diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 000000000..1a6bd4587
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1 @@
+package-lock.json binary
diff --git a/.gitignore b/.gitignore
index 17168f4e1..318fba425 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,3 +12,7 @@ azure_error
coverage.html
.coveralls.yml
pkgcloud.lcov*
+node-jscoverage
+.nyc_output
+*.tgz
+*.tar.gz
diff --git a/.jshintrc b/.jshintrc
new file mode 100644
index 000000000..77bab72f6
--- /dev/null
+++ b/.jshintrc
@@ -0,0 +1,89 @@
+{
+ "predef" : ["-context"],
+ "maxerr" : 50, // {int} Maximum error before stopping
+
+ // Enforcing
+ "bitwise" : false, // true: Prohibit bitwise operators (&, |, ^, etc.)
+ "camelcase" : false, // true: Identifiers must be in camelCase
+ "curly" : true, // true: Require {} for every new block or scope
+ "eqeqeq" : false, // true: Require triple equals (===) for comparison
+ "forin" : false, // true: Require filtering for..in loops with obj.hasOwnProperty()
+ "freeze" : true, // true: prohibits overwriting prototypes of native objects such as Array, Date etc.
+ "immed" : false, // true: Require immediate invocations to be wrapped in parens e.g. `(function () { } ());`
+ "indent" : false, // {int} Number of spaces to use for indentation
+ "latedef" : true, // true: Require variables/functions to be defined before being used
+ "newcap" : true, // true: Require capitalization of all constructor functions e.g. `new F()`
+ "noarg" : true, // true: Prohibit use of `arguments.caller` and `arguments.callee`
+ "noempty" : true, // true: Prohibit use of empty blocks
+ "nonbsp" : false, // true: Prohibit "non-breaking whitespace" characters.
+ "nonew" : false, // true: Prohibit use of constructors for side-effects (without assignment)
+ "plusplus" : false, // true: Prohibit use of `++` & `--`
+ "quotmark" : "single", // Quotation mark consistency:
+ // false : do nothing (default)
+ // true : ensure whatever is used is consistent
+ // "single" : require single quotes
+ // "double" : require double quotes
+ "undef" : true, // true: Require all non-global variables to be declared (prevents global leaks)
+ "unused" : true, // true: Require all defined variables be used
+ "strict" : false, // true: Requires all functions run in ES5 Strict Mode
+ "maxparams" : false, // {int} Max number of formal params allowed per function
+ "maxdepth" : false, // {int} Max depth of nested blocks (within functions)
+ "maxstatements" : false, // {int} Max number statements per function
+ "maxcomplexity" : false, // {int} Max cyclomatic complexity per function
+ "maxlen" : false, // {int} Max number of characters per line
+
+ // Relaxing
+ "asi" : false, // true: Tolerate Automatic Semicolon Insertion (no semicolons)
+ "boss" : true, // true: Tolerate assignments where comparisons would be expected
+ "debug" : true, // true: Allow debugger statements e.g. browser breakpoints.
+ "eqnull" : true, // true: Tolerate use of `== null`
+ "es5" : false, // true: Allow ES5 syntax (ex: getters and setters)
+ "esnext" : true, // true: Allow ES.next (ES6) syntax (ex: `const`)
+ "moz" : true, // true: Allow Mozilla specific syntax (extends and overrides esnext features)
+ // (ex: `for each`, multiple try/catch, function expression…)
+ "evil" : true, // true: Tolerate use of `eval` and `new Function()`
+ "expr" : true, // true: Tolerate `ExpressionStatement` as Programs
+ "funcscope" : true, // true: Tolerate defining variables inside control statements
+ "globalstrict" : true, // true: Allow global "use strict" (also enables 'strict')
+ "iterator" : true, // true: Tolerate using the `__iterator__` property
+ "lastsemic" : true, // true: Tolerate omitting a semicolon for the last statement of a 1-line block
+ "laxbreak" : true, // true: Tolerate possibly unsafe line breakings
+ "laxcomma" : true, // true: Tolerate comma-first style coding
+ "loopfunc" : true, // true: Tolerate functions being defined in loops
+ "multistr" : true, // true: Tolerate multi-line strings
+ "noyield" : true, // true: Tolerate generator functions with no yield statement in them.
+ "notypeof" : true, // true: Tolerate invalid typeof operator values
+ "proto" : true, // true: Tolerate using the `__proto__` property
+ "scripturl" : true, // true: Tolerate script-targeted URLs
+ "shadow" : true, // true: Allows re-define variables later in code e.g. `var x=1; x=2;`
+ "sub" : true, // true: Tolerate using `[]` notation when it can still be expressed in dot notation
+ "supernew" : true, // true: Tolerate `new function () { ... };` and `new Object;`
+ "validthis" : true, // true: Tolerate using this in a non-constructor function
+ "-W086" : true, // true: Allow fall-through; see https://github.com/jshint/jshint/issues/18
+ "-W008" : true, // true: Allow leading decimal point; see https://jslinterrors.com/a-leading-decimal-point-can-be-confused-with-a-dot-a
+ "-W041" : true, // true: Ignore strict comparison checking; see https://github.com/jshint/jshint/blob/a643f3fec0632249dcd78d0cf5f200d9166b587d/src/messages.js#L115
+ "-W082" : true, // true: Allow function declarations inside blocks; see https://jslinterrors.com/function-statements-should-not-be-placed-in-blocks
+
+ // Environments
+ "browser" : false, // Web Browser (window, document, etc)
+ "browserify" : false, // Browserify (node.js code in the browser)
+ "couch" : false, // CouchDB
+ "devel" : false, // Development/debugging (alert, confirm, etc)
+ "dojo" : false, // Dojo Toolkit
+ "jasmine" : false, // Jasmine
+ "jquery" : false, // jQuery
+ "mocha" : true, // Mocha
+ "mootools" : false, // MooTools
+ "node" : true, // Node.js
+ "nonstandard" : false, // Widely adopted globals (escape, unescape, etc)
+ "prototypejs" : false, // Prototype and Scriptaculous
+ "qunit" : false, // QUnit
+ "rhino" : false, // Rhino
+ "shelljs" : false, // ShellJS
+ "worker" : false, // Web Workers
+ "wsh" : false, // Windows Scripting Host
+ "yui" : false, // Yahoo User Interface
+
+ // Custom Globals
+ "globals" : {} // additional predefined global variables
+}
diff --git a/.npmignore b/.npmignore
index e19255845..260ffcaef 100644
--- a/.npmignore
+++ b/.npmignore
@@ -1 +1,15 @@
-test/*
\ No newline at end of file
+.DS_Store
+*.log
+*.notes
+.*.sw[op]
+.project
+.idea
+azure_error
+coverage.html
+.coveralls.yml
+pkgcloud.lcov*
+node-jscoverage
+.nyc_output
+test/*
+*.tgz
+*.tar.gz
diff --git a/.travis.yml b/.travis.yml
index 340271c98..9c67e9deb 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,16 +1,10 @@
language: node_js
node_js:
- - "0.8"
- - "0.10"
-
+- '8'
+- '10'
notifications:
- email:
- - travis@nodejitsu.com
- irc: "irc.freenode.org#pkgcloud"
-
-before_script:
- - git clone git://github.com/visionmedia/node-jscoverage.git
- - pushd node-jscoverage
- - ./configure
- - make
- - popd
+ irc: irc.freenode.org#pkgcloud
+ slack:
+ secure: RjlcoxHiKzep+CdLSC4UcL6Wsrv/4F3mzCwnDhIFsoH53XZ4t5oexLyaQxZFVq6KYes7nv2D/w2jUX7z7LBCZ6N0p8Sf/ao2s5O71ETDYDajtQjdEC1/w8PflC61b1EsVfE1tDbDtkFJtVXWKCBUAfbvrMYZwP0f8Ffhf3Bvg2I=
+script: npm test
+after_success: npm run coverage
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 143370221..a47e3ac36 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,116 @@
+## CHANGELOG
+
+## v2.2.0
+
+- [#678] [@jcrugzz] support more aws auth scenarios via credentials object or sessionToken.
+
+## v2.1.1
+
+- [#666], [@guischdi] Fix GCS upload.
+
+## v2.1.0
+
+- Add content encoding option for s3 upload
+
+## v2.0.0
+
+- [BREAKING] Drop all legacy providers.
+- Update dependencies.
+- Documentation fixes.
+ - Fix broken links to databases.md
+ - Replace Openstack with OpenStack
+ - Fix page title markdown formatting
+- `this.protocol` from client instance is used as the URL protocol
+ as it should be. Fixes [#526].
+
+## v1.7.0
+
+* Amazon use native `aws-sdk` for `s3` uploads instead of `s3-upload-stream` module
+* Update the `aws-sdk` to `2.382.0`
+* Amazon storage client.upload - expose concurrency - `queueSize` and `partSize` configurability and add ability to abort an upload
+
+## v1.6.0
+
+- Equivalent to `v1.5.0`.
+
+## v1.5.0
+
+- Added 1&1 support with tests.
+- Set Content-Type with Google storage. Fixes [#635].
+- Attempt to restrict to `node@6` and `node@8`.
+- [fix] Patched RegEx DoS vuln & Remote Memory Exposure vuln.
+ This addresses two major security issues:
+ - https://nodesecurity.io/advisories/309
+ - https://nodesecurity.io/advisories/535
+- Fix typo in OpenStack `createSecurityGroupRule`. Fixes [#556].
+- Fix typo in `createSecurityGroup`. Fixes [#454].
+- Fix breaking test due to expired auth token.
+
+## v1.4.0
+
+- Pass in other aws options that allow an s3 like API to be configured correctly
+- Fixing broken merge from replacing underscore with lodash
+
+## v1.3.0
+* OpenStack identity v3 (keystone) support, Issue [#367](//github.com/pkgcloud/pkgcloud/issues/367), [#477](//github.com/pkgcloud/pkgcloud/issues/477), PR [#461](//github.com/pkgcloud/pkgcloud/pull/461)
+* OpenStack cancel client download, Issue [#379](//github.com/pkgcloud/pkgcloud/issues/379), PR [#416](//github.com/pkgcloud/pkgcloud/pull/416)
+* OpenStack improved directory support for getFiles, PR [#390](//github.com/pkgcloud/pkgcloud/pull/390)
+* Add support for prepending a custom user agent, Issue [#394](//github.com/pkgcloud/pkgcloud/issues/394), PR [#395](//github.com/pkgcloud/pkgcloud/pull/395)
+* OpenStack fixed storage copy function, Issue [#396](//github.com/pkgcloud/pkgcloud/issues/396) , PR [#350](//github.com/pkgcloud/pkgcloud/pull/350)
+* OpenStack allow non-strict SSL, PR [#397](//github.com/pkgcloud/pkgcloud/pull/397)
+* Adding a refresh method on the stack model, Issue [#398](//github.com/pkgcloud/pkgcloud/issues/398), PR [#402](//github.com/pkgcloud/pkgcloud/pull/402)
+* Google storage return metadata in success handler, Issue [#400](//github.com/pkgcloud/pkgcloud/issues/400), PR [#401](//github.com/pkgcloud/pkgcloud/pull/401)
+* OpenStack added template outputs field to stack, PR [#403](//github.com/pkgcloud/pkgcloud/pull/403)
+* Amazon fixes to AWS config, Issue [#406](//github.com/pkgcloud/pkgcloud/issues/406), PR [#407](//github.com/pkgcloud/pkgcloud/pull/xxx), [#409](//github.com/pkgcloud/pkgcloud/pull/407)
+* Added support for nestedDepth option to stack getResources method, Issue [#410](//github.com/pkgcloud/pkgcloud/issues/410), PR [#411](//github.com/pkgcloud/pkgcloud/pull/411)
+* Added support for networking security groups, security group rules, PR [#412](//github.com/pkgcloud/pkgcloud/pull/412)
+* Allow passing options to rebuildServer, Issue [#414](//github.com/pkgcloud/pkgcloud/issues/414), PR [#415](//github.com/pkgcloud/pkgcloud/pull/415)
+* Allow deleteStack to accept stack object or stack name, Issue [#418](//github.com/pkgcloud/pkgcloud/issues/418), PR [#420](//github.com/pkgcloud/pkgcloud/pull/420)
+* Amazon createServer: use pluralized keys for SecurityGroups/SecurityGroupIds, Issue [#432](//github.com/pkgcloud/pkgcloud/issues/432), PR [#433](//github.com/pkgcloud/pkgcloud/pull/433)
+* RackSpace, OpenStack add enableRootUser and listRootStatus, PR [#438](//github.com/pkgcloud/pkgcloud/pull/438)
+* Amazon storage added cache control support to s3 buckets, PR [#447](//github.com/pkgcloud/pkgcloud/pull/447)
+* OpenStack compute added deleteRule, PR [#456](//github.com/pkgcloud/pkgcloud/pull/456)
+* DigitalOcean ported provider to APIv2, PR [#470](//github.com/pkgcloud/pkgcloud/pull/470)
+* OpenStack handle request errors in client.upload flow, Issue [#481](//github.com/pkgcloud/pkgcloud/issues/481), PR [#484](//github.com/pkgcloud/pkgcloud/pull/484)
+* OpenStack added adminPass attribute to createServer, PR [#486](//github.com/pkgcloud/pkgcloud/pull/486)
+* Amazon added AWS specific options for cache control and file encryption, PR [#496](//github.com/pkgcloud/pkgcloud/pull/496)
+* Misc doc fixes, PR [#417](//github.com/pkgcloud/pkgcloud/pull/417), [#426](//github.com/pkgcloud/pkgcloud/pull/426), [#429](//github.com/pkgcloud/pkgcloud/pull/429), [#442](//github.com/pkgcloud/pkgcloud/pull/442), [#444](//github.com/pkgcloud/pkgcloud/pull/444), [#449](//github.com/pkgcloud/pkgcloud/pull/449), [#498](//github.com/pkgcloud/pkgcloud/pull/498)
+
+## v1.2.0
+* Added Support for Openstack CDN (Poppy)
+
+## v1.1.0
+* Added support for Google Cloud Storage
+* Added support for Rackspace Cloud Networks
+
+## v1.0.3
+* Adding support for Openstack Trove, and adding HP, rackspace providers
+
+## v1.0.2
+* Adding support for OpenStack Cinder
+
+## v1.0.1
+* Adding a rackspace orchestration provider
+
+## v1.0.0
+* Requires node 0.10, dropping support for node v0.8
+* Fundamentally changed the streaming file api for upload. No longer takes a callback. See #332
+* Significant cleanup across storage apis across providers
+* Added `toJSON` on all models
+* Changed underlying Amazon provider to use aws-sdk
+* Added Openstack Heat provider
+* updated all package dependencies, including removing `utile`
+* static website support for Rackspace Cloud Files
+* Added compute.keys support for HP Compute provider
+
+## v0.9.6
+* Fixed a long-standing bug in openstack.compute.getFlavor #292
+
+## v0.9.5
+* Openstack Network service.
+* Added support for HP Cloud provider.
+* Added support for Rackspace Storage Temporary URLs
+
## v0.9.4
* Added support for os-security-groups compute extension
@@ -91,4 +204,3 @@
## v0.7.2
* Added a pkgcloud User-Agent for outbound HTTP requests #134
* Added tests for core compute method signatures
-
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index e7c1b09bf..724ed2a39 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -26,7 +26,8 @@ The only issues we accept are bug reports or feature requests. Bugs must be isol
- Please tag your commit depending what it does (`[misc]`, `[docs]`, `[database]`, `[compute]`)
- Follow the style guide in code and docs.
- Your pull request should pass the tests and the `travis-ci` build. This will be reviewed by the maintainer.
-
+ - Before making the pull request, please run the unit tests using `npm test`.
+ - Before making the pull request, please run the lint tests using `npm run lint`.
## Coding standards: JS
@@ -46,7 +47,7 @@ The only issues we accept are bug reports or feature requests. Bugs must be isol
## Adding tests to my pull requests
-The tests are written using [mocha](http://visionmedia.github.io/mocha/) and given the nature of `pkgcloud` test against third-party APIs are very slow specially in case of IaaS providers, so, we encourage the use of [`hock`](https://github.com/mmalecki) for mocking the responses.
+The tests are written using [mocha](http://mochajs.org/) and given the nature of `pkgcloud` test against third-party APIs are very slow specially in case of IaaS providers, so, we encourage the use of [`hock`](https://github.com/mmalecki/hock) for mocking the responses.
Be familiar with the whole test suite and its helpers and other utilities on `test/` directory, read it to see examples of tests.
@@ -57,7 +58,7 @@ var hock = require('hock');
// ...
```
-As `hock` has a similar API to [nock](https://github.com/flatiron/nock), you can easily record the API calls using `nock`. do this using the `recorder.rec()` method offer by `nock` just add this before the test declaration:
+As `hock` has a similar API to [nock](https://github.com/pgte/nock), you can easily record the API calls using `nock`. do this using the `recorder.rec()` method offer by `nock` just add this before the test declaration:
``` js
nock.recorder.rec();
diff --git a/LICENSE b/LICENSE
index 4b467e5d7..58f564e66 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2011 Nodejitsu Inc.
+Copyright (C) 2011 Charlie Robbins, Ken Perkins, Ross Kukulinski & the Contributors.
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
@@ -16,4 +16,4 @@ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
\ No newline at end of file
+THE SOFTWARE.
diff --git a/Makefile b/Makefile
deleted file mode 100644
index aac56eae4..000000000
--- a/Makefile
+++ /dev/null
@@ -1,34 +0,0 @@
-MOCHA_OPTS=-t 4000 test/*/*/*-test.js test/*/*/*/*-test.js
-REPORTER = spec
-
-check: test
-
-test: test-unit
-
-test-unit:
- @NODE_ENV=test MOCK=on ./node_modules/.bin/mocha \
- --reporter $(REPORTER) \
- $(MOCHA_OPTS)
-
-lib-cov:
- jscoverage --encoding=UTF-8 lib lib-cov
-
-test-cov: lib-cov
- mv lib lib-bak
- mv lib-cov lib
- $(MAKE) test REPORTER=html-cov > coverage.html
- rm -rf lib
- mv lib-bak lib
-
-test-coveralls: lib-cov
- echo TRAVIS_JOB_ID $(TRAVIS_JOB_ID)
- mv lib lib-bak
- mv lib-cov lib
- $(MAKE) test REPORTER=mocha-lcov-reporter > pkgcloud.lcov.raw
- rm -rf lib
- mv lib-bak lib
- sed "s#SF:#SF:$(PWD)/lib/#g" pkgcloud.lcov.raw > pkgcloud.lcov
- ./node_modules/coveralls/bin/coveralls.js < pkgcloud.lcov
- rm pkgcloud.lcov pkgcloud.lcov.raw
-
-.PHONY: test
diff --git a/README.md b/README.md
index 3368d4837..3c9f961e1 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,7 @@
# pkgcloud [](http://travis-ci.org/pkgcloud/pkgcloud) [](http://badge.fury.io/js/pkgcloud)
+[](https://gitter.im/pkgcloud/pkgcloud?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
+
pkgcloud is a standard library for node.js that abstracts away differences among multiple cloud providers.
* [Getting started](#getting-started)
@@ -8,12 +10,15 @@ pkgcloud is a standard library for node.js that abstracts away differences among
* [Supported APIs](#supported-apis)
* [Compute](#compute)
* [Storage](#storage)
- * [Uploading Files](#uploading)
- * [Downloading Files](#downloading)
+ * [Uploading Files](#upload-a-file)
+ * [Downloading Files](#download-a-file)
* [Database](#databases)
* [DNS](#dns----beta) *(beta)*
* [Block Storage](#block-storage----beta) *(beta)*
* [Load Balancers](#load-balancers----beta) *(beta)*
+* [Orchestration](#orchestration----beta) *(beta)*
+* [Network](#network----beta) *(beta)*
+* [CDN](#cdn----beta) *(beta)*
* _Fine Print_
* [Installation](#installation)
* [Tests](#tests)
@@ -31,7 +36,7 @@ You can install `pkgcloud` via `npm` or add to it to [dependencies](https://npmj
npm install pkgcloud
```
-Currently there are six service types which are handled by pkgcloud:
+Currently there are nine service types which are handled by pkgcloud:
* [Compute](#compute)
* [Storage](#storage)
@@ -39,9 +44,27 @@ Currently there are six service types which are handled by pkgcloud:
* [DNS](#dns----beta) *(beta)*
* [Block Storage](#block-storage----beta) *(beta)*
* [Load Balancers](#load-balancers----beta) *(beta)*
+* [Network](#network----beta) *(beta)*
+* [Orchestration](#orchestration----beta) *(beta)*
+* [CDN](#cdn----beta) *(beta)*
In our [Roadmap](#roadmap), we plan to add support for more services, such as Queueing, Monitoring, and more. Additionally, we plan to implement more providers for the *beta* services, thus moving them out of *beta*.
+### User Agent
+
+By default, all pkgcloud HTTP requests will have a user agent with the library and version: `nodejs-pkgcloud/x.y.z` where `x.y.z` is the current version.
+
+You can get this from a client at any time by calling `client.getUserAgent();`. Some providers may have an additional suffix as a function of the underlying HTTP stacks.
+
+You can also set a custom User Agent prefix:
+
+```javascript
+client.setCustomUserAgent('my-app/1.2.3');
+
+// returns "my-app/1.2.3 nodejs-pkgcloud/1.1.0"
+client.getUserAgent();
+```
+
make test-cov
### Run Coverage locally and send to coveralls.io
-Travis takes care of coveralls, so this shouldn't be necessary unless you're troubleshooting a problem with Travis/Coveralls.
-You'll need to have access to the coveralls repo_token, which should only be visible to pkgcloud/pkgcloud admins.
+Travis takes care of coveralls, so this shouldn't be necessary unless you're
+troubleshooting a problem with Travis / Coveralls. You'll need to have access
+to the coveralls `repo_token`, which should only be visible to
+`pkgcloud/pkgcloud` admins.
-1. Create a .coveralls.yml containing the repo_token from https://coveralls.io/r/pkgcloud/pkgcloud
-2. Run make test-coveralls
+1. Create a `.coveralls.yml` containing the `repo_token` from
+ https://coveralls.io/r/pkgcloud/pkgcloud
+2. Run the following:
+```
+npm test
+npm run coverage
+```
API
AWS
Azure
-Joyent
-Openstack
+OpenStack
RAX
DigitalOcean
@@ -44,4 +43,4 @@ The following table outlines the methods that are available on the different com
-*Note: There are a few I haven't listed yet that I know exist on Rackspace/Openstack, but I lack the awareness of the other providers.*
+*Note: There are a few I haven't listed yet that I know exist on Rackspace/OpenStack, but I lack the awareness of the other providers.*
diff --git a/docs/providers/digitalocean.md b/docs/providers/digitalocean.md
index 6e5b913b2..33da938be 100644
--- a/docs/providers/digitalocean.md
+++ b/docs/providers/digitalocean.md
@@ -5,13 +5,12 @@
',
- apiKey: ''
+ token: ''
});
```
diff --git a/docs/providers/google.md b/docs/providers/google.md
new file mode 100644
index 000000000..927702540
--- /dev/null
+++ b/docs/providers/google.md
@@ -0,0 +1,47 @@
+# Using Google Cloud with `pkgcloud`
+
+The Google Cloud provider in pkgcloud supports the following services:
+
+* **Storage** Google Cloud Storage
+
+Using the Google Cloud provider requires:
+
+1. A project id
+2. A JSON key file
+
+Both are provided from the [Google Developers Console](https://console.developers.google.com/project). For detailed instructions, see this [Getting Started guide](https://github.com/GoogleCloudPlatform/gcloud-node/blob/v0.10.0/README.md#authorization).
+
+);
+
+var writeStream = client.upload({
+ container: ,
+ remote: ,
+ contentType: 'application/pdf' // optional
+});
+
+writeStream.on('error', function (err) {
+ console.error(err);
+});
+
+writeStream.on('success', function (file) {
+ console.log("Success!");
+});
+
+readStream.pipe(writeStream);
+```
+
diff --git a/docs/providers/hp/README.md b/docs/providers/hp/README.md
new file mode 100644
index 000000000..b85a12513
--- /dev/null
+++ b/docs/providers/hp/README.md
@@ -0,0 +1,74 @@
+
+
+## Using the HP Helion Cloud provider in pkgcloud
+The HP Helion Cloud provider in pkgcloud supports the following services:
+
+* [**Compute**](compute.md) (cloud compute)
+* [**Databases**](databases.md) (databases)
+* [**Network**](network.md) (network)
+* [**Storage**](storage.md) (object storage)
+
+### Activating your HP Helion Cloud services
+If this is your first time using HP Helion Cloud Services, please follow [this](https://community.hpcloud.com/article/hp-public-cloud-quick-start-guide) guide to get started.
+### Getting Started with Compute
+
+We've provided a [simple compute example](getting-started-compute.md) where it creates a couple of compute instances.
+
+### Authentication
+For all of the HP Cloud services, you create a client with the same options.
+
+For key-based auth:
+
+```Javascript
+createClient({
+ provider: 'hp',
+ tenantId: 'your-tenant-id',
+ username: 'your-access-key',
+ apiKey: 'your-secret-key',
+});
+```
+
+For password auth:
+
+```Javascript
+createClient({
+ provider: 'hp',
+ tenantId: 'your-tenant-id',
+ username: 'your-username',
+ password: 'your-password',
+});
+```
+
+### Getting your API key
+You can provision API keys in your cloud management console.
+Please see [here](https://community.hpcloud.com/article/managing-your-access-keys) for more instructions.
+
+### Authentication Endpoints and Regions
+All of the HP `createClient` calls have a few options that can be provided:
+
+#### authUrl
+`authUrl` specifies the authentication endpoint used to create a token for your HP client.
+See here for more details : [Regions](http://docs.hpcloud.com/api/identity/#2.2RegionsandAvailabilityZones)
+If you're targeting an HP Private Cloud instance, please contact your administrator for the authUrl.
+
+#### region
+`region` specifies which region of a service to use. HP has services deployed in multiple regions.
+See here for more details : [Regions](http://docs.hpcloud.com/api/identity/#2.2RegionsandAvailabilityZones)
+If you're targeting an HP Private Cloud instance, please contact your administrator for region names.
+
+##### Authenticating against the US-West endpoint
+
+```Javascript
+ region: 'region-a.geo-1',
+ authUrl: 'https://region-a.geo-1.identity.hpcloudsvc.com:35357'
+```
+
+##### Authenticating against the US-East endpoint
+
+```Javascript
+ region: 'region-b.geo-1',
+ authUrl: 'https://region-b.geo-1.identity.hpcloudsvc.com:35357'
+```
+
+### Tokens and Expiration
+When you make your first call to a HP provider, your client is authenticated transparent to your API call. HP will issue you a token, with an expiration. When that token expires, the client will automatically re-authenticate and retrieve a new token. The caller shouldn't have to worry about this happening.
diff --git a/docs/providers/hp/compute.md b/docs/providers/hp/compute.md
new file mode 100644
index 000000000..18982a3a2
--- /dev/null
+++ b/docs/providers/hp/compute.md
@@ -0,0 +1,144 @@
+
+
+## Using the HP Helion Cloud Compute provider
+
+Creating a client is straight-forward:
+
+``` js
+ var HPCompute = pkgcloud.compute.createClient({
+ provider: 'hp',
+ username: 'your-user-name',
+ apiKey: 'your-api-key',
+ region: 'region of identity service',
+ authUrl: 'https://your-identity-service'
+ });
+```
+
+[More options for creating clients](README.md)
+
+### API Methods
+
+**Servers**
+
+#### client.getServers(callback)
+Lists all servers that are available to use on your HP Cloud account
+
+Callback returns `f(err, servers)` where `servers` is an `Array`
+
+#### client.createServer(options, callback)
+Creates a server with the options specified
+
+Options are as follows:
+
+```js
+{
+ name: 'serverName', // required
+ flavor: 'flavor1', // required
+ image: 'image1', // required
+ personality: [] // optional
+}
+```
+Returns the server in the callback `f(err, server)`
+
+#### client.destroyServer(server, callback)
+Destroys the specified server
+
+Takes server or serverId as an argument and returns the id of the destroyed server in the callback `f(err, serverId)`
+
+#### client.getServer(server, callback)
+Gets specified server
+
+Takes server or serverId as an argument and returns the server in the callback
+`f(err, server)`
+
+#### client.rebootServer(server, options, callback)
+Reboots the specifed server with options
+
+Options include:
+
+```js
+{
+ type: 'HARD' // optional (defaults to 'SOFT')
+}
+```
+Returns callback with a confirmation
+
+#### client.getVersion(callback)
+
+Get the current version of the api returned in a callback `f(err, version)`
+
+#### client.getLimits(callback)
+
+Get the current API limits returned in a callback `f(err, limits)`
+
+**flavors**
+
+#### client.getFlavors(callback)
+
+Returns a list of all possible server flavors available in the callback `f(err,
+flavors)`
+
+#### client.getFlavor(flavor, callback)
+Returns the specified HP flavor of OpenStack Images by ID or flavor
+object in the callback `f(err, flavor)`
+
+**images**
+
+#### client.getImages(callback)
+Returns a list of the images available for your account
+
+`f(err, images)`
+
+#### client.getImage(image, callback)
+Returns the image specified
+
+`f(err, image)`
+
+#### client.createImage(options, callback)
+Creates an Image based on a server
+
+Options include:
+
+```js
+{
+ name: 'imageName', // required
+ server: 'serverId' // required
+}
+```
+
+Returns the newly created image
+
+`f(err, image)`
+
+#### client.destroyImage(image, callback)
+Destroys the specified image and returns a confirmation
+
+`f(err, {ok: imageId})`
+
+## Volume Attachments
+
+Attaching a volume to a compute instance requires using a HP compute client, as well as possessing a `volume` or `volumeId`. Detaching volumes behaves the same way.
+
+#### client.getVolumeAttachments(server, callback)
+
+Gets an array of volumeAttachments for the provided server.
+
+`f(err, volumeAttachments)`
+
+#### client.getVolumeAttachmentDetails(server, attachment, callback)
+
+Gets the details for a provided server and attachment. `attachment` may either be the `attachmentId` or an object with `attachmentId` as a property.
+
+`f(err, volumeAttachment)`
+
+#### client.attachVolume(server, volume, callback)
+
+Attaches the provided `volume` to the `server`. `volume` may either be the `volumeId` or an instance of `Volume`.
+
+`f(err, volumeAttachment)`
+
+#### client.detachVolume(server, attachment, callback)
+
+Detaches the provided `attachment` from the server. `attachment` may either be the `attachmentId` or an object with `attachmentId` as a property. If the `volume` is mounted this call will return an err.
+
+`f(err)`
diff --git a/docs/providers/hp/databases.md b/docs/providers/hp/databases.md
new file mode 100644
index 000000000..0779c47cb
--- /dev/null
+++ b/docs/providers/hp/databases.md
@@ -0,0 +1,92 @@
+## Using the HP Helion Database provider
+
+Creating a client is straight-forward:
+
+``` js
+ var rackspace = pkgcloud.database.createClient({
+ provider: 'hp',
+ username: 'your-user-name',
+ apiKey: 'your-api-key',
+ region: 'region of identity service',
+ authUrl: 'https://your-identity-service'
+ });
+```
+
+[More options for creating clients](README.md)
+
+### Creating a MySQL Database
+
+The steps for provision a MySQL database from HP Helion cloud databases are:
+
+1. Choose a flavor (memory RAM size)
+2. Create an instance of a database server.
+3. When the instance is provisioned, create your database.
+
+Also you can manage users across your instances and each instance can handle several databases.
+
+``` js
+ client.getFlavors(function (err, flavors) {
+ //
+ // Look at the availables flavors for your instance
+ //
+ console.log(flavors);
+
+ //
+ // Lets choose the ID 1 for 512MB flavor
+ //
+ client.getFlavor(1, function (err, flavor) {
+ //
+ // Create the instance for host the databases.
+ //
+ client.createInstance({
+ name: 'test-instance',
+ flavor: flavor,
+ //
+ // Optional, you can choose the disk size for the instance
+ // (1 - 8) in GB. Default to 1
+ //
+ size: 3
+ //
+ // Optional, you can give an array of database names for initialize
+ // when the instace is ready
+ //
+ databases: ['first-database', 'second-database']
+ }, function (err, instance) {
+ //
+ // At this point when the instance is ready we can manage the databases
+ //
+ client.createDatabase({
+ name: 'test-database',
+ instance: instance
+ }, function (err, database) {
+ //
+ // Log the result
+ //
+ console.log(database);
+ });
+ });
+ })
+ });
+```
+
+### API Methods ###
+
+#### client.createUser(options, callback)
+
+Allows the creation of specific users to have access to any database you create.
+
+Accepts one user object as the `options` argument or an array of user objects.
+
+A user object is defined as follows:
+
+```js
+{
+ username: 'nodejitsu', // required
+ password: 'foobar', // required
+ databases: ['first-db, second-db'], // required (Can be either string or array)
+ instance: instance // required (instance or instanceId)
+}
+```
+
+**note**: If creating multiple users, the instance provided must be the same for
+both.
diff --git a/docs/providers/hp/getting-started-compute.md b/docs/providers/hp/getting-started-compute.md
new file mode 100644
index 000000000..d4e77f974
--- /dev/null
+++ b/docs/providers/hp/getting-started-compute.md
@@ -0,0 +1,98 @@
+
+# Getting started with pkgcloud & HP Helion Cloud
+The HP node.js SDK is available as part of `pkgcloud`, a multi-provider cloud provisioning package
+
+Pkgcloud currently supports HP Helion Cloud Compute and HP Helion Cloud Object Storage, and HP Helion Cloud Networking.
+
+To install `pkgcloud` from the command line:
+
+```
+npm install pkgcloud
+```
+
+Don't have `npm` or `node` yet? [Get it now](http://nodejs.org/download).
+
+## Using pkgcloud
+
+In this example, we're going to create a HP Helion Cloud Compute client, create two servers, and then output their details to the command line.
+
+*Note: We're going to use [lodash.js](https://lodash.com) for some convenience functions.*
+
+```Javascript
+var pkgcloud = require('pkgcloud'),
+ _ = require('lodash');
+
+// create our client with your openstack credentials
+var client = pkgcloud.compute.createClient({
+ provider: 'hp',
+ username: 'your-user-name',
+ apiKey: 'your-api-key',
+ region: 'region of identity service',
+ authUrl: 'https://your-identity-service'
+});
+
+// first we're going to get our flavors
+client.getFlavors(function (err, flavors) {
+ if (err) {
+ console.dir(err);
+ return;
+ }
+
+ // then get our base images
+ client.getImages(function (err, images) {
+ if (err) {
+ console.dir(err);
+ return;
+ }
+
+ // Pick a medium instance flavor
+ // see here for more instance flavors: http://www.hpcloud.com/products-services/hp-cloud-compute-13_5
+ var flavor = _.findWhere(flavors, { name: 'standard.medium' });
+
+ // Pick an image based on CentOS 6.3
+ var image = _.findWhere(images, { name: 'CentOS 6.3 Server 64-bit 20130116' });
+
+ // Create our first server
+ client.createServer({
+ name: 'server1',
+ image: image,
+ flavor: flavor
+ }, handleServerResponse);
+
+ // Create our second server
+ client.createServer({
+ name: 'server2',
+ image: image,
+ flavor: flavor
+ }, handleServerResponse);
+ });
+});
+
+// This function will handle our server creation,
+// as well as waiting for the server to come online after we've
+// created it.
+function handleServerResponse(err, server) {
+ if (err) {
+ console.dir(err);
+ return;
+ }
+
+ console.log('SERVER CREATED: ' + server.name + ', waiting for active status');
+
+ // Wait for status: ACTIVE on our server, and then callback
+ server.setWait({ status: 'ACTIVE' }, 5000, function (err) {
+ if (err) {
+ console.dir(err);
+ return;
+ }
+
+ console.log('SERVER INFO');
+ console.log(server.name);
+ console.log(server.status);
+ console.log(server.id);
+
+ console.log('Make sure you DELETE server: ' + server.id +
+ ' in order to not accrue billing charges');
+ });
+}
+```
diff --git a/docs/providers/hp/network.md b/docs/providers/hp/network.md
new file mode 100644
index 000000000..664c97bf5
--- /dev/null
+++ b/docs/providers/hp/network.md
@@ -0,0 +1,245 @@
+
+
+## Using the HP Cloud Network provider
+
+Creating a client is straight-forward:
+
+``` js
+ var hPNetwork = pkgcloud.network.createClient({
+ provider: 'hp',
+ username: 'your-user-name',
+ apiKey: 'your-api-key',
+ region: 'region of identity service',
+ authUrl: 'https://your-identity-service'
+ });
+```
+### API Methods
+
+**Networks**
+
+#### client.getNetworks(callback)
+Lists all networks that are available to use on your HP Cloud account
+
+Callback returns `f(err, networks)` where `networks` is an `Array`
+
+#### client.getNetwork(network, callback)
+Gets specified network
+
+Takes network or networkId as an argument and returns the network in the callback
+`f(err, network)`
+
+#### client.createNetwork(options, callback)
+Creates a network with the options specified
+
+Options are as follows:
+
+```js
+{
+ name: 'networkName', // optional
+ adminStateUp : true, // optional
+ shared : true, // optional, Admin only
+ tenantId : 'tenantId' // optional, Admin only
+}
+```
+Returns the network in the callback `f(err, network)`
+
+#### client.updateNetwork(options, callback)
+Updates a network with the options specified
+
+Options are as follows:
+
+```js
+{
+ id : 'networkId', // required
+ name: 'networkName', // optional
+ adminStateUp : true, // optional
+ shared : true, // optional, Admin only
+ tenantId : 'tenantId' // optional, Admin only
+}
+```
+Returns the network in the callback `f(err, network)`
+
+#### client.destroyNetwork(network, callback)
+Destroys the specified network
+
+Takes network or networkId as an argument and returns the id of the destroyed network in the callback `f(err, networkId)`
+
+**Subnets**
+
+#### client.getSubnets(callback)
+Lists all subnets that are available to use on your HP Cloud account
+
+Callback returns `f(err, subnets)` where `subnets` is an `Array`
+
+#### client.getSubnet(subnet, callback)
+Gets specified subnet
+
+Takes subnet or subnetId as an argument and returns the subnet in the callback
+`f(err, subnet)`
+
+#### client.createSubnet(options, callback)
+Creates a subnet with the options specified
+
+Options are as follows:
+
+```js
+{
+ name: 'subnetName', // optional
+ networkId : 'networkId', // required, The ID of the attached network.
+ shared : true, // optional, Admin only
+ tenantId : 'tenantId' // optional, The ID of the tenant who owns the network. Admin-only
+ gatewayIp : 'gateway ip address', // optional,The gateway IP address.
+ enableDhcp : true // Set to true if DHCP is enabled and false if DHCP is disabled.
+}
+```
+Returns the subnet in the callback `f(err, subnet)`
+
+#### client.updateSubnet(options, callback)
+Updates a subnet with the options specified
+
+Options are as follows:
+
+```js
+{
+ id : 'subnetId', // required
+ name: 'subnetName', // optional
+ networkId : 'networkId', // required, The ID of the attached network.
+ shared : true, // optional, Admin only
+ tenantId : 'tenantId' // optional, The ID of the tenant who owns the network. Admin-only
+ gatewayIp : 'gateway ip address', // optional,The gateway IP address.
+ enableDhcp : true // Set to true if DHCP is enabled and false if DHCP is disabled.
+}
+```
+Returns the subnet in the callback `f(err, subnet)`
+
+#### client.destroySubnet(subnet, callback)
+Destroys the specified subnet
+
+Takes subnet or subnetId as an argument and returns the id of the destroyed subnet in the callback `f(err, subnetId)`
+
+**Ports**
+
+#### client.getPorts(callback)
+Lists all ports that are available to use on your HP Cloud account
+
+Callback returns `f(err, ports)` where `ports` is an `Array`
+
+#### client.getPort(port, callback)
+Gets specified port
+
+Takes port or portId as an argument and returns the port in the callback
+`f(err, port)`
+
+#### client.createPort(options, callback)
+Creates a port with the options specified
+
+Options are as follows:
+
+```js
+{
+ name: 'portName', // optional
+ adminStateUp : true, // optional, The administrative status of the router. Admin-only
+ networkId : 'networkId', // required, The ID of the attached network.
+ status : 'text status', // optional, The status of the port.
+ tenantId : 'tenantId' // optional, The ID of the tenant who owns the network. Admin-only
+ macAddress: 'mac address' // optional
+ fixedIps : ['ip address1', 'ip address 2'], // optional.
+ securityGroups : ['security group1', 'security group2'] // optional, Specify one or more security group IDs.
+}
+```
+Returns the port in the callback `f(err, port)`
+
+#### client.updatePort(options, callback)
+Updates a port with the options specified
+
+Options are as follows:
+
+```js
+{
+ id : 'portId', // required
+ name: 'portName', // optional
+ adminStateUp : true, // optional, The administrative status of the router. Admin-only
+ networkId : 'networkId', // required, The ID of the attached network.
+ status : 'text status', // optional, The status of the port.
+ tenantId : 'tenantId' // optional, The ID of the tenant who owns the network. Admin-only
+ macAddress: 'mac address' // optional
+ fixedIps : ['ip address1', 'ip address 2'], // optional.
+ securityGroups : ['security group1', 'security group2'] // optional, Specify one or more security group IDs.
+}
+```
+Returns the port in the callback `f(err, port)`
+
+#### client.destroyPort(port, callback)
+Destroys the specified port
+
+Takes port or portId as an argument and returns the id of the destroyed port in the callback `f(err, portId)`
+
+**Security Groups**
+
+#### client.getSecurityGroups(callback)
+Lists all security groups that are available to use on your OpenStack account
+
+Callback returns `f(err, securityGroups)` where `securityGroups` is an `Array`
+
+#### client.getSecurityGroup(securityGroup, callback)
+Gets specified security group
+
+Takes securityGroup or securityGroupId as an argument and returns the security group in the callback
+`f(err, securityGroup)`
+
+#### client.createSecurityGroup(options, callback)
+Creates a security group with the options specified
+
+Options are as follows:
+
+```js
+{
+ name: 'securityGroupName', // required, name of security group
+ description : 'security group description', // optional, description of security group
+ tenantId : 'tenantId' // optional, The ID of the tenant who owns the security group. Admin-only
+}
+```
+Returns the created security group in the callback `f(err, securityGroup)`
+
+#### client.destroySecurityGroup(securityGroup, callback)
+Destroys the specified security group
+
+Takes securityGroup or securityGroupId as an argument and returns the id of the destroyed security group in the callback `f(err, securityGroupId)`
+
+**Security Group Rules**
+
+#### client.getSecurityGroupRules(callback)
+Lists all security group rules that are available to use on your OpenStack account
+
+Callback returns `f(err, securityGroupRules)` where `securityGroupRules` is an `Array`
+
+#### client.getSecurityGroupRule(securityGroupRule, callback)
+Gets specified security group rule
+
+Takes securityGroupRule or securityGroupRuleId as an argument and returns the security group rule in the callback
+`f(err, securityGroupRule)`
+
+#### client.createSecurityGroupRule(options, callback)
+Creates a security group rule with the options specified
+
+Options are as follows:
+
+```js
+{
+ securityGroupId: 'securityGroupId', // required, The security group ID to associate with this security group rule.
+ direction: 'ingress|egress', // required, The direction in which the security group rule is applied.
+ ethertype: 'IPv4|IPv6', // optional,
+ portRangeMin: portNumber, // optional, The minimum port number in the range that is matched by the security group rule.
+ portRangeMax: portNumber, // optional, The maximum port number in the range that is matched by the security group rule.
+ protocol: 'tcp|udp|icmp', // optional, The protocol that is matched by the security group rule
+ remoteGroupId: 'remote group id', // optional, The remote group ID to be associated with this security group rule. You can specify either this or remoteIpPrefix.
+ remoteIpPrefix: 'remote IP prefix', // optional, The remote IP prefix to be associated with this security group rule. You can specify either this or remoteGroupId.
+ tenantId : 'tenantId' // optional, The ID of the tenant who owns the security group rule. Admin-only
+}
+```
+Returns the created security group rule in the callback `f(err, securityGroupRule)`
+
+#### client.destroySecurityGroupRule(securityGroupRule, callback)
+Destroys the specified security group rule
+
+Takes securityGroupRule or securityGroupRuleId as an argument and returns the id of the destroyed security group rule in the callback `f(err, securityGroupRuleId)`
diff --git a/docs/providers/hp/storage.md b/docs/providers/hp/storage.md
new file mode 100644
index 000000000..be9208993
--- /dev/null
+++ b/docs/providers/hp/storage.md
@@ -0,0 +1,269 @@
+
+
+## Using the HP Object Storage provider
+
+* Container
+ * [Model](#container-model)
+ * [APIs](#container-apis)
+* File
+ * [Model](#file-model)
+ * [APIs](#file-apis)
+
+Creating a client is straight-forward:
+
+``` js
+ var hpStorage = pkgcloud.storage.createClient({
+ provider: 'hp',
+ username: 'your-user-name',
+ apiKey: 'your-api-key',
+ region: 'region of identity service',
+ authUrl: 'https://your-identity-service'
+ });
+```
+
+Learn about [more options for creating clients](README.md) in the HP `storage` provider.
+
+### Container Model
+
+A Container for HP Object Storage has following properties:
+
+```Javascript
+{
+ name: 'my-container',
+ count: 1, // number of files in your container
+ bytes: 12345, // size of the container in bytes
+ metadata: { // key value pairs for the container
+ // ...
+ }
+}
+```
+
+### File Model
+
+A File for HP Object Storage has the following properties:
+
+```Javascript
+{
+ name: 'my-file',
+ container: 'my-container', // may be an instance of container if provided
+ size: 12345, // size of the file in bytes
+ contentType: 'plain/text' // Mime type for the file
+ lastModified: Fri Dec 14 2012 10:16:50 GMT-0800 (PST), // Last modified date of the file
+ etag: '1234567890abcdef', // MD5 sum of the file
+ metadata: {} // optional object metadata
+}
+```
+
+### Container APIs
+
+* [`client.getContainers(function(err, containers) { })`](#clientgetcontainersfunctionerr-containers--)
+* [`client.getContainer(container, function(err, container) { })`](#clientgetcontainercontainer-functionerr-container--)
+* [`client.createContainer(container, function(err, container) { })`](#clientcreatecontainercontainer-functionerr-container--)
+* [`client.destroyContainer(container, function(err, result) { })`](#clientdestroycontainercontainer-functionerr-result--)
+* [`client.updateContainerMetadata(container, function(err, container) { })`](#clientupdatecontainermetadatacontainer-functionerr-container--)
+* [`client.removeContainerMetadata(container, metadataToRemove, function(err, container) { })`](#clientremovecontainermetadatacontainer-metadatatoremove-functionerr-container--)
+
+### Container API Details
+
+For all of the container methods, you can pass either an instance of [`container`](#container) or the container name as `container`. For example:
+
+```Javascript
+client.getContainer('my-container', function(err, container) { ... });
+```
+
+This call is functionally equivalent to:
+
+```Javascript
+var myContainer = new Container({ name: 'my-container' });
+
+client.getContainer(myContainer, function(err, container) { ... });
+```
+
+#### client.getContainers(function(err, containers) { })
+
+Retreives the containers for the current client instance as an array of [`container`](#container-model)
+
+#### client.getContainer(container, function(err, container) { })
+
+Retrieves the specified [`container`](#container-model) from the current client instance.
+
+#### client.createContainer(container, function(err, container) { })
+
+Creates a new [`container`](#container-model) with the name from argument `container`. You can optionally provide `metadata` on the request:
+
+```javascript
+client.createContainer({
+ name: 'my-container',
+ metadata: {
+ brand: 'bmw',
+ model: '335i'
+ year: 2009
+ }}, function(err, container) {
+ // ...
+ })
+```
+
+#### client.destroyContainer(container, function(err, result) { })
+
+Removes the [`container`](#container-model) from the storage account. If there are any files within the `container`, they will be deleted before removing the `container` on the client. `result` will be `true` on success.
+
+#### client.updateContainerMetadata(container, function(err, container) { })
+
+Updates the metadata on the provided [`container`](#container-model) . Currently, the `updateContainer` method only adds new metadata fields. If you need to remove specific metadata properties, you should call `client.removeContainerMetadata(...)`.
+
+```javascript
+container.metadata.color = 'red';
+client.updateContainerMetadata(container, function(err, container) {
+ // ...
+})
+```
+
+#### client.removeContainerMetadata(container, metadataToRemove, function(err, container) { })
+
+Removes the keys in the `metadataToRemove` object from the stored [`container`](#container-model) metadata.
+
+```Javascript
+client.removeContainerMetadata(container, { year: false }, function(err, c) {
+ // ...
+});
+```
+
+### File APIs
+
+* [`client.upload(options)`](#clientuploadoptions)
+* [`client.download(options, function(err, file) { })`](#clientdownloadoptions-functionerr-file--)
+* [`client.getFile(container, file, function(err, file) { })`](#clientgetfilecontainer-file-functionerr-file--)
+* [`client.getFiles(container, function(err, file) { })`](#clientgetfilescontainer-functionerr-file--)
+* [`client.removeFile(container, file, function(err, result) { })`](#clientremovefilecontainer-file-functionerr-result--)
+* [`client.updateFileMetadata(container, file, function(err, file) { })`](#clientupdatefilemetadatacontainer-file-functionerr-file--)
+
+### File API Details
+
+For all of the file methods, you can pass either an instance of [`container`](#container-model) or the container name as `container`. For example:
+
+```Javascript
+client.getFile('my-container', 'my-file', function(err, file) { ... });
+```
+
+This call is functionally equivalent to:
+
+```Javascript
+var myContainer = new Container({ name: 'my-container' });
+
+client.getFile(myContainer, 'my-file', function(err, file) { ... });
+```
+
+#### client.upload(options)
+
+Returns a `writableStream`. Upload a new file to a [`container`](#container-model). `writableStream` will emit `success` on completion of the upload, and will emit `error` on any failure. Function for `success` is `function(file) { ... }` where `file` is a [`file`](#file-model) model
+
+To upload a file, you need to provide an `options` argument:
+
+```Javascript
+var options = {
+ // required options
+ container: 'my-container', // this can be either the name or an instance of container
+ remote: 'my-file', // name of the new file
+ contentType: 'application/json', // optional mime type for the file, will attempt to auto-detect based on remote name
+ size: 1234 // size of the file
+};
+```
+
+```Javascript
+ var readStream = fs.createReadStream('a-file.txt');
+ var writeStream = client.upload({
+ container: 'a-container',
+ remote: 'remote-file-name.txt'
+ });
+
+ writeStream.on('error', function(err) {
+ // handle your error case
+ });
+
+ writeStream.on('success', function(file) {
+ // success, file will be a File model
+ });
+
+ readStream.pipe(writeStream);
+```
+
+#### client.download(options, function(err, file) { })
+
+Returns a readable stream. Download a [`file`](#file-model) from a [`container`](#container-model).
+
+To download a file, you need to provide an `options` argument:
+
+```Javascript
+var options = {
+ // required options
+ container: 'my-container', // this can be either the name or an instance of container
+ remote: 'my-file', // name of the new file
+
+ // optional, either stream or local
+ stream: myStream, // any instance of a writeable stream
+ local: '/path/to/local/file' // the path to a local file to write to
+};
+```
+
+You need not provide either `stream` or `local`. `client.download` returns a readable stream, so you can simply pipe it into your writeable stream. For example:
+
+```Javascript
+var fs = require('fs'),
+ pkgcloud = require('pkgcloud');
+
+var client = pkgcloud.providers.hp.storage.createClient({ ... });
+
+var myFile = fs.createWriteStream('/my/local/file');
+
+client.download({
+ container: 'my-container',
+ remote: 'my-file'
+}, function(err, result) {
+ // handle the download result
+})).pipe(myFile);
+```
+
+You could also download to a local file via the `local` property on `options`:
+
+```Javascript
+var pkgcloud = require('pkgcloud');
+
+var client = pkgcloud.providers.hp.storage.createClient({ ... });
+
+client.download({
+ container: 'my-container',
+ remote: 'my-file',
+ local: '/path/to/my/file'
+}, function(err, result) {
+ // handle the download result
+});
+```
+
+This is functionally equivalent to piping from an `fs.createWriteStream`, but has a simplified calling convention.
+
+#### client.getFile(container, file, function(err, file) { })
+
+Retrieves the specified [`file`](#file-model) details in the specified [`container`](#container-model) from the current client instance.
+
+#### client.getFiles(container, function(err, files) { })
+
+Retreives an array of [`file`](#file-model) for the provided [`container`](#container-model).
+
+#### client.removeFile(container, file, function(err, result) { })
+
+Removes the provided [`file`](#file-model) from the provided [`container`](#container-model).
+
+#### client.updateFileMetadata(container, file, function(err, file) { })
+
+Updates the [`file`](#file-model) metadata in the the provided [`container`](#container-model).
+
+File metadata is completely replaced with each call to updateFileMetadata. This is different than container metadata. To delete a property, just remove it from the metadata attribute on the `File` and call `updateFileMetadata`.
+```javascript
+file.metadata = {
+ campaign = '2011 website'
+};
+
+client.updateFileMetadata(file.container, file, function(err, file) {
+ // ...
+});
+```
diff --git a/docs/providers/iriscouch.md b/docs/providers/iriscouch.md
deleted file mode 100644
index 8bafdec1e..000000000
--- a/docs/providers/iriscouch.md
+++ /dev/null
@@ -1,71 +0,0 @@
-# Using IrisCouch with `pkgcloud`
-
-**In order to use IrisCOuch you will need to have created a valid account.** IrisCouch actually exposes two database services:
-
-* [Using CouchDB](#couchdb)
-* [Using Redis](#redis)
-* [All API Methods](#all-api-methods)
-
-:5000*
```Javascript
var pkgcloud = require('pkgcloud'),
- _ = require('underscore');
+ _ = require('lodash');
// create our client with your openstack credentials
var client = pkgcloud.compute.createClient({
provider: 'openstack',
username: 'your-user-name',
password: 'your-password',
+ region: 'RegionOne', //default for DevStack, might be different on other OpenStack distributions
authUrl: 'https://your-identity-service'
});
@@ -45,10 +47,10 @@ client.getFlavors(function (err, flavors) {
}
// Pick a 512MB instance flavor
- var flavor = _.findWhere(flavors, { name: '512MB Standard Instance' });
+ var flavor = _.findWhere(flavors, { name: 'm1.tiny' });
// Pick an image based on Ubuntu 12.04
- var image = _.findWhere(images, { name: 'Ubuntu 12.04 LTS (Precise Pangolin)' });
+ var image = _.findWhere(images, { name: 'cirros-0.3.2-x86_64-uec' }); // Check if this version is correct
// Create our first server
client.createServer({
@@ -77,8 +79,8 @@ function handleServerResponse(err, server) {
console.log('SERVER CREATED: ' + server.name + ', waiting for active status');
- // Wait for status: ACTIVE on our server, and then callback
- server.setWait({ status: 'ACTIVE' }, 5000, function (err) {
+ // Wait for status: RUNNING on our server, and then callback
+ server.setWait({ status: server.STATUS.running }, 5000, function (err) {
if (err) {
console.dir(err);
return;
@@ -93,4 +95,4 @@ function handleServerResponse(err, server) {
' in order to not accrue billing charges');
});
}
-```
\ No newline at end of file
+```
diff --git a/docs/providers/openstack/network.md b/docs/providers/openstack/network.md
new file mode 100644
index 000000000..3df2a0b58
--- /dev/null
+++ b/docs/providers/openstack/network.md
@@ -0,0 +1,315 @@
+##Using the OpenStack Network provider
+
+Creating a client is straight-forward:
+
+``` js
+ var openstack = pkgcloud.network.createClient({
+ provider: 'openstack', // required
+ username: 'your-user-name', // required
+ password: 'your-password', // required
+ authUrl: 'your identity service url' // required
+ });
+```
+
+**Note:** *Due to variances between OpenStack deployments, you may or may not need a `region` option.*
+
+### API Methods
+
+**Networks**
+
+#### client.getNetworks(callback)
+Lists all networks that are available to use on your OpenStack account
+
+Callback returns `f(err, networks)` where `networks` is an `Array`
+
+#### client.getNetwork(network, callback)
+Gets specified network
+
+Takes network or networkId as an argument and returns the network in the callback
+`f(err, network)`
+
+#### client.createNetwork(options, callback)
+Creates a network with the options specified
+
+Options are as follows:
+
+```js
+{
+ name: 'networkName', // optional
+ adminStateUp : true, // optional
+ shared : true, // optional, Admin only
+ tenantId : 'tenantId' // optional, Admin only
+}
+```
+Returns the network in the callback `f(err, network)`
+
+#### client.updateNetwork(options, callback)
+Updates a network with the options specified
+
+Options are as follows:
+
+```js
+{
+ id : 'networkId', // required
+ name: 'networkName', // optional
+ adminStateUp : true, // optional
+ shared : true, // optional, Admin only
+ tenantId : 'tenantId' // optional, Admin only
+}
+```
+Returns the network in the callback `f(err, network)`
+
+#### client.destroyNetwork(network, callback)
+Destroys the specified network
+
+Takes network or networkId as an argument and returns the id of the destroyed network in the callback `f(err, networkId)`
+
+**Subnets**
+
+#### client.getSubnets(callback)
+Lists all subnets that are available to use on your OpenStack account
+
+Callback returns `f(err, subnets)` where `subnets` is an `Array`
+
+#### client.getSubnet(subnet, callback)
+Gets specified subnet
+
+Takes subnet or subnetId as an argument and returns the subnet in the callback
+`f(err, subnet)`
+
+#### client.createSubnet(options, callback)
+Creates a subnet with the options specified
+
+Options are as follows:
+
+```js
+{
+ name: 'subnetName', // optional
+ networkId : 'networkId', // required, The ID of the attached network.
+ shared : true, // optional, Admin only
+ tenantId : 'tenantId' // optional, The ID of the tenant who owns the network. Admin-only
+ gatewayIp : 'gateway ip address', // optional,The gateway IP address.
+ enableDhcp : true // Set to true if DHCP is enabled and false if DHCP is disabled.
+}
+```
+Returns the subnet in the callback `f(err, subnet)`
+
+#### client.updateSubnet(options, callback)
+Updates a subnet with the options specified
+
+Options are as follows:
+
+```js
+{
+ id : 'subnetId', // required
+ name: 'subnetName', // optional
+ networkId : 'networkId', // required, The ID of the attached network.
+ shared : true, // optional, Admin only
+ tenantId : 'tenantId' // optional, The ID of the tenant who owns the network. Admin-only
+ gatewayIp : 'gateway ip address', // optional,The gateway IP address.
+ enableDhcp : true // Set to true if DHCP is enabled and false if DHCP is disabled.
+}
+```
+Returns the subnet in the callback `f(err, subnet)`
+
+#### client.destroySubnet(subnet, callback)
+Destroys the specified subnet
+
+Takes subnet or subnetId as an argument and returns the id of the destroyed subnet in the callback `f(err, subnetId)`
+
+**Ports**
+
+#### client.getPorts(callback)
+Lists all ports that are available to use on your OpenStack account
+
+Callback returns `f(err, ports)` where `ports` is an `Array`
+
+#### client.getPort(port, callback)
+Gets specified port
+
+Takes port or portId as an argument and returns the port in the callback
+`f(err, port)`
+
+#### client.createPort(options, callback)
+Creates a port with the options specified
+
+Options are as follows:
+
+```js
+{
+ name: 'portName', // optional
+ adminStateUp : true, // optional, The administrative status of the router. Admin-only
+ networkId : 'networkId', // required, The ID of the attached network.
+ status : 'text status', // optional, The status of the port.
+ tenantId : 'tenantId' // optional, The ID of the tenant who owns the network. Admin-only
+ macAddress: 'mac address' // optional
+ fixedIps : ['ip address1', 'ip address 2'], // optional.
+ securityGroups : ['security group1', 'security group2'] // optional, Specify one or more security group IDs.
+}
+```
+Returns the port in the callback `f(err, port)`
+
+#### client.updatePort(options, callback)
+Updates a port with the options specified
+
+Options are as follows:
+
+```js
+{
+ id : 'portId', // required
+ name: 'portName', // optional
+ adminStateUp : true, // optional, The administrative status of the router. Admin-only
+ networkId : 'networkId', // required, The ID of the attached network.
+ status : 'text status', // optional, The status of the port.
+ tenantId : 'tenantId' // optional, The ID of the tenant who owns the network. Admin-only
+ macAddress: 'mac address' // optional
+ fixedIps : ['ip address1', 'ip address 2'], // optional.
+ securityGroups : ['security group1', 'security group2'] // optional, Specify one or more security group IDs.
+}
+```
+Returns the port in the callback `f(err, port)`
+
+#### client.destroyPort(port, callback)
+Destroys the specified port
+
+Takes port or portId as an argument and returns the id of the destroyed port in the callback `f(err, portId)`
+
+**Security Groups**
+
+#### client.getSecurityGroups(callback)
+Lists all security groups that are available to use on your OpenStack account
+
+Callback returns `f(err, securityGroups)` where `securityGroups` is an `Array`
+
+#### client.getSecurityGroup(securityGroup, callback)
+Gets specified security group
+
+Takes securityGroup or securityGroupId as an argument and returns the security group in the callback
+`f(err, securityGroup)`
+
+#### client.createSecurityGroup(options, callback)
+Creates a security group with the options specified
+
+Options are as follows:
+
+```js
+{
+ name: 'securityGroupName', // required, name of security group
+ description : 'security group description', // optional, description of security group
+ tenantId : 'tenantId' // optional, The ID of the tenant who owns the security group. Admin-only
+}
+```
+Returns the created security group in the callback `f(err, securityGroup)`
+
+#### client.destroySecurityGroup(securityGroup, callback)
+Destroys the specified security group
+
+Takes securityGroup or securityGroupId as an argument and returns the id of the destroyed security group in the callback `f(err, securityGroupId)`
+
+**Security Group Rules**
+
+#### client.getSecurityGroupRules(callback)
+Lists all security group rules that are available to use on your OpenStack account
+
+Callback returns `f(err, securityGroupRules)` where `securityGroupRules` is an `Array`
+
+#### client.getSecurityGroupRule(securityGroupRule, callback)
+Gets specified security group rule
+
+Takes securityGroupRule or securityGroupRuleId as an argument and returns the security group rule in the callback
+`f(err, securityGroupRule)`
+
+#### client.createSecurityGroupRule(options, callback)
+Creates a security group rule with the options specified
+
+Options are as follows:
+
+```js
+{
+ securityGroupId: 'securityGroupId', // required, The security group ID to associate with this security group rule.
+ direction: 'ingress|egress', // required, The direction in which the security group rule is applied.
+ ethertype: 'IPv4|IPv6', // optional,
+ portRangeMin: portNumber, // optional, The minimum port number in the range that is matched by the security group rule.
+ portRangeMax: portNumber, // optional, The maximum port number in the range that is matched by the security group rule.
+ protocol: 'tcp|udp|icmp', // optional, The protocol that is matched by the security group rule
+ remoteGroupId: 'remote group id', // optional, The remote group ID to be associated with this security group rule. You can specify either this or remoteIpPrefix.
+ remoteIpPrefix: 'remote IP prefix', // optional, The remote IP prefix to be associated with this security group rule. You can specify either this or remoteGroupId.
+ tenantId : 'tenantId' // optional, The ID of the tenant who owns the security group rule. Admin-only
+}
+```
+Returns the created security group rule in the callback `f(err, securityGroupRule)`
+
+#### client.destroySecurityGroupRule(securityGroupRule, callback)
+Destroys the specified security group rule
+
+Takes securityGroupRule or securityGroupRuleId as an argument and returns the id of the destroyed security group rule in the callback `f(err, securityGroupRuleId)`
+
+**Security Groups**
+
+#### client.getSecurityGroups(callback)
+Lists all security groups that are available to use on your OpenStack account
+
+Callback returns `f(err, securityGroups)` where `securityGroups` is an `Array`
+
+#### client.getSecurityGroup(securityGroup, callback)
+Gets specified security group
+
+Takes securityGroup or securityGroupId as an argument and returns the security group in the callback
+`f(err, securityGroup)`
+
+#### client.createSecurityGroup(options, callback)
+Creates a security group with the options specified
+
+Options are as follows:
+
+```js
+{
+ name: 'securityGroupName', // required, name of security group
+ description : 'security group description', // optional, description of security group
+ tenantId : 'tenantId' // optional, The ID of the tenant who owns the security group. Admin-only
+}
+```
+Returns the created security group in the callback `f(err, securityGroup)`
+
+#### client.destroySecurityGroup(securityGroup, callback)
+Destroys the specified security group
+
+Takes securityGroup or securityGroupId as an argument and returns the id of the destroyed security group in the callback `f(err, securityGroupId)`
+
+**Security Group Rules**
+
+#### client.getSecurityGroupRules(callback)
+Lists all security group rules that are available to use on your OpenStack account
+
+Callback returns `f(err, securityGroupRules)` where `securityGroupRules` is an `Array`
+
+#### client.getSecurityGroupRule(securityGroupRule, callback)
+Gets specified security group rule
+
+Takes securityGroupRule or securityGroupRuleId as an argument and returns the security group rule in the callback
+`f(err, securityGroupRule)`
+
+#### client.createSecurityGroupRule(options, callback)
+Creates a security group rule with the options specified
+
+Options are as follows:
+
+```js
+{
+ securityGroupId: 'securityGroupId', // required, The security group ID to associate with this security group rule.
+ direction: 'ingress|egress', // required, The direction in which the security group rule is applied.
+ ethertype: 'IPv4|IPv6', // optional,
+ portRangeMin: portNumber, // optional, The minimum port number in the range that is matched by the security group rule.
+ portRangeMax: portNumber, // optional, The maximum port number in the range that is matched by the security group rule.
+ protocol: 'tcp|udp|icmp', // optional, The protocol that is matched by the security group rule
+ remoteGroupId: 'remote group id', // optional, The remote group ID to be associated with this security group rule. You can specify either this or remoteIpPrefix.
+ remoteIpPrefix: 'remote IP prefix', // optional, The remote IP prefix to be associated with this security group rule. You can specify either this or remoteGroupId.
+ tenantId : 'tenantId' // optional, The ID of the tenant who owns the security group rule. Admin-only
+}
+```
+Returns the created security group rule in the callback `f(err, securityGroupRule)`
+
+#### client.destroySecurityGroupRule(securityGroupRule, callback)
+Destroys the specified security group rule
+
+Takes securityGroupRule or securityGroupRuleId as an argument and returns the id of the destroyed security group rule in the callback `f(err, securityGroupRuleId)`
diff --git a/docs/providers/openstack/orchestration.md b/docs/providers/openstack/orchestration.md
new file mode 100644
index 000000000..1d3f2de1a
--- /dev/null
+++ b/docs/providers/openstack/orchestration.md
@@ -0,0 +1,158 @@
+##Using the OpenStack Orchestration provider
+
+Creating a client is straight-forward:
+
+``` js
+ var openstack = pkgcloud.orchestration.createClient({
+ provider: 'openstack', // required
+ username: 'your-user-name', // required
+ password: 'your-password', // required
+ authUrl: 'your identity service url' // required
+ });
+```
+
+**Note:** *Due to variances between OpenStack deployments, you may or may not need a `region` option.*
+
+[More options for creating clients](README.md)
+
+### API Methods
+
+## Stacks
+
+#### client.getStacks([options], callback)
+Lists all stacks that are available to use on your OpenStack account
+
+Callback returns `f(err, stacks)` where `stacks` is an `Array`
+
+#### client.createStack(options, callback)
+Creates a stack with the options specified.
+
+Options are as follows:
+
+```js
+{
+ name: 'my-stack-name', // required
+ timeout: 30, // timeout, in minutes, required
+ templateUrl: 'http://path.to.some.openstack.heat.template', // required, unless you pass template directly
+ template: { ... }, // optional, unless you don't provide templateUrl
+ parameters: { ... }, // optional parameters for the stack
+ environment: { ... }, // optional environment values for the stack
+ files: { ... }, // optional files for the stack
+}
+```
+Returns the stack in the callback `f(err, stack)`
+
+#### client.getStack(stack, callback)
+Retrieves the provided stack or stackId from the service. Callback has the signature `f(err, stack)`.
+
+Result stack-object includes following fields
+```js
+{
+ id: ,
+ name: ,
+ status: ,
+ description: ,
+ templateDescription: ,
+ statusReason: ,
+ owner: ,
+ disableRollback: ,
+ parameters: ,
+ capabilities: ,
+ notificationTopics: ,
+ timeout: ,
+ createdAt: ,
+ updatedAt: ,
+ outputs: // Outputs field has value only if outputs are defined in template and the stack has been instantiated.
+}
+```
+
+#### client.previewStack(details, callback)
+Identical to the `client.createStack()` call, except it only previews the creation, instead of actually provisioning
+the stack.
+
+Returns the previewed stack in the callback `f(err, stack)`
+
+#### client.adoptStack(details, callback)
+Identical to the `client.createStack()` call, except it requires passing `details.stackData` which is the `abandonedStack`
+value returned from `client.abandonStack()`.
+
+Returns the created stack in the callback `f(err, stack)`
+
+#### client.updateStack(stack, callback)
+
+Update the provided stack.
+
+The following values from the provided stack are updatable.
+
+```js
+{
+ name: 'my-stack-name', // required
+ timeout: 30, // timeout, in minutes, required
+ templateUrl: 'http://path.to.some.openstack.heat.template', // required, unless you pass template directly
+ template: { ... }, // optional, unless you don't provide templateUrl
+ parameters: { ... }, // optional parameters for the stack
+ environment: { ... }, // optional environment values for the stack
+ files: { ... }, // optional files for the stack
+}
+```
+
+#### client.deleteStack(stack, callback)
+
+Delete the created stack, and delete the resources. Callback is `f(err)`.
+
+#### client.abandonStack(stack, callback)
+
+Delete the created stack, but leave the resources running. Will callback with `f(err, abandonedStack)` where the
+`abandonedStack` would be passed in as an option to `client.createStack()`.
+
+#### client.getTemplate(stack, callback)
+
+Get the template for a provided stack. Will callback with `f(err, template)`.
+
+## Resources
+
+#### client.getResource(stack, resource, callback)
+
+Get the resource for a provided stack and resource or resourceName in the callback `f(err,
+resource)`
+
+#### client.getResources(stack, [options], callback)
+Get the resources for a provided stack. Callback is `f(err, resources)`.
+
+Options are as follows:
+```js
+{
+ nestedDepth: 3 // include resources from nested stacks up to nestedDepth levels of recursion
+}
+```
+
+#### client.getResourceTypes(callback)
+Get a list of valid resource types. Callback is `f(err, resourceTypes)`.
+
+#### client.getResourceSchema(resourceType, callback)
+Get the schema for a provided resourceType. Callback is `f(err, resourceSchema)`.
+
+#### client.getResourceTemplate(resourceType, callback)
+Get the template for a provided resourceType. Callback is `f(err, resourceTemplate)`.
+
+## Events
+
+#### client.getEvent(stack, resource, eventId, callback)
+Get the event for a provided stack, resource and eventId.
+
+`f(err, event)`
+
+#### client.getEvents(stack, callback)
+Get all of the events for a provided stack
+
+`f(err, events)`
+
+#### client.getResourceEvents(stack, resource, callback)
+Get all of the events for a stack and resource.
+
+`f(err, events)`
+
+## Templates
+
+#### client.validateTemplate(template, callback)
+Validates a provided template, with a callback of `f(err, template)`.
diff --git a/docs/providers/openstack/storage.md b/docs/providers/openstack/storage.md
index 0d07c9b49..14c322a6b 100644
--- a/docs/providers/openstack/storage.md
+++ b/docs/providers/openstack/storage.md
@@ -1,4 +1,4 @@
-## Using the Openstack Storage provider
+## Using the OpenStack Storage provider
* Container
* [Model](#container-model)
@@ -10,19 +10,21 @@
Creating a client is straight-forward:
``` js
- var rackspace = pkgcloud.storage.createClient({
- provider: 'openstack',
- username: 'your-user-name',
- password: 'your-password',
- authUrl: 'https://your-identity-service'
+ var openstack = pkgcloud.storage.createClient({
+ provider: 'openstack', // required
+ username: 'your-user-name', // required
+ password: 'your-password', // required
+ authUrl: 'your identity service url' // required
});
```
-Learn about [more options for creating clients](README.md) in the Openstack `storage` provider.
+**Note:** *Due to variances between OpenStack deployments, you may or may not need a `region` option.*
+
+Learn about [more options for creating clients](README.md) in the OpenStack `storage` provider.
### Container Model
-A Container for Openstack has following properties:
+A Container for OpenStack has following properties:
```Javascript
{
@@ -37,7 +39,7 @@ A Container for Openstack has following properties:
### File Model
-A File for Openstack has the following properties:
+A File for OpenStack has the following properties:
```Javascript
{
@@ -127,7 +129,7 @@ client.removeContainerMetadata(container, { year: false }, function(err, c) {
### File APIs
-* [`client.upload(options, function(err, result) { })`](#clientuploadoptions-functionerr-result--)
+* [`client.upload(options)`](#clientuploadoptions)
* [`client.download(options, function(err, file) { })`](#clientdownloadoptions-functionerr-file--)
* [`client.getFile(container, file, function(err, file) { })`](#clientgetfilecontainer-file-functionerr-file--)
* [`client.getFiles(container, function(err, file) { })`](#clientgetfilescontainer-functionerr-file--)
@@ -150,9 +152,8 @@ var myContainer = new Container({ name: 'my-container' });
client.getFile(myContainer, 'my-file', function(err, file) { ... });
```
-#### client.upload(options, function(err, result) { })
-
-Returns a writeable stream. Upload a new file to a [`container`](#container-model). `result` will be `true` on success.
+#### client.upload(options)
+Returns a `writableStream`. Upload a new file to a [`container`](#container-model). `writableStream` will emit `success` on completion of the upload, and will emit `error` on any failure. Function for `success` is `function(file) { ... }` where `file` is a [`file`](#file-model) model
To upload a file, you need to provide an `options` argument:
@@ -161,57 +162,29 @@ var options = {
// required options
container: 'my-container', // this can be either the name or an instance of container
remote: 'my-file', // name of the new file
-
- // optional, either stream or local
- stream: myStream, // any instance of a readable stream
- local: '/path/to/local/file' // a path to any local file
-
- // Other optional values
- metadata: { // provide any number of property/values for metadata
- campaign: '2012 magazine'
- },
- headers: { // optionally provide raw headers to send to cloud files
- 'content-type': 'application/json'
- }
+ contentType: 'application/json', // optional mime type for the file, will attempt to auto-detect based on remote name
+ size: 1234 // size of the file
};
```
-You need not provide either `stream` or `local`. `client.upload` returns a writeable stream, so you can simply pipe directly into it from your stream. For example:
-
```Javascript
-var fs = require('fs'),
- pkgcloud = require('pkgcloud');
-
-var client = pkgcloud.providers.rackspace.storage.createClient({ ... });
-
-var myFile = fs.createReadStream('/my/local/file');
-
-myFile.pipe(client.upload({
- container: 'my-container',
- remote: 'my-file'
-}, function(err, result) {
- // handle the upload result
-}));
-```
-
-You could also upload a local file via the `local` property on `options`:
+ var readStream = fs.createReadStream('a-file.txt');
+ var writeStream = client.upload({
+ container: 'a-container',
+ remote: 'remote-file-name.txt'
+ });
-```Javascript
-var pkgcloud = require('pkgcloud');
+ writeStream.on('error', function(err) {
+ // handle your error case
+ });
-var client = pkgcloud.providers.rackspace.storage.createClient({ ... });
+ writeStream.on('success', function(file) {
+ // success, file will be a File model
+ });
-client.upload({
- container: 'my-container',
- remote: 'my-file',
- local: '/path/to/my/file'
-}, function(err, result) {
- // handle the upload result
-});
+ readStream.pipe(writeStream);
```
-This is functionally equivalent to piping from an `fs.createReadStream`, but has a simplified calling convention.
-
#### client.download(options, function(err, file) { })
Returns a readable stream. Download a [`file`](#file-model) from a [`container`](#container-model).
@@ -236,7 +209,7 @@ You need not provide either `stream` or `local`. `client.download` returns a rea
var fs = require('fs'),
pkgcloud = require('pkgcloud');
-var client = pkgcloud.providers.rackspace.storage.createClient({ ... });
+var client = pkgcloud.providers.openstack.storage.createClient({ ... });
var myFile = fs.createWriteStream('/my/local/file');
@@ -253,7 +226,7 @@ You could also download to a local file via the `local` property on `options`:
```Javascript
var pkgcloud = require('pkgcloud');
-var client = pkgcloud.providers.rackspace.storage.createClient({ ... });
+var client = pkgcloud.providers.openstack.storage.createClient({ ... });
client.download({
container: 'my-container',
diff --git a/docs/providers/rackspace/README.md b/docs/providers/rackspace/README.md
index f47d8adf4..432771682 100644
--- a/docs/providers/rackspace/README.md
+++ b/docs/providers/rackspace/README.md
@@ -7,7 +7,10 @@ The Rackspace provider in pkgcloud supports the following services:
* [**Databases**](databases.md) (Cloud Databases)
* [**DNS**](dns.md) (Cloud DNS) *(beta)*
* [**Block Storage**](blockstorage.md) (Cloud Block Storage) *(beta)*
+* [**Orchestration**](orchestration.md) (Cloud Orchestration) *(beta)*
* [**Load Balancers**](loadbalancer.md) (Cloud Load Balancers) *(beta)*
+* [**Network**](network.md) (Cloud Networks) *(beta)*
+* [**CDN**](cdn.md) (Rackspace CDN) *(beta)*
### Getting Started with Compute
@@ -31,33 +34,40 @@ In addition to your `apiKey`, you could alternately provide your `password` as a
All of the Rackspace `createClient` calls have a few options that can be provided:
-#### authUrl
+#### region
-`authUrl` specifies the authentication endpoint used to create a token for your Rackspace client. By default, this is set to the Global endpoint: https://identity.api.rackspacecloud.com.
+`region` specifies which region of a service to use. Different services have different regions enabled, and DNS doesn't require a region at all. The current list of regions is:
-##### Authenticating against the London endpoint
+- `DFW` (Dallas, Texas)
+- `ORD` (Chicago, Illinois)
+- `IAD` (Washington, DC)
+- `LON` (London, UK)
+- `SYD` (Sydney, Austrailia)
+- `HKG` (Hong Kong, China)
+
+##### Specifying a custom region
```Javascript
var client = require('pkgcloud').compute.createClient({
provider: 'rackspace',
username: 'your-user-name',
apiKey: 'your-api-key',
- authUrl: 'https://lon.identity.api.rackspacecloud.com'
+ region: 'ORD'
});
```
-#### region
+#### authUrl
-`region` specifies which region of a service to use. For example, when you authenticate with the global endpoint for compute, you have the option of either `DFW`, `ORD`, or `SYD`. The default region is `DFW`. Previous pkgcloud versions did not let you specify which region you used, so all calls were against `DFW`.
+`authUrl` specifies the authentication endpoint used to create a token for your Rackspace client. By default, this is set to the Global endpoint: https://identity.api.rackspacecloud.com.
-##### Specifying a custom region
+##### Authenticating against the London endpoint
```Javascript
var client = require('pkgcloud').compute.createClient({
provider: 'rackspace',
username: 'your-user-name',
apiKey: 'your-api-key',
- region: 'ORD'
+ authUrl: 'https://lon.identity.api.rackspacecloud.com'
});
```
diff --git a/docs/providers/rackspace/blockstorage.md b/docs/providers/rackspace/blockstorage.md
index cb59ef682..32ff08808 100644
--- a/docs/providers/rackspace/blockstorage.md
+++ b/docs/providers/rackspace/blockstorage.md
@@ -1,4 +1,4 @@
-##Using the Rackspace Block Storage provider
+## Using the Rackspace Block Storage provider
#### BETA - This API may change as additional providers for block storage are added to pkgcloud
@@ -6,9 +6,12 @@ Creating a block-storage client is straight-forward:
``` js
var rackspace = pkgcloud.blockstorage.createClient({
- provider: 'rackspace',
- username: 'your-user-name',
- apiKey: 'your-api-key'
+ provider: 'rackspace', // required
+ username: 'your-user-name', // required
+ apiKey: 'your-api-key', // required
+ region: 'IAD', // required, regions can be found at
+ // http://www.rackspace.com/knowledge_center/article/about-regions
+ useInternal: false // optional, use to talk to serviceNet from a Rackspace machine
});
```
diff --git a/docs/providers/rackspace/cdn.md b/docs/providers/rackspace/cdn.md
new file mode 100644
index 000000000..9596a4b86
--- /dev/null
+++ b/docs/providers/rackspace/cdn.md
@@ -0,0 +1,92 @@
+## Using the Rackspace CDN provider
+
+Creating a client is straight-forward:
+
+``` js
+ var rackspace = pkgcloud.cdn.createClient({
+ provider: 'rackspace', // required
+ username: 'your-user-name', // required
+ password: 'your-password', // required
+ authUrl: 'your identity service url' // required
+ });
+```
+
+[More options for creating clients](README.md)
+
+### API Methods
+
+## Base
+
+#### `client.getHomeDocument(function (err, homeDocument) { })`
+Retrieves the home document, which allows you to navigate the remainder of the
+API. Callback is `f(err, homeDocument)` where `homeDocument` is an `Object`.
+
+#### `client.getPing(function (err) { })`
+Pings the server for any errors. Callback is `f(err)`.
+
+## Services
+
+#### client.createService(options, callback)
+Creates a service with the options specified.
+
+Options are as follows:
+
+```js
+{
+ name: 'my-service-name', // name of service, required
+ domains: [ ... ], // list of domains for service, required
+ origins: [ ... ], // list of origins for service, required
+ caching: [ ... ], // list of caching rules for service, optional
+ restrictions: [ ... ], // list of restrictions on where service can be accessed from, optional
+ flavorId: 'cdn' // ID of CDN flavor to use, required
+}
+```
+Callback is `f(err, service)`, where `service` is the created service.
+
+#### client.getServices([options], callback)
+
+Lists all created services. Callback is `f(err, services)` where `services`
+is an `Array`.
+
+#### client.getService(service, callback)
+
+Retrieve the created service for the provided service or serviceName. Callback is `f(err,
+service)`.
+
+#### client.updateService(service, callback)
+
+Update the provided service.
+
+The following values from the provided service are updatable.
+
+```js
+{
+ name: 'my-service-name', // name of service, required
+ domains: [ ... ], // list of domains for service, required
+ origins: [ ... ], // list of origins for service, required
+ flavorId: 'cdn' // ID of CDN flavor to use, required
+}
+```
+
+#### client.deleteService(service, callback)
+
+Delete the created service. Callback is `f(err)`.
+
+## Service Assets
+
+#### client.deleteServiceCachedAssets(service, assetUrl, callback)
+
+Purge the service's cached asset (if `assetUrl` is specified) or all cached
+assets (if `assetUrl` is not specified). Callback is `f(err)`.
+
+## Flavors
+
+#### client.getFlavors(options, callback)
+
+Lists all available CDN flavors. Callback is `f(err, flavors)` where
+`flavors` is an Array.
+
+#### client.getFlavor(flavor, callback)
+
+Retrieve the CDN flavor for a provided flavor or flavorId. Callback is `f(err,
+flavor)`.
diff --git a/docs/providers/rackspace/compute.md b/docs/providers/rackspace/compute.md
index 25bedbe4c..0a3ae0934 100644
--- a/docs/providers/rackspace/compute.md
+++ b/docs/providers/rackspace/compute.md
@@ -1,4 +1,4 @@
-##Using the Rackspace Compute provider
+## Using the Rackspace Compute provider
As of the `v0.8` release of `pkgcloud`, the Compute provider uses Next Generation Cloud Servers, meaning you'll need to use a version <=0.7.x to use First Generation Cloud Servers.
@@ -6,9 +6,12 @@ Creating a client is straight-forward:
``` js
var rackspace = pkgcloud.compute.createClient({
- provider: 'rackspace',
- username: 'your-user-name',
- apiKey: 'your-api-key'
+ provider: 'rackspace', // required
+ username: 'your-user-name', // required
+ apiKey: 'your-api-key', // required
+ region: 'IAD', // required, regions can be found at
+ // http://www.rackspace.com/knowledge_center/article/about-regions
+ useInternal: false // optional, use to talk to serviceNet from a Rackspace machine
});
```
@@ -61,6 +64,27 @@ Options include:
```
Returns callback with a confirmation
+#### client.rebuildServer(server, options, callback)
+Rebuilds the specifed server with options
+
+Options include:
+
+```js
+{
+ image: '45a01744-2bcf-4a23-ae88-63317f768a2f', // required; image ID or instance of pkgcloud.core.compute.Image
+ accessIPv4: '123.45.67.89' // optional; IPv4 address of server
+ accessIPv6: 'f0::09', // optional; IPv6 address of server
+ adminPass: 'foobar', // optional; administrator password for the server
+ metadata: { group: 'webservers' }, // optional; metadata key/value pairs
+ personality: [ { path: '/etc/banner.txt', contents: 'ICAgICAgDQo' } ], // optional; personality files - path and contents
+ 'OS-DCF:diskConfig': 'AUTO' // optional; disk configuration value ("AUTO" | "MANUAL")
+}
+```
+Returns callback with a confirmation
+
+**Note about backwards compatiblity:**
+For backwards compatibility, it is also possible to pass an image ID or instance of `pkgcloud.core.compute.Image` as the value of the `options` argument.
+
#### client.getVersion(callback)
Get the current version of the api returned in a callback `f(err, version)`
@@ -139,4 +163,4 @@ Attaches the provided `volume` to the `server`. `volume` may either be the `volu
Detaches the provided `attachment` from the server. `attachment` may either be the `attachmentId` or an object with `attachmentId` as a property. If the `volume` is mounted this call will return an err.
-`f(err)`
\ No newline at end of file
+`f(err)`
diff --git a/docs/providers/rackspace/databases.md b/docs/providers/rackspace/databases.md
index 6ad70fff9..abe0c35a2 100644
--- a/docs/providers/rackspace/databases.md
+++ b/docs/providers/rackspace/databases.md
@@ -1,12 +1,15 @@
-##Using the Rackspace Database provider
+## Using the Rackspace Database provider
Creating a client is straight-forward:
``` js
var rackspace = pkgcloud.database.createClient({
- provider: 'rackspace',
- username: 'your-user-name',
- apiKey: 'your-api-key'
+ provider: 'rackspace', // required
+ username: 'your-user-name', // required
+ apiKey: 'your-api-key', // required
+ region: 'IAD', // required, regions can be found at
+ // http://www.rackspace.com/knowledge_center/article/about-regions
+ useInternal: false // optional, use to talk to serviceNet from a Rackspace machine
});
```
@@ -87,4 +90,32 @@ A user object is defined as follows:
```
**note**: If creating multiple users, the instance provided must be the same for
-both.
\ No newline at end of file
+both.
+
+#### client.listRootStatus(instance, callback)
+
+Checks if the root user is enabled for the passed instance.
+
+```js
+client.listRootStatus(instance, function (err, result) {
+ // handle err
+ console.log(result); // => { rootEnabled: true }
+});
+```
+
+#### client.enableRootUser(instance, callback)
+
+Enables the root user for the passed instance.
+
+```js
+client.enableRootUser(instance, function (err, result) {
+ // handle err
+ console.log(result);
+ // => {
+ // => user: {
+ // => name: 'root',
+ // => password: ''
+ // => }
+ // => }
+});
+```
diff --git a/docs/providers/rackspace/dns.md b/docs/providers/rackspace/dns.md
index 58d6349cc..255be6f2b 100644
--- a/docs/providers/rackspace/dns.md
+++ b/docs/providers/rackspace/dns.md
@@ -10,10 +10,13 @@
Creating a client is straight-forward:
``` js
+ // Rackspace Cloud DNS is a global service, so no region is required
+
var rackspace = pkgcloud.dns.createClient({
- provider: 'rackspace',
- username: 'your-user-name',
- apiKey: 'your-api-key'
+ provider: 'rackspace', // required
+ username: 'your-user-name', // required
+ apiKey: 'your-api-key', // required
+ useInternal: false // optional, use to talk to serviceNet from a Rackspace machine
});
```
diff --git a/docs/providers/rackspace/getting-started-compute.md b/docs/providers/rackspace/getting-started-compute.md
index 9ec9832a7..4102d43e6 100644
--- a/docs/providers/rackspace/getting-started-compute.md
+++ b/docs/providers/rackspace/getting-started-compute.md
@@ -16,16 +16,17 @@ Don't have `npm` or `node` yet? [Get it now](http://nodejs.org/download).
In this example, we're going to create a Rackspace compute client, create two servers, and then output their details to the command line.
-*Note: We're going to use [underscore.js](http://underscorejs.org) for some convenience functions.*
+*Note: We're going to use [lodash.js](https://lodash.com) for some convenience functions.*
```Javascript
var pkgcloud = require('pkgcloud'),
- _ = require('underscore');
+ _ = require('lodash');
// create our client with your rackspace credentials
var client = pkgcloud.providers.rackspace.compute.createClient({
username: 'your-username',
- apiKey: 'your-api-key'
+ apiKey: 'your-api-key',
+ region: 'your-region' // see http://www.rackspace.com/knowledge_center/article/about-regions
});
// first we're going to get our flavors
@@ -91,4 +92,4 @@ function handleServerResponse(err, server) {
' in order to not accrue billing charges');
});
}
-```
\ No newline at end of file
+```
diff --git a/docs/providers/rackspace/loadbalancer.md b/docs/providers/rackspace/loadbalancer.md
index 20ccf5cc0..b02a18c1b 100644
--- a/docs/providers/rackspace/loadbalancer.md
+++ b/docs/providers/rackspace/loadbalancer.md
@@ -1,4 +1,4 @@
-##Using the Rackspace Load Balancer provider
+## Using the Rackspace Load Balancer provider
#### BETA - This API may change as additional providers for load balancers are added to pkgcloud
@@ -28,9 +28,12 @@ Creating a loadbalancer client is straight-forward:
``` js
var rackspace = pkgcloud.loadbalancer.createClient({
- provider: 'rackspace',
- username: 'your-user-name',
- apiKey: 'your-api-key'
+ provider: 'rackspace', // required
+ username: 'your-user-name', // required
+ apiKey: 'your-api-key', // required
+ region: 'IAD', // required, regions can be found at
+ // http://www.rackspace.com/knowledge_center/article/about-regions
+ useInternal: false // optional, use to talk to serviceNet from a Rackspace machine
});
```
diff --git a/docs/providers/rackspace/network.md b/docs/providers/rackspace/network.md
new file mode 100644
index 000000000..104d1cb6c
--- /dev/null
+++ b/docs/providers/rackspace/network.md
@@ -0,0 +1,247 @@
+## Using the Rackspace Network provider
+
+Creating a client is straight-forward:
+
+``` js
+ var rackspace = pkgcloud.network.createClient({
+ provider: 'rackspace', // required
+ username: 'your-user-name', // required
+ apiKey: 'your-api-key', // required
+ region: 'IAD', // required, regions can be found at
+ // http://www.rackspace.com/knowledge_center/article/about-regions
+ useInternal: false // optional, use to talk to serviceNet from a Rackspace machine
+ });
+```
+
+[More options for creating clients](README.md)
+
+### API Methods
+
+## Networks
+
+#### client.getNetworks(callback)
+Lists all networks that are available to use on your HP Cloud account
+
+Callback returns `f(err, networks)` where `networks` is an `Array`
+
+#### client.getNetwork(network, callback)
+Gets specified network
+
+Takes network or networkId as an argument and returns the network in the callback
+`f(err, network)`
+
+#### client.createNetwork(options, callback)
+Creates a network with the options specified
+
+Options are as follows:
+
+```js
+{
+ name: 'networkName', // optional
+ adminStateUp : true, // optional
+ shared : true, // optional, Admin only
+ tenantId : 'tenantId' // optional, Admin only
+}
+```
+Returns the network in the callback `f(err, network)`
+
+#### client.updateNetwork(options, callback)
+Updates a network with the options specified
+
+Options are as follows:
+
+```js
+{
+ id : 'networkId', // required
+ name: 'networkName', // optional
+ adminStateUp : true, // optional
+ shared : true, // optional, Admin only
+ tenantId : 'tenantId' // optional, Admin only
+}
+```
+Returns the network in the callback `f(err, network)`
+
+#### client.destroyNetwork(network, callback)
+Destroys the specified network
+
+Takes network or networkId as an argument and returns the id of the destroyed network in the callback `f(err, networkId)`
+
+## Subnets
+
+#### client.getSubnets(callback)
+Lists all subnets that are available to use on your HP Cloud account
+
+Callback returns `f(err, subnets)` where `subnets` is an `Array`
+
+#### client.getSubnet(subnet, callback)
+Gets specified subnet
+
+Takes subnet or subnetId as an argument and returns the subnet in the callback
+`f(err, subnet)`
+
+#### client.createSubnet(options, callback)
+Creates a subnet with the options specified
+
+Options are as follows:
+
+```js
+{
+ name: 'subnetName', // optional
+ networkId : 'networkId', // required, The ID of the attached network.
+ shared : true, // optional, Admin only
+ tenantId : 'tenantId' // optional, The ID of the tenant who owns the network. Admin-only
+ gatewayIp : 'gateway ip address', // optional,The gateway IP address.
+ enableDhcp : true // Set to true if DHCP is enabled and false if DHCP is disabled.
+}
+```
+Returns the subnet in the callback `f(err, subnet)`
+
+#### client.updateSubnet(options, callback)
+Updates a subnet with the options specified
+
+Options are as follows:
+
+```js
+{
+ id : 'subnetId', // required
+ name: 'subnetName', // optional
+ networkId : 'networkId', // required, The ID of the attached network.
+ shared : true, // optional, Admin only
+ tenantId : 'tenantId' // optional, The ID of the tenant who owns the network. Admin-only
+ gatewayIp : 'gateway ip address', // optional,The gateway IP address.
+ enableDhcp : true // Set to true if DHCP is enabled and false if DHCP is disabled.
+}
+```
+Returns the subnet in the callback `f(err, subnet)`
+
+#### client.destroySubnet(subnet, callback)
+Destroys the specified subnet
+
+Takes subnet or subnetId as an argument and returns the id of the destroyed subnet in the callback `f(err, subnetId)`
+
+## Ports
+
+#### client.getPorts(callback)
+Lists all ports that are available to use on your HP Cloud account
+
+Callback returns `f(err, ports)` where `ports` is an `Array`
+
+#### client.getPort(port, callback)
+Gets specified port
+
+Takes port or portId as an argument and returns the port in the callback
+`f(err, port)`
+
+#### client.createPort(options, callback)
+Creates a port with the options specified
+
+Options are as follows:
+
+```js
+{
+ name: 'portName', // optional
+ adminStateUp : true, // optional, The administrative status of the router. Admin-only
+ networkId : 'networkId', // required, The ID of the attached network.
+ status : 'text status', // optional, The status of the port.
+ tenantId : 'tenantId' // optional, The ID of the tenant who owns the network. Admin-only
+ macAddress: 'mac address' // optional
+ fixedIps : ['ip address1', 'ip address 2'], // optional.
+ securityGroups : ['security group1', 'security group2'] // optional, Specify one or more security group IDs.
+}
+```
+Returns the port in the callback `f(err, port)`
+
+#### client.updatePort(options, callback)
+Updates a port with the options specified
+
+Options are as follows:
+
+```js
+{
+ id : 'portId', // required
+ name: 'portName', // optional
+ adminStateUp : true, // optional, The administrative status of the router. Admin-only
+ networkId : 'networkId', // required, The ID of the attached network.
+ status : 'text status', // optional, The status of the port.
+ tenantId : 'tenantId' // optional, The ID of the tenant who owns the network. Admin-only
+ macAddress: 'mac address' // optional
+ fixedIps : ['ip address1', 'ip address 2'], // optional.
+ securityGroups : ['security group1', 'security group2'] // optional, Specify one or more security group IDs.
+}
+```
+Returns the port in the callback `f(err, port)`
+
+#### client.destroyPort(port, callback)
+Destroys the specified port
+
+Takes port or portId as an argument and returns the id of the destroyed port in the callback `f(err, portId)`
+
+**Security Groups**
+
+#### client.getSecurityGroups(callback)
+Lists all security groups that are available to use on your OpenStack account
+
+Callback returns `f(err, securityGroups)` where `securityGroups` is an `Array`
+
+#### client.getSecurityGroup(securityGroup, callback)
+Gets specified security group
+
+Takes securityGroup or securityGroupId as an argument and returns the security group in the callback
+`f(err, securityGroup)`
+
+#### client.createSecurityGroup(options, callback)
+Creates a security group with the options specified
+
+Options are as follows:
+
+```js
+{
+ name: 'securityGroupName', // required, name of security group
+ description : 'security group description', // optional, description of security group
+ tenantId : 'tenantId' // optional, The ID of the tenant who owns the security group. Admin-only
+}
+```
+Returns the created security group in the callback `f(err, securityGroup)`
+
+#### client.destroySecurityGroup(securityGroup, callback)
+Destroys the specified security group
+
+Takes securityGroup or securityGroupId as an argument and returns the id of the destroyed security group in the callback `f(err, securityGroupId)`
+
+**Security Group Rules**
+
+#### client.getSecurityGroupRules(callback)
+Lists all security group rules that are available to use on your OpenStack account
+
+Callback returns `f(err, securityGroupRules)` where `securityGroupRules` is an `Array`
+
+#### client.getSecurityGroupRule(securityGroupRule, callback)
+Gets specified security group rule
+
+Takes securityGroupRule or securityGroupRuleId as an argument and returns the security group rule in the callback
+`f(err, securityGroupRule)`
+
+#### client.createSecurityGroupRule(options, callback)
+Creates a security group rule with the options specified
+
+Options are as follows:
+
+```js
+{
+ securityGroupId: 'securityGroupId', // required, The security group ID to associate with this security group rule.
+ direction: 'ingress|egress', // required, The direction in which the security group rule is applied.
+ ethertype: 'IPv4|IPv6', // optional,
+ portRangeMin: portNumber, // optional, The minimum port number in the range that is matched by the security group rule.
+ portRangeMax: portNumber, // optional, The maximum port number in the range that is matched by the security group rule.
+ protocol: 'tcp|udp|icmp', // optional, The protocol that is matched by the security group rule
+ remoteGroupId: 'remote group id', // optional, The remote group ID to be associated with this security group rule. You can specify either this or remoteIpPrefix.
+ remoteIpPrefix: 'remote IP prefix', // optional, The remote IP prefix to be associated with this security group rule. You can specify either this or remoteGroupId.
+ tenantId : 'tenantId' // optional, The ID of the tenant who owns the security group rule. Admin-only
+}
+```
+Returns the created security group rule in the callback `f(err, securityGroupRule)`
+
+#### client.destroySecurityGroupRule(securityGroupRule, callback)
+Destroys the specified security group rule
+
+Takes securityGroupRule or securityGroupRuleId as an argument and returns the id of the destroyed security group rule in the callback `f(err, securityGroupRuleId)`
diff --git a/docs/providers/rackspace/orchestration.md b/docs/providers/rackspace/orchestration.md
new file mode 100644
index 000000000..9bb9c37b1
--- /dev/null
+++ b/docs/providers/rackspace/orchestration.md
@@ -0,0 +1,137 @@
+## Using the Rackspace Orchestration provider
+
+Creating a client is straight-forward:
+
+``` js
+ var rackspace = pkgcloud.orchestration.createClient({
+ provider: 'rackspace', // required
+ username: 'your-user-name', // required
+ apiKey: 'your-api-key', // required
+ region: 'IAD', // required, regions can be found at
+ // http://www.rackspace.com/knowledge_center/article/about-regions
+ useInternal: false // optional, use to talk to serviceNet from a Rackspace machine
+ });
+```
+
+[More options for creating clients](README.md)
+
+### API Methods
+
+## Stacks
+
+#### client.getStacks([options], callback)
+Lists all stacks that are available to use on your Rackspace account
+
+Callback returns `f(err, stacks)` where `stacks` is an `Array`
+
+#### client.createStack(options, callback)
+Creates a stack with the options specified.
+
+Options are as follows:
+
+```js
+{
+ name: 'my-stack-name', // required
+ timeout: 30, // timeout, in minutes, required
+ templateUrl: 'http://path.to.some.openstack.heat.template', // required, unless you pass template directly
+ template: { ... }, // optional, unless you don't provide templateUrl
+ parameters: { ... }, // optional parameters for the stack
+ environment: { ... }, // optional environment values for the stack
+ files: { ... }, // optional files for the stack
+}
+```
+Returns the stack in the callback `f(err, stack)`
+
+#### client.getStack(stack, callback)
+Retrieves the provided stack or stackId from the service. Callback has the signature `f(err, stack)`.
+
+#### client.previewStack(details, callback)
+Identical to the `client.createStack()` call, except it only previews the creation, instead of actually provisioning
+the stack.
+
+Returns the previewed stack in the callback `f(err, stack)`
+
+#### client.adoptStack(details, callback)
+Identical to the `client.createStack()` call, except it requires passing `details.stackData` which is the `abandonedStack`
+value returned from `client.abandonStack()`.
+
+Returns the created stack in the callback `f(err, stack)`
+
+#### client.updateStack(stack, callback)
+
+Update the provided stack.
+
+The following values from the provided stack are updatable.
+
+```js
+{
+ name: 'my-stack-name', // required
+ timeout: 30, // timeout, in minutes, required
+ templateUrl: 'http://path.to.some.openstack.heat.template', // required, unless you pass template directly
+ template: { ... }, // optional, unless you don't provide templateUrl
+ parameters: { ... }, // optional parameters for the stack
+ environment: { ... }, // optional environment values for the stack
+ files: { ... }, // optional files for the stack
+}
+```
+
+#### client.deleteStack(stack, callback)
+
+Delete the created stack, and delete the resources. Callback is `f(err)`.
+
+#### client.abandonStack(stack, callback)
+
+Delete the created stack, but leave the resources running. Will callback with `f(err, abandonedStack)` where the
+`abandonedStack` would be passed in as an option to `client.createStack()`.
+
+#### client.getTemplate(stack, callback)
+
+Get the template for a provided stack. Will callback with `f(err, template)`.
+
+## Resources
+
+#### client.getResource(stack, resource, callback)
+
+Get the resource for a provided stack and resource or resourceName in the callback `f(err,
+resource)`
+
+#### client.getResources(stack, [options], callback)
+Get the resources for a provided stack. Callback is `f(err, resources)`.
+
+Options are as follows:
+```js
+{
+ nestedDepth: 3 // include resources from nested stacks up to nestedDepth levels of recursion
+}
+```
+
+#### client.getResourceTypes(callback)
+Get a list of valid resource types. Callback is `f(err, resourceTypes)`.
+
+#### client.getResourceSchema(resourceType, callback)
+Get the schema for a provided resourceType. Callback is `f(err, resourceSchema)`.
+
+#### client.getResourceTemplate(resourceType, callback)
+Get the template for a provided resourceType. Callback is `f(err, resourceTemplate)`.
+
+## Events
+
+#### client.getEvent(stack, resource, eventId, callback)
+Get the event for a provided stack, resource and eventId.
+
+`f(err, event)`
+
+#### client.getEvents(stack, callback)
+Get all of the events for a provided stack
+
+`f(err, events)`
+
+#### client.getResourceEvents(stack, resource, callback)
+Get all of the events for a stack and resource.
+
+`f(err, events)`
+
+## Templates
+
+#### client.validateTemplate(template, callback)
+Validates a provided template, with a callback of `f(err, template)`.
\ No newline at end of file
diff --git a/docs/providers/rackspace/storage.md b/docs/providers/rackspace/storage.md
index 00c076454..fc5b935c9 100644
--- a/docs/providers/rackspace/storage.md
+++ b/docs/providers/rackspace/storage.md
@@ -11,14 +11,16 @@ Creating a client is straight-forward:
``` js
var rackspace = pkgcloud.storage.createClient({
- provider: 'rackspace',
- username: 'your-rax-user-name',
- apiKey: 'your-rax-api-key',
- region: 'IAD'
+ provider: 'rackspace', // required
+ username: 'your-user-name', // required
+ apiKey: 'your-api-key', // required
+ region: 'IAD', // required, regions can be found at
+ // http://www.rackspace.com/knowledge_center/article/about-regions
+ useInternal: false // optional, use to talk to serviceNet from a Rackspace machine
});
```
-Learn about [more options for creating clients](README.md) in the Openstack `storage` provider. `region` parameter can be any [Rackspace Region](http://www.rackspace.com/about/datacenters/).
+Learn about [more options for creating clients](README.md) in the OpenStack `storage` provider. `region` parameter can be any [Rackspace Region](http://www.rackspace.com/about/datacenters/).
### Container Model
@@ -127,7 +129,7 @@ client.removeContainerMetadata(container, { year: false }, function(err, c) {
### File APIs
-* [`client.upload(options, function(err, result) { })`](#clientuploadoptions-functionerr-result--)
+* [`client.upload(options)`](#clientuploadoptions)
* [`client.download(options, function(err, file) { })`](#clientdownloadoptions-functionerr-file--)
* [`client.getFile(container, file, function(err, file) { })`](#clientgetfilecontainer-file-functionerr-file--)
* [`client.getFiles(container, [options], function(err, file) { })`](#clientgetfilescontainer-options-functionerr-files--)
@@ -150,9 +152,8 @@ var myContainer = new Container({ name: 'my-container' });
client.getFile(myContainer, 'my-file', function(err, file) { ... });
```
-#### client.upload(options, function(err, result) { })
-
-Returns a writeable stream. Upload a new file to a [`container`](#container-model). `result` will be `true` on success.
+#### client.upload(options)
+Returns a `writableStream`. Upload a new file to a [`container`](#container-model). `writableStream` will emit `success` on completion of the upload, and will emit `error` on any failure. Function for `success` is `function(file) { ... }` where `file` is a [`file`](#file-model) model
To upload a file, you need to provide an `options` argument:
@@ -161,57 +162,29 @@ var options = {
// required options
container: 'my-container', // this can be either the name or an instance of container
remote: 'my-file', // name of the new file
-
- // optional, either stream or local
- stream: myStream, // any instance of a readable stream
- local: '/path/to/local/file' // a path to any local file
-
- // Other optional values
- metadata: { // provide any number of property/values for metadata
- campaign: '2012 magazine'
- },
- headers: { // optionally provide raw headers to send to cloud files
- 'content-type': 'application/json'
- }
+ contentType: 'application/json', // optional mime type for the file, will attempt to auto-detect based on remote name
+ size: 1234 // size of the file
};
```
-You need not provide either `stream` or `local`. `client.upload` returns a writeable stream, so you can simply pipe directly into it from your stream. For example:
-
```Javascript
-var fs = require('fs'),
- pkgcloud = require('pkgcloud');
-
-var client = pkgcloud.providers.rackspace.storage.createClient({ ... });
-
-var myFile = fs.createReadStream('/my/local/file');
-
-myFile.pipe(client.upload({
- container: 'my-container',
- remote: 'my-file'
-}, function(err, result) {
- // handle the upload result
-}));
-```
-
-You could also upload a local file via the `local` property on `options`:
+ var readStream = fs.createReadStream('a-file.txt');
+ var writeStream = client.upload({
+ container: 'a-container',
+ remote: 'remote-file-name.txt'
+ });
-```Javascript
-var pkgcloud = require('pkgcloud');
+ writeStream.on('error', function(err) {
+ // handle your error case
+ });
-var client = pkgcloud.providers.rackspace.storage.createClient({ ... });
+ writeStream.on('success', function(file) {
+ // success, file will be a File model
+ });
-client.upload({
- container: 'my-container',
- remote: 'my-file',
- local: '/path/to/my/file'
-}, function(err, result) {
- // handle the upload result
-});
+ readStream.pipe(writeStream);
```
-This is functionally equivalent to piping from an `fs.createReadStream`, but has a simplified calling convention.
-
#### client.download(options, function(err, file) { })
Returns a readable stream. Download a [`file`](#file-model) from a [`container`](#container-model).
diff --git a/docs/providers/redistogo.md b/docs/providers/redistogo.md
deleted file mode 100644
index c6e1737a1..000000000
--- a/docs/providers/redistogo.md
+++ /dev/null
@@ -1,43 +0,0 @@
-# Using RedisToGo with `pkgcloud`
-
-``` js
- var client = pkgcloud.database.createClient({
- provider: 'redistogo',
- username: "bob",
- password: "1234"
- });
-
- //
- // Create a redis
- //
- client.create({
- plan: "nano",
- }, function (err, result) {
- //
- // Log the result
- //
- console.log(err, result);
-
- //
- // Get the same redis we just created
- //
- client.get(result.id, function (err, result) {
- //
- // Show the details of the database we just created
- //
- console.log(err, result);
- client.remove(result.id, function (err, result) {
- //
- // Ensure it was removed correctly.
- //
- console.log(err, result);
- });
- });
- });
-```
-
-The `client` instance returned by `pkgcloud.database.createClient` has the following methods for RedisToGo:
-
-* `client.create(options, callback)`
-* `client.remove(id, callback)`
-* `client.get(id, callback)`
\ No newline at end of file
diff --git a/docs/vocabulary.md b/docs/vocabulary.md
index f6c2d6a33..286440fba 100644
--- a/docs/vocabulary.md
+++ b/docs/vocabulary.md
@@ -8,11 +8,11 @@ When considering all IaaS providers as a whole, their vocabulary is somewhat dis
pkgcloud
OpenStack
- Joyent
Amazon
Azure
Rackspace
DigitalOcean
+ HP
Server
@@ -22,6 +22,7 @@ When considering all IaaS providers as a whole, their vocabulary is somewhat dis
Virtual Machine
Server
Droplet
+ Server
Image
@@ -31,6 +32,7 @@ When considering all IaaS providers as a whole, their vocabulary is somewhat dis
Image
Image
Image
+ Image
Flavor
@@ -40,6 +42,7 @@ When considering all IaaS providers as a whole, their vocabulary is somewhat dis
RoleSize
Flavor
Size
+ Flavor
diff --git a/examples/blockstorage/oneandone.js b/examples/blockstorage/oneandone.js
new file mode 100644
index 000000000..6952da3bd
--- /dev/null
+++ b/examples/blockstorage/oneandone.js
@@ -0,0 +1,67 @@
+/**
+ * Created by Ali Bazlamit on 9/6/2017.
+ */
+var pkgcloud = require('pkgcloud'),
+ _ = require('lodash');
+
+(function() {
+
+ var config = {
+ token: process.env.OAO_TOKEN,
+ };
+
+ // create our client with your 1&1 credentials
+ var computeClient = pkgcloud.providers.oneandone.compute.createClient(config);
+ var blockStorageClient = pkgcloud.providers.oneandone.blockstorage.createClient(config);
+
+ // first we're going to get our flavors
+ computeClient.getFlavors(function (err, flavors) {
+ if (err) {
+ console.dir(err);
+ return;
+ }
+
+ // then get our base images
+ computeClient.getImages(function (err, images) {
+ if (err) {
+ console.dir(err);
+ return;
+ }
+
+ // Pick a medium instance flavor
+ var flavor = _.findWhere(flavors, { name: 'M' });
+
+ // Pick an image based on Ubuntu 14.04
+ var image = _.findWhere(images, { name: 'centos6-32std' });
+
+ // Create our first server
+ computeClient.createServer({
+ name: 'server1',
+ image: image,
+ flavor: flavor.id
+ }, function(err, server) {
+ if (err) {
+ console.error(err);
+ return;
+ }
+
+ // Wait for our server to start up
+ server.setWait({ status: server.STATUS.running }, 5000, function (err) {
+ if (err) {
+ console.dir(err);
+ return;
+ }
+
+ // create a block storage snapshot
+ blockStorageClient.createSnapshot(server, function(err, snapshot) {
+ if (err) {
+ console.error(err);
+ return;
+ }
+ console.log(snapshot);
+ });
+ });
+ });
+ });
+ });
+})();
diff --git a/examples/blockstorage/rackspace.js b/examples/blockstorage/rackspace.js
index 7ba6d4b07..7d8752159 100644
--- a/examples/blockstorage/rackspace.js
+++ b/examples/blockstorage/rackspace.js
@@ -1,5 +1,5 @@
var pkgcloud = require('pkgcloud'),
- _ = require('underscore');
+ _ = require('lodash');
(function() {
diff --git a/examples/cdn/rackspace.js b/examples/cdn/rackspace.js
new file mode 100644
index 000000000..771e97c17
--- /dev/null
+++ b/examples/cdn/rackspace.js
@@ -0,0 +1,95 @@
+var pkgcloud = require('../../lib/pkgcloud');
+
+var rackspace = pkgcloud.cdn.createClient({
+ provider: 'rackspace',
+ username: 'rackspace_id',
+ apiKey: '1234567890poiiuytrrewq'
+});
+
+// Basic flavor and service operations. Please note that due to the asynchronous nature of Javascript programming,
+// the code sample below will cause unexpected results if run as-a-whole and are meant for documentation
+// and illustration purposes.
+
+// 1 -- to list all available CDN flavors
+rackspace.getFlavors(function (err, flavors) {
+ if (err) {
+ console.dir(err);
+ return;
+ }
+ flavors.forEach(function (flavor) {
+ console.log(flavor.id);
+ });
+});
+
+// 2 -- to create a service
+rackspace.createService({
+ name: 'sample-service-test',
+ domains: [
+ {
+ domain: 'www.acme.com'
+ },
+ {
+ domain: 'acme.com'
+ }
+ ],
+ origins: [
+ {
+ origin: '12.34.56.78'
+ }
+ ],
+ flavorId: 'cdn'
+}, function (err, service) {
+ if (err) {
+ console.dir(err);
+ return;
+ }
+
+ console.log(service.id);
+ console.log(service.name);
+
+});
+
+// 2 -- to list our services
+rackspace.getServices(function (err, services) {
+ if (err) {
+ console.dir(err);
+ return;
+ }
+
+ services.forEach(function(service) {
+ console.log(service.id);
+ console.log(service.name);
+ });
+
+});
+
+// 3 -- to get our service and update it
+rackspace.getService(function (err, service) {
+ if (err) {
+ console.dir(err);
+ return;
+ }
+
+ service.origins[0].origin = '88.88.88.88';
+
+ rackspace.updateService(service, function (err, service) {
+ if (err) {
+ console.dir(err);
+ return;
+ }
+
+ console.log(service.origins[0].origin);
+
+ });
+
+});
+
+// 4 -- to delete our service
+rackspace.deleteService('abcdef01-2345-6789-abcd-ef0123456789', function (err) {
+ if (err) {
+ console.dir(err);
+ return;
+ }
+
+ console.log('Service deletion request was successful.');
+});
diff --git a/examples/compute/amazon.js b/examples/compute/amazon.js
index f0c19f743..a1bc22674 100644
--- a/examples/compute/amazon.js
+++ b/examples/compute/amazon.js
@@ -5,3 +5,13 @@ var client = pkgcloud.compute.createClient({
accessKey: 'asdfkjas;dkj43498aj3n',
accessKeyId: '98kja34lkj'
});
+
+client.getServers(function (err, servers) {
+ if (err) {
+ console.error(err);
+ }
+
+ servers.forEach(function (server) {
+ console.log(server.toJSON());
+ });
+});
diff --git a/examples/compute/azure.js b/examples/compute/azure.js
index d523babba..2acd9b62c 100644
--- a/examples/compute/azure.js
+++ b/examples/compute/azure.js
@@ -8,9 +8,9 @@ var pkgcloud = require('../../lib/pkgcloud'),
//
options = {
provider: 'azure',
- "storageAccount": "test-storage-account",
- "storageAccessKey": "test-storage-access-key",
- "subscriptionId": "azure-account-subscription-id",
+ storageAccount: 'test-storage-account',
+ storageAccessKey: 'test-storage-access-key',
+ subscriptionId: 'azure-account-subscription-id',
key: fs.readFileSync('path to your account management key file', 'ascii'),
cert: fs.readFileSync('path to your account management certificate pem file', 'ascii')
};
@@ -39,15 +39,15 @@ options = {
// Azure ports (endpoints)
ports: [
{
- name : "foo", // name of port
- protocol : "tcp", // tcp or udp
- port: "12333", // external port number
- localPort: "12333" // internal port number
+ name : 'foo', // name of port
+ protocol : 'tcp', // tcp or udp
+ port: '12333', // external port number
+ localPort: '12333' // internal port number
}
]
};
-console.log("creating server...");
+console.log('creating server...');
client.createServer(options, function (err, server) {
if (err) {
@@ -55,7 +55,7 @@ client.createServer(options, function (err, server) {
} else {
// Wait for the server to reach the RUNNING state.
// This may take several minutes.
- console.log("waiting for server RUNNING state...");
+ console.log('waiting for server RUNNING state...');
server.setWait({ status: server.STATUS.running }, 10000, function (err, server) {
if (err) {
console.log(err);
diff --git a/examples/compute/digitalocean.js b/examples/compute/digitalocean.js
new file mode 100644
index 000000000..de0209e60
--- /dev/null
+++ b/examples/compute/digitalocean.js
@@ -0,0 +1,54 @@
+var pkgcloud = require('../../lib/pkgcloud'),
+ client,
+ options;
+
+//
+// Create a pkgcloud compute instance
+//
+options = {
+ provider: 'digitalocean',
+ token: 'digitalocean-api-token'
+};
+client = pkgcloud.compute.createClient(options);
+
+//
+// List DigitalOcean Droplets.
+//
+client.getServers(function (err, servers) {
+ if (err) {
+ console.error(err);
+ }
+
+ servers.forEach(function (server) {
+ console.log(server.name, server.id, server.status);
+ });
+});
+
+
+//
+// Create a Droplet and wait until finished.
+//
+options = {
+ name: 'pkgcloud-test',
+ flavor: '512mb',
+ image: 'ubuntu-14-04-x64',
+ ipv6: true,
+ private_networking: true,
+ backups: true
+};
+
+client.createServer(options, function (err, server) {
+ if (err) {
+ console.log(err);
+ } else {
+ // Wait for the server to reach the RUNNING state.
+ console.log('waiting for server RUNNING state...');
+ server.setWait({ status: server.STATUS.running }, 10000, function (err, server) {
+ if (err) {
+ console.log(err);
+ } else {
+ console.dir(server);
+ }
+ });
+ }
+});
\ No newline at end of file
diff --git a/examples/compute/joyent.js b/examples/compute/joyent.js
deleted file mode 100644
index 102608754..000000000
--- a/examples/compute/joyent.js
+++ /dev/null
@@ -1,23 +0,0 @@
-var pkgcloud = require('../../lib/pkgcloud');
-
-//
-// Joyent requires a username / password or key / keyId combo.
-// key/keyId should be registered in Joyent servers.
-// check `test/helpers/index.js` for details on key/keyId works.
-//
-var client = pkgcloud.compute.createClient({
- provider: 'joyent',
- account: 'nodejitsu',
- keyId: '/nodejitsu1/keys/dscape',
- key: fs.readFileSync(path.join(process.env.HOME, '.ssh/id_rsa'), 'ascii')
-});
-
-//
-// Alternatively create a client with a username / password pair
-//
-var otherClient = pkgcloud.compute.createClient({
- provider: 'joyent',
- username: 'your-account',
- password: 'your-password'
-});
-
diff --git a/examples/compute/oneandone.js b/examples/compute/oneandone.js
new file mode 100644
index 000000000..1df0ae89d
--- /dev/null
+++ b/examples/compute/oneandone.js
@@ -0,0 +1,74 @@
+/**
+ * Created by Ali Bazlamit on 9/6/2017.
+ */
+var pkgcloud = require('pkgcloud'),
+ _ = require('lodash');
+
+// create our client with your 1&1 token
+var client = pkgcloud.providers.oneandone.compute.createClient({
+ token: process.env.OAO_TOKEN,
+});
+
+// This function will handle our server creation,
+// as well as waiting for the server to come online after we've
+// created it.
+function handleServerResponse(err, server) {
+ if (err) {
+ console.dir(err);
+ return;
+ }
+
+ console.log('SERVER CREATED: ' + server.name + ', waiting for active status');
+
+ // Wait for status: ACTIVE on our server, and then callback
+ server.setWait({ status: server.STATUS.running }, 5000, function (err) {
+ if (err) {
+ console.dir(err);
+ return;
+ }
+
+ console.log('SERVER INFO');
+ console.log(server.name);
+ console.log(server.status);
+ console.log(server.id);
+
+ console.log('Make sure you DELETE server: ' + server.id +
+ ' in order to not accrue billing charges');
+ });
+}
+
+// first we're going to get our flavors
+client.getFlavors(function (err, flavors) {
+ if (err) {
+ console.dir(err);
+ return;
+ }
+
+ // then get our base images
+ client.getImages(function (err, images) {
+ if (err) {
+ console.dir(err);
+ return;
+ }
+
+ // Pick a medium instance flavor
+ var flavor = _.findWhere(flavors, { name: 'M' });
+
+ // Pick an image based on Ubuntu 14.04
+ var image = _.findWhere(images, { name: 'centos6-32std' });
+
+ // Create our first server
+ client.createServer({
+ name: 'server1',
+ image: image,
+ flavor: flavor.id
+ }, handleServerResponse);
+
+ // Create our second server
+ client.createServer({
+ name: 'server2',
+ image: image,
+ flavor: flavor.id
+ }, handleServerResponse);
+ });
+});
diff --git a/examples/compute/rackspace.js b/examples/compute/rackspace.js
index dd5e89cb5..127c5039e 100644
--- a/examples/compute/rackspace.js
+++ b/examples/compute/rackspace.js
@@ -1,12 +1,41 @@
var pkgcloud = require('pkgcloud'),
- _ = require('underscore');
+ _ = require('lodash');
// create our client with your rackspace credentials
var client = pkgcloud.providers.rackspace.compute.createClient({
username: 'your-username',
- apiKey: 'your-api-key'
+ apiKey: 'your-api-key',
+ region: 'DFW'
});
+// This function will handle our server creation,
+// as well as waiting for the server to come online after we've
+// created it.
+function handleServerResponse(err, server) {
+ if (err) {
+ console.dir(err);
+ return;
+ }
+
+ console.log('SERVER CREATED: ' + server.name + ', waiting for active status');
+
+ // Wait for status: ACTIVE on our server, and then callback
+ server.setWait({ status: server.STATUS.running }, 5000, function (err) {
+ if (err) {
+ console.dir(err);
+ return;
+ }
+
+ console.log('SERVER INFO');
+ console.log(server.name);
+ console.log(server.status);
+ console.log(server.id);
+
+ console.log('Make sure you DELETE server: ' + server.id +
+ ' in order to not accrue billing charges');
+ });
+}
+
// first we're going to get our flavors
client.getFlavors(function (err, flavors) {
if (err) {
@@ -42,31 +71,3 @@ client.getFlavors(function (err, flavors) {
}, handleServerResponse);
});
});
-
-// This function will handle our server creation,
-// as well as waiting for the server to come online after we've
-// created it.
-function handleServerResponse(err, server) {
- if (err) {
- console.dir(err);
- return;
- }
-
- console.log('SERVER CREATED: ' + server.name + ', waiting for active status');
-
- // Wait for status: ACTIVE on our server, and then callback
- server.setWait({ status: server.STATUS.running }, 5000, function (err) {
- if (err) {
- console.dir(err);
- return;
- }
-
- console.log('SERVER INFO');
- console.log(server.name);
- console.log(server.status);
- console.log(server.id);
-
- console.log('Make sure you DELETE server: ' + server.id +
- ' in order to not accrue billing charges');
- });
-}
\ No newline at end of file
diff --git a/examples/database/azure.js b/examples/database/azure.js
index 8cbb26593..b60f7917a 100644
--- a/examples/database/azure.js
+++ b/examples/database/azure.js
@@ -2,15 +2,15 @@ var pkgcloud = require('../../lib/pkgcloud');
var client = pkgcloud.database.createClient({
provider: 'azure',
- storageAccount: "storage-account-name", // Name of your Azure storage account
- storageAccessKey: "storage-account-access-key" // Access key for storage account
+ storageAccount: 'storage-account-name', // Name of your Azure storage account
+ storageAccessKey: 'storage-account-access-key' // Access key for storage account
});
//
// Create an Azure Table
//
client.create({
- name: "testing123"
+ name: 'testing123'
}, function (err, result) {
//
// Check the result
diff --git a/examples/database/iriscouch.js b/examples/database/iriscouch.js
deleted file mode 100644
index 3297e100e..000000000
--- a/examples/database/iriscouch.js
+++ /dev/null
@@ -1,47 +0,0 @@
-var pkgcloud = require('../../lib/pkgcloud');
-
-var client = pkgcloud.database.createClient({
- provider: 'iriscouch',
- username: "bob",
- password: "1234"
-});
-
-//
-// Create a couch database
-//
-client.create({
- subdomain: "pkgcloud-nodejitsu-test-5",
- first_name: "pkgcloud",
- last_name: "pkgcloud",
- email: "info@nodejitsu.com"
-}, function (err, result) {
- //
- // Check now exists @ http://pkgcloud-nodejitsu-test-5.iriscouch.com
- //
- console.log(err, result);
-});
-
-//
-// Crate a redis database
-//
-client.create({
- subdomain: "pkgcloud-nodejitsu-test-6",
- first_name: "pkgcloud",
- last_name: "pkgcloud",
- email: "info@nodejitsu.com",
- //
- // For redis instead of couch just put type to redis
- //
- type: "redis",
- //
- // AND ADD A PASSWORD! (required)
- //
- password: "mys3cur3p4ssw0rd"
-}, function (err, result) {
- //
- // Check the connection, use result.host and result.password values
- // redis-cli -h $RESULT.HOST -a $RESULT.PASSWORD
- //
- console.log('HOST to connect:', result.host);
- console.log('KEY to use:', result.password);
-});
\ No newline at end of file
diff --git a/examples/database/mongohq.js b/examples/database/mongohq.js
deleted file mode 100644
index e19c69015..000000000
--- a/examples/database/mongohq.js
+++ /dev/null
@@ -1,30 +0,0 @@
-var pkgcloud = require('../../lib/pkgcloud');
-
-var client = pkgcloud.database.createClient({
- provider: 'mongohq',
- username: "bob",
- password: "1234"
-});
-
-//
-// Create a MongoDB
-//
-client.create({
- name: "mongo-instance",
- plan: "free",
-}, function (err, result) {
- //
- // Check the result
- //
- console.log(err, result);
-
- //
- // Now delete that same MongoDB
- //
- client.remove(result.id, function (err, result) {
- //
- // Check the result
- //
- console.log(err, result);
- });
-});
\ No newline at end of file
diff --git a/examples/database/rackspace.js b/examples/database/rackspace.js
index 10ca0843c..08fbc4848 100644
--- a/examples/database/rackspace.js
+++ b/examples/database/rackspace.js
@@ -46,5 +46,5 @@ client.getFlavors(function (err, flavors) {
console.log(database);
});
});
- })
-});
\ No newline at end of file
+ });
+});
diff --git a/examples/database/redistogo.js b/examples/database/redistogo.js
deleted file mode 100644
index 73aa041ed..000000000
--- a/examples/database/redistogo.js
+++ /dev/null
@@ -1,35 +0,0 @@
-var pkgcloud = require('../../lib/pkgcloud');
-
-var client = pkgcloud.database.createClient({
- provider: 'redistogo',
- username: "bob",
- password: "1234"
-});
-
-//
-// Create a redis
-//
-client.create({
- plan: "nano",
-}, function (err, result) {
- //
- // Log the result
- //
- console.log(err, result);
-
- //
- // Get the same redis we just created
- //
- client.get(result.id, function (err, result) {
- //
- // Show the details of the database we just created
- //
- console.log(err, result);
- client.remove(result.id, function (err, result) {
- //
- // Ensure it was removed correctly.
- //
- console.log(err, result);
- });
- });
-});
\ No newline at end of file
diff --git a/examples/dns/rackspace.js b/examples/dns/rackspace.js
index 2a9a402b9..7e66ab18b 100644
--- a/examples/dns/rackspace.js
+++ b/examples/dns/rackspace.js
@@ -1,7 +1,6 @@
-var pkgcloud = require('../../lib/pkgcloud'),
- _ = require('underscore');
+var pkgcloud = require('../../lib/pkgcloud');
-var rackspace = pkgcloud.dns.createClient({
+var client = pkgcloud.dns.createClient({
provider: 'rackspace',
username: 'rax-user-id',
apiKey: '1234567890asdbchehe'
@@ -12,13 +11,13 @@ var rackspace = pkgcloud.dns.createClient({
// and illustration purposes.
// 1 - Get all DNS "Zones" associates with your account
-rackspace.getZones(function (err, zones) {
+client.getZones(function (err, zones) {
if (err) {
console.dir(err);
return;
}
- _.each(zones, function (zone) {
+ zones.forEach(function (zone) {
console.log(zone.id + ' ' + zone.name);
});
@@ -34,7 +33,7 @@ var details = {
comment: 'I pity .foo'
};
-rackspace.createZone(details, function (err, zone) {
+client.createZone(details, function (err, zone) {
if (err) {
console.dir(err);
return;
@@ -46,7 +45,7 @@ rackspace.createZone(details, function (err, zone) {
// 3 - Get the "Zone" we just created and get its records
-rackspace.getZones({ name: 'example.org' }, function (err, zones) {
+client.getZones({ name: 'example.org' }, function (err, zones) {
if (err) {
console.dir(err);
return;
@@ -54,13 +53,13 @@ rackspace.getZones({ name: 'example.org' }, function (err, zones) {
if (zones.length) {
console.log('We have parent Zone');
- rackspace.getRecords(zones[0], function (err, records) {
+ client.getRecords(zones[0], function (err, records) {
if (err) {
console.dir(err);
return;
}
- _.each(records, function (record){
+ records.forEach(function (record){
console.log(record.toJSON());
});
});
@@ -74,7 +73,7 @@ var _rec = {
data: '127.0.0.1'
};
-rackspace.getZones({ name: 'example.org' }, function (err, zones) {
+client.getZones({ name: 'example.org' }, function (err, zones) {
if (err) {
console.dir(err);
return;
@@ -82,7 +81,7 @@ rackspace.getZones({ name: 'example.org' }, function (err, zones) {
if (zones.length) {
console.log('We have parent Zone');
- rackspace.createRecord(zones[0], _rec, function (err, rec) {
+ client.createRecord(zones[0], _rec, function (err, rec) {
if (err) {
console.dir(err);
return;
@@ -96,7 +95,7 @@ rackspace.getZones({ name: 'example.org' }, function (err, zones) {
});
// 5 - Now let's remove the "Zone" and all of its children records.
-rackspace.getZones({ name: 'example.org' }, function (err, zones) {
+client.getZones({ name: 'example.org' }, function (err, zones) {
if (err) {
console.dir(err);
return;
@@ -104,7 +103,7 @@ rackspace.getZones({ name: 'example.org' }, function (err, zones) {
if (zones.length) {
console.log('We have parent Zone');
- rackspace.deleteZone(zones[0], function (err) {
+ client.deleteZone(zones[0], function (err) {
if (err) {
console.dir(err);
return;
diff --git a/examples/loadbalancer/oneandone.js b/examples/loadbalancer/oneandone.js
new file mode 100644
index 000000000..58503652a
--- /dev/null
+++ b/examples/loadbalancer/oneandone.js
@@ -0,0 +1,85 @@
+/**
+ * Created by Ali Bazlamit on 9/6/2017.
+ */
+var pkgcloud = require('pkgcloud'),
+ _ = require('lodash');
+
+(function () {
+
+ var config = {
+ token: process.env.OAO_TOKEN,
+ };
+
+ // create our client with your 1&1 credentials
+ var computeClient = pkgcloud.providers.oneandone.compute.createClient(config);
+ var loadBalancerClient = pkgcloud.providers.oneandone.loadbalancer.createClient(config);
+
+ // first we're going to get our flavors
+ computeClient.getFlavors(function (err, flavors) {
+ if (err) {
+ console.dir(err);
+ return;
+ }
+
+ // then get our base images
+ computeClient.getImages(function (err, images) {
+ if (err) {
+ console.dir(err);
+ return;
+ }
+
+ // Pick a 512MB instance flavor
+ var flavor = _.findWhere(flavors, { name: 'M' });
+
+ // Pick an image based on Ubuntu 14.04
+ var image = _.findWhere(images, { name: 'centos6-32std' });
+
+ // Create our first server
+ computeClient.createServer({
+ name: 'server11',
+ image: image,
+ flavor: flavor.id,
+ location: '4EFAD5836CE43ACA502FD5B99BEE44EF'
+ }, function (err, server) {
+ if (err) {
+ console.error(err);
+ return;
+ }
+
+ // Wait for our server to start up
+ server.setWait({ status: server.STATUS.running }, 5000, function (err) {
+ if (err) {
+ console.dir(err);
+ return;
+ }
+
+ // create a block storage snapshot
+ var options = {
+ name: 'lb test',
+ healthCheckInterval: 40,
+ Persistence: true,
+ persistenceTime: 1200,
+ method: 'ROUND_ROBIN',
+ rules: [
+ {
+ protocol: 'TCP',
+ port_balancer: 80,
+ port_server: 80,
+ source: '0.0.0.0'
+ }
+ ],
+ location: '4EFAD5836CE43ACA502FD5B99BEE44EF'
+ };
+
+ loadBalancerClient.createLoadBalancer(options, function (err, loadbalancer) {
+ if (err) {
+ console.error(err);
+ return;
+ }
+ console.log(loadbalancer);
+ });
+ });
+ });
+ });
+ });
+})();
diff --git a/examples/storage/amazon.js b/examples/storage/amazon.js
index 42fc98ebd..3dd2d643c 100644
--- a/examples/storage/amazon.js
+++ b/examples/storage/amazon.js
@@ -5,3 +5,13 @@ var client = pkgcloud.storage.createClient({
accessKey: 'asdfkjas;dkj43498aj3n',
accessKeyId: '98kja34lkj'
});
+
+client.getContainers(function (err, containers) {
+ if (err) {
+ console.error(err);
+ }
+
+ containers.forEach(function (container) {
+ console.log(container.toJSON());
+ });
+});
diff --git a/examples/storage/azure.js b/examples/storage/azure.js
index 3cf9bf908..ef6462fdc 100644
--- a/examples/storage/azure.js
+++ b/examples/storage/azure.js
@@ -1,7 +1,17 @@
var pkgcloud = require('../../lib/pkgcloud');
-var azure = pkgcloud.storage.createClient({
+var client = pkgcloud.storage.createClient({
provider: 'azure',
- storageAccount: "test-storage-account", // Name of your storage account
- storageAccessKey: "test-storage-access-key" // Access key for storage account
+ storageAccount: 'test-storage-account', // Name of your storage account
+ storageAccessKey: 'test-storage-access-key' // Access key for storage account
});
+
+client.getContainers(function (err, containers) {
+ if (err) {
+ console.error(err);
+ }
+
+ containers.forEach(function (container) {
+ console.log(container.toJSON());
+ });
+});
\ No newline at end of file
diff --git a/examples/storage/rackspace.js b/examples/storage/rackspace.js
index 1b26a2ea3..304b2e470 100644
--- a/examples/storage/rackspace.js
+++ b/examples/storage/rackspace.js
@@ -1,8 +1,7 @@
var fs = require('fs'),
- pkgcloud = require('../../lib/pkgcloud'),
- _ = require('underscore');
+ pkgcloud = require('../../lib/pkgcloud');
-var rackspace = pkgcloud.storage.createClient({
+var client = pkgcloud.storage.createClient({
provider: 'rackspace',
username: 'rackspace_id',
apiKey: '1234567890poiiuytrrewq',
@@ -14,7 +13,7 @@ var rackspace = pkgcloud.storage.createClient({
// and illustration purposes.
// 1 -- to create a container
-rackspace.createContainer({
+client.createContainer({
name: 'sample-container-test',
metadata: {
callme: 'maybe'
@@ -31,20 +30,20 @@ rackspace.createContainer({
});
// 2 -- to list our containers
-rackspace.getContainers(function (err, containers) {
+client.getContainers(function (err, containers) {
if (err) {
console.dir(err);
return;
}
- _.each(containers, function(container) {
+ containers.forEach(function(container) {
console.log(container.name);
});
});
// 3 -- to create a container and upload a file to it
-rackspace.createContainer({
+client.createContainer({
name: 'sample-container',
metadata: {
callme: 'maybe'
@@ -57,22 +56,24 @@ rackspace.createContainer({
var myPicture = fs.createReadStream('/path/to/some/file/picture.jpg');
- myPicture.pipe(rackspace.upload({
- container: container.name,
- remote: 'profile-picture.jpg'
- },
- function (err, result) {
- if (err) {
- console.dir(err);
- return;
- }
-
- console.log(result);
- }));
+ var upload = client.upload({
+ container: container.name,
+ remote: 'profile-picture.jpg'
+ });
+
+ upload.on('error', function(err) {
+ console.error(err);
+ });
+
+ upload.on('success', function(file) {
+ console.log(file.toJSON());
+ });
+
+ myPicture.pipe(upload);
});
// 4 -- setup container as CDN
-rackspace.getContainer('container-name', function (err, container) {
+client.getContainer('container-name', function (err, container) {
if(err){
console.log('There was an error retrieving container:\n');
console.dir(err);
@@ -86,23 +87,25 @@ rackspace.getContainer('container-name', function (err, container) {
return;
}
console.log('Successfully set bucket as CDN bucket');
+ console.log(cont);
});
});
// 5 -- to get a container, empty it, then finally destroying it
-rackspace.getContainer('sample-container', function (err, container) {
+client.getContainer('sample-container', function (err, container) {
if (err) {
console.dir(err);
return;
}
// destroying a container automatically calls the remove file API to empty before delete
- rackspace.destroyContainer(container, function (err, result) {
+ client.destroyContainer(container, function (err, result) {
if (err) {
console.dir(err);
return;
}
- console.log('Container ' + container.name + ' was successfully destroyed.')
+ console.log('Container ' + container.name + ' was successfully destroyed.');
+ console.log(result);
});
-});
\ No newline at end of file
+});
diff --git a/lib/pkgcloud.js b/lib/pkgcloud.js
index 8921d9617..ae6152235 100644
--- a/lib/pkgcloud.js
+++ b/lib/pkgcloud.js
@@ -1,7 +1,7 @@
/*
* pkgcloud.js: Top-level include for the pkgcloud module
*
- * (C) 2011 Nodejitsu Inc.
+ * (C) 2011 Charlie Robbins, Ken Perkins, Ross Kukulinski & the Contributors.
*
*/
@@ -9,7 +9,7 @@ var path = require('path');
var pkgcloud = exports;
-require('pkginfo')(module, 'version');
+pkgcloud.version = require('../package.json').version;
var components = [
'./pkgcloud/core/base',
@@ -22,14 +22,11 @@ var providers = [
'amazon',
'azure',
'digitalocean',
- 'iriscouch',
- 'joyent',
- 'mongohq',
- 'mongolab',
+ 'google',
+ 'oneandone',
'openstack',
'rackspace',
- 'redistogo',
- 'telefonica'
+ 'hp'
];
var services = [
@@ -39,6 +36,8 @@ var services = [
'database',
'dns',
'loadbalancer',
+ 'orchestration',
+ 'network',
'storage'
];
diff --git a/lib/pkgcloud/amazon/client.js b/lib/pkgcloud/amazon/client.js
index e39fa754c..e6786ea8f 100644
--- a/lib/pkgcloud/amazon/client.js
+++ b/lib/pkgcloud/amazon/client.js
@@ -1,39 +1,68 @@
/*
* client.js: Base client from which all AWS clients inherit from
*
- * (C) 2012 Nodejitsu Inc.
+ * (C) 2012 Charlie Robbins, Ken Perkins, Ross Kukulinski & the Contributors.
*
*/
-var utile = require('utile'),
- request = require('request'),
+var util = require('util'),
+ AWS = require('aws-sdk'),
base = require('../core/base');
+var userAgent = AWS.util.userAgent();
var Client = exports.Client = function (options) {
+ var self = this;
+
base.Client.call(this, options);
options = options || {};
// Allow overriding serversUrl in child classes
this.provider = 'amazon';
+ this.endpoint = options.endpoint;
this.securityGroup = options.securityGroup;
this.securityGroupId = options.securityGroupId;
- this.version = options.version || '2012-04-01';
+ this.version = options.version || '2014-06-15';
this.protocol = options.protocol || 'https://';
- this.serversUrl = options.serversUrl
- || this.serversUrl
- || 'ec2.amazonaws.com';
// support either key/accessKey syntax
this.config.key = this.config.key || options.accessKey;
this.config.keyId = this.config.keyId || options.accessKeyId;
+ this._awsConfig = {
+ accessKeyId: this.config.keyId,
+ secretAccessKey: this.config.key,
+ region: options.region,
+ s3ForcePathStyle: options.forcePathBucket,
+ sessionToken: options.sessionToken,
+ credentials: options.credentials
+ };
+
+ // TODO think about a proxy option for pkgcloud
+ // enable forwarding to mock test server
+ if (options.serversUrl) {
+ this._awsConfig.httpOptions = {
+ proxy: this.protocol + options.serversUrl
+ };
+ }
+
+ if (options.endpoint) {
+ this._awsConfig.endpoint = new AWS.Endpoint(options.endpoint);
+ }
+
+ this.userAgent = util.format('%s %s', self.getUserAgent(), userAgent);
+
+ // Setup a custom user agent for pkgcloud
+ AWS.util.userAgent = function () {
+ return self.userAgent;
+ };
+
if (!this.before) {
this.before = [];
}
};
-utile.inherits(Client, base.Client);
+util.inherits(Client, base.Client);
Client.prototype._toArray = function toArray(obj) {
if (typeof obj === 'undefined') {
diff --git a/lib/pkgcloud/amazon/compute/client/flavors.js b/lib/pkgcloud/amazon/compute/client/flavors.js
index 9975eb7ce..270b25a64 100644
--- a/lib/pkgcloud/amazon/compute/client/flavors.js
+++ b/lib/pkgcloud/amazon/compute/client/flavors.js
@@ -1,7 +1,7 @@
/*
* flavors.js: Implementation of AWS Flavors Client.
*
- * (C) 2012, Nodejitsu Inc.
+ * (C) 2012 Charlie Robbins, Ken Perkins, Ross Kukulinski & the Contributors.
*
*/
diff --git a/lib/pkgcloud/amazon/compute/client/groups.js b/lib/pkgcloud/amazon/compute/client/groups.js
index 6c44c04f7..091e7f8f3 100644
--- a/lib/pkgcloud/amazon/compute/client/groups.js
+++ b/lib/pkgcloud/amazon/compute/client/groups.js
@@ -4,7 +4,7 @@
*/
var errs = require('errs'),
- utile = require('utile');
+ _ = require('lodash');
//
// ### function listGroups (options, callback)
@@ -22,10 +22,23 @@ exports.listGroups = function (options, callback) {
var self = this;
options = options || {};
- return this._query('DescribeSecurityGroups', options, function (err, body, res) {
- return err
- ? callback(err)
- : callback(err, self._toArray(body.securityGroupInfo.item));
+ var requestOpts = {};
+
+ if (options.groupNames) {
+ requestOpts.GroupNames = options.groupNames;
+ }
+
+ if (options.groupIds) {
+ requestOpts.GroupIds = options.groupIds;
+ }
+
+ self.ec2.describeSecurityGroups(requestOpts, function(err, data) {
+ if (err) {
+ callback(err);
+ return;
+ }
+
+ callback(err, data.SecurityGroups);
});
};
@@ -37,12 +50,15 @@ exports.listGroups = function (options, callback) {
// Gets the details of the EC2 SecurityGroup with the specified `name`.
//
exports.getGroup = function (name, callback) {
- return this.listGroups({
- 'GroupName.1': name
- }, function (err, body) {
- return err
- ? callback(err)
- : callback(null, body[0]);
+ this.listGroups({ groupNames: [ name ] }, function(err, groups) {
+ if (err) {
+ callback(err);
+ } else if (groups && groups[0]) {
+ callback(err, groups[0]);
+ }
+ else {
+ callback(new Error('Group not found'));
+ }
});
};
@@ -63,18 +79,16 @@ exports.addGroup = function (options, callback) {
);
}
- return this._query(
- 'CreateSecurityGroup',
- {
- GroupName: options.name,
- GroupDescription: options.description
- },
- function (err, body, res) {
- return err
- ? callback(err)
- : callback(null, true);
- }
- );
+ var requestOpts = {
+ GroupName: options.name,
+ Description: options.description
+ };
+
+ this.ec2.createSecurityGroup(requestOpts, function(err, data) {
+ return err
+ ? callback(err)
+ : callback(null, _.extend(requestOpts, { GroupId: data.GroupId }));
+ });
};
//
@@ -85,15 +99,11 @@ exports.addGroup = function (options, callback) {
// Destroys EC2 SecurityGroup with the specified `name`.
//
exports.destroyGroup = function (name, callback) {
- return this._query(
- 'DeleteSecurityGroup',
- { GroupName: name },
- function (err, body, res) {
- return err
- ? callback(err)
- : callback(null, true);
- }
- );
+ this.ec2.deleteSecurityGroup({ GroupName: name }, function(err) {
+ return err
+ ? callback(err)
+ : callback(null, true);
+ });
};
//
@@ -117,18 +127,14 @@ exports.addRules = function (options, callback) {
}
// Simply append the group name to the rules - override if existing
- var rules = options.rules;
- rules.GroupName = options.name;
-
- return this._query(
- 'AuthorizeSecurityGroupIngress',
- rules ,
- function (err, body, res) {
- return err
- ? callback(err)
- : callback(null, true);
- }
- );
+ this.ec2.authorizeSecurityGroupIngress({
+ GroupName: options.name,
+ IpPermissions: options.rules
+ }, function(err) {
+ return err
+ ? callback(err)
+ : callback(null, true);
+ });
};
//
@@ -152,16 +158,12 @@ exports.delRules = function (options, callback) {
}
// Simply append the group name to the rules - override if existing
- var rules = options.rules;
- rules.GroupName = options.name;
-
- return this._query(
- 'RevokeSecurityGroupIngress',
- rules ,
- function (err, body, res) {
- return err
- ? callback(err)
- : callback(null, true);
- }
- );
+ this.ec2.revokeSecurityGroupIngress({
+ GroupName: options.name,
+ IpPermissions: options.rules
+ }, function (err) {
+ return err
+ ? callback(err)
+ : callback(null, true);
+ });
};
diff --git a/lib/pkgcloud/amazon/compute/client/images.js b/lib/pkgcloud/amazon/compute/client/images.js
index 2f4f2415f..a92dadb66 100644
--- a/lib/pkgcloud/amazon/compute/client/images.js
+++ b/lib/pkgcloud/amazon/compute/client/images.js
@@ -1,12 +1,11 @@
/*
* images.js: Implementation of AWS Images Client.
*
- * (C) 2012, Nodejitsu Inc.
+ * (C) 2012 Charlie Robbins, Ken Perkins, Ross Kukulinski & the Contributors.
*
*/
var pkgcloud = require('../../../../../lib/pkgcloud'),
base = require('../../../core/compute'),
- errs = require('errs'),
compute = pkgcloud.providers.amazon.compute;
//
@@ -19,27 +18,39 @@ var pkgcloud = require('../../../../../lib/pkgcloud'),
exports.getImages = function getImages(options, callback) {
if (!callback && typeof options === 'function') {
callback = options;
- options = null;
+ options = {};
}
- var query = { 'Owner.0': 'self' },
+ var requestOpts = { },
self = this;
- if (options && options.owners) {
- //
- // TODO: Support more than just owners
- //
- for (var i = 0; i < options.owners.length; i++) {
- query['Owner.' + (i + 1)] = options.owners[i];
- }
+ if (options.owners && options.owners instanceof Array) {
+ requestOpts.Owners = options.owners;
+ }
+ else if (options.owners && typeof options.owners === 'string') {
+ requestOpts.Owners = [ options.owners ];
}
- return this._query('DescribeImages', query, function (err, body, res) {
- return err
- ? callback(err)
- : callback(null, self._toArray(body.imagesSet.item).map(function (image) {
- return new compute.Image(self, image);
- }), res);
+ if (options.images && options.images instanceof Array) {
+ requestOpts.ImageIds = options.images;
+ }
+ else if (options.images && typeof options.images === 'string') {
+ requestOpts.ImagesIds = [ options.images ];
+ }
+
+ if (!requestOpts.ImageIds && !requestOpts.Owners) {
+ requestOpts.Owners = [ 'self' ];
+ }
+
+ self.ec2.describeImages(requestOpts, function(err, data) {
+ if (err) {
+ callback(err);
+ return;
+ }
+
+ callback(err, data.Images.map(function(image) {
+ return new compute.Image(self, image);
+ }));
});
};
@@ -52,21 +63,22 @@ exports.getImages = function getImages(options, callback) {
// object.
//
exports.getImage = function getImage(image, callback) {
- var self = this,
- imageId = image instanceof base.Image ? image.id : image,
- query = { 'ImageId.1': imageId };
+ var self = this;
- return this._query('DescribeImages', query, function (err, body, res) {
+ self.getImages({
+ images: [ image ]
+ }, function(err, images) {
if (err) {
- return callback(err);
+ callback(err);
+ return;
+ }
+
+ if (images && images[0]) {
+ callback(err, images[0]);
+ return;
}
- var image = self._toArray(body.imagesSet.item).map(function (image) {
- return image ? new compute.Image(self, image) : null;
- })[0];
- return !image
- ? callback(new Error('Image not found'))
- : callback(null, image, res);
+ callback(new Error('Image not found'));
});
};
@@ -83,18 +95,25 @@ exports.getImage = function getImage(image, callback) {
exports.createImage = function createImage(options, callback) {
options || (options = {});
- if (!options.name) throw new TypeError('`name` is a required option');
- if (!options.server) throw new TypeError('`server` is a required option');
+ if (!options.name) {
+ throw new TypeError('`name` is a required option');
+ }
+
+ if (!options.server) {
+ throw new TypeError('`server` is a required option');
+ }
var self = this,
serverId = options.server instanceof base.Server
- ? options.server.id : options.server,
- query = { InstanceId: serverId, Name: options.name };
+ ? options.server.id : options.server;
- return this._query('CreateImage', query, function (err, body, res) {
+ this.ec2.createImage({
+ InstanceId: serverId,
+ Name: options.name
+ }, function(err, data) {
return err
? callback(err)
- : self.getImage(res.imageId, callback);
+ : self.getImage(data.ImageId, callback);
});
};
@@ -114,19 +133,25 @@ exports.destroyImage = function destroyImage(image, callback) {
return callback(err);
}
- if (!image.blockDeviceMapping.item ||
- !image.blockDeviceMapping.item.ebs.snapshotId) {
+ if (!image.blockDeviceMappings || !image.blockDeviceMappings[0] ||
+ !image.blockDeviceMappings[0].Ebs || !image.blockDeviceMappings[0].Ebs.SnapshotId) {
return callback(new TypeError('Image is not EBS backed'));
}
- var query = {
- snapshotId: image.blockDeviceMapping.item.ebs.snapshotId
- };
-
- self._query('DeleteSnapshot', query, function (err, body, res) {
- return err
- ? callback(err)
- : callback(null, { ok: query.snapshotId }, res);
- });
+ self.ec2.deregisterImage({ ImageId: image instanceof base.Image ? image.id : image },
+ function(err) {
+ if (err) {
+ callback(err);
+ return;
+ }
+
+ self.ec2.deleteSnapshot({
+ SnapshotId: image.blockDeviceMappings[0].Ebs.SnapshotId
+ }, function(err) {
+ return err
+ ? callback(err)
+ : callback(null, { ok: image.blockDeviceMappings[0].Ebs.SnapshotId });
+ });
+ });
});
};
diff --git a/lib/pkgcloud/amazon/compute/client/index.js b/lib/pkgcloud/amazon/compute/client/index.js
index 9063483dc..6f183ca7b 100644
--- a/lib/pkgcloud/amazon/compute/client/index.js
+++ b/lib/pkgcloud/amazon/compute/client/index.js
@@ -1,57 +1,27 @@
/*
* index.js: Compute client for AWS CloudAPI
*
- * (C) 2012 Nodejitsu Inc.
+ * (C) 2012 Charlie Robbins, Ken Perkins, Ross Kukulinski & the Contributors.
*
*/
-var qs = require('querystring'),
- utile = require('utile'),
- urlJoin = require('url-join'),
- xml2js = require('xml2js'),
- auth = require('../../../common/auth'),
- amazon = require('../../client');
+var AWS = require('aws-sdk'),
+ util = require('util'),
+ amazon = require('../../client'),
+ _ = require('lodash');
var Client = exports.Client = function (options) {
amazon.Client.call(this, options);
this.securityGroup = options.securityGroup;
- utile.mixin(this, require('./flavors'));
- utile.mixin(this, require('./images'));
- utile.mixin(this, require('./servers'));
- utile.mixin(this, require('./keys'));
- utile.mixin(this, require('./groups'));
+ _.extend(this, require('./flavors'));
+ _.extend(this, require('./images'));
+ _.extend(this, require('./servers'));
+ _.extend(this, require('./keys'));
+ _.extend(this, require('./groups'));
- this.before.push(auth.amazon.bodySignature);
+ this.ec2 = new AWS.EC2(this._awsConfig);
};
-utile.inherits(Client, amazon.Client);
-
-Client.prototype._query = function query(action, query, callback) {
- return this._request({
- method: 'POST',
- headers: { },
- body: utile.mixin({ Action: action }, query)
- }, function (err, body, res) {
- if (err) {
- return callback(err);
- }
- var parser = new xml2js.Parser();
-
- parser.parseString(body, function (err, data) {
- return err
- ? callback(err)
- : callback(err, data, res);
- });
- });
-};
-
-Client.prototype._getUrl = function (options) {
- options = options || {};
-
- return urlJoin(this.protocol + this.serversUrl,
- (typeof options === 'string'
- ? options
- : options.path));
-};
+util.inherits(Client, amazon.Client);
diff --git a/lib/pkgcloud/amazon/compute/client/keys.js b/lib/pkgcloud/amazon/compute/client/keys.js
index a8e9b9936..45dc6d53e 100644
--- a/lib/pkgcloud/amazon/compute/client/keys.js
+++ b/lib/pkgcloud/amazon/compute/client/keys.js
@@ -1,12 +1,11 @@
/*
* keys.js: Implementation of AWS SSH keys Client.
*
- * (C) 2012, Nodejitsu Inc.
+ * (C) 2012 Charlie Robbins, Ken Perkins, Ross Kukulinski & the Contributors.
*
*/
-var errs = require('errs'),
- utile = require('utile');
+var errs = require('errs');
//
// ### function listKeys (options, callback)
@@ -21,13 +20,19 @@ exports.listKeys = function (options, callback) {
options = {};
}
- var self = this;
+ var self = this,
+ requestOpts = {};
+
options = options || {};
- return this._query('DescribeKeyPairs', options, function (err, body, res) {
+ if (options.keyNames) {
+ requestOpts.KeyNames = options.keyNames;
+ }
+
+ self.ec2.describeKeyPairs(requestOpts, function(err, data) {
return err
? callback(err)
- : callback(null, self._toArray(body.keySet.item));
+ : callback(err, data.KeyPairs);
});
};
@@ -40,7 +45,7 @@ exports.listKeys = function (options, callback) {
//
exports.getKey = function (name, callback) {
return this.listKeys({
- 'KeyName.1': name
+ keyNames: [ name ]
}, function (err, body) {
return err
? callback(err)
@@ -65,18 +70,14 @@ exports.addKey = function (options, callback) {
);
}
- return this._query(
- 'ImportKeyPair',
- {
- KeyName: options.name,
- PublicKeyMaterial: utile.base64.encode(options.key)
- },
- function (err, body, res) {
- return err
- ? callback(err)
- : callback(null, true);
- }
- );
+ this.ec2.importKeyPair({
+ KeyName: options.name,
+ PublicKeyMaterial: new Buffer(options.key).toString('base64')
+ }, function (err) {
+ return err
+ ? callback(err)
+ : callback(null, true);
+ });
};
//
@@ -87,13 +88,11 @@ exports.addKey = function (options, callback) {
// Destroys EC2 Key Pair with the specified `name`.
//
exports.destroyKey = function (name, callback) {
- return this._query(
- 'DeleteKeyPair',
- { KeyName: name },
- function (err, body, res) {
- return err
- ? callback(err)
- : callback(null, true);
- }
- );
-};
\ No newline at end of file
+ this.ec2.deleteKeyPair({
+ KeyName: name
+ }, function (err) {
+ return err
+ ? callback(err)
+ : callback(null, true);
+ });
+};
diff --git a/lib/pkgcloud/amazon/compute/client/servers.js b/lib/pkgcloud/amazon/compute/client/servers.js
index 66da39eb2..d2c070aee 100644
--- a/lib/pkgcloud/amazon/compute/client/servers.js
+++ b/lib/pkgcloud/amazon/compute/client/servers.js
@@ -1,11 +1,10 @@
/*
* servers.js: Instance methods for working with servers from AWS Cloud
*
- * (C) 2012 Nodejitsu Inc.
+ * (C) 2012 Charlie Robbins, Ken Perkins, Ross Kukulinski & the Contributors.
*
*/
var async = require('async'),
- request = require('request'),
base = require('../../../core/compute'),
pkgcloud = require('../../../../../lib/pkgcloud'),
errs = require('errs'),
@@ -32,7 +31,7 @@ exports.getVersion = function getVersion(callback) {
//
exports.getLimits = function getLimits(callback) {
return errs.handle(
- errs.create({ message: "AWS's API is not rate limited" }),
+ errs.create({ message: 'AWS\'s API is not rate limited' }),
callback
);
};
@@ -47,31 +46,29 @@ exports.getLimits = function getLimits(callback) {
exports._getDetails = function getDetails(details, callback) {
var self = this;
- self._query(
- 'DescribeInstanceAttribute', {
- InstanceId: details.instanceId,
- Attribute: 'userData'
- },
- function (err, body, res) {
- if (err) {
- // disregard the errors, if any
- return callback(null, details);
- }
+ self.ec2.describeInstanceAttribute({
+ InstanceId: details.instanceId || details.InstanceId,
+ Attribute: 'userData'
+ }, function(err, data) {
+ if (err) {
+ // disregard the errors, if any
+ return callback(null, details);
+ }
- var meta = new Buffer(
- body.userData.value || '',
- 'base64'
- ).toString();
+ var meta = new Buffer(
+ data.UserData.Value || '',
+ 'base64'
+ ).toString();
- try {
- meta = JSON.parse(meta);
- } catch (e) {
- meta = {};
- }
+ try {
+ meta = JSON.parse(meta);
+ } catch (e) {
+ meta = {};
+ }
- details.name = meta.name;
- callback(null, details);
- });
+ details.name = meta.name;
+ callback(null, details);
+ });
};
//
@@ -81,34 +78,37 @@ exports._getDetails = function getDetails(details, callback) {
//
// Lists all servers available to your account.
//
-exports.getServers = function getServers(callback) {
+exports.getServers = function getServers(options, callback) {
+ if (typeof options === 'function') {
+ callback = options;
+ options = {};
+ }
+
var self = this;
- return self._query('DescribeInstances', {}, function (err, body, res) {
+
+ self.ec2.describeInstances(options, function(err, data) {
if (err) {
- return callback(err);
+ callback(err);
+ return;
}
var servers = [];
- if (!body || !body.reservationSet || !body.reservationSet.item) {
- return callback(null, []);
- }
-
- self._toArray(body.reservationSet.item).forEach(function (reservation) {
- self._toArray(reservation.instancesSet.item).forEach(function (instance) {
+ data.Reservations.forEach(function(reservation) {
+ reservation.Instances.forEach(function(instance) {
servers.push(instance);
});
});
- async.map(
- servers,
+ // TODO investigate performance when getServers returns 100s of servers
+ async.map(servers,
self._getDetails.bind(self),
function finish(err, servers) {
return err
? callback(err)
: callback(null, servers.map(function (server) {
- return new compute.Server(self, server);
- }), res);
+ return new compute.Server(self, server);
+ }));
}
);
});
@@ -134,14 +134,14 @@ exports.createServer = function createServer(options, callback) {
options = options || {}; // no args
var self = this,
- meta = { name: options.name || '' },
- createOptions = {
- UserData: new Buffer(JSON.stringify(meta)).toString('base64'),
- MinCount: 1,
- MaxCount: 1
- },
- securityGroup,
- securityGroupId;
+ meta = { name: options.name || '' },
+ createOptions = {
+ UserData: new Buffer(JSON.stringify(meta)).toString('base64'),
+ MinCount: 1,
+ MaxCount: 1
+ },
+ securityGroup,
+ securityGroupId;
if (!options.image) {
return errs.handle(
@@ -154,12 +154,12 @@ exports.createServer = function createServer(options, callback) {
securityGroup = this.securityGroup || options['SecurityGroup'];
if (securityGroup) {
- createOptions['SecurityGroup'] = securityGroup;
+ createOptions['SecurityGroups'] = [securityGroup];
}
securityGroupId = this.securityGroupId || options['SecurityGroupId'];
if (securityGroupId) {
- createOptions['SecurityGroupId'] = securityGroupId;
+ createOptions['SecurityGroupIds'] = [securityGroupId];
}
createOptions.ImageId = options.image instanceof base.Image
@@ -181,23 +181,19 @@ exports.createServer = function createServer(options, callback) {
|| options['Placement.AvailabilityZone'];
}
- return this._query(
- 'RunInstances',
- createOptions,
- function (err, body, res) {
- var server;
- if (err) {
- return callback(err);
- }
+ self.ec2.runInstances(createOptions, function(err, data) {
+ var server;
+ if (err) {
+ return callback(err);
+ }
- self._toArray(body.instancesSet.item).forEach(function (instance) {
- instance.meta = meta;
- server = new compute.Server(self, instance);
- });
+ data.Instances.forEach(function (instance) {
+ instance.meta = meta;
+ server = new compute.Server(self, instance);
+ });
- callback(null, server, res);
- }
- );
+ callback(null, server);
+ });
};
//
@@ -208,17 +204,16 @@ exports.createServer = function createServer(options, callback) {
// Destroy a server in AWS.
//
exports.destroyServer = function destroyServer(server, callback) {
- var serverId = server instanceof base.Server ? server.id : server;
-
- return this._query(
- 'TerminateInstances',
- { InstanceId: serverId },
- function (err, body, res) {
- return err
- ? callback && callback(err)
- : callback && callback(null, { ok: serverId }, res);
- }
- );
+ var self = this,
+ serverId = server instanceof base.Server ? server.id : server;
+
+ self.ec2.terminateInstances({
+ InstanceIds: [ serverId ]
+ }, function(err) {
+ return err
+ ? callback && callback(err)
+ : callback && callback(null, { ok: serverId });
+ });
};
//
@@ -232,26 +227,21 @@ exports.getServer = function getServer(server, callback) {
var self = this,
serverId = server instanceof base.Server ? server.id : server;
- return this._query(
- 'DescribeInstances',
- {
- 'InstanceId.1' : serverId,
- 'Filter.1.Name': 'instance-state-code',
- 'Filter.1.Value.1': 0, // pending
- 'Filter.1.Value.2': 16, // running
- 'Filter.1.Value.3': 32, // shutting down
- 'Filter.1.Value.4': 64, // stopping
- 'Filter.1.Value.5': 80 // stopped
- },
- function (err, body, res) {
+ self.ec2.describeInstances({
+ InstanceIds: [ serverId ],
+ Filters: [
+ { Name: 'instance-state-code',
+ Values : [ '0', '16', '32', '64', '80' ] }
+ ]
+ }, function (err, data) {
var server;
if (err) {
return callback(err);
}
- self._toArray(body.reservationSet.item).forEach(function (reservation) {
- self._toArray(reservation.instancesSet.item).forEach(function (instance) {
+ data.Reservations.forEach(function(reservation) {
+ reservation.Instances.forEach(function (instance) {
server = instance;
});
});
@@ -261,7 +251,10 @@ exports.getServer = function getServer(server, callback) {
}
self._getDetails(server, function (err, server) {
- if (err) return callback(err);
+ if (err) {
+ return callback(err);
+ }
+
callback(null, new compute.Server(self, server));
});
}
@@ -277,17 +270,16 @@ exports.getServer = function getServer(server, callback) {
// Reboots a server
//
exports.rebootServer = function rebootServer(server, callback) {
- var serverId = server instanceof base.Server ? server.id : server;
-
- return this._query(
- 'RebootInstances',
- { InstanceId: serverId },
- function (err, body, res) {
- return err
- ? callback(err)
- : callback(null, { ok: serverId }, res);
- }
- );
+ var self = this,
+ serverId = server instanceof base.Server ? server.id : server;
+
+ self.ec2.rebootInstances({
+ InstanceIds: [ serverId ]
+ }, function (err) {
+ return err
+ ? callback && callback(err)
+ : callback && callback(null, { ok: serverId });
+ });
};
//
diff --git a/lib/pkgcloud/amazon/compute/flavor.js b/lib/pkgcloud/amazon/compute/flavor.js
index 894477ca9..50325b37f 100644
--- a/lib/pkgcloud/amazon/compute/flavor.js
+++ b/lib/pkgcloud/amazon/compute/flavor.js
@@ -1,42 +1,78 @@
/*
* flavor.js: AWS Cloud Package
*
- * (C) 2012 Nodejitsu Inc.
+ * (C) 2012 Charlie Robbins, Ken Perkins, Ross Kukulinski & the Contributors.
*
*/
-var utile = require('utile'),
- base = require('../../core/compute/flavor');
+var util = require('util'),
+ base = require('../../core/compute/flavor'),
+ _ = require('lodash');
var Flavor = exports.Flavor = function Flavor(client, details) {
base.Flavor.call(this, client, details);
};
-utile.inherits(Flavor, base.Flavor);
+util.inherits(Flavor, base.Flavor);
Flavor.options = {
- 'm1.small': { ram: 1.7 * 1024, disk: 160 },
- 'm1.medium': { ram: 3.75 * 1024, disk: 410 },
- 'm1.large': { ram: 7.5 * 1024, disk: 850 },
- 'm1.xlarge': { ram: 15 * 1024, disk: 1690 },
- 'c1.medium': { ram: 1.7 * 1024, disk: 350 },
- 'c1.xlarge': { ram: 7 * 1024, disk: 1690 },
- 'm2.xlarge': { ram: 17.1 * 1024, disk: 420 },
- 'm2.2xlarge': { ram: 34.2 * 1024, disk: 850 },
- 'm2.4xlarge': { ram: 68.4 * 1024, disk: 1690 },
- 'cc1.4xlarge': { ram: 23 * 1024, disk: 1690 },
- 'cg1.4xlarge': { ram: 22 * 1024, disk: 1690 },
- 'cc2.8xlarge': { ram: 60.5 * 1024, disk: 3370 },
- 't1.micro': { ram: 613, disk: 0 }
+
+ // Previous Generation Instance Types
+ 'm1.small': { id: 'm1.small', ram: 1.7 * 1024, disk: 160 },
+ 'm1.medium': { id: 'm1.medium', ram: 3.75 * 1024, disk: 410 },
+ 'm1.large': { id: 'm1.large', ram: 7.5 * 1024, disk: 2 * 420 },
+ 'm1.xlarge': { id: 'm1.xlarge', ram: 15 * 1024, disk: 4 * 420 },
+ 'c1.medium': { id: 'c1.medium', ram: 1.7 * 1024, disk: 350 },
+ 'c1.xlarge': { id: 'c1.xlarge', ram: 7 * 1024, disk: 4 * 420 },
+ 'cc2.8xlarge': { id: 'cc2.8xlarge', ram: 60.5 * 1024, disk: 4 * 840 },
+ 'm2.xlarge': { id: 'm2.xlarge', ram: 17.1 * 1024, disk: 420 },
+ 'm2.2xlarge': { id: 'm2.2xlarge', ram: 34.2 * 1024, disk: 850 },
+ 'm2.4xlarge': { id: 'm2.4xlarge', ram: 68.4 * 1024, disk: 2 * 840 },
+ 'cr1.8xlarge': { id: 'cr1.8xlarge', ram: 244 * 1024, disk: 2 * 120 },
+ 'hi1.4xlarge': { id: 'hi1.4xlarge', ram: 60.5 * 1024, disk: 2 * 1024 },
+ 'cg1.4xlarge': { id: 'cg1.4xlarge', ram: 22.5 * 1024, disk: 2 * 840 },
+ 't1.micro': { id: 't1.micro', ram: 613, disk: 0},
+
+ // Current Generation Instance Types
+ 't2.micro': { id: 't2.micro', ram: 1024, disk: 0 },
+ 't2.small': { id: 't2.small', ram: 2 * 1024, disk: 0 },
+ 't2.medium': { id: 't2.medium', ram: 4 * 1024, disk: 0 },
+ 'm3.medium': { id: 'm3.medium', ram: 3.75 * 1024, disk: 4 },
+ 'm3.large': { id: 'm3.large', ram: 7.5 * 1024, disk: 32 },
+ 'm3.xlarge': { id: 'm3.xlarge', ram: 15 * 1024, disk: 2 * 40 },
+ 'm3.2xlarge': { id: 'm3.2xlarge', ram: 30 * 1024, disk: 2 * 80 },
+ 'c3.large': { id: 'c3.large', ram: 3.75 * 1024, disk: 2 * 16 },
+ 'c3.xlarge': { id: 'c3.xlarge', ram: 7.5 * 1024, disk: 2 * 40 },
+ 'c3.2xlarge': { id: 'c3.2xlarge', ram: 15 * 1024, disk: 2 * 80 },
+ 'c3.4xlarge': { id: 'c3.4xlarge', ram: 30 * 1024, disk: 2 * 160 },
+ 'c3.8xlarge': { id: 'c3.8xlarge', ram: 60 * 1024, disk: 2 * 320 },
+ 'g2.2xlarge': { id: 'g2.2xlarge', ram: 15 * 1024, disk: 60 },
+ 'r3.large': { id: 'r3.large', ram: 15.25 * 1024, disk: 32 },
+ 'r3.xlarge': { id: 'r3.xlarge', ram: 30.5 * 1024, disk: 80 },
+ 'r3.2xlarge': { id: 'r3.2xlarge', ram: 61 * 1024, disk: 160 },
+ 'r3.4xlarge': { id: 'r3.4xlarge', ram: 122 * 1024, disk: 320 },
+ 'r3.8xlarge': { id: 'r3.8xlarge', ram: 244 * 1024, disk: 2 * 320 },
+ 'i2.xlarge': { id: 'i2.xlarge', ram: 30.5 * 1024, disk: 800 },
+ 'i2.2xlarge': { id: 'i2.2xlarge', ram: 61 * 1024, disk: 2 * 800 },
+ 'i2.4xlarge': { id: 'i2.4xlarge', ram: 122 * 1024, disk: 4 * 800 },
+ 'i2.8xlarge': { id: 'i2.8xlarge', ram: 244 * 1024, disk: 8 * 800 },
+ 'hs1.8xlarge': { id: 'hs1.8xlarge', ram: 117 * 1024, disk: 24 * 2000 }
+
};
Flavor.prototype._setProperties = function (details) {
var id = details.name || 'm1.small';
- if (!Flavor.options[id]) throw new TypeError('No such AWS Flavor: ' + id);
+ if (!Flavor.options[id]) {
+ throw new TypeError('No such AWS Flavor: ' + id);
+ }
this.id = id;
this.name = id;
this.ram = Flavor.options[id].ram;
this.disk = Flavor.options[id].disk;
};
+
+Flavor.prototype.toJSON = function () {
+ return _.pick(this, ['id', 'name', 'ram', 'disk' ]);
+};
\ No newline at end of file
diff --git a/lib/pkgcloud/amazon/compute/image.js b/lib/pkgcloud/amazon/compute/image.js
index 5648bbafc..2af52b309 100644
--- a/lib/pkgcloud/amazon/compute/image.js
+++ b/lib/pkgcloud/amazon/compute/image.js
@@ -1,22 +1,28 @@
/*
* image.js: AWS Cloud
*
- * (C) 2012 Nodejitsu Inc.
+ * (C) 2012 Charlie Robbins, Ken Perkins, Ross Kukulinski & the Contributors.
*
*/
-var utile = require('utile'),
- base = require('../../core/compute/image');
+var util = require('util'),
+ base = require('../../core/compute/image'),
+ _ = require('lodash');
var Image = exports.Image = function Image(client, details) {
base.Image.call(this, client, details);
};
-utile.inherits(Image, base.Image);
+util.inherits(Image, base.Image);
Image.prototype._setProperties = function (details) {
- this.id = details.imageId;
- this.name = details.name || details.imageLocation.split('/')[1];
+ this.id = details.imageId || details.ImageId;
+ this.name = details.Name || details.ImageLocation.split('/')[1];
this.created = new Date(0);
+ this.blockDeviceMappings = details.BlockDeviceMappings;
this.details = this.amazon = details;
};
+
+Image.prototype.toJSON = function () {
+ return _.pick(this, ['id', 'name', 'created', 'blockDeviceMappings']);
+};
diff --git a/lib/pkgcloud/amazon/compute/index.js b/lib/pkgcloud/amazon/compute/index.js
index 1fe951fee..e2d4b17a9 100644
--- a/lib/pkgcloud/amazon/compute/index.js
+++ b/lib/pkgcloud/amazon/compute/index.js
@@ -1,7 +1,7 @@
/*
* index.js: Top-level include for the AWS compute module
*
- * (C) 2012 Nodejitsu Inc.
+ * (C) 2012 Charlie Robbins, Ken Perkins, Ross Kukulinski & the Contributors.
*
*/
diff --git a/lib/pkgcloud/amazon/compute/server.js b/lib/pkgcloud/amazon/compute/server.js
index 818a6c608..e0cd396fc 100644
--- a/lib/pkgcloud/amazon/compute/server.js
+++ b/lib/pkgcloud/amazon/compute/server.js
@@ -1,25 +1,26 @@
/*
* server.js: AWS Server
*
- * (C) 2012 Nodejitsu Inc.
+ * (C) 2012 Charlie Robbins, Ken Perkins, Ross Kukulinski & the Contributors.
*
*/
-var utile = require('utile'),
- base = require('../../core/compute/server');
+var util = require('util'),
+ base = require('../../core/compute/server'),
+ _ = require('lodash');
var Server = exports.Server = function Server(client, details) {
base.Server.call(this, client, details);
};
-utile.inherits(Server, base.Server);
+util.inherits(Server, base.Server);
Server.prototype._setProperties = function (details) {
- this.id = details.instanceId;
+ this.id = details.InstanceId || details.instanceId;
this.name = details.name || (details.meta || {}).name;
- if (details.instanceState) {
- switch (details.instanceState.name.toUpperCase()) {
+ if (details.State) {
+ switch (details.State.Name.toUpperCase()) {
case 'PENDING':
this.status = this.STATUS.provisioning;
break;
@@ -41,13 +42,13 @@ Server.prototype._setProperties = function (details) {
var addresses = { private: [], public: [] };
- ['ipAddress', 'dnsName'].forEach(function (prop) {
+ ['PublicIpAddress', 'PublicDnsName'].forEach(function (prop) {
if (typeof details[prop] === 'string') {
addresses.public.push(details[prop]);
}
});
- ['privateIpAddress', 'privateDnsName'].forEach(function (prop) {
+ ['PrivateIpAddress', 'PrivateDnsName'].forEach(function (prop) {
if (typeof details[prop] === 'string') {
addresses.private.push(details[prop]);
}
@@ -56,9 +57,13 @@ Server.prototype._setProperties = function (details) {
//
// AWS specific
//
- this.imageId = details.imageId;
- this.addresses = details.addresses = addresses;
- this.launchTime = details.launchTime;
- this.type = details.instanceType;
+ this.imageId = details.ImageId;
+ this.addresses = details.Addresses = addresses;
+ this.launchTime = details.LaunchTime;
+ this.flavorId = details.InstanceType;
this.original = this.amazon = details;
};
+
+Server.prototype.toJSON = function () {
+ return _.pick(this, ['id', 'name', 'status', 'image', 'addresses', 'launchTime', 'flavor' ]);
+};
diff --git a/lib/pkgcloud/amazon/index.js b/lib/pkgcloud/amazon/index.js
index b1b009ab8..ed8534b40 100644
--- a/lib/pkgcloud/amazon/index.js
+++ b/lib/pkgcloud/amazon/index.js
@@ -1,7 +1,7 @@
/*
* index.js: Top-level include for the AWS module.
*
- * (C) 2012 Nodejitsu Inc.
+ * (C) 2012 Charlie Robbins, Ken Perkins, Ross Kukulinski & the Contributors.
*
*/
diff --git a/lib/pkgcloud/amazon/storage/client/containers.js b/lib/pkgcloud/amazon/storage/client/containers.js
index 0bac80377..da71aefd2 100644
--- a/lib/pkgcloud/amazon/storage/client/containers.js
+++ b/lib/pkgcloud/amazon/storage/client/containers.js
@@ -1,13 +1,11 @@
/*
* containers.js: Instance methods for working with containers from AWS S3
*
- * (C) 2012 Nodejitsu Inc.
+ * (C) 2012 Charlie Robbins, Ken Perkins, Ross Kukulinski & the Contributors.
*
*/
var async = require('async'),
- request = require('request'),
- base = require('../../../core/storage'),
pkgcloud = require('../../../../../lib/pkgcloud'),
storage = pkgcloud.providers.amazon.storage;
@@ -19,20 +17,19 @@ var async = require('async'),
exports.getContainers = function (callback) {
var self = this;
- this._xmlRequest({
- path: '/'
- }, function (err, body) {
+ self.s3.listBuckets(function(err, data) {
if (err) {
- return callback(err);
+ callback(err);
+ return;
}
- var containers = self._toArray(body.Buckets.Bucket);
+ var containers = data.Buckets;
- containers = containers.map(function (container) {
+ containers = containers.map(function(container) {
return new (storage.Container)(self, container);
});
- callback(null, containers);
+ callback(err, containers);
});
};
@@ -47,12 +44,12 @@ exports.getContainer = function (container, callback) {
var containerName = container instanceof storage.Container ? container.name : container,
self = this;
- this._xmlRequest({
- container: containerName
- }, function (err, body) {
+ self.s3.listObjects({
+ Bucket: containerName
+ }, function(err, data) {
return err
? callback(err)
- : callback(null, new (storage.Container)(self, body));
+ : callback(null, new (storage.Container)(self, data));
});
};
@@ -64,13 +61,12 @@ exports.getContainer = function (container, callback) {
// with this instance.
//
exports.createContainer = function (options, callback) {
- var containerName = options instanceof base.Container ? options.name : options,
+ var containerName = options instanceof storage.Container ? options.name : options,
self = this;
- this._xmlRequest({
- method: 'PUT',
- container: containerName
- }, function (err) {
+ self.s3.createBucket({
+ Bucket: containerName
+ }, function(err) {
return err
? callback(err)
: callback(null, new (storage.Container)(self, options));
@@ -84,38 +80,61 @@ exports.createContainer = function (options, callback) {
// Destroys the specified `container` and all files in it.
//
exports.destroyContainer = function (container, callback) {
- var containerName = container instanceof base.Container ? container.name : container,
+ var containerName = container instanceof storage.Container ? container.name : container,
self = this;
- this.getFiles(containerName, false, function (err, files) {
+ function getPagedFiles(containerName, marker, callback) {
+ var options = {};
+
+ if (marker) {
+ options.marker = marker;
+ }
+
+ self.getFiles(containerName, marker, callback);
+ }
+
+ function deleteContainer(err) {
if (err) {
return callback(err);
}
- function deleteContainer(err) {
- if (err) {
- return callback(err);
+ self.s3.deleteBucket({
+ Bucket: containerName
+ }, function (err) {
+ return err
+ ? callback(err)
+ : callback(null, true);
}
+ );
+ }
+
+ function destroyFile(file, next) {
+ file.remove(next);
+ }
+
+ function deleteFiles(files, next) {
+ async.forEachLimit(files, 10, destroyFile, next);
+ }
+
+ function handleResponse(err, files, meta) {
+ if (err) {
+ return callback(err);
+ }
- self._xmlRequest({
- method: 'DELETE',
- container: containerName
- }, function (err, body, res) {
- return err
- ? callback(err)
- : callback(null, res.statusCode == 204);
+ if (meta.isTruncated) {
+ deleteFiles(files, function (err) {
+ if (err) {
+ callback(err);
+ return;
}
- );
- }
- function destroyFile(file, next) {
- file.remove(next);
+ getPagedFiles(containerName, files[files.length - 1].name, handleResponse);
+ });
+ return;
}
- if (files.length === 0) {
- return deleteContainer();
- }
+ deleteFiles(files, deleteContainer);
+ }
- async.forEach(files, destroyFile, deleteContainer);
- });
+ getPagedFiles(containerName, handleResponse);
};
diff --git a/lib/pkgcloud/amazon/storage/client/files.js b/lib/pkgcloud/amazon/storage/client/files.js
index 9ed678faf..7065e71a0 100644
--- a/lib/pkgcloud/amazon/storage/client/files.js
+++ b/lib/pkgcloud/amazon/storage/client/files.js
@@ -1,21 +1,15 @@
/*
* files.js: Instance methods for working with files from AWS S3
*
- * (C) 2012 Nodejitsu Inc.
+ * (C) 2012 Charlie Robbins, Ken Perkins, Ross Kukulinski & the Contributors.
*
*/
-var fs = require('fs'),
- filed = require('filed'),
- mime = require('mime'),
- request = require('request'),
- utile = require('utile'),
- qs = require('querystring'),
- base = require('../../../core/storage'),
+var base = require('../../../core/storage'),
pkgcloud = require('../../../../../lib/pkgcloud'),
- storage = pkgcloud.providers.amazon.storage;
-
-const MAX_UPLOAD = 5 * 1024 * 1024 * 1024;
+ through = require('through2'),
+ storage = pkgcloud.providers.amazon.storage,
+ _ = require('lodash');
//
// ### function removeFile (container, file, callback)
@@ -25,6 +19,8 @@ const MAX_UPLOAD = 5 * 1024 * 1024 * 1024;
// Destroys the `file` in the specified `container`.
//
exports.removeFile = function (container, file, callback) {
+ var self = this;
+
if (container instanceof storage.Container) {
container = container.name;
}
@@ -33,320 +29,110 @@ exports.removeFile = function (container, file, callback) {
file = file.name;
}
- this._request({
- method: 'DELETE',
- container: container,
- path: file
- },
- function (err, body, res) {
- return err
- ? callback(err)
- : callback(null, res.statusCode == 204);
+ self.s3.deleteObject({
+ Bucket: container,
+ Key: file
+ }, function(err, data) {
+ return err
+ ? callback(err)
+ : callback(null, !!data.DeleteMarker);
});
};
-exports.upload = function (options, callback) {
- if (typeof options === 'function' && !callback) {
- callback = options;
- options = {};
- }
+exports.upload = function (options) {
+ var self = this;
- //
- // Optional helper function passed to `this._request`
- // in the case when no callback is passed to `.upload(options)`.
- //
- function onUpload(err, body, res) {
- return err
- ? callback(err)
- : callback(null, res.statusCode == 200, res);
+ // check for deprecated calling with a callback
+ if (typeof arguments[arguments.length - 1] === 'function') {
+ self.emit('log::warn', 'storage.upload no longer supports calling with a callback');
}
- var container = options.container,
- success = callback ? onUpload : null,
- apiStream,
- inputStream;
-
- if (container instanceof storage.Container) {
- container = container.name;
- }
+ var s3Options = {
+ Bucket: options.container instanceof base.Container ? options.container.name : options.container,
+ Key: options.remote instanceof base.File ? options.remote.name : options.remote
+ };
- options.headers = options.headers || {};
+ var s3Settings = {
+ queueSize: options.queueSize || 1,
+ partSize: options.partSize || 5 * 1024 * 1024
+ };
- if (options.local) {
- inputStream = filed(options.local);
- options.headers['content-length'] = fs.statSync(options.local).size;
- }
- else if (options.stream) {
- inputStream = options.stream;
+ if (options.cacheControl) {
+ s3Options.CacheControl = options.cacheControl;
}
- if (options.headers && !options.headers['content-type'] && options.remote) {
- options.headers['content-type'] = mime.lookup(options.remote);
+ if (options.contentType) {
+ s3Options.ContentType = options.contentType;
}
-
- // If the content-length is greater than 5gb, we need to force the
- // multi-part path by nuking the content-length header
- if (options.headers['content-length'] !== undefined &&
- parseInt(options.headers['content-length'], 10) > MAX_UPLOAD) {
- delete options.headers['content-length'];
+
+ if (options.contentEncoding) {
+ s3Options.ContentEncoding = options.contentEncoding;
}
- if (options.headers['content-length'] !== undefined) {
- // Regular upload
- apiStream = this._request({
- method: 'PUT',
- upload: true,
- container: container,
- path: options.remote,
- headers: options.headers || {}
- }, success);
- } else {
- // Multi-part, 5mb chunk upload
- apiStream = this.multipartUpload(options, success);
+ // use ACL until a more obvious permission generalization is available
+ if (options.acl) {
+ s3Options.ACL = options.acl;
}
- if (inputStream) {
- inputStream.pipe(apiStream);
+ // add AWS specific options
+ if (options.cacheControl) {
+ s3Options.CacheControl = options.cacheControl;
}
- return apiStream;
-};
-
-exports.multipartUpload = function (options, callback) {
- var self = this,
- container = options.container,
- chunk = 5 * 1024 * 1024,
- chunksStarted = 0,
- chunksFinished = [],
- stream = new storage.ChunkedStream(chunk),
- ended = false;
-
- if (container instanceof storage.Container) {
- container = container.name;
+ if (options.ServerSideEncryption) {
+ s3Options.ServerSideEncryption = options.ServerSideEncryption;
}
- // We're doing a lot of parallel stuff there,
- // but callback should be called only once
- function handleResponse(err, body, res) {
- if (handleResponse.called) return;
- handleResponse.called = true;
- callback && callback(err, body, res);
- }
+ // we need a writable stream because aws-sdk listens for an error event on writable
+ // stream and redirects it to the provided callback - without the writable stream
+ // the error would be emitted twice on the returned proxyStream
+ var writableStream = through();
+ // we need a proxy stream so we can always return a file model
+ // via the 'success' event
+ var proxyStream = through();
- handleResponse.called = false;
-
- // Wait for first data event, probably file is less than 5 mbs and
- // we don't need that multipart thing at all
- var first = null,
- fastCase = true;
-
- stream.once('data', function (data) {
- // Good case - all data fits in one chunk
- if (fastCase) {
- if (data.length < chunk && !first) {
- first = data;
- return;
- } else {
- fastCase = false;
-
- // Emit accumulated chunk
- self.emit('data', first);
- first = null;
- }
- }
+ s3Options.Body = writableStream;
- stream.pause();
- self._xmlRequest({
- method: 'POST',
- container: container,
- // Don't use the qs option here because there's no way to turn an object
- // parsed with qs into just ?uploads. i.e. { uploads: null } turns into
- // '?uploads=' which breaks signing
- path: options.remote + '?uploads'
- }, function (err, body, res) {
- if (err) {
- return handleResponse(err);
- }
-
- if (res.statusCode !== 200) return handleResponse(res.statusCode, res);
-
- // Upload rest
- function onChunk(chunk) {
- stream.pause();
- uploadChunk(body.UploadId, chunk, function (err, chunk) {
- if (err) return handleResponse(err);
-
- finish(chunk);
- stream.resume();
- });
- }
- stream.on('data', onChunk);
-
- // Upload existing chunk
- onChunk(data);
- }
- );
- });
+ var managedUpload = self.s3.upload(s3Options, s3Settings);
- stream.on('end', function () {
- if (fastCase) {
- // Upload with default method once again
- var rstream = self.upload(utile.mixin({}, options, {
- stream: null,
- headers: utile.mixin({}, options.headers, {
- 'content-length': first.length
- })
- }), handleResponse);
- rstream.end(first);
- return;
- }
+ proxyStream.managedUpload = managedUpload;
- ended = true;
- finish();
- });
-
- function uploadChunk(uploadId, data, uploadCallback) {
- // Ignore empty chunks
- if (data.length === 0) return;
-
- var id = ++chunksStarted,
- chunk = {
- uploadId: uploadId,
- id: id,
- etag: null
- };
-
- var stream = self._request({
- method: 'PUT',
- upload: true,
- path: options.remote,
- container: container,
- qs: {
- partNumber: id,
- uploadId: uploadId
- },
- headers: utile.mixin({}, options.headers, {
- 'content-length': data.length
- })
- }, function (err, body, res) {
- if (err) { return uploadCallback(err); }
- if (res.statusCode != 200) return uploadCallback(res.statusCode);
-
- chunk.etag = res.headers.etag;
- uploadCallback(null, chunk);
- });
- stream.write(data);
- stream.end();
- }
-
- function finish(chunk) {
- if (chunk) chunksFinished.push(chunk);
-
- // We must send request only if:
- // - stream was ended
- // - we was doing multipart request
- // - all chunks were uploaded
- if (!ended ||
- chunksFinished.length === 0 ||
- chunksFinished.length !== chunksStarted) {
- return;
+ managedUpload.send(function(err, data) {
+ if (err) {
+ return proxyStream.emit('error', err);
}
+ return proxyStream.emit('success', new storage.File(self, data));
+ });
- // Sort chunks in ascending order
- chunksFinished.sort(function (a, b) {
- return a.id > b.id ? 1 : a.id < b.id ? -1 : 0;
- });
-
- var body = '' +
- chunksFinished.map(function (chunk) {
- return '' +
- '' + chunk.id + ' ' +
- '' + chunk.etag + ' ' +
- ' ';
- }).join('') +
- ' ';
-
- // Send "Complete Multipart Upload" request
- self._request({
- method: 'POST',
- container: container,
- path: options.remote,
- qs: {
- uploadId: chunksFinished[0].uploadId
- },
- headers: {
- 'Content-Length': Buffer.byteLength(body)
- },
- body: body
- }, function (err, body, res) {
- handleResponse(err, res.statusCode == 200);
- });
- }
+ proxyStream.pipe(writableStream);
- return stream;
+ return proxyStream;
};
-exports.download = function (options, callback) {
- var self = this,
- success = callback ? onDownload : null,
- container = options.container,
- inputStream,
- apiStream;
-
- //
- // Optional helper function passed to `this._request`
- // in the case when no callback is passed to `.download(options)`.
- //
- function onDownload(err, body, res) {
- return err
- ? callback(err)
- : callback(null, new (storage.File)(self, utile.mixin(res.headers, {
- container: container,
- name: options.remote
- })));
- }
+exports.download = function (options) {
+ var self = this;
- if (container instanceof storage.Container) {
- container = container.name;
- }
-
- if (options.local) {
- inputStream = filed(options.local);
- }
- else if (options.stream) {
- inputStream = options.stream;
- }
+ return self.s3.getObject({
+ Bucket: options.container instanceof base.Container ? options.container.name : options.container,
+ Key: options.remote instanceof base.File ? options.remote.name : options.remote
+ }).createReadStream();
- apiStream = this._request({
- path: options.remote,
- container: container,
- download: true
- }, success);
-
- if (inputStream) {
- apiStream.pipe(inputStream);
- }
-
- return apiStream;
};
exports.getFile = function (container, file, callback) {
var containerName = container instanceof base.Container ? container.name : container,
self = this;
- this._request(
- {
- method: 'HEAD',
- container: containerName,
- path: file
- },
- function (err, body, res) {
- return err
- ? callback(err)
- : callback(null, new storage.File(self, utile.mixin(res.headers, {
- container: container,
- name: file
- })));
+ self.s3.headObject({
+ Bucket: containerName,
+ Key: file
+ }, function(err, data) {
+ return err
+ ? callback(err)
+ : callback(null, new storage.File(self, _.extend(data, {
+ container: container,
+ name: file
+ })));
});
};
@@ -356,22 +142,39 @@ exports.getFiles = function (container, options, callback) {
if (typeof options === 'function') {
callback = options;
- options = null;
+ options = {};
+ }
+ else if (!options) {
+ options = {};
}
- this._xmlRequest(
- {
- container: containerName,
- qs: options
- },
- function (err, body, res) {
- return err
- ? callback(err)
- : callback(null, self._toArray(body.Contents).map(function (file) {
- file.container = container;
- return new storage.File(self, file);
- }));
- }
- );
+ var s3Options = {
+ Bucket: containerName
+ };
+
+ if (options.marker) {
+ s3Options.Marker = options.marker;
+ }
+
+ if (options.prefix) {
+ s3Options.Prefix = options.prefix;
+ }
+
+ if (options.maxKeys) {
+ s3Options.MaxKeys = options.maxKeys;
+ }
+
+ self.s3.listObjects(s3Options, function(err, data) {
+ return err
+ ? callback(err)
+ : callback(null, self._toArray(data.Contents).map(function (file) {
+ file.container = container;
+ return new storage.File(self, file);
+ }), {
+ isTruncated: data.IsTruncated,
+ marker: data.Marker,
+ nextMarker: data.NextMarker
+ });
+ });
};
diff --git a/lib/pkgcloud/amazon/storage/client/index.js b/lib/pkgcloud/amazon/storage/client/index.js
index 5c47db546..f8d7a6e94 100644
--- a/lib/pkgcloud/amazon/storage/client/index.js
+++ b/lib/pkgcloud/amazon/storage/client/index.js
@@ -1,59 +1,22 @@
/*
* client.js: Storage client for AWS S3
*
- * (C) 2011 Nodejitsu Inc.
+ * (C) 2011 Charlie Robbins, Ken Perkins, Ross Kukulinski & the Contributors.
*
*/
-var utile = require('utile'),
- urlJoin = require('url-join'),
- xml2js = require('xml2js'),
- auth = require('../../../common/auth'),
- amazon = require('../../client');
+var util = require('util'),
+ AWS = require('aws-sdk'),
+ amazon = require('../../client'),
+ _ = require('lodash');
var Client = exports.Client = function (options) {
- this.serversUrl = 's3.amazonaws.com';
-
amazon.Client.call(this, options);
- utile.mixin(this, require('./containers'));
- utile.mixin(this, require('./files'));
+ _.extend(this, require('./containers'));
+ _.extend(this, require('./files'));
- this.before.push(auth.amazon.headersSignature);
+ this.s3 = new AWS.S3(this._awsConfig);
};
-utile.inherits(Client, amazon.Client);
-
-Client.prototype._xmlRequest = function query(options, callback) {
-
- if (typeof options === 'function') {
- callback = options;
- options = {};
- }
-
- return this._request(options, function (err, body, res) {
-
- if (err) {
- return callback(err);
- }
- var parser = new xml2js.Parser();
-
- parser.parseString(body || '', function (err, data) {
- return err
- ? callback(err)
- : callback(null, data, res);
- });
- });
-};
-
-Client.prototype._getUrl = function (options) {
- options = options || {};
-
- if (typeof options === 'string') {
- return urlJoin('https://' + this.serversUrl, options);
- }
-
- return urlJoin('https://' +
- (options.container ? options.container + '.' : '') +
- this.serversUrl, options.path);
-};
+util.inherits(Client, amazon.Client);
diff --git a/lib/pkgcloud/amazon/storage/container.js b/lib/pkgcloud/amazon/storage/container.js
index ec01c99c3..1a2524e1a 100644
--- a/lib/pkgcloud/amazon/storage/container.js
+++ b/lib/pkgcloud/amazon/storage/container.js
@@ -1,19 +1,20 @@
/*
* container.js: AWS S3 Bucket
*
- * (C) 2012 Nodejitsu Inc.
+ * (C) 2012 Charlie Robbins, Ken Perkins, Ross Kukulinski & the Contributors.
*
*/
-var utile = require('utile'),
+var util = require('util'),
storage = require('../storage'),
- base = require('../../core/storage/container');
+ base = require('../../core/storage/container'),
+ _ = require('lodash');
var Container = exports.Container = function Container(client, details) {
base.Container.call(this, client, details);
};
-utile.inherits(Container, base.Container);
+util.inherits(Container, base.Container);
Container.prototype._setProperties = function (details) {
var self = this;
@@ -33,9 +34,14 @@ Container.prototype._setProperties = function (details) {
this.isTruncated = details.IsTruncated === 'true';
if (details.Contents) {
- this.client._toArray(details.Contents).forEach(function (file) {
+ details.Contents.forEach(function (file) {
file.container = self;
self.files.push(new storage.File(self.client, file));
});
}
};
+
+Container.prototype.toJSON = function () {
+ return _.pick(this, ['name', 'maxKeys', 'isTruncated' ]);
+};
+
diff --git a/lib/pkgcloud/amazon/storage/file.js b/lib/pkgcloud/amazon/storage/file.js
index d7ae0ceae..cf414df4b 100644
--- a/lib/pkgcloud/amazon/storage/file.js
+++ b/lib/pkgcloud/amazon/storage/file.js
@@ -1,26 +1,34 @@
/*
* container.js: AWS S3 File
*
- * (C) 2012 Nodejitsu Inc.
+ * (C) 2012 Charlie Robbins, Ken Perkins, Ross Kukulinski & the Contributors.
*
*/
-var utile = require('utile'),
- base = require('../../core/storage/file');
+var util = require('util'),
+ base = require('../../core/storage/file'),
+ _ = require('lodash');
var File = exports.File = function File(client, details) {
base.File.call(this, client, details);
};
-utile.inherits(File, base.File);
+util.inherits(File, base.File);
File.prototype._setProperties = function (details) {
- var self = this;
-
this.name = details.name || details.Key;
- this.size = +(details.Size || details['content-length']) || 0;
- this.container = details.container;
+ this.etag = details.ETag || details.etag || null;
+ this.lastModified = details.LastModified || details.lastModified || null;
+ this.size = +(details.Size || details['content-length'] || details.ContentLength) || 0;
+ this.container = details.container || details.Bucket;
+ this.location = details.location || details.Location;
+ // amazon appears to send the etag double enquoted
+ this.etag = this.etag ? this.etag.replace(/"/g,'') : this.etag;
// AWS Specific
- this.storageClass = this.StorageClass;
+ this.storageClass = details.StorageClass || this.StorageClass;
+};
+
+File.prototype.toJSON = function () {
+ return _.pick(this, ['name', 'etag', 'size', 'storageClass', 'lastModified', 'container', 'location' ]);
};
diff --git a/lib/pkgcloud/amazon/storage/index.js b/lib/pkgcloud/amazon/storage/index.js
index 7d0432889..a7e4e5193 100644
--- a/lib/pkgcloud/amazon/storage/index.js
+++ b/lib/pkgcloud/amazon/storage/index.js
@@ -1,14 +1,13 @@
/*
* index.js: Top-level include for the AWS S3 module
*
- * (C) 2012 Nodejitsu Inc.
+ * (C) 2012 Charlie Robbins, Ken Perkins, Ross Kukulinski & the Contributors.
*
*/
exports.Client = require('./client').Client;
exports.Container = require('./container').Container;
exports.File = require('./file').File;
-exports.ChunkedStream = require('./utils').ChunkedStream;
exports.createClient = function (options) {
return new exports.Client(options);
diff --git a/lib/pkgcloud/amazon/storage/utils.js b/lib/pkgcloud/amazon/storage/utils.js
deleted file mode 100644
index 5418ab998..000000000
--- a/lib/pkgcloud/amazon/storage/utils.js
+++ /dev/null
@@ -1,99 +0,0 @@
-var util = require('util'),
- Stream = require('stream').Stream;
-
-var ChunkedStream = exports.ChunkedStream = function ChunkedStream(chunk) {
- Stream.call(this);
-
- this.writable = true;
- this.readable = true;
-
- this.ended = false;
- this.paused = false;
- this.size = 0;
- this.chunk = chunk;
- this.buffer = [];
- this.chunkBuffer = [];
-};
-
-util.inherits(ChunkedStream, Stream);
-
-ChunkedStream.prototype.write = function write(data, encoding) {
- if (!Buffer.isBuffer(data)) {
- data = new Buffer(data, encoding);
- }
-
- this.buffer.push(data);
- this.size += data.length;
-
- // Split data in chunks
- while (this.size >= this.chunk) {
- var total = 0,
- parts = [];
-
- this.buffer = this.buffer.filter(function (part) {
- if (total >= this.chunk) return true;
-
- parts.push(part);
- total += part.length;
- return false;
- }, this);
-
- // Last chunk is bigger than we need
- if (total > this.chunk) {
- var last = parts[parts.length - 1],
- splitPos = last.length - total + this.chunk,
- head = last.slice(0, splitPos),
- tail = last.slice(splitPos);
-
- parts[parts.length - 1] = head;
-
- // Return tail back to main buffer
- this.buffer.unshift(tail);
- }
-
- this.emitChunk(Buffer.concat(parts, this.chunk));
- this.size -= this.chunk;
- }
-
- if (this.paused) return false;
-};
-
-ChunkedStream.prototype.end = function end() {
- if (this.ended) return;
-
- // Emit all left data
- var self = this;
- this.ended = true;
- this.emitChunk(Buffer.concat(this.buffer, this.size));
- this.buffer = [];
- this.size = 0;
-
- this.emit('end');
-};
-ChunkedStream.prototype.close = ChunkedStream.prototype.end;
-
-ChunkedStream.prototype.emitChunk = function emitChunk(chunk) {
- if (this.paused) {
- this.chunkBuffer.push(chunk);
- return;
- }
- this.emit('data', chunk);
-};
-
-ChunkedStream.prototype.pause = function pause() {
- if (this.paused) return;
- this.paused = true;
-};
-
-ChunkedStream.prototype.resume = function resume() {
- if (!this.paused) return;
- this.paused = false;
-
- // Emit all accumulated data
- this.chunkBuffer.forEach(function (chunk) {
- this.emit('data', chunk);
- }, this);
- this.chunkBuffer = [];
-
- this.emit('drain');
-};
diff --git a/lib/pkgcloud/azure/client.js b/lib/pkgcloud/azure/client.js
index 3ab008686..9ef30a2e2 100644
--- a/lib/pkgcloud/azure/client.js
+++ b/lib/pkgcloud/azure/client.js
@@ -5,8 +5,7 @@
*
*/
-var utile = require('utile'),
- request = require('request'),
+var util = require('util'),
base = require('../core/base');
var Client = exports.Client = function (options) {
@@ -23,7 +22,7 @@ var Client = exports.Client = function (options) {
}
};
-utile.inherits(Client, base.Client);
+util.inherits(Client, base.Client);
Client.prototype._toArray = function toArray(obj) {
if (typeof obj === 'undefined') {
diff --git a/lib/pkgcloud/azure/compute/client/images.js b/lib/pkgcloud/azure/compute/client/images.js
index 50976b49f..b6c37354e 100644
--- a/lib/pkgcloud/azure/compute/client/images.js
+++ b/lib/pkgcloud/azure/compute/client/images.js
@@ -6,7 +6,6 @@
*/
var pkgcloud = require('../../../../../lib/pkgcloud'),
base = require('../../../core/compute'),
- errs = require('errs'),
compute = pkgcloud.providers.azure.compute,
azureApi = require('../../utils/azureApi');
@@ -29,7 +28,7 @@ exports.getImages = function getImages(options, callback) {
return this.get(path, function (err, body, res) {
return err
? callback(err)
- : callback(null, self._toArray(body.OSImage).map(function (image) {
+ : callback(null, self._toArray(body.Images.OSImage).map(function (image) {
return new compute.Image(self, image);
}), res);
});
@@ -78,8 +77,13 @@ exports.getImage = function getImage(image, callback) {
exports.createImage = function createImage(options, callback) {
options || (options = {});
- if (!options.name) throw new TypeError('`name` is a required option');
- if (!options.server) throw new TypeError('`server` is a required option');
+ if (!options.name) {
+ throw new TypeError('`name` is a required option');
+ }
+
+ if (!options.server) {
+ throw new TypeError('`server` is a required option');
+ }
var self = this,
serverId = options.server instanceof base.Server
diff --git a/lib/pkgcloud/azure/compute/client/index.js b/lib/pkgcloud/azure/compute/client/index.js
index 6253ccffe..20b9d0ed4 100644
--- a/lib/pkgcloud/azure/compute/client/index.js
+++ b/lib/pkgcloud/azure/compute/client/index.js
@@ -5,22 +5,22 @@
*
*/
-var qs = require('querystring'),
- utile = require('utile'),
+var util = require('util'),
urlJoin = require('url-join'),
https = require('https'),
auth = require('../../../common/auth'),
azureApi = require('../../utils/azureApi.js'),
xml2JSON = require('../../utils/xml2json.js').xml2JSON,
- azure = require('../../client');
+ azure = require('../../client'),
+ _ = require('lodash');
var Client = exports.Client = function (options) {
azure.Client.call(this, options);
- utile.mixin(this, require('./flavors'));
- utile.mixin(this, require('./images'));
- utile.mixin(this, require('./servers'));
- utile.mixin(this, require('./keys'));
+ _.extend(this, require('./flavors'));
+ _.extend(this, require('./images'));
+ _.extend(this, require('./servers'));
+ _.extend(this, require('./keys'));
this.serversUrl = options.serversUrl || azureApi.MANAGEMENT_ENDPOINT;
this.version = azureApi.MANAGEMENT_API_VERSION;
@@ -47,13 +47,13 @@ var Client = exports.Client = function (options) {
}
};
-utile.inherits(Client, azure.Client);
+util.inherits(Client, azure.Client);
Client.prototype._query = function query(action, query, callback) {
return this._request({
method: 'POST',
headers: { },
- body: utile.mixin({ Action: action }, query)
+ body: _.extend({ Action: action }, query)
}, function (err, body, res) {
if (err) { return callback(err); }
xml2JSON(body, function (err, data) {
diff --git a/lib/pkgcloud/azure/compute/client/keys.js b/lib/pkgcloud/azure/compute/client/keys.js
index ef2597d84..500008670 100644
--- a/lib/pkgcloud/azure/compute/client/keys.js
+++ b/lib/pkgcloud/azure/compute/client/keys.js
@@ -5,8 +5,7 @@
*
*/
-var errs = require('errs'),
- utile = require('utile');
+var errs = require('errs');
//
// ### function listKeys (options, callback)
@@ -24,7 +23,7 @@ exports.listKeys = function (options, callback) {
var self = this;
options = options || {};
- return this._query('DescribeKeyPairs', options, function (err, body, res) {
+ return this._query('DescribeKeyPairs', options, function (err, body) {
return err
? callback(err)
: callback(null, self._toArray(body.keySet.item));
@@ -69,9 +68,9 @@ exports.addKey = function (options, callback) {
'ImportKeyPair',
{
KeyName: options.name,
- PublicKeyMaterial: utile.base64.encode(options.key)
+ PublicKeyMaterial: new Buffer(options.key).toString('base64')
},
- function (err, body, res) {
+ function (err) {
return err
? callback(err)
: callback(null, true);
@@ -90,10 +89,10 @@ exports.destroyKey = function (name, callback) {
return this._query(
'DeleteKeyPair',
{ KeyName: name },
- function (err, body, res) {
+ function (err) {
return err
? callback(err)
: callback(null, true);
}
);
-};
\ No newline at end of file
+};
diff --git a/lib/pkgcloud/azure/compute/client/servers.js b/lib/pkgcloud/azure/compute/client/servers.js
index 5bf226f59..4d47ca16c 100644
--- a/lib/pkgcloud/azure/compute/client/servers.js
+++ b/lib/pkgcloud/azure/compute/client/servers.js
@@ -4,8 +4,7 @@
* (C) Microsoft Open Technologies, Inc.
*
*/
-var async = require('async'),
- base = require('../../../core/compute'),
+var base = require('../../../core/compute'),
pkgcloud = require('../../../../../lib/pkgcloud'),
errs = require('errs'),
azureApi = require('../../utils/azureApi'),
@@ -29,7 +28,7 @@ exports.getVersion = function getVersion(callback) {
//
exports.getLimits = function getLimits(callback) {
return errs.handle(
- errs.create({ message: "Azure's API is not rate limited" }),
+ errs.create({ message: 'Azure\'s API is not rate limited' }),
callback
);
};
@@ -42,8 +41,7 @@ exports.getLimits = function getLimits(callback) {
// Lists all servers available to your account.
//
exports.getServers = function getServers(callback) {
- var self = this,
- servers = [];
+ var self = this;
azureApi.getServers(this, function (err, results) {
if (err) {
@@ -123,7 +121,7 @@ exports.createServer = function createServer(options, callback) {
exports.destroyServer = function destroyServer(server, callback) {
var serverId = server instanceof base.Server ? server.id : server;
- azureApi.destroyServer(this, serverId, function (err, res) {
+ azureApi.destroyServer(this, serverId, function (err) {
if (callback) {
return !err
? callback && callback(null, { ok: serverId })
@@ -142,7 +140,7 @@ exports.destroyServer = function destroyServer(server, callback) {
exports.stopServer = function stopServer(server, callback) {
var serverId = server instanceof base.Server ? server.id : server;
- azureApi.stopServer(this, serverId, function (err, res) {
+ azureApi.stopServer(this, serverId, function (err) {
return !err
? callback(null, { ok: serverId })
: callback(err);
@@ -174,7 +172,7 @@ exports.createHostedService = function createHostedService(serviceName, callback
exports.rebootServer = function rebootServer(server, callback) {
var serverId = server instanceof base.Server ? server.id : server;
- azureApi.rebootServer(this, serverId, function (err, res) {
+ azureApi.rebootServer(this, serverId, function (err) {
return !err
? callback(null, { ok: serverId })
: callback(err);
diff --git a/lib/pkgcloud/azure/compute/flavor.js b/lib/pkgcloud/azure/compute/flavor.js
index 1b17b8b60..ee2f5f66d 100644
--- a/lib/pkgcloud/azure/compute/flavor.js
+++ b/lib/pkgcloud/azure/compute/flavor.js
@@ -5,14 +5,14 @@
*
*/
-var utile = require('utile'),
+var util = require('util'),
base = require('../../core/compute/flavor');
var Flavor = exports.Flavor = function Flavor(client, details) {
base.Flavor.call(this, client, details);
};
-utile.inherits(Flavor, base.Flavor);
+util.inherits(Flavor, base.Flavor);
Flavor.options = {
'ExtraSmall': { ram: 0.768 * 1024, disk: 20 },
@@ -25,7 +25,9 @@ Flavor.options = {
Flavor.prototype._setProperties = function (details) {
var id = details.name || details.id || 'ExtraSmall';
- if (!Flavor.options[id]) throw new TypeError('No such Azure Flavor: ' + id);
+ if (!Flavor.options[id]) {
+ throw new TypeError('No such Azure Flavor: ' + id);
+ }
this.id = id;
this.name = id;
diff --git a/lib/pkgcloud/azure/compute/image.js b/lib/pkgcloud/azure/compute/image.js
index 38bb6b1f4..06a1682d7 100644
--- a/lib/pkgcloud/azure/compute/image.js
+++ b/lib/pkgcloud/azure/compute/image.js
@@ -5,14 +5,14 @@
*
*/
-var utile = require('utile'),
+var util = require('util'),
base = require('../../core/compute/image');
var Image = exports.Image = function Image(client, details) {
base.Image.call(this, client, details);
};
-utile.inherits(Image, base.Image);
+util.inherits(Image, base.Image);
Image.prototype._setProperties = function (details) {
this.id = details.Name;
diff --git a/lib/pkgcloud/azure/compute/server.js b/lib/pkgcloud/azure/compute/server.js
index 3118db6c5..af78a4ed9 100644
--- a/lib/pkgcloud/azure/compute/server.js
+++ b/lib/pkgcloud/azure/compute/server.js
@@ -5,7 +5,7 @@
*
*/
-var utile = require('utile'),
+var util = require('util'),
base = require('../../core/compute/server');
var Server = exports.Server = function Server(client, details) {
@@ -13,20 +13,20 @@ var Server = exports.Server = function Server(client, details) {
this.requestPending = false;
};
-utile.inherits(Server, base.Server);
+util.inherits(Server, base.Server);
Server.prototype._setProperties = function (details) {
var roleInstance = null;
details = details || {};
- this.id = details.Name || "";
- this.name = details.Name || "";
+ this.id = details.Name || '';
+ this.name = details.Name || '';
if (details.RoleInstanceList && details.RoleInstanceList.RoleInstance) {
roleInstance = details.RoleInstanceList.RoleInstance;
}
- //console.log("Status: " + details.Status + ' RoleInstanceList: ' + roleInstance ? roleInstance.InstanceStatus : 'UNKNOWN');
+ //console.log('Status: ' + details.Status + ' RoleInstanceList: ' + roleInstance ? roleInstance.InstanceStatus : 'UNKNOWN');
// azure can return an inconsistent RoleInstance status (not in azure rest api docs) so we check everything.
// an azure vm has a complicated state machine. We need to check the status of both the deployment and the role.
@@ -101,7 +101,6 @@ Server.prototype._setProperties = function (details) {
// TODO: Need to clean up once I understand what is private ip?
if (roleInstance) {
- var ip = roleInstance.IpAddress;
addresses.public.push(roleInstance.InstanceEndpoints.InstanceEndpoint.Vip);
addresses.private.push(roleInstance.IpAddress);
} else {
diff --git a/lib/pkgcloud/azure/compute/templates/templates.js b/lib/pkgcloud/azure/compute/templates/templates.js
index a2401d1fa..60a5336be 100644
--- a/lib/pkgcloud/azure/compute/templates/templates.js
+++ b/lib/pkgcloud/azure/compute/templates/templates.js
@@ -7,7 +7,7 @@
var fs = require('fs');
var PATH = require('path');
-var _ = require('underscore');
+var _ = require('lodash');
exports.loadSync = function (name) {
var path = PATH.join(__dirname, name);
@@ -15,7 +15,8 @@ exports.loadSync = function (name) {
};
exports.compileSync = function (template, params) {
- return _.template(template, params);
+ var compiled = _.template(template);
+ return compiled(params);
};
exports.load = function (name, callback) {
@@ -28,8 +29,7 @@ exports.load = function (name, callback) {
exports.compile = function (name, params, callback) {
var path = PATH.join(__dirname, name);
fs.readFile(path, 'utf8', function (err, data) {
- callback(err, _.template(data, params));
+ var compiled = _.template(data);
+ callback(err, compiled(params));
});
};
-
-
diff --git a/lib/pkgcloud/azure/database/client/databases.js b/lib/pkgcloud/azure/database/client/databases.js
index 2c1700c0a..9a974e174 100644
--- a/lib/pkgcloud/azure/database/client/databases.js
+++ b/lib/pkgcloud/azure/database/client/databases.js
@@ -10,8 +10,19 @@ var errs = require('errs'),
templates = require('../../utils/templates'),
PATH = require('path'),
xml2js = require('xml2js'),
- _ = require('underscore'),
- url = require('url');
+ _ = require('lodash');
+
+// Encode a uri according to Azure Table rules
+// ### @options {uri} The uri to encode
+// ### @return {String} The encoded uri.
+var encodeTableUriComponent = function (uri) {
+ return encodeURIComponent(uri)
+ .replace(/!/g, '%21')
+ .replace(/'/g, '%27')
+ .replace(/\(/g, '%28')
+ .replace(/\)/g, '%29')
+ .replace(/\*/g, '%2A');
+};
// Create a new Azure Table Database
// Need name of table to create
@@ -48,17 +59,18 @@ exports.create = function (options, callback) {
},
function (template, next) {
// compile template with params
- body = _.template(template, params);
+ var compiled = _.template(template);
+ body = compiled(params);
headers['content-length'] = body.length;
self._request({
method: 'POST',
path: 'Tables',
body: body,
headers: headers
- }, function (err, body, res) {
+ }, function (err, body) {
if (err) { return next(err); }
- var parser = new xml2js.Parser();
+ var parser = new xml2js.Parser({explicitArray : false});
parser.parseString(body || '', function (err, data) {
return !err
? next(null, data)
@@ -68,7 +80,7 @@ exports.create = function (options, callback) {
}],
function (err, result) {
return !err
- ? callback(null, self.formatResponse(result))
+ ? callback(null, self.formatResponse(result.entry))
: callback(err);
}
);
@@ -83,15 +95,15 @@ exports.list = function (callback) {
this._xmlRequest({
method: 'GET',
path: 'Tables'
- }, function (err, body, res) {
+ }, function (err, body) {
if (err) { return callback(err); }
- if (body && body.entry) {
- if (Array.isArray(body.entry)) {
- body.entry.forEach(function (table) {
+ if (body && body.feed && body.feed.entry) {
+ if (Array.isArray(body.feed.entry)) {
+ body.feed.entry.forEach(function (table) {
tables.push(self.formatResponse(table));
});
} else {
- tables.push(self.formatResponse(body.entry));
+ tables.push(self.formatResponse(body.feed.entry));
}
}
callback(null, tables);
@@ -110,7 +122,7 @@ exports.remove = function (id, callback) {
}), Array.prototype.slice.call(arguments).pop());
}
- path = encodeTableUriComponent("Tables('" + id + "')");
+ path = encodeTableUriComponent('Tables(\'' + id + '\')');
this._xmlRequest({
method: 'DELETE',
path: path
@@ -120,15 +132,3 @@ exports.remove = function (id, callback) {
: callback(null, res.statusCode === 204);
});
};
-
-// Encode a uri according to Azure Table rules
-// ### @options {uri} The uri to encode
-// ### @return {String} The encoded uri.
-var encodeTableUriComponent = function (uri) {
- return encodeURIComponent(uri)
- .replace(/!/g, '%21')
- .replace(/'/g, '%27')
- .replace(/\(/g, '%28')
- .replace(/\)/g, '%29')
- .replace(/\*/g, '%2A');
-};
diff --git a/lib/pkgcloud/azure/database/client/index.js b/lib/pkgcloud/azure/database/client/index.js
index 7a6820c82..bb7ff2445 100644
--- a/lib/pkgcloud/azure/database/client/index.js
+++ b/lib/pkgcloud/azure/database/client/index.js
@@ -5,13 +5,13 @@
*
*/
-var utile = require('utile'),
+var util = require('util'),
urlJoin = require('url-join'),
auth = require('../../../common/auth'),
azureApi = require('../../utils/azureApi.js'),
xml2JSON = require('../../utils/xml2json.js').xml2JSON,
- azure = require('../../client');
-
+ azure = require('../../client'),
+ _ = require('lodash');
var Client = exports.Client = function (options) {
azure.Client.call(this, options);
@@ -24,10 +24,10 @@ var Client = exports.Client = function (options) {
this.azureKeys.storageAccessKey = this.config.storageAccessKey;
this.before.push(auth.azure.tablesSignature);
- utile.mixin(this, require('./databases'));
+ _.extend(this, require('./databases'));
};
-utile.inherits(Client, azure.Client);
+util.inherits(Client, azure.Client);
//
// Gets the version of the Azure Tables API we are running against
diff --git a/lib/pkgcloud/azure/storage/client/containers.js b/lib/pkgcloud/azure/storage/client/containers.js
index c505407fc..57773727a 100644
--- a/lib/pkgcloud/azure/storage/client/containers.js
+++ b/lib/pkgcloud/azure/storage/client/containers.js
@@ -5,9 +5,7 @@
*
*/
-var async = require('async'),
- request = require('request'),
- base = require('../../../core/storage'),
+var base = require('../../../core/storage'),
pkgcloud = require('../../../../../lib/pkgcloud'),
storage = pkgcloud.providers.azure.storage;
@@ -21,13 +19,14 @@ exports.getContainers = function (callback) {
this._xmlRequest({
method: 'GET',
+ path: '/',
qs: {
comp: 'list'
}
}, function (err, body) {
if (err) { return callback(err); }
- var containers = self._toArray(body.Containers.Container);
+ var containers = self._toArray(body.EnumerationResults.Containers.Container);
containers = containers.map(function (container) {
return new (storage.Container)(self, container);
@@ -46,8 +45,7 @@ exports.getContainers = function (callback) {
//
exports.getContainer = function (container, callback) {
var containerName = container instanceof storage.Container ? container.name : container,
- self = this,
- options;
+ self = this;
this._xmlRequest({
method: 'GET',
@@ -55,7 +53,7 @@ exports.getContainer = function (container, callback) {
qs: {
restype: 'container'
}
- }, function (err, body, res) {
+ }, function (err, body) {
return err
? callback(err)
: callback(null, new (storage.Container)(self, body));
@@ -85,7 +83,7 @@ exports.createContainer = function (options, callback) {
qs: {
restype: 'container'
}
- }, function (err, body, res) {
+ }, function (err) {
return err
? callback(err)
: callback(null, new (storage.Container)(self, options));
@@ -104,8 +102,7 @@ exports.createContainer = function (options, callback) {
// of the same name during this cleanup period, your call returns an error immediately.
//
exports.destroyContainer = function (container, callback) {
- var containerName = container instanceof base.Container ? container.name : container,
- self = this;
+ var containerName = container instanceof base.Container ? container.name : container;
this._xmlRequest({
method: 'DELETE',
diff --git a/lib/pkgcloud/azure/storage/client/files.js b/lib/pkgcloud/azure/storage/client/files.js
index a985218b9..8a356388c 100644
--- a/lib/pkgcloud/azure/storage/client/files.js
+++ b/lib/pkgcloud/azure/storage/client/files.js
@@ -5,17 +5,15 @@
*
*/
-var fs = require('fs'),
- filed = require('filed'),
+var filed = require('filed-mimefix'),
+ through = require('through2'),
mime = require('mime'),
- request = require('request'),
- utile = require('utile'),
urlJoin = require('url-join'),
- qs = require('querystring'),
base = require('../../../core/storage'),
AzureConstants = require('../../utils/constants'),
pkgcloud = require('../../../../../lib/pkgcloud'),
- storage = pkgcloud.providers.azure.storage;
+ storage = pkgcloud.providers.azure.storage,
+ _ = require('lodash');
//
// ### function removeFile (container, file, callback)
@@ -43,189 +41,241 @@ exports.removeFile = function (container, file, callback) {
});
};
-exports.upload = function (options, callback) {
- if (typeof options === 'function' && !callback) {
- callback = options;
- options = {};
- }
+exports.upload = function (options) {
+ var self = this;
- //
- // Optional helper function passed to `this._request`
- // in the case when no callback is passed to `.upload(options)`.
- //
- function onUpload(err, body, res) {
- return err
- ? callback(err)
- : callback(null, res.statusCode === 200 || res.statusCode === 201, res);
+ // check for deprecated calling with a callback
+ if (typeof arguments[arguments.length - 1] === 'function') {
+ self.emit('log::warn', 'storage.upload no longer supports calling with a callback');
}
- var container = options.container,
- success = callback ? onUpload : null,
- path,
- rstream,
- lstream;
-
- if (container instanceof storage.Container) {
- container = container.name;
+ // if we don't have a size, we need to immediately jump into multipart upload
+ if (!options.size) {
+ return self.multipartUpload(options);
}
- options.headers = options.headers || {};
+ var writableStream,
+ proxyStream = through(),
+ uploadOptions = {
+ method: 'PUT',
+ upload: true,
+ headers: options.headers || {}
+ };
- if (options.local) {
- lstream = filed(options.local);
- options.headers['content-length'] = fs.statSync(options.local).size;
+ if (options.container instanceof storage.Container) {
+ uploadOptions.path = urlJoin(options.container.name, options.remote);
}
- else if (options.stream) {
- lstream = options.stream;
+ else {
+ uploadOptions.path = urlJoin(options.container, options.remote);
}
- if (options.headers && !options.headers['content-type'] && options.remote) {
- options.headers['content-type'] = mime.lookup(options.remote);
+ if (options.contentType) {
+ uploadOptions.headers['content-type'] = options.contentType;
+ }
+ else {
+ uploadOptions.headers['content-type'] = mime.getType(options.remote);
}
- options.headers['x-ms-blob-type'] = AzureConstants.BlobConstants.BlobTypes.BLOCK;
+ uploadOptions.headers['content-length'] = options.size;
+ uploadOptions.headers['x-ms-blob-type'] = AzureConstants.BlobConstants.BlobTypes.BLOCK;
- path = urlJoin(container, options.remote);
+ writableStream = self._request(uploadOptions);
- if (options.azureBlockId) {
- options.qs = {
- comp: 'block',
- blockid: options.azureBlockId
+ writableStream.on('complete', function(response) {
+ var err = self._parseError(response);
+
+ if (err) {
+ proxyStream.emit('error', err);
+ return;
}
- }
- if (options.headers['content-length'] !== undefined) {
- // Regular upload
- rstream = this._request({
- method: 'PUT',
- upload: true,
- path: path,
- headers: options.headers || {},
- qs: options.qs
- }, success);
- } else {
- // Multi-part, 5mb chunk upload
- rstream = this.multipartUpload(options, success);
- }
+ // load the file metadata from the cloud, so we can return a proper model
+ self.getFile(options.container, options.remote, function (err, file) {
+ if (err) {
+ proxyStream.emit('error', err);
+ return;
+ }
- if (lstream) lstream.pipe(rstream);
+ proxyStream.emit('success', file);
+ });
+ });
- return rstream;
+ writableStream.on('error', function(err) {
+ proxyStream.emit('err', err);
+ });
+
+ writableStream.on('data', function (chunk) {
+ proxyStream.emit('data', chunk);
+ });
+
+ // we need a proxy stream so we can always return a file model
+ // via the 'success' event
+ proxyStream.pipe(writableStream);
+
+ return proxyStream;
};
var getBlockId = function (a, b) {
- return "block" + ((1e15 + a + "").slice(-b));
+ return 'block' + ((1e15 + a + '').slice(-b));
};
-exports.multipartUpload = function (options, callback) {
+exports.multipartUpload = function (options) {
var self = this,
- container = options.container,
- chunk = AzureConstants.BlobConstants.DEFAULT_WRITE_BLOCK_SIZE_IN_BYTES,
- numBlocks = 0,
- chunksFinished = [],
- stream = new storage.ChunkedStream(chunk),
+ numberOfBlocks = 0,
+ chunkedStream = new storage.ChunkedStream(AzureConstants.BlobConstants.DEFAULT_WRITE_BLOCK_SIZE_IN_BYTES),
+ proxyStream = through(),
ended = false;
- if (container instanceof storage.Container) {
- container = container.name;
- }
+ // for each chunk of data, we need to upload a block
+ chunkedStream.on('data', function (data) {
+ chunkedStream.pause();
- stream.on('data', function (data) {
- stream.pause();
- options.azureBlockId = getBlockId(numBlocks++, 15);
- options.headers['content-length'] = data.length;
-
- var next = function (err, body, res) {
- // TODO What to do if err here?
- // TODO MUST FIX
- if (!ended) {
- stream.resume();
- } else {
- self.sendBlockList(options, numBlocks, callback);
- }
+ var blockOptions = {
+ container: options.container,
+ remote: options.remote,
+ headers: options.headers || {},
+ size: data.length,
+ blockId: getBlockId(numberOfBlocks++, 15)
};
- var rstream = self.upload(options, next);
- rstream.write(data);
- rstream.end();
+ var writableStream = self.uploadBlock(blockOptions);
+
+ writableStream.on('error', function(err) {
+ chunkedStream.emit('error', err);
+ });
+
+ // when the block has been uploaded, resume if more data
+ writableStream.on('complete', function(response) {
+ var err = self._parseError(response);
+
+ if (err) {
+ chunkedStream.emit('error', err);
+ ended = true;
+ }
+ else if (!ended) {
+ chunkedStream.resume();
+ }
+ else {
+ // when we're done with data, we need to upload the block list
+ self.sendBlockList(_.extend({
+ numberOfBlocks: numberOfBlocks
+ } ,_.pick(options, ['remote', 'container', 'headers', 'contentType'])), function(err) {
+ if (err) {
+ proxyStream.emit('error', err);
+ return;
+ }
+
+ // finally, fetch the file, and emit success on the original stream
+ self.getFile(options.container, options.remote, function(err, file) {
+ if (err) {
+ proxyStream.emit('error', err);
+ return;
+ }
+
+ proxyStream.emit('success', file);
+ });
+ });
+ }
+ });
+
+ // write the chunk to the block stream, and end it.
+ writableStream.write(data);
+ writableStream.end();
});
- stream.on('end', function (data) {
+ chunkedStream.on('end', function () {
ended = true;
});
- return stream;
+ chunkedStream.on('error', function(err) {
+ proxyStream.emit('error', err);
+ });
+
+ proxyStream.pipe(chunkedStream);
+
+ return proxyStream;
};
-exports.sendBlockList = function (options, numBlocks, callback) {
- var container = options.container,
- body,
- path,
- qs;
+exports.sendBlockList = function (options, callback) {
+ var putOptions = {
+ method: 'PUT',
+ headers: options.headers || {},
+ qs: {
+ comp: 'blocklist'
+ }
+ };
- if (container instanceof storage.Container) {
- container = container.name;
+ if (options.container instanceof storage.Container) {
+ putOptions.path = urlJoin(options.container.name, options.remote);
+ }
+ else {
+ putOptions.path = urlJoin(options.container, options.remote);
}
-
- options.headers = options.headers || {};
// remove x-ms-blob-type header or request will fail
- if (options.headers['x-ms-blob-type']) {
- delete options.headers['x-ms-blob-type'];
+ if (putOptions.headers['x-ms-blob-type']) {
+ delete putOptions.headers['x-ms-blob-type'];
}
- if (options.headers['content-type']) {
- options.headers['x-ms-blob-content-type'] = options.headers['content-type'];
+ if (options.contentType) {
+ putOptions.headers['x-ms-blob-content-type'] = options.contentType;
} else if (options.remote) {
- options.headers['x-ms-blob-content-type'] = mime.lookup(options.remote);
+ putOptions.headers['x-ms-blob-content-type'] = mime.getType(options.remote);
}
- path = urlJoin(container, options.remote);
- qs = {
- comp: 'blocklist'
- };
-
- body = '';
- body += '';
- for (var i = 0; i < numBlocks; i++) {
- body += '' + encodeURIComponent(getBlockId(i, 15)) + ' ';
+ putOptions.body = '';
+ putOptions.body += '';
+ for (var i = 0; i < options.numberOfBlocks; i++) {
+ putOptions.body += '' + encodeURIComponent(getBlockId(i, 15)) + ' ';
}
- body += ' ';
+ putOptions.body += ' ';
- options.headers['content-length'] = body.length;
+ putOptions.headers['content-length'] = putOptions.body.length;
- this._request({
- method: 'PUT',
- path: path,
- body: body,
- headers: options.headers,
- qs: qs
- }, function (err, body, res) {
+ this._request(putOptions, function (err, body, res) {
return err
? callback && callback(err)
: callback && callback(null, res.statusCode === 201, res);
});
};
+exports.uploadBlock = function(options) {
+ var uploadOptions = {
+ method: 'PUT',
+ upload: true,
+ headers: {
+ 'content-length': options.size
+ },
+ qs: {
+ comp: 'block',
+ blockid: options.blockId
+ }
+ };
+
+ if (options.container instanceof storage.Container) {
+ uploadOptions.path = urlJoin(options.container.name, options.remote);
+ }
+ else {
+ uploadOptions.path = urlJoin(options.container, options.remote);
+ }
+
+ return this._request(uploadOptions);
+};
+
exports.download = function (options, callback) {
var self = this,
- success = callback ? onDownload : null,
container = options.container,
lstream,
rstream;
- //
- // Optional helper function passed to `this._request`
- // in the case when no callback is passed to `.download(options)`.
- //
- function onDownload(err, body, res) {
+ var success = !callback ? null : function (err, body, res) {
return err
? callback(err)
- : callback(null, new (storage.File)(self, utile.mixin(res.headers, {
- container: container,
+ : callback(null, new (storage.File)(self, _.extend(res.headers, {
+ container: options.container,
name: options.remote
})));
- }
+ };
if (container instanceof storage.Container) {
container = container.name;
@@ -260,17 +310,25 @@ exports.getFile = function (container, file, callback) {
}, function (err, body, res) {
return err
? callback(err)
- : callback(null, new storage.File(self, utile.mixin(res.headers, {
+ : callback(null, new storage.File(self, _.extend(res.headers, {
container: container,
name: file
})));
});
};
-exports.getFiles = function (container, download, callback) {
+exports.getFiles = function (container, options, callback) {
var containerName = container instanceof base.Container ? container.name : container,
self = this;
+ if (typeof options === 'function') {
+ callback = options;
+ options = {};
+ }
+ else if (!options) {
+ options = {};
+ }
+
this._xmlRequest({
method: 'GET',
path: containerName,
@@ -278,7 +336,7 @@ exports.getFiles = function (container, download, callback) {
restype: 'container',
comp: 'list'
}
- }, function (err, body, res) {
+ }, function (err, body) {
if (err) {
return callback(err);
}
diff --git a/lib/pkgcloud/azure/storage/client/index.js b/lib/pkgcloud/azure/storage/client/index.js
index 1f6eac737..b6cf02b98 100644
--- a/lib/pkgcloud/azure/storage/client/index.js
+++ b/lib/pkgcloud/azure/storage/client/index.js
@@ -5,20 +5,21 @@
*
*/
-var utile = require('utile'),
+var util = require('util'),
urlJoin = require('url-join'),
auth = require('../../../common/auth'),
azureApi = require('../../utils/azureApi.js'),
xml2JSON = require('../../utils/xml2json.js').xml2JSON,
- azure = require('../../client');
+ azure = require('../../client'),
+ _ = require('lodash');
var Client = exports.Client = function (options) {
this.serversUrl = options.serversUrl || azureApi.STORAGE_ENDPOINT;
azure.Client.call(this, options);
- utile.mixin(this, require('./containers'));
- utile.mixin(this, require('./files'));
+ _.extend(this, require('./containers'));
+ _.extend(this, require('./files'));
// add the auth keys for request authorization
this.azureKeys = {};
@@ -28,7 +29,7 @@ var Client = exports.Client = function (options) {
this.before.push(auth.azure.storageSignature);
};
-utile.inherits(Client, azure.Client);
+util.inherits(Client, azure.Client);
Client.prototype._xmlRequest = function query(options, callback) {
return this._request(options, function (err, body, res) {
@@ -57,6 +58,6 @@ Client.prototype._getUrl = function (options) {
}
- return urlJoin('http://' + this.azureKeys.storageAccount + '.' + this.serversUrl + '/',
+ return urlJoin(this.protocol + this.azureKeys.storageAccount + '.' + this.serversUrl + '/',
fragment);
};
diff --git a/lib/pkgcloud/azure/storage/container.js b/lib/pkgcloud/azure/storage/container.js
index f3c2d90bb..f64fb3b9e 100644
--- a/lib/pkgcloud/azure/storage/container.js
+++ b/lib/pkgcloud/azure/storage/container.js
@@ -5,19 +5,17 @@
*
*/
-var utile = require('utile'),
- storage = require('../storage'),
+var util = require('util'),
+ _ = require('lodash'),
base = require('../../core/storage/container');
var Container = exports.Container = function Container(client, details) {
base.Container.call(this, client, details);
};
-utile.inherits(Container, base.Container);
+util.inherits(Container, base.Container);
Container.prototype._setProperties = function (details) {
- var self = this;
-
if (typeof details === 'string') {
this.name = details;
return;
@@ -31,3 +29,7 @@ Container.prototype._setProperties = function (details) {
this.original = this.azure = details;
};
+
+Container.prototype.toJSON = function () {
+ return _.pick(this, ['name']);
+};
diff --git a/lib/pkgcloud/azure/storage/file.js b/lib/pkgcloud/azure/storage/file.js
index cbfb3de30..ffc467f7c 100644
--- a/lib/pkgcloud/azure/storage/file.js
+++ b/lib/pkgcloud/azure/storage/file.js
@@ -5,14 +5,15 @@
*
*/
-var utile = require('utile'),
+var util = require('util'),
+ _ = require('lodash'),
base = require('../../core/storage/file');
var File = exports.File = function File(client, details) {
base.File.call(this, client, details);
};
-utile.inherits(File, base.File);
+util.inherits(File, base.File);
File.prototype._setProperties = function (details) {
this.container = details.container;
@@ -26,3 +27,7 @@ File.prototype._setProperties = function (details) {
this.size = (details['content-length']) ? parseInt(details['content-length'], 10) : 0;
}
};
+
+File.prototype.toJSON = function () {
+ return _.pick(this, ['name', 'size', 'container' ]);
+};
\ No newline at end of file
diff --git a/lib/pkgcloud/azure/storage/utils.js b/lib/pkgcloud/azure/storage/utils.js
index c10963d33..9a600cf71 100644
--- a/lib/pkgcloud/azure/storage/utils.js
+++ b/lib/pkgcloud/azure/storage/utils.js
@@ -30,7 +30,9 @@ ChunkedStream.prototype.write = function write(data, encoding) {
parts = [];
this.buffer = this.buffer.filter(function (part) {
- if (total >= this.chunk) return true;
+ if (total >= this.chunk) {
+ return true;
+ }
parts.push(part);
total += part.length;
@@ -54,14 +56,17 @@ ChunkedStream.prototype.write = function write(data, encoding) {
this.size -= this.chunk;
}
- if (this.paused) return false;
+ if (this.paused) {
+ return false;
+ }
};
ChunkedStream.prototype.end = function end() {
- if (this.ended) return;
+ if (this.ended) {
+ return;
+ }
// Emit all left data
- var self = this;
this.ended = true;
this.emitChunk(Buffer.concat(this.buffer, this.size));
this.buffer = [];
@@ -80,12 +85,18 @@ ChunkedStream.prototype.emitChunk = function emitChunk(chunk) {
};
ChunkedStream.prototype.pause = function pause() {
- if (this.paused) return;
+ if (this.paused) {
+ return;
+ }
+
this.paused = true;
};
ChunkedStream.prototype.resume = function resume() {
- if (!this.paused) return;
+ if (!this.paused) {
+ return;
+ }
+
this.paused = false;
// Emit all accumulated data
diff --git a/lib/pkgcloud/azure/utils/azureApi.js b/lib/pkgcloud/azure/utils/azureApi.js
index af2e4da7a..435686133 100644
--- a/lib/pkgcloud/azure/utils/azureApi.js
+++ b/lib/pkgcloud/azure/utils/azureApi.js
@@ -16,20 +16,29 @@
var HeaderConstants = require('./constants').HeaderConstants;
var async = require('async');
var templates = require('../compute/templates/templates');
-var _ = require('underscore');
+var _ = require('lodash');
var errs = require('errs');
var URL = require('url');
var cert = require('../utils/cert');
var pkgcloud = require('../../../../../pkgcloud');
-var MANAGEMENT_API_VERSION = exports.MANAGEMENT_API_VERSION = '2012-03-01';
-var MANAGEMENT_ENDPOINT = exports.MANAGEMENT_ENDPOINT = 'management.core.windows.net';
+exports.MANAGEMENT_API_VERSION = '2012-03-01';
+exports.MANAGEMENT_ENDPOINT = 'management.core.windows.net';
var STORAGE_ENDPOINT = exports.STORAGE_ENDPOINT = 'blob.core.windows.net';
-var STORAGE_API_VERSION = exports.STORAGE_API_VERSION = HeaderConstants.TARGET_STORAGE_VERSION;
-var TABLES_ENDPOINT = exports.TABLES_ENDPOINT = 'table.core.windows.net';
-var TABLES_API_VERSION = exports.TABLES_API_VERSION = '2012-02-12';
+exports.STORAGE_API_VERSION = HeaderConstants.TARGET_STORAGE_VERSION;
+exports.TABLES_ENDPOINT = 'table.core.windows.net';
+exports.TABLES_API_VERSION = '2012-02-12';
var MINIMUM_POLL_INTERVAL = exports.MINIMUM_POLL_INTERVAL = 3000;
+// Declaring variables for helper functions defined later
+var createVM, createLinuxVM, createWindowsVM, validateCreateOptions, getServer,
+ getServers, rebootServer, stopServer, deleteHostedService, destroyServer, createImage,
+ captureServer, deleteImage, destroyImage, getMediaLinkUrl, createEndpoints,
+ makeTemplateRequest, createHostedService, addCertificate, getHostedServices,
+ deleteServer, getOSImage, deleteOSDisk, deleteOSBlob, getServersFromServices,
+ getServersFromService, isVM, getHostedServiceProperties, pollRequestStatus,
+ getStorageInfoFromUri;
+
/**
* createServer()
*
@@ -55,7 +64,7 @@ var MINIMUM_POLL_INTERVAL = exports.MINIMUM_POLL_INTERVAL = 3000;
* its status is RUNNING. This entire process may take several minutes.
*/
-var createServer = exports.createServer = function (client, options, callback) {
+exports.createServer = function (client, options, callback) {
var vmOptions = {},
ssh;
@@ -131,123 +140,10 @@ var createServer = exports.createServer = function (client, options, callback) {
);
};
-var createVM = function (client, options, vmOptions, callback) {
- // check OS type of image to determine if we are creating a linux or windows VM
- switch (vmOptions.image.OS.toLowerCase()) {
- case 'linux':
- createLinuxVM(client, options, vmOptions, callback);
- break;
- case 'windows':
- createWindowsVM(client, options, vmOptions, callback);
- break;
- default:
- callback(errs.create({message: 'Unknown Image OS: ' + vmOptions.image.OS}));
- break;
- }
-};
-
-var getMediaLinkUrl = function (storageAccount, fileName) {
- return 'http://' + storageAccount + '.' + STORAGE_ENDPOINT + '/vhd/' + fileName;
-};
-
-var createEndpoints = function (ports) {
- var endPoints = '',
- template = templates.loadSync('endpoint.xml');
-
- (ports || []).forEach(function (port) {
- endPoints += templates.compileSync(template, port);
- });
- return endPoints;
-};
-
-var createLinuxVM = function (client, options, vmOptions, callback) {
- var path = client.subscriptionId + '/services/hostedservices/' + options.name + '/deployments';
- var mediaLink = getMediaLinkUrl(client.config.storageAccount, options.name + '.vhd');
- var label = new Buffer(options.name).toString('base64');
-
- var configParams = {
- NAME: options.name,
- LABEL_BASE64: label,
- USERNAME: options.username,
- PASSWORD: options.password,
- SSH_CERTIFICATE_FINGERPRINT: vmOptions.sshCertInfo.fingerprint,
- PORT: options.ssh.port || '22',
- LOCAL_PORT: options.ssh.localPort || '22',
- ROLESIZE: options.flavor,
- ENDPOINTS: createEndpoints(options.ports),
- OS_SOURCE_IMAGE_NAME: vmOptions.image.Name,
- OS_IMAGE_MEDIALINK: mediaLink
- };
-
- makeTemplateRequest(client, path, 'linuxDeployment.xml', configParams, callback);
-};
-
-var createWindowsVM = function (client, options, vmOptions, callback) {
- var path = client.subscriptionId + '/services/hostedservices/' + options.name + '/deployments';
- var mediaLink = getMediaLinkUrl(client.config.storageAccount, options.name + '.vhd');
- var label = new Buffer(options.name).toString('base64');
-
- var configParams = {
- NAME: options.name,
- COMPUTER_NAME: options.computerName || options.name.slice(0, 15),
- LABEL_BASE64: label,
- PASSWORD: options.password,
- ROLESIZE: options.flavor,
- ENDPOINTS: createEndpoints(options.ports),
- OS_SOURCE_IMAGE_NAME: vmOptions.image.Name,
- OS_IMAGE_MEDIALINK: mediaLink
- };
-
- makeTemplateRequest(client, path, 'windowsDeployment.xml', configParams, callback);
-};
-
-var captureServer = function (client, serverName, targetImageName, callback) {
- // /services/hostedservices//deployments//roleinstances//operations
- var path = client.subscriptionId + '/services/hostedservices/' +
- serverName + '/deployments/' +
- serverName + '/roleInstances/' +
- serverName + '/Operations';
-
- var configParams = {
- NAME: targetImageName
- };
-
- makeTemplateRequest(client, path, 'captureRole.xml', configParams, callback);
-};
-
-var deleteImage = function (client, image, callback) {
- // https://management.core.windows.net//services/images/
- var path = client.subscriptionId + '/services/images/' + image.Name;
-
- var configParams = {
- LABEL: image.LABEL
- };
-
- makeTemplateRequest(client, path, 'deleteImage.xml', configParams, callback);
-};
-
-var validateCreateOptions = function (options, config, callback) {
- if (typeof options === 'function') {
- options = {};
- }
- options = options || {}; // no args
-
- // check required options values
- ['flavor', 'image', 'name', 'username', 'password', 'location'].forEach(function (member) {
- if (!options[member]) {
- errs.handle(
- errs.create({ message: 'options.' + member + ' is a required argument.' }),
- callback
- );
- }
- });
- callback();
-};
-
/**
* getServer
*/
-var getServer = exports.getServer = function (client, serverName, callback) {
+getServer = exports.getServer = function (client, serverName, callback) {
getServersFromService(client, serverName, function (err, servers) {
return !err
? callback(err, servers[0] ? servers[0] : null)
@@ -255,7 +151,7 @@ var getServer = exports.getServer = function (client, serverName, callback) {
});
};
-var getServers = exports.getServers = function (client, callback) {
+getServers = exports.getServers = function (client, callback) {
// async execute the following tasks one by one and bail if there is an error
async.waterfall([
function (next) {
@@ -272,7 +168,7 @@ var getServers = exports.getServers = function (client, callback) {
);
};
-var makeTemplateRequest = function (client, path, templateName, params, callback) {
+makeTemplateRequest = function (client, path, templateName, params, callback) {
var headers = {},
body;
@@ -283,7 +179,8 @@ var makeTemplateRequest = function (client, path, templateName, params, callback
},
function (template, next) {
// compile template with params
- body = _.template(template, params);
+ var compiled = _.template(template);
+ body = compiled(params);
headers['content-length'] = body.length;
headers['content-type'] = 'application/xml';
headers['accept'] = 'application/xml';
@@ -300,13 +197,13 @@ var makeTemplateRequest = function (client, path, templateName, params, callback
pollRequestStatus(client, res.headers['x-ms-request-id'], MINIMUM_POLL_INTERVAL, next);
});
}],
- function (err, result) {
+ function (err) {
callback(err);
}
);
};
-var createHostedService = exports.createHostedService = function (client, options, callback) {
+createHostedService = exports.createHostedService = function (client, options, callback) {
var path = client.subscriptionId + '/services/hostedservices';
var params = {
NAME: options.name,
@@ -323,7 +220,7 @@ var createHostedService = exports.createHostedService = function (client, option
* POST https://management.core.windows.net//services/hostedservices//deployments//roleinstances//operations
* A successful operation returns status code 201 (Created). Need to poll for success?
*/
-var rebootServer = exports.rebootServer = function (client, serviceName, callback) {
+rebootServer = exports.rebootServer = function (client, serviceName, callback) {
var path = client.subscriptionId + '/services/hostedservices/' +
serviceName + '/deployments/' +
serviceName + '/roleInstances/' +
@@ -338,7 +235,7 @@ var rebootServer = exports.rebootServer = function (client, serviceName, callbac
* POST https://management.core.windows.net//services/hostedservices//deployments//roleinstances//operations
* A successful operation returns status code 201 (Created). Need to poll for success?
*/
-var stopServer = exports.stopServer = function (client, serviceName, callback) {
+stopServer = exports.stopServer = function (client, serviceName, callback) {
var path = client.subscriptionId + '/services/hostedservices/' +
serviceName + '/deployments/' +
serviceName + '/roleInstances/' +
@@ -347,7 +244,7 @@ var stopServer = exports.stopServer = function (client, serviceName, callback) {
makeTemplateRequest(client, path, 'shutdownRole.xml', {}, callback);
};
-var addCertificate = function (client, serviceName, cert, password, callback) {
+addCertificate = function (client, serviceName, cert, password, callback) {
var path = client.subscriptionId + '/services/hostedservices/' +
serviceName + '/certificates';
@@ -359,7 +256,7 @@ var addCertificate = function (client, serviceName, cert, password, callback) {
makeTemplateRequest(client, path, 'addCertificate.xml', params, callback);
};
-var deleteHostedService = exports.deleteHostedService = function (client, serviceName, callback) {
+deleteHostedService = exports.deleteHostedService = function (client, serviceName, callback) {
// DELETE https://management.core.windows.net//services/hostedservices/
var path = client.subscriptionId + '/services/hostedservices/' + serviceName;
@@ -375,22 +272,22 @@ var deleteHostedService = exports.deleteHostedService = function (client, servic
});
};
-var getHostedServices = exports.getHostedServices = function (client, callback) {
+getHostedServices = exports.getHostedServices = function (client, callback) {
var path = client.subscriptionId + '/services/hostedservices',
services = [];
- client.get(path, function (err, body, res) {
+ client.get(path, function (err, body) {
if (err) {
return callback(err);
}
- if (body.HostedService) {
+ if (body && body.HostedServices && body.HostedServices.HostedService) {
// need to check if azure returned an array or single object
- if (Array.isArray(body.HostedService)) {
- body.HostedService.forEach(function (service) {
+ if (Array.isArray(body.HostedServices.HostedService)) {
+ body.HostedServices.HostedService.forEach(function (service) {
services.push(service);
});
} else {
- services.push(body.HostedService);
+ services.push(body.HostedServices.HostedService);
}
}
@@ -406,7 +303,7 @@ var getHostedServices = exports.getHostedServices = function (client, callback)
* To determine the status code for the operation once it is complete, call Get Operation Status.
* Because Delete Deployment is an asynchronous operation, it always returns status code 202 (Accept).
*/
-var destroyServer = exports.destroyServer = function (client, serverName, callback) {
+destroyServer = exports.destroyServer = function (client, serverName, callback) {
var server = null;
// async execute the following tasks one by one and bail if there is an error
@@ -432,13 +329,13 @@ var destroyServer = exports.destroyServer = function (client, serverName, callba
function (next) {
deleteHostedService(client, serverName, next);
}],
- function (err, result) {
+ function (err) {
callback(err, true);
}
);
};
-var deleteServer = function (client, serverName, callback) {
+deleteServer = function (client, serverName, callback) {
var path = client.subscriptionId + '/services/hostedservices/' + serverName;
path += '/deployments/' + serverName;
@@ -454,7 +351,7 @@ var deleteServer = function (client, serverName, callback) {
});
};
-var getOSImage = exports.getOSImage = function (client, imageName, callback) {
+getOSImage = exports.getOSImage = function (client, imageName, callback) {
var path = '/' + client.subscriptionId + '/services/images/' + imageName;
var onError = function (err) {
@@ -466,14 +363,14 @@ var getOSImage = exports.getOSImage = function (client, imageName, callback) {
}
};
- client.get(path, function (err, body, res) {
+ client.get(path, function (err, body) {
return err
? onError(err)
: callback(null, body);
});
};
-var deleteOSDisk = function (client, server, callback) {
+deleteOSDisk = function (client, server, callback) {
var diskName = null,
path;
@@ -490,7 +387,6 @@ var deleteOSDisk = function (client, server, callback) {
// https://management.core.windows.net//services/disks/
path = client.subscriptionId + '/services/disks/' + diskName;
-
client._request({
method: 'DELETE',
path: path
@@ -503,7 +399,7 @@ var deleteOSDisk = function (client, server, callback) {
});
};
-var deleteOSBlob = function (client, server, callback) {
+deleteOSBlob = function (client, server, callback) {
var blob = null;
if (server && server.RoleList && server.RoleList.Role) {
@@ -522,7 +418,7 @@ var deleteOSBlob = function (client, server, callback) {
callback(err);
} else {
var storage = pkgcloud.storage.createClient(client.config);
- storage.removeFile(info.container, info.file, function (err, result) {
+ storage.removeFile(info.container, info.file, function (err) {
callback(err);
});
}
@@ -533,7 +429,7 @@ var deleteOSBlob = function (client, server, callback) {
* getServersFromServices
* Retrieves all servers (VMs) from the list of services
*/
-var getServersFromServices = function (client, services, callback) {
+getServersFromServices = function (client, services, callback) {
var task = function (service, next) {
getServersFromService(client, service.ServiceName, function (err, servers) {
next(err, servers);
@@ -550,16 +446,16 @@ var getServersFromServices = function (client, services, callback) {
* getServersFromServices
* Retrieves all servers (VMs) from a Hosted Service
*/
-var getServersFromService = function (client, serviceName, callback) {
+getServersFromService = function (client, serviceName, callback) {
var servers = [];
getHostedServiceProperties(client, serviceName, function (err, result) {
if (err) {
return callback(err);
}
- if (result && result.Deployments && result.Deployments.Deployment) {
- if (isVM(result.Deployments.Deployment)) {
- servers.push(result.Deployments.Deployment);
+ if (result && result.HostedService && result.HostedService.Deployments && result.HostedService.Deployments.Deployment) {
+ if (isVM(result.HostedService.Deployments.Deployment)) {
+ servers.push(result.HostedService.Deployments.Deployment);
}
}
@@ -567,7 +463,7 @@ var getServersFromService = function (client, serviceName, callback) {
});
};
-var isVM = function (deployment) {
+isVM = function (deployment) {
if (deployment.RoleList && deployment.RoleList.Role) {
if (deployment.RoleList.Role.RoleType === 'PersistentVMRole') {
return true;
@@ -582,7 +478,7 @@ var isVM = function (deployment) {
GET https://management.core.windows.net//services/hostedservices/?embed-detail=true
A successful operation returns status code 200 (OK).
*/
-var getHostedServiceProperties = function (client, serviceName, callback) {
+getHostedServiceProperties = function (client, serviceName, callback) {
var path = client.subscriptionId + '/services/hostedservices/' + serviceName + '?embed-detail=true';
var onError = function (err) {
@@ -591,7 +487,7 @@ var getHostedServiceProperties = function (client, serviceName, callback) {
: callback(err);
};
- client.get(path, function (err, body, res) {
+ client.get(path, function (err, body) {
return err
? onError(err)
: callback(null, body);
@@ -604,14 +500,14 @@ var getHostedServiceProperties = function (client, serviceName, callback) {
* GET https://management.core.windows.net//operations/
*/
-var pollRequestStatus = function (client, requestId, interval, callback) {
+pollRequestStatus = function (client, requestId, interval, callback) {
var checkStatus = function () {
var path = client.subscriptionId + '/operations/' + requestId;
- client.get(path, function (err, body, res) {
+ client.get(path, function (err, body) {
if (err) {
return callback(err);
}
- switch (body.Status) {
+ switch (body.Operation.Status) {
case 'InProgress':
setTimeout(checkStatus, interval);
break;
@@ -628,7 +524,7 @@ var pollRequestStatus = function (client, requestId, interval, callback) {
checkStatus();
};
-var getStorageInfoFromUri = exports.getStorageInfoFromUri = function (uri, callback) {
+getStorageInfoFromUri = exports.getStorageInfoFromUri = function (uri, callback) {
var u, tokens, path,
info = {};
@@ -658,7 +554,7 @@ var getStorageInfoFromUri = exports.getStorageInfoFromUri = function (uri, callb
* 2. stop server if it is running
* 3. capture server image
*/
-var createImage = exports.createImage = function (client, serverName, targetImageName, callback) {
+createImage = exports.createImage = function (client, serverName, targetImageName, callback) {
async.waterfall([
function (next) {
// stop the server
@@ -674,12 +570,23 @@ var createImage = exports.createImage = function (client, serverName, targetImag
);
};
+deleteImage = function (client, image, callback) {
+ // https://management.core.windows.net//services/images/
+ var path = client.subscriptionId + '/services/images/' + image.Name;
+
+ var configParams = {
+ LABEL: image.LABEL
+ };
+
+ makeTemplateRequest(client, path, 'deleteImage.xml', configParams, callback);
+};
+
/**
* destroyImage()
* 1. get the requested image
* 2. delete the image using its label
*/
-var destroyImage = exports.destroyImage = function (client, imageName, callback) {
+destroyImage = exports.destroyImage = function (client, imageName, callback) {
async.waterfall([
function (next) {
// stop the server
@@ -694,6 +601,108 @@ var destroyImage = exports.destroyImage = function (client, imageName, callback)
);
};
+createVM = function (client, options, vmOptions, callback) {
+ // check OS type of image to determine if we are creating a linux or windows VM
+ switch (vmOptions.image.OSImage.OS.toLowerCase()) {
+ case 'linux':
+ createLinuxVM(client, options, vmOptions, callback);
+ break;
+ case 'windows':
+ createWindowsVM(client, options, vmOptions, callback);
+ break;
+ default:
+ callback(errs.create({message: 'Unknown Image OS: ' + vmOptions.image.OS}));
+ break;
+ }
+};
+
+getMediaLinkUrl = function (storageAccount, fileName) {
+ return 'http://' + storageAccount + '.' + STORAGE_ENDPOINT + '/vhd/' + fileName;
+};
+
+createEndpoints = function (ports) {
+ var endPoints = '',
+ template = templates.loadSync('endpoint.xml');
+
+ (ports || []).forEach(function (port) {
+ endPoints += templates.compileSync(template, port);
+ });
+ return endPoints;
+};
+
+createLinuxVM = function (client, options, vmOptions, callback) {
+ var path = client.subscriptionId + '/services/hostedservices/' + options.name + '/deployments';
+ var mediaLink = getMediaLinkUrl(client.config.storageAccount, options.name + '.vhd');
+ var label = new Buffer(options.name).toString('base64');
+
+ var configParams = {
+ NAME: options.name,
+ LABEL_BASE64: label,
+ USERNAME: options.username,
+ PASSWORD: options.password,
+ SSH_CERTIFICATE_FINGERPRINT: vmOptions.sshCertInfo.fingerprint,
+ PORT: options.ssh.port || '22',
+ LOCAL_PORT: options.ssh.localPort || '22',
+ ROLESIZE: options.flavor,
+ ENDPOINTS: createEndpoints(options.ports),
+ OS_SOURCE_IMAGE_NAME: vmOptions.image.OSImage.Name,
+ OS_IMAGE_MEDIALINK: mediaLink
+ };
+
+ makeTemplateRequest(client, path, 'linuxDeployment.xml', configParams, callback);
+};
+
+createWindowsVM = function (client, options, vmOptions, callback) {
+ var path = client.subscriptionId + '/services/hostedservices/' + options.name + '/deployments';
+ var mediaLink = getMediaLinkUrl(client.config.storageAccount, options.name + '.vhd');
+ var label = new Buffer(options.name).toString('base64');
+
+ var configParams = {
+ NAME: options.name,
+ COMPUTER_NAME: options.computerName || options.name.slice(0, 15),
+ LABEL_BASE64: label,
+ PASSWORD: options.password,
+ ROLESIZE: options.flavor,
+ ENDPOINTS: createEndpoints(options.ports),
+ OS_SOURCE_IMAGE_NAME: vmOptions.image.Name,
+ OS_IMAGE_MEDIALINK: mediaLink
+ };
+
+ makeTemplateRequest(client, path, 'windowsDeployment.xml', configParams, callback);
+};
+
+captureServer = function (client, serverName, targetImageName, callback) {
+ // /services/hostedservices//deployments//roleinstances//operations
+ var path = client.subscriptionId + '/services/hostedservices/' +
+ serverName + '/deployments/' +
+ serverName + '/roleInstances/' +
+ serverName + '/Operations';
+
+ var configParams = {
+ NAME: targetImageName
+ };
+
+ makeTemplateRequest(client, path, 'captureRole.xml', configParams, callback);
+};
+
+validateCreateOptions = function (options, config, callback) {
+ if (typeof options === 'function') {
+ options = {};
+ }
+ options = options || {}; // no args
+
+ // check required options values
+ ['flavor', 'image', 'name', 'username', 'password', 'location'].forEach(function (member) {
+ if (!options[member]) {
+ errs.handle(
+ errs.create({ message: 'options.' + member + ' is a required argument.' }),
+ callback
+ );
+ }
+ });
+ callback();
+};
+
exports._updateMinimumPollInterval = function(interval) {
MINIMUM_POLL_INTERVAL = interval;
-};
\ No newline at end of file
+};
diff --git a/lib/pkgcloud/azure/utils/cert.js b/lib/pkgcloud/azure/utils/cert.js
index 903053d46..4979aab87 100644
--- a/lib/pkgcloud/azure/utils/cert.js
+++ b/lib/pkgcloud/azure/utils/cert.js
@@ -85,7 +85,7 @@ var getFingerPrint = function (pem) {
return sha1.digest('hex').toUpperCase();
};
-var getAzureCertInfo = exports.getAzureCertInfo = function (cert) {
+exports.getAzureCertInfo = function (cert) {
return {
cert: cert,
fingerprint: getFingerPrint(cert.toString())
diff --git a/lib/pkgcloud/azure/utils/hmacsha256sign.js b/lib/pkgcloud/azure/utils/hmacsha256sign.js
index ae86f09bc..b7d1b3878 100644
--- a/lib/pkgcloud/azure/utils/hmacsha256sign.js
+++ b/lib/pkgcloud/azure/utils/hmacsha256sign.js
@@ -16,9 +16,6 @@
// Module dependencies.
var crypto = require('crypto');
-// Expose 'HmacSHA256Sign'.
-exports = module.exports = HmacSha256Sign;
-
/**
* Creates a new HmacSHA256Sign object.
*
@@ -41,3 +38,6 @@ HmacSha256Sign.prototype.sign = function (stringToSign) {
return crypto.createHmac('sha256', this._decodedAccessKey).update(stringToSign).digest('base64');
};
+
+// Expose 'HmacSHA256Sign'.
+exports = module.exports = HmacSha256Sign;
diff --git a/lib/pkgcloud/azure/utils/sharedkey.js b/lib/pkgcloud/azure/utils/sharedkey.js
index 7b75b59f6..0f795d37f 100644
--- a/lib/pkgcloud/azure/utils/sharedkey.js
+++ b/lib/pkgcloud/azure/utils/sharedkey.js
@@ -20,11 +20,6 @@
// Module dependencies.
var HeaderConstants = require('./constants').HeaderConstants;
var HmacSha256Sign = require('./hmacsha256sign');
-var URL = require('url');
-var azureApi = require('./azureApi'),
-
-// Expose 'SharedKey'.
-exports = module.exports = SharedKey;
/**
* Creates a new SharedKey object.
@@ -47,11 +42,9 @@ var getvalueToAppend = function (value) {
* Signs a request with the Authentication header.
*
* @param {req} The request request object.
- * @param {options} The request options to be signed.
- * @param {function (error)} callback The callback function.
* @return {undefined}
*/
-SharedKey.prototype.signRequest = function (req, options) {
+SharedKey.prototype.signRequest = function (req) {
var httpVerb = req.method || 'GET';
@@ -153,9 +146,12 @@ SharedKey.prototype._getCanonicalizedHeaders = function (req) {
canonicalizedHeadersArray.sort();
for (var headerName in canonicalizedHeadersArray) {
- canonicalizedHeaders += canonicalizedHeadersArray[headerName].toLowerCase() + ":" + req.headers[canonicalizedHeadersArray[headerName]] + '\n';
+ canonicalizedHeaders += canonicalizedHeadersArray[headerName].toLowerCase() + ':' + req.headers[canonicalizedHeadersArray[headerName]] + '\n';
}
}
return canonicalizedHeaders;
-};
\ No newline at end of file
+};
+
+// Expose 'SharedKey'.
+exports = module.exports = SharedKey;
diff --git a/lib/pkgcloud/azure/utils/sharedkeytable.js b/lib/pkgcloud/azure/utils/sharedkeytable.js
index cee68144f..a1b822ba5 100644
--- a/lib/pkgcloud/azure/utils/sharedkeytable.js
+++ b/lib/pkgcloud/azure/utils/sharedkeytable.js
@@ -19,9 +19,6 @@ var HmacSha256Sign = require('./hmacsha256sign'),
azureApi = require('../utils/azureApi'),
URL = require('url');
-// Expose 'SharedKeyTable'.
-exports = module.exports = SharedKeyTable;
-
/**
* Creates a new SharedKeyTable object.
*
@@ -101,4 +98,7 @@ SharedKeyTable.prototype._getCanonicalizedResource = function (req) {
}
}
return canonicalizedResource;
-};
\ No newline at end of file
+};
+
+// Expose 'SharedKeyTable'.
+exports = module.exports = SharedKeyTable;
diff --git a/lib/pkgcloud/azure/utils/templates.js b/lib/pkgcloud/azure/utils/templates.js
index 697a773b5..3b433a536 100644
--- a/lib/pkgcloud/azure/utils/templates.js
+++ b/lib/pkgcloud/azure/utils/templates.js
@@ -6,7 +6,7 @@
*/
var fs = require('fs');
-var _ = require('underscore');
+var _ = require('lodash');
exports.load = function (path, callback) {
fs.readFile(path, 'utf8', function (err, data) {
@@ -19,9 +19,8 @@ exports.compile = function (path, params, callback) {
if (err) {
callback(err);
} else {
- callback(null, _.template(data, params));
+ var compiled = _.template(data);
+ callback(null, compiled(params));
}
});
};
-
-
diff --git a/lib/pkgcloud/azure/utils/xml2json.js b/lib/pkgcloud/azure/utils/xml2json.js
index 9c28b0068..3d05030f9 100644
--- a/lib/pkgcloud/azure/utils/xml2json.js
+++ b/lib/pkgcloud/azure/utils/xml2json.js
@@ -25,7 +25,7 @@ exports.xml2JSON = function (xml, callback) {
xml = xml.slice(index);
}
- var parser = new xml2js.Parser({normalize: false, trim: false});
+ var parser = new xml2js.Parser({normalize: false, trim: false, explicitArray : false});
parser.parseString(xml, function (err, data) {
if (err) {
callback(err);
diff --git a/lib/pkgcloud/common/auth.js b/lib/pkgcloud/common/auth.js
index 3a0b10034..01a1b808b 100644
--- a/lib/pkgcloud/common/auth.js
+++ b/lib/pkgcloud/common/auth.js
@@ -1,14 +1,12 @@
/*
* auth.js: Utilities for authenticating with multiple cloud providers
*
- * (C) 2011-2012 Nodejitsu Inc.
+ * (C) 2011-2012 Charlie Robbins, Ken Perkins, Ross Kukulinski & the Contributors.
*
*/
var httpSignature = require('./http-signature'),
- awsSignature = require('./aws-signature'),
- azureSignature = require('./azure-signature'),
- utile = require('utile');
+ azureSignature = require('./azure-signature');
var auth = exports;
@@ -19,14 +17,16 @@ auth.basic = function basicAuth(req) {
req.headers = req.headers || {};
req.headers.authorization = [
'Basic',
- utile.base64.encode(credentials)
+ new Buffer(credentials).toString('base64')
].join(' ');
};
// Add Account number for requests to rackspace API
auth.accountId = function (req) {
req.headers = req.headers || {};
- req.headers['x-auth-project-id'] = this.config.accountNumber;
+ if (this.config.accountNumber) {
+ req.headers['x-auth-project-id'] = this.config.accountNumber;
+ }
};
function signatureGenerator(sign) {
@@ -47,10 +47,6 @@ function azureSignatureGenerator(sign) {
}
auth.httpSignature = signatureGenerator(httpSignature.sign);
-auth.amazon = {
- bodySignature: signatureGenerator(awsSignature.signBody),
- headersSignature: signatureGenerator(awsSignature.signHeaders)
-};
auth.azure = {
managementSignature: azureSignatureGenerator(azureSignature.managementSignature),
diff --git a/lib/pkgcloud/common/aws-signature.js b/lib/pkgcloud/common/aws-signature.js
deleted file mode 100644
index 3b01faca3..000000000
--- a/lib/pkgcloud/common/aws-signature.js
+++ /dev/null
@@ -1,122 +0,0 @@
-/*
- * aws-signature.js: Implmentation of authentication for Amazon AWS APIs.
- *
- * (C) 2012 Nodejitsu Inc.
- *
- */
-
-var url = require('url'),
- qs = require('querystring'),
- crypto = require('crypto');
-
-exports.signBody = function signBody(req, options) {
- if (!options) options = {};
-
- if (typeof options.key !== 'string') {
- throw new TypeError('`key` is a required argument for aws-signature');
- }
-
- if (typeof options.keyId !== 'string') {
- throw new TypeError('`keyId` is a required argument for aws-signature');
- }
-
- var signatureString = [
- req.method, '\n',
- this.serversUrl, '\n',
- '/', '\n'
- ],
- query = req.body;
-
- query.AWSAccessKeyId = options.keyId;
- query.SignatureMethod = 'HmacSHA256';
- query.SignatureVersion = 2;
- query.Version = this.version;
- query.Timestamp = new Date(+new Date + 36e5 * 30).toISOString();
-
- Object.keys(query).sort().forEach(function (key, i) {
- if (i !== 0) signatureString.push('&');
- signatureString.push(encodeURIComponent(key), '=', encodeURIComponent(query[key]));
- });
-
- var toSign = signatureString.join('');
-
- // Crappy code, but AWS seems to need it
- toSign = toSign.replace(/!/g, '%21');
- toSign = toSign.replace(/'/g, '%27');
- toSign = toSign.replace(/\*/g, '%2A');
- toSign = toSign.replace(/\(/g, '%28');
- toSign = toSign.replace(/\)/g, '%29');
-
- query.Signature = crypto.createHmac(
- 'sha256',
- options.key
- ).update(toSign).digest('base64');
-
- if (req.qs) {
- req.qs.Action = query.Action;
- }
- else {
- req.qs = {
- Action: query.Action
- };
- }
-
- delete query.Action;
-
- req.body = Object.keys(query).sort().map(function (key) {
- return encodeURIComponent(key) + '=' + encodeURIComponent(query[key]);
- }).join('&');
-
- req.headers['Content-Type'] = 'application/x-www-form-urlencoded';
- req.headers['Content-Length'] = Buffer.byteLength(req.body);
-};
-
-exports.signHeaders = function signHeaders(req, options) {
- if (!options) options = {};
-
- if (typeof options.key !== 'string') {
- throw new TypeError('`key` is a required argument for aws-signature');
- }
-
- if (typeof options.keyId !== 'string') {
- throw new TypeError('`keyId` is a required argument for aws-signature');
- }
-
- req.headers = req.headers || {};
-
- // Lower-case keys in headers hashmap
- var headers = {};
- Object.keys(req.headers).forEach(function (key) {
- headers[key.toLowerCase()] = req.headers[key];
- });
-
- var now = new Date(),
- signatureString = [
- req.method || 'GET', '\n',
- headers['content-md5'] || '', '\n',
- headers['content-type'] || '', '\n',
- now.toUTCString(), '\n'
- ];
-
- // Push amz headers to signature string
- Object.keys(headers).forEach(function (key) {
- if (/^x-amz/.test(key)) {
- signatureString.push(key, ':', headers[key], '\n');
- }
- });
-
- if (req.signingUrl) {
- signatureString.push(req.signingUrl);
- }
- else {
- signatureString.push(req.path);
- }
-
- var signature = crypto.createHmac(
- 'sha1',
- options.key
- ).update(signatureString.join('')).digest('base64');
-
- req.headers.Date = now.toUTCString();
- req.headers.Authorization = 'AWS ' + options.keyId + ':' + signature;
-};
diff --git a/lib/pkgcloud/common/azure-signature.js b/lib/pkgcloud/common/azure-signature.js
index d28239651..64f6c83bd 100644
--- a/lib/pkgcloud/common/azure-signature.js
+++ b/lib/pkgcloud/common/azure-signature.js
@@ -1,20 +1,14 @@
/*
* azure-signature.js: Implementation of authentication for Azure APIs.
*
- * (C) 2012 Nodejitsu Inc.
+ * (C) 2012 Charlie Robbins, Ken Perkins, Ross Kukulinski & the Contributors.
*
*/
-var url = require('url'),
- qs = require('querystring'),
- https = require('https'),
- azureApi = require('../azure/utils/azureApi'),
+var azureApi = require('../azure/utils/azureApi'),
SharedKey = require('../azure/utils/sharedkey'),
SharedTableKey = require('../azure/utils/sharedkeytable');
-var MANAGEMENT_API_VERSION = azureApi.MANAGEMENT_API_VERSION;
-var STORAGE_API_VERSION = azureApi.STORAGE_API_VERSION;
-
exports.managementSignature = function managementSignature(req, options) {
req.headers = req.headers || {};
diff --git a/lib/pkgcloud/common/http-signature.js b/lib/pkgcloud/common/http-signature.js
index 46ee1fb10..10d91ab7f 100644
--- a/lib/pkgcloud/common/http-signature.js
+++ b/lib/pkgcloud/common/http-signature.js
@@ -4,13 +4,11 @@
* Copyright (C) 2011 Joyent, Inc. All rights reserved.
* MIT License
*
- * Modified by Nodejitsu, under MIT
+ * Modified under MIT
*
*/
-var assert = require('assert'),
- crypto = require('crypto'),
- http = require('http');
+var crypto = require('crypto');
//
// ## Globals
@@ -25,8 +23,6 @@ var Algorithms = {
'hmac-sha512': true
};
-var Authorization = 'Signature keyId="%s",algorithm="%s",headers="%s" %s';
-
//
// ## Specific Errors
//
@@ -127,4 +123,4 @@ module.exports = {
return req;
}
-};
\ No newline at end of file
+};
diff --git a/lib/pkgcloud/common/index.js b/lib/pkgcloud/common/index.js
index cf5fe070c..b9753790b 100644
--- a/lib/pkgcloud/common/index.js
+++ b/lib/pkgcloud/common/index.js
@@ -1,7 +1,7 @@
/*
* index.js: Top-level include for the pkgcloud common module.
*
- * (C) 2011 Nodejitsu Inc.
+ * (C) 2011 Charlie Robbins, Ken Perkins, Ross Kukulinski & the Contributors.
*
*/
diff --git a/lib/pkgcloud/common/status.js b/lib/pkgcloud/common/status.js
index 231afaa75..b4cab0dc8 100644
--- a/lib/pkgcloud/common/status.js
+++ b/lib/pkgcloud/common/status.js
@@ -1,7 +1,7 @@
/*
* status.js: Standardized statuses for different services
*
- * (C) 2011-2012 Nodejitsu Inc.
+ * (C) 2011-2012 Charlie Robbins, Ken Perkins, Ross Kukulinski & the Contributors.
*
*/
diff --git a/lib/pkgcloud/core/base/client.js b/lib/pkgcloud/core/base/client.js
index 490380a14..34a4a5431 100644
--- a/lib/pkgcloud/core/base/client.js
+++ b/lib/pkgcloud/core/base/client.js
@@ -1,16 +1,14 @@
/*
* client.js: Base client from which all pkgcloud clients inherit from
*
- * (C) 2013 Nodejitsu Inc.
+ * (C) 2013 Charlie Robbins, Ken Perkins, Ross Kukulinski & the Contributors.
*
*/
-var fs = require('fs'),
- events = require('eventemitter2'),
+var events = require('eventemitter2'),
request = require('request'),
- utile = require('utile'),
+ util = require('util'),
qs = require('qs'),
- common = require('../../common'),
pkgcloud = require('../../../pkgcloud'),
errs = require('errs');
@@ -27,7 +25,35 @@ var Client = exports.Client = function (options) {
this.config = options || {};
};
-utile.inherits(Client, events.EventEmitter2);
+util.inherits(Client, events.EventEmitter2);
+
+/**
+ * Client.setCustomUserAgent
+ *
+ * @description allows the caller to specify a custom prefix for the HTTP UserAgent
+ * for all queries generated during the lifetime of the client.
+ *
+ * Valid user agents should come in the form of app-name/version, for example:
+ *
+ * client.setCustomUserAgent("my-app/1.2.3");
+ *
+ * @param {String} userAgent the new userAgent to be prefixed
+ */
+Client.prototype.setCustomUserAgent = function (userAgent) {
+ this._customUserAgent = userAgent;
+};
+
+/**
+ * Client.getUserAgent
+ *
+ * @description gets the full UserAgent for the current client
+ *
+ * @returns {string}
+ */
+Client.prototype.getUserAgent = function() {
+ return util.format('%snodejs-pkgcloud/%s', this._customUserAgent ?
+ this._customUserAgent + ' ' : '', pkgcloud.version);
+};
/**
* Client._request
@@ -42,7 +68,6 @@ utile.inherits(Client, events.EventEmitter2);
*/
Client.prototype._request = function (options, callback) {
var self = this;
-
var requestOptions = {};
requestOptions.method = options.method || 'GET';
@@ -106,7 +131,7 @@ Client.prototype._request = function (options, callback) {
delete opts.signingUrl;
// Set our User Agent
- opts.headers['User-Agent'] = utile.format('nodejs-pkgcloud/%s', pkgcloud.version);
+ opts.headers['User-Agent'] = self.getUserAgent();
// If we are missing callback
if (!callback) {
@@ -151,30 +176,9 @@ Client.prototype._defaultRequestHandler = function (callback) {
return callback(err);
}
- var statusCode = res.statusCode.toString(),
- err2;
-
- if (Object.keys(self.failCodes).indexOf(statusCode) !== -1) {
- //
- // TODO: Support more than JSON errors here
- //
- err2 = {
- provider: self.provider,
- failCode: self.failCodes[statusCode],
- statusCode: res.statusCode,
- message: self.provider + ' Error (' +
- statusCode + '): ' + self.failCodes[statusCode],
- href: res.request.uri.href,
- method: res.request.method,
- headers: res.headers
- };
-
- try {
- err2.result = typeof body === 'string' ? JSON.parse(body) : body;
- } catch (e) {
- err2.result = { err: body };
- }
+ var err2 = self._parseError(res, body);
+ if (err2) {
self.emit('log::error', 'Error during provider response', err2);
return callback(errs.create(err2));
}
@@ -187,5 +191,37 @@ Client.prototype._defaultRequestHandler = function (callback) {
});
callback(err, body, res);
+ };
+};
+
+Client.prototype._parseError = function(response, body) {
+ var self = this,
+ statusCode = response.statusCode.toString(),
+ err;
+
+ if (Object.keys(self.failCodes).indexOf(statusCode) !== -1) {
+ //
+ // TODO: Support more than JSON errors here
+ //
+ err = {
+ provider: self.provider,
+ failCode: self.failCodes[statusCode],
+ statusCode: response.statusCode,
+ message: self.provider + ' Error (' +
+ statusCode + '): ' + self.failCodes[statusCode],
+ href: response.request.uri.href,
+ method: response.request.method,
+ headers: response.headers
+ };
+
+ if (body) {
+ try {
+ err.result = typeof body === 'string' ? JSON.parse(body) : body;
+ } catch (e) {
+ err.result = { err: body };
+ }
+ }
}
+
+ return err;
};
diff --git a/lib/pkgcloud/core/base/index.js b/lib/pkgcloud/core/base/index.js
index b73e15336..2d71cde3f 100644
--- a/lib/pkgcloud/core/base/index.js
+++ b/lib/pkgcloud/core/base/index.js
@@ -1,7 +1,7 @@
/*
* index.js: Top-level include for pkgcloud `base` module from which all pkgcloud objects inherit.
*
- * (C) 2011 Nodejitsu Inc.
+ * (C) 2011 Charlie Robbins, Ken Perkins, Ross Kukulinski & the Contributors.
*
*/
diff --git a/lib/pkgcloud/core/base/model.js b/lib/pkgcloud/core/base/model.js
index 2b1f5eed1..2c00d102d 100644
--- a/lib/pkgcloud/core/base/model.js
+++ b/lib/pkgcloud/core/base/model.js
@@ -1,12 +1,12 @@
/*
* model.js: Base model from which all pkgcloud models inherit from
*
- * (C) 2011 Nodejitsu Inc.
+ * (C) 2011 Charlie Robbins, Ken Perkins, Ross Kukulinski & the Contributors.
*
*/
var events = require('eventemitter2'),
- utile = require('utile');
+ util = require('util');
var Model = exports.Model = function (client, details) {
events.EventEmitter2.call(this, { delimiter: '::', wildcard: true });
@@ -17,7 +17,7 @@ var Model = exports.Model = function (client, details) {
}
};
-utile.inherits(Model, events.EventEmitter2);
+util.inherits(Model, events.EventEmitter2);
// ### function setWait (attributes, interval, callback)
//
diff --git a/lib/pkgcloud/core/compute/flavor.js b/lib/pkgcloud/core/compute/flavor.js
index 42b33d4cf..44abcc62b 100644
--- a/lib/pkgcloud/core/compute/flavor.js
+++ b/lib/pkgcloud/core/compute/flavor.js
@@ -1,18 +1,18 @@
/*
* flavor.js: Base flavor from which all pkgcloud flavors inherit from
*
- * (C) 2011 Nodejitsu Inc.
+ * (C) 2011 Charlie Robbins, Ken Perkins, Ross Kukulinski & the Contributors.
*
*/
-var utile = require('utile'),
+var util = require('util'),
model = require('../base/model');
var Flavor = exports.Flavor = function (client, details) {
model.Model.call(this, client, details);
};
-utile.inherits(Flavor, model.Model);
+util.inherits(Flavor, model.Model);
Flavor.prototype.refresh = function (callback) {
return this.client.getFlavor(this, callback);
diff --git a/lib/pkgcloud/core/compute/image.js b/lib/pkgcloud/core/compute/image.js
index 7fff63adb..f468ad901 100644
--- a/lib/pkgcloud/core/compute/image.js
+++ b/lib/pkgcloud/core/compute/image.js
@@ -1,18 +1,18 @@
/*
* image.js: Base image from which all pkgcloud images inherit from
*
- * (C) 2011 Nodejitsu Inc.
+ * (C) 2011 Charlie Robbins, Ken Perkins, Ross Kukulinski & the Contributors.
*
*/
-var utile = require('utile'),
+var util = require('util'),
model = require('../base/model');
var Image = exports.Image = function (client, details) {
model.Model.call(this, client, details);
};
-utile.inherits(Image, model.Model);
+util.inherits(Image, model.Model);
Image.prototype.refresh = function (callback) {
return this.client.getImage(this, callback);
diff --git a/lib/pkgcloud/core/compute/index.js b/lib/pkgcloud/core/compute/index.js
index cbececd00..d9c09456e 100644
--- a/lib/pkgcloud/core/compute/index.js
+++ b/lib/pkgcloud/core/compute/index.js
@@ -1,7 +1,7 @@
/*
* index.js: Top-level include from which all pkgcloud compute models inherit.
*
- * (C) 2011 Nodejitsu Inc.
+ * (C) 2011 Charlie Robbins, Ken Perkins, Ross Kukulinski & the Contributors.
*
*/
@@ -57,7 +57,6 @@ exports.serverIp = function (server, options) {
isPrivate = options.isPrivate || exports.isPrivate,
interfaces,
addresses,
- networks,
pub;
if (server.ips) {
diff --git a/lib/pkgcloud/core/compute/server.js b/lib/pkgcloud/core/compute/server.js
index 64d789bac..4bef9e01c 100644
--- a/lib/pkgcloud/core/compute/server.js
+++ b/lib/pkgcloud/core/compute/server.js
@@ -1,11 +1,11 @@
/*
* server.js: Base server from which all pkgcloud servers inherit from
*
- * (C) 2011 Nodejitsu Inc.
+ * (C) 2011 Charlie Robbins, Ken Perkins, Ross Kukulinski & the Contributors.
*
*/
-var utile = require('utile'),
+var util = require('util'),
model = require('../base/model'),
computeStatus = require('../../common/status').compute;
@@ -13,12 +13,15 @@ var Server = exports.Server = function (client, details) {
model.Model.call(this, client, details);
};
-utile.inherits(Server, model.Model);
+util.inherits(Server, model.Model);
Server.prototype.refresh = function (callback) {
var self = this;
return self.client.getServer(this, function (err, server) {
- if (!err) self._setProperties(server.original);
+ if (!err) {
+ self._setProperties(server.original);
+ }
+
return callback.apply(this, arguments);
});
};
diff --git a/lib/pkgcloud/core/dns/record.js b/lib/pkgcloud/core/dns/record.js
index c7d760f4f..fec81e9cd 100644
--- a/lib/pkgcloud/core/dns/record.js
+++ b/lib/pkgcloud/core/dns/record.js
@@ -7,14 +7,14 @@
*
*/
-var utile = require('utile'),
+var util = require('util'),
model = require('../base/model');
var Record = exports.Record = function (zone, details) {
model.Model.call(this, zone.client, details);
};
-utile.inherits(Record, model.Model);
+util.inherits(Record, model.Model);
Record.prototype.create = function(callback) {
return this.zone.createRecord(this, callback);
diff --git a/lib/pkgcloud/core/dns/zone.js b/lib/pkgcloud/core/dns/zone.js
index 6f1bbd252..a334cf899 100644
--- a/lib/pkgcloud/core/dns/zone.js
+++ b/lib/pkgcloud/core/dns/zone.js
@@ -7,14 +7,14 @@
*
*/
-var utile = require('utile'),
+var util = require('util'),
model = require('../base/model');
var Zone = exports.Zone = function (client, details) {
model.Model.call(this, client, details);
};
-utile.inherits(Zone, model.Model);
+util.inherits(Zone, model.Model);
Zone.prototype.create = function (callback) {
return this.client.createZone(this, callback);
diff --git a/lib/pkgcloud/core/loadbalancer/loadbalancer.js b/lib/pkgcloud/core/loadbalancer/loadbalancer.js
index f2fda0017..5e4ebf45e 100644
--- a/lib/pkgcloud/core/loadbalancer/loadbalancer.js
+++ b/lib/pkgcloud/core/loadbalancer/loadbalancer.js
@@ -7,14 +7,14 @@
*
*/
-var utile = require('utile'),
+var util = require('util'),
model = require('../base/model');
var LoadBalancer = exports.LoadBalancer = function (client, details) {
model.Model.call(this, client, details);
};
-utile.inherits(LoadBalancer, model.Model);
+util.inherits(LoadBalancer, model.Model);
LoadBalancer.prototype.create = function (callback) {
return this.client.createLoadBalancer(this, callback);
diff --git a/lib/pkgcloud/core/loadbalancer/node.js b/lib/pkgcloud/core/loadbalancer/node.js
index c9ce602ae..606ff409a 100644
--- a/lib/pkgcloud/core/loadbalancer/node.js
+++ b/lib/pkgcloud/core/loadbalancer/node.js
@@ -7,11 +7,11 @@
*
*/
-var utile = require('utile'),
+var util = require('util'),
model = require('../base/model');
var Node = exports.Node = function (client, details) {
model.Model.call(this, client, details);
};
-utile.inherits(Node, model.Model);
+util.inherits(Node, model.Model);
diff --git a/lib/pkgcloud/core/network/network.js b/lib/pkgcloud/core/network/network.js
new file mode 100644
index 000000000..d51abacc6
--- /dev/null
+++ b/lib/pkgcloud/core/network/network.js
@@ -0,0 +1,31 @@
+/*
+ * network.js: Base network from which all pkgcloud networks inherit.
+ *
+ * (C) 2014 Hewlett-Packard Development Company, L.P.
+ *
+ */
+
+var util = require('util'),
+ model = require('../base/model');
+
+var Network = exports.Network = function (client, details) {
+ model.Model.call(this, client, details);
+};
+
+util.inherits(Network, model.Model);
+
+Network.prototype.create = function (callback) {
+ this.client.createNetwork(this.name, callback);
+};
+
+Network.prototype.refresh = function (callback) {
+ this.client.getNetwork(this.id, callback);
+};
+
+Network.prototype.update = function (callback) {
+ this.client.updateNetwork(this, callback);
+};
+
+Network.prototype.destroy = function (callback) {
+ this.client.destroyNetwork(this.id, callback);
+};
diff --git a/lib/pkgcloud/core/network/port.js b/lib/pkgcloud/core/network/port.js
new file mode 100644
index 000000000..d918a1020
--- /dev/null
+++ b/lib/pkgcloud/core/network/port.js
@@ -0,0 +1,31 @@
+/*
+ * port.js: Base network from which all pkgcloud ports inherit.
+ *
+ * (C) 2014 Hewlett-Packard Development Company, L.P.
+ *
+ */
+
+var util = require('util'),
+ model = require('../base/model');
+
+var Port = exports.Port = function (client, details) {
+ model.Model.call(this, client, details);
+};
+
+util.inherits(Port, model.Model);
+
+Port.prototype.create = function (callback) {
+ this.client.createPort(this.name, callback);
+};
+
+Port.prototype.refresh = function (callback) {
+ this.client.getPort(this.id, callback);
+};
+
+Port.prototype.update = function (callback) {
+ this.client.updatePort(this, callback);
+};
+
+Port.prototype.destroy = function (callback) {
+ this.client.destroyPort(this.id, callback);
+};
diff --git a/lib/pkgcloud/core/network/securityGroup.js b/lib/pkgcloud/core/network/securityGroup.js
new file mode 100644
index 000000000..18eeef7fd
--- /dev/null
+++ b/lib/pkgcloud/core/network/securityGroup.js
@@ -0,0 +1,28 @@
+/*
+ * securityGroup.js: Base securityGroup from which all pkgcloud securityGroup inherit.
+ *
+ * (C) 2015 Rackspace
+ * Shaunak Kashyap
+ * MIT LICENSE
+ */
+
+var util = require('util'),
+ Model = require('../base/model').Model;
+
+var SecurityGroup = exports.SecurityGroup = function (client, details) {
+ Model.call(this, client, details);
+};
+
+util.inherits(SecurityGroup, Model);
+
+SecurityGroup.prototype.create = function (callback) {
+ this.client.createSecurityGroup(this, callback);
+};
+
+SecurityGroup.prototype.refresh = function (callback) {
+ this.client.getSecurityGroup(this.id, callback);
+};
+
+SecurityGroup.prototype.destroy = function (callback) {
+ this.client.destroySecurityGroup(this.id, callback);
+};
diff --git a/lib/pkgcloud/core/network/securityGroupRule.js b/lib/pkgcloud/core/network/securityGroupRule.js
new file mode 100644
index 000000000..abacd2c4b
--- /dev/null
+++ b/lib/pkgcloud/core/network/securityGroupRule.js
@@ -0,0 +1,28 @@
+/*
+ * securityGroupRule.js: Base securityGroupRule from which all pkgcloud securityGroupRule inherit.
+ *
+ * (C) 2015 Rackspace
+ * Shaunak Kashyap
+ * MIT LICENSE
+ */
+
+var util = require('util'),
+ Model = require('../base/model').Model;
+
+var SecurityGroupRule = exports.SecurityGroupRule = function (client, details) {
+ Model.call(this, client, details);
+};
+
+util.inherits(SecurityGroupRule, Model);
+
+SecurityGroupRule.prototype.create = function (callback) {
+ this.client.createSecurityGroupRule(this, callback);
+};
+
+SecurityGroupRule.prototype.refresh = function (callback) {
+ this.client.getSecurityGroupRule(this.id, callback);
+};
+
+SecurityGroupRule.prototype.destroy = function (callback) {
+ this.client.destroySecurityGroupRule(this.id, callback);
+};
diff --git a/lib/pkgcloud/core/network/subnet.js b/lib/pkgcloud/core/network/subnet.js
new file mode 100644
index 000000000..34c2568b7
--- /dev/null
+++ b/lib/pkgcloud/core/network/subnet.js
@@ -0,0 +1,31 @@
+/*
+ * subnet.js: Base subnet from which all pkgcloud subnet inherit.
+ *
+ * (C) 2014 Hewlett-Packard Development Company, L.P.
+ *
+ */
+
+var util = require('util'),
+ model = require('../base/model');
+
+var Subnet = exports.Subnet = function (client, details) {
+ model.Model.call(this, client, details);
+};
+
+util.inherits(Subnet, model.Model);
+
+Subnet.prototype.create = function (callback) {
+ this.client.createSubnet(this.name, callback);
+};
+
+Subnet.prototype.refresh = function (callback) {
+ this.client.getSubnet(this.id, callback);
+};
+
+Subnet.prototype.update = function (callback) {
+ this.client.updateSubnet(this, callback);
+};
+
+Subnet.prototype.destroy = function (callback) {
+ this.client.destroySubnet(this.id, callback);
+};
diff --git a/lib/pkgcloud/core/storage/container.js b/lib/pkgcloud/core/storage/container.js
index 8e1c008a7..2c5ab3be0 100644
--- a/lib/pkgcloud/core/storage/container.js
+++ b/lib/pkgcloud/core/storage/container.js
@@ -1,20 +1,20 @@
/*
* container.js: Base container from which all pkgcloud containers inherit from
*
- * (C) 2010 Nodejitsu Inc.
+ * (C) 2010 Charlie Robbins, Ken Perkins, Ross Kukulinski & the Contributors.
*
*/
-var utile = require('utile'),
+var util = require('util'),
model = require('../base/model');
var Container = exports.Container = function (client, details) {
- model.Model.call(this, client, details);
-
this.files = [];
+
+ model.Model.call(this, client, details);
};
-utile.inherits(Container, model.Model);
+util.inherits(Container, model.Model);
Container.prototype.create = function (callback) {
this.client.createContainer(this.name, callback);
@@ -54,4 +54,4 @@ Container.prototype.getFiles = function (download, callback) {
Container.prototype.removeFile = function (file, callback) {
this.client.removeFile(this.name, file, callback);
-};
\ No newline at end of file
+};
diff --git a/lib/pkgcloud/core/storage/file.js b/lib/pkgcloud/core/storage/file.js
index e7981d892..d98d21d9d 100644
--- a/lib/pkgcloud/core/storage/file.js
+++ b/lib/pkgcloud/core/storage/file.js
@@ -1,12 +1,11 @@
/*
* file.js: Base container from which all pkgcloud files inherit from
*
- * (C) 2010 Nodejitsu Inc.
+ * (C) 2010 Charlie Robbins, Ken Perkins, Ross Kukulinski & the Contributors.
*
*/
-var fs = require('fs'),
- utile = require('utile'),
+var util = require('util'),
model = require('../base/model'),
storage = require('../storage');
@@ -14,7 +13,7 @@ var File = exports.File = function (client, details) {
model.Model.call(this, client, details);
};
-utile.inherits(File, model.Model);
+util.inherits(File, model.Model);
File.prototype.remove = function (callback) {
this.client.removeFile(this.containerName, this.name, callback);
diff --git a/lib/pkgcloud/core/storage/index.js b/lib/pkgcloud/core/storage/index.js
index 8a9cc34f2..09f922080 100644
--- a/lib/pkgcloud/core/storage/index.js
+++ b/lib/pkgcloud/core/storage/index.js
@@ -1,7 +1,7 @@
/*
* index.js: Top-level include from which all pkgcloud storage models inherit.
*
- * (C) 2011 Nodejitsu Inc.
+ * (C) 2011 Charlie Robbins, Ken Perkins, Ross Kukulinski & the Contributors.
*
*/
diff --git a/lib/pkgcloud/digitalocean/client.js b/lib/pkgcloud/digitalocean/client.js
index c261ff5cc..55ff0cce3 100644
--- a/lib/pkgcloud/digitalocean/client.js
+++ b/lib/pkgcloud/digitalocean/client.js
@@ -1,13 +1,11 @@
/*
* client.js: Base client from which all Joyent clients inherit from
*
- * (C) 2012 Nodejitsu Inc.
+ * (C) 2012 Charlie Robbins, Ken Perkins, Ross Kukulinski & the Contributors.
*
*/
-var utile = require('utile'),
- fs = require('fs'),
- auth = require('../common/auth'),
+var util = require('util'),
base = require('../core/base');
//
@@ -18,8 +16,8 @@ var utile = require('utile'),
// #### @throws {TypeError} On bad input
//
var Client = exports.Client = function (opts) {
- if (!opts || !opts.clientId || !opts.apiKey) {
- throw new TypeError('clientId and apiKey are required');
+ if (!opts || !opts.token) {
+ throw new TypeError('token is required');
}
base.Client.call(this, opts);
@@ -27,7 +25,7 @@ var Client = exports.Client = function (opts) {
this.provider = 'digitalocean';
this.protocol = opts.protocol || 'https://';
this.serversUrl = opts.serversUrl;
-
+
if (!this.before) {
this.before = [];
}
@@ -41,14 +39,14 @@ var Client = exports.Client = function (opts) {
});
this.before.push(function setAuth(req) {
- req.qs = req.qs || {};
-
- req.qs.client_id = opts.clientId;
- req.qs.api_key = opts.apiKey;
+ req.headers = req.headers || {};
+ req.headers.authorization = [
+ 'Bearer', opts.token
+ ].join(' ');
});
};
-utile.inherits(Client, base.Client);
+util.inherits(Client, base.Client);
Client.prototype.failCodes = {
400: 'Bad Request',
diff --git a/lib/pkgcloud/digitalocean/compute/client/flavors.js b/lib/pkgcloud/digitalocean/compute/client/flavors.js
index 015a67dde..d481fac61 100644
--- a/lib/pkgcloud/digitalocean/compute/client/flavors.js
+++ b/lib/pkgcloud/digitalocean/compute/client/flavors.js
@@ -1,7 +1,7 @@
/*
* flavors.js: Implementation of DigitalOcean Flavors Client.
*
- * (C) 2012, Nodejitsu Inc.
+ * (C) 2012 Charlie Robbins, Ken Perkins, Ross Kukulinski & the Contributors.
*
*/
@@ -19,15 +19,15 @@ var pkgcloud = require('../../../../../lib/pkgcloud'),
exports.getFlavors = function getFlavors(callback) {
var self = this;
return this._request({
- path: '/sizes'
+ path: '/v2/sizes'
}, function (err, body, res) {
if (err || !body.sizes) {
return callback(err || new Error('No flavors provided.'));
}
-
+
callback(null, body.sizes.map(function (result) {
return new compute.Flavor(self, result);
- }), res);
+ }), res);
});
};
@@ -45,8 +45,8 @@ exports.getFlavor = function getFlavor(flavor, callback) {
self = this;
return this._request({
- path: '/sizes'
- }, function (err, body, res) {
+ path: '/v2/sizes'
+ }, function (err, body) {
if (err || !body.sizes) {
return callback(err || new Error('No flavors found.'));
}
@@ -54,9 +54,10 @@ exports.getFlavor = function getFlavor(flavor, callback) {
var flavor = body.sizes.filter(function (flavor) {
return flavor.id == flavorId;
})[0];
-
+
return !flavor
? callback(new Error('No flavor found with id: ' + flavorId))
- : callback(null, new Flavor(self, flavor));
+ : callback(null, new compute.Flavor(self, flavor));
});
-};
\ No newline at end of file
+};
+
diff --git a/lib/pkgcloud/digitalocean/compute/client/images.js b/lib/pkgcloud/digitalocean/compute/client/images.js
index 9a0bce4fc..b7618a088 100644
--- a/lib/pkgcloud/digitalocean/compute/client/images.js
+++ b/lib/pkgcloud/digitalocean/compute/client/images.js
@@ -1,25 +1,41 @@
/*
* images.js: Implementation of DigitalOcean Images Client.
*
- * (C) 2012, Nodejitsu Inc.
+ * (C) 2012 Charlie Robbins, Ken Perkins, Ross Kukulinski & the Contributors.
*
*/
var pkgcloud = require('../../../../../lib/pkgcloud'),
base = require('../../../core/compute'),
errs = require('errs'),
+ urlJoin = require('url-join'),
compute = pkgcloud.providers.digitalocean.compute;
//
// ### function getImages (callback)
+// #### @options {Object} Options when getting images
+// #### @options.per_page {number} **Optional** Number of images to list
+// #### @options.page {number} **Optional** Page number of images to return
// #### @callback {function} f(err, images). `images` is an array that
// represents the images that are available to your account
//
// Lists all images available to your account.
//
-exports.getImages = function getImages(callback) {
- var self = this;
+exports.getImages = function getImages(options, callback) {
+ if (!callback && typeof options === 'function') {
+ callback = options;
+ options = {};
+ }
+
+ var self = this,
+ per_page = options.per_page || 200,
+ page = options.page || 1;
+
return this._request({
- path: '/images'
+ path: '/v2/images',
+ qs: {
+ per_page: per_page,
+ page: page
+ }
}, function (err, body, res) {
if (err || !body.images) {
return callback(err || new Error('No images found.'));
@@ -41,10 +57,10 @@ exports.getImages = function getImages(callback) {
//
exports.getImage = function getImage(image, callback) {
var imageId = image instanceof base.Image ? image.id : image,
- self = this;
+ self = this;
return this._request({
- path: '/images/' + imageId
+ path: urlJoin('/v2/images/', imageId)
}, function (err, body, res) {
return err
? callback(err)
@@ -78,14 +94,14 @@ exports.createImage = function createImage(options, callback) {
// Destroys an image in DigitalOcean
//
exports.destroyImage = function destroyImage(image, callback) {
- var imageId = image instanceof base.Image ? image.id : image,
- self = this;
+ var imageId = image instanceof base.Image ? image.id : image;
return this._request({
- path: '/images/' + imageId + '/destroy'
+ path: urlJoin('/images/', imageId , '/destroy'),
+ method: 'DELETE'
}, function (err, body, res) {
return err
? callback(err)
: callback(null, { ok: imageId }, res);
});
-};
\ No newline at end of file
+};
diff --git a/lib/pkgcloud/digitalocean/compute/client/index.js b/lib/pkgcloud/digitalocean/compute/client/index.js
index 9fd493816..f74726c6b 100644
--- a/lib/pkgcloud/digitalocean/compute/client/index.js
+++ b/lib/pkgcloud/digitalocean/compute/client/index.js
@@ -1,24 +1,25 @@
/*
* index.js: Compute client for DigitalOcean API
*
- * (C) 2012 Nodejitsu Inc.
+ * (C) 2012 Charlie Robbins, Ken Perkins, Ross Kukulinski & the Contributors.
*
*/
-var utile = require('utile'),
+var util = require('util'),
urlJoin = require('url-join'),
- digitalocean = require('../../client');
+ digitalocean = require('../../client'),
+ _ = require('lodash');
var Client = exports.Client = function (options) {
digitalocean.Client.call(this, options);
- utile.mixin(this, require('./flavors'));
- utile.mixin(this, require('./images'));
- utile.mixin(this, require('./servers'));
- utile.mixin(this, require('./keys'));
+ _.extend(this, require('./flavors'));
+ _.extend(this, require('./images'));
+ _.extend(this, require('./servers'));
+ _.extend(this, require('./keys'));
};
-utile.inherits(Client, digitalocean.Client);
+util.inherits(Client, digitalocean.Client);
Client.prototype._getUrl = function (options) {
options = options || {};
diff --git a/lib/pkgcloud/digitalocean/compute/client/keys.js b/lib/pkgcloud/digitalocean/compute/client/keys.js
index 4e5cc493c..4bf6d5df5 100644
--- a/lib/pkgcloud/digitalocean/compute/client/keys.js
+++ b/lib/pkgcloud/digitalocean/compute/client/keys.js
@@ -1,12 +1,12 @@
/*
* keys.js: Implementation of DigitalOcean SSH keys Client.
*
- * (C) 2012, Nodejitsu Inc.
+ * (C) 2012 Charlie Robbins, Ken Perkins, Ross Kukulinski & the Contributors.
*
*/
var errs = require('errs'),
- utile = require('utile');
+ urlJoin = require('url-join');
//
// ### function listKeys (callback)
@@ -16,8 +16,8 @@ var errs = require('errs'),
//
exports.listKeys = function (callback) {
return this._request({
- path: '/ssh_keys'
- }, function (err, body, res) {
+ path: '/v2/account/keys'
+ }, function (err, body) {
return err
? callback(err)
: callback(null, body.ssh_keys);
@@ -25,16 +25,16 @@ exports.listKeys = function (callback) {
};
//
-// ### function getKey (name, callback)
-// #### @name {string} Name of the DigitalOcean SSH key to get
+// ### function getKey (id, callback)
+// #### @id {int} Name of the DigitalOcean SSH key to get
// #### @callback {function} Continuation to respond to when complete.
//
-// Gets the details of the DigitalOcean SSH Key with the specified `name`.
+// Gets the details of the DigitalOcean SSH Key with the specified `id`.
//
-exports.getKey = function (name, callback) {
+exports.getKey = function (id, callback) {
return this._request({
- path: '/ssh_keys/' + name
- }, function (err, body, res) {
+ path: urlJoin('/v2/account/keys', id)
+ }, function (err, body) {
return err
? callback(err)
: callback(null, body.ssh_key);
@@ -59,12 +59,13 @@ exports.addKey = function (options, callback) {
}
return this._request({
- path: '/ssh_keys/new',
- qs: {
+ path: '/v2/account/keys',
+ method: 'POST',
+ body: {
name: options.name,
ssh_pub_key: options.key
}
- }, function (err, body, res) {
+ }, function (err) {
return err
? callback(err)
: callback(null, true);
@@ -73,17 +74,18 @@ exports.addKey = function (options, callback) {
//
// ### function getKey (name, callback)
-// #### @name {string} Name of the DigitalOcean SSH key to destroy
+// #### @id {int} Name of the DigitalOcean SSH key to destroy
// #### @callback {function} Continuation to respond to when complete.
//
-// Destroys DigitalOcean SSH Key with the specified `name`.
+// Destroys DigitalOcean SSH Key with the specified `id`.
//
-exports.destroyKey = function (name, callback) {
+exports.destroyKey = function (id, callback) {
return this._request({
- path: '/ssh_keys/' + name + '/destroy',
- }, function (err, body, res) {
+ path: urlJoin('/v2/account/keys', id),
+ method: 'DELETE',
+ }, function (err) {
return err
? callback(err)
: callback(null, true);
});
-};
\ No newline at end of file
+};
diff --git a/lib/pkgcloud/digitalocean/compute/client/servers.js b/lib/pkgcloud/digitalocean/compute/client/servers.js
index 235b788b5..db4a14ce6 100644
--- a/lib/pkgcloud/digitalocean/compute/client/servers.js
+++ b/lib/pkgcloud/digitalocean/compute/client/servers.js
@@ -1,15 +1,19 @@
/*
* servers.js: Instance methods for working with servers from DigitalOcean
*
- * (C) 2012 Nodejitsu Inc.
+ * (C) 2012 Charlie Robbins, Ken Perkins, Ross Kukulinski & the Contributors.
*
*/
-var request = require('request'),
- base = require('../../../core/compute'),
+var base = require('../../../core/compute'),
pkgcloud = require('../../../../../lib/pkgcloud'),
errs = require('errs'),
+ urlJoin = require('url-join'),
compute = pkgcloud.providers.digitalocean.compute;
+function _getServerId(server) {
+ return (server instanceof base.Server ? server.id : server) + '';
+}
+
//
// ### function getVersion (callback)
// #### @callback {function} f(err, version).
@@ -18,7 +22,7 @@ var request = require('request'),
//
exports.getVersion = function getVersion(callback) {
return errs.handle(
- errs.create({ message: "DigitalOcean's API does not support versioning" }),
+ errs.create({ message: 'DigitalOcean\'s API does not support versioning' }),
callback
);
};
@@ -31,7 +35,7 @@ exports.getVersion = function getVersion(callback) {
//
exports.getLimits = function getLimits(callback) {
return errs.handle(
- errs.create({ message: "DigitalOcean's API is not rate limited" }),
+ errs.create({ message: 'DigitalOcean\'s API is not rate limited' }),
callback
);
};
@@ -39,8 +43,8 @@ exports.getLimits = function getLimits(callback) {
//
// ### function getServers (callback)
// #### @options {Object} Options when getting servers
-// #### @options.offset {number} Number of servers to skip when listing
-// #### @options.limit {number} Number of servers to return
+// #### @options.per_page {number} **Optional** Number of servers to skip when listing
+// #### @options.page {number} **Optional** Number of servers to return
// #### @callback {function} f(err, servers). `servers` is an array that
// represents the servers that are available to your account
//
@@ -49,14 +53,20 @@ exports.getLimits = function getLimits(callback) {
exports.getServers = function getServers(options, callback) {
if (!callback && typeof options === 'function') {
callback = options;
- options = null;
+ options = {};
}
- var self = this;
+ var self = this,
+ per_page = options.per_page || 200,
+ page = options.page || 1;
+
return this._request(
{
- path: '/droplets',
- qs: options
+ path: '/v2/droplets',
+ qs: {
+ per_page: per_page,
+ page: page
+ }
},
function (err, body, res) {
if (err) {
@@ -73,11 +83,15 @@ exports.getServers = function getServers(options, callback) {
//
// ### function createServer (options, callback)
// #### @opts {Object} **Optional** options
-// #### @name {String} **Optional** a name for your server
+// #### @name {String} a name for your server
// #### @flavor {String|Flavor} **Optional** flavor to use for this image
// #### @image {String|Image} **Optional** the image to use
// #### @required {Boolean} **Optional** Validate if flavor, name,
// and image are present
+// #### @ipv6 {Boolean} **Optional** Enable IPv6
+// #### @private_networking {Boolean} **Optional** Enable private networking
+// #### @backups {Boolean} **Optional** Enable backups
+// #### @user_data {String} **Optional** Provide cloud-init user-data
// #### @* {*} **Optional** Anything platform specific
// #### @callback {Function} f(err, server).
//
@@ -95,8 +109,9 @@ exports.createServer = function createServer(options, callback) {
var self = this,
createOptions = {
- path: '/droplets/new',
- qs: {}
+ method: 'POST',
+ path: '/v2/droplets',
+ body: {}
};
['flavor', 'image', 'name'].forEach(function (member) {
@@ -108,13 +123,13 @@ exports.createServer = function createServer(options, callback) {
}
});
- createOptions.qs.name = options.name;
- createOptions.qs.region_id = options.region || options.region_id || 1;
- createOptions.qs.size_id = options.flavor instanceof base.Flavor
+ createOptions.body.name = options.name;
+ createOptions.body.region = options.region || options.region_id || 'nyc3';
+ createOptions.body.size = options.flavor instanceof base.Flavor
? options.flavor.id
: options.flavor;
- createOptions.qs.image_id = options.image instanceof base.Image
+ createOptions.body.image = options.image instanceof base.Image
? options.image.id
: options.image;
@@ -123,14 +138,34 @@ exports.createServer = function createServer(options, callback) {
// which can be a single string or an Array.
//
if (options.keyname) {
- createOptions.qs.ssh_key_ids = options.keyname;
+ createOptions.body.ssh_keys = options.keyname;
}
else if (options.keynames) {
- createOptions.qs.ssh_key_ids = Array.isArray(options.keynames)
+ createOptions.body.ssh_keys = Array.isArray(options.keynames)
? options.keynames.join(',')
: options.keynames;
}
+
+ //
+ // DigitalOcean specific options.
+ //
+ if (options.ipv6) {
+ createOptions.body.ipv6 = options.ipv6;
+ }
+
+ if (options.private_networking) {
+ createOptions.body.private_networking = options.private_networking;
+ }
+
+ if (options.backups) {
+ createOptions.body.backups = options.backups;
+ }
+
+ if (options.user_data) {
+ createOptions.body.user_data = options.user_data;
+ }
+
return this._request(createOptions, function (err, body, res) {
return err
? callback(err)
@@ -150,8 +185,7 @@ exports.createServer = function createServer(options, callback) {
// Destroy a server in DigitalOcean.
//
exports.destroyServer = function destroyServer(server, options, callback) {
- var serverId = server instanceof base.Server ? server.id : server,
- self = this;
+ var serverId = _getServerId(server);
if (typeof options === 'function') {
callback = options;
@@ -159,12 +193,8 @@ exports.destroyServer = function destroyServer(server, options, callback) {
}
this._request({
- path: '/droplets/' + serverId + '/destroy',
- qs: {
- scrub_data: (typeof options.scrubData === 'boolean')
- ? (options.scrubData ? '1' : '0')
- : '1'
- }
+ method: 'DELETE',
+ path: urlJoin('/v2/droplets/', serverId)
}, function (err, body, res) {
return err ? callback(err) : callback(null, { ok: serverId }, res);
});
@@ -178,11 +208,11 @@ exports.destroyServer = function destroyServer(server, options, callback) {
// Gets a server in DigitalOcean.
//
exports.getServer = function getServer(server, callback) {
- var serverId = server instanceof base.Server ? server.id : server,
+ var serverId = _getServerId(server),
self = this;
return this._request({
- path: '/droplets/' + serverId
+ path: urlJoin('/v2/droplets/', serverId)
}, function (err, body, res) {
return !err
? callback(null, new compute.Server(self, body.droplet), res)
@@ -201,7 +231,9 @@ exports.getServer = function getServer(server, callback) {
exports.rebootServer = function rebootServer(server, callback) {
var serverId = server instanceof base.Server ? server.id : server;
return this._request({
- path: '/droplets/' + serverId + '/reboot'
+ method: 'POST',
+ path: urlJoin('/v2/droplets/', serverId, '/actions'),
+ body: { type: 'reboot' },
}, function (err, body, res) {
return err
? callback(err)
@@ -220,8 +252,12 @@ exports.rebootServer = function rebootServer(server, callback) {
exports.renameServer = function renameServer(server, name, callback) {
var serverId = server instanceof base.Server ? server.id : server;
return this._request({
- path: '/droplets/' + serverId + '/rename',
- qs: { name: name }
+ method: 'POST',
+ path: urlJoin('/v2/droplets/', serverId, '/actions'),
+ body: {
+ type: 'rename',
+ name: name
+ },
}, function (err, body, res) {
return err
? callback(err)
diff --git a/lib/pkgcloud/digitalocean/compute/flavor.js b/lib/pkgcloud/digitalocean/compute/flavor.js
index f585d3976..bce1c5426 100644
--- a/lib/pkgcloud/digitalocean/compute/flavor.js
+++ b/lib/pkgcloud/digitalocean/compute/flavor.js
@@ -1,30 +1,30 @@
/*
* flavor.js: DigitalOcean Server "Size"
*
- * (C) 2012 Nodejitsu Inc.
+ * (C) 2012 Charlie Robbins, Ken Perkins, Ross Kukulinski & the Contributors.
*
*/
-var utile = require('utile'),
+var util = require('util'),
base = require('../../core/compute/flavor');
var Flavor = exports.Flavor = function Flavor(client, details) {
base.Flavor.call(this, client, details);
};
-utile.inherits(Flavor, base.Flavor);
+util.inherits(Flavor, base.Flavor);
Flavor.prototype._setProperties = function (details) {
- this.id = details.id;
- this.name = details.name;
+ this.id = details.slug;
+ this.name = details.slug;
this.ram = details.memory;
this.disk = details.disk;
-
+
//
// DigitalOcean specific
//
- this.cpu = details.cpu;
- this.costPerHour = details.cost_per_hour;
- this.costPerMonth = details.cost_per_month;
+ this.cpu = details.vcpus;
+ this.costPerHour = details.price_hourly;
+ this.costPerMonth = details.price_monthly;
this.original = this.digitalocean = details;
};
\ No newline at end of file
diff --git a/lib/pkgcloud/digitalocean/compute/image.js b/lib/pkgcloud/digitalocean/compute/image.js
index 57c7429c7..be1b1530f 100644
--- a/lib/pkgcloud/digitalocean/compute/image.js
+++ b/lib/pkgcloud/digitalocean/compute/image.js
@@ -1,26 +1,29 @@
/*
* image.js: DigitalOcean Image
*
- * (C) 2012 Nodejitsu Inc.
+ * (C) 2012 Charlie Robbins, Ken Perkins, Ross Kukulinski & the Contributors.
*
*/
-var utile = require('utile'),
+var util = require('util'),
base = require('../../core/compute/image');
var Image = exports.Image = function Image(client, details) {
base.Image.call(this, client, details);
};
-utile.inherits(Image, base.Image);
+util.inherits(Image, base.Image);
Image.prototype._setProperties = function (details) {
this.id = details.id;
this.name = details.name;
+ this.created = details.created_at;
//
// DigitalOcean specific
//
this.distribution = details.distribution;
+ this.public = details.public;
+ this.slug = details.slug;
this.original = this.digitalocean = details;
};
\ No newline at end of file
diff --git a/lib/pkgcloud/digitalocean/compute/index.js b/lib/pkgcloud/digitalocean/compute/index.js
index 36815810c..7878ea5ea 100644
--- a/lib/pkgcloud/digitalocean/compute/index.js
+++ b/lib/pkgcloud/digitalocean/compute/index.js
@@ -1,7 +1,7 @@
/*
* index.js: Top-level include for the DigitalOcean compute module
*
- * (C) 2012 Nodejitsu Inc.
+ * (C) 2012 Charlie Robbins, Ken Perkins, Ross Kukulinski & the Contributors.
*
*/
diff --git a/lib/pkgcloud/digitalocean/compute/server.js b/lib/pkgcloud/digitalocean/compute/server.js
index c7fc2c9a3..0d7c72122 100644
--- a/lib/pkgcloud/digitalocean/compute/server.js
+++ b/lib/pkgcloud/digitalocean/compute/server.js
@@ -1,33 +1,51 @@
/*
* server.js: DigitalOcean Server
*
- * (C) 2013 Nodejitsu Inc.
+ * (C) 2013 Charlie Robbins, Ken Perkins, Ross Kukulinski & the Contributors.
*
*/
-var utile = require('utile'),
- compute = require('../../core/compute'),
+var util = require('util'),
base = require('../../core/compute/server');
var Server = exports.Server = function Server(client, details) {
base.Server.call(this, client, details);
};
-utile.inherits(Server, base.Server);
+util.inherits(Server, base.Server);
Server.prototype._setProperties = function (details) {
+ var self = this;
+
+ function getAddresses(networks) {
+ networks.forEach(function (network) {
+ self.addresses[network.type].push(network.ip_address);
+ });
+ }
+
this.id = details.id;
this.name = details.name;
- this.imageId = details.image_id;
- this.flavorId = details.size_id;
+ this.imageId = details.image.id;
+ this.flavorId = details.size_slug;
this.addresses = {
- public: [details.ip_address],
+ public: [],
private: []
};
+ if (details.networks.v4) {
+ getAddresses(details.networks.v4);
+ }
+
+ if (details.networks.v6) {
+ getAddresses(details.networks.v6);
+ }
+
switch (details.status && details.status.toUpperCase()) {
case 'ACTIVE':
- this.status = "RUNNING";
+ this.status = 'RUNNING';
+ break;
+ case 'OFF':
+ this.status = this.STATUS.stopped;
break;
case 'NEW':
default:
@@ -38,5 +56,7 @@ Server.prototype._setProperties = function (details) {
// DigitalOcean specific
//
this.region = details.region_id;
+ this.created = details.created_at;
this.original = this.digitalocean = details;
};
+
diff --git a/lib/pkgcloud/digitalocean/index.js b/lib/pkgcloud/digitalocean/index.js
index a29a0083d..b54da38e5 100644
--- a/lib/pkgcloud/digitalocean/index.js
+++ b/lib/pkgcloud/digitalocean/index.js
@@ -1,7 +1,7 @@
/*
* index.js: Top-level include for the DigitalOcean module.
*
- * (C) 2013 Nodejitsu Inc.
+ * (C) 2013 Charlie Robbins, Ken Perkins, Ross Kukulinski & the Contributors.
*
*/
diff --git a/lib/pkgcloud/google/client.js b/lib/pkgcloud/google/client.js
new file mode 100644
index 000000000..364f5a541
--- /dev/null
+++ b/lib/pkgcloud/google/client.js
@@ -0,0 +1,21 @@
+/*
+ * client.js: Base client from which all Google Cloud Storage clients inherit from
+ *
+ * (C) 2012 Charlie Robbins, Ken Perkins, Ross Kukulinski & the Contributors.
+ *
+ */
+
+var util = require('util'),
+ base = require('../core/base');
+
+var Client = exports.Client = function (options) {
+ base.Client.call(this, options);
+
+ options = options || {};
+
+ this.provider = 'google';
+ this.config.keyFilename = this.config.keyFilename || options.keyFilename;
+ this.config.projectId = this.config.projectId || options.projectId;
+};
+
+util.inherits(Client, base.Client);
diff --git a/lib/pkgcloud/google/index.js b/lib/pkgcloud/google/index.js
new file mode 100644
index 000000000..c0ab50782
--- /dev/null
+++ b/lib/pkgcloud/google/index.js
@@ -0,0 +1,8 @@
+/*
+ * index.js: Top-level include for the Google Cloud Storage module.
+ *
+ * (C) 2012 Charlie Robbins, Ken Perkins, Ross Kukulinski & the Contributors.
+ *
+ */
+
+exports.storage = require('./storage');
diff --git a/lib/pkgcloud/google/storage/client/containers.js b/lib/pkgcloud/google/storage/client/containers.js
new file mode 100644
index 000000000..67bd4b8ee
--- /dev/null
+++ b/lib/pkgcloud/google/storage/client/containers.js
@@ -0,0 +1,121 @@
+/*
+ * containers.js: Instance methods for working with containers from Google Cloud Storage
+ *
+ * (C) 2012 Charlie Robbins, Ken Perkins, Ross Kukulinski & the Contributors.
+ *
+ */
+
+var async = require('async'),
+ pkgcloud = require('../../../../../lib/pkgcloud'),
+ storage = pkgcloud.providers.google.storage;
+
+/**
+ * Get all Google Cloud Storage containers for this instance.
+ *
+ * @param {function} callback - Continuation to respond to when complete.
+ */
+exports.getContainers = function (callback) {
+ var self = this,
+ containers = [];
+
+ function handleResponse(err, buckets, nextQuery) {
+ if (err) {
+ callback(err);
+ return;
+ }
+
+ buckets.forEach(function(container) {
+ containers.push(new (storage.Container)(self, container));
+ });
+
+ if (nextQuery) {
+ self.storage.getBuckets(nextQuery, handleResponse);
+ return;
+ }
+
+ callback(err, containers);
+ }
+
+ self.storage.getBuckets(handleResponse);
+};
+
+/**
+ * Responds with the Google Cloud Storage bucket for the specified container.
+ *
+ * @param {string|storage.Container} container - The container to return.
+ * @param {function} callback - Continuation to respond to when complete.
+ */
+exports.getContainer = function (container, callback) {
+ var self = this,
+ bucket = this._getBucket(container);
+
+ bucket.getMetadata(function(err) {
+ return err
+ ? callback(err)
+ : callback(null, new (storage.Container)(self, bucket));
+ });
+};
+
+/**
+ * Creates the specified `container` in the Google Cloud Storage account
+ * associated with this instance.
+ *
+ * @param {string|storage.Container} container - The container to create.
+ * @param {function} callback - Continuation to respond to when complete.
+ */
+exports.createContainer = function (options, callback) {
+ var self = this,
+ bucketName = this._getBucket(options).name;
+
+ self.storage.createBucket(bucketName, function(err, bucket) {
+ return err
+ ? callback(err)
+ : callback(null, new (storage.Container)(self, bucket));
+ });
+};
+
+/**
+ * Destroys the specified container and all files in it.
+ *
+ * @param {string|storage.Container} container - The container to destroy.
+ * @param {function} callback - Continuation to respond to when complete.
+ */
+exports.destroyContainer = function (container, callback) {
+ var bucket = this._getBucket(container);
+
+ function deleteContainer() {
+ bucket.delete(function(err) {
+ return err
+ ? callback(err)
+ : callback(null, true);
+ });
+ }
+
+ function destroyFile(file, next) {
+ file.delete(next);
+ }
+
+ function deleteFiles(files, next) {
+ async.forEachLimit(files, 10, destroyFile, next);
+ }
+
+ function handleResponse(err, files, nextQuery) {
+ if (err) {
+ return callback(err);
+ }
+
+ if (files.length > 0) {
+ deleteFiles(files, function() {
+ if (nextQuery) {
+ bucket.getFiles(nextQuery, handleResponse);
+ } else {
+ deleteContainer();
+ }
+ });
+ } else {
+ deleteContainer();
+ }
+ }
+
+ bucket.getFiles(handleResponse);
+};
diff --git a/lib/pkgcloud/google/storage/client/files.js b/lib/pkgcloud/google/storage/client/files.js
new file mode 100644
index 000000000..b41567c1e
--- /dev/null
+++ b/lib/pkgcloud/google/storage/client/files.js
@@ -0,0 +1,117 @@
+/*
+ * files.js: Instance methods for working with files from Google Cloud Storage
+ *
+ * (C) 2012 Charlie Robbins, Ken Perkins, Ross Kukulinski & the Contributors.
+ *
+ */
+
+var pkgcloud = require('../../../../../lib/pkgcloud'),
+ storage = pkgcloud.providers.google.storage,
+ _ = require('lodash');
+
+/**
+ * Destroy a file in the specified container.
+ *
+ * @param {string} container - Name of the container to destroy the file in.
+ * @param {string} file - Name of the file to destroy.
+ * @param {function} callback - Continuation to respond to when complete.
+ */
+exports.removeFile = function (container, file, callback) {
+ var bucket = this._getBucket(container),
+ file = this._getFile(bucket, file);
+
+ file.delete(function(err) {
+ return err
+ ? callback(err)
+ : callback(null, true);
+ });
+};
+
+/**
+ * Upload a file to the specified bucket.
+ *
+ * @param {object} options - Configuration object.
+ * @param {object} options.container - Container object for the file.
+ * @param {object|string} options.file - The file to upload content to.
+ * @return {stream}
+ */
+exports.upload = function (options) {
+ var self = this,
+ bucket = this._getBucket(options),
+ file = this._getFile(bucket, options),
+ metadata = { contentType: options.contentType };
+
+ // check for deprecated calling with a callback
+ if (typeof arguments[arguments.length - 1] === 'function') {
+ self.emit('log::warn', 'storage.upload no longer supports calling with a callback');
+ }
+
+ // GCS implicitly detects mime-type if none was implicitly given via options
+ var writableStream = file.createWriteStream({ metadata });
+
+ // return a file model via the 'success' event
+ writableStream.on('finish', function() {
+ writableStream.emit('success', new storage.File(self, file));
+ });
+
+ return writableStream;
+};
+
+/**
+ * Download a file from the specified bucket.
+ *
+ * @param {object} options - Configuration object.
+ * @param {object} options.container - Container object for the file.
+ * @param {object|string} options.file - The file to upload content to.
+ * @return {stream}
+ */
+exports.download = function (options) {
+ var bucket = this._getBucket(options),
+ file = this._getFile(bucket, options);
+
+ return file.createReadStream(options);
+};
+
+exports.getFile = function (container, file, callback) {
+ var self = this,
+ bucket = this._getBucket(container),
+ file = this._getFile(bucket, file);
+
+ file.getMetadata(function(err, data) {
+ return err
+ ? callback(err)
+ : callback(null, new storage.File(self, _.extend({ metadata: data }, {
+ container: container
+ })));
+ });
+};
+
+/**
+ * Get all of the files from a gcloud bucket.
+ *
+ * @param {object} container - Container object for the file.
+ * @param {object=|function} options - Options or callback.
+ * @param {string} options.maxResults - Maximum amount of results to fetch.
+ * @param {function} callback - Continuation to respond to when complete.
+ */
+exports.getFiles = function (container, options, callback) {
+ var self = this,
+ bucket = this._getBucket(container);
+
+ if (typeof options === 'function') {
+ callback = options;
+ options = {};
+ }
+ else if (!options) {
+ options = {};
+ }
+
+ bucket.getFiles(options, function(err, files, nextQuery) {
+ return err
+ ? callback(err)
+ : callback(null, files.map(function (file) {
+ file.container = container;
+ return new storage.File(self, file);
+ }), nextQuery);
+ });
+};
diff --git a/lib/pkgcloud/google/storage/client/index.js b/lib/pkgcloud/google/storage/client/index.js
new file mode 100644
index 000000000..03b36f5af
--- /dev/null
+++ b/lib/pkgcloud/google/storage/client/index.js
@@ -0,0 +1,56 @@
+/*
+ * client.js: Storage client for Google Cloud Storage
+ *
+ * (C) 2011 Charlie Robbins, Ken Perkins, Ross Kukulinski & the Contributors.
+ *
+ */
+
+const util = require('util');
+const google = require('../../client');
+const _ = require('lodash');
+const pkgcloud = require('../../../../../lib/pkgcloud');
+const { Storage } = require('@google-cloud/storage');
+
+var Client = exports.Client = function (options) {
+ google.Client.call(this, options);
+
+ _.extend(this, require('./containers'));
+ _.extend(this, require('./files'));
+
+ this.storage = new Storage(options);
+};
+
+util.inherits(Client, google.Client);
+
+/**
+ * Return a gcloud Bucket instance after detecting its name from a variety of
+ * parameter types.
+ *
+ * @param {object|string} container - A descriptor for a gcloud Bucket.
+ * @return {gcloud:bucket}
+ */
+Client.prototype._getBucket = function (container) {
+ container = container.container || container;
+
+ var storage = pkgcloud.providers.google.storage,
+ containerName = container instanceof storage.Container ? container.name : container;
+
+ return this.storage.bucket(containerName || container);
+};
+
+/**
+ * Return a gcloud File instance after detecting its name from a variety of
+ * parameter types.
+ *
+ * @param {gcloud:bucket} bucket - A gcloud Bucket instance, which contains the file.
+ * @param {object|string} file - A descriptor for a gcloud File.
+ * @return {gcloud:file}
+ */
+Client.prototype._getFile = function (bucket, file) {
+ file = file.file || file.remote || file;
+
+ var storage = pkgcloud.providers.google.storage,
+ fileName = file instanceof storage.File ? file.name : file;
+
+ return bucket.file(fileName || file);
+};
diff --git a/lib/pkgcloud/google/storage/container.js b/lib/pkgcloud/google/storage/container.js
new file mode 100644
index 000000000..ea609f227
--- /dev/null
+++ b/lib/pkgcloud/google/storage/container.js
@@ -0,0 +1,26 @@
+/*
+ * container.js: Google Cloud Storage Bucket
+ *
+ * (C) 2012 Charlie Robbins, Ken Perkins, Ross Kukulinski & the Contributors.
+ *
+ */
+
+var util = require('util'),
+ base = require('../../core/storage/container'),
+ _ = require('lodash');
+
+var Container = exports.Container = function Container(client, details) {
+ base.Container.call(this, client, details);
+};
+
+util.inherits(Container, base.Container);
+
+Container.prototype._setProperties = function (bucket) {
+ this.name = bucket.name;
+ this.metadata = bucket.metadata;
+ _.extend(this, bucket.metadata);
+};
+
+Container.prototype.toJSON = function () {
+ return this.metadata;
+};
diff --git a/lib/pkgcloud/google/storage/file.js b/lib/pkgcloud/google/storage/file.js
new file mode 100644
index 000000000..bbad7f10c
--- /dev/null
+++ b/lib/pkgcloud/google/storage/file.js
@@ -0,0 +1,30 @@
+/*
+ * container.js: Google Cloud Storage File
+ *
+ * (C) 2012 Charlie Robbins, Ken Perkins, Ross Kukulinski & the Contributors.
+ *
+ */
+
+var util = require('util'),
+ base = require('../../core/storage/file'),
+ _ = require('lodash');
+
+var File = exports.File = function File(client, details) {
+ base.File.call(this, client, details);
+};
+
+util.inherits(File, base.File);
+
+File.prototype._setProperties = function (file) {
+ this.name = file.name;
+ this.metadata = file.metadata;
+ _.extend(this, file.metadata);
+
+ if (this.size) {
+ this.size = parseInt(this.size, 10);
+ }
+};
+
+File.prototype.toJSON = function () {
+ return this.metadata;
+};
\ No newline at end of file
diff --git a/lib/pkgcloud/google/storage/index.js b/lib/pkgcloud/google/storage/index.js
new file mode 100644
index 000000000..c87d08a46
--- /dev/null
+++ b/lib/pkgcloud/google/storage/index.js
@@ -0,0 +1,14 @@
+/*
+ * index.js: Top-level include for the Google Cloud Storage module
+ *
+ * (C) 2012 Charlie Robbins, Ken Perkins, Ross Kukulinski & the Contributors.
+ *
+ */
+
+exports.Client = require('./client').Client;
+exports.Container = require('./container').Container;
+exports.File = require('./file').File;
+
+exports.createClient = function (options) {
+ return new exports.Client(options);
+};
diff --git a/lib/pkgcloud/hp/client.js b/lib/pkgcloud/hp/client.js
new file mode 100644
index 000000000..88e4fe822
--- /dev/null
+++ b/lib/pkgcloud/hp/client.js
@@ -0,0 +1,37 @@
+/*
+ * client.js: Base client from which all HP clients inherit from
+ *
+ * (C) 2014 Hewlett-Packard Development Company, L.P.
+ *
+ */
+
+var util = require('util'),
+ identity = require('./identity'),
+ base = require('../openstack/client'),
+ _ = require('lodash');
+
+var Client = exports.Client = function (options) {
+ options = options || {};
+
+ if (!options.authUrl){
+ throw new Error('authUrl is invalid');
+ }
+
+ options.identity = identity.Identity;
+
+ if (typeof options.useServiceCatalog === 'undefined') {
+ options.useServiceCatalog = true;
+ }
+
+ base.Client.call(this, options);
+
+ this.provider = 'hp';
+};
+
+util.inherits(Client, base.Client);
+
+Client.prototype._getIdentityOptions = function() {
+ return _.extend({
+ apiKey: this.config.apiKey
+ }, Client.super_.prototype._getIdentityOptions.call(this));
+};
diff --git a/lib/pkgcloud/hp/compute/client/index.js b/lib/pkgcloud/hp/compute/client/index.js
new file mode 100644
index 000000000..ad2484097
--- /dev/null
+++ b/lib/pkgcloud/hp/compute/client/index.js
@@ -0,0 +1,29 @@
+/*
+ * client.js: Compute client for HP Cloudservers
+ *
+ * (C) 2014 Hewlett-Packard Development Company, L.P.
+ * Phani Raj
+ *
+ */
+
+var util = require('util'),
+ hp = require('../../client'),
+ ComputeClient = require('../../../openstack/compute/computeClient').ComputeClient,
+ _ = require('lodash');
+
+var Client = exports.Client = function (options) {
+ hp.Client.call(this, options);
+ _.extend(this, require('../../../openstack/compute/client/flavors'));
+ _.extend(this, require('../../../openstack/compute/client/images'));
+ _.extend(this, require('../../../openstack/compute/client/servers'));
+ _.extend(this, require('../../../openstack/compute/client/extensions/keys'));
+ _.extend(this, require('../../../openstack/compute/client/extensions/floating-ips'));
+ _.extend(this, require('../../../openstack/compute/client/extensions/keys'));
+ _.extend(this, require('../../../openstack/compute/client/extensions/security-groups'));
+ _.extend(this, require('../../../openstack/compute/client/extensions/servers'));
+
+ this.serviceType = 'compute';
+};
+
+util.inherits(Client, hp.Client);
+_.extend(Client.prototype, ComputeClient.prototype);
diff --git a/lib/pkgcloud/hp/compute/index.js b/lib/pkgcloud/hp/compute/index.js
new file mode 100644
index 000000000..0eef07471
--- /dev/null
+++ b/lib/pkgcloud/hp/compute/index.js
@@ -0,0 +1,16 @@
+ /*
+ * index.js: Top-level include for the Rackspace storage module
+ *
+ * (C) 2014 Hewlett-Packard Development Company, L.P.
+ * Phani Raj
+ *
+ */
+
+exports.Client = require('./client').Client;
+exports.Flavor = require('../../openstack/compute/flavor').Flavor;
+exports.Image = require('../../openstack/compute/image').Image;
+exports.Server = require('../../openstack/compute/server').Server;
+
+exports.createClient = function (options) {
+ return new exports.Client(options);
+};
diff --git a/lib/pkgcloud/hp/database/client/index.js b/lib/pkgcloud/hp/database/client/index.js
new file mode 100644
index 000000000..0cefae2a0
--- /dev/null
+++ b/lib/pkgcloud/hp/database/client/index.js
@@ -0,0 +1,61 @@
+/*
+ * client.js: Database client for HP Trove Databases
+ *
+ * (C) 2014 Hewlett-Packard Development Company, L.P.
+ *
+ */
+
+var util = require('util'),
+ urlJoin = require('url-join'),
+ hp = require('../../client'),
+ auth = require('../../../common/auth.js'),
+ _ = require('lodash');
+
+var Client = exports.Client = function (options) {
+ hp.Client.call(this, options);
+
+ this.before.push(auth.accountId);
+
+ _.extend(this, require('../../../openstack/database/client/flavors'));
+ _.extend(this, require('../../../openstack/database/client/instances'));
+ _.extend(this, require('../../../openstack/database/client/databases'));
+ _.extend(this, require('../../../openstack/database/client/users'));
+
+ this.serviceType = 'database';
+};
+
+util.inherits(Client, hp.Client);
+
+Client.prototype._getUrl = function (options) {
+ options = options || {};
+
+ return urlJoin(this._serviceUrl,
+ typeof options === 'string'
+ ? options
+ : options.path);
+
+};
+
+//
+// Gets the version of the OpenStack Compute API we are running against
+// Parameters: callback
+//
+Client.prototype.getVersion = function getVersion(callback) {
+ var self = this;
+
+ this.auth(function (err) {
+ if (err) {
+ return callback(err);
+ }
+
+ self._request({
+ uri: self._getUrl('/').replace('/v1.0/' + self._identity.token.tenant.id + '/', '')
+ }, function (err, body) {
+ if (err) {
+ return callback(err);
+ }
+ return callback(null,
+ ((typeof body === 'object') ? body.versions : JSON.parse(body).versions));
+ });
+ });
+};
diff --git a/lib/pkgcloud/hp/database/index.js b/lib/pkgcloud/hp/database/index.js
new file mode 100644
index 000000000..36f968345
--- /dev/null
+++ b/lib/pkgcloud/hp/database/index.js
@@ -0,0 +1,16 @@
+/*
+ * index.js: Top-level include for the HP database module
+ *
+ * (C) 2014 Hewlett-Packard Development Company, L.P.
+ *
+ */
+
+exports.Client = require('./client').Client;
+exports.Flavor = require('../../openstack/database/flavor').Flavor;
+exports.Instance = require('../../openstack/database/instance').Instance;
+exports.Database = require('../../openstack/database/database').Database;
+exports.User = require('../../openstack/database/user').User;
+
+exports.createClient = function createClient(options) {
+ return new exports.Client(options);
+};
diff --git a/lib/pkgcloud/hp/identity/hpIdentity.js b/lib/pkgcloud/hp/identity/hpIdentity.js
new file mode 100644
index 000000000..89d340011
--- /dev/null
+++ b/lib/pkgcloud/hp/identity/hpIdentity.js
@@ -0,0 +1,50 @@
+/*
+ * hpIdentity.js: hpIdentity model
+ *
+ * (C) 2014 Hewlett-Packard Development Company, L.P.
+ * Phani Raj
+ *
+ */
+
+var identity = require('../../openstack/context'),
+ events = require('eventemitter2'),
+ Identity = identity.Identity,
+ util = require('util');
+
+var HPIdentity = exports.Identity = function (options) {
+ this.options = options;
+ this.name = 'HPIdentity';
+
+ this.basePath = options.basePath || '/v2.0/tokens';
+ this.useServiceCatalog = (typeof options.useServiceCatalog === 'boolean')
+ ? options.useServiceCatalog
+ : true;
+
+ events.EventEmitter2.call(this, { delimiter: '::', wildcard: true });
+};
+
+util.inherits(HPIdentity, events.EventEmitter2);
+util.inherits(HPIdentity, Identity);
+
+HPIdentity.prototype._buildAuthenticationPayload = function () {
+ var self = this;
+
+ HPIdentity.super_.prototype._buildAuthenticationPayload.call(this);
+
+ this.emit('log::trace', 'Building HP Identity Auth Payload');
+
+ if (!self._authenticationPayload) {
+ // setup our inputs for authorization
+ // access key & secret key
+ if (self.options.apiKey && self.options.username) {
+ self._authenticationPayload = {
+ auth: {
+ 'apiAccessKeyCredentials': {
+ 'accessKey': self.options.username,
+ 'secretKey': self.options.apiKey
+ }
+ }
+ };
+ }
+ }
+};
diff --git a/lib/pkgcloud/hp/identity/index.js b/lib/pkgcloud/hp/identity/index.js
new file mode 100644
index 000000000..54c592b69
--- /dev/null
+++ b/lib/pkgcloud/hp/identity/index.js
@@ -0,0 +1,9 @@
+/*
+ * index.js: Identity models
+ *
+ * (C) 2014 Hewlett-Packard Development Company, L.P.
+ * Phani Raj
+ *
+ */
+
+module.exports = require('./hpIdentity');
diff --git a/lib/pkgcloud/hp/index.js b/lib/pkgcloud/hp/index.js
new file mode 100644
index 000000000..f725ea2df
--- /dev/null
+++ b/lib/pkgcloud/hp/index.js
@@ -0,0 +1,12 @@
+/*
+ * index.js: Top-level include for the HP module.
+ *
+ * (C) 2014 Hewlett-Packard Development Company, L.P.
+ * Phani Raj
+ *
+ */
+
+exports.storage = require('./storage');
+exports.compute = require('./compute');
+exports.network = require('./network');
+exports.database = require('./database');
diff --git a/lib/pkgcloud/hp/network/client/index.js b/lib/pkgcloud/hp/network/client/index.js
new file mode 100644
index 000000000..a48370179
--- /dev/null
+++ b/lib/pkgcloud/hp/network/client/index.js
@@ -0,0 +1,51 @@
+/*
+ * client.js: Client for HP networking
+ *
+ * (C) 2014 Hewlett-Packard Development Company, L.P.
+ *
+ */
+
+var util = require('util'),
+ urlJoin = require('url-join'),
+ hp = require('../../client'),
+ NetworkClient = require('../../../openstack/network/networkClient').NetworkClient,
+ _ = require('lodash');
+
+var Client = exports.Client = function (options) {
+ hp.Client.call(this, options);
+
+ this.models = {
+ Network: require('../../../openstack/network/network').Network,
+ Subnet: require('../../../openstack/network/subnet').Subnet,
+ Port: require('../../../openstack/network/port').Port,
+ SecurityGroup: require('../../../openstack/network/securityGroup').SecurityGroup,
+ SecurityGroupRule: require('../../../openstack/network/securityGroupRule').SecurityGroupRule
+ };
+
+ _.extend(this, require('../../../openstack/network/client/networks'));
+ _.extend(this, require('../../../openstack/network/client/subnets'));
+ _.extend(this, require('../../../openstack/network/client/ports'));
+ _.extend(this, require('../../../openstack/network/client/securityGroups'));
+ _.extend(this, require('../../../openstack/network/client/securityGroupRules'));
+
+ this.serviceType = 'network';
+};
+
+util.inherits(Client, hp.Client);
+_.extend(Client.prototype, NetworkClient.prototype);
+
+/**
+ * client._getUrl
+ *
+ * @description get the url for the current networking service
+ *
+ * @param options
+ * @returns {exports|*}
+ * @private
+ */
+Client.prototype._getUrl = function(options) {
+ if (options.path) {
+ options.path = urlJoin('v2.0', options.path);
+ }
+ return NetworkClient.prototype._getUrl.call(this, options);
+};
diff --git a/lib/pkgcloud/hp/network/index.js b/lib/pkgcloud/hp/network/index.js
new file mode 100644
index 000000000..b11932fee
--- /dev/null
+++ b/lib/pkgcloud/hp/network/index.js
@@ -0,0 +1,17 @@
+/*
+ * index.js: Top-level include for the HP networking client.
+ *
+ * (C) 2014 Hewlett-Packard Development Company, L.P.
+ *
+ */
+
+exports.Client = require('./client').Client;
+exports.Network = require('../../openstack/network/network').Network;
+exports.Subnet = require('../../openstack/network/subnet').Subnet;
+exports.Port = require('../../openstack/network/port').Port;
+exports.SecurityGroup = require('../../openstack/network/securityGroup').SecurityGroup;
+exports.SecurityGroupRule = require('../../openstack/network/securityGroupRule').SecurityGroupRule;
+
+exports.createClient = function (options) {
+ return new exports.Client(options);
+};
diff --git a/lib/pkgcloud/hp/storage/client/index.js b/lib/pkgcloud/hp/storage/client/index.js
new file mode 100644
index 000000000..3826d3975
--- /dev/null
+++ b/lib/pkgcloud/hp/storage/client/index.js
@@ -0,0 +1,29 @@
+/*
+ * index.js: Storage client for HP Cloudservers
+ *
+ * (C) 2014 Hewlett-Packard Development Company, L.P.
+ * Phani Raj
+ *
+ */
+
+var util = require('util'),
+ hp = require('../../client'),
+ StorageClient = require('../../../openstack/storage/storageClient').StorageClient,
+ _ = require('lodash');
+
+var Client = exports.Client = function (options) {
+ hp.Client.call(this, options);
+
+ this.models = {
+ Container: require('../../../openstack/storage/container').Container,
+ File: require('../../../openstack/storage/file').File
+ };
+
+ _.extend(this, require('../../../openstack/storage/client/containers'));
+ _.extend(this, require('../../../openstack/storage/client/files'));
+
+ this.serviceType = 'object-store';
+};
+
+util.inherits(Client, hp.Client);
+_.extend(Client.prototype, StorageClient.prototype);
diff --git a/lib/pkgcloud/hp/storage/index.js b/lib/pkgcloud/hp/storage/index.js
new file mode 100644
index 000000000..524da3a56
--- /dev/null
+++ b/lib/pkgcloud/hp/storage/index.js
@@ -0,0 +1,15 @@
+ /*
+ * index.js: Top-level include for the HP storage module
+ *
+ * (C) 2014 Hewlett-Packard Development Company, L.P.
+ * Phani Raj
+ *
+ */
+
+exports.Client = require('./client').Client;
+exports.Container = require('../../openstack/storage/container').Container;
+exports.File = require('../../openstack/storage/file').File;
+
+exports.createClient = function (options) {
+ return new exports.Client(options);
+};
diff --git a/lib/pkgcloud/iriscouch/database/client/index.js b/lib/pkgcloud/iriscouch/database/client/index.js
deleted file mode 100644
index be65f4707..000000000
--- a/lib/pkgcloud/iriscouch/database/client/index.js
+++ /dev/null
@@ -1,191 +0,0 @@
-/*
- * client.js: Database client for Iriscouch Cloud Databases
- *
- * (C) 2011 Nodejitsu Inc.
- *
- */
-
-var utile = require('utile'),
- request = require('request'),
- pkgcloud = require('../../../../pkgcloud'),
- errs = require('errs');
-
-var Client = exports.Client = function (options) {
- this.username = options.username;
- this.password = options.password;
-
- this.protocol = options.protocol || 'https://';
- this.databaseUrl = options.databaseUrl || 'hosting.iriscouch.com/hosting_public';
-};
-
-Client.prototype.create = function (attrs, callback) {
- // Check for options.
- if (!attrs || typeof attrs === 'function') {
- return errs.handle(errs.create({
- message: 'Options required for create a database.'
- }), Array.prototype.slice.call(arguments).pop());
- }
- // Check for obligatory fields
- if (!attrs['first_name'] || !attrs['last_name']) {
- return errs.handle(errs.create({
- message: 'Options. first_name and last_name are required arguments'
- }), Array.prototype.slice.call(arguments).pop());
- }
-
- if (!attrs['subdomain'] || !attrs['email']) {
- return errs.handle(errs.create({
- message: 'Options. subdomain and email are required arguments'
- }), Array.prototype.slice.call(arguments).pop());
- }
-
- // If is a redis provisioning request so we have to define a password
- if (attrs['type'] && attrs['type'] === 'redis' && !attrs['password']) {
- return errs.handle(errs.create({
- message: 'Options. password for redis is a required argument'
- }), Array.prototype.slice.call(arguments).pop());
- }
-
- var self = this,
- couch = {
- // The ID needs the prefix of the type of database
- _id: ((attrs['type'] &&
- attrs['type'] === 'redis') ? "Redis/" : "Server/") + attrs.subdomain,
- partner: this.username,
- creation: {
- "first_name": attrs.first_name,
- "last_name": attrs.last_name,
- "email": attrs.email,
- "subdomain": attrs.subdomain
- }
- };
-
- // When redis so we have to add the password
- if (attrs['type'] && attrs['type'] === 'redis') {
- couch.creation.password = attrs['password'];
- }
-
- var options = {
- uri : this._getUrl(),
- method : 'POST',
- body : JSON.stringify(couch),
- followRedirect: false,
- headers: {
- 'Content-Type': 'application/json',
- 'Authorization': "Basic " + utile.base64.encode(this.username + ':' + this.password),
- 'User-Agent': utile.format('nodejs-pkgcloud/%s', pkgcloud.version)
- }
- };
-
- request(options, function (err, response, body) {
- if (err) {
- return callback(err);
- }
-
- if (typeof body === 'string') {
- try { body = JSON.parse(body) }
- catch (ex) { }
- }
-
- if (response.statusCode === 201) {
- if (body.ok === true) {
- //
- // For Redis we dont have any polling method yet, so just trust on iriscouch for provisioning correctly
- //
- if (attrs['type'] && attrs['type'] === 'redis') {
- var subdomain = body.id.split('/').pop();
- callback(err, {
- id: subdomain,
- port: 6379,
- host: subdomain + '.redis.irstack.com',
- uri: 'redis://' + subdomain + '.redis.irstack.com/',
- username: '',
- password: subdomain + '.redis.irstack.com:' + attrs['password']
- });
- } else {
- //
- // Remark: Begin polling iriscouch to determine when the couch database is ready.
- //
- self._checkCouch(attrs.subdomain, function (err, response) {
- response.subdomain = attrs.subdomain;
- var database = self.formatResponse(response);
- callback(err, database);
- });
- }
- }
- else {
- callback("There was an issue creating the couch", { "created": false });
- }
- }
- else if (response.statusCode === 403 || response.statusCode === 401 || response.statusCode === 302) {
- callback("incorrect partner name or password.", { "created": false });
- }
- else if (response.statusCode === 409) {
- callback("subdomain is already taken.", { "created": false });
- }
- else {
- callback("unknown error", { "created": false });
- }
- });
-};
-
-Client.prototype.formatResponse = function (response) {
- var database = {
- id: response.subdomain,
- port: 6984,
- host: response.subdomain + '.iriscouch.com',
- uri: 'https://' + response.subdomain + '.iriscouch.com:6984/',
- username: '',
- password: ''
- };
- return database;
-};
-
-Client.prototype._getUrl = function () {
- return this.protocol + this.databaseUrl;
-};
-
-Client.prototype._checkCouch = function (couchName, callback) {
- //
- // Remark: Poll the couch with a GET every interval to determine if couch is up yet
- // We perform a poll since there is no real database available notification event from couchone
- //
-
- var interval = 4000,
- maxAttempts = 20,
- count = 0,
- options = {
- uri : this._getCouchPollingUrl(couchName),
- method : 'GET',
- followRedirect: false,
- headers: {
- 'Content-Type': 'application/json',
- 'User-Agent': utile.format('nodejs-pkgcloud/%s', pkgcloud.version)
- }
- },
-
- t = function () {
- count = count + 1;
- if (count > maxAttempts) {
- return callback("Max Attempts hit", { "created": false });
- }
- request(options, function (err, response, body) {
- if (err) {
- return callback(err, { "created": false });
- }
- if (response.statusCode === 200) {
- return callback(null, { "created": true });
- }
- setTimeout(t, interval);
- });
- };
- t();
-};
-
-Client.prototype.remove = function (id, callback) {
- callback("Destroy method not available for iriscouch.");
-};
-
-// This function gets overriden in tests to trap the polling request
-Client.prototype._getCouchPollingUrl = function(couchName) {
- return 'http://' + couchName + '.iriscouch.com/';
-};
diff --git a/lib/pkgcloud/iriscouch/database/index.js b/lib/pkgcloud/iriscouch/database/index.js
deleted file mode 100644
index c34a775e7..000000000
--- a/lib/pkgcloud/iriscouch/database/index.js
+++ /dev/null
@@ -1,12 +0,0 @@
-/*
- * index.js: Top-level include for the Iriscouch database module
- *
- * (C) 2011 Nodejitsu Inc.
- *
- */
-
-exports.Client = require('./client').Client;
-
-exports.createClient = function createClient(options) {
- return new exports.Client(options);
-};
diff --git a/lib/pkgcloud/iriscouch/index.js b/lib/pkgcloud/iriscouch/index.js
deleted file mode 100644
index b0c730580..000000000
--- a/lib/pkgcloud/iriscouch/index.js
+++ /dev/null
@@ -1,8 +0,0 @@
-/*
- * index.js: Top-level include for the iriscouch module.
- *
- * (C) 2011 Nodejitsu Inc.
- *
- */
-
-exports.database = require('./database');
diff --git a/lib/pkgcloud/joyent/client.js b/lib/pkgcloud/joyent/client.js
deleted file mode 100644
index fd4eeeb91..000000000
--- a/lib/pkgcloud/joyent/client.js
+++ /dev/null
@@ -1,115 +0,0 @@
-/*
- * client.js: Base client from which all Joyent clients inherit from
- *
- * (C) 2012 Nodejitsu Inc.
- *
- */
-
-var utile = require('utile'),
- fs = require('fs'),
- auth = require('../common/auth'),
- base = require('../core/base');
-
-//
-// ### constructor (options)
-// #### @opts {Object} an object literal with options
-// #### @serversUrl {String} **Optional** CloudAPI Endpoint
-// #### @apiVersion {String} **Optional** CloudAPI API Version
-// #### @account {String} **Optional** CloudAPI Account to connect to
-// #### @username {String} **Optional** Login name
-// #### @password {String} **Optional** Password that goes with username
-// #### @keyId {String} **Optional** SSH KeyId to sign in to cloudapi
-// #### @key {String} **Optional** SSH key (PEM) that goes
-// #### @identity {String} **Optional** File path of the private key
-// with `keyId`.
-// #### @throws {TypeError} On bad input
-//
-// Creates a new Joyent CloudAPI Client. Even though all @opts are optional
-// you must either provide username/password or keyId/key
-//
-var Client = exports.Client = function (opts) {
- if (!opts) {
- throw new TypeError('options required');
- }
-
- if (opts.identity) {
- opts.key = fs.readFileSync(opts.identity, 'ascii');
- }
-
- if (!(opts.username && opts.password) &&
- !(opts.keyId && opts.key)) {
- throw new TypeError('Either username/password or keyId/key are required');
- }
-
- // default values
- opts.account = opts.account || opts.username || 'my';
- opts.apiVersion = opts.apiVersion || '~6.5';
-
- // if a person gives a key id by name that doesn't work in joyent
- // keys are fully qualified. so we check for `/` in the keyId, if it's not
- // there we need to do something about it
- if (opts.keyId && opts.keyId.indexOf('/') === -1) {
- // this will fail if account was also not properly set and account is
- // set to `my`.
- opts.keyId = '/' + opts.account + '/keys/' + opts.keyId;
- }
-
- base.Client.call(this, opts);
-
- this.provider = 'joyent';
- this.account = opts.account;
- this.serversUrl = opts.serversUrl
- || process.env.SDC_CLI_URL
- || 'us-sw-1.api.joyentcloud.com';
- this.protocol = opts.protocol || 'https://';
-
- if (!this.before) { this.before = []; }
-
- if (opts.key && opts.keyId) {
- this.before.push(auth.httpSignature);
- } else {
- this.before.push(auth.basic);
- }
-
- this.before.push(function setReqHeaders(req) {
- req.json = true;
- if (typeof req.headers["X-Api-Version"] === 'undefined') {
- req.headers["x-api-version"] = opts.apiVersion;
- req.headers.Accept = 'application/json';
- req.headers['content-type'] = 'application/json';
- }
- });
-
- this.before.push(function setContentTypeAndReqJson(req) {
- if (typeof req.body !== 'undefined') {
- req.json = req.body;
- delete req.body;
- }
- });
-};
-
-utile.inherits(Client, base.Client);
-
-Client.prototype.failCodes = {
- 400: 'Bad Request',
- 401: 'Unauthorized',
- 403: 'Forbidden',
- 404: 'Not Found',
- 405: 'Method Not Allowed',
- 406: 'Not Acceptable',
- 409: 'Conflict',
- 413: 'Request Entity Too Large',
- 415: 'Unsupported Media Type',
- 420: 'Slow Down',
- 449: 'Retry With',
- 500: 'Internal Error',
- 503: 'Service Unavailable'
-};
-
-Client.prototype.successCodes = {
- 200: 'OK',
- 201: 'Created',
- 202: 'Accepted',
- 203: 'Non-authoritative information',
- 204: 'No content'
-};
diff --git a/lib/pkgcloud/joyent/compute/client/flavors.js b/lib/pkgcloud/joyent/compute/client/flavors.js
deleted file mode 100644
index 31c4be0d1..000000000
--- a/lib/pkgcloud/joyent/compute/client/flavors.js
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * flavors.js: Implementation of Joyent Flavors Client.
- *
- * (C) 2012, Nodejitsu Inc.
- *
- */
-
-var pkgcloud = require('../../../../../lib/pkgcloud'),
- base = require('../../../core/compute'),
- compute = pkgcloud.providers.joyent.compute;
-
-//
-// ### function getFlavors (callback)
-// #### @callback {function} f(err, flavors). `flavors` is an array that
-// represents the flavors that are available to your account
-//
-// Lists all flavors available to your account.
-//
-exports.getFlavors = function getFlavors(callback) {
- var self = this;
- return this._request({
- path: this.account + '/packages'
- }, function (err, body, res) {
- return err
- ? callback(err)
- : callback(null, body.map(function (result) {
- return new compute.Flavor(self, result);
- }), res);
- });
-};
-
-//
-// ### function getFlavor (flavor, callback)
-// #### @image {Flavor|String} Flavor ID or an Flavor
-// #### @callback {function} f(err, flavor). `flavor` is an object that
-// represents the flavor that was retrieved.
-//
-// Gets a specified flavor of Joyent DataSets using the provided details
-// object.
-//
-exports.getFlavor = function getFlavor(flavor, callback) {
- var self = this,
- flavorId = flavor instanceof base.Flavor ? flavor.id : flavor;
-
- // joyent decided to add spaces to their identifiers
- flavorId = encodeURIComponent(flavorId);
-
- return this._request({
- path: this.account + '/packages/' + flavorId
- }, function (err, body, res) {
- return err
- ? callback(err)
- : callback(null, new compute.Flavor(self, body), res);
- });
-};
\ No newline at end of file
diff --git a/lib/pkgcloud/joyent/compute/client/images.js b/lib/pkgcloud/joyent/compute/client/images.js
deleted file mode 100644
index bf28da777..000000000
--- a/lib/pkgcloud/joyent/compute/client/images.js
+++ /dev/null
@@ -1,86 +0,0 @@
-/*
- * images.js: Implementation of Joyent Images Client.
- *
- * (C) 2012, Nodejitsu Inc.
- *
- */
-var pkgcloud = require('../../../../../lib/pkgcloud'),
- base = require('../../../core/compute'),
- errs = require('errs'),
- compute = pkgcloud.providers.joyent.compute;
-
-//
-// ### function getImages (callback)
-// #### @callback {function} f(err, images). `images` is an array that
-// represents the images that are available to your account
-//
-// Lists all images available to your account.
-//
-exports.getImages = function getImages(callback) {
- var self = this;
- return this._request({
- path: this.account + '/datasets'
- }, function (err, body, res) {
- return err
- ? callback(err)
- : callback(null, body.map(function (result) {
- return new compute.Image(self, result);
- }), res);
- });
-};
-
-// ### function getImage (image, callback)
-// #### @image {Image|String} Image id or an Image
-// #### @callback {function} f(err, image). `image` is an object that
-// represents the image that was retrieved.
-//
-// Gets a specified image of Joyent DataSets using the provided details
-// object.
-//
-exports.getImage = function getImage(image, callback) {
- var self = this,
- imageId = image instanceof base.Image ? image.id : image;
-
- // joyent decided to add spaces to their identifiers
- imageId = encodeURIComponent(imageId);
-
- return this._request({
- path: this.account + '/datasets/' + imageId
- }, function (err, body, res) {
- return err
- ? callback(err)
- : callback(null, new compute.Image(self, body), res);
- });
-};
-
-//
-// ### function createImage(options, callback)
-// #### @id {Object} an object literal with options
-// #### @name {String} String name of the image
-// #### @server {Boolean} the server to use
-// #### @callback {function} f(err, image). `image` is an object that
-// represents the image that was created.
-//
-// Creates an image in Joyent based on a server
-//
-exports.createImage = function createImage(options, callback) {
- return errs.handle(
- errs.create({ message: 'Not supported by joyent' }),
- callback
- );
-};
-
-//
-// ### function destroyImage(image, callback)
-// #### @image {Image|String} Image id or an Image
-// #### @callback {function} f(err, image). `image` is an object that
-// represents the image that was deleted.
-//
-// Destroys an image in Joyent
-//
-exports.destroyImage = function destroyImage(image, callback) {
- return errs.handle(
- errs.create({ message: 'Not supported by joyent' }),
- callback
- );
-};
\ No newline at end of file
diff --git a/lib/pkgcloud/joyent/compute/client/index.js b/lib/pkgcloud/joyent/compute/client/index.js
deleted file mode 100644
index 33bf1b75e..000000000
--- a/lib/pkgcloud/joyent/compute/client/index.js
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * index.js: Compute client for Joyent CloudAPI
- *
- * (C) 2012 Nodejitsu Inc.
- *
- */
-
-var utile = require('utile'),
- urlJoin = require('url-join'),
- joyent = require('../../client');
-
-var Client = exports.Client = function (options) {
- joyent.Client.call(this, options);
-
- utile.mixin(this, require('./flavors'));
- utile.mixin(this, require('./images'));
- utile.mixin(this, require('./servers'));
- utile.mixin(this, require('./keys'));
-};
-
-utile.inherits(Client, joyent.Client);
-
-Client.prototype._getUrl = function (options) {
- options = options || {};
-
- var root = this.serversUrl
- ? this.protocol + this.serversUrl
- : this.protocol + 'us-sw-1.api.joyentcloud.com';
-
- return urlJoin(root, typeof options === 'string'
- ? options
- : options.path);
-};
diff --git a/lib/pkgcloud/joyent/compute/client/keys.js b/lib/pkgcloud/joyent/compute/client/keys.js
deleted file mode 100644
index 563f4a0f2..000000000
--- a/lib/pkgcloud/joyent/compute/client/keys.js
+++ /dev/null
@@ -1,88 +0,0 @@
-/*
- * keys.js: Implementation of Joyent SSH keys Client.
- *
- * (C) 2012, Nodejitsu Inc.
- *
- */
-
-var errs = require('errs'),
- utile = require('utile');
-
-//
-// ### function listKeys (callback)
-// #### @callback {function} Continuation to respond to when complete.
-//
-// Lists all Joyent SSH Keys matching the specified `options`.
-//
-exports.listKeys = function (callback) {
- return this._request({
- path: this.account + '/keys'
- }, function (err, body, res) {
- return err
- ? callback(err)
- : callback(null, body);
- });
-};
-
-//
-// ### function getKey (name, callback)
-// #### @name {string} Name of the Joyent SSH key to get
-// #### @callback {function} Continuation to respond to when complete.
-//
-// Gets the details of the Joyent SSH Key with the specified `name`.
-//
-exports.getKey = function (name, callback) {
- return this._request({
- path: this.account + '/keys/' + name
- }, function (err, body, res) {
- return err
- ? callback(err)
- : callback(null, body);
- });
-};
-
-//
-// ### function addKey (options, callback)
-// #### @options {Object} SSH Public Key details
-// #### @name {string} String name of the key
-// #### @key {string} SSH Public Key
-// #### @callback {function} Continuation to respond to when complete.
-//
-// Adds a Joyent SSH Key with the specified `options`.
-//
-exports.addKey = function (options, callback) {
- if (!options || !options.key || !options.name) {
- return errs.handle(
- errs.create({ message: '`key` and `name` are required options.' }),
- callback
- );
- }
-
- return this._request({
- method: 'POST',
- path: this.account + '/keys',
- body: options
- }, function (err, body, res) {
- return err
- ? callback(err)
- : callback(null, true);
- });
-};
-
-//
-// ### function getKey (name, callback)
-// #### @name {string} Name of the Joyent SSH key to destroy
-// #### @callback {function} Continuation to respond to when complete.
-//
-// Destroys Joyent SSH Key with the specified `name`.
-//
-exports.destroyKey = function (name, callback) {
- return this._request({
- method: 'DELETE',
- path: this.account + '/keys/' + name
- }, function (err, body, res) {
- return err
- ? callback(err)
- : callback(null, true);
- });
-};
\ No newline at end of file
diff --git a/lib/pkgcloud/joyent/compute/client/servers.js b/lib/pkgcloud/joyent/compute/client/servers.js
deleted file mode 100644
index 3ce979dd0..000000000
--- a/lib/pkgcloud/joyent/compute/client/servers.js
+++ /dev/null
@@ -1,264 +0,0 @@
-/*
- * servers.js: Instance methods for working with servers from Joyent Cloud
- *
- * (C) 2012 Nodejitsu Inc.
- *
- */
-var request = require('request'),
- base = require('../../../core/compute'),
- pkgcloud = require('../../../../../lib/pkgcloud'),
- errs = require('errs'),
- compute = pkgcloud.providers.joyent.compute;
-
-//
-// ### function getVersion (callback)
-// #### @callback {function} f(err, version).
-//
-// Gets the current API version
-//
-exports.getVersion = function getVersion(callback) {
- return this._request({
- path: this.account + '/datacenters'
- }, function (err, response, res) {
- return err
- ? callback(err)
- : callback(null, res.headers['x-api-version'], res);
- });
-};
-
-//
-// ### function getLimits (callback)
-// #### @callback {function} f(err, version).
-//
-// Gets the current API limits
-//
-exports.getLimits = function getLimits(callback) {
- return errs.handle(
- errs.create({message: "Joyent's API is not rate limited"}), callback);
-};
-
-//
-// ### function getServers (callback)
-// #### @options {Object} Options when getting servers
-// #### @options.offset {number} Number of servers to skip when listing
-// #### @options.limit {number} Number of servers to return
-// #### @callback {function} f(err, servers). `servers` is an array that
-// represents the servers that are available to your account
-//
-// Lists all servers available to your account.
-//
-exports.getServers = function getServers(options, callback) {
- if (!callback && typeof options === 'function') {
- callback = options;
- options = null;
- }
-
- var self = this;
- return this._request(
- {
- path: this.account + '/machines',
- qs: options
- },
- function (err, body, res) {
- return err
- ? callback(err)
- : callback(null, body.map(function (result) {
- return new compute.Server(self, result);
- }), res);
- }
- );
-};
-
-//
-// ### function createServer (options, callback)
-// #### @opts {Object} **Optional** options
-// #### @name {String} **Optional** a name for your server
-// #### @flavor {String|Favor} **Optional** flavor to use for this image
-// #### @image {String|Image} **Optional** the image to use
-// #### @required {Boolean} **Optional** Validate if flavor, name,
-// and image are present
-// #### @* {*} **Optional** Anything platform specific
-// #### @callback {Function} f(err, server).
-//
-// Creates a server with the specified options. The flavor
-// properties of the options can be instances of Flavor
-// OR ids to those entities in Joyent.
-//
-exports.createServer = function createServer(options, callback) {
- if (typeof options === 'function') {
- callback = options;
- options = {};
- }
-
- options = options || {}; // no args
- var self = this,
- createOptions = {
- method: 'POST',
- path: this.account + '/machines',
- body: options
- };
-
- ['flavor', 'image', 'name'].forEach(function (member) {
- if (options.required) { // marked as required?
- if (!options[member]) {
- return errs.handle(
- errs.create({ message: 'options.' + member + ' is a required argument.' }),
- callback
- );
- }
- }
- });
- if (options.flavor) {
- createOptions.body["package"] = options.flavor instanceof base.Flavor
- ? options.flavor.id
- : options.flavor;
-
- delete options.flavor;
- }
-
- if (options.image) {
- createOptions.body.dataset = options.image instanceof base.Image
- ? options.image.id
- : options.image;
-
- delete options.image;
- }
-
- return this._request(createOptions, function (err, body, res) {
- return err
- ? callback(err)
- : callback(null, new compute.Server(self, body), res);
- });
-};
-
-//
-// ### function destroyServer(server, callback)
-// #### @server {Server|String} Server id or a server
-// #### @callback {Function} f(err, serverId).
-//
-// Destroy a server in Joyent.
-//
-exports.destroyServer = function destroyServer(server, callback) {
- var serverId = server instanceof base.Server ? server.id : server;
- var self = this;
-
- var stopOptions = {
- method: 'POST',
- path: this.account + '/machines/' + serverId,
- body: {
- action: 'stop'
- }
- };
-
- return this._request(stopOptions, function (err, body, res) {
- if (err) { return callback && callback(err); }
- if (res.statusCode === 202) {
- var checks = 10;
- var done = false;
- function check() {
- if (done) return;
- checks--;
- if (checks <= 0) return;
- if (checks === 0) {
- done = true;
- finish(new Error('Machine unresponsive to STOP'));
- return;
- }
- var checkOptions = {
- method: 'GET',
- path: self.account + '/machines/' + serverId
- };
-
- self._request(checkOptions, function (err, body, res) {
- if (err) { return callback && callback(err) }
- if (body && body.state === 'stopped') {
- done = true;
- finish();
- return;
- }
- });
-
- setTimeout(check, 5000);
- }
-
- check();
- return;
- }
- else {
- finish();
- }
-
- function finish() {
- var destroyOptions = {
- method: 'DELETE',
- path: self.account + '/machines/' + serverId
- };
-
- self._request(destroyOptions, function (err, body, res) {
- return err
- ? callback && callback(err)
- : callback && callback(err, {ok: serverId}, res);
- });
- }
- });
-};
-
-//
-// ### function getServer(server, callback)
-// #### @server {Server|String} Server id or a server
-// #### @callback {Function} f(err, serverId).
-//
-// Gets a server in Joyent.
-//
-exports.getServer = function getServer(server, callback) {
- var self = this,
- serverId = server instanceof base.Server ? server.id : server;
-
- return this._request({
- path: this.account + '/machines/' + serverId
- }, function (err, body, res) {
- return err
- ? callback(err)
- : callback(null, new compute.Server(self, body), res);
- });
-};
-
-
-//
-// ### function rebootServer (server, options, callback)
-// #### @server {Server|String} The server to reboot
-// #### @callback {Function} f(err, server).
-//
-// Reboots a server
-//
-exports.rebootServer = function rebootServer(server, callback) {
- var serverId = server instanceof base.Server ? server.id : server;
- var createOptions = {
- method: 'POST',
- path: this.account + '/machines/' + serverId,
- qs: {
- action: 'reboot'
- }
- };
-
- return this._request(createOptions, function (err, body, res) {
- return err
- ? callback(err)
- : callback(null, { ok: serverId }, res);
- });
-};
-
-//
-// ### function renameServer(server, name, callback)
-// #### @server {Server|String} Server id or a server
-// #### @name {String} New name to apply to the server
-// #### @callback {Function} f(err, server).
-//
-// Renames a server
-//
-exports.renameServer = function renameServer(server, name, callback) {
- return errs.handle(
- errs.create({ message: 'Not supported by Joyent.' }),
- callback
- );
-};
\ No newline at end of file
diff --git a/lib/pkgcloud/joyent/compute/flavor.js b/lib/pkgcloud/joyent/compute/flavor.js
deleted file mode 100644
index 3b5167e3a..000000000
--- a/lib/pkgcloud/joyent/compute/flavor.js
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * flavor.js: Joyent Cloud Package
- *
- * (C) 2012 Nodejitsu Inc.
- *
- */
-
-var utile = require('utile'),
- base = require('../../core/compute/flavor');
-
-var Flavor = exports.Flavor = function Flavor(client, details) {
- base.Flavor.call(this, client, details);
-};
-
-utile.inherits(Flavor, base.Flavor);
-
-Flavor.prototype._setProperties = function (details) {
- this.id = details.name;
- this.name = details.name;
- this.ram = details.memory;
- this.disk = details.disk;
-
- //
- // Joyent specific
- //
- this.swap = details.swap;
- this["default"] = details["default"];
- this.original = this.joyent = details;
-};
\ No newline at end of file
diff --git a/lib/pkgcloud/joyent/compute/image.js b/lib/pkgcloud/joyent/compute/image.js
deleted file mode 100644
index 47e68e3c2..000000000
--- a/lib/pkgcloud/joyent/compute/image.js
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * image.js: Joyent Cloud DataSet
- *
- * (C) 2012 Nodejitsu Inc.
- *
- */
-
-var utile = require('utile'),
- base = require('../../core/compute/image');
-
-var Image = exports.Image = function Image(client, details) {
- base.Image.call(this, client, details);
-};
-
-utile.inherits(Image, base.Image);
-
-Image.prototype._setProperties = function (details) {
- this.id = details.urn;
- this.name = details.name;
- this.created = details.created;
-
- //
- // Joyent specific
- //
- this.urn = details.urn;
- this.joyentId = details.id;
- this.os = details.os;
- this.type = details.type;
- this.description = details.description;
- this["default"] = details["default"];
- this.version = details.version;
- this.requirements = details.requirements;
- this.original = this.rackspace = details;
-};
\ No newline at end of file
diff --git a/lib/pkgcloud/joyent/compute/server.js b/lib/pkgcloud/joyent/compute/server.js
deleted file mode 100644
index a45cb2283..000000000
--- a/lib/pkgcloud/joyent/compute/server.js
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- * server.js: Joyent Cloud Machine
- *
- * (C) 2012 Nodejitsu Inc.
- *
- */
-
-var utile = require('utile'),
- compute = require('../../core/compute'),
- base = require('../../core/compute/server'),
- computeStatus = require('../../common/status').compute;
-
-var Server = exports.Server = function Server(client, details) {
- base.Server.call(this, client, details);
-};
-
-utile.inherits(Server, base.Server);
-
-Server.prototype._setProperties = function (details) {
- this.id = details.id;
- this.name = details.name;
-
- if (details.state) {
- switch (details.state.toUpperCase()) {
- case 'PROVISIONING':
- this.status = this.STATUS.provisioning;
- break;
- case 'RUNNING':
- this.status = this.STATUS.running;
- break;
- case 'STOPPING':
- case 'STOPPED':
- this.status = this.STATUS.stopped;
- break;
- default:
- this.status = this.STATUS.unknown;
- break;
- }
- }
-
- var addresses = details.ips.reduce(function (all, addr) {
- if (compute.isPrivate(addr)) {
- all['private'].push(addr);
- }
- else {
- all['public'].push(addr);
- }
-
- return all;
- }, { 'private': [], 'public': [] });
-
- //
- // Joyent specific
- //
- this.ips = details.ips;
- this.imageId = details.dataset;
- this.addresses = details.addresses = addresses;
- this.created = details.created;
- this.updated = details.updated;
- this.type = details.type;
- this.ram = details.memory;
- this.disk = details.disk;
- this.metadata = details.metadata;
- this.original = this.joyent = details;
- this.adminPass = details.metadata && details.metadata.credentials &&
- details.metadata.credentials.admin;
-
-};
\ No newline at end of file
diff --git a/lib/pkgcloud/joyent/index.js b/lib/pkgcloud/joyent/index.js
deleted file mode 100644
index a6bed7e82..000000000
--- a/lib/pkgcloud/joyent/index.js
+++ /dev/null
@@ -1,8 +0,0 @@
-/*
- * index.js: Top-level include for the Joyent module.
- *
- * (C) 2012 Nodejitsu Inc.
- *
- */
-
-exports.compute = require('./compute');
diff --git a/lib/pkgcloud/mongohq/database/client/databases.js b/lib/pkgcloud/mongohq/database/client/databases.js
deleted file mode 100644
index 02254345b..000000000
--- a/lib/pkgcloud/mongohq/database/client/databases.js
+++ /dev/null
@@ -1,102 +0,0 @@
-/*
- * database.js: Database methods for working with databases from MongoHQ
- *
- * (C) 2012 Nodejitsu Inc.
- *
- */
-
- var errs = require('errs'),
- url = require('url');
-
-// Function formatResponse
-// This function parse the response from the provider and return an object
-// with the correct keys and values.
-// ### @response {Object} The body response from the provider api
-function formatResponse(response) {
- var info, user, dbname, database, auth;
- info = url.parse(response.config.MONGOHQ_URL);
- auth = encodeURIComponent(info.auth);
- user = auth.replace(/%3A/i, ':').split(':');
- dbname = info.pathname.replace('/', ''),
- database = {
- id: response.id,
- port: Number(info.port),
- host: info.hostname,
- uri: 'mongodb://' + info.auth + '@' + info.host,
- username: decodeURIComponent(user[0]),
- password: decodeURIComponent(user[1]),
- dbname: dbname
- };
- return database;
-}
-
-// Create a new Database at mongohq
-// Need Name and select a plan.
-// ### @options {Object} pair of name an plan values.
-// ##### @options['name'] {String} Name of the new database.(required)
-// ##### @options['plan'] {String} Name of the plan selected for database.(required)
-exports.create = function create(options, callback) {
- // Check for options
- if (!options || typeof options === 'function') {
- return errs.handle(errs.create({
- message: 'Options required for create a database.'
- }), Array.prototype.slice.call(arguments).pop());
- }
- // Check for name
- if (!options['name']) {
- return errs.handle(errs.create({
- message: 'options. Name are required arguments'
- }), Array.prototype.slice.call(arguments).pop());
- }
-
- // Check for plan
- if (!options['plan']) {
- options['plan'] = 'free';
- }
-
- var createOptions = {
- path : 'resources',
- method : 'POST',
- body : 'app_id=' + options.name + '&plan=' + options.plan
- };
-
- this._request(createOptions, function (err, b, response) {
- if (err) {
- return callback(err);
- }
- var body;
- if (typeof b !== 'object') {
- try {
- body = JSON.parse(b);
- } catch (e) {
- return errs.handle(errs.create({
- messages: 'Bad response from server.'
- }), callback);
- }
- } else { body = b; }
- return callback(null, formatResponse(body));
- });
-};
-
-//
-// Removes one mongo instance by id
-// ### @id {String} ID of the instance to remove.
-exports.remove = function remove(id, callback) {
- // Check for id
- if (!id || typeof id === 'function') {
- return errs.handle(errs.create({
- message: 'ID is a required argument'
- }), Array.prototype.slice.call(arguments).pop());
- }
-
- var deleteOptions = {
- path : 'resources/' + id,
- method : 'DELETE'
- };
-
- this._request(deleteOptions, function (err, body, response) {
- return err
- ? callback(err)
- : callback(null, 'deleted');
- });
-};
\ No newline at end of file
diff --git a/lib/pkgcloud/mongohq/database/client/index.js b/lib/pkgcloud/mongohq/database/client/index.js
deleted file mode 100644
index b70d44f3c..000000000
--- a/lib/pkgcloud/mongohq/database/client/index.js
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * index.js: Database client for MongoHQ Cloud Databases
- *
- * (C) 2012 Nodejitsu Inc.
- *
- */
-
-var utile = require('utile'),
- urlJoin = require('url-join'),
- base = require('../../../core/base'),
- auth = require('../../../common/auth'),
- url = require('url'),
- request = require('request'),
- errs = require('errs');
-
-var Client = exports.Client = function (options) {
- base.Client.call(this, options);
-
- if (!this.before) {
- this.before = [];
- }
-
- this.protocol = options.protocol || 'https://';
- this.databaseUrl = options.databaseUrl || 'providers.mongohq.com';
-
- this.before.push(auth.basic);
-
- utile.mixin(this, require('./databases'));
-};
-
-utile.inherits(Client, base.Client);
-
-Client.prototype._getUrl = function (options) {
- options = options || {};
-
- return urlJoin([this.protocol + this.databaseUrl, 'provider'].join('/'),
- typeof options === 'string'
- ? options
- : options.path);
-};
-
-Client.prototype.failCodes = {
- 400: 'Bad Request',
- 401: 'Unauthorized',
- 403: 'Resize not allowed',
- 404: 'Item or Account not found',
- 409: 'Build in progress',
- 413: 'Over Limit',
- 415: 'Bad Media Type',
- 500: 'Fault',
- 503: 'Service Unavailable'
-};
-
-Client.prototype.successCodes = {
- 200: 'OK',
- 201: 'Created',
- 202: 'Accepted',
- 203: 'Non-authoritative information',
- 204: 'No content'
-};
\ No newline at end of file
diff --git a/lib/pkgcloud/mongohq/database/index.js b/lib/pkgcloud/mongohq/database/index.js
deleted file mode 100644
index f5d03971d..000000000
--- a/lib/pkgcloud/mongohq/database/index.js
+++ /dev/null
@@ -1,12 +0,0 @@
-/*
- * index.js: Top-level include for the MongoHQ database module
- *
- * (C) 2012 Nodejitsu Inc.
- *
- */
-
-exports.Client = require('./client').Client;
-
-exports.createClient = function createClient(options) {
- return new exports.Client(options);
-};
diff --git a/lib/pkgcloud/mongohq/index.js b/lib/pkgcloud/mongohq/index.js
deleted file mode 100644
index 63b085d8b..000000000
--- a/lib/pkgcloud/mongohq/index.js
+++ /dev/null
@@ -1,8 +0,0 @@
-/*
- * index.js: Top-level include for the mongohq module.
- *
- * (C) 2012 Nodejitsu Inc.
- *
- */
-
-exports.database = require('./database');
diff --git a/lib/pkgcloud/mongolab/database/client/accounts.js b/lib/pkgcloud/mongolab/database/client/accounts.js
deleted file mode 100644
index 922088d34..000000000
--- a/lib/pkgcloud/mongolab/database/client/accounts.js
+++ /dev/null
@@ -1,117 +0,0 @@
-/*
- * accounts.js: Accounts methods for working with databases from MongoLab
- *
- * (C) 2012 Nodejitsu Inc.
- *
- */
-
-var pkgcloud = require('../../../../../lib/pkgcloud'),
- errs = require('errs');
-
-// Create Account
-// ### @options {Object} Set of options can be
-// #### options['name'] {string} Name of account (required)
-// #### options['email'] {string} Email of the owner of the account (required)
-// #### options['password'] {string} Password for the account (Optional), If not specify so mongolab will generate one.
-// ### @callback {Function} Continuation to respond to when complete.
-exports.createAccount = function createAccount(options, callback) {
- // Check for options
- if (typeof options === 'function') {
- return errs.handle(errs.create({
- message: 'Options required for create an account.'
- }), options);
- }
-
- if (!options['name']) {
- return errs.handle(errs.create({
- message: 'options. Name is a required argument'
- }), callback);
- }
-
- if (!options['email']) {
- return errs.handle(errs.create({
- message: 'options. Email is a required argument'
- }), callback);
- }
-
- // Add support for the displayName input for mongolab
- // https://objectlabs.jira.com/wiki/display/partners/MongoLab+Partner+Integration+API#MongoLabPartnerIntegrationAPI-Createaccount.1
-
- var adminUser = { email: options['email'] };
-
- if (options['password']) {
- if (/[+\d]/g.test(options['password'])) {
- adminUser['password'] = options['password'];
- } else {
- return errs.handle(errs.create({
- message: 'options. Password must contain at least one numeric character.'
- }), callback);
- }
- }
-
- var createOptions = {
- method: 'POST',
- path: 'accounts',
- body: {
- name: [this.config.username, options['name']].join('_'),
- adminUser: adminUser
- }
- };
-
- this._request(createOptions, function (err, body, response) {
- return err
- ? callback(err)
- : callback(null, { account: body.adminUser });
- });
-};
-
-// Delete Account
-// ### @name {String} Name of the account to be deleted
-// ### @callback {Function} Continuation to respond to when complete.
-exports.deleteAccount = function deleteAccount(name, callback) {
- // Check for options
- if (typeof name === 'function') {
- return errs.handle(errs.create({
- message: 'Name required for delete an account.'
- }), name);
- }
-
- var deleteOptions = {
- method: 'DELETE',
- path: 'accounts/' + name
- };
-
- this._request(deleteOptions, function (err, body, response) {
- return err
- ? callback(err)
- : callback(null);
- });
-};
-
-// List all accounts
-// ### @callback {Function} Continuation to respond to when complete.
-exports.getAccounts = function getAccounts(callback) {
- this._request({ path: 'accounts' }, function (err, body, response) {
- return err
- ? callback(err)
- : callback(null, body.map(function (account) {
- return account.adminUser;
- }));
- });
-};
-
-// View an account
-exports.getAccount = function getAccount(name, callback) {
- // Check for options
- if (typeof name === 'function') {
- return errs.handle(errs.create({
- message: 'Name required for view an account.'
- }), name);
- }
-
- this._request({ path: 'accounts/' + name }, function (err, body, response) {
- return err
- ? callback(err)
- : callback(null, body.adminUser);
- });
-};
\ No newline at end of file
diff --git a/lib/pkgcloud/mongolab/database/client/databases.js b/lib/pkgcloud/mongolab/database/client/databases.js
deleted file mode 100644
index 1ab883ce0..000000000
--- a/lib/pkgcloud/mongolab/database/client/databases.js
+++ /dev/null
@@ -1,192 +0,0 @@
-/*
- * database.js: Database methods for working with databases from MongoLab
- *
- * (C) 2012 Nodejitsu Inc.
- *
- */
-
-var pkgcloud = require('../../../../../lib/pkgcloud'),
- errs = require('errs'),
- qs = require('querystring'),
- url = require('url');
-
-
-// Function formatResponse
-// This function parse the response from the provider and return an object
-// with the correct keys and values.
-// ### @response {Object} The body response from the provider api
-function formatResponse(response) {
- var info, user, dbname, auth;
- info = url.parse(response.uri);
- auth = encodeURIComponent(info.auth);
- user = auth.replace(/%3A/i, ':').split(':');
- dbname = response.name;
-
- var database = {
- id: dbname,
- host: info.hostname,
- port: Number(info.port),
- uri: 'mongodb://' + info.auth + '@' + info.host,
- username: decodeURIComponent(user[0]),
- password: decodeURIComponent(user[1]),
- dbname: dbname
- };
- return database;
-}
-
-// Create Database
-// ### @options {Object} Set of options can be
-// #### options['name'] {String} Name of database (required)
-// #### options['owner'] {String} Name of the user owner the database (required)
-// #### options['plan'] {String} Name of plan according to the MongoLab plans (Default: 'free')
-// ### @callback {Function} Continuation to respond to when complete.
-exports.create = function create(options, callback) {
- // Check for options
- if (typeof options === 'function') {
- return errs.handle(errs.create({
- message: 'Options required for create a database.'
- }), options);
- }
-
- if (!options['name']) {
- return errs.handle(errs.create({
- message: 'options. Name is a required argument'
- }), callback);
- }
-
- if (!options['owner']) {
- return errs.handle(errs.create({
- message: 'options. Owner is a required argument'
- }), callback);
- }
-
- if (!options['plan']) {
- options['plan'] = 'free';
- }
-
- // We have to setup the correct prefix for database name
- // for the moment we use the 'owner' field because we expect the correct prefix there.
- var databaseName = [options['owner'], options['name']].join('_');
-
- // Setup the account name according mongolab API.
- // @todo We need a helper function for add the prefix if its necesary
- //var account = [this.config.username, options['owner']].join('_');
- // at the moment we need provide the username with the prefix (partner name)
- var account = options['owner'];
-
- var createOptions = {
- method: 'POST',
- path: 'accounts/' + account + '/databases',
- body: {
- name: databaseName,
- plan: options['plan'],
- username: options['owner'],
- // In future we will have to change this for support multiples clouds and user-selected cloud.
- cloud: this.config.cloud
- }
- };
-
- this._request(createOptions, function (err, body, response) {
- return err
- ? callback(err)
- : callback(null, formatResponse(body));
- });
-};
-
-// Lists all databases by user account
-// ### @owner {String} Username for list their databases
-// ### @callback {Function} Continuation to respond to when complete.
-exports.getDatabases = function getDatabases(owner, callback) {
- // Check for options
- if (typeof owner === 'function') {
- return errs.handle(errs.create({
- message: 'Name required for delete an account.'
- }), owner);
- }
-
- this._request({ path: 'accounts/' + owner + '/databases' }, function (err, body, response) {
- return err
- ? callback(err)
- : callback(null, body);
- });
-};
-
-// View one database with details
-// NOT USE THIS METHOD YET
-// The principal idea of this method is for view details like username and
-// password and the hostname and port, but for now MongoLab just answer with the name.
-// The behavior I describe its according the parters documentation.
-// https://objectlabs.jira.com/wiki/display/partners/MongoLab+Partner+Integration+API#MongoLabPartnerIntegrationAPI-Viewdatabase
-// ### @options {Object} Set of options can be
-// #### options['name'] {String} Name of the database to view (required)
-// #### options['owner'] {String} Username of the database owner (required)
-// ### @callback {Function} Continuation to respond to when complete.
-exports.getDatabase = function getDatabase(options, callback) {
- // Check for options
- if (typeof options === 'function') {
- return errs.handle(errs.create({
- message: 'Options required for view a database.'
- }), options);
- }
-
- // Check for name
- if (!options['name']) {
- return errs.handle(errs.create({
- message: 'options. Name is a required argument.'
- }), callback);
- }
-
- // Check for owner
- if (!options['owner']) {
- return errs.handle(errs.create({
- message: 'options. Username of owner is a required argument.'
- }), callback);
- }
-
- var path = ['accounts', options['owner'], 'databases', options['name']].join('/');
-
- this._request({ path: path }, function (err, body, response) {
- return err
- ? callback(err)
- : callback(null, body);
- });
-};
-
-// Delete a database
-// ### @options {Object} Set of options can be
-// #### options['name'] {String} Name of the database to view (required)
-// #### options['owner'] {String} Username of the database owner (required)
-// ### @callback {Function} Continuation to respond to when complete.
-exports.remove = function remove(options, callback) {
- // Check for options
- if (typeof options === 'function') {
- return errs.handle(errs.create({
- message: 'Options required for delete a database.'
- }), options);
- }
-
- // Check for name
- if (!options['name']) {
- return errs.handle(errs.create({
- message: 'options. Name is a required argument.'
- }), callback);
- }
-
- // Check for owner
- if (!options['owner']) {
- return errs.handle(errs.create({
- message: 'options. Username of owner is a required argument.'
- }), callback);
- }
-
- var deleteOptions = {
- method: 'DELETE',
- path: ['accounts', options['owner'], 'databases', options['name']].join('/')
- };
-
- this._request(deleteOptions, function (err, body, response) {
- return err
- ? callback(err)
- : callback(null);
- });
-};
diff --git a/lib/pkgcloud/mongolab/database/client/index.js b/lib/pkgcloud/mongolab/database/client/index.js
deleted file mode 100644
index a00104e76..000000000
--- a/lib/pkgcloud/mongolab/database/client/index.js
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
- * index.js: Database client for MongoLab databases
- *
- * (C) 2012 Nodejitsu Inc.
- *
- */
-
-var utile = require('utile'),
- urlJoin = require('url-join'),
- base = require('../../../core/base'),
- auth = require('../../../common/auth');
-
-var Client = exports.Client = function (options) {
- base.Client.call(this, options);
-
- if (!this.before) {
- this.before = [];
- }
-
- this.protocol = options.protocol || 'https://';
- this.databaseUrl = options.databaseUrl || 'api.mongolab.com';
-
- this.before.push(auth.basic);
-
- this.before.push(function (req) {
- req.json = true;
- if (typeof req.body !== 'undefined') {
- req.headers['Content-Type'] = 'application/json';
- req.body = JSON.stringify(req.body);
- }
- });
-
- utile.mixin(this, require('./databases'));
- utile.mixin(this, require('./accounts'));
-};
-
-utile.inherits(Client, base.Client);
-
-Client.prototype._getUrl = function (options) {
- options = options || {};
-
- var root = [this.protocol + this.databaseUrl,
- 'api', '1', 'partners', (this.config.username)
- ? this.config.username
- : ''].join('/');
-
- return urlJoin(root, typeof options === 'string'
- ? options
- : options.path);
-};
-
-Client.prototype.failCodes = {
- 400: 'Bad Request',
- 401: 'Unauthorized',
- 403: 'Resize not allowed',
- 404: 'Item or Account not found',
- 409: 'Build in progress',
- 413: 'Over Limit',
- 415: 'Bad Media Type',
- 500: 'Fault',
- 503: 'Service Unavailable'
-};
-
-Client.prototype.successCodes = {
- 200: 'OK',
- 201: 'Created',
- 202: 'Accepted',
- 203: 'Non-authoritative information',
- 204: 'No content'
-};
\ No newline at end of file
diff --git a/lib/pkgcloud/mongolab/database/index.js b/lib/pkgcloud/mongolab/database/index.js
deleted file mode 100644
index 6ef8ab5b8..000000000
--- a/lib/pkgcloud/mongolab/database/index.js
+++ /dev/null
@@ -1,12 +0,0 @@
-/*
- * index.js: Top-level include for the MongoLab database module
- *
- * (C) 2012 Nodejitsu Inc.
- *
- */
-
-exports.Client = require('./client').Client;
-
-exports.createClient = function createClient(options) {
- return new exports.Client(options);
-};
diff --git a/lib/pkgcloud/mongolab/index.js b/lib/pkgcloud/mongolab/index.js
deleted file mode 100644
index 1ee6d28cf..000000000
--- a/lib/pkgcloud/mongolab/index.js
+++ /dev/null
@@ -1,8 +0,0 @@
-/*
- * index.js: Top-level include for the MongoLab module.
- *
- * (C) 2012 Nodejitsu Inc.
- *
- */
-
-exports.database = require('./database');
diff --git a/lib/pkgcloud/oneandone/blockstorage/client/index.js b/lib/pkgcloud/oneandone/blockstorage/client/index.js
new file mode 100644
index 000000000..be47a99f0
--- /dev/null
+++ b/lib/pkgcloud/oneandone/blockstorage/client/index.js
@@ -0,0 +1,15 @@
+/**
+ * Created by Ali Bazlamit on 8/28/2017.
+ */
+
+var util = require('util'),
+ oneandone = require('../../client'),
+ _ = require('lodash');
+
+var Client = exports.Client = function (options) {
+ oneandone.Client.call(this, options);
+
+ _.extend(this, require('./snapshots'));
+};
+
+util.inherits(Client, oneandone.Client);
diff --git a/lib/pkgcloud/oneandone/blockstorage/client/snapshots.js b/lib/pkgcloud/oneandone/blockstorage/client/snapshots.js
new file mode 100644
index 000000000..a365aeeac
--- /dev/null
+++ b/lib/pkgcloud/oneandone/blockstorage/client/snapshots.js
@@ -0,0 +1,122 @@
+/**
+ * Created by Ali Bazlamit on 8/28/2017.
+ */
+
+var Snapshot = require('../snapshot').Snapshot,
+ oneandone = require('liboneandone'),
+ Server = require('../../compute/server').Server;
+/**
+ * client.getSnapshots
+ *
+ * @description Returns a list of the server's snapshots.
+ *
+ * @param {function} callback
+ * @returns {*}
+ */
+exports.getSnapshots = function (server, callback) {
+ var self = this,
+ serverId = server instanceof Server ? server.id : server;
+ oneandone.listSnapshots(serverId, function (error, response, body) {
+ if (error) {
+ callback(error);
+ return;
+ }
+ if (response.statusCode != 200) {
+ callback(JSON.parse(body));
+ return;
+ }
+ var object = JSON.parse(body);
+ var result = [];
+ if (object instanceof Array) {
+ result = object;
+ } else {
+ result.push(object);
+ }
+ callback(null, result.map(function (data) {
+ return new Snapshot(self, data);
+ }));
+ });
+};
+
+/**
+ * client.createSnapshot
+ *
+ * @description Creates a new snapshot of the server.
+ *
+ * @param {string} server Server or Server id to create the snapshot from
+ * @param {function} callback
+ * @returns {*}
+ */
+exports.createSnapshot = function (server, callback) {
+ var serverId = server instanceof Server ? server.id : server;
+
+ oneandone.createSnapshot(serverId, function (error, response, body) {
+ if (error) {
+ callback(error);
+ return;
+ }
+ if (response.statusCode != 202) {
+ callback(JSON.parse(body));
+ return;
+ }
+ var snapshot = JSON.parse(body);
+ callback(null, snapshot.snapshot);
+ });
+};
+
+/**
+ * client.updateSnapshot
+ *
+ * @description Restores a snapshot into the server.
+ *
+ * @param {string} options.server Server or Server id to restore the snapshot into
+ * @param {string} options.snapshot snapshot or snapshot id to restore into the server provided
+ * @param {function} callback
+ * @returns {*}
+ */
+exports.updateSnapshot = function (options, callback) {
+ var self = this;
+ var serverId = options.server instanceof Server ? options.server.id : options.server,
+ snapshotId = options.snapshot instanceof Object ? options.snapshot.id : options.snapshot;
+
+ oneandone.restoreSnapshot(serverId, snapshotId, function (error, response, body) {
+ if (error) {
+ callback(error);
+ return;
+ }
+ if (response.statusCode != 202) {
+ callback(JSON.parse(body));
+ return;
+ }
+ var snp = JSON.parse(body);
+ callback(null, new Snapshot(self, snp));
+ });
+};
+
+/**
+ * client.deleteSnapshot
+ *
+ * @description Removes a snapshot
+ * @param {string} options.server Server or Server id to restore the snapshot into
+ * @param {string} options.snapshot snapshot or snapshot id to restore into the server provided
+ * @param {function} callback
+ * @returns {*}
+ */
+exports.deleteSnapshot = function (options, callback) {
+ var self = this;
+ var serverId = options.server instanceof Server ? options.server.id : options.server,
+ snapshotId = options.snapshot instanceof Object ? options.snapshot.id : options.snapshot;
+
+ oneandone.deleteSnapshot(serverId, snapshotId, function (error, response, body) {
+ if (error) {
+ callback(error);
+ return;
+ }
+ if (response.statusCode != 202) {
+ callback(JSON.parse(body));
+ return;
+ }
+ var snp = JSON.parse(body);
+ callback(null, new Snapshot(self, snp));
+ });
+};
\ No newline at end of file
diff --git a/lib/pkgcloud/oneandone/blockstorage/index.js b/lib/pkgcloud/oneandone/blockstorage/index.js
new file mode 100644
index 000000000..c149170bd
--- /dev/null
+++ b/lib/pkgcloud/oneandone/blockstorage/index.js
@@ -0,0 +1,9 @@
+/**
+ * Created by Ali Bazlamit on 8/28/2017.
+ */
+exports.Client = require('./client').Client;
+exports.Snapshot = require('./snapshot').Snapshot;
+
+exports.createClient = function (options) {
+ return new exports.Client(options);
+};
diff --git a/lib/pkgcloud/oneandone/blockstorage/snapshot.js b/lib/pkgcloud/oneandone/blockstorage/snapshot.js
new file mode 100644
index 000000000..452a6052c
--- /dev/null
+++ b/lib/pkgcloud/oneandone/blockstorage/snapshot.js
@@ -0,0 +1,26 @@
+/**
+ * Created by Ali Bazlamit on 8/28/2017.
+ */
+
+var util = require('util'),
+ base = require('../../core/base'),
+ _ = require('lodash');
+
+var Snapshot = exports.Snapshot = function Snapshot(client, details) {
+ base.Model.call(this, client, details);
+};
+
+util.inherits(Snapshot, base.Model);
+
+Snapshot.prototype._setProperties = function (details) {
+ this.id = details.id;
+};
+
+Snapshot.prototype.toJSON = function () {
+ return _.pick(this, ['id', 'name']);
+};
+
+
+
+
+
diff --git a/lib/pkgcloud/oneandone/client.js b/lib/pkgcloud/oneandone/client.js
new file mode 100644
index 000000000..2de22b9a6
--- /dev/null
+++ b/lib/pkgcloud/oneandone/client.js
@@ -0,0 +1,45 @@
+/*
+ * client.js: Base client
+ * (C) Created by Ali Bazlamit on 8/10/2017.
+ *
+ */
+
+var util = require('util'),
+ OAO = require('liboneandone'),
+ url = 'cloudpanel-api.1and1.com/v1',
+ base = require('../core/base');
+
+
+var Client = exports.Client = function (options) {
+ if (!options || !options.token) {
+ throw new TypeError('token is required');
+ }
+ base.Client.call(this, options);
+
+ options = options || {};
+ this.provider = 'oneandone';
+ this.protocol = options.protocol || 'https://';
+ this.serversUrl = options.serversUrl ? options.serversUrl : url;
+ OAO.oneandoneauth(options.token);
+ OAO.setendpoint(this.protocol + this.serversUrl);
+};
+
+util.inherits(Client, base.Client);
+
+
+Client.prototype.failCodes = {
+ 400: 'Bad Request',
+ 401: 'Unauthorized',
+ 403: 'Forbidden',
+ 404: 'Item not found',
+ 500: 'Fault',
+ 503: 'Service Unavailable'
+};
+
+Client.prototype.successCodes = {
+ 200: 'OK',
+ 201: 'Created',
+ 202: 'Accepted',
+ 203: 'Non-authoritative information',
+ 204: 'No content'
+};
\ No newline at end of file
diff --git a/lib/pkgcloud/oneandone/compute/client/flavors.js b/lib/pkgcloud/oneandone/compute/client/flavors.js
new file mode 100644
index 000000000..944f46730
--- /dev/null
+++ b/lib/pkgcloud/oneandone/compute/client/flavors.js
@@ -0,0 +1,59 @@
+/**
+ * Created by Ali Bazlamit on 8/19/2017.
+ */
+
+var pkgcloud = require('../../../../../lib/pkgcloud'),
+ base = require('../../../core/compute'),
+ oneandone = require('liboneandone'),
+ compute = pkgcloud.providers.oneandone.compute;
+
+//
+// ### function getFlavors(size, callback)
+// #### @size {size|String} flavor name or part of it S,M,L,XL
+// #### @callback {function} f(err, flavors). `flavors`
+//
+// Returns available flavours for fixed servers.
+//
+exports.getFlavors = function getFlavors(callback) {
+ var self = this;
+
+ oneandone.listHardwareFlavours(function (error, response, body) {
+ if (error) {
+ callback(error);
+ return;
+ }
+ if (response.statusCode != 200) {
+ callback(JSON.parse(body));
+ return;
+ }
+ var flavors = JSON.parse(body);
+ callback(error, flavors.map(function (flavor) {
+ return new compute.Flavor(self, flavor);
+ }));
+ });
+};
+
+//
+// ### function getFlavor (flavor, callback)
+// #### @flavor {Flavor|String} Flavor ID or an Flavor
+// #### @callback {function} f(err, flavor). `flavor` is an object that
+// represents the flavor that was retrieved.
+//
+// Returns information about one flavour
+//
+exports.getFlavor = function getFlavor(flavor, callback) {
+ var flavorId = flavor instanceof base.Flavor ? flavor.id : flavor;
+ var self = this;
+ oneandone.getHardwareFlavour(flavorId, function (error, response, body) {
+ if (error) {
+ callback(error);
+ return;
+ }
+ if (response.statusCode != 200) {
+ callback(JSON.parse(body));
+ return;
+ }
+ var flavor = JSON.parse(body);
+ callback(null, new compute.Flavor(self, flavor));
+ });
+};
\ No newline at end of file
diff --git a/lib/pkgcloud/oneandone/compute/client/images.js b/lib/pkgcloud/oneandone/compute/client/images.js
new file mode 100644
index 000000000..284abf0e4
--- /dev/null
+++ b/lib/pkgcloud/oneandone/compute/client/images.js
@@ -0,0 +1,135 @@
+/*
+ * (C) Created by Ali Bazlamit on 8/19/2017.
+ *
+ */
+var pkgcloud = require('../../../../../lib/pkgcloud'),
+ base = require('../../../core/compute'),
+ oneandone = require('liboneandone'),
+ compute = pkgcloud.providers.oneandone.compute;
+//
+// ### function getImages (callback)
+// #### @callback {function} f(err, images). `images` is an array that
+// represents the images that are available to your account
+//
+// Lists all images available to your account.
+//
+exports.getImages = function getImages(options, callback) {
+ var self = this;
+ if (typeof options === 'function') {
+ callback = options;
+ options = {};
+ }
+ var images = [];
+ oneandone.listServerAppliances(function (error, response, body) {
+ if (error) {
+ callback(error);
+ return;
+ }
+ if (response.statusCode != 200) {
+ callback(JSON.parse(body));
+ return;
+ }
+ images = JSON.parse(body);
+ callback(error, images.map(function (image) {
+ return new compute.Image(self, image);
+ }));
+ });
+};
+
+// ### function getImage (image, callback)
+// #### @image {Image|String} Image id or an Image
+// #### @callback {function} f(err, image). `image` is an object that
+// represents the image that was retrieved.
+//
+// Information about specific appliance
+//
+
+exports.getImage = function getImage(image, callback) {
+ var self = this;
+ var imageId = image instanceof base.Image
+ ? image.id
+ : image;
+
+ oneandone.getServerAppliance(imageId, function (error, response, body) {
+ if (error) {
+ return callback(error);
+ }
+ var img = JSON.parse(body);
+ callback(null, new compute.Image(self, img));
+ });
+};
+
+//
+// ### function createImage(options, callback)
+// #### @id {Object} an object literal with options
+// #### @name {String} String name of the image
+// #### @server {Server} the server to create an image from
+// #### @callback {function} f(err, image). `image` is an object that
+// represents the image that was created.
+//
+// Adds a new image from a server
+//
+
+exports.createImage = function createImage(options, callback) {
+ var self = this;
+ options || (options = {});
+
+ var serverId = options.server instanceof base.Server
+ ? options.server.id
+ : options.server;
+
+ if (!options.name) {
+ throw new TypeError('`name` is a required option');
+ }
+
+ if (!options.server) {
+ throw new TypeError('`server` is a required option');
+ }
+
+ var imageData = {
+ 'server_id': serverId,
+ 'name': options.name,
+ 'frequency': oneandone.ImageFrequency.ONCE,
+ 'source': 'server',
+ 'num_images': 1,
+ 'datacenter_id': options.server.datacenter ? options.server.datacenter.id : null
+ };
+
+ oneandone.createImage(imageData, function (error, response, body) {
+ if (error) {
+ callback(error);
+ return;
+ }
+ if (response.statusCode != 202) {
+ callback(JSON.parse(body));
+ return;
+ }
+ var _image = JSON.parse(body);
+ var image = new compute.Image(self, _image);
+ callback(null, image);
+
+ });
+};
+
+//
+// ### function destroyImage(image, callback)
+// #### @image {Image|String} Image id or an Image
+// #### @callback {function} f(err, image). `image` is an object that
+// represents the image that was deleted.
+//
+// Destroys an image
+//
+
+exports.destroyImage = function destroyImage(image, callback) {
+ var imageId = image instanceof base.Image
+ ? image.id
+ : image;
+ oneandone.deleteImage(imageId, function (error, response, body) {
+ if (error) {
+ return callback(error);
+ }
+ callback(null, body);
+ });
+};
+
+
diff --git a/lib/pkgcloud/oneandone/compute/client/index.js b/lib/pkgcloud/oneandone/compute/client/index.js
new file mode 100644
index 000000000..33d202b33
--- /dev/null
+++ b/lib/pkgcloud/oneandone/compute/client/index.js
@@ -0,0 +1,17 @@
+/**
+ * Created by Ali Bazlamit on 8/10/2017.
+ */
+
+var util = require('util'),
+ oneandone = require('../../client'),
+ _ = require('lodash');
+
+var Client = exports.Client = function (options) {
+ oneandone.Client.call(this, options);
+
+ _.extend(this, require('./servers'));
+ _.extend(this, require('./images'));
+ _.extend(this, require('./flavors'));
+};
+
+util.inherits(Client, oneandone.Client);
\ No newline at end of file
diff --git a/lib/pkgcloud/oneandone/compute/client/servers.js b/lib/pkgcloud/oneandone/compute/client/servers.js
new file mode 100644
index 000000000..47d00e020
--- /dev/null
+++ b/lib/pkgcloud/oneandone/compute/client/servers.js
@@ -0,0 +1,190 @@
+/**
+ * Created by Ali Bazlamit on 8/10/2017.
+ */
+
+var base = require('../../../core/compute'),
+ pkgcloud = require('../../../../../lib/pkgcloud'),
+ errs = require('errs'),
+ oneandone = require('liboneandone'),
+ compute = pkgcloud.providers.oneandone.compute;
+
+//
+// ### function getVersion (callback)
+// #### @callback {function} f(err, version).
+//
+// Gets the current API version
+//
+exports.getVersion = function getVersion(callback) {
+ callback(null, '1.7');
+};
+
+//
+// ### function getServers (callback)
+// #### @callback {function} f(err, servers). `servers` is an array that
+// represents the servers that are available to your account
+//
+// Lists all servers available to your account.
+//
+exports.getServers = function getServers(options, callback) {
+ if (typeof options === 'function') {
+ callback = options;
+ options = {};
+ }
+
+ var self = this;
+
+ oneandone.listServers(function (error, response, results) {
+ if (error) {
+ callback(error);
+ return;
+ }
+ callback(null, JSON.parse(results).map(function (server) {
+ return new compute.Server(self, server);
+ }));
+ });
+};
+
+//
+// ### function createServer (options, callback)
+// #### @opts {Object} **Optional** options
+// #### @name {String} **Optional** the name of server
+// #### @image {String|Image} the image ID to use
+// #### @flavor {String|Flavor} **Optional** flavor to use for this image
+// #### @callback {Function} f(err, server).
+//
+// Creates a server with the specified options. The flavor
+// id of the options can be ids of Hardware Flavors
+//
+exports.createServer = function createServer(options, callback) {
+ if (typeof options === 'function') {
+ callback = options;
+ options = {};
+ }
+ var self = this,
+ ImageId,
+ FlavorId,
+ hardware = {};
+ options = options || {}; // no args
+ if (!options.image) {
+ return errs.handle(
+ errs.create({
+ message: 'options.image is a required argument.'
+ }),
+ callback
+ );
+ }
+ ImageId = options.image instanceof base.Image
+ ? options.image.id
+ : options.image;
+
+ if (options.flavor) {
+ FlavorId = options.flavor instanceof base.Flavor
+ ? options.flavor.id
+ : options.flavor;
+ hardware = {
+ 'fixed_instance_size_id': FlavorId
+ };
+ } else {
+ return errs.handle(
+ errs.create({
+ message: 'options.flavor: is required'
+ }),
+ callback
+ );
+ }
+
+ var serverData = {
+ 'name': options.name,
+ 'hardware': hardware,
+ 'appliance_id': ImageId,
+ 'datacenter_id': options.location
+ };
+
+ oneandone.createServer(serverData, function (error, response, body) {
+ if (error) {
+ callback(error);
+ return;
+ }
+ if (response.statusCode != 202) {
+ callback(JSON.parse(body));
+ return;
+ }
+ var _server = JSON.parse(body);
+ var server = new compute.Server(self, _server);
+ callback(null, server);
+ });
+};
+
+//
+// ### function destroyServer(server, callback)
+// #### @server {Server|String} Server id or a server
+// #### @callback {Function} f(err, serverId).
+//
+// Destroy a server in OAO.
+//
+exports.destroyServer = function destroyServer(server, callback) {
+ var serverId = server instanceof base.Server ? server.id : server;
+ oneandone.deleteServer(serverId, false, function (error, response, body) {
+ if (error) {
+ callback(error);
+ return;
+ }
+ if (response.statusCode != 202) {
+ callback(JSON.parse(body));
+ return;
+ }
+ callback(null, JSON.parse(body));
+ });
+};
+
+//
+// ### function getServer(server, callback)
+// #### @server {Server|String} Server id or a server
+// #### @callback {Function} f(err, serverId).
+//
+// Gets a server in OAO.
+//
+exports.getServer = function getServer(server, callback) {
+ var self = this,
+ serverId = server instanceof base.Server ? server.id : server;
+
+ oneandone.getServer(serverId, function (error, response, body) {
+ if (error) {
+ return callback(error);
+ }
+ var srv = JSON.parse(body);
+ callback(null, new compute.Server(self, srv));
+ }
+ );
+};
+
+//
+// ### function rebootServer (server, options, callback)
+// #### @server {Server|String} The server to reboot
+// #### @callback {Function} f(err, server).
+//
+// Reboots a server
+//
+exports.rebootServer = function rebootServer(server, callback) {
+ var self = this,
+ serverId = server instanceof base.Server ? server.id : server;
+
+ var updateData = {
+ 'action': oneandone.ServerUpdateAction.REBOOT,
+ 'method': oneandone.ServerUpdateMethod.SOFTWARE
+
+ };
+
+ oneandone.updateServerStatus(serverId, updateData, function (error, response, body) {
+ if (error) {
+ return callback(error);
+ }
+ if (response.statusCode != 202) {
+ callback(JSON.parse(body));
+ return;
+ }
+ var _server = JSON.parse(body);
+ var server = new compute.Server(self, _server);
+ callback(null, server);
+ });
+};
\ No newline at end of file
diff --git a/lib/pkgcloud/oneandone/compute/flavor.js b/lib/pkgcloud/oneandone/compute/flavor.js
new file mode 100644
index 000000000..3d7ac2496
--- /dev/null
+++ b/lib/pkgcloud/oneandone/compute/flavor.js
@@ -0,0 +1,22 @@
+/**
+ * Created by Ali Bazlamit on 8/21/2017.
+ */
+
+var util = require('util'),
+ base = require('../../core/compute/flavor');
+
+var Flavor = exports.Flavor = function Flavor(client, details) {
+ base.Flavor.call(this, client, details);
+};
+
+util.inherits(Flavor, base.Flavor);
+
+Flavor.prototype._setProperties = function (details) {
+ var id = details.id;
+
+ this.id = id;
+ this.name = details.name;
+ this.ram = details.hardware.ram;
+ this.disk = details.hardware.hdds[0] ? details.hardware.hdds[0].size : 0;
+ this.cores = details.hardware.vcore;
+};
diff --git a/lib/pkgcloud/oneandone/compute/image.js b/lib/pkgcloud/oneandone/compute/image.js
new file mode 100644
index 000000000..96b112986
--- /dev/null
+++ b/lib/pkgcloud/oneandone/compute/image.js
@@ -0,0 +1,26 @@
+/*
+ * image.js: OAO
+ *
+ * (C) Created by Ali Bazlamit on 8/19/2017.
+ *
+ */
+
+var util = require('util'),
+ base = require('../../core/compute/image'),
+ _ = require('lodash');
+
+var Image = exports.Image = function Image(client, details) {
+ base.Image.call(this, client, details);
+};
+
+util.inherits(Image, base.Image);
+
+Image.prototype._setProperties = function (details) {
+ this.id = details.id;
+ this.name = details.name;
+ this.server_id = details.server_id;
+};
+
+Image.prototype.toJSON = function () {
+ return _.pick(this, ['id', 'name', 'server_id']);
+};
diff --git a/lib/pkgcloud/joyent/compute/index.js b/lib/pkgcloud/oneandone/compute/index.js
similarity index 61%
rename from lib/pkgcloud/joyent/compute/index.js
rename to lib/pkgcloud/oneandone/compute/index.js
index 7ad4ff846..5307e0de8 100644
--- a/lib/pkgcloud/joyent/compute/index.js
+++ b/lib/pkgcloud/oneandone/compute/index.js
@@ -1,15 +1,11 @@
-/*
- * index.js: Top-level include for the Joyent compute module
- *
- * (C) 2012 Nodejitsu Inc.
- *
- */
-
-exports.Client = require('./client').Client;
-exports.Flavor = require('./flavor').Flavor;
-exports.Image = require('./image').Image;
-exports.Server = require('./server').Server;
-
-exports.createClient = function (options) {
- return new exports.Client(options);
-};
+/**
+ * Created by Ali Bazlamit on 8/14/2017.
+ */
+exports.Client = require('./client').Client;
+exports.Server = require('./server').Server;
+exports.Image = require('./image').Image;
+exports.Flavor = require('./flavor').Flavor;
+
+exports.createClient = function (options) {
+ return new exports.Client(options);
+};
diff --git a/lib/pkgcloud/oneandone/compute/server.js b/lib/pkgcloud/oneandone/compute/server.js
new file mode 100644
index 000000000..e1337f35e
--- /dev/null
+++ b/lib/pkgcloud/oneandone/compute/server.js
@@ -0,0 +1,45 @@
+/**
+ * server.js: 1&1 Server
+ *
+ * (C) Created by Ali Bazlamit on 8/10/2017.
+ *
+ */
+
+var util = require('util'),
+ _ = require('lodash'),
+ base = require('../../core/compute/server');
+
+var Server = exports.Server = function Server(client, details) {
+ base.Server.call(this, client, details);
+};
+
+util.inherits(Server, base.Server);
+
+Server.prototype._setProperties = function (details) {
+
+ this.id = details.id;
+ this.name = details.name;
+ this.image = details.image;
+ this.imageId = details.image ? details.image.id : details.imageId;
+ this.ips = details.ips;
+ if (details.datacenter) {
+ this.datacenter = details.datacenter;
+ }
+
+ switch (details.status && details.status.state) {
+ case 'POWERED_ON':
+ this.status = 'RUNNING';
+ break;
+ case 'POWERED_OFF':
+ this.status = this.STATUS.stopped;
+ break;
+ case 'NEW':
+ default:
+ this.status = 'PROVISIONING';
+ }
+ this.original = this.oneandone = details;
+};
+
+Server.prototype.toJSON = function () {
+ return _.pick(this, ['id', 'name', 'image', 'datacenter']);
+};
\ No newline at end of file
diff --git a/lib/pkgcloud/oneandone/index.js b/lib/pkgcloud/oneandone/index.js
new file mode 100644
index 000000000..001d01d00
--- /dev/null
+++ b/lib/pkgcloud/oneandone/index.js
@@ -0,0 +1,9 @@
+/**
+ *
+ * (C) Created by Ali Bazlamit on 8/10/2017.
+ *
+ */
+
+exports.compute = require('./compute');
+exports.blockstorage = require('./blockstorage');
+exports.loadbalancer = require('./loadbalancer');
\ No newline at end of file
diff --git a/lib/pkgcloud/oneandone/loadbalancer/client/index.js b/lib/pkgcloud/oneandone/loadbalancer/client/index.js
new file mode 100644
index 000000000..d1aec485f
--- /dev/null
+++ b/lib/pkgcloud/oneandone/loadbalancer/client/index.js
@@ -0,0 +1,17 @@
+/**
+ * Created by Ali Bazlamit on 8/31/2017.
+ */
+
+var util = require('util'),
+ oneandone = require('../../client'),
+ _ = require('lodash');
+
+var Client = exports.Client = function (options) {
+ oneandone.Client.call(this, options);
+
+ _.extend(this, require('./loadbalancers'));
+ _.extend(this, require('./nodes'));
+
+};
+
+util.inherits(Client, oneandone.Client);
\ No newline at end of file
diff --git a/lib/pkgcloud/oneandone/loadbalancer/client/loadbalancers.js b/lib/pkgcloud/oneandone/loadbalancer/client/loadbalancers.js
new file mode 100644
index 000000000..a129485d3
--- /dev/null
+++ b/lib/pkgcloud/oneandone/loadbalancer/client/loadbalancers.js
@@ -0,0 +1,170 @@
+/**
+ * Created by Ali Bazlamit on 8/31/2017.
+ */
+var oneandone = require('liboneandone'),
+ LoadBalancer = require('../loadbalancer').LoadBalancer;
+
+//
+// ### function getLoadBalancers (callback)
+// #### @callback {function} f(err, loadbalancers). `loadbalancers` is an array that
+// represents the loadbalancers that are available to your account
+//
+// Lists all loadbalancers available to your account.
+//
+exports.getLoadBalancers = function getLoadBalancers(options, callback) {
+ if (typeof options === 'function') {
+ callback = options;
+ options = {};
+ }
+
+ var self = this;
+
+ oneandone.listLoadBalancers(function (error, response, body) {
+ if (error) {
+ callback(error);
+ return;
+ }
+ callback(null, JSON.parse(body).map(function (loadbalancer) {
+ return new LoadBalancer(self, loadbalancer);
+ }));
+ });
+};
+
+//
+// ### function createLoadbalancer (options, callback)
+// #### @opts {Object} options
+// #### @name {String} Load balancer name
+// #### @healthCheckInterval {int} Health check period in seconds
+// #### @healthCheckPath {String} **Optional** flavor to use for this image
+// #### @healthCheckParser {String} **Optional** flavor to use for this image
+// #### @persistence {boolean} Persistence
+// #### @persistenceTime {int} Persistence time in seconds. Required if persistence is enabled.
+// #### @method {String} 'Balancing procedure','enum': ['ROUND_ROBIN', 'LEAST_CONNECTIONS'].
+// #### @datacenterId {String} **Optional** ID of the datacenter where the load balancer will be created
+// #### @rules {Array|Rule} **Optional** flavor to use for this image
+// #### @callback {Function} f(err, loadbalancer).
+//
+// Creates a new load balancer.
+//
+exports.createLoadBalancer = function createLoadBalancer(options, callback) {
+ if (typeof options === 'function') {
+ callback = options;
+ options = {};
+ }
+ var self = this;
+
+ var balancerData = {
+ 'name': options.name,
+ 'description': options.name,
+ 'health_check_test': oneandone.HealthCheckTestTypes.TCP,
+ 'health_check_interval': options.healthCheckInterval,
+ 'health_check_path': options.healthCheckPath,
+ 'health_check_parser': options.healthCheckParser,
+ 'persistence': options.Persistence,
+ 'persistence_time': options.persistenceTime,
+ 'method': options.method,
+ 'datacenter_id': options.location,
+ 'rules': options.rules
+ };
+
+ oneandone.createLoadBalancer(balancerData, function (error, response, body) {
+ if (error) {
+ callback(error);
+ return;
+ }
+ if (response.statusCode != 202) {
+ callback(JSON.parse(body));
+ return;
+ }
+ var _lb = JSON.parse(body);
+ var lb = new LoadBalancer(self, _lb);
+ callback(null, lb);
+ });
+};
+
+//
+// ### function deleteLoadBalancer(loadbalancer, callback)
+// #### @loadbalancer {LoadBalancer|String} LoadBalancer id or a LoadBalancer
+// #### @callback {Function} f(err, lbId).
+//
+// Destroy a LoadBalancer in OAO.
+//
+exports.deleteLoadBalancer = function deleteLoadBalancer(loadbalancer, callback) {
+ var lbId = loadbalancer instanceof LoadBalancer ? loadbalancer.id : loadbalancer;
+ oneandone.deleteLoadBalancer(lbId, function (error, response, body) {
+ if (error) {
+ callback(error);
+ return;
+ }
+ if (response.statusCode != 202) {
+ callback(JSON.parse(body));
+ return;
+ }
+ callback(null, JSON.parse(body));
+ });
+};
+
+//
+// ### function getLoadBalancer(loadbalancer, callback)
+// #### @loadbalancer {LoadBalancer|String} LoadBalancer id or a loadbalancer
+// #### @callback {Function} f(err, lbId).
+//
+// Gets a loadbalancer in OAO.
+//
+exports.getLoadBalancer = function getLoadBalancer(loadbalancer, callback) {
+ var self = this,
+ lbId = loadbalancer instanceof LoadBalancer ? loadbalancer.id : loadbalancer;
+
+ oneandone.getLoadBalancer(lbId, function (error, response, body) {
+ if (error) {
+ return callback(error);
+ }
+ var _lb = JSON.parse(body);
+ callback(null, new LoadBalancer(self, _lb));
+ }
+ );
+};
+
+/**
+ * client.updateLoadBalancer
+ // #### @opts {Object} options
+ // #### @name {String} Load balancer name
+ // #### @healthCheckInterval {int} Health check period in seconds
+ // #### @healthCheckPath {String} **Optional** flavor to use for this image
+ // #### @healthCheckParser {String} **Optional** flavor to use for this image
+ // #### @persistence {boolean} Persistence
+ // #### @persistenceTime {int} Persistence time in seconds. Required if persistence is enabled.
+ // #### @method {String} 'Balancing procedure','enum': ['ROUND_ROBIN', 'LEAST_CONNECTIONS'].
+ * @param {function} callback
+ * @returns {*}
+ */
+exports.updateLoadBalancer = function updateLoadBalancer(options, callback) {
+ var self = this,
+ lbId = options.loadbalancer instanceof LoadBalancer ? options.loadbalancer.id : options.loadbalancer;
+
+ var updateData = {
+ 'name': options.name,
+ 'health_check_test': oneandone.HealthCheckTestTypes.TCP,
+ 'health_check_interval': options.healthCheckInterval,
+ 'health_check_path': options.healthCheckPath,
+ 'health_check_parser': options.healthCheckParser,
+ 'persistence': options.Persistence,
+ 'persistence_time': options.persistenceTime,
+ 'method': options.method,
+ 'rules': options.rules
+ };
+ oneandone.updateLoadBalancer(lbId, updateData, function (error, response, body) {
+ if (error) {
+ callback(error);
+ return;
+ }
+ if (response.statusCode != 202) {
+ callback(JSON.parse(body));
+ return;
+ }
+ var lb = JSON.parse(body);
+ callback(null, new LoadBalancer(self, lb));
+ });
+};
+
+
diff --git a/lib/pkgcloud/oneandone/loadbalancer/client/nodes.js b/lib/pkgcloud/oneandone/loadbalancer/client/nodes.js
new file mode 100644
index 000000000..41b27d1ca
--- /dev/null
+++ b/lib/pkgcloud/oneandone/loadbalancer/client/nodes.js
@@ -0,0 +1,90 @@
+/**
+ * Created by Ali Bazlamit on 8/31/2017.
+ */
+var oneandone = require('liboneandone'),
+ LoadBalancer = require('../loadbalancer').LoadBalancer,
+ Node = require('../node').Node;
+
+//
+// ### function getNodes (callback)
+// #### @callback {function} f(err, nodes).
+// Returns a list of the servers/IPs attached to a load balancer.
+//
+exports.getNodes = function getNodes(loadbalancer, callback) {
+ var self = this,
+ lbId = loadbalancer instanceof LoadBalancer ? loadbalancer.id : loadbalancer;
+
+ oneandone.listLoadBalancerServerIps(lbId, function (error, response, body) {
+ if (error) {
+ callback(error);
+ return;
+ }
+ callback(null, JSON.parse(body).map(function (node) {
+ return new Node(self, node);
+ }));
+ });
+};
+
+//
+// ### function createNode (serverIps, callback)
+// #### @opts {Object} options
+// #### @loadbalancer {Loadbalancer} Load balancer name
+// #### @serverIps {Array}
+//
+// #### @callback {Function} f(err, node).
+//
+// Assigns servers/IPs to a load balancer.
+//
+exports.addNodes = function addNodes(options, callback) {
+ if (typeof options === 'function') {
+ callback = options;
+ options = {};
+ }
+ var self = this;
+ var lbId = options.loadbalancer instanceof LoadBalancer ? options.loadbalancer.id : options.loadbalancer;
+
+ var assignData = {
+ 'server_ips': options.serverIps
+ };
+
+ oneandone.assignServerIpToLoadBalancer(lbId, assignData, function (error, response, body) {
+ if (error) {
+ callback(error);
+ return;
+ }
+ if (response.statusCode != 202) {
+ callback(JSON.parse(body));
+ return;
+ }
+ var _lb = JSON.parse(body);
+ var lb = new LoadBalancer(self, _lb);
+ callback(null, lb);
+ });
+};
+
+//
+// ### function deleteNode(options, callback)
+// #### @opts {Object} options
+// #### @loadbalancer {Loadbalancer} Load balancer name
+// #### @serverIp {String}
+// #### @callback {Function} f(err, lbId).
+//
+// Destroy a Node in OAO.
+//
+exports.removeNode = function removeNode(options, callback) {
+ var self = this,
+ lbId = options.loadbalancer instanceof LoadBalancer ? options.loadbalancer.id : options.loadbalancer;
+ oneandone.unassignServerIpFromLoadBalancer(lbId, options.serverIp, function (error, response, body) {
+ if (error) {
+ callback(error);
+ return;
+ }
+ if (response.statusCode != 202) {
+ callback(JSON.parse(body));
+ return;
+ }
+ var _lb = JSON.parse(body);
+ var lb = new LoadBalancer(self, _lb);
+ callback(null, lb);
+ });
+};
\ No newline at end of file
diff --git a/lib/pkgcloud/oneandone/loadbalancer/index.js b/lib/pkgcloud/oneandone/loadbalancer/index.js
new file mode 100644
index 000000000..0e3ae9482
--- /dev/null
+++ b/lib/pkgcloud/oneandone/loadbalancer/index.js
@@ -0,0 +1,11 @@
+/**
+ * Created by Ali Bazlamit on 8/31/2017.
+ */
+
+exports.Client = require('./client').Client;
+exports.LoadBalancer = require('./loadbalancer').LoadBalancer;
+exports.Node = require('./node').Node;
+
+exports.createClient = function (options) {
+ return new exports.Client(options);
+};
diff --git a/lib/pkgcloud/oneandone/loadbalancer/loadbalancer.js b/lib/pkgcloud/oneandone/loadbalancer/loadbalancer.js
new file mode 100644
index 000000000..0fc4284b3
--- /dev/null
+++ b/lib/pkgcloud/oneandone/loadbalancer/loadbalancer.js
@@ -0,0 +1,56 @@
+/**
+ * Created by Ali Bazlamit on 8/31/2017.
+ */
+
+var util = require('util'),
+ base = require('../../core/loadbalancer/loadbalancer');
+
+var LoadBalancer = exports.LoadBalancer = function LoadBalancer(client, details) {
+ base.LoadBalancer.call(this, client, details);
+};
+
+util.inherits(LoadBalancer, base.LoadBalancer);
+
+LoadBalancer.prototype._setProperties = function (details) {
+ var id = details.id;
+
+ this.id = id;
+ this.name = details.name;
+ this.ip = details.ip;
+ this.healthCheckTest = details.health_check_test;
+ this.healthCheckInterval = details.health_check_interval;
+ this.persistence = details.persistence;
+ this.persistenceTime = details.persistence_time;
+ this.datacenter = details.datacenter;
+ this.rules = details.rules;
+ this.nodes = details.server_ips;
+
+};
+
+/// Nodes
+
+LoadBalancer.prototype.refresh = function(callback) {
+ var self = this;
+ return self.client.getLoadBalancer(this, function (err, server) {
+ if (err) {
+ callback(err);
+ return;
+ }
+
+ self._setProperties(server);
+ callback(err, self);
+ });
+};
+
+//NODES
+LoadBalancer.prototype.getNodes = function(callback) {
+ this.client.getNodes(this, callback);
+};
+
+LoadBalancer.prototype.addNodes = function(nodes, callback) {
+ this.client.addNodes(this, nodes, callback);
+};
+
+LoadBalancer.prototype.removeNode = function (node, callback) {
+ this.client.removeNode(this, node, callback);
+};
diff --git a/lib/pkgcloud/oneandone/loadbalancer/node.js b/lib/pkgcloud/oneandone/loadbalancer/node.js
new file mode 100644
index 000000000..153ba4e96
--- /dev/null
+++ b/lib/pkgcloud/oneandone/loadbalancer/node.js
@@ -0,0 +1,20 @@
+/**
+ * Created by Ali Bazlamit on 8/31/2017.
+ */
+
+var util = require('util'),
+ base = require('../../core/loadbalancer/node');
+
+var Node = exports.Node = function Node(client, details) {
+ base.Node.call(this, client, details);
+};
+
+util.inherits(Node, base.Node);
+
+Node.prototype._setProperties = function (details) {
+ var self = this;
+
+ self.id = details.id;
+ self.ip = details.ip;
+ self.server_name = details.server_name;
+};
diff --git a/lib/pkgcloud/oneandone/loadbalancer/rule.js b/lib/pkgcloud/oneandone/loadbalancer/rule.js
new file mode 100644
index 000000000..84459025e
--- /dev/null
+++ b/lib/pkgcloud/oneandone/loadbalancer/rule.js
@@ -0,0 +1,25 @@
+/**
+ * Created by Ali Bazlamit on 8/31/2017.
+ */
+var _ = require('lodash');
+var Rule = function (details) {
+ if (!details) {
+ throw new Error('Rule must be constructed with at-least basic details.');
+ }
+
+ this._setProperties(details);
+};
+
+Rule.prototype._setProperties = function (details) {
+ this.id = details.id;
+ this.protocol = details.protocol;
+ this.portBalancer = details.port_balancer;
+ this.portServer = details.port_server;
+ this.source = details.source;
+};
+
+exports.Rule = Rule;
+
+Rule.prototype.toJSON = function () {
+ return _.pick(this, ['id', 'protocol', 'port_balancer', 'port_server','source']);
+};
\ No newline at end of file
diff --git a/lib/pkgcloud/openstack/blockstorage/client/index.js b/lib/pkgcloud/openstack/blockstorage/client/index.js
new file mode 100644
index 000000000..99e5ca205
--- /dev/null
+++ b/lib/pkgcloud/openstack/blockstorage/client/index.js
@@ -0,0 +1,35 @@
+/*
+ * index.js: Openstack cinder (blockstorage) client
+ *
+ * (C) 2014 Rackspace
+ * Ken Perkins
+ * MIT LICENSE
+ *
+ */
+
+var util = require('util'),
+ urlJoin = require('url-join'),
+ openstack = require('../../client'),
+ _ = require('lodash');
+
+var Client = exports.Client = function (options) {
+ openstack.Client.call(this, options);
+
+ _.extend(this, require('./volumetypes'));
+ _.extend(this, require('./snapshots'));
+ _.extend(this, require('./volumes'));
+
+ this.serviceType = 'volume';
+};
+
+util.inherits(Client, openstack.Client);
+
+Client.prototype._getUrl = function (options) {
+ options = options || {};
+
+ return urlJoin(this._serviceUrl,
+ typeof options === 'string'
+ ? options
+ : options.path);
+
+};
diff --git a/lib/pkgcloud/rackspace/blockstorage/client/snapshots.js b/lib/pkgcloud/openstack/blockstorage/client/snapshots.js
similarity index 93%
rename from lib/pkgcloud/rackspace/blockstorage/client/snapshots.js
rename to lib/pkgcloud/openstack/blockstorage/client/snapshots.js
index 57751e3dd..fc88fb007 100644
--- a/lib/pkgcloud/rackspace/blockstorage/client/snapshots.js
+++ b/lib/pkgcloud/openstack/blockstorage/client/snapshots.js
@@ -1,14 +1,13 @@
/*
- * snapshots.js: Instance methods for working with SnapShots from OpenStack Block Storage
+ * snapshots.js: Instance methods for working with SnapShots from Openstack Cinder (Block Storage)
*
- * (C) 2013 Rackspace
+ * (C) 2014 Rackspace
* Ken Perkins
* MIT LICENSE
*
*
*/
-var errs = require('errs'),
- Snapshot = require('../snapshot').Snapshot,
+var Snapshot = require('../snapshot').Snapshot,
urlJoin = require('url-join');
var _urlPrefix = 'snapshots';
@@ -96,8 +95,7 @@ exports.createSnapshot = function(details, callback) {
}
};
- self._request(createOptions, function(err, body, res) {
- console.dir(body);
+ self._request(createOptions, function(err, body) {
return err
? callback(err)
: callback(null, new Snapshot(self, body.snapshot));
@@ -128,7 +126,7 @@ exports.updateSnapshot = function (snapshot, callback) {
}
};
- self._request(updateOptions, function (err, body, res) {
+ self._request(updateOptions, function (err, body) {
return err
? callback(err)
: callback(null, new Snapshot(self, body.snapshot));
@@ -155,4 +153,4 @@ exports.deleteSnapshot = function (snapshot, callback) {
? callback(err)
: callback(null, true);
});
-};
\ No newline at end of file
+};
diff --git a/lib/pkgcloud/rackspace/blockstorage/client/volumes.js b/lib/pkgcloud/openstack/blockstorage/client/volumes.js
similarity index 95%
rename from lib/pkgcloud/rackspace/blockstorage/client/volumes.js
rename to lib/pkgcloud/openstack/blockstorage/client/volumes.js
index 41ff07390..ed4d5b547 100644
--- a/lib/pkgcloud/rackspace/blockstorage/client/volumes.js
+++ b/lib/pkgcloud/openstack/blockstorage/client/volumes.js
@@ -1,14 +1,13 @@
/*
- * volumes.js: Instance methods for working with Volumes from CloudBlockStorage
+ * volumes.js: Instance methods for working with Volumes from Openstack Cinder (Block Storage)
*
- * (C) 2013 Rackspace
+ * (C) 2014 Rackspace
* Ken Perkins
* MIT LICENSE
*
*
*/
-var errs = require('errs'),
- Volume = require('../volume').Volume,
+var Volume = require('../volume').Volume,
VolumeType = require('../volumetype').VolumeType,
urlJoin = require('url-join');
@@ -166,4 +165,4 @@ exports.deleteVolume = function (volume, callback) {
? callback(err)
: callback();
});
-};
\ No newline at end of file
+};
diff --git a/lib/pkgcloud/rackspace/blockstorage/client/volumetypes.js b/lib/pkgcloud/openstack/blockstorage/client/volumetypes.js
similarity index 90%
rename from lib/pkgcloud/rackspace/blockstorage/client/volumetypes.js
rename to lib/pkgcloud/openstack/blockstorage/client/volumetypes.js
index bf64aa9d9..e345b053d 100644
--- a/lib/pkgcloud/rackspace/blockstorage/client/volumetypes.js
+++ b/lib/pkgcloud/openstack/blockstorage/client/volumetypes.js
@@ -1,14 +1,13 @@
/*
- * volumetypes.js: Instance methods for working with VolumeTypes from CloudBlockStorage
+ * volumetypes.js: Instance methods for working with VolumeTypes from Openstack Cinder (Block Storage)
*
- * (C) 2013 Rackspace
+ * (C) 2014 Rackspace
* Ken Perkins
* MIT LICENSE
*
*
*/
-var errs = require('errs'),
- VolumeType = require('../volumetype').VolumeType,
+var VolumeType = require('../volumetype').VolumeType,
urlJoin = require('url-join');
var _urlPrefix = 'types';
@@ -54,4 +53,4 @@ exports.getVolumeType = function (volumeType, callback) {
? callback(err)
: callback(null, new VolumeType(self, body['volume_type']));
});
-};
\ No newline at end of file
+};
diff --git a/lib/pkgcloud/openstack/blockstorage/index.js b/lib/pkgcloud/openstack/blockstorage/index.js
new file mode 100644
index 000000000..e80ae01ff
--- /dev/null
+++ b/lib/pkgcloud/openstack/blockstorage/index.js
@@ -0,0 +1,17 @@
+/*
+ * index.js: Top-level include for the Openstack Block Storage module
+ *
+ * (C) 2014 Rackspace
+ * Ken Perkins
+ * MIT LICENSE
+ *
+ */
+
+exports.Client = require('./client').Client;
+exports.Volume = require('./volume').Volume;
+exports.VolumeType = require('./volumetype').VolumeType;
+exports.Snapshot = require('./snapshot').Snapshot;
+
+exports.createClient = function (options) {
+ return new exports.Client(options);
+};
diff --git a/lib/pkgcloud/rackspace/blockstorage/snapshot.js b/lib/pkgcloud/openstack/blockstorage/snapshot.js
similarity index 81%
rename from lib/pkgcloud/rackspace/blockstorage/snapshot.js
rename to lib/pkgcloud/openstack/blockstorage/snapshot.js
index db3181cb1..487a076a9 100644
--- a/lib/pkgcloud/rackspace/blockstorage/snapshot.js
+++ b/lib/pkgcloud/openstack/blockstorage/snapshot.js
@@ -1,21 +1,21 @@
/*
- * volume.js: OpenStack BlockStorage snapshot
+ * volume.js: OpenStack Block Storage snapshot
*
- * (C) 2013 Rackspace
+ * (C) 2014 Rackspace
* Ken Perkins
* MIT LICENSE
*
*/
-var utile = require('utile'),
+var util = require('util'),
base = require('../../core/base'),
- _ = require('underscore');
+ _ = require('lodash');
var Snapshot = exports.Snapshot = function Snapshot(client, details) {
base.Model.call(this, client, details);
};
-utile.inherits(Snapshot, base.Model);
+util.inherits(Snapshot, base.Model);
Snapshot.prototype._setProperties = function (details) {
this.id = details.id;
diff --git a/lib/pkgcloud/rackspace/blockstorage/volume.js b/lib/pkgcloud/openstack/blockstorage/volume.js
similarity index 84%
rename from lib/pkgcloud/rackspace/blockstorage/volume.js
rename to lib/pkgcloud/openstack/blockstorage/volume.js
index bf669299d..cb42d530a 100644
--- a/lib/pkgcloud/rackspace/blockstorage/volume.js
+++ b/lib/pkgcloud/openstack/blockstorage/volume.js
@@ -1,21 +1,21 @@
/*
- * volume.js: OpenStack BlockStorage volume
+ * volume.js: OpenStack Block Storage volume
*
- * (C) 2013 Rackspace
+ * (C) 2014 Rackspace
* Ken Perkins
* MIT LICENSE
*
*/
-var utile = require('utile'),
+var util = require('util'),
base = require('../../core/base'),
- _ = require('underscore');
+ _ = require('lodash');
var Volume = exports.Volume = function Volume(client, details) {
base.Model.call(this, client, details);
};
-utile.inherits(Volume, base.Model);
+util.inherits(Volume, base.Model);
Volume.prototype._setProperties = function (details) {
this.id = details.id;
diff --git a/lib/pkgcloud/rackspace/blockstorage/volumetype.js b/lib/pkgcloud/openstack/blockstorage/volumetype.js
similarity index 80%
rename from lib/pkgcloud/rackspace/blockstorage/volumetype.js
rename to lib/pkgcloud/openstack/blockstorage/volumetype.js
index 0a226c329..e0703b07e 100644
--- a/lib/pkgcloud/rackspace/blockstorage/volumetype.js
+++ b/lib/pkgcloud/openstack/blockstorage/volumetype.js
@@ -1,21 +1,21 @@
/*
* volumetype.js: OpenStack Block Storage volume type
*
- * (C) 2013 Rackspace
+ * (C) 2014 Rackspace
* Ken Perkins
* MIT LICENSE
*
*/
-var utile = require('utile'),
+var util = require('util'),
base = require('../../core/base'),
- _ = require('underscore');
+ _ = require('lodash');
var VolumeType = exports.VolumeType = function VolumeType(client, details) {
base.Model.call(this, client, details);
};
-utile.inherits(VolumeType, base.Model);
+util.inherits(VolumeType, base.Model);
VolumeType.prototype._setProperties = function (details) {
this.id = details.id;
diff --git a/lib/pkgcloud/openstack/cdn/client/base.js b/lib/pkgcloud/openstack/cdn/client/base.js
new file mode 100644
index 000000000..fb8f9536e
--- /dev/null
+++ b/lib/pkgcloud/openstack/cdn/client/base.js
@@ -0,0 +1,47 @@
+/*
+ * flavors.js: Instance methods for working with base resources from Openstack CDN
+ *
+ * (C) 2014 Rackspace
+ * Shaunak Kashyap
+ * MIT LICENSE
+ */
+
+/**
+ * client.getHomeDocument
+ *
+ * @description gets the home document for the CDN service
+ *
+ * @param callback
+ * @return {*}
+ */
+exports.getHomeDocument = function(callback) {
+ var requestOptions = {
+ path: '/'
+ };
+
+ return this._request(requestOptions, function (err, body) {
+ if (err) {
+ return callback(err);
+ }
+
+ callback(err, body);
+ });
+};
+
+/**
+ * client.getPing
+ *
+ * @description gets the server ping response (status response)
+ *
+ * @param callback
+ * @return {*}
+ */
+exports.getPing = function(callback) {
+ var requestOptions = {
+ path: '/ping'
+ };
+
+ return this._request(requestOptions, function (err) {
+ return callback(err);
+ });
+};
diff --git a/lib/pkgcloud/openstack/cdn/client/flavors.js b/lib/pkgcloud/openstack/cdn/client/flavors.js
new file mode 100644
index 000000000..50f155c6f
--- /dev/null
+++ b/lib/pkgcloud/openstack/cdn/client/flavors.js
@@ -0,0 +1,75 @@
+/*
+ * flavors.js: Instance methods for working with flavors from Openstack CDN
+ *
+ * (C) 2014 Rackspace
+ * Shaunak Kashyap
+ * MIT LICENSE
+ */
+
+var pkgcloud = require('../../../../../lib/pkgcloud'),
+ urlJoin = require('url-join'),
+ cdn = pkgcloud.providers.openstack.cdn;
+
+var _urlPrefix = '/flavors';
+
+/**
+ * client.getFlavor
+ *
+ * @description Gets a flavor from the account
+ *
+ * @param {String|object} flavor The flavor or flavorId to fetch
+ * @param {Function} callback
+ * @returns {request|*}
+ */
+exports.getFlavor = function (flavor, callback) {
+ var self = this,
+ path = flavor instanceof cdn.Flavor
+ ? urlJoin(_urlPrefix, flavor.id)
+ : urlJoin(_urlPrefix, flavor);
+
+ return this._request({
+ path: path
+ }, function (err, body) {
+ if (err) {
+ return callback(err);
+ }
+ if (!body) {
+ callback(new Error('Unexpected empty response'));
+ }
+ else {
+ callback(err, new cdn.Flavor(self, body));
+ }
+ });
+};
+
+/**
+ * client.getFlavors
+ *
+ * @description get the list of flavors for the current account
+ *
+ * @param {object|Function} [options] A set of options for the getFlavors call
+ * @param {function} callback f(err, flavors) where flavors is an array of Flavor
+ * @returns {*}
+ */
+exports.getFlavors = function getFlavors(options, callback) {
+ var self = this;
+
+ if (typeof options === 'function') {
+ callback = options;
+ options = {};
+ }
+
+ var requestOptions = {
+ path: _urlPrefix
+ };
+
+ return this._request(requestOptions, function (err, body) {
+ if (err) {
+ return callback(err);
+ }
+
+ callback(err, body.flavors.map(function(flavor) {
+ return new cdn.Flavor(self, flavor);
+ }));
+ });
+};
diff --git a/lib/pkgcloud/openstack/cdn/client/index.js b/lib/pkgcloud/openstack/cdn/client/index.js
new file mode 100644
index 000000000..a308707bd
--- /dev/null
+++ b/lib/pkgcloud/openstack/cdn/client/index.js
@@ -0,0 +1,47 @@
+/*
+ * index.js: CDN client for OpenStack
+ *
+ * (C) 2014 Rackspace
+ * Shaunak Kashyap
+ * MIT LICENSE
+ */
+
+var util = require('util'),
+ openstack = require('../../client'),
+ urlJoin = require('url-join'),
+ _ = require('lodash');
+
+var Client = exports.Client = function (options) {
+ openstack.Client.call(this, options);
+
+ _.extend(this, require('./base'));
+ _.extend(this, require('./services'));
+ _.extend(this, require('./flavors'));
+
+ this.serviceType = 'cdn';
+
+};
+
+util.inherits(Client, openstack.Client);
+
+/**
+ * client._getUrl
+ *
+ * @description get the url for the current CDN service
+ *
+ * @param options
+ * @returns {exports|*}
+ * @private
+ */
+Client.prototype._getUrl = function (options) {
+ options = options || {};
+
+ if (!this._serviceUrl) {
+ throw new Error('Service url not found');
+ }
+
+ return urlJoin(this._serviceUrl,
+ typeof options === 'string'
+ ? options
+ : options.path);
+};
diff --git a/lib/pkgcloud/openstack/cdn/client/services.js b/lib/pkgcloud/openstack/cdn/client/services.js
new file mode 100644
index 000000000..a64c868ed
--- /dev/null
+++ b/lib/pkgcloud/openstack/cdn/client/services.js
@@ -0,0 +1,301 @@
+/*
+ * services.js: Instance methods for working with services from Openstack CDN
+ *
+ * (C) 2014 Rackspace
+ * Shaunak Kashyap
+ * MIT LICENSE
+ */
+
+var pkgcloud = require('../../../../../lib/pkgcloud'),
+ errs = require('errs'),
+ url = require('url'),
+ urlJoin = require('url-join'),
+ util = require('util'),
+ _ = require('lodash'),
+ cdn = pkgcloud.providers.openstack.cdn,
+ jsonpatch = require('fast-json-patch');
+
+// Declaring variables for helper functions defined later
+var _getService, _validateProperties;
+
+var _urlPrefix = '/services';
+
+/**
+ * client.getService
+ *
+ * @description Gets a service from the account
+ *
+ * @param {String|object} service The service or serviceId to fetch
+ * @param {Function} callback
+ * @returns {request|*}
+ */
+exports.getService = function (service, callback) {
+ return _getService(this, service, callback);
+};
+
+/**
+ * client.getServices
+ *
+ * @description get the list of services for the current account
+ *
+ * @param {object|Function} [options] A set of options for the getServices call
+ * @param {function} callback f(err, services) where services is an array of Service
+ * @returns {*}
+ */
+exports.getServices = function getServices(options, callback) {
+ var self = this;
+
+ if (typeof options === 'function') {
+ callback = options;
+ options = {};
+ }
+
+ var requestOptions = {
+ path: _urlPrefix
+ };
+
+ requestOptions.qs = _.pick(options,
+ 'limit',
+ 'marker');
+
+ return this._request(requestOptions, function (err, body) {
+ if (err) {
+ return callback(err);
+ }
+
+ callback(err, body.services.map(function(service) {
+ return new cdn.Service(self, service);
+ }));
+ });
+};
+
+/**
+ * client.createService
+ *
+ * @description Creates a service with the specified options.
+
+ * @param {object} details the details to create this service
+ * @param {String} details.name the name of the new service
+ * @param {Array} details.domains list of domains for the new service
+ * @param {Object} details.domains[n] information about a domain
+ * @param {String} details.domains[n].domain the domain name
+ * @param {String} [details.domains[n].protocol] the protocol used to access the domain; default = http
+ * @param {Array} details.origins list of origin servers for the new service
+ * @param {Object} details.origins[n] information about an origin server
+ * @param {String} details.origins[n].origin origin server address
+ * @param {Number} [details.origins[n].port] origin server port; default = 80
+ * @param {Boolean} [details.origins[n].ssl] whether origin server uses SSL; default = false
+ * @param {Array} [details.origins[n].rules] list of rules defining the conditions when this origin should be accessed
+ * @param {Object} [details.origins[n].rules[n]] information about an access rule
+ * @param {String} [details.origins[n].rules[n].name] the name of the rule
+ * @param {String} [details.origins[n].rules[n].request_url] the request URL this rule should match (regex supported)
+ * @param {Array} [details.caching] list of TTL rules for assets of this service
+ * @param {Object} [details.caching[n]] information about a TTL rule
+ * @param {String} [details.caching[n].name] the name of the TTL rule
+ * @param {Number} [details.caching[n].ttl] the TTL value, in seconds?
+ * @param {Array} [details.caching[n].rules] list of rules that determine if this TTL should be applied to an asset
+ * @param {Object} [details.caching[n].rules[n]] information about a TTL rule
+ * @param {String} [details.caching[n].rules[n].name] the name of the TTL rule
+ * @param {String} [details.caching[n].rules[n].request_url] the request URL this rule should match (regex supported)
+ * @param {Array} [details.restrictions] list of restrictions on who can access new service
+ * @param {Object} [details.restrictions[n]] information about an access restriction
+ * @param {String} [details.restrictions[n].name] the name of the restriction
+ * @param {Array} [details.restrictions[n].rules] list of restrition rules
+ * @param {Object} [details.restrictions[n].rules[n]] information about a restriction rule
+ * @param {String} [details.restrictions[n].rules[n].name] the name of the restriction rule
+ * @param {String} [details.restrictions[n].rules[n].referrer] the domain from which the new service can be accessed
+ * @param {String} details.flavorId the ID of the flavor to use for this service
+ * @param callback
+ * @returns {request|null}
+ */
+exports.createService = function (details, callback) {
+ if (typeof details === 'function') {
+ callback = details;
+ details = {};
+ }
+
+ details = details || {};
+
+ if (!_validateProperties(['name', 'domains', 'origins', 'flavorId'], details,
+ 'options.%s is a required argument.', callback)) {
+ return;
+ }
+
+ var self = this,
+ createOptions = {
+ method: 'POST',
+ path: _urlPrefix,
+ body: {
+ name: details.name,
+ domains: details.domains,
+ origins: details.origins,
+ flavor_id: details.flavorId
+ }
+ };
+
+ if (details.caching) {
+ createOptions.body.caching = details.caching;
+ }
+
+ if (details.restrictions) {
+ createOptions.body.restrictions = details.restrictions;
+ }
+
+ return self._request(createOptions, function (err, body, res) {
+ if (err) {
+ return callback(err);
+ }
+
+ return _getService(self, res.headers.location, callback);
+ });
+};
+
+/**
+ * client.updateService
+ *
+ * @description Update a service
+ *
+ * @param {String|object} service The service or serviceId to update
+ * @param {Function} callback
+ * @returns {request|*}
+ */
+exports.updateService = function (service, callback) {
+ var self = this;
+
+ if (!(service instanceof cdn.Service)) {
+ return callback(new Error('you must provide a service to update'));
+ }
+
+ // Get a pristine copy of service resource from the server
+ return _getService(self, service, function(err, pristineService) {
+ if (err) {
+ return callback(err);
+ }
+
+ // Compare passed-in service with pristine copy to generate
+ // JSON Patch representation
+ var patch = jsonpatch.compare(pristineService, service);
+ return self._request({
+ path: urlJoin(_urlPrefix, service.id),
+ body: patch,
+ method: 'PATCH'
+ }, function (err) {
+ if (err) {
+ return callback(err);
+ }
+
+ callback(err, service);
+ });
+ });
+};
+
+/**
+ * client.deleteService
+ *
+ * @description Delete a service from the account
+ *
+ * @param {String|object} service The service or serviceId to delete
+ * @param {Function} callback
+ * @returns {request|*}
+ */
+exports.deleteService = function (service, callback) {
+ var path = service instanceof cdn.Service
+ ? urlJoin(_urlPrefix, service.id)
+ : urlJoin(_urlPrefix, service);
+
+ return this._request({
+ path: path,
+ method: 'DELETE'
+ }, function (err) {
+ return callback(err);
+ });
+};
+
+/**
+ * client.deleteServiceCachedAssets
+ *
+ * @description Delete cached assets of a service
+ *
+ * @param {String|object} service The service or serviceId whose cached assets to delete
+ * @param {String|null} assetUrl The URL of the asset to delete; default = delete all assets
+ * @param {Function} callback
+ * @returns {request|*}
+ */
+exports.deleteServiceCachedAssets = function (service, assetUrl, callback) {
+ var path = service instanceof cdn.Service
+ ? urlJoin(_urlPrefix, service.id)
+ : urlJoin(_urlPrefix, service);
+
+ if (!callback) {
+ callback = assetUrl;
+ assetUrl = null;
+ }
+
+ return this._request({
+ path: urlJoin(path, 'assets'),
+ qs: assetUrl ? { url: assetUrl } : { all: true },
+ method: 'DELETE'
+ }, function (err) {
+ return callback(err);
+ });
+};
+
+/**
+ * _getService
+ *
+ * @description Gets a service from the account
+ *
+ * @param {String|object} service The service or serviceId or serviceUrl to fetch
+ * @param {Function} callback
+ * @returns {request|*}
+ */
+_getService = function (self, service, callback) {
+ var requestOptions = {};
+
+ // Determine if service is an object, a URL or a string (serviceId)
+ if (service instanceof cdn.Service) {
+ requestOptions.path = urlJoin(_urlPrefix, service.id);
+ } else {
+ if (!!url.parse(service).protocol) {
+ requestOptions.uri = service;
+ } else {
+ requestOptions.path = urlJoin(_urlPrefix, service);
+ }
+ }
+
+ return self._request(requestOptions, function (err, body) {
+ if (err) {
+ return callback(err);
+ }
+ if (!body) {
+ callback(new Error('Unexpected empty response'));
+ }
+ else {
+ callback(err, new cdn.Service(self, body));
+ }
+ });
+};
+
+/**
+ * _validateProperties
+ *
+ * @description local helper function for validating arguments
+ *
+ * @param {Array} required The list of required properties
+ * @param {object} options The options object to validate
+ * @param {String} formatString String formatter for the error message
+ * @param {Function} callback
+ * @returns {boolean}
+ */
+_validateProperties = function (required, options, formatString, callback) {
+ return !required.some(function (item) {
+ if (typeof(options[item]) === 'undefined') {
+ errs.handle(
+ errs.create({ message: util.format(formatString, item) }),
+ callback
+ );
+ return true;
+ }
+ return false;
+ });
+};
diff --git a/lib/pkgcloud/openstack/cdn/flavor.js b/lib/pkgcloud/openstack/cdn/flavor.js
new file mode 100644
index 000000000..49699fb16
--- /dev/null
+++ b/lib/pkgcloud/openstack/cdn/flavor.js
@@ -0,0 +1,27 @@
+/*
+ * flavor.js: OpenStack CDN Flavor
+ *
+ * (C) 2014 Rackspace
+ * Shaunak Kashyap
+ * MIT LICENSE
+ *
+ */
+
+var util = require('util'),
+ base = require('../../core/base'),
+ _ = require('lodash');
+
+var Flavor = exports.Flavor = function Flavor(client, details) {
+ base.Model.call(this, client, details);
+};
+
+util.inherits(Flavor, base.Model);
+
+Flavor.prototype._setProperties = function (details) {
+ this.id = details.id || details['id'];
+ this.providers = details.providers || details['providers'];
+};
+
+Flavor.prototype.toJSON = function () {
+ return _.pick(this, ['id', 'providers']);
+};
diff --git a/lib/pkgcloud/openstack/cdn/index.js b/lib/pkgcloud/openstack/cdn/index.js
new file mode 100644
index 000000000..69b49ac76
--- /dev/null
+++ b/lib/pkgcloud/openstack/cdn/index.js
@@ -0,0 +1,15 @@
+/*
+ * index.js: Top-level include for the OpenStack CDN module
+ *
+ * (C) 2014 Rackspace
+ * Shaunak Kashyap
+ * MIT LICENSE
+ */
+
+exports.Client = require('./client').Client;
+exports.Service = require('./service').Service;
+exports.Flavor = require('./flavor').Flavor;
+
+exports.createClient = function (options) {
+ return new exports.Client(options);
+};
diff --git a/lib/pkgcloud/openstack/cdn/service.js b/lib/pkgcloud/openstack/cdn/service.js
new file mode 100644
index 000000000..5896536dc
--- /dev/null
+++ b/lib/pkgcloud/openstack/cdn/service.js
@@ -0,0 +1,36 @@
+/*
+ * service.js: OpenStack CDN Service
+ *
+ * (C) 2014 Rackspace
+ * Shaunak Kashyap
+ * MIT LICENSE
+ *
+ */
+
+var util = require('util'),
+ base = require('../../core/base'),
+ _ = require('lodash');
+
+var Service = exports.Service = function Service(client, details) {
+ base.Model.call(this, client, details);
+};
+
+util.inherits(Service, base.Model);
+
+Service.prototype._setProperties = function (details) {
+ this.id = details.id || details['id'];
+ this.name = details.name || details['name'];
+ this.domains = details.domains || details['domains'];
+ this.origins = details.origins || details['origins'];
+ this.caching = details.caching || details['caching'];
+ this.restrictions = details.restrictions || details['restrictions'];
+ this.flavorId = details.flavorId || details['flavor_id'];
+ this.status = details.status || details['status'];
+ this.links = details.links;
+ this.errors = details.errors;
+};
+
+Service.prototype.toJSON = function () {
+ return _.pick(this, ['id', 'name', 'domains', 'origins', 'caching',
+ 'restrictions', 'flavorId', 'status', 'links', 'errors']);
+};
diff --git a/lib/pkgcloud/openstack/client.js b/lib/pkgcloud/openstack/client.js
index aa91fea63..2f0259318 100644
--- a/lib/pkgcloud/openstack/client.js
+++ b/lib/pkgcloud/openstack/client.js
@@ -1,13 +1,13 @@
/*
* client.js: Base client from which all OpenStack clients inherit from
*
- * (C) 2013 Nodejitsu Inc.
+ * (C) 2013 Charlie Robbins, Ken Perkins, Ross Kukulinski & the Contributors.
+ * (C) 2015 IBM Corp.
*
*/
-var utile = require('utile'),
- request = require('request'),
- through = require('through'),
+var util = require('util'),
+ through = require('through2'),
base = require('../core/base'),
errs = require('errs'),
context = require('./context');
@@ -35,7 +35,9 @@ var Client = exports.Client = function (options) {
this.authUrl = options.authUrl || 'auth.api.trystack.org';
this.provider = 'openstack';
this.region = options.region;
- this.tenantId = options.tenantId;
+ this.tenantId = options.tenantId;
+ this.version = options.version || 'v2.0';
+ this.keystoneAuthVersion = options.keystoneAuthVersion || 'v2.0';
if (!/^http[s]?\:\/\//.test(this.authUrl)) {
this.authUrl = 'http://' + this.authUrl;
@@ -51,6 +53,10 @@ var Client = exports.Client = function (options) {
});
this.before.push(function (req) {
+ if (req.headers['Content-Type'] && req.headers['Content-Type'] !== 'application/json') {
+ req.json = false;
+ return;
+ }
req.json = true;
if (typeof req.body !== 'undefined') {
req.headers['Content-Type'] = 'application/json';
@@ -66,25 +72,51 @@ var Client = exports.Client = function (options) {
this._serviceUrl = null;
};
-utile.inherits(Client, base.Client);
+util.inherits(Client, base.Client);
Client.prototype._getIdentityOptions = function() {
var options = {
url: this.authUrl,
+ version: this.version,
username: this.config.username,
- password: this.config.password
+ password: this.config.password,
+ keystoneAuthVersion: this.keystoneAuthVersion
};
+ options.strictSSL = typeof this.config.strictSSL === 'boolean'
+ ? this.config.strictSSL : true;
+
+ if (this.config.domainId) {
+ options.domainId = this.config.domainId;
+ } else if (this.config.domainName) {
+ options.domainName = this.config.domainName;
+ }
+
+ if (this.config.projectDomainName) {
+ options.projectDomainName = this.config.projectDomainName;
+ } else if (this.config.projectDomainId) {
+ options.projectDomainId = this.config.projectDomainId;
+ }
+
if (this.config.tenantId) {
options.tenantId = this.config.tenantId;
}
else if (this.config.tenantName) {
options.tenantName = this.config.tenantName;
}
+
if (typeof this.config.useServiceCatalog === 'boolean') {
options.useServiceCatalog = this.config.useServiceCatalog;
}
+ if (this.config.basePath) {
+ options.basePath = this.config.basePath;
+ }
+
+ if (this.config.headers) {
+ options.token = this.config.headers.authorization;
+ }
+
return options;
};
@@ -170,33 +202,64 @@ Client.prototype.auth = function (callback) {
Client.prototype._request = function (options, callback) {
var self = this;
-
if (!self._isAuthorized()) {
self.emit('log::trace', 'Not-Authenticated, inlining Auth...');
- var buf = through().pause();
-
+ var proxyStream = through();
+ proxyStream.pause();
self.auth(function (err) {
-
if (err) {
self.emit('log::error', 'Error with inline authentication', err);
- return errs.handle(err, callback);
+ if (callback) {
+ return errs.handle(err, callback);
+ }
+
+ return errs.handle(err, function (err) {
+ if (err) {
+ proxyStream.emit('error', err);
+ }
+ });
}
self.emit('log::trace', 'Creating Authenticated Proxy Request');
var apiStream = Client.super_.prototype._request.call(self, options, callback);
+ proxyStream.on('abort', function () {
+ apiStream.abort();
+ });
+
+ proxyStream.abort = function () {
+ apiStream.abort();
+ };
+
if (options.upload) {
- buf.pipe(apiStream);
+
+ // needed for event propagation during proxied auth for streams
+ apiStream.on('error', function (err) {
+ proxyStream.emit('error', err);
+ });
+
+ apiStream.on('complete', function (response) {
+ proxyStream.emit('complete', response);
+ });
+
+ proxyStream.pipe(apiStream);
}
else if (options.download) {
- apiStream.pipe(buf);
+ apiStream.on('error', function (err) {
+ proxyStream.emit('error', err);
+ });
+
+ apiStream.on('response', function (response) {
+ proxyStream.emit('response', response);
+ });
+ apiStream.pipe(proxyStream);
}
- buf.resume();
+ proxyStream.resume();
});
- return buf;
+ return proxyStream;
}
else {
self.emit('log::trace', 'Creating Authenticated Request');
diff --git a/lib/pkgcloud/openstack/compute/client/extensions/floating-ips.js b/lib/pkgcloud/openstack/compute/client/extensions/floating-ips.js
index ff44c9bb5..54bb1668e 100644
--- a/lib/pkgcloud/openstack/compute/client/extensions/floating-ips.js
+++ b/lib/pkgcloud/openstack/compute/client/extensions/floating-ips.js
@@ -7,8 +7,7 @@
*
*/
-var Server = require('../../server').Server,
- urlJoin = require('url-join');
+var urlJoin = require('url-join');
var _extension = 'os-floating-ips';
@@ -115,7 +114,7 @@ exports.deallocateFloatingIp = function (floatingIp, callback) {
* @returns {*}
*/
exports.addFloatingIp = function (server, floatingIp, callback) {
- var floatingIpAddress = (typeof floatingIp === 'object') ? floatingIp.ip : floatingIp
+ var floatingIpAddress = (typeof floatingIp === 'object') ? floatingIp.ip : floatingIp;
return this._doServerAction(server, {
addFloatingIp: {
@@ -137,7 +136,7 @@ exports.addFloatingIp = function (server, floatingIp, callback) {
* @returns {*}
*/
exports.removeFloatingIp = function (server, floatingIp, callback) {
- var floatingIpAddress = (typeof floatingIp === 'object') ? floatingIp.ip : floatingIp
+ var floatingIpAddress = (typeof floatingIp === 'object') ? floatingIp.ip : floatingIp;
return this._doServerAction(server, {
removeFloatingIp: {
diff --git a/lib/pkgcloud/openstack/compute/client/extensions/index.js b/lib/pkgcloud/openstack/compute/client/extensions/index.js
index 1fb53a6f6..70464d1b6 100644
--- a/lib/pkgcloud/openstack/compute/client/extensions/index.js
+++ b/lib/pkgcloud/openstack/compute/client/extensions/index.js
@@ -8,7 +8,7 @@
* (updated by Alvaro M. Reol)
*/
-var utile = require('utile');
+var _ = require('lodash');
var extensions = {
getExtensions: function(callback) {
@@ -22,12 +22,12 @@ var extensions = {
}
};
-utile.mixin(extensions, require('./floating-ips'));
-utile.mixin(extensions, require('./keys'));
-utile.mixin(extensions, require('./networks'));
-utile.mixin(extensions, require('./security-groups'));
-utile.mixin(extensions, require('./security-group-rules'));
-utile.mixin(extensions, require('./servers'));
-utile.mixin(extensions, require('./volume-attachments'));
+_.extend(extensions, require('./floating-ips'));
+_.extend(extensions, require('./keys'));
+_.extend(extensions, require('./networks'));
+_.extend(extensions, require('./security-groups'));
+_.extend(extensions, require('./security-group-rules'));
+_.extend(extensions, require('./servers'));
+_.extend(extensions, require('./volume-attachments'));
module.exports = extensions;
diff --git a/lib/pkgcloud/openstack/compute/client/extensions/keys.js b/lib/pkgcloud/openstack/compute/client/extensions/keys.js
index 9bbcf37ce..befaa39fc 100644
--- a/lib/pkgcloud/openstack/compute/client/extensions/keys.js
+++ b/lib/pkgcloud/openstack/compute/client/extensions/keys.js
@@ -1,7 +1,7 @@
/*
* keys.js Implementation of OpenStack KeyPair API
*
- * (C) 2013, Nodejitsu Inc.
+ * (C) 2013 Charlie Robbins, Ken Perkins, Ross Kukulinski & the Contributors.
*
*/
diff --git a/lib/pkgcloud/openstack/compute/client/extensions/networks-base.js b/lib/pkgcloud/openstack/compute/client/extensions/networks-base.js
index 393e21244..4012a65e1 100644
--- a/lib/pkgcloud/openstack/compute/client/extensions/networks-base.js
+++ b/lib/pkgcloud/openstack/compute/client/extensions/networks-base.js
@@ -9,7 +9,7 @@
*/
var urlJoin = require('url-join'),
- _ = require('underscore');
+ _ = require('lodash');
exports.createNetworkExtension = function(prefix) {
return {
@@ -236,7 +236,7 @@ exports.createNetworkExtension = function(prefix) {
return callback(err);
});
}
- }
+ };
};
diff --git a/lib/pkgcloud/openstack/compute/client/extensions/networks.js b/lib/pkgcloud/openstack/compute/client/extensions/networks.js
index 862648437..1d2f3deb8 100644
--- a/lib/pkgcloud/openstack/compute/client/extensions/networks.js
+++ b/lib/pkgcloud/openstack/compute/client/extensions/networks.js
@@ -8,7 +8,6 @@
*
*/
-var urlJoin = require('url-join'),
- networks = require('./networks-base');
+var networks = require('./networks-base');
module.exports = networks.createNetworkExtension('os-networks');
diff --git a/lib/pkgcloud/openstack/compute/client/extensions/security-group-rules.js b/lib/pkgcloud/openstack/compute/client/extensions/security-group-rules.js
index 291946bd8..b879ed6c2 100644
--- a/lib/pkgcloud/openstack/compute/client/extensions/security-group-rules.js
+++ b/lib/pkgcloud/openstack/compute/client/extensions/security-group-rules.js
@@ -5,10 +5,8 @@
*
*/
-var urlJoin = require('url-join'),
- _ = require('underscore'),
- async = require('async');
-
+var async = require('async');
+var urlJoin = require('url-join');
var _extension = 'os-security-group-rules';
/**
@@ -80,3 +78,24 @@ exports.addRules = function(rules, callback) {
callback(null, created);
});
};
+
+/**
+ * client.deleteRule
+ *
+ * @description Remove a rule from a security group
+ *
+ * @param {string} ruleId the id of the rule to be deleted
+ * @param {Function} callback
+ * @returns {request|*}
+ */
+exports.deleteRule = function deleteRule(ruleId, callback) {
+
+ return this._request({
+ method: 'DELETE',
+ path: urlJoin(_extension, ruleId)
+ }, function (err) {
+ return err
+ ? callback(err)
+ : callback(err, { ok: ruleId});
+ });
+};
diff --git a/lib/pkgcloud/openstack/compute/client/extensions/servers.js b/lib/pkgcloud/openstack/compute/client/extensions/servers.js
index cc099330b..b0fc93c01 100644
--- a/lib/pkgcloud/openstack/compute/client/extensions/servers.js
+++ b/lib/pkgcloud/openstack/compute/client/extensions/servers.js
@@ -7,11 +7,6 @@
*
*/
-var Server = require('../../server').Server,
- urlJoin = require('url-join');
-
-var _extension = 'servers';
-
/**
* client.startServer
*
diff --git a/lib/pkgcloud/openstack/compute/client/flavors.js b/lib/pkgcloud/openstack/compute/client/flavors.js
index a876be1fc..7fc133870 100644
--- a/lib/pkgcloud/openstack/compute/client/flavors.js
+++ b/lib/pkgcloud/openstack/compute/client/flavors.js
@@ -1,7 +1,7 @@
/*
* flavors.js: Implementation of OpenStack Flavors Client.
*
- * (C) 2013, Nodejitsu Inc.
+ * (C) 2013 Charlie Robbins, Ken Perkins, Ross Kukulinski & the Contributors.
*
*/
var pkgcloud = require('../../../../../lib/pkgcloud'),
@@ -58,7 +58,7 @@ exports.getFlavor = function getFlavor(flavor, callback) {
if (err) {
return callback(err);
}
- if (!body || !body.flavors) {
+ if (!body || !body.flavor) {
return callback(new Error('Unexpected empty response'));
}
else {
diff --git a/lib/pkgcloud/openstack/compute/client/images.js b/lib/pkgcloud/openstack/compute/client/images.js
index 6ece45f1e..6132c7131 100644
--- a/lib/pkgcloud/openstack/compute/client/images.js
+++ b/lib/pkgcloud/openstack/compute/client/images.js
@@ -1,7 +1,7 @@
/*
* images.js: Implementation of OpenStack Images Client.
*
- * (C) 2013, Nodejitsu Inc.
+ * (C) 2013 Charlie Robbins, Ken Perkins, Ross Kukulinski & the Contributors.
*
*/
var pkgcloud = require('../../../../../lib/pkgcloud'),
@@ -142,4 +142,32 @@ exports.destroyImage = function destroyImage(image, callback) {
? callback(err)
: callback(null, { ok: imageId });
});
-};
\ No newline at end of file
+};
+
+/**
+ * client.updateImageMeta
+ *
+ * @description updates image metadata
+ *
+ * @param {String|object} image the image or imageId to get
+ * @param {object} metadata the metadata object to store
+ * @param callback
+ * @returns {*}
+ */
+exports.updateImageMeta = function updateImageMeta(image, metadata, callback) {
+ var imageId = image instanceof compute.Image ? image.id : image,
+ specs = {
+ metadata : metadata
+ };
+
+ return this._request({
+ path: urlJoin(_urlPrefix, imageId, 'metadata' ),
+ method: 'POST',
+ body: specs
+ },
+ function (err, body) {
+ return err
+ ? callback(err)
+ : callback(null, body);
+ });
+};
diff --git a/lib/pkgcloud/openstack/compute/client/index.js b/lib/pkgcloud/openstack/compute/client/index.js
index a47eda70f..9cc502d77 100644
--- a/lib/pkgcloud/openstack/compute/client/index.js
+++ b/lib/pkgcloud/openstack/compute/client/index.js
@@ -1,25 +1,25 @@
/*
* index.js: Compute client for OpenStack
*
- * (C) 2013 Nodejitsu Inc.
+ * (C) 2013 Charlie Robbins, Ken Perkins, Ross Kukulinski & the Contributors.
*
*/
-var utile = require('utile'),
+var util = require('util'),
openstack = require('../../client'),
ComputeClient = require('../computeClient').ComputeClient,
- _ = require('underscore');
+ _ = require('lodash');
var Client = exports.Client = function (options) {
openstack.Client.call(this, options);
- utile.mixin(this, require('./flavors'));
- utile.mixin(this, require('./images'));
- utile.mixin(this, require('./servers'));
- utile.mixin(this, require('./extensions'));
+ _.extend(this, require('./flavors'));
+ _.extend(this, require('./images'));
+ _.extend(this, require('./servers'));
+ _.extend(this, require('./extensions'));
this.serviceType = 'compute';
};
-utile.inherits(Client, openstack.Client);
+util.inherits(Client, openstack.Client);
_.extend(Client.prototype, ComputeClient.prototype);
diff --git a/lib/pkgcloud/openstack/compute/client/servers.js b/lib/pkgcloud/openstack/compute/client/servers.js
index 3c839d26f..b5199f5e2 100644
--- a/lib/pkgcloud/openstack/compute/client/servers.js
+++ b/lib/pkgcloud/openstack/compute/client/servers.js
@@ -1,21 +1,44 @@
/*
* servers.js: Instance methods for working with servers from OpenStack Cloud
*
- * (C) 2013 Nodejitsu Inc.
+ * (C) 2013 Charlie Robbins, Ken Perkins, Ross Kukulinski & the Contributors.
*
*/
-var request = require('request'),
- base = require('../../../core/compute'),
+var base = require('../../../core/compute'),
pkgcloud = require('../../../../../lib/pkgcloud'),
errs = require('errs'),
urlJoin = require('url-join'),
util = require('util'),
- _ = require('underscore'),
+ _ = require('lodash'),
Server = require('../server').Server,
compute = pkgcloud.providers.openstack.compute;
var _urlPrefix = '/servers';
+/**
+ * validateProperties
+ *
+ * @description local helper function for validating arguments
+ *
+ * @param {Array} required The list of required properties
+ * @param {object} options The options object to validate
+ * @param {String} formatString String formatter for the error message
+ * @param {Function} callback
+ * @returns {boolean}
+ */
+function validateProperties(required, options, formatString, callback) {
+ return !required.some(function (item) {
+ if (typeof(options[item]) === 'undefined') {
+ errs.handle(
+ errs.create({ message: util.format(formatString, item) }),
+ callback
+ );
+ return true;
+ }
+ return false;
+ });
+}
+
/**
* client._doServerAction
*
@@ -101,6 +124,7 @@ exports.getServers = function getServers(options, callback) {
* @param {Object} [details.keyname] optional keyname configuration
* @param {Object} [details.personality] optional personality configuration
* @param {Object} [details.metadata] optional metadata configuration
+ * @param {Object} [details.adminPass] optional password configuration
* @param callback
* @returns {request|*}
*/
@@ -146,10 +170,19 @@ exports.createServer = function createServer(details, callback) {
createOptions.body.server.key_name = details.keyname;
}
+ if (details.adminPass) {
+ createOptions.body.server.adminPass = details.adminPass;
+ }
+
if (details.securityGroups) {
createOptions.body.server.security_groups = details.securityGroups;
}
+ if (details.cloudConfig) {
+ createOptions.body.server.user_data = details.cloudConfig;
+ createOptions.body.server.config_drive = true;
+ }
+
return this._request(createOptions, function (err, body) {
if (err) {
return callback(err);
@@ -247,18 +280,42 @@ exports.rebootServer = function rebootServer(server, options, callback) {
*
* @description Rebuild the provider server
*
- * @param {String|object} server The server or serverId to rebuild
- * @param {String|object} image The image or imageId to use in the rebuild
+ * @param {String|object} server The server or serverId to rebuild
+ * @param {String|object} options The image or imageId to use in the rebuild (for backwards compatibility)
+ * @param {String|object} options.image The image or imageId to use in the rebuild
+ * @param {String} options.accessIPv4 The IP version 4 address of the server.
+ * @param {String} options.accessIPv6 The IP version 6 address of the server.
+ * @param {String} options.adminPass The administrator password for the server.
+ * @param {object} options.metadata Metadata key/value pairs.
+ * @param {array} options.personality Personality files - path and contents
+ * @param {String} options.personality[n].path Personality file path
+ * @param {String} options.personality[n].contents Personality file contents
+ * @param {String} options['OS-DCF:diskConfig'] The disk configuration value ("AUTO" | "MANUAL").
* @param {Function} callback
* @returns {*}
*/
-exports.rebuildServer = function rebootServer(server, image, callback) {
- var imageId = image instanceof base.Image ? image.id : image;
+exports.rebuildServer = function rebootServer(server, options, callback) {
+ var rebuildBody = {};
+ if (options instanceof base.Image) {
+ // Image object was passed in as options (backwards compatible)
+ rebuildBody.imageRef = options.id;
+ } else if (typeof options === 'object') {
+ // Several options were passed in as options
+ rebuildBody = _.pick(options, [
+ 'accessIPv4',
+ 'accessIPv6',
+ 'adminPass',
+ 'metadata',
+ 'personality'
+ ]);
+ rebuildBody.imageRef = options.image instanceof base.Image ? options.image.id : options.image;
+ } else {
+ // Image ID was passed in as options (backwards compatible)
+ rebuildBody.imageRef = options;
+ }
this._doServerAction.call(this, server, {
- rebuild: {
- imageRef: imageId
- }
+ rebuild: rebuildBody
}, callback);
};
@@ -362,27 +419,3 @@ exports.getServerAddresses = function (server, type, callback) {
: callback(null, body.addresses || body);
});
};
-
-/**
- * validateProperties
- *
- * @description local helper function for validating arguments
- *
- * @param {Array} required The list of required properties
- * @param {object} options The options object to validate
- * @param {String} formatString String formatter for the error message
- * @param {Function} callback
- * @returns {boolean}
- */
-function validateProperties(required, options, formatString, callback) {
- return !required.some(function (item) {
- if (typeof(options[item]) === 'undefined') {
- errs.handle(
- errs.create({ message: util.format(formatString, item) }),
- callback
- );
- return true;
- }
- return false;
- });
-}
diff --git a/lib/pkgcloud/openstack/compute/flavor.js b/lib/pkgcloud/openstack/compute/flavor.js
index d6679d0bc..c7f9d9f12 100644
--- a/lib/pkgcloud/openstack/compute/flavor.js
+++ b/lib/pkgcloud/openstack/compute/flavor.js
@@ -1,18 +1,19 @@
/*
* flavor.js: OpenStack Cloud flavor
*
- * (C) 2013 Nodejitsu Inc.
+ * (C) 2013 Charlie Robbins, Ken Perkins, Ross Kukulinski & the Contributors.
*
*/
-var utile = require('utile'),
- base = require('../../core/compute/flavor');
+var util = require('util'),
+ base = require('../../core/compute/flavor'),
+ _ = require('lodash');
var Flavor = exports.Flavor = function Flavor(client, details) {
base.Flavor.call(this, client, details);
};
-utile.inherits(Flavor, base.Flavor);
+util.inherits(Flavor, base.Flavor);
Flavor.prototype._setProperties = function (details) {
this.id = details.id;
@@ -22,3 +23,7 @@ Flavor.prototype._setProperties = function (details) {
this.vcpus = details.vcpus;
this.swap = details.swap;
};
+
+Flavor.prototype.toJSON = function () {
+ return _.pick(this, ['id', 'name', 'ram', 'disk', 'vcpus', 'swap' ]);
+};
\ No newline at end of file
diff --git a/lib/pkgcloud/openstack/compute/image.js b/lib/pkgcloud/openstack/compute/image.js
index fd093ffdc..1c0ca0872 100644
--- a/lib/pkgcloud/openstack/compute/image.js
+++ b/lib/pkgcloud/openstack/compute/image.js
@@ -1,18 +1,19 @@
/*
* image.js: OpenStack Cloud image
*
- * (C) 2013 Nodejitsu Inc.
+ * (C) 2013 Charlie Robbins, Ken Perkins, Ross Kukulinski & the Contributors.
*
*/
-var utile = require('utile'),
- base = require('../../core/compute/image');
+var util = require('util'),
+ base = require('../../core/compute/image'),
+ _ = require('lodash');
var Image = exports.Image = function Image(client, details) {
base.Image.call(this, client, details);
};
-utile.inherits(Image, base.Image);
+util.inherits(Image, base.Image);
Image.prototype._setProperties = function (details) {
this.id = details.id;
@@ -25,4 +26,8 @@ Image.prototype._setProperties = function (details) {
this.updated = details.updated;
this.status = details.status;
this.progress = details.progress;
+};
+
+Image.prototype.toJSON = function () {
+ return _.pick(this, ['id', 'name', 'status', 'progress', 'created', 'updated']);
};
\ No newline at end of file
diff --git a/lib/pkgcloud/openstack/compute/index.js b/lib/pkgcloud/openstack/compute/index.js
index de5f78fb9..05e66dbb5 100644
--- a/lib/pkgcloud/openstack/compute/index.js
+++ b/lib/pkgcloud/openstack/compute/index.js
@@ -1,7 +1,7 @@
/*
* index.js: Top-level include for the OpenStack compute module
*
- * (C) 2013 Nodejitsu Inc.
+ * (C) 2013 Charlie Robbins, Ken Perkins, Ross Kukulinski & the Contributors.
*
*/
diff --git a/lib/pkgcloud/openstack/compute/server.js b/lib/pkgcloud/openstack/compute/server.js
index 79b22fe5d..9c240186b 100644
--- a/lib/pkgcloud/openstack/compute/server.js
+++ b/lib/pkgcloud/openstack/compute/server.js
@@ -1,20 +1,20 @@
/*
* server.js: OpenStack Cloud server
*
- * (C) 2013 Nodejitsu Inc.
+ * (C) 2013 Charlie Robbins, Ken Perkins, Ross Kukulinski & the Contributors.
*
*/
-var utile = require('utile'),
+var util = require('util'),
compute = require('../../core/compute'),
base = require('../../core/compute/server'),
- _ = require('underscore');
+ _ = require('lodash');
var Server = exports.Server = function Server(client, details) {
base.Server.call(this, client, details);
};
-utile.inherits(Server, base.Server);
+util.inherits(Server, base.Server);
Server.prototype._setProperties = function (details) {
var self = this;
@@ -94,13 +94,13 @@ Server.prototype._setProperties = function (details) {
}
// Try to set the flavorId using a flavor object
- if (typeof this.flavorId === "undefined" &&
+ if (typeof this.flavorId === 'undefined' &&
details.flavor && details.flavor.id) {
this.flavorId = details.flavor.id;
}
// Try to set the imageId using an image object
- if (typeof this.imageId === "undefined" &&
+ if (typeof this.imageId === 'undefined' &&
details.image && details.image.id) {
this.imageId = details.image.id;
}
@@ -135,9 +135,9 @@ Server.prototype.getAddresses = function (type, callback) {
};
Server.prototype.toJSON = function() {
- return _.pick(this, ['id', 'name', 'status', 'hostId', 'addresses',
- 'links', 'key_name', 'image', 'flavor', 'user_id', 'tenant_id', 'progress',
+ return _.pick(this, ['id', 'name', 'status', 'hostId', 'adminPass', 'addresses',
+ 'links', 'key_name', 'imageId', 'flavorId', 'user_id', 'tenant_id', 'progress',
'OS-EXT-STS:task_state', 'OS-EXT-STS:vm_state', 'OS-EXT-STS:power_state',
'OS-DCF:diskConfig', 'accessIPv4', 'accessIPv6', 'config_drive', 'metadata',
'created', 'updated']);
-};
\ No newline at end of file
+};
diff --git a/lib/pkgcloud/openstack/context/identity.js b/lib/pkgcloud/openstack/context/identity.js
index c30728da4..489d41266 100644
--- a/lib/pkgcloud/openstack/context/identity.js
+++ b/lib/pkgcloud/openstack/context/identity.js
@@ -2,22 +2,18 @@
* identity.js: Identity for openstack authentication
*
* (C) 2013 Rackspace, Ken Perkins
+ * (C) 2015 IBM Corp.
* MIT LICENSE
*
*/
-var _ = require('underscore'),
+var _ = require('lodash'),
events = require('eventemitter2'),
- fs = require('fs'),
request = require('request'),
ServiceCatalog = require('./serviceCatalog').ServiceCatalog,
- svcCat = require('./serviceCatalog'),
- url = require('url'),
- utile = require('utile'),
urlJoin = require('url-join'),
util = require('util'),
- pkgcloud = require('../../../pkgcloud'),
- errs = require('errs');
+ pkgcloud = require('../../../pkgcloud');
// TODO refactor failCodes, getError into global handlers
var failCodes = {
@@ -33,6 +29,38 @@ var failCodes = {
503: 'Service Unavailable'
};
+function getError(err, res, body) {
+ if (err) {
+ return err;
+ }
+
+ var statusCode = res.statusCode.toString(),
+ err2;
+
+ if (Object.keys(failCodes).indexOf(statusCode) !== -1) {
+ //
+ // TODO: Support more than JSON errors here
+ //
+ err2 = {
+ failCode: failCodes[statusCode],
+ statusCode: res.statusCode,
+ message: 'Error (' +
+ statusCode + '): ' + failCodes[statusCode],
+ href: res.request.uri.href,
+ method: res.request.method,
+ headers: res.headers
+ };
+
+ try {
+ err2.result = typeof body === 'string' ? JSON.parse(body) : body;
+ } catch (e) {
+ err2.result = { err: body };
+ }
+
+ return err2;
+ }
+}
+
/**
* Identity object
*
@@ -48,6 +76,7 @@ var Identity = exports.Identity = function (options) {
self.options = options || {};
self.name = 'OpenstackIdentity';
+ self.basePath = options.basePath || (options.keystoneAuthVersion === 'v3' ? '/v3/auth/tokens' : '/v2.0/tokens');
self.useServiceCatalog = (typeof options.useServiceCatalog === 'boolean')
? options.useServiceCatalog
: true;
@@ -59,7 +88,7 @@ var Identity = exports.Identity = function (options) {
});
};
-utile.inherits(Identity, events.EventEmitter2);
+util.inherits(Identity, events.EventEmitter2);
/**
* Identity.authorize
@@ -76,17 +105,30 @@ Identity.prototype.authorize = function (options, callback) {
callback = options;
options = {};
}
-
var authenticationOptions = {
- uri: urlJoin(options.url || self.options.url, '/v2.0/tokens'),
+ uri: urlJoin(options.url || self.options.url, self.basePath),
method: 'POST',
+ strictSSL: options.strictSSL || self.options.strictSSL,
headers: {
'User-Agent': util.format('nodejs-pkgcloud/%s', pkgcloud.version),
'Content-Type': 'application/json',
'Accept': 'application/json'
}
};
+ if (self.options.headers) {
+ for (var header in self.options.headers) {
+ if (self.options.headers.hasOwnProperty(header)) {
+ authenticationOptions.headers[header] = self.options.headers[header];
+ }
+ }
+ }
+ if (self.options.version === 1 || self.options.version === '/v1.0') {
+ authenticationOptions.uri = urlJoin(options.url || self.options.url, '/auth/v1.0');
+ authenticationOptions.method = 'GET';
+ authenticationOptions.headers['X-Auth-User'] = self.options.username;
+ authenticationOptions.headers['X-Auth-Key'] = self.options.password;
+ }
self._buildAuthenticationPayload();
// we can't be called without a payload
@@ -108,44 +150,11 @@ Identity.prototype.authorize = function (options, callback) {
self.emit('log::trace', 'Sending client authorization request', authenticationOptions);
- // Don't keep a copy of the credentials in memory
- delete self._authenticationPayload;
-
- request(authenticationOptions, function (err, response, body) {
- // check for a network error, or a handled error
- var err2 = getError(err, response, body);
-
- if (err2) {
- return callback(err2);
- }
-
- self.emit('log::trace', 'Provider Authentication Response', {
- href: response.request.uri.href,
- method: response.request.method,
- headers: response.headers,
- statusCode: response.statusCode
- });
-
- // If we don't have a tenantId in the response (meaning no service catalog)
- // go ahead and make a 1-off request to get a tenant and then reauthorize
- if (!body.access.token.tenant) {
- getTenantId(urlJoin(options.url || self.options.url, '/v2.0/tenants'), body.access.token.id);
- }
- else {
- try {
- self._parseIdentityResponse(body);
- callback();
- }
- catch (e) {
- callback(e);
- }
- }
- });
-
function getTenantId(endpoint, token) {
var tenantOptions = {
uri: endpoint,
json: true,
+ strictSSL: options.strictSSL || self.options.strictSSL,
headers: {
'X-Auth-Token': token,
'Content-Type': 'application/json',
@@ -174,6 +183,48 @@ Identity.prototype.authorize = function (options, callback) {
self.authorize(options, callback);
});
}
+
+ // Don't keep a copy of the credentials in memory
+ delete self._authenticationPayload;
+ request(authenticationOptions, function (err, response, body) {
+ // check for a network error, or a handled error
+ var err2 = getError(err, response, body);
+
+ if (err2) {
+ return callback(err2);
+ }
+
+ self.emit('log::trace', 'Provider Authentication Response', {
+ href: response.request.uri.href,
+ method: response.request.method,
+ headers: response.headers,
+ statusCode: response.statusCode
+ });
+
+ // If we've been asked to do v1 auth, check the response headers
+ // otherwise, check the body
+ try {
+ if (self.options.version === 1 || self.options.version === '/v1.0') {
+ self._storageUrl = response.headers['x-storage-url'];
+ self.token = {
+ id: response.headers['x-auth-token']
+ };
+ callback();
+ }
+ // If we don't have a tenantId in the response (meaning no service catalog)
+ // go ahead and make a 1-off request to get a tenant and then reauthorize
+ else if (self.options.keystoneAuthVersion !== 'v3' && !body.access.token.tenant) {
+ getTenantId(urlJoin(options.url || self.options.url, '/v2.0/tenants'), body.access.token.id);
+ }
+ else {
+ self._parseIdentityResponse(body, response.headers);
+ callback();
+ }
+ }
+ catch (e) {
+ callback(e);
+ }
+ });
};
/**
@@ -188,27 +239,101 @@ Identity.prototype._buildAuthenticationPayload = function () {
var self = this;
self.emit('log::trace', 'Building Openstack Identity Auth Payload');
-
- // setup our inputs for authorization
- if (self.options.password && self.options.username) {
- self._authenticationPayload = {
- auth: {
- passwordCredentials: {
- username: self.options.username,
- password: self.options.password
+ if (self.options.keystoneAuthVersion === 'v3') {
+ if (self.options.password) {
+ self._authenticationPayload = {
+ auth: {
+ identity : {
+ methods : ['password'],
+ password : {
+ user: {
+ password: self.options.password
+ }
+ }
+ }
}
+ };
+
+ //first add user name or id to user field
+ if (self.options.username) {
+ self._authenticationPayload.auth.identity.password.user.name = self.options.username;
+ } else if (self.options.userid) {
+ self._authenticationPayload.auth.identity.password.user.id = self.options.userid;
}
- };
- }
- // Token and tenant are also valid inputs
- else if (self.options.token && (self.options.tenantId || self.options.tenantName)) {
- self._authenticationPayload = {
- auth: {
- token: {
- id: self.options.token
+ //check if authenticating against user domain
+ if (self.options.domainId) {
+ self._authenticationPayload.auth.identity.password.user.domain = {id:self.options.domainId};
+ } else if (self.options.domainName) {
+ self._authenticationPayload.auth.identity.password.user.domain = {name:self.options.domainName};
+ }
+ //check if we're getting a scoped token against a project and/or domain
+ if (self.options.tenantId || self.options.tenantName || self.options.projectDomainName || self.options.projectDomainId) {
+ self._authenticationPayload.auth.scope = {};
+ var scopedProject = true;
+ if (self.options.tenantId) {
+ self._authenticationPayload.auth.scope.project = {id:self.options.tenantId};
+ } else if (self.options.tenantName) {
+ self._authenticationPayload.auth.scope.project = {name:self.options.tenantName};
+ } else {
+ scopedProject = false;
+ }
+ if (!scopedProject) {
+ if (self.options.projectDomainId) {
+ self._authenticationPayload.auth.scope.domain = {id:self.options.projectDomainId};
+ } else if (self.options.projectDomainName) {
+ self._authenticationPayload.auth.scope.domain = {name:self.options.projectDomainName};
+ }
+ } else {
+ if (self.options.projectDomainId) {
+ self._authenticationPayload.auth.scope.project.domain = {id:self.options.projectDomainId};
+ } else if(self.options.projectDomainName) {
+ self._authenticationPayload.auth.scope.project.domain = {name:self.options.projectDomainName};
+ }
}
}
- };
+ }
+ // Token and tenant are also valid inputs
+ else if (self.options.token && (self.options.tenantId || self.options.tenantName)) {
+ self._authenticationPayload = {
+ auth: {
+ identity : {
+ methods : ['token'],
+ token: {
+ id: self.options.token
+ }
+ }
+ }
+ };
+ }
+ } else {
+ // setup our inputs for authorization
+ if (self.options.password && self.options.username) {
+ self._authenticationPayload = {
+ auth: {
+ passwordCredentials: {
+ username: self.options.username,
+ password: self.options.password
+ }
+ }
+ };
+ }
+ // Token and tenant are also valid inputs
+ else if (self.options.token && (self.options.tenantId || self.options.tenantName)) {
+ self._authenticationPayload = {
+ auth: {
+ token: {
+ id: self.options.token
+ }
+ }
+ };
+ }
+ // Are we filtering down by a tenant?
+ if (self._authenticationPayload && self.options.tenantId) {
+ self._authenticationPayload.auth.tenantId = self.options.tenantId;
+ }
+ else if (self._authenticationPayload && self.options.tenantName) {
+ self._authenticationPayload.auth.tenantName = self.options.tenantName;
+ }
}
};
@@ -221,67 +346,51 @@ Identity.prototype._buildAuthenticationPayload = function () {
* @param {object} data the raw response from the identity call
* @private
*/
-Identity.prototype._parseIdentityResponse = function (data) {
+Identity.prototype._parseIdentityResponse = function (data, headers) {
var self = this;
if (!data) {
throw new Error('missing required arguments!');
}
-
- if (data.access.token) {
- self.token = data.access.token;
- self.token.expires = new Date(self.token.expires);
- }
+ if (self.options.keystoneAuthVersion === 'v3') {
+ self.token = {
+ id: headers['x-subject-token'],
+ expires: new Date(data.token.expires_at),
+ issued_at: new Date(data.token.issued_at),
+ tenant: {id: data.token.project.id, name: data.token.project.name}
+ };
+ self.user = data.token.user;
+ if (self.useServiceCatalog) {
+ self.serviceCatalog = new ServiceCatalog(data.token.catalog);
+ }
+ } else {
+ if (data.access.token) {
+ self.token = data.access.token;
+ self.token.expires = new Date(self.token.expires);
+ }
- if (self.useServiceCatalog && data.access.serviceCatalog) {
- self.serviceCatalog = new ServiceCatalog(data.access.serviceCatalog);
- }
+ if (self.useServiceCatalog && data.access.serviceCatalog) {
+ self.serviceCatalog = new ServiceCatalog(data.access.serviceCatalog);
+ }
- self.user = data.access.user;
+ self.user = data.access.user;
+ }
self.raw = data;
-
};
Identity.prototype.getServiceEndpointUrl = function (options) {
if (this.useServiceCatalog) {
return this.serviceCatalog.getServiceEndpointUrl(options);
}
+ // This is a hack to enable support for v1 swift clients
+ // TODO move all auth for v1 swift out of identity, as it's not related to identity at all
+ else if (this.options.version === 1 || this.options.version === '/v1.0') {
+ return this._storageUrl;
+ }
else {
return this.options.url;
}
};
-function getError(err, res, body) {
- if (err) {
- return err;
- }
-
- var statusCode = res.statusCode.toString(),
- err2;
-
- if (Object.keys(failCodes).indexOf(statusCode) !== -1) {
- //
- // TODO: Support more than JSON errors here
- //
- err2 = {
- failCode: failCodes[statusCode],
- statusCode: res.statusCode,
- message: 'Error (' +
- statusCode + '): ' + failCodes[statusCode],
- href: res.request.uri.href,
- method: res.request.method,
- headers: res.headers
- };
-
- try {
- err2.result = typeof body === 'string' ? JSON.parse(body) : body;
- } catch (e) {
- err2.result = { err: body };
- }
-
- return err2;
- }
- return;
-}
diff --git a/lib/pkgcloud/openstack/context/index.js b/lib/pkgcloud/openstack/context/index.js
index a4b7aefac..aa36ee91d 100644
--- a/lib/pkgcloud/openstack/context/index.js
+++ b/lib/pkgcloud/openstack/context/index.js
@@ -1,7 +1,7 @@
/*
* index.js: Top-level include for the OpenStack identity module
*
- * (C) 2013 Nodejitsu Inc.
+ * (C) 2013 Charlie Robbins, Ken Perkins, Ross Kukulinski & the Contributors.
*
*/
diff --git a/lib/pkgcloud/openstack/context/service.js b/lib/pkgcloud/openstack/context/service.js
index 6cf6e1b3d..0c32f2afd 100644
--- a/lib/pkgcloud/openstack/context/service.js
+++ b/lib/pkgcloud/openstack/context/service.js
@@ -2,11 +2,23 @@
* service.js: Service model
*
* (C) 2013 Rackspace, Ken Perkins
+ * (C) 2015 IBM Corp.
* MIT LICENSE
*
*/
-var _ = require('underscore');
+var _ = require('lodash');
+
+function matchRegion(a, b) {
+ if (!a && !b) {
+ return true;
+ }
+ else if ((!a && b) || (a && !b)) {
+ return false;
+ }
+
+ return a.toLowerCase() === b.toLowerCase();
+}
/**
* Service class
@@ -56,16 +68,60 @@ Service.prototype.getEndpointUrl = function (options) {
if (options.serviceType.toLowerCase() !== this.type.toLowerCase()) {
return '';
}
+ //since we don't know if this is a v2 or v3 catalog, check if the "interface" field is set on an endpoint, if so, we're v3
+ if (self.endpoints && self.endpoints.length > 0 && self.endpoints[0]['interface'] !== undefined) {
+ self.v3 = true;
+ }
- options = options || {};
+ /**
+ * getUrl
+ *
+ * @description utility function for getEndpointUrl
+ * @param {object} endpoint the endpoint to use
+ * @param {string} [endpoint.internalURL] the internal URL of the endpoint
+ * @param {string} [endpoint.publicURL] the public URL of the endpoint
+ *
+ * @returns {String} the uri of the endpoint
+ */
+ function getUrl(endpoint) {
+ var useInternal = typeof options.useInternal === 'boolean' ?
+ options.useInternal : false;
+
+ return useInternal && endpoint.internalURL
+ ? endpoint.internalURL
+ : ((typeof options.useAdmin === 'boolean' && options.useAdmin && endpoint.adminURL) ?
+ endpoint.adminURL : endpoint.publicURL);
+ }
+
+ /**
+ * endpointMatchDesiredInterface
+ *
+ * @description determine if the endpoint interface matches the desired interface
+ * @param {object} endpoint
+ * @returns {Boolean}
+ */
+ function endpointMatchDesiredInterface(endpoint) {
+ var interfaceToUse = 'public';
+ if (options.useInternal === true) {
+ interfaceToUse = 'internal';
+ } else if (options.useAdmin === true) {
+ interfaceToUse = 'admin';
+ }
+ return endpoint['interface'] === interfaceToUse;
+ }
if (options.region) {
_.each(self.endpoints, function (endpoint) {
if (!endpoint.region || !matchRegion(endpoint.region, options.region)) {
return;
}
-
- url = getUrl(endpoint);
+ if (self.v3 === true) {
+ if (endpointMatchDesiredInterface(endpoint)) {
+ url = endpoint.url;
+ }
+ } else {
+ url = getUrl(endpoint);
+ }
});
}
else {
@@ -82,26 +138,6 @@ Service.prototype.getEndpointUrl = function (options) {
});
}
- /**
- * getUrl
- *
- * @description utility function for getEndpointUrl
- * @param {object} endpoint the endpoint to use
- * @param {string} [endpoint.internalURL] the internal URL of the endpoint
- * @param {string} [endpoint.publicURL] the public URL of the endpoint
- *
- * @returns {String} the uri of the endpoint
- */
- function getUrl(endpoint) {
- var useInternal = typeof options.useInternal === 'boolean' ?
- options.useInternal : false;
-
- return useInternal && endpoint.internalURL
- ? endpoint.internalURL
- : ((typeof options.useAdmin === 'boolean' && options.useAdmin && endpoint.adminURL) ?
- endpoint.adminURL : endpoint.publicURL);
- }
-
if (!url) {
throw new Error('Unable to identify endpoint url');
}
@@ -109,15 +145,4 @@ Service.prototype.getEndpointUrl = function (options) {
return url;
};
-exports.Service = Service;
-
-function matchRegion(a, b) {
- if (!a && !b) {
- return true;
- }
- else if ((!a && b) || (a && !b)) {
- return false;
- }
-
- return a.toLowerCase() === b.toLowerCase();
-}
+exports.Service = Service;
\ No newline at end of file
diff --git a/lib/pkgcloud/openstack/context/serviceCatalog.js b/lib/pkgcloud/openstack/context/serviceCatalog.js
index 91b3f41cc..f435ebdad 100644
--- a/lib/pkgcloud/openstack/context/serviceCatalog.js
+++ b/lib/pkgcloud/openstack/context/serviceCatalog.js
@@ -6,10 +6,8 @@
*
*/
-var service = require('./service'),
- Service = require('./service').Service,
- async = require('async'),
- _ = require('underscore');
+var Service = require('./service').Service,
+ _ = require('lodash');
/**
* ServiceCatalog class
diff --git a/lib/pkgcloud/rackspace/database/client/databases.js b/lib/pkgcloud/openstack/database/client/databases.js
similarity index 97%
rename from lib/pkgcloud/rackspace/database/client/databases.js
rename to lib/pkgcloud/openstack/database/client/databases.js
index 0fd0027a0..f70ed0822 100644
--- a/lib/pkgcloud/rackspace/database/client/databases.js
+++ b/lib/pkgcloud/openstack/database/client/databases.js
@@ -1,7 +1,7 @@
/*
* database.js: Database methods for working with database within instances from Rackspace Cloud
*
- * (C) 2012 Nodejitsu Inc.
+ * (C) 2014 Hewlett-Packard Development Company, L.P.
*
*/
@@ -20,8 +20,6 @@ var pkgcloud = require('../../../../../lib/pkgcloud'),
// #### options['collate'] {string} Should be a valid Collate for mysql. Default to 'utf8_general_ci'
// For more info about character_set and collate for mysql see http://dev.mysql.com/doc/refman/5.6/en/charset-mysql.html
exports.createDatabase = exports.create = function createDatabase(options, callback) {
- var self = this;
-
// Check for options
if (!options || typeof options === 'function') {
return errs.handle(errs.create({
@@ -108,7 +106,7 @@ exports.getDatabases = function getDatabases(options, callback) {
requestOptions.qs = completeUrl;
requestOptions.path = 'instances/' + instanceId + '/databases';
- this._request(requestOptions, function (err, body, response) {
+ this._request(requestOptions, function (err, body) {
if (err) {
return callback(err);
}
diff --git a/lib/pkgcloud/rackspace/database/client/flavors.js b/lib/pkgcloud/openstack/database/client/flavors.js
similarity index 91%
rename from lib/pkgcloud/rackspace/database/client/flavors.js
rename to lib/pkgcloud/openstack/database/client/flavors.js
index 0e03f91a0..45c4164e7 100644
--- a/lib/pkgcloud/rackspace/database/client/flavors.js
+++ b/lib/pkgcloud/openstack/database/client/flavors.js
@@ -1,7 +1,7 @@
/*
- * flavors.js: Implementation of Rackspace Flavors Client.
+ * flavors.js: Implementation of Openstack Trove Flavors Client.
*
- * (C) 2011 Nodejitsu Inc.
+ * (C) 2014 Hewlett-Packard Development Company, L.P.
*
*/
diff --git a/lib/pkgcloud/openstack/database/client/index.js b/lib/pkgcloud/openstack/database/client/index.js
new file mode 100644
index 000000000..2646173e2
--- /dev/null
+++ b/lib/pkgcloud/openstack/database/client/index.js
@@ -0,0 +1,61 @@
+/*
+ * client.js: Database client for Openstack Trove Databases
+ *
+ * (C) 2014 Hewlett-Packard Development Company, L.P.
+ *
+ */
+
+var util = require('util'),
+ urlJoin = require('url-join'),
+ rackspace = require('../../client'),
+ auth = require('../../../common/auth.js'),
+ _ = require('lodash');
+
+var Client = exports.Client = function (options) {
+ rackspace.Client.call(this, options);
+
+ this.before.push(auth.accountId);
+
+ _.extend(this, require('./flavors'));
+ _.extend(this, require('./instances'));
+ _.extend(this, require('./databases'));
+ _.extend(this, require('./users'));
+
+ this.serviceType = 'database';
+};
+
+util.inherits(Client, rackspace.Client);
+
+Client.prototype._getUrl = function (options) {
+ options = options || {};
+
+ return urlJoin(this._serviceUrl,
+ typeof options === 'string'
+ ? options
+ : options.path);
+
+};
+
+//
+// Gets the version of the OpenStack Compute API we are running against
+// Parameters: callback
+//
+Client.prototype.getVersion = function getVersion(callback) {
+ var self = this;
+
+ this.auth(function (err) {
+ if (err) {
+ return callback(err);
+ }
+
+ self._request({
+ uri: self._getUrl('/').replace('/v1.0/' + self._identity.token.tenant.id + '/', '')
+ }, function (err, body) {
+ if (err) {
+ return callback(err);
+ }
+ return callback(null,
+ ((typeof body === 'object') ? body.versions : JSON.parse(body).versions));
+ });
+ });
+};
diff --git a/lib/pkgcloud/rackspace/database/client/instances.js b/lib/pkgcloud/openstack/database/client/instances.js
similarity index 80%
rename from lib/pkgcloud/rackspace/database/client/instances.js
rename to lib/pkgcloud/openstack/database/client/instances.js
index d132118d5..928659791 100644
--- a/lib/pkgcloud/rackspace/database/client/instances.js
+++ b/lib/pkgcloud/openstack/database/client/instances.js
@@ -1,7 +1,7 @@
/*
- * instances.js: Instance methods for working with database instances from Rackspace Cloud
+ * instances.js: Instance methods for working with database instances from Openstack Trove
*
- * (C) 2011 Nodejitsu Inc.
+ * (C) 2014 Hewlett-Packard Development Company, L.P.
*
*/
@@ -45,14 +45,14 @@ exports.createInstance = function createInstance(options, callback) {
// If the 'databases' are specified we create a template for each database name.
if (options && options['databases'] &&
- typeof options['databases'] === 'array' &&
+ Array.isArray(options['databases']) &&
options['databases'].length > 0) {
options['databases'].forEach(function (item, idx) {
if (typeof item === 'string') {
// This template is according to the defaults of rackspace.
options['databases'][idx] = {
name: item,
- character_set: "utf8",
+ character_set: 'utf8',
collate: 'utf8_general_ci'
};
}
@@ -89,7 +89,7 @@ exports.createInstance = function createInstance(options, callback) {
}
};
- this._request(createOptions, function (err, body, response) {
+ this._request(createOptions, function (err, body) {
return err
? callback(err)
: callback(null, new Instance(self, body.instance));
@@ -124,7 +124,7 @@ exports.getInstances = function getInstances(options, callback) {
requestOptions.qs = completeUrl;
requestOptions.path = 'instances';
- this._request(requestOptions, function (err, body, res) {
+ this._request(requestOptions, function (err, body) {
if (err) {
return callback(err);
}
@@ -177,7 +177,7 @@ exports.getInstance = function getInstance(instance, callback) {
var instanceId = instance instanceof Instance ? instance.id : instance;
this._request({
path: 'instances/' + instanceId
- }, function (err, body, response) {
+ }, function (err, body) {
return err
? callback(err)
: callback(null, new Instance(self, body.instance));
@@ -319,4 +319,71 @@ exports.setVolumeSize = function setVolumeSize(instance, newSize, callback) {
message: 'Bad response from resize action.'
}), callback);
});
-};
\ No newline at end of file
+};
+
+// Enable the root user for the given database instance.
+// ### @instance {string | Object} The ID of the instance or a instance or Instance class (required)
+// ### @callback {Function} Function to continue, the call is cb(error, res)
+exports.enableRootUser = function enableRootUser(instance, callback) {
+ // Check for instance
+ if (typeof instance === 'function' || typeof instance === 'undefined') {
+ return errs.handle(errs.create({
+ message: 'An instance is required.'
+ }), Array.prototype.slice.call(arguments).pop());
+ }
+
+ var instanceId = instance instanceof Instance ? instance.id : instance;
+
+ var options = {
+ method: 'POST',
+ path: 'instances/' + instanceId + '/root'
+ };
+
+ this._request(options, function (err, body, response) {
+ if (err) {
+ return callback(err);
+ }
+
+ if (response.statusCode === 200) {
+ return callback(null, body);
+ }
+
+ return errs.handle(errs.create({
+ message: 'Bad response from enabling root user'
+ }), callback);
+ });
+};
+
+// List the root status for the database instance.
+// `res` will be an object like `{ rootEnabled: true }`
+// ### @instance {string | Object} The ID of the instance or a instance or Instance class (required)
+// ### @callback {Function} Function to continue, the call is cb(error, res)
+exports.listRootStatus = function listRootStatus(instance, callback) {
+ // Check for instance
+ if (typeof instance === 'function' || typeof instance === 'undefined') {
+ return errs.handle(errs.create({
+ message: 'An instance is required.'
+ }), Array.prototype.slice.call(arguments).pop());
+ }
+
+ var instanceId = instance instanceof Instance ? instance.id : instance;
+
+ var options = {
+ method: 'GET',
+ path: 'instances/' + instanceId + '/root'
+ };
+
+ this._request(options, function (err, body, response) {
+ if (err) {
+ return callback(err);
+ }
+
+ if (response.statusCode === 200) {
+ return callback(null, body);
+ }
+
+ return errs.handle(errs.create({
+ message: 'Bad response from listing root-enabled status'
+ }), callback);
+ });
+};
diff --git a/lib/pkgcloud/rackspace/database/client/users.js b/lib/pkgcloud/openstack/database/client/users.js
similarity index 91%
rename from lib/pkgcloud/rackspace/database/client/users.js
rename to lib/pkgcloud/openstack/database/client/users.js
index c292f58e8..536d338cd 100644
--- a/lib/pkgcloud/rackspace/database/client/users.js
+++ b/lib/pkgcloud/openstack/database/client/users.js
@@ -1,7 +1,7 @@
/*
- * users.js: Client methods for working with users on database within instances from Rackspace Cloud
+ * users.js: Client methods for working with users on database within instances from Openstack Trove.
*
- * (C) 2012 Nodejitsu Inc.
+ * (C) 2014 Hewlett-Packard Development Company, L.P.
*
*/
@@ -10,7 +10,6 @@ var pkgcloud = require('../../../../../lib/pkgcloud'),
Instance = pkgcloud.providers.rackspace.database.Instance,
User = pkgcloud.providers.rackspace.database.User,
errs = require('errs'),
- async = require('async'),
qs = require('querystring');
// Create a User(s) for a Database.
@@ -28,21 +27,20 @@ exports.createUser = function createUser(options, callback) {
instanceId,
count = 0;
- // Check for options
- if (!options || typeof options === 'function') {
- return errs.handle(errs.create({
- message: 'Options required for create an instance.'
- }), options);
- }
+ function makeRequest() {
+ var createOptions = {
+ method: 'POST',
+ path: 'instances/' + instanceId + '/users',
+ body: {
+ users: users
+ }
+ };
- // Not as clean as I'd like but async didn't seem to work properly.
- if (options instanceof Array) {
- for (var i = 0; i < options.length; i++) {
- assessOptions(options[i]);
- }
- }
- else {
- assessOptions(options);
+ self._request(createOptions, function (err, body, response) {
+ return err
+ ? callback(err)
+ : callback(null, response);
+ });
}
function assessOptions(opts) {
@@ -51,7 +49,8 @@ exports.createUser = function createUser(options, callback) {
// Check for required options.
['username', 'password', 'database', 'instance'].forEach(function (required) {
- if (!opts[required]) {
+ // API allows for individual or multiple databases
+ if (!opts[required] && ( required === 'database' && !opts['databases'])) {
if (calledBack) { return; }
errs.handle(errs.create({
message: 'Options. ' + required + ' is a required argument'
@@ -86,21 +85,29 @@ exports.createUser = function createUser(options, callback) {
if (opts && opts['databases'] &&
opts['databases'] instanceof Array &&
opts['databases'].length > 0) {
- opts['databases'].forEach(function (item, idx) {
+ opts['databases'].forEach(function (item) {
if (typeof item === 'string') {
- databases.push(item);
+ databases.push({'name' : item});
} else if (item instanceof Database) {
- databases.push(item.name);
+ databases.push({'name' : item.name});
}
});
}
+ if (opts && opts['database'] && typeof opts['database'] === 'string') {
+ databases.push({ 'name' : opts['database']});
+ }
+
+ if (opts && opts['database'] && opts['database'] instanceof Database) {
+ databases.push({ 'name' : opts['database'].name});
+ }
+
if (opts && opts['databases'] && typeof opts['databases'] === 'string') {
- databases.push(opts['databases']);
+ databases.push({ 'name' : opts['databases']});
}
if (opts && opts['databases'] && opts['databases'] instanceof Database) {
- databases.push(opts['databases'].name);
+ databases.push({ 'name' : opts['databases'].name});
}
// Check for invalid characters and permitted length of database
databases.forEach(function (db) {
@@ -135,20 +142,21 @@ exports.createUser = function createUser(options, callback) {
}
}
- function makeRequest() {
- var createOptions = {
- method: 'POST',
- path: 'instances/' + instanceId + '/users',
- body: {
- users: users
- }
- };
+ // Check for options
+ if (!options || typeof options === 'function') {
+ return errs.handle(errs.create({
+ message: 'Options required for create an instance.'
+ }), options);
+ }
- self._request(createOptions, function (err, body, response) {
- return err
- ? callback(err)
- : callback(null, response);
- });
+ // Not as clean as I'd like but async didn't seem to work properly.
+ if (options instanceof Array) {
+ for (var i = 0; i < options.length; i++) {
+ assessOptions(options[i]);
+ }
+ }
+ else {
+ assessOptions(options);
}
};
@@ -189,13 +197,12 @@ exports.getUsers = function getUsers(options, callback) {
requestOptions.qs = completeUrl;
requestOptions.path = 'instances/' + instanceId + '/users';
- this._request(requestOptions, function (err, body, res) {
+ this._request(requestOptions, function (err, body) {
if (err) {
return callback(err);
}
var marker = null;
-
if (body.links && body.links.length > 0) {
marker = qs.parse(body.links[0].href.split('?').pop()).marker;
}
diff --git a/lib/pkgcloud/rackspace/database/database.js b/lib/pkgcloud/openstack/database/database.js
similarity index 59%
rename from lib/pkgcloud/rackspace/database/database.js
rename to lib/pkgcloud/openstack/database/database.js
index 855b6da85..0ef39e94b 100644
--- a/lib/pkgcloud/rackspace/database/database.js
+++ b/lib/pkgcloud/openstack/database/database.js
@@ -1,18 +1,18 @@
/*
- * databases.js: Rackspace Cloud Database within a Instance
+ * databases.js: Openstack Trove Database within a Instance
*
- * (C) 2011 Nodejitsu Inc.
+ * (C) 2014 Hewlett-Packard Development Company, L.P.
*
*/
-var utile = require('utile'),
+var util = require('util'),
model = require('../../core/base/model');
var Database = exports.Database = function Database(client, details) {
model.Model.call(this, client, details);
};
-utile.inherits(Database, model.Model);
+util.inherits(Database, model.Model);
Database.prototype.refresh = function (callback) {
this.client.getDatabase(this, callback);
@@ -22,6 +22,11 @@ Database.prototype._setProperties = function (details) {
// @todo Check for characters that CANNOT be used in the Database Name
// @todo There is a length restrictions for database name. 64
this.name = details.name;
- if (details.characterSet) this.characterSet = details.characterSet;
- if (details.collation) this.collation = details.collation;
-};
\ No newline at end of file
+ if (details.characterSet) {
+ this.characterSet = details.characterSet;
+ }
+
+ if (details.collation) {
+ this.collation = details.collation;
+ }
+};
diff --git a/lib/pkgcloud/rackspace/database/flavor.js b/lib/pkgcloud/openstack/database/flavor.js
similarity index 73%
rename from lib/pkgcloud/rackspace/database/flavor.js
rename to lib/pkgcloud/openstack/database/flavor.js
index 981f3d1e2..cdfa41e0a 100644
--- a/lib/pkgcloud/rackspace/database/flavor.js
+++ b/lib/pkgcloud/openstack/database/flavor.js
@@ -1,18 +1,18 @@
/*
- * flavor.js: Rackspace Cloud Databases flavor
+ * flavor.js: Openstack Trove Databases flavor
*
- * (C) 2011 Nodejitsu Inc.
+ * (C) 2014 Hewlett-Packard Development Company, L.P.
*
*/
-var utile = require('utile'),
+var util = require('util'),
base = require('../../openstack/compute/flavor');
var Flavor = exports.Flavor = function Flavor(client, details) {
base.Flavor.call(this, client, details);
};
-utile.inherits(Flavor, base.Flavor);
+util.inherits(Flavor, base.Flavor);
Flavor.prototype._setProperties = function (details) {
var selfLink = details.links.filter(function (link) {
diff --git a/lib/pkgcloud/openstack/database/index.js b/lib/pkgcloud/openstack/database/index.js
new file mode 100644
index 000000000..a46b22c79
--- /dev/null
+++ b/lib/pkgcloud/openstack/database/index.js
@@ -0,0 +1,16 @@
+/*
+ * index.js: Top-level include for the Openstack Trove module
+ *
+ * (C) 2014 Hewlett-Packard Development Company, L.P.
+ *
+ */
+
+exports.Client = require('./client').Client;
+exports.Flavor = require('./flavor').Flavor;
+exports.Instance = require('./instance').Instance;
+exports.Database = require('./database').Database;
+exports.User = require('./user').User;
+
+exports.createClient = function createClient(options) {
+ return new exports.Client(options);
+};
diff --git a/lib/pkgcloud/rackspace/database/instance.js b/lib/pkgcloud/openstack/database/instance.js
similarity index 90%
rename from lib/pkgcloud/rackspace/database/instance.js
rename to lib/pkgcloud/openstack/database/instance.js
index 1d4a039fc..ac09d8397 100644
--- a/lib/pkgcloud/rackspace/database/instance.js
+++ b/lib/pkgcloud/openstack/database/instance.js
@@ -1,11 +1,11 @@
/*
- * instances.js: Rackspace Cloud Database Instance
+ * instances.js: Openstack Trove Database Instance
*
- * (C) 2011 Nodejitsu Inc.
+ * (C) 2014 Hewlett-Packard Development Company, L.P.
*
*/
-var utile = require('utile'),
+var util = require('util'),
model = require('../../core/base/model'),
computeStatus = require('../../common/status').compute;
@@ -13,7 +13,7 @@ var Instance = exports.Instance = function Instance(client, details) {
model.Model.call(this, client, details);
};
-utile.inherits(Instance, model.Model);
+util.inherits(Instance, model.Model);
Instance.prototype.refresh = function (callback) {
this.client.getInstance(this, callback);
@@ -62,4 +62,4 @@ Instance.prototype._setProperties = function (details) {
this.hostname = details.hostname || this.hostname;
this.volume = details.volume || this.volume;
this.original = this.rackspace = details;
-};
\ No newline at end of file
+};
diff --git a/lib/pkgcloud/rackspace/database/user.js b/lib/pkgcloud/openstack/database/user.js
similarity index 69%
rename from lib/pkgcloud/rackspace/database/user.js
rename to lib/pkgcloud/openstack/database/user.js
index 677548640..ed35ef82b 100644
--- a/lib/pkgcloud/rackspace/database/user.js
+++ b/lib/pkgcloud/openstack/database/user.js
@@ -1,18 +1,18 @@
/*
- * user.js: Rackspace Cloud Database User
+ * user.js: Openstack Trove Database User
*
- * (C) 2011 Nodejitsu Inc.
+ * (C) 2014 Hewlett-Packard Development Company, L.P.
*
*/
-var utile = require('utile'),
+var util = require('util'),
model = require('../../core/base/model');
var User = exports.User = function User(client, details) {
model.Model.call(this, client, details);
};
-utile.inherits(User, model.Model);
+util.inherits(User, model.Model);
User.prototype.refresh = function (callback) {
this.client.getUser(this, callback);
@@ -21,4 +21,4 @@ User.prototype.refresh = function (callback) {
User.prototype._setProperties = function (details) {
this.name = details.name;
this.password = details.password;
-};
\ No newline at end of file
+};
diff --git a/lib/pkgcloud/openstack/identity/client/index.js b/lib/pkgcloud/openstack/identity/client/index.js
index c26bd21c1..e74c259d6 100644
--- a/lib/pkgcloud/openstack/identity/client/index.js
+++ b/lib/pkgcloud/openstack/identity/client/index.js
@@ -6,10 +6,9 @@
*
*/
-var utile = require('utile'),
+var util = require('util'),
urlJoin = require('url-join'),
- openstack = require('../../client'),
- _ = require('underscore');
+ openstack = require('../../client');
var Client = exports.Client = function (options) {
openstack.Client.call(this, options);
@@ -17,7 +16,7 @@ var Client = exports.Client = function (options) {
this.serviceType = null;
};
-utile.inherits(Client, openstack.Client);
+util.inherits(Client, openstack.Client);
/**
* Client._getUrl
@@ -67,7 +66,7 @@ Client.prototype.validateToken = function (token, belongsTo, callback) {
};
}
- this._request(options, function (err, body, res) {
+ this._request(options, function (err, body) {
return err
? callback(err)
: callback(err, body);
@@ -94,10 +93,10 @@ Client.prototype.getTenantInfo = function (tenantId, callback) {
path: urlJoin('/v2.0/tenants', tenantId ? tenantId : '')
};
- this._request(options, function (err, body, res) {
+ this._request(options, function (err, body) {
return err
? callback(err)
: callback(err, body);
});
-};
\ No newline at end of file
+};
diff --git a/lib/pkgcloud/openstack/identity/index.js b/lib/pkgcloud/openstack/identity/index.js
index 9081e1127..72822bf84 100644
--- a/lib/pkgcloud/openstack/identity/index.js
+++ b/lib/pkgcloud/openstack/identity/index.js
@@ -1,7 +1,7 @@
/*
* index.js: Top-level include for the OpenStack identity module
*
- * (C) 2013 Nodejitsu Inc.
+ * (C) 2013 Charlie Robbins, Ken Perkins, Ross Kukulinski & the Contributors.
*
*/
diff --git a/lib/pkgcloud/openstack/index.js b/lib/pkgcloud/openstack/index.js
index eb1d6b4bf..ffec3b774 100644
--- a/lib/pkgcloud/openstack/index.js
+++ b/lib/pkgcloud/openstack/index.js
@@ -1,10 +1,15 @@
/*
* index.js: Top-level include for the OpenStack module.
*
- * (C) 2013 Nodejitsu Inc.
+ * (C) 2013 Charlie Robbins, Ken Perkins, Ross Kukulinski & the Contributors.
*
*/
+exports.blockstorage = require('./blockstorage');
exports.compute = require('./compute');
+exports.identity = require('./identity');
+exports.orchestration = require('./orchestration');
+exports.network = require('./network');
exports.storage = require('./storage');
-exports.identity = require('./identity');
\ No newline at end of file
+exports.database = require('./database');
+exports.cdn = require('./cdn');
diff --git a/lib/pkgcloud/openstack/network/client/index.js b/lib/pkgcloud/openstack/network/client/index.js
new file mode 100644
index 000000000..2d00bce1a
--- /dev/null
+++ b/lib/pkgcloud/openstack/network/client/index.js
@@ -0,0 +1,51 @@
+/*
+ * client.js: Client for Openstack networking
+ *
+ * (C) 2014 Hewlett-Packard Development Company, L.P.
+ *
+ */
+
+var util = require('util'),
+ urlJoin = require('url-join'),
+ openstack = require('../../client'),
+ NetworkClient = require('../networkClient').NetworkClient,
+ _ = require('lodash');
+
+var Client = exports.Client = function (options) {
+ openstack.Client.call(this, options);
+
+ this.models = {
+ Network: require('../network').Network,
+ Subnet: require('../subnet').Subnet,
+ Port: require('../port').Port,
+ SecurityGroup: require('../securityGroup').SecurityGroup,
+ SecurityGroupRule: require('../securityGroupRule').SecurityGroupRule
+ };
+
+ _.extend(this, require('./networks'));
+ _.extend(this, require('./subnets'));
+ _.extend(this, require('./ports'));
+ _.extend(this, require('./securityGroups'));
+ _.extend(this, require('./securityGroupRules'));
+
+ this.serviceType = 'network';
+};
+
+util.inherits(Client, openstack.Client);
+_.extend(Client.prototype, NetworkClient.prototype);
+
+/**
+ * client._getUrl
+ *
+ * @description get the url for the current networking service
+ *
+ * @param options
+ * @returns {exports|*}
+ * @private
+ */
+Client.prototype._getUrl = function(options) {
+ if (options.path) {
+ options.path = urlJoin('v2.0', options.path);
+ }
+ return NetworkClient.prototype._getUrl.call(this, options);
+};
diff --git a/lib/pkgcloud/openstack/network/client/networks.js b/lib/pkgcloud/openstack/network/client/networks.js
new file mode 100644
index 000000000..a417ec949
--- /dev/null
+++ b/lib/pkgcloud/openstack/network/client/networks.js
@@ -0,0 +1,172 @@
+/*
+ * networks.js: Instance methods for working with networks
+ * for Openstack networking
+ *
+ * (C) 2014 Hewlett-Packard Development Company, L.P.
+ *
+ */
+
+var urlJoin = require('url-join');
+
+var networksResourcePath = '/networks';
+
+// Declaring variables for helper functions defined later
+var _convertNetworkToWireFormat;
+
+/**
+ * client.getNetworks
+ *
+ * @description get the list of networks for an account
+ *
+ * @param {object|Function} options
+ * @param {Function} callback
+ */
+exports.getNetworks = function (options, callback) {
+ var self = this;
+
+ if (typeof options === 'function') {
+ callback = options;
+ options = {};
+ }
+
+ var getNetworkOpts = {
+ path: networksResourcePath
+ };
+
+ this._request(getNetworkOpts, function (err, body) {
+ if (err) {
+ return callback(err);
+ }
+ else if (!body || !body.networks || !(body.networks instanceof Array)) {
+ return new Error('Malformed API Response');
+ }
+
+ return callback(err, body.networks.map(function (network) {
+ return new self.models.Network(self, network);
+ }));
+ });
+};
+
+/**
+ * client.getNetwork
+ *
+ * @description get the details for a specific network
+ *
+ * @param {String|object} network the network or networkId
+ * @param callback
+ */
+exports.getNetwork = function (network, callback) {
+ var self = this,
+ networkId = network instanceof this.models.Network ? network.id : network;
+ self.emit('log::trace', 'Getting details for network', networkId);
+ this._request({
+ path: urlJoin(networksResourcePath, networkId),
+ method: 'GET'
+ }, function (err, body) {
+ if (err) {
+ return callback(err);
+ }
+
+ if (!body ||!body.network) {
+ return new Error('Malformed API Response');
+ }
+
+ callback(err, new self.models.Network(self, body.network));
+ });
+};
+
+/**
+ * client.createNetwork
+ *
+ * @description create a new network
+ *
+ * @param {object} options
+ * @param {String} options.name the name of the new network
+ * @param callback
+ */
+exports.createNetwork = function (options, callback) {
+ var self = this,
+ network = typeof options === 'object' ? options : { 'name' : options};
+
+ network = _convertNetworkToWireFormat(network);
+
+ var createNetworkOpts = {
+ method: 'POST',
+ path: networksResourcePath,
+ body: { 'network' : network}
+ };
+
+ self.emit('log::trace', 'Creating network', network);
+ this._request(createNetworkOpts, function (err,body) {
+ return err
+ ? callback(err)
+ : callback(err, new self.models.Network(self, body.network));
+ });
+};
+
+/**
+ * client.updateNetwork
+ *
+ * @description update an existing network
+ *
+ * @param {object} options
+ * @param callback
+ */
+exports.updateNetwork = function (network, callback) {
+ var self = this,
+ networkId = network.id,
+ networkToUpdate = _convertNetworkToWireFormat(network);
+
+ var updateNetworkOpts = {
+ method: 'PUT',
+ path: urlJoin(networksResourcePath, networkId),
+ contentType: 'application/json',
+ body: { 'network' : networkToUpdate}
+ };
+
+ self.emit('log::trace', 'Updating network', networkId);
+ this._request(updateNetworkOpts, function (err,body) {
+ return err
+ ? callback(err)
+ : callback(err, new self.models.Network(self, body.network));
+ });
+};
+
+/**
+ * client.destroyNetwork
+ *
+ * @description Delete a specific network
+ *
+ * @param {String|object} network the network or network ID
+ * @param callback
+ */
+exports.destroyNetwork = function (network, callback) {
+ var self = this,
+ networkId = network instanceof this.models.Network ? network.id : network;
+ self.emit('log::trace', 'Deleting network', networkId);
+ this._request({
+ path: urlJoin(networksResourcePath,networkId),
+ method: 'DELETE'
+ }, function (err) {
+ if (err) {
+ return callback(err);
+ }
+ callback(err, networkId);
+ });
+};
+
+/**
+ * _convertNetworkToWireFormat
+ *
+ * @description convert Network instance into its wire representation.
+ *
+ * @param {object} details the Network instance.
+ */
+_convertNetworkToWireFormat = function (details){
+ var wireFormat = {};
+ wireFormat.admin_state_up = details.admin_state_up || details.adminStateUp;
+ wireFormat.name = details.name;
+ wireFormat.shared = details.shared;
+ wireFormat.tenant_id = details.tenantId || details.tenant_id;
+ return wireFormat;
+};
diff --git a/lib/pkgcloud/openstack/network/client/ports.js b/lib/pkgcloud/openstack/network/client/ports.js
new file mode 100644
index 000000000..2a9242665
--- /dev/null
+++ b/lib/pkgcloud/openstack/network/client/ports.js
@@ -0,0 +1,176 @@
+/*
+ * ports.js: Instance methods for working with ports
+ * for Openstack porting
+ *
+ * (C) 2014 Hewlett-Packard Development Company, L.P.
+ *
+ */
+
+var urlJoin = require('url-join');
+
+var portsResourcePath = '/ports';
+
+// Declaring variables for helper functions defined later
+var _convertPortToWireFormat;
+
+/**
+ * client.getPorts
+ *
+ * @description get the list of ports for an account
+ *
+ * @param {object|Function} options
+ * @param {Function} callback
+ */
+exports.getPorts = function (options, callback) {
+ var self = this;
+
+ if (typeof options === 'function') {
+ callback = options;
+ options = {};
+ }
+
+ var getPortOpts = {
+ path: portsResourcePath
+ };
+
+ this._request(getPortOpts, function (err, body) {
+ if (err) {
+ return callback(err);
+ }
+ else if (!body || !body.ports || !(body.ports instanceof Array)) {
+ return new Error('Malformed API Response');
+ }
+
+ return callback(err, body.ports.map(function (port) {
+ return new self.models.Port(self, port);
+ }));
+ });
+};
+
+/**
+ * client.getPort
+ *
+ * @description get the details for a specific port
+ *
+ * @param {String|object} port the port or portId
+ * @param callback
+ */
+exports.getPort = function (port, callback) {
+ var self = this,
+ portId = port instanceof this.models.Port ? port.id : port;
+ self.emit('log::trace', 'Getting details for port', portId);
+ this._request({
+ path: urlJoin(portsResourcePath, portId),
+ method: 'GET'
+ }, function (err, body) {
+ if (err) {
+ return callback(err);
+ }
+
+ if (!body ||!body.port) {
+ return new Error('Malformed API Response');
+ }
+
+ callback(err, new self.models.Port(self, body.port));
+ });
+};
+
+/**
+ * client.createPort
+ *
+ * @description create a new port
+ *
+ * @param {object} options
+ * @param {String} options.name the name of the new port
+ * @param callback
+ */
+exports.createPort = function (options, callback) {
+ var self = this,
+ port = typeof options === 'object' ? options : { 'name' : options};
+
+ port = _convertPortToWireFormat(port);
+
+ var createPortOpts = {
+ method: 'POST',
+ path: portsResourcePath,
+ body: { 'port' : port}
+ };
+
+ self.emit('log::trace', 'Creating port', port);
+ this._request(createPortOpts, function (err,body) {
+ return err
+ ? callback(err)
+ : callback(err, new self.models.Port(self, body.port));
+ });
+};
+
+/**
+ * client.updatePort
+ *
+ * @description update an existing port
+ *
+ * @param {object} options
+ * @param callback
+ */
+exports.updatePort = function (port, callback) {
+ var self = this,
+ portId = port.id;
+
+ port = _convertPortToWireFormat(port);
+ var updatePortOpts = {
+ method: 'PUT',
+ path: urlJoin(portsResourcePath, portId),
+ contentType: 'application/json',
+ body: { 'port' : port}
+ };
+
+ self.emit('log::trace', 'Updating port', port);
+ this._request(updatePortOpts, function (err,body) {
+ return err
+ ? callback(err)
+ : callback(err, new self.models.Port(self, body.port));
+ });
+};
+
+/**
+ * client.destroyPort
+ *
+ * @description Delete a specific port
+ *
+ * @param {String|object} port the port or port ID
+ * @param callback
+ */
+exports.destroyPort = function (port, callback) {
+ var self = this,
+ portId = port instanceof this.models.Port ? port.id : port;
+ self.emit('log::trace', 'Deleting port', portId);
+ this._request({
+ path: urlJoin(portsResourcePath,portId),
+ method: 'DELETE'
+ }, function (err) {
+ if (err) {
+ return callback(err);
+ }
+ callback(err, portId);
+ });
+};
+
+/**
+ * _convertPortToWireFormat
+ *
+ * @description convert Port instance into its wire representation.
+ *
+ * @param {object} details the Port instance.
+ */
+_convertPortToWireFormat = function (details){
+ var wireFormat = {};
+ wireFormat.status = details.status;
+ wireFormat.name = details.name;
+ wireFormat.admin_state_up = details.admin_state_up || details.adminStateUp;
+ wireFormat.tenant_id = details.tenant_id || details.tenantId;
+ wireFormat.mac_address = details.mac_address || details.macAddress;
+ wireFormat.fixed_ips = details.fixed_ips || details.fixedIps;
+ wireFormat.security_groups = details.security_groups || details.securityGroups;
+ wireFormat.network_id = details.network_id || details.networkId;
+ return wireFormat;
+};
diff --git a/lib/pkgcloud/openstack/network/client/securityGroupRules.js b/lib/pkgcloud/openstack/network/client/securityGroupRules.js
new file mode 100644
index 000000000..dbd6a135f
--- /dev/null
+++ b/lib/pkgcloud/openstack/network/client/securityGroupRules.js
@@ -0,0 +1,156 @@
+/*
+ * securityGroupRules.js: Instance methods for working with security group rules
+ * for Openstack Networking
+ *
+ * (C) 2015 Rackspace
+ * Shaunak Kashyap
+ * MIT LICENSE
+ */
+
+var urlJoin = require('url-join');
+
+var securityGroupRulesResourcePath = '/security-group-rules';
+
+// Declaring variables for helper functions defined later
+var _convertSecurityGroupRuleToWireFormat;
+
+/**
+ * client.getSecurityGroupRules
+ *
+ * @description get the list of security group rules for an account
+ *
+ * @param {object|Function} options
+ * @param {Function} callback
+ */
+exports.getSecurityGroupRules = function (options, callback) {
+ var self = this;
+
+ if (typeof options === 'function') {
+ callback = options;
+ options = {};
+ }
+
+ var getSecurityGroupRuleOpts = {
+ path: securityGroupRulesResourcePath
+ };
+
+ this._request(getSecurityGroupRuleOpts, function (err, body) {
+ if (err) {
+ return callback(err);
+ }
+ else if (!body || !body.security_group_rules || !(body.security_group_rules instanceof Array)) {
+ return new Error('Malformed API Response');
+ }
+
+ return callback(err, body.security_group_rules.map(function (securityGroupRule) {
+ return new self.models.SecurityGroupRule(self, securityGroupRule);
+ }));
+ });
+};
+
+/**
+ * client.getSecurityGroupRule
+ *
+ * @description get the details for a specific securityGroupRule
+ *
+ * @param {String|object} securityGroupRule the securityGroupRule or securityGroupRuleId
+ * @param callback
+ */
+exports.getSecurityGroupRule = function (securityGroupRule, callback) {
+ var self = this,
+ securityGroupRuleId = securityGroupRule instanceof this.models.SecurityGroupRule ? securityGroupRule.id : securityGroupRule;
+ self.emit('log::trace', 'Getting details for security group rule', securityGroupRuleId);
+ this._request({
+ path: urlJoin(securityGroupRulesResourcePath, securityGroupRuleId),
+ method: 'GET'
+ }, function (err, body) {
+ if (err) {
+ return callback(err);
+ }
+
+ if (!body ||!body.security_group_rule) {
+ return new Error('Malformed API Response');
+ }
+
+ callback(err, new self.models.SecurityGroupRule(self, body.security_group_rule));
+ });
+};
+
+/**
+ * client.createSecurityGroupRule
+ *
+ * @description create a new securityGroupRule
+ *
+ * @param object securityGroupRule
+ * @param string securityGroupRule.securityGroupId The security group ID to associate with this security group rule.
+ * @param string securityGroupRule.direction The direction ("ingress" or "egress") in which the security group rule is applied.
+ * @param {string} securityGroupRule.ethertype "IPv4" or "IPv6".
+ * @param {number} securityGroupRule.portRangeMin The minimum port number in the range that is matched by the security group rule.
+ * @param {number} securityGroupRule.portRangeMax The maximum port number in the range that is matched by the security group rule.
+ * @param {string} securityGroupRule.protocol The protocol ("tcp", "udp", or "icmp") that is matched by the security group rule.
+ * @param {string} securityGroupRule.remoteGroupId The remote group ID to be associated with this security group rule. You can specify either this or remoteIpPrefix.
+ * @param {string} securityGroupRule.remoteIpPrefix The remote IP prefix to be associated with this security group rule. You can specify either this or remoteGroupId.
+ *
+ * @param callback
+ */
+exports.createSecurityGroupRule = function (securityGroupRule, callback) {
+ var self = this;
+
+ securityGroupRule = _convertSecurityGroupRuleToWireFormat(securityGroupRule);
+
+ var createSecurityGroupRuleOpts = {
+ method: 'POST',
+ path: securityGroupRulesResourcePath,
+ body: { 'security_group_rule': securityGroupRule }
+ };
+
+ self.emit('log::trace', 'Creating security group rule', securityGroupRule);
+ this._request(createSecurityGroupRuleOpts, function (err,body) {
+ return err
+ ? callback(err)
+ : callback(err, new self.models.SecurityGroupRule(self, body.security_group_rule));
+ });
+};
+
+/**
+ * client.destroySecurityGroupRule
+ *
+ * @description Delete a specific securityGroupRule
+ *
+ * @param {String|object} securityGroupRule the securityGroupRule or securityGroupRule ID
+ * @param callback
+ */
+exports.destroySecurityGroupRule = function (securityGroupRule, callback) {
+ var self = this,
+ securityGroupRuleId = securityGroupRule instanceof this.models.SecurityGroupRule ? securityGroupRule.id : securityGroupRule;
+ self.emit('log::trace', 'Deleting security group rule', securityGroupRuleId);
+ this._request({
+ path: urlJoin(securityGroupRulesResourcePath,securityGroupRuleId),
+ method: 'DELETE'
+ }, function (err) {
+ if (err) {
+ return callback(err);
+ }
+ callback(err, securityGroupRuleId);
+ });
+};
+
+/**
+ * _convertSecurityGroupRuleToWireFormat
+ *
+ * @description convert SecurityGroupRule instance into its wire representation.
+ *
+ * @param {object} details the SecurityGroupRule instance.
+ */
+_convertSecurityGroupRuleToWireFormat = function (details){
+ var wireFormat = {};
+ wireFormat.direction = details.direction;
+ wireFormat.ethertype = details.ethertype;
+ wireFormat.security_group_id = details.security_group_id || details.securityGroupId;
+ wireFormat.port_range_min = details.port_range_min || details.portRangeMin;
+ wireFormat.port_range_max = details.port_range_max || details.portRangeMax;
+ wireFormat.protocol = details.protocol;
+ wireFormat.remote_group_id = details.remote_group_id || details.remoteGroupId;
+ wireFormat.remote_ip_prefix = details.remote_ip_prefix || details.remoteIpPrefix;
+ return wireFormat;
+};
diff --git a/lib/pkgcloud/openstack/network/client/securityGroups.js b/lib/pkgcloud/openstack/network/client/securityGroups.js
new file mode 100644
index 000000000..3beca6471
--- /dev/null
+++ b/lib/pkgcloud/openstack/network/client/securityGroups.js
@@ -0,0 +1,145 @@
+/*
+ * securityGroups.js: Instance methods for working with security groups
+ * for Openstack Networking
+ *
+ * (C) 2015 Rackspace
+ * Shaunak Kashyap
+ * MIT LICENSE
+ */
+
+var urlJoin = require('url-join');
+
+var securityGroupsResourcePath = '/security-groups';
+
+// Declaring variables for helper functions defined later
+var _convertSecurityGroupToWireFormat;
+
+/**
+ * client.getSecurityGroups
+ *
+ * @description get the list of security groups for an account
+ *
+ * @param {object|Function} options
+ * @param {Function} callback
+ */
+exports.getSecurityGroups = function (options, callback) {
+ var self = this;
+
+ if (typeof options === 'function') {
+ callback = options;
+ options = {};
+ }
+
+ var getSecurityGroupOpts = {
+ path: securityGroupsResourcePath
+ };
+
+ this._request(getSecurityGroupOpts, function (err, body) {
+ if (err) {
+ return callback(err);
+ }
+ else if (!body || !body.security_groups || !(body.security_groups instanceof Array)) {
+ return new Error('Malformed API Response');
+ }
+
+ return callback(err, body.security_groups.map(function (securityGroup) {
+ return new self.models.SecurityGroup(self, securityGroup);
+ }));
+ });
+};
+
+/**
+ * client.getSecurityGroup
+ *
+ * @description get the details for a specific securityGroup
+ *
+ * @param {String|object} securityGroup the securityGroup or securityGroupId
+ * @param callback
+ */
+exports.getSecurityGroup = function (securityGroup, callback) {
+ var self = this,
+ securityGroupId = securityGroup instanceof this.models.SecurityGroup ? securityGroup.id : securityGroup;
+ self.emit('log::trace', 'Getting details for security group', securityGroupId);
+ this._request({
+ path: urlJoin(securityGroupsResourcePath, securityGroupId),
+ method: 'GET'
+ }, function (err, body) {
+ if (err) {
+ return callback(err);
+ }
+
+ if (!body ||!body.security_group) {
+ return new Error('Malformed API Response');
+ }
+
+ callback(err, new self.models.SecurityGroup(self, body.security_group));
+ });
+};
+
+/**
+ * client.createSecurityGroup
+ *
+ * @description create a new security group
+ *
+ * @param object securityGroup
+ * @param string securityGroup.name Name of security group.
+ * @param {string} securityGroup.description Description of security group.
+ * @param {string} securityGroup.tenantId The ID of the tenant who owns the security group. Only administrative users can specify a tenant ID other than their own.
+ * @param callback
+ */
+exports.createSecurityGroup = function (securityGroup, callback) {
+ var self = this;
+
+ securityGroup = _convertSecurityGroupToWireFormat(securityGroup);
+
+ var createSecurityGroupOpts = {
+ method: 'POST',
+ path: securityGroupsResourcePath,
+ body: { 'security_group': securityGroup }
+ };
+
+ self.emit('log::trace', 'Creating security group', securityGroup);
+ this._request(createSecurityGroupOpts, function (err,body) {
+ return err
+ ? callback(err)
+ : callback(err, new self.models.SecurityGroup(self, body.security_group));
+ });
+};
+
+/**
+ * client.destroySecurityGroup
+ *
+ * @description Delete a specific securityGroup
+ *
+ * @param {String|object} securityGroup the securityGroup or securityGroup ID
+ * @param callback
+ */
+exports.destroySecurityGroup = function (securityGroup, callback) {
+ var self = this,
+ securityGroupId = securityGroup instanceof this.models.SecurityGroup ? securityGroup.id : securityGroup;
+ self.emit('log::trace', 'Deleting security group', securityGroupId);
+ this._request({
+ path: urlJoin(securityGroupsResourcePath,securityGroupId),
+ method: 'DELETE'
+ }, function (err) {
+ if (err) {
+ return callback(err);
+ }
+ callback(err, securityGroupId);
+ });
+};
+
+/**
+ * _convertSecurityGroupToWireFormat
+ *
+ * @description convert SecurityGroup instance into its wire representation.
+ *
+ * @param {object} details the SecurityGroup instance.
+ */
+_convertSecurityGroupToWireFormat = function (details){
+ var wireFormat = {};
+ wireFormat.name = details.name;
+ wireFormat.description = details.description;
+ wireFormat.tenant_id = details.tenant_id || details.tenantId;
+ return wireFormat;
+};
diff --git a/lib/pkgcloud/openstack/network/client/subnets.js b/lib/pkgcloud/openstack/network/client/subnets.js
new file mode 100644
index 000000000..1559aa796
--- /dev/null
+++ b/lib/pkgcloud/openstack/network/client/subnets.js
@@ -0,0 +1,181 @@
+/*
+ * networks.js: Instance methods for working with networks
+ * for Openstack networking
+ *
+ * (C) 2014 Hewlett-Packard Development Company, L.P.
+ *
+ */
+
+var urlJoin = require('url-join');
+
+var subnetsResourcePath = '/subnets';
+
+// Declaring variables for helper functions defined later
+var _convertSubnetToWireFormat;
+
+/**
+ * client.getSubnets
+ *
+ * @description get the list of networks for an account
+ *
+ * @param {object|Function} options
+ * @param {Number} [options.limit] the number of records to return
+ * @param {String} [options.marker] Marker value. Operation returns object names that are greater than this value.
+ * @param {String} [options.end_marker] Operation returns object names that are less than this value.
+ * @param {Function} callback
+ */
+exports.getSubnets = function (options, callback) {
+ var self = this;
+
+ if (typeof options === 'function') {
+ callback = options;
+ options = {};
+ }
+
+ var getSubnetOpts = {
+ path: subnetsResourcePath,
+ };
+
+ this._request(getSubnetOpts, function (err, body) {
+ if (err) {
+ return callback(err);
+ }
+ else if (!body ||!body.subnets || !(body.subnets instanceof Array)) {
+ return new Error('Malformed API Response');
+ }
+
+ return callback(err, body.subnets.map(function (subnet) {
+ return new self.models.Subnet(self, subnet);
+ }));
+ });
+};
+
+/**
+ * client.getSubnet
+ *
+ * @description get the details for a specific network
+ *
+ * @param {String|object} subnet the subnet or subnetId
+ * @param callback
+ */
+exports.getSubnet = function (subnet, callback) {
+ var self = this,
+ subnetId = subnet instanceof this.models.Subnet ? subnet.id : subnet;
+ self.emit('log::trace', 'Getting details for subnet', subnetId);
+ this._request({
+ path: urlJoin(subnetsResourcePath, subnetId),
+ method: 'GET'
+ }, function (err, body) {
+ if (err) {
+ return callback(err);
+ }
+
+ if (!body || !body.subnet) {
+ return new Error('Malformed API Response');
+ }
+
+ callback(err, new self.models.Subnet(self, body.subnet));
+ });
+};
+
+/**
+ * client.createSubnet
+ *
+ * @description create a new subnet
+ *
+ * @param {object} options
+ * @param {String} options.name the name of the new subnet
+ * @param callback
+ */
+exports.createSubnet = function (options, callback) {
+ var self = this,
+ subnet = typeof options === 'object' ? options : { 'name' : options};
+
+ subnet = _convertSubnetToWireFormat(subnet);
+
+ var createSubnetOpts = {
+ method: 'POST',
+ path: subnetsResourcePath,
+ body: { 'subnet' : subnet}
+ };
+
+ self.emit('log::trace', 'Creating subnet', subnet);
+ this._request(createSubnetOpts, function (err,body) {
+ return err
+ ? callback(err)
+ : callback(err, new self.models.Subnet(self, body.subnet));
+ });
+};
+
+/**
+ * client.updateSubnet
+ *
+ * @description update an existing subnet
+ *
+ * @param {object} options
+ * @param callback
+ */
+exports.updateSubnet = function (subnet, callback) {
+ var self = this,
+ subnetId = subnet.id,
+ subnetToUpdate = _convertSubnetToWireFormat(subnet);
+
+ var updateSubnetOpts = {
+ method: 'PUT',
+ path: urlJoin(subnetsResourcePath, subnetId),
+ contentType: 'application/json',
+ body: { 'subnet' : subnetToUpdate}
+ };
+
+ self.emit('log::trace', 'Updating subnet', subnetId);
+ this._request(updateSubnetOpts, function (err,body) {
+ return err
+ ? callback(err)
+ : callback(err, new self.models.Subnet(self, body.subnet));
+ });
+};
+
+/**
+ * client.destroySubnet
+ *
+ * @description Delete a specific network
+ *
+ * @param {String|object} subnet the subnet or subnet ID
+ * @param callback
+ */
+exports.destroySubnet = function (subnet, callback) {
+ var self = this,
+ subnetId = subnet instanceof this.models.Subnet ? subnet.id : subnet;
+ self.emit('log::trace', 'Deleting subnet', subnetId);
+ this._request({
+ path: urlJoin(subnetsResourcePath,subnetId),
+ method: 'DELETE'
+ }, function (err) {
+ if (err) {
+ return callback(err);
+ }
+ callback(err, subnetId);
+ });
+};
+
+/**
+ * _convertSubnetToWireFormat
+ *
+ * @description convert Subnet instance into its wire representation.
+ *
+ * @param {object} details the Subnet instance.
+ */
+_convertSubnetToWireFormat = function (details){
+
+ var wireFormat = {};
+ wireFormat.name = details.name;
+ wireFormat.network_id = details.networkId || details.network_id;
+ wireFormat.tenant_id = details.tenantId || details.tenant_id;
+ wireFormat.allocation_pools = details.allocationPools || details.allocation_pools;
+ wireFormat.gateway_ip = details.gatewayIp || details.gateway_ip;
+ wireFormat.ip_version = details.ipVersion || details.ip_version;
+ wireFormat.cidr = details.cidr;
+ wireFormat.enable_dhcp = details.enable_dhcp == null ? details.enableDhcp : details.enable_dhcp;
+
+ return wireFormat;
+};
diff --git a/lib/pkgcloud/openstack/network/index.js b/lib/pkgcloud/openstack/network/index.js
new file mode 100644
index 000000000..4199b7447
--- /dev/null
+++ b/lib/pkgcloud/openstack/network/index.js
@@ -0,0 +1,17 @@
+/*
+ * index.js: Top-level include for the Openstack networking client.
+ *
+ * (C) 2014 Hewlett-Packard Development Company, L.P.
+ *
+ */
+
+exports.Client = require('./client').Client;
+exports.Network = require('./network').Network;
+exports.Subnet = require('./subnet').Subnet;
+exports.Port = require('./port').Port;
+exports.SecurityGroup = require('./securityGroup').SecurityGroup;
+exports.SecurityGroupRule = require('./securityGroup').SecurityGroupRule;
+
+exports.createClient = function (options) {
+ return new exports.Client(options);
+};
diff --git a/lib/pkgcloud/openstack/network/network.js b/lib/pkgcloud/openstack/network/network.js
new file mode 100644
index 000000000..69aa46a70
--- /dev/null
+++ b/lib/pkgcloud/openstack/network/network.js
@@ -0,0 +1,31 @@
+/*
+ * network.js: Openstack Network object.
+ *
+ * (C) 2014 Hewlett-Packard Development Company, L.P.
+ *
+ */
+
+var util = require('util'),
+ base = require('../../core/network/network'),
+ _ = require('lodash');
+
+var Network = exports.Network = function Network(client, details) {
+ base.Network.call(this, client, details);
+};
+
+util.inherits(Network, base.Network);
+
+Network.prototype._setProperties = function (details) {
+ this.name = details.name || this.name;
+ this.status = details.status || this.status;
+ this.adminStateUp = details.admin_state_up || this.adminStateUp;
+ this.id = details.id || this.id;
+ this.shared = details.shared || this.shared || 0;
+ this.tenantId = details.tenant_id || this.tenantId;
+ this.subnets = details.subnets || this.subnets;
+};
+
+Network.prototype.toJSON = function () {
+ return _.pick(this, ['name', 'id', 'adminStateUp', 'status', 'shared',
+ 'tenantId', 'subnets']);
+};
diff --git a/lib/pkgcloud/openstack/network/networkClient.js b/lib/pkgcloud/openstack/network/networkClient.js
new file mode 100644
index 000000000..d98763a4f
--- /dev/null
+++ b/lib/pkgcloud/openstack/network/networkClient.js
@@ -0,0 +1,48 @@
+/*
+ * networkingClient.js: A base NetworkClient for Openstack networking clients
+ *
+ * (C) 2014 Hewlett-Packard Development Company, L.P.
+ *
+ */
+
+var urlJoin = require('url-join');
+
+var Client = exports.NetworkClient = function () {
+ this.serviceType = 'network';
+};
+
+/**
+ * client._getUrl
+ *
+ * @description get the url for the current network service
+ *
+ * @param options
+ * @returns {exports|*}
+ * @private
+ */
+Client.prototype._getUrl = function (options) {
+ options = options || {};
+ var fragment = '';
+
+ if (options.network) {
+ if (options.method === 'GET') {
+ fragment = encodeURIComponent(options.network);
+ }
+ }
+
+ if (options.path) {
+ fragment = urlJoin(fragment, options.path.split('/').map(encodeURIComponent).join('/'));
+ }
+
+ var serviceUrl = options.serviceType ? this._identity.getServiceEndpointUrl({
+ serviceType: options.serviceType,
+ region: this.region
+ }) : this._serviceUrl;
+
+ if (fragment === '' || fragment === '/') {
+ return serviceUrl;
+ }
+
+ return urlJoin(serviceUrl, fragment);
+
+};
diff --git a/lib/pkgcloud/openstack/network/port.js b/lib/pkgcloud/openstack/network/port.js
new file mode 100644
index 000000000..1b5a3bcf8
--- /dev/null
+++ b/lib/pkgcloud/openstack/network/port.js
@@ -0,0 +1,39 @@
+/*
+ * network.js: Openstack Port object.
+ *
+ * (C) 2014 Hewlett-Packard Development Company, L.P.
+ *
+ */
+
+var util = require('util'),
+ base = require('../../core/network/port'),
+ _ = require('lodash');
+
+var Port = exports.Port = function Port(client, details) {
+ base.Port.call(this, client, details);
+};
+
+util.inherits(Port, base.Port);
+
+Port.prototype._setProperties = function (details) {
+
+ this.status = details.status || this.status;
+ this.name = details.name || this.name;
+ this.allowedAddressPairs = details.allowed_address_pairs || this.allowedAddressPairs;
+ this.adminStateUp = details.admin_state_up || this.adminStateUp;
+ this.networkId = details.network_id || this.networkId;
+ this.tenantId = details.tenant_id || this.tenantId;
+ this.extraDhcpOpts = details.extra_dhcp_opts || this.extraDhcpOpts;
+ this.deviceOwner = details.device_owner || this.deviceOwner;
+ this.macAddress = details.mac_address || this.macAddress;
+ this.fixedIps = details.fixed_ips || this.fixedIps;
+ this.id = details.id || this.id;
+ this.securityGroups = details.security_groups || this.securityGroups;
+ this.deviceId = details.device_id || this.deviceId;
+};
+
+Port.prototype.toJSON = function () {
+ return _.pick(this, ['status', 'name', 'allowedAddressPairs', 'adminStateUp',
+ 'networkId', 'tenantId', 'extraDhcpOpts', 'deviceOwner',
+ 'macAddress', 'fixedIps', 'id', 'securityGroups', 'deviceId']);
+};
diff --git a/lib/pkgcloud/openstack/network/securityGroup.js b/lib/pkgcloud/openstack/network/securityGroup.js
new file mode 100644
index 000000000..cb68fa4dd
--- /dev/null
+++ b/lib/pkgcloud/openstack/network/securityGroup.js
@@ -0,0 +1,30 @@
+/*
+ * network.js: Openstack Security Group object.
+ *
+ * (C) 2015 Rackspace
+ * Shaunak Kashyap
+ * MIT LICENSE
+ */
+
+var util = require('util'),
+ base = require('../../core/network/securityGroup'),
+ _ = require('lodash');
+
+var SecurityGroup = exports.SecurityGroup = function SecurityGroup(client, details) {
+ base.SecurityGroup.call(this, client, details);
+};
+
+util.inherits(SecurityGroup, base.SecurityGroup);
+
+SecurityGroup.prototype._setProperties = function (details) {
+
+ this.id = details.id || this.id;
+ this.name = details.name || this.name;
+ this.description = details.description || this.id;
+ this.tenantId = details.tenant_id || this.tenantId;
+ this.securityGroupRules = details.security_group_rules || this.securityGroupRules;
+};
+
+SecurityGroup.prototype.toJSON = function () {
+ return _.pick(this, ['id', 'name', 'description', 'securityGroupRules', 'tenantId']);
+};
diff --git a/lib/pkgcloud/openstack/network/securityGroupRule.js b/lib/pkgcloud/openstack/network/securityGroupRule.js
new file mode 100644
index 000000000..f80580c35
--- /dev/null
+++ b/lib/pkgcloud/openstack/network/securityGroupRule.js
@@ -0,0 +1,36 @@
+/*
+ * network.js: Openstack Security Group Rule object.
+ *
+ * (C) 2015 Rackspace
+ * Shaunak Kashyap
+ * MIT LICENSE
+ */
+
+var util = require('util'),
+ base = require('../../core/network/securityGroupRule'),
+ _ = require('lodash');
+
+var SecurityGroupRule = exports.SecurityGroupRule = function SecurityGroupRule(client, details) {
+ base.SecurityGroupRule.call(this, client, details);
+};
+
+util.inherits(SecurityGroupRule, base.SecurityGroupRule);
+
+SecurityGroupRule.prototype._setProperties = function (details) {
+ this.id = details.id || this.id;
+ this.direction = details.direction || this.direction;
+ this.ethertype = details.ethertype || this.id;
+ this.securityGroupId = details.security_group_id || this.securityGroupId;
+ this.portRangeMin = details.port_range_min || this.portRangeMin;
+ this.portRangeMax = details.port_range_max || this.portRangeMax;
+ this.protocol = details.protocol || this.protocol;
+ this.remoteGroupId = details.remote_group_id || this.remoteGroupId;
+ this.remoteIpPrefix = details.remote_ip_prefix || this.remoteIpPrefix;
+ this.tenantId = details.tenant_id || this.tenantId;
+};
+
+SecurityGroupRule.prototype.toJSON = function () {
+ return _.pick(this, ['id', 'direction', 'ethertype', 'securityGroupId',
+ 'portRangeMin', 'portRangeMax', 'protocol',
+ 'remoteGroupId', 'remoteIpPrefix', 'tenantId']);
+};
diff --git a/lib/pkgcloud/openstack/network/subnet.js b/lib/pkgcloud/openstack/network/subnet.js
new file mode 100644
index 000000000..0853a234c
--- /dev/null
+++ b/lib/pkgcloud/openstack/network/subnet.js
@@ -0,0 +1,35 @@
+/*
+ * network.js: Openstack Subnet object.
+ *
+ * (C) 2014 Hewlett-Packard Development Company, L.P.
+ *
+ */
+
+var util = require('util'),
+ base = require('../../core/network/subnet'),
+ _ = require('lodash');
+
+var Subnet = exports.Subnet = function Subnet(client, details) {
+ base.Subnet.call(this, client, details);
+};
+
+util.inherits(Subnet, base.Subnet);
+
+Subnet.prototype._setProperties = function (details) {
+ this.name = details.name || this.name;
+ this.enableDhcp = details.enable_dhcp || this.enableDhcp;
+ this.networkId = details.network_id || this.networkId;
+ this.id = details.id || this.id;
+ this.ipVersion = details.ip_version || this.ipVersion;
+ this.tenantId = details.tenant_id || this.tenantId;
+ this.gatewayIp = details.gateway_ip || this.gatewayIp;
+ this.cidr = details.cidr || this.cidr;
+ this.dnsNameServers = details.dns_nameservers || this.dnsNameServers;
+ this.hostRoutes = details.host_routes || this.hostRoutes;
+ this.allocationPools = details.allocation_pools || this.allocationPools;
+};
+
+Subnet.prototype.toJSON = function () {
+ return _.pick(this, ['name', 'id', 'networkId', 'ipVersion',
+ 'tenantId', 'gatewayIp', 'dnsNameServers', 'allocationPools', 'hostRoutes']);
+};
diff --git a/lib/pkgcloud/openstack/orchestration/client/events.js b/lib/pkgcloud/openstack/orchestration/client/events.js
new file mode 100644
index 000000000..8b0a7c862
--- /dev/null
+++ b/lib/pkgcloud/openstack/orchestration/client/events.js
@@ -0,0 +1,139 @@
+/*
+ * events.js: Instance methods for working with stack events from OpenStack Orchestration
+ *
+ * (C) 2014 Rackspace
+ * Ken Perkins
+ * MIT LICENSE
+ */
+var pkgcloud = require('../../../../../lib/pkgcloud'),
+ urlJoin = require('url-join'),
+ orchestration = pkgcloud.providers.openstack.orchestration;
+
+var _urlPrefix = '/stacks';
+
+/**
+ * client.getEvent
+ *
+ * @description get the event for a provided stack, resource, and eventName
+ *
+ * @param {object|string} stack stack or stackName
+ * @param {object|string} resource resource or resourceName
+ * @param {string} eventId eventId to query for
+ * @param {function} callback f(err, event)
+ * @returns {*}
+ */
+exports.getEvent = function (stack, resource, eventId, callback) {
+ var self = this;
+
+ function getEvent(stack) {
+ return self._request({
+ path: urlJoin(_urlPrefix, stack.name, stack.id, 'resources',
+ resource instanceof orchestration.Resource ? resource.name : resource, 'events', eventId)
+ }, function (err, body) {
+ if (err) {
+ return callback(err);
+ }
+
+ callback(null, body.event);
+
+ });
+ }
+
+ if (stack instanceof orchestration.Stack) {
+ getEvent(stack);
+ }
+ else if (typeof stack === 'string') {
+ self.getStack(stack, function (err, stack) {
+ if (err) {
+ callback(err);
+ return;
+ }
+
+ getEvent(stack);
+ });
+ }
+
+};
+
+/**
+ * client.getEvents
+ *
+ * @description get the list of stack events for a provided stack
+ *
+ * @param {object|string} stack stack or stackName to find events for
+ * @param {function} callback f(err, events) where stacks is an array of Event
+ * @returns {*}
+ */
+exports.getEvents = function(stack, callback) {
+ var self = this;
+
+ function getEvents(stack) {
+ return self._request({
+ path: urlJoin(_urlPrefix, stack.name, stack.id, 'events')
+ }, function (err, body) {
+ if (err) {
+ return callback(err);
+ }
+
+ callback(null, body.events);
+
+ });
+ }
+
+ if (stack instanceof orchestration.Stack) {
+ getEvents(stack);
+ }
+ else if (typeof stack === 'string') {
+ self.getStack(stack, function (err, stack) {
+ if (err) {
+ callback(err);
+ return;
+ }
+
+ getEvents(stack);
+ });
+ }
+
+};
+
+/**
+ * client.getResourceEvents
+ *
+ * @description get the list of stack events for a provided stack and resource
+ *
+ * @param {object|string} stack stack or stackName to find events for
+ * @param {object|string} resource resource or resourceName to find events for
+ * @param {function} callback f(err, events) where stacks is an array of Event
+ * @returns {*}
+ */
+exports.getResourceEvents = function (stack, resource, callback) {
+ var self = this;
+
+ function getEvents(stack) {
+ return self._request({
+ path: urlJoin(_urlPrefix, stack.name, stack.id, 'resources',
+ resource instanceof orchestration.Resource ? resource.name : resource, 'events')
+ }, function (err, body) {
+ if (err) {
+ return callback(err);
+ }
+
+ callback(null, body.events);
+
+ });
+ }
+
+ if (stack instanceof orchestration.Stack) {
+ getEvents(stack);
+ }
+ else if (typeof stack === 'string') {
+ self.getStack(stack, function (err, stack) {
+ if (err) {
+ callback(err);
+ return;
+ }
+
+ getEvents(stack);
+ });
+ }
+};
diff --git a/lib/pkgcloud/openstack/orchestration/client/index.js b/lib/pkgcloud/openstack/orchestration/client/index.js
new file mode 100644
index 000000000..a844fb8ae
--- /dev/null
+++ b/lib/pkgcloud/openstack/orchestration/client/index.js
@@ -0,0 +1,68 @@
+/*
+ * index.js: Orchestration client for OpenStack
+ *
+ * (C) 2014 Rackspace
+ * Ken Perkins
+ * MIT LICENSE
+ */
+
+var util = require('util'),
+ openstack = require('../../client'),
+ urlJoin = require('url-join'),
+ _ = require('lodash');
+
+var Client = exports.Client = function (options) {
+ openstack.Client.call(this, options);
+
+ _.extend(this, require('./stacks'));
+ _.extend(this, require('./templates'));
+ _.extend(this, require('./events'));
+ _.extend(this, require('./resources'));
+
+ this.serviceType = 'orchestration';
+
+};
+
+util.inherits(Client, openstack.Client);
+
+/**
+ * client._getUrl
+ *
+ * @description get the url for the current compute service
+ *
+ * @param options
+ * @returns {exports|*}
+ * @private
+ */
+Client.prototype._getUrl = function (options) {
+ options = options || {};
+
+ if (!this._serviceUrl) {
+ throw new Error('Service url not found');
+ }
+
+ return urlJoin(this._serviceUrl,
+ typeof options === 'string'
+ ? options
+ : options.path);
+};
+
+/**
+ * client.buildInfo
+ *
+ * @description gets the build information for the orchestration service
+ *
+ * @param callback
+ * @returns {*}
+ */
+Client.prototype.buildInfo = function(callback) {
+ return this._request({
+ path: '/build_info'
+ }, function (err, body) {
+ if (err) {
+ return callback(err);
+ }
+
+ callback(null, body);
+ });
+};
diff --git a/lib/pkgcloud/openstack/orchestration/client/resources.js b/lib/pkgcloud/openstack/orchestration/client/resources.js
new file mode 100644
index 000000000..cb9e9486f
--- /dev/null
+++ b/lib/pkgcloud/openstack/orchestration/client/resources.js
@@ -0,0 +1,176 @@
+/*
+ * resources.js: Instance methods for working with stack resources from OpenStack Orchestration
+ *
+ * (C) 2014 Rackspace
+ * Ken Perkins
+ * MIT LICENSE
+ */
+var pkgcloud = require('../../../../../lib/pkgcloud'),
+ urlJoin = require('url-join'),
+ _ = require('lodash'),
+ orchestration = pkgcloud.providers.openstack.orchestration;
+
+var _urlPrefix = '/resource_types';
+
+/**
+ * client.getResource
+ *
+ * @description get the resource data for a provided resource and stack
+ *
+ * @param {object|string} stack stack or stackName to find resources for
+ * @param {object|string} resource resource or resourceName to get
+ * @param {function} callback f(err, resource)
+ * @returns {*}
+ */
+exports.getResource = function (stack, resource, callback) {
+ var self = this;
+
+ function getResource(stack) {
+ return self._request({
+ path: urlJoin('/stacks', stack.name, stack.id, 'resources',
+ resource instanceof orchestration.Resource ? resource.name : resource)
+ }, function (err, body) {
+ if (err) {
+ return callback(err);
+ }
+
+ callback(null, new orchestration.Resource(self, _.extend({ stack: stack }, body.resource)));
+ });
+ }
+
+ if (stack instanceof orchestration.Stack) {
+ getResource(stack);
+ }
+ else if (typeof stack === 'string') {
+ self.getStack(stack, function (err, stack) {
+ if (err) {
+ callback(err);
+ return;
+ }
+
+ getResource(stack);
+ });
+ }
+};
+
+/**
+ * client.getResources
+ *
+ * @description get the list of stack resources for a provided stack
+ *
+ * @param {object|string} stack stack or stackName to find resources for
+ * @param {function} callback f(err, resources) where stacks is an array of Resource
+ * @returns {*}
+ */
+exports.getResources = function (stack, options, callback) {
+ var self = this;
+
+ if (typeof options === 'function') {
+ callback = options;
+ options = {};
+ }
+
+ function getResources(stack) {
+ var requestOptions = {
+ path: urlJoin('/stacks', stack.name, stack.id, 'resources'),
+ qs: []
+ };
+
+ if (options.nestedDepth) {
+ requestOptions.qs['nested_depth'] = options.nestedDepth;
+ }
+
+ return self._request(requestOptions, function (err, body) {
+ if (err) {
+ return callback(err);
+ }
+
+ callback(null, body.resources.map(function(resource) {
+ return new orchestration.Resource(self, _.extend({ stack: stack }, resource));
+ }));
+ });
+ }
+
+ if (stack instanceof orchestration.Stack) {
+ getResources(stack);
+ }
+ else if (typeof stack === 'string') {
+ self.getStack(stack, function (err, stack) {
+ if (err) {
+ callback(err);
+ return;
+ }
+
+ getResources(stack);
+ });
+ }
+
+};
+
+/**
+ * client.getResourceTypes
+ *
+ * @description get the list of resource types for the account
+ *
+ * @param {function} callback f(err, resourceTypes) where resourceTypes is an array of types
+ * @returns {*}
+ */
+exports.getResourceTypes = function (callback) {
+ var self = this;
+
+ return self._request({
+ path: _urlPrefix
+ }, function (err, body) {
+ if (err) {
+ return callback(err);
+ }
+
+ callback(null, body.resource_types);
+ });
+};
+
+/**
+ * client.getResourceSchema
+ *
+ * @description get the schema for a provided resource type
+ *
+ * @param {string} resourceType the resourceType to get the schema for
+ * @param {function} callback f(err, schema)
+ * @returns {*}
+ */
+exports.getResourceSchema = function (resourceType, callback) {
+ var self = this;
+
+ return self._request({
+ path: urlJoin(_urlPrefix, resourceType)
+ }, function (err, schema) {
+ if (err) {
+ return callback(err);
+ }
+
+ callback(null, schema);
+ });
+};
+
+/**
+ * client.getResourceTemplate
+ *
+ * @description get the template for a provided resource type
+ *
+ * @param {string} resourceType the resourceType to get the template for
+ * @param {function} callback f(err, template)
+ * @returns {*}
+ */
+exports.getResourceTemplate = function (resourceType, callback) {
+ var self = this;
+
+ return self._request({
+ path: urlJoin(_urlPrefix, resourceType, 'template')
+ }, function (err, template) {
+ if (err) {
+ return callback(err);
+ }
+
+ callback(null, template);
+ });
+};
diff --git a/lib/pkgcloud/openstack/orchestration/client/stacks.js b/lib/pkgcloud/openstack/orchestration/client/stacks.js
new file mode 100644
index 000000000..4023f9a62
--- /dev/null
+++ b/lib/pkgcloud/openstack/orchestration/client/stacks.js
@@ -0,0 +1,369 @@
+/*
+ * stacks.js: Instance methods for working with stacks from OpenStack Orchestration
+ *
+ * (C) 2014 Rackspace
+ * Ken Perkins
+ * MIT LICENSE
+ */
+
+var pkgcloud = require('../../../../../lib/pkgcloud'),
+ errs = require('errs'),
+ urlJoin = require('url-join'),
+ util = require('util'),
+ _ = require('lodash'),
+ orchestration = pkgcloud.providers.openstack.orchestration;
+
+var _urlPrefix = '/stacks';
+
+/**
+ * validateProperties
+ *
+ * @description local helper function for validating arguments
+ *
+ * @param {Array} required The list of required properties
+ * @param {object} options The options object to validate
+ * @param {String} formatString String formatter for the error message
+ * @param {Function} callback
+ * @returns {boolean}
+ */
+function validateProperties(required, options, formatString, callback) {
+ return !required.some(function (item) {
+ if (typeof(options[item]) === 'undefined') {
+ errs.handle(
+ errs.create({ message: util.format(formatString, item) }),
+ callback
+ );
+ return true;
+ }
+ return false;
+ });
+}
+
+/**
+ * client.getStack
+ *
+ * @description Gets a stack from the account
+ *
+ * @param {String|object} stack The stack or stackName to fetch
+ * @param {Function} callback
+ * @returns {request|*}
+ */
+exports.getStack = function (stack, callback) {
+ var self = this,
+ path = stack instanceof orchestration.Stack
+ ? urlJoin(_urlPrefix, stack.name, stack.id)
+ : urlJoin(_urlPrefix, stack);
+
+ return this._request({
+ path: path
+ }, function (err, body) {
+ if (err) {
+ return callback(err);
+ }
+ if (!body.stack) {
+ return new Error('Unexpected empty response');
+ }
+ else {
+ callback(null, new orchestration.Stack(self, body.stack));
+ }
+ });
+};
+
+/**
+ * client.getStacks
+ *
+ * @description get the list of stacks for the current account
+ *
+ * @param {object|Function} [options] A set of options for the getStacks call
+ * @param {function} callback f(err, stacks) where stacks is an array of Stack
+ * @returns {*}
+ */
+exports.getStacks = function getStacks(options, callback) {
+ var self = this;
+
+ if (typeof options === 'function') {
+ callback = options;
+ options = {};
+ }
+
+ var requestOptions = {
+ path: _urlPrefix
+ };
+
+ requestOptions.qs = _.pick(options,
+ 'status',
+ 'name',
+ 'limit',
+ 'marker',
+ 'sort');
+
+ if (options.sortDir) {
+ requestOptions.qs['sort_dir'] = options.sortDir;
+ }
+
+ if (options.sortKeys) {
+ requestOptions.qs['sort_keys'] = options.sortKeys;
+ }
+
+ return this._request(requestOptions, function (err, body) {
+ if (err) {
+ callback(err);
+ return;
+ }
+
+ callback(err, body.stacks.map(function(stack) {
+ return new orchestration.Stack(self, stack);
+ }));
+ });
+};
+
+/**
+ * client.createStack
+ *
+ * @description Creates a stack with the specified options.
+
+ * @param {object} details the details to create this stack
+ * @param {String} details.name the name of the new stack
+ * @param {Number} details.timeout timeout in minutes for stack creation
+ * @param {String} [details.environment] the environment for the stack
+ * @param {Object} [details.template] template for the stack, required unless templateUrl is provided
+ * @param {String} [details.templateUrl] url for the template, required if no template
+ * @param {Object} [details.parameters] optional parameters configuration
+ * @param {Object} [details.files] optional files configuration
+ * @param callback
+ * @returns {request|null}
+ */
+exports.createStack = function (details, callback) {
+ if (typeof details === 'function') {
+ callback = details;
+ details = {};
+ }
+
+ details = details || {};
+
+ if (!validateProperties(['name', 'timeout'], details,
+ 'options.%s is a required argument.', callback)) {
+ return;
+ }
+
+ if (!details.templateUrl && !details.template) {
+ callback(new Error('one of template or templateUrl are required'));
+ return;
+ }
+
+ var self = this,
+ createOptions = {
+ method: 'POST',
+ path: details.preview ? urlJoin(_urlPrefix, 'preview'): _urlPrefix,
+ body: {
+ stack_name: details.name,
+ // environment is required from the API, but may be empty
+ environment: details.environment ? JSON.stringify(details.environment) : JSON.stringify({}),
+ timeout_mins: typeof details.timeout === 'number' ? details.timeout : parseInt(details.timeout)
+ }
+ };
+
+ if (details.template) {
+ createOptions.body.template = details.template;
+ }
+ else if (details.templateUrl) {
+ createOptions.body['template_url'] = details.templateUrl;
+ }
+
+ if (details.parameters) {
+ createOptions.body.parameters = details.parameters;
+ }
+
+ if (details.files) {
+ createOptions.body.files = details.files;
+ }
+
+ // Adopt Stack options
+ if (details.stackData) {
+ createOptions.body['adopt_stack_data'] = JSON.stringify(details.stackData);
+
+ if (typeof details.disableRollback === 'boolean') {
+ createOptions.body['disable_rollback'] = details.disableRollback;
+ }
+
+ // if we're adopting a stack, copy the parameters (if any) from the stackData to
+ // the request payload
+ if (details.stackData.parameters) {
+ createOptions.body.parameters = details.stackData.parameters;
+ }
+ }
+
+ return self._request(createOptions, function (err, body) {
+ if (err) {
+ return callback(err);
+ }
+
+ if (!body || !body.stack) {
+ return new Error('Stack not passed back from OpenStack.');
+ }
+
+ // since createStack returns an href to the stack, lets go fetch it
+ self.getStack(body.stack.id, callback);
+ });
+};
+
+/**
+ * client.previewStack
+ *
+ * @description Preview a stack creation with the specified options.
+
+ * @param {object} details the details to create this stack
+ * @param {String} details.name the name of the new stack
+ * @param {String} details.environment the environment for the stack
+ * @param {Number} details.timeout timeout in minutes for stack creation
+ * @param {Object} [details.template] template for the stack, required unless templateUrl is provided
+ * @param {String} [details.templateUrl] url for the template, required if no template
+ * @param {Object} [details.parameters] optional parameters configuration
+ * @param {Object} [details.files] optional files configuration
+ * @param callback
+ * @returns {request|*}
+ */
+exports.previewStack = function(details, callback) {
+ return this.createStack(_.extend(details, { preview: true }), callback);
+};
+
+/**
+ * client.adoptStack
+ *
+ * @description adopt a stack from previously abandoned resources
+
+ * @param {object} details the details to create this stack
+ * @param {String} details.name the name of the new stack
+ * @param {String} details.environment the environment for the stack
+ * @param {Number} details.timeout timeout in minutes for stack creation
+ * @param {Object} details.stackData Object with stack data to adopt
+ * @param {Boolean} details.disableRollback Controls whetehr a failure during stack creation causes deletion
+ * @param {Object} [details.template] template for the stack, required unless templateUrl is provided
+ * @param {String} [details.templateUrl] url for the template, required if no template
+ * @param {Object} [details.parameters] optional parameters configuration
+ * @param {Object} [details.files] optional files configuration
+ * @param callback
+ * @returns {request|*}
+ */
+exports.adoptStack = function (details, callback) {
+ return this.createStack(details, callback);
+};
+
+/**
+ * client.updateStack
+ *
+ * @description Update a stack
+ *
+ * @param {String|object} stack The stack or stackName to update
+ * @param {Function} callback
+ * @returns {request|*}
+ */
+exports.updateStack = function (stack, callback) {
+ if (!(stack instanceof orchestration.Stack)) {
+ callback(new Error('you must provide a stack to update'));
+ return;
+ }
+
+ return this._request({
+ path: urlJoin(_urlPrefix, stack.name, stack.id),
+ body: {
+ template_url: stack.templateUrl,
+ template: stack.template,
+ files: stack.files,
+ environment: stack.environment,
+ parameters: stack.parameters,
+ timeout_mins: stack.timeout
+ },
+ method: 'PUT'
+ }, function (err) {
+ if (err) {
+ return callback(err);
+ }
+
+ callback(err, stack);
+ });
+};
+
+/**
+ * client.deleteStack
+ *
+ * @description Delete a stack from the account
+ *
+ * @param {String|object} stack The stack or stackName to delete
+ * @param {Function} callback
+ * @returns {request|*}
+ */
+exports.deleteStack = function (stack, callback) {
+ var self = this;
+
+ var deleteStack = function(stack) {
+ return self._request({
+ path: urlJoin(_urlPrefix, stack.name, stack.id),
+ method: 'DELETE'
+ }, function(err) {
+ if (err) {
+ return callback(err);
+ }
+ callback(err, true);
+ });
+ };
+
+ if (typeof stack === 'string') {
+ self.getStack(stack, function(err, stack) {
+ if (err) {
+ return callback(err);
+ }
+ return deleteStack(stack);
+ });
+ } else if (stack instanceof orchestration.Stack) {
+ return deleteStack(stack);
+ } else {
+ return callback(new Error('stack must be a string or stack instance'));
+ }
+};
+
+/**
+ * client.abandonStack
+ *
+ * @description Delete a stack, but preserve the created resources
+ *
+ * @param {String|object} stack The stack or stackName to abandon
+ * @param {Function} callback
+ * @returns {request|*}
+ */
+exports.abandonStack = function (stack, callback) {
+ var self = this;
+
+ function abandon(stack) {
+ return self._request({
+ path: urlJoin(_urlPrefix, stack.name, stack.id, 'abandon'),
+ method: 'DELETE'
+ }, function (err, abandonStackData) {
+ if (err) {
+ return callback(err);
+ }
+
+ callback(err, abandonStackData);
+ });
+ }
+
+ if (typeof stack === 'string') {
+ self.getStack(stack, function(err, stack) {
+ if (err) {
+ callback(err);
+ return;
+ }
+
+ abandon(stack);
+ });
+
+ return;
+ }
+ else if (!(stack instanceof orchestration.stack)) {
+ callback(new Error('stack must be a string or stack instance'));
+ return;
+ }
+
+ abandon(stack);
+
+};
diff --git a/lib/pkgcloud/openstack/orchestration/client/templates.js b/lib/pkgcloud/openstack/orchestration/client/templates.js
new file mode 100644
index 000000000..c4482234b
--- /dev/null
+++ b/lib/pkgcloud/openstack/orchestration/client/templates.js
@@ -0,0 +1,96 @@
+/*
+ * templates.js: Instance methods for working with templates from OpenStack Orchestration
+ *
+ * (C) 2014 Rackspace
+ * Ken Perkins
+ * MIT LICENSE
+ */
+var pkgcloud = require('../../../../../lib/pkgcloud'),
+ urlJoin = require('url-join'),
+ orchestration = pkgcloud.providers.openstack.orchestration;
+
+var _urlPrefix = '/stacks';
+
+/**
+ * client.getTemplate
+ *
+ * @description get the template for a provided stack
+ *
+ * @param {object|string} stack the stackName or stack for the template query
+ * @param {function} callback f(err, template)
+ * @returns {*}
+ */
+exports.getTemplate = function (stack, callback) {
+ var self = this;
+
+ function getTemplate(stack) {
+ return self._request({
+ path: urlJoin(_urlPrefix, stack.name, stack.id, 'template')
+ }, function (err, body) {
+ if (err) {
+ return callback(err);
+ }
+ if (!body) {
+ return new Error('Unexpected empty response');
+ }
+ else {
+ callback(null, body);
+ }
+ });
+ }
+
+ if (stack instanceof orchestration.Stack) {
+ getTemplate(stack);
+ }
+ else if (typeof stack === 'string') {
+ self.getStack(stack, function(err, stack) {
+ if (err) {
+ callback(err);
+ return;
+ }
+
+ getTemplate(stack);
+ });
+ }
+
+};
+
+/**
+ * client.validateTemplate
+ *
+ * @description validate a provided template
+ *
+ * @param {object|string} template the template or templateUrl to validate
+ * @param {function} callback f(err, template)
+ * @returns {*}
+ */
+exports.validateTemplate = function (template, callback) {
+ var self = this,
+ requestOpts = {
+ path: urlJoin('/validate'),
+ method: 'POST',
+ body: {}
+ };
+
+ if (typeof template === 'string') {
+ requestOpts.body.template_url = template;
+ }
+ else if (typeof template === 'object') {
+ requestOpts.body.template = template;
+ }
+ else {
+ callback(new Error('please provide either a template object, or a templateUrl'));
+ }
+
+ return self._request(requestOpts, function (err, body) {
+ if (err) {
+ return callback(err);
+ }
+ if (!body) {
+ return new Error('Unexpected empty response');
+ }
+ else {
+ callback(null, body);
+ }
+ });
+};
diff --git a/lib/pkgcloud/openstack/orchestration/index.js b/lib/pkgcloud/openstack/orchestration/index.js
new file mode 100644
index 000000000..56642940b
--- /dev/null
+++ b/lib/pkgcloud/openstack/orchestration/index.js
@@ -0,0 +1,15 @@
+/*
+ * index.js: Top-level include for the OpenStack orchestration module
+ *
+ * (C) 2014 Rackspace
+ * Ken Perkins
+ * MIT LICENSE
+ */
+
+exports.Client = require('./client').Client;
+exports.Stack = require('./stack').Stack;
+exports.Resource = require('./resource').Resource;
+
+exports.createClient = function (options) {
+ return new exports.Client(options);
+};
diff --git a/lib/pkgcloud/openstack/orchestration/resource.js b/lib/pkgcloud/openstack/orchestration/resource.js
new file mode 100644
index 000000000..1fc5a7ad9
--- /dev/null
+++ b/lib/pkgcloud/openstack/orchestration/resource.js
@@ -0,0 +1,48 @@
+/*
+ * volume.js: OpenStack Orchestration Stack
+ *
+ * (C) 2014 Rackspace
+ * Ken Perkins
+ * MIT LICENSE
+ *
+ */
+
+var util = require('util'),
+ base = require('../../core/base'),
+ Stack = require('./stack').Stack,
+ _ = require('lodash');
+
+var Resource = exports.Resource = function Stack(client, details) {
+ base.Model.call(this, client, details);
+};
+
+util.inherits(Resource, base.Model);
+
+Resource.prototype._setProperties = function (details) {
+ this.name = details.name || details['resource_name'];
+ this.status = details.status || details['resource_status'];
+ this.stack = details.stack;
+ this.statusReason = details.statusReason || details['resource_status_reason'];
+ this.type = details.type || details['resource_type'];
+ this.logicalResourceId = details.logicalResourceId || details['logical_resource_id'];
+ this.physicalResourceId = details.physicalResourceId || details['physical_resource_id'];
+ this.requiredBy = details.requiredBy || details['required_by'];
+ this.updatedAt = details.updatedAt || details['updated_time'];
+ this.links = details.links;
+};
+
+Resource.prototype.toJSON = function () {
+
+ var data = _.pick(this, ['name', 'status', 'statusReason', 'type', 'logicalResourceId', 'physicalResourceId',
+ 'requiredBy', 'updatedAt', 'links']);
+
+ this.stack instanceof Stack ? data.stack = this.stack.toJSON() : {};
+
+ return data;
+
+};
+
+
+
+
+
diff --git a/lib/pkgcloud/openstack/orchestration/stack.js b/lib/pkgcloud/openstack/orchestration/stack.js
new file mode 100644
index 000000000..f9c9b894a
--- /dev/null
+++ b/lib/pkgcloud/openstack/orchestration/stack.js
@@ -0,0 +1,56 @@
+/*
+ * volume.js: OpenStack Orchestration Stack
+ *
+ * (C) 2014 Rackspace
+ * Ken Perkins
+ * MIT LICENSE
+ *
+ */
+
+var util = require('util'),
+ base = require('../../core/base'),
+ _ = require('lodash');
+
+var Stack = exports.Stack = function Stack(client, details) {
+ base.Model.call(this, client, details);
+};
+
+util.inherits(Stack, base.Model);
+
+Stack.prototype.refresh = function (callback) {
+ var self = this;
+ return self.client.getStack(this, function (err, stack) {
+ if (!err) {
+ self._setProperties(stack.original);
+ }
+
+ return callback.apply(this, arguments);
+ });
+};
+
+Stack.prototype._setProperties = function (details) {
+ this.id = details.id;
+ this.name = details.name || details['stack_name'];
+ this.status = details.status || details['stack_status'];
+ this.description = details.description;
+ this.templateDescription = details.templateDescription || details['template_description'];
+ this.statusReason = details.statusReason || details['stack_status_reason'];
+ this.owner = details.owner || details['stack_owner'];
+ this.disableRollback = details.disableRollback || details['disable_rollback'];
+ this.parameters = details.parameters;
+ this.capabilities = details.capabilities;
+ this.notificationTopics = details.notificationTopics || details['notification_topics'];
+ this.timeout = details.timeout || details['timeout_mins'];
+
+ this.createdAt = details['creation_time'];
+ this.updatedAt = details['updated_time'];
+
+ this.outputs = details['outputs'];
+
+ this.original = this.openstack = details;
+};
+
+Stack.prototype.toJSON = function () {
+ return _.pick(this, ['id', 'name', 'status', 'description', 'templateDescription', 'statusReason', 'owner',
+ 'disableRollback', 'parameters', 'capabilities', 'notificationTopics', 'timeout', 'updatedAt', 'createdAt', 'outputs' ]);
+};
diff --git a/lib/pkgcloud/openstack/storage/client/account.js b/lib/pkgcloud/openstack/storage/client/account.js
new file mode 100644
index 000000000..f10f51359
--- /dev/null
+++ b/lib/pkgcloud/openstack/storage/client/account.js
@@ -0,0 +1,101 @@
+var crypto = require('crypto');
+
+/**
+ * client.getTemporaryUrlKey
+ *
+ * @description get the previously set temporaryUrl key on the current account
+ *
+ * @param callback
+ */
+exports.getTemporaryUrlKey = function (callback) {
+ var self = this;
+
+ this._request({
+ method: 'HEAD'
+ }, function (err, body, res){
+ if(err) {
+ return callback(err);
+ }
+
+ var temporaryUrlKey = res.headers[self.ACCOUNT_META_PREFIX + 'temp-url-key'];
+ callback(null, temporaryUrlKey);
+ });
+
+};
+
+/**
+ * client.setTemporaryUrlKey
+ *
+ * @description set a temporaryUrl key on the current account
+ *
+ * @param {String} key the secret key to be used in hmac signing temporary urls
+ * @param callback
+ */
+exports.setTemporaryUrlKey = function (key, callback) {
+ if(!key){
+ return process.nextTick(function(){
+ callback(new Error('A temporary URL key must be provided'));
+ });
+ }
+
+ this._request({
+ method: 'POST',
+ headers: {
+ 'x-account-meta-temp-url-key': key
+ }
+ }, function(err){
+ callback(err);
+ });
+};
+
+/**
+ * client.generateTempUrl
+ *
+ * @description create a temporary url for GET/PUT to a cloud files container
+ *
+ * @param {String|object} container the container or container name for the url
+ * @param {String|object} file the file or fileName for the url
+ * @param {String} method either GET or PUT
+ * @param {Number} time expiry for the url in seconds (from now)
+ * @param {String} key the secret key to be used for signing the url
+ * @param callback
+ */
+exports.generateTempUrl = function(container, file, method, time, key, callback) {
+ var containerName = container instanceof this.models.Container ? container.name : container,
+ fileName = file instanceof this.models.File ? file.name : file,
+ time = typeof time === 'number' ? time : parseInt(time),
+ self = this,
+ split = '/v1';
+
+ function createUrl() {
+ // construct our hmac signature
+ var expiry = parseInt(new Date().getTime() / 1000) + time,
+ url = self._getUrl({
+ container: containerName,
+ path: fileName
+ }),
+ hmac_body = method.toUpperCase() + '\n' + expiry + '\n' + split + url.split(split)[1];
+
+ var hash = crypto.createHmac('sha1', key).update(hmac_body).digest('hex');
+
+ callback(null, url + '?temp_url_sig=' + hash + '&temp_url_expires=' + expiry);
+ }
+
+ // We have to be authed to make sure we have the service catalog
+ // this is required to validate the service url
+
+ if (!this._isAuthorized()) {
+ this.auth(function(err) {
+ if (err) {
+ callback(err);
+ return;
+ }
+
+ createUrl();
+ });
+
+ return;
+ }
+
+ createUrl();
+};
diff --git a/lib/pkgcloud/openstack/storage/client/containers.js b/lib/pkgcloud/openstack/storage/client/containers.js
index 53325b27f..646107a13 100644
--- a/lib/pkgcloud/openstack/storage/client/containers.js
+++ b/lib/pkgcloud/openstack/storage/client/containers.js
@@ -8,10 +8,7 @@
*/
var async = require('async'),
- request = require('request'),
- base = require('../../../core/storage'),
- pkgcloud = require('../../../../pkgcloud'),
- _ = require('underscore');
+ _ = require('lodash');
/**
* client.getContainers
@@ -44,7 +41,7 @@ exports.getContainers = function (options, callback) {
return callback(err);
}
else if (!body || !(body instanceof Array)) {
- return new Error('Malformed API Response')
+ return new Error('Malformed API Response');
}
return callback(null, body.map(function (container) {
@@ -190,34 +187,53 @@ exports.destroyContainer = function (container, callback) {
var containerName = container instanceof this.models.Container ? container.name : container,
self = this;
- this.getFiles(container, function (err, files) {
+ // first fetch the container, to get the count of objects
+ this.getContainer(container, function(err, container) {
if (err) {
- return callback(err);
+ callback(err);
+ return;
}
- function deleteContainer(err) {
+ // we need to call get files, but with a limit of the current count of the container
+ // with a modest offset incase of any cache staleness
+ self.getFiles(container, { limit: container.count + 1000 }, function (err, files) {
if (err) {
return callback(err);
}
- self._request({
- method: 'DELETE',
- container: containerName
- }, function(err) {
- return err
- ? callback(err)
- : callback(null, true);
- });
- }
+ function deleteContainer(err) {
+ if (err) {
+ return callback(err);
+ }
+
+ self._request({
+ method: 'DELETE',
+ container: containerName
+ }, function (err) {
+ // if the file we're deleting returns a 404 error, ignore it
+ if (err && err.statusCode === 404) {
+ callback(null, false);
+ return;
+ }
+ // non-404 case, propagate it
+ else if (err) {
+ callback(err);
+ return;
+ }
+
+ callback(null, true);
+ });
+ }
- function destroyFile(file, next) {
- file.remove(next);
- }
+ function destroyFile(file, next) {
+ file.remove(next);
+ }
- if (files.length === 0) {
- return deleteContainer();
- }
+ if (files.length === 0) {
+ return deleteContainer();
+ }
- async.forEach(files, destroyFile, deleteContainer);
+ async.forEachLimit(files, 15, destroyFile, deleteContainer);
+ });
});
};
diff --git a/lib/pkgcloud/openstack/storage/client/files.js b/lib/pkgcloud/openstack/storage/client/files.js
index 397a73661..c29387137 100644
--- a/lib/pkgcloud/openstack/storage/client/files.js
+++ b/lib/pkgcloud/openstack/storage/client/files.js
@@ -6,15 +6,12 @@
*
*/
-var fs = require('fs'),
- filed = require('filed'),
+var filed = require('filed-mimefix'),
mime = require('mime'),
- request = require('request'),
- utile = require('utile'),
base = require('../../../core/storage'),
- pkgcloud = require('../../../../pkgcloud'),
- _ = require('underscore'),
- storage = pkgcloud.providers.openstack.storage;
+ through = require('through2'),
+ _ = require('lodash'),
+ urlJoin = require('url-join');
/**
* client.removeFile
@@ -41,6 +38,36 @@ exports.removeFile = function (container, file, callback) {
);
};
+/**
+ * client.bulkDelete
+ *
+ * @description remove a list of files from a container
+ *
+ * @param {String|object} container the container or containerName
+ * @param {array} files the files or fileNames to delete
+ * @param callback
+ */
+exports.bulkDelete = function(container, files, callback) {
+ var self = this,
+ containerName = container instanceof this.models.Container ? container.name : container;
+ this._request({
+ method: 'DELETE',
+ body: files.map(function(file) {
+ return urlJoin(containerName, (file instanceof self.models.File ? file.name : file));
+ }).join('\r\n'),
+ headers: {
+ 'Content-Type': 'text/plain'
+ },
+ qs: {
+ 'bulk-delete': true
+ }
+ }, function(err, results) {
+ return err
+ ? callback(err)
+ : callback(null, results);
+ });
+};
+
/**
* client.upload
*
@@ -59,81 +86,75 @@ exports.removeFile = function (container, file, callback) {
* @param callback
* @returns {request|*}
*/
-exports.upload = function (options, callback) {
- if (typeof options === 'function' && !callback) {
- callback = options;
- options = {};
- }
+exports.upload = function (options) {
+ var self = this;
- //
- // Optional helper function passed to `this._request`
- // in the case when no callback is passed to `.upload(options)`.
- //
- function onUpload(err, body, res) {
- return err
- ? callback(err)
- : callback(null, true, res);
+ // check for deprecated calling with a callback
+ if (typeof arguments[arguments.length - 1] === 'function') {
+ self.emit('log::warn', 'storage.upload no longer supports calling with a callback');
}
var container = options.container,
- success = callback ? onUpload : null,
- self = this,
- apiStream,
- inputStream,
- uploadOptions;
-
- if (container instanceof this.models.Container) {
- container = container.name;
+ writableStream,
+ proxyStream = through(),
+ uploadOptions = {
+ method: 'PUT',
+ upload: true,
+ container: container,
+ path: options.remote,
+ headers: options.headers || {}
+ };
+
+ if (options.container instanceof this.models.Container) {
+ uploadOptions.container = options.container.name;
}
- uploadOptions = {
- method: 'PUT',
- upload: true,
- container: container,
- path: options.remote,
- headers: options.headers || {}
- };
-
- if (options.local) {
- inputStream = filed(options.local);
- uploadOptions.headers['content-length'] = fs.statSync(options.local).size;
+ if (options.contentType) {
+ uploadOptions.headers['content-type'] = options.contentType;
}
- else if (options.stream) {
- inputStream = options.stream;
+ else {
+ uploadOptions.headers['content-type'] = mime.getType(options.remote);
}
- if (!uploadOptions.headers['content-type']) {
- uploadOptions.headers['content-type'] = mime.lookup(options.remote);
+ if (options.metadata) {
+ uploadOptions.headers = _.extend(uploadOptions.headers,
+ self.serializeMetadata(self.OBJECT_META_PREFIX, options.metadata));
}
- // If the inputStream is a request stream, headers are automatically
- // copied from the source stream to the destination stream.
- // As CloudFiles uses ETag to compute an md5 hash, this leads to a case
- // where a remote resource with an ETag, piped via request to CloudFiles with
- // pkgcloud, would result in a 422 "Unable to Process" error.
- //
- // As a result, we explicitly only opt in 'Content-Type' and 'Content-Length'
- // if there is a response handler on the inputStream
- if (inputStream) {
- inputStream.on('response', function(response) {
- response.headers = {
- 'content-type': response.headers['content-type'],
- 'content-length': response.headers['content-length']
+ writableStream = this._request(uploadOptions);
+
+ writableStream.on('complete', function(response) {
+ var err = self._parseError(response);
+
+ if (err) {
+ proxyStream.emit('error', err);
+ return;
+ }
+
+ // load the file metadata from the cloud, so we can return a proper model
+ self.getFile(uploadOptions.container, options.remote, function (err, file) {
+ if (err) {
+ proxyStream.emit('error', err);
+ return;
}
+
+ proxyStream.emit('success', file);
});
- }
+ });
- if (options.metadata) {
- uploadOptions.headers = _.extend(uploadOptions.headers,
- self.serializeMetadata(self.OBJECT_META_PREFIX, options.metadata));
- }
+ writableStream.on('error', function (err) {
+ proxyStream.emit('error', err);
+ });
- apiStream = this._request(uploadOptions, success);
- if (inputStream) {
- inputStream.pipe(apiStream);
- }
+ writableStream.on('data', function (chunk) {
+ proxyStream.emit('data', chunk);
+ });
- return apiStream;
+ // we need a proxy stream so we can always return a file model
+ // via the 'success' event
+ proxyStream.pipe(writableStream);
+
+ return proxyStream;
};
/**
@@ -154,23 +175,18 @@ exports.upload = function (options, callback) {
*/
exports.download = function (options, callback) {
var self = this,
- success = callback ? onDownload : null,
container = options.container,
inputStream,
apiStream;
- //
- // Optional helper function passed to `this._request`
- // in the case when no callback is passed to `.download(options)`.
- //
- function onDownload(err, body, res) {
+ var success = !callback ? null : function (err, body, res) {
return err
? callback(err)
- : callback(null, new self.models.File(self, utile.mixin(res.headers, {
- container: container,
+ : callback(null, new self.models.File(self, _.extend(res.headers, {
+ container: options.container,
name: options.remote
})));
- }
+ };
if (container instanceof self.models.Container) {
container = container.name;
@@ -186,7 +202,8 @@ exports.download = function (options, callback) {
apiStream = this._request({
container: container,
path: options.remote,
- download: true
+ download: true,
+ headers: options.headers
}, success);
if (inputStream) {
@@ -219,7 +236,7 @@ exports.getFile = function (container, file, callback) {
}, function (err, body, res) {
return err
? callback(err)
- : callback(null, new self.models.File(self, utile.mixin(res.headers, {
+ : callback(null, new self.models.File(self, _.extend(res.headers, {
container: container,
name: file
})));
@@ -245,6 +262,9 @@ exports.getFiles = function (container, options, callback) {
callback = options;
options = {};
}
+ else if (!options) {
+ options = {};
+ }
// If limit is not specified, or it is <=10k, just make a single request
if (!options.limit || options.limit <= 10000) {
@@ -289,18 +309,30 @@ exports._getFiles = function (container, options, callback) {
self = this;
var getFilesOpts = {
- path: containerName,
- qs: {
- format: 'json'
+ path: containerName,
+ qs: _.extend({
+ format: 'json'
+ }, _.pick(options, ['limit', 'marker', 'prefix', 'path', 'delimiter']))
+ };
+
+ if (options.endMarker) {
+ getFilesOpts.qs.end_marker = options.endMarker;
}
- };
- if (options.limit) {
- getFilesOpts.qs.limit = options.limit;
+ if (options.end_marker) {
+ getFilesOpts.qs.end_marker = options.end_marker;
+ }
+
+ if (options.prefix) {
+ getFilesOpts.qs.prefix = options.prefix;
+ }
+
+ if (options.path) {
+ getFilesOpts.qs.path = options.path;
}
- if (options.marker) {
- getFilesOpts.qs.marker = options.marker;
+ if (options.delimiter) {
+ getFilesOpts.qs.delimiter = options.delimiter;
}
this._request(getFilesOpts, function (err, body) {
@@ -309,7 +341,7 @@ exports._getFiles = function (container, options, callback) {
return callback(err);
}
else if (!body || !(body instanceof Array)) {
- return new Error('Malformed API Response')
+ return new Error('Malformed API Response');
}
return callback(null, body.map(function (file) {
@@ -323,7 +355,7 @@ exports._getFiles = function (container, options, callback) {
* client.updateFileMetadata
*
* @description Updates the specified `file` with the provided metadata `headers`
- * in the Rackspace Cloud Files account associated with this instance.
+ * in the Openstack account associated with this instance.
*
* @param {String|object} container the container or containerName
* @param {String|object} file the file or fileName to update
@@ -333,7 +365,7 @@ exports.updateFileMetadata = function (container, file, callback) {
var self = this,
containerName = container instanceof self.models.Container ? container.name : container;
- if (!file instanceof base.File) {
+ if (!(file instanceof base.File)) {
throw new Error('Must update an existing file instance');
}
@@ -351,4 +383,41 @@ exports.updateFileMetadata = function (container, file, callback) {
});
};
+/**
+ * client.copy
+ *
+ * @description copies a file to another location in the same or different container.
+ *
+ * @param {object} options
+ * @param {String|object} options.sourceContainer the source container
+ * @param {String|object} options.destinationContainer the destination container
+ * @param {String|object} options.sourceFile the file to copy
+ * @param {String|object} [options.destinationFile] the destination to copy to
+ * @param {String|object} [options.headers] headers to send with the request
+ * @param callback
+ */
+exports.copy = function (options, callback) {
+ var self = this,
+ containerName = options.sourceContainer instanceof self.models.Container ? options.sourceContainer.name : options.sourceContainer,
+ destContainerName = options.destinationContainer instanceof self.models.Container ? options.destinationContainer.name : options.destinationContainer,
+ destinationFile = options.destinationFile || options.sourceFile;
+
+ var copyOptions = {
+ method: 'COPY',
+ uri: options.sourceFile instanceof self.models.File ? options.sourceFile.fullPath : this._getUrl({
+ container: containerName,
+ path: options.sourceFile
+ }),
+ headers: _.extend(options.headers || {}, {
+ destination: urlJoin('/', destContainerName,
+ destinationFile instanceof self.models.File ? destinationFile.name : destinationFile)
+ })
+ };
+
+ this._request(copyOptions, function (err) {
+ return err
+ ? callback(err)
+ : callback(null, true);
+ });
+};
diff --git a/lib/pkgcloud/openstack/storage/client/index.js b/lib/pkgcloud/openstack/storage/client/index.js
index 216e78266..b219a23e6 100644
--- a/lib/pkgcloud/openstack/storage/client/index.js
+++ b/lib/pkgcloud/openstack/storage/client/index.js
@@ -6,13 +6,18 @@
*
*/
-var utile = require('utile'),
- urlJoin = require('url-join'),
+var util = require('util'),
openstack = require('../../client'),
StorageClient = require('../storageClient').StorageClient,
- _ = require('underscore');
+ _ = require('lodash');
var Client = exports.Client = function (options) {
+ // explicitly prevent service catalog usage if using version 1.0 for swift
+ // this must happen before we call into the base openstack client.
+ if (options.version === 1 || options.version === '/v1.0') {
+ options.useServiceCatalog = false;
+ }
+
openstack.Client.call(this, options);
this.models = {
@@ -20,11 +25,12 @@ var Client = exports.Client = function (options) {
File: require('../file').File
};
- utile.mixin(this, require('./containers'));
- utile.mixin(this, require('./files'));
+ _.extend(this, require('./containers'));
+ _.extend(this, require('./files'));
+ _.extend(this, require('./account'));
this.serviceType = 'object-store';
};
-utile.inherits(Client, openstack.Client);
+util.inherits(Client, openstack.Client);
_.extend(Client.prototype, StorageClient.prototype);
diff --git a/lib/pkgcloud/openstack/storage/container.js b/lib/pkgcloud/openstack/storage/container.js
index f996a9cbc..75fc9033a 100644
--- a/lib/pkgcloud/openstack/storage/container.js
+++ b/lib/pkgcloud/openstack/storage/container.js
@@ -6,15 +6,15 @@
*
*/
-var utile = require('utile'),
+var util = require('util'),
base = require('../../core/storage/container'),
- _ = require('underscore');
+ _ = require('lodash');
var Container = exports.Container = function Container(client, details) {
base.Container.call(this, client, details);
};
-utile.inherits(Container, base.Container);
+util.inherits(Container, base.Container);
Container.prototype.updateMetadata = function (callback) {
this.client.updateContainerMetadata(this.container, callback);
@@ -28,7 +28,7 @@ Container.prototype._setProperties = function (details) {
this.name = details.name || this.name;
this.ttl = details.ttl || this.ttl;
this.logRetention = details.logRetention || this.logRetention;
- this.count = details.count || this.count || 0
+ this.count = details.count || this.count || 0;
this.bytes = details.bytes || this.bytes || 0;
this.metadata = details.metadata || this.metadata || {};
};
diff --git a/lib/pkgcloud/openstack/storage/file.js b/lib/pkgcloud/openstack/storage/file.js
index 5b164cd0b..bf5162dc8 100644
--- a/lib/pkgcloud/openstack/storage/file.js
+++ b/lib/pkgcloud/openstack/storage/file.js
@@ -6,35 +6,22 @@
*
*/
-var utile = require('utile'),
+var util = require('util'),
+ _ = require('lodash'),
base = require('../../core/storage/file');
var File = exports.File = function File(client, details) {
base.File.call(this, client, details);
};
-utile.inherits(File, base.File);
+util.inherits(File, base.File);
File.prototype.updateMetadata = function (callback) {
this.client.updateFileMetadata(this.container, this, callback);
};
-// Remark: This method is untested
-File.prototype.copy = function (container, destination, callback) {
- var copyOptions = {
- method: 'PUT',
- uri: this.fullPath,
- headers: {
- 'X-COPY-DESTINATION': [container, destination].join('/'),
- 'CONTENT-LENGTH': this.bytes
- }
- };
-
- this.client._request(copyOptions, function (err, body, res) {
- return err
- ? callback(err)
- : callback(null, true);
- });
+File.prototype.copy = function (options, callback) {
+ this.client.copy(options, callback);
};
File.prototype._setProperties = function (details) {
@@ -42,9 +29,14 @@ File.prototype._setProperties = function (details) {
this.metadata = {};
this.container = details.container || null;
- this.name = details.name || null;
+ this.name = details.name || details.subdir || null;
this.etag = details.etag || details.hash || null;
- this.contentType = details['content-type'] || details['content_type'] || null;
+
+ if (details.subdir) {
+ this.contentType = 'application/directory';
+ } else {
+ this.contentType = details['content-type'] || details['content_type'] || null;
+ }
this.lastModified = details['last-modified']
? new Date(details['last-modified'])
@@ -66,3 +58,7 @@ File.prototype._setProperties = function (details) {
});
};
+File.prototype.toJSON = function () {
+ return _.pick(this, ['name', 'etag', 'size', 'storageClass', 'lastModified', 'container', 'location' ]);
+};
+
diff --git a/lib/pkgcloud/openstack/storage/storageClient.js b/lib/pkgcloud/openstack/storage/storageClient.js
index 22373fea1..1420910f9 100644
--- a/lib/pkgcloud/openstack/storage/storageClient.js
+++ b/lib/pkgcloud/openstack/storage/storageClient.js
@@ -9,16 +9,17 @@
*/
var urlJoin = require('url-join'),
- _ = require('underscore');
+ _ = require('lodash');
const CONTAINER_META_PREFIX = 'x-container-meta-';
const CONTAINER_REMOVE_META_PREFIX = 'x-remove-container-meta-';
const OBJECT_META_PREFIX = 'x-object-meta-';
const OBJECT_REMOVE_META_PREFIX = 'x-object-remove-meta-';
+const ACCOUNT_META_PREFIX = 'x-account-meta-';
var Client = exports.StorageClient = function () {
this.serviceType = 'object-store';
-}
+};
/**
* client._getUrl
@@ -87,9 +88,11 @@ Client.prototype.deserializeMetadata = function (prefix, metadata) {
return deserializedMetadata;
};
+
+
Client.prototype.CONTAINER_META_PREFIX = CONTAINER_META_PREFIX;
Client.prototype.CONTAINER_REMOVE_META_PREFIX = CONTAINER_REMOVE_META_PREFIX;
Client.prototype.OBJECT_META_PREFIX = OBJECT_META_PREFIX;
Client.prototype.OBJECT_REMOVE_META_PREFIX = OBJECT_REMOVE_META_PREFIX;
-
+Client.prototype.ACCOUNT_META_PREFIX = ACCOUNT_META_PREFIX;
diff --git a/lib/pkgcloud/rackspace/blockstorage/client/index.js b/lib/pkgcloud/rackspace/blockstorage/client/index.js
index 25cd95d90..75e836176 100644
--- a/lib/pkgcloud/rackspace/blockstorage/client/index.js
+++ b/lib/pkgcloud/rackspace/blockstorage/client/index.js
@@ -7,21 +7,22 @@
*
*/
-var utile = require('utile'),
+var util = require('util'),
urlJoin = require('url-join'),
- rackspace = require('../../client');
+ rackspace = require('../../client'),
+ _ = require('lodash');
var Client = exports.Client = function (options) {
rackspace.Client.call(this, options);
- utile.mixin(this, require('./volumetypes'));
- utile.mixin(this, require('./snapshots'));
- utile.mixin(this, require('./volumes'));
+ _.extend(this, require('../../../openstack/blockstorage/client/volumetypes'));
+ _.extend(this, require('../../../openstack/blockstorage/client/snapshots'));
+ _.extend(this, require('../../../openstack/blockstorage/client/volumes'));
this.serviceType = 'volume';
};
-utile.inherits(Client, rackspace.Client);
+util.inherits(Client, rackspace.Client);
Client.prototype._getUrl = function (options) {
options = options || {};
diff --git a/lib/pkgcloud/rackspace/blockstorage/index.js b/lib/pkgcloud/rackspace/blockstorage/index.js
index c48916fee..9c8abcd17 100644
--- a/lib/pkgcloud/rackspace/blockstorage/index.js
+++ b/lib/pkgcloud/rackspace/blockstorage/index.js
@@ -8,9 +8,9 @@
*/
exports.Client = require('./client').Client;
-exports.Volume = require('./volume').Volume;
-exports.VolumeType = require('./volumetype').VolumeType;
-exports.Snapshot = require('./snapshot').Snapshot;
+exports.Volume = require('../../openstack/blockstorage/volume').Volume;
+exports.VolumeType = require('../../openstack/blockstorage/volumetype').VolumeType;
+exports.Snapshot = require('../../openstack/blockstorage/snapshot').Snapshot;
exports.createClient = function (options) {
return new exports.Client(options);
diff --git a/lib/pkgcloud/rackspace/cdn/client/index.js b/lib/pkgcloud/rackspace/cdn/client/index.js
new file mode 100644
index 000000000..b96452754
--- /dev/null
+++ b/lib/pkgcloud/rackspace/cdn/client/index.js
@@ -0,0 +1,51 @@
+/*
+ * client.js: client for Rackspace CDN
+ *
+ * (C) 2014 Rackspace
+ * Shaunak Kashyap
+ * MIT License
+ */
+
+var util = require('util'),
+ rackspace = require('../../client'),
+ urlJoin = require('url-join'),
+ _ = require('lodash');
+
+var Client = exports.Client = function (options) {
+ rackspace.Client.call(this, options);
+
+ this.models = {
+ Service: require('../../../openstack/cdn/service').Service,
+ Flavor: require('../../../openstack/cdn/flavor').Flavor
+ };
+
+ _.extend(this, require('../../../openstack/cdn/client/base'));
+ _.extend(this, require('../../../openstack/cdn/client/services'));
+ _.extend(this, require('../../../openstack/cdn/client/flavors'));
+
+ this.serviceType = 'rax:cdn';
+};
+
+util.inherits(Client, rackspace.Client);
+
+/**
+ * client._getUrl
+ *
+ * @description get the url for the current compute service
+ *
+ * @param options
+ * @returns {exports|*}
+ * @private
+ */
+Client.prototype._getUrl = function (options) {
+ options = options || {};
+
+ if (!this._serviceUrl) {
+ throw new Error('Service url not found');
+ }
+
+ return urlJoin(this._serviceUrl,
+ typeof options === 'string'
+ ? options
+ : options.path);
+};
diff --git a/lib/pkgcloud/rackspace/cdn/index.js b/lib/pkgcloud/rackspace/cdn/index.js
new file mode 100644
index 000000000..1a5f56266
--- /dev/null
+++ b/lib/pkgcloud/rackspace/cdn/index.js
@@ -0,0 +1,15 @@
+/*
+ * index.js: Top-level include for the Rackspace CDN module.
+ *
+ * (C) 2014 Rackspace
+ * Shaunak Kashyap
+ * MIT LICENSE
+ */
+
+exports.Client = require('./client').Client;
+exports.Service = require('../../openstack/cdn/service').Service;
+exports.Flavor = require('../../openstack/cdn/flavor').Flavor;
+
+exports.createClient = function(options) {
+ return new exports.Client(options);
+};
diff --git a/lib/pkgcloud/rackspace/client.js b/lib/pkgcloud/rackspace/client.js
index d7a07067b..6a5800d5f 100644
--- a/lib/pkgcloud/rackspace/client.js
+++ b/lib/pkgcloud/rackspace/client.js
@@ -1,14 +1,14 @@
/*
* client.js: Base client from which all Rackspace clients inherit from
*
- * (C) 2011 Nodejitsu Inc.
+ * (C) 2011 Charlie Robbins, Ken Perkins, Ross Kukulinski & the Contributors.
*
*/
-var utile = require('utile'),
+var util = require('util'),
identity = require('./identity'),
base = require('../openstack/client'),
- _ = require('underscore');
+ _ = require('lodash');
var Client = exports.Client = function (options) {
options = options || {};
@@ -25,7 +25,7 @@ var Client = exports.Client = function (options) {
this.provider = 'rackspace';
};
-utile.inherits(Client, base.Client);
+util.inherits(Client, base.Client);
Client.prototype._getIdentityOptions = function() {
return _.extend({
diff --git a/lib/pkgcloud/rackspace/compute/client/extensions/virtual-interfacesv2.js b/lib/pkgcloud/rackspace/compute/client/extensions/virtual-interfacesv2.js
index 7121b424c..99935c9ed 100644
--- a/lib/pkgcloud/rackspace/compute/client/extensions/virtual-interfacesv2.js
+++ b/lib/pkgcloud/rackspace/compute/client/extensions/virtual-interfacesv2.js
@@ -9,8 +9,7 @@
*/
var Server = require('../../server').Server,
- urlJoin = require('url-join'),
- _ = require('underscore');
+ urlJoin = require('url-join');
var _servers = 'servers',
_extension = 'os-virtual-interfacesv2';
diff --git a/lib/pkgcloud/rackspace/compute/client/index.js b/lib/pkgcloud/rackspace/compute/client/index.js
index 04ff529d5..67ba4bc92 100644
--- a/lib/pkgcloud/rackspace/compute/client/index.js
+++ b/lib/pkgcloud/rackspace/compute/client/index.js
@@ -1,29 +1,29 @@
/*
* client.js: Compute client for Rackspace Cloudservers
*
- * (C) 2011 Nodejitsu Inc.
+ * (C) 2011 Charlie Robbins, Ken Perkins, Ross Kukulinski & the Contributors.
*
*/
-var utile = require('utile'),
+var util = require('util'),
rackspace = require('../../client'),
ComputeClient = require('../../../openstack/compute/computeClient').ComputeClient,
- _ = require('underscore');
+ _ = require('lodash');
var Client = exports.Client = function (options) {
rackspace.Client.call(this, options);
- utile.mixin(this, require('../../../openstack/compute/client/flavors'));
- utile.mixin(this, require('../../../openstack/compute/client/images'));
- utile.mixin(this, require('../../../openstack/compute/client/servers'));
- utile.mixin(this, require('../../../openstack/compute/client/extensions'));
+ _.extend(this, require('../../../openstack/compute/client/flavors'));
+ _.extend(this, require('../../../openstack/compute/client/images'));
+ _.extend(this, require('../../../openstack/compute/client/servers'));
+ _.extend(this, require('../../../openstack/compute/client/extensions'));
// rackspace specific extensions
- utile.mixin(this, require('./extensions/networksv2'));
- utile.mixin(this, require('./extensions/virtual-interfacesv2'));
+ _.extend(this, require('./extensions/networksv2'));
+ _.extend(this, require('./extensions/virtual-interfacesv2'));
this.serviceType = 'compute';
};
-utile.inherits(Client, rackspace.Client);
+util.inherits(Client, rackspace.Client);
_.extend(Client.prototype, ComputeClient.prototype);
diff --git a/lib/pkgcloud/rackspace/compute/index.js b/lib/pkgcloud/rackspace/compute/index.js
index 0fd03d94d..516538712 100644
--- a/lib/pkgcloud/rackspace/compute/index.js
+++ b/lib/pkgcloud/rackspace/compute/index.js
@@ -1,7 +1,7 @@
/*
* index.js: Top-level include for the Rackspace compute module
*
- * (C) 2011 Nodejitsu Inc.
+ * (C) 2011 Charlie Robbins, Ken Perkins, Ross Kukulinski & the Contributors.
*
*/
diff --git a/lib/pkgcloud/rackspace/compute/server.js b/lib/pkgcloud/rackspace/compute/server.js
index cd7125cc4..e3a95ce40 100644
--- a/lib/pkgcloud/rackspace/compute/server.js
+++ b/lib/pkgcloud/rackspace/compute/server.js
@@ -7,11 +7,11 @@
*
*/
-var utile = require('utile'),
+var util = require('util'),
base = require('../../openstack/compute/server');
var Server = exports.Server = function Server(client, details) {
base.Server.call(this, client, details);
};
-utile.inherits(Server, base.Server);
+util.inherits(Server, base.Server);
diff --git a/lib/pkgcloud/rackspace/database/client/index.js b/lib/pkgcloud/rackspace/database/client/index.js
index a19f535c8..8dffca1cc 100644
--- a/lib/pkgcloud/rackspace/database/client/index.js
+++ b/lib/pkgcloud/rackspace/database/client/index.js
@@ -1,31 +1,30 @@
/*
* client.js: Database client for Rackspace Cloud Databases
*
- * (C) 2011 Nodejitsu Inc.
+ * (C) 2011 Charlie Robbins, Ken Perkins, Ross Kukulinski & the Contributors.
*
*/
-var utile = require('utile'),
+var util = require('util'),
urlJoin = require('url-join'),
- request = require('request'),
rackspace = require('../../client'),
auth = require('../../../common/auth.js'),
- _ = require('underscore');
+ _ = require('lodash');
var Client = exports.Client = function (options) {
rackspace.Client.call(this, options);
this.before.push(auth.accountId);
- utile.mixin(this, require('./flavors'));
- utile.mixin(this, require('./instances'));
- utile.mixin(this, require('./databases'));
- utile.mixin(this, require('./users'));
+ _.extend(this, require('../../../openstack/database/client/flavors'));
+ _.extend(this, require('../../../openstack/database/client/instances'));
+ _.extend(this, require('../../../openstack/database/client/databases'));
+ _.extend(this, require('../../../openstack/database/client/users'));
this.serviceType = 'rax:database';
};
-utile.inherits(Client, rackspace.Client);
+util.inherits(Client, rackspace.Client);
Client.prototype._getUrl = function (options) {
options = options || {};
diff --git a/lib/pkgcloud/rackspace/database/index.js b/lib/pkgcloud/rackspace/database/index.js
index 995030f48..df1a07b33 100644
--- a/lib/pkgcloud/rackspace/database/index.js
+++ b/lib/pkgcloud/rackspace/database/index.js
@@ -1,15 +1,15 @@
/*
* index.js: Top-level include for the Rackspace database module
*
- * (C) 2011 Nodejitsu Inc.
+ * (C) 2011 Charlie Robbins, Ken Perkins, Ross Kukulinski & the Contributors.
*
*/
exports.Client = require('./client').Client;
-exports.Flavor = require('./flavor').Flavor;
-exports.Instance = require('./instance').Instance;
-exports.Database = require('./database').Database;
-exports.User = require('./user').User;
+exports.Flavor = require('../../openstack/database/flavor').Flavor;
+exports.Instance = require('../../openstack/database/instance').Instance;
+exports.Database = require('../../openstack/database/database').Database;
+exports.User = require('../../openstack/database/user').User;
exports.createClient = function createClient(options) {
return new exports.Client(options);
diff --git a/lib/pkgcloud/rackspace/dns/client/index.js b/lib/pkgcloud/rackspace/dns/client/index.js
index 853912973..b9fcf09fa 100644
--- a/lib/pkgcloud/rackspace/dns/client/index.js
+++ b/lib/pkgcloud/rackspace/dns/client/index.js
@@ -7,22 +7,22 @@
*
*/
-var utile = require('utile'),
+var util = require('util'),
rackspace = require('../../client'),
urlJoin = require('url-join'),
Status = require('../status').Status,
- _ = require('underscore');
+ _ = require('lodash');
var Client = exports.Client = function (options) {
rackspace.Client.call(this, options);
- utile.mixin(this, require('./records.js'));
- utile.mixin(this, require('./zones.js'));
+ _.extend(this, require('./records.js'));
+ _.extend(this, require('./zones.js'));
this.serviceType = 'rax:dns';
};
-utile.inherits(Client, rackspace.Client);
+util.inherits(Client, rackspace.Client);
Client.prototype._getUrl = function (options) {
options = options || {};
diff --git a/lib/pkgcloud/rackspace/dns/client/records.js b/lib/pkgcloud/rackspace/dns/client/records.js
index 2ac118179..bd421e3c9 100644
--- a/lib/pkgcloud/rackspace/dns/client/records.js
+++ b/lib/pkgcloud/rackspace/dns/client/records.js
@@ -7,11 +7,9 @@
*
*/
-var base = require('../../../core/dns'),
- urlJoin = require('url-join'),
+var urlJoin = require('url-join'),
pkgcloud = require('../../../../../lib/pkgcloud'),
- errs = require('errs'),
- _ = require('underscore'),
+ _ = require('lodash'),
dns = pkgcloud.providers.rackspace.dns;
var _urlPrefix = 'domains',
@@ -66,7 +64,7 @@ module.exports = {
path: urlJoin(_urlPrefix, zoneId, _recordFragment, recordId)
};
- self._request(requestOptions, function (err, body, res) {
+ self._request(requestOptions, function (err, body) {
return err
? callback(err)
: callback(err, new dns.Record(self, body));
@@ -255,8 +253,8 @@ module.exports = {
method: 'DELETE'
};
- self._asyncRequest(requestOptions, function (err, result) {
+ self._asyncRequest(requestOptions, function (err) {
return callback(err);
});
}
-};
\ No newline at end of file
+};
diff --git a/lib/pkgcloud/rackspace/dns/client/zones.js b/lib/pkgcloud/rackspace/dns/client/zones.js
index 1017542d3..8d0f2cae3 100644
--- a/lib/pkgcloud/rackspace/dns/client/zones.js
+++ b/lib/pkgcloud/rackspace/dns/client/zones.js
@@ -7,11 +7,9 @@
*
*/
-var base = require('../../../core/dns'),
- urlJoin = require('url-join'),
+var urlJoin = require('url-join'),
pkgcloud = require('../../../../../lib/pkgcloud'),
- errs = require('errs'),
- _ = require('underscore'),
+ _ = require('lodash'),
dns = pkgcloud.providers.rackspace.dns;
var _urlPrefix = 'domains';
@@ -108,8 +106,9 @@ module.exports = {
var listOfZones = [];
_.each(zones, function (zone) {
['name', 'email'].forEach(function (required) {
- if (!zone[required]) throw new Error('details.' +
- required + ' is a required argument.');
+ if (!zone[required]) {
+ throw new Error('details.' + required + ' is a required argument.');
+ }
});
var newZone = {
@@ -160,8 +159,9 @@ module.exports = {
var self = this;
['contentType', 'contents'].forEach(function (required) {
- if (!details[required]) throw new Error('details.' +
- required + ' is a required argument.');
+ if (!details[required]) {
+ throw new Error('details.' + required + ' is a required argument.');
+ }
});
if (details.contentType !== 'BIND_9') {
@@ -346,10 +346,10 @@ module.exports = {
if (options.since) {
requestOptions.qs = {
since: options.since.toString()
- }
+ };
}
- self._request(requestOptions, function (err, body, res) {
+ self._request(requestOptions, function (err, body) {
return err
? callback(err)
: callback(err, body);
@@ -438,4 +438,4 @@ module.exports = {
}), res);
});
}
-};
\ No newline at end of file
+};
diff --git a/lib/pkgcloud/rackspace/dns/record.js b/lib/pkgcloud/rackspace/dns/record.js
index 8e87943b7..b1921d60a 100644
--- a/lib/pkgcloud/rackspace/dns/record.js
+++ b/lib/pkgcloud/rackspace/dns/record.js
@@ -7,15 +7,15 @@
*
*/
-var utile = require('utile'),
+var util = require('util'),
base = require('../../core/dns/record'),
- _ = require('underscore');
+ _ = require('lodash');
var Record = exports.Record = function Record(zone, details) {
base.Record.call(this, zone, details);
};
-utile.inherits(Record, base.Record);
+util.inherits(Record, base.Record);
Record.prototype._setProperties = function (details) {
var self = this;
diff --git a/lib/pkgcloud/rackspace/dns/status.js b/lib/pkgcloud/rackspace/dns/status.js
index 6e734cdf3..d0ee9956c 100644
--- a/lib/pkgcloud/rackspace/dns/status.js
+++ b/lib/pkgcloud/rackspace/dns/status.js
@@ -7,14 +7,14 @@
*
*/
-var utile = require('utile'),
+var util = require('util'),
base = require('../../core/base/model');
var Status = exports.Status = function Status(client, details) {
base.Model.call(this, client, details);
};
-utile.inherits(Status, base.Model);
+util.inherits(Status, base.Model);
/**
* @name Status.getDetails
@@ -31,7 +31,7 @@ Status.prototype.getDetails = function (callback) {
qs: { showDetails: true }
};
- self.client._request(requestOptions, function (err, body, res) {
+ self.client._request(requestOptions, function (err, body) {
if (err) {
return callback(err);
}
diff --git a/lib/pkgcloud/rackspace/dns/zone.js b/lib/pkgcloud/rackspace/dns/zone.js
index d39e58172..64490fc2e 100644
--- a/lib/pkgcloud/rackspace/dns/zone.js
+++ b/lib/pkgcloud/rackspace/dns/zone.js
@@ -7,15 +7,15 @@
*
*/
-var utile = require('utile'),
+var util = require('util'),
base = require('../../core/dns/zone'),
- _ = require('underscore');
+ _ = require('lodash');
var Zone = exports.Zone = function Zone(client, details) {
base.Zone.call(this, client, details);
};
-utile.inherits(Zone, base.Zone);
+util.inherits(Zone, base.Zone);
Zone.prototype._setProperties = function (details) {
var self = this;
diff --git a/lib/pkgcloud/rackspace/identity/rackspaceIdentity.js b/lib/pkgcloud/rackspace/identity/rackspaceIdentity.js
index eae184477..7909b8fe1 100644
--- a/lib/pkgcloud/rackspace/identity/rackspaceIdentity.js
+++ b/lib/pkgcloud/rackspace/identity/rackspaceIdentity.js
@@ -7,16 +7,16 @@
*
*/
-var _ = require('underscore'),
- identity = require('../../openstack/context'),
+var identity = require('../../openstack/context'),
events = require('eventemitter2'),
Identity = identity.Identity,
util = require('util');
-exports.Identity = RackspaceIdentity = function (options) {
+var RackspaceIdentity = exports.Identity = function (options) {
this.options = options;
this.name = 'RackspaceIdentity';
+ this.basePath = options.basePath || '/v2.0/tokens';
this.useServiceCatalog = (typeof options.useServiceCatalog === 'boolean')
? options.useServiceCatalog
: true;
diff --git a/lib/pkgcloud/rackspace/index.js b/lib/pkgcloud/rackspace/index.js
index 370ba7065..95ba375ee 100644
--- a/lib/pkgcloud/rackspace/index.js
+++ b/lib/pkgcloud/rackspace/index.js
@@ -1,7 +1,7 @@
/*
* index.js: Top-level include for the Rackspace module.
*
- * (C) 2011 Nodejitsu Inc.
+ * (C) 2011 Charlie Robbins, Ken Perkins, Ross Kukulinski & the Contributors.
*
*/
@@ -10,4 +10,7 @@ exports.compute = require('./compute');
exports.database = require('./database');
exports.dns = require('./dns');
exports.loadbalancer = require('./loadbalancer');
+exports.orchestration = require('./orchestration');
exports.storage = require('./storage');
+exports.network = require('./network');
+exports.cdn = require('./cdn');
diff --git a/lib/pkgcloud/rackspace/loadbalancer/client/index.js b/lib/pkgcloud/rackspace/loadbalancer/client/index.js
index 41e2caf41..15f3dffb1 100644
--- a/lib/pkgcloud/rackspace/loadbalancer/client/index.js
+++ b/lib/pkgcloud/rackspace/loadbalancer/client/index.js
@@ -7,21 +7,21 @@
*
*/
-var utile = require('utile'),
+var util = require('util'),
rackspace = require('../../client'),
urlJoin = require('url-join'),
- _ = require('underscore');
+ _ = require('lodash');
var Client = exports.Client = function (options) {
rackspace.Client.call(this, options);
- utile.mixin(this, require('./nodes.js'));
- utile.mixin(this, require('./loadbalancers.js'));
+ _.extend(this, require('./nodes.js'));
+ _.extend(this, require('./loadbalancers.js'));
this.serviceType = 'rax:load-balancer';
};
-utile.inherits(Client, rackspace.Client);
+util.inherits(Client, rackspace.Client);
Client.prototype._getUrl = function (options) {
options = options || {};
diff --git a/lib/pkgcloud/rackspace/loadbalancer/client/loadbalancers.js b/lib/pkgcloud/rackspace/loadbalancer/client/loadbalancers.js
index 6f621ad5e..b876f9d0e 100644
--- a/lib/pkgcloud/rackspace/loadbalancer/client/loadbalancers.js
+++ b/lib/pkgcloud/rackspace/loadbalancer/client/loadbalancers.js
@@ -7,15 +7,69 @@
*
*/
-var base = require('../../../core/dns'),
- urlJoin = require('url-join'),
+var urlJoin = require('url-join'),
pkgcloud = require('../../../../../lib/pkgcloud'),
- errs = require('errs'),
- _ = require('underscore'),
+ _ = require('lodash'),
lb = pkgcloud.providers.rackspace.loadbalancer;
var _urlPrefix = 'loadbalancers';
+// Private function for validation of createLoadBalancer Inputs
+var validateLbInputs = function (inputs) {
+
+ var errors = {
+ requiredParametersMissing: [],
+ invalidInputs: []
+ }, response;
+
+ if (!inputs.name) {
+ errors.requiredParametersMissing.push('name');
+ }
+
+ if (!inputs.nodes) {
+ errors.requiredParametersMissing.push('nodes');
+ }
+
+ if (!inputs.protocol) {
+ errors.requiredParametersMissing.push('protocol');
+ }
+
+ if (!inputs.port) {
+ errors.requiredParametersMissing.push('port');
+ }
+
+ if (!inputs.virtualIps) {
+ errors.requiredParametersMissing.push('virtualIps');
+ }
+
+ if (inputs.name && inputs.name.length > 128) {
+ errors.invalidInputs.push('name exceeds maximum 128 length');
+ }
+
+ if (!inputs.protocol ||
+ typeof(inputs.protocol) !== 'string' || !lb.Protocols[inputs.protocol]) {
+ errors.invalidInputs.push('please specify a valid protocol');
+ }
+
+ // TODO Node validation
+
+ if (errors.requiredParametersMissing.length) {
+ response ? response.requiredParametersMissing = errors.requiredParametersMissing :
+ response = {
+ requiredParametersMissing: errors.requiredParametersMissing
+ };
+ }
+
+ if (errors.invalidInputs.length) {
+ response ? response.invalidInputs = errors.invalidInputs :
+ response = {
+ invalidInputs: errors.invalidInputs
+ };
+ }
+
+ return response;
+};
+
module.exports = {
/**
@@ -37,7 +91,7 @@ module.exports = {
options = {};
}
- self._request(requestOptions, function (err, body, res) {
+ self._request(requestOptions, function (err, body) {
if (err) {
return callback(err);
}
@@ -70,7 +124,7 @@ module.exports = {
self._request({
path: urlJoin(_urlPrefix, loadBalancerId)
- }, function (err, body, res) {
+ }, function (err, body) {
if (err) {
return callback(err);
}
@@ -333,7 +387,7 @@ module.exports = {
self._request({
path: urlJoin(_urlPrefix, loadBalancerId, 'ssltermination'),
method: 'DELETE'
- }, function (err, body, res) {
+ }, function (err) {
callback(err);
});
},
@@ -355,7 +409,7 @@ module.exports = {
self._request({
path: urlJoin(_urlPrefix, loadBalancerId, 'accesslist')
- }, function (err, body, res) {
+ }, function (err, body) {
return callback(err, body.accessList);
});
},
@@ -448,7 +502,7 @@ module.exports = {
self._request({
path: urlJoin(_urlPrefix, loadBalancerId, 'accesslist', '?id=' + list.join('&id=')),
method: 'DELETE'
- }, function (err, body, res) {
+ }, function (err) {
return callback(err);
});
},
@@ -552,7 +606,7 @@ module.exports = {
type: details.type,
delay: details.delay,
timeout: details.timeout
- }
+ };
}
else if (details.type === 'HTTP' || details.type === 'HTTPS') {
requestOptions.body = {
@@ -563,7 +617,7 @@ module.exports = {
bodyRegex: details.bodyRegex,
path: details.path,
statusRegex: details.statusRegex
- }
+ };
if (details.hostHeader) {
requestOptions.body.hostHeader = details.hostHeader;
@@ -1124,59 +1178,3 @@ module.exports = {
});
}
};
-
-// Private function for validation of createLoadBalancer Inputs
-var validateLbInputs = function (inputs) {
-
- var errors = {
- requiredParametersMissing: [],
- invalidInputs: []
- }, response;
-
- if (!inputs.name) {
- errors.requiredParametersMissing.push('name');
- }
-
- if (!inputs.nodes) {
- errors.requiredParametersMissing.push('nodes');
- }
-
- if (!inputs.protocol) {
- errors.requiredParametersMissing.push('protocol');
- }
-
- if (!inputs.port) {
- errors.requiredParametersMissing.push('port');
- }
-
- if (!inputs.virtualIps) {
- errors.requiredParametersMissing.push('virtualIps');
- }
-
- if (inputs.name && inputs.name.length > 128) {
- errors.invalidInputs.push('name exceeds maximum 128 length');
- }
-
- if (!inputs.protocol ||
- typeof(inputs.protocol) !== 'string' || !lb.Protocols[inputs.protocol]) {
- errors.invalidInputs.push('please specify a valid protocol');
- }
-
- // TODO Node validation
-
- if (errors.requiredParametersMissing.length) {
- response ? response.requiredParametersMissing = errors.requiredParametersMissing :
- response = {
- requiredParametersMissing: errors.requiredParametersMissing
- };
- }
-
- if (errors.invalidInputs.length) {
- response ? response.invalidInputs = errors.invalidInputs :
- response = {
- invalidInputs: errors.invalidInputs
- };
- }
-
- return response;
-};
diff --git a/lib/pkgcloud/rackspace/loadbalancer/client/nodes.js b/lib/pkgcloud/rackspace/loadbalancer/client/nodes.js
index 2c5754bec..9aa6df900 100644
--- a/lib/pkgcloud/rackspace/loadbalancer/client/nodes.js
+++ b/lib/pkgcloud/rackspace/loadbalancer/client/nodes.js
@@ -7,11 +7,9 @@
*
*/
-var base = require('../../../core/dns'),
- urlJoin = require('url-join'),
+var urlJoin = require('url-join'),
pkgcloud = require('../../../../../lib/pkgcloud'),
- errs = require('errs'),
- _ = require('underscore'),
+ _ = require('lodash'),
lb = pkgcloud.providers.rackspace.loadbalancer;
var _urlPrefix = 'loadbalancers';
@@ -122,7 +120,7 @@ module.exports = {
loadBalancer instanceof lb.LoadBalancer ? loadBalancer.id : loadBalancer;
if (!(node instanceof lb.Node) && (typeof node !== 'object')) {
- throw new Error('node is require argument and must be an object');
+ throw new Error('node is a required argument and must be an object');
}
self._request({
@@ -214,4 +212,4 @@ module.exports = {
: callback(err, body.nodeServiceEvents);
});
}
-};
\ No newline at end of file
+};
diff --git a/lib/pkgcloud/rackspace/loadbalancer/loadbalancer.js b/lib/pkgcloud/rackspace/loadbalancer/loadbalancer.js
index 59e6d99c7..da6c2d3b8 100644
--- a/lib/pkgcloud/rackspace/loadbalancer/loadbalancer.js
+++ b/lib/pkgcloud/rackspace/loadbalancer/loadbalancer.js
@@ -7,15 +7,15 @@
*
*/
-var utile = require('utile'),
+var util = require('util'),
base = require('../../core/loadbalancer/loadbalancer'),
- _ = require('underscore');
+ _ = require('lodash');
var LoadBalancer = exports.LoadBalancer = function LoadBalancer(client, details) {
base.LoadBalancer.call(this, client, details);
};
-utile.inherits(LoadBalancer, base.LoadBalancer);
+util.inherits(LoadBalancer, base.LoadBalancer);
LoadBalancer.prototype._setProperties = function (details) {
var self = this;
diff --git a/lib/pkgcloud/rackspace/loadbalancer/node.js b/lib/pkgcloud/rackspace/loadbalancer/node.js
index 27e4976e7..be19b0757 100644
--- a/lib/pkgcloud/rackspace/loadbalancer/node.js
+++ b/lib/pkgcloud/rackspace/loadbalancer/node.js
@@ -7,15 +7,15 @@
*
*/
-var utile = require('utile'),
+var util = require('util'),
base = require('../../core/loadbalancer/node'),
- _ = require('underscore');
+ _ = require('lodash');
var Node = exports.Node = function Node(client, details) {
base.Node.call(this, client, details);
};
-utile.inherits(Node, base.Node);
+util.inherits(Node, base.Node);
Node.prototype._setProperties = function (details) {
var self = this;
diff --git a/lib/pkgcloud/rackspace/loadbalancer/protocols.js b/lib/pkgcloud/rackspace/loadbalancer/protocols.js
index 732b92141..24d274310 100644
--- a/lib/pkgcloud/rackspace/loadbalancer/protocols.js
+++ b/lib/pkgcloud/rackspace/loadbalancer/protocols.js
@@ -11,75 +11,75 @@
exports.Protocols = {
DNS_TCP: {
- "name": "DNS_TCP",
- "port": 53
+ name: 'DNS_TCP',
+ port: 53
}, DNS_UDP: {
- "name": "DNS_UDP",
- "port": 53
+ name: 'DNS_UDP',
+ port: 53
},
FTP: {
- "name": "FTP",
- "port": 21
+ name: 'FTP',
+ port: 21
},
HTTP: {
- "name": "HTTP",
- "port": 80
+ name: 'HTTP',
+ port: 80
},
HTTPS: {
- "name": "HTTPS",
- "port": 443
+ name: 'HTTPS',
+ port: 443
},
IMAPS: {
- "name": "IMAPS",
- "port": 993
+ name: 'IMAPS',
+ port: 993
},
IMAPv4: {
- "name": "IMAPv4",
- "port": 143
+ name: 'IMAPv4',
+ port: 143
},
LDAP: {
- "name": "LDAP",
- "port": 389
+ name: 'LDAP',
+ port: 389
},
LDAPS: {
- "name": "LDAPS",
- "port": 636
+ name: 'LDAPS',
+ port: 636
},
MYSQL: {
- "name": "MYSQL",
- "port": 3306
+ name: 'MYSQL',
+ port: 3306
},
POP3: {
- "name": "POP3",
- "port": 110
+ name: 'POP3',
+ port: 110
},
POP3S: {
- "name": "POP3S",
- "port": 995
+ name: 'POP3S',
+ port: 995
},
SMTP: {
- "name": "SMTP",
- "port": 25
+ name: 'SMTP',
+ port: 25
},
TCP: {
- "name": "TCP",
- "port": 0
+ name: 'TCP',
+ port: 0
},
TCP_CLIENT_FIRST: {
- "name": "TCP_CLIENT_FIRST",
- "port": 0
+ name: 'TCP_CLIENT_FIRST',
+ port: 0
},
UDP: {
- "name": "UDP",
- "port": 0
+ name: 'UDP',
+ port: 0
},
UDP_STREAM: {
- "name": "UDP_STREAM",
- "port": 0
+ name: 'UDP_STREAM',
+ port: 0
},
SFTP: {
- "name": "SFTP",
- "port": 22
+ name: 'SFTP',
+ port: 22
}
};
\ No newline at end of file
diff --git a/lib/pkgcloud/rackspace/loadbalancer/virtualip.js b/lib/pkgcloud/rackspace/loadbalancer/virtualip.js
index f9c29b6b4..4c208c485 100644
--- a/lib/pkgcloud/rackspace/loadbalancer/virtualip.js
+++ b/lib/pkgcloud/rackspace/loadbalancer/virtualip.js
@@ -9,7 +9,7 @@
var VirtualIp = function (details) {
if (!details) {
- throw new Error('VirtualIp must be constructed with at-least basic details.')
+ throw new Error('VirtualIp must be constructed with at-least basic details.');
}
this._setProperties(details);
@@ -37,4 +37,4 @@ exports.VirtualIp = VirtualIp;
exports.VirtualIpTypes = {
PUBLIC: 'PUBLIC',
SERVICENET: 'SERVICENET'
-};
\ No newline at end of file
+};
diff --git a/lib/pkgcloud/rackspace/network/client/index.js b/lib/pkgcloud/rackspace/network/client/index.js
new file mode 100644
index 000000000..b24d94dcf
--- /dev/null
+++ b/lib/pkgcloud/rackspace/network/client/index.js
@@ -0,0 +1,35 @@
+/*
+ * client.js: client for Rackspace Networking
+ *
+ * (C) 2014 Rackspace
+ * Shaunak Kashyap
+ * MIT License
+ */
+
+var util = require('util'),
+ rackspace = require('../../client'),
+ NetworkClient = require('../../../openstack/network/networkClient').NetworkClient,
+ _ = require('lodash');
+
+var Client = exports.Client = function (options) {
+ rackspace.Client.call(this, options);
+
+ this.models = {
+ Network: require('../../../openstack/network/network').Network,
+ Subnet: require('../../../openstack/network/subnet').Subnet,
+ Port: require('../../../openstack/network/port').Port,
+ SecurityGroup: require('../../../openstack/network/securityGroup').SecurityGroup,
+ SecurityGroupRule: require('../../../openstack/network/securityGroupRule').SecurityGroupRule
+ };
+
+ _.extend(this, require('../../../openstack/network/client/networks'));
+ _.extend(this, require('../../../openstack/network/client/subnets'));
+ _.extend(this, require('../../../openstack/network/client/ports'));
+ _.extend(this, require('../../../openstack/network/client/securityGroups'));
+ _.extend(this, require('../../../openstack/network/client/securityGroupRules'));
+
+ this.serviceType = 'network';
+};
+
+util.inherits(Client, rackspace.Client);
+_.extend(Client.prototype, NetworkClient.prototype);
diff --git a/lib/pkgcloud/rackspace/network/index.js b/lib/pkgcloud/rackspace/network/index.js
new file mode 100644
index 000000000..6b3d249f9
--- /dev/null
+++ b/lib/pkgcloud/rackspace/network/index.js
@@ -0,0 +1,17 @@
+/*
+ * index.js: Top-level include for the Rackspace Networking module.
+ *
+ * (C) 2014 Rackspace
+ * Shaunak Kashyap
+ * MIT LICENSE
+ */
+
+exports.Client = require('./client').Client;
+exports.Network = require('../../openstack/network/network').Network;
+exports.Subnet = require('../../openstack/network/subnet').Subnet;
+exports.Port = require('../../openstack/network/port').Port;
+exports.SecurityGroup = require('../../openstack/network/securityGroup').SecurityGroup;
+
+exports.createClient = function(options) {
+ return new exports.Client(options);
+};
diff --git a/lib/pkgcloud/rackspace/orchestration/client/index.js b/lib/pkgcloud/rackspace/orchestration/client/index.js
new file mode 100644
index 000000000..dddf74c50
--- /dev/null
+++ b/lib/pkgcloud/rackspace/orchestration/client/index.js
@@ -0,0 +1,67 @@
+/*
+ * client.js: client for Rackspace Orchestration
+ *
+ * (C) 2014 Rackspace
+ * Ken Perkins
+ * MIT LICENSE
+ */
+
+var util = require('util'),
+ rackspace = require('../../client'),
+ urlJoin = require('url-join'),
+ _ = require('lodash');
+
+var Client = exports.Client = function (options) {
+ rackspace.Client.call(this, options);
+
+ _.extend(this, require('../../../openstack/orchestration/client/events'));
+ _.extend(this, require('../../../openstack/orchestration/client/resources'));
+ _.extend(this, require('../../../openstack/orchestration/client/stacks'));
+ _.extend(this, require('../../../openstack/orchestration/client/templates'));
+
+ this.serviceType = 'orchestration';
+};
+
+util.inherits(Client, rackspace.Client);
+
+/**
+ * client._getUrl
+ *
+ * @description get the url for the current compute service
+ *
+ * @param options
+ * @returns {exports|*}
+ * @private
+ */
+Client.prototype._getUrl = function (options) {
+ options = options || {};
+
+ if (!this._serviceUrl) {
+ throw new Error('Service url not found');
+ }
+
+ return urlJoin(this._serviceUrl,
+ typeof options === 'string'
+ ? options
+ : options.path);
+};
+
+/**
+ * client.buildInfo
+ *
+ * @description gets the build information for the orchestration service
+ *
+ * @param callback
+ * @returns {*}
+ */
+Client.prototype.buildInfo = function (callback) {
+ return this._request({
+ path: '/build_info'
+ }, function (err, body) {
+ if (err) {
+ return callback(err);
+ }
+
+ callback(null, body);
+ });
+};
diff --git a/lib/pkgcloud/rackspace/orchestration/index.js b/lib/pkgcloud/rackspace/orchestration/index.js
new file mode 100644
index 000000000..79ecf358b
--- /dev/null
+++ b/lib/pkgcloud/rackspace/orchestration/index.js
@@ -0,0 +1,16 @@
+ /*
+ * index.js: Top-level include for the Rackspace orchestration module
+ *
+ * (C) 2014 Rackspace
+ * Ken Perkins
+ * MIT LICENSE
+ *
+ */
+
+exports.Client = require('./client').Client;
+exports.Stack = require('../../openstack/orchestration/stack').Stack;
+exports.Resource = require('../../openstack/orchestration/resource').Resource;
+
+exports.createClient = function (options) {
+ return new exports.Client(options);
+};
\ No newline at end of file
diff --git a/lib/pkgcloud/rackspace/storage/client/archive.js b/lib/pkgcloud/rackspace/storage/client/archive.js
index 8db42c4da..2caa9e24a 100644
--- a/lib/pkgcloud/rackspace/storage/client/archive.js
+++ b/lib/pkgcloud/rackspace/storage/client/archive.js
@@ -7,7 +7,7 @@
*/
var fs = require('fs'),
- filed = require('filed');
+ filed = require('filed-mimefix');
/**
* Client.extract
diff --git a/lib/pkgcloud/rackspace/storage/client/cdn-containers.js b/lib/pkgcloud/rackspace/storage/client/cdn-containers.js
index de99d991c..c3074d098 100644
--- a/lib/pkgcloud/rackspace/storage/client/cdn-containers.js
+++ b/lib/pkgcloud/rackspace/storage/client/cdn-containers.js
@@ -1,16 +1,13 @@
/*
* cdn-containers.js: Instance methods for working with containers from Rackspace Cloudfiles
*
- * (C) 2011 Nodejitsu Inc.
+ * (C) 2011 Charlie Robbins, Ken Perkins, Ross Kukulinski & the Contributors.
*
*/
var async = require('async'),
crypto = require('crypto'),
- request = require('request'),
- base = require('../../../openstack'),
- pkgcloud = require('../../../../pkgcloud'),
- _ = require('underscore');
+ _ = require('lodash');
/**
* client.getFiles
@@ -42,7 +39,7 @@ exports.getContainers = function (options, callback) {
return callback(err);
}
else if (!body || !(body instanceof Array)) {
- return new Error('Malformed API Response')
+ return new Error('Malformed API Response');
}
if (!options.loadCDNAttributes) {
@@ -62,7 +59,7 @@ exports.getContainers = function (options, callback) {
return next(err);
}
next();
- })
+ });
}, function (err) {
callback(err, containers);
});
@@ -287,7 +284,7 @@ exports._getCdnContainerDetails = function(container, callback) {
container: containerName,
serviceType: this.cdnServiceType
}, function (err, body, res) {
- if (err && !(err.statusCode === 404)) {
+ if (err && !(err.statusCode === 403 || err.statusCode === 404)) {
return callback(err);
}
else if (err) {
@@ -314,21 +311,101 @@ exports._getCdnContainerDetails = function(container, callback) {
});
};
-exports.setTempUrlMetadataKey = function(key, callback) {
+/**
+ * client.setStaticWebsite
+ *
+ * @description set the static website index page on a storage container
+ *
+ * @param {String|object} container the container or containerName
+ * @param {object} options an object with options
+ * @param {String} options.indexFile configure the static website index file for this container
+ * @param {String} options.errorFile configure the static website error file for this container
+ * @param callback
+ */
+exports.setStaticWebsite = function (container, options, callback) {
+ var indexFile = options.indexFile, errorFile = options.errorFile;
+
+ if (typeof options === 'function') {
+ callback = options;
+ indexFile = 'index.html';
+ errorFile = 'error.html';
+ }
+
+ container.metadata['web-index'] = indexFile;
+ container.metadata['web-error'] = errorFile;
+
+ this.updateContainerMetadata(container, callback);
+};
+
+/**
+ * client.removeStaticWebsite
+ *
+ * @description remove the static website index/error page on a storage container
+ *
+ * @param {String|object} container the container or containerName
+ * @param callback
+ */
+exports.removeStaticWebsite = function (container, callback) {
+ var indexFile = container.metadata['web-index'], errorFile = container.metadata['web-error'],
+ metadata = {
+ 'web-index': indexFile,
+ 'web-error': errorFile
+ };
+
+ this.removeContainerMetadata(container, metadata, callback);
+};
+
+/**
+ * client.setTemporaryUrlKey
+ *
+ * @description set a temporaryUrl key on the current account
+ *
+ * @param {String} key the secret key to be used in hmac signing temporary urls
+ * @param callback
+ */
+exports.setTemporaryUrlKey = function(key, callback) {
this._request({
method: 'POST',
headers: {
'X-Account-Meta-Temp-Url-Key': key
}
}, function (err) {
- callback(err)
+ callback(err);
});
};
+/**
+ * client.generateTempUrl
+ *
+ * @description create a temporary url for GET/PUT to a cloud files container
+ *
+ * @param {String|object} container the container or container name for the url
+ * @param {String|object} file the file or fileName for the url
+ * @param {String} method either GET or PUT
+ * @param {Number} time expiry for the url in seconds (from now)
+ * @param {String} key the secret key to be used for signing the url
+ * @param callback
+ */
exports.generateTempUrl = function(container, file, method, time, key, callback) {
- var self = this, split = '/v1';
+ var containerName = container instanceof this.models.Container ? container.name : container,
+ fileName = file instanceof this.models.File ? file.name : file,
+ time = typeof time === 'number' ? time : parseInt(time),
+ self = this,
+ split = '/v1';
- time = parseInt(time);
+ function createUrl() {
+ // construct our hmac signature
+ var expiry = parseInt(new Date().getTime() / 1000) + time,
+ url = self._getUrl({
+ container: containerName,
+ path: fileName
+ }),
+ hmac_body = method.toUpperCase() + '\n' + expiry + '\n' + split + url.split(split)[1];
+
+ var hash = crypto.createHmac('sha1', key).update(hmac_body).digest('hex');
+
+ callback(null, url + '?temp_url_sig=' + hash + '&temp_url_expires=' + expiry);
+ }
// We have to be authed to make sure we have the service catalog
// this is required to validate the service url
@@ -348,17 +425,4 @@ exports.generateTempUrl = function(container, file, method, time, key, callback)
createUrl();
- function createUrl() {
- // construct our hmac signature
- var expiry = parseInt(new Date().getTime() / 1000) + time,
- url = self._getUrl({
- container: container,
- path: file
- }),
- hmac_body = method + '\n' + expiry + '\n' + split + url.split(split)[1];
-
- var hash = crypto.createHmac('sha1', key).update(hmac_body).digest('hex');
-
- callback(null, url + "?temp_url_sig=" + hash + "&temp_url_expires=" + expiry);
- }
-};
\ No newline at end of file
+};
diff --git a/lib/pkgcloud/rackspace/storage/client/files.js b/lib/pkgcloud/rackspace/storage/client/files.js
index 955ad0ff3..795f1e765 100644
--- a/lib/pkgcloud/rackspace/storage/client/files.js
+++ b/lib/pkgcloud/rackspace/storage/client/files.js
@@ -6,13 +6,6 @@
*
*/
-var fs = require('fs'),
- request = require('request'),
- utile = require('utile'),
- base = require('../../../core/storage'),
- pkgcloud = require('../../../../pkgcloud'),
- _ = require('underscore');
-
//
// ### function purgeFileFromCdn (container, file, emails, callback)
// #### @container {string} Name of the container to destroy the file in
diff --git a/lib/pkgcloud/rackspace/storage/client/index.js b/lib/pkgcloud/rackspace/storage/client/index.js
index 24ad889d7..476419eab 100644
--- a/lib/pkgcloud/rackspace/storage/client/index.js
+++ b/lib/pkgcloud/rackspace/storage/client/index.js
@@ -1,14 +1,14 @@
/*
* client.js: Compute client for Rackspace Cloudservers
*
- * (C) 2011 Nodejitsu Inc.
+ * (C) 2011 Charlie Robbins, Ken Perkins, Ross Kukulinski & the Contributors.
*
*/
-var utile = require('utile'),
+var util = require('util'),
rackspace = require('../../client'),
StorageClient = require('../../../openstack/storage/storageClient').StorageClient,
- _ = require('underscore');
+ _ = require('lodash');
var Client = exports.Client = function (options) {
rackspace.Client.call(this, options);
@@ -18,16 +18,16 @@ var Client = exports.Client = function (options) {
File: require('../file').File
};
- utile.mixin(this, require('../../../openstack/storage/client/containers'));
- utile.mixin(this, require('../../../openstack/storage/client/files'));
- utile.mixin(this, require('./archive'));
- utile.mixin(this, require('./cdn-containers'));
- utile.mixin(this, require('./files'));
+ _.extend(this, require('../../../openstack/storage/client/containers'));
+ _.extend(this, require('../../../openstack/storage/client/files'));
+ _.extend(this, require('./archive'));
+ _.extend(this, require('./cdn-containers'));
+ _.extend(this, require('./files'));
this.serviceType = 'object-store';
this.cdnServiceType = 'rax:object-cdn';
};
-utile.inherits(Client, rackspace.Client);
+util.inherits(Client, rackspace.Client);
_.extend(Client.prototype, StorageClient.prototype);
diff --git a/lib/pkgcloud/rackspace/storage/container.js b/lib/pkgcloud/rackspace/storage/container.js
index ef3986ad9..182f3a901 100644
--- a/lib/pkgcloud/rackspace/storage/container.js
+++ b/lib/pkgcloud/rackspace/storage/container.js
@@ -6,15 +6,15 @@
*
*/
-var utile = require('utile'),
+var util = require('util'),
base = require('../../openstack/storage/container'),
- _ = require('underscore');
+ _ = require('lodash');
var Container = exports.Container = function Container(client, details) {
base.Container.call(this, client, details);
};
-utile.inherits(Container, base.Container);
+util.inherits(Container, base.Container);
Container.prototype.refreshCdnDetails = function (callback) {
var self = this;
@@ -42,6 +42,14 @@ Container.prototype.updateCdn = function (options, callback) {
this.client.updateCdnContainer(this, options, callback);
};
+Container.prototype.setStaticWebsite = function (options, callback) {
+ this.client.setStaticWebsite(this, options, callback);
+};
+
+Container.prototype.removeStaticWebsite = function (callback) {
+ this.client.removeStaticWebsite(this, callback);
+};
+
Container.prototype._setProperties = function (details) {
this.cdnEnabled = details.cdnEnabled || this.cdnEnabled || false;
this.cdnUri = details.cdnUri || this.cdnUri;
diff --git a/lib/pkgcloud/rackspace/storage/file.js b/lib/pkgcloud/rackspace/storage/file.js
index 5e72adc97..f12ce2c8e 100644
--- a/lib/pkgcloud/rackspace/storage/file.js
+++ b/lib/pkgcloud/rackspace/storage/file.js
@@ -7,15 +7,15 @@
*
*/
-var utile = require('utile'),
+var util = require('util'),
base = require('../../openstack/storage/file'),
- _ = require('underscore');
+ _ = require('lodash');
var File = exports.File = function File(client, details) {
base.File.call(this, client, details);
};
-utile.inherits(File, base.File);
+util.inherits(File, base.File);
File.prototype.purgeFromCdn = function (emails, callback) {
this.client.purgeFileFromCdn(this.container, this, emails, callback);
diff --git a/lib/pkgcloud/redistogo/database/client/index.js b/lib/pkgcloud/redistogo/database/client/index.js
deleted file mode 100644
index 0fecca24d..000000000
--- a/lib/pkgcloud/redistogo/database/client/index.js
+++ /dev/null
@@ -1,146 +0,0 @@
-/*
- * client.js: Database client for RedisToGo Cloud Databases
- *
- * (C) 2011 Nodejitsu Inc.
- *
- */
-
-var utile = require('utile'),
- request = require('request'),
- pkgcloud = require('../../../../pkgcloud'),
- errs = require('errs');
-
-var Client = exports.Client = function (options) {
- this.username = options.username;
- this.password = options.password;
- this._url = options.url || "https://redistogo.com";
-};
-
-Client.prototype._getUrl = function () {
- return this._url;
-};
-
-//
-// Wrapper for all http requests with RedisToGo
-//
-
-Client.prototype._request = function (options, callback) {
- var self = this;
-
- options.headers['User-Agent'] = utile.format('nodejs-pkgcloud/%s', pkgcloud.version);
-
- request(options, function (err, response, body) {
- if (err) {
- return callback(err);
- }
- if (response.statusCode == 401 || response.statusCode == 403) {
- return callback("Unauthorized");
- }
- if (options.method !== "DELETE") {
- var database;
- if (typeof body !== 'object') {
- try {
- database = JSON.parse(body);
- } catch (e) {
- return callback("Bad response from server.", body);
- }
- } else { database = body; }
- database = self.formatResponse(database);
- return callback(null, database);
- } else {
- return callback(null, 'deleted');
- }
- });
-};
-
-// Create a new database at redistogo
-// Need a correct plan
-// ### @attrs {Object} Map of options
-// ##### @attrs['plan'] Plan for the database.(required)
-Client.prototype.create = function (attrs, callback) {
- // Check for options.
- if (!attrs || typeof attrs === 'function') {
- return errs.handle(errs.create({
- message: 'Options required for create a database.'
- }), Array.prototype.slice.call(arguments).pop());
- }
- // Check for plan.
- if (!attrs['plan']) {
- attrs['plan'] = 'nano';
- }
- //
- // TODO: Add validation for options.plan types
- //
- var options = {
- uri : this._getUrl() + '/instances.json',
- method : 'POST',
- body : 'instance%5Bplan%5D=' + attrs.plan,
- headers: {
- 'Authorization': "Basic " + utile.base64.encode(this.username + ':' + this.password)
- }
- };
- this._request(options, callback);
-};
-
-// Get information about specific database
-// Need the database ID
-// ### @id {String} ID of the database.(required)
-Client.prototype.get = function (id, callback) {
- // Check for id
- if (!id || typeof id === 'function') {
- return errs.handle(errs.create({
- message: 'ID is a required argument'
- }), Array.prototype.slice.call(arguments).pop());
- }
- var options,
- path = '/instances',
- self = this;
- if (id !== null) {
- path = path + '/' + id;
- }
- options = {
- uri : this._getUrl() + path + '.json',
- method : 'GET',
- headers: {
- 'Authorization': "Basic " + utile.base64.encode(this.username + ':' + this.password)
- }
- };
- this._request(options, callback);
-};
-
-// Removes one Redis instance by id
-// Need the database ID
-// ### @id {String} ID of the database.(required)
-Client.prototype.remove = function (id, callback) {
- // Check for id
- if (!id || typeof id === 'function') {
- return errs.handle(errs.create({
- message: 'ID is a required argument'
- }), Array.prototype.slice.call(arguments).pop());
- }
- var options,
- path = '/instances/' + id,
- self = this;
- options = {
- uri : this._getUrl() + path + '.json',
- method : 'DELETE',
- headers: {
- 'Authorization': "Basic " + utile.base64.encode(this.username + ':' + this.password),
- 'Content-Length': 0
- }
- };
- this._request(options, callback);
-};
-
-Client.prototype.formatResponse = function (response) {
- var database = {
- id: response.id,
- port: response.port,
- host: response.label.split('-')[0] + '.redistogo.com',
- uri: 'redis://nodejitsu:' + response.password + '@' + response.label.split('-')[0] + '.redistogo.com:' + response.port,
- username: 'nodejitsu',
- password: response.password,
- metadata: response
- };
- return database;
-};
\ No newline at end of file
diff --git a/lib/pkgcloud/redistogo/database/index.js b/lib/pkgcloud/redistogo/database/index.js
deleted file mode 100644
index 213bca089..000000000
--- a/lib/pkgcloud/redistogo/database/index.js
+++ /dev/null
@@ -1,12 +0,0 @@
-/*
- * index.js: Top-level include for the RedisToGo database module
- *
- * (C) 2011 Nodejitsu Inc.
- *
- */
-
-exports.Client = require('./client').Client;
-
-exports.createClient = function createClient(options) {
- return new exports.Client(options);
-};
diff --git a/lib/pkgcloud/redistogo/index.js b/lib/pkgcloud/redistogo/index.js
deleted file mode 100644
index 7fbc67c26..000000000
--- a/lib/pkgcloud/redistogo/index.js
+++ /dev/null
@@ -1,8 +0,0 @@
-/*
- * index.js: Top-level include for the RedisToGo module.
- *
- * (C) 2011 Nodejitsu Inc.
- *
- */
-
-exports.database = require('./database');
diff --git a/lib/pkgcloud/telefonica/compute/client.js b/lib/pkgcloud/telefonica/compute/client.js
deleted file mode 100644
index b157390f6..000000000
--- a/lib/pkgcloud/telefonica/compute/client.js
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * index.js: Compute client for Telefonica InstantServers CloudAPI
- *
- * (C) 2012 Nodejitsu Inc.
- *
- */
-
-var utile = require('utile'),
- urlJoin = require('url-join'),
- joyent = require('../../joyent/compute');
-
-var Client = exports.Client = function (options) {
- joyent.Client.call(this, options);
-
- this.serversUrl = options.serversUrl
- || process.env.SDC_CLI_URL
- || 'api-eu-lon-1.instantservers.telefonica.com';
-};
-
-utile.inherits(Client, joyent.Client);
-
-Client.prototype._getUrl = function (options) {
- options = options || {};
-
- return urlJoin(this.serversUrl
- ? 'https://' + this.serversUrl
- : 'https://api-eu-lon-1.instantservers.telefonica.com',
- (typeof options === 'string' ?
- options : options.path));
-};
diff --git a/lib/pkgcloud/telefonica/compute/index.js b/lib/pkgcloud/telefonica/compute/index.js
deleted file mode 100644
index 1e48156f6..000000000
--- a/lib/pkgcloud/telefonica/compute/index.js
+++ /dev/null
@@ -1,15 +0,0 @@
-/*
- * index.js: Top-level include for the Telefonica compute module
- *
- * (C) 2012 Nodejitsu Inc.
- *
- */
-
-exports.Client = require('./client').Client;
-exports.Flavor = require('../../joyent/compute/flavor').Flavor;
-exports.Image = require('../../joyent/compute/image').Image;
-exports.Server = require('../../joyent/compute/server').Server;
-
-exports.createClient = function (options) {
- return new exports.Client(options);
-};
diff --git a/lib/pkgcloud/telefonica/index.js b/lib/pkgcloud/telefonica/index.js
deleted file mode 100644
index 3c0872103..000000000
--- a/lib/pkgcloud/telefonica/index.js
+++ /dev/null
@@ -1,8 +0,0 @@
-/*
- * index.js: Top-level include for the Telefonica module.
- *
- * (C) 2012 Nodejitsu Inc.
- *
- */
-
-exports.compute = require('./compute');
diff --git a/package-lock.json b/package-lock.json
new file mode 100644
index 000000000..e6d06e53f
--- /dev/null
+++ b/package-lock.json
@@ -0,0 +1,3731 @@
+{
+ "name": "pkgcloud",
+ "version": "2.2.0",
+ "lockfileVersion": 1,
+ "requires": true,
+ "dependencies": {
+ "@babel/code-frame": {
+ "version": "7.0.0",
+ "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.0.0.tgz",
+ "integrity": "sha512-OfC2uemaknXr87bdLUkWog7nYuliM9Ij5HUcajsVcMCpQrcLmtxRbVFTIqmcSkSeYRBFBRxs2FiUqFJDLdiebA==",
+ "dev": true,
+ "requires": {
+ "@babel/highlight": "^7.0.0"
+ }
+ },
+ "@babel/generator": {
+ "version": "7.5.0",
+ "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.5.0.tgz",
+ "integrity": "sha512-1TTVrt7J9rcG5PMjvO7VEG3FrEoEJNHxumRq66GemPmzboLWtIjjcJgk8rokuAS7IiRSpgVSu5Vb9lc99iJkOA==",
+ "dev": true,
+ "requires": {
+ "@babel/types": "^7.5.0",
+ "jsesc": "^2.5.1",
+ "lodash": "^4.17.11",
+ "source-map": "^0.5.0",
+ "trim-right": "^1.0.1"
+ }
+ },
+ "@babel/helper-function-name": {
+ "version": "7.1.0",
+ "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.1.0.tgz",
+ "integrity": "sha512-A95XEoCpb3TO+KZzJ4S/5uW5fNe26DjBGqf1o9ucyLyCmi1dXq/B3c8iaWTfBk3VvetUxl16e8tIrd5teOCfGw==",
+ "dev": true,
+ "requires": {
+ "@babel/helper-get-function-arity": "^7.0.0",
+ "@babel/template": "^7.1.0",
+ "@babel/types": "^7.0.0"
+ }
+ },
+ "@babel/helper-get-function-arity": {
+ "version": "7.0.0",
+ "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.0.0.tgz",
+ "integrity": "sha512-r2DbJeg4svYvt3HOS74U4eWKsUAMRH01Z1ds1zx8KNTPtpTL5JAsdFv8BNyOpVqdFhHkkRDIg5B4AsxmkjAlmQ==",
+ "dev": true,
+ "requires": {
+ "@babel/types": "^7.0.0"
+ }
+ },
+ "@babel/helper-split-export-declaration": {
+ "version": "7.4.4",
+ "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.4.4.tgz",
+ "integrity": "sha512-Ro/XkzLf3JFITkW6b+hNxzZ1n5OQ80NvIUdmHspih1XAhtN3vPTuUFT4eQnela+2MaZ5ulH+iyP513KJrxbN7Q==",
+ "dev": true,
+ "requires": {
+ "@babel/types": "^7.4.4"
+ }
+ },
+ "@babel/highlight": {
+ "version": "7.5.0",
+ "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.5.0.tgz",
+ "integrity": "sha512-7dV4eu9gBxoM0dAnj/BCFDW9LFU0zvTrkq0ugM7pnHEgguOEeOz1so2ZghEdzviYzQEED0r4EAgpsBChKy1TRQ==",
+ "dev": true,
+ "requires": {
+ "chalk": "^2.0.0",
+ "esutils": "^2.0.2",
+ "js-tokens": "^4.0.0"
+ }
+ },
+ "@babel/parser": {
+ "version": "7.5.0",
+ "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.5.0.tgz",
+ "integrity": "sha512-I5nW8AhGpOXGCCNYGc+p7ExQIBxRFnS2fd/d862bNOKvmoEPjYPcfIjsfdy0ujagYOIYPczKgD9l3FsgTkAzKA==",
+ "dev": true
+ },
+ "@babel/template": {
+ "version": "7.4.4",
+ "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.4.4.tgz",
+ "integrity": "sha512-CiGzLN9KgAvgZsnivND7rkA+AeJ9JB0ciPOD4U59GKbQP2iQl+olF1l76kJOupqidozfZ32ghwBEJDhnk9MEcw==",
+ "dev": true,
+ "requires": {
+ "@babel/code-frame": "^7.0.0",
+ "@babel/parser": "^7.4.4",
+ "@babel/types": "^7.4.4"
+ }
+ },
+ "@babel/traverse": {
+ "version": "7.5.0",
+ "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.5.0.tgz",
+ "integrity": "sha512-SnA9aLbyOCcnnbQEGwdfBggnc142h/rbqqsXcaATj2hZcegCl903pUD/lfpsNBlBSuWow/YDfRyJuWi2EPR5cg==",
+ "dev": true,
+ "requires": {
+ "@babel/code-frame": "^7.0.0",
+ "@babel/generator": "^7.5.0",
+ "@babel/helper-function-name": "^7.1.0",
+ "@babel/helper-split-export-declaration": "^7.4.4",
+ "@babel/parser": "^7.5.0",
+ "@babel/types": "^7.5.0",
+ "debug": "^4.1.0",
+ "globals": "^11.1.0",
+ "lodash": "^4.17.11"
+ },
+ "dependencies": {
+ "debug": {
+ "version": "4.1.1",
+ "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
+ "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
+ "dev": true,
+ "requires": {
+ "ms": "^2.1.1"
+ }
+ }
+ }
+ },
+ "@babel/types": {
+ "version": "7.5.0",
+ "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.5.0.tgz",
+ "integrity": "sha512-UFpDVqRABKsW01bvw7/wSUe56uy6RXM5+VJibVVAybDGxEW25jdwiFJEf7ASvSaC7sN7rbE/l3cLp2izav+CtQ==",
+ "dev": true,
+ "requires": {
+ "esutils": "^2.0.2",
+ "lodash": "^4.17.11",
+ "to-fast-properties": "^2.0.0"
+ }
+ },
+ "@google-cloud/common": {
+ "version": "0.32.1",
+ "resolved": "https://registry.npmjs.org/@google-cloud/common/-/common-0.32.1.tgz",
+ "integrity": "sha512-bLdPzFvvBMtVkwsoBtygE9oUm3yrNmPa71gvOgucYI/GqvNP2tb6RYsDHPq98kvignhcgHGDI5wyNgxaCo8bKQ==",
+ "requires": {
+ "@google-cloud/projectify": "^0.3.3",
+ "@google-cloud/promisify": "^0.4.0",
+ "@types/request": "^2.48.1",
+ "arrify": "^2.0.0",
+ "duplexify": "^3.6.0",
+ "ent": "^2.2.0",
+ "extend": "^3.0.2",
+ "google-auth-library": "^3.1.1",
+ "pify": "^4.0.1",
+ "retry-request": "^4.0.0",
+ "teeny-request": "^3.11.3"
+ },
+ "dependencies": {
+ "arrify": {
+ "version": "2.0.1",
+ "resolved": "https://registry.npmjs.org/arrify/-/arrify-2.0.1.tgz",
+ "integrity": "sha512-3duEwti880xqi4eAMN8AyR4a0ByT90zoYdLlevfrvU43vb0YZwZVfxOgxWrLXXXpyugL0hNZc9G6BiB5B3nUug=="
+ }
+ }
+ },
+ "@google-cloud/paginator": {
+ "version": "0.2.0",
+ "resolved": "https://registry.npmjs.org/@google-cloud/paginator/-/paginator-0.2.0.tgz",
+ "integrity": "sha512-2ZSARojHDhkLvQ+CS32K+iUhBsWg3AEw+uxtqblA7xoCABDyhpj99FPp35xy6A+XlzMhOSrHHaxFE+t6ZTQq0w==",
+ "requires": {
+ "arrify": "^1.0.1",
+ "extend": "^3.0.1",
+ "split-array-stream": "^2.0.0",
+ "stream-events": "^1.0.4"
+ }
+ },
+ "@google-cloud/projectify": {
+ "version": "0.3.3",
+ "resolved": "https://registry.npmjs.org/@google-cloud/projectify/-/projectify-0.3.3.tgz",
+ "integrity": "sha512-7522YHQ4IhaafgSunsFF15nG0TGVmxgXidy9cITMe+256RgqfcrfWphiMufW+Ou4kqagW/u3yxwbzVEW3dk2Uw=="
+ },
+ "@google-cloud/promisify": {
+ "version": "0.4.0",
+ "resolved": "https://registry.npmjs.org/@google-cloud/promisify/-/promisify-0.4.0.tgz",
+ "integrity": "sha512-4yAHDC52TEMCNcMzVC8WlqnKKKq+Ssi2lXoUg9zWWkZ6U6tq9ZBRYLHHCRdfU+EU9YJsVmivwGcKYCjRGjnf4Q=="
+ },
+ "@google-cloud/storage": {
+ "version": "2.5.0",
+ "resolved": "https://registry.npmjs.org/@google-cloud/storage/-/storage-2.5.0.tgz",
+ "integrity": "sha512-q1mwB6RUebIahbA3eriRs8DbG2Ij81Ynb9k8hMqTPkmbd8/S6Z0d6hVvfPmnyvX9Ej13IcmEYIbymuq/RBLghA==",
+ "requires": {
+ "@google-cloud/common": "^0.32.0",
+ "@google-cloud/paginator": "^0.2.0",
+ "@google-cloud/promisify": "^0.4.0",
+ "arrify": "^1.0.0",
+ "async": "^2.0.1",
+ "compressible": "^2.0.12",
+ "concat-stream": "^2.0.0",
+ "date-and-time": "^0.6.3",
+ "duplexify": "^3.5.0",
+ "extend": "^3.0.0",
+ "gcs-resumable-upload": "^1.0.0",
+ "hash-stream-validation": "^0.2.1",
+ "mime": "^2.2.0",
+ "mime-types": "^2.0.8",
+ "onetime": "^5.1.0",
+ "pumpify": "^1.5.1",
+ "snakeize": "^0.1.0",
+ "stream-events": "^1.0.1",
+ "teeny-request": "^3.11.3",
+ "through2": "^3.0.0",
+ "xdg-basedir": "^3.0.0"
+ }
+ },
+ "@types/caseless": {
+ "version": "0.12.2",
+ "resolved": "https://registry.npmjs.org/@types/caseless/-/caseless-0.12.2.tgz",
+ "integrity": "sha512-6ckxMjBBD8URvjB6J3NcnuAn5Pkl7t3TizAg+xdlzzQGSPSmBcXf8KoIH0ua/i+tio+ZRUHEXp0HEmvaR4kt0w=="
+ },
+ "@types/form-data": {
+ "version": "2.2.1",
+ "resolved": "https://registry.npmjs.org/@types/form-data/-/form-data-2.2.1.tgz",
+ "integrity": "sha512-JAMFhOaHIciYVh8fb5/83nmuO/AHwmto+Hq7a9y8FzLDcC1KCU344XDOMEmahnrTFlHjgh4L0WJFczNIX2GxnQ==",
+ "requires": {
+ "@types/node": "*"
+ }
+ },
+ "@types/node": {
+ "version": "12.0.12",
+ "resolved": "https://registry.npmjs.org/@types/node/-/node-12.0.12.tgz",
+ "integrity": "sha512-Uy0PN4R5vgBUXFoJrKryf5aTk3kJ8Rv3PdlHjl6UaX+Cqp1QE0yPQ68MPXGrZOfG7gZVNDIJZYyot0B9ubXUrQ=="
+ },
+ "@types/request": {
+ "version": "2.48.1",
+ "resolved": "https://registry.npmjs.org/@types/request/-/request-2.48.1.tgz",
+ "integrity": "sha512-ZgEZ1TiD+KGA9LiAAPPJL68Id2UWfeSO62ijSXZjFJArVV+2pKcsVHmrcu+1oiE3q6eDGiFiSolRc4JHoerBBg==",
+ "requires": {
+ "@types/caseless": "*",
+ "@types/form-data": "*",
+ "@types/node": "*",
+ "@types/tough-cookie": "*"
+ }
+ },
+ "@types/tough-cookie": {
+ "version": "2.3.5",
+ "resolved": "https://registry.npmjs.org/@types/tough-cookie/-/tough-cookie-2.3.5.tgz",
+ "integrity": "sha512-SCcK7mvGi3+ZNz833RRjFIxrn4gI1PPR3NtuIS+6vMkvmsGjosqTJwRt5bAEFLRz+wtJMWv8+uOnZf2hi2QXTg=="
+ },
+ "abort-controller": {
+ "version": "3.0.0",
+ "resolved": "https://registry.npmjs.org/abort-controller/-/abort-controller-3.0.0.tgz",
+ "integrity": "sha512-h8lQ8tacZYnR3vNQTgibj+tODHI5/+l06Au2Pcriv/Gmet0eaj4TwWH41sO9wnHDiQsEj19q0drzdWdeAHtweg==",
+ "requires": {
+ "event-target-shim": "^5.0.0"
+ }
+ },
+ "agent-base": {
+ "version": "4.3.0",
+ "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-4.3.0.tgz",
+ "integrity": "sha512-salcGninV0nPrwpGNn4VTXBb1SOuXQBiqbrNXoeizJsHrsL6ERFM2Ne3JUSBWRE6aeNJI2ROP/WEEIDUiDe3cg==",
+ "requires": {
+ "es6-promisify": "^5.0.0"
+ }
+ },
+ "ajv": {
+ "version": "6.10.1",
+ "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.10.1.tgz",
+ "integrity": "sha512-w1YQaVGNC6t2UCPjEawK/vo/dG8OOrVtUmhBT1uJJYxbl5kU2Tj3v6LGqBcsysN1yhuCStJCCA3GqdvKY8sqXQ==",
+ "requires": {
+ "fast-deep-equal": "^2.0.1",
+ "fast-json-stable-stringify": "^2.0.0",
+ "json-schema-traverse": "^0.4.1",
+ "uri-js": "^4.2.2"
+ }
+ },
+ "ansi-colors": {
+ "version": "3.2.3",
+ "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-3.2.3.tgz",
+ "integrity": "sha512-LEHHyuhlPY3TmuUYMh2oz89lTShfvgbmzaBcxve9t/9Wuy7Dwf4yoAKcND7KFT1HAQfqZ12qtc+DUrBMeKF9nw==",
+ "dev": true
+ },
+ "ansi-regex": {
+ "version": "3.0.0",
+ "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz",
+ "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=",
+ "dev": true
+ },
+ "ansi-styles": {
+ "version": "3.2.1",
+ "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+ "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+ "dev": true,
+ "requires": {
+ "color-convert": "^1.9.0"
+ }
+ },
+ "argparse": {
+ "version": "1.0.10",
+ "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz",
+ "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==",
+ "dev": true,
+ "requires": {
+ "sprintf-js": "~1.0.2"
+ }
+ },
+ "arrify": {
+ "version": "1.0.1",
+ "resolved": "https://registry.npmjs.org/arrify/-/arrify-1.0.1.tgz",
+ "integrity": "sha1-iYUI2iIm84DfkEcoRWhJwVAaSw0="
+ },
+ "asn1": {
+ "version": "0.2.4",
+ "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.4.tgz",
+ "integrity": "sha512-jxwzQpLQjSmWXgwaCZE9Nz+glAG01yF1QnWgbhGwHI5A6FRIEY6IVqtHhIepHqI7/kyEyQEagBC5mBEFlIYvdg==",
+ "requires": {
+ "safer-buffer": "~2.1.0"
+ }
+ },
+ "assert-plus": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
+ "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU="
+ },
+ "async": {
+ "version": "2.6.2",
+ "resolved": "https://registry.npmjs.org/async/-/async-2.6.2.tgz",
+ "integrity": "sha512-H1qVYh1MYhEEFLsP97cVKqCGo7KfCyTt6uEWqsTBr9SO84oK9Uwbyd/yCW+6rKJLHksBNUVWZDAjfS+Ccx0Bbg==",
+ "requires": {
+ "lodash": "^4.17.11"
+ }
+ },
+ "asynckit": {
+ "version": "0.4.0",
+ "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
+ "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k="
+ },
+ "aws-sdk": {
+ "version": "2.488.0",
+ "resolved": "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.488.0.tgz",
+ "integrity": "sha512-9AP48tyF1E5+x1CKeiRlj0Sv1YF7KI0BdSW9JP8x3ClhPWNUHjDYNH2OwsALuG1BloeY2ZigYqfI2fB7g3rNHQ==",
+ "requires": {
+ "buffer": "4.9.1",
+ "events": "1.1.1",
+ "ieee754": "1.1.8",
+ "jmespath": "0.15.0",
+ "querystring": "0.2.0",
+ "sax": "1.2.1",
+ "url": "0.10.3",
+ "uuid": "3.3.2",
+ "xml2js": "0.4.19"
+ }
+ },
+ "aws-sign2": {
+ "version": "0.7.0",
+ "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.7.0.tgz",
+ "integrity": "sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg="
+ },
+ "aws4": {
+ "version": "1.8.0",
+ "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.8.0.tgz",
+ "integrity": "sha512-ReZxvNHIOv88FlT7rxcXIIC0fPt4KZqZbOlivyWtXLt8ESx84zd3kMC6iK5jVeS2qt+g7ftS7ye4fi06X5rtRQ=="
+ },
+ "balanced-match": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz",
+ "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=",
+ "dev": true
+ },
+ "base64-js": {
+ "version": "1.3.0",
+ "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.3.0.tgz",
+ "integrity": "sha512-ccav/yGvoa80BQDljCxsmmQ3Xvx60/UpBIij5QN21W3wBi/hhIC9OoO+KLpu9IJTS9j4DRVJ3aDDF9cMSoa2lw=="
+ },
+ "bcrypt-pbkdf": {
+ "version": "1.0.2",
+ "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz",
+ "integrity": "sha1-pDAdOJtqQ/m2f/PKEaP2Y342Dp4=",
+ "requires": {
+ "tweetnacl": "^0.14.3"
+ }
+ },
+ "bignumber.js": {
+ "version": "7.2.1",
+ "resolved": "https://registry.npmjs.org/bignumber.js/-/bignumber.js-7.2.1.tgz",
+ "integrity": "sha512-S4XzBk5sMB+Rcb/LNcpzXr57VRTxgAvaAEDAl1AwRx27j00hT84O6OkteE7u8UB3NuaaygCRrEpqox4uDOrbdQ=="
+ },
+ "brace-expansion": {
+ "version": "1.1.11",
+ "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
+ "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
+ "dev": true,
+ "requires": {
+ "balanced-match": "^1.0.0",
+ "concat-map": "0.0.1"
+ }
+ },
+ "browser-stdout": {
+ "version": "1.3.1",
+ "resolved": "https://registry.npmjs.org/browser-stdout/-/browser-stdout-1.3.1.tgz",
+ "integrity": "sha512-qhAVI1+Av2X7qelOfAIYwXONood6XlZE/fXaBSmW/T5SzLAmCgzi+eiWE7fUvbHaeNBQH13UftjpXxsfLkMpgw==",
+ "dev": true
+ },
+ "buffer": {
+ "version": "4.9.1",
+ "resolved": "https://registry.npmjs.org/buffer/-/buffer-4.9.1.tgz",
+ "integrity": "sha1-bRu2AbB6TvztlwlBMgkwJ8lbwpg=",
+ "requires": {
+ "base64-js": "^1.0.2",
+ "ieee754": "^1.1.4",
+ "isarray": "^1.0.0"
+ }
+ },
+ "buffer-equal-constant-time": {
+ "version": "1.0.1",
+ "resolved": "https://registry.npmjs.org/buffer-equal-constant-time/-/buffer-equal-constant-time-1.0.1.tgz",
+ "integrity": "sha1-+OcRMvf/5uAaXJaXpMbz5I1cyBk="
+ },
+ "buffer-from": {
+ "version": "1.1.1",
+ "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.1.tgz",
+ "integrity": "sha512-MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A=="
+ },
+ "camelcase": {
+ "version": "5.3.1",
+ "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz",
+ "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==",
+ "dev": true
+ },
+ "caseless": {
+ "version": "0.12.0",
+ "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz",
+ "integrity": "sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw="
+ },
+ "chalk": {
+ "version": "2.4.2",
+ "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
+ "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
+ "dev": true,
+ "requires": {
+ "ansi-styles": "^3.2.1",
+ "escape-string-regexp": "^1.0.5",
+ "supports-color": "^5.3.0"
+ },
+ "dependencies": {
+ "escape-string-regexp": {
+ "version": "1.0.5",
+ "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
+ "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=",
+ "dev": true
+ },
+ "supports-color": {
+ "version": "5.5.0",
+ "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
+ "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+ "dev": true,
+ "requires": {
+ "has-flag": "^3.0.0"
+ }
+ }
+ }
+ },
+ "cli": {
+ "version": "1.0.1",
+ "resolved": "https://registry.npmjs.org/cli/-/cli-1.0.1.tgz",
+ "integrity": "sha1-IoF1NPJL+klQw01TLUjsvGIbjBQ=",
+ "dev": true,
+ "requires": {
+ "exit": "0.1.2",
+ "glob": "^7.1.1"
+ },
+ "dependencies": {
+ "glob": {
+ "version": "7.1.4",
+ "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.4.tgz",
+ "integrity": "sha512-hkLPepehmnKk41pUGm3sYxoFs/umurYfYJCerbXEyFIWcAzvpipAgVkBqqT9RBKMGjnq6kMuyYwha6csxbiM1A==",
+ "dev": true,
+ "requires": {
+ "fs.realpath": "^1.0.0",
+ "inflight": "^1.0.4",
+ "inherits": "2",
+ "minimatch": "^3.0.4",
+ "once": "^1.3.0",
+ "path-is-absolute": "^1.0.0"
+ }
+ },
+ "minimatch": {
+ "version": "3.0.4",
+ "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
+ "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
+ "dev": true,
+ "requires": {
+ "brace-expansion": "^1.1.7"
+ }
+ }
+ }
+ },
+ "cliui": {
+ "version": "4.1.0",
+ "resolved": "https://registry.npmjs.org/cliui/-/cliui-4.1.0.tgz",
+ "integrity": "sha512-4FG+RSG9DL7uEwRUZXZn3SS34DiDPfzP0VOiEwtUWlE+AR2EIg+hSyvrIgUUfhdgR/UkAeW2QHgeP+hWrXs7jQ==",
+ "dev": true,
+ "requires": {
+ "string-width": "^2.1.1",
+ "strip-ansi": "^4.0.0",
+ "wrap-ansi": "^2.0.0"
+ }
+ },
+ "code-point-at": {
+ "version": "1.1.0",
+ "resolved": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz",
+ "integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=",
+ "dev": true
+ },
+ "color-convert": {
+ "version": "1.9.3",
+ "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
+ "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
+ "dev": true,
+ "requires": {
+ "color-name": "1.1.3"
+ }
+ },
+ "color-name": {
+ "version": "1.1.3",
+ "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
+ "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=",
+ "dev": true
+ },
+ "combined-stream": {
+ "version": "1.0.8",
+ "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz",
+ "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==",
+ "requires": {
+ "delayed-stream": "~1.0.0"
+ }
+ },
+ "commander": {
+ "version": "2.3.0",
+ "resolved": "https://registry.npmjs.org/commander/-/commander-2.3.0.tgz",
+ "integrity": "sha1-/UMOiJgy7DU7ms0d4hfBHLPu+HM="
+ },
+ "compressible": {
+ "version": "2.0.17",
+ "resolved": "https://registry.npmjs.org/compressible/-/compressible-2.0.17.tgz",
+ "integrity": "sha512-BGHeLCK1GV7j1bSmQQAi26X+GgWcTjLr/0tzSvMCl3LH1w1IJ4PFSPoV5316b30cneTziC+B1a+3OjoSUcQYmw==",
+ "requires": {
+ "mime-db": ">= 1.40.0 < 2"
+ }
+ },
+ "concat-map": {
+ "version": "0.0.1",
+ "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
+ "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=",
+ "dev": true
+ },
+ "concat-stream": {
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/concat-stream/-/concat-stream-2.0.0.tgz",
+ "integrity": "sha512-MWufYdFw53ccGjCA+Ol7XJYpAlW6/prSMzuPOTRnJGcGzuhLn4Scrz7qf6o8bROZ514ltazcIFJZevcfbo0x7A==",
+ "requires": {
+ "buffer-from": "^1.0.0",
+ "inherits": "^2.0.3",
+ "readable-stream": "^3.0.2",
+ "typedarray": "^0.0.6"
+ },
+ "dependencies": {
+ "readable-stream": {
+ "version": "3.4.0",
+ "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.4.0.tgz",
+ "integrity": "sha512-jItXPLmrSR8jmTRmRWJXCnGJsfy85mB3Wd/uINMXA65yrnFo0cPClFIUWzo2najVNSl+mx7/4W8ttlLWJe99pQ==",
+ "requires": {
+ "inherits": "^2.0.3",
+ "string_decoder": "^1.1.1",
+ "util-deprecate": "^1.0.1"
+ }
+ }
+ }
+ },
+ "configstore": {
+ "version": "4.0.0",
+ "resolved": "https://registry.npmjs.org/configstore/-/configstore-4.0.0.tgz",
+ "integrity": "sha512-CmquAXFBocrzaSM8mtGPMM/HiWmyIpr4CcJl/rgY2uCObZ/S7cKU0silxslqJejl+t/T9HS8E0PUNQD81JGUEQ==",
+ "requires": {
+ "dot-prop": "^4.1.0",
+ "graceful-fs": "^4.1.2",
+ "make-dir": "^1.0.0",
+ "unique-string": "^1.0.0",
+ "write-file-atomic": "^2.0.0",
+ "xdg-basedir": "^3.0.0"
+ }
+ },
+ "console-browserify": {
+ "version": "1.1.0",
+ "resolved": "https://registry.npmjs.org/console-browserify/-/console-browserify-1.1.0.tgz",
+ "integrity": "sha1-8CQcRXMKn8YyOyBtvzjtx0HQuxA=",
+ "dev": true,
+ "requires": {
+ "date-now": "^0.1.4"
+ }
+ },
+ "core-util-is": {
+ "version": "1.0.2",
+ "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
+ "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac="
+ },
+ "coveralls": {
+ "version": "3.0.4",
+ "resolved": "https://registry.npmjs.org/coveralls/-/coveralls-3.0.4.tgz",
+ "integrity": "sha512-eyqUWA/7RT0JagiL0tThVhjbIjoiEUyWCjtUJoOPcWoeofP5WK/jb2OJYoBFrR6DvplR+AxOyuBqk4JHkk5ykA==",
+ "dev": true,
+ "requires": {
+ "growl": "~> 1.10.0",
+ "js-yaml": "^3.11.0",
+ "lcov-parse": "^0.0.10",
+ "log-driver": "^1.2.7",
+ "minimist": "^1.2.0",
+ "request": "^2.86.0"
+ },
+ "dependencies": {
+ "growl": {
+ "version": "1.10.5",
+ "resolved": "https://registry.npmjs.org/growl/-/growl-1.10.5.tgz",
+ "integrity": "sha512-qBr4OuELkhPenW6goKVXiv47US3clb3/IbuWF9KNKEijAy9oeHxU9IgzjvJhHkUzhaj7rOUD7+YGWqUjLp5oSA==",
+ "dev": true
+ },
+ "minimist": {
+ "version": "1.2.0",
+ "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
+ "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=",
+ "dev": true
+ }
+ }
+ },
+ "cross-spawn": {
+ "version": "6.0.5",
+ "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz",
+ "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==",
+ "dev": true,
+ "requires": {
+ "nice-try": "^1.0.4",
+ "path-key": "^2.0.1",
+ "semver": "^5.5.0",
+ "shebang-command": "^1.2.0",
+ "which": "^1.2.9"
+ }
+ },
+ "crypto-random-string": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/crypto-random-string/-/crypto-random-string-1.0.0.tgz",
+ "integrity": "sha1-ojD2T1aDEOFJgAmUB5DsmVRbyn4="
+ },
+ "dashdash": {
+ "version": "1.14.1",
+ "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz",
+ "integrity": "sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA=",
+ "requires": {
+ "assert-plus": "^1.0.0"
+ }
+ },
+ "date-and-time": {
+ "version": "0.6.3",
+ "resolved": "https://registry.npmjs.org/date-and-time/-/date-and-time-0.6.3.tgz",
+ "integrity": "sha512-lcWy3AXDRJOD7MplwZMmNSRM//kZtJaLz4n6D1P5z9wEmZGBKhJRBIr1Xs9KNQJmdXPblvgffynYji4iylUTcA=="
+ },
+ "date-now": {
+ "version": "0.1.4",
+ "resolved": "https://registry.npmjs.org/date-now/-/date-now-0.1.4.tgz",
+ "integrity": "sha1-6vQ5/U1ISK105cx9vvIAZyueNFs=",
+ "dev": true
+ },
+ "debug": {
+ "version": "3.2.6",
+ "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz",
+ "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==",
+ "requires": {
+ "ms": "^2.1.1"
+ }
+ },
+ "decamelize": {
+ "version": "1.2.0",
+ "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz",
+ "integrity": "sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=",
+ "dev": true
+ },
+ "deep-equal": {
+ "version": "1.0.1",
+ "resolved": "https://registry.npmjs.org/deep-equal/-/deep-equal-1.0.1.tgz",
+ "integrity": "sha1-9dJgKStmDghO/0zbyfCK0yR0SLU="
+ },
+ "define-properties": {
+ "version": "1.1.3",
+ "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.3.tgz",
+ "integrity": "sha512-3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ==",
+ "dev": true,
+ "requires": {
+ "object-keys": "^1.0.12"
+ }
+ },
+ "delayed-stream": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
+ "integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk="
+ },
+ "diff": {
+ "version": "1.4.0",
+ "resolved": "https://registry.npmjs.org/diff/-/diff-1.4.0.tgz",
+ "integrity": "sha1-fyjS657nsVqX79ic5j3P2qPMur8="
+ },
+ "dom-serializer": {
+ "version": "0.1.1",
+ "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-0.1.1.tgz",
+ "integrity": "sha512-l0IU0pPzLWSHBcieZbpOKgkIn3ts3vAh7ZuFyXNwJxJXk/c4Gwj9xaTJwIDVQCXawWD0qb3IzMGH5rglQaO0XA==",
+ "dev": true,
+ "requires": {
+ "domelementtype": "^1.3.0",
+ "entities": "^1.1.1"
+ },
+ "dependencies": {
+ "entities": {
+ "version": "1.1.2",
+ "resolved": "https://registry.npmjs.org/entities/-/entities-1.1.2.tgz",
+ "integrity": "sha512-f2LZMYl1Fzu7YSBKg+RoROelpOaNrcGmE9AZubeDfrCEia483oW4MI4VyFd5VNHIgQ/7qm1I0wUHK1eJnn2y2w==",
+ "dev": true
+ }
+ }
+ },
+ "domelementtype": {
+ "version": "1.3.1",
+ "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-1.3.1.tgz",
+ "integrity": "sha512-BSKB+TSpMpFI/HOxCNr1O8aMOTZ8hT3pM3GQ0w/mWRmkhEDSFJkkyzz4XQsBV44BChwGkrDfMyjVD0eA2aFV3w==",
+ "dev": true
+ },
+ "domhandler": {
+ "version": "2.3.0",
+ "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-2.3.0.tgz",
+ "integrity": "sha1-LeWaCCLVAn+r/28DLCsloqir5zg=",
+ "dev": true,
+ "requires": {
+ "domelementtype": "1"
+ }
+ },
+ "domutils": {
+ "version": "1.5.1",
+ "resolved": "https://registry.npmjs.org/domutils/-/domutils-1.5.1.tgz",
+ "integrity": "sha1-3NhIiib1Y9YQeeSMn3t+Mjc2gs8=",
+ "dev": true,
+ "requires": {
+ "dom-serializer": "0",
+ "domelementtype": "1"
+ }
+ },
+ "dot-prop": {
+ "version": "4.2.0",
+ "resolved": "https://registry.npmjs.org/dot-prop/-/dot-prop-4.2.0.tgz",
+ "integrity": "sha512-tUMXrxlExSW6U2EXiiKGSBVdYgtV8qlHL+C10TsW4PURY/ic+eaysnSkwB4kA/mBlCyy/IKDJ+Lc3wbWeaXtuQ==",
+ "requires": {
+ "is-obj": "^1.0.0"
+ }
+ },
+ "duplexify": {
+ "version": "3.7.1",
+ "resolved": "https://registry.npmjs.org/duplexify/-/duplexify-3.7.1.tgz",
+ "integrity": "sha512-07z8uv2wMyS51kKhD1KsdXJg5WQ6t93RneqRxUHnskXVtlYYkLqM0gqStQZ3pj073g687jPCHrqNfCzawLYh5g==",
+ "requires": {
+ "end-of-stream": "^1.0.0",
+ "inherits": "^2.0.1",
+ "readable-stream": "^2.0.0",
+ "stream-shift": "^1.0.0"
+ }
+ },
+ "ecc-jsbn": {
+ "version": "0.1.2",
+ "resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz",
+ "integrity": "sha1-OoOpBOVDUyh4dMVkt1SThoSamMk=",
+ "requires": {
+ "jsbn": "~0.1.0",
+ "safer-buffer": "^2.1.0"
+ }
+ },
+ "ecdsa-sig-formatter": {
+ "version": "1.0.11",
+ "resolved": "https://registry.npmjs.org/ecdsa-sig-formatter/-/ecdsa-sig-formatter-1.0.11.tgz",
+ "integrity": "sha512-nagl3RYrbNv6kQkeJIpt6NJZy8twLB/2vtz6yN9Z4vRKHN4/QZJIEbqohALSgwKdnksuY3k5Addp5lg8sVoVcQ==",
+ "requires": {
+ "safe-buffer": "^5.0.1"
+ }
+ },
+ "emoji-regex": {
+ "version": "7.0.3",
+ "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz",
+ "integrity": "sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==",
+ "dev": true
+ },
+ "end-of-stream": {
+ "version": "1.4.1",
+ "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.1.tgz",
+ "integrity": "sha512-1MkrZNvWTKCaigbn+W15elq2BB/L22nqrSY5DKlo3X6+vclJm8Bb5djXJBmEX6fS3+zCh/F4VBK5Z2KxJt4s2Q==",
+ "requires": {
+ "once": "^1.4.0"
+ }
+ },
+ "ent": {
+ "version": "2.2.0",
+ "resolved": "https://registry.npmjs.org/ent/-/ent-2.2.0.tgz",
+ "integrity": "sha1-6WQhkyWiHQX0RGai9obtbOX13R0="
+ },
+ "entities": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/entities/-/entities-1.0.0.tgz",
+ "integrity": "sha1-sph6o4ITR/zeZCsk/fyeT7cSvyY=",
+ "dev": true
+ },
+ "errs": {
+ "version": "0.3.2",
+ "resolved": "https://registry.npmjs.org/errs/-/errs-0.3.2.tgz",
+ "integrity": "sha1-eYCZstvTfKK8dJ5TinwTB9C1BJk="
+ },
+ "es-abstract": {
+ "version": "1.13.0",
+ "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.13.0.tgz",
+ "integrity": "sha512-vDZfg/ykNxQVwup/8E1BZhVzFfBxs9NqMzGcvIJrqg5k2/5Za2bWo40dK2J1pgLngZ7c+Shh8lwYtLGyrwPutg==",
+ "dev": true,
+ "requires": {
+ "es-to-primitive": "^1.2.0",
+ "function-bind": "^1.1.1",
+ "has": "^1.0.3",
+ "is-callable": "^1.1.4",
+ "is-regex": "^1.0.4",
+ "object-keys": "^1.0.12"
+ }
+ },
+ "es-to-primitive": {
+ "version": "1.2.0",
+ "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.0.tgz",
+ "integrity": "sha512-qZryBOJjV//LaxLTV6UC//WewneB3LcXOL9NP++ozKVXsIIIpm/2c13UDiD9Jp2eThsecw9m3jPqDwTyobcdbg==",
+ "dev": true,
+ "requires": {
+ "is-callable": "^1.1.4",
+ "is-date-object": "^1.0.1",
+ "is-symbol": "^1.0.2"
+ }
+ },
+ "es6-promise": {
+ "version": "4.2.8",
+ "resolved": "https://registry.npmjs.org/es6-promise/-/es6-promise-4.2.8.tgz",
+ "integrity": "sha512-HJDGx5daxeIvxdBxvG2cb9g4tEvwIk3i8+nhX0yGrYmZUzbkdg8QbDevheDB8gd0//uPj4c1EQua8Q+MViT0/w=="
+ },
+ "es6-promisify": {
+ "version": "5.0.0",
+ "resolved": "https://registry.npmjs.org/es6-promisify/-/es6-promisify-5.0.0.tgz",
+ "integrity": "sha1-UQnWLz5W6pZ8S2NQWu8IKRyKUgM=",
+ "requires": {
+ "es6-promise": "^4.0.3"
+ }
+ },
+ "escape-string-regexp": {
+ "version": "1.0.2",
+ "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.2.tgz",
+ "integrity": "sha1-Tbwv5nTnGUnK8/smlc5/LcHZqNE="
+ },
+ "esprima": {
+ "version": "4.0.1",
+ "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz",
+ "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==",
+ "dev": true
+ },
+ "esutils": {
+ "version": "2.0.2",
+ "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.2.tgz",
+ "integrity": "sha1-Cr9PHKpbyx96nYrMbepPqqBLrJs=",
+ "dev": true
+ },
+ "event-target-shim": {
+ "version": "5.0.1",
+ "resolved": "https://registry.npmjs.org/event-target-shim/-/event-target-shim-5.0.1.tgz",
+ "integrity": "sha512-i/2XbnSz/uxRCU6+NdVJgKWDTM427+MqYbkQzD321DuCQJUqOuJKIA0IM2+W2xtYHdKOmZ4dR6fExsd4SXL+WQ=="
+ },
+ "eventemitter2": {
+ "version": "5.0.1",
+ "resolved": "https://registry.npmjs.org/eventemitter2/-/eventemitter2-5.0.1.tgz",
+ "integrity": "sha1-YZegldX7a1folC9v1+qtY6CclFI="
+ },
+ "events": {
+ "version": "1.1.1",
+ "resolved": "https://registry.npmjs.org/events/-/events-1.1.1.tgz",
+ "integrity": "sha1-nr23Y1rQmccNzEwqH1AEKI6L2SQ="
+ },
+ "execa": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/execa/-/execa-1.0.0.tgz",
+ "integrity": "sha512-adbxcyWV46qiHyvSp50TKt05tB4tK3HcmF7/nxfAdhnox83seTDbwnaqKO4sXRy7roHAIFqJP/Rw/AuEbX61LA==",
+ "dev": true,
+ "requires": {
+ "cross-spawn": "^6.0.0",
+ "get-stream": "^4.0.0",
+ "is-stream": "^1.1.0",
+ "npm-run-path": "^2.0.0",
+ "p-finally": "^1.0.0",
+ "signal-exit": "^3.0.0",
+ "strip-eof": "^1.0.0"
+ }
+ },
+ "exit": {
+ "version": "0.1.2",
+ "resolved": "https://registry.npmjs.org/exit/-/exit-0.1.2.tgz",
+ "integrity": "sha1-BjJjj42HfMghB9MKD/8aF8uhzQw=",
+ "dev": true
+ },
+ "extend": {
+ "version": "3.0.2",
+ "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz",
+ "integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g=="
+ },
+ "extsprintf": {
+ "version": "1.3.0",
+ "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz",
+ "integrity": "sha1-lpGEQOMEGnpBT4xS48V06zw+HgU="
+ },
+ "fast-deep-equal": {
+ "version": "2.0.1",
+ "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz",
+ "integrity": "sha1-ewUhjd+WZ79/Nwv3/bLLFf3Qqkk="
+ },
+ "fast-json-patch": {
+ "version": "2.1.0",
+ "resolved": "https://registry.npmjs.org/fast-json-patch/-/fast-json-patch-2.1.0.tgz",
+ "integrity": "sha512-PipOsAKamRw7+CXtKiieehyjUeDVPJ5J7b2kdJYerEf6TSUQoD2ijpVyZ88KQm5YXziff4h762bz3+vzf56khg==",
+ "requires": {
+ "deep-equal": "^1.0.1"
+ }
+ },
+ "fast-json-stable-stringify": {
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz",
+ "integrity": "sha1-1RQsDK7msRifh9OnYREGT4bIu/I="
+ },
+ "fast-text-encoding": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/fast-text-encoding/-/fast-text-encoding-1.0.0.tgz",
+ "integrity": "sha512-R9bHCvweUxxwkDwhjav5vxpFvdPGlVngtqmx4pIZfSUhM/Q4NiIUHB456BAf+Q1Nwu3HEZYONtu+Rya+af4jiQ=="
+ },
+ "filed-mimefix": {
+ "version": "0.1.3",
+ "resolved": "https://registry.npmjs.org/filed-mimefix/-/filed-mimefix-0.1.3.tgz",
+ "integrity": "sha1-Cwtn0HWmP8dPJv3znH+dQxSWe7U=",
+ "requires": {
+ "mime": "^1.4.0"
+ },
+ "dependencies": {
+ "mime": {
+ "version": "1.6.0",
+ "resolved": "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz",
+ "integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg=="
+ }
+ }
+ },
+ "find-up": {
+ "version": "3.0.0",
+ "resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz",
+ "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==",
+ "dev": true,
+ "requires": {
+ "locate-path": "^3.0.0"
+ }
+ },
+ "flat": {
+ "version": "4.1.0",
+ "resolved": "https://registry.npmjs.org/flat/-/flat-4.1.0.tgz",
+ "integrity": "sha512-Px/TiLIznH7gEDlPXcUD4KnBusa6kR6ayRUVcnEAbreRIuhkqow/mun59BuRXwoYk7ZQOLW1ZM05ilIvK38hFw==",
+ "dev": true,
+ "requires": {
+ "is-buffer": "~2.0.3"
+ }
+ },
+ "forever-agent": {
+ "version": "0.6.1",
+ "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz",
+ "integrity": "sha1-+8cfDEGt6zf5bFd60e1C2P2sypE="
+ },
+ "form-data": {
+ "version": "2.3.3",
+ "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.3.3.tgz",
+ "integrity": "sha512-1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ==",
+ "requires": {
+ "asynckit": "^0.4.0",
+ "combined-stream": "^1.0.6",
+ "mime-types": "^2.1.12"
+ }
+ },
+ "fs.realpath": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
+ "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=",
+ "dev": true
+ },
+ "function-bind": {
+ "version": "1.1.1",
+ "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",
+ "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==",
+ "dev": true
+ },
+ "gaxios": {
+ "version": "1.8.4",
+ "resolved": "https://registry.npmjs.org/gaxios/-/gaxios-1.8.4.tgz",
+ "integrity": "sha512-BoENMnu1Gav18HcpV9IleMPZ9exM+AvUjrAOV4Mzs/vfz2Lu/ABv451iEXByKiMPn2M140uul1txXCg83sAENw==",
+ "requires": {
+ "abort-controller": "^3.0.0",
+ "extend": "^3.0.2",
+ "https-proxy-agent": "^2.2.1",
+ "node-fetch": "^2.3.0"
+ }
+ },
+ "gcp-metadata": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/gcp-metadata/-/gcp-metadata-1.0.0.tgz",
+ "integrity": "sha512-Q6HrgfrCQeEircnNP3rCcEgiDv7eF9+1B+1MMgpE190+/+0mjQR8PxeOaRgxZWmdDAF9EIryHB9g1moPiw1SbQ==",
+ "requires": {
+ "gaxios": "^1.0.2",
+ "json-bigint": "^0.3.0"
+ }
+ },
+ "gcs-resumable-upload": {
+ "version": "1.1.0",
+ "resolved": "https://registry.npmjs.org/gcs-resumable-upload/-/gcs-resumable-upload-1.1.0.tgz",
+ "integrity": "sha512-uBz7uHqp44xjSDzG3kLbOYZDjxxR/UAGbB47A0cC907W6yd2LkcyFDTHg+bjivkHMwiJlKv4guVWcjPCk2zScg==",
+ "requires": {
+ "abort-controller": "^2.0.2",
+ "configstore": "^4.0.0",
+ "gaxios": "^1.5.0",
+ "google-auth-library": "^3.0.0",
+ "pumpify": "^1.5.1",
+ "stream-events": "^1.0.4"
+ },
+ "dependencies": {
+ "abort-controller": {
+ "version": "2.0.3",
+ "resolved": "https://registry.npmjs.org/abort-controller/-/abort-controller-2.0.3.tgz",
+ "integrity": "sha512-EPSq5wr2aFyAZ1PejJB32IX9Qd4Nwus+adnp7STYFM5/23nLPBazqZ1oor6ZqbH+4otaaGXTlC8RN5hq3C8w9Q==",
+ "requires": {
+ "event-target-shim": "^5.0.0"
+ }
+ }
+ }
+ },
+ "get-caller-file": {
+ "version": "2.0.5",
+ "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz",
+ "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==",
+ "dev": true
+ },
+ "get-stream": {
+ "version": "4.1.0",
+ "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-4.1.0.tgz",
+ "integrity": "sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==",
+ "dev": true,
+ "requires": {
+ "pump": "^3.0.0"
+ },
+ "dependencies": {
+ "pump": {
+ "version": "3.0.0",
+ "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz",
+ "integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==",
+ "dev": true,
+ "requires": {
+ "end-of-stream": "^1.1.0",
+ "once": "^1.3.1"
+ }
+ }
+ }
+ },
+ "getpass": {
+ "version": "0.1.7",
+ "resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz",
+ "integrity": "sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo=",
+ "requires": {
+ "assert-plus": "^1.0.0"
+ }
+ },
+ "glob": {
+ "version": "3.2.11",
+ "resolved": "https://registry.npmjs.org/glob/-/glob-3.2.11.tgz",
+ "integrity": "sha1-Spc/Y1uRkPcV0QmH1cAP0oFevj0=",
+ "requires": {
+ "inherits": "2",
+ "minimatch": "0.3"
+ }
+ },
+ "globals": {
+ "version": "11.12.0",
+ "resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz",
+ "integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==",
+ "dev": true
+ },
+ "google-auth-library": {
+ "version": "3.1.2",
+ "resolved": "https://registry.npmjs.org/google-auth-library/-/google-auth-library-3.1.2.tgz",
+ "integrity": "sha512-cDQMzTotwyWMrg5jRO7q0A4TL/3GWBgO7I7q5xGKNiiFf9SmGY/OJ1YsLMgI2MVHHsEGyrqYnbnmV1AE+Z6DnQ==",
+ "requires": {
+ "base64-js": "^1.3.0",
+ "fast-text-encoding": "^1.0.0",
+ "gaxios": "^1.2.1",
+ "gcp-metadata": "^1.0.0",
+ "gtoken": "^2.3.2",
+ "https-proxy-agent": "^2.2.1",
+ "jws": "^3.1.5",
+ "lru-cache": "^5.0.0",
+ "semver": "^5.5.0"
+ }
+ },
+ "google-p12-pem": {
+ "version": "1.0.4",
+ "resolved": "https://registry.npmjs.org/google-p12-pem/-/google-p12-pem-1.0.4.tgz",
+ "integrity": "sha512-SwLAUJqUfTB2iS+wFfSS/G9p7bt4eWcc2LyfvmUXe7cWp6p3mpxDo6LLI29MXdU6wvPcQ/up298X7GMC5ylAlA==",
+ "requires": {
+ "node-forge": "^0.8.0",
+ "pify": "^4.0.0"
+ }
+ },
+ "graceful-fs": {
+ "version": "4.2.0",
+ "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.0.tgz",
+ "integrity": "sha512-jpSvDPV4Cq/bgtpndIWbI5hmYxhQGHPC4d4cqBPb4DLniCfhJokdXhwhaDuLBGLQdvvRum/UiX6ECVIPvDXqdg=="
+ },
+ "growl": {
+ "version": "1.9.2",
+ "resolved": "https://registry.npmjs.org/growl/-/growl-1.9.2.tgz",
+ "integrity": "sha1-Dqd0NxXbjY3ixe3hd14bRayFwC8="
+ },
+ "gtoken": {
+ "version": "2.3.3",
+ "resolved": "https://registry.npmjs.org/gtoken/-/gtoken-2.3.3.tgz",
+ "integrity": "sha512-EaB49bu/TCoNeQjhCYKI/CurooBKkGxIqFHsWABW0b25fobBYVTMe84A8EBVVZhl8emiUdNypil9huMOTmyAnw==",
+ "requires": {
+ "gaxios": "^1.0.4",
+ "google-p12-pem": "^1.0.0",
+ "jws": "^3.1.5",
+ "mime": "^2.2.0",
+ "pify": "^4.0.0"
+ }
+ },
+ "har-schema": {
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/har-schema/-/har-schema-2.0.0.tgz",
+ "integrity": "sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI="
+ },
+ "har-validator": {
+ "version": "5.1.3",
+ "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-5.1.3.tgz",
+ "integrity": "sha512-sNvOCzEQNr/qrvJgc3UG/kD4QtlHycrzwS+6mfTrrSq97BvaYcPZZI1ZSqGSPR73Cxn4LKTD4PttRwfU7jWq5g==",
+ "requires": {
+ "ajv": "^6.5.5",
+ "har-schema": "^2.0.0"
+ }
+ },
+ "has": {
+ "version": "1.0.3",
+ "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz",
+ "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==",
+ "dev": true,
+ "requires": {
+ "function-bind": "^1.1.1"
+ }
+ },
+ "has-flag": {
+ "version": "3.0.0",
+ "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
+ "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
+ "dev": true
+ },
+ "has-symbols": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.0.tgz",
+ "integrity": "sha1-uhqPGvKg/DllD1yFA2dwQSIGO0Q=",
+ "dev": true
+ },
+ "hash-stream-validation": {
+ "version": "0.2.1",
+ "resolved": "https://registry.npmjs.org/hash-stream-validation/-/hash-stream-validation-0.2.1.tgz",
+ "integrity": "sha1-7Mm5l7IYvluzEphii7gHhptz3NE=",
+ "requires": {
+ "through2": "^2.0.0"
+ },
+ "dependencies": {
+ "through2": {
+ "version": "2.0.5",
+ "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.5.tgz",
+ "integrity": "sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==",
+ "requires": {
+ "readable-stream": "~2.3.6",
+ "xtend": "~4.0.1"
+ }
+ }
+ }
+ },
+ "he": {
+ "version": "1.2.0",
+ "resolved": "https://registry.npmjs.org/he/-/he-1.2.0.tgz",
+ "integrity": "sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==",
+ "dev": true
+ },
+ "hock": {
+ "version": "1.3.3",
+ "resolved": "https://registry.npmjs.org/hock/-/hock-1.3.3.tgz",
+ "integrity": "sha512-bEX7KH/KSv2Q5zA+o1EdyeH52+gD2cfpYyAsHMEwjb9txXWttityKVf7cG0y3UVA4D8bxKDzH8LVXCQIr9rClg==",
+ "dev": true,
+ "requires": {
+ "deep-equal": "0.2.1",
+ "url-equal": "0.1.2-1"
+ },
+ "dependencies": {
+ "deep-equal": {
+ "version": "0.2.1",
+ "resolved": "https://registry.npmjs.org/deep-equal/-/deep-equal-0.2.1.tgz",
+ "integrity": "sha1-+tenkyJMvww8d4b5LveA5PyMyHg=",
+ "dev": true
+ }
+ }
+ },
+ "htmlparser2": {
+ "version": "3.8.3",
+ "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-3.8.3.tgz",
+ "integrity": "sha1-mWwosZFRaovoZQGn15dX5ccMEGg=",
+ "dev": true,
+ "requires": {
+ "domelementtype": "1",
+ "domhandler": "2.3",
+ "domutils": "1.5",
+ "entities": "1.0",
+ "readable-stream": "1.1"
+ },
+ "dependencies": {
+ "isarray": {
+ "version": "0.0.1",
+ "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
+ "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=",
+ "dev": true
+ },
+ "readable-stream": {
+ "version": "1.1.14",
+ "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz",
+ "integrity": "sha1-fPTFTvZI44EwhMY23SB54WbAgdk=",
+ "dev": true,
+ "requires": {
+ "core-util-is": "~1.0.0",
+ "inherits": "~2.0.1",
+ "isarray": "0.0.1",
+ "string_decoder": "~0.10.x"
+ }
+ },
+ "string_decoder": {
+ "version": "0.10.31",
+ "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
+ "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=",
+ "dev": true
+ }
+ }
+ },
+ "http-signature": {
+ "version": "1.2.0",
+ "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz",
+ "integrity": "sha1-muzZJRFHcvPZW2WmCruPfBj7rOE=",
+ "requires": {
+ "assert-plus": "^1.0.0",
+ "jsprim": "^1.2.2",
+ "sshpk": "^1.7.0"
+ }
+ },
+ "https-proxy-agent": {
+ "version": "2.2.2",
+ "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-2.2.2.tgz",
+ "integrity": "sha512-c8Ndjc9Bkpfx/vCJueCPy0jlP4ccCCSNDp8xwCZzPjKJUm+B+u9WX2x98Qx4n1PiMNTWo3D7KK5ifNV/yJyRzg==",
+ "requires": {
+ "agent-base": "^4.3.0",
+ "debug": "^3.1.0"
+ }
+ },
+ "ieee754": {
+ "version": "1.1.8",
+ "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.1.8.tgz",
+ "integrity": "sha1-vjPUCsEO8ZJnAfbwii2G+/0a0+Q="
+ },
+ "imurmurhash": {
+ "version": "0.1.4",
+ "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz",
+ "integrity": "sha1-khi5srkoojixPcT7a21XbyMUU+o="
+ },
+ "inflight": {
+ "version": "1.0.6",
+ "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
+ "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=",
+ "dev": true,
+ "requires": {
+ "once": "^1.3.0",
+ "wrappy": "1"
+ }
+ },
+ "inherits": {
+ "version": "2.0.4",
+ "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
+ "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ=="
+ },
+ "invert-kv": {
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/invert-kv/-/invert-kv-2.0.0.tgz",
+ "integrity": "sha512-wPVv/y/QQ/Uiirj/vh3oP+1Ww+AWehmi1g5fFWGPF6IpCBCDVrhgHRMvrLfdYcwDh3QJbGXDW4JAuzxElLSqKA==",
+ "dev": true
+ },
+ "ip": {
+ "version": "1.1.5",
+ "resolved": "https://registry.npmjs.org/ip/-/ip-1.1.5.tgz",
+ "integrity": "sha1-vd7XARQpCCjAoDnnLvJfWq7ENUo="
+ },
+ "is-buffer": {
+ "version": "2.0.3",
+ "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-2.0.3.tgz",
+ "integrity": "sha512-U15Q7MXTuZlrbymiz95PJpZxu8IlipAp4dtS3wOdgPXx3mqBnslrWU14kxfHB+Py/+2PVKSr37dMAgM2A4uArw==",
+ "dev": true
+ },
+ "is-callable": {
+ "version": "1.1.4",
+ "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.1.4.tgz",
+ "integrity": "sha512-r5p9sxJjYnArLjObpjA4xu5EKI3CuKHkJXMhT7kwbpUyIFD1n5PMAsoPvWnvtZiNz7LjkYDRZhd7FlI0eMijEA==",
+ "dev": true
+ },
+ "is-date-object": {
+ "version": "1.0.1",
+ "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.1.tgz",
+ "integrity": "sha1-mqIOtq7rv/d/vTPnTKAbM1gdOhY=",
+ "dev": true
+ },
+ "is-fullwidth-code-point": {
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
+ "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=",
+ "dev": true
+ },
+ "is-obj": {
+ "version": "1.0.1",
+ "resolved": "https://registry.npmjs.org/is-obj/-/is-obj-1.0.1.tgz",
+ "integrity": "sha1-PkcprB9f3gJc19g6iW2rn09n2w8="
+ },
+ "is-regex": {
+ "version": "1.0.4",
+ "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.0.4.tgz",
+ "integrity": "sha1-VRdIm1RwkbCTDglWVM7SXul+lJE=",
+ "dev": true,
+ "requires": {
+ "has": "^1.0.1"
+ }
+ },
+ "is-stream": {
+ "version": "1.1.0",
+ "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz",
+ "integrity": "sha1-EtSj3U5o4Lec6428hBc66A2RykQ=",
+ "dev": true
+ },
+ "is-stream-ended": {
+ "version": "0.1.4",
+ "resolved": "https://registry.npmjs.org/is-stream-ended/-/is-stream-ended-0.1.4.tgz",
+ "integrity": "sha512-xj0XPvmr7bQFTvirqnFr50o0hQIh6ZItDqloxt5aJrR4NQsYeSsyFQERYGCAzfindAcnKjINnwEEgLx4IqVzQw=="
+ },
+ "is-symbol": {
+ "version": "1.0.2",
+ "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.2.tgz",
+ "integrity": "sha512-HS8bZ9ox60yCJLH9snBpIwv9pYUAkcuLhSA1oero1UB5y9aiQpRA8y2ex945AOtCZL1lJDeIk3G5LthswI46Lw==",
+ "dev": true,
+ "requires": {
+ "has-symbols": "^1.0.0"
+ }
+ },
+ "is-typedarray": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz",
+ "integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo="
+ },
+ "isarray": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
+ "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE="
+ },
+ "isexe": {
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
+ "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=",
+ "dev": true
+ },
+ "isstream": {
+ "version": "0.1.2",
+ "resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz",
+ "integrity": "sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo="
+ },
+ "istanbul-lib-coverage": {
+ "version": "2.0.5",
+ "resolved": "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.5.tgz",
+ "integrity": "sha512-8aXznuEPCJvGnMSRft4udDRDtb1V3pkQkMMI5LI+6HuQz5oQ4J2UFn1H82raA3qJtyOLkkwVqICBQkjnGtn5mA==",
+ "dev": true
+ },
+ "istanbul-lib-instrument": {
+ "version": "3.3.0",
+ "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-3.3.0.tgz",
+ "integrity": "sha512-5nnIN4vo5xQZHdXno/YDXJ0G+I3dAm4XgzfSVTPLQpj/zAV2dV6Juy0yaf10/zrJOJeHoN3fraFe+XRq2bFVZA==",
+ "dev": true,
+ "requires": {
+ "@babel/generator": "^7.4.0",
+ "@babel/parser": "^7.4.3",
+ "@babel/template": "^7.4.0",
+ "@babel/traverse": "^7.4.3",
+ "@babel/types": "^7.4.0",
+ "istanbul-lib-coverage": "^2.0.5",
+ "semver": "^6.0.0"
+ },
+ "dependencies": {
+ "semver": {
+ "version": "6.2.0",
+ "resolved": "https://registry.npmjs.org/semver/-/semver-6.2.0.tgz",
+ "integrity": "sha512-jdFC1VdUGT/2Scgbimf7FSx9iJLXoqfglSF+gJeuNWVpiE37OIbc1jywR/GJyFdz3mnkz2/id0L0J/cr0izR5A==",
+ "dev": true
+ }
+ }
+ },
+ "jade": {
+ "version": "0.26.3",
+ "resolved": "https://registry.npmjs.org/jade/-/jade-0.26.3.tgz",
+ "integrity": "sha1-jxDXl32NefL2/4YqgbBRPMslaGw=",
+ "requires": {
+ "commander": "0.6.1",
+ "mkdirp": "0.3.0"
+ },
+ "dependencies": {
+ "commander": {
+ "version": "0.6.1",
+ "resolved": "https://registry.npmjs.org/commander/-/commander-0.6.1.tgz",
+ "integrity": "sha1-+mihT2qUXVTbvlDYzbMyDp47GgY="
+ },
+ "mkdirp": {
+ "version": "0.3.0",
+ "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.3.0.tgz",
+ "integrity": "sha1-G79asbqCevI1dRQ0kEJkVfSB/h4="
+ }
+ }
+ },
+ "jmespath": {
+ "version": "0.15.0",
+ "resolved": "https://registry.npmjs.org/jmespath/-/jmespath-0.15.0.tgz",
+ "integrity": "sha1-o/Iiqarp+Wb10nx5ZRDigJF2Qhc="
+ },
+ "js-tokens": {
+ "version": "4.0.0",
+ "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
+ "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==",
+ "dev": true
+ },
+ "js-yaml": {
+ "version": "3.13.1",
+ "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.13.1.tgz",
+ "integrity": "sha512-YfbcO7jXDdyj0DGxYVSlSeQNHbD7XPWvrVWeVUujrQEoZzWJIRrCPoyk6kL6IAjAG2IolMK4T0hNUe0HOUs5Jw==",
+ "dev": true,
+ "requires": {
+ "argparse": "^1.0.7",
+ "esprima": "^4.0.0"
+ }
+ },
+ "jsbn": {
+ "version": "0.1.1",
+ "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz",
+ "integrity": "sha1-peZUwuWi3rXyAdls77yoDA7y9RM="
+ },
+ "jsesc": {
+ "version": "2.5.2",
+ "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz",
+ "integrity": "sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==",
+ "dev": true
+ },
+ "jshint": {
+ "version": "2.10.2",
+ "resolved": "https://registry.npmjs.org/jshint/-/jshint-2.10.2.tgz",
+ "integrity": "sha512-e7KZgCSXMJxznE/4WULzybCMNXNAd/bf5TSrvVEq78Q/K8ZwFpmBqQeDtNiHc3l49nV4E/+YeHU/JZjSUIrLAA==",
+ "dev": true,
+ "requires": {
+ "cli": "~1.0.0",
+ "console-browserify": "1.1.x",
+ "exit": "0.1.x",
+ "htmlparser2": "3.8.x",
+ "lodash": "~4.17.11",
+ "minimatch": "~3.0.2",
+ "shelljs": "0.3.x",
+ "strip-json-comments": "1.0.x"
+ },
+ "dependencies": {
+ "minimatch": {
+ "version": "3.0.4",
+ "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
+ "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
+ "dev": true,
+ "requires": {
+ "brace-expansion": "^1.1.7"
+ }
+ }
+ }
+ },
+ "json-bigint": {
+ "version": "0.3.0",
+ "resolved": "https://registry.npmjs.org/json-bigint/-/json-bigint-0.3.0.tgz",
+ "integrity": "sha1-DM2RLEuCcNBfBW+9E4FLU9OCWx4=",
+ "requires": {
+ "bignumber.js": "^7.0.0"
+ }
+ },
+ "json-schema": {
+ "version": "0.2.3",
+ "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.2.3.tgz",
+ "integrity": "sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM="
+ },
+ "json-schema-traverse": {
+ "version": "0.4.1",
+ "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
+ "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg=="
+ },
+ "json-stringify-safe": {
+ "version": "5.0.1",
+ "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz",
+ "integrity": "sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus="
+ },
+ "jsprim": {
+ "version": "1.4.1",
+ "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.1.tgz",
+ "integrity": "sha1-MT5mvB5cwG5Di8G3SZwuXFastqI=",
+ "requires": {
+ "assert-plus": "1.0.0",
+ "extsprintf": "1.3.0",
+ "json-schema": "0.2.3",
+ "verror": "1.10.0"
+ }
+ },
+ "jwa": {
+ "version": "1.4.1",
+ "resolved": "https://registry.npmjs.org/jwa/-/jwa-1.4.1.tgz",
+ "integrity": "sha512-qiLX/xhEEFKUAJ6FiBMbes3w9ATzyk5W7Hvzpa/SLYdxNtng+gcurvrI7TbACjIXlsJyr05/S1oUhZrc63evQA==",
+ "requires": {
+ "buffer-equal-constant-time": "1.0.1",
+ "ecdsa-sig-formatter": "1.0.11",
+ "safe-buffer": "^5.0.1"
+ }
+ },
+ "jws": {
+ "version": "3.2.2",
+ "resolved": "https://registry.npmjs.org/jws/-/jws-3.2.2.tgz",
+ "integrity": "sha512-YHlZCB6lMTllWDtSPHz/ZXTsi8S00usEV6v1tjq8tOUZzw7DpSDWVXjXDre6ed1w/pd495ODpHZYSdkRTsa0HA==",
+ "requires": {
+ "jwa": "^1.4.1",
+ "safe-buffer": "^5.0.1"
+ }
+ },
+ "lcid": {
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/lcid/-/lcid-2.0.0.tgz",
+ "integrity": "sha512-avPEb8P8EGnwXKClwsNUgryVjllcRqtMYa49NTsbQagYuT1DcXnl1915oxWjoyGrXR6zH/Y0Zc96xWsPcoDKeA==",
+ "dev": true,
+ "requires": {
+ "invert-kv": "^2.0.0"
+ }
+ },
+ "lcov-parse": {
+ "version": "0.0.10",
+ "resolved": "https://registry.npmjs.org/lcov-parse/-/lcov-parse-0.0.10.tgz",
+ "integrity": "sha1-GwuP+ayceIklBYK3C3ExXZ2m2aM=",
+ "dev": true
+ },
+ "liboneandone": {
+ "version": "1.2.0",
+ "resolved": "https://registry.npmjs.org/liboneandone/-/liboneandone-1.2.0.tgz",
+ "integrity": "sha512-EB6Ak9qw+U4HAOnKqPtatxQ9pLclvtsBsggrvOuD4zclJ5xOeEASojsLKEC3O8KJ1Q4obE2JHhOeDuqWXvkoUQ==",
+ "requires": {
+ "mocha": "^2.5.3",
+ "request": "^2.74.0"
+ },
+ "dependencies": {
+ "debug": {
+ "version": "2.2.0",
+ "resolved": "https://registry.npmjs.org/debug/-/debug-2.2.0.tgz",
+ "integrity": "sha1-+HBX6ZWxofauaklgZkE3vFbwOdo=",
+ "requires": {
+ "ms": "0.7.1"
+ }
+ },
+ "mocha": {
+ "version": "2.5.3",
+ "resolved": "https://registry.npmjs.org/mocha/-/mocha-2.5.3.tgz",
+ "integrity": "sha1-FhvlvetJZ3HrmzV0UFC2IrWu/Fg=",
+ "requires": {
+ "commander": "2.3.0",
+ "debug": "2.2.0",
+ "diff": "1.4.0",
+ "escape-string-regexp": "1.0.2",
+ "glob": "3.2.11",
+ "growl": "1.9.2",
+ "jade": "0.26.3",
+ "mkdirp": "0.5.1",
+ "supports-color": "1.2.0",
+ "to-iso-string": "0.0.2"
+ }
+ },
+ "ms": {
+ "version": "0.7.1",
+ "resolved": "https://registry.npmjs.org/ms/-/ms-0.7.1.tgz",
+ "integrity": "sha1-nNE8A62/8ltl7/3nzoZO6VIBcJg="
+ }
+ }
+ },
+ "locate-path": {
+ "version": "3.0.0",
+ "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz",
+ "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==",
+ "dev": true,
+ "requires": {
+ "p-locate": "^3.0.0",
+ "path-exists": "^3.0.0"
+ }
+ },
+ "lodash": {
+ "version": "4.17.11",
+ "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.11.tgz",
+ "integrity": "sha512-cQKh8igo5QUhZ7lg38DYWAxMvjSAKG0A8wGSVimP07SIUEK2UO+arSRKbRZWtelMtN5V0Hkwh5ryOto/SshYIg=="
+ },
+ "log-driver": {
+ "version": "1.2.7",
+ "resolved": "https://registry.npmjs.org/log-driver/-/log-driver-1.2.7.tgz",
+ "integrity": "sha512-U7KCmLdqsGHBLeWqYlFA0V0Sl6P08EE1ZrmA9cxjUE0WVqT9qnyVDPz1kzpFEP0jdJuFnasWIfSd7fsaNXkpbg==",
+ "dev": true
+ },
+ "log-symbols": {
+ "version": "2.2.0",
+ "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-2.2.0.tgz",
+ "integrity": "sha512-VeIAFslyIerEJLXHziedo2basKbMKtTw3vfn5IzG0XTjhAVEJyNHnL2p7vc+wBDSdQuUpNw3M2u6xb9QsAY5Eg==",
+ "dev": true,
+ "requires": {
+ "chalk": "^2.0.1"
+ }
+ },
+ "lru-cache": {
+ "version": "5.1.1",
+ "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz",
+ "integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==",
+ "requires": {
+ "yallist": "^3.0.2"
+ }
+ },
+ "make-dir": {
+ "version": "1.3.0",
+ "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-1.3.0.tgz",
+ "integrity": "sha512-2w31R7SJtieJJnQtGc7RVL2StM2vGYVfqUOvUDxH6bC6aJTxPxTF0GnIgCyu7tjockiUWAYQRbxa7vKn34s5sQ==",
+ "requires": {
+ "pify": "^3.0.0"
+ },
+ "dependencies": {
+ "pify": {
+ "version": "3.0.0",
+ "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz",
+ "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY="
+ }
+ }
+ },
+ "map-age-cleaner": {
+ "version": "0.1.3",
+ "resolved": "https://registry.npmjs.org/map-age-cleaner/-/map-age-cleaner-0.1.3.tgz",
+ "integrity": "sha512-bJzx6nMoP6PDLPBFmg7+xRKeFZvFboMrGlxmNj9ClvX53KrmvM5bXFXEWjbz4cz1AFn+jWJ9z/DJSz7hrs0w3w==",
+ "dev": true,
+ "requires": {
+ "p-defer": "^1.0.0"
+ }
+ },
+ "mem": {
+ "version": "4.3.0",
+ "resolved": "https://registry.npmjs.org/mem/-/mem-4.3.0.tgz",
+ "integrity": "sha512-qX2bG48pTqYRVmDB37rn/6PT7LcR8T7oAX3bf99u1Tt1nzxYfxkgqDwUwolPlXweM0XzBOBFzSx4kfp7KP1s/w==",
+ "dev": true,
+ "requires": {
+ "map-age-cleaner": "^0.1.1",
+ "mimic-fn": "^2.0.0",
+ "p-is-promise": "^2.0.0"
+ }
+ },
+ "mime": {
+ "version": "2.4.4",
+ "resolved": "https://registry.npmjs.org/mime/-/mime-2.4.4.tgz",
+ "integrity": "sha512-LRxmNwziLPT828z+4YkNzloCFC2YM4wrB99k+AV5ZbEyfGNWfG8SO1FUXLmLDBSo89NrJZ4DIWeLjy1CHGhMGA=="
+ },
+ "mime-db": {
+ "version": "1.40.0",
+ "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.40.0.tgz",
+ "integrity": "sha512-jYdeOMPy9vnxEqFRRo6ZvTZ8d9oPb+k18PKoYNYUe2stVEBPPwsln/qWzdbmaIvnhZ9v2P+CuecK+fpUfsV2mA=="
+ },
+ "mime-types": {
+ "version": "2.1.24",
+ "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.24.tgz",
+ "integrity": "sha512-WaFHS3MCl5fapm3oLxU4eYDw77IQM2ACcxQ9RIxfaC3ooc6PFuBMGZZsYpvoXS5D5QTWPieo1jjLdAm3TBP3cQ==",
+ "requires": {
+ "mime-db": "1.40.0"
+ }
+ },
+ "mimic-fn": {
+ "version": "2.1.0",
+ "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz",
+ "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg=="
+ },
+ "minimatch": {
+ "version": "0.3.0",
+ "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-0.3.0.tgz",
+ "integrity": "sha1-J12O2qxPG7MyZHIInnlJyDlGmd0=",
+ "requires": {
+ "lru-cache": "2",
+ "sigmund": "~1.0.0"
+ },
+ "dependencies": {
+ "lru-cache": {
+ "version": "2.7.3",
+ "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.7.3.tgz",
+ "integrity": "sha1-bUUk6LlV+V1PW1iFHOId1y+06VI="
+ }
+ }
+ },
+ "minimist": {
+ "version": "0.0.8",
+ "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz",
+ "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0="
+ },
+ "mkdirp": {
+ "version": "0.5.1",
+ "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
+ "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=",
+ "requires": {
+ "minimist": "0.0.8"
+ }
+ },
+ "mocha": {
+ "version": "6.1.4",
+ "resolved": "https://registry.npmjs.org/mocha/-/mocha-6.1.4.tgz",
+ "integrity": "sha512-PN8CIy4RXsIoxoFJzS4QNnCH4psUCPWc4/rPrst/ecSJJbLBkubMiyGCP2Kj/9YnWbotFqAoeXyXMucj7gwCFg==",
+ "dev": true,
+ "requires": {
+ "ansi-colors": "3.2.3",
+ "browser-stdout": "1.3.1",
+ "debug": "3.2.6",
+ "diff": "3.5.0",
+ "escape-string-regexp": "1.0.5",
+ "find-up": "3.0.0",
+ "glob": "7.1.3",
+ "growl": "1.10.5",
+ "he": "1.2.0",
+ "js-yaml": "3.13.1",
+ "log-symbols": "2.2.0",
+ "minimatch": "3.0.4",
+ "mkdirp": "0.5.1",
+ "ms": "2.1.1",
+ "node-environment-flags": "1.0.5",
+ "object.assign": "4.1.0",
+ "strip-json-comments": "2.0.1",
+ "supports-color": "6.0.0",
+ "which": "1.3.1",
+ "wide-align": "1.1.3",
+ "yargs": "13.2.2",
+ "yargs-parser": "13.0.0",
+ "yargs-unparser": "1.5.0"
+ },
+ "dependencies": {
+ "diff": {
+ "version": "3.5.0",
+ "resolved": "https://registry.npmjs.org/diff/-/diff-3.5.0.tgz",
+ "integrity": "sha512-A46qtFgd+g7pDZinpnwiRJtxbC1hpgf0uzP3iG89scHk0AUC7A1TGxf5OiiOUv/JMZR8GOt8hL900hV0bOy5xA==",
+ "dev": true
+ },
+ "escape-string-regexp": {
+ "version": "1.0.5",
+ "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
+ "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=",
+ "dev": true
+ },
+ "glob": {
+ "version": "7.1.3",
+ "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.3.tgz",
+ "integrity": "sha512-vcfuiIxogLV4DlGBHIUOwI0IbrJ8HWPc4MU7HzviGeNho/UJDfi6B5p3sHeWIQ0KGIU0Jpxi5ZHxemQfLkkAwQ==",
+ "dev": true,
+ "requires": {
+ "fs.realpath": "^1.0.0",
+ "inflight": "^1.0.4",
+ "inherits": "2",
+ "minimatch": "^3.0.4",
+ "once": "^1.3.0",
+ "path-is-absolute": "^1.0.0"
+ }
+ },
+ "growl": {
+ "version": "1.10.5",
+ "resolved": "https://registry.npmjs.org/growl/-/growl-1.10.5.tgz",
+ "integrity": "sha512-qBr4OuELkhPenW6goKVXiv47US3clb3/IbuWF9KNKEijAy9oeHxU9IgzjvJhHkUzhaj7rOUD7+YGWqUjLp5oSA==",
+ "dev": true
+ },
+ "minimatch": {
+ "version": "3.0.4",
+ "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
+ "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
+ "dev": true,
+ "requires": {
+ "brace-expansion": "^1.1.7"
+ }
+ },
+ "ms": {
+ "version": "2.1.1",
+ "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
+ "integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==",
+ "dev": true
+ },
+ "strip-json-comments": {
+ "version": "2.0.1",
+ "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz",
+ "integrity": "sha1-PFMZQukIwml8DsNEhYwobHygpgo=",
+ "dev": true
+ },
+ "supports-color": {
+ "version": "6.0.0",
+ "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.0.0.tgz",
+ "integrity": "sha512-on9Kwidc1IUQo+bQdhi8+Tijpo0e1SS6RoGo2guUwn5vdaxw8RXOF9Vb2ws+ihWOmh4JnCJOvaziZWP1VABaLg==",
+ "dev": true,
+ "requires": {
+ "has-flag": "^3.0.0"
+ }
+ }
+ }
+ },
+ "ms": {
+ "version": "2.1.2",
+ "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+ "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
+ },
+ "nice-try": {
+ "version": "1.0.5",
+ "resolved": "https://registry.npmjs.org/nice-try/-/nice-try-1.0.5.tgz",
+ "integrity": "sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==",
+ "dev": true
+ },
+ "node-environment-flags": {
+ "version": "1.0.5",
+ "resolved": "https://registry.npmjs.org/node-environment-flags/-/node-environment-flags-1.0.5.tgz",
+ "integrity": "sha512-VNYPRfGfmZLx0Ye20jWzHUjyTW/c+6Wq+iLhDzUI4XmhrDd9l/FozXV3F2xOaXjvp0co0+v1YSR3CMP6g+VvLQ==",
+ "dev": true,
+ "requires": {
+ "object.getownpropertydescriptors": "^2.0.3",
+ "semver": "^5.7.0"
+ }
+ },
+ "node-fetch": {
+ "version": "2.6.0",
+ "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.0.tgz",
+ "integrity": "sha512-8dG4H5ujfvFiqDmVu9fQ5bOHUC15JMjMY/Zumv26oOvvVJjM67KF8koCWIabKQ1GJIa9r2mMZscBq/TbdOcmNA=="
+ },
+ "node-forge": {
+ "version": "0.8.5",
+ "resolved": "https://registry.npmjs.org/node-forge/-/node-forge-0.8.5.tgz",
+ "integrity": "sha512-vFMQIWt+J/7FLNyKouZ9TazT74PRV3wgv9UT4cRjC8BffxFbKXkgIWR42URCPSnHm/QDz6BOlb2Q0U4+VQT67Q=="
+ },
+ "npm-run-path": {
+ "version": "2.0.2",
+ "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-2.0.2.tgz",
+ "integrity": "sha1-NakjLfo11wZ7TLLd8jV7GHFTbF8=",
+ "dev": true,
+ "requires": {
+ "path-key": "^2.0.0"
+ }
+ },
+ "number-is-nan": {
+ "version": "1.0.1",
+ "resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz",
+ "integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=",
+ "dev": true
+ },
+ "nyc": {
+ "version": "13.3.0",
+ "resolved": "https://registry.npmjs.org/nyc/-/nyc-13.3.0.tgz",
+ "integrity": "sha512-P+FwIuro2aFG6B0Esd9ZDWUd51uZrAEoGutqZxzrVmYl3qSfkLgcQpBPBjtDFsUQLFY1dvTQJPOyeqr8S9GF8w==",
+ "dev": true,
+ "requires": {
+ "archy": "^1.0.0",
+ "arrify": "^1.0.1",
+ "caching-transform": "^3.0.1",
+ "convert-source-map": "^1.6.0",
+ "find-cache-dir": "^2.0.0",
+ "find-up": "^3.0.0",
+ "foreground-child": "^1.5.6",
+ "glob": "^7.1.3",
+ "istanbul-lib-coverage": "^2.0.3",
+ "istanbul-lib-hook": "^2.0.3",
+ "istanbul-lib-instrument": "^3.1.0",
+ "istanbul-lib-report": "^2.0.4",
+ "istanbul-lib-source-maps": "^3.0.2",
+ "istanbul-reports": "^2.1.1",
+ "make-dir": "^1.3.0",
+ "merge-source-map": "^1.1.0",
+ "resolve-from": "^4.0.0",
+ "rimraf": "^2.6.3",
+ "signal-exit": "^3.0.2",
+ "spawn-wrap": "^1.4.2",
+ "test-exclude": "^5.1.0",
+ "uuid": "^3.3.2",
+ "yargs": "^12.0.5",
+ "yargs-parser": "^11.1.1"
+ },
+ "dependencies": {
+ "ansi-regex": {
+ "version": "3.0.0",
+ "bundled": true,
+ "dev": true
+ },
+ "append-transform": {
+ "version": "1.0.0",
+ "bundled": true,
+ "dev": true,
+ "requires": {
+ "default-require-extensions": "^2.0.0"
+ }
+ },
+ "archy": {
+ "version": "1.0.0",
+ "bundled": true,
+ "dev": true
+ },
+ "arrify": {
+ "version": "1.0.1",
+ "bundled": true,
+ "dev": true
+ },
+ "async": {
+ "version": "2.6.2",
+ "bundled": true,
+ "dev": true,
+ "requires": {
+ "lodash": "^4.17.11"
+ }
+ },
+ "balanced-match": {
+ "version": "1.0.0",
+ "bundled": true,
+ "dev": true
+ },
+ "brace-expansion": {
+ "version": "1.1.11",
+ "bundled": true,
+ "dev": true,
+ "requires": {
+ "balanced-match": "^1.0.0",
+ "concat-map": "0.0.1"
+ }
+ },
+ "caching-transform": {
+ "version": "3.0.1",
+ "bundled": true,
+ "dev": true,
+ "requires": {
+ "hasha": "^3.0.0",
+ "make-dir": "^1.3.0",
+ "package-hash": "^3.0.0",
+ "write-file-atomic": "^2.3.0"
+ }
+ },
+ "camelcase": {
+ "version": "5.0.0",
+ "bundled": true,
+ "dev": true
+ },
+ "cliui": {
+ "version": "4.1.0",
+ "bundled": true,
+ "dev": true,
+ "requires": {
+ "string-width": "^2.1.1",
+ "strip-ansi": "^4.0.0",
+ "wrap-ansi": "^2.0.0"
+ }
+ },
+ "code-point-at": {
+ "version": "1.1.0",
+ "bundled": true,
+ "dev": true
+ },
+ "commander": {
+ "version": "2.17.1",
+ "bundled": true,
+ "dev": true,
+ "optional": true
+ },
+ "commondir": {
+ "version": "1.0.1",
+ "bundled": true,
+ "dev": true
+ },
+ "concat-map": {
+ "version": "0.0.1",
+ "bundled": true,
+ "dev": true
+ },
+ "convert-source-map": {
+ "version": "1.6.0",
+ "bundled": true,
+ "dev": true,
+ "requires": {
+ "safe-buffer": "~5.1.1"
+ }
+ },
+ "cross-spawn": {
+ "version": "4.0.2",
+ "bundled": true,
+ "dev": true,
+ "requires": {
+ "lru-cache": "^4.0.1",
+ "which": "^1.2.9"
+ }
+ },
+ "debug": {
+ "version": "4.1.1",
+ "bundled": true,
+ "dev": true,
+ "requires": {
+ "ms": "^2.1.1"
+ }
+ },
+ "decamelize": {
+ "version": "1.2.0",
+ "bundled": true,
+ "dev": true
+ },
+ "default-require-extensions": {
+ "version": "2.0.0",
+ "bundled": true,
+ "dev": true,
+ "requires": {
+ "strip-bom": "^3.0.0"
+ }
+ },
+ "end-of-stream": {
+ "version": "1.4.1",
+ "bundled": true,
+ "dev": true,
+ "requires": {
+ "once": "^1.4.0"
+ }
+ },
+ "error-ex": {
+ "version": "1.3.2",
+ "bundled": true,
+ "dev": true,
+ "requires": {
+ "is-arrayish": "^0.2.1"
+ }
+ },
+ "es6-error": {
+ "version": "4.1.1",
+ "bundled": true,
+ "dev": true
+ },
+ "execa": {
+ "version": "1.0.0",
+ "bundled": true,
+ "dev": true,
+ "requires": {
+ "cross-spawn": "^6.0.0",
+ "get-stream": "^4.0.0",
+ "is-stream": "^1.1.0",
+ "npm-run-path": "^2.0.0",
+ "p-finally": "^1.0.0",
+ "signal-exit": "^3.0.0",
+ "strip-eof": "^1.0.0"
+ },
+ "dependencies": {
+ "cross-spawn": {
+ "version": "6.0.5",
+ "bundled": true,
+ "dev": true,
+ "requires": {
+ "nice-try": "^1.0.4",
+ "path-key": "^2.0.1",
+ "semver": "^5.5.0",
+ "shebang-command": "^1.2.0",
+ "which": "^1.2.9"
+ }
+ }
+ }
+ },
+ "find-cache-dir": {
+ "version": "2.0.0",
+ "bundled": true,
+ "dev": true,
+ "requires": {
+ "commondir": "^1.0.1",
+ "make-dir": "^1.0.0",
+ "pkg-dir": "^3.0.0"
+ }
+ },
+ "find-up": {
+ "version": "3.0.0",
+ "bundled": true,
+ "dev": true,
+ "requires": {
+ "locate-path": "^3.0.0"
+ }
+ },
+ "foreground-child": {
+ "version": "1.5.6",
+ "bundled": true,
+ "dev": true,
+ "requires": {
+ "cross-spawn": "^4",
+ "signal-exit": "^3.0.0"
+ }
+ },
+ "fs.realpath": {
+ "version": "1.0.0",
+ "bundled": true,
+ "dev": true
+ },
+ "get-caller-file": {
+ "version": "1.0.3",
+ "bundled": true,
+ "dev": true
+ },
+ "get-stream": {
+ "version": "4.1.0",
+ "bundled": true,
+ "dev": true,
+ "requires": {
+ "pump": "^3.0.0"
+ }
+ },
+ "glob": {
+ "version": "7.1.3",
+ "bundled": true,
+ "dev": true,
+ "requires": {
+ "fs.realpath": "^1.0.0",
+ "inflight": "^1.0.4",
+ "inherits": "2",
+ "minimatch": "^3.0.4",
+ "once": "^1.3.0",
+ "path-is-absolute": "^1.0.0"
+ }
+ },
+ "graceful-fs": {
+ "version": "4.1.15",
+ "bundled": true,
+ "dev": true
+ },
+ "handlebars": {
+ "version": "4.1.0",
+ "bundled": true,
+ "dev": true,
+ "requires": {
+ "async": "^2.5.0",
+ "optimist": "^0.6.1",
+ "source-map": "^0.6.1",
+ "uglify-js": "^3.1.4"
+ },
+ "dependencies": {
+ "source-map": {
+ "version": "0.6.1",
+ "bundled": true,
+ "dev": true
+ }
+ }
+ },
+ "has-flag": {
+ "version": "3.0.0",
+ "bundled": true,
+ "dev": true
+ },
+ "hasha": {
+ "version": "3.0.0",
+ "bundled": true,
+ "dev": true,
+ "requires": {
+ "is-stream": "^1.0.1"
+ }
+ },
+ "hosted-git-info": {
+ "version": "2.7.1",
+ "bundled": true,
+ "dev": true
+ },
+ "imurmurhash": {
+ "version": "0.1.4",
+ "bundled": true,
+ "dev": true
+ },
+ "inflight": {
+ "version": "1.0.6",
+ "bundled": true,
+ "dev": true,
+ "requires": {
+ "once": "^1.3.0",
+ "wrappy": "1"
+ }
+ },
+ "inherits": {
+ "version": "2.0.3",
+ "bundled": true,
+ "dev": true
+ },
+ "invert-kv": {
+ "version": "2.0.0",
+ "bundled": true,
+ "dev": true
+ },
+ "is-arrayish": {
+ "version": "0.2.1",
+ "bundled": true,
+ "dev": true
+ },
+ "is-fullwidth-code-point": {
+ "version": "2.0.0",
+ "bundled": true,
+ "dev": true
+ },
+ "is-stream": {
+ "version": "1.1.0",
+ "bundled": true,
+ "dev": true
+ },
+ "isexe": {
+ "version": "2.0.0",
+ "bundled": true,
+ "dev": true
+ },
+ "istanbul-lib-coverage": {
+ "version": "2.0.3",
+ "bundled": true,
+ "dev": true
+ },
+ "istanbul-lib-hook": {
+ "version": "2.0.3",
+ "bundled": true,
+ "dev": true,
+ "requires": {
+ "append-transform": "^1.0.0"
+ }
+ },
+ "istanbul-lib-report": {
+ "version": "2.0.4",
+ "bundled": true,
+ "dev": true,
+ "requires": {
+ "istanbul-lib-coverage": "^2.0.3",
+ "make-dir": "^1.3.0",
+ "supports-color": "^6.0.0"
+ },
+ "dependencies": {
+ "supports-color": {
+ "version": "6.1.0",
+ "bundled": true,
+ "dev": true,
+ "requires": {
+ "has-flag": "^3.0.0"
+ }
+ }
+ }
+ },
+ "istanbul-lib-source-maps": {
+ "version": "3.0.2",
+ "bundled": true,
+ "dev": true,
+ "requires": {
+ "debug": "^4.1.1",
+ "istanbul-lib-coverage": "^2.0.3",
+ "make-dir": "^1.3.0",
+ "rimraf": "^2.6.2",
+ "source-map": "^0.6.1"
+ },
+ "dependencies": {
+ "source-map": {
+ "version": "0.6.1",
+ "bundled": true,
+ "dev": true
+ }
+ }
+ },
+ "istanbul-reports": {
+ "version": "2.1.1",
+ "bundled": true,
+ "dev": true,
+ "requires": {
+ "handlebars": "^4.1.0"
+ }
+ },
+ "json-parse-better-errors": {
+ "version": "1.0.2",
+ "bundled": true,
+ "dev": true
+ },
+ "lcid": {
+ "version": "2.0.0",
+ "bundled": true,
+ "dev": true,
+ "requires": {
+ "invert-kv": "^2.0.0"
+ }
+ },
+ "load-json-file": {
+ "version": "4.0.0",
+ "bundled": true,
+ "dev": true,
+ "requires": {
+ "graceful-fs": "^4.1.2",
+ "parse-json": "^4.0.0",
+ "pify": "^3.0.0",
+ "strip-bom": "^3.0.0"
+ }
+ },
+ "locate-path": {
+ "version": "3.0.0",
+ "bundled": true,
+ "dev": true,
+ "requires": {
+ "p-locate": "^3.0.0",
+ "path-exists": "^3.0.0"
+ }
+ },
+ "lodash": {
+ "version": "4.17.11",
+ "bundled": true,
+ "dev": true
+ },
+ "lodash.flattendeep": {
+ "version": "4.4.0",
+ "bundled": true,
+ "dev": true
+ },
+ "lru-cache": {
+ "version": "4.1.5",
+ "bundled": true,
+ "dev": true,
+ "requires": {
+ "pseudomap": "^1.0.2",
+ "yallist": "^2.1.2"
+ }
+ },
+ "make-dir": {
+ "version": "1.3.0",
+ "bundled": true,
+ "dev": true,
+ "requires": {
+ "pify": "^3.0.0"
+ }
+ },
+ "map-age-cleaner": {
+ "version": "0.1.3",
+ "bundled": true,
+ "dev": true,
+ "requires": {
+ "p-defer": "^1.0.0"
+ }
+ },
+ "mem": {
+ "version": "4.1.0",
+ "bundled": true,
+ "dev": true,
+ "requires": {
+ "map-age-cleaner": "^0.1.1",
+ "mimic-fn": "^1.0.0",
+ "p-is-promise": "^2.0.0"
+ }
+ },
+ "merge-source-map": {
+ "version": "1.1.0",
+ "bundled": true,
+ "dev": true,
+ "requires": {
+ "source-map": "^0.6.1"
+ },
+ "dependencies": {
+ "source-map": {
+ "version": "0.6.1",
+ "bundled": true,
+ "dev": true
+ }
+ }
+ },
+ "mimic-fn": {
+ "version": "1.2.0",
+ "bundled": true,
+ "dev": true
+ },
+ "minimatch": {
+ "version": "3.0.4",
+ "bundled": true,
+ "dev": true,
+ "requires": {
+ "brace-expansion": "^1.1.7"
+ }
+ },
+ "minimist": {
+ "version": "0.0.10",
+ "bundled": true,
+ "dev": true
+ },
+ "mkdirp": {
+ "version": "0.5.1",
+ "bundled": true,
+ "dev": true,
+ "requires": {
+ "minimist": "0.0.8"
+ },
+ "dependencies": {
+ "minimist": {
+ "version": "0.0.8",
+ "bundled": true,
+ "dev": true
+ }
+ }
+ },
+ "ms": {
+ "version": "2.1.1",
+ "bundled": true,
+ "dev": true
+ },
+ "nice-try": {
+ "version": "1.0.5",
+ "bundled": true,
+ "dev": true
+ },
+ "normalize-package-data": {
+ "version": "2.5.0",
+ "bundled": true,
+ "dev": true,
+ "requires": {
+ "hosted-git-info": "^2.1.4",
+ "resolve": "^1.10.0",
+ "semver": "2 || 3 || 4 || 5",
+ "validate-npm-package-license": "^3.0.1"
+ }
+ },
+ "npm-run-path": {
+ "version": "2.0.2",
+ "bundled": true,
+ "dev": true,
+ "requires": {
+ "path-key": "^2.0.0"
+ }
+ },
+ "number-is-nan": {
+ "version": "1.0.1",
+ "bundled": true,
+ "dev": true
+ },
+ "once": {
+ "version": "1.4.0",
+ "bundled": true,
+ "dev": true,
+ "requires": {
+ "wrappy": "1"
+ }
+ },
+ "optimist": {
+ "version": "0.6.1",
+ "bundled": true,
+ "dev": true,
+ "requires": {
+ "minimist": "~0.0.1",
+ "wordwrap": "~0.0.2"
+ }
+ },
+ "os-homedir": {
+ "version": "1.0.2",
+ "bundled": true,
+ "dev": true
+ },
+ "os-locale": {
+ "version": "3.1.0",
+ "bundled": true,
+ "dev": true,
+ "requires": {
+ "execa": "^1.0.0",
+ "lcid": "^2.0.0",
+ "mem": "^4.0.0"
+ }
+ },
+ "p-defer": {
+ "version": "1.0.0",
+ "bundled": true,
+ "dev": true
+ },
+ "p-finally": {
+ "version": "1.0.0",
+ "bundled": true,
+ "dev": true
+ },
+ "p-is-promise": {
+ "version": "2.0.0",
+ "bundled": true,
+ "dev": true
+ },
+ "p-limit": {
+ "version": "2.1.0",
+ "bundled": true,
+ "dev": true,
+ "requires": {
+ "p-try": "^2.0.0"
+ }
+ },
+ "p-locate": {
+ "version": "3.0.0",
+ "bundled": true,
+ "dev": true,
+ "requires": {
+ "p-limit": "^2.0.0"
+ }
+ },
+ "p-try": {
+ "version": "2.0.0",
+ "bundled": true,
+ "dev": true
+ },
+ "package-hash": {
+ "version": "3.0.0",
+ "bundled": true,
+ "dev": true,
+ "requires": {
+ "graceful-fs": "^4.1.15",
+ "hasha": "^3.0.0",
+ "lodash.flattendeep": "^4.4.0",
+ "release-zalgo": "^1.0.0"
+ }
+ },
+ "parse-json": {
+ "version": "4.0.0",
+ "bundled": true,
+ "dev": true,
+ "requires": {
+ "error-ex": "^1.3.1",
+ "json-parse-better-errors": "^1.0.1"
+ }
+ },
+ "path-exists": {
+ "version": "3.0.0",
+ "bundled": true,
+ "dev": true
+ },
+ "path-is-absolute": {
+ "version": "1.0.1",
+ "bundled": true,
+ "dev": true
+ },
+ "path-key": {
+ "version": "2.0.1",
+ "bundled": true,
+ "dev": true
+ },
+ "path-parse": {
+ "version": "1.0.6",
+ "bundled": true,
+ "dev": true
+ },
+ "path-type": {
+ "version": "3.0.0",
+ "bundled": true,
+ "dev": true,
+ "requires": {
+ "pify": "^3.0.0"
+ }
+ },
+ "pify": {
+ "version": "3.0.0",
+ "bundled": true,
+ "dev": true
+ },
+ "pkg-dir": {
+ "version": "3.0.0",
+ "bundled": true,
+ "dev": true,
+ "requires": {
+ "find-up": "^3.0.0"
+ }
+ },
+ "pseudomap": {
+ "version": "1.0.2",
+ "bundled": true,
+ "dev": true
+ },
+ "pump": {
+ "version": "3.0.0",
+ "bundled": true,
+ "dev": true,
+ "requires": {
+ "end-of-stream": "^1.1.0",
+ "once": "^1.3.1"
+ }
+ },
+ "read-pkg": {
+ "version": "3.0.0",
+ "bundled": true,
+ "dev": true,
+ "requires": {
+ "load-json-file": "^4.0.0",
+ "normalize-package-data": "^2.3.2",
+ "path-type": "^3.0.0"
+ }
+ },
+ "read-pkg-up": {
+ "version": "4.0.0",
+ "bundled": true,
+ "dev": true,
+ "requires": {
+ "find-up": "^3.0.0",
+ "read-pkg": "^3.0.0"
+ }
+ },
+ "release-zalgo": {
+ "version": "1.0.0",
+ "bundled": true,
+ "dev": true,
+ "requires": {
+ "es6-error": "^4.0.1"
+ }
+ },
+ "require-directory": {
+ "version": "2.1.1",
+ "bundled": true,
+ "dev": true
+ },
+ "require-main-filename": {
+ "version": "1.0.1",
+ "bundled": true,
+ "dev": true
+ },
+ "resolve": {
+ "version": "1.10.0",
+ "bundled": true,
+ "dev": true,
+ "requires": {
+ "path-parse": "^1.0.6"
+ }
+ },
+ "resolve-from": {
+ "version": "4.0.0",
+ "bundled": true,
+ "dev": true
+ },
+ "rimraf": {
+ "version": "2.6.3",
+ "bundled": true,
+ "dev": true,
+ "requires": {
+ "glob": "^7.1.3"
+ }
+ },
+ "safe-buffer": {
+ "version": "5.1.2",
+ "bundled": true,
+ "dev": true
+ },
+ "semver": {
+ "version": "5.6.0",
+ "bundled": true,
+ "dev": true
+ },
+ "set-blocking": {
+ "version": "2.0.0",
+ "bundled": true,
+ "dev": true
+ },
+ "shebang-command": {
+ "version": "1.2.0",
+ "bundled": true,
+ "dev": true,
+ "requires": {
+ "shebang-regex": "^1.0.0"
+ }
+ },
+ "shebang-regex": {
+ "version": "1.0.0",
+ "bundled": true,
+ "dev": true
+ },
+ "signal-exit": {
+ "version": "3.0.2",
+ "bundled": true,
+ "dev": true
+ },
+ "spawn-wrap": {
+ "version": "1.4.2",
+ "bundled": true,
+ "dev": true,
+ "requires": {
+ "foreground-child": "^1.5.6",
+ "mkdirp": "^0.5.0",
+ "os-homedir": "^1.0.1",
+ "rimraf": "^2.6.2",
+ "signal-exit": "^3.0.2",
+ "which": "^1.3.0"
+ }
+ },
+ "spdx-correct": {
+ "version": "3.1.0",
+ "bundled": true,
+ "dev": true,
+ "requires": {
+ "spdx-expression-parse": "^3.0.0",
+ "spdx-license-ids": "^3.0.0"
+ }
+ },
+ "spdx-exceptions": {
+ "version": "2.2.0",
+ "bundled": true,
+ "dev": true
+ },
+ "spdx-expression-parse": {
+ "version": "3.0.0",
+ "bundled": true,
+ "dev": true,
+ "requires": {
+ "spdx-exceptions": "^2.1.0",
+ "spdx-license-ids": "^3.0.0"
+ }
+ },
+ "spdx-license-ids": {
+ "version": "3.0.3",
+ "bundled": true,
+ "dev": true
+ },
+ "string-width": {
+ "version": "2.1.1",
+ "bundled": true,
+ "dev": true,
+ "requires": {
+ "is-fullwidth-code-point": "^2.0.0",
+ "strip-ansi": "^4.0.0"
+ }
+ },
+ "strip-ansi": {
+ "version": "4.0.0",
+ "bundled": true,
+ "dev": true,
+ "requires": {
+ "ansi-regex": "^3.0.0"
+ }
+ },
+ "strip-bom": {
+ "version": "3.0.0",
+ "bundled": true,
+ "dev": true
+ },
+ "strip-eof": {
+ "version": "1.0.0",
+ "bundled": true,
+ "dev": true
+ },
+ "test-exclude": {
+ "version": "5.1.0",
+ "bundled": true,
+ "dev": true,
+ "requires": {
+ "arrify": "^1.0.1",
+ "minimatch": "^3.0.4",
+ "read-pkg-up": "^4.0.0",
+ "require-main-filename": "^1.0.1"
+ }
+ },
+ "uglify-js": {
+ "version": "3.4.9",
+ "bundled": true,
+ "dev": true,
+ "optional": true,
+ "requires": {
+ "commander": "~2.17.1",
+ "source-map": "~0.6.1"
+ },
+ "dependencies": {
+ "source-map": {
+ "version": "0.6.1",
+ "bundled": true,
+ "dev": true,
+ "optional": true
+ }
+ }
+ },
+ "uuid": {
+ "version": "3.3.2",
+ "bundled": true,
+ "dev": true
+ },
+ "validate-npm-package-license": {
+ "version": "3.0.4",
+ "bundled": true,
+ "dev": true,
+ "requires": {
+ "spdx-correct": "^3.0.0",
+ "spdx-expression-parse": "^3.0.0"
+ }
+ },
+ "which": {
+ "version": "1.3.1",
+ "bundled": true,
+ "dev": true,
+ "requires": {
+ "isexe": "^2.0.0"
+ }
+ },
+ "which-module": {
+ "version": "2.0.0",
+ "bundled": true,
+ "dev": true
+ },
+ "wordwrap": {
+ "version": "0.0.3",
+ "bundled": true,
+ "dev": true
+ },
+ "wrap-ansi": {
+ "version": "2.1.0",
+ "bundled": true,
+ "dev": true,
+ "requires": {
+ "string-width": "^1.0.1",
+ "strip-ansi": "^3.0.1"
+ },
+ "dependencies": {
+ "ansi-regex": {
+ "version": "2.1.1",
+ "bundled": true,
+ "dev": true
+ },
+ "is-fullwidth-code-point": {
+ "version": "1.0.0",
+ "bundled": true,
+ "dev": true,
+ "requires": {
+ "number-is-nan": "^1.0.0"
+ }
+ },
+ "string-width": {
+ "version": "1.0.2",
+ "bundled": true,
+ "dev": true,
+ "requires": {
+ "code-point-at": "^1.0.0",
+ "is-fullwidth-code-point": "^1.0.0",
+ "strip-ansi": "^3.0.0"
+ }
+ },
+ "strip-ansi": {
+ "version": "3.0.1",
+ "bundled": true,
+ "dev": true,
+ "requires": {
+ "ansi-regex": "^2.0.0"
+ }
+ }
+ }
+ },
+ "wrappy": {
+ "version": "1.0.2",
+ "bundled": true,
+ "dev": true
+ },
+ "write-file-atomic": {
+ "version": "2.4.2",
+ "bundled": true,
+ "dev": true,
+ "requires": {
+ "graceful-fs": "^4.1.11",
+ "imurmurhash": "^0.1.4",
+ "signal-exit": "^3.0.2"
+ }
+ },
+ "y18n": {
+ "version": "4.0.0",
+ "bundled": true,
+ "dev": true
+ },
+ "yallist": {
+ "version": "2.1.2",
+ "bundled": true,
+ "dev": true
+ },
+ "yargs": {
+ "version": "12.0.5",
+ "bundled": true,
+ "dev": true,
+ "requires": {
+ "cliui": "^4.0.0",
+ "decamelize": "^1.2.0",
+ "find-up": "^3.0.0",
+ "get-caller-file": "^1.0.1",
+ "os-locale": "^3.0.0",
+ "require-directory": "^2.1.1",
+ "require-main-filename": "^1.0.1",
+ "set-blocking": "^2.0.0",
+ "string-width": "^2.0.0",
+ "which-module": "^2.0.0",
+ "y18n": "^3.2.1 || ^4.0.0",
+ "yargs-parser": "^11.1.1"
+ }
+ },
+ "yargs-parser": {
+ "version": "11.1.1",
+ "bundled": true,
+ "dev": true,
+ "requires": {
+ "camelcase": "^5.0.0",
+ "decamelize": "^1.2.0"
+ }
+ }
+ }
+ },
+ "oauth-sign": {
+ "version": "0.9.0",
+ "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.9.0.tgz",
+ "integrity": "sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ=="
+ },
+ "object-keys": {
+ "version": "1.1.1",
+ "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz",
+ "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==",
+ "dev": true
+ },
+ "object.assign": {
+ "version": "4.1.0",
+ "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.0.tgz",
+ "integrity": "sha512-exHJeq6kBKj58mqGyTQ9DFvrZC/eR6OwxzoM9YRoGBqrXYonaFyGiFMuc9VZrXf7DarreEwMpurG3dd+CNyW5w==",
+ "dev": true,
+ "requires": {
+ "define-properties": "^1.1.2",
+ "function-bind": "^1.1.1",
+ "has-symbols": "^1.0.0",
+ "object-keys": "^1.0.11"
+ }
+ },
+ "object.getownpropertydescriptors": {
+ "version": "2.0.3",
+ "resolved": "https://registry.npmjs.org/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.0.3.tgz",
+ "integrity": "sha1-h1jIRvW0B62rDyNuCYbxSwUcqhY=",
+ "dev": true,
+ "requires": {
+ "define-properties": "^1.1.2",
+ "es-abstract": "^1.5.1"
+ }
+ },
+ "once": {
+ "version": "1.4.0",
+ "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
+ "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
+ "requires": {
+ "wrappy": "1"
+ }
+ },
+ "onetime": {
+ "version": "5.1.0",
+ "resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.0.tgz",
+ "integrity": "sha512-5NcSkPHhwTVFIQN+TUqXoS5+dlElHXdpAWu9I0HP20YOtIi+aZ0Ct82jdlILDxjLEAWwvm+qj1m6aEtsDVmm6Q==",
+ "requires": {
+ "mimic-fn": "^2.1.0"
+ }
+ },
+ "os-locale": {
+ "version": "3.1.0",
+ "resolved": "https://registry.npmjs.org/os-locale/-/os-locale-3.1.0.tgz",
+ "integrity": "sha512-Z8l3R4wYWM40/52Z+S265okfFj8Kt2cC2MKY+xNi3kFs+XGI7WXu/I309QQQYbRW4ijiZ+yxs9pqEhJh0DqW3Q==",
+ "dev": true,
+ "requires": {
+ "execa": "^1.0.0",
+ "lcid": "^2.0.0",
+ "mem": "^4.0.0"
+ }
+ },
+ "p-defer": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/p-defer/-/p-defer-1.0.0.tgz",
+ "integrity": "sha1-n26xgvbJqozXQwBKfU+WsZaw+ww=",
+ "dev": true
+ },
+ "p-finally": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/p-finally/-/p-finally-1.0.0.tgz",
+ "integrity": "sha1-P7z7FbiZpEEjs0ttzBi3JDNqLK4=",
+ "dev": true
+ },
+ "p-is-promise": {
+ "version": "2.1.0",
+ "resolved": "https://registry.npmjs.org/p-is-promise/-/p-is-promise-2.1.0.tgz",
+ "integrity": "sha512-Y3W0wlRPK8ZMRbNq97l4M5otioeA5lm1z7bkNkxCka8HSPjR0xRWmpCmc9utiaLP9Jb1eD8BgeIxTW4AIF45Pg==",
+ "dev": true
+ },
+ "p-limit": {
+ "version": "2.2.0",
+ "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.2.0.tgz",
+ "integrity": "sha512-pZbTJpoUsCzV48Mc9Nh51VbwO0X9cuPFE8gYwx9BTCt9SF8/b7Zljd2fVgOxhIF/HDTKgpVzs+GPhyKfjLLFRQ==",
+ "dev": true,
+ "requires": {
+ "p-try": "^2.0.0"
+ }
+ },
+ "p-locate": {
+ "version": "3.0.0",
+ "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz",
+ "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==",
+ "dev": true,
+ "requires": {
+ "p-limit": "^2.0.0"
+ }
+ },
+ "p-try": {
+ "version": "2.2.0",
+ "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
+ "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==",
+ "dev": true
+ },
+ "path-exists": {
+ "version": "3.0.0",
+ "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz",
+ "integrity": "sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=",
+ "dev": true
+ },
+ "path-is-absolute": {
+ "version": "1.0.1",
+ "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
+ "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=",
+ "dev": true
+ },
+ "path-key": {
+ "version": "2.0.1",
+ "resolved": "https://registry.npmjs.org/path-key/-/path-key-2.0.1.tgz",
+ "integrity": "sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A=",
+ "dev": true
+ },
+ "performance-now": {
+ "version": "2.1.0",
+ "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz",
+ "integrity": "sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns="
+ },
+ "pify": {
+ "version": "4.0.1",
+ "resolved": "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz",
+ "integrity": "sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g=="
+ },
+ "process-nextick-args": {
+ "version": "2.0.1",
+ "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz",
+ "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag=="
+ },
+ "psl": {
+ "version": "1.2.0",
+ "resolved": "https://registry.npmjs.org/psl/-/psl-1.2.0.tgz",
+ "integrity": "sha512-GEn74ZffufCmkDDLNcl3uuyF/aSD6exEyh1v/ZSdAomB82t6G9hzJVRx0jBmLDW+VfZqks3aScmMw9DszwUalA=="
+ },
+ "pump": {
+ "version": "2.0.1",
+ "resolved": "https://registry.npmjs.org/pump/-/pump-2.0.1.tgz",
+ "integrity": "sha512-ruPMNRkN3MHP1cWJc9OWr+T/xDP0jhXYCLfJcBuX54hhfIBnaQmAUMfDcG4DM5UMWByBbJY69QSphm3jtDKIkA==",
+ "requires": {
+ "end-of-stream": "^1.1.0",
+ "once": "^1.3.1"
+ }
+ },
+ "pumpify": {
+ "version": "1.5.1",
+ "resolved": "https://registry.npmjs.org/pumpify/-/pumpify-1.5.1.tgz",
+ "integrity": "sha512-oClZI37HvuUJJxSKKrC17bZ9Cu0ZYhEAGPsPUy9KlMUmv9dKX2o77RUmq7f3XjIxbwyGwYzbzQ1L2Ks8sIradQ==",
+ "requires": {
+ "duplexify": "^3.6.0",
+ "inherits": "^2.0.3",
+ "pump": "^2.0.0"
+ }
+ },
+ "punycode": {
+ "version": "1.3.2",
+ "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.3.2.tgz",
+ "integrity": "sha1-llOgNvt8HuQjQvIyXM7v6jkmxI0="
+ },
+ "qs": {
+ "version": "6.7.0",
+ "resolved": "https://registry.npmjs.org/qs/-/qs-6.7.0.tgz",
+ "integrity": "sha512-VCdBRNFTX1fyE7Nb6FYoURo/SPe62QCaAyzJvUjwRaIsc+NePBEniHlvxFmmX56+HZphIGtV0XeCirBtpDrTyQ=="
+ },
+ "querystring": {
+ "version": "0.2.0",
+ "resolved": "https://registry.npmjs.org/querystring/-/querystring-0.2.0.tgz",
+ "integrity": "sha1-sgmEkgO7Jd+CDadW50cAWHhSFiA="
+ },
+ "readable-stream": {
+ "version": "2.3.6",
+ "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
+ "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
+ "requires": {
+ "core-util-is": "~1.0.0",
+ "inherits": "~2.0.3",
+ "isarray": "~1.0.0",
+ "process-nextick-args": "~2.0.0",
+ "safe-buffer": "~5.1.1",
+ "string_decoder": "~1.1.1",
+ "util-deprecate": "~1.0.1"
+ }
+ },
+ "request": {
+ "version": "2.88.0",
+ "resolved": "https://registry.npmjs.org/request/-/request-2.88.0.tgz",
+ "integrity": "sha512-NAqBSrijGLZdM0WZNsInLJpkJokL72XYjUpnB0iwsRgxh7dB6COrHnTBNwN0E+lHDAJzu7kLAkDeY08z2/A0hg==",
+ "requires": {
+ "aws-sign2": "~0.7.0",
+ "aws4": "^1.8.0",
+ "caseless": "~0.12.0",
+ "combined-stream": "~1.0.6",
+ "extend": "~3.0.2",
+ "forever-agent": "~0.6.1",
+ "form-data": "~2.3.2",
+ "har-validator": "~5.1.0",
+ "http-signature": "~1.2.0",
+ "is-typedarray": "~1.0.0",
+ "isstream": "~0.1.2",
+ "json-stringify-safe": "~5.0.1",
+ "mime-types": "~2.1.19",
+ "oauth-sign": "~0.9.0",
+ "performance-now": "^2.1.0",
+ "qs": "~6.5.2",
+ "safe-buffer": "^5.1.2",
+ "tough-cookie": "~2.4.3",
+ "tunnel-agent": "^0.6.0",
+ "uuid": "^3.3.2"
+ },
+ "dependencies": {
+ "qs": {
+ "version": "6.5.2",
+ "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.2.tgz",
+ "integrity": "sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA=="
+ }
+ }
+ },
+ "require-directory": {
+ "version": "2.1.1",
+ "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz",
+ "integrity": "sha1-jGStX9MNqxyXbiNE/+f3kqam30I=",
+ "dev": true
+ },
+ "require-main-filename": {
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-2.0.0.tgz",
+ "integrity": "sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==",
+ "dev": true
+ },
+ "retry-request": {
+ "version": "4.1.1",
+ "resolved": "https://registry.npmjs.org/retry-request/-/retry-request-4.1.1.tgz",
+ "integrity": "sha512-BINDzVtLI2BDukjWmjAIRZ0oglnCAkpP2vQjM3jdLhmT62h0xnQgciPwBRDAvHqpkPT2Wo1XuUyLyn6nbGrZQQ==",
+ "requires": {
+ "debug": "^4.1.1",
+ "through2": "^3.0.1"
+ },
+ "dependencies": {
+ "debug": {
+ "version": "4.1.1",
+ "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
+ "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
+ "requires": {
+ "ms": "^2.1.1"
+ }
+ }
+ }
+ },
+ "safe-buffer": {
+ "version": "5.1.2",
+ "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
+ "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="
+ },
+ "safer-buffer": {
+ "version": "2.1.2",
+ "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
+ "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="
+ },
+ "sax": {
+ "version": "1.2.1",
+ "resolved": "https://registry.npmjs.org/sax/-/sax-1.2.1.tgz",
+ "integrity": "sha1-e45lYZCyKOgaZq6nSEgNgozS03o="
+ },
+ "semver": {
+ "version": "5.7.0",
+ "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.0.tgz",
+ "integrity": "sha512-Ya52jSX2u7QKghxeoFGpLwCtGlt7j0oY9DYb5apt9nPlJ42ID+ulTXESnt/qAQcoSERyZ5sl3LDIOw0nAn/5DA=="
+ },
+ "set-blocking": {
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz",
+ "integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc=",
+ "dev": true
+ },
+ "shebang-command": {
+ "version": "1.2.0",
+ "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz",
+ "integrity": "sha1-RKrGW2lbAzmJaMOfNj/uXer98eo=",
+ "dev": true,
+ "requires": {
+ "shebang-regex": "^1.0.0"
+ }
+ },
+ "shebang-regex": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-1.0.0.tgz",
+ "integrity": "sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM=",
+ "dev": true
+ },
+ "shelljs": {
+ "version": "0.3.0",
+ "resolved": "https://registry.npmjs.org/shelljs/-/shelljs-0.3.0.tgz",
+ "integrity": "sha1-NZbmMHp4FUT1kfN9phg2DzHbV7E=",
+ "dev": true
+ },
+ "should": {
+ "version": "13.2.3",
+ "resolved": "https://registry.npmjs.org/should/-/should-13.2.3.tgz",
+ "integrity": "sha512-ggLesLtu2xp+ZxI+ysJTmNjh2U0TsC+rQ/pfED9bUZZ4DKefP27D+7YJVVTvKsmjLpIi9jAa7itwDGkDDmt1GQ==",
+ "dev": true,
+ "requires": {
+ "should-equal": "^2.0.0",
+ "should-format": "^3.0.3",
+ "should-type": "^1.4.0",
+ "should-type-adaptors": "^1.0.1",
+ "should-util": "^1.0.0"
+ }
+ },
+ "should-equal": {
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/should-equal/-/should-equal-2.0.0.tgz",
+ "integrity": "sha512-ZP36TMrK9euEuWQYBig9W55WPC7uo37qzAEmbjHz4gfyuXrEUgF8cUvQVO+w+d3OMfPvSRQJ22lSm8MQJ43LTA==",
+ "dev": true,
+ "requires": {
+ "should-type": "^1.4.0"
+ }
+ },
+ "should-format": {
+ "version": "3.0.3",
+ "resolved": "https://registry.npmjs.org/should-format/-/should-format-3.0.3.tgz",
+ "integrity": "sha1-m/yPdPo5IFxT04w01xcwPidxJPE=",
+ "dev": true,
+ "requires": {
+ "should-type": "^1.3.0",
+ "should-type-adaptors": "^1.0.1"
+ }
+ },
+ "should-type": {
+ "version": "1.4.0",
+ "resolved": "https://registry.npmjs.org/should-type/-/should-type-1.4.0.tgz",
+ "integrity": "sha1-B1bYzoRt/QmEOmlHcZ36DUz/XPM=",
+ "dev": true
+ },
+ "should-type-adaptors": {
+ "version": "1.1.0",
+ "resolved": "https://registry.npmjs.org/should-type-adaptors/-/should-type-adaptors-1.1.0.tgz",
+ "integrity": "sha512-JA4hdoLnN+kebEp2Vs8eBe9g7uy0zbRo+RMcU0EsNy+R+k049Ki+N5tT5Jagst2g7EAja+euFuoXFCa8vIklfA==",
+ "dev": true,
+ "requires": {
+ "should-type": "^1.3.0",
+ "should-util": "^1.0.0"
+ }
+ },
+ "should-util": {
+ "version": "1.0.1",
+ "resolved": "https://registry.npmjs.org/should-util/-/should-util-1.0.1.tgz",
+ "integrity": "sha512-oXF8tfxx5cDk8r2kYqlkUJzZpDBqVY/II2WhvU0n9Y3XYvAYRmeaf1PvvIvTgPnv4KJ+ES5M0PyDq5Jp+Ygy2g==",
+ "dev": true
+ },
+ "sigmund": {
+ "version": "1.0.1",
+ "resolved": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.1.tgz",
+ "integrity": "sha1-P/IfGYytIXX587eBhT/ZTQ0ZtZA="
+ },
+ "signal-exit": {
+ "version": "3.0.2",
+ "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.2.tgz",
+ "integrity": "sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0="
+ },
+ "snakeize": {
+ "version": "0.1.0",
+ "resolved": "https://registry.npmjs.org/snakeize/-/snakeize-0.1.0.tgz",
+ "integrity": "sha1-EMCI2LWOsHazIpu1oE4jLOEmQi0="
+ },
+ "source-map": {
+ "version": "0.5.7",
+ "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
+ "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
+ "dev": true
+ },
+ "split-array-stream": {
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/split-array-stream/-/split-array-stream-2.0.0.tgz",
+ "integrity": "sha512-hmMswlVY91WvGMxs0k8MRgq8zb2mSen4FmDNc5AFiTWtrBpdZN6nwD6kROVe4vNL+ywrvbCKsWVCnEd4riELIg==",
+ "requires": {
+ "is-stream-ended": "^0.1.4"
+ }
+ },
+ "sprintf-js": {
+ "version": "1.0.3",
+ "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz",
+ "integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=",
+ "dev": true
+ },
+ "sshpk": {
+ "version": "1.16.1",
+ "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.16.1.tgz",
+ "integrity": "sha512-HXXqVUq7+pcKeLqqZj6mHFUMvXtOJt1uoUx09pFW6011inTMxqI8BA8PM95myrIyyKwdnzjdFjLiE6KBPVtJIg==",
+ "requires": {
+ "asn1": "~0.2.3",
+ "assert-plus": "^1.0.0",
+ "bcrypt-pbkdf": "^1.0.0",
+ "dashdash": "^1.12.0",
+ "ecc-jsbn": "~0.1.1",
+ "getpass": "^0.1.1",
+ "jsbn": "~0.1.0",
+ "safer-buffer": "^2.0.2",
+ "tweetnacl": "~0.14.0"
+ }
+ },
+ "stream-events": {
+ "version": "1.0.5",
+ "resolved": "https://registry.npmjs.org/stream-events/-/stream-events-1.0.5.tgz",
+ "integrity": "sha512-E1GUzBSgvct8Jsb3v2X15pjzN1tYebtbLaMg+eBOUOAxgbLoSbT2NS91ckc5lJD1KfLjId+jXJRgo0qnV5Nerg==",
+ "requires": {
+ "stubs": "^3.0.0"
+ }
+ },
+ "stream-shift": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/stream-shift/-/stream-shift-1.0.0.tgz",
+ "integrity": "sha1-1cdSgl5TZ+eG944Y5EXqIjoVWVI="
+ },
+ "string-width": {
+ "version": "2.1.1",
+ "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz",
+ "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==",
+ "dev": true,
+ "requires": {
+ "is-fullwidth-code-point": "^2.0.0",
+ "strip-ansi": "^4.0.0"
+ }
+ },
+ "string_decoder": {
+ "version": "1.1.1",
+ "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
+ "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
+ "requires": {
+ "safe-buffer": "~5.1.0"
+ }
+ },
+ "strip-ansi": {
+ "version": "4.0.0",
+ "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
+ "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
+ "dev": true,
+ "requires": {
+ "ansi-regex": "^3.0.0"
+ }
+ },
+ "strip-eof": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/strip-eof/-/strip-eof-1.0.0.tgz",
+ "integrity": "sha1-u0P/VZim6wXYm1n80SnJgzE2Br8=",
+ "dev": true
+ },
+ "strip-json-comments": {
+ "version": "1.0.4",
+ "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-1.0.4.tgz",
+ "integrity": "sha1-HhX7ysl9Pumb8tc7TGVrCCu6+5E=",
+ "dev": true
+ },
+ "stubs": {
+ "version": "3.0.0",
+ "resolved": "https://registry.npmjs.org/stubs/-/stubs-3.0.0.tgz",
+ "integrity": "sha1-6NK6H6nJBXAwPAMLaQD31fiavls="
+ },
+ "supports-color": {
+ "version": "1.2.0",
+ "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-1.2.0.tgz",
+ "integrity": "sha1-/x7R5hFp0Gs88tWI4YixjYhH4X4="
+ },
+ "teeny-request": {
+ "version": "3.11.3",
+ "resolved": "https://registry.npmjs.org/teeny-request/-/teeny-request-3.11.3.tgz",
+ "integrity": "sha512-CKncqSF7sH6p4rzCgkb/z/Pcos5efl0DmolzvlqRQUNcpRIruOhY9+T1FsIlyEbfWd7MsFpodROOwHYh2BaXzw==",
+ "requires": {
+ "https-proxy-agent": "^2.2.1",
+ "node-fetch": "^2.2.0",
+ "uuid": "^3.3.2"
+ }
+ },
+ "through2": {
+ "version": "3.0.1",
+ "resolved": "https://registry.npmjs.org/through2/-/through2-3.0.1.tgz",
+ "integrity": "sha512-M96dvTalPT3YbYLaKaCuwu+j06D/8Jfib0o/PxbVt6Amhv3dUAtW6rTV1jPgJSBG83I/e04Y6xkVdVhSRhi0ww==",
+ "requires": {
+ "readable-stream": "2 || 3"
+ }
+ },
+ "to-fast-properties": {
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz",
+ "integrity": "sha1-3F5pjL0HkmW8c+A3doGk5Og/YW4=",
+ "dev": true
+ },
+ "to-iso-string": {
+ "version": "0.0.2",
+ "resolved": "https://registry.npmjs.org/to-iso-string/-/to-iso-string-0.0.2.tgz",
+ "integrity": "sha1-TcGeZk38y+Jb2NtQiwDG2hWCVdE="
+ },
+ "tough-cookie": {
+ "version": "2.4.3",
+ "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.4.3.tgz",
+ "integrity": "sha512-Q5srk/4vDM54WJsJio3XNn6K2sCG+CQ8G5Wz6bZhRZoAe/+TxjWB/GlFAnYEbkYVlON9FMk/fE3h2RLpPXo4lQ==",
+ "requires": {
+ "psl": "^1.1.24",
+ "punycode": "^1.4.1"
+ },
+ "dependencies": {
+ "punycode": {
+ "version": "1.4.1",
+ "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz",
+ "integrity": "sha1-wNWmOycYgArY4esPpSachN1BhF4="
+ }
+ }
+ },
+ "trim-right": {
+ "version": "1.0.1",
+ "resolved": "https://registry.npmjs.org/trim-right/-/trim-right-1.0.1.tgz",
+ "integrity": "sha1-yy4SAwZ+DI3h9hQJS5/kVwTqYAM=",
+ "dev": true
+ },
+ "tunnel-agent": {
+ "version": "0.6.0",
+ "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz",
+ "integrity": "sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=",
+ "requires": {
+ "safe-buffer": "^5.0.1"
+ }
+ },
+ "tweetnacl": {
+ "version": "0.14.5",
+ "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz",
+ "integrity": "sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q="
+ },
+ "typedarray": {
+ "version": "0.0.6",
+ "resolved": "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz",
+ "integrity": "sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c="
+ },
+ "unique-string": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/unique-string/-/unique-string-1.0.0.tgz",
+ "integrity": "sha1-nhBXzKhRq7kzmPizOuGHuZyuwRo=",
+ "requires": {
+ "crypto-random-string": "^1.0.0"
+ }
+ },
+ "uri-js": {
+ "version": "4.2.2",
+ "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.2.2.tgz",
+ "integrity": "sha512-KY9Frmirql91X2Qgjry0Wd4Y+YTdrdZheS8TFwvkbLWf/G5KNJDCh6pKL5OZctEW4+0Baa5idK2ZQuELRwPznQ==",
+ "requires": {
+ "punycode": "^2.1.0"
+ },
+ "dependencies": {
+ "punycode": {
+ "version": "2.1.1",
+ "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz",
+ "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A=="
+ }
+ }
+ },
+ "url": {
+ "version": "0.10.3",
+ "resolved": "https://registry.npmjs.org/url/-/url-0.10.3.tgz",
+ "integrity": "sha1-Ah5NnHcF8hu/N9A861h2dAJ3TGQ=",
+ "requires": {
+ "punycode": "1.3.2",
+ "querystring": "0.2.0"
+ }
+ },
+ "url-equal": {
+ "version": "0.1.2-1",
+ "resolved": "https://registry.npmjs.org/url-equal/-/url-equal-0.1.2-1.tgz",
+ "integrity": "sha1-IjeVIL/gfSa1kIAEkIruEuhNBf8=",
+ "dev": true,
+ "requires": {
+ "deep-equal": "~1.0.1"
+ }
+ },
+ "url-join": {
+ "version": "4.0.1",
+ "resolved": "https://registry.npmjs.org/url-join/-/url-join-4.0.1.tgz",
+ "integrity": "sha512-jk1+QP6ZJqyOiuEI9AEWQfju/nB2Pw466kbA0LEZljHwKeMgd9WrAEgEGxjPDD2+TNbbb37rTyhEfrCXfuKXnA=="
+ },
+ "util-deprecate": {
+ "version": "1.0.2",
+ "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
+ "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8="
+ },
+ "uuid": {
+ "version": "3.3.2",
+ "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.3.2.tgz",
+ "integrity": "sha512-yXJmeNaw3DnnKAOKJE51sL/ZaYfWJRl1pK9dr19YFCu0ObS231AB1/LbqTKRAQ5kw8A90rA6fr4riOUpTZvQZA=="
+ },
+ "verror": {
+ "version": "1.10.0",
+ "resolved": "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz",
+ "integrity": "sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA=",
+ "requires": {
+ "assert-plus": "^1.0.0",
+ "core-util-is": "1.0.2",
+ "extsprintf": "^1.2.0"
+ }
+ },
+ "which": {
+ "version": "1.3.1",
+ "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz",
+ "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==",
+ "dev": true,
+ "requires": {
+ "isexe": "^2.0.0"
+ }
+ },
+ "which-module": {
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/which-module/-/which-module-2.0.0.tgz",
+ "integrity": "sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=",
+ "dev": true
+ },
+ "wide-align": {
+ "version": "1.1.3",
+ "resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.3.tgz",
+ "integrity": "sha512-QGkOQc8XL6Bt5PwnsExKBPuMKBxnGxWWW3fU55Xt4feHozMUhdUMaBCk290qpm/wG5u/RSKzwdAC4i51YigihA==",
+ "dev": true,
+ "requires": {
+ "string-width": "^1.0.2 || 2"
+ }
+ },
+ "wrap-ansi": {
+ "version": "2.1.0",
+ "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-2.1.0.tgz",
+ "integrity": "sha1-2Pw9KE3QV5T+hJc8rs3Rz4JP3YU=",
+ "dev": true,
+ "requires": {
+ "string-width": "^1.0.1",
+ "strip-ansi": "^3.0.1"
+ },
+ "dependencies": {
+ "ansi-regex": {
+ "version": "2.1.1",
+ "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
+ "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
+ "dev": true
+ },
+ "is-fullwidth-code-point": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz",
+ "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=",
+ "dev": true,
+ "requires": {
+ "number-is-nan": "^1.0.0"
+ }
+ },
+ "string-width": {
+ "version": "1.0.2",
+ "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
+ "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
+ "dev": true,
+ "requires": {
+ "code-point-at": "^1.0.0",
+ "is-fullwidth-code-point": "^1.0.0",
+ "strip-ansi": "^3.0.0"
+ }
+ },
+ "strip-ansi": {
+ "version": "3.0.1",
+ "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
+ "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
+ "dev": true,
+ "requires": {
+ "ansi-regex": "^2.0.0"
+ }
+ }
+ }
+ },
+ "wrappy": {
+ "version": "1.0.2",
+ "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
+ "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8="
+ },
+ "write-file-atomic": {
+ "version": "2.4.3",
+ "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-2.4.3.tgz",
+ "integrity": "sha512-GaETH5wwsX+GcnzhPgKcKjJ6M2Cq3/iZp1WyY/X1CSqrW+jVNM9Y7D8EC2sM4ZG/V8wZlSniJnCKWPmBYAucRQ==",
+ "requires": {
+ "graceful-fs": "^4.1.11",
+ "imurmurhash": "^0.1.4",
+ "signal-exit": "^3.0.2"
+ }
+ },
+ "xdg-basedir": {
+ "version": "3.0.0",
+ "resolved": "https://registry.npmjs.org/xdg-basedir/-/xdg-basedir-3.0.0.tgz",
+ "integrity": "sha1-SWsswQnsqNus/i3HK2A8F8WHCtQ="
+ },
+ "xml2js": {
+ "version": "0.4.19",
+ "resolved": "https://registry.npmjs.org/xml2js/-/xml2js-0.4.19.tgz",
+ "integrity": "sha512-esZnJZJOiJR9wWKMyuvSE1y6Dq5LCuJanqhxslH2bxM6duahNZ+HMpCLhBQGZkbX6xRf8x1Y2eJlgt2q3qo49Q==",
+ "requires": {
+ "sax": ">=0.6.0",
+ "xmlbuilder": "~9.0.1"
+ }
+ },
+ "xmlbuilder": {
+ "version": "9.0.7",
+ "resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-9.0.7.tgz",
+ "integrity": "sha1-Ey7mPS7FVlxVfiD0wi35rKaGsQ0="
+ },
+ "xtend": {
+ "version": "4.0.1",
+ "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz",
+ "integrity": "sha1-pcbVMr5lbiPbgg77lDofBJmNY68="
+ },
+ "y18n": {
+ "version": "4.0.0",
+ "resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.0.tgz",
+ "integrity": "sha512-r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w==",
+ "dev": true
+ },
+ "yallist": {
+ "version": "3.0.3",
+ "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.0.3.tgz",
+ "integrity": "sha512-S+Zk8DEWE6oKpV+vI3qWkaK+jSbIK86pCwe2IF/xwIpQ8jEuxpw9NyaGjmp9+BoJv5FV2piqCDcoCtStppiq2A=="
+ },
+ "yargs": {
+ "version": "13.2.2",
+ "resolved": "https://registry.npmjs.org/yargs/-/yargs-13.2.2.tgz",
+ "integrity": "sha512-WyEoxgyTD3w5XRpAQNYUB9ycVH/PQrToaTXdYXRdOXvEy1l19br+VJsc0vcO8PTGg5ro/l/GY7F/JMEBmI0BxA==",
+ "dev": true,
+ "requires": {
+ "cliui": "^4.0.0",
+ "find-up": "^3.0.0",
+ "get-caller-file": "^2.0.1",
+ "os-locale": "^3.1.0",
+ "require-directory": "^2.1.1",
+ "require-main-filename": "^2.0.0",
+ "set-blocking": "^2.0.0",
+ "string-width": "^3.0.0",
+ "which-module": "^2.0.0",
+ "y18n": "^4.0.0",
+ "yargs-parser": "^13.0.0"
+ },
+ "dependencies": {
+ "ansi-regex": {
+ "version": "4.1.0",
+ "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz",
+ "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==",
+ "dev": true
+ },
+ "string-width": {
+ "version": "3.1.0",
+ "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz",
+ "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==",
+ "dev": true,
+ "requires": {
+ "emoji-regex": "^7.0.1",
+ "is-fullwidth-code-point": "^2.0.0",
+ "strip-ansi": "^5.1.0"
+ }
+ },
+ "strip-ansi": {
+ "version": "5.2.0",
+ "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
+ "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
+ "dev": true,
+ "requires": {
+ "ansi-regex": "^4.1.0"
+ }
+ }
+ }
+ },
+ "yargs-parser": {
+ "version": "13.0.0",
+ "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-13.0.0.tgz",
+ "integrity": "sha512-w2LXjoL8oRdRQN+hOyppuXs+V/fVAYtpcrRxZuF7Kt/Oc+Jr2uAcVntaUTNT6w5ihoWfFDpNY8CPx1QskxZ/pw==",
+ "dev": true,
+ "requires": {
+ "camelcase": "^5.0.0",
+ "decamelize": "^1.2.0"
+ }
+ },
+ "yargs-unparser": {
+ "version": "1.5.0",
+ "resolved": "https://registry.npmjs.org/yargs-unparser/-/yargs-unparser-1.5.0.tgz",
+ "integrity": "sha512-HK25qidFTCVuj/D1VfNiEndpLIeJN78aqgR23nL3y4N0U/91cOAzqfHlF8n2BvoNDcZmJKin3ddNSvOxSr8flw==",
+ "dev": true,
+ "requires": {
+ "flat": "^4.1.0",
+ "lodash": "^4.17.11",
+ "yargs": "^12.0.5"
+ },
+ "dependencies": {
+ "get-caller-file": {
+ "version": "1.0.3",
+ "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-1.0.3.tgz",
+ "integrity": "sha512-3t6rVToeoZfYSGd8YoLFR2DJkiQrIiUrGcjvFX2mDw3bn6k2OtwHN0TNCLbBO+w8qTvimhDkv+LSscbJY1vE6w==",
+ "dev": true
+ },
+ "require-main-filename": {
+ "version": "1.0.1",
+ "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-1.0.1.tgz",
+ "integrity": "sha1-l/cXtp1IeE9fUmpsWqj/3aBVpNE=",
+ "dev": true
+ },
+ "yargs": {
+ "version": "12.0.5",
+ "resolved": "https://registry.npmjs.org/yargs/-/yargs-12.0.5.tgz",
+ "integrity": "sha512-Lhz8TLaYnxq/2ObqHDql8dX8CJi97oHxrjUcYtzKbbykPtVW9WB+poxI+NM2UIzsMgNCZTIf0AQwsjK5yMAqZw==",
+ "dev": true,
+ "requires": {
+ "cliui": "^4.0.0",
+ "decamelize": "^1.2.0",
+ "find-up": "^3.0.0",
+ "get-caller-file": "^1.0.1",
+ "os-locale": "^3.0.0",
+ "require-directory": "^2.1.1",
+ "require-main-filename": "^1.0.1",
+ "set-blocking": "^2.0.0",
+ "string-width": "^2.0.0",
+ "which-module": "^2.0.0",
+ "y18n": "^3.2.1 || ^4.0.0",
+ "yargs-parser": "^11.1.1"
+ }
+ },
+ "yargs-parser": {
+ "version": "11.1.1",
+ "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-11.1.1.tgz",
+ "integrity": "sha512-C6kB/WJDiaxONLJQnF8ccx9SEeoTTLek8RVbaOIsrAUS8VrBEXfmeSnCZxygc+XC2sNMBIwOOnfcxiynjHsVSQ==",
+ "dev": true,
+ "requires": {
+ "camelcase": "^5.0.0",
+ "decamelize": "^1.2.0"
+ }
+ }
+ }
+ }
+ }
+}
diff --git a/package.json b/package.json
index 28c331d57..85af72f3f 100644
--- a/package.json
+++ b/package.json
@@ -1,58 +1,70 @@
{
- "name": "pkgcloud",
- "description": "An infrastructure-as-a-service agnostic cloud library for node.js",
- "version": "0.9.4",
- "author": "Nodejitsu Inc ",
+ "name": "pkgcloud",
+ "description": "A provider agnostic cloud library for Node.js",
+ "version": "2.2.0",
+ "author": "Charlie Robbins ",
"contributors": [
- { "name": "Charlie Robbins", "email": "charlie@nodejitsu.com" },
- { "name": "Nuno Job", "email": "nuno@nodejitsu.com" },
- { "name": "Daniel Aristizabal", "email": "daniel@nodejitsu.com" },
- { "name": "Ken Perkins", "email": "ken.perkins@rackspace.com" }
+ "Ross Kukulinski ",
+ "Jarrett Cruger ",
+ "Ken Perkins "
],
"repository": {
"type": "git",
- "url" : "http://github.com/pkgcloud/pkgcloud.git"
+ "url": "http://github.com/pkgcloud/pkgcloud.git"
},
"keywords": [
- "cloud", "cloud computing",
- "api", "rackspace",
- "joyent", "aws",
- "amazon", "azure",
- "iaas", "servers",
- "compute", "storage",
- "databases", "client",
- "mongolab", "iriscouch",
- "mongohq", "openstack",
- "redistogo"
+ "cloud",
+ "cloud computing",
+ "api",
+ "rackspace",
+ "aws",
+ "amazon",
+ "azure",
+ "google",
+ "iaas",
+ "servers",
+ "compute",
+ "storage",
+ "client",
+ "openstack",
+ "hpcloud",
+ "hp",
+ "helion"
],
"dependencies": {
- "async": "0.1.x",
- "errs": "0.2.x",
- "eventemitter2": "0.4.x",
- "filed": "0.0.7",
- "ip": "0.0.x",
- "xml2js": "0.1.x",
- "mime": "1.2.x",
- "through": "~2.3",
- "pkginfo": "0.2.x",
- "qs": "0.6.x",
- "request": "2.22.x",
- "underscore": "1.4.x",
- "url-join": "0.0.x",
- "utile": "0.x.x"
+ "@google-cloud/storage": "^2.4.3",
+ "async": "^2.6.1",
+ "aws-sdk": "^2.382.0",
+ "errs": "^0.3.2",
+ "eventemitter2": "^5.0.1",
+ "fast-json-patch": "^2.1.0",
+ "filed-mimefix": "^0.1.3",
+ "ip": "^1.1.5",
+ "liboneandone": "^1.2.0",
+ "lodash": "^4.17.10",
+ "mime": "^2.4.1",
+ "qs": "^6.5.2",
+ "request": "^2.88.0",
+ "through2": "^3.0.1",
+ "url-join": "^4.0.0",
+ "xml2js": "^0.4.19"
},
"devDependencies": {
- "hock" : "0.2.x",
- "mocha": "1.9.x",
- "should": "1.2.x",
- "mocha-lcov-reporter": "0.0.1",
- "coveralls": "2.x.x"
+ "coveralls": "^3.0.2",
+ "hock": "^1.2.0",
+ "jshint": "^2.9.6",
+ "mocha": "^6.0.2",
+ "nyc": "^13.3.0",
+ "should": "^13.2.3"
},
- "main": "./lib/pkgcloud",
+ "main": "./lib/pkgcloud",
"scripts": {
- "test": "make test",
- "test-cov": "make test-cov",
- "test-coveralls": "make test-coveralls"
+ "test": "MOCK=on nyc mocha -t 4000 test/*/*/*-test.js",
+ "coverage": "nyc report --reporter=text-lcov | coveralls",
+ "lint": "jshint --exclude-path .gitignore .",
+ "posttest": "npm run lint"
},
- "engines": { "node": "0.8.x || 0.10.x" }
+ "engines": {
+ "node": ">= 8.0.0"
+ }
}
diff --git a/test/amazon/compute/client/groups-test.js b/test/amazon/compute/client/groups-test.js
index dd51e2457..f4c775415 100644
--- a/test/amazon/compute/client/groups-test.js
+++ b/test/amazon/compute/client/groups-test.js
@@ -1,11 +1,12 @@
var helpers = require('../../../helpers'),
+ http = require('http'),
should = require('should'),
hock = require('hock'),
mock = !!process.env.MOCK;
-describe('pkgcloud/amazon/groups', function () {
+describe.skip('pkgcloud/amazon/groups', function () {
- var client, server;
+ var client, server, hockInstance;
before(function (done) {
client = helpers.createClient('amazon', 'compute');
@@ -14,24 +15,25 @@ describe('pkgcloud/amazon/groups', function () {
return done();
}
- hock.createHock(12345, function (err, hockClient) {
- should.not.exist(err);
- should.exist(hockClient);
+ hockInstance = hock.createHock();
+ hockInstance.filteringRequestBody(helpers.authFilter);
- server = hockClient.filteringRequestBody(helpers.authFilter);
+ // setup a filtering path for aws
+ hockInstance.filteringPathRegEx(/https:\/\/ec2\.us-west-2\.amazonaws\.com([?\w\-\.\_0-9\/]*)/g, '$1');
- done();
- });
+ server = http.createServer(hockInstance.handler);
+ server.listen(12345, done);
});
it('add SecurityGroup should succeed', function(done) {
if (mock) {
- server
- .post('/?Action=CreateSecurityGroup', {
+ hockInstance
+ .post('/', {
+ Action: 'CreateSecurityGroup',
GroupDescription: 'unit test',
GroupName: 'unit test'
- })
+ }, { 'User-Agent': client.userAgent })
.replyWithFile(200, __dirname + '/../../../fixtures/amazon/add-group.xml');
}
@@ -40,8 +42,9 @@ describe('pkgcloud/amazon/groups', function () {
description: 'unit test'
}, function(err, data) {
should.not.exist(err);
- data.should.equal(true);
- server && server.done();
+ data.GroupId.should.equal('sg-a6e01ccd');
+
+ hockInstance && hockInstance.done();
done();
});
});
@@ -49,17 +52,18 @@ describe('pkgcloud/amazon/groups', function () {
it('destroy SecurityGroup should succeed', function (done) {
if (mock) {
- server
- .post('/?Action=DeleteSecurityGroup', {
+ hockInstance
+ .post('/', {
+ Action: 'DeleteSecurityGroup',
GroupName: 'unit test'
- })
+ }, { 'User-Agent': client.userAgent })
.replyWithFile(200, __dirname + '/../../../fixtures/amazon/destroy-group.xml');
}
client.destroyGroup('unit test', function (err, data) {
should.not.exist(err);
data.should.equal(true);
- server && server.done();
+ hockInstance && hockInstance.done();
done();
});
});
@@ -67,15 +71,15 @@ describe('pkgcloud/amazon/groups', function () {
it('list SecurityGroups should succeed', function (done) {
if (mock) {
- server
- .post('/?Action=DescribeSecurityGroups', {})
+ hockInstance
+ .post('/', { Action: 'DescribeSecurityGroups'}, { 'User-Agent': client.userAgent })
.replyWithFile(200, __dirname + '/../../../fixtures/amazon/list-groups.xml');
}
client.listGroups(function (err, data) {
should.not.exist(err);
- data.should.be.instanceOf(Array);
- server && server.done();
+ data.should.be.an.Array;
+ hockInstance && hockInstance.done();
done();
});
});
@@ -83,17 +87,18 @@ describe('pkgcloud/amazon/groups', function () {
it('get SecurityGroup should succeed', function (done) {
if (mock) {
- server
- .post('/?Action=DescribeSecurityGroups', {
+ hockInstance
+ .post('/', {
+ Action: 'DescribeSecurityGroups',
'GroupName.1': 'unit test'
- })
+ }, { 'User-Agent': client.userAgent })
.replyWithFile(200, __dirname + '/../../../fixtures/amazon/list-group.xml');
}
client.getGroup('unit test', function (err, data) {
should.not.exist(err);
- // TODO
- server && server.done();
+ should.exist(data);
+ hockInstance && hockInstance.done();
done();
});
});
@@ -101,29 +106,33 @@ describe('pkgcloud/amazon/groups', function () {
it('add Rules should succeed', function(done) {
if (mock) {
- server
- .post('/?Action=AuthorizeSecurityGroupIngress', {
+ hockInstance
+ .post('/', {
+ Action: 'AuthorizeSecurityGroupIngress',
GroupName: 'unit test',
'IpPermissions.1.FromPort': '0',
'IpPermissions.1.Groups.1.GroupName': 'unit test',
'IpPermissions.1.IpProtocol': 'tcp',
'IpPermissions.1.ToPort': '65535'
- })
+ }, { 'User-Agent': client.userAgent })
.replyWithFile(200, __dirname + '/../../../fixtures/amazon/add-rules.xml');
}
client.addRules({
name: 'unit test',
- rules: {
- 'IpPermissions.1.IpProtocol': 'tcp',
- 'IpPermissions.1.Groups.1.GroupName': 'unit test',
- 'IpPermissions.1.FromPort': 0,
- 'IpPermissions.1.ToPort': 65535
- }
+ rules: [
+ { IpProtocol: 'tcp',
+ FromPort: 0,
+ UserIdGroupPairs: [ {
+ GroupName: 'unit test'
+ } ],
+ ToPort: 65535
+ }
+ ]
}, function(err, data) {
should.not.exist(err);
data.should.equal(true);
- server && server.done();
+ hockInstance && hockInstance.done();
done();
});
});
@@ -131,29 +140,35 @@ describe('pkgcloud/amazon/groups', function () {
it('delete Rules should succeed', function (done) {
if (mock) {
- server
- .post('/?Action=RevokeSecurityGroupIngress', {
+ hockInstance
+ .post('/', {
+ Action: 'RevokeSecurityGroupIngress',
GroupName: 'unit test',
'IpPermissions.1.FromPort': '0',
'IpPermissions.1.Groups.1.GroupName': 'unit test',
'IpPermissions.1.IpProtocol': 'tcp',
'IpPermissions.1.ToPort': '65535'
- })
+ }, { 'User-Agent': client.userAgent })
.replyWithFile(200, __dirname + '/../../../fixtures/amazon/destroy-rules.xml');
}
client.delRules({
name: 'unit test',
- rules: {
- 'IpPermissions.1.IpProtocol': 'tcp',
- 'IpPermissions.1.Groups.1.GroupName': 'unit test',
- 'IpPermissions.1.FromPort': 0,
- 'IpPermissions.1.ToPort': 65535
- }
+ rules:
+ [
+ { IpProtocol: 'tcp',
+ FromPort: 0,
+ UserIdGroupPairs: [
+ {
+ GroupName: 'unit test'
+ }
+ ],
+ ToPort: 65535
+ } ]
}, function (err, data) {
should.not.exist(err);
data.should.equal(true);
- server && server.done();
+ hockInstance && hockInstance.done();
done();
});
});
diff --git a/test/amazon/compute/client/keys-test.js b/test/amazon/compute/client/keys-test.js
index a22c5aff6..b809e8ffc 100644
--- a/test/amazon/compute/client/keys-test.js
+++ b/test/amazon/compute/client/keys-test.js
@@ -1,11 +1,12 @@
var helpers = require('../../../helpers'),
+ http = require('http'),
should = require('should'),
hock = require('hock'),
mock = !!process.env.MOCK;
-describe('pkgcloud/amazon/keys', function () {
+describe.skip('pkgcloud/amazon/keys', function () {
- var client, server;
+ var client, server, hockInstance;
before(function (done) {
client = helpers.createClient('amazon', 'compute');
@@ -14,24 +15,25 @@ describe('pkgcloud/amazon/keys', function () {
return done();
}
- hock.createHock(12345, function (err, hockClient) {
- should.not.exist(err);
- should.exist(hockClient);
+ hockInstance = hock.createHock();
+ hockInstance.filteringRequestBody(helpers.authFilter);
- server = hockClient.filteringRequestBody(helpers.authFilter);
+ // setup a filtering path for aws
+ hockInstance.filteringPathRegEx(/https:\/\/ec2\.us-west-2\.amazonaws\.com([?\w\-\.\_0-9\/]*)/g, '$1');
- done();
- });
+ server = http.createServer(hockInstance.handler);
+ server.listen(12345, done);
});
it('add KeyPair should succeed', function(done) {
if (mock) {
- server
- .post('/?Action=ImportKeyPair', {
+ hockInstance
+ .post('/', {
+ Action: 'ImportKeyPair',
KeyName: 'unittest',
- PublicKeyMaterial: 'c3NoLXJzYSBBQUFBQjNOemFDMXljMkVBQUFBREFRQUJBQUFCQVFDblhidGZGTTNrNExFb3hMaENGQ3lucnBibmtPYWphQ2xFUVVzdWRaazBTVWxVenl0Y2laRjArN25VaDg1VDZjZWMyNjdnazZ4ZTBZWEJqalhWc2xqcGtBVnIyc21ycFRwc2FJWk1qdXdPNlZHNFdYMG54NFhJaG1lTy9WcmdvYzY5Q0liTFJqNnkySlI1UTlaaHVqZVZJK1FZVkg3RnZ0OTZMZjh5SkN6YzRQdDZIVCswU2pudnlqSVZRTkcrWFVuS21GMWNVTGZiWTZOK2JwbUhJQWpxNW1mLzR4T2lKeHFUa0N0NmhoNGk4aE4vOHJmMzUwL0dDUE1GYTA0Umh2Si9hQVRWMmhxLzR4UXZVUXhzdzVsWnUzM3dZMENiQXI1Z3Z2bHZQd1grV0pFQjQ3RU9adEwrdm1nZVdieGJETGNFNUVaSnIxejJIV2ZSQkIweC9uQng='
- })
+ PublicKeyMaterial: 'YzNOb0xYSnpZU0JCUVVGQlFqTk9lbUZETVhsak1rVkJRVUZCUkVGUlFVSkJRVUZDUVZGRGJsaGlkR1pHVFROck5FeEZiM2hNYUVOR1EzbHVjbkJpYm10UFlXcGhRMnhGVVZWemRXUmFhekJUVld4VmVubDBZMmxhUmpBck4yNVZhRGcxVkRaalpXTXlOamRuYXpaNFpUQlpXRUpxYWxoV2MyeHFjR3RCVm5JeWMyMXljRlJ3YzJGSldrMXFkWGRQTmxaSE5GZFlNRzU0TkZoSmFHMWxUeTlXY21kdll6WTVRMGxpVEZKcU5ua3lTbEkxVVRsYWFIVnFaVlpKSzFGWlZrZzNSblowT1RaTVpqaDVTa042WXpSUWREWklWQ3N3VTJwdWRubHFTVlpSVGtjcldGVnVTMjFHTVdOVlRHWmlXVFpPSzJKd2JVaEpRV3B4TlcxbUx6UjRUMmxLZUhGVWEwTjBObWhvTkdrNGFFNHZPSEptTXpVd0wwZERVRTFHWVRBMFVtaDJTaTloUVZSV01taHhMelI0VVhaVlVYaHpkelZzV25Vek0zZFpNRU5pUVhJMVozWjJiSFpRZDFnclYwcEZRalEzUlU5YWRFd3JkbTFuWlZkaWVHSkVUR05GTlVWYVNuSXhlakpJVjJaU1FrSXdlQzl1UW5nPQ=='
+ }, { 'User-Agent': client.userAgent })
.replyWithFile(200, __dirname + '/../../../fixtures/amazon/add-key.xml');
}
@@ -41,7 +43,7 @@ describe('pkgcloud/amazon/keys', function () {
}, function(err, data) {
should.not.exist(err);
data.should.equal(true);
- server && server.done();
+ hockInstance && hockInstance.done();
done();
});
});
@@ -49,17 +51,18 @@ describe('pkgcloud/amazon/keys', function () {
it('destroy KeyPair should succeed', function (done) {
if (mock) {
- server
- .post('/?Action=DeleteKeyPair', {
+ hockInstance
+ .post('/', {
+ Action: 'DeleteKeyPair',
KeyName: 'unittest'
- })
+ }, { 'User-Agent': client.userAgent })
.replyWithFile(200, __dirname + '/../../../fixtures/amazon/destroy-key.xml');
}
client.destroyKey('unittest', function (err, data) {
should.not.exist(err);
data.should.equal(true);
- server && server.done();
+ hockInstance && hockInstance.done();
done();
});
});
@@ -67,15 +70,15 @@ describe('pkgcloud/amazon/keys', function () {
it('list KeyPairs should succeed', function (done) {
if (mock) {
- server
- .post('/?Action=DescribeKeyPairs', {})
+ hockInstance
+ .post('/', { Action: 'DescribeKeyPairs' }, { 'User-Agent': client.userAgent })
.replyWithFile(200, __dirname + '/../../../fixtures/amazon/list-keys.xml');
}
client.listKeys(function (err, data) {
should.not.exist(err);
- data.should.be.instanceOf(Array);
- server && server.done();
+ data.should.be.an.Array;
+ hockInstance && hockInstance.done();
done();
});
});
@@ -83,17 +86,18 @@ describe('pkgcloud/amazon/keys', function () {
it('get KeyPair should succeed', function (done) {
if (mock) {
- server
- .post('/?Action=DescribeKeyPairs', {
+ hockInstance
+ .post('/', {
+ Action: 'DescribeKeyPairs',
'KeyName.1': 'unittest'
- })
+ }, { 'User-Agent': client.userAgent })
.replyWithFile(200, __dirname + '/../../../fixtures/amazon/list-keys.xml');
}
client.getKey('unittest', function (err, data) {
should.not.exist(err);
- // TODO
- server && server.done();
+ should.exist(data);
+ hockInstance && hockInstance.done();
done();
});
});
diff --git a/test/azure/compute/client/test-createImage.js b/test/azure/compute/client/test-createImage.js
index 40166126f..a3f55422f 100644
--- a/test/azure/compute/client/test-createImage.js
+++ b/test/azure/compute/client/test-createImage.js
@@ -1,16 +1,12 @@
//TODO: Make this a vows test
-var Client = new require('../../../../lib/pkgcloud/core/base/client').Client;
var helpers = require('../../../helpers');
-var fs = require('fs');
-var async = require('async');
-
var client = helpers.createClient('azure', 'compute');
var options = {
- name: "pkgcloud1",
- server: "pkgcloud1"
+ name: 'pkgcloud1',
+ server: 'pkgcloud1'
};
client.createImage(options, function (err, result) {
diff --git a/test/azure/compute/client/test-createServer.js b/test/azure/compute/client/test-createServer.js
index f9e13ff80..f21da9dc3 100644
--- a/test/azure/compute/client/test-createServer.js
+++ b/test/azure/compute/client/test-createServer.js
@@ -13,6 +13,8 @@ var fs = require('fs'),
azureNock = require('../../../helpers/azureNock'),
nock = require('nock');
+var testContext = {};
+
var options = {
name: 'create-test-ids2',
flavor: 'ExtraSmall',
@@ -25,8 +27,8 @@ var options = {
},
ports: [
{
- name: "foo",
- protocol: "tcp",
+ name: 'foo',
+ protocol: 'tcp',
port: 12333,
localPort: 12333
}
@@ -40,13 +42,13 @@ function testCreateServer(client) {
var name = 'azure',
test = {};
- test["The pkgcloud " + name + " compute client"] = {
- "the createServer() method": {
- "with image and flavor ids": {
+ test['The pkgcloud ' + name + ' compute client'] = {
+ 'the createServer() method': {
+ 'with image and flavor ids': {
topic: function () {
client.createServer(options, this.callback);
},
- "should return a valid server": function (err, server) {
+ 'should return a valid server': function (err, server) {
testContext.server = server;
assert.isNull(err);
@@ -63,17 +65,17 @@ function testCreateServer(client) {
return test;
}
-function testSetWait(client) {
+function testSetWait() {
var name = 'azure',
test = {};
- test["The pkgcloud " + name + " compute client"] = {
- "the setWait() method": {
- "with setWait({ status: testContext.server.STATUS.running },": {
+ test['The pkgcloud ' + name + ' compute client'] = {
+ 'the setWait() method': {
+ 'with setWait({ status: testContext.server.STATUS.running },': {
topic: function () {
testContext.server.setWait({ status: testContext.server.STATUS.running }, 1000, this.callback);
},
- "should return a running server": function (err, server) {
+ 'should return a running server': function (err, server) {
testContext.server = server;
assert.isNull(err);
if (err === null) {
@@ -92,8 +94,6 @@ function testSetWait(client) {
var client = helpers.createClient('azure', 'compute');
-var testContext = {};
-
if (process.env.MOCK) {
azureNock.serverTest(nock, helpers);
}
@@ -102,7 +102,7 @@ vows
.describe('pkgcloud/azure/compute/createServer')
.addBatch(testCreateServer(client))
.addBatch(testSetWait(client))
- ["export"](module);
+ ['export'](module);
diff --git a/test/azure/compute/client/test-destroyImage.js b/test/azure/compute/client/test-destroyImage.js
index 8cdb4ac0c..6a578e6d7 100644
--- a/test/azure/compute/client/test-destroyImage.js
+++ b/test/azure/compute/client/test-destroyImage.js
@@ -1,14 +1,9 @@
//TODO: Make this a vows test
-var Client = new require('../../../../lib/pkgcloud/core/base/client').Client;
var helpers = require('../../../helpers');
-var fs = require('fs');
-var async = require('async');
-
var client = helpers.createClient('azure', 'compute');
-
client.destroyImage('pkgcloud1', function (err, result) {
if (err) {
console.dir(err);
diff --git a/test/azure/compute/client/test-destroyServer.js b/test/azure/compute/client/test-destroyServer.js
index 6063a56e1..39b76ea7a 100644
--- a/test/azure/compute/client/test-destroyServer.js
+++ b/test/azure/compute/client/test-destroyServer.js
@@ -1,8 +1,6 @@
//TODO: Make this a vows test
-var Client = new require('../../../../lib/pkgcloud/core/base/client').Client;
var helpers = require('../../../helpers');
-var pkgcloud = require('../../../../lib/pkgcloud');
var client = helpers.createClient('azure', 'compute');
@@ -10,7 +8,7 @@ client.destroyServer('test-reboot', function (err, result) {
if (err) {
console.log(err);
} else {
- console.log('ok');
+ console.log(result);
}
});
diff --git a/test/azure/compute/client/test-getImages.js b/test/azure/compute/client/test-getImages.js
index 25e899435..e66894105 100644
--- a/test/azure/compute/client/test-getImages.js
+++ b/test/azure/compute/client/test-getImages.js
@@ -1,12 +1,9 @@
//TODO: Make this a vows test
-var Client = new require('../../../../lib/pkgcloud/core/base/client').Client;
var helpers = require('../../../helpers');
var client = helpers.createClient('azure', 'compute');
-var options = {};
-
/*
client.getImages(options, function (err, result) {
if (err) {
diff --git a/test/azure/compute/client/test-getServer.js b/test/azure/compute/client/test-getServer.js
index d232b2a87..7ee322074 100644
--- a/test/azure/compute/client/test-getServer.js
+++ b/test/azure/compute/client/test-getServer.js
@@ -1,12 +1,9 @@
//TODO: Make this a vows test
-var Client = new require('../../../../lib/pkgcloud/core/base/client').Client;
var helpers = require('../../../helpers');
var client = helpers.createClient('azure', 'compute');
-var options = {};
-
client.getServer('pkgcloud2', function (err, result) {
if (err) {
console.log(err);
diff --git a/test/azure/compute/client/test-getServers.js b/test/azure/compute/client/test-getServers.js
index 7193abbc1..e6025f68e 100644
--- a/test/azure/compute/client/test-getServers.js
+++ b/test/azure/compute/client/test-getServers.js
@@ -1,12 +1,9 @@
//TODO: Make this a vows test
-var Client = new require('../../../../lib/pkgcloud/core/base/client').Client;
var helpers = require('../../../helpers');
var client = helpers.createClient('azure', 'compute');
-var options = {};
-
client.getServers(function (err, result) {
if (err) {
console.log(err);
diff --git a/test/azure/compute/client/test-rebootServer.js b/test/azure/compute/client/test-rebootServer.js
index 97b57b9b4..360b2debf 100644
--- a/test/azure/compute/client/test-rebootServer.js
+++ b/test/azure/compute/client/test-rebootServer.js
@@ -5,14 +5,14 @@
*
*/
-var fs = require('fs'),
- path = require('path'),
- vows = require('vows'),
+var vows = require('vows'),
assert = require('../../../helpers/assert'),
helpers = require('../../../helpers'),
azureNock = require('../../../helpers/azureNock'),
nock = require('nock');
+var testContext = {};
+
var options = {
name: 'test-reboot',
flavor: 'ExtraSmall',
@@ -23,9 +23,9 @@ function testCreateServer(client) {
var name = 'azure',
test = {};
- test["The pkgcloud " + name + " compute client"] = {
- "the createServer() method": {
- "with image and flavor ids": {
+ test['The pkgcloud ' + name + ' compute client'] = {
+ 'the createServer() method': {
+ 'with image and flavor ids': {
topic: function () {
client.createServer({
name: options.name,
@@ -33,7 +33,7 @@ function testCreateServer(client) {
flavor: options.flavor
}, this.callback);
},
- "should return a valid server": function (err, server) {
+ 'should return a valid server': function (err, server) {
testContext.server = server;
assert.isNull(err);
@@ -50,17 +50,17 @@ function testCreateServer(client) {
return test;
}
-function testSetWait(client) {
+function testSetWait() {
var name = 'azure',
test = {};
- test["The pkgcloud " + name + " compute client"] = {
- "the setWait() method": {
- "with setWait({ status: testContext.server.STATUS.running },": {
+ test['The pkgcloud ' + name + ' compute client'] = {
+ 'the setWait() method': {
+ 'with setWait({ status: testContext.server.STATUS.running },': {
topic: function () {
testContext.server.setWait({ status: testContext.server.STATUS.running }, 1000, this.callback);
},
- "should return a running server": function (err, server) {
+ 'should return a running server': function (err, server) {
testContext.server = server;
assert.isNull(err);
if (err === null) {
@@ -81,13 +81,13 @@ function testRebootServer(client) {
var name = 'azure',
test = {};
- test["The pkgcloud " + name + " compute client"] = {
- "the rebootServer() method": {
- "rebooting server": {
+ test['The pkgcloud ' + name + ' compute client'] = {
+ 'the rebootServer() method': {
+ 'rebooting server': {
topic: function () {
client.rebootServer(testContext.server, this.callback);
},
- "should return a valid server": function (err, res) {
+ 'should return a valid server': function (err, res) {
assert.isNull(err);
if (err === null) {
@@ -105,8 +105,6 @@ function testRebootServer(client) {
var client = helpers.createClient('azure', 'compute');
-var testContext = {};
-
if (process.env.MOCK) {
azureNock.serverTest(nock, helpers);
}
@@ -117,6 +115,6 @@ vows
.addBatch(testSetWait(client))
.addBatch(testRebootServer(client))
.addBatch(testSetWait(client))
- ["export"](module);
+ ['export'](module);
diff --git a/test/azure/compute/client/test-stopServer.js b/test/azure/compute/client/test-stopServer.js
index 688f577b7..4d985eb6a 100644
--- a/test/azure/compute/client/test-stopServer.js
+++ b/test/azure/compute/client/test-stopServer.js
@@ -1,12 +1,9 @@
//TODO: Make this a vows test
-var Client = new require('../../../../lib/pkgcloud/core/base/client').Client;
var helpers = require('../../../helpers');
var client = helpers.createClient('azure', 'compute');
-var options = {};
-
client.stopServer('pkgcloud1', function (err, result) {
if (err) {
console.log(err);
diff --git a/test/azure/compute/templates/test-linuxConfigSet.js b/test/azure/compute/templates/test-linuxConfigSet.js
index 217c4af4a..266430e0a 100644
--- a/test/azure/compute/templates/test-linuxConfigSet.js
+++ b/test/azure/compute/templates/test-linuxConfigSet.js
@@ -1,11 +1,7 @@
//TODO: Make this a vows test
-var Client = new require('../../../../lib/pkgcloud/core/base/client').Client;
-var helpers = require('../../../helpers');
var templates = require('../../../../lib/pkgcloud/azure/compute/templates/templates');
-var _ = require('underscore');
-
-var fs = require('fs');
+var _ = require('lodash');
var params = {
HOSTNAME: 'pkgcloud1',
@@ -19,6 +15,7 @@ templates.load('linuxConfigSet.xml', function (err, template) {
console.dir(err);
} else {
- console.log(_.template(template, params));
+ var compiled = _.template(template);
+ console.log(compiled(params));
}
});
diff --git a/test/azure/databases/databases-test.js b/test/azure/databases/databases-test.js
index 2ceacea8f..3aa768429 100644
--- a/test/azure/databases/databases-test.js
+++ b/test/azure/databases/databases-test.js
@@ -6,6 +6,7 @@
*/
var helpers = require('../../helpers'),
+ http = require('http'),
should = require('should'),
urlJoin = require('url-join'),
hock = require('hock'),
@@ -13,7 +14,7 @@ var helpers = require('../../helpers'),
describe('pkgcloud/azure/databases', function () {
- var client, server, testContext = {};
+ var client, server, testContext = {}, hockInstance;
before(function (done) {
client = helpers.createClient('azure', 'database');
@@ -28,24 +29,21 @@ describe('pkgcloud/azure/databases', function () {
return urlJoin('http://localhost:12345/',
(typeof options === 'string'
? options
- : options.path));
+ : options.path || ''));
};
- hock.createHock(12345, function (err, hockClient) {
- should.not.exist(err);
- should.exist(hockClient);
+ hockInstance = hock.createHock();
+ hockInstance.filteringRequestBodyRegEx(/.*/, '*');
- server = hockClient.filteringRequestBodyRegEx(/.*/, '*');
-
- done();
- });
+ server = http.createServer(hockInstance.handler);
+ server.listen(12345, done);
});
describe('the pkgcloud azure db client', function() {
it('the create() method with correct options should respond correctly', function(done) {
if (mock) {
- server
+ hockInstance
.post('/Tables', '*')
.replyWithFile(201, __dirname + '/../../fixtures/azure/database/createTableResponse.xml');
}
@@ -61,7 +59,7 @@ describe('pkgcloud/azure/databases', function () {
database.password.should.equal('');
testContext.databaseId = database.id;
- server && server.done();
+ hockInstance && hockInstance.done();
done();
});
});
@@ -85,7 +83,7 @@ describe('pkgcloud/azure/databases', function () {
it('the list() method with correct options should respond correctly', function (done) {
if (mock) {
- server
+ hockInstance
.get('/Tables')
.replyWithFile(201, __dirname + '/../../fixtures/azure/database/listTables.xml');
}
@@ -93,10 +91,10 @@ describe('pkgcloud/azure/databases', function () {
client.list(function (err, databases) {
should.not.exist(err);
should.exist(databases);
- databases.should.be.instanceOf(Array);
+ databases.should.be.an.Array;
databases.should.have.length(1);
- server && server.done();
+ hockInstance && hockInstance.done();
done();
});
});
@@ -104,15 +102,15 @@ describe('pkgcloud/azure/databases', function () {
it('the remove() method with correct options should respond correctly', function (done) {
if (mock) {
- server
- .delete("/Tables%28%27testDatabase%27%29")
+ hockInstance
+ .delete('/Tables%28%27testDatabase%27%29')
.reply(204, '', {'content-length': '0'});
}
client.remove(testContext.databaseId, function (err, result) {
should.not.exist(err);
result.should.equal(true);
- server && server.done();
+ hockInstance && hockInstance.done();
done();
});
});
diff --git a/test/azure/databases/test-database.js b/test/azure/databases/test-database.js
index 83613cd42..63ca325a9 100644
--- a/test/azure/databases/test-database.js
+++ b/test/azure/databases/test-database.js
@@ -4,7 +4,7 @@ var helpers = require('../../helpers');
var options = {
name: 'test10'
-}
+};
var client = helpers.createClient('azure', 'database');
diff --git a/test/azure/databases/test-deleteTable.js b/test/azure/databases/test-deleteTable.js
index c5fab9c8e..1788a4cc2 100644
--- a/test/azure/databases/test-deleteTable.js
+++ b/test/azure/databases/test-deleteTable.js
@@ -1,6 +1,5 @@
//TODO: Make this a vows test
-var Client = new require('../../../lib/pkgcloud/core/base/client').Client;
var helpers = require('../../helpers');
var client = helpers.createClient('azure', 'database');
diff --git a/test/azure/databases/test-getTables.js b/test/azure/databases/test-getTables.js
index b799b5bea..dfc6547a4 100644
--- a/test/azure/databases/test-getTables.js
+++ b/test/azure/databases/test-getTables.js
@@ -1,11 +1,9 @@
//TODO: Make this a vows test
-var Client = new require('../../../lib/pkgcloud/core/base/client').Client;
var helpers = require('../../helpers');
var client = helpers.createClient('azure', 'database');
-
client.list(function (err, res) {
if (err) {
console.dir(err);
diff --git a/test/azure/storage/test-download.js b/test/azure/storage/test-download.js
index 18c1d478c..ea7635456 100644
--- a/test/azure/storage/test-download.js
+++ b/test/azure/storage/test-download.js
@@ -1,9 +1,6 @@
//TODO: Make this a vows test
-var Client = new require('../../../lib/pkgcloud/core/base/client').Client;
var helpers = require('../../helpers');
-var fs = require('fs');
-var async = require('async');
var client = helpers.createClient('azure', 'storage');
@@ -12,9 +9,6 @@ var options = {
remote: 'test-file.txt'
};
-
-
-
var stream = client.download(options, function (err, res) {
if (err) {
console.dir(err);
diff --git a/test/azure/storage/test-files.js b/test/azure/storage/test-files.js
index 96d47c4be..43c7a663a 100644
--- a/test/azure/storage/test-files.js
+++ b/test/azure/storage/test-files.js
@@ -1,12 +1,9 @@
//TODO: Make this a vows test
-var Client = new require('../../../lib/pkgcloud/core/base/client').Client;
var helpers = require('../../helpers');
-var async = require('async');
var client = helpers.createClient('azure', 'storage');
-
client.getFile('pkgcloud-test-container', 'test-file.txt', function (err, res) {
if (err) {
console.dir(err);
diff --git a/test/azure/storage/test-removeFile.js b/test/azure/storage/test-removeFile.js
index 244c5fc35..9489a5eb8 100644
--- a/test/azure/storage/test-removeFile.js
+++ b/test/azure/storage/test-removeFile.js
@@ -1,12 +1,9 @@
//TODO: Make this a vows test
-var Client = new require('../../../lib/pkgcloud/core/base/client').Client;
var helpers = require('../../helpers');
-var async = require('async');
var client = helpers.createClient('azure', 'storage');
-
client.removeFile('pkgcloud-test-container', 'test-file.txt', function (err, res) {
if (err) {
console.dir(err);
diff --git a/test/azure/storage/test-upload.js b/test/azure/storage/test-upload.js
index 787dfeaa7..c7183c7db 100644
--- a/test/azure/storage/test-upload.js
+++ b/test/azure/storage/test-upload.js
@@ -1,9 +1,7 @@
//TODO: Make this a vows test
-var Client = new require('../../../lib/pkgcloud/core/base/client').Client;
var helpers = require('../../helpers');
var fs = require('fs');
-var async = require('async');
var client = helpers.createClient('azure', 'storage');
@@ -12,7 +10,6 @@ var options = {
remote: 'test-file.txt'
};
-
var stream = client.upload(options, function (err, res) {
if (err) {
console.dir(err);
@@ -24,7 +21,7 @@ var stream = client.upload(options, function (err, res) {
var file = fs.createReadStream(helpers.fixturePath('fillerama.txt'));
file.pipe(stream);
-options.remote = 'bigfile.raw'
+options.remote = 'bigfile.raw';
var stream2 = client.upload(options, function (err, res) {
if (err) {
console.dir(err);
diff --git a/test/azure/utils/test-cert.js b/test/azure/utils/test-cert.js
index c6ea9f8c8..e3d93f04a 100644
--- a/test/azure/utils/test-cert.js
+++ b/test/azure/utils/test-cert.js
@@ -1,12 +1,6 @@
//TODO: Make this a vows test
-var fs = require('fs');
var azureCert = require('../../../lib/pkgcloud/azure/utils/cert.js');
-
-// load azure config file (you need to set this up with your azure account info)
-var config = JSON.parse(fs.readFileSync("../configs/azure.json",'utf8'));
-
-
azureCert.getAzureCert('../../fixtures/azure/cert/management/management.pem', function (err, result) {
if (err) {
console.dir(err);
diff --git a/test/azure/utils/test-createHostedService.js b/test/azure/utils/test-createHostedService.js
index 20fa84f05..db66bce3f 100644
--- a/test/azure/utils/test-createHostedService.js
+++ b/test/azure/utils/test-createHostedService.js
@@ -1,12 +1,9 @@
//TODO: Make this a vows test
-var Client = new require('../../../lib/pkgcloud/core/base/client').Client;
var helpers = require('../../helpers');
var azureApi = require('../../../lib/pkgcloud/azure/utils/azureApi');
var client = helpers.createClient('azure', 'compute');
-var options = {};
-
azureApi.createHostedService(client, 'pkgcloud4', function (err, result) {
if (err) {
console.log(err);
diff --git a/test/azure/utils/test-createServer.js b/test/azure/utils/test-createServer.js
index dc7ce09ec..a998bdf41 100644
--- a/test/azure/utils/test-createServer.js
+++ b/test/azure/utils/test-createServer.js
@@ -1,6 +1,5 @@
//TODO: Make this a vows test
-var Client = new require('../../../lib/pkgcloud/core/base/client').Client;
var helpers = require('../../helpers');
var azureApi = require('../../../lib/pkgcloud/azure/utils/azureApi');
var client = helpers.createClient('azure', 'compute');
diff --git a/test/azure/utils/test-createWindowsServer.js b/test/azure/utils/test-createWindowsServer.js
index 038a2adcb..59f119a6a 100644
--- a/test/azure/utils/test-createWindowsServer.js
+++ b/test/azure/utils/test-createWindowsServer.js
@@ -1,6 +1,5 @@
//TODO: Make this a vows test
-var Client = new require('../../../lib/pkgcloud/core/base/client').Client;
var helpers = require('../../helpers');
var azureApi = require('../../../lib/pkgcloud/azure/utils/azureApi');
var client = helpers.createClient('azure', 'compute');
diff --git a/test/azure/utils/test-getOSImage.js b/test/azure/utils/test-getOSImage.js
index 16fec27f2..ab37a02a9 100644
--- a/test/azure/utils/test-getOSImage.js
+++ b/test/azure/utils/test-getOSImage.js
@@ -1,12 +1,9 @@
//TODO: Make this a vows test
-var Client = new require('../../../lib/pkgcloud/core/base/client').Client;
var helpers = require('../../helpers');
var azureApi = require('../../../lib/pkgcloud/azure/utils/azureApi');
var client = helpers.createClient('azure', 'compute');
-var options = {};
-
azureApi.getOSImage(client, 'OpenLogic__OpenLogic-CentOS-62-20120531-en-us-30GB.vhd', function (err, result) {
if (err) {
console.log(err);
diff --git a/test/common/base/client-test.js b/test/common/base/client-test.js
index fa142793e..0de1f3b5d 100644
--- a/test/common/base/client-test.js
+++ b/test/common/base/client-test.js
@@ -1,11 +1,12 @@
-/*
+ /*
* client-test.js: Tests for pkgcloud base client
*
-* (C) 2012 Nodejitsu Inc.
+* (C) 2012 Charlie Robbins, Ken Perkins, Ross Kukulinski & the Contributors.
*
*/
var should = require('should'),
+ pkgcloud = require('../../../lib/pkgcloud'),
Client = new require('../../../lib/pkgcloud/core/base/client').Client;
describe('pkgcloud/core/base/client', function () {
@@ -13,7 +14,7 @@ describe('pkgcloud/core/base/client', function () {
it('with a wrong request with a cb', function(done) {
var cli = new Client();
cli._getUrl = function () {
- return "badurl";
+ return 'badurl';
};
cli.failCodes = {};
cli._request({ path: '/' }, function(err) {
@@ -26,28 +27,28 @@ describe('pkgcloud/core/base/client', function () {
var cli = new Client();
cli._getUrl = function () {
- return "badurl";
+ return 'badurl';
};
cli.failCodes = {};
var stream = cli._request({ path: '/' });
- stream.on('error', function () {
- return handleResponse(true);
- });
- stream.on('end', function () {
- return handleResponse(false);
- });
function handleResponse(err) {
should.exist(err);
done();
}
+ stream.on('error', function () {
+ return handleResponse(true);
+ });
+ stream.on('end', function () {
+ return handleResponse(false);
+ });
});
it('the before filters throwing an error with a callback should return the error on the cb', function(done) {
var cli = new Client();
cli._getUrl = function () {
- return "badurl";
+ return 'badurl';
};
cli.failCodes = {};
cli.before = [function () {
@@ -59,12 +60,24 @@ describe('pkgcloud/core/base/client', function () {
});
});
+ it('custom user agents should work', function () {
+ var cli = new Client();
+ cli.setCustomUserAgent('my-app/1.2.3');
+ cli.getUserAgent().should.equal('my-app/1.2.3 nodejs-pkgcloud/' + pkgcloud.version);
+ });
+
it('the before filters throwing an error without a callback should return the error on the EE', function(done) {
var cli = new Client();
cli._getUrl = function () {
- return "badurl";
+ return 'badurl';
};
+
+ function handleResponse(err) {
+ should.exist(err);
+ done();
+ }
+
cli.failCodes = {};
var stream = cli._request({ path: '/' });
stream.on('error', function () {
@@ -73,11 +86,6 @@ describe('pkgcloud/core/base/client', function () {
stream.on('end', function () {
handleResponse(false);
});
-
- function handleResponse(err) {
- should.exist(err);
- done();
- }
});
});
});
diff --git a/test/common/base/pkgcloud-test.js b/test/common/base/pkgcloud-test.js
index 33e55191a..b38e476ea 100644
--- a/test/common/base/pkgcloud-test.js
+++ b/test/common/base/pkgcloud-test.js
@@ -1,10 +1,9 @@
-var should = require('should'),
- pkgcloud = require('../../../lib/pkgcloud');
+var pkgcloud = require('../../../lib/pkgcloud');
describe('pkgcloud/pkgcloud', function() {
it('should throw an Error when the provider is not supported', function() {
(function () {
- pkgcloud.storage.createClient({"provider":"in-memory"});
- }).should.throw(new Error("in-memory is not a supported provider"));
+ pkgcloud.storage.createClient({ provider: 'in-memory' });
+ }).should.throw(new Error('in-memory is not a supported provider'));
});
});
diff --git a/test/common/base/useragent-test.js b/test/common/base/useragent-test.js
new file mode 100644
index 000000000..b12fa243b
--- /dev/null
+++ b/test/common/base/useragent-test.js
@@ -0,0 +1,30 @@
+/*
+ * useragent-test.js: Tests for pkgcloud base client useragent
+ *
+ * (C) 2015 Ken Perkins, Rackspace Inc.
+ *
+ */
+
+var pkgcloud = require('../../../lib/pkgcloud'),
+ Client = new require('../../../lib/pkgcloud/core/base/client').Client;
+
+require('should');
+
+describe('pkgcloud/core/base/client/useragent', function () {
+ describe('getUserAgent tests', function () {
+ it('should return the default useragent', function () {
+ var cli = new Client();
+
+ cli.getUserAgent().should.equal('nodejs-pkgcloud/' + pkgcloud.version);
+ });
+ });
+
+ describe('setCustomUserAgent tests', function () {
+ it('should allow prefixing a custom useragent', function () {
+ var cli = new Client();
+
+ cli.setCustomUserAgent('my-app/1.2.3');
+ cli.getUserAgent().should.equal('my-app/1.2.3 nodejs-pkgcloud/' + pkgcloud.version);
+ });
+ });
+});
diff --git a/test/common/compute/base-test.js b/test/common/compute/base-test.js
index b50bfd976..aae0a4de6 100644
--- a/test/common/compute/base-test.js
+++ b/test/common/compute/base-test.js
@@ -1,19 +1,17 @@
/*
* base-test.js: Test that should be common to all providers.
*
- * (C) 2013 Nodejitsu Inc.
+ * (C) 2013 Charlie Robbins, Ken Perkins, Ross Kukulinski & the Contributors.
*
*/
-var fs = require('fs'),
- path = require('path'),
- should = require('should'),
- qs = require('qs'),
- utile = require('utile'),
+var should = require('should'),
+ util = require('util'),
async = require('async'),
+ http = require('http'),
helpers = require('../../helpers'),
hock = require('hock'),
- _ = require('underscore'),
+ _ = require('lodash'),
providers = require('../../configs/providers.json'),
versions = require('../../fixtures/versions.json'),
Flavor = require('../../../lib/pkgcloud/core/compute/flavor').Flavor,
@@ -25,48 +23,55 @@ var fs = require('fs'),
var azureOptions = require('../../fixtures/azure/azure-options.json');
+// Declaring variables for helper functions defined later
+var setupVersionMock, setupFlavorMock, setupImagesMock, setupServerMock, setupDestroyMock;
+
azureApi._updateMinimumPollInterval(mock ? 10 : azureApi.MINIMUM_POLL_INTERVAL);
-providers.forEach(function(provider) {
+providers.filter(function (provider) {
+ return !!helpers.pkgcloud.providers[provider].compute;
+}).forEach(function (provider) {
describe('pkgcloud/common/compute/base [' + provider + ']', function () {
var client = helpers.createClient(provider, 'compute'),
- context = {},
- authServer, server;
+ context = {},
+ authServer, server,
+ authHockInstance,
+ hockInstance;
- before(function(done) {
+ before(function (done) {
if (!mock) {
return done();
}
+ hockInstance = hock.createHock({ throwOnUnmatched: false });
+ authHockInstance = hock.createHock();
+
+ // setup a filtering path for aws
+ hockInstance.filteringPathRegEx(/https:\/\/ec2\.us-west-2\.amazonaws\.com([?\w\-\.\_0-9\/]*)/g, '$1');
+
+ server = http.createServer(hockInstance.handler);
+ authServer = http.createServer(authHockInstance.handler);
+
async.parallel([
- function(next) {
- hock.createHock({
- port: 12345,
- throwOnUnmatched: false
- }, function(err, hockClient) {
- server = hockClient;
- next();
- });
+ function (next) {
+ server.listen(12345, next);
},
function (next) {
- hock.createHock(12346, function (err, hockClient) {
- authServer = hockClient;
- next();
- });
+ authServer.listen(12346, next);
}
- ], done)
+ ], done);
});
it('the getVersion() method with no arguments should return the version', function (done) {
if (mock) {
var errors = setupVersionMock(client, provider, {
- authServer: authServer,
- server: server
+ authServer: authHockInstance,
+ server: hockInstance
});
}
-
+
if (errors) {
client.getVersion(function (err) {
err.should.be.an.instanceof(Error);
@@ -79,18 +84,18 @@ providers.forEach(function(provider) {
should.exist(version);
version.should.equal(versions[provider]);
- authServer && authServer.done();
- server && server.done();
+ authHockInstance && authHockInstance.done();
+ hockInstance && hockInstance.done();
done();
});
}
});
- it('the getFlavors() method should return a list of flavors', function(done) {
+ it('the getFlavors() method should return a list of flavors', function (done) {
if (mock) {
setupFlavorMock(client, provider, {
- authServer: authServer,
- server: server
+ authServer: authHockInstance,
+ server: hockInstance
});
}
@@ -104,8 +109,8 @@ providers.forEach(function(provider) {
context.flavors = flavors;
- authServer && authServer.done();
- server && server.done();
+ authHockInstance && authHockInstance.done();
+ hockInstance && hockInstance.done();
done();
});
@@ -114,8 +119,8 @@ providers.forEach(function(provider) {
it('the getImages() method should return a list of images', function (done) {
if (mock) {
setupImagesMock(client, provider, {
- authServer: authServer,
- server: server
+ authServer: authHockInstance,
+ server: hockInstance
});
}
@@ -129,8 +134,8 @@ providers.forEach(function(provider) {
context.images = images;
- authServer && authServer.done();
- server && server.done();
+ authHockInstance && authHockInstance.done();
+ hockInstance && hockInstance.done();
done();
});
@@ -141,12 +146,12 @@ providers.forEach(function(provider) {
if (mock) {
setupServerMock(client, provider, {
- authServer: authServer,
- server: server
+ authServer: authHockInstance,
+ server: hockInstance
});
}
- client.createServer(utile.mixin({
+ client.createServer(_.extend({
name: 'create-test-setWait',
image: context.images[0].id,
flavor: context.flavors[0].id
@@ -154,7 +159,7 @@ providers.forEach(function(provider) {
should.not.exist(err);
should.exist(srv1);
- srv1.setWait({ status: srv1.STATUS.running }, 100 * m, function (err, srv2) {
+ srv1.setWait({ status: srv1.STATUS.running }, 100 * m, 1000, function (err, srv2) {
should.not.exist(err);
should.exist(srv2);
srv2.should.be.instanceOf(Server);
@@ -162,25 +167,25 @@ providers.forEach(function(provider) {
srv2.status.should.equal(srv2.STATUS.running);
context.server = srv2;
- authServer && authServer.done();
- server && server.done();
+ authHockInstance && authHockInstance.done();
+ hockInstance && hockInstance.done();
done();
});
});
});
- it('the setWait() method waiting for a server to be operational should return a running server', function (done) {
+ it('the destroyServer() method should destroy an existing server', function (done) {
// TODO enable destroy tests for all providers
- if (provider === 'joyent' || provider === 'amazon' || provider === 'azure') {
+ if (provider === 'amazon' || provider === 'azure') {
done();
return;
}
if (mock) {
setupDestroyMock(client, provider, {
- authServer: authServer,
- server: server
+ authServer: authHockInstance,
+ server: hockInstance
});
}
@@ -188,14 +193,14 @@ providers.forEach(function(provider) {
should.not.exist(err);
should.exist(result);
- authServer && authServer.done();
- server && server.done();
+ authHockInstance && authHockInstance.done();
+ hockInstance && hockInstance.done();
done();
});
});
- after(function(done) {
+ after(function (done) {
if (!mock) {
return done();
}
@@ -207,12 +212,12 @@ providers.forEach(function(provider) {
function (next) {
server.close(next);
}
- ], done)
+ ], done);
});
});
});
-function setupVersionMock(client, provider, servers) {
+setupVersionMock = function (client, provider, servers) {
if (provider === 'digitalocean') {
return true;
}
@@ -229,7 +234,7 @@ function setupVersionMock(client, provider, servers) {
.reply(200, helpers.getRackspaceAuthResponse());
servers.server
- .get('/v2/', {'User-Agent': utile.format('nodejs-pkgcloud/%s', pkgcloud.version)})
+ .get('/v2/', { 'User-Agent': util.format('nodejs-pkgcloud/%s', pkgcloud.version) })
.replyWithFile(200, __dirname + '/../../fixtures/rackspace/versions.json');
}
else if (provider === 'openstack') {
@@ -241,9 +246,9 @@ function setupVersionMock(client, provider, servers) {
password: 'MOCK-PASSWORD'
}
}
- }, {'User-Agent': utile.format('nodejs-pkgcloud/%s', pkgcloud.version)})
+ }, { 'User-Agent': util.format('nodejs-pkgcloud/%s', pkgcloud.version) })
.reply(200, helpers._getOpenstackStandardResponse('../fixtures/openstack/initialToken.json'))
- .get('/v2.0/tenants', {'User-Agent': utile.format('nodejs-pkgcloud/%s', pkgcloud.version)})
+ .get('/v2.0/tenants', { 'User-Agent': util.format('nodejs-pkgcloud/%s', pkgcloud.version) })
.replyWithFile(200, __dirname + '/../../fixtures/openstack/tenantId.json')
.post('/v2.0/tokens', {
auth: {
@@ -253,174 +258,177 @@ function setupVersionMock(client, provider, servers) {
},
tenantId: '72e90ecb69c44d0296072ea39e537041'
}
- }, {'User-Agent': utile.format('nodejs-pkgcloud/%s', pkgcloud.version)})
+ }, { 'User-Agent': util.format('nodejs-pkgcloud/%s', pkgcloud.version) })
.reply(200, helpers.getOpenstackAuthResponse());
servers.server
- .get('/v2/', {'User-Agent': utile.format('nodejs-pkgcloud/%s', pkgcloud.version)})
+ .get('/v2/', { 'User-Agent': util.format('nodejs-pkgcloud/%s', pkgcloud.version) })
.replyWithFile(200, __dirname + '/../../fixtures/rackspace/versions.json');
}
- else if (provider === 'joyent') {
+ else if (provider === 'hp') {
+ servers.authServer
+ .post('/v2.0/tokens', {
+ auth: {
+ apiAccessKeyCredentials: {
+ accessKey: 'MOCK-USERNAME',
+ secretKey: 'MOCK-API-KEY'
+ }
+ }
+ }, { 'User-Agent': util.format('nodejs-pkgcloud/%s', pkgcloud.version) })
+ .reply(200, helpers._getOpenstackStandardResponse('../fixtures/hp/initialToken.json'))
+ .get('/v2.0/tenants', { 'User-Agent': util.format('nodejs-pkgcloud/%s', pkgcloud.version) })
+ .replyWithFile(200, __dirname + '/../../fixtures/hp/tenantId.json')
+ .post('/v2.0/tokens', {
+ auth: {
+ apiAccessKeyCredentials: {
+ accessKey: 'MOCK-USERNAME',
+ secretKey: 'MOCK-API-KEY'
+ },
+ tenantId: '5ACED3DC3AA740ABAA41711243CC6949'
+ }
+ }, { 'User-Agent': util.format('nodejs-pkgcloud/%s', pkgcloud.version) })
+ .reply(200, helpers.gethpAuthResponse());
+
servers.server
- .get('/' + client.account + '/datacenters',
- {'User-Agent': utile.format('nodejs-pkgcloud/%s', pkgcloud.version)})
- .reply(200, '', { 'x-api-version': '6.5.0' });
+ .get('/v2/', { 'User-Agent': util.format('nodejs-pkgcloud/%s', pkgcloud.version) })
+ .replyWithFile(200, __dirname + '/../../fixtures/hp/versions.json');
}
-}
+};
-function setupFlavorMock(client, provider, servers) {
+setupFlavorMock = function (client, provider, servers) {
if (provider === 'rackspace') {
servers.server
- .get('/v2/123456/flavors/detail', {'User-Agent': utile.format('nodejs-pkgcloud/%s', pkgcloud.version)})
+ .get('/v2/123456/flavors/detail', { 'User-Agent': util.format('nodejs-pkgcloud/%s', pkgcloud.version) })
.replyWithFile(200, __dirname + '/../../fixtures/rackspace/flavors.json');
}
else if (provider === 'openstack') {
servers.server
.get('/v2/72e90ecb69c44d0296072ea39e537041/flavors/detail',
- {'User-Agent': utile.format('nodejs-pkgcloud/%s', pkgcloud.version)})
+ { 'User-Agent': util.format('nodejs-pkgcloud/%s', pkgcloud.version) })
.replyWithFile(200, __dirname + '/../../fixtures/openstack/flavors.json');
}
- else if (provider === 'joyent') {
- servers.server
- .get('/' + client.account + '/packages',
- {'User-Agent': utile.format('nodejs-pkgcloud/%s', pkgcloud.version)})
- .replyWithFile(200, __dirname + '/../../fixtures/joyent/flavors.json');
- }
else if (provider === 'digitalocean') {
- var account = require(__dirname + '/../../configs/mock/digitalocean');
servers.server
- .get('/sizes?' + qs.stringify({
- client_id: account.clientId,
- api_key: account.apiKey
- }))
+ .get('/v2/sizes')
.replyWithFile(200, __dirname + '/../../fixtures/digitalocean/flavors.json');
}
-}
+ else if (provider === 'hp') {
+ servers.server
+ .get('/v2/5ACED3DC3AA740ABAA41711243CC6949/flavors/detail',
+ { 'User-Agent': util.format('nodejs-pkgcloud/%s', pkgcloud.version) })
+ .replyWithFile(200, __dirname + '/../../fixtures/hp/flavors.json');
+ }
+ else if (provider === 'oneandone') {
+ servers.server
+ .get('/servers/fixed_instance_sizes')
+ .replyWithFile(200, __dirname + '/../../fixtures/oneandone/listFlavors.json');
+ }
+};
-function setupImagesMock(client, provider, servers) {
+setupImagesMock = function (client, provider, servers) {
if (provider === 'rackspace') {
servers.server
.get('/v2/123456/images/detail',
- {'User-Agent': utile.format('nodejs-pkgcloud/%s', pkgcloud.version)})
+ { 'User-Agent': util.format('nodejs-pkgcloud/%s', pkgcloud.version) })
.replyWithFile(200, __dirname + '/../../fixtures/rackspace/images.json');
}
else if (provider === 'openstack') {
servers.server
.get('/v2/72e90ecb69c44d0296072ea39e537041/images/detail',
- {'User-Agent': utile.format('nodejs-pkgcloud/%s', pkgcloud.version)})
+ { 'User-Agent': util.format('nodejs-pkgcloud/%s', pkgcloud.version) })
.replyWithFile(200, __dirname + '/../../fixtures/openstack/images.json');
}
- else if (provider === 'joyent') {
- servers.server
- .get('/' + client.account + '/datasets',
- {'User-Agent': utile.format('nodejs-pkgcloud/%s', pkgcloud.version)})
- .replyWithFile(200, __dirname + '/../../fixtures/joyent/images.json');
- }
else if (provider === 'amazon') {
servers.server
.filteringRequestBody(helpers.authFilter)
- .post('/?Action=DescribeImages', { 'Owner.0': 'self' },
- {'User-Agent': utile.format('nodejs-pkgcloud/%s', pkgcloud.version)})
+ .post('/', { Action: 'DescribeImages', 'Owner.1': 'self' },
+ { 'User-Agent': client.userAgent })
.replyWithFile(200, __dirname + '/../../fixtures/amazon/images.xml');
}
else if (provider === 'azure') {
servers.server
.get('/azure-account-subscription-id/services/images',
- {'User-Agent': utile.format('nodejs-pkgcloud/%s', pkgcloud.version)})
+ { 'User-Agent': util.format('nodejs-pkgcloud/%s', pkgcloud.version) })
.replyWithFile(200, __dirname + '/../../fixtures/azure/images.xml');
}
else if (provider === 'digitalocean') {
- var account = require(__dirname + '/../../configs/mock/digitalocean');
servers.server
- .get('/images?' + qs.stringify({
- client_id: account.clientId,
- api_key: account.apiKey
- }))
+ .get('/v2/images?per_page=200&page=1')
.replyWithFile(200, __dirname + '/../../fixtures/digitalocean/images.json');
}
-}
+ else if (provider === 'hp') {
+ servers.server
+ .get('/v2/5ACED3DC3AA740ABAA41711243CC6949/images/detail',
+ { 'User-Agent': util.format('nodejs-pkgcloud/%s', pkgcloud.version) })
+ .replyWithFile(200, __dirname + '/../../fixtures/hp/images.json');
+ }
+ else if (provider === 'oneandone') {
+ servers.server
+ .get('/server_appliances')
+ .replyWithFile(200, __dirname + '/../../fixtures/oneandone/listImages.json');
+ }
+};
-function setupServerMock(client, provider, servers) {
+setupServerMock = function (client, provider, servers) {
if (provider === 'digitalocean') {
- var account = require(__dirname + '/../../configs/mock/digitalocean');
servers.server
- .get('/droplets/new?' + qs.stringify({
+ .post('/v2/droplets', {
name: 'create-test-setWait',
- region_id: 1,
- size_id: 66,
- image_id: 1601,
- client_id: account.clientId,
- api_key: account.apiKey
- }))
+ region: 'nyc3',
+ size: '512mb',
+ image: 119192817
+ })
.replyWithFile(200, __dirname + '/../../fixtures/digitalocean/create-server.json')
- .get('/droplets/354526?' + qs.stringify({
- client_id: account.clientId,
- api_key: account.apiKey
- }))
+ .get('/v2/droplets/3164444')
.replyWithFile(200, __dirname + '/../../fixtures/digitalocean/not-active.json')
- .get('/droplets/354526?' + qs.stringify({
- client_id: account.clientId,
- api_key: account.apiKey
- }))
+ .get('/v2/droplets/3164444')
.replyWithFile(200, __dirname + '/../../fixtures/digitalocean/active.json');
}
else if (provider === 'rackspace') {
servers.server
.post('/v2/123456/servers', {
- server: {
- name: 'create-test-setWait',
- flavorRef: '2',
- imageRef: '9922a7c7-5a42-4a56-bc6a-93f857ae2346'
- }
- },
- {'User-Agent': utile.format('nodejs-pkgcloud/%s', pkgcloud.version)})
+ server: {
+ name: 'create-test-setWait',
+ flavorRef: '2',
+ imageRef: '9922a7c7-5a42-4a56-bc6a-93f857ae2346'
+ }
+ },
+ { 'User-Agent': util.format('nodejs-pkgcloud/%s', pkgcloud.version) })
.replyWithFile(202, __dirname + '/../../fixtures/rackspace/setWaitResp1.json')
.get('/v2/123456/servers/a0a5f183-b94e-4a41-a854-64cff53375bf',
- {'User-Agent': utile.format('nodejs-pkgcloud/%s', pkgcloud.version)})
+ { 'User-Agent': util.format('nodejs-pkgcloud/%s', pkgcloud.version) })
.replyWithFile(200, __dirname + '/../../fixtures/rackspace/a0a5f183-b94e-4a41-a854-64cff53375bf.json');
}
else if (provider === 'openstack') {
servers.server
.post('/v2/72e90ecb69c44d0296072ea39e537041/servers', {
- server: {
- name: 'create-test-setWait',
- flavorRef: '1',
- imageRef: '506d077e-66bf-44ff-907a-588c5c79fa66'
- }
- },
- {'User-Agent': utile.format('nodejs-pkgcloud/%s', pkgcloud.version)})
+ server: {
+ name: 'create-test-setWait',
+ flavorRef: '1',
+ imageRef: '506d077e-66bf-44ff-907a-588c5c79fa66'
+ }
+ },
+ { 'User-Agent': util.format('nodejs-pkgcloud/%s', pkgcloud.version) })
.replyWithFile(202, __dirname + '/../../fixtures/openstack/creatingServer.json')
.get('/v2/72e90ecb69c44d0296072ea39e537041/servers/5a023de8-957b-4822-ad84-8c7a9ef83c07',
- {'User-Agent': utile.format('nodejs-pkgcloud/%s', pkgcloud.version)})
+ { 'User-Agent': util.format('nodejs-pkgcloud/%s', pkgcloud.version) })
.replyWithFile(200, __dirname + '/../../fixtures/openstack/serverCreated.json');
}
- else if (provider === 'joyent') {
- servers.server
- .post('/' + client.account + '/machines',
- { name: 'create-test-setWait',
- 'package': 'Small 1GB',
- dataset: 'sdc:sdc:nodejitsu:1.0.0'
- },
- {'User-Agent': utile.format('nodejs-pkgcloud/%s', pkgcloud.version)})
- .replyWithFile(200, __dirname + '/../../fixtures/joyent/setWait.json')
- .get('/' + client.account +
- '/machines/534aa63a-104f-4d6d-a3b1-c0d341a20a53',
- {'User-Agent': utile.format('nodejs-pkgcloud/%s', pkgcloud.version)})
- .replyWithFile(200, __dirname + '/../../fixtures/joyent/setWaitResp1.json');
- }
else if (provider === 'amazon') {
servers.server
.filteringRequestBody(helpers.authFilter)
- .post('/?Action=RunInstances', {
+ .post('/', {
+ 'Action': 'RunInstances',
'ImageId': 'ami-85db1cec',
'InstanceType': 'm1.small',
'MaxCount': '1',
'MinCount': '1',
'UserData': 'eyJuYW1lIjoiY3JlYXRlLXRlc3Qtc2V0V2FpdCJ9'
- }, {'User-Agent': utile.format('nodejs-pkgcloud/%s', pkgcloud.version)})
+ }, { 'User-Agent': client.userAgent })
.replyWithFile(200, __dirname + '/../../fixtures/amazon/run-instances.xml')
- .post('/?Action=DescribeInstances', {
+ .post('/', {
+ 'Action': 'DescribeInstances',
'Filter.1.Name': 'instance-state-code',
'Filter.1.Value.1': '0',
'Filter.1.Value.2': '16',
@@ -428,14 +436,16 @@ function setupServerMock(client, provider, servers) {
'Filter.1.Value.4': '64',
'Filter.1.Value.5': '80',
'InstanceId.1': 'i-1d48637b'
- }, {'User-Agent': utile.format('nodejs-pkgcloud/%s', pkgcloud.version)})
+ }, { 'User-Agent': client.userAgent })
.replyWithFile(200, __dirname + '/../../fixtures/amazon/pending-server.xml')
- .post('/?Action=DescribeInstanceAttribute', {
+ .post('/', {
+ 'Action': 'DescribeInstanceAttribute',
'Attribute': 'userData',
'InstanceId': 'i-1d48637b'
- }, {'User-Agent': utile.format('nodejs-pkgcloud/%s', pkgcloud.version)})
+ }, { 'User-Agent': client.userAgent })
.replyWithFile(200, __dirname + '/../../fixtures/amazon/running-server-attr.xml')
- .post('/?Action=DescribeInstances', {
+ .post('/', {
+ 'Action': 'DescribeInstances',
'Filter.1.Name': 'instance-state-code',
'Filter.1.Value.1': '0',
'Filter.1.Value.2': '16',
@@ -443,75 +453,107 @@ function setupServerMock(client, provider, servers) {
'Filter.1.Value.4': '64',
'Filter.1.Value.5': '80',
'InstanceId.1': 'i-1d48637b'
- }, {'User-Agent': utile.format('nodejs-pkgcloud/%s', pkgcloud.version)})
+ }, { 'User-Agent': client.userAgent })
.replyWithFile(200, __dirname + '/../../fixtures/amazon/running-server.xml')
- .post('/?Action=DescribeInstanceAttribute', {
+ .post('/', {
+ 'Action': 'DescribeInstanceAttribute',
'Attribute': 'userData',
'InstanceId': 'i-1d48637b'
- }, {'User-Agent': utile.format('nodejs-pkgcloud/%s', pkgcloud.version)})
+ }, { 'User-Agent': client.userAgent })
.replyWithFile(200, __dirname + '/../../fixtures/amazon/running-server-attr.xml');
}
else if (provider === 'azure') {
servers.server
.get('/azure-account-subscription-id/services/hostedservices/create-test-setWait?embed-detail=true',
- {'User-Agent': utile.format('nodejs-pkgcloud/%s', pkgcloud.version)})
+ { 'User-Agent': util.format('nodejs-pkgcloud/%s', pkgcloud.version) })
.replyWithFile(404, __dirname + '/../../fixtures/azure/hosted-service-404.xml')
- .post('/azure-account-subscription-id/services/hostedservices', helpers.loadFixture('azure/create-hosted-service.xml'), {'User-Agent': utile.format('nodejs-pkgcloud/%s', pkgcloud.version)})
+ .post('/azure-account-subscription-id/services/hostedservices', helpers.loadFixture('azure/create-hosted-service.xml'), { 'User-Agent': util.format('nodejs-pkgcloud/%s', pkgcloud.version) })
.reply(201, '', {
location: 'https://management.core.windows.net/subscriptions/azure-account-subscription-id/compute/create-test-setWait',
- 'x-ms-request-id': 'b67cc525ecc546618fd6fb3e57d724f5'})
+ 'x-ms-request-id': 'b67cc525ecc546618fd6fb3e57d724f5'
+ })
.get('/azure-account-subscription-id/operations/b67cc525ecc546618fd6fb3e57d724f5',
- {'User-Agent': utile.format('nodejs-pkgcloud/%s', pkgcloud.version)})
+ { 'User-Agent': util.format('nodejs-pkgcloud/%s', pkgcloud.version) })
.replyWithFile(200, __dirname + '/../../fixtures/azure/operation-succeeded.xml')
- .get('/azure-account-subscription-id/services/images/CANONICAL__Canonical-Ubuntu-12-04-amd64-server-20120528.1.3-en-us-30GB.vhd', {'User-Agent': utile.format('nodejs-pkgcloud/%s', pkgcloud.version)})
+ .get('/azure-account-subscription-id/services/images/CANONICAL__Canonical-Ubuntu-12-04-amd64-server-20120528.1.3-en-us-30GB.vhd', { 'User-Agent': util.format('nodejs-pkgcloud/%s', pkgcloud.version) })
.replyWithFile(200, __dirname + '/../../fixtures/azure/image-1.xml')
- .post('/azure-account-subscription-id/services/hostedservices/create-test-setWait/deployments', helpers.loadFixture('azure/create-deployment.xml'), {'User-Agent': utile.format('nodejs-pkgcloud/%s', pkgcloud.version)})
- .reply(202, '', {'x-ms-request-id': 'b67cc525ecc546618fd6fb3e57d724f5'})
+ .post('/azure-account-subscription-id/services/hostedservices/create-test-setWait/deployments', helpers.loadFixture('azure/create-deployment.xml'), { 'User-Agent': util.format('nodejs-pkgcloud/%s', pkgcloud.version) })
+ .reply(202, '', { 'x-ms-request-id': 'b67cc525ecc546618fd6fb3e57d724f5' })
.get('/azure-account-subscription-id/operations/b67cc525ecc546618fd6fb3e57d724f5',
- {'User-Agent': utile.format('nodejs-pkgcloud/%s', pkgcloud.version)})
+ { 'User-Agent': util.format('nodejs-pkgcloud/%s', pkgcloud.version) })
.replyWithFile(200, __dirname + '/../../fixtures/azure/operation-inprogress.xml')
.get('/azure-account-subscription-id/operations/b67cc525ecc546618fd6fb3e57d724f5',
- {'User-Agent': utile.format('nodejs-pkgcloud/%s', pkgcloud.version)})
+ { 'User-Agent': util.format('nodejs-pkgcloud/%s', pkgcloud.version) })
.replyWithFile(200, __dirname + '/../../fixtures/azure/operation-succeeded.xml')
// TODO: have to do this twice as setWait() does not check server status before calling server.refresh()?
.get('/azure-account-subscription-id/services/hostedservices/create-test-setWait?embed-detail=true',
- {'User-Agent': utile.format('nodejs-pkgcloud/%s', pkgcloud.version)})
+ { 'User-Agent': util.format('nodejs-pkgcloud/%s', pkgcloud.version) })
.replyWithFile(200, __dirname + '/../../fixtures/azure/running-server.xml')
.get('/azure-account-subscription-id/services/hostedservices/create-test-setWait?embed-detail=true',
- {'User-Agent': utile.format('nodejs-pkgcloud/%s', pkgcloud.version)})
+ { 'User-Agent': util.format('nodejs-pkgcloud/%s', pkgcloud.version) })
.replyWithFile(200, __dirname + '/../../fixtures/azure/running-server.xml')
.filteringRequestBodyRegEx(/.*/, '*')
.post('/azure-account-subscription-id/services/hostedservices/create-test-setWait/certificates', '*',
- {'User-Agent': utile.format('nodejs-pkgcloud/%s', pkgcloud.version)})
- .reply(202, '', {'x-ms-request-id': 'b67cc525ecc546618fd6fb3e57d724f5'})
+ { 'User-Agent': util.format('nodejs-pkgcloud/%s', pkgcloud.version) })
+ .reply(202, '', { 'x-ms-request-id': 'b67cc525ecc546618fd6fb3e57d724f5' })
.get('/azure-account-subscription-id/operations/b67cc525ecc546618fd6fb3e57d724f5',
- {'User-Agent': utile.format('nodejs-pkgcloud/%s', pkgcloud.version)})
+ { 'User-Agent': util.format('nodejs-pkgcloud/%s', pkgcloud.version) })
.replyWithFile(200, __dirname + '/../../fixtures/azure/operation-succeeded.xml');
}
-}
+ else if (provider === 'hp') {
+ servers.server
+ .post('/v2/5ACED3DC3AA740ABAA41711243CC6949/servers', {
+ server: {
+ name: 'create-test-setWait',
+ flavorRef: '1',
+ imageRef: '506d077e-66bf-44ff-907a-588c5c79fa66'
+ }
+ },
+ { 'User-Agent': util.format('nodejs-pkgcloud/%s', pkgcloud.version) })
+ .replyWithFile(202, __dirname + '/../../fixtures/hp/creatingServer.json')
+ .get('/v2/5ACED3DC3AA740ABAA41711243CC6949/servers/5a023de8-957b-4822-ad84-8c7a9ef83c07',
+ { 'User-Agent': util.format('nodejs-pkgcloud/%s', pkgcloud.version) })
+ .replyWithFile(200, __dirname + '/../../fixtures/hp/serverCreated.json');
+ }
+ else if (provider === 'oneandone') {
+ servers.server
+ .post('/servers', {
+ name: 'create-test-setWait',
+ hardware: { fixed_instance_size_id: '8C626C1A7005D0D1F527143C413D461E' }
+ , appliance_id: 'A0FAA4587A7CB6BBAA1EA877C844977E'
+ })
+ .replyWithFile(202, __dirname + '/../../fixtures/oneandone/getWaitServer.json')
+ .get('/servers/39AA65F5D5B02FA02D58173094EBAF95')
+ .replyWithFile(200, __dirname + '/../../fixtures/oneandone/getWaitServer.json');
+ }
+};
-function setupDestroyMock(client, provider, servers) {
+setupDestroyMock = function (client, provider, servers) {
if (provider === 'rackspace') {
servers.server
.delete('/v2/123456/servers/a0a5f183-b94e-4a41-a854-64cff53375bf',
- {'User-Agent': utile.format('nodejs-pkgcloud/%s', pkgcloud.version)})
+ { 'User-Agent': util.format('nodejs-pkgcloud/%s', pkgcloud.version) })
.reply(204);
}
else if (provider === 'openstack') {
servers.server
- .delete('/v2/72e90ecb69c44d0296072ea39e537041/servers/5a023de8-957b-4822-ad84-8c7a9ef83c07', {'User-Agent': utile.format('nodejs-pkgcloud/%s', pkgcloud.version)})
+ .delete('/v2/72e90ecb69c44d0296072ea39e537041/servers/5a023de8-957b-4822-ad84-8c7a9ef83c07', { 'User-Agent': util.format('nodejs-pkgcloud/%s', pkgcloud.version) })
+ .reply(204);
+ }
+ else if (provider === 'hp') {
+ servers.server
+ .delete('/v2/5ACED3DC3AA740ABAA41711243CC6949/servers/5a023de8-957b-4822-ad84-8c7a9ef83c07', { 'User-Agent': util.format('nodejs-pkgcloud/%s', pkgcloud.version) })
.reply(204);
}
else if (provider === 'digitalocean') {
- var account = require(__dirname + '/../../configs/mock/digitalocean');
-
servers.server
- .get('/droplets/354526/destroy?' + qs.stringify({
- scrub_data: '1',
- client_id: account.clientId,
- api_key: account.apiKey
- }))
- .replyWithFile(200, __dirname + '/../../fixtures/digitalocean/destroy-server.json');
+ .delete('/v2/droplets/3164444')
+ .reply(204);
+ }
+ else if (provider === 'oneandone') {
+ servers.server
+ .delete('/servers/39AA65F5D5B02FA02D58173094EBAF95?keep_ips=false')
+ .replyWithFile(202, __dirname + '/../../fixtures/oneandone/getWaitServer.json');
}
-}
+};
diff --git a/test/common/compute/meta-test.js b/test/common/compute/meta-test.js
new file mode 100644
index 000000000..f0fefc7ca
--- /dev/null
+++ b/test/common/compute/meta-test.js
@@ -0,0 +1,165 @@
+/*
+* meta-test.js: Openstack updateImageMeta() function test .
+*
+* (C) 2012 Charlie Robbins, Ken Perkins, Ross Kukulinski & the Contributors.
+*
+*/
+
+var should = require('should'),
+ helpers = require('../../helpers'),
+ http = require('http'),
+ hock = require('hock'),
+ async = require('async'),
+ Image = require('../../../lib/pkgcloud/core/compute/image').Image,
+ mock = !!process.env.MOCK;
+
+// Declaring variables for helper functions defined later
+var setupMetaMock, setupImagesMock;
+
+var providers=['openstack'];
+
+providers.filter(function (provider) {
+ return !!helpers.pkgcloud.providers[provider].compute;
+}).forEach(function (provider) {
+ describe('pkgcloud/common/compute/server [' + provider + ']', function () {
+
+ var client = helpers.createClient(provider, 'compute'),
+ context = {},
+ authServer, server,
+ authHockInstance,
+ hockInstance;
+
+ before(function (done) {
+
+ if (!mock) {
+ return done();
+ }
+
+ hockInstance = hock.createHock({ throwOnUnmatched: false });
+ authHockInstance = hock.createHock();
+
+ server = http.createServer(hockInstance.handler);
+ authServer = http.createServer(authHockInstance.handler);
+
+ async.parallel([
+ function (next) {
+ server.listen(12345, next);
+ },
+ function (next) {
+ authServer.listen(12346, next);
+ }
+ ], done);
+ });
+
+ it('the getImages() function should return a list of images', function(done) {
+
+ if (mock) {
+ setupImagesMock(client, provider, {
+ authServer: authHockInstance,
+ server: hockInstance
+ });
+ }
+
+ client.getImages(function (err, images) {
+ should.not.exist(err);
+ should.exist(images);
+
+ context.images = images;
+
+ images.forEach(function(img) {
+ img.should.be.instanceOf(Image);
+ });
+
+ authHockInstance && authHockInstance.done();
+ hockInstance && hockInstance.done();
+
+ done();
+ });
+ });
+
+
+ it('the updateImageMeta() method should update the image metadata', function (done) {
+ if (mock) {
+ setupMetaMock(client, provider, {
+ authServer: authHockInstance,
+ server: hockInstance
+ });
+ }
+
+ var testMetadata = {os_type: 'windows'};
+
+ client.updateImageMeta(context.images[0].id, testMetadata, function (err, reply) {
+ should.not.exist(err);
+ should.exist(reply);
+ should.exist(reply.metadata.os_type);
+ reply.metadata.os_type.should.equal('windows');
+
+ context.currentServer = server;
+
+ authHockInstance && authHockInstance.done();
+ hockInstance && hockInstance.done();
+ done();
+
+ });
+ });
+
+
+ after(function (done) {
+ if (!mock) {
+ return done();
+ }
+
+ async.parallel([
+ function (next) {
+ authServer.close(next);
+ },
+ function (next) {
+ server.close(next);
+ }
+ ], done);
+ });
+
+ });
+});
+
+setupMetaMock = function (client, provider, servers) {
+ if (provider === 'openstack') {
+ servers.server
+ .post('/v2/72e90ecb69c44d0296072ea39e537041/images/506d077e-66bf-44ff-907a-588c5c79fa66/metadata',
+ { metadata: {
+ os_type :'windows'
+ }})
+ .replyWithFile(202, __dirname + '/../../fixtures/openstack/metaResponse.json');
+ }
+};
+
+setupImagesMock = function (client, provider, servers) {
+ if (provider === 'openstack') {
+ servers.authServer
+ .post('/v2.0/tokens', {
+ auth: {
+ passwordCredentials: {
+ username: 'MOCK-USERNAME',
+ password: 'MOCK-PASSWORD'
+ }
+ }
+ })
+ .replyWithFile(200, __dirname + '/../../fixtures/openstack/initialToken.json')
+ .get('/v2.0/tenants')
+ .replyWithFile(200, __dirname + '/../../fixtures/openstack/tenantId.json')
+ .post('/v2.0/tokens', {
+ auth: {
+ passwordCredentials: {
+ username: 'MOCK-USERNAME',
+ password: 'MOCK-PASSWORD'
+ },
+ tenantId: '72e90ecb69c44d0296072ea39e537041'
+ }
+ })
+ .reply(200, helpers.getOpenstackAuthResponse());
+
+ servers.server
+ .get('/v2/72e90ecb69c44d0296072ea39e537041/images/detail')
+ .replyWithFile(200, __dirname + '/../../fixtures/openstack/images.json');
+ }
+};
diff --git a/test/common/compute/server-test.js b/test/common/compute/server-test.js
index f8a5b83bc..7928c445c 100644
--- a/test/common/compute/server-test.js
+++ b/test/common/compute/server-test.js
@@ -1,37 +1,39 @@
/*
* server-test.js: Test that should be common to all providers.
*
-* (C) 2012 Nodejitsu Inc.
+* (C) 2012 Charlie Robbins, Ken Perkins, Ross Kukulinski & the Contributors.
*
*/
-var fs = require('fs'),
- path = require('path'),
- qs = require('qs'),
- should = require('should'),
- utile = require('utile'),
+var should = require('should'),
async = require('async'),
helpers = require('../../helpers'),
+ http = require('http'),
hock = require('hock'),
- async = require('async'),
- _ = require('underscore'),
+ _ = require('lodash'),
providers = require('../../configs/providers.json'),
- Flavor = require('../../../lib/pkgcloud/core/compute/flavor').Flavor,
- Image = require('../../../lib/pkgcloud/core/compute/image').Image,
Server = require('../../../lib/pkgcloud/core/compute/server').Server,
azureApi = require('../../../lib/pkgcloud/azure/utils/azureApi'),
mock = !!process.env.MOCK;
var azureOptions = require('../../fixtures/azure/azure-options.json');
+// Declaring variables for helper functions defined later
+var setupImagesMock, setupFlavorMock, setupServerMock, setupGetServersMock,
+ setupGetServerMock, setupRebootMock, serverStatusReply;
+
azureApi._updateMinimumPollInterval(mock ? 10 : azureApi.MINIMUM_POLL_INTERVAL);
-providers.forEach(function (provider) {
+providers.filter(function (provider) {
+ return !!helpers.pkgcloud.providers[provider].compute;
+}).forEach(function (provider) {
describe('pkgcloud/common/compute/server [' + provider + ']', function () {
var client = helpers.createClient(provider, 'compute'),
context = {},
- authServer, server;
+ authServer, server,
+ authHockInstance,
+ hockInstance;
before(function (done) {
@@ -39,31 +41,31 @@ providers.forEach(function (provider) {
return done();
}
+ hockInstance = hock.createHock({ throwOnUnmatched: false });
+ authHockInstance = hock.createHock();
+
+ // setup a filtering path for aws
+ hockInstance.filteringPathRegEx(/https:\/\/ec2\.us-west-2\.amazonaws\.com([?\w\-\.\_0-9\/]*)/g, '$1');
+
+ server = http.createServer(hockInstance.handler);
+ authServer = http.createServer(authHockInstance.handler);
+
async.parallel([
function (next) {
- hock.createHock({
- port: 12345,
- throwOnUnmatched: false
- }, function (err, hockClient) {
- server = hockClient;
- next();
- });
+ server.listen(12345, next);
},
function (next) {
- hock.createHock(12346, function (err, hockClient) {
- authServer = hockClient;
- next();
- });
+ authServer.listen(12346, next);
}
- ], done)
+ ], done);
});
it('the getImages() function should return a list of images', function(done) {
if (mock) {
setupImagesMock(client, provider, {
- authServer: authServer,
- server: server
+ authServer: authHockInstance,
+ server: hockInstance
});
}
@@ -71,10 +73,10 @@ providers.forEach(function (provider) {
should.not.exist(err);
should.exist(images);
- context.images = images
+ context.images = images;
- authServer && authServer.done();
- server && server.done();
+ authHockInstance && authHockInstance.done();
+ hockInstance && hockInstance.done();
done();
});
@@ -84,8 +86,8 @@ providers.forEach(function (provider) {
if (mock) {
setupFlavorMock(client, provider, {
- authServer: authServer,
- server: server
+ authServer: authHockInstance,
+ server: hockInstance
});
}
@@ -93,10 +95,10 @@ providers.forEach(function (provider) {
should.not.exist(err);
should.exist(flavors);
- context.flavors = flavors
+ context.flavors = flavors;
- authServer && authServer.done();
- server && server.done();
+ authHockInstance && authHockInstance.done();
+ hockInstance && hockInstance.done();
done();
});
@@ -107,12 +109,12 @@ providers.forEach(function (provider) {
if (mock) {
setupServerMock(client, provider, {
- authServer: authServer,
- server: server
+ authServer: authHockInstance,
+ server: hockInstance
});
}
- client.createServer(utile.mixin({
+ client.createServer(_.extend({
name: 'create-test-ids2',
image: context.images[0].id,
flavor: context.flavors[0].id
@@ -127,8 +129,8 @@ providers.forEach(function (provider) {
srv2.name.should.equal('create-test-ids2');
srv2.imageId.should.equal(context.images[0].id);
- authServer && authServer.done();
- server && server.done();
+ authHockInstance && authHockInstance.done();
+ hockInstance && hockInstance.done();
done();
});
});
@@ -137,8 +139,8 @@ providers.forEach(function (provider) {
it('the getServers() method should return a list of servers', function (done) {
if (mock) {
setupGetServersMock(client, provider, {
- authServer: authServer,
- server: server
+ authServer: authHockInstance,
+ server: hockInstance
});
}
@@ -146,24 +148,26 @@ providers.forEach(function (provider) {
should.not.exist(err);
should.exist(servers);
- servers.should.be.instanceOf(Array);
+ servers.should.be.an.Array;
servers.forEach(function(srv) {
srv.should.be.instanceOf(Server);
});
- authServer && authServer.done();
- server && server.done();
+ context.servers = servers;
+
+ authHockInstance && authHockInstance.done();
+ hockInstance && hockInstance.done();
done();
});
});
- it.skip('the getServer() method should get a server instance', function (done) {
+ it('the getServer() method should get a server instance', function (done) {
if (mock) {
setupGetServerMock(client, provider, {
- authServer: authServer,
- server: server
+ authServer: authHockInstance,
+ server: hockInstance
});
}
@@ -173,10 +177,10 @@ providers.forEach(function (provider) {
srv.should.be.instanceOf(Server);
- context.currentServer = server;
+ context.currentServer = hockInstance;
- authServer && authServer.done();
- server && server.done();
+ authHockInstance && authHockInstance.done();
+ hockInstance && hockInstance.done();
done();
});
@@ -185,12 +189,13 @@ providers.forEach(function (provider) {
it.skip('the server.rebootServer() method should restart a server instance', function (done) {
if (mock) {
setupRebootMock(client, provider, {
- authServer: authServer,
- server: server
+ authServer: authHockInstance,
+ server: hockInstance
});
}
context.currentServer.reboot(function(err) {
+ should.not.exist(err);
done();
});
});
@@ -198,12 +203,13 @@ providers.forEach(function (provider) {
it.skip('the destroyServer() method should delete a server instance', function (done) {
if (mock) {
setupRebootMock(client, provider, {
- authServer: authServer,
- server: server
+ authServer: authHockInstance,
+ server: hockInstance
});
}
context.currentServer.reboot(function (err) {
+ should.not.exist(err);
done();
});
});
@@ -220,13 +226,13 @@ providers.forEach(function (provider) {
function (next) {
server.close(next);
}
- ], done)
+ ], done);
});
});
});
-function setupImagesMock(client, provider, servers) {
+setupImagesMock = function (client, provider, servers) {
if (provider === 'rackspace') {
servers.authServer
.post('/v2.0/tokens', {
@@ -271,15 +277,13 @@ function setupImagesMock(client, provider, servers) {
.get('/v2/72e90ecb69c44d0296072ea39e537041/images/detail')
.replyWithFile(200, __dirname + '/../../fixtures/openstack/images.json');
}
- else if (provider === 'joyent') {
- servers.server
- .get('/' + client.account + '/datasets')
- .replyWithFile(200, __dirname + '/../../fixtures/joyent/images.json');
- }
else if (provider === 'amazon') {
servers.server
.filteringRequestBody(helpers.authFilter)
- .post('/?Action=DescribeImages', { 'Owner.0': 'self' })
+ .post('/',
+ { Action: 'DescribeImages',
+ 'Owner.1': 'self' },
+ { 'User-Agent': client.userAgent })
.replyWithFile(200, __dirname + '/../../fixtures/amazon/images.xml');
}
else if (provider === 'azure') {
@@ -288,17 +292,46 @@ function setupImagesMock(client, provider, servers) {
.replyWithFile(200, __dirname + '/../../fixtures/azure/images.xml');
}
else if (provider === 'digitalocean') {
- var account = require(__dirname + '/../../configs/mock/digitalocean');
servers.server
- .get('/images?' + qs.stringify({
- client_id: account.clientId,
- api_key: account.apiKey
- }))
+ .get('/v2/images?per_page=200&page=1')
.replyWithFile(200, __dirname + '/../../fixtures/digitalocean/images.json');
}
-}
+ else if (provider === 'hp') {
+ servers.authServer
+ .post('/v2.0/tokens', {
+ auth: {
+ apiAccessKeyCredentials: {
+ accessKey: 'MOCK-USERNAME',
+ secretKey: 'MOCK-API-KEY'
+ }
+ }
+ })
+ .replyWithFile(200, __dirname + '/../../fixtures/hp/initialToken.json')
+ .get('/v2.0/tenants')
+ .replyWithFile(200, __dirname + '/../../fixtures/hp/tenantId.json')
+ .post('/v2.0/tokens', {
+ auth: {
+ apiAccessKeyCredentials: {
+ accessKey: 'MOCK-USERNAME',
+ secretKey: 'MOCK-API-KEY'
+ },
+ tenantId: '5ACED3DC3AA740ABAA41711243CC6949'
+ }
+ })
+ .reply(200, helpers.gethpAuthResponse());
-function setupFlavorMock(client, provider, servers) {
+ servers.server
+ .get('/v2/5ACED3DC3AA740ABAA41711243CC6949/images/detail')
+ .replyWithFile(200, __dirname + '/../../fixtures/hp/images.json');
+ }
+ else if (provider === 'oneandone') {
+ servers.server
+ .get('/server_appliances')
+ .replyWithFile(200, __dirname + '/../../fixtures/oneandone/listImages.json');
+ }
+};
+
+setupFlavorMock = function (client, provider, servers) {
if (provider === 'rackspace') {
servers.server
.get('/v2/123456/flavors/detail')
@@ -309,40 +342,35 @@ function setupFlavorMock(client, provider, servers) {
.get('/v2/72e90ecb69c44d0296072ea39e537041/flavors/detail')
.replyWithFile(200, __dirname + '/../../fixtures/openstack/flavors.json');
}
- else if (provider === 'joyent') {
- servers.server
- .get('/' + client.account + '/packages')
- .replyWithFile(200, __dirname + '/../../fixtures/joyent/flavors.json');
- }
else if (provider === 'digitalocean') {
- var account = require(__dirname + '/../../configs/mock/digitalocean');
servers.server
- .get('/sizes?' + qs.stringify({
- client_id: account.clientId,
- api_key: account.apiKey
- }))
+ .get('/v2/sizes')
.replyWithFile(200, __dirname + '/../../fixtures/digitalocean/flavors.json');
}
-}
+ else if (provider === 'hp') {
+ servers.server
+ .get('/v2/5ACED3DC3AA740ABAA41711243CC6949/flavors/detail')
+ .replyWithFile(200, __dirname + '/../../fixtures/hp/flavors.json');
+ }
+ else if (provider === 'oneandone') {
+ servers.server
+ .get('/servers/fixed_instance_sizes')
+ .replyWithFile(200, __dirname + '/../../fixtures/oneandone/listFlavors.json');
+ }
+};
-function setupServerMock(client, provider, servers) {
+setupServerMock = function (client, provider, servers) {
if (provider === 'digitalocean') {
- var account = require(__dirname + '/../../configs/mock/digitalocean');
servers.server
- .get('/droplets/new?' + qs.stringify({
+ .post('/v2/droplets', {
name: 'create-test-ids2',
- region_id: 1,
- size_id: 66,
- image_id: 1601,
- client_id: account.clientId,
- api_key: account.apiKey
- }))
+ region: 'nyc3',
+ size: '512mb',
+ image: 119192817
+ })
.replyWithFile(200, __dirname + '/../../fixtures/digitalocean/create-server2.json')
- .get('/droplets/354526?' + qs.stringify({
- client_id: account.clientId,
- api_key: account.apiKey
- }))
+ .get('/v2/droplets/12345')
.replyWithFile(200, __dirname + '/../../fixtures/digitalocean/active2.json');
}
else if (provider === 'rackspace') {
@@ -366,35 +394,28 @@ function setupServerMock(client, provider, servers) {
.get('/v2/72e90ecb69c44d0296072ea39e537041/servers/5a023de8-957b-4822-ad84-8c7a9ef83c07')
.replyWithFile(200, __dirname + '/../../fixtures/openstack/serverCreated2.json');
}
- else if (provider === 'joyent') {
- servers.server
- .post('/' + client.account + '/machines',
- require(__dirname + '/../../fixtures/joyent/createServer.json'))
- .replyWithFile(201, __dirname + '/../../fixtures/joyent/createdServer.json')
- .get('/' + client.account +
- '/machines/14186c17-0fcd-4bb5-ab42-51b848bda7e9')
- .replyWithFile(200,
- __dirname + '/../../fixtures/joyent/14186c17.json');
- }
else if (provider === 'amazon') {
servers.server
.filteringRequestBody(helpers.authFilter)
- .post('/?Action=RunInstances', {
+ .post('/', {
+ 'Action': 'RunInstances',
'ImageId': 'ami-85db1cec',
'InstanceType': 'm1.small',
'MaxCount': '1',
'MinCount': '1',
'UserData': 'eyJuYW1lIjoiY3JlYXRlLXRlc3QtaWRzMiJ9'
- })
+ }, { 'User-Agent': client.userAgent })
.replyWithFile(200, __dirname + '/../../fixtures/amazon/run-instances.xml')
// .post('/?Action=DescribeInstances')
// .replyWithFile(200, __dirname + '/../../fixtures/amazon/pending-server.xml')
- .post('/?Action=DescribeInstanceAttribute', {
+ .post('/', {
+ 'Action':'DescribeInstanceAttribute',
'Attribute': 'userData',
'InstanceId': 'i-1d48637b'
- })
+ }, { 'User-Agent': client.userAgent })
.replyWithFile(200, __dirname + '/../../fixtures/amazon/running-server-attr2.xml')
- .post('/?Action=DescribeInstances', {
+ .post('/', {
+ 'Action': 'DescribeInstances',
'Filter.1.Name': 'instance-state-code',
'Filter.1.Value.1': '0',
'Filter.1.Value.2': '16',
@@ -402,7 +423,7 @@ function setupServerMock(client, provider, servers) {
'Filter.1.Value.4': '64',
'Filter.1.Value.5': '80',
'InstanceId.1': 'i-1d48637b'
- })
+ }, { 'User-Agent': client.userAgent })
.replyWithFile(200, __dirname + '/../../fixtures/amazon/running-server.xml');
}
else if (provider === 'azure') {
@@ -432,11 +453,30 @@ function setupServerMock(client, provider, servers) {
.get('/azure-account-subscription-id/services/hostedservices/create-test-ids2?embed-detail=true')
.reply(200, serverStatusReply('create-test-ids2', 'ReadyRole'))
.get('/azure-account-subscription-id/services/hostedservices/create-test-ids2?embed-detail=true')
- .reply(200, serverStatusReply('create-test-ids2', 'ReadyRole'))
+ .reply(200, serverStatusReply('create-test-ids2', 'ReadyRole'));
}
-}
+ else if (provider === 'hp') {
+ servers.server
+ .post('/v2/5ACED3DC3AA740ABAA41711243CC6949/servers',
+ {server: {name: 'create-test-ids2', flavorRef: '1', imageRef: '506d077e-66bf-44ff-907a-588c5c79fa66'}})
+ .replyWithFile(202, __dirname + '/../../fixtures/openstack/creatingServer.json')
+ .get('/v2/5ACED3DC3AA740ABAA41711243CC6949/servers/5a023de8-957b-4822-ad84-8c7a9ef83c07')
+ .replyWithFile(200, __dirname + '/../../fixtures/openstack/serverCreated2.json');
+ }
+ else if (provider === 'oneandone') {
+ servers.server
+ .post('/servers', {
+ name: 'create-test-ids2',
+ hardware: {fixed_instance_size_id: '8C626C1A7005D0D1F527143C413D461E'}
+ , appliance_id: 'A0FAA4587A7CB6BBAA1EA877C844977E'
+ })
+ .replyWithFile(202, __dirname + '/../../fixtures/oneandone/getServer.json')
+ .get('/servers/39AA65F5D5B02FA02D58173094EBAF95')
+ .replyWithFile(200, __dirname + '/../../fixtures/oneandone/getServer.json');
+ }
+};
-function setupGetServersMock(client, provider, servers) {
+setupGetServersMock = function (client, provider, servers) {
if (provider === 'rackspace') {
servers.server
.get('/v2/123456/servers/detail')
@@ -447,16 +487,13 @@ function setupGetServersMock(client, provider, servers) {
.get('/v2/72e90ecb69c44d0296072ea39e537041/servers/detail')
.replyWithFile(200, __dirname + '/../../fixtures/openstack/serverList.json');
}
- else if (provider === 'joyent') {
- servers.server
- .get('/' + client.account + '/machines')
- .replyWithFile(200, __dirname + '/../../fixtures/joyent/servers.json');
- }
else if (provider === 'amazon') {
servers.server
.filteringRequestBody(helpers.authFilter)
- .post('/?Action=DescribeInstances', {})
- .replyWithFile(200, __dirname + '/../../fixtures/amazon/running-server.xml')
+ .post('/', {
+ Action: 'DescribeInstances'
+ }, { 'User-Agent': client.userAgent })
+ .replyWithFile(200, __dirname + '/../../fixtures/amazon/running-server.xml');
}
else if (provider === 'azure') {
@@ -465,439 +502,92 @@ function setupGetServersMock(client, provider, servers) {
servers.server
.defaultReplyHeaders({'x-ms-request-id': requestId, 'Content-Type': 'application/xml'})
.get('/azure-account-subscription-id/services/hostedservices')
- .reply(200, "https://management.core.windows.net/azure-account-subscription-id/services/hostedservices/create-test-ids2 create-test-ids2 service created by pkgcloud East US Y3JlYXRlLXRlc3QtaWRzMg== Created 2012-11-11T18:13:55Z 2012-11-11T18:14:37Z https://management.core.windows.net/azure-account-subscription-id/services/hostedservices/create-test-ids2 create-test-ids2 service created by pkgcloud East US Y3JlYXRlLXRlc3QtaWRzMg== Created 2012-11-11T18:13:55Z 2012-11-11T18:14:37Z https://management.core.windows.net/azure-account-subscription-id/services/hostedservices/create-test-ids2 create-test-ids2 service created by pkgcloud East US Y3JlYXRlLXRlc3QtaWRzMg== Created 2012-11-11T18:13:55Z 2012-11-11T18:14:37Z us-west-2 block000000000000000 block000000000000000 pkgcloud-test-container bigfile.raw U4vzbMZVEkBOyxMPHMCu7nRSUw.eNLeqK0oYOPA6BeeiDSu6OTjrsMkkTsOFav3qCpgvIJluGWe_Yi.ypTVxEg-- https://pkgcloud-test-container.s3.amazonaws.com/bigfile.raw pkgcloud-test-container bigfile.raw "b2286fe4aac65809a1b7a053d07fc99f-1" https://pkgcloud-test-container.s3.amazonaws.com/bigfile.raw pkgcloud-test-container bigfile.raw "b2286fe4aac65809a1b7a053d07fc99f-2" "b2286fe4aac65809a1b7a053d07fc99f-1" 1 "b2286fe4aac65809a1b7a053d07fc99f-2" 2 block000000000000000 block000000000000001 block000000000000002 RestartRoleOperation https://management.core.windows.net/azure-account-subscription-id/services/hostedservices/create-test-ids2 create-test-ids2 service created by pkgcloud East US Y3JlYXRlLXRlc3QtaWRzMg== Created 2012-11-11T18:13:55Z 2012-11-11T18:14:37Z https://management.core.windows.net/azure-account-subscription-id/services/hostedservices/create-test-ids2 create-test-ids2 service created by pkgcloud East US Y3JlYXRlLXRlc3QtaWRzMg== Created 2012-11-11T18:13:55Z 2012-11-11T18:14:37Z https://management.core.windows.net/azure-account-subscription-id/services/hostedservices/create-test-ids2 create-test-ids2 service created by pkgcloud East US Y3JlYXRlLXRlc3QtaWRzMg== Created 2012-11-11T18:13:55Z 2012-11-11T18:14:37Z https://management.core.windows.net/azure-account-subscription-id/services/hostedservices/create-test-ids2 create-test-ids2 service created by pkgcloud East US Y3JlYXRlLXRlc3QtaWRzMg== Created 2012-11-11T18:13:55Z 2012-11-11T18:14:37Z