diff --git a/.cfignore b/.cfignore index 148a77cdae..4b6eebf7b1 100644 --- a/.cfignore +++ b/.cfignore @@ -3,3 +3,7 @@ node_modules/ bower_components/ dist/ components/*/backend/vendor +dev-certs/ +out/ +outputs/ +tmp/ diff --git a/.gitignore b/.gitignore index f0d4bc2f65..7a0258a148 100644 --- a/.gitignore +++ b/.gitignore @@ -39,4 +39,9 @@ deploy/hsc-upgrade-volume/ deploy/development.rc deploy/ci/secrets.yml deploy/kubernetes/values.yaml +deploy/cloud-foundry/db-migration/goose outputs/ +deploy/kubernetes/console/charts/ +deploy/stratos-ui-release/.dev_builds +deploy/stratos-ui-release/blobs +deploy/stratos-ui-release/dev_releases/ diff --git a/CHANGELOG.md b/CHANGELOG.md new file mode 100644 index 0000000000..35b7f2850c --- /dev/null +++ b/CHANGELOG.md @@ -0,0 +1,41 @@ +# Change Log + +## 0.9.2 Alpha-3 Release +[Full Changelog](https://github.com/SUSE/stratos-ui/compare/0.9.1...0.9.2) + +Third alpha release containing the following bug fixes and minor improvements: + +- Fix a few service instance bugs [\#1226](https://github.com/SUSE/stratos-ui/pull/1226) +- Fixes issues where trailing slash in CF endpoint causes problems [\#1224](https://github.com/SUSE/stratos-ui/pull/1224) +- Reuse unbound routes [\#1223](https://github.com/SUSE/stratos-ui/pull/1223) +- Optionally enable endpoints-dashboard via env var for use in cf push [\#1221](https://github.com/SUSE/stratos-ui/pull/1221) +- Use stable name for docker registry in CI pipelines [\#1220](https://github.com/SUSE/stratos-ui/pull/1220) +- Improve documentation [\#1219](https://github.com/SUSE/stratos-ui/pull/1219) +- Add upgrade documentation for helm repository based installation [\#1218](https://github.com/SUSE/stratos-ui/pull/1218) +- Update CI piplines for environment [\#1217](https://github.com/SUSE/stratos-ui/pull/1217) +- Fixed docker image name for all-in-one deployment [\#1216](https://github.com/SUSE/stratos-ui/pull/1216) +- Persist app wall selection of cf/org/space in local storage [\#1214](https://github.com/SUSE/stratos-ui/pull/1214) +- Fix 'remove' i10n in create space modal [\#1213](https://github.com/SUSE/stratos-ui/pull/1213) +- Fix terminate instance UI [\#1211](https://github.com/SUSE/stratos-ui/pull/1211) +- Fix issue where previously selected language was not shown on landing page [\#1209](https://github.com/SUSE/stratos-ui/pull/1209) +- Add missing defaults to values.yaml [\#1207](https://github.com/SUSE/stratos-ui/pull/1207) +- Fix localisation in unmap route from apps modal \(unmap route from app is fine\) [\#1206](https://github.com/SUSE/stratos-ui/pull/1206) +- Split deploy app wizard service into smaller chunks [\#1202](https://github.com/SUSE/stratos-ui/pull/1202) +- UX Review: Update landing page \(login + setup screens\) [\#1200](https://github.com/SUSE/stratos-ui/pull/1200) +- Remember grid or list state for the app wall [\#1199](https://github.com/SUSE/stratos-ui/pull/1199) + +## 0.9.1 Alpha-2 Release +[Full Changelog](https://github.com/SUSE/stratos-ui/compare/0.9.0...0.9.1) + +Second alpha release contains the following fixes: + +- Improved documentation when deploying using Helm [\#1201](https://github.com/SUSE/stratos-ui/pull/1201) +- Added the ability to deploy the Console helm chart without using shared volumes, to make it easier to deploy in multi-node clusters with basic storage provisioner such as `hostpath` [\#1204](https://github.com/SUSE/stratos-ui/pull/1204) +- Specified the `cflinuxfs2` stack to the CF manifest.yaml, since default CAASP stack `opensuse42` is unable to deploy the app [\#1205](https://github.com/SUSE/stratos-ui/pull/1205) +- Changed root of the volume mount for Postgres in kubernetes to address permission issue in certain environments [\#1203](https://github.com/SUSE/stratos-ui/pull/1203) + +## 0.9.0 Alpha-1 Release + +First Alpha release of the Stratos UI Console. + +For information on the Alpha feature set and on deploying the Console, please start with the main [README](https://github.com/SUSE/stratos-ui/blob/0.9.0/README.md) documentation. diff --git a/README.md b/README.md index bc844314b1..58ad778d49 100644 --- a/README.md +++ b/README.md @@ -13,7 +13,6 @@ Stratos UI can be deployed in the following environments: 3. Docker, using docker compose. See [guide](deploy/docker-compose) 4. Docker, single container deploying all components. See [guide](deploy/all-in-one) - ## Quick Start To get started quickly, we recommend following the steps to deploy the Stratos UI Console as a Cloud Foundry Application - see [here](deploy/cloud-foundry). diff --git a/build/bk-build-utils.js b/build/bk-build-utils.js index cbbc46b314..ad3cd88a4d 100644 --- a/build/bk-build-utils.js +++ b/build/bk-build-utils.js @@ -51,8 +51,12 @@ function skipGlideInstall() { if (isLocalDevBuild()) { - // Check if we can find the golang folder - indicates glide has run before - var folder = path.join(env.GOPATH, 'src', 'golang.org'); + // Skip glide install if ... + // .. we're in test mode and we've found a common test dependency + // .. we're building the backend and we've found a common dependency + var folder = prepareBuild.getBuildTest() + ? path.join(env.GOPATH, 'src', 'github.com', 'smartystreets', 'goconvey', 'convey') + : path.join(env.GOPATH, 'src', 'github.com', 'labstack', 'echo'); return fs.existsSync(folder); } return false; diff --git a/build/components.js b/build/components.js index 3b18db6038..7ec62eb6f7 100644 --- a/build/components.js +++ b/build/components.js @@ -139,6 +139,8 @@ } }); }); + // Exclude backend/vendor folder from bower_component plugins + globs.bowerFull.push('!' + path.relative(baseFolder,path.join(wildBowerFolder, 'backend/vendor/**'))); return globs; } diff --git a/build/coverage.conf.js b/build/coverage.conf.js index e9e908ddda..1bad891f9e 100644 --- a/build/coverage.conf.js +++ b/build/coverage.conf.js @@ -28,11 +28,11 @@ jasmine.getEnv().addReporter(new function () { var deferred = []; var results = []; -/* - this.specStarted = function (spec) { - console.log('Spec Start : ' + spec.id + ':: ' + spec.fullName); - }; -*/ + /* + this.specStarted = function (spec) { + console.log('Spec Start : ' + spec.id + ':: ' + spec.fullName); + }; + */ this.specDone = function (spec) { //console.log('Spec Finished: ' + spec.id + ':: ' + spec.fullName); if (spec.status !== 'failed' && spec.status !== 'disabled') { diff --git a/build/dev-dependencies.js b/build/dev-dependencies.js new file mode 100644 index 0000000000..5e1350c808 --- /dev/null +++ b/build/dev-dependencies.js @@ -0,0 +1,17 @@ +(function () { + 'use strict'; + + var gutil = require('gulp-util'); + + var deps = {}; + + module.exports = { + get: function (string) { + if (gutil.env.devMode && !deps[string]) { + deps[string] = require(string); + } + return deps[string]; + } + }; + +})(); diff --git a/build/e2e.gulp.js b/build/e2e.gulp.js index b821163a94..1242915ed3 100644 --- a/build/e2e.gulp.js +++ b/build/e2e.gulp.js @@ -18,6 +18,9 @@ var path = require('path'); var runSequence = require('run-sequence'); var ngAnnotate = require('gulp-ng-annotate'); + var e2eConfigFile = './build/coverage.conf.js'; + var glob = require('glob'); + var fs = require('fs'); var components; gulp.task('prepare:e2e', function () { @@ -29,11 +32,31 @@ }); gulp.task('coverage-combine', function (cb) { - var combine = require('istanbul-combine'); var coverageDir = path.resolve(__dirname, '..', 'out', 'coverage-report'); + var toCombine = path.join(coverageDir, '_json/*.json'); + + // Remove 'frontend' from both key and path for all coverage reports. This makes the path invalid however now + // keys align across both e2e tests (components don't show '/frontend') and unit (components show '/frontend' where + // used). The html is fine except for the file paths drop '/frontend' in places. This behaviour matches the + // standalone output of the e2e coverage reports. + glob(toCombine, null, function (err, files) { + if (err) { + cb(err); + return; + } + + for (var i = 0; i < files.length; i++) { + var file = files[i]; + var content = fs.readFileSync(file, 'utf8'); + content = content.replace(/(components\/[^\/]+)\/frontend(\/src\/)/g, '$1$2'); + fs.writeFileSync(file, content); + } + }); + + var combine = require('istanbul-combine'); var opts = { dir: path.join(coverageDir, 'combined'), - pattern: path.join(coverageDir, '_json/*.json'), + pattern: toCombine, print: 'summary', reporters: { html: {} @@ -42,6 +65,13 @@ combine(opts, cb); }); + gulp.task('e2e:nocov', function () { + e2eConfigFile = './build/protractor.conf.js'; + runSequence( + 'e2e:tests' + ); + }); + gulp.task('e2e:tests', function (cb) { // Use the protractor in our node_modules folder var cmd = './node_modules/protractor/bin/protractor'; @@ -50,7 +80,7 @@ options.env.NODE_ENV = 'development'; options.env.env = 'development'; - var args = ['./build/coverage.conf.js']; + var args = [e2eConfigFile]; if (process.env.STRATOS_E2E_SUITE) { args.push('--suite'); args.push(process.env.STRATOS_E2E_SUITE); diff --git a/build/gulp.config.js b/build/gulp.config.js index a9250258ab..0e12d6e45b 100644 --- a/build/gulp.config.js +++ b/build/gulp.config.js @@ -49,7 +49,7 @@ }, 'bootstrap-sass': { main: [ -// 'assets/stylesheets/_bootstrap.scss' + // 'assets/stylesheets/_bootstrap.scss' ] } } diff --git a/build/i18n.gulp.js b/build/i18n.gulp.js index 28ad7afe54..3f54993be6 100644 --- a/build/i18n.gulp.js +++ b/build/i18n.gulp.js @@ -65,7 +65,7 @@ contents: new Buffer(res) }); - // console.log(res); + // console.log(res); that.push(file); }); @@ -98,7 +98,7 @@ dest[k] = v; } } else { - // Merge again + // Merge again merge(dest[k], v); } } diff --git a/build/main.gulp.js b/build/main.gulp.js index 60577aca92..dcd0ac1df4 100644 --- a/build/main.gulp.js +++ b/build/main.gulp.js @@ -30,6 +30,7 @@ var i18n = require('./i18n.gulp'); var cleanCSS = require('gulp-clean-css'); var config = require('./gulp.config'); + var devDeps = require('./dev-dependencies'); // Pull in the gulp tasks for e2e tests require('./e2e.gulp'); @@ -132,6 +133,7 @@ // Compile SCSS to CSS gulp.task('css:generate', function () { + var sourcemaps = devDeps.get('gulp-sourcemaps'); var scssFile = './bower_components/index.scss'; utils.generateScssFile('./bower_components/index.scss', components.findMainFile('**/*.scss'), components.getBowerFolder()); return gulp @@ -142,17 +144,23 @@ this.emit('end'); } }))) - .pipe(sass()) - .pipe(autoprefixer({browsers: ['last 2 versions'], cascade: false})) + .pipe(gutil.env.devMode ? sourcemaps.init() : gutil.noop()) + .pipe(sass().on('error', sass.logError)) + .pipe(gutil.env.devMode ? sourcemaps.write({ includeContent: false}) : gutil.noop()) + .pipe(autoprefixer({ browsers: ['last 2 version'], cascade: false })) + .pipe(gutil.env.devMode ? sourcemaps.write() : gutil.noop()) .pipe(gulp.dest(paths.dist)); }); gulp.task('css', ['css:generate'], function () { + var sourcemaps = devDeps.get('gulp-sourcemaps'); var cssFiles = bowerFiles.css; cssFiles.push(path.join(paths.dist, 'index.css')); return gulp.src(cssFiles) .pipe(concat('index.css')) - .pipe(cleanCSS({})) + .pipe(gutil.env.devMode ? sourcemaps.init({loadMaps: true}) : gutil.noop()) + .pipe(cleanCSS()) + .pipe(gutil.env.devMode ? sourcemaps.write() : gutil.noop()) .pipe(gulp.dest(paths.dist)); }); diff --git a/build/protractor.conf.js b/build/protractor.conf.js index 097454cf5c..47389990b1 100644 --- a/build/protractor.conf.js +++ b/build/protractor.conf.js @@ -51,10 +51,13 @@ } }, + // Default is 11000 + allScriptsTimeout: 20000, + params: { protocol: 'https://', - host: 'localhost', - port: '3100', + host: secrets.console.host || 'localhost', + port: secrets.console.port || '3100', credentials: { admin: secrets.console.admin, user: secrets.console.user @@ -133,8 +136,19 @@ browser.addMockModule('disableNgAnimate', disableNgAnimate); + var setLocale = function () { + angular.module('setLocale', []).config(['$injector', function ($injector) { + // Override whatever language the running browser is in, this removes unexpected http request to + // locale_.json + var languageServiceProvider = $injector.get('languageServiceProvider'); + languageServiceProvider.setBrowserLocale('en_US'); + }]); + }; + + browser.addMockModule('setLocale', setLocale); + // Optional. Really nice to see the progress of the tests while executing - var SpecReporter = require('jasmine-spec-reporter'); + var SpecReporter = require('jasmine-spec-reporter').SpecReporter; jasmine.getEnv().addReporter(new SpecReporter({ displayPendingSpec: false, displayPendingSummary: false, @@ -151,6 +165,7 @@ }, jasmineNodeOpts: { + defaultTimeoutInterval: 45000, // disable default jasmine report (using jasmine-spec-reporter) print: function () { } diff --git a/build/tools/get-glide.sh b/build/tools/get-glide.sh new file mode 100755 index 0000000000..cb21e4575b --- /dev/null +++ b/build/tools/get-glide.sh @@ -0,0 +1,121 @@ +#!/bin/sh + +# The install script is licensed under the MIT license Glide itself is under. +# See https://github.com/Masterminds/glide/blob/master/LICENSE for more details. + +# To run this script execute: +# `curl https://glide.sh/get | sh` + +PROJECT_NAME="glide" + +# LGOBIN represents the local bin location. This can be either the GOBIN, if set, +# or the GOPATH/bin. + +LGOBIN="" + +verifyGoInstallation() { + GO=$(which go) + if [ "$?" = "1" ]; then + echo "$PROJECT_NAME needs go. Please intall it first." + exit 1 + fi + if [ -z "$GOPATH" ]; then + echo "$PROJECT_NAME needs environment variable "'$GOPATH'". Set it before continue." + exit 1 + fi + if [ -n "$GOBIN" ]; then + if [ ! -d "$GOBIN" ]; then + echo "$GOBIN "'($GOBIN)'" folder not found. Please create it before continue." + exit 1 + fi + LGOBIN="$GOBIN" + else + if [ ! -d "$GOPATH/bin" ]; then + echo "$GOPATH/bin "'($GOPATH/bin)'" folder not found. Please create it before continue." + exit 1 + fi + LGOBIN="$GOPATH/bin" + fi + +} + +initArch() { + ARCH=$(uname -m) + case $ARCH in + armv5*) ARCH="armv5";; + armv6*) ARCH="armv6";; + armv7*) ARCH="armv7";; + aarch64) ARCH="arm64";; + x86) ARCH="386";; + x86_64) ARCH="amd64";; + i686) ARCH="386";; + i386) ARCH="386";; + esac +} + +initOS() { + OS=$(echo `uname`|tr '[:upper:]' '[:lower:]') + + case "$OS" in + # Minimalist GNU for Windows + mingw*) OS='windows';; + esac +} + +downloadFile() { + TAG=$(wget -q -O - https://glide.sh/version) + LATEST_RELEASE_URL="https://api.github.com/repos/Masterminds/$PROJECT_NAME/releases/tags/$TAG" + LATEST_RELEASE_JSON=$(wget -q -O - "$LATEST_RELEASE_URL") + GLIDE_DIST="glide-$TAG-$OS-$ARCH.tar.gz" + # || true forces this command to not catch error if grep does not find anything + DOWNLOAD_URL=$(echo "$LATEST_RELEASE_JSON" | grep 'browser_' | cut -d\" -f4 | grep "$GLIDE_DIST") || true + if [ -z "$DOWNLOAD_URL" ]; then + echo "Sorry, we dont have a dist for your system: $OS $ARCH" + echo "You can ask one here: https://github.com/Masterminds/$PROJECT_NAME/issues" + exit 1 + else + GLIDE_TMP_FILE="/tmp/$GLIDE_DIST" + echo "Downloading $DOWNLOAD_URL" + wget -q -O "$GLIDE_TMP_FILE" "$DOWNLOAD_URL" + fi +} + +installFile() { + GLIDE_TMP="/tmp/$PROJECT_NAME" + mkdir -p "$GLIDE_TMP" + tar xf "$GLIDE_TMP_FILE" -C "$GLIDE_TMP" + GLIDE_TMP_BIN="$GLIDE_TMP/$OS-$ARCH/$PROJECT_NAME" + cp "$GLIDE_TMP_BIN" "$LGOBIN" +} + +bye() { + result=$? + if [ "$result" != "0" ]; then + echo "Fail to install $PROJECT_NAME" + fi + exit $result +} + +testVersion() { + set +e + GLIDE="$(which $PROJECT_NAME)" + if [ "$?" = "1" ]; then + echo "$PROJECT_NAME not found. Did you add "'$LGOBIN'" to your "'$PATH?' + exit 1 + fi + set -e + GLIDE_VERSION=$($PROJECT_NAME -v) + echo "$GLIDE_VERSION installed successfully" +} + +# Execution + +#Stop execution on any error +trap "bye" EXIT +verifyGoInstallation +set -e +initArch +initOS +downloadFile +installFile +testVersion diff --git a/components/about-app/src/plugin.config.js b/components/about-app/src/plugin.config.js index d5649d071b..c4468576c1 100644 --- a/components/about-app/src/plugin.config.js +++ b/components/about-app/src/plugin.config.js @@ -4,10 +4,10 @@ // register this plugin application to the platform if (env && env.registerApplication) { env.registerApplication( - 'aboutApp', // plugin application identity - 'about-app', // plugin application's root angular module name - 'plugins/about-app/', // plugin application's base path - 'about-app' // plugin applications's start state + 'aboutApp', // plugin application identity + 'about-app', // plugin application's root angular module name + 'plugins/about-app/', // plugin application's base path + 'about-app' // plugin applications's start state ); } diff --git a/components/app-core/backend/auth.go b/components/app-core/backend/auth.go index c72800b10a..48dc86ad0d 100644 --- a/components/app-core/backend/auth.go +++ b/components/app-core/backend/auth.go @@ -40,7 +40,7 @@ const UAAAdminIdentifier = "stratos.admin" const CFAdminIdentifier = "cloud_controller.admin" // SessionExpiresOnHeader Custom header for communicating the session expiry time to clients -const SessionExpiresOnHeader = "X-Cnap-Session-Expires-On" +const SessionExpiresOnHeader = "X-Cap-Session-Expires-On" // EmptyCookieMatcher - Used to detect and remove empty Cookies sent by certain browsers var EmptyCookieMatcher *regexp.Regexp = regexp.MustCompile(portalSessionName + "=(?:;[ ]*|$)") @@ -184,7 +184,6 @@ func (p *portalProxy) DoLoginToCNSI(c echo.Context, cnsiGUID string) (*interface } func (p *portalProxy) verifyLoginToCNSI(c echo.Context) error { - log.Debug("verifyLoginToCNSI") cnsiGUID := c.FormValue("cnsi_guid") @@ -327,6 +326,7 @@ func (p *portalProxy) logout(c echo.Context) error { func (p *portalProxy) getUAATokenWithCreds(skipSSLValidation bool, username, password, client, clientSecret, authEndpoint string) (*UAAResponse, error) { log.Debug("getUAATokenWithCreds") + body := url.Values{} body.Set("grant_type", "password") body.Set("username", username) @@ -338,6 +338,7 @@ func (p *portalProxy) getUAATokenWithCreds(skipSSLValidation bool, username, pas func (p *portalProxy) getUAATokenWithRefreshToken(skipSSLValidation bool, refreshToken, client, clientSecret, authEndpoint string) (*UAAResponse, error) { log.Debug("getUAATokenWithRefreshToken") + body := url.Values{} body.Set("grant_type", "refresh_token") body.Set("refresh_token", refreshToken) @@ -386,6 +387,7 @@ func (p *portalProxy) getUAAToken(body url.Values, skipSSLValidation bool, clien func (p *portalProxy) saveUAAToken(u userTokenInfo, authTok string, refreshTok string) (interfaces.TokenRecord, error) { log.Debug("saveUAAToken") + key := u.UserGUID tokenRecord := interfaces.TokenRecord{ AuthToken: authTok, @@ -403,6 +405,7 @@ func (p *portalProxy) saveUAAToken(u userTokenInfo, authTok string, refreshTok s func (p *portalProxy) saveCNSIToken(cnsiID string, u userTokenInfo, authTok string, refreshTok string) (interfaces.TokenRecord, error) { log.Debug("saveCNSIToken") + tokenRecord := interfaces.TokenRecord{ AuthToken: authTok, RefreshToken: refreshTok, @@ -420,6 +423,7 @@ func (p *portalProxy) saveCNSIToken(cnsiID string, u userTokenInfo, authTok stri func (p *portalProxy) deleteCNSIToken(cnsiID string, userGUID string) error { log.Debug("deleteCNSIToken") + err := p.unsetCNSITokenRecord(cnsiID, userGUID) if err != nil { log.Errorf("%v", err) @@ -431,6 +435,7 @@ func (p *portalProxy) deleteCNSIToken(cnsiID string, userGUID string) error { func (p *portalProxy) GetUAATokenRecord(userGUID string) (interfaces.TokenRecord, error) { log.Debug("GetUAATokenRecord") + tokenRepo, err := tokens.NewPgsqlTokenRepository(p.DatabaseConnectionPool) if err != nil { log.Errorf("Database error getting repo for UAA token: %v", err) @@ -448,6 +453,7 @@ func (p *portalProxy) GetUAATokenRecord(userGUID string) (interfaces.TokenRecord func (p *portalProxy) setUAATokenRecord(key string, t interfaces.TokenRecord) error { log.Debug("setUAATokenRecord") + tokenRepo, err := tokens.NewPgsqlTokenRepository(p.DatabaseConnectionPool) if err != nil { return fmt.Errorf("Database error getting repo for UAA token: %v", err) @@ -463,6 +469,7 @@ func (p *portalProxy) setUAATokenRecord(key string, t interfaces.TokenRecord) er func (p *portalProxy) verifySession(c echo.Context) error { log.Debug("verifySession") + sessionExpireTime, err := p.GetSessionInt64Value(c, "exp") if err != nil { msg := "Could not find session date" @@ -542,6 +549,7 @@ func (p *portalProxy) verifySession(c echo.Context) error { func (p *portalProxy) getUAAUser(userGUID string) (*interfaces.ConnectedUser, error) { log.Debug("getUAAUser") + // get the uaa token record uaaTokenRecord, err := p.GetUAATokenRecord(userGUID) if err != nil { @@ -573,6 +581,7 @@ func (p *portalProxy) getUAAUser(userGUID string) (*interfaces.ConnectedUser, er func (p *portalProxy) GetCNSIUser(cnsiGUID string, userGUID string) (*interfaces.ConnectedUser, bool) { log.Debug("GetCNSIUser") + // get the uaa token record cfTokenRecord, ok := p.GetCNSITokenRecord(cnsiGUID, userGUID) if !ok { diff --git a/components/app-core/backend/auth_test.go b/components/app-core/backend/auth_test.go index 324774604e..6c68a6e152 100644 --- a/components/app-core/backend/auth_test.go +++ b/components/app-core/backend/auth_test.go @@ -49,7 +49,7 @@ func TestLoginToUAA(t *testing.T) { WillReturnRows(expectNoRows()) mock.ExpectExec(insertIntoTokens). - // WithArgs(mockUserGUID, "uaa", mockTokenRecord.AuthToken, mockTokenRecord.RefreshToken, newExpiry). + // WithArgs(mockUserGUID, "uaa", mockTokenRecord.AuthToken, mockTokenRecord.RefreshToken, newExpiry). WillReturnResult(sqlmock.NewResult(1, 1)) Convey("Should not fail to login", func() { @@ -88,7 +88,6 @@ func TestLoginToUAAWithBadCreds(t *testing.T) { pp.Config.ConsoleConfig.UAAEndpoint = uaaUrl pp.Config.ConsoleConfig.SkipSSLValidation = true - err := pp.loginToUAA(ctx) Convey("Login to UAA should fail", func() { So(err, ShouldNotBeNil) @@ -129,9 +128,8 @@ func TestLoginToUAAButCantSaveToken(t *testing.T) { pp.Config.ConsoleConfig.UAAEndpoint = uaaUrl pp.Config.ConsoleConfig.SkipSSLValidation = true - mock.ExpectQuery(selectAnyFromTokens). - // WithArgs(mockUserGUID). + // WithArgs(mockUserGUID). WillReturnRows(sqlmock.NewRows([]string{"COUNT(*)"}).AddRow("0")) // --- set up the database expectation for pp.saveUAAToken @@ -207,7 +205,7 @@ func TestLoginToCNSI(t *testing.T) { // Setup expectation that the CNSI token will get saved //encryptedUAAToken, _ := tokens.EncryptToken(pp.Config.EncryptionKeyInBytes, mockUAAToken) mock.ExpectExec(insertIntoTokens). - //WithArgs(mockCNSIGUID, mockUserGUID, "cnsi", encryptedUAAToken, encryptedUAAToken, sessionValues["exp"]). + //WithArgs(mockCNSIGUID, mockUserGUID, "cnsi", encryptedUAAToken, encryptedUAAToken, sessionValues["exp"]). WillReturnResult(sqlmock.NewResult(1, 1)) // do the call @@ -660,7 +658,7 @@ func TestVerifySessionExpired(t *testing.T) { mock.ExpectQuery(selectAnyFromTokens). WillReturnRows(sqlmock.NewRows([]string{"auth_token", "refresh_token", "token_expiry"}). - AddRow(mockUAAToken, mockUAAToken, sessionValues["exp"])) + AddRow(mockUAAToken, mockUAAToken, sessionValues["exp"])) err := pp.verifySession(ctx) Convey("Should fail to verify session", func() { diff --git a/components/app-core/backend/cnsi.go b/components/app-core/backend/cnsi.go index f87249679f..6a7a7b848d 100644 --- a/components/app-core/backend/cnsi.go +++ b/components/app-core/backend/cnsi.go @@ -262,19 +262,31 @@ func (p *portalProxy) GetCNSIRecord(guid string) (interfaces.CNSIRecord, error) return rec, nil } -func (p *portalProxy) cnsiRecordExists(endpoint string) bool { - log.Debug("cnsiRecordExists") +func (p *portalProxy) GetCNSIRecordByEndpoint(endpoint string) (interfaces.CNSIRecord, error) { + log.Debug("GetCNSIRecordByEndpoint") + var rec interfaces.CNSIRecord + cnsiRepo, err := cnsis.NewPostgresCNSIRepository(p.DatabaseConnectionPool) if err != nil { - return false + return rec, err } - _, err = cnsiRepo.FindByAPIEndpoint(endpoint) + rec, err = cnsiRepo.FindByAPIEndpoint(endpoint) if err != nil { - return false + return rec, err } - return true + // Ensure that trailing slash is removed from the API Endpoint + rec.APIEndpoint.Path = strings.TrimRight(rec.APIEndpoint.Path, "/") + + return rec, nil +} + +func (p *portalProxy) cnsiRecordExists(endpoint string) bool { + log.Debug("cnsiRecordExists") + + _, err := p.GetCNSIRecordByEndpoint(endpoint); + return err == nil } func (p *portalProxy) setCNSIRecord(guid string, c interfaces.CNSIRecord) error { diff --git a/components/app-core/backend/datastore/database_cf_config.go b/components/app-core/backend/datastore/database_cf_config.go new file mode 100644 index 0000000000..0d1226d5d4 --- /dev/null +++ b/components/app-core/backend/datastore/database_cf_config.go @@ -0,0 +1,68 @@ +package datastore + +import ( + "encoding/json" + "github.com/SUSE/stratos-ui/components/app-core/backend/config" + log "github.com/Sirupsen/logrus" + "strconv" + "strings" +) + +const ( + SERVICES_ENV = "VCAP_SERVICES" +) + +type VCAPService struct { + Credentials VCAPCredential `json:"credentials"` + Tags []string `json:"tags"` +} + +type VCAPCredential struct { + Username string `json:"username"` + Password string `json:"password"` + Dbname string `json:"dbname"` + Hostname string `json:"hostname"` + Port string `json:"port"` + Uri string `json:"uri"` +} + +// Discover cf db services via their 'uri' env var and apply settings to the DatabaseConfig objects +func ParseCFEnvs(db *DatabaseConfig) bool { + if config.IsSet(SERVICES_ENV) == false { + return false + } + + // Extract struts from VCAP_SERVICES env + vcapServicesStr := config.GetString(SERVICES_ENV) + var vcapServices map[string][]VCAPService + err := json.Unmarshal([]byte(vcapServicesStr), &vcapServices) + if err != nil { + log.Warnf("Unable to convert %s env var into JSON", SERVICES_ENV) + return false + } + + for _, services := range vcapServices { + if len(services) == 0 { + continue + } + service := services[0] + + for _, tag := range service.Tags { + if strings.HasPrefix(tag, "stratos_postgresql") { + dbCredentials := service.Credentials + // At the moment we only handle Postgres + db.DatabaseProvider = "pgsql" + db.Username = dbCredentials.Username + db.Password = dbCredentials.Password + db.Database = dbCredentials.Dbname + db.Host = dbCredentials.Hostname + db.Port, err = strconv.Atoi(dbCredentials.Port) + db.SSLMode = "disable" + log.Info("Discovered Cloud Foundry postgres service and applied config") + return true + } + } + } + + return false +} diff --git a/components/app-core/backend/datastore/datastore.go b/components/app-core/backend/datastore/datastore.go index 2f0b85db30..24921be480 100644 --- a/components/app-core/backend/datastore/datastore.go +++ b/components/app-core/backend/datastore/datastore.go @@ -11,24 +11,35 @@ import ( "github.com/SUSE/stratos-ui/components/app-core/backend/config" log "github.com/Sirupsen/logrus" + // Mysql driver + _ "github.com/go-sql-driver/mysql" "github.com/kat-co/vala" - // SQL Lite 3 + // Sqlite driver _ "github.com/mattn/go-sqlite3" ) +const ( + // SQLite DB Provider + SQLITE string = "sqlite" + // PGSQL DB Provider + PGSQL = "pgsql" + // MYSQL DB Provider + MYSQL = "mysql" +) + // DatabaseConfig represents the connection configuration parameters type DatabaseConfig struct { DatabaseProvider string `configName:"DATABASE_PROVIDER"` - Username string `configName:"PGSQL_USER"` - Password string `configName:"PGSQL_PASSWORD"` - Database string `configName:"PGSQL_DATABASE"` - Host string `configName:"PGSQL_HOST"` - Port int `configName:"PGSQL_PORT"` - SSLMode string `configName:"PGSQL_SSL_MODE"` - ConnectionTimeoutInSecs int `configName:"PGSQL_CONNECT_TIMEOUT_IN_SECS"` - SSLCertificate string `configName:"PGSQL_CERT"` - SSLKey string `configName:"PGSQL_CERT_KEY"` - SSLRootCertificate string `configName:"PGSQL_ROOT_CERT"` + Username string `configName:"DB_USER"` + Password string `configName:"DB_PASSWORD"` + Database string `configName:"DB_DATABASE_NAME"` + Host string `configName:"DB_HOST"` + Port int `configName:"DB_PORT"` + SSLMode string `configName:"DB_SSL_MODE"` + ConnectionTimeoutInSecs int `configName:"DB_CONNECT_TIMEOUT_IN_SECS"` + SSLCertificate string `configName:"DB_CERT"` + SSLKey string `configName:"DB_CERT_KEY"` + SSLRootCertificate string `configName:"DB_ROOT_CERT"` } // SSLValidationMode is the PostgreSQL driver SSL validation modes @@ -48,7 +59,7 @@ const ( // SQLiteDatabaseFile - SQLite database file SQLiteDatabaseFile = "./console-database.db" // Default database provider when not specified - DefaultDatabaseProvider = "pgsql" + DefaultDatabaseProvider = MYSQL ) const ( @@ -73,7 +84,7 @@ func NewDatabaseConnectionParametersFromConfig(dc DatabaseConfig) (DatabaseConfi } // No configuration needed for SQLite - if dc.DatabaseProvider == "sqlite" { + if dc.DatabaseProvider == SQLITE { return dc, nil } @@ -84,12 +95,15 @@ func NewDatabaseConnectionParametersFromConfig(dc DatabaseConfig) (DatabaseConfi return dc, err } - if dc.SSLMode == string(SSLDisabled) || dc.SSLMode == string(SSLRequired) || - dc.SSLMode == string(SSLVerifyCA) || dc.SSLMode == string(SSLVerifyFull) { + if dc.DatabaseProvider == PGSQL { + if dc.SSLMode == string(SSLDisabled) || dc.SSLMode == string(SSLRequired) || + dc.SSLMode == string(SSLVerifyCA) || dc.SSLMode == string(SSLVerifyFull) { + return dc, nil + } + } else if dc.DatabaseProvider == MYSQL { return dc, nil } - - return dc, fmt.Errorf("Invalid SSL mode: %v", dc.SSLMode) + return dc, fmt.Errorf("Invalid provider %v", dc) } func validateRequiredDatabaseParams(username, password, database, host string, port int) (err error) { @@ -114,10 +128,15 @@ func validateRequiredDatabaseParams(username, password, database, host string, p func GetConnection(dc DatabaseConfig) (*sql.DB, error) { log.Debug("GetConnection") - if dc.DatabaseProvider == "pgsql" { + if dc.DatabaseProvider == PGSQL { return sql.Open("postgres", buildConnectionString(dc)) } + if dc.DatabaseProvider == MYSQL { + return sql.Open("mysql", buildConnectionStringForMysql(dc)) + + } + // SQL Lite return GetSQLLiteConnection() } @@ -210,6 +229,28 @@ func buildConnectionString(dc DatabaseConfig) string { return connStr } +func buildConnectionStringForMysql(dc DatabaseConfig) string { + log.Println("buildConnectionString") + escapeStr := func(in string) string { + return strings.Replace(in, `'`, `\'`, -1) + } + + connStr := fmt.Sprintf("%s:%s@tcp(%s:%d)/%s?parseTime=true", + escapeStr(dc.Username), + escapeStr(dc.Password), + dc.Host, + dc.Port, + escapeStr(dc.Database)) + + log.Printf("DB Connection string: %s:*********@tcp(%s:%d)/%s?parseTime=true", + escapeStr(dc.Username), + dc.Host, + dc.Port, + escapeStr(dc.Database)) + + return connStr +} + // Ping - ping the database to ensure the connection/pool works. func Ping(db *sql.DB) error { log.Debug("Ping database") @@ -226,7 +267,7 @@ func Ping(db *sql.DB) error { // SQLite uses ? func ModifySQLStatement(sql string, databaseProvider string) string { - if databaseProvider == "sqlite" { + if databaseProvider == SQLITE || databaseProvider == MYSQL { sqlParamReplace := regexp.MustCompile("\\$[0-9]") return sqlParamReplace.ReplaceAllString(sql, "?") } diff --git a/components/app-core/backend/development.rc.sample b/components/app-core/backend/development.rc.sample index 57769df5c7..38653b4ea6 100644 --- a/components/app-core/backend/development.rc.sample +++ b/components/app-core/backend/development.rc.sample @@ -28,13 +28,13 @@ export GITHUB_OAUTH_STATE=thisshouldberando # All the things # ################### -export PGSQL_USER='console' -export PGSQL_PASSWORD='console' -export PGSQL_DATABASE='console-db' -export PGSQL_HOST='localhost' -export PGSQL_PORT=5432 -export PGSQL_CONNECT_TIMEOUT_IN_SECS=100 -export PGSQL_SSL_MODE='disable' +export DB_USER='console' +export DB_PASSWORD='console' +export DB_DATABASE_NAME='console-db' +export DB_HOST='localhost' +export DB_PORT=5432 +export DB_CONNECT_TIMEOUT_IN_SECS=100 +export DB_SSL_MODE='disable' export HTTP_CLIENT_TIMEOUT_IN_SECS=100 export SKIP_SSL_VALIDATION='true' diff --git a/components/app-core/backend/glide.lock b/components/app-core/backend/glide.lock index c6d4a2c47d..77988257a9 100644 --- a/components/app-core/backend/glide.lock +++ b/components/app-core/backend/glide.lock @@ -1,13 +1,12 @@ -hash: 094a647361758abee514f89cf6e36736a4f8375dbf24800116141c5360555ae4 -updated: 2017-05-16T11:17:15.523496697+01:00 +hash: c790bcfd2741c2e94175d40e1a44d7c595d4d57fd34753a61b065fecdfcc5f76 +updated: 2017-08-21T09:55:31.917609969+01:00 imports: - name: github.com/antonlindstrom/pgstore version: 4f1dbba445e540bf071eb9572262edb8fe4a593a - name: github.com/cloudfoundry/noaa - version: 086fd462f8fcdde1a234e028e3e157237bdb3383 + version: a1d4a94e2be6711111893c59538976d07ef7ea98 subpackages: - consumer - - consumer/internal - errors - name: github.com/cloudfoundry/sonde-go version: 78019103037ae46207993c8816e970d85bf1a9e4 @@ -15,6 +14,8 @@ imports: - events - name: github.com/dgrijalva/jwt-go version: 6c8dedd55f8a2e41f605de6d5d66e51ed1f299fc +- name: github.com/go-sql-driver/mysql + version: a0583e0143b1624142adab07e0e97fe106d99561 - name: github.com/gorilla/context version: 1ea25387ff6f684839d82767c1733ff4d4d15d0a - name: github.com/gorilla/securecookie @@ -23,6 +24,8 @@ imports: version: ca9ada44574153444b00d3fd9c8559e4cc95f896 - name: github.com/gorilla/websocket version: 3ab3a8b8831546bd18fd182c20687ca853b2bb13 +- name: github.com/irfanhabib/mysqlstore + version: 304308519d1355852f92cd88b31153c8a9a4e4db - name: github.com/kat-co/vala version: 43c3f19f86f47a7a83ce5656a1dd8fee3da5d12b - name: github.com/labstack/echo @@ -65,9 +68,9 @@ imports: - name: golang.org/x/net version: 59a0b19b5533c7977ddeb86b017bf507ed407b12 subpackages: - - context - - html - - websocket + - context + - html + - websocket - name: golang.org/x/sys version: 0b25a408a50076fbbcae6b7ac0ea5fbb0b085e79 subpackages: @@ -92,4 +95,3 @@ testImports: - convey/reporting - name: gopkg.in/DATA-DOG/go-sqlmock.v1 version: 9958e5c69de03e97ec215b23f6fcae1f600c3fb6 - diff --git a/components/app-core/backend/glide.yaml b/components/app-core/backend/glide.yaml index 70eddd096e..0d603178e0 100644 --- a/components/app-core/backend/glide.yaml +++ b/components/app-core/backend/glide.yaml @@ -17,7 +17,6 @@ import: version: ~1.1.0 - package: github.com/gorilla/websocket version: ~1.1.0 -# No release was cut - package: github.com/kat-co/vala version: 43c3f19f86f47a7a83ce5656a1dd8fee3da5d12b - package: github.com/labstack/echo @@ -32,6 +31,9 @@ import: version: ^1.1.0 - package: github.com/gorilla/securecookie version: ~1.1.0 +- package: github.com/go-sql-driver/mysql + version: ^1.3.0 +- package: github.com/irfanhabib/mysqlstore testImport: - package: github.com/smartystreets/goconvey version: 1.6.2 diff --git a/components/app-core/backend/main.go b/components/app-core/backend/main.go index 873108f40a..dd5d0a9a79 100644 --- a/components/app-core/backend/main.go +++ b/components/app-core/backend/main.go @@ -18,6 +18,7 @@ import ( log "github.com/Sirupsen/logrus" "github.com/antonlindstrom/pgstore" + "github.com/irfanhabib/mysqlstore" "github.com/labstack/echo" "github.com/labstack/echo/engine/standard" "github.com/labstack/echo/middleware" @@ -259,7 +260,7 @@ func initConnPool(dc datastore.DatabaseConfig) (*sql.DB, error) { // If our timeout boundary has been exceeded, bail out if timeout.Sub(time.Now()) < 0 { - return nil, fmt.Errorf("Timeout boundary of %d minutes has been exceeded. Exiting.", TimeoutBoundary) + return nil, fmt.Errorf("timeout boundary of %d minutes has been exceeded. Exiting", TimeoutBoundary) } // Circle back and try again @@ -273,8 +274,10 @@ func initConnPool(dc datastore.DatabaseConfig) (*sql.DB, error) { func initSessionStore(db *sql.DB, databaseProvider string, pc interfaces.PortalConfig, sessionExpiry int) (HttpSessionStore, error) { log.Debug("initSessionStore") + sessionsTable := "sessions" + // Store depends on the DB Type - if databaseProvider == "pgsql" { + if databaseProvider == datastore.PGSQL { log.Info("Creating Postgres session store") sessionStore, err := pgstore.NewPGStoreFromPool(db, []byte(pc.SessionStoreSecret)) // Setup cookie-store options @@ -283,9 +286,19 @@ func initSessionStore(db *sql.DB, databaseProvider string, pc interfaces.PortalC sessionStore.Options.Secure = true return sessionStore, err } + // Store depends on the DB Type + if databaseProvider == datastore.MYSQL { + log.Info("Creating MySQL session store") + sessionStore, err := mysqlstore.NewMySQLStoreFromConnection(db, sessionsTable, "/", 3600, []byte(pc.SessionStoreSecret)) + // Setup cookie-store options + sessionStore.Options.MaxAge = sessionExpiry + sessionStore.Options.HttpOnly = true + sessionStore.Options.Secure = true + return sessionStore, err + } log.Info("Creating SQLite session store") - sessionStore, err := sqlitestore.NewSqliteStoreFromConnection(db, "sessions", "/", 3600, []byte(pc.SessionStoreSecret)) + sessionStore, err := sqlitestore.NewSqliteStoreFromConnection(db, sessionsTable, "/", 3600, []byte(pc.SessionStoreSecret)) // Setup cookie-store options sessionStore.Options.MaxAge = sessionExpiry sessionStore.Options.HttpOnly = true @@ -312,7 +325,10 @@ func loadPortalConfig(pc interfaces.PortalConfig) (interfaces.PortalConfig, erro func loadDatabaseConfig(dc datastore.DatabaseConfig) (datastore.DatabaseConfig, error) { log.Debug("loadDatabaseConfig") - if err := config.Load(&dc); err != nil { + + if datastore.ParseCFEnvs(&dc) == true { + log.Info("Using Cloud Foundry DB service") + } else if err := config.Load(&dc); err != nil { return dc, fmt.Errorf("Unable to load database configuration. %v", err) } @@ -321,18 +337,11 @@ func loadDatabaseConfig(dc datastore.DatabaseConfig) (datastore.DatabaseConfig, return dc, fmt.Errorf("Unable to load database configuration. %v", err) } - // Determine database provider - if len(dc.Host) > 0 { - dc.DatabaseProvider = "pgsql" - } else { - dc.DatabaseProvider = "sqlite" - } - return dc, nil } -func createTempCertFiles(pc interfaces.PortalConfig) (string, string, error) { - log.Debug("createTempCertFiles") +func detectTLSCert(pc interfaces.PortalConfig) (string, string, error) { + log.Debug("detectTLSCert") certFilename := "pproxy.crt" certKeyFilename := "pproxy.key" @@ -346,6 +355,17 @@ func createTempCertFiles(pc interfaces.PortalConfig) (string, string, error) { return devCertsDir + certFilename, devCertsDir + certKeyFilename, nil } + // Check if certificate have been provided as files (as is the case in kubernetes) + if pc.TLSCertPath != "" && pc.TLSCertKeyPath != "" { + log.Infof("Using TLS cert: %s, %s", pc.TLSCertPath, pc.TLSCertKeyPath) + _, errCertMissing := os.Stat(pc.TLSCertPath) + _, errCertKeyMissing := os.Stat(pc.TLSCertKeyPath) + if errCertMissing != nil || errCertKeyMissing != nil { + return "", "", fmt.Errorf("unable to find certificate %s or certificate key %s", pc.TLSCertPath, pc.TLSCertKeyPath) + } + return pc.TLSCertPath, pc.TLSCertKeyPath, nil + } + err := ioutil.WriteFile(certFilename, []byte(pc.TLSCert), 0600) if err != nil { return "", "", err @@ -427,7 +447,7 @@ func start(config interfaces.PortalConfig, p *portalProxy, addSetupMiddleware *s } if config.HTTPS { - certFile, certKeyFile, err := createTempCertFiles(config) + certFile, certKeyFile, err := detectTLSCert(config) if err != nil { return err } @@ -622,6 +642,9 @@ func isConsoleUpgrading() bool { } upgradeLockPath := fmt.Sprintf("/%s/%s", upgradeVolume, upgradeLockFile) + if string(upgradeVolume[0]) == "/" { + upgradeLockPath = fmt.Sprintf("%s/%s", upgradeVolume, upgradeLockFile) + } if _, err := os.Stat(upgradeLockPath); err == nil { return true diff --git a/components/app-core/backend/main_test.go b/components/app-core/backend/main_test.go index 326bee3343..2f7cb3ce63 100644 --- a/components/app-core/backend/main_test.go +++ b/components/app-core/backend/main_test.go @@ -59,8 +59,8 @@ func (e *echoContextMock) Reset(engine.Request, engine.Response) { */ func TestLoadPortalConfig(t *testing.T) { - t.Parallel() + os.Unsetenv("DATABASE_PROVIDER") os.Setenv("HTTP_CLIENT_TIMEOUT_IN_SECS", "10") os.Setenv("SKIP_SSL_VALIDATION", "true") os.Setenv("CONSOLE_PROXY_TLS_ADDRESS", ":8080") @@ -88,7 +88,6 @@ func TestLoadPortalConfig(t *testing.T) { t.Error("Unable to get TLSAddress from config") } - if result.CFClient != "portal-proxy" { t.Error("Unable to get CFClient from config") } @@ -117,15 +116,15 @@ func TestLoadPortalConfig(t *testing.T) { } func TestLoadDatabaseConfig(t *testing.T) { - t.Parallel() - os.Setenv("PGSQL_USER", "console") - os.Setenv("PGSQL_PASSWORD", "console") - os.Setenv("PGSQL_DATABASE", "console-db") - os.Setenv("PGSQL_HOST", "localhost") - os.Setenv("PGSQL_PORT", "5432") - os.Setenv("PGSQL_CONNECT_TIMEOUT_IN_SECS", "5") - os.Setenv("PGSQL_SSL_MODE", "disable") + os.Unsetenv("DATABASE_PROVIDER") + os.Setenv("DB_USER", "console") + os.Setenv("DB_PASSWORD", "console") + os.Setenv("DB_DATABASE_NAME", "console-db") + os.Setenv("DB_HOST", "localhost") + os.Setenv("DB_PORT", "5432") + os.Setenv("DB_CONNECT_TIMEOUT_IN_SECS", "5") + os.Setenv("DB_SSL_MODE", "disable") var dc datastore.DatabaseConfig @@ -137,9 +136,14 @@ func TestLoadDatabaseConfig(t *testing.T) { } func TestLoadDatabaseConfigWithInvalidSSLMode(t *testing.T) { - t.Parallel() - os.Setenv("PGSQL_SSL_MODE", "invalid.ssl.mode") + os.Setenv("DB_USER", "console") + os.Setenv("DB_PASSWORD", "console") + os.Setenv("DB_DATABASE_NAME", "console-db") + os.Setenv("DB_HOST", "localhost") + os.Setenv("DB_PORT", "5432") + os.Setenv("DATABASE_PROVIDER", "pgsql") + os.Setenv("DB_SSL_MODE", "invalid.ssl.mode") var dc datastore.DatabaseConfig diff --git a/components/app-core/backend/mock_server_test.go b/components/app-core/backend/mock_server_test.go index b420f0ef33..0eb9eefe2b 100644 --- a/components/app-core/backend/mock_server_test.go +++ b/components/app-core/backend/mock_server_test.go @@ -11,13 +11,12 @@ import ( "testing" "time" - "gopkg.in/DATA-DOG/go-sqlmock.v1" - log "github.com/Sirupsen/logrus" "github.com/gorilla/securecookie" "github.com/gorilla/sessions" "github.com/labstack/echo" "github.com/labstack/echo/engine/standard" + sqlmock "gopkg.in/DATA-DOG/go-sqlmock.v1" "github.com/SUSE/stratos-ui/components/app-core/backend/repository/crypto" "github.com/SUSE/stratos-ui/components/app-core/backend/repository/interfaces" @@ -131,12 +130,11 @@ func setupPortalProxy(db *sql.DB) *portalProxy { urlP, _ := url.Parse("https://login.52.38.188.107.nip.io:50450") pc := interfaces.PortalConfig{ ConsoleConfig: &interfaces.ConsoleConfig{ - ConsoleClient: "console", - ConsoleClientSecret: "", - UAAEndpoint: urlP, - SkipSSLValidation: true, + ConsoleClient: "console", + ConsoleClientSecret: "", + UAAEndpoint: urlP, + SkipSSLValidation: true, ConsoleAdminScope: UAAAdminIdentifier, - }, SessionStoreSecret: "hiddenraisinsohno!", EncryptionKeyInBytes: mockEncryptionKey, @@ -263,21 +261,21 @@ var mockUAAResponse = UAAResponse{ } const ( - mockAPIEndpoint = "https://api.127.0.0.1" - mockAuthEndpoint = "https://login.127.0.0.1" - mockTokenEndpoint = "https://uaa.127.0.0.1" + mockAPIEndpoint = "https://api.127.0.0.1" + mockAuthEndpoint = "https://login.127.0.0.1" + mockTokenEndpoint = "https://uaa.127.0.0.1" mockDopplerEndpoint = "https://doppler.127.0.0.1" - mockProxyVersion = 20161117141922 + mockProxyVersion = 20161117141922 stringCFType = "cf" stringCEType = "hce" selectAnyFromTokens = `SELECT .+ FROM tokens WHERE .+` - insertIntoTokens = `INSERT INTO tokens` - updateTokens = `UPDATE tokens` - selectAnyFromCNSIs = `SELECT (.+) FROM cnsis WHERE (.+)` - insertIntoCNSIs = `INSERT INTO cnsis` - getDbVersion = `SELECT version_id FROM goose_db_version WHERE is_applied = 't' ORDER BY id DESC LIMIT 1` + insertIntoTokens = `INSERT INTO tokens` + updateTokens = `UPDATE tokens` + selectAnyFromCNSIs = `SELECT (.+) FROM cnsis WHERE (.+)` + insertIntoCNSIs = `INSERT INTO cnsis` + getDbVersion = `SELECT version_id FROM goose_db_version WHERE is_applied = '1' ORDER BY id DESC LIMIT 1` ) var rowFieldsForCNSI = []string{"guid", "name", "cnsi_type", "api_endpoint", "auth_endpoint", "token_endpoint", "doppler_logging_endpoint", "skip_ssl_validation"} diff --git a/components/app-core/backend/passthrough.go b/components/app-core/backend/passthrough.go index 9c3e40ecc0..4cf9cc2414 100644 --- a/components/app-core/backend/passthrough.go +++ b/components/app-core/backend/passthrough.go @@ -160,8 +160,8 @@ func fwdCNSIStandardHeaders(cnsiRequest *CNSIRequest, req *http.Request) { switch { // Skip these // - "Referer" causes CF to fail with a 403 - // - "Connection", "X-Cnap-*" and "Cookie" are consumed by us - case k == "Connection", k == "Cookie", k == "Referer", strings.HasPrefix(strings.ToLower(k), "x-cnap-"): + // - "Connection", "X-Cap-*" and "Cookie" are consumed by us + case k == "Connection", k == "Cookie", k == "Referer", strings.HasPrefix(strings.ToLower(k), "x-cap-"): // Forwarding everything else default: @@ -172,8 +172,8 @@ func fwdCNSIStandardHeaders(cnsiRequest *CNSIRequest, req *http.Request) { func (p *portalProxy) proxy(c echo.Context) error { log.Debug("proxy") - cnsiList := strings.Split(c.Request().Header().Get("x-cnap-cnsi-list"), ",") - shouldPassthrough := "true" == c.Request().Header().Get("x-cnap-passthrough") + cnsiList := strings.Split(c.Request().Header().Get("x-cap-cnsi-list"), ",") + shouldPassthrough := "true" == c.Request().Header().Get("x-cap-passthrough") if err := p.validateCNSIList(cnsiList); err != nil { return echo.NewHTTPError(http.StatusBadRequest, err.Error()) @@ -218,7 +218,7 @@ func (p *portalProxy) proxy(c echo.Context) error { return echo.NewHTTPError(http.StatusBadRequest, buildErr.Error()) } // Allow the host part of the API URL to be overridden - apiHost := c.Request().Header().Get("x-cnap-api-host") + apiHost := c.Request().Header().Get("x-cap-api-host") // Don't allow any '.' chars in the api name if apiHost != "" && !strings.ContainsAny(apiHost, ".") { // Add trailing . for when we replace diff --git a/components/app-core/backend/repository/cnsis/pgsql_cnsis.go b/components/app-core/backend/repository/cnsis/pgsql_cnsis.go index 466b2c81bb..22db50379c 100644 --- a/components/app-core/backend/repository/cnsis/pgsql_cnsis.go +++ b/components/app-core/backend/repository/cnsis/pgsql_cnsis.go @@ -8,8 +8,8 @@ import ( "github.com/SUSE/stratos-ui/components/app-core/backend/datastore" - log "github.com/Sirupsen/logrus" "github.com/SUSE/stratos-ui/components/app-core/backend/repository/interfaces" + log "github.com/Sirupsen/logrus" ) var listCNSIs = `SELECT guid, name, cnsi_type, api_endpoint, auth_endpoint, token_endpoint, doppler_logging_endpoint, skip_ssl_validation diff --git a/components/app-core/backend/repository/console_config/psql_console_config.go b/components/app-core/backend/repository/console_config/psql_console_config.go index 803a9fda1a..77ec8fd824 100644 --- a/components/app-core/backend/repository/console_config/psql_console_config.go +++ b/components/app-core/backend/repository/console_config/psql_console_config.go @@ -94,8 +94,8 @@ func (c *ConsoleConfigRepository) SaveConsoleConfig(config *interfaces.ConsoleCo if err != nil { return fmt.Errorf("Unable to truncate Console Config table: %v", err) } - isComplete := config.ConsoleAdminScope != "" + if _, err := c.db.Exec(saveConsoleConfig, fmt.Sprintf("%s", config.UAAEndpoint), config.ConsoleAdminScope, config.ConsoleClient, config.ConsoleClientSecret, config.SkipSSLValidation, isComplete); err != nil { return fmt.Errorf("Unable to Save Console Config record: %v", err) @@ -125,7 +125,7 @@ func (c *ConsoleConfigRepository) IsInitialised() (bool, error) { rowCount, err := c.getTableCount() if err != nil { - for strings.Contains(err.Error(), "does not exist") { + for strings.Contains(err.Error(), "does not exist") || strings.Contains(err.Error(), "doesn't exist") { // Schema isn't initialised yet. Wait a few secs and retry log.Warnf("It appears schema isn't initialised yet, sleeping and trying again %s", err) time.Sleep(1 * time.Second) @@ -173,8 +173,8 @@ func (c *ConsoleConfigRepository) isSetupComplete() (bool, error) { return isSetupComplete, nil } -func (c *ConsoleConfigRepository) getTableCount() (int, error) { - rows, err := c.db.Query(getTableCount) +func (c *ConsoleConfigRepository) getCount(sqlStatement string) (int, error) { + rows, err := c.db.Query(sqlStatement) if err != nil { if strings.Contains(err.Error(), "does not exist") { @@ -198,3 +198,7 @@ func (c *ConsoleConfigRepository) getTableCount() (int, error) { return count, nil } + +func (c *ConsoleConfigRepository) getTableCount() (int, error) { + return c.getCount(getTableCount) +} diff --git a/components/app-core/backend/repository/crypto/aes.go b/components/app-core/backend/repository/crypto/aes.go index f4759309d9..fb21fcb503 100644 --- a/components/app-core/backend/repository/crypto/aes.go +++ b/components/app-core/backend/repository/crypto/aes.go @@ -73,8 +73,12 @@ func Decrypt(key, ciphertext []byte) (plaintext []byte, err error) { // ReadEncryptionKey - Read the encryption key from the shared volume func ReadEncryptionKey(v, f string) ([]byte, error) { log.Println("ReadEncryptionKey") - fname := fmt.Sprintf("/%s/%s", v, f) - key64chars, err := ioutil.ReadFile(fname) + + encryptionKey := fmt.Sprintf("/%s/%s", v, f) + if string(f[0]) == "/" { + encryptionKey = fmt.Sprintf("%s/%s", v, f) + } + key64chars, err := ioutil.ReadFile(encryptionKey) if err != nil { log.Errorf("Unable to read encryption key file: %+v\n", err) return nil, err diff --git a/components/app-core/backend/repository/goose-db-version/pgsql_goose_db_version.go b/components/app-core/backend/repository/goose-db-version/pgsql_goose_db_version.go index 065b377a4f..82e1fde74c 100644 --- a/components/app-core/backend/repository/goose-db-version/pgsql_goose_db_version.go +++ b/components/app-core/backend/repository/goose-db-version/pgsql_goose_db_version.go @@ -9,7 +9,7 @@ import ( ) const ( - getCurrentVersion = `SELECT version_id FROM goose_db_version WHERE is_applied = 't' ORDER BY id DESC LIMIT 1` + getCurrentVersion = `SELECT version_id FROM goose_db_version WHERE is_applied = '1' ORDER BY id DESC LIMIT 1` ) // PostgresGooseDBVersionRepository is a PostgreSQL-backed Goose DB Version repository diff --git a/components/app-core/backend/repository/interfaces/portal_proxy.go b/components/app-core/backend/repository/interfaces/portal_proxy.go index 2db438e28a..8fc0ee7407 100644 --- a/components/app-core/backend/repository/interfaces/portal_proxy.go +++ b/components/app-core/backend/repository/interfaces/portal_proxy.go @@ -28,6 +28,7 @@ type PortalProxy interface { DoLoginToCNSI(c echo.Context, cnsiGUID string) (*LoginRes, error) // Expose internal portal proxy records to extensions GetCNSIRecord(guid string) (CNSIRecord, error) + GetCNSIRecordByEndpoint(endpoint string) (CNSIRecord, error) GetCNSITokenRecord(cnsiGUID string, userGUID string) (TokenRecord, bool) GetCNSIUser(cnsiGUID string, userGUID string) (*ConnectedUser, bool) GetConfig() *PortalConfig diff --git a/components/app-core/backend/repository/interfaces/structs.go b/components/app-core/backend/repository/interfaces/structs.go index 8293d862ed..c23d8b3e54 100644 --- a/components/app-core/backend/repository/interfaces/structs.go +++ b/components/app-core/backend/repository/interfaces/structs.go @@ -86,6 +86,8 @@ type PortalConfig struct { TLSAddress string `configName:"CONSOLE_PROXY_TLS_ADDRESS"` TLSCert string `configName:"CONSOLE_PROXY_CERT"` TLSCertKey string `configName:"CONSOLE_PROXY_CERT_KEY"` + TLSCertPath string `configName:"CONSOLE_PROXY_CERT_PATH"` + TLSCertKeyPath string `configName:"CONSOLE_PROXY_CERT_KEY_PATH"` CFClient string `configName:"CF_CLIENT"` CFClientSecret string `configName:"CF_CLIENT_SECRET"` AllowedOrigins []string `configName:"ALLOWED_ORIGINS"` diff --git a/components/app-core/frontend/src/model/account.model.js b/components/app-core/frontend/src/model/account.model.js index 9459bf227f..d78f56167e 100644 --- a/components/app-core/frontend/src/model/account.model.js +++ b/components/app-core/frontend/src/model/account.model.js @@ -128,7 +128,7 @@ * @private */ function onLoggedIn(response) { - var sessionExpiresOnEpoch = response.headers()['x-cnap-session-expires-on']; + var sessionExpiresOnEpoch = response.headers()['x-cap-session-expires-on']; var loginData = response.data || {}; var loginRes = loginData.user ? loginData.user : loginData; diff --git a/components/app-core/frontend/src/model/navigation.model.js b/components/app-core/frontend/src/model/navigation.model.js index 5866a3cc15..30350caa11 100644 --- a/components/app-core/frontend/src/model/navigation.model.js +++ b/components/app-core/frontend/src/model/navigation.model.js @@ -207,7 +207,7 @@ position: pos, // baseState is used to work out which menu entry is active based on any child state baseState: baseState || name, // defaults to name - items: new Menu() // sub-menu + items: new Menu() // sub-menu }; return this._addMenuItem(item); @@ -232,7 +232,7 @@ position: pos, onClick: fn, baseState: name, - items: new Menu() // sub-menu + items: new Menu() // sub-menu }; return this._addMenuItem(item); diff --git a/components/app-core/frontend/src/utils/logged-in.service.js b/components/app-core/frontend/src/utils/logged-in.service.js index c41bf26d7b..933892a403 100644 --- a/components/app-core/frontend/src/utils/logged-in.service.js +++ b/components/app-core/frontend/src/utils/logged-in.service.js @@ -22,7 +22,7 @@ * @returns {object} Logged In Service */ function loggedInServiceFactory(appEventService, modelManager, loginManager, frameworkDialogConfirm, - $interval, $rootScope, $window, $log, $document, $translate) { + $interval, $rootScope, $window, $log, $document, $translate) { var loggedIn = false; var lastUserInteraction = moment(); diff --git a/components/app-core/frontend/src/view/application.directive.js b/components/app-core/frontend/src/view/application.directive.js index 6392fd2807..77f0f856b2 100644 --- a/components/app-core/frontend/src/view/application.directive.js +++ b/components/app-core/frontend/src/view/application.directive.js @@ -48,9 +48,21 @@ * @property {boolean} serverErrorOnLogin - a flag indicating if user login failed because of a server error. * @class */ - function ApplicationController($q, appEventService, modelManager, loginManager, appUpgradeCheck, appLocalStorage, - consoleSetupCheck, $timeout, $stateParams, $window, $rootScope, $scope, - appLoggedInService) { + function ApplicationController( + $q, + appEventService, + modelManager, + loginManager, + appUpgradeCheck, + appLocalStorage, + consoleSetupCheck, + $timeout, + $stateParams, + $window, + $rootScope, + $scope, + appLoggedInService + ) { var vm = this; @@ -82,7 +94,7 @@ } // Navigation options - $rootScope.$on('$stateChangeSuccess', function (event, toState, toParams) { // eslint-disable-line angular/on-watch + $rootScope.$on('$stateChangeSuccess', function (event, toState, toParams) { // eslint-disable-line angular/on-watch vm.hideNavigation = toParams.hideNavigation; vm.hideAccount = toParams.hideAccount; }); @@ -147,6 +159,10 @@ * @public */ function login(username, password) { + vm.failedLogin = false; + vm.serverErrorOnLogin = false; + vm.serverFailedToRespond = false; + modelManager.retrieve('app.model.account') .login(username, password) .then( diff --git a/components/app-core/frontend/src/view/endpoints/endpoints-dashboard-service-instance.service.js b/components/app-core/frontend/src/view/endpoints/endpoints-dashboard-service-instance.service.js index 58e1a3a821..679c10060e 100644 --- a/components/app-core/frontend/src/view/endpoints/endpoints-dashboard-service-instance.service.js +++ b/components/app-core/frontend/src/view/endpoints/endpoints-dashboard-service-instance.service.js @@ -24,8 +24,8 @@ * @returns {object} the service instance service */ function cnsiServiceFactory($q, $interpolate, $translate, modelManager, appEndpointsDashboardService, - appUtilsService, appErrorService, appNotificationsService, - appCredentialsDialog, frameworkDialogConfirm, appEventService) { + appUtilsService, appErrorService, appNotificationsService, + appCredentialsDialog, frameworkDialogConfirm, appEventService) { var that = this; var endpointPrefix = 'cnsi_'; var cnsiEndpointProviders = {}; diff --git a/components/app-core/frontend/src/view/landing-page/landing-page.directive.js b/components/app-core/frontend/src/view/landing-page/landing-page.directive.js index 95e3186b22..cc0be1db00 100644 --- a/components/app-core/frontend/src/view/landing-page/landing-page.directive.js +++ b/components/app-core/frontend/src/view/landing-page/landing-page.directive.js @@ -28,9 +28,10 @@ function landingPageController($scope, languageService) { var vm = this; vm.languageService = languageService; - vm.languageOptions = vm.languageService.getAll(); - languageService.getLocale(true).then(function (locale) { - vm.currentLanguage = locale; + vm.languageOptions = []; + languageService.initialised.then(function () { + vm.languageOptions = languageService.getAll(); + vm.currentLanguage = languageService.getLocale(); $scope.$watch(function () { return vm.currentLanguage; diff --git a/components/app-core/frontend/src/view/language/language.service.js b/components/app-core/frontend/src/view/language/language.service.js index 8af70eb014..bae7e413a9 100644 --- a/components/app-core/frontend/src/view/language/language.service.js +++ b/components/app-core/frontend/src/view/language/language.service.js @@ -97,23 +97,7 @@ */ function languageServiceFactory($q, $log, $translate, frameworkAsyncTaskDialog, modelManager, appLocalStorage) { - var userPreference = appLocalStorage.getItem(localeStorageId); - var setPromise = $q.resolve(); - - // Determine if there is only one locale which the user should always use - var locales = _getLocales(); - if (locales.length === 1) { - $log.debug('Only 1 locale found, setting to preferred + fallback: ', locales[0]); - // Attempt to set the fallback + preferred - $translate.preferredLanguage(locales[0]); - $translate.useFallbackLanguage(locales[0]); - // Ensure that the user pref is this one. This avoids instances where older, unsupported locales have not been - // cleared out of the source tree - userPreference = locales[0]; - } - - // Ensure that the locale is set to the user's pref (or forced to the only locale) - setLocale(userPreference); + var initialised = $translate.onReady().then(init); var service = { /** @@ -158,28 +142,63 @@ * fetching, false to fetch immediately * @returns {string|object} If waitForSet is true returns promise containing locale, else locale */ - getLocale: getLocale - }; + getLocale: getLocale, - if (enableLanguageSelection()) { - var userNavModel = modelManager.retrieve('app.model.navigation').user; - var item = userNavModel.addMenuItemFunction('select-language', service.showLanguageSelection, 'menu.language', 2); - item.setTextValues(function () { - return { current: service.getLocaleLocalised() }; - }); - } + /** + * @name initialised + * @description Promise resolving when language service has been initialised + */ + initialised: initialised + }; return service; + function init() { + var userPreference = appLocalStorage.getItem(localeStorageId); + + // Determine if there is only one locale which the user should always use + var locales = _getLocales(); + if (locales.length === 1) { + $log.debug('Only 1 locale found, setting to preferred + fallback: ', locales[0]); + // Attempt to set the fallback + preferred + $translate.preferredLanguage(locales[0]); + $translate.useFallbackLanguage(locales[0]); + // Ensure that the user pref is this one. This avoids instances where older, unsupported locales have not been + // cleared out of the source tree + userPreference = locales[0]; + } + + // Ensure that the locale is set to the user's pref (or forced to the only locale) + var setPromise = setLocale(userPreference); + + if (enableLanguageSelection()) { + var userNavModel = modelManager.retrieve('app.model.navigation').user; + var item = userNavModel.addMenuItemFunction('select-language', service.showLanguageSelection, 'menu.language', 2); + item.setTextValues(function () { + return { current: service.getLocaleLocalised() }; + }); + } + + return setPromise; + } + function setLocale(locale) { if (locale) { - // Only store the locale if it's explicitly been set... + // Check locale is valid + if (_.indexOf(_getLocales(), locale) < 0) { + // If not leave it up to the defaults for the current session + locale = ''; + } + // Only store the locale if it's explicitly been set or is invalid... appLocalStorage.setItem(localeStorageId, locale); - } else { + } + + if (!locale) { // .. otherwise use a best guess from the browser locale = browserLocale || $translate.resolveClientLocale(); locale = locale.replace('-', '_'); } + // Take into account moment naming conventions. For a list of supported moment locales see // https://github.com/moment/moment/tree/2.10.6/locale var momentLocale = locale.replace('_', '-'); @@ -190,7 +209,7 @@ return $q.resolve(); } - setPromise = $translate.use(locale).then(function () { + return $translate.use(locale).then(function () { $log.debug("Changed locale to '" + $translate.use() + "'"); momentLocale = momentLocale.toLowerCase(); var newMomentLocale = moment.locale(momentLocale); @@ -203,15 +222,10 @@ $log.warn("Failed to load language for locale '" + locale + "', falling back to '" + $translate.use() + "'"); return $q.reject(reason); }); - return setPromise; } - function getLocale(waitForSet) { - if (waitForSet && setPromise) { - return setPromise.then($translate.use); - } else { - return $translate.use(); - } + function getLocale() { + return $translate.use(); } function getAll() { diff --git a/components/app-core/frontend/src/view/login-page/login-form/login-form.scss b/components/app-core/frontend/src/view/login-page/login-form/login-form.scss index 1d5f17c9eb..55d2985ed1 100644 --- a/components/app-core/frontend/src/view/login-page/login-form/login-form.scss +++ b/components/app-core/frontend/src/view/login-page/login-form/login-form.scss @@ -14,7 +14,7 @@ login-form { > h1 { margin-bottom: $console-unit-space * 1.5; - margin-top: $console-unit-space / 2; + margin-top: $console-unit-space / 4; color: $brand-primary; font-weight: $console-font-weight-light; } @@ -57,6 +57,7 @@ login-form { .spinner-notification { text-transform: none; font-size: $font-size-large; + padding-right: $console-unit-space / 2; } .bounce-spinner > div { diff --git a/components/app-core/frontend/src/view/util/local-storage.service.js b/components/app-core/frontend/src/view/util/local-storage.service.js index fa82ec8c45..4c6825b1e9 100644 --- a/components/app-core/frontend/src/view/util/local-storage.service.js +++ b/components/app-core/frontend/src/view/util/local-storage.service.js @@ -2,8 +2,8 @@ 'use strict'; angular - .module('app.view') - .factory('appLocalStorage', localStorageFactory); + .module('app.view') + .factory('appLocalStorage', localStorageFactory); /** * @namespace app.view.localStorageFactory diff --git a/components/app-core/frontend/src/view/util/upgrade.service.js b/components/app-core/frontend/src/view/util/upgrade.service.js index 99d2197078..e2b282cac7 100644 --- a/components/app-core/frontend/src/view/util/upgrade.service.js +++ b/components/app-core/frontend/src/view/util/upgrade.service.js @@ -2,9 +2,9 @@ 'use strict'; angular - .module('app.view') - .factory('appUpgradeCheck', upgradeCheckFactory) - .config(upgradeCheckInterceptor); + .module('app.view') + .factory('appUpgradeCheck', upgradeCheckFactory) + .config(upgradeCheckInterceptor); /** * @namespace appUpgradeCheck @@ -53,7 +53,7 @@ // rejection is a response object // Must be a 503 with the Retry-After header and mst be do a Portal Proxy URL if (isUpgrading(rejection)) { - // This indicates upgrade in progress, so change state to an upgrade error page + // This indicates upgrade in progress, so change state to an upgrade error page appEventService.$emit(appEventService.events.TRANSFER, 'error-page', {error: 'upgrading', hideAccount: true}); } // Always return the rejection as it was diff --git a/components/app-core/frontend/test/e2e/po/helpers.po.js b/components/app-core/frontend/test/e2e/po/helpers.po.js index e8380d02ba..6cab77a6ad 100644 --- a/components/app-core/frontend/test/e2e/po/helpers.po.js +++ b/components/app-core/frontend/test/e2e/po/helpers.po.js @@ -66,7 +66,9 @@ hasClass: hasClass, isButtonEnabled: isButtonEnabled, - scrollIntoView: scrollIntoView + scrollIntoView: scrollIntoView, + + waitForElementAndClick: waitForElementAndClick }; function getHost() { @@ -422,4 +424,10 @@ }); } + function waitForElementAndClick(element) { + var until = protractor.ExpectedConditions; + browser.wait(until.presenceOf(element), 10000); + return element.click(); + } + })(); diff --git a/components/app-core/frontend/test/e2e/po/widgets/actions-menu.po.js b/components/app-core/frontend/test/e2e/po/widgets/actions-menu.po.js index bb79e4407c..86c667a164 100644 --- a/components/app-core/frontend/test/e2e/po/widgets/actions-menu.po.js +++ b/components/app-core/frontend/test/e2e/po/widgets/actions-menu.po.js @@ -2,6 +2,7 @@ 'use strict'; var wrapper = require('../wrapper.po'); + var helpers = require('../helpers.po'); module.exports = { isSingleButton: isSingleButton, @@ -40,11 +41,11 @@ } function click(actionMenu) { - return actionMenu.element(by.css('.actions-menu-icon')).click(); + return helpers.waitForElementAndClick(actionMenu.element(by.css('.actions-menu-icon'))); } function clickItem(actionMenu, row) { - return _getRow(actionMenu, row).click(); + return helpers.waitForElementAndClick(_getRow(actionMenu, row)); } function _getRow(actionMenu, row) { diff --git a/components/app-core/frontend/test/e2e/po/widgets/async-dialog-view.po.js b/components/app-core/frontend/test/e2e/po/widgets/async-dialog-view.po.js index 916ec8a10c..17b7e40b1e 100644 --- a/components/app-core/frontend/test/e2e/po/widgets/async-dialog-view.po.js +++ b/components/app-core/frontend/test/e2e/po/widgets/async-dialog-view.po.js @@ -32,7 +32,9 @@ cancel: _.partial(cancel, element), primary: _.partial(primary, element), - commit: _.partial(commit, element) + commit: _.partial(commit, element), + + getTitleText: _.partial(getTitleText, element) }; } diff --git a/components/app-core/frontend/test/e2e/po/widgets/table.po.js b/components/app-core/frontend/test/e2e/po/widgets/table.po.js index 645dad9ae8..503975aef1 100644 --- a/components/app-core/frontend/test/e2e/po/widgets/table.po.js +++ b/components/app-core/frontend/test/e2e/po/widgets/table.po.js @@ -1,23 +1,15 @@ (function () { 'use strict'; - var _ = require('lodash'); + var wrapper = require('../wrapper.po'); module.exports = { - wrap: wrap + getRows: getRows, + getData: getData, + getItem: getItem }; - function wrap(element) { - return { - getElement: function () { - return element; - }, - getRows: _.partial(getRows, element), - //getItem: _.partial(getItem, element), - getData: _.partial(getData, element), - getItem: _.partial(getItem, element) - }; - } + wrapper(module); function getRows(ele) { //return ele.element(by.css('.wizard-head h4')).getText(); diff --git a/components/app-core/frontend/test/e2e/po/wrapper.po.js b/components/app-core/frontend/test/e2e/po/wrapper.po.js index 5d2bc05fe1..5d39cea372 100644 --- a/components/app-core/frontend/test/e2e/po/wrapper.po.js +++ b/components/app-core/frontend/test/e2e/po/wrapper.po.js @@ -7,7 +7,9 @@ module.exports = function (_module) { if (!_module.exports.wrap) { _module.exports.wrap = function (element) { + var until = protractor.ExpectedConditions; var wrappers = {}; + _.each(_module.exports, function (value, key) { if (_.isFunction(value)) { wrappers[key] = _.partial(value, element); @@ -23,6 +25,11 @@ return element.getWebElement(); }; } + if (!wrappers.waitForElement) { + wrappers.waitForElement = function () { + browser.wait(until.presenceOf(wrappers.getElement()), 10000); + }; + } return wrappers; }; } diff --git a/components/app-core/frontend/test/unit/api/userServiceInstance.api.spec.js b/components/app-core/frontend/test/unit/api/userServiceInstance.api.spec.js index 2352873bed..fbfe2c7969 100644 --- a/components/app-core/frontend/test/unit/api/userServiceInstance.api.spec.js +++ b/components/app-core/frontend/test/unit/api/userServiceInstance.api.spec.js @@ -56,9 +56,9 @@ $httpBackend.when('POST', '/pp/v1/auth/login/cnsi').respond(200, data); userServiceInstanceApi.connect('TESTGUID', 'user', 'password') - .then(function (response) { - expect(response.data).toEqual('test'); - }); + .then(function (response) { + expect(response.data).toEqual('test'); + }); $httpBackend.flush(); }); diff --git a/components/app-framework/bower.json b/components/app-framework/bower.json index 7ac678e2c0..15a3c9e9e9 100644 --- a/components/app-framework/bower.json +++ b/components/app-framework/bower.json @@ -25,6 +25,7 @@ "jquery": "~1.11.3", "lodash": "~4.0.1", "ngSmoothScroll": "~2.0.0", + "ng-tags-input": "~3.2.0", "angular-cookies": "1.4", "angular-utf8-base64": "~0.0.5", "SpinKit": "spinkit#~1.2.5" diff --git a/components/app-framework/src/filters/json.filter.js b/components/app-framework/src/filters/json.filter.js new file mode 100644 index 0000000000..e22344c886 --- /dev/null +++ b/components/app-framework/src/filters/json.filter.js @@ -0,0 +1,32 @@ +(function () { + 'use strict'; + + // The filters + angular.module('app.framework.filters') + .filter('jsonString', jsonStringFilter); + + /** + * @namespace app.framework.filters.jsonStringFilter + * @memberof app.framework.filters + * @name jsonStringFilter + * @description An angular filter which will format the JSON object as a string OR show a supplied invalid message + * @param {object} $filter - Angular $filter service + * @returns {Function} The filter itself + */ + function jsonStringFilter($filter) { + var jsonStringFilter = function (obj, invalidMsg) { + + try { + return angular.toJson(obj); + } catch (e) { + return $filter('translate')(invalidMsg) || ''; + } + }; + + // Ensure the filter is reapplied on change of language + jsonStringFilter.$stateful = true; + + return jsonStringFilter; + } + +})(); diff --git a/components/app-framework/src/framework.module.js b/components/app-framework/src/framework.module.js index 94dc48502b..809ab63e72 100644 --- a/components/app-framework/src/framework.module.js +++ b/components/app-framework/src/framework.module.js @@ -10,6 +10,7 @@ 'app.framework.widgets', 'angular-websocket', 'ngAnimate', - 'toastr' + 'toastr', + 'ngTagsInput' ]); })(); diff --git a/components/app-framework/src/utils/auto-focus/focus-when.directive.js b/components/app-framework/src/utils/auto-focus/focus-when.directive.js new file mode 100644 index 0000000000..27a42ce898 --- /dev/null +++ b/components/app-framework/src/utils/auto-focus/focus-when.directive.js @@ -0,0 +1,28 @@ +(function () { + 'use strict'; + + angular + .module('app.framework.utils') + .directive('focusWhen', focusWhen); + + /** + * A simple attribute directive to set focus on an element when a value is set + * @param {Object} $timeout - the Angular $timeout service + * @returns {Object} the focus-when directive + * */ + function focusWhen($timeout) { + return { + restrict: 'A', + link: function (scope, element, attrs) { + scope.$watch(attrs.focusWhen, function (nv) { + if (nv) { + $timeout(function () { + element[0].focus(); + }, 0); + } + }); + } + }; + } + +})(); diff --git a/components/app-framework/src/utils/auto-populate-input/auto-populate-input.directive.js b/components/app-framework/src/utils/auto-populate-input/auto-populate-input.directive.js index eb39dde702..5b62e02872 100644 --- a/components/app-framework/src/utils/auto-populate-input/auto-populate-input.directive.js +++ b/components/app-framework/src/utils/auto-populate-input/auto-populate-input.directive.js @@ -2,8 +2,8 @@ 'use strict'; angular - .module('app.framework.utils') - .directive('autoPopulateInput', autoPopulateInput); + .module('app.framework.utils') + .directive('autoPopulateInput', autoPopulateInput); /** * @name autoPopulateInput diff --git a/components/app-framework/src/utils/focusable-input/focusable-input.directive.js b/components/app-framework/src/utils/focusable-input/focusable-input.directive.js index 940c24a3b7..c85ed94068 100644 --- a/components/app-framework/src/utils/focusable-input/focusable-input.directive.js +++ b/components/app-framework/src/utils/focusable-input/focusable-input.directive.js @@ -27,8 +27,12 @@ element.find('input').on('focus', handleOnFocus); element.find('select-input').on('focus', handleOnFocus); + element.find('tags-input').on('focus', handleOnFocus); + element.find('textarea').on('focus', handleOnFocus); element.find('input').on('blur', handleOnBlur); element.find('select-input').on('blur', handleOnBlur); + element.find('tags-input').on('blur', handleOnBlur); + element.find('textarea').on('blur', handleOnBlur); function handleOnFocus() { element.addClass(focusedClass); diff --git a/components/app-framework/src/utils/long-running/long-running.service.js b/components/app-framework/src/utils/long-running/long-running.service.js index b5b279dc8d..e70ac4c6f9 100644 --- a/components/app-framework/src/utils/long-running/long-running.service.js +++ b/components/app-framework/src/utils/long-running/long-running.service.js @@ -78,7 +78,7 @@ loop(); } }, - loop); + loop); }, interval); } } diff --git a/components/app-framework/src/widgets/actions-toolbar/actions-toolbar.html b/components/app-framework/src/widgets/actions-toolbar/actions-toolbar.html index f4ec4847ab..4c5784ce49 100644 --- a/components/app-framework/src/widgets/actions-toolbar/actions-toolbar.html +++ b/components/app-framework/src/widgets/actions-toolbar/actions-toolbar.html @@ -3,7 +3,7 @@ @@ -23,24 +23,26 @@

{{asyncTaskDialogCtrl.content.title}}

- - +
+ + +
diff --git a/components/app-framework/src/widgets/async-task-dialog/async-task-dialog.service.js b/components/app-framework/src/widgets/async-task-dialog/async-task-dialog.service.js index d2210500ee..03e59ccc7b 100644 --- a/components/app-framework/src/widgets/async-task-dialog/async-task-dialog.service.js +++ b/components/app-framework/src/widgets/async-task-dialog/async-task-dialog.service.js @@ -141,6 +141,11 @@ vm.hasErrorMessage = hasErrorMessage; vm.isFormInvalid = isFormInvalid; + // Ignore enter if event has been marked with preventDefault() + vm.canUseEnter = function (ev) { + return !ev.isDefaultPrevented(); + }; + /** * @name invokeAction * @description invokes the asyn task diff --git a/components/app-framework/src/widgets/detail-view/detail-view.html b/components/app-framework/src/widgets/detail-view/detail-view.html index ec615d9360..d1e0ccd189 100644 --- a/components/app-framework/src/widgets/detail-view/detail-view.html +++ b/components/app-framework/src/widgets/detail-view/detail-view.html @@ -4,5 +4,5 @@

- + diff --git a/components/app-framework/src/widgets/detail-view/detail-view.service.js b/components/app-framework/src/widgets/detail-view/detail-view.service.js index 7d795f9258..6fea9d02a3 100644 --- a/components/app-framework/src/widgets/detail-view/detail-view.service.js +++ b/components/app-framework/src/widgets/detail-view/detail-view.service.js @@ -82,7 +82,8 @@ templateUrl: config.templateUrl, template: config.template, title: config.title, - titleTranslateValues: config.titleTranslateValues + titleTranslateValues: config.titleTranslateValues, + hideClose: config.hideClose }; } }, @@ -101,18 +102,20 @@ } }); - if (config.dialog && openDetailViewCount > 1) { - $timeout(function () { - var dialog = angular.element('.detail-view-dialog .modal-dialog'); - // Latest dialog will be the first element - var thisDialog = angular.element(dialog.get(0)); - var parentDialog = angular.element(dialog.get(1)); - - var overlap = STACKED_HORIZONTAL_MARGIN * 2; - thisDialog.width(parentDialog.width() + overlap); - thisDialog.height(parentDialog.height()); - }); - } + modal.opened.then(function () { + if (config.dialog && openDetailViewCount > 1) { + $timeout(function () { + var dialog = angular.element('.detail-view-dialog .modal-dialog'); + // Latest dialog will be the first element + var thisDialog = angular.element(dialog.get(0)); + var parentDialog = angular.element(dialog.get(1)); + + var overlap = STACKED_HORIZONTAL_MARGIN * 2; + thisDialog.width(parentDialog.width() + overlap); + thisDialog.height(parentDialog.height()); + }); + } + }); modal.rendered.then(function () { $timeout(function () { diff --git a/components/app-framework/src/widgets/file-drop/gitignore.service.js b/components/app-framework/src/widgets/file-drop/gitignore.service.js index 96d690e87b..6a9562c72a 100644 --- a/components/app-framework/src/widgets/file-drop/gitignore.service.js +++ b/components/app-framework/src/widgets/file-drop/gitignore.service.js @@ -60,44 +60,44 @@ */ exports.parse = function (content) { return content.split('\n') - .map(function (line) { - line = line.trim(); - return line; - }) - .filter(function (line) { - return line && line[0] !== '#'; - }) - .reduce(function (lists, line) { - var isNegative = line[0] === '!'; - if (isNegative) { - line = line.slice(1); - } - if (line[0] === '/') { - line = line.slice(1); - } - if (isNegative) { - lists[1].push(line); - } else { - lists[0].push(line); - } - return lists; - }, [[], []]) - .map(function (list) { - return list - .sort() - .map(prepareRegexes) - .reduce(function (list, prepared) { - list[0].push(prepared[0]); - list[1].push(prepared[1]); - return list; - }, [[], [], []]); - }) - .map(function (item) { - return [ - item[0].length > 0 ? new RegExp('^((' + item[0].join(')|(') + '))') : new RegExp('$^'), - item[1].length > 0 ? new RegExp('^((' + item[1].join(')|(') + '))') : new RegExp('$^') - ]; - }); + .map(function (line) { + line = line.trim(); + return line; + }) + .filter(function (line) { + return line && line[0] !== '#'; + }) + .reduce(function (lists, line) { + var isNegative = line[0] === '!'; + if (isNegative) { + line = line.slice(1); + } + if (line[0] === '/') { + line = line.slice(1); + } + if (isNegative) { + lists[1].push(line); + } else { + lists[0].push(line); + } + return lists; + }, [[], []]) + .map(function (list) { + return list + .sort() + .map(prepareRegexes) + .reduce(function (list, prepared) { + list[0].push(prepared[0]); + list[1].push(prepared[1]); + return list; + }, [[], [], []]); + }) + .map(function (item) { + return [ + item[0].length > 0 ? new RegExp('^((' + item[0].join(')|(') + '))') : new RegExp('$^'), + item[1].length > 0 ? new RegExp('^((' + item[1].join(')|(') + '))') : new RegExp('$^') + ]; + }); }; function prepareRegexes(pattern) { @@ -115,15 +115,15 @@ function preparePartialRegex(pattern) { return pattern - .split('/') - .map(function (item, index) { - if (index) { - return '([\\/]?(' + prepareRegexPattern(item) + '\\b|$))'; - } else { - return '(' + prepareRegexPattern(item) + '\\b)'; - } - }) - .join(''); + .split('/') + .map(function (item, index) { + if (index) { + return '([\\/]?(' + prepareRegexPattern(item) + '\\b|$))'; + } else { + return '(' + prepareRegexPattern(item) + '\\b)'; + } + }) + .join(''); } function escapeRegex(pattern) { diff --git a/components/app-framework/src/widgets/gallery-card/gallery-card.html b/components/app-framework/src/widgets/gallery-card/gallery-card.html index 5e888a8021..e75b3c2d6c 100644 --- a/components/app-framework/src/widgets/gallery-card/gallery-card.html +++ b/components/app-framework/src/widgets/gallery-card/gallery-card.html @@ -5,6 +5,7 @@ {{ galleryCardCtrl.cardData.titleTranslate }} diff --git a/components/app-framework/src/widgets/json-text-input/json-text-input.directive.js b/components/app-framework/src/widgets/json-text-input/json-text-input.directive.js new file mode 100644 index 0000000000..f1edfbbbd8 --- /dev/null +++ b/components/app-framework/src/widgets/json-text-input/json-text-input.directive.js @@ -0,0 +1,34 @@ +(function () { + 'use strict'; + + angular + .module('app.framework.widgets') + .directive('jsonTextInput', jsonTextInput); + + /** + * @name jsonTextInput + * @description A directive that displays JSON. + * @returns {object} The directive definition object + */ + function jsonTextInput() { + return { + restrict: 'A', + require: 'ngModel', + scope: { + ngModel: '=' + }, + link: function ($scope, elem, attr, ngModelCtrl) { + ngModelCtrl.$parsers.push(function (viewValue) { + try { + return angular.fromJson(viewValue); + } catch (e) { + return undefined; + } + }); + ngModelCtrl.$formatters.push(function (value) { + return angular.toJson(value, 2); + }); + } + }; + } +})(); diff --git a/components/app-framework/src/widgets/json-text-input/json-text-input.scss b/components/app-framework/src/widgets/json-text-input/json-text-input.scss new file mode 100644 index 0000000000..2a4cb917bb --- /dev/null +++ b/components/app-framework/src/widgets/json-text-input/json-text-input.scss @@ -0,0 +1,16 @@ +.json-input-field { + flex: 1 1 0; + display: flex; + flex-direction: column; + + &.form-group { + width: 100%; + } + + textarea { + outline: 0; + border: 0; + font-family: monospace; + font-size: $font-size-monospace; + } +} \ No newline at end of file diff --git a/components/app-framework/src/widgets/select-input/select-input.directive.js b/components/app-framework/src/widgets/select-input/select-input.directive.js index fd54327b93..73d1ca0559 100644 --- a/components/app-framework/src/widgets/select-input/select-input.directive.js +++ b/components/app-framework/src/widgets/select-input/select-input.directive.js @@ -68,7 +68,7 @@ } function handleKeypress(event) { - var enterSpaceKeyCodes = [13, 32]; // enter or space + var enterSpaceKeyCodes = [13, 32]; // enter or space var keyCode = event.which || event.keyCode; var charStr = String.fromCharCode(keyCode); @@ -131,7 +131,7 @@ */ function init() { $scope.$watch(function () { - return vm.inputOptions.length; + return vm.inputOptions ? vm.inputOptions.length : 0; }, function (length) { if (length === 1) { vm.setValue(vm.inputOptions[0]); diff --git a/components/app-framework/src/widgets/tags-input/tags-input.scss b/components/app-framework/src/widgets/tags-input/tags-input.scss new file mode 100644 index 0000000000..d6f5f5b9a0 --- /dev/null +++ b/components/app-framework/src/widgets/tags-input/tags-input.scss @@ -0,0 +1,49 @@ +.tags-input-field.form-group { + height: auto; + + // Override default styles for the tags-input directive + tags-input { + + .host { + margin: 0; + min-height: 32px; + outline: 0; + } + + .tags { + box-shadow: none; + border: 0; + padding: 0; + + &.focused { + outline: 0; + border: 0; + box-shadow: none; + } + + input.input { + font-family: $font-family-base; + font-size: $font-size-base; + height: 26px; + margin-bottom: 0; + } + + .tag-item { + background: none; + font-family: $font-family-base; + font-size: $font-size-base; + margin: 2px 6px 2px 0; + + &.selected { + background: $suse-primary; + } + + ti-tag-item { + ng-include { + margin: 0 !important; + } + } + } + } + } +} diff --git a/components/app-framework/src/widgets/widgets.scss b/components/app-framework/src/widgets/widgets.scss index d83463e6fb..b5a8dfad26 100644 --- a/components/app-framework/src/widgets/widgets.scss +++ b/components/app-framework/src/widgets/widgets.scss @@ -11,6 +11,7 @@ @import "flyout/flyout"; @import "gallery-card/gallery-card"; @import "global-spinner/global-spinner"; +@import "json-text-input/json-text-input"; @import "json-tree-view/json-tree-view"; @import "log-viewer/logs-viewer"; @import "paginator/paginator"; @@ -24,6 +25,8 @@ @import "status-indicator/status-indicator"; @import "tabbed-nav/tabbed-nav"; @import "table-inline-message/table-inline-message"; +@import "tags-input/tags-input"; @import "toaster/toast"; @import "wizard/wizard"; @import "auto-update/auto-update"; + diff --git a/components/app-framework/src/widgets/wizard/wizard.directive.js b/components/app-framework/src/widgets/wizard/wizard.directive.js index f22b980876..7b120bd6ce 100644 --- a/components/app-framework/src/widgets/wizard/wizard.directive.js +++ b/components/app-framework/src/widgets/wizard/wizard.directive.js @@ -215,8 +215,8 @@ */ function disableNext() { var step = vm.steps[vm.currentIndex] || {}; - if (_.isFunction(step.allowNext) && !step.allowNext()) { - return true; + if (_.isFunction(step.allowNext)) { + return !step.allowNext(); } if ($scope.wizardForm) { var form = $scope.wizardForm[step.formName]; @@ -331,26 +331,26 @@ }; } }) - .then(function () { - if (step.isLastStep) { - vm.resetMessage(); - vm.actions.finish(vm); - } else { - vm.switchTo(index + 1).then(function () { + .then(function () { + if (step.isLastStep) { vm.resetMessage(); - }); - } - }, function (message) { + vm.actions.finish(vm); + } else { + vm.switchTo(index + 1).then(function () { + vm.resetMessage(); + }); + } + }, function (message) { // Hide the loading indicator if we showed one - vm.currentIndex = index; - vm.busyMessage = false; - if (message) { - vm.showMessage(message, 'alert-danger'); - } else { - vm.resetMessage(); - } - vm.resetButtons(); - }); + vm.currentIndex = index; + vm.busyMessage = false; + if (message) { + vm.showMessage(message, 'alert-danger'); + } else { + vm.resetMessage(); + } + vm.resetButtons(); + }); } else { if (step.isLastStep) { vm.actions.finish(vm); diff --git a/components/app-framework/src/widgets/wizard/wizard.html b/components/app-framework/src/widgets/wizard/wizard.html index df013b04eb..80814ed167 100644 --- a/components/app-framework/src/widgets/wizard/wizard.html +++ b/components/app-framework/src/widgets/wizard/wizard.html @@ -69,36 +69,37 @@

{{ wizardCtrl.workflow.title }}

+
+ - - - + - + +
diff --git a/components/app-framework/src/widgets/wizard/wizard.scss b/components/app-framework/src/widgets/wizard/wizard.scss index 4ff52ae3bb..5b8a6f5ef0 100644 --- a/components/app-framework/src/widgets/wizard/wizard.scss +++ b/components/app-framework/src/widgets/wizard/wizard.scss @@ -14,4 +14,26 @@ .wizard-nav-step-number, .wizard-nav-step-number-complete, .wizard-nav-item-sep { display: none; -} \ No newline at end of file +} + + +.wizard-foot { + overflow: hidden; + .wizard-foot-buttons { + + button { + transition: margin-left 0.5s, margin-right 0.5s; + } + + &.wizard-footer-hidden { + + button:first-child { + margin-left: -200px + } + + button:last-child { + margin-right: -200px + } + } + } +} diff --git a/components/app-setup/frontend/src/plugin.config.js b/components/app-setup/frontend/src/plugin.config.js index 30474c154a..ecc78dec0d 100644 --- a/components/app-setup/frontend/src/plugin.config.js +++ b/components/app-setup/frontend/src/plugin.config.js @@ -4,10 +4,10 @@ // register this plugin application to the platform if (env && env.registerApplication) { env.registerApplication( - 'appSetup', // plugin application identity - 'app-setup', // plugin application's root angular module name - 'plugins/app-setup/', // plugin application's base path - 'setup' // Main start state + 'appSetup', // plugin application identity + 'app-setup', // plugin application's root angular module name + 'plugins/app-setup/', // plugin application's base path + 'setup' // Main start state ); } diff --git a/components/app-theme/src/scss/style/components/_async_task_dialog.scss b/components/app-theme/src/scss/style/components/_async_task_dialog.scss index bd3fd3f0ff..cf5dced94d 100644 --- a/components/app-theme/src/scss/style/components/_async_task_dialog.scss +++ b/components/app-theme/src/scss/style/components/_async_task_dialog.scss @@ -1,3 +1,6 @@ +$async-dialog-header-height: $console-unit-space * 3; +$async-dialog-footer-height: $button-height + $console-unit-space * 2 + 1; + .async-dialog { margin-right: $detail-view-margin; margin-left: $detail-view-margin; @@ -20,10 +23,33 @@ .modal-footer { margin-top: $console-unit-space * 2; padding-top: $console-unit-space; + height: $async-dialog-footer-height; + overflow: hidden; + flex: 0 0 $async-dialog-footer-height; } .disable-margin { margin-top: 0; } + + .modal-footer { + .async-footer-buttons { + + button { + transition: margin-left 0.5s, margin-right 0.5s; + } + + &.async-footer-hidden { + + button:first-child { + margin-left: -200px + } + + button:last-child { + margin-right: -200px + } + } + } + } } diff --git a/components/app-theme/src/scss/theme/components/_actions-toolbar.scss b/components/app-theme/src/scss/theme/components/_actions-toolbar.scss index 9fd4651476..6acaecf5ed 100644 --- a/components/app-theme/src/scss/theme/components/_actions-toolbar.scss +++ b/components/app-theme/src/scss/theme/components/_actions-toolbar.scss @@ -4,7 +4,8 @@ $actions-toolbar-hover-bg: darken($white, 10%) !default; $actions-toolbar-height: $button-height !default; -$actions-toolbar-menu-hover-color: $link-color !default; +$actions-toolbar-menu-color: $link-color !default; +$actions-toolbar-menu-hover-color: $link-hover-color !default; $actions-toolbar-spacing: 4px !default; $actions-toolbar-menu-gripper-size: 28px !default; $actions-toolbar-icon-svg-size: 16px !default; diff --git a/components/cf-app-push/backend/deploy.go b/components/cf-app-push/backend/deploy.go index 8fc4133d61..ed169a3d89 100644 --- a/components/cf-app-push/backend/deploy.go +++ b/components/cf-app-push/backend/deploy.go @@ -81,6 +81,7 @@ const ( SOURCE_FILE SOURCE_FILE_DATA SOURCE_FILE_ACK + SOURCE_GITURL ) const ( @@ -119,21 +120,36 @@ var upgrader = websocket.Upgrader{ } type StratosProject struct { - Url string `json:"url"` - CommitHash string `json:"commit"` - Branch string `json:"branch"` + DeploySource interface{} `json:"deploySource"` +} + +type DeploySource struct { + SourceType string `json:"type"` Timestamp int64 `json:"timestamp"` } // Structure used to provide metadata about the GitHub source type GitHubSourceInfo struct { - Project string `json:"project"` - Branch string `json:"branch"` + DeploySource + Project string `json:"project"` + Branch string `json:"branch"` + Url string `json:"url"` + CommitHash string `json:"commit"` +} + +// Structure used to provide metadata about the Git Url source +type GitUrlSourceInfo struct { + DeploySource + Project string `json:"project"` + Branch string `json:"branch"` + Url string `json:"url"` + CommitHash string `json:"commit"` } type FolderSourceInfo struct { + DeploySource Files int `json:"files"` - Folders []string `json:"folders"` + Folders []string `json:"folders,omitempty"` } func (cfAppPush *CFAppPush) deploy(echoContext echo.Context) error { @@ -157,7 +173,6 @@ func (cfAppPush *CFAppPush) deploy(echoContext echo.Context) error { defer pingTicker.Stop() // We use a simple protocol to get the source to use for cf push - // This can either be a github project or one or more files // Send a message to the client to say that we are awaiting source details sendEvent(clientWebSocket, SOURCE_REQUIRED) @@ -185,6 +200,8 @@ func (cfAppPush *CFAppPush) deploy(echoContext echo.Context) error { sourceEnvVarMetadata, appDir, err = getGitHubSource(clientWebSocket, tempDir, msg) case SOURCE_FOLDER: sourceEnvVarMetadata, appDir, err = getFolderSource(clientWebSocket, tempDir, msg) + case SOURCE_GITURL: + sourceEnvVarMetadata, appDir, err = getGitUrlSource(clientWebSocket, tempDir, msg) default: err = errors.New("Unsupported source type; don't know how to get the source for the application") } @@ -253,6 +270,7 @@ func (cfAppPush *CFAppPush) deploy(echoContext echo.Context) error { func getFolderSource(clientWebSocket *websocket.Conn, tempDir string, msg SocketMessage) (string, string, error) { // The msg data is JSON for the Folder info info := FolderSourceInfo{} + if err := json.Unmarshal([]byte(msg.Message), &info); err != nil { return "", tempDir, err } @@ -317,6 +335,9 @@ func getFolderSource(clientWebSocket *websocket.Conn, tempDir string, msg Socket archiver := getArchiverFor(lastFilePath) if archiver != nil { + // Overwrite generic 'filefolder' type + info.DeploySource.SourceType = "archive" + log.Debug("Unpacking archive ......") unpackPath := filepath.Join(tempDir, "application") err := os.Mkdir(unpackPath, 0700) @@ -337,12 +358,21 @@ func getFolderSource(clientWebSocket *websocket.Conn, tempDir string, msg Socket } // Archive done - return "", unpackPath, nil + tempDir = unpackPath } } // All done! - return "", tempDir, nil + + // Return a string that can be added to the manifest as an application env var to trace where the source originated + info.Timestamp = time.Now().Unix() + info.Folders = nil + stratosProject := StratosProject{ + DeploySource: info, + } + + marshalledJson, _ := json.Marshal(stratosProject) + return string(marshalledJson), tempDir, nil } // Check the suffix of the file name and return an archiver that can handle that file type @@ -360,17 +390,52 @@ func getArchiverFor(filePath string) archiver.Archiver { } func getGitHubSource(clientWebSocket *websocket.Conn, tempDir string, msg SocketMessage) (string, string, error) { + var ( + err error + ) // The msg data is JSON for the GitHub info info := GitHubSourceInfo{} - if err := json.Unmarshal([]byte(msg.Message), &info); err != nil { + if err = json.Unmarshal([]byte(msg.Message), &info); err != nil { + return "", tempDir, err + } + + info.Url = fmt.Sprintf("https://github.com/%s", info.Project) + log.Infof("GitHub Source: %s, branch %s, url: %s", info.Project, info.Branch, info.Url) + + info.CommitHash, err = cloneRepository(info.Url, info.Branch, clientWebSocket, tempDir) + if err != nil { + return "", tempDir, err + } + + sendEvent(clientWebSocket, EVENT_CLONED) + + // Return a string that can be added to the manifest as an application env var to trace where the source originated + info.Timestamp = time.Now().Unix() + stratosProject := StratosProject{ + DeploySource: info, + } + + marshalledJson, _ := json.Marshal(stratosProject) + return string(marshalledJson), tempDir, nil +} + +func getGitUrlSource(clientWebSocket *websocket.Conn, tempDir string, msg SocketMessage) (string, string, error) { + + var ( + err error + ) + + // The msg data is JSON for the GitHub info + info := GitUrlSourceInfo{} + + if err = json.Unmarshal([]byte(msg.Message), &info); err != nil { return "", tempDir, err } - projectUrl := fmt.Sprintf("https://github.com/%s", info.Project) - log.Infof("GitHub Source: %s, branch %s, url: %s", info.Project, info.Branch, projectUrl) + log.Infof("Git Url Source: %s, branch %s", info.Url, info.Branch) - commitHash, err := cloneRepository(projectUrl, info.Branch, clientWebSocket, tempDir) + info.CommitHash, err = cloneRepository(info.Url, info.Branch, clientWebSocket, tempDir) if err != nil { return "", tempDir, err } @@ -378,11 +443,9 @@ func getGitHubSource(clientWebSocket *websocket.Conn, tempDir string, msg Socket sendEvent(clientWebSocket, EVENT_CLONED) // Return a string that can be added to the manifest as an application env var to trace where the source originated + info.Timestamp = time.Now().Unix() stratosProject := StratosProject{ - Url: projectUrl, - CommitHash: commitHash, - Branch: info.Branch, - Timestamp: time.Now().Unix(), + DeploySource: info, } marshalledJson, _ := json.Marshal(stratosProject) @@ -532,22 +595,22 @@ func (cfAppPush *CFAppPush) getConfigData(echoContext echo.Context, cnsiGuid str func cloneRepository(repoUrl string, branch string, clientWebSocket *websocket.Conn, tempDir string) (string, error) { + if len(branch) == 0 { + err := errors.New("No branch supplied") + log.Infof("Failed to checkout repo %s due to %+v", branch, repoUrl, err) + sendErrorMessage(clientWebSocket, err, CLOSE_FAILED_NO_BRANCH) + return "", err + } + vcsGit := GetVCS() - err := vcsGit.Create(tempDir, repoUrl) + err := vcsGit.Create(tempDir, repoUrl, branch) if err != nil { log.Infof("Failed to clone repo %s due to %+v", repoUrl, err) sendErrorMessage(clientWebSocket, err, CLOSE_FAILED_CLONE) return "", err } - err = vcsGit.Checkout(tempDir, branch) - if err != nil { - log.Infof("Failed to checkout %s branch in repo %s due to %+v", branch, repoUrl, err) - sendErrorMessage(clientWebSocket, err, CLOSE_FAILED_NO_BRANCH) - return "", err - } - head, err := vcsGit.Head(tempDir) if err != nil { log.Infof("Unable to fetch HEAD in branch due to %s", err) diff --git a/components/cf-app-push/backend/main.go b/components/cf-app-push/backend/main.go index 289a53ca97..0984e0708d 100644 --- a/components/cf-app-push/backend/main.go +++ b/components/cf-app-push/backend/main.go @@ -5,8 +5,8 @@ import ( "code.cloudfoundry.org/cli/cf/commands/application" "code.cloudfoundry.org/cli/cf/flags" - "github.com/labstack/echo" "github.com/SUSE/stratos-ui/components/app-core/backend/repository/interfaces" + "github.com/labstack/echo" ) type CFAppPush struct { diff --git a/components/cf-app-push/backend/vcs.go b/components/cf-app-push/backend/vcs.go index a4cec00bf1..a5ae021a1d 100644 --- a/components/cf-app-push/backend/vcs.go +++ b/components/cf-app-push/backend/vcs.go @@ -1,4 +1,5 @@ package main + // Based on https://github.com/golang/go/blob/master/src/cmd/go/internal/get/vcs.go import ( @@ -13,7 +14,7 @@ import ( var vcsGit = &vcsCmd{ name: "Git", cmd: "git", - createCmd: []string{"clone {repo} {dir}"}, + createCmd: []string{"clone -b {branch} {repo} {dir}"}, checkoutCmd: []string{"checkout refs/remotes/origin/{branch}"}, headCmd: []string{"rev-parse HEAD"}, } @@ -24,17 +25,17 @@ func GetVCS() *vcsCmd { } type vcsCmd struct { - name string - cmd string // name of binary to invoke command + name string + cmd string // name of binary to invoke command createCmd []string // commands to download a fresh copy of a repository checkoutCmd []string // commands to checkout a branch headCmd []string // get current head commit } -func (vcs *vcsCmd) Create(dir string, repo string) error { +func (vcs *vcsCmd) Create(dir string, repo string, branch string) error { for _, cmd := range vcs.createCmd { - if err := vcs.run(".", cmd, "dir", dir, "repo", repo); err != nil { + if err := vcs.run(".", cmd, "dir", dir, "repo", repo, "branch", branch); err != nil { return err } } @@ -72,7 +73,7 @@ func (v *vcsCmd) run1(dir string, cmdline string, keyval []string, verbose bool) m := make(map[string]string) for i := 0; i < len(keyval); i += 2 { - m[keyval[i]] = keyval[i + 1] + m[keyval[i]] = keyval[i+1] } args := strings.Fields(cmdline) for i, arg := range args { @@ -102,7 +103,7 @@ func (v *vcsCmd) run1(dir string, cmdline string, keyval []string, verbose bool) func expand(match map[string]string, s string) string { for k, v := range match { - s = strings.Replace(s, "{" + k + "}", v, -1) + s = strings.Replace(s, "{"+k+"}", v, -1) } return s } @@ -113,7 +114,7 @@ func EnvForDir(dir string, base []string) []string { func MergeEnvLists(in, out []string) []string { out = append([]string(nil), out...) - NextVar: +NextVar: for _, inkv := range in { k := strings.SplitAfterN(inkv, "=", 2)[0] for i, outkv := range out { diff --git a/components/cf-app-push/frontend/i18n/en_US/app-push.json b/components/cf-app-push/frontend/i18n/en_US/app-push.json index 0be3c74a58..9f01dbcf6b 100644 --- a/components/cf-app-push/frontend/i18n/en_US/app-push.json +++ b/components/cf-app-push/frontend/i18n/en_US/app-push.json @@ -14,16 +14,33 @@ "title": "Source", "choose-label": "Source Type", "choose-placeholder": "Select the source type", - "github": { - "label": "Public Github", - "project-label": "Project", - "project-placeholder": "suse/stratos-ui", - "project-not-found": "Project not found", - "branch-label": "Project Branch", - "branch-placeholder": "Select Branch", - "branch-last-commit": "", - "branch-last-commit-date": "", - "branch-last-commit-committer": "" + "git": { + "git": "Git", + "github": { + "github": "Public Github", + "project-label": "Project", + "project-placeholder": "suse/stratos-ui", + "project-not-found": "Project not found", + "branch-label": "Branch", + "branch-placeholder": "Select Branch", + "branch-last-commit": "", + "branch-last-commit-date": "", + "branch-last-commit-committer": "" + }, + "gitUrl": { + "gitUrl": "Public Git URL", + "url": { + "url": "URL", + "placeholder": "HTTPS URL of git repository", + "error-required": "URL is required", + "error-pattern": "Invalid URL" + }, + "branch": { + "branch": "Branch Name", + "placeholder": "Branch name will decrease clone time", + "error-required": "Branch is required" + } + } }, "source": { "file": "Select a source or drag and drop a GitHub url or an archive file", @@ -64,8 +81,8 @@ }, "socket": { "event-type": { - "CLOSE_FAILED_NO_BRANCH": "Failed to clone repository (invalid branch), please ensure github details are correct", - "CLOSE_FAILED_CLONE": "Failed to clone repository, please ensure github details are correct and try again", + "CLOSE_FAILED_NO_BRANCH": "Failed to clone repository (no branch supplied), please ensure git details are correct", + "CLOSE_FAILED_CLONE": "Failed to clone repository, please ensure git details are correct and try again", "CLOSE_FAILURE": "Unknown failure. See log for more information.", "CLOSE_INVALID_MANIFEST": "Invalid manifest", "CLOSE_NO_MANIFEST": "Failed to find manifest", diff --git a/components/cf-app-push/frontend/src/plugin.config.js b/components/cf-app-push/frontend/src/plugin.config.js index 781c18ec62..30b1548eef 100644 --- a/components/cf-app-push/frontend/src/plugin.config.js +++ b/components/cf-app-push/frontend/src/plugin.config.js @@ -4,9 +4,9 @@ // register this plugin application to the platform if (env && env.registerApplication) { env.registerApplication( - 'cfAppPush', // plugin application identity - 'cf-app-push', // plugin application's root angular module name - 'plugins/cf-app-push/', // plugin application's base path + 'cfAppPush', // plugin application identity + 'cf-app-push', // plugin application's root angular module name + 'plugins/cf-app-push/', // plugin application's base path '' // plugin applications's start state ); } diff --git a/components/cf-app-push/frontend/src/view/deploy-app-workflow/deploy-app.scss b/components/cf-app-push/frontend/src/view/deploy-app-workflow/deploy-app.scss index 7646693b90..f68ac31547 100644 --- a/components/cf-app-push/frontend/src/view/deploy-app-workflow/deploy-app.scss +++ b/components/cf-app-push/frontend/src/view/deploy-app-workflow/deploy-app.scss @@ -1,4 +1,4 @@ -$deploy-app-step-height: 350px; +$deploy-app-step-height: 392px; $deploy-app-step-padding-bottom: 6px; @import "deploy-step-deploying/deploy-step-deploying"; diff --git a/components/cf-app-push/frontend/src/view/deploy-app-workflow/deploy-app.service.js b/components/cf-app-push/frontend/src/view/deploy-app-workflow/deploy-app.service.js index 983da52609..2967b659fc 100644 --- a/components/cf-app-push/frontend/src/view/deploy-app-workflow/deploy-app.service.js +++ b/components/cf-app-push/frontend/src/view/deploy-app-workflow/deploy-app.service.js @@ -82,7 +82,7 @@ * @param {object} appDeployStepDeployingService - Service to provide the deploying step */ function DeployAppController($scope, $uibModalInstance, $state, appDeployStepDestinationService, - appDeployStepSourceService, appDeployStepDeployingService) { + appDeployStepSourceService, appDeployStepDeployingService) { var vm = this; @@ -95,7 +95,7 @@ }, wizard: { allowBack: true, - sourceType: 'github' + sourceType: 'git' } }; diff --git a/components/cf-app-push/frontend/src/view/deploy-app-workflow/deploy-step-deploying/deploy-step-deploying.service.js b/components/cf-app-push/frontend/src/view/deploy-app-workflow/deploy-step-deploying/deploy-step-deploying.service.js index a6fd8a36ba..4529e8fc4a 100644 --- a/components/cf-app-push/frontend/src/view/deploy-app-workflow/deploy-step-deploying/deploy-step-deploying.service.js +++ b/components/cf-app-push/frontend/src/view/deploy-app-workflow/deploy-step-deploying/deploy-step-deploying.service.js @@ -42,7 +42,8 @@ SOURCE_FOLDER: 30002, SOURCE_FILE: 30003, SOURCE_FILE_DATA: 30004, - SOURCE_FILE_ACK: 30005 + SOURCE_FILE_ACK: 30005, + SOURCE_GITURL: 30006 }; // How often to check for the app being created @@ -176,17 +177,26 @@ } function sendSourceMetadata() { - if (wizardData.sourceType === 'github') { - sendGitHubSourceMetadata(); + if (wizardData.sourceType === 'git') { + sendGitMetadata(); } else if (wizardData.sourceType === 'local') { sendLocalSourceMetadata(); } } + function sendGitMetadata() { + if (sourceUserInput.gitType === 'github') { + sendGitHubSourceMetadata(); + } else if (sourceUserInput.gitType === 'giturl') { + sendGitUrlSourceMetadata(); + } + } + function sendGitHubSourceMetadata() { var github = { project: sourceUserInput.githubProject, - branch: sourceUserInput.githubBranch.name + branch: sourceUserInput.githubBranch.name, + type: sourceUserInput.gitType }; var msg = { @@ -199,6 +209,23 @@ data.webSocket.send(angular.toJson(msg)); } + function sendGitUrlSourceMetadata() { + var giturl = { + url: sourceUserInput.gitUrl, + branch: sourceUserInput.gitUrlBranch, + type: sourceUserInput.gitType + }; + + var msg = { + message: angular.toJson(giturl), + timestamp: Math.round((new Date()).getTime() / 1000), + type: socketEventTypes.SOURCE_GITURL + }; + + // Send the source metadata + data.webSocket.send(angular.toJson(msg)); + } + function sendLocalSourceMetadata() { var metadata = { files: [], @@ -209,6 +236,7 @@ sourceUserInput.fileTransfers = metadata.files; metadata.files = metadata.files.length; + metadata.type = 'filefolder'; data.uploadingFiles = { remaining: metadata.files, bytes: 0, diff --git a/components/cf-app-push/frontend/src/view/deploy-app-workflow/deploy-step-source/deploy-source-git/deploy-source-git.directive.js b/components/cf-app-push/frontend/src/view/deploy-app-workflow/deploy-step-source/deploy-source-git/deploy-source-git.directive.js index 653a24b46f..ea65d92ca7 100644 --- a/components/cf-app-push/frontend/src/view/deploy-app-workflow/deploy-step-source/deploy-source-git/deploy-source-git.directive.js +++ b/components/cf-app-push/frontend/src/view/deploy-app-workflow/deploy-step-source/deploy-source-git/deploy-source-git.directive.js @@ -9,8 +9,8 @@ * @namespace cf-app-push.accountActions * @memberof cf-app-push * @name DeploySourceGit - * @description ???????? - * @returns {object} The ???????? directive definition object + * @description Directive to aid user in selecting a git source for their application + * @returns {object} The DeploySourceGit directive definition object */ function DeploySourceGit() { return { @@ -42,6 +42,15 @@ githubBranches: [] }; + vm.userInput.gitType = vm.userInput.gitType || 'github'; + vm.userInput.gitUrlBranch = vm.userInput.gitUrlBranch || 'master'; + + vm.isGithub = isGithub; + vm.isGitUrl = isGitUrl; + // For now mandate https (pp container does not support ssh) + vm.gitUrlRegEx = /https:(\/\/)?(.*?)(\.git)(\/?|\#[-\d\w._]+?)$/; + // vm.gitUrlRegEx = /(?:git|ssh|https?|git@[-\w.]+):(\/\/)?(.*?)(\.git)(\/?|\#[-\d\w._]+?)$/; + var gitHubUrlBase = 'https://github.com/'; var debounceGithubProjectFetch = _.debounce(function () { @@ -90,25 +99,21 @@ }, 1000); $scope.$watch(function () { - return vm.userInput.githubProjectValid && - vm.userInput.githubProject && + var gitType = vm.userInput.gitType; + var gitHub = vm.userInput.githubProject && vm.userInput.githubBranch && - vm.userInput.githubBranch.name; - }, function (newVal) { - vm.valid = newVal; - }); + vm.userInput.githubBranch.name || false; + var gitUrl = vm.userInput.gitUrl && vm.userInput.gitUrlBranch || false; + return gitType.toString() + gitHub.toString() + gitUrl.toString(); + }, updateValid); - $scope.$watch(function () { - return vm.userInput.githubProject; - }, function (newVal, oldVal) { + $scope.$watch('dplyGitCtrl.userInput.githubProject', function (newVal, oldVal) { if (oldVal !== newVal) { debounceGithubProjectFetch(); } }); - $scope.$watch(function () { - return vm.userInput.githubBranch; - }, function (newVal, oldVal) { + $scope.$watch('dplyGitCtrl.userInput.githubBranch', function (newVal, oldVal) { if (newVal && oldVal !== newVal) { $http.get('https://api.github.com/repos/' + vm.userInput.githubProject + '/commits/' + newVal.commit.sha) .then(function (response) { @@ -120,14 +125,21 @@ } }); - $scope.$watch(function () { - return vm.dropInfo; - }, function (newVal, oldVal) { + $scope.$watch('dplyGitCtrl.dropInfo', function (newVal, oldVal) { if (oldVal !== newVal) { var info = newVal; - // Check if this is a GitHub link - if (angular.isString(info.value) && info.value.toLowerCase().indexOf(gitHubUrlBase) === 0) { - vm.sourceType = 'github'; + if (!info.isWebLink || !angular.isString(info.value)) { + return; + } + + if (vm.gitUrlRegEx.test(info.value)) { + vm.sourceType = 'git'; + vm.userInput.gitType = 'giturl'; + vm.userInput.gitUrl = info.value; + } else if (info.value.toLowerCase().indexOf(gitHubUrlBase) === 0) { + // Check if this is a GitHub link + vm.sourceType = 'git'; + vm.userInput.gitType = 'github'; var urlParts = info.value.substring(gitHubUrlBase.length).split('/'); if (urlParts.length > 1) { var branch; @@ -147,6 +159,14 @@ } }); + function isGithub() { + return vm.userInput.gitType === 'github'; + } + + function isGitUrl() { + return vm.userInput.gitType === 'giturl'; + } + function selectBranch(branch) { var foundBranch = _.find(vm.data.githubBranches, function (o) { return o.value && o.value.name === branch; @@ -154,6 +174,31 @@ vm.userInput.githubBranch = foundBranch ? foundBranch.value : undefined; } + function isGitUrlValid() { + return $scope.formGitUrl.$valid; + } + + function isGithubValid() { + return vm.userInput.githubProjectValid && + vm.userInput.githubProject && + vm.userInput.githubBranch && + vm.userInput.githubBranch.name; + } + + function updateValid() { + switch (vm.userInput.gitType) { + case 'giturl': + vm.valid = !!isGitUrlValid(); + break; + case 'github': + vm.valid = !!isGithubValid(); + break; + default: + vm.valid = false; + break; + } + } + } })(); diff --git a/components/cf-app-push/frontend/src/view/deploy-app-workflow/deploy-step-source/deploy-source-git/deploy-source-git.html b/components/cf-app-push/frontend/src/view/deploy-app-workflow/deploy-step-source/deploy-source-git/deploy-source-git.html index 1a4f490b52..995520deb8 100644 --- a/components/cf-app-push/frontend/src/view/deploy-app-workflow/deploy-step-source/deploy-source-git/deploy-source-git.html +++ b/components/cf-app-push/frontend/src/view/deploy-app-workflow/deploy-step-source/deploy-source-git/deploy-source-git.html @@ -1,22 +1,27 @@
+
+ +
- + ng-class="{'has-error': dplyGitCtrl.isGithub() && dplyGitCtrl.userInput.githubProjectValid === false, 'form-group-disabled': !dplyGitCtrl.isGithub()}"> + - deploy-app-dialog.step-source.github.project-not-found - + deploy-app-dialog.step-source.git.github.project-not-found + + placeholder="{{'deploy-app-dialog.step-source.git.github.project-placeholder' | translate}}" + />
-
- +
+
@@ -43,17 +48,17 @@
- deploy-app-dialog.step-source.github.branch-last-commit + deploy-app-dialog.step-source.git.github.branch-last-commit {{ dplyGitCtrl.data.githubCommit.sha | limitTo:6}} {{ dplyGitCtrl.data.githubCommit.commit.message | limitTo:50}}...
- deploy-app-dialog.step-source.github.branch-last-commit-committer{{ dplyGitCtrl.data.githubCommit.author.login || dplyGitCtrl.data.githubCommit.commit.author.name}} + deploy-app-dialog.step-source.git.github.branch-last-commit-committer{{ dplyGitCtrl.data.githubCommit.author.login || dplyGitCtrl.data.githubCommit.commit.author.name}}
- deploy-app-dialog.step-source.github.branch-last-commit-date {{ dplyGitCtrl.data.githubCommit.commit.author.date | momentDateFormat }} + deploy-app-dialog.step-source.git.github.branch-last-commit-date {{ dplyGitCtrl.data.githubCommit.commit.author.date | momentDateFormat }}
@@ -61,4 +66,37 @@
+
+
+ +
+
+ +
+ deploy-app-dialog.step-source.git.gitUrl.url.error-required + deploy-app-dialog.step-source.git.gitUrl.url.error-pattern +
+ +
+
+ +
+ deploy-app-dialog.step-source.git.gitUrl.branch.error-required +
+ +
+
\ No newline at end of file diff --git a/components/cf-app-push/frontend/src/view/deploy-app-workflow/deploy-step-source/deploy-source-git/deploy-source-git.scss b/components/cf-app-push/frontend/src/view/deploy-app-workflow/deploy-step-source/deploy-source-git/deploy-source-git.scss index 70b1a41742..d2830d4306 100644 --- a/components/cf-app-push/frontend/src/view/deploy-app-workflow/deploy-step-source/deploy-source-git/deploy-source-git.scss +++ b/components/cf-app-push/frontend/src/view/deploy-app-workflow/deploy-step-source/deploy-source-git/deploy-source-git.scss @@ -15,90 +15,100 @@ $select-option-height: 39px; max-height: $select-option-height * 3; } } - } - .deploy-app-source-details { + .deploy-app-source-details { - &.deploy-app-invisible { - visibility: hidden; - } + &.deploy-app-invisible { + visibility: hidden; + } - &.deploy-app-github-details { - margin-top: $console-unit-space / 2; + &.deploy-app-github-details { + margin-top: $console-unit-space / 2; - .deploy-app-github-info { - border: 1px solid $rule; - padding: $console-unit-space / 4 $console-unit-space / 2; - max-width: $console-input-width * 1.25; + .deploy-app-github-info { + border: 1px solid $rule; + padding: $console-unit-space / 4 $console-unit-space / 2; + max-width: $console-input-width * 1.25; - &.deploy-app-file-details { - height: $console-input-height; - display: flex; - align-items: center; - padding-left: 18px; + &.deploy-app-file-details { + height: $console-input-height; + display: flex; + align-items: center; + padding-left: 18px; - > p { - margin: 0; - } + > p { + margin: 0; + } - > i { - margin-right: 6px; + > i { + margin-right: 6px; + } } - } - - img { - height: $github-avatar-height; - width: $github-avatar-width; - } - - .project { - display: flex; - flex-direction: row; - align-items: center; - .project-info { - padding-left: $console-unit-space / 2; + img { + height: $github-avatar-height; + width: $github-avatar-width; } - } - .lastCommit { - display: flex; - flex-direction: row; - align-items: center; - overflow-x: hidden; + .project { + display: flex; + flex-direction: row; + align-items: center; - padding-top: $github-info-commit-spacer; + .project-info { + padding-left: $console-unit-space / 2; + } + } - .lastCommit-info { - padding-left: $console-unit-space / 2; - flex: 1; + .lastCommit { display: flex; - flex-direction: column; + flex-direction: row; + align-items: center; overflow-x: hidden; - > .lastCommit-info-commit-message { + padding-top: $github-info-commit-spacer; + + .lastCommit-info { + padding-left: $console-unit-space / 2; + flex: 1; display: flex; + flex-direction: column; + overflow-x: hidden; + + > .lastCommit-info-commit-message { + display: flex; - > a { - text-overflow: ellipsis; - white-space: nowrap; - overflow-x: hidden; + > a { + text-overflow: ellipsis; + white-space: nowrap; + overflow-x: hidden; + } } - } - .lastCommit-date-committer { - display: flex; + .lastCommit-date-committer { + display: flex; - > .lastCommitter { - flex: 1; + > .lastCommitter { + flex: 1; + } } } } } + } } + } + .deploy-app-git-url-form { + padding-left: $console-unit-space; + } + + .deploy-app-github-form, .deploy-app-git-url-form { + radio-input { + padding-bottom: $console-unit-space / 2; + } } } } diff --git a/components/cf-app-push/frontend/src/view/deploy-app-workflow/deploy-step-source/deploy-step-source.html b/components/cf-app-push/frontend/src/view/deploy-app-workflow/deploy-step-source/deploy-step-source.html index 6f89cf5cb8..02822a6cdf 100644 --- a/components/cf-app-push/frontend/src/view/deploy-app-workflow/deploy-step-source/deploy-step-source.html +++ b/components/cf-app-push/frontend/src/view/deploy-app-workflow/deploy-step-source/deploy-step-source.html @@ -16,7 +16,7 @@
+ ng-show="step.wizard.sourceType === 'git'"> 0; } function filterByText(text) { text = text.toLowerCase(); - model.filteredApplications = _.filter(model.cachedApplications, function (app) { + model.filteredApplications = _.filter(model.filteredApplications, function (app) { if (app.entity.name.toLowerCase().indexOf(text) > -1) { return app; } diff --git a/components/cloud-foundry/frontend/src/model/model-utils.service.js b/components/cloud-foundry/frontend/src/model/model-utils.service.js index b87a3b5108..151a2aded5 100644 --- a/components/cloud-foundry/frontend/src/model/model-utils.service.js +++ b/components/cloud-foundry/frontend/src/model/model-utils.service.js @@ -33,10 +33,10 @@ * @returns {object} the $http service http config */ function makeHttpConfig(cnsiGuid) { - var headers = {'x-cnap-cnsi-list': cnsiGuid}; + var headers = {'x-cap-cnsi-list': cnsiGuid}; // Add passthrough header angular.extend(headers, { - 'x-cnap-passthrough': 'true' + 'x-cap-passthrough': 'true' }); return { headers: headers diff --git a/components/cloud-foundry/frontend/src/model/model.module.js b/components/cloud-foundry/frontend/src/model/model.module.js index e2138480a6..f04529c225 100644 --- a/components/cloud-foundry/frontend/src/model/model.module.js +++ b/components/cloud-foundry/frontend/src/model/model.module.js @@ -10,7 +10,7 @@ /** * @name interceptor - * @description A $http interceptor that adds `x-cnap-cnsi-list` + * @description A $http interceptor that adds `x-cap-cnsi-list` * header to each request if the CNSI guid is present in the * URL (route). * @param {object} $stateParams - the UI router $stateParams service @@ -27,8 +27,8 @@ } var cnsiGuid = $stateParams.cnsiGuid; - if (angular.isUndefined(config.headers['x-cnap-cnsi-list']) && angular.isDefined(cnsiGuid)) { - config.headers['x-cnap-cnsi-list'] = cnsiGuid; + if (angular.isUndefined(config.headers['x-cap-cnsi-list']) && angular.isDefined(cnsiGuid)) { + config.headers['x-cap-cnsi-list'] = cnsiGuid; } return config; } diff --git a/components/cloud-foundry/frontend/src/model/space.model.js b/components/cloud-foundry/frontend/src/model/space.model.js index e265ec5805..a0ca48f0cb 100644 --- a/components/cloud-foundry/frontend/src/model/space.model.js +++ b/components/cloud-foundry/frontend/src/model/space.model.js @@ -438,10 +438,10 @@ * @public */ function updateRoutesCount(cnsiGuid, guid, count) { - var promise = $q.resolve({data: {total_results: count}}); + var promise = $q.resolve({ data: { total_results: count } }); if (!count) { promise = apiManager.retrieve('cloud-foundry.api.Spaces') - .ListAllRoutesForSpace(guid, {'results-per-page': 1}, modelUtils.makeHttpConfig(cnsiGuid)); + .ListAllRoutesForSpace(guid, { 'results-per-page': 1 }, modelUtils.makeHttpConfig(cnsiGuid)); } return promise.then(function (response) { _.set(model, 'spaces.' + cnsiGuid + '.' + guid + '.details.totalRoutes', response.data.total_results); @@ -461,10 +461,10 @@ * @public */ function updateServiceInstanceCount(cnsiGuid, guid, count) { - var promise = $q.resolve({data: {total_results: count}}); + var promise = $q.resolve({ data: { total_results: count } }); if (!count) { promise = apiManager.retrieve('cloud-foundry.api.Spaces') - .ListAllServiceInstancesForSpace(guid, {'results-per-page': 1}, modelUtils.makeHttpConfig(cnsiGuid)); + .ListAllServiceInstancesForSpace(guid, { 'results-per-page': 1 }, modelUtils.makeHttpConfig(cnsiGuid)); } return promise.then(function (response) { _.set(model, 'spaces.' + cnsiGuid + '.' + guid + '.details.totalServiceInstances', response.data.total_results); @@ -484,10 +484,10 @@ * @public */ function updateServiceCount(cnsiGuid, guid, count) { - var promise = $q.resolve({data: {total_results: count}}); + var promise = $q.resolve({ data: { total_results: count } }); if (!count) { promise = apiManager.retrieve('cloud-foundry.api.Spaces') - .ListAllServicesForSpace(guid, {'results-per-page': 1}, modelUtils.makeHttpConfig(cnsiGuid)); + .ListAllServicesForSpace(guid, { 'results-per-page': 1 }, modelUtils.makeHttpConfig(cnsiGuid)); } return promise.then(function (response) { _.set(model, 'spaces.' + cnsiGuid + '.' + guid + '.details.totalServices', response.data.total_results); @@ -732,11 +732,10 @@ var updateData = { allow_ssh: enabled }; - return spaceApi.UpdateSpace(spaceGuid, updateData, null, - modelUtils.makeHttpConfig(cnsiGuid)).then(function (response) { - // Refresh the space itself - return getSpaceDetails(cnsiGuid, response.data); - }); + return spaceApi.UpdateSpace(spaceGuid, updateData, null, modelUtils.makeHttpConfig(cnsiGuid)).then(function (response) { + // Refresh the space itself + return getSpaceDetails(cnsiGuid, response.data); + }); } } diff --git a/components/cloud-foundry/frontend/src/plugin.config.js b/components/cloud-foundry/frontend/src/plugin.config.js index 6ac7a61922..5316883568 100644 --- a/components/cloud-foundry/frontend/src/plugin.config.js +++ b/components/cloud-foundry/frontend/src/plugin.config.js @@ -4,9 +4,9 @@ // register this plugin application to the platform if (env && env.registerApplication) { env.registerApplication( - 'cloudFoundry', // plugin application identity - 'cloud-foundry', // plugin application's root angular module name - 'plugins/cloud-foundry/', // plugin application's base path + 'cloudFoundry', // plugin application identity + 'cloud-foundry', // plugin application's root angular module name + 'plugins/cloud-foundry/', // plugin application's base path 'cf.applications.list.gallery-view' // plugin applications's start state ); } diff --git a/components/cloud-foundry/frontend/src/services/app-wall-actions.service.js b/components/cloud-foundry/frontend/src/services/app-wall-actions.service.js index 3fa057e699..549957b056 100644 --- a/components/cloud-foundry/frontend/src/services/app-wall-actions.service.js +++ b/components/cloud-foundry/frontend/src/services/app-wall-actions.service.js @@ -39,13 +39,22 @@ return false; }, execute: function addApplication() { + var reload = _.get(this.context, 'reload'); frameworkDetailView( { templateUrl: 'plugins/cloud-foundry/view/applications/workflows/add-app-workflow/add-app-dialog.html', dialog: true, - class: 'dialog-form-large' + class: 'dialog-form-large', + hideClose: true } - ); + ).result.then(function (result) { + // Do we need to reload the app collection to show the newly added app? This would be the case where + // the route was not created/binded successfully + if (_.get(result, 'reload') && angular.isFunction(reload)) { + // Note - this won't show the app if the user selected a different cluster/org/guid than that of the filter + reload(); + } + }); } }); diff --git a/components/cloud-foundry/frontend/src/services/cfServiceEndpoint.services.js b/components/cloud-foundry/frontend/src/services/cfServiceEndpoint.services.js index cfd706285c..d9026b6aae 100644 --- a/components/cloud-foundry/frontend/src/services/cfServiceEndpoint.services.js +++ b/components/cloud-foundry/frontend/src/services/cfServiceEndpoint.services.js @@ -67,7 +67,7 @@ function refreshToken(allServiceInstances) { var cfInfoApi = apiManager.retrieve('cloud-foundry.api.Info'); var cfGuids = _.map(_.filter(allServiceInstances, {cnsi_type: service.cnsi_type}) || [], 'guid') || []; - var cfCfg = {headers: {'x-cnap-cnsi-list': cfGuids.join(',')}}; + var cfCfg = {headers: {'x-cap-cnsi-list': cfGuids.join(',')}}; if (cfGuids.length > 0) { return cfInfoApi.GetInfo({}, cfCfg).then(function (response) { return response.data || {}; diff --git a/components/cloud-foundry/frontend/src/view/applications/application/application.module.js b/components/cloud-foundry/frontend/src/view/applications/application/application.module.js index f9f8ef6f14..6549ba2b38 100644 --- a/components/cloud-foundry/frontend/src/view/applications/application/application.module.js +++ b/components/cloud-foundry/frontend/src/view/applications/application/application.module.js @@ -6,6 +6,7 @@ 'cloud-foundry.view.applications.application.summary', 'cloud-foundry.view.applications.application.log-stream', 'cloud-foundry.view.applications.application.services', + 'cloud-foundry.view.applications.application.service-catalogue', 'cloud-foundry.view.applications.application.variables', 'cloud-foundry.view.applications.application.events' ]) @@ -48,8 +49,8 @@ * @property {object} frameworkDialogConfirm - the confirm dialog service */ function ApplicationController(modelManager, appEventService, frameworkDialogConfirm, appUtilsService, - cfAppCliCommands, frameworkDetailView, $stateParams, $scope, $window, $q, $interval, - $translate, $state, cfApplicationTabs) { + cfAppCliCommands, frameworkDetailView, $stateParams, $scope, $window, $q, $interval, + $translate, $state, cfApplicationTabs) { var vm = this; var authModel = modelManager.retrieve('cloud-foundry.model.auth'); diff --git a/components/cloud-foundry/frontend/src/view/applications/application/application.scss b/components/cloud-foundry/frontend/src/view/applications/application/application.scss index 79fb663019..321260c82c 100644 --- a/components/cloud-foundry/frontend/src/view/applications/application/application.scss +++ b/components/cloud-foundry/frontend/src/view/applications/application/application.scss @@ -1,4 +1,5 @@ @import 'services/services', + 'service-catalogue/service-catalogue', 'summary/summary', 'log-stream/cf-log-viewer', 'variables/variables'; @@ -47,7 +48,7 @@ cursor: pointer; } } - + } .application-header { diff --git a/components/cloud-foundry/frontend/src/view/applications/application/log-stream/log-stream.module.js b/components/cloud-foundry/frontend/src/view/applications/application/log-stream/log-stream.module.js index 1562bb6c38..f21a8c5b67 100644 --- a/components/cloud-foundry/frontend/src/view/applications/application/log-stream/log-stream.module.js +++ b/components/cloud-foundry/frontend/src/view/applications/application/log-stream/log-stream.module.js @@ -2,11 +2,9 @@ 'use strict'; angular - .module('cloud-foundry.view.applications.application.log-stream', - [ + .module('cloud-foundry.view.applications.application.log-stream', [ 'cloud-foundry.view.applications.application.log-stream.cfLogViewer', - 'cloud-foundry.view.applications.application.log-stream.cfLogViewerReize' - ]) + 'cloud-foundry.view.applications.application.log-stream.cfLogViewerReize']) .config(registerRoute) .run(registerAppTab); @@ -25,7 +23,7 @@ hide: false, uiSref: 'cf.applications.application.log-stream', uiSrefParam: function () { - return {guid: $stateParams.guid}; + return { guid: $stateParams.guid }; }, label: 'app.app-info.app-tabs.log-stream.label' }); diff --git a/components/cloud-foundry/frontend/src/view/applications/application/service-catalogue/service-catalogue-card/service-catalogue-card.directive.js b/components/cloud-foundry/frontend/src/view/applications/application/service-catalogue/service-catalogue-card/service-catalogue-card.directive.js new file mode 100644 index 0000000000..dd9e78a071 --- /dev/null +++ b/components/cloud-foundry/frontend/src/view/applications/application/service-catalogue/service-catalogue-card/service-catalogue-card.directive.js @@ -0,0 +1,156 @@ +(function () { + 'use strict'; + + angular + .module('cloud-foundry.view.applications.application.service-catalogue') + .directive('serviceCatalogueCard', serviceCatalogueCard); + + /** + * @memberof cloud-foundry.view.applications.application.services + * @name serviceCatalogueCard + * @description The service card directive + * @returns {object} The service card directive definition object + */ + function serviceCatalogueCard() { + return { + bindToController: { + app: '=', + cnsiGuid: '=', + service: '=', + addOnly: '=?' + }, + controller: ServiceCatalogueCardController, + controllerAs: 'serviceCatalogueCardCtrl', + restrict: 'E', + scope: {}, + templateUrl: 'plugins/cloud-foundry/view/applications/application/service-catalogue/service-catalogue-card/service-catalogue-card.html' + }; + } + + /** + * @memberof cloud-foundry.view.applications.application.services.serviceCatalogueCard + * @name serviceCatalogueCardController + * @description Controller for service card directive + * @constructor + * @param {object} $scope - the Angular $scope service + * @param {app.model.modelManager} modelManager - the application model manager + * @param {app.utils.appEventService} appEventService - the event management service + * @property {app.utils.appEventService} appEventService - the event management service + * @property {object} cfServiceInstanceService - the service instance service + * @property {cloud-foundry.model.service-binding} bindingModel - the Cloud Foundry service binding model + * @property {boolean} allowAddOnly - allow adding services only (no manage or detach) + * @property {array} serviceBindings - the service instances bound to specified app + * @property {number} numAttached - the number of service instances bound to specified app + * @property {array} actions - the actions that can be performed from vm.service card + */ + function ServiceCatalogueCardController($scope, modelManager, appEventService) { + var vm = this; + + var bindingModel = modelManager.retrieve('cloud-foundry.model.service-binding'); + var authModel = modelManager.retrieve('cloud-foundry.model.auth'); + + vm.allowAddOnly = angular.isDefined(vm.addOnly) ? vm.addOnly : false; + vm.numAttached = 0; + vm.serviceBindings = []; + + $scope.$watch(function () { + return vm.app.summary.services; + }, function () { + init(); + }); + + $scope.$watch(function () { + return vm.service; + }, function () { + vm.canBind = vm.service._bindTarget === 'APP'; + }); + + vm.addService = addService; + vm.hideServiceActions = hideServiceActions; + vm.getServiceInstanceGuids = getServiceInstanceGuids; + vm.getServiceBindings = getServiceBindings; + vm.init = init; + + /** + * @function init + * @memberof cloud-foundry.view.applications.application.services.serviceCatalogueCard.serviceCatalogueCardController + * @description Fetch service bindings for this app and update content + * @returns {undefined} + */ + function init() { + var serviceInstances = vm.getServiceInstanceGuids(); + if (serviceInstances.length > 0) { + return vm.getServiceBindings(serviceInstances); + } else { + vm.serviceBindings = []; + } + } + + /** + * @function getServiceInstanceGuids + * @memberof cloud-foundry.view.applications.application.services.serviceCatalogueCard.serviceCatalogueCardController + * @description Get service instances for app + * @returns {array} A list of service instance GUIDs + */ + function getServiceInstanceGuids() { + var serviceInstances = _.chain(vm.app.summary.services) + .filter(function (o) { + return angular.isDefined(o.service_plan) && + o.service_plan.service.guid === vm.service.metadata.guid; + }) + .map('guid') + .value(); + return serviceInstances; + } + + /** + * @function getServiceBindings + * @memberof cloud-foundry.view.applications.application.services.serviceCatalogueCard.serviceCatalogueCardController + * @description Get service bindings for specified service instances + * @param {array} serviceInstanceGuids A list of service instance GUIDs + * @returns {promise} A promise object + */ + function getServiceBindings(serviceInstanceGuids) { + var q = 'service_instance_guid IN ' + serviceInstanceGuids.join(','); + var options = {q: q, 'inline-relations-depth': 1, 'include-relations': 'service_instance'}; + return bindingModel.listAllServiceBindings(vm.cnsiGuid, options) + .then(function (bindings) { + var appGuid = vm.app.summary.guid; + var appBindings = _.filter(bindings, function (o) { + return o.entity.app_guid === appGuid; + }); + vm.serviceBindings = appBindings; + }); + } + + /** + * @function addService + * @memberof cloud-foundry.view.applications.application.services.serviceCatalogueCard.serviceCatalogueCardController + * @description Show the add service detail view + * @returns {undefined} + */ + function addService() { + var config = { + app: vm.app, + cnsiGuid: vm.cnsiGuid, + confirm: !vm.allowAddOnly, + service: vm.service + }; + + appEventService.$emit('cf.events.START_ADD_SERVICE_WORKFLOW', config); + } + + /** + * @function hideServiceActions + * @memberof cloud-foundry.view.applications.application.services.serviceCatalogueCard.serviceCatalogueCardController + * @description Update service actions visibility + * @returns {*} + */ + function hideServiceActions() { + return !authModel.isAllowed(vm.cnsiGuid, + authModel.resources.managed_service_instance, + authModel.actions.create, vm.app.summary.space_guid); + } + } + +})(); diff --git a/components/cloud-foundry/frontend/src/view/applications/application/service-catalogue/service-catalogue-card/service-catalogue-card.html b/components/cloud-foundry/frontend/src/view/applications/application/service-catalogue/service-catalogue-card/service-catalogue-card.html new file mode 100644 index 0000000000..3d233557f3 --- /dev/null +++ b/components/cloud-foundry/frontend/src/view/applications/application/service-catalogue/service-catalogue-card/service-catalogue-card.html @@ -0,0 +1,50 @@ +
+
+ +
+
+
+
+

{{ ::serviceCatalogueCardCtrl.service.entity.label }}

+
+
+
+
app.app-info.app-tabs.services.card.version
+
{{ ::serviceCatalogueCardCtrl.service.entity.extra.Version || serviceCatalogueCardCtrl.service.entity.version || '-'}}
+
+
+
+
+

{{ ::serviceCatalogueCardCtrl.service.entity.extra.LongDescription || serviceCatalogueCardCtrl.service.entity.description }}

+
+
+
+
+ {{ serviceCatalogueCardCtrl.serviceBindings.length }} app.app-info.app-tabs.services.card.attached +
+
+
+
+ app.app-info.app-tabs.service-catalogue.card.cannot-bind +
+
+ {{ serviceCatalogueCardCtrl.serviceBindings.length }} app.app-info.app-tabs.service-catalogue.card.attached +
+ + +
+
+
+
diff --git a/components/cloud-foundry/frontend/src/view/applications/application/service-catalogue/service-catalogue-card/service-catalogue-card.scss b/components/cloud-foundry/frontend/src/view/applications/application/service-catalogue/service-catalogue-card/service-catalogue-card.scss new file mode 100644 index 0000000000..c91ccfc02a --- /dev/null +++ b/components/cloud-foundry/frontend/src/view/applications/application/service-catalogue/service-catalogue-card/service-catalogue-card.scss @@ -0,0 +1,147 @@ +service-catalogue-card { + display: flex; + width: 100%; + + .service-card { + display: flex; + width: 100%; + min-height: $console-unit-space * 5; + + .service-icon { + display: block; + padding: 0; + padding-right: $console-unit-space; + + img { + max-height: $console-unit-space * 4; + max-width: $console-unit-space * 4; + } + } + + .service-block { + display: flex; + flex-grow: 1; + flex-direction: column; + + .service-title { + display: flex; + .service-text { + display: flex; + flex: 1 1 0px; + + h4 { + margin-top: 0; + } + } + + .service-metadata { + display: flex; + padding: 0 $console-unit-space 0 $console-unit-space; + flex: none; + width: 35%; + + dl { + margin: 0; + dt { + display: inline-block; + text-transform: uppercase; + margin-right: $console-unit-space; + + &:not(:first-of-type) { + margin-top: $console-unit-space / 2; + } + } + dd { + display: inline-block; + } + } + } + + @media (max-width: 640px) { + .service-metadata { + display: none; + } + } + + .service-actions-menu { + text-align: right; + width: $console-unit-space * 2; + flex: none; + + .actions-menu { + &.open { + .actions-menu-icon { + color: $brand-primary; + } + + .actions-menu-list { + margin-top: -$console-unit-space / 2; + } + } + + .actions-menu-icon { + font-weight: $console-font-weight-semibold; + line-height: $console-unit-space; + font-size: 1.75em; + } + } + } + + } + + .service-description { + flex-grow: 1; + padding-right: $console-unit-space * 2; + } + + .service-action-block { + display: flex; + + .service-attached-msg { + flex: 1 1 0px; + margin: auto 0; + } + + .service-attached:before { + @extend .material-icons; + content: 'attachment'; + margin-right: $console-unit-space / 4; + vertical-align: bottom; + } + + .service-added:after { + @extend .material-icons; + content: 'attachment'; + margin-left: $console-unit-space / 4; + } + } + + .service-actions { + text-align: right; + + .btn-link { + margin-top: auto; + padding-right: 0; + display: flex; + align-items: center; + + &:hover, + &:focus, + &:active { + text-decoration: none; + outline: 0; + + .add-icon { + border-color: $link-hover-color; + } + } + + .add-icon { + font-size: 20px; + margin-left: $console-unit-space / 4; + } + } + } + } + } +} diff --git a/components/cloud-foundry/frontend/src/view/applications/application/service-catalogue/service-catalogue.html b/components/cloud-foundry/frontend/src/view/applications/application/service-catalogue/service-catalogue.html new file mode 100644 index 0000000000..3ebf560ccf --- /dev/null +++ b/components/cloud-foundry/frontend/src/view/applications/application/service-catalogue/service-catalogue.html @@ -0,0 +1,36 @@ +
+

+ +

app.app-info.app-tabs.service-catalogue.messages.no-services

+

+
+
+ +
+ +
+
+
+
+ + + +
+
+
+ + + + +
+
+
+
+
+ +
+
+ +
+
\ No newline at end of file diff --git a/components/cloud-foundry/frontend/src/view/applications/application/service-catalogue/service-catalogue.module.js b/components/cloud-foundry/frontend/src/view/applications/application/service-catalogue/service-catalogue.module.js new file mode 100644 index 0000000000..c0e0432bca --- /dev/null +++ b/components/cloud-foundry/frontend/src/view/applications/application/service-catalogue/service-catalogue.module.js @@ -0,0 +1,135 @@ +(function () { + 'use strict'; + + angular + .module('cloud-foundry.view.applications.application.service-catalogue', []) + .config(registerRoute) + .run(registerAppTab); + + function registerRoute($stateProvider) { + $stateProvider.state('cf.applications.application.service-catalogue', { + url: '/service-catalogue', + templateUrl: 'plugins/cloud-foundry/view/applications/application/service-catalogue/service-catalogue.html', + controller: ApplicationServiceCatalogueController, + controllerAs: 'applicationServiceCatalogueCtrl' + }); + } + + function registerAppTab($stateParams, cfApplicationTabs) { + cfApplicationTabs.tabs.push({ + position: 10, + hide: false, + uiSref: 'cf.applications.application.service-catalogue', + uiSrefParam: function () { + return {guid: $stateParams.guid}; + }, + label: 'app.app-info.app-tabs.service-catalogue.label' + }); + } + + /** + * @name ApplicationServiceCatalogueController + * @constructor + * @param {object} $scope - the Angular $scope service + * @param {app.model.modelManager} modelManager - the model management service + * @param {object} $stateParams - the UI router $stateParams service + * @property {cloud-foundry.model.space} model - the Cloud Foundry space model + * @property {cloud-foundry.model.application} model - the Cloud Foundry application model + * @property {string} id - the application GUID + * @property {string} cnsiGuid - the CNSI GUID + * @property {array} services - the services for the space + * @property {array} serviceCategories - the service categories to filter by + * @property {string} searchCategory - the category to filter by + * @property {object} search - the search object for filtering + * @property {object} category - the search category object for filtering + */ + function ApplicationServiceCatalogueController($scope, modelManager, $stateParams) { + var that = this; + this.model = modelManager.retrieve('cloud-foundry.model.space'); + this.appModel = modelManager.retrieve('cloud-foundry.model.application'); + this.id = $stateParams.guid; + this.cnsiGuid = $stateParams.cnsiGuid; + this.services = []; + this.serviceCategories = [ + { label: 'app.app-info.app-tabs.service-catalogue.categories.attached', value: 'attached' }, + { label: 'app.app-info.app-tabs.service-catalogue.categories.all', value: 'all' } + ]; + this.searchCategory = 'all'; + this.search = {}; + this.category = { + entity: { + extra: undefined + } + }; + this.ready = false; + + $scope.$watch(function () { + return that.appModel.application.summary.guid; + }, function () { + var summary = that.appModel.application.summary; + var spaceGuid = summary.space_guid; + if (angular.isDefined(spaceGuid)) { + that.model.listAllServicesForSpace(that.cnsiGuid, spaceGuid) + .then(function (services) { + // retrieve categories and attachment data for service filtering + var categories = []; + var attachedServices = _.chain(summary.services) + .filter(function (o) { return angular.isDefined(o.service_plan); }) + .map(function (o) { return o.service_plan.service.guid; }) + .value(); + angular.forEach(services, function (service) { + if (attachedServices.length > 0) { + if (_.includes(attachedServices, service.metadata.guid)) { + service.attached = true; + } + } + + // Parse service entity extra data JSON string + if (!_.isNil(service.entity.extra) && angular.isString(service.entity.extra)) { + service.entity.extra = angular.fromJson(service.entity.extra); + } + + // a service can belong to >1 category, so allow filtering by any of them + if (angular.isObject(service.entity.extra) && angular.isDefined(service.entity.extra.Categories)) { + var _categories = service.entity.extra.Categories; + if (angular.isString(_categories)) { + _categories = [_categories]; + } + var serviceCategories = _.map(_categories, function (o) { + return { + label: o, + value: { Categories: o }, + lower: o.toLowerCase() + }; + }); + categories = _.unionBy(categories, serviceCategories, 'lower'); + } + }); + + that.services.length = 0; + [].push.apply(that.services, services); + + categories = _.sortBy(categories, 'lower'); + that.serviceCategories.length = 2; + [].push.apply(that.serviceCategories, categories); + }) + .finally(function () { + that.ready = true; + }); + } + }); + + $scope.$watch(function () { + return that.searchCategory; + }, function (newSearchCategory) { + if (newSearchCategory === 'attached') { + that.category.entity.extra = undefined; + that.category.attached = true; + } else { + delete that.category.attached; + that.category.entity.extra = newSearchCategory === 'all' ? undefined : newSearchCategory; + } + }); + } + +})(); diff --git a/components/cloud-foundry/frontend/src/view/applications/application/service-catalogue/service-catalogue.scss b/components/cloud-foundry/frontend/src/view/applications/application/service-catalogue/service-catalogue.scss new file mode 100644 index 0000000000..7733a4f265 --- /dev/null +++ b/components/cloud-foundry/frontend/src/view/applications/application/service-catalogue/service-catalogue.scss @@ -0,0 +1,12 @@ +@import "./service-catalogue-card/service-catalogue-card"; + +.service-filter-panel { + .filter-form-group { + flex-grow: 1; + } +} + +.service-panel { + display: flex; + align-items: stretch; +} diff --git a/components/cloud-foundry/frontend/src/view/applications/application/services/manage-services/manage-services.directive.js b/components/cloud-foundry/frontend/src/view/applications/application/services/manage-services/manage-services.directive.js deleted file mode 100644 index 9ce35cd326..0000000000 --- a/components/cloud-foundry/frontend/src/view/applications/application/services/manage-services/manage-services.directive.js +++ /dev/null @@ -1,166 +0,0 @@ -(function () { - 'use strict'; - - angular - .module('cloud-foundry.view.applications') - .directive('manageServices', manageServices); - - /** - * @memberof cloud-foundry.view.applications - * @name manageServices - * @description An manage services detail view - * @returns {object} The manage-services directive definition object - */ - function manageServices() { - return { - controller: ManageServicesController, - controllerAs: 'manageServicesCtrl', - restrict: 'E' - }; - } - - /** - * @memberof cloud-foundry.view.applications - * @name ManageServicesController - * @constructor - * @param {object} $q - the Angular $q service - * @param {object} $scope - the Angular $scope service - * @param {app.model.modelManager} modelManager - the model management service - * @param {app.utils.appEventService} appEventService - the event management service - * @param {app.framework.widgets.frameworkDetailView} frameworkDetailView - the detail view service - * @param {object} cfServiceInstanceService - the service instance service - * @property {object} $q - the Angular $q service - * @property {frameworkDetailView} frameworkDetailView - the detail view service - * @property {object} cfServiceInstanceService - the service instance service - * @property {cloud-foundry.model.application} appModel - the CF application model - * @property {object} modal - the detail view modal instance - * @property {array} serviceInstances - service instances associated with this service - * @property {object} serviceBindings - service bindings associated with this app - */ - function ManageServicesController($q, $scope, modelManager, appEventService, frameworkDetailView, cfServiceInstanceService) { - var vm = this; - - var appModel = modelManager.retrieve('cloud-foundry.model.application'); - var modal = null; - - vm.serviceInstances = []; - vm.serviceBindings = {}; - - vm.detach = detach; - vm.viewEnvVariables = viewEnvVariables; - vm.reset = reset; - vm.startManageServices = startManageServices; - vm.getServiceBindings = getServiceBindings; - - var manageServicesEvent = appEventService.$on('cf.events.START_MANAGE_SERVICES', function (event, config) { - $q.when(vm.reset(config)).then(function () { - modal = vm.startManageServices(); - }); - }); - $scope.$on('$destroy', manageServicesEvent); - - /** - * @function reset - * @memberof cloud-foundry.view.applications.ManageServicesController - * @description Reset the view to an initial state - * @param {object} config - data containing app, service, etc. - * @returns {promise} A promise object - */ - function reset(config) { - vm.data = { - app: config.app, - service: config.service, - cnsiGuid: config.cnsiGuid - }; - vm.serviceInstances.length = 0; - vm.serviceBindings = {}; - - var serviceInstances = _.filter(vm.data.app.summary.services, function (o) { - return angular.isDefined(o.service_plan) && - o.service_plan.service.guid === vm.data.service.metadata.guid; - }); - if (serviceInstances.length > 0) { - [].push.apply(vm.serviceInstances, serviceInstances); - - var guids = _.map(vm.serviceInstances, 'guid'); - return vm.getServiceBindings(guids); - } - } - - /** - * @function getServiceBindings - * @memberof cloud-foundry.view.applications.ManageServicesController - * @description Retrieve service bindings for service instances - * @param {array} serviceInstanceGuids - a list of service instance GUIDs - * @returns {promise} A promise object - */ - function getServiceBindings(serviceInstanceGuids) { - - var q = 'service_instance_guid IN ' + serviceInstanceGuids.join(','); - return appModel.listServiceBindings(vm.data.cnsiGuid, vm.data.app.summary.guid, {q: q}) - .then(function (bindings) { - vm.serviceBindings = _.keyBy(bindings, function (o) { - return o.entity.service_instance_guid; - }); - }); - } - - /** - * @function detach - * @memberof cloud-foundry.view.applications.ManageServicesController - * @description Detach service instance - * @param {object} instance - the service instance to detach - * @returns {promise} A promise object - */ - function detach(instance) { - - var binding = vm.serviceBindings[instance.guid]; - return cfServiceInstanceService.unbindServiceFromApp( - vm.data.cnsiGuid, - vm.data.app.summary.guid, - binding.metadata.guid, - instance.name, - function closeOnEmpty() { - _.pull(vm.serviceInstances, instance); - if (vm.serviceInstances.length === 0) { - modal.dismiss('close'); - } - } - ); - } - - /** - * @function viewEnvVariables - * @memberof cloud-foundry.view.applications.ManageServicesController - * @description View environmental variables of service instance - * @param {object} instance - the service instance to view - * @returns {promise} A promise object - */ - function viewEnvVariables(instance) { - return cfServiceInstanceService.viewEnvVariables( - vm.data.cnsiGuid, - vm.data.app.summary, - vm.data.service.entity.label, - instance - ); - } - - /** - * @function startManageService - * @memberof cloud-foundry.view.applications.ManageServicesController - * @description Show the manage services detail view - * @returns {promise} A promise object - */ - function startManageServices() { - var config = { - templateUrl: 'plugins/cloud-foundry/view/applications/application/services/manage-services/manage-services.html', - title: 'app.app-info.app-tabs.services.manage.title', - dialog: true, - class: 'dialog-form-larger' - }; - - return frameworkDetailView(config, vm); - } - } - -})(); diff --git a/components/cloud-foundry/frontend/src/view/applications/application/services/manage-services/manage-services.html b/components/cloud-foundry/frontend/src/view/applications/application/services/manage-services/manage-services.html deleted file mode 100644 index fe26f56227..0000000000 --- a/components/cloud-foundry/frontend/src/view/applications/application/services/manage-services/manage-services.html +++ /dev/null @@ -1,38 +0,0 @@ -
-
-
- -
-
-

{{ detailViewCtrl.context.data.service.entity.label }}

-

{{ detailViewCtrl.context.data.service.entity.extra.LongDescription || detailViewCtrl.context.data.service.entity.description }}

-
-
- - - - - - - - - - - - - - - - - -
app.app-info.app-tabs.services.manage.name-labelapp.app-info.app-tabs.services.manage.plan-labelapp.app-info.app-tabs.services.manage.env-vars-label
{{ instance.name }}{{ instance.service_plan.name }} - - - -
-
diff --git a/components/cloud-foundry/frontend/src/view/applications/application/services/manage-services/manage-services.scss b/components/cloud-foundry/frontend/src/view/applications/application/services/manage-services/manage-services.scss deleted file mode 100644 index fd9202241c..0000000000 --- a/components/cloud-foundry/frontend/src/view/applications/application/services/manage-services/manage-services.scss +++ /dev/null @@ -1,41 +0,0 @@ -.manage-instances { - padding: 0 $console-unit-space; - // env vars window shown over needs some space - min-height: 400px; - - .service-description { - display: flex; - padding: 0; - - .service-icon { - padding: 0 $console-unit-space/2 $console-unit-space 0; - - img { - max-height: $console-unit-space * 4; - max-width: $console-unit-space * 4; - } - } - } - - .btn-link { - &:hover, - &:focus, - &:active { - text-decoration: none; - outline: 0; - } - } - - .min-col-header { - width: 1px; - white-space: nowrap; - } -} - -.env-variables { - margin: $console-unit-space; - - pre { - white-space: pre-wrap; - } -} diff --git a/components/cloud-foundry/frontend/src/view/applications/application/services/service-card/service-card.directive.js b/components/cloud-foundry/frontend/src/view/applications/application/services/service-card/service-card.directive.js index d128d62970..511eb7379e 100644 --- a/components/cloud-foundry/frontend/src/view/applications/application/services/service-card/service-card.directive.js +++ b/components/cloud-foundry/frontend/src/view/applications/application/services/service-card/service-card.directive.js @@ -33,196 +33,84 @@ * @description Controller for service card directive * @constructor * @param {object} $scope - the Angular $scope service - * @param {app.model.modelManager} modelManager - the application model manager - * @param {app.utils.appEventService} appEventService - the event management service + * @param {object} $q - the Angular $q service * @param {object} cfServiceInstanceService - the service instance service - * @property {app.utils.appEventService} appEventService - the event management service - * @property {object} cfServiceInstanceService - the service instance service - * @property {cloud-foundry.model.service-binding} bindingModel - the Cloud Foundry service binding model - * @property {boolean} allowAddOnly - allow adding services only (no manage or detach) - * @property {array} serviceBindings - the service instances bound to specified app - * @property {number} numAttached - the number of service instances bound to specified app * @property {array} actions - the actions that can be performed from vm.service card */ - function ServiceCardController($scope, modelManager, appEventService, cfServiceInstanceService) { + function ServiceCardController( + $scope, + $q, + cfServiceInstanceService + ) { var vm = this; - var bindingModel = modelManager.retrieve('cloud-foundry.model.service-binding'); - var authModel = modelManager.retrieve('cloud-foundry.model.auth'); + vm.detach = detach; + vm.viewEnvVariables = viewEnvVariables; - vm.allowAddOnly = angular.isDefined(vm.addOnly) ? vm.addOnly : false; - vm.numAttached = 0; vm.actions = [ - { - name: 'app.app-info.app-tabs.services.card.actions.add', - execute: function () { - addService(); - } - }, { name: 'app.app-info.app-tabs.services.card.actions.detach', execute: function () { - detach(); - } - }, - { - name: 'app.app-info.app-tabs.services.card.actions.manage', - execute: function () { - manageInstances(); + detach(vm.service).then(function (result) { + vm.service = result; + }); } } ]; - vm.serviceBindings = []; - - $scope.$watch(function () { - return vm.app.summary.services; - }, function () { - init(); - }); $scope.$watch(function () { return vm.service; }, function () { - vm.canBind = vm.service._bindTarget === 'APP'; - }); - - vm.addService = addService; - vm.detach = detach; - vm.manageInstances = manageInstances; - vm.hideServiceActions = hideServiceActions; - vm.getServiceInstanceGuids = getServiceInstanceGuids; - vm.getServiceBindings = getServiceBindings; - vm.updateActions = updateActions; - vm.init = init; - - /** - * @function init - * @memberof cloud-foundry.view.applications.application.services.serviceCard.ServiceCardController - * @description Fetch service bindings for this app and update content - * @returns {undefined} - */ - function init() { - var serviceInstances = vm.getServiceInstanceGuids(); - if (serviceInstances.length > 0) { - return vm.getServiceBindings(serviceInstances); - } else { - vm.serviceBindings = []; - vm.updateActions(); - } - } - - /** - * @function getServiceInstanceGuids - * @memberof cloud-foundry.view.applications.application.services.serviceCard.ServiceCardController - * @description Get service instances for app - * @returns {array} A list of service instance GUIDs - */ - function getServiceInstanceGuids() { - var serviceInstances = _.chain(vm.app.summary.services) - .filter(function (o) { - return angular.isDefined(o.service_plan) && - o.service_plan.service.guid === vm.service.metadata.guid; - }) - .map('guid') - .value(); - return serviceInstances; - } - - /** - * @function getServiceBindings - * @memberof cloud-foundry.view.applications.application.services.serviceCard.ServiceCardController - * @description Get service bindings for specified service instances - * @param {array} serviceInstanceGuids A list of service instance GUIDs - * @returns {promise} A promise object - */ - function getServiceBindings(serviceInstanceGuids) { - var q = 'service_instance_guid IN ' + serviceInstanceGuids.join(','); - var options = {q: q, 'inline-relations-depth': 1, 'include-relations': 'service_instance'}; - return bindingModel.listAllServiceBindings(vm.cnsiGuid, options) - .then(function (bindings) { - var appGuid = vm.app.summary.guid; - var appBindings = _.filter(bindings, function (o) { - return o.entity.app_guid === appGuid; - }); - vm.serviceBindings = appBindings; - vm.updateActions(); - }); - } - - /** - * @function addService - * @memberof cloud-foundry.view.applications.application.services.serviceCard.ServiceCardController - * @description Show the add service detail view - * @returns {undefined} - */ - function addService() { - var config = { - app: vm.app, - cnsiGuid: vm.cnsiGuid, - confirm: !vm.allowAddOnly, - service: vm.service + vm.cardData = { + title: vm.service.entity.name }; - - appEventService.$emit('cf.events.START_ADD_SERVICE_WORKFLOW', config); - } + }); /** * @function detach * @memberof cloud-foundry.view.applications.application.services.serviceCard.ServiceCardController + * @param {object} serviceInstance The service instance to be detached from the application * @description Detach service instance from app * @returns {undefined} */ - function detach() { - if (vm.serviceBindings.length === 1) { - var serviceBinding = vm.serviceBindings[0]; - return cfServiceInstanceService.unbindServiceFromApp( + function detach(serviceInstance) { + var serviceBinding = serviceInstance.entity.service_bindings + ? _.find(serviceInstance.entity.service_bindings, function (binding) { + return vm.app.summary.guid === binding.entity.app_guid; + }) : null; + if (serviceBinding) { + var deferred = $q.defer(); + cfServiceInstanceService.unbindServiceFromApp( vm.cnsiGuid, vm.app.summary.guid, serviceBinding.metadata.guid, - serviceBinding.entity.service_instance.entity.name + serviceInstance.entity.name, + function () { + serviceInstance.entity.service_bindings = []; + return deferred.resolve(serviceInstance); + } ); + return deferred.promise; } + return $q.resolve(serviceInstance); } /** - * @function manageInstances - * @memberof cloud-foundry.view.applications.application.services.serviceCard.ServiceCardController - * @description Show the manage services detail view - * @returns {void} - */ - function manageInstances() { - var config = { - app: vm.app, - cnsiGuid: vm.cnsiGuid, - service: vm.service - }; - - appEventService.$emit('cf.events.START_MANAGE_SERVICES', config); - } - - /** - * @function updateActions - * @memberof cloud-foundry.view.applications.application.services.serviceCard.ServiceCardController - * @description Update service actions visibility - * @returns {void} + * @function viewEnvVariables + * @memberof cloud-foundry.view.applications.ManageServicesController + * @description View environmental variables of service instance + * @param {object} instance - the service instance to view + * @returns {promise} A promise object */ - function updateActions() { - vm.numAttached = vm.serviceBindings.length; - vm.actions[1].hidden = vm.numAttached !== 1; - vm.actions[2].hidden = vm.numAttached === 0; + function viewEnvVariables(instance) { + return cfServiceInstanceService.viewEnvVariables( + vm.cnsiGuid, + vm.app.summary, + instance.entity.service_plan.entity.service.entity.label, + instance.entity + ); } - /** - * @function hideServiceActions - * @memberof cloud-foundry.view.applications.application.services.serviceCard.ServiceCardController - * @description Update service actions visibility - * @returns {*} - */ - function hideServiceActions() { - return !authModel.isAllowed(vm.cnsiGuid, - authModel.resources.managed_service_instance, - authModel.actions.create, vm.app.summary.space_guid); - } } })(); diff --git a/components/cloud-foundry/frontend/src/view/applications/application/services/service-card/service-card.html b/components/cloud-foundry/frontend/src/view/applications/application/services/service-card/service-card.html index b053d61314..1b4e667f40 100644 --- a/components/cloud-foundry/frontend/src/view/applications/application/services/service-card/service-card.html +++ b/components/cloud-foundry/frontend/src/view/applications/application/services/service-card/service-card.html @@ -1,61 +1,54 @@ -
-
- -
-
-
-
-

{{ ::serviceCardCtrl.service.entity.label }}

-
-
-
-
app.app-info.app-tabs.services.card.version
-
{{ ::serviceCardCtrl.service.entity.extra.Version || serviceCardCtrl.service.entity.version || '-'}}
-
-
-
- - -
-
-
-

{{ ::serviceCardCtrl.service.entity.extra.LongDescription || serviceCardCtrl.service.entity.description }}

-
-
-
-
- {{ serviceCardCtrl.numAttached }} app.app-info.app-tabs.services.card.attached + +
+
+
+
+
+ app.app-info.app-tabs.services.labels.type +
+
+ {{ ::serviceCardCtrl.service.entity.service_plan.entity.service.entity.label }} +
-
-
-
- app.app-info.app-tabs.services.card.cannot-bind + +
+
+ app.app-info.app-tabs.services.labels.description +
+
+ {{ ::serviceCardCtrl.service.entity.service_plan.entity.service.entity.description }} +
+
+
+
+ app.app-info.app-tabs.services.labels.created-date +
+
+ {{ ::serviceCardCtrl.service.metadata.created_at | momentDateFormat }} +
-
- {{ serviceCardCtrl.numAttached }} app.app-info.app-tabs.services.card.attached +
+
+ app.app-info.app-tabs.services.labels.tags +
+
+
+
{{ tag }}
+
+ - +
- - -
+
+ +
+
+
+ + app.app-info.app-tabs.services.labels.env-variables +
-
+ + \ No newline at end of file diff --git a/components/cloud-foundry/frontend/src/view/applications/application/services/service-card/service-card.scss b/components/cloud-foundry/frontend/src/view/applications/application/services/service-card/service-card.scss index d109b73de7..90c0a1c159 100644 --- a/components/cloud-foundry/frontend/src/view/applications/application/services/service-card/service-card.scss +++ b/components/cloud-foundry/frontend/src/view/applications/application/services/service-card/service-card.scss @@ -1,147 +1,73 @@ -service-card { - display: flex; - width: 100%; - .service-card { +.service-catalogue-card { + display: flex; + flex-direction: row; + &__meta { display: flex; - width: 100%; - min-height: $console-unit-space * 5; - - .service-icon { - display: block; - padding: 0; - padding-right: $console-unit-space; - - img { - max-height: $console-unit-space * 4; - max-width: $console-unit-space * 4; - } - } + flex: 1; + flex-direction: column; + margin-right: 25px; + } + &__icon { + flex: none; + } + &__bold-text { - .service-block { - display: flex; - flex-grow: 1; + } + &__meta-split { + display: flex; + justify-content: space-between; + margin-bottom: 10px; + @media (max-width: 900px) { flex-direction: column; - - .service-title { - display: flex; - .service-text { - display: flex; - flex: 1 1 0px; - - h4 { - margin-top: 0; - } - } - - .service-metadata { - display: flex; - padding: 0 $console-unit-space 0 $console-unit-space; - flex: none; - width: 35%; - - dl { - margin: 0; - dt { - display: inline-block; - text-transform: uppercase; - margin-right: $console-unit-space; - - &:not(:first-of-type) { - margin-top: $console-unit-space / 2; - } - } - dd { - display: inline-block; - } - } - } - - @media (max-width: 640px) { - .service-metadata { - display: none; - } - } - - .service-actions-menu { - text-align: right; - width: $console-unit-space * 2; - flex: none; - - .actions-menu { - &.open { - .actions-menu-icon { - color: $brand-primary; - } - - .actions-menu-list { - margin-top: -$console-unit-space / 2; - } - } - - .actions-menu-icon { - font-weight: $console-font-weight-semibold; - line-height: $console-unit-space; - font-size: 1.75em; - } - } - } - - } - - .service-description { - flex-grow: 1; - padding-right: $console-unit-space * 2; - } - - .service-action-block { - display: flex; - - .service-attached-msg { - flex: 1 1 0px; - margin: auto 0; - } - - .service-attached:before { - @extend .material-icons; - content: 'attachment'; - margin-right: $console-unit-space / 4; - vertical-align: bottom; - } - - .service-added:after { - @extend .material-icons; - content: 'attachment'; - margin-left: $console-unit-space / 4; - } - } - - .service-actions { - text-align: right; - - .btn-link { - margin-top: auto; - padding-right: 0; - display: flex; - align-items: center; - - &:hover, - &:focus, - &:active { - text-decoration: none; - outline: 0; - - .add-icon { - border-color: $link-hover-color; - } - } - - .add-icon { - font-size: 20px; - margin-left: $console-unit-space / 4; - } - } - } } } + &__meta-left { + text-transform: uppercase; + font-weight: bold; + } + &__meta-right { + @media (min-width: 901px) { + text-align: right; + margin-left: 10px; + margin-top: 0; + } + margin-top: 5px; + } + &__outer { + display: flex; + flex-direction: column; + height: 100%; + justify-content: space-between; + padding-bottom: 5px; + } + &__env { + padding-top: 10px; + } + &__tag { + border: 1px solid $input-border; + padding: 2px 6px; + border-radius: 4px; + margin-bottom: 2px; + display: inline-block; + } +} +.services-gallery-card { + height: 100%; + display: block; + position: relative; + padding-bottom: 20px; + .panel { + display: flex; + flex-direction: column; + height: 100%; + margin-bottom: 0; + &-body { + flex: 1; + } + } + &__container.cluster-gallery-card-container { + width: auto; + margin: 0 -10px; + } } diff --git a/components/cloud-foundry/frontend/src/view/applications/application/services/services.html b/components/cloud-foundry/frontend/src/view/applications/application/services/services.html index f9b8f5f94f..7648cf4139 100644 --- a/components/cloud-foundry/frontend/src/view/applications/application/services/services.html +++ b/components/cloud-foundry/frontend/src/view/applications/application/services/services.html @@ -1,23 +1,9 @@ -
-

- -

There are no services available for this endpoint. Please contact your Administrator to add services so you can bind them to your applications.

-

-
-
- -
- -
+
- - app.app-info.app-tabs.services.types.show +
@@ -26,17 +12,37 @@

There are no services available for this endpoint. Please contact - +

- -
-
- -
+
app.app-info.app-tabs.services.messages.currently-viewing-1 app.app-info.app-tabs.services.messages.click-here app.app-info.app-tabs.services.messages.currently-viewing-2
+
+

+ +

+

+ app.app-info.app-tabs.services.messages.no-services +

+

+ app.app-info.app-tabs.services.messages.view-catalogue + app.app-info.app-tabs.services.messages.view-catalogue-link +

+
+
+

+ app.app-info.app-tabs.services.messages.no-services-search +

+
+

+
+
+
+
+ + +
\ No newline at end of file diff --git a/components/cloud-foundry/frontend/src/view/applications/application/services/services.module.js b/components/cloud-foundry/frontend/src/view/applications/application/services/services.module.js index f6c63fc065..f6fe5bd6af 100644 --- a/components/cloud-foundry/frontend/src/view/applications/application/services/services.module.js +++ b/components/cloud-foundry/frontend/src/view/applications/application/services/services.module.js @@ -8,7 +8,7 @@ function registerRoute($stateProvider) { $stateProvider.state('cf.applications.application.services', { - url: '/services', + url: '/services?serviceType', templateUrl: 'plugins/cloud-foundry/view/applications/application/services/services.html', controller: ApplicationServicesController, controllerAs: 'applicationServicesCtrl' @@ -21,7 +21,7 @@ hide: false, uiSref: 'cf.applications.application.services', uiSrefParam: function () { - return {guid: $stateParams.guid}; + return { guid: $stateParams.guid }; }, label: 'app.app-info.app-tabs.services.label' }); @@ -33,6 +33,7 @@ * @param {object} $scope - the Angular $scope service * @param {app.model.modelManager} modelManager - the model management service * @param {object} $stateParams - the UI router $stateParams service + * @param {object} $state - the UI router $state service * @property {cloud-foundry.model.space} model - the Cloud Foundry space model * @property {cloud-foundry.model.application} model - the Cloud Foundry application model * @property {string} id - the application GUID @@ -43,93 +44,133 @@ * @property {object} search - the search object for filtering * @property {object} category - the search category object for filtering */ - function ApplicationServicesController($scope, modelManager, $stateParams) { + function ApplicationServicesController( + $scope, + modelManager, + $stateParams, + $state + ) { var that = this; - this.model = modelManager.retrieve('cloud-foundry.model.space'); - this.appModel = modelManager.retrieve('cloud-foundry.model.application'); - this.id = $stateParams.guid; - this.cnsiGuid = $stateParams.cnsiGuid; - this.services = []; - this.serviceCategories = [ - { label: 'app.app-info.app-tabs.services.categories.attached', value: 'attached' }, - { label: 'app.app-info.app-tabs.services.categories.all', value: 'all' } - ]; - this.searchCategory = 'all'; - this.search = {}; - this.category = { - entity: { - extra: undefined - } - }; - this.ready = false; - - $scope.$watch(function () { - return that.appModel.application.summary.guid; - }, function () { - var summary = that.appModel.application.summary; - var spaceGuid = summary.space_guid; - if (angular.isDefined(spaceGuid)) { - that.model.listAllServicesForSpace(that.cnsiGuid, spaceGuid) - .then(function (services) { - // retrieve categories and attachment data for service filtering - var categories = []; - var attachedServices = _.chain(summary.services) - .filter(function (o) { return angular.isDefined(o.service_plan); }) - .map(function (o) { return o.service_plan.service.guid; }) - .value(); - angular.forEach(services, function (service) { - if (attachedServices.length > 0) { - if (_.includes(attachedServices, service.metadata.guid)) { - service.attached = true; - } - } - - // Parse service entity extra data JSON string - if (!_.isNil(service.entity.extra) && angular.isString(service.entity.extra)) { - service.entity.extra = angular.fromJson(service.entity.extra); - } - - // a service can belong to >1 category, so allow filtering by any of them - if (angular.isObject(service.entity.extra) && angular.isDefined(service.entity.extra.Categories)) { - var _categories = service.entity.extra.Categories; - if (angular.isString(_categories)) { - _categories = [_categories]; - } - var serviceCategories = _.map(_categories, function (o) { - return { - label: o, - value: { Categories: o }, - lower: o.toLowerCase() - }; - }); - categories = _.unionBy(categories, serviceCategories, 'lower'); - } - }); + that.model = modelManager.retrieve('cloud-foundry.model.space'); + that.appModel = modelManager.retrieve('cloud-foundry.model.application'); + that.id = $stateParams.guid; + that.cnsiGuid = $stateParams.cnsiGuid; + that.managingType = $stateParams.serviceType; + that.services = []; + that.ALL_FILTER = 'all'; + that.filterType = $stateParams.serviceType || that.ALL_FILTER; + that.search = {}; - that.services.length = 0; - [].push.apply(that.services, services); + that.ready = false; - categories = _.sortBy(categories, 'lower'); - that.serviceCategories.length = 2; - [].push.apply(that.serviceCategories, categories); - }) - .finally(function () { - that.ready = true; - }); + if ($stateParams.serviceType) { + // Make sure we clear the serviceType url param if the user changes the filter + var stopFilterWatch = $scope.$watch(function () { + return that.filterType; + }, function () { + if (that.filterType !== $stateParams.serviceType) { + stopFilterWatch(); + $stateParams.serviceType = null; + that.managingType = null; + $state.go('.', $stateParams, { notify: false }); + } + }); + } + + var stopSummaryWatch = $scope.$watch(function () { + return that.appModel.application.summary; + }, function (summary) { + if (summary.guid) { + stopSummaryWatch(); + var spaceGuid = summary.space_guid; + if (spaceGuid) { + that.model.listAllServiceInstancesForSpace(that.cnsiGuid, spaceGuid) + .then(function (serviceInstances) { + // Get any extra service data + // and get the types from services + return { + filterTypes: that.getServiceFilterTypes(serviceInstances), + services: that.getExtraServiceData(serviceInstances) + }; + }) + .then(function (data) { + // Attach data to controller + that.filterTypes = data.filterTypes; + that.services = data.services; + that.ready = true; + }); + } } }); - $scope.$watch(function () { - return that.searchCategory; - }, function (newSearchCategory) { - if (newSearchCategory === 'attached') { - that.category.entity.extra = undefined; - that.category.attached = true; - } else { - delete that.category.attached; - that.category.entity.extra = newSearchCategory === 'all' ? undefined : newSearchCategory; + function getCurrentAppBinding(serviceInstance) { + if ( + !serviceInstance.entity.service_bindings || + serviceInstance.entity.service_bindings.length === 0 + ) { + return null; } - }); + return _.find(serviceInstance.entity.service_bindings, function (binding) { + return binding.entity.app_guid === that.appModel.application.summary.guid; + }) || null; + } + + function getServiceInstanceType(serviceInstance) { + return serviceInstance.entity.service_plan.entity.service.entity.label; + } + + // Works out if the current list is being filtered or searched. + that.isFiltered = function () { + return that.search.$ || that.filterType !== that.ALL_FILTER; + }; + + that.showInstance = function (serviceInstance) { + var isOfType = !that.filterType || + that.filterType === that.ALL_FILTER || + that.filterType === getServiceInstanceType(serviceInstance); + var isBoundToThisApp = !!getCurrentAppBinding(serviceInstance); + + return isBoundToThisApp && isOfType; + }; + + that.getExtraServiceData = function (services) { + return _.chain(services) + .map(function (service) { + if (angular.isString(service.entity.extra)) { + service.entity.extra = angular.fromJson(service.entity.extra); + } + return service; + }) + .sortBy('entity.type') + .value(); + }; + + // Gets all of the types in the current list of instances + that.getServiceFilterTypes = function (serviceInstances) { + var baseFilters = [{ + label: 'app.app-info.app-tabs.services.types.all', + value: that.ALL_FILTER, + lower: that.ALL_FILTER.toLowerCase() + }]; + + var typeFilters = _.chain(serviceInstances) + .flatMap(function (serviceInstance) { + return getServiceInstanceType(serviceInstance); + }) + .compact() + .uniq() + .map(function (type) { + return { + label: type, + value: type, + lower: type.toLowerCase() + }; + }) + .sortBy('lower') + .value(); + + return baseFilters.concat(typeFilters); + }; } })(); diff --git a/components/cloud-foundry/frontend/src/view/applications/application/services/services.scss b/components/cloud-foundry/frontend/src/view/applications/application/services/services.scss index bbaae2cbb0..b99a6bdd25 100644 --- a/components/cloud-foundry/frontend/src/view/applications/application/services/services.scss +++ b/components/cloud-foundry/frontend/src/view/applications/application/services/services.scss @@ -1,5 +1,4 @@ -@import "manage-services/manage-services"; -@import "service-card/service-card"; +@import "./service-card/service-card"; .service-filter-panel { .filter-form-group { @@ -11,3 +10,7 @@ display: flex; align-items: stretch; } + +.service-manage-message { + margin-bottom: $console-unit-space; +} diff --git a/components/cloud-foundry/frontend/src/view/applications/application/summary/add-route/add-route.service.js b/components/cloud-foundry/frontend/src/view/applications/application/summary/add-route/add-route.service.js index 64f7a0cdd2..fbeeae7d8c 100644 --- a/components/cloud-foundry/frontend/src/view/applications/application/summary/add-route/add-route.service.js +++ b/components/cloud-foundry/frontend/src/view/applications/application/summary/add-route/add-route.service.js @@ -149,19 +149,19 @@ // 3) Get the route id and add it to the route object // 4) Return array of routes return getRoutesFn() - .then(function (routes) { - return _.chain(routes) - .filter(function (route) { - return !_.find(route.entity.apps, function (app) { - return app.metadata.guid === applicationGuid; - }); - }) - .map(function (route) { - route.entity.id = getRouteIdFn(route); - return route; - }) - .value(); - }); + .then(function (routes) { + return _.chain(routes) + .filter(function (route) { + return !_.find(route.entity.apps, function (app) { + return app.metadata.guid === applicationGuid; + }); + }) + .map(function (route) { + route.entity.id = getRouteIdFn(route); + return route; + }) + .value(); + }); }; var getAllRoutesForThisSpace = _.partial( @@ -223,9 +223,9 @@ }); }), getReleventRoutes() - .then(function (routes) { - data.existingRoutes = routes; - }) + .then(function (routes) { + data.existingRoutes = routes; + }) ) ); } diff --git a/components/cloud-foundry/frontend/src/view/applications/application/summary/summary.html b/components/cloud-foundry/frontend/src/view/applications/application/summary/summary.html index f2c74bdc35..bca7dbe3da 100644 --- a/components/cloud-foundry/frontend/src/view/applications/application/summary/summary.html +++ b/components/cloud-foundry/frontend/src/view/applications/application/summary/summary.html @@ -78,17 +78,30 @@
-
-
app.app-info.app-tabs.summary.summary-panel.deployed-label
-
- {{ applicationSummaryCtrl.stratosProject.timestamp * 1000 | momentDateFormat }} +
app.app-info.app-tabs.summary.summary-panel.deployed-label
+
+ {{ applicationSummaryCtrl.stratosProject.deploySource.timestamp * 1000 | momentDateFormat }}
-
app.app-info.app-tabs.summary.summary-panel.deployed-source-label
-
- - {{applicationSummaryCtrl.stratosProject.commit | limitTo:8}} +
app.app-info.app-tabs.summary.summary-panel.deployed-source-label
+
+ + {{applicationSummaryCtrl.stratosProject.deploySource.commit | limitTo:8}} + + {{applicationSummaryCtrl.stratosProject.deploySource.url}} + + app.app-info.app-tabs.summary.summary-panel.deployed-source-filefolder + app.app-info.app-tabs.summary.summary-panel.deployed-source-archive
cf.ssh.access
@@ -106,6 +119,10 @@ off-class="console-status-normal" on-class="console-status-normal"> +
app.app-info.app-tabs.summary.summary-panel.service-count
+
+ {{ ::appCtrl.model.application.summary.services.length }} +
@@ -268,40 +285,3 @@
-
-
- app.app-info.app-tabs.summary.service-instances-panel.title - - arrow_forward - app.app-info.app-tabs.summary.service-instances-panel.manage-button - -
-
-
- app.app-info.app-tabs.summary.service-instances-panel.none -
- - - - - - - - - - - - - - - - -
app.app-info.app-tabs.summary.service-instances-panel.name-labelapp.app-info.app-tabs.summary.service-instances-panel.service-labelapp.app-info.app-tabs.summary.service-instances-panel.plan-label
{{ service.name }}{{ service.service_plan.service.label }}{{ service.service_plan.name }}
-
-
- diff --git a/components/cloud-foundry/frontend/src/view/applications/application/summary/summary.module.js b/components/cloud-foundry/frontend/src/view/applications/application/summary/summary.module.js index 1f99db24de..3e06e18e05 100644 --- a/components/cloud-foundry/frontend/src/view/applications/application/summary/summary.module.js +++ b/components/cloud-foundry/frontend/src/view/applications/application/summary/summary.module.js @@ -53,7 +53,7 @@ authModel.actions.create, model.application.summary.space_guid); }, go: function (appActions, appGuid) { - $state.go('cf.applications.application.services', {guid: appGuid}); + $state.go('cf.applications.application.service-catalogue', {guid: appGuid}); } }] }); @@ -86,9 +86,9 @@ * @property {appNotificationsService} appNotificationsService - the toast notification service */ function ApplicationSummaryController($state, $stateParams, $log, $q, $translate, - modelManager, cfAddRoutes, cfEditApp, appUtilsService, - appClusterRoutesService, frameworkDialogConfirm, appNotificationsService, - cfApplicationTabs, cfUtilsService) { + modelManager, cfAddRoutes, cfEditApp, appUtilsService, + appClusterRoutesService, frameworkDialogConfirm, appNotificationsService, + cfApplicationTabs, cfUtilsService) { var vm = this; var authModel = modelManager.retrieve('cloud-foundry.model.auth'); diff --git a/components/cloud-foundry/frontend/src/view/applications/applications.module.js b/components/cloud-foundry/frontend/src/view/applications/applications.module.js index 25d6c4278f..0885c848da 100644 --- a/components/cloud-foundry/frontend/src/view/applications/applications.module.js +++ b/components/cloud-foundry/frontend/src/view/applications/applications.module.js @@ -49,9 +49,9 @@ function init() { return initialized.promise - .then(function () { - return authService.initialize(); - }); + .then(function () { + return authService.initialize(); + }); } appUtilsService.chainStateResolve('cf.applications', $state, init); diff --git a/components/cloud-foundry/frontend/src/view/applications/list/list.module.js b/components/cloud-foundry/frontend/src/view/applications/list/list.module.js index fd0b684b26..33b45c5746 100644 --- a/components/cloud-foundry/frontend/src/view/applications/list/list.module.js +++ b/components/cloud-foundry/frontend/src/view/applications/list/list.module.js @@ -34,7 +34,7 @@ * @param {appLocalStorage} appLocalStorage - service provides access to the local storage facility of the web browser */ function ApplicationsListController($scope, $translate, $state, $timeout, $q, $window, modelManager, appErrorService, - appUtilsService, cfOrganizationModel, cfAppWallActions, appLocalStorage) { + appUtilsService, cfOrganizationModel, cfAppWallActions, appLocalStorage) { var vm = this; @@ -276,6 +276,9 @@ } }); } else { + // Cluster is set to all, so should org + vm.model.filterParams.orgGuid = 'all'; + vm.filter.orgGuid = 'all'; return $q.resolve(); } } @@ -313,6 +316,9 @@ } }); } else { + // Cluster & org are set to all, so should space + vm.model.filterParams.spaceGuid = 'all'; + vm.filter.spaceGuid = 'all'; return $q.resolve(); } } @@ -407,8 +413,8 @@ } /** - * @function getClusterOrganizations - * @description Get organizations for selected cluster + * @function setCluster + * @description * @returns {void} * @public */ @@ -427,18 +433,7 @@ // changed the org and space filter needToReload = needToReload || !_.isMatch(vm.filter, {orgGuid: 'all', spaceGuid: 'all'}); - if (needToReload) { - _reload(); - } else { - if (vm.filter.cnsiGuid === 'all') { - vm.model.resetFilter(); - } else { - vm.model.filterByCluster(vm.filter.cnsiGuid); - } - vm.paginationProperties.pageNumber = 1; - vm.paginationProperties.total = _.ceil(vm.model.filteredApplications.length / vm.model.pageSize); - _loadPage(1); - } + _reload(false, !needToReload); }); } diff --git a/components/cloud-foundry/frontend/src/view/applications/list/table-view/table-view.directive.js b/components/cloud-foundry/frontend/src/view/applications/list/table-view/table-view.directive.js index aefcca17e6..481a49c418 100644 --- a/components/cloud-foundry/frontend/src/view/applications/list/table-view/table-view.directive.js +++ b/components/cloud-foundry/frontend/src/view/applications/list/table-view/table-view.directive.js @@ -41,12 +41,12 @@ var model = modelManager.retrieve('cloud-foundry.model.application'); this.stApps = []; this.tableColumns = [ - {name: 'app-wall.table.columns.appName', value: 'entity.name'}, - {name: 'app-wall.table.columns.status', value: 'state.label', noSort: true}, - {name: 'app-wall.table.columns.instances', value: 'entity.instances', descendingFirst: true}, - {name: 'app-wall.table.columns.disk', value: 'entity.disk_quota', descendingFirst: true}, - {name: 'app-wall.table.columns.memory', value: 'entity.memory', descendingFirst: true}, - {name: 'app-wall.table.columns.creation', value: 'metadata.created_at', descendingFirst: true} + { name: 'app-wall.table.columns.appName', value: 'entity.name' }, + { name: 'app-wall.table.columns.status', value: 'state.label', noSort: true }, + { name: 'app-wall.table.columns.instances', value: 'entity.instances', descendingFirst: true }, + { name: 'app-wall.table.columns.disk', value: 'entity.disk_quota', descendingFirst: true }, + { name: 'app-wall.table.columns.memory', value: 'entity.memory', descendingFirst: true }, + { name: 'app-wall.table.columns.creation', value: 'metadata.created_at', descendingFirst: true } ]; this.init = false; @@ -72,18 +72,20 @@ $scope.$watchCollection( function () { return that.apps; - }, function () { - updateStTableState(); - }); + }, + function () { + updateStTableState(); + }); $scope.$watch( function () { return that.table; - }, function () { - if (that.table) { - that.table.sortBy(model.currentSortOption, !model.sortAscending); - } - }); + }, + function () { + if (that.table) { + that.table.sortBy(model.currentSortOption, !model.sortAscending); + } + }); this.getAppSummaryLink = getAppSummaryLink; this.stMiddleware = stMiddleware; diff --git a/components/cloud-foundry/frontend/src/view/applications/services/service-instance/service-instance.service.js b/components/cloud-foundry/frontend/src/view/applications/services/service-instance/service-instance.service.js index 4d672d7c98..5ee7877291 100644 --- a/components/cloud-foundry/frontend/src/view/applications/services/service-instance/service-instance.service.js +++ b/components/cloud-foundry/frontend/src/view/applications/services/service-instance/service-instance.service.js @@ -19,7 +19,7 @@ * @returns {object} A service instance factory */ function serviceInstanceFactory($log, $translate, $q, modelManager, appNotificationsService, frameworkDetailView, - frameworkDialogConfirm) { + frameworkDialogConfirm) { var appModel = modelManager.retrieve('cloud-foundry.model.application'); var bindingModel = modelManager.retrieve('cloud-foundry.model.service-binding'); var instanceModel = modelManager.retrieve('cloud-foundry.model.service-instance'); diff --git a/components/cloud-foundry/frontend/src/view/applications/workflows/add-app-workflow/add-app-workflow.directive.js b/components/cloud-foundry/frontend/src/view/applications/workflows/add-app-workflow/add-app-workflow.directive.js index 8dc3bd1f4c..3cef856d51 100644 --- a/components/cloud-foundry/frontend/src/view/applications/workflows/add-app-workflow/add-app-workflow.directive.js +++ b/components/cloud-foundry/frontend/src/view/applications/workflows/add-app-workflow/add-app-workflow.directive.js @@ -40,7 +40,7 @@ * @property {object} options - workflow options */ function AddAppWorkflowController(modelManager, appEventService, appUtilsService, cfUtilsService, $scope, $q, - $translate) { + $translate) { var vm = this; @@ -125,10 +125,7 @@ { templateUrl: 'plugins/cloud-foundry/view/applications/workflows/add-app-workflow/add-application.html', formName: 'application-name-form', - btnText: { - next: 'buttons.add', - cancel: 'buttons.cancel' - }, + nextBtnText: 'buttons.add', showBusyOnNext: true, isLastStep: true, onEnter: function () { @@ -154,14 +151,24 @@ {appName: vm.userInput.name}) }); }, function (error) { - var msg = $translate.instant('add-app-dialog.step1.notifications.failure-part-1'); + var failurePart1, failurePart1Alt, failurePart2; + if (vm.userInput.routeCreateBindError) { + failurePart1 = 'add-app-dialog.step1.route-create-bind.failure-part-1'; + failurePart1Alt = 'add-app-dialog.step1.route-create-bind.failure-part-1-alt'; + failurePart2 = 'add-app-dialog.step1.route-create-bind.failure-part-2'; + } else { + failurePart1 = 'add-app-dialog.step1.notifications.failure-part-1'; + failurePart1Alt = 'add-app-dialog.step1.notifications.failure-part-1-alt'; + failurePart2 = 'add-app-dialog.step1.notifications.failure-part-2'; + } + + var msg = $translate.instant(failurePart1); var cloudFoundryException = appUtilsService.extractCloudFoundryError(error); if (cloudFoundryException || _.isString(error)) { - msg = $translate.instant('add-app-dialog.step1.notifications.failure-part-1-alt', - { error: cloudFoundryException || error}); + msg = $translate.instant(failurePart1Alt, { error: cloudFoundryException || error}); } - msg = msg + $translate.instant('add-app-dialog.step1.notifications.failure-part-2'); + msg = msg + $translate.instant(failurePart2); return $q.reject(msg); }); }); @@ -224,6 +231,13 @@ var routePromise = routeModel.createRoute(cnsiGuid, routeSpec) .then(function (route) { return routeModel.associateAppWithRoute(cnsiGuid, route.metadata.guid, app.metadata.guid); + }) + .then(function () { + vm.userInput.routeCreateBindError = false; + }) + .catch(function (err) { + vm.userInput.routeCreateBindError = true; + return $q.reject(err); }); appEventService.$emit('cf.events.NEW_APP_CREATED'); @@ -260,17 +274,17 @@ } if (error.exist) { - return $q.reject($translate.instant('add-app-dialog.step1.route.exists')); + return $q.reject($translate.instant('add-app-dialog.step1.route-validate.exists')); } - var msg = $translate.instant('add-app-dialog.step1.route.failure-part-1'); + var msg = $translate.instant('add-app-dialog.step1.route-validate.failure-part-1'); var cloudFoundryException = appUtilsService.extractCloudFoundryError(error); if (cloudFoundryException || _.isString(error)) { - msg = $translate.instant('add-app-dialog.step1.route.failure-part-1-alt', + msg = $translate.instant('add-app-dialog.step1.route-validate.failure-part-1-alt', {error: cloudFoundryException || error}); } - msg = msg + $translate.instant('add-app-dialog.step1.route.failure-part-2'); + msg = msg + $translate.instant('add-app-dialog.step1.route-validate.failure-part-2'); return $q.reject(msg); }); @@ -360,13 +374,13 @@ function stopWorkflow() { vm.notify(); vm.addingApplication = false; - vm.closeDialog(); + vm.closeDialog({ reload: vm.userInput.routeCreateBindError }); } function finishWorkflow() { vm.notify(); vm.addingApplication = false; - vm.dismissDialog(); + vm.dismissDialog({ reload: vm.userInput.routeCreateBindError }); } } diff --git a/components/cloud-foundry/frontend/src/view/applications/workflows/add-service-workflow/add-service-workflow.directive.js b/components/cloud-foundry/frontend/src/view/applications/workflows/add-service-workflow/add-service-workflow.directive.js index 275921e73a..c605eb62c2 100644 --- a/components/cloud-foundry/frontend/src/view/applications/workflows/add-service-workflow/add-service-workflow.directive.js +++ b/components/cloud-foundry/frontend/src/view/applications/workflows/add-service-workflow/add-service-workflow.directive.js @@ -29,15 +29,15 @@ * @param {app.model.modelManager} modelManager - the application model manager * @param {app.utils.appEventService} appEventService - the event management service * @param {app.framework.widgets.frameworkDetailView} frameworkDetailView - the detail view widget + * @param {object} cfServiceCreateServiceInstanceWorkflow - service to support creating a new service instance * @property {object} modal - the detail view modal instance * @property {object} addServiceActions - the stop and finish workflow actions */ - function AddServiceWorkflowController($q, $scope, $translate, modelManager, appEventService, frameworkDetailView) { + function AddServiceWorkflowController($q, $scope, $translate, modelManager, appEventService, frameworkDetailView, cfServiceCreateServiceInstanceWorkflow) { var vm = this; var appModel = modelManager.retrieve('cloud-foundry.model.application'); var bindingModel = modelManager.retrieve('cloud-foundry.model.service-binding'); - var instanceModel = modelManager.retrieve('cloud-foundry.model.service-instance'); var serviceModel = modelManager.retrieve('cloud-foundry.model.service'); var spaceModel = modelManager.retrieve('cloud-foundry.model.space'); var path = 'plugins/cloud-foundry/view/applications/workflows/add-service-workflow/'; @@ -55,7 +55,6 @@ }; vm.reset = reset; - vm.addService = addService; vm.addBinding = addBinding; vm.startWorkflow = startWorkflow; vm.stopWorkflow = stopWorkflow; @@ -110,18 +109,17 @@ { templateUrl: path + 'instance.html', formName: 'addInstanceForm', - nextBtnText: 'app.app-info.app-tabs.services.add.add', + nextBtnText: 'app.app-info.app-tabs.services.bind.bind-to-app', showBusyOnNext: true, stepCommit: true, onNext: function () { - return vm.addService().then(function () { - return vm.addBinding().then(function () { - return $q.resolve(); - }, function () { - return _onServiceBindingError(); - }); + var planGuid = vm.options.userInput.existingServiceInstance.entity.service_plan_guid; + vm.options.servicePlan = vm.options.servicePlanMap[planGuid]; + vm.options.serviceInstance = vm.options.userInput.existingServiceInstance; + return vm.addBinding().then(function () { + return $q.resolve(); }, function () { - return $q.reject('app.app-info.app-tabs.services.add.notifications.failure-create'); + return _onServiceBindingError(); }); } } @@ -158,6 +156,18 @@ serviceInstance: null, servicePlan: null }; + + vm.options.createServiceBinding = createServiceBinding; + } + + function createServiceBinding() { + cfServiceCreateServiceInstanceWorkflow.show(vm.data.cnsiGuid, vm.data.spaceGuid, vm.options.instanceNames, vm.options.servicePlans) + .then(function (newServiceInstance) { + _loadServiceInstances().then(function () { + // AUto-select the instance that was just created + vm.userInput.existingServiceInstance = _.find(vm.options.instances, function (o) { return o.metadata.guid === newServiceInstance.metadata.guid; }); + }); + }); } /** @@ -235,43 +245,6 @@ }); } - /** - * @function addService - * @memberof cloud-foundry.view.applications.AddServiceWorkflowController - * @description Add a new service instance to the space - * @returns {object} A promise object - */ - function addService() { - var deferred = $q.defer(); - - if (vm.options.activeTab === 0) { - var newInstance = { - name: vm.options.userInput.name, - service_plan_guid: vm.options.userInput.plan.metadata.guid, - space_guid: vm.data.spaceGuid - }; - instanceModel.createServiceInstance(vm.data.cnsiGuid, newInstance) - .then(function (newServiceInstance) { - if (angular.isDefined(newServiceInstance.metadata)) { - vm.options.serviceInstance = newServiceInstance; - deferred.resolve(); - } else { - deferred.reject(); - } - }, function () { - deferred.reject(); - }); - vm.options.servicePlan = vm.options.userInput.plan; - } else { - var planGuid = vm.options.userInput.existingServiceInstance.entity.service_plan_guid; - vm.options.servicePlan = vm.options.servicePlanMap[planGuid]; - vm.options.serviceInstance = vm.options.userInput.existingServiceInstance; - deferred.resolve(); - } - - return deferred.promise; - } - /** * @function addBinding * @memberof cloud-foundry.view.applications.AddServiceWorkflowController @@ -284,6 +257,10 @@ app_guid: vm.data.app.summary.guid }; + if (vm.options.userInput && vm.options.userInput.params) { + bindingSpec.parameters = vm.options.userInput.params; + } + return bindingModel.createServiceBinding(vm.data.cnsiGuid, bindingSpec) .then(function (newBinding) { if (angular.isDefined(newBinding.metadata)) { @@ -301,16 +278,18 @@ * @returns {object} A promise object */ function startWorkflow() { + var config = { templateUrl: 'plugins/cloud-foundry/view/applications/workflows/add-service-workflow/add-service-workflow.html', - title: 'app.app-info.app-tabs.services.add.title', - titleTranslateValues: { appName: vm.data.app.summary.name }, + title: 'app.app-info.app-tabs.service-catalogue.bind.title', + titleTranslateValues: { appName: vm.data.app.summary.name, svcName: vm.options.service.entity.label}, dialog: true, - class: 'dialog-form-larger' + class: 'dialog-form-larger add-service-workflow-dialog' }; var context = { addServiceActions: vm.addServiceActions, - options: vm.options + options: vm.options, + createServiceBinding: vm.createServiceBinding }; return frameworkDetailView(config, context); @@ -334,20 +313,19 @@ */ function finishWorkflow() { if (!vm.data.confirm) { - vm.addService().then(function () { - vm.addBinding().then(function () { - // show notification for successful binding - var successMsg = $translate.instant('app.app-info.app-tabs.services.add.notifications.success', { - service: vm.options.serviceInstance.entity.name, - appName: vm.data.app.summary.name - }); - appEventService.$emit('events.NOTIFY_SUCCESS', {message: successMsg}); - vm.modal.close(); - }, function () { - return _onServiceBindingError(); + var planGuid = vm.options.userInput.existingServiceInstance.entity.service_plan_guid; + vm.options.servicePlan = vm.options.servicePlanMap[planGuid]; + vm.options.serviceInstance = vm.options.userInput.existingServiceInstance; + return vm.addBinding().then(function () { + // show notification for successful binding + var successMsg = $translate.instant('app.app-info.app-tabs.services.add.notifications.success', { + service: vm.options.serviceInstance.entity.name, + appName: vm.data.app.summary.name }); + appEventService.$emit('events.NOTIFY_SUCCESS', {message: successMsg}); + vm.modal.close(); }, function () { - return $q.reject('app.app-info.app-tabs.services.add.notifications.failure-create'); + return _onServiceBindingError(); }); } else { vm.modal.close(); @@ -367,7 +345,7 @@ vm.options.activeTab = 1; var guid = vm.options.serviceInstance.metadata.guid; vm.userInput.existingServiceInstance = _.find(vm.options.instances, - function (o) { return o.metadata.guid === guid; }); + function (o) { return o.metadata.guid === guid; }); }); } return $q.reject('app.app-info.app-tabs.services.add.notifications.failure-bind'); diff --git a/components/cloud-foundry/frontend/src/view/applications/workflows/add-service-workflow/add-service-workflow.scss b/components/cloud-foundry/frontend/src/view/applications/workflows/add-service-workflow/add-service-workflow.scss index 1179fd5419..fd61524848 100644 --- a/components/cloud-foundry/frontend/src/view/applications/workflows/add-service-workflow/add-service-workflow.scss +++ b/components/cloud-foundry/frontend/src/view/applications/workflows/add-service-workflow/add-service-workflow.scss @@ -1,7 +1,7 @@ .add-service-workflow { .select-instance { - padding: $console-unit-space 0; + padding: 0; .loading-services-spinner { text-align: center; @@ -35,12 +35,20 @@ } .select-instance-tabs { + + min-height: 300px; + .nav.nav-tabs { .uib-tab > a { background: transparent; } } + .td-row-selector { + vertical-align: middle; + width: $console-unit-space; + } + .tab-content { padding: $console-unit-space 0; @@ -51,6 +59,33 @@ } } } + .no-bindable-instances > td { + text-align: center; + p { + margin: $console-half-space; + } + } + + table > tfoot > tr { + .td-create-service { + padding: 0; + vertical-align: middle; + + button { + display: flex; + align-items: center; + > i { + line-height: 1; + margin-right: $console-unit-space / 4; + } + + &:hover, &:focus { + outline: 0; + text-decoration: none; + } + } + } + } } .wizard-foot { diff --git a/components/cloud-foundry/frontend/src/view/applications/workflows/add-service-workflow/instance.html b/components/cloud-foundry/frontend/src/view/applications/workflows/add-service-workflow/instance.html index ff8517fffc..532ed539a9 100644 --- a/components/cloud-foundry/frontend/src/view/applications/workflows/add-service-workflow/instance.html +++ b/components/cloud-foundry/frontend/src/view/applications/workflows/add-service-workflow/instance.html @@ -1,84 +1,85 @@
-
-
- -
-
-

{{ wizardCtrl.options.service.entity.label }}

-

{{ wizardCtrl.options.service.entity.extra.LongDescription || wizardCtrl.options.service.entity.description }}

-
-
- -
-

- You can bind the Auto-scaler to this application here. Please note that you will need to use the CLI - to configure the auto-scaling policy for this application in order for it to be enabled. -

+

app.app-info.app-tabs.services.bind.warning.auto-sclaer

- - -
-
- - - .name-error-required - .name-error-unique - .name-error-pattern - - -
+

app.app-info.app-tabs.services.bind.select

-
- - - -
-
- - -
- - - - - - - - - - - - - - - - - -
.name-label.plan-label.apps-label
- - - {{ instance.entity.name }}{{ wizardCtrl.options.servicePlanMap[instance.entity.service_plan_guid].entity.name }}{{ instance.entity.service_bindings.length || '-' }}
-
- - +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + +
.name-label.plan-label.tags-label.apps-label
+ + + {{ instance.entity.name }}{{ wizardCtrl.options.servicePlanMap[instance.entity.service_plan_guid].entity.name }} +
+
{{ tag }}
+
+ 		{{ instance.entity.service_bindings.length || '-' }}
+

.title

+

.prompt

+ +
+ +
+ +
+ + app.app-info.app-tabs.services.create.edit-params +
{{ wizardCtrl.options.userInput.params | jsonString }}
+
+ +
+
+ + +
+
+
+ + + app.app-info.app-tabs.services.create.json-error-invalid + + +
+
+ app.app-info.app-tabs.services.create.done +
+
+
\ No newline at end of file diff --git a/components/cloud-foundry/frontend/src/view/applications/workflows/create-service-instance/create-service-instance.html b/components/cloud-foundry/frontend/src/view/applications/workflows/create-service-instance/create-service-instance.html new file mode 100644 index 0000000000..17ce1b0bb3 --- /dev/null +++ b/components/cloud-foundry/frontend/src/view/applications/workflows/create-service-instance/create-service-instance.html @@ -0,0 +1,60 @@ +
+
+ + + .name-error-required + .name-error-unique + .name-error-pattern + + +
+ +
+ + + +
+ +
+ + +
+ +
+ + app.app-info.app-tabs.services.create.edit-params +
{{ asyncTaskDialogCtrl.context.options.userInput.params | jsonString }}
+
+
+ + +
+
+
+ + + app.app-info.app-tabs.services.create.json-error-invalid + + +
+
+ app.app-info.app-tabs.services.create.done +
+
+
\ No newline at end of file diff --git a/components/cloud-foundry/frontend/src/view/applications/workflows/create-service-instance/create-service-instance.scss b/components/cloud-foundry/frontend/src/view/applications/workflows/create-service-instance/create-service-instance.scss new file mode 100644 index 0000000000..1fbb39a0a1 --- /dev/null +++ b/components/cloud-foundry/frontend/src/view/applications/workflows/create-service-instance/create-service-instance.scss @@ -0,0 +1,92 @@ +.modal.detail-view.detail-view-dialog.create-service-instance-dialog { + >.modal-dialog { + .async-dialog { + display: flex; + flex-direction: column; + height: 100%; + + .detail-view-content { + flex: 1; + width: 100%; + + > ng-include { + flex: 1 1 0; + } + } + } + } +} + +.async-dialog-param-editor { + display: none; + top: $async-dialog-header-height; + bottom: $async-dialog-footer-height; + left: $console-unit-space; + right: $console-unit-space; + + &.param-editor-open { + position: absolute; + display: block; + } + + .param-editor-container { + display: flex; + width: 100%; + height: 100%; + } +} + +.async-dialog-param-editor { + .param-editor-container { + flex-direction: column; + background-color: $white; + + p { + flex: 0 0 $console-unit-space; + margin: 0px; + } + + textarea { + flex: 1 1 0; + resize: none; + } + + .param-editor-buttons { + flex: 0 0 auto; + align-self: center; + margin: $console-half-space 0; + } + } +} + +form .form-group { + + &.tags-input-field { + width: 100%; + } + + &.form-json-editor-input { + padding-right: $console-unit-space * 3; + width: 100%; + + a.input-box-edit { + position: absolute; + right: 0; + border: 1px solid $input-border; + padding: 2px 6px; + margin-right: $console-half-space; + bottom: $padding-base-vertical; + } + + input.json-edit-box { + pointer-events: none; + } + + div.json-edit-box { + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; + } + + } +} \ No newline at end of file diff --git a/components/cloud-foundry/frontend/src/view/applications/workflows/create-service-instance/create-service-instance.service.js b/components/cloud-foundry/frontend/src/view/applications/workflows/create-service-instance/create-service-instance.service.js new file mode 100644 index 0000000000..9ad7772094 --- /dev/null +++ b/components/cloud-foundry/frontend/src/view/applications/workflows/create-service-instance/create-service-instance.service.js @@ -0,0 +1,87 @@ +(function () { + 'use strict'; + + angular + .module('cloud-foundry.view.applications.services') + .factory('cfServiceCreateServiceInstanceWorkflow', cfServiceCreateServiceInstanceWorkflow); + + /** + * @memberof cloud-foundry.view.applications.services + * @name cfServiceCreateServiceInstanceWorkflow + * @description helper service for creating a new service instance + * @param {object} $q - the Angular $q service + * @param {app.model.modelManager} modelManager - the model management service + * @param {app.framework.widgets.frameworkAsyncTaskDialog} frameworkAsyncTaskDialog The framework async task dialog + * @returns {object} A service instance factory + */ + function cfServiceCreateServiceInstanceWorkflow($q, modelManager, frameworkAsyncTaskDialog) { + var instanceModel = modelManager.retrieve('cloud-foundry.model.service-instance'); + + /** + * @function addService + * @memberof cloud-foundry.view.applications.AddServiceWorkflowController + * @description Add a new service instance to the space + * @param {string} cnsiGuid - id of the Cloud Foundry to add in + * @param {string} spaceGuid - id of the space to add in + * @param {object} userInput - user input + * @returns {object} A promise object + */ + function addService(cnsiGuid, spaceGuid, userInput) { + var newInstance = { + name: userInput.name, + service_plan_guid: userInput.plan.metadata.guid, + space_guid: spaceGuid, + tags: _.map(userInput.tags, function (tag) { return tag.text; }), + parameters: userInput.params || {} + }; + + if (userInput.params) { + newInstance.parameters = userInput.params; + } + + return instanceModel.createServiceInstance(cnsiGuid, newInstance) + .then(function (newServiceInstance) { + if (angular.isDefined(newServiceInstance.metadata)) { + return newServiceInstance; + } else { + throw new Error('Failed to create instance'); + } + }); + } + + return { + show: function (cnsiGuid, spaceGuid, instanceNames, servicePlans) { + var path = 'plugins/cloud-foundry/view/applications/workflows/create-service-instance/create-service-instance.html'; + var options = { + instanceNames: instanceNames, + servicePlans: servicePlans, + userInput: { + plan: servicePlans.length ? servicePlans[0].value : null + } + }; + + var doCreate = function () { + return addService(cnsiGuid, spaceGuid, options.userInput); + }; + + return frameworkAsyncTaskDialog( + { + title: 'app.app-info.app-tabs.services.create.title', + templateUrl: path, + submitCommit: true, + buttonTitles: { + submit: 'app.app-info.app-tabs.services.create.button.yes' + }, + class: 'dialog-form-larger create-service-instance-dialog', + dialog: true + }, + { + options: options + }, + doCreate + ).result; + } + }; + } + +})(); diff --git a/components/cloud-foundry/frontend/src/view/applications/workflows/delete-app-workflow/delete-app-workflow.directive.js b/components/cloud-foundry/frontend/src/view/applications/workflows/delete-app-workflow/delete-app-workflow.directive.js index a1423dc051..c09a9a4e8e 100644 --- a/components/cloud-foundry/frontend/src/view/applications/workflows/delete-app-workflow/delete-app-workflow.directive.js +++ b/components/cloud-foundry/frontend/src/view/applications/workflows/delete-app-workflow/delete-app-workflow.directive.js @@ -41,7 +41,7 @@ * @property {object} userInput - user's input about new application */ function DeleteAppWorkflowController(modelManager, appEventService, $q, $translate, appUtilsService, - cfApplicationTabs, cfServiceDeleteAppWorkflow) { + cfApplicationTabs, cfServiceDeleteAppWorkflow) { var vm = this; @@ -321,13 +321,13 @@ appEventService.$emit(appEventService.events.REDIRECT, 'cf.applications.list.gallery-view'); vm.dismissDialog(); }) - .catch(function () { - vm.options.hasError = true; - return $q.reject(); - }) - .finally(function () { - vm.options.isDeleting = false; - }); + .catch(function () { + vm.options.hasError = true; + return $q.reject(); + }) + .finally(function () { + vm.options.isDeleting = false; + }); } } diff --git a/components/cloud-foundry/frontend/src/view/applications/workflows/workflows.scss b/components/cloud-foundry/frontend/src/view/applications/workflows/workflows.scss index a95370924a..cb465dfa81 100644 --- a/components/cloud-foundry/frontend/src/view/applications/workflows/workflows.scss +++ b/components/cloud-foundry/frontend/src/view/applications/workflows/workflows.scss @@ -1,5 +1,6 @@ @import "add-app-workflow/add-app-workflow"; @import "add-service-workflow/add-service-workflow"; +@import "create-service-instance/create-service-instance"; @import "delete-app-workflow/delete-app-workflow"; .control-title { diff --git a/components/cloud-foundry/frontend/src/view/dashboard/cluster/actions/assign-users-workflow/assign-users.service.js b/components/cloud-foundry/frontend/src/view/dashboard/cluster/actions/assign-users-workflow/assign-users.service.js index dfdabede97..f7d0548792 100644 --- a/components/cloud-foundry/frontend/src/view/dashboard/cluster/actions/assign-users-workflow/assign-users.service.js +++ b/components/cloud-foundry/frontend/src/view/dashboard/cluster/actions/assign-users-workflow/assign-users.service.js @@ -47,7 +47,7 @@ * @param {object} $uibModalInstance - the angular $uibModalInstance service used to close/dismiss a modal */ function AssignUsersWorkflowController($scope, $translate, modelManager, context, appClusterRolesService, - cfOrganizationModel,$stateParams, $q, $timeout, $uibModalInstance) { + cfOrganizationModel,$stateParams, $q, $timeout, $uibModalInstance) { var that = this; this.$uibModalInstance = $uibModalInstance; diff --git a/components/cloud-foundry/frontend/src/view/dashboard/cluster/actions/manage-user/manage-user.service.js b/components/cloud-foundry/frontend/src/view/dashboard/cluster/actions/manage-user/manage-user.service.js index 1435f51e13..54dc0357d4 100644 --- a/components/cloud-foundry/frontend/src/view/dashboard/cluster/actions/manage-user/manage-user.service.js +++ b/components/cloud-foundry/frontend/src/view/dashboard/cluster/actions/manage-user/manage-user.service.js @@ -16,7 +16,7 @@ * @param {object} cfOrganizationModel - the cfOrganizationModel service */ function ManageUsersFactory($translate, modelManager, frameworkAsyncTaskDialog, appClusterRolesService, - cfOrganizationModel) { + cfOrganizationModel) { var authModel = modelManager.retrieve('cloud-foundry.model.auth'); @@ -60,9 +60,9 @@ _.forEach(organizations, function (organization) { selectedRoles[organization.details.org.metadata.guid] = {}; disableClearAll = disableClearAll || !authModel.isAllowed(clusterGuid, - authModel.resources.organization, - authModel.actions.update, - organization.details.org.metadata.guid); + authModel.resources.organization, + authModel.actions.update, + organization.details.org.metadata.guid); }); // Async refresh roles diff --git a/components/cloud-foundry/frontend/src/view/dashboard/cluster/actions/roles-tables/roles.service.js b/components/cloud-foundry/frontend/src/view/dashboard/cluster/actions/roles-tables/roles.service.js index 4f80bd620e..970d07a0ab 100644 --- a/components/cloud-foundry/frontend/src/view/dashboard/cluster/actions/roles-tables/roles.service.js +++ b/components/cloud-foundry/frontend/src/view/dashboard/cluster/actions/roles-tables/roles.service.js @@ -36,7 +36,7 @@ * selected */ function appClusterRolesService($log, $q, $interpolate, $translate, modelManager, appEventService, - appNotificationsService, frameworkDialogConfirm, cfOrganizationModel) { + appNotificationsService, frameworkDialogConfirm, cfOrganizationModel) { var that = this; var spaceModel = modelManager.retrieve('cloud-foundry.model.space'); diff --git a/components/cloud-foundry/frontend/src/view/dashboard/cluster/cluster.module.js b/components/cloud-foundry/frontend/src/view/dashboard/cluster/cluster.module.js index 50748cf480..70036afe57 100644 --- a/components/cloud-foundry/frontend/src/view/dashboard/cluster/cluster.module.js +++ b/components/cloud-foundry/frontend/src/view/dashboard/cluster/cluster.module.js @@ -19,7 +19,7 @@ } function ClusterController($stateParams, $log, appUtilsService, $state, $q, appClusterRolesService, - modelManager, appUserSelection, cfOrganizationModel, cfUtilsService) { + modelManager, appUserSelection, cfOrganizationModel, cfUtilsService) { var that = this; var appModel = modelManager.retrieve('cloud-foundry.model.application'); var authModel = modelManager.retrieve('cloud-foundry.model.auth'); diff --git a/components/cloud-foundry/frontend/src/view/dashboard/cluster/detail/actions/cluster-actions.directive.js b/components/cloud-foundry/frontend/src/view/dashboard/cluster/detail/actions/cluster-actions.directive.js index bd61d46aee..3d48f48809 100644 --- a/components/cloud-foundry/frontend/src/view/dashboard/cluster/detail/actions/cluster-actions.directive.js +++ b/components/cloud-foundry/frontend/src/view/dashboard/cluster/detail/actions/cluster-actions.directive.js @@ -40,8 +40,8 @@ * @property {Array} actions - collection of relevant actions vm can be executed against cluster */ function ClusterActionsController($scope, modelManager, $state, $q, $stateParams, $translate, appUtilsService, - frameworkAsyncTaskDialog, appClusterAssignUsers, appUserSelection, - appNotificationsService, cfOrganizationModel) { + frameworkAsyncTaskDialog, appClusterAssignUsers, appUserSelection, + appNotificationsService, cfOrganizationModel) { var vm = this; var spaceModel = modelManager.retrieve('cloud-foundry.model.space'); var authModel = modelManager.retrieve('cloud-foundry.model.auth'); diff --git a/components/cloud-foundry/frontend/src/view/dashboard/cluster/detail/cluster-detail.html b/components/cloud-foundry/frontend/src/view/dashboard/cluster/detail/cluster-detail.html index cc445ff5b0..4b8736f50b 100644 --- a/components/cloud-foundry/frontend/src/view/dashboard/cluster/detail/cluster-detail.html +++ b/components/cloud-foundry/frontend/src/view/dashboard/cluster/detail/cluster-detail.html @@ -50,6 +50,10 @@

cf.cli-common.button-text +
cf.summary.panel.label.api-version
+
+ {{ clusterDetailController.userService.info.api_version }} +
cf.summary.panel.label.username
{{ clusterDetailController.userName }} diff --git a/components/cloud-foundry/frontend/src/view/dashboard/cluster/detail/cluster-detail.module.js b/components/cloud-foundry/frontend/src/view/dashboard/cluster/detail/cluster-detail.module.js index e8219d50bf..99256e477c 100644 --- a/components/cloud-foundry/frontend/src/view/dashboard/cluster/detail/cluster-detail.module.js +++ b/components/cloud-foundry/frontend/src/view/dashboard/cluster/detail/cluster-detail.module.js @@ -28,8 +28,8 @@ } function ClusterDetailController($stateParams, $scope, $state, $q, - modelManager, apiManager, appUtilsService, appClusterCliCommands, - modelUtils, cfOrganizationModel, cfUtilsService, cfTabs) { + modelManager, apiManager, appUtilsService, appClusterCliCommands, + modelUtils, cfOrganizationModel, cfUtilsService, cfTabs) { var that = this; this.guid = $stateParams.guid; this.appClusterCliCommands = appClusterCliCommands; diff --git a/components/cloud-foundry/frontend/src/view/dashboard/cluster/detail/firehose/cluster-detail.firehose.module.js b/components/cloud-foundry/frontend/src/view/dashboard/cluster/detail/firehose/cluster-detail.firehose.module.js index acf32e3aff..37e79813f7 100644 --- a/components/cloud-foundry/frontend/src/view/dashboard/cluster/detail/firehose/cluster-detail.firehose.module.js +++ b/components/cloud-foundry/frontend/src/view/dashboard/cluster/detail/firehose/cluster-detail.firehose.module.js @@ -34,7 +34,7 @@ } function ClusterFirehoseController(base64, appUtilsService, appLocalStorage, - $scope, $rootScope, $stateParams, $location, $log, $document, $animate) { + $scope, $rootScope, $stateParams, $location, $log, $document, $animate) { var vm = this; /* eslint-disable no-control-regex */ diff --git a/components/cloud-foundry/frontend/src/view/dashboard/cluster/detail/organization-tile/organization-tile.directive.js b/components/cloud-foundry/frontend/src/view/dashboard/cluster/detail/organization-tile/organization-tile.directive.js index 1bf57e536c..59e717575c 100644 --- a/components/cloud-foundry/frontend/src/view/dashboard/cluster/detail/organization-tile/organization-tile.directive.js +++ b/components/cloud-foundry/frontend/src/view/dashboard/cluster/detail/organization-tile/organization-tile.directive.js @@ -35,8 +35,8 @@ * @property {Array} actions - collection of relevant actions that can be executed against cluster */ function OrganizationTileController(modelManager, $state, $q, $scope, $translate, appUtilsService, - appClusterAssignUsers, appNotificationsService, frameworkDialogConfirm, - frameworkAsyncTaskDialog, cfOrganizationModel) { + appClusterAssignUsers, appNotificationsService, frameworkDialogConfirm, + frameworkAsyncTaskDialog, cfOrganizationModel) { var that = this; this.$state = $state; @@ -175,11 +175,11 @@ for (var i = 0; i < that.organization.org.entity.spaces.length; i++) { var space = that.organization.org.entity.spaces[i]; if (authModel.isAllowed(that.organization.cnsiGuid, - authModel.resources.space, - authModel.actions.update, - space.metadata.guid, - space.entity.organization_guid, - true)) { + authModel.resources.space, + authModel.actions.update, + space.metadata.guid, + space.entity.organization_guid, + true)) { isSpaceManager = true; break; @@ -190,9 +190,9 @@ // 1. Not allowed to update the organization (not an admin or an org-manager) // 2. and not a manager of any space within the organization in question var canAssignUsers = authModel.isAllowed(that.organization.cnsiGuid, - authModel.resources.organization, - authModel.actions.update, - that.organization.guid) || isSpaceManager; + authModel.resources.organization, + authModel.actions.update, + that.organization.guid) || isSpaceManager; editOrgAction.hidden = !canEditOrg && !that.user.admin; deleteOrgAction.hidden = !canDeleteOrg && !that.user.admin; diff --git a/components/cloud-foundry/frontend/src/view/dashboard/cluster/detail/users/cluster-detail.users.module.js b/components/cloud-foundry/frontend/src/view/dashboard/cluster/detail/users/cluster-detail.users.module.js index c60fbb7e68..0cae8a95a2 100644 --- a/components/cloud-foundry/frontend/src/view/dashboard/cluster/detail/users/cluster-detail.users.module.js +++ b/components/cloud-foundry/frontend/src/view/dashboard/cluster/detail/users/cluster-detail.users.module.js @@ -32,7 +32,7 @@ } function ClusterUsersController($scope, $state, $stateParams, $q, modelManager, appUtilsService, appClusterManageUsers, appClusterRolesService, - appEventService, appUserSelection, cfOrganizationModel) { + appEventService, appUserSelection, cfOrganizationModel) { var that = this; this.guid = $stateParams.guid; diff --git a/components/cloud-foundry/frontend/src/view/dashboard/cluster/organization/detail/spaces/space-tile/organization-space-tile.directive.js b/components/cloud-foundry/frontend/src/view/dashboard/cluster/organization/detail/spaces/space-tile/organization-space-tile.directive.js index 7892cf77f7..a76cf0cd22 100644 --- a/components/cloud-foundry/frontend/src/view/dashboard/cluster/organization/detail/spaces/space-tile/organization-space-tile.directive.js +++ b/components/cloud-foundry/frontend/src/view/dashboard/cluster/organization/detail/spaces/space-tile/organization-space-tile.directive.js @@ -35,8 +35,8 @@ * @property {Array} actions - collection of relevant actions that can be executed against cluster */ function OrganizationSpaceTileController($state, $stateParams, $scope, $q, $translate, modelManager, - appClusterAssignUsers, appNotificationsService, appUtilsService, - frameworkDialogConfirm, frameworkAsyncTaskDialog, cfOrganizationModel) { + appClusterAssignUsers, appNotificationsService, appUtilsService, + frameworkDialogConfirm, frameworkAsyncTaskDialog, cfOrganizationModel) { var vm = this; vm.clusterGuid = $stateParams.guid; diff --git a/components/cloud-foundry/frontend/src/view/dashboard/cluster/organization/detail/summary-tile/organization-summary-tile.directive.js b/components/cloud-foundry/frontend/src/view/dashboard/cluster/organization/detail/summary-tile/organization-summary-tile.directive.js index 9c86be6a86..5ceaeb5410 100644 --- a/components/cloud-foundry/frontend/src/view/dashboard/cluster/organization/detail/summary-tile/organization-summary-tile.directive.js +++ b/components/cloud-foundry/frontend/src/view/dashboard/cluster/organization/detail/summary-tile/organization-summary-tile.directive.js @@ -36,8 +36,8 @@ * @param {object} cfOrganizationModel - the cfOrganizationModel service */ function OrganizationSummaryTileController($scope, $state, $stateParams, $q, $translate, modelManager, appUtilsService, - appNotificationsService, appClusterCliCommands, frameworkDialogConfirm, - frameworkAsyncTaskDialog, cfOrganizationModel) { + appNotificationsService, appClusterCliCommands, frameworkDialogConfirm, + frameworkAsyncTaskDialog, cfOrganizationModel) { var that = this; this.clusterGuid = $stateParams.guid; this.organizationGuid = $stateParams.organization; diff --git a/components/cloud-foundry/frontend/src/view/dashboard/cluster/organization/detail/users/organization-detail.users.module.js b/components/cloud-foundry/frontend/src/view/dashboard/cluster/organization/detail/users/organization-detail.users.module.js index c02fef0df1..3de5aa056c 100644 --- a/components/cloud-foundry/frontend/src/view/dashboard/cluster/organization/detail/users/organization-detail.users.module.js +++ b/components/cloud-foundry/frontend/src/view/dashboard/cluster/organization/detail/users/organization-detail.users.module.js @@ -34,7 +34,7 @@ } function OrganizationUsersController($scope, $state, $stateParams, $q, modelManager, appUtilsService, appClusterManageUsers, appClusterRolesService, - appEventService, appUserSelection, cfOrganizationModel) { + appEventService, appUserSelection, cfOrganizationModel) { var that = this; this.guid = $stateParams.guid; diff --git a/components/cloud-foundry/frontend/src/view/dashboard/cluster/organization/space/detail/applications/space-applications.module.js b/components/cloud-foundry/frontend/src/view/dashboard/cluster/organization/space/detail/applications/space-applications.module.js index de6304d7c7..4e311d4347 100644 --- a/components/cloud-foundry/frontend/src/view/dashboard/cluster/organization/space/detail/applications/space-applications.module.js +++ b/components/cloud-foundry/frontend/src/view/dashboard/cluster/organization/space/detail/applications/space-applications.module.js @@ -32,7 +32,7 @@ } function SpaceApplicationsController($state, $stateParams, $q, $scope, $filter, - modelManager, appUtilsService, cfAppStateService) { + modelManager, appUtilsService, cfAppStateService) { var that = this; var clusterGuid = $stateParams.guid; diff --git a/components/cloud-foundry/frontend/src/view/dashboard/cluster/organization/space/detail/services/space-services.html b/components/cloud-foundry/frontend/src/view/dashboard/cluster/organization/space/detail/services/space-services.html index b9064ecf00..0d15eb36eb 100644 --- a/components/cloud-foundry/frontend/src/view/dashboard/cluster/organization/space/detail/services/space-services.html +++ b/components/cloud-foundry/frontend/src/view/dashboard/cluster/organization/space/detail/services/space-services.html @@ -1,5 +1,5 @@
-
cf.space-info.tabs.services.none
@@ -18,6 +18,7 @@ cf.space-info.tabs.services.columns.services cf.space-info.tabs.services.columns.type cf.space-info.tabs.services.columns.plan + cf.space-info.tabs.services.columns.tags cf.space-info.tabs.services.columns.attached cf.space-info.tabs.services.columns.action @@ -28,6 +29,12 @@ {{ instance.entity.name }} {{ instance.entity.service_plan.entity.service.entity.label }} {{ instance.entity.service_plan.entity.name }} + +
+
{{ tag }}
+
+ - + {{ spaceSrvsCtrl.createApplicationList(instance.entity.service_bindings) }} create from test above + appRouteName = newHostName + '.' + domain; + browser.getCurrentUrl().then(function (url) { appViewUrl = url; }); @@ -168,17 +171,18 @@ routes.getRows().then(function (rows) { expect(rows.length).toBeGreaterThan(0); }); - // Table should contain our service - var column = routes.getElement().all(by.css('td')).filter(function (elem) { - return elem.getText().then(function (text) { - return text === appRouteName; + // Table should contain our route + routes.getData().then(function (rows) { + var index = _.findIndex(rows, function (row) { + return row[0] === appRouteName; }); - }).first(); - expect(column).toBeDefined(); + expect(index).not.toBeLessThan(0); + }); }); it('should allow the route to be un-mapped and then deleted', function () { var routes = table.wrap(element(by.css('.space-services-table table'))); + routes.waitForElement(); // Click the "Show More" button in case there are many routes var showMoreButtonLink = element(by.css('.space-services-table tfoot > tr > td > a')); @@ -193,9 +197,23 @@ return row[0] === appRouteName; }); - // Unmap Route + // Confirm route exists in table + expect(index).not.toBeLessThan(0); + expect(rows[index]).toBeDefined(); + + // Confirm route is attached to an application + var appRouteAttachedTo = rows[index][1]; + expect(appRouteAttachedTo).toBeDefined(); + expect(appRouteAttachedTo.length).toBeGreaterThan(0); + expect(appRouteAttachedTo).toContain(testAppName); + var columnMenu = actionMenu.wrap(routes.getItem(index, 2)); + columnMenu.waitForElement(); + helpers.scrollIntoView(columnMenu); + + // Unmap Route columnMenu.click(); + columnMenu.clickItem(1); confirmModal.waitForModal(); expect(confirmModal.getTitle()).toBe('Unmap Route from Application'); diff --git a/components/cloud-foundry/frontend/test/e2e/applications.add-app.spec.js b/components/cloud-foundry/frontend/test/e2e/applications.add-app.spec.js index 3931d4b7e3..f6a2679106 100644 --- a/components/cloud-foundry/frontend/test/e2e/applications.add-app.spec.js +++ b/components/cloud-foundry/frontend/test/e2e/applications.add-app.spec.js @@ -15,9 +15,6 @@ var inputText = require('../../../../app-core/frontend/test/e2e/po/widgets/input-text.po'); var orgsAndSpaces = require('./po/endpoints/endpoints-org-spaces.po'); var navbar = require('../../../../app-core/frontend/test/e2e/po/navbar.po'); - var table = require('../../../../app-core/frontend/test/e2e/po/widgets/table.po'); - var actionMenu = require('../../../../app-core/frontend/test/e2e/po/widgets/actions-menu.po'); - var confirmModal = require('../../../../app-core/frontend/test/e2e/po/widgets/confirmation-modal.po'); // Service to use when adding a service to the app var SERVICE_NAME = 'app-autoscaler'; @@ -157,9 +154,9 @@ expect(element(by.id('new-app-add-services')).isDisplayed()).toBe(true); element(by.id('new-app-add-services')).click(); - expect(application.getActiveTab().getText()).toBe('Services'); + expect(application.getActiveTab().getText()).toBe('Service Catalog'); - browser.wait(until.presenceOf(element(by.css('service-card'))), 10000); + browser.wait(until.presenceOf(element(by.css('service-catalogue-card'))), 10000); addAppService.addService(SERVICE_NAME); @@ -167,15 +164,24 @@ expect(serviceWizard.getWizard().isCancelEnabled()).toBe(true); expect(serviceWizard.getWizard().isNextEnabled()).toBe(false); - expect(serviceWizard.getSelectedAddServiceTab()).toBe('Create New Instance'); + // Click the "create new instance" button + addAppService.showCreateInstanceDialog(); + var createDialog = serviceWizard.getDialog(); + + expect(createDialog.getTitleText()).toBe('Create Service Instance'); + serviceWizard.getCreateNewName().addText(serviceName); - expect(serviceWizard.getWizard().isNextEnabled()).toBe(false); + expect(createDialog.isCommitEnabled()).toBe(false); serviceName = appSetupHelper.getServiceName(testTime, true); serviceWizard.getCreateNewName().clear(); serviceWizard.getCreateNewName().addText(serviceName); - expect(serviceWizard.getWizard().isNextEnabled()).toBe(true); + expect(createDialog.isCommitEnabled()).toBe(true); + + createDialog.commit(); + // Dialog should close + expect(serviceWizard.getWizard().getNext().getText()).toBe('BIND TO APP'); serviceWizard.getWizard().next(); expect(serviceWizard.getWizard().getNext().getText()).toBe('DONE'); serviceWizard.getWizard().next().then(function () { @@ -189,20 +195,12 @@ }); application.showSummary(); + // Check that we now have a bound service instance + var servicesCount = element(by.css('.app-summary-bound-services-count')); + expect(servicesCount.getText()).toBe('1'); - // Test that the service is shown in the summary page - // Check that we have at least one service - var serviceInstances = table.wrap(element(by.css('.summary-service-instances table'))); - serviceInstances.getRows().then(function (rows) { - expect(rows.length).toBeGreaterThan(0); - }); - // Table should contain our service - var column = serviceInstances.getElement().all(by.css('td')).filter(function (elem) { - return elem.getText().then(function (text) { - return text === SERVICE_NAME; - }); - }).first(); - expect(column).toBeDefined(); + // Test that the service is shown on the Service Instance tab + expect(application.findServiceInstanceCard(serviceName)).toBeDefined(); // Test CLI Info application.invokeAction('CLI Info'); @@ -245,8 +243,6 @@ describe('check application on the cf endpoints dashboard -', function () { - var serviceName = appSetupHelper.getServiceName(testTime, true); - beforeAll(function () { // Load the app again - keep the cookies so we don't have to login // This is a workaround for a Bug @@ -264,56 +260,6 @@ }); }); }); - - it('should contain the service that was created', function () { - // Go to Services tab - application.getTabs().get(1).click(); - // Check that we have at least one service - var serviceInstances = table.wrap(element(by.css('.space-services-table table'))); - serviceInstances.getRows().then(function (rows) { - expect(rows.length).toBeGreaterThan(0); - }); - // Table should contain our service - var column = serviceInstances.getElement().all(by.css('td')).filter(function (elem) { - return elem.getText().then(function (text) { - return text === serviceName; - }); - }).first(); - expect(column).toBeDefined(); - }); - - it('should allow the service to be detached and then deleted', function () { - // Go to Services tab - application.getTabs().get(1).click(); - var serviceInstances = table.wrap(element(by.css('.space-services-table table'))); - serviceInstances.getData().then(function (rows) { - var index = _.findIndex(rows, function (row) { - return row[0] === serviceName; - }); - - // Detach Service - var columnMenu = actionMenu.wrap(serviceInstances.getItem(index, 4)); - columnMenu.click(); - columnMenu.clickItem(1); - expect(confirmModal.getTitle()).toBe('Detach Service'); - confirmModal.commit(); - helpers.checkAndCloseToast(/Service instance successfully detached/); - - // Delete Service - columnMenu.click(); - columnMenu.clickItem(0); - expect(confirmModal.getTitle()).toBe('Delete Service'); - confirmModal.commit(); - helpers.checkAndCloseToast(/Service instance successfully deleted/); - if (rows.length === 1) { - expect(element(by.css('.space-services-table .panel-body')).getText()).toBe('You have no service instances'); - } else { - serviceInstances.getData().then(function (newRows) { - expect(newRows.length).toBe(rows.length - 1); - }); - } - }); - }); }); }).skipWhen(helpers.skipIfNoCF); })(); diff --git a/components/cloud-foundry/frontend/test/e2e/cf.organizations.spaces.spec.js b/components/cloud-foundry/frontend/test/e2e/cf.organizations.spaces.spec.js index a748c8b362..aed35485c0 100644 --- a/components/cloud-foundry/frontend/test/e2e/cf.organizations.spaces.spec.js +++ b/components/cloud-foundry/frontend/test/e2e/cf.organizations.spaces.spec.js @@ -59,8 +59,12 @@ afterAll(function () { if (testGuid) { - browser.driver.wait(Q.all(cfModel.deleteOrgIfExisting(testGuid, testOrgName), - cfModel.deleteSpaceIfExisting(testGuid, testSpaceName))); + browser.driver.wait( + Q.all([ + cfModel.deleteOrgIfExisting(testGuid, testOrgName), + cfModel.deleteSpaceIfExisting(testGuid, testSpaceName) + ]) + ); } }); @@ -93,8 +97,16 @@ var testAdminUser, testUser; var init = cfModel.fetchUsers(testGuid) .then(function (users) { - testUser = _.find(users, {entity: {username: cfFromConfig.user.username}}); - testAdminUser = _.find(users, {entity: {username: cfFromConfig.admin.username}}); + testUser = _.find(users, { + entity: { + username: cfFromConfig.user.username + } + }); + testAdminUser = _.find(users, { + entity: { + username: cfFromConfig.admin.username + } + }); expect(testUser).toBeDefined(); expect(testAdminUser).toBeDefined(); }) diff --git a/components/cloud-foundry/frontend/test/e2e/po/app-setup.po.js b/components/cloud-foundry/frontend/test/e2e/po/app-setup.po.js index af68414ce8..aa624819b2 100644 --- a/components/cloud-foundry/frontend/test/e2e/po/app-setup.po.js +++ b/components/cloud-foundry/frontend/test/e2e/po/app-setup.po.js @@ -60,6 +60,7 @@ // - The app wall is showing // - The app wall has the required cf, organization and space filters set correctly + jasmine.DEFAULT_TIMEOUT_INTERVAL = 240000; // Reset all cnsi that exist in params return resetTo.resetAllCnsi() .then(function () { diff --git a/components/cloud-foundry/frontend/test/e2e/po/applications/add-application-services.po.js b/components/cloud-foundry/frontend/test/e2e/po/applications/add-application-services.po.js index d3e5f5a0f7..627a225272 100644 --- a/components/cloud-foundry/frontend/test/e2e/po/applications/add-application-services.po.js +++ b/components/cloud-foundry/frontend/test/e2e/po/applications/add-application-services.po.js @@ -6,11 +6,12 @@ module.exports = { getServices: getServices, addService: addService, - getServiceWizard: getServiceWizard + getServiceWizard: getServiceWizard, + showCreateInstanceDialog: showCreateInstanceDialog }; function getServices() { - return element.all(by.css('service-card')); + return element.all(by.css('service-catalogue-card')); } function addService(serviceName) { @@ -19,11 +20,27 @@ return text === serviceName; }); }).first(); - return matchingService.element(by.css('.btn.btn-sm.btn-link')).click(); + + var btn = getButton(matchingService, 'Bind Service'); + btn.click(); + } + + function getButton(serviceCatalogCard, buttonText) { + var buttons = serviceCatalogCard.all(by.css('.service-actions > button')); + return buttons.filter(function (elem) { + return elem.getText().then(function (text) { + return text.toLowerCase().indexOf(buttonText.toLowerCase()) === 0; + }); + }).first(); } function getServiceWizard() { return serviceWizard; } + function showCreateInstanceDialog() { + var btn = getServiceWizard().getElement().element(by.css('.td-create-service > button')); + return btn.click(); + } + })(); diff --git a/components/cloud-foundry/frontend/test/e2e/po/applications/add-service-wizard.po.js b/components/cloud-foundry/frontend/test/e2e/po/applications/add-service-wizard.po.js index 40e601737f..80195a2e5b 100644 --- a/components/cloud-foundry/frontend/test/e2e/po/applications/add-service-wizard.po.js +++ b/components/cloud-foundry/frontend/test/e2e/po/applications/add-service-wizard.po.js @@ -3,26 +3,32 @@ var inputText = require('../../../../../../app-core/frontend/test/e2e/po/widgets/input-text.po'); var wizard = require('../../../../../../app-core/frontend/test/e2e/po/widgets/wizard.po'); + var asyncDialog = require('../../../../../../app-core/frontend/test/e2e/po/widgets/async-dialog-view.po'); module.exports = { - getSelectedAddServiceTab: getSelectedAddServiceTab, + getElement: getElement, getCreateNewName: getCreateNewName, - getWizard: getWizard + getWizard: getWizard, + getDialog: getDialog }; function getElement() { return element(by.css('.add-service-workflow')); } - function getSelectedAddServiceTab() { - return getElement().element(by.css('.nav.nav-tabs .active a')).getText(); - } - function getCreateNewName() { - return inputText.wrap(getElement().all(by.css('.tab-pane.active .form-group')).get(0)); + return inputText.wrap(getDialogElement().all(by.css('form .form-group')).get(0)); } function getWizard() { return wizard.wrap(getElement()); } + + function getDialogElement() { + return element(by.css('.modal.create-service-instance-dialog')); + } + + function getDialog() { + return asyncDialog.wrap(getDialogElement()); + } })(); diff --git a/components/cloud-foundry/frontend/test/e2e/po/applications/application.po.js b/components/cloud-foundry/frontend/test/e2e/po/applications/application.po.js index d8c9b14924..7b7843bf9b 100644 --- a/components/cloud-foundry/frontend/test/e2e/po/applications/application.po.js +++ b/components/cloud-foundry/frontend/test/e2e/po/applications/application.po.js @@ -22,6 +22,9 @@ addRoute: addRoute, editApplication: editApplication, + // Service Instance Tab + findServiceInstanceCard: findServiceInstanceCard, + invokeAction: invokeAction // applicationServiceFlyout: applicationServiceFlyout, @@ -97,6 +100,17 @@ return element(by.css('.summary .action-header a.btn.btn-link')).click(); } + function findServiceInstanceCard(name) { + var cards = element.all(by.css('.services-gallery-card__container')); + var matchingService = cards.filter(function (elem) { + return elem.element(by.css('.gallery-card-title')).getText().then(function (text) { + return text === name; + }); + }).first(); + + return matchingService; + } + function invokeAction(actionName) { var actions = element.all(by.css('.application-header .actions-toolbar > button > span')); var matchingAction = actions.filter(function (elem) { diff --git a/components/cloud-foundry/frontend/test/e2e/po/models/cf-model.po.js b/components/cloud-foundry/frontend/test/e2e/po/models/cf-model.po.js index 12d17285ca..911df0cd37 100644 --- a/components/cloud-foundry/frontend/test/e2e/po/models/cf-model.po.js +++ b/components/cloud-foundry/frontend/test/e2e/po/models/cf-model.po.js @@ -20,8 +20,8 @@ function createHeader(cnsiGuid) { return { - 'x-cnap-cnsi-list': cnsiGuid, - 'x-cnap-passthrough': 'true' + 'x-cap-cnsi-list': cnsiGuid, + 'x-cap-passthrough': 'true' }; } diff --git a/components/cloud-foundry/frontend/test/e2e/po/widgets/cluster-actions.po.js b/components/cloud-foundry/frontend/test/e2e/po/widgets/cluster-actions.po.js index 4e1b19d6dd..0748acee09 100644 --- a/components/cloud-foundry/frontend/test/e2e/po/widgets/cluster-actions.po.js +++ b/components/cloud-foundry/frontend/test/e2e/po/widgets/cluster-actions.po.js @@ -16,7 +16,7 @@ var orgNameField = inputText.wrap(element(by.name('form.createOrganization'))); orgNameField.addText(orgName); element(by.buttonText('Create')).click(); - helpers.checkAndCloseToast(/Organisation '.*' successfully created/); + helpers.checkAndCloseToast(/Organization '.*' successfully created/); } function createSpace(orgName, spaceName) { diff --git a/components/cloud-foundry/frontend/test/unit/api/Apps.mock.js b/components/cloud-foundry/frontend/test/unit/api/Apps.mock.js index 6825e01f7a..b3646f164a 100644 --- a/components/cloud-foundry/frontend/test/unit/api/Apps.mock.js +++ b/components/cloud-foundry/frontend/test/unit/api/Apps.mock.js @@ -209,87 +209,87 @@ 200: { body: { - "guid": guid, - "name": "name-2342", - "routes": [ + 'guid': guid, + 'name': 'name-2342', + 'routes': [ { - "guid": "84a911b3-16f7-4f47-afa4-581c86018600", - "host": "host-20", - "path": "", - "domain": { - "guid": "bc102838-ebd6-448e-8ea1-63f9b490dc7c", - "name": "domain-48.example.com" + 'guid': '84a911b3-16f7-4f47-afa4-581c86018600', + 'host': 'host-20', + 'path': '', + 'domain': { + 'guid': 'bc102838-ebd6-448e-8ea1-63f9b490dc7c', + 'name': 'domain-48.example.com' } } ], - "running_instances": 0, - "services": [ + 'running_instances': 0, + 'services': [ { - "guid": "28aa8270-ab0e-480d-b9b6-ba4ec4f15015", - "name": "name-2344", - "bound_app_count": 1, - "last_operation": null, - "dashboard_url": null, - "service_plan": { - "guid": "d22b3754-d093-42a2-a294-5fda6c6db44c", - "name": "name-2345", - "service": { - "guid": "67229bc6-8fc9-4fe1-b8bc-8790cdae5334", - "label": "label-53", - "provider": null, - "version": null + 'guid': '28aa8270-ab0e-480d-b9b6-ba4ec4f15015', + 'name': 'name-2344', + 'bound_app_count': 1, + 'last_operation': null, + 'dashboard_url': null, + 'service_plan': { + 'guid': 'd22b3754-d093-42a2-a294-5fda6c6db44c', + 'name': 'name-2345', + 'service': { + 'guid': '67229bc6-8fc9-4fe1-b8bc-8790cdae5334', + 'label': 'label-53', + 'provider': null, + 'version': null } } } ], - "available_domains": [ + 'available_domains': [ { - "guid": "bc102838-ebd6-448e-8ea1-63f9b490dc7c", - "name": "domain-48.example.com", - "owning_organization_guid": "adee2ddb-8fa9-44cb-80f8-9c7f1589534c" + 'guid': 'bc102838-ebd6-448e-8ea1-63f9b490dc7c', + 'name': 'domain-48.example.com', + 'owning_organization_guid': 'adee2ddb-8fa9-44cb-80f8-9c7f1589534c' }, { - "guid": "e39933ad-2265-4d24-bf94-c962b2d60438", - "name": "customer-app-domain1.com", - "router_group_guid": null, - "router_group_types": null + 'guid': 'e39933ad-2265-4d24-bf94-c962b2d60438', + 'name': 'customer-app-domain1.com', + 'router_group_guid': null, + 'router_group_types': null }, { - "guid": "d664430b-1406-4d22-bc74-293581d36f0b", - "name": "customer-app-domain2.com", - "router_group_guid": null, - "router_group_types": null + 'guid': 'd664430b-1406-4d22-bc74-293581d36f0b', + 'name': 'customer-app-domain2.com', + 'router_group_guid': null, + 'router_group_types': null } ], - "production": false, - "space_guid": spaceGuid, - "stack_guid": "19fb9562-b371-44e5-b008-09d3e34c2041", - "buildpack": null, - "detected_buildpack": null, - "environment_json": null, - "memory": 1024, - "instances": 1, - "disk_quota": 1024, - "state": "STOPPED", - "version": "9e3484a4-6228-41a7-a1f1-e2d16cb43876", - "command": null, - "console": false, - "debug": null, - "staging_task_id": null, - "package_state": "PENDING", - "health_check_type": "port", - "health_check_timeout": null, - "staging_failed_reason": null, - "staging_failed_description": null, - "diego": false, - "docker_image": null, - "package_updated_at": "2016-02-19T02:04:02Z", - "detected_start_command": "", - "enable_ssh": true, - "docker_credentials_json": { - "redacted_message": "[PRIVATE DATA HIDDEN]" + 'production': false, + 'space_guid': spaceGuid, + 'stack_guid': '19fb9562-b371-44e5-b008-09d3e34c2041', + 'buildpack': null, + 'detected_buildpack': null, + 'environment_json': null, + 'memory': 1024, + 'instances': 1, + 'disk_quota': 1024, + 'state': 'STOPPED', + 'version': '9e3484a4-6228-41a7-a1f1-e2d16cb43876', + 'command': null, + 'console': false, + 'debug': null, + 'staging_task_id': null, + 'package_state': 'PENDING', + 'health_check_type': 'port', + 'health_check_timeout': null, + 'staging_failed_reason': null, + 'staging_failed_description': null, + 'diego': false, + 'docker_image': null, + 'package_updated_at': '2016-02-19T02:04:02Z', + 'detected_start_command': '', + 'enable_ssh': true, + 'docker_credentials_json': { + 'redacted_message': '[PRIVATE DATA HIDDEN]' }, - "ports": null + 'ports': null } }, @@ -309,49 +309,49 @@ 201: { body: { - "metadata": { - "guid": guid, - "url": "/v2/apps/6373ab80-6838-4169-8f3e-ba200fd3daca", - "created_at": "2016-02-19T02:03:42Z", - "updated_at": "2016-02-19T02:03:42Z" + 'metadata': { + 'guid': guid, + 'url': '/v2/apps/6373ab80-6838-4169-8f3e-ba200fd3daca', + 'created_at': '2016-02-19T02:03:42Z', + 'updated_at': '2016-02-19T02:03:42Z' }, - "entity": { - "name": value.name, - "production": false, - "space_guid": "c4b18843-a768-4ac5-8c37-aeb3153aba9a", - "stack_guid": "17f9ca84-d83e-46ee-ba2d-5c7f9196ce55", - "buildpack": null, - "detected_buildpack": null, - "environment_json": null, - "memory": 1024, - "instances": 1, - "disk_quota": 1024, - "state": value.state, - "version": "edcde09b-c926-4440-aa9a-924758e961c4", - "command": null, - "console": false, - "debug": null, - "staging_task_id": null, - "package_state": "PENDING", - "health_check_type": "port", - "health_check_timeout": null, - "staging_failed_reason": null, - "staging_failed_description": null, - "diego": false, - "docker_image": null, - "package_updated_at": "2016-02-19T02:03:43Z", - "detected_start_command": "", - "enable_ssh": true, - "docker_credentials_json": { - "redacted_message": "[PRIVATE DATA HIDDEN]" + 'entity': { + 'name': value.name, + 'production': false, + 'space_guid': 'c4b18843-a768-4ac5-8c37-aeb3153aba9a', + 'stack_guid': '17f9ca84-d83e-46ee-ba2d-5c7f9196ce55', + 'buildpack': null, + 'detected_buildpack': null, + 'environment_json': null, + 'memory': 1024, + 'instances': 1, + 'disk_quota': 1024, + 'state': value.state, + 'version': 'edcde09b-c926-4440-aa9a-924758e961c4', + 'command': null, + 'console': false, + 'debug': null, + 'staging_task_id': null, + 'package_state': 'PENDING', + 'health_check_type': 'port', + 'health_check_timeout': null, + 'staging_failed_reason': null, + 'staging_failed_description': null, + 'diego': false, + 'docker_image': null, + 'package_updated_at': '2016-02-19T02:03:43Z', + 'detected_start_command': '', + 'enable_ssh': true, + 'docker_credentials_json': { + 'redacted_message': '[PRIVATE DATA HIDDEN]' }, - "ports": null, - "space_url": "/v2/spaces/c4b18843-a768-4ac5-8c37-aeb3153aba9a", - "stack_url": "/v2/stacks/17f9ca84-d83e-46ee-ba2d-5c7f9196ce55", - "events_url": "/v2/apps/6373ab80-6838-4169-8f3e-ba200fd3daca/events", - "service_bindings_url": "/v2/apps/6373ab80-6838-4169-8f3e-ba200fd3daca/service_bindings", - "routes_url": "/v2/apps/6373ab80-6838-4169-8f3e-ba200fd3daca/routes", - "route_mappings_url": "/v2/apps/6373ab80-6838-4169-8f3e-ba200fd3daca/route_mappings" + 'ports': null, + 'space_url': '/v2/spaces/c4b18843-a768-4ac5-8c37-aeb3153aba9a', + 'stack_url': '/v2/stacks/17f9ca84-d83e-46ee-ba2d-5c7f9196ce55', + 'events_url': '/v2/apps/6373ab80-6838-4169-8f3e-ba200fd3daca/events', + 'service_bindings_url': '/v2/apps/6373ab80-6838-4169-8f3e-ba200fd3daca/service_bindings', + 'routes_url': '/v2/apps/6373ab80-6838-4169-8f3e-ba200fd3daca/routes', + 'route_mappings_url': '/v2/apps/6373ab80-6838-4169-8f3e-ba200fd3daca/route_mappings' } } }, @@ -372,52 +372,52 @@ 201: { body: { - "metadata": { - "guid": "67eff332-a6e9-4b74-8ee3-608a6fd152b7", - "url": "/v2/apps/67eff332-a6e9-4b74-8ee3-608a6fd152b7", - "created_at": "2016-02-19T02:03:43Z", - "updated_at": null + 'metadata': { + 'guid': '67eff332-a6e9-4b74-8ee3-608a6fd152b7', + 'url': '/v2/apps/67eff332-a6e9-4b74-8ee3-608a6fd152b7', + 'created_at': '2016-02-19T02:03:43Z', + 'updated_at': null }, - "entity": { - "name": newAppSpec.name, - "production": false, - "space_guid": newAppSpec.space_guid, - "stack_guid": "db232beb-9a37-47e1-983b-299770b150ce", - "buildpack": null, - "detected_buildpack": null, - "environment_json": {}, - "memory": 1024, - "instances": 1, - "disk_quota": 1024, - "state": "STOPPED", - "version": "105ad15b-e286-48cd-a0a7-d3dd423cac4d", - "command": null, - "console": false, - "debug": null, - "staging_task_id": null, - "package_state": "PENDING", - "health_check_type": "port", - "health_check_timeout": null, - "staging_failed_reason": null, - "staging_failed_description": null, - "diego": true, - "docker_image": null, - "package_updated_at": null, - "detected_start_command": "", - "enable_ssh": true, - "docker_credentials_json": { - "redacted_message": "[PRIVATE DATA HIDDEN]" + 'entity': { + 'name': newAppSpec.name, + 'production': false, + 'space_guid': newAppSpec.space_guid, + 'stack_guid': 'db232beb-9a37-47e1-983b-299770b150ce', + 'buildpack': null, + 'detected_buildpack': null, + 'environment_json': {}, + 'memory': 1024, + 'instances': 1, + 'disk_quota': 1024, + 'state': 'STOPPED', + 'version': '105ad15b-e286-48cd-a0a7-d3dd423cac4d', + 'command': null, + 'console': false, + 'debug': null, + 'staging_task_id': null, + 'package_state': 'PENDING', + 'health_check_type': 'port', + 'health_check_timeout': null, + 'staging_failed_reason': null, + 'staging_failed_description': null, + 'diego': true, + 'docker_image': null, + 'package_updated_at': null, + 'detected_start_command': '', + 'enable_ssh': true, + 'docker_credentials_json': { + 'redacted_message': '[PRIVATE DATA HIDDEN]' }, - "ports": [ + 'ports': [ 1024, 2000 ], - "space_url": "/v2/spaces/306ba038-4cd6-412a-bbd2-6d659924d785", - "stack_url": "/v2/stacks/db232beb-9a37-47e1-983b-299770b150ce", - "events_url": "/v2/apps/67eff332-a6e9-4b74-8ee3-608a6fd152b7/events", - "service_bindings_url": "/v2/apps/67eff332-a6e9-4b74-8ee3-608a6fd152b7/service_bindings", - "routes_url": "/v2/apps/67eff332-a6e9-4b74-8ee3-608a6fd152b7/routes", - "route_mappings_url": "/v2/apps/67eff332-a6e9-4b74-8ee3-608a6fd152b7/route_mappings" + 'space_url': '/v2/spaces/306ba038-4cd6-412a-bbd2-6d659924d785', + 'stack_url': '/v2/stacks/db232beb-9a37-47e1-983b-299770b150ce', + 'events_url': '/v2/apps/67eff332-a6e9-4b74-8ee3-608a6fd152b7/events', + 'service_bindings_url': '/v2/apps/67eff332-a6e9-4b74-8ee3-608a6fd152b7/service_bindings', + 'routes_url': '/v2/apps/67eff332-a6e9-4b74-8ee3-608a6fd152b7/routes', + 'route_mappings_url': '/v2/apps/67eff332-a6e9-4b74-8ee3-608a6fd152b7/route_mappings' } } }, @@ -453,25 +453,25 @@ 200: { body: { - "0": { - "state": "RUNNING", - "stats": { - "usage": { - "disk": 66392064, - "mem": 29880320, - "cpu": 0.13511219703079957, - "time": "2014-06-19 22:37:58 +0000" + '0': { + 'state': 'RUNNING', + 'stats': { + 'usage': { + 'disk': 66392064, + 'mem': 29880320, + 'cpu': 0.13511219703079957, + 'time': '2014-06-19 22:37:58 +0000' }, - "name": "app_name", - "uris": [ - "app_name.example.com" + 'name': 'app_name', + 'uris': [ + 'app_name.example.com' ], - "host": "10.0.0.1", - "port": 61035, - "uptime": 65007, - "mem_quota": 536870912, - "disk_quota": 1073741824, - "fds_quota": 16384 + 'host': '10.0.0.1', + 'port': 61035, + 'uptime': 65007, + 'mem_quota': 536870912, + 'disk_quota': 1073741824, + 'fds_quota': 16384 } } } @@ -490,31 +490,31 @@ response: { 200: { body: { - "total_results": 1, - "total_pages": 1, - "prev_url": null, - "next_url": null, - "resources": [ + 'total_results': 1, + 'total_pages': 1, + 'prev_url': null, + 'next_url': null, + 'resources': [ { - "metadata": { - "guid": "065a62a1-a1d0-4cf0-b2b5-9833299bdc76", - "url": "/v2/service_bindings/065a62a1-a1d0-4cf0-b2b5-9833299bdc76", - "created_at": "2016-05-12T00:45:22Z", - "updated_at": null + 'metadata': { + 'guid': '065a62a1-a1d0-4cf0-b2b5-9833299bdc76', + 'url': '/v2/service_bindings/065a62a1-a1d0-4cf0-b2b5-9833299bdc76', + 'created_at': '2016-05-12T00:45:22Z', + 'updated_at': null }, - "entity": { - "app_guid": guid, - "service_instance_guid": "6441a69e-d403-48a4-b86f-8184b302490b", - "credentials": { - "creds-key-60": "creds-val-60" + 'entity': { + 'app_guid': guid, + 'service_instance_guid': '6441a69e-d403-48a4-b86f-8184b302490b', + 'credentials': { + 'creds-key-60': 'creds-val-60' }, - "binding_options": {}, - "gateway_data": null, - "gateway_name": "", - "syslog_drain_url": null, - "volume_mounts": [], - "app_url": "/v2/apps/09ad0ee0-b35d-40eb-b7a3-25dd072f8964", - "service_instance_url": "/v2/service_instances/6441a69e-d403-48a4-b86f-8184b302490b" + 'binding_options': {}, + 'gateway_data': null, + 'gateway_name': '', + 'syslog_drain_url': null, + 'volume_mounts': [], + 'app_url': '/v2/apps/09ad0ee0-b35d-40eb-b7a3-25dd072f8964', + 'service_instance_url': '/v2/service_instances/6441a69e-d403-48a4-b86f-8184b302490b' } } ] @@ -525,7 +525,7 @@ body: {} } } - } + }; }, GetEnvForApp: function (guid) { @@ -534,40 +534,40 @@ response: { 200: { body: { - "staging_env_json": { - "STAGING_ENV": "staging_value" + 'staging_env_json': { + 'STAGING_ENV': 'staging_value' }, - "running_env_json": { - "RUNNING_ENV": "running_value" + 'running_env_json': { + 'RUNNING_ENV': 'running_value' }, - "environment_json": { - "env_var": "env_val" + 'environment_json': { + 'env_var': 'env_val' }, - "system_env_json": { - "VCAP_SERVICES": { - "label-19": [ - {"name": "instance_123"}, - {"name": "instance_456"} + 'system_env_json': { + 'VCAP_SERVICES': { + 'label-19': [ + {'name': 'instance_123'}, + {'name': 'instance_456'} ] } }, - "application_env_json": { - "VCAP_APPLICATION": { - "limits": { - "fds": 16384, - "mem": 1024, - "disk": 1024 + 'application_env_json': { + 'VCAP_APPLICATION': { + 'limits': { + 'fds': 16384, + 'mem': 1024, + 'disk': 1024 }, - "application_name": "name-1840", - "application_uris": [], - "name": "name-1840", - "space_name": "name-1841", - "space_id": "5afc57f0-3283-48be-89ae-4cfe99c3acde", - "uris": [], - "users": null, - "version": "b80b288d-585d-4dd0-a9f3-3263c07f460b", - "application_version": "b80b288d-585d-4dd0-a9f3-3263c07f460b", - "application_id": "02e4e483-c566-47be-89bc-565d4dae7be6" + 'application_name': 'name-1840', + 'application_uris': [], + 'name': 'name-1840', + 'space_name': 'name-1841', + 'space_id': '5afc57f0-3283-48be-89ae-4cfe99c3acde', + 'uris': [], + 'users': null, + 'version': 'b80b288d-585d-4dd0-a9f3-3263c07f460b', + 'application_version': 'b80b288d-585d-4dd0-a9f3-3263c07f460b', + 'application_id': '02e4e483-c566-47be-89bc-565d4dae7be6' } } } @@ -586,101 +586,101 @@ response: { 200: { body: { - "metadata": { - "guid": guid, - "url": "/v2/apps/" + guid, - "created_at": "2016-10-15T17:12:52Z", - "updated_at": "2016-10-20T11:30:20Z" + 'metadata': { + 'guid': guid, + 'url': '/v2/apps/' + guid, + 'created_at': '2016-10-15T17:12:52Z', + 'updated_at': '2016-10-20T11:30:20Z' }, - "entity": { - "name": "node-env", - "production": false, - "space_guid": "ece5299a-35e8-4ecf-96ad-e1ec0df1073f", - "stack_guid": "f7ea50c4-cf7d-4935-b0dc-279c72e2bbc5", - "buildpack": null, - "detected_buildpack": "node.js 1.5.18", - "detected_buildpack_guid": "00b92f7a-d298-44bc-b9a6-afd751321cb6", - "environment_json": {}, - "memory": 31, - "instances": 0, - "disk_quota": 1024, - "state": "STARTED", - "version": "887a058b-da40-4ac4-a3ac-6cc21b18f050", - "command": null, - "console": false, - "debug": null, - "staging_task_id": "aec4cad6529a428e90256726bda988ff", - "package_state": "STAGED", - "health_check_type": "port", - "health_check_timeout": null, - "staging_failed_reason": null, - "staging_failed_description": null, - "diego": true, - "docker_image": null, - "package_updated_at": "2016-10-17T15:02:59Z", - "detected_start_command": "node server.js", - "enable_ssh": true, - "docker_credentials_json": { - "redacted_message": "[PRIVATE DATA HIDDEN]" + 'entity': { + 'name': 'node-env', + 'production': false, + 'space_guid': 'ece5299a-35e8-4ecf-96ad-e1ec0df1073f', + 'stack_guid': 'f7ea50c4-cf7d-4935-b0dc-279c72e2bbc5', + 'buildpack': null, + 'detected_buildpack': 'node.js 1.5.18', + 'detected_buildpack_guid': '00b92f7a-d298-44bc-b9a6-afd751321cb6', + 'environment_json': {}, + 'memory': 31, + 'instances': 0, + 'disk_quota': 1024, + 'state': 'STARTED', + 'version': '887a058b-da40-4ac4-a3ac-6cc21b18f050', + 'command': null, + 'console': false, + 'debug': null, + 'staging_task_id': 'aec4cad6529a428e90256726bda988ff', + 'package_state': 'STAGED', + 'health_check_type': 'port', + 'health_check_timeout': null, + 'staging_failed_reason': null, + 'staging_failed_description': null, + 'diego': true, + 'docker_image': null, + 'package_updated_at': '2016-10-17T15:02:59Z', + 'detected_start_command': 'node server.js', + 'enable_ssh': true, + 'docker_credentials_json': { + 'redacted_message': '[PRIVATE DATA HIDDEN]' }, - "ports": [ + 'ports': [ 8080 ], - "space_url": "/v2/spaces/ece5299a-35e8-4ecf-96ad-e1ec0df1073f", - "space": { - "metadata": { - "guid": "ece5299a-35e8-4ecf-96ad-e1ec0df1073f", - "url": "/v2/spaces/ece5299a-35e8-4ecf-96ad-e1ec0df1073f", - "created_at": "2016-10-15T17:11:11Z", - "updated_at": null + 'space_url': '/v2/spaces/ece5299a-35e8-4ecf-96ad-e1ec0df1073f', + 'space': { + 'metadata': { + 'guid': 'ece5299a-35e8-4ecf-96ad-e1ec0df1073f', + 'url': '/v2/spaces/ece5299a-35e8-4ecf-96ad-e1ec0df1073f', + 'created_at': '2016-10-15T17:11:11Z', + 'updated_at': null }, - "entity": { - "name": "Dev", - "organization_guid": "4f95b8fd-69b4-4b2b-a4e4-d45b74bdf099", - "space_quota_definition_guid": null, - "allow_ssh": true, - "organization_url": "/v2/organizations/4f95b8fd-69b4-4b2b-a4e4-d45b74bdf099", - "organization": { - "metadata": { - "guid": "4f95b8fd-69b4-4b2b-a4e4-d45b74bdf099", - "url": "/v2/organizations/4f95b8fd-69b4-4b2b-a4e4-d45b74bdf099", - "created_at": "2016-10-15T17:10:42Z", - "updated_at": null + 'entity': { + 'name': 'Dev', + 'organization_guid': '4f95b8fd-69b4-4b2b-a4e4-d45b74bdf099', + 'space_quota_definition_guid': null, + 'allow_ssh': true, + 'organization_url': '/v2/organizations/4f95b8fd-69b4-4b2b-a4e4-d45b74bdf099', + 'organization': { + 'metadata': { + 'guid': '4f95b8fd-69b4-4b2b-a4e4-d45b74bdf099', + 'url': '/v2/organizations/4f95b8fd-69b4-4b2b-a4e4-d45b74bdf099', + 'created_at': '2016-10-15T17:10:42Z', + 'updated_at': null }, - "entity": { - "name": "Bristol", - "billing_enabled": false, - "quota_definition_guid": "7b742342-cdb4-4550-9601-181ff5944cfc", - "status": "active", - "quota_definition_url": "/v2/quota_definitions/7b742342-cdb4-4550-9601-181ff5944cfc", - "spaces_url": "/v2/organizations/4f95b8fd-69b4-4b2b-a4e4-d45b74bdf099/spaces", - "domains_url": "/v2/organizations/4f95b8fd-69b4-4b2b-a4e4-d45b74bdf099/domains", - "private_domains_url": "/v2/organizations/4f95b8fd-69b4-4b2b-a4e4-d45b74bdf099/private_domains", - "users_url": "/v2/organizations/4f95b8fd-69b4-4b2b-a4e4-d45b74bdf099/users", - "managers_url": "/v2/organizations/4f95b8fd-69b4-4b2b-a4e4-d45b74bdf099/managers", - "billing_managers_url": "/v2/organizations/4f95b8fd-69b4-4b2b-a4e4-d45b74bdf099/billing_managers", - "auditors_url": "/v2/organizations/4f95b8fd-69b4-4b2b-a4e4-d45b74bdf099/auditors", - "app_events_url": "/v2/organizations/4f95b8fd-69b4-4b2b-a4e4-d45b74bdf099/app_events", - "space_quota_definitions_url": "/v2/organizations/4f95b8fd-69b4-4b2b-a4e4-d45b74bdf099/space_quota_definitions" + 'entity': { + 'name': 'Bristol', + 'billing_enabled': false, + 'quota_definition_guid': '7b742342-cdb4-4550-9601-181ff5944cfc', + 'status': 'active', + 'quota_definition_url': '/v2/quota_definitions/7b742342-cdb4-4550-9601-181ff5944cfc', + 'spaces_url': '/v2/organizations/4f95b8fd-69b4-4b2b-a4e4-d45b74bdf099/spaces', + 'domains_url': '/v2/organizations/4f95b8fd-69b4-4b2b-a4e4-d45b74bdf099/domains', + 'private_domains_url': '/v2/organizations/4f95b8fd-69b4-4b2b-a4e4-d45b74bdf099/private_domains', + 'users_url': '/v2/organizations/4f95b8fd-69b4-4b2b-a4e4-d45b74bdf099/users', + 'managers_url': '/v2/organizations/4f95b8fd-69b4-4b2b-a4e4-d45b74bdf099/managers', + 'billing_managers_url': '/v2/organizations/4f95b8fd-69b4-4b2b-a4e4-d45b74bdf099/billing_managers', + 'auditors_url': '/v2/organizations/4f95b8fd-69b4-4b2b-a4e4-d45b74bdf099/auditors', + 'app_events_url': '/v2/organizations/4f95b8fd-69b4-4b2b-a4e4-d45b74bdf099/app_events', + 'space_quota_definitions_url': '/v2/organizations/4f95b8fd-69b4-4b2b-a4e4-d45b74bdf099/space_quota_definitions' } }, - "developers_url": "/v2/spaces/ece5299a-35e8-4ecf-96ad-e1ec0df1073f/developers", - "managers_url": "/v2/spaces/ece5299a-35e8-4ecf-96ad-e1ec0df1073f/managers", - "auditors_url": "/v2/spaces/ece5299a-35e8-4ecf-96ad-e1ec0df1073f/auditors", - "apps_url": "/v2/spaces/ece5299a-35e8-4ecf-96ad-e1ec0df1073f/apps", - "routes_url": "/v2/spaces/ece5299a-35e8-4ecf-96ad-e1ec0df1073f/routes", - "domains_url": "/v2/spaces/ece5299a-35e8-4ecf-96ad-e1ec0df1073f/domains", - "service_instances_url": "/v2/spaces/ece5299a-35e8-4ecf-96ad-e1ec0df1073f/service_instances", - "app_events_url": "/v2/spaces/ece5299a-35e8-4ecf-96ad-e1ec0df1073f/app_events", - "events_url": "/v2/spaces/ece5299a-35e8-4ecf-96ad-e1ec0df1073f/events", - "security_groups_url": "/v2/spaces/ece5299a-35e8-4ecf-96ad-e1ec0df1073f/security_groups" + 'developers_url': '/v2/spaces/ece5299a-35e8-4ecf-96ad-e1ec0df1073f/developers', + 'managers_url': '/v2/spaces/ece5299a-35e8-4ecf-96ad-e1ec0df1073f/managers', + 'auditors_url': '/v2/spaces/ece5299a-35e8-4ecf-96ad-e1ec0df1073f/auditors', + 'apps_url': '/v2/spaces/ece5299a-35e8-4ecf-96ad-e1ec0df1073f/apps', + 'routes_url': '/v2/spaces/ece5299a-35e8-4ecf-96ad-e1ec0df1073f/routes', + 'domains_url': '/v2/spaces/ece5299a-35e8-4ecf-96ad-e1ec0df1073f/domains', + 'service_instances_url': '/v2/spaces/ece5299a-35e8-4ecf-96ad-e1ec0df1073f/service_instances', + 'app_events_url': '/v2/spaces/ece5299a-35e8-4ecf-96ad-e1ec0df1073f/app_events', + 'events_url': '/v2/spaces/ece5299a-35e8-4ecf-96ad-e1ec0df1073f/events', + 'security_groups_url': '/v2/spaces/ece5299a-35e8-4ecf-96ad-e1ec0df1073f/security_groups' } }, - "stack_url": "/v2/stacks/f7ea50c4-cf7d-4935-b0dc-279c72e2bbc5", - "routes_url": "/v2/apps/d87c4e68-a486-443f-b83e-fc9536f8478f/routes", - "events_url": "/v2/apps/d87c4e68-a486-443f-b83e-fc9536f8478f/events", - "service_bindings_url": "/v2/apps/d87c4e68-a486-443f-b83e-fc9536f8478f/service_bindings", - "route_mappings_url": "/v2/apps/d87c4e68-a486-443f-b83e-fc9536f8478f/route_mappings" + 'stack_url': '/v2/stacks/f7ea50c4-cf7d-4935-b0dc-279c72e2bbc5', + 'routes_url': '/v2/apps/d87c4e68-a486-443f-b83e-fc9536f8478f/routes', + 'events_url': '/v2/apps/d87c4e68-a486-443f-b83e-fc9536f8478f/events', + 'service_bindings_url': '/v2/apps/d87c4e68-a486-443f-b83e-fc9536f8478f/service_bindings', + 'route_mappings_url': '/v2/apps/d87c4e68-a486-443f-b83e-fc9536f8478f/route_mappings' } } }, diff --git a/components/cloud-foundry/frontend/test/unit/api/FeatureFlags.mock.js b/components/cloud-foundry/frontend/test/unit/api/FeatureFlags.mock.js index c4a3ff56b5..d81c35e616 100644 --- a/components/cloud-foundry/frontend/test/unit/api/FeatureFlags.mock.js +++ b/components/cloud-foundry/frontend/test/unit/api/FeatureFlags.mock.js @@ -16,82 +16,82 @@ response: { data: [ { - "name": "user_org_creation", - "enabled": false, - "error_message": null, - "url": "/v2/config/feature_flags/user_org_creation" + 'name': 'user_org_creation', + 'enabled': false, + 'error_message': null, + 'url': '/v2/config/feature_flags/user_org_creation' }, { - "name": "private_domain_creation", - "enabled": true, - "error_message": null, - "url": "/v2/config/feature_flags/private_domain_creation" + 'name': 'private_domain_creation', + 'enabled': true, + 'error_message': null, + 'url': '/v2/config/feature_flags/private_domain_creation' }, { - "name": "app_bits_upload", - "enabled": true, - "error_message": null, - "url": "/v2/config/feature_flags/app_bits_upload" + 'name': 'app_bits_upload', + 'enabled': true, + 'error_message': null, + 'url': '/v2/config/feature_flags/app_bits_upload' }, { - "name": "app_scaling", - "enabled": true, - "error_message": null, - "url": "/v2/config/feature_flags/app_scaling" + 'name': 'app_scaling', + 'enabled': true, + 'error_message': null, + 'url': '/v2/config/feature_flags/app_scaling' }, { - "name": "route_creation", - "enabled": true, - "error_message": null, - "url": "/v2/config/feature_flags/route_creation" + 'name': 'route_creation', + 'enabled': true, + 'error_message': null, + 'url': '/v2/config/feature_flags/route_creation' }, { - "name": "service_instance_creation", - "enabled": true, - "error_message": null, - "url": "/v2/config/feature_flags/service_instance_creation" + 'name': 'service_instance_creation', + 'enabled': true, + 'error_message': null, + 'url': '/v2/config/feature_flags/service_instance_creation' }, { - "name": "diego_docker", - "enabled": false, - "error_message": null, - "url": "/v2/config/feature_flags/diego_docker" + 'name': 'diego_docker', + 'enabled': false, + 'error_message': null, + 'url': '/v2/config/feature_flags/diego_docker' }, { - "name": "set_roles_by_username", - "enabled": true, - "error_message": null, - "url": "/v2/config/feature_flags/set_roles_by_username" + 'name': 'set_roles_by_username', + 'enabled': true, + 'error_message': null, + 'url': '/v2/config/feature_flags/set_roles_by_username' }, { - "name": "unset_roles_by_username", - "enabled": true, - "error_message": null, - "url": "/v2/config/feature_flags/unset_roles_by_username" + 'name': 'unset_roles_by_username', + 'enabled': true, + 'error_message': null, + 'url': '/v2/config/feature_flags/unset_roles_by_username' }, { - "name": "task_creation", - "enabled": false, - "error_message": null, - "url": "/v2/config/feature_flags/task_creation" + 'name': 'task_creation', + 'enabled': false, + 'error_message': null, + 'url': '/v2/config/feature_flags/task_creation' }, { - "name": "env_var_visibility", - "enabled": true, - "error_message": null, - "url": "/v2/config/feature_flags/env_var_visibility" + 'name': 'env_var_visibility', + 'enabled': true, + 'error_message': null, + 'url': '/v2/config/feature_flags/env_var_visibility' }, { - "name": "space_scoped_private_broker_creation", - "enabled": true, - "error_message": null, - "url": "/v2/config/feature_flags/space_scoped_private_broker_creation" + 'name': 'space_scoped_private_broker_creation', + 'enabled': true, + 'error_message': null, + 'url': '/v2/config/feature_flags/space_scoped_private_broker_creation' }, { - "name": "space_developer_env_var_visibility", - "enabled": true, - "error_message": null, - "url": "/v2/config/feature_flags/space_developer_env_var_visibility" + 'name': 'space_developer_env_var_visibility', + 'enabled': true, + 'error_message': null, + 'url': '/v2/config/feature_flags/space_developer_env_var_visibility' } ] } diff --git a/components/cloud-foundry/frontend/test/unit/api/Info.mock.js b/components/cloud-foundry/frontend/test/unit/api/Info.mock.js index b2a2c1e171..0f385fe743 100644 --- a/components/cloud-foundry/frontend/test/unit/api/Info.mock.js +++ b/components/cloud-foundry/frontend/test/unit/api/Info.mock.js @@ -10,23 +10,23 @@ var body = {}; body[guid] = { - "name": "CF", - "build": "4.0.0", - "support": "stratos@suse.com", - "version": 2, - "description": "Stratos Cloud Foundry", - "authorization_endpoint": "https://cf.identity.julbra.stacktest.io:443", - "token_endpoint": "https://cf.identity.julbra.stacktest.io:443", - "min_cli_version": null, - "min_recommended_cli_version": null, - "api_version": "2.61.0", - "app_ssh_endpoint": "ssh.cf.julbra.stacktest.io:2222", - "app_ssh_host_key_fingerprint": "a2:16:28:80:23:79:b8:8d:3b:95:c6:a1:b1:be:ed:66", - "app_ssh_oauth_client": "ssh-proxy", - "routing_endpoint": "https://api.cf.julbra.stacktest.io/routing", - "logging_endpoint": "wss://loggregator.cf.julbra.stacktest.io:4443", - "doppler_logging_endpoint": "wss://doppler.cf.julbra.stacktest.io:4443", - "user": "bae87025-2aa3-4f89-9d43-b2e9c0932655" + 'name': 'CF', + 'build': '4.0.0', + 'support': 'stratos@suse.com', + 'version': 2, + 'description': 'Stratos Cloud Foundry', + 'authorization_endpoint': 'https://cf.identity.julbra.stacktest.io:443', + 'token_endpoint': 'https://cf.identity.julbra.stacktest.io:443', + 'min_cli_version': null, + 'min_recommended_cli_version': null, + 'api_version': '2.61.0', + 'app_ssh_endpoint': 'ssh.cf.julbra.stacktest.io:2222', + 'app_ssh_host_key_fingerprint': 'a2:16:28:80:23:79:b8:8d:3b:95:c6:a1:b1:be:ed:66', + 'app_ssh_oauth_client': 'ssh-proxy', + 'routing_endpoint': 'https://api.cf.julbra.stacktest.io/routing', + 'logging_endpoint': 'wss://loggregator.cf.julbra.stacktest.io:4443', + 'doppler_logging_endpoint': 'wss://doppler.cf.julbra.stacktest.io:4443', + 'user': 'bae87025-2aa3-4f89-9d43-b2e9c0932655' }; return { url: '/pp/v1/proxy/v2/info', diff --git a/components/cloud-foundry/frontend/test/unit/api/PrivateDomains.mock.js b/components/cloud-foundry/frontend/test/unit/api/PrivateDomains.mock.js index ac70d1d1bc..138a1cdb6e 100644 --- a/components/cloud-foundry/frontend/test/unit/api/PrivateDomains.mock.js +++ b/components/cloud-foundry/frontend/test/unit/api/PrivateDomains.mock.js @@ -15,24 +15,24 @@ 200: { body: { - "guid": { - "total_results": 1, - "total_pages": 1, - "prev_url": null, - "next_url": null, - "resources": [ + 'guid': { + 'total_results': 1, + 'total_pages': 1, + 'prev_url': null, + 'next_url': null, + 'resources': [ { - "metadata": { - "guid": "3de9db5f-8e3b-4d10-a8c9-8137caafe43d", - "url": "/v2/private_domains/3de9db5f-8e3b-4d10-a8c9-8137caafe43d", - "created_at": "2016-02-19T02:04:00Z", - "updated_at": null + 'metadata': { + 'guid': '3de9db5f-8e3b-4d10-a8c9-8137caafe43d', + 'url': '/v2/private_domains/3de9db5f-8e3b-4d10-a8c9-8137caafe43d', + 'created_at': '2016-02-19T02:04:00Z', + 'updated_at': null }, - "entity": { - "name": "my-domain.com", - "owning_organization_guid": "2f70efed-abb2-4b7a-9f31-d4fe4d849932", - "owning_organization_url": "/v2/organizations/2f70efed-abb2-4b7a-9f31-d4fe4d849932", - "shared_organizations_url": "/v2/private_domains/3de9db5f-8e3b-4d10-a8c9-8137caafe43d/shared_organizations" + 'entity': { + 'name': 'my-domain.com', + 'owning_organization_guid': '2f70efed-abb2-4b7a-9f31-d4fe4d849932', + 'owning_organization_url': '/v2/organizations/2f70efed-abb2-4b7a-9f31-d4fe4d849932', + 'shared_organizations_url': '/v2/private_domains/3de9db5f-8e3b-4d10-a8c9-8137caafe43d/shared_organizations' } } ] @@ -57,37 +57,37 @@ 200: { body: { - "total_results": 2, - "total_pages": 1, - "prev_url": null, - "next_url": null, - "resources": [ + 'total_results': 2, + 'total_pages': 1, + 'prev_url': null, + 'next_url': null, + 'resources': [ { - "metadata": { - "guid": "6ea5aeab-cced-43ad-b1bd-44057d2c648f", - "url": "/v2/private_domains/6ea5aeab-cced-43ad-b1bd-44057d2c648f", - "created_at": "2016-04-20T18:45:03Z", - "updated_at": null + 'metadata': { + 'guid': '6ea5aeab-cced-43ad-b1bd-44057d2c648f', + 'url': '/v2/private_domains/6ea5aeab-cced-43ad-b1bd-44057d2c648f', + 'created_at': '2016-04-20T18:45:03Z', + 'updated_at': null }, - "entity": { - "name": "example.com", - "owning_organization_guid": "2fe5b39d-2147-4687-88d1-07abf3500e41", - "owning_organization_url": "/v2/organizations/2fe5b39d-2147-4687-88d1-07abf3500e41", - "shared_organizations_url": "/v2/private_domains/6ea5aeab-cced-43ad-b1bd-44057d2c648f/shared_organizations" + 'entity': { + 'name': 'example.com', + 'owning_organization_guid': '2fe5b39d-2147-4687-88d1-07abf3500e41', + 'owning_organization_url': '/v2/organizations/2fe5b39d-2147-4687-88d1-07abf3500e41', + 'shared_organizations_url': '/v2/private_domains/6ea5aeab-cced-43ad-b1bd-44057d2c648f/shared_organizations' } }, { - "metadata": { - "guid": "36d72b3b-1bf5-44a0-9aa8-7401a78e484d", - "url": "/v2/private_domains/36d72b3b-1bf5-44a0-9aa8-7401a78e484d", - "created_at": "2016-04-20T20:33:13Z", - "updated_at": null + 'metadata': { + 'guid': '36d72b3b-1bf5-44a0-9aa8-7401a78e484d', + 'url': '/v2/private_domains/36d72b3b-1bf5-44a0-9aa8-7401a78e484d', + 'created_at': '2016-04-20T20:33:13Z', + 'updated_at': null }, - "entity": { - "name": "example.net", - "owning_organization_guid": "2fe5b39d-2147-4687-88d1-07abf3500e41", - "owning_organization_url": "/v2/organizations/2fe5b39d-2147-4687-88d1-07abf3500e41", - "shared_organizations_url": "/v2/private_domains/36d72b3b-1bf5-44a0-9aa8-7401a78e484d/shared_organizations" + 'entity': { + 'name': 'example.net', + 'owning_organization_guid': '2fe5b39d-2147-4687-88d1-07abf3500e41', + 'owning_organization_url': '/v2/organizations/2fe5b39d-2147-4687-88d1-07abf3500e41', + 'shared_organizations_url': '/v2/private_domains/36d72b3b-1bf5-44a0-9aa8-7401a78e484d/shared_organizations' } } ] @@ -111,45 +111,45 @@ 200: { body: { - "36d72b3b-1bf5-44a0-9aa8-7401a78e484d": { - "total_results": 1, - "total_pages": 1, - "prev_url": null, - "next_url": null, - "resources": [ + '36d72b3b-1bf5-44a0-9aa8-7401a78e484d': { + 'total_results': 1, + 'total_pages': 1, + 'prev_url': null, + 'next_url': null, + 'resources': [ { - "metadata": { - "guid": "5b401ba9-4314-4e7c-939f-1c3a1dd722e7", - "url": "/v2/organizations/5b401ba9-4314-4e7c-939f-1c3a1dd722e7", - "created_at": "2016-04-20T22:48:22Z", - "updated_at": null + 'metadata': { + 'guid': '5b401ba9-4314-4e7c-939f-1c3a1dd722e7', + 'url': '/v2/organizations/5b401ba9-4314-4e7c-939f-1c3a1dd722e7', + 'created_at': '2016-04-20T22:48:22Z', + 'updated_at': null }, - "entity": { - "name": "HPQ", - "billing_enabled": false, - "quota_definition_guid": "06c73405-4038-469e-99dd-585f0f544641", - "status": "active", - "is_default": false, - "quota_definition_url": "/v2/quota_definitions/06c73405-4038-469e-99dd-585f0f544641", - "spaces_url": "/v2/organizations/5b401ba9-4314-4e7c-939f-1c3a1dd722e7/spaces", - "domains_url": "/v2/organizations/5b401ba9-4314-4e7c-939f-1c3a1dd722e7/domains", - "private_domains_url": "/v2/organizations/5b401ba9-4314-4e7c-939f-1c3a1dd722e7/private_domains", - "users_url": "/v2/organizations/5b401ba9-4314-4e7c-939f-1c3a1dd722e7/users", - "managers_url": "/v2/organizations/5b401ba9-4314-4e7c-939f-1c3a1dd722e7/managers", - "billing_managers_url": "/v2/organizations/5b401ba9-4314-4e7c-939f-1c3a1dd722e7/billing_managers", - "auditors_url": "/v2/organizations/5b401ba9-4314-4e7c-939f-1c3a1dd722e7/auditors", - "app_events_url": "/v2/organizations/5b401ba9-4314-4e7c-939f-1c3a1dd722e7/app_events", - "space_quota_definitions_url": "/v2/organizations/5b401ba9-4314-4e7c-939f-1c3a1dd722e7/space_quota_definitions" + 'entity': { + 'name': 'HPQ', + 'billing_enabled': false, + 'quota_definition_guid': '06c73405-4038-469e-99dd-585f0f544641', + 'status': 'active', + 'is_default': false, + 'quota_definition_url': '/v2/quota_definitions/06c73405-4038-469e-99dd-585f0f544641', + 'spaces_url': '/v2/organizations/5b401ba9-4314-4e7c-939f-1c3a1dd722e7/spaces', + 'domains_url': '/v2/organizations/5b401ba9-4314-4e7c-939f-1c3a1dd722e7/domains', + 'private_domains_url': '/v2/organizations/5b401ba9-4314-4e7c-939f-1c3a1dd722e7/private_domains', + 'users_url': '/v2/organizations/5b401ba9-4314-4e7c-939f-1c3a1dd722e7/users', + 'managers_url': '/v2/organizations/5b401ba9-4314-4e7c-939f-1c3a1dd722e7/managers', + 'billing_managers_url': '/v2/organizations/5b401ba9-4314-4e7c-939f-1c3a1dd722e7/billing_managers', + 'auditors_url': '/v2/organizations/5b401ba9-4314-4e7c-939f-1c3a1dd722e7/auditors', + 'app_events_url': '/v2/organizations/5b401ba9-4314-4e7c-939f-1c3a1dd722e7/app_events', + 'space_quota_definitions_url': '/v2/organizations/5b401ba9-4314-4e7c-939f-1c3a1dd722e7/space_quota_definitions' } } ] }, - "6ea5aeab-cced-43ad-b1bd-44057d2c648f": { - "total_results": 0, - "total_pages": 1, - "prev_url": null, - "next_url": null, - "resources": [] + '6ea5aeab-cced-43ad-b1bd-44057d2c648f': { + 'total_results': 0, + 'total_pages': 1, + 'prev_url': null, + 'next_url': null, + 'resources': [] } } }, @@ -171,18 +171,18 @@ 200: { body: { - "guid": { - "metadata": { - "guid": "6ea5aeab-cced-43ad-b1bd-44057d2c648f", - "url": "/v2/private_domains/6ea5aeab-cced-43ad-b1bd-44057d2c648f", - "created_at": "2016-04-20T18:45:03Z", - "updated_at": null + 'guid': { + 'metadata': { + 'guid': '6ea5aeab-cced-43ad-b1bd-44057d2c648f', + 'url': '/v2/private_domains/6ea5aeab-cced-43ad-b1bd-44057d2c648f', + 'created_at': '2016-04-20T18:45:03Z', + 'updated_at': null }, - "entity": { - "name": "example.com", - "owning_organization_guid": "2fe5b39d-2147-4687-88d1-07abf3500e41", - "owning_organization_url": "/v2/organizations/2fe5b39d-2147-4687-88d1-07abf3500e41", - "shared_organizations_url": "/v2/private_domains/6ea5aeab-cced-43ad-b1bd-44057d2c648f/shared_organizations" + 'entity': { + 'name': 'example.com', + 'owning_organization_guid': '2fe5b39d-2147-4687-88d1-07abf3500e41', + 'owning_organization_url': '/v2/organizations/2fe5b39d-2147-4687-88d1-07abf3500e41', + 'shared_organizations_url': '/v2/private_domains/6ea5aeab-cced-43ad-b1bd-44057d2c648f/shared_organizations' } } } diff --git a/components/cloud-foundry/frontend/test/unit/api/Routes.mock.js b/components/cloud-foundry/frontend/test/unit/api/Routes.mock.js index 91408f9dff..b96c416aac 100644 --- a/components/cloud-foundry/frontend/test/unit/api/Routes.mock.js +++ b/components/cloud-foundry/frontend/test/unit/api/Routes.mock.js @@ -13,23 +13,23 @@ response: { 201: { body: { - "guid": { - "metadata": { - "guid": "a9bf1ec7-48f5-49e0-befb-4c3602591325", - "url": "/v2/routes/a9bf1ec7-48f5-49e0-befb-4c3602591325", - "created_at": "2016-02-19T02:04:02Z", - "updated_at": null + 'guid': { + 'metadata': { + 'guid': 'a9bf1ec7-48f5-49e0-befb-4c3602591325', + 'url': '/v2/routes/a9bf1ec7-48f5-49e0-befb-4c3602591325', + 'created_at': '2016-02-19T02:04:02Z', + 'updated_at': null }, - "entity": { - "host": "host-25", - "path": "", - "domain_guid": "b7dafe61-0077-4017-adf1-17433e1926c3", - "space_guid": "b3bfcbb3-b786-41c0-b700-108db832e1db", - "service_instance_guid": null, - "port": 0, - "domain_url": "/v2/domains/b7dafe61-0077-4017-adf1-17433e1926c3", - "space_url": "/v2/spaces/b3bfcbb3-b786-41c0-b700-108db832e1db", - "apps_url": "/v2/routes/a9bf1ec7-48f5-49e0-befb-4c3602591325/apps" + 'entity': { + 'host': 'host-25', + 'path': '', + 'domain_guid': 'b7dafe61-0077-4017-adf1-17433e1926c3', + 'space_guid': 'b3bfcbb3-b786-41c0-b700-108db832e1db', + 'service_instance_guid': null, + 'port': 0, + 'domain_url': '/v2/domains/b7dafe61-0077-4017-adf1-17433e1926c3', + 'space_url': '/v2/spaces/b3bfcbb3-b786-41c0-b700-108db832e1db', + 'apps_url': '/v2/routes/a9bf1ec7-48f5-49e0-befb-4c3602591325/apps' } } } @@ -85,55 +85,55 @@ 200: { body: { - "total_results": 1, - "total_pages": 1, - "prev_url": null, - "next_url": null, - "resources": [ + 'total_results': 1, + 'total_pages': 1, + 'prev_url': null, + 'next_url': null, + 'resources': [ { - "metadata": { - "guid": "af96374d-3f82-4956-8af2-f2a7b572458e", - "url": "/v2/apps/af96374d-3f82-4956-8af2-f2a7b572458e", - "created_at": "2016-02-19T02:04:02Z", - "updated_at": "2016-02-19T02:04:02Z" + 'metadata': { + 'guid': 'af96374d-3f82-4956-8af2-f2a7b572458e', + 'url': '/v2/apps/af96374d-3f82-4956-8af2-f2a7b572458e', + 'created_at': '2016-02-19T02:04:02Z', + 'updated_at': '2016-02-19T02:04:02Z' }, - "entity": { - "name": "name-2381", - "production": false, - "space_guid": "9024b3ee-16df-4c91-8012-ba44f8785d2e", - "stack_guid": "39122b68-9cc6-4b79-8b26-7a02301b10d3", - "buildpack": null, - "detected_buildpack": null, - "environment_json": null, - "memory": 1024, - "instances": 1, - "disk_quota": 1024, - "state": "STOPPED", - "version": "78756cf3-636b-4244-a38e-bf9ee82b3178", - "command": null, - "console": false, - "debug": null, - "staging_task_id": null, - "package_state": "PENDING", - "health_check_type": "port", - "health_check_timeout": null, - "staging_failed_reason": null, - "staging_failed_description": null, - "diego": false, - "docker_image": null, - "package_updated_at": "2016-02-19T02:04:02Z", - "detected_start_command": "", - "enable_ssh": true, - "docker_credentials_json": { - "redacted_message": "[PRIVATE DATA HIDDEN]" + 'entity': { + 'name': 'name-2381', + 'production': false, + 'space_guid': '9024b3ee-16df-4c91-8012-ba44f8785d2e', + 'stack_guid': '39122b68-9cc6-4b79-8b26-7a02301b10d3', + 'buildpack': null, + 'detected_buildpack': null, + 'environment_json': null, + 'memory': 1024, + 'instances': 1, + 'disk_quota': 1024, + 'state': 'STOPPED', + 'version': '78756cf3-636b-4244-a38e-bf9ee82b3178', + 'command': null, + 'console': false, + 'debug': null, + 'staging_task_id': null, + 'package_state': 'PENDING', + 'health_check_type': 'port', + 'health_check_timeout': null, + 'staging_failed_reason': null, + 'staging_failed_description': null, + 'diego': false, + 'docker_image': null, + 'package_updated_at': '2016-02-19T02:04:02Z', + 'detected_start_command': '', + 'enable_ssh': true, + 'docker_credentials_json': { + 'redacted_message': '[PRIVATE DATA HIDDEN]' }, - "ports": null, - "space_url": "/v2/spaces/9024b3ee-16df-4c91-8012-ba44f8785d2e", - "stack_url": "/v2/stacks/39122b68-9cc6-4b79-8b26-7a02301b10d3", - "events_url": "/v2/apps/af96374d-3f82-4956-8af2-f2a7b572458e/events", - "service_bindings_url": "/v2/apps/af96374d-3f82-4956-8af2-f2a7b572458e/service_bindings", - "routes_url": "/v2/apps/af96374d-3f82-4956-8af2-f2a7b572458e/routes", - "route_mappings_url": "/v2/apps/af96374d-3f82-4956-8af2-f2a7b572458e/route_mappings" + 'ports': null, + 'space_url': '/v2/spaces/9024b3ee-16df-4c91-8012-ba44f8785d2e', + 'stack_url': '/v2/stacks/39122b68-9cc6-4b79-8b26-7a02301b10d3', + 'events_url': '/v2/apps/af96374d-3f82-4956-8af2-f2a7b572458e/events', + 'service_bindings_url': '/v2/apps/af96374d-3f82-4956-8af2-f2a7b572458e/service_bindings', + 'routes_url': '/v2/apps/af96374d-3f82-4956-8af2-f2a7b572458e/routes', + 'route_mappings_url': '/v2/apps/af96374d-3f82-4956-8af2-f2a7b572458e/route_mappings' } } ] diff --git a/components/cloud-foundry/frontend/test/unit/api/ServiceBindings.mock.js b/components/cloud-foundry/frontend/test/unit/api/ServiceBindings.mock.js index b3b591a8f2..473287b1bc 100644 --- a/components/cloud-foundry/frontend/test/unit/api/ServiceBindings.mock.js +++ b/components/cloud-foundry/frontend/test/unit/api/ServiceBindings.mock.js @@ -12,25 +12,25 @@ response: { 200: { body: { - "metadata": { - "guid": "8ed4029b-251a-41d3-95ee-55cf3a1817d4", - "url": "/v2/service_bindings/8ed4029b-251a-41d3-95ee-55cf3a1817d4", - "created_at": "2016-05-12T00:45:16Z", - "updated_at": null + 'metadata': { + 'guid': '8ed4029b-251a-41d3-95ee-55cf3a1817d4', + 'url': '/v2/service_bindings/8ed4029b-251a-41d3-95ee-55cf3a1817d4', + 'created_at': '2016-05-12T00:45:16Z', + 'updated_at': null }, - "entity": { - "app_guid": newBindingSpec.app_guid, - "service_instance_guid": newBindingSpec.service_instance_guid, - "credentials": { - "creds-key-32": "creds-val-32" + 'entity': { + 'app_guid': newBindingSpec.app_guid, + 'service_instance_guid': newBindingSpec.service_instance_guid, + 'credentials': { + 'creds-key-32': 'creds-val-32' }, - "binding_options": {}, - "gateway_data": null, - "gateway_name": "", - "syslog_drain_url": null, - "volume_mounts": [], - "app_url": "/v2/apps/" + newBindingSpec.app_guid, - "service_instance_url": "/v2/user_provided_service_instances/" + newBindingSpec.service_instance_guid + 'binding_options': {}, + 'gateway_data': null, + 'gateway_name': '', + 'syslog_drain_url': null, + 'volume_mounts': [], + 'app_url': '/v2/apps/' + newBindingSpec.app_guid, + 'service_instance_url': '/v2/user_provided_service_instances/' + newBindingSpec.service_instance_guid } } }, @@ -70,33 +70,33 @@ 200: { body: { - "total_results": 1, - "total_pages": 1, - "prev_url": null, - "next_url": null, - "resources": [ + 'total_results': 1, + 'total_pages': 1, + 'prev_url': null, + 'next_url': null, + 'resources': [ { - "metadata": { - "guid": "571b283b-97f9-41e3-abc7-81792ee34e40", - "url": "/v2/service_bindings/571b283b-97f9-41e3-abc7-81792ee34e40", - "created_at": "2016-02-19T02:04:08Z", - "updated_at": null + 'metadata': { + 'guid': '571b283b-97f9-41e3-abc7-81792ee34e40', + 'url': '/v2/service_bindings/571b283b-97f9-41e3-abc7-81792ee34e40', + 'created_at': '2016-02-19T02:04:08Z', + 'updated_at': null }, - "entity": { - "app_guid": "6e23689c-2844-4ebf-ab69-e52ab3439f6b", - "service_instance_guid": "01430cca-2592-4396-ac79-b1405a488b3e", - "credentials": { - "creds-key-64": "creds-val-64" + 'entity': { + 'app_guid': '6e23689c-2844-4ebf-ab69-e52ab3439f6b', + 'service_instance_guid': '01430cca-2592-4396-ac79-b1405a488b3e', + 'credentials': { + 'creds-key-64': 'creds-val-64' }, - "binding_options": {}, - "gateway_data": null, - "gateway_name": "", - "syslog_drain_url": null, - "app_url": "/v2/apps/6e23689c-2844-4ebf-ab69-e52ab3439f6b", - "service_instance_url": "/v2/service_instances/01430cca-2592-4396-ac79-b1405a488b3e", - "service_instance": { - "entity": { - "name": "instance_123" + 'binding_options': {}, + 'gateway_data': null, + 'gateway_name': '', + 'syslog_drain_url': null, + 'app_url': '/v2/apps/6e23689c-2844-4ebf-ab69-e52ab3439f6b', + 'service_instance_url': '/v2/service_instances/01430cca-2592-4396-ac79-b1405a488b3e', + 'service_instance': { + 'entity': { + 'name': 'instance_123' } } } diff --git a/components/cloud-foundry/frontend/test/unit/api/ServiceInstances.mock.js b/components/cloud-foundry/frontend/test/unit/api/ServiceInstances.mock.js index d03da75596..99ffaec573 100644 --- a/components/cloud-foundry/frontend/test/unit/api/ServiceInstances.mock.js +++ b/components/cloud-foundry/frontend/test/unit/api/ServiceInstances.mock.js @@ -12,36 +12,36 @@ response: { 200: { body: { - "metadata": { - "guid": "8efda023-ccd8-4cbb-b854-d56d7282fec3", - "url": "/v2/service_instances/8efda023-ccd8-4cbb-b854-d56d7282fec3", - "created_at": "2016-05-12T00:45:07Z", - "updated_at": null + 'metadata': { + 'guid': '8efda023-ccd8-4cbb-b854-d56d7282fec3', + 'url': '/v2/service_instances/8efda023-ccd8-4cbb-b854-d56d7282fec3', + 'created_at': '2016-05-12T00:45:07Z', + 'updated_at': null }, - "entity": { - "name": newInstanceSpec.name, - "credentials": {}, - "service_plan_guid": newInstanceSpec.service_plan_guid, - "space_guid": newInstanceSpec.space_guid, - "gateway_data": null, - "dashboard_url": null, - "type": "managed_service_instance", - "last_operation": { - "type": "create", - "state": "in progress", - "description": "", - "updated_at": null, - "created_at": "2016-05-12T00:45:07Z" + 'entity': { + 'name': newInstanceSpec.name, + 'credentials': {}, + 'service_plan_guid': newInstanceSpec.service_plan_guid, + 'space_guid': newInstanceSpec.space_guid, + 'gateway_data': null, + 'dashboard_url': null, + 'type': 'managed_service_instance', + 'last_operation': { + 'type': 'create', + 'state': 'in progress', + 'description': '', + 'updated_at': null, + 'created_at': '2016-05-12T00:45:07Z' }, - "tags": [ - "accounting", - "mongodb" + 'tags': [ + 'accounting', + 'mongodb' ], - "space_url": "/v2/spaces/" + newInstanceSpec.space_guid, - "service_plan_url": "/v2/service_plans/" + newInstanceSpec.service_plan_guid, - "service_bindings_url": "/v2/service_instances/8efda023-ccd8-4cbb-b854-d56d7282fec3/service_bindings", - "service_keys_url": "/v2/service_instances/8efda023-ccd8-4cbb-b854-d56d7282fec3/service_keys", - "routes_url": "/v2/service_instances/8efda023-ccd8-4cbb-b854-d56d7282fec3/routes" + 'space_url': '/v2/spaces/' + newInstanceSpec.space_guid, + 'service_plan_url': '/v2/service_plans/' + newInstanceSpec.service_plan_guid, + 'service_bindings_url': '/v2/service_instances/8efda023-ccd8-4cbb-b854-d56d7282fec3/service_bindings', + 'service_keys_url': '/v2/service_instances/8efda023-ccd8-4cbb-b854-d56d7282fec3/service_keys', + 'routes_url': '/v2/service_instances/8efda023-ccd8-4cbb-b854-d56d7282fec3/routes' } } }, @@ -59,44 +59,44 @@ response: { 200: { body: { - "total_results": 1, - "total_pages": 1, - "prev_url": null, - "next_url": null, - "resources": [ + 'total_results': 1, + 'total_pages': 1, + 'prev_url': null, + 'next_url': null, + 'resources': [ { - "metadata": { - "guid": "b6e8fcbf-5b91-4850-ad4b-00b96e38c6d0", - "url": "/v2/service_instances/b6e8fcbf-5b91-4850-ad4b-00b96e38c6d0", - "created_at": "2016-05-12T00:45:07Z", - "updated_at": null + 'metadata': { + 'guid': 'b6e8fcbf-5b91-4850-ad4b-00b96e38c6d0', + 'url': '/v2/service_instances/b6e8fcbf-5b91-4850-ad4b-00b96e38c6d0', + 'created_at': '2016-05-12T00:45:07Z', + 'updated_at': null }, - "entity": { - "name": "name-178", - "credentials": { - "creds-key-2": "creds-val-2" + 'entity': { + 'name': 'name-178', + 'credentials': { + 'creds-key-2': 'creds-val-2' }, - "service_plan_guid": "9346c902-124e-4c35-9f6c-bfa4848887e5", - "space_guid": "de83d7e1-1894-49ce-940f-dea4bc484eac", - "gateway_data": null, - "dashboard_url": null, - "type": "managed_service_instance", - "last_operation": { - "type": "create", - "state": "succeeded", - "description": "service broker-provided description", - "updated_at": "2016-05-12T00:45:07Z", - "created_at": "2016-05-12T00:45:07Z" + 'service_plan_guid': '9346c902-124e-4c35-9f6c-bfa4848887e5', + 'space_guid': 'de83d7e1-1894-49ce-940f-dea4bc484eac', + 'gateway_data': null, + 'dashboard_url': null, + 'type': 'managed_service_instance', + 'last_operation': { + 'type': 'create', + 'state': 'succeeded', + 'description': 'service broker-provided description', + 'updated_at': '2016-05-12T00:45:07Z', + 'created_at': '2016-05-12T00:45:07Z' }, - "tags": [ - "accounting", - "mongodb" + 'tags': [ + 'accounting', + 'mongodb' ], - "space_url": "/v2/spaces/de83d7e1-1894-49ce-940f-dea4bc484eac", - "service_plan_url": "/v2/service_plans/9346c902-124e-4c35-9f6c-bfa4848887e5", - "service_bindings_url": "/v2/service_instances/b6e8fcbf-5b91-4850-ad4b-00b96e38c6d0/service_bindings", - "service_keys_url": "/v2/service_instances/b6e8fcbf-5b91-4850-ad4b-00b96e38c6d0/service_keys", - "routes_url": "/v2/service_instances/b6e8fcbf-5b91-4850-ad4b-00b96e38c6d0/routes" + 'space_url': '/v2/spaces/de83d7e1-1894-49ce-940f-dea4bc484eac', + 'service_plan_url': '/v2/service_plans/9346c902-124e-4c35-9f6c-bfa4848887e5', + 'service_bindings_url': '/v2/service_instances/b6e8fcbf-5b91-4850-ad4b-00b96e38c6d0/service_bindings', + 'service_keys_url': '/v2/service_instances/b6e8fcbf-5b91-4850-ad4b-00b96e38c6d0/service_keys', + 'routes_url': '/v2/service_instances/b6e8fcbf-5b91-4850-ad4b-00b96e38c6d0/routes' } } ] diff --git a/components/cloud-foundry/frontend/test/unit/api/Services.mock.js b/components/cloud-foundry/frontend/test/unit/api/Services.mock.js index 8f107f11c9..2675a13f5f 100644 --- a/components/cloud-foundry/frontend/test/unit/api/Services.mock.js +++ b/components/cloud-foundry/frontend/test/unit/api/Services.mock.js @@ -22,78 +22,78 @@ resources: [ { metadata: { - guid: "b55b3e8d-66df-475a-ba80-f6ca7edfcb41", - url: "/v2/services/b55b3e8d-66df-475a-ba80-f6ca7edfcb41", - created_at: "2016-02-19T02:03:48Z", + guid: 'b55b3e8d-66df-475a-ba80-f6ca7edfcb41', + url: '/v2/services/b55b3e8d-66df-475a-ba80-f6ca7edfcb41', + created_at: '2016-02-19T02:03:48Z', updated_at: null }, entity: { - label: "label-19", + label: 'label-19', provider: null, url: null, - description: "MySQL", + description: 'MySQL', long_description: null, version: 1, info_url: null, active: true, bindable: true, - unique_id: "8be9090d-f716-4111-aa75-74ec99c30069", + unique_id: '8be9090d-f716-4111-aa75-74ec99c30069', extra: { - vendor: "SUSE", + vendor: 'SUSE', defaultVersion: 1, - versions: "1,2,3", - catalogId: "sample:mysql", - type: "external", - categories: "database", - labels: "User-label1", - imageUrl: "http://localhost:8081/v1/services/sample:mysql?image", - documentationUrl: "http://www.suse.com/", - readme: "http://localhost:8081/v1/services/sample:mysql?readme" + versions: '1,2,3', + catalogId: 'sample:mysql', + type: 'external', + categories: 'database', + labels: 'User-label1', + imageUrl: 'http://localhost:8081/v1/services/sample:mysql?image', + documentationUrl: 'http://www.suse.com/', + readme: 'http://localhost:8081/v1/services/sample:mysql?readme' }, tags: [], requires: [], documentation_url: null, - service_broker_guid: "f00db357-bedd-4432-bb51-890c26b5862e", + service_broker_guid: 'f00db357-bedd-4432-bb51-890c26b5862e', plan_updateable: false, - service_plans_url: "/v2/services/b55b3e8d-66df-475a-ba80-f6ca7edfcb41/service_plans" + service_plans_url: '/v2/services/b55b3e8d-66df-475a-ba80-f6ca7edfcb41/service_plans' } }, { metadata: { - guid: "b55b3e8d-66df-475a-ba80-f6ca7edfcb42", - url: "/v2/services/b55b3e8d-66df-475a-ba80-f6ca7edfcb42", - created_at: "2016-02-19T02:03:48Z", + guid: 'b55b3e8d-66df-475a-ba80-f6ca7edfcb42', + url: '/v2/services/b55b3e8d-66df-475a-ba80-f6ca7edfcb42', + created_at: '2016-02-19T02:03:48Z', updated_at: null }, entity: { - label: "label-20", + label: 'label-20', provider: null, url: null, - description: "SQL Server 2007", + description: 'SQL Server 2007', long_description: null, version: 2, info_url: null, active: true, bindable: true, - unique_id: "8be9090d-f716-4111-aa75-74ec99c30068", + unique_id: '8be9090d-f716-4111-aa75-74ec99c30068', extra: { - vendor: "SUSE", + vendor: 'SUSE', defaultVersion: 1, - versions: "1,2,3", - catalogId: "sample:sqlserver", - type: "external", - categories: "database", - labels: "User-label2", - imageUrl: "http://localhost:8081/v1/services/sample:mysql?image", - documentationUrl: "http://www.suse.com/", - readme: "http://localhost:8081/v1/services/sample:mysql?readme" + versions: '1,2,3', + catalogId: 'sample:sqlserver', + type: 'external', + categories: 'database', + labels: 'User-label2', + imageUrl: 'http://localhost:8081/v1/services/sample:mysql?image', + documentationUrl: 'http://www.suse.com/', + readme: 'http://localhost:8081/v1/services/sample:mysql?readme' }, tags: [], requires: [], documentation_url: null, - service_broker_guid: "f00db357-bedd-4432-bb51-890c26b5862f", + service_broker_guid: 'f00db357-bedd-4432-bb51-890c26b5862f', plan_updateable: false, - service_plans_url: "/v2/services/b55b3e8d-66df-475a-ba80-f6ca7edfcb42/service_plans" + service_plans_url: '/v2/services/b55b3e8d-66df-475a-ba80-f6ca7edfcb42/service_plans' } } ] @@ -120,29 +120,29 @@ resources: [ { metadata: { - guid: "a5ac915f-b746-42c5-8506-6d318bf21107", - url: "/v2/service_plans/a5ac915f-b746-42c5-8506-6d318bf21107", - created_at: "2016-05-12T00:45:19Z", + guid: 'a5ac915f-b746-42c5-8506-6d318bf21107', + url: '/v2/service_plans/a5ac915f-b746-42c5-8506-6d318bf21107', + created_at: '2016-05-12T00:45:19Z', updated_at: null }, entity: { - name: "name-1686", + name: 'name-1686', free: false, - description: "desc-109", - service_guid: "b2728c78-1057-4021-9c84-d2158f8f20df", + description: 'desc-109', + service_guid: 'b2728c78-1057-4021-9c84-d2158f8f20df', extra: null, - unique_id: "e010ae61-ec46-433d-bdf6-136ead10828b", + unique_id: 'e010ae61-ec46-433d-bdf6-136ead10828b', public: true, active: true, - service_url: "/v2/services/b2728c78-1057-4021-9c84-d2158f8f20df", - service_instances_url: "/v2/service_plans/a5ac915f-b746-42c5-8506-6d318bf21107/service_instances" + service_url: '/v2/services/b2728c78-1057-4021-9c84-d2158f8f20df', + service_instances_url: '/v2/service_plans/a5ac915f-b746-42c5-8506-6d318bf21107/service_instances' } } ] } } } - } + }; } }; diff --git a/components/cloud-foundry/frontend/test/unit/api/SharedDomains.mock.js b/components/cloud-foundry/frontend/test/unit/api/SharedDomains.mock.js index e1ab849227..c661a4cd26 100644 --- a/components/cloud-foundry/frontend/test/unit/api/SharedDomains.mock.js +++ b/components/cloud-foundry/frontend/test/unit/api/SharedDomains.mock.js @@ -15,24 +15,24 @@ 200: { body: { - "guid": { - "total_results": 1, - "total_pages": 1, - "prev_url": null, - "next_url": null, - "resources": [ + 'guid': { + 'total_results': 1, + 'total_pages': 1, + 'prev_url': null, + 'next_url': null, + 'resources': [ { - "metadata": { - "guid": "97b5b602-0d2a-46f4-98e0-408f6463cbbd", - "url": "/v2/shared_domains/97b5b602-0d2a-46f4-98e0-408f6463cbbd", - "created_at": "2016-02-19T02:04:07Z", - "updated_at": null + 'metadata': { + 'guid': '97b5b602-0d2a-46f4-98e0-408f6463cbbd', + 'url': '/v2/shared_domains/97b5b602-0d2a-46f4-98e0-408f6463cbbd', + 'created_at': '2016-02-19T02:04:07Z', + 'updated_at': null }, - "entity": { - "name": "shared-domain.com", - "router_group_guid": "my-random-guid", - "router_group_types": [ - "tcp" + 'entity': { + 'name': 'shared-domain.com', + 'router_group_guid': 'my-random-guid', + 'router_group_types': [ + 'tcp' ] } } @@ -58,31 +58,31 @@ 200: { body: { - "total_results": 2, - "total_pages": 1, - "prev_url": null, - "next_url": null, - "resources": [ + 'total_results': 2, + 'total_pages': 1, + 'prev_url': null, + 'next_url': null, + 'resources': [ { - "metadata": { - "guid": "e05c91d8-e0d1-439a-911f-2216e62dafa6", - "url": "/v2/shared_domains/e05c91d8-e0d1-439a-911f-2216e62dafa6", - "created_at": "2016-04-12T22:02:34Z", - "updated_at": "2016-04-18T19:55:58Z" + 'metadata': { + 'guid': 'e05c91d8-e0d1-439a-911f-2216e62dafa6', + 'url': '/v2/shared_domains/e05c91d8-e0d1-439a-911f-2216e62dafa6', + 'created_at': '2016-04-12T22:02:34Z', + 'updated_at': '2016-04-18T19:55:58Z' }, - "entity": { - "name": "console-8hhk.local" + 'entity': { + 'name': 'console-8hhk.local' } }, { - "metadata": { - "guid": "98dcbe2a-f14f-4dc8-bb33-ccec7ca736df", - "url": "/v2/shared_domains/98dcbe2a-f14f-4dc8-bb33-ccec7ca736df", - "created_at": "2016-04-20T20:33:26Z", - "updated_at": null + 'metadata': { + 'guid': '98dcbe2a-f14f-4dc8-bb33-ccec7ca736df', + 'url': '/v2/shared_domains/98dcbe2a-f14f-4dc8-bb33-ccec7ca736df', + 'created_at': '2016-04-20T20:33:26Z', + 'updated_at': null }, - "entity": { - "name": "example.org" + 'entity': { + 'name': 'example.org' } } ] diff --git a/components/cloud-foundry/frontend/test/unit/api/Spaces.mock.js b/components/cloud-foundry/frontend/test/unit/api/Spaces.mock.js index e04757b6bd..d7cff142a8 100644 --- a/components/cloud-foundry/frontend/test/unit/api/Spaces.mock.js +++ b/components/cloud-foundry/frontend/test/unit/api/Spaces.mock.js @@ -8,55 +8,55 @@ 200: { body: { - "total_results": 1, - "total_pages": 1, - "prev_url": null, - "next_url": null, - "resources": [ + 'total_results': 1, + 'total_pages': 1, + 'prev_url': null, + 'next_url': null, + 'resources': [ { - "metadata": { - "guid": "91587747-004b-4a44-9adf-61c764519f71", - "url": "/v2/apps/91587747-004b-4a44-9adf-61c764519f71", - "created_at": "2016-02-19T02:04:05Z", - "updated_at": "2016-02-19T02:04:05Z" + 'metadata': { + 'guid': '91587747-004b-4a44-9adf-61c764519f71', + 'url': '/v2/apps/91587747-004b-4a44-9adf-61c764519f71', + 'created_at': '2016-02-19T02:04:05Z', + 'updated_at': '2016-02-19T02:04:05Z' }, - "entity": { - "name": "name-2500", - "production": false, - "space_guid": "b71b5455-6d01-4846-bab9-f2af6e4e7a4f", - "stack_guid": "07f55326-9ced-4ff2-bb42-a23525ff9425", - "buildpack": null, - "detected_buildpack": null, - "environment_json": null, - "memory": 1024, - "instances": 1, - "disk_quota": 1024, - "state": "STOPPED", - "version": "f6bb92c2-107e-41fc-9705-9d9892e30845", - "command": null, - "console": false, - "debug": null, - "staging_task_id": null, - "package_state": "PENDING", - "health_check_type": "port", - "health_check_timeout": null, - "staging_failed_reason": null, - "staging_failed_description": null, - "diego": false, - "docker_image": null, - "package_updated_at": "2016-02-19T02:04:05Z", - "detected_start_command": "", - "enable_ssh": true, - "docker_credentials_json": { - "redacted_message": "[PRIVATE DATA HIDDEN]" + 'entity': { + 'name': 'name-2500', + 'production': false, + 'space_guid': 'b71b5455-6d01-4846-bab9-f2af6e4e7a4f', + 'stack_guid': '07f55326-9ced-4ff2-bb42-a23525ff9425', + 'buildpack': null, + 'detected_buildpack': null, + 'environment_json': null, + 'memory': 1024, + 'instances': 1, + 'disk_quota': 1024, + 'state': 'STOPPED', + 'version': 'f6bb92c2-107e-41fc-9705-9d9892e30845', + 'command': null, + 'console': false, + 'debug': null, + 'staging_task_id': null, + 'package_state': 'PENDING', + 'health_check_type': 'port', + 'health_check_timeout': null, + 'staging_failed_reason': null, + 'staging_failed_description': null, + 'diego': false, + 'docker_image': null, + 'package_updated_at': '2016-02-19T02:04:05Z', + 'detected_start_command': '', + 'enable_ssh': true, + 'docker_credentials_json': { + 'redacted_message': '[PRIVATE DATA HIDDEN]' }, - "ports": null, - "space_url": "/v2/spaces/b71b5455-6d01-4846-bab9-f2af6e4e7a4f", - "stack_url": "/v2/stacks/07f55326-9ced-4ff2-bb42-a23525ff9425", - "events_url": "/v2/apps/91587747-004b-4a44-9adf-61c764519f71/events", - "service_bindings_url": "/v2/apps/91587747-004b-4a44-9adf-61c764519f71/service_bindings", - "routes_url": "/v2/apps/91587747-004b-4a44-9adf-61c764519f71/routes", - "route_mappings_url": "/v2/apps/91587747-004b-4a44-9adf-61c764519f71/route_mappings" + 'ports': null, + 'space_url': '/v2/spaces/b71b5455-6d01-4846-bab9-f2af6e4e7a4f', + 'stack_url': '/v2/stacks/07f55326-9ced-4ff2-bb42-a23525ff9425', + 'events_url': '/v2/apps/91587747-004b-4a44-9adf-61c764519f71/events', + 'service_bindings_url': '/v2/apps/91587747-004b-4a44-9adf-61c764519f71/service_bindings', + 'routes_url': '/v2/apps/91587747-004b-4a44-9adf-61c764519f71/routes', + 'route_mappings_url': '/v2/apps/91587747-004b-4a44-9adf-61c764519f71/route_mappings' } } ] @@ -79,7 +79,7 @@ 200: { body: { - "guid": ListAllAppsForSpace[200].body + 'guid': ListAllAppsForSpace[200].body } }, @@ -107,34 +107,34 @@ 200: { body: { - "total_results": 1, - "total_pages": 1, - "prev_url": null, - "next_url": null, - "resources": [ + 'total_results': 1, + 'total_pages': 1, + 'prev_url': null, + 'next_url': null, + 'resources': [ { - "metadata": { - "guid": "c414defe-a42a-424f-b7a3-01ef237202dc", - "url": "/v2/spaces/c414defe-a42a-424f-b7a3-01ef237202dc", - "created_at": "2016-02-19T02:04:03Z", - "updated_at": null + 'metadata': { + 'guid': 'c414defe-a42a-424f-b7a3-01ef237202dc', + 'url': '/v2/spaces/c414defe-a42a-424f-b7a3-01ef237202dc', + 'created_at': '2016-02-19T02:04:03Z', + 'updated_at': null }, - "entity": { - "name": "name-2435", - "organization_guid": "43cae62a-9a5e-4e45-a11b-5cfc4fa59604", - "space_quota_definition_guid": null, - "allow_ssh": true, - "organization_url": "/v2/organizations/43cae62a-9a5e-4e45-a11b-5cfc4fa59604", - "developers_url": "/v2/spaces/c414defe-a42a-424f-b7a3-01ef237202dc/developers", - "managers_url": "/v2/spaces/c414defe-a42a-424f-b7a3-01ef237202dc/managers", - "auditors_url": "/v2/spaces/c414defe-a42a-424f-b7a3-01ef237202dc/auditors", - "apps_url": "/v2/spaces/c414defe-a42a-424f-b7a3-01ef237202dc/apps", - "routes_url": "/v2/spaces/c414defe-a42a-424f-b7a3-01ef237202dc/routes", - "domains_url": "/v2/spaces/c414defe-a42a-424f-b7a3-01ef237202dc/domains", - "service_instances_url": "/v2/spaces/c414defe-a42a-424f-b7a3-01ef237202dc/service_instances", - "app_events_url": "/v2/spaces/c414defe-a42a-424f-b7a3-01ef237202dc/app_events", - "events_url": "/v2/spaces/c414defe-a42a-424f-b7a3-01ef237202dc/events", - "security_groups_url": "/v2/spaces/c414defe-a42a-424f-b7a3-01ef237202dc/security_groups" + 'entity': { + 'name': 'name-2435', + 'organization_guid': '43cae62a-9a5e-4e45-a11b-5cfc4fa59604', + 'space_quota_definition_guid': null, + 'allow_ssh': true, + 'organization_url': '/v2/organizations/43cae62a-9a5e-4e45-a11b-5cfc4fa59604', + 'developers_url': '/v2/spaces/c414defe-a42a-424f-b7a3-01ef237202dc/developers', + 'managers_url': '/v2/spaces/c414defe-a42a-424f-b7a3-01ef237202dc/managers', + 'auditors_url': '/v2/spaces/c414defe-a42a-424f-b7a3-01ef237202dc/auditors', + 'apps_url': '/v2/spaces/c414defe-a42a-424f-b7a3-01ef237202dc/apps', + 'routes_url': '/v2/spaces/c414defe-a42a-424f-b7a3-01ef237202dc/routes', + 'domains_url': '/v2/spaces/c414defe-a42a-424f-b7a3-01ef237202dc/domains', + 'service_instances_url': '/v2/spaces/c414defe-a42a-424f-b7a3-01ef237202dc/service_instances', + 'app_events_url': '/v2/spaces/c414defe-a42a-424f-b7a3-01ef237202dc/app_events', + 'events_url': '/v2/spaces/c414defe-a42a-424f-b7a3-01ef237202dc/events', + 'security_groups_url': '/v2/spaces/c414defe-a42a-424f-b7a3-01ef237202dc/security_groups' } } ] @@ -154,35 +154,35 @@ response: { 200: { body: { - "total_results": 1, - "total_pages": 1, - "prev_url": null, - "next_url": null, - "resources": [ + 'total_results': 1, + 'total_pages': 1, + 'prev_url': null, + 'next_url': null, + 'resources': [ { - "metadata": { - "guid": "4986ba9d-f537-4e37-9479-0abb8da7b216", - "url": "/v2/service_instances/4986ba9d-f537-4e37-9479-0abb8da7b216", - "created_at": "2016-05-12T00:45:18Z", - "updated_at": null + 'metadata': { + 'guid': '4986ba9d-f537-4e37-9479-0abb8da7b216', + 'url': '/v2/service_instances/4986ba9d-f537-4e37-9479-0abb8da7b216', + 'created_at': '2016-05-12T00:45:18Z', + 'updated_at': null }, - "entity": { - "name": "name-1621", - "credentials": { - "creds-key-41": "creds-val-41" + 'entity': { + 'name': 'name-1621', + 'credentials': { + 'creds-key-41': 'creds-val-41' }, - "service_plan_guid": "d22b3754-d093-42a2-a294-5fda6c6db44c", - "space_guid": guid, - "gateway_data": null, - "dashboard_url": null, - "type": "managed_service_instance", - "last_operation": null, - "tags": [], - "space_url": "/v2/spaces/" + guid, - "service_plan_url": "/v2/service_plans/d22b3754-d093-42a2-a294-5fda6c6db44c", - "service_bindings_url": "/v2/service_instances/4986ba9d-f537-4e37-9479-0abb8da7b216/service_bindings", - "service_keys_url": "/v2/service_instances/4986ba9d-f537-4e37-9479-0abb8da7b216/service_keys", - "routes_url": "/v2/service_instances/4986ba9d-f537-4e37-9479-0abb8da7b216/routes" + 'service_plan_guid': 'd22b3754-d093-42a2-a294-5fda6c6db44c', + 'space_guid': guid, + 'gateway_data': null, + 'dashboard_url': null, + 'type': 'managed_service_instance', + 'last_operation': null, + 'tags': [], + 'space_url': '/v2/spaces/' + guid, + 'service_plan_url': '/v2/service_plans/d22b3754-d093-42a2-a294-5fda6c6db44c', + 'service_bindings_url': '/v2/service_instances/4986ba9d-f537-4e37-9479-0abb8da7b216/service_bindings', + 'service_keys_url': '/v2/service_instances/4986ba9d-f537-4e37-9479-0abb8da7b216/service_keys', + 'routes_url': '/v2/service_instances/4986ba9d-f537-4e37-9479-0abb8da7b216/routes' } } ] @@ -198,36 +198,36 @@ response: { 200: { body: { - "total_results": 1, - "total_pages": 1, - "prev_url": null, - "next_url": null, - "resources": [ + 'total_results': 1, + 'total_pages': 1, + 'prev_url': null, + 'next_url': null, + 'resources': [ { - "metadata": { - "guid": "bb90f482-4b6b-4baf-8a5a-265b8d7e115e", - "url": "/v2/services/bb90f482-4b6b-4baf-8a5a-265b8d7e115e", - "created_at": "2016-05-12T00:45:17Z", - "updated_at": null + 'metadata': { + 'guid': 'bb90f482-4b6b-4baf-8a5a-265b8d7e115e', + 'url': '/v2/services/bb90f482-4b6b-4baf-8a5a-265b8d7e115e', + 'created_at': '2016-05-12T00:45:17Z', + 'updated_at': null }, - "entity": { - "label": "label-44", - "provider": null, - "url": null, - "description": "desc-90", - "long_description": null, - "version": null, - "info_url": null, - "active": true, - "bindable": true, - "unique_id": "ebb0d295-82f5-435d-85ed-aa38068c4582", - "extra": null, - "tags": [], - "requires": [], - "documentation_url": null, - "service_broker_guid": "f7f4280c-c7df-4010-ba54-96786e0326f1", - "plan_updateable": false, - "service_plans_url": "/v2/services/bb90f482-4b6b-4baf-8a5a-265b8d7e115e/service_plans" + 'entity': { + 'label': 'label-44', + 'provider': null, + 'url': null, + 'description': 'desc-90', + 'long_description': null, + 'version': null, + 'info_url': null, + 'active': true, + 'bindable': true, + 'unique_id': 'ebb0d295-82f5-435d-85ed-aa38068c4582', + 'extra': null, + 'tags': [], + 'requires': [], + 'documentation_url': null, + 'service_broker_guid': 'f7f4280c-c7df-4010-ba54-96786e0326f1', + 'plan_updateable': false, + 'service_plans_url': '/v2/services/bb90f482-4b6b-4baf-8a5a-265b8d7e115e/service_plans' } } ] @@ -243,102 +243,102 @@ response: { 200: { body: { - "total_results": 3, - "total_pages": 1, - "prev_url": null, - "next_url": null, - "resources": [ + 'total_results': 3, + 'total_pages': 1, + 'prev_url': null, + 'next_url': null, + 'resources': [ { - "metadata": { - "guid": "871e6711-2da6-42d8-992d-645fd9c930c5", - "url": "/v2/services/871e6711-2da6-42d8-992d-645fd9c930c5", - "created_at": "2016-07-26T03:48:12Z", - "updated_at": null + 'metadata': { + 'guid': '871e6711-2da6-42d8-992d-645fd9c930c5', + 'url': '/v2/services/871e6711-2da6-42d8-992d-645fd9c930c5', + 'created_at': '2016-07-26T03:48:12Z', + 'updated_at': null }, - "entity": { - "label": "sso-routing", - "provider": null, - "url": null, - "description": "Application single sign-on service broker", - "long_description": null, - "version": null, - "info_url": null, - "active": 1, - "bindable": 1, - "unique_id": "a98eb389-64e1-475e-afc0-824394ed60d1", - "extra": null, - "tags": [ + 'entity': { + 'label': 'sso-routing', + 'provider': null, + 'url': null, + 'description': 'Application single sign-on service broker', + 'long_description': null, + 'version': null, + 'info_url': null, + 'active': 1, + 'bindable': 1, + 'unique_id': 'a98eb389-64e1-475e-afc0-824394ed60d1', + 'extra': null, + 'tags': [ ], - "requires": [ - "route_forwarding" + 'requires': [ + 'route_forwarding' ], - "documentation_url": null, - "service_broker_guid": "bec439da-7d35-4a09-921c-842585a1aee1", - "plan_updateable": 0, - "service_plans_url": "/v2/services/871e6711-2da6-42d8-992d-645fd9c930c5/service_plans" + 'documentation_url': null, + 'service_broker_guid': 'bec439da-7d35-4a09-921c-842585a1aee1', + 'plan_updateable': 0, + 'service_plans_url': '/v2/services/871e6711-2da6-42d8-992d-645fd9c930c5/service_plans' } }, { - "metadata": { - "guid": "0b936783-2330-423b-8349-7378ece6cd1e", - "url": "/v2/services/0b936783-2330-423b-8349-7378ece6cd1e", - "created_at": "2016-07-26T04:04:32Z", - "updated_at": "2016-07-26T04:04:40Z" + 'metadata': { + 'guid': '0b936783-2330-423b-8349-7378ece6cd1e', + 'url': '/v2/services/0b936783-2330-423b-8349-7378ece6cd1e', + 'created_at': '2016-07-26T04:04:32Z', + 'updated_at': '2016-07-26T04:04:40Z' }, - "entity": { - "label": "Mongo", - "provider": null, - "url": null, - "description": "Default service", - "long_description": null, - "version": null, - "info_url": null, - "active": 1, - "bindable": 1, - "unique_id": "60204887-f232-4bff-8bcb-7954bc1a6852", - "extra": "{\"displayName\":\"dev-mongo\",\"longDescription\":\"MongoDB is a cross-platform document-oriented database. Classified as a NoSQL database, MongoDB uses JSON-like documents with dynamic schemas\"}", - "tags": [ - "Mongo" + 'entity': { + 'label': 'Mongo', + 'provider': null, + 'url': null, + 'description': 'Default service', + 'long_description': null, + 'version': null, + 'info_url': null, + 'active': 1, + 'bindable': 1, + 'unique_id': '60204887-f232-4bff-8bcb-7954bc1a6852', + 'extra': '{"displayName":"dev-mongo","longDescription":"MongoDB is a cross-platform document-oriented database. Classified as a NoSQL database, MongoDB uses JSON-like documents with dynamic schemas"}', + 'tags': [ + 'Mongo' ], - "requires": [ + 'requires': [ ], - "documentation_url": null, - "service_broker_guid": "c19472bf-5644-4fa0-8d7c-e3f2c0ead312", - "plan_updateable": 0, - "service_plans_url": "/v2/services/0b936783-2330-423b-8349-7378ece6cd1e/service_plans" + 'documentation_url': null, + 'service_broker_guid': 'c19472bf-5644-4fa0-8d7c-e3f2c0ead312', + 'plan_updateable': 0, + 'service_plans_url': '/v2/services/0b936783-2330-423b-8349-7378ece6cd1e/service_plans' } }, { - "metadata": { - "guid": "6fe696c1-1d95-4a63-aa29-1fa404282fa2", - "url": "/v2/services/6fe696c1-1d95-4a63-aa29-1fa404282fa2", - "created_at": "2016-07-26T04:04:40Z", - "updated_at": null + 'metadata': { + 'guid': '6fe696c1-1d95-4a63-aa29-1fa404282fa2', + 'url': '/v2/services/6fe696c1-1d95-4a63-aa29-1fa404282fa2', + 'created_at': '2016-07-26T04:04:40Z', + 'updated_at': null }, - "entity": { - "label": "MySQL", - "provider": null, - "url": null, - "description": "Default service", - "long_description": null, - "version": null, - "info_url": null, - "active": 1, - "bindable": 1, - "unique_id": "6ab90aeb-c7b1-4ae9-8c37-b5a9fb6a49ab", - "extra": "{\"displayName\":\"dev-mysql\",\"longDescription\":\"MySQL is a popular open source relational database management system.\"}", - "tags": [ - "MySQL" + 'entity': { + 'label': 'MySQL', + 'provider': null, + 'url': null, + 'description': 'Default service', + 'long_description': null, + 'version': null, + 'info_url': null, + 'active': 1, + 'bindable': 1, + 'unique_id': '6ab90aeb-c7b1-4ae9-8c37-b5a9fb6a49ab', + 'extra': '{"displayName":"dev-mysql","longDescription":"MySQL is a popular open source relational database management system."}', + 'tags': [ + 'MySQL' ], - "requires": [ + 'requires': [ ], - "documentation_url": null, - "service_broker_guid": "c19472bf-5644-4fa0-8d7c-e3f2c0ead312", - "plan_updateable": 0, - "service_plans_url": "/v2/services/6fe696c1-1d95-4a63-aa29-1fa404282fa2/service_plans" + 'documentation_url': null, + 'service_broker_guid': 'c19472bf-5644-4fa0-8d7c-e3f2c0ead312', + 'plan_updateable': 0, + 'service_plans_url': '/v2/services/6fe696c1-1d95-4a63-aa29-1fa404282fa2/service_plans' } } ] @@ -354,71 +354,71 @@ response: { 200: { body: { - "total_results": 3, - "total_pages": 1, - "prev_url": null, - "next_url": null, - "resources": [ + 'total_results': 3, + 'total_pages': 1, + 'prev_url': null, + 'next_url': null, + 'resources': [ { - "metadata": { - "guid": "hcf_auto_config", - "url": "/v2/users/hcf_auto_config", - "created_at": "2016-10-11T17:00:51Z", - "updated_at": null + 'metadata': { + 'guid': 'hcf_auto_config', + 'url': '/v2/users/hcf_auto_config', + 'created_at': '2016-10-11T17:00:51Z', + 'updated_at': null }, - "entity": { - "admin": false, - "active": true, - "default_space_guid": null, - "spaces_url": "/v2/users/hcf_auto_config/spaces", - "organizations_url": "/v2/users/hcf_auto_config/organizations", - "managed_organizations_url": "/v2/users/hcf_auto_config/managed_organizations", - "billing_managed_organizations_url": "/v2/users/hcf_auto_config/billing_managed_organizations", - "audited_organizations_url": "/v2/users/hcf_auto_config/audited_organizations", - "managed_spaces_url": "/v2/users/hcf_auto_config/managed_spaces", - "audited_spaces_url": "/v2/users/hcf_auto_config/audited_spaces" + 'entity': { + 'admin': false, + 'active': true, + 'default_space_guid': null, + 'spaces_url': '/v2/users/hcf_auto_config/spaces', + 'organizations_url': '/v2/users/hcf_auto_config/organizations', + 'managed_organizations_url': '/v2/users/hcf_auto_config/managed_organizations', + 'billing_managed_organizations_url': '/v2/users/hcf_auto_config/billing_managed_organizations', + 'audited_organizations_url': '/v2/users/hcf_auto_config/audited_organizations', + 'managed_spaces_url': '/v2/users/hcf_auto_config/managed_spaces', + 'audited_spaces_url': '/v2/users/hcf_auto_config/audited_spaces' } }, { - "metadata": { - "guid": "280391c9-335d-4f03-83d9-af64fc315b6c", - "url": "/v2/users/280391c9-335d-4f03-83d9-af64fc315b6c", - "created_at": "2016-10-11T17:57:39Z", - "updated_at": null + 'metadata': { + 'guid': '280391c9-335d-4f03-83d9-af64fc315b6c', + 'url': '/v2/users/280391c9-335d-4f03-83d9-af64fc315b6c', + 'created_at': '2016-10-11T17:57:39Z', + 'updated_at': null }, - "entity": { - "admin": false, - "active": true, - "default_space_guid": null, - "username": "admin", - "spaces_url": "/v2/users/280391c9-335d-4f03-83d9-af64fc315b6c/spaces", - "organizations_url": "/v2/users/280391c9-335d-4f03-83d9-af64fc315b6c/organizations", - "managed_organizations_url": "/v2/users/280391c9-335d-4f03-83d9-af64fc315b6c/managed_organizations", - "billing_managed_organizations_url": "/v2/users/280391c9-335d-4f03-83d9-af64fc315b6c/billing_managed_organizations", - "audited_organizations_url": "/v2/users/280391c9-335d-4f03-83d9-af64fc315b6c/audited_organizations", - "managed_spaces_url": "/v2/users/280391c9-335d-4f03-83d9-af64fc315b6c/managed_spaces", - "audited_spaces_url": "/v2/users/280391c9-335d-4f03-83d9-af64fc315b6c/audited_spaces" + 'entity': { + 'admin': false, + 'active': true, + 'default_space_guid': null, + 'username': 'admin', + 'spaces_url': '/v2/users/280391c9-335d-4f03-83d9-af64fc315b6c/spaces', + 'organizations_url': '/v2/users/280391c9-335d-4f03-83d9-af64fc315b6c/organizations', + 'managed_organizations_url': '/v2/users/280391c9-335d-4f03-83d9-af64fc315b6c/managed_organizations', + 'billing_managed_organizations_url': '/v2/users/280391c9-335d-4f03-83d9-af64fc315b6c/billing_managed_organizations', + 'audited_organizations_url': '/v2/users/280391c9-335d-4f03-83d9-af64fc315b6c/audited_organizations', + 'managed_spaces_url': '/v2/users/280391c9-335d-4f03-83d9-af64fc315b6c/managed_spaces', + 'audited_spaces_url': '/v2/users/280391c9-335d-4f03-83d9-af64fc315b6c/audited_spaces' } }, { - "metadata": { - "guid": "0683b8d1-767d-4063-9ae6-bc2194d7f3da", - "url": "/v2/users/0683b8d1-767d-4063-9ae6-bc2194d7f3da", - "created_at": "2016-10-12T19:07:32Z", - "updated_at": null + 'metadata': { + 'guid': '0683b8d1-767d-4063-9ae6-bc2194d7f3da', + 'url': '/v2/users/0683b8d1-767d-4063-9ae6-bc2194d7f3da', + 'created_at': '2016-10-12T19:07:32Z', + 'updated_at': null }, - "entity": { - "admin": false, - "active": false, - "default_space_guid": null, - "username": "rcox", - "spaces_url": "/v2/users/0683b8d1-767d-4063-9ae6-bc2194d7f3da/spaces", - "organizations_url": "/v2/users/0683b8d1-767d-4063-9ae6-bc2194d7f3da/organizations", - "managed_organizations_url": "/v2/users/0683b8d1-767d-4063-9ae6-bc2194d7f3da/managed_organizations", - "billing_managed_organizations_url": "/v2/users/0683b8d1-767d-4063-9ae6-bc2194d7f3da/billing_managed_organizations", - "audited_organizations_url": "/v2/users/0683b8d1-767d-4063-9ae6-bc2194d7f3da/audited_organizations", - "managed_spaces_url": "/v2/users/0683b8d1-767d-4063-9ae6-bc2194d7f3da/managed_spaces", - "audited_spaces_url": "/v2/users/0683b8d1-767d-4063-9ae6-bc2194d7f3da/audited_spaces" + 'entity': { + 'admin': false, + 'active': false, + 'default_space_guid': null, + 'username': 'rcox', + 'spaces_url': '/v2/users/0683b8d1-767d-4063-9ae6-bc2194d7f3da/spaces', + 'organizations_url': '/v2/users/0683b8d1-767d-4063-9ae6-bc2194d7f3da/organizations', + 'managed_organizations_url': '/v2/users/0683b8d1-767d-4063-9ae6-bc2194d7f3da/managed_organizations', + 'billing_managed_organizations_url': '/v2/users/0683b8d1-767d-4063-9ae6-bc2194d7f3da/billing_managed_organizations', + 'audited_organizations_url': '/v2/users/0683b8d1-767d-4063-9ae6-bc2194d7f3da/audited_organizations', + 'managed_spaces_url': '/v2/users/0683b8d1-767d-4063-9ae6-bc2194d7f3da/managed_spaces', + 'audited_spaces_url': '/v2/users/0683b8d1-767d-4063-9ae6-bc2194d7f3da/audited_spaces' } } ] diff --git a/components/cloud-foundry/frontend/test/unit/api/Users.mock.js b/components/cloud-foundry/frontend/test/unit/api/Users.mock.js index ddf30d98c7..4dddd183be 100644 --- a/components/cloud-foundry/frontend/test/unit/api/Users.mock.js +++ b/components/cloud-foundry/frontend/test/unit/api/Users.mock.js @@ -14,22 +14,22 @@ response: { 201: { body: { - "metadata": { - "guid": "a9bf1ec7-48f5-49e0-befb-4c3602591325", - "url": "/v2/routes/a9bf1ec7-48f5-49e0-befb-4c3602591325", - "created_at": "2016-02-19T02:04:02Z", - "updated_at": null + 'metadata': { + 'guid': 'a9bf1ec7-48f5-49e0-befb-4c3602591325', + 'url': '/v2/routes/a9bf1ec7-48f5-49e0-befb-4c3602591325', + 'created_at': '2016-02-19T02:04:02Z', + 'updated_at': null }, - "entity": { - "host": "host-25", - "path": "", - "domain_guid": "b7dafe61-0077-4017-adf1-17433e1926c3", - "space_guid": "b3bfcbb3-b786-41c0-b700-108db832e1db", - "service_instance_guid": null, - "port": 0, - "domain_url": "/v2/domains/b7dafe61-0077-4017-adf1-17433e1926c3", - "space_url": "/v2/spaces/b3bfcbb3-b786-41c0-b700-108db832e1db", - "apps_url": "/v2/routes/a9bf1ec7-48f5-49e0-befb-4c3602591325/apps" + 'entity': { + 'host': 'host-25', + 'path': '', + 'domain_guid': 'b7dafe61-0077-4017-adf1-17433e1926c3', + 'space_guid': 'b3bfcbb3-b786-41c0-b700-108db832e1db', + 'service_instance_guid': null, + 'port': 0, + 'domain_url': '/v2/domains/b7dafe61-0077-4017-adf1-17433e1926c3', + 'space_url': '/v2/spaces/b3bfcbb3-b786-41c0-b700-108db832e1db', + 'apps_url': '/v2/routes/a9bf1ec7-48f5-49e0-befb-4c3602591325/apps' } } }, @@ -98,26 +98,26 @@ resources: [ { metadata: { - guid: "guid", - url: "/v2/organizations/guid", - created_at: "2016-08-25T12:02:01Z", + guid: 'guid', + url: '/v2/organizations/guid', + created_at: '2016-08-25T12:02:01Z', updated_at: null }, entity: { - name: "BRUI", - "billing_enabled": false, - "quota_definition_guid": "guid", - "status": "active", - "quota_definition_url": "/v2/quota_definitions/guid", - "spaces_url": "/v2/organizations/guid/spaces", - "domains_url": "/v2/organizations/guid/domains", - "private_domains_url": "/v2/organizations/guid/private_domains", - "users_url": "/v2/organizations/guid/users", - "managers_url": "/v2/organizations/guid/managers", - "billing_managers_url": "/v2/organizations/guid/billing_managers", - "auditors_url": "/v2/organizations/guid/auditors", - "app_events_url": "/v2/organizations/guid/app_events", - "space_quota_definitions_url": "/v2/organizations/guid/space_quota_definitions" + name: 'BRUI', + 'billing_enabled': false, + 'quota_definition_guid': 'guid', + 'status': 'active', + 'quota_definition_url': '/v2/quota_definitions/guid', + 'spaces_url': '/v2/organizations/guid/spaces', + 'domains_url': '/v2/organizations/guid/domains', + 'private_domains_url': '/v2/organizations/guid/private_domains', + 'users_url': '/v2/organizations/guid/users', + 'managers_url': '/v2/organizations/guid/managers', + 'billing_managers_url': '/v2/organizations/guid/billing_managers', + 'auditors_url': '/v2/organizations/guid/auditors', + 'app_events_url': '/v2/organizations/guid/app_events', + 'space_quota_definitions_url': '/v2/organizations/guid/space_quota_definitions' } } ] @@ -154,26 +154,26 @@ resources: [ { metadata: { - guid: "guid", - url: "/v2/organizations/guid", - created_at: "2016-08-25T12:02:01Z", + guid: 'guid', + url: '/v2/organizations/guid', + created_at: '2016-08-25T12:02:01Z', updated_at: null }, entity: { - name: "BRUI", - "billing_enabled": false, - "quota_definition_guid": "guid", - "status": "active", - "quota_definition_url": "/v2/quota_definitions/guid", - "spaces_url": "/v2/organizations/guid/spaces", - "domains_url": "/v2/organizations/guid/domains", - "private_domains_url": "/v2/organizations/guid/private_domains", - "users_url": "/v2/organizations/guid/users", - "managers_url": "/v2/organizations/guid/managers", - "billing_managers_url": "/v2/organizations/guid/billing_managers", - "auditors_url": "/v2/organizations/guid/auditors", - "app_events_url": "/v2/organizations/guid/app_events", - "space_quota_definitions_url": "/v2/organizations/guid/space_quota_definitions" + name: 'BRUI', + 'billing_enabled': false, + 'quota_definition_guid': 'guid', + 'status': 'active', + 'quota_definition_url': '/v2/quota_definitions/guid', + 'spaces_url': '/v2/organizations/guid/spaces', + 'domains_url': '/v2/organizations/guid/domains', + 'private_domains_url': '/v2/organizations/guid/private_domains', + 'users_url': '/v2/organizations/guid/users', + 'managers_url': '/v2/organizations/guid/managers', + 'billing_managers_url': '/v2/organizations/guid/billing_managers', + 'auditors_url': '/v2/organizations/guid/auditors', + 'app_events_url': '/v2/organizations/guid/app_events', + 'space_quota_definitions_url': '/v2/organizations/guid/space_quota_definitions' } } ] @@ -181,8 +181,7 @@ } } }; - } - , + }, // Space ListAllAuditedSpacesForUser: function (guid) { @@ -203,8 +202,7 @@ code: 200 } }; - } - , + }, ListAllManagedSpacesForUser: function (guid) { return { @@ -222,27 +220,27 @@ resources: [ { metadata: { - guid: "guid", - url: "/v2/spaces/guid", - created_at: "2016-09-02T15:46:50Z", + guid: 'guid', + url: '/v2/spaces/guid', + created_at: '2016-09-02T15:46:50Z', updated_at: null }, entity: { - name: "mySpace3", - organization_guid: "guid", + name: 'mySpace3', + organization_guid: 'guid', space_quota_definition_guid: null, allow_ssh: true, - organization_url: "/v2/organizations/guid", - developers_url: "/v2/spaces/guid/developers", - managers_url: "/v2/spaces/guid/managers", - auditors_url: "/v2/spaces/guid/auditors", - apps_url: "/v2/spaces/guid/apps", - routes_url: "/v2/spaces/guid/routes", - domains_url: "/v2/spaces/guid/domains", - service_instances_url: "/v2/spaces/guid/service_instances", - app_events_url: "/v2/spaces/guid/app_events", - events_url: "/v2/spaces/guid/events", - security_groups_url: "/v2/spaces/guid/security_groups" + organization_url: '/v2/organizations/guid', + developers_url: '/v2/spaces/guid/developers', + managers_url: '/v2/spaces/guid/managers', + auditors_url: '/v2/spaces/guid/auditors', + apps_url: '/v2/spaces/guid/apps', + routes_url: '/v2/spaces/guid/routes', + domains_url: '/v2/spaces/guid/domains', + service_instances_url: '/v2/spaces/guid/service_instances', + app_events_url: '/v2/spaces/guid/app_events', + events_url: '/v2/spaces/guid/events', + security_groups_url: '/v2/spaces/guid/security_groups' } }] } @@ -281,27 +279,27 @@ next_url: null, resources: [{ metadata: { - guid: "spaceGuid", - url: "/v2/spaces/spaceGuid", - created_at: "2016-09-02T15:46:50Z", + guid: 'spaceGuid', + url: '/v2/spaces/spaceGuid', + created_at: '2016-09-02T15:46:50Z', updated_at: null }, entity: { - name: "mySpace3", + name: 'mySpace3', organization_guid: orgGuid, space_quota_definition_guid: null, allow_ssh: true, - organization_url: "/v2/organizations/guid", - developers_url: "/v2/spaces/spaceGuid/developers", - "managers_url": "/v2/spaces/spaceGuid/managers", - "auditors_url": "/v2/spaces/spaceGuid/auditors", - "apps_url": "/v2/spaces/spaceGuid/apps", - "routes_url": "/v2/spaces/spaceGuid/routes", - "domains_url": "/v2/spaces/spaceGuid/domains", - "service_instances_url": "/v2/spaces/guid/service_instances", - "app_events_url": "/v2/spaces/guid/app_events", - "events_url": "/v2/spaces/guid/events", - "security_groups_url": "/v2/spaces/guid/security_groups" + organization_url: '/v2/organizations/guid', + developers_url: '/v2/spaces/spaceGuid/developers', + 'managers_url': '/v2/spaces/spaceGuid/managers', + 'auditors_url': '/v2/spaces/spaceGuid/auditors', + 'apps_url': '/v2/spaces/spaceGuid/apps', + 'routes_url': '/v2/spaces/spaceGuid/routes', + 'domains_url': '/v2/spaces/spaceGuid/domains', + 'service_instances_url': '/v2/spaces/guid/service_instances', + 'app_events_url': '/v2/spaces/guid/app_events', + 'events_url': '/v2/spaces/guid/events', + 'security_groups_url': '/v2/spaces/guid/security_groups' } }] } @@ -320,8 +318,7 @@ } } }; - } - , + }, GetUserSummary: function (guid, spaceGuid) { @@ -334,48 +331,48 @@ code: 200, response: { metadata: { - guid: "a256c708-09cc-4650-ac7d-a44b291fe997", - created_at: "2016-08-25T10:49:30Z", + guid: 'a256c708-09cc-4650-ac7d-a44b291fe997', + created_at: '2016-08-25T10:49:30Z', updated_at: null }, entity: { organizations: [{ metadata: { - guid: "guid", - created_at: "2016-08-25T12:02:01Z", + guid: 'guid', + created_at: '2016-08-25T12:02:01Z', updated_at: null }, entity: { - name: "BRUI", + name: 'BRUI', billing_enabled: false, - status: "active", + status: 'active', spaces: [{ metadata: { guid: mySpaceGuid, - created_at: "2016-08-100% 25T12:02:20Z", + created_at: '2016-08-100% 25T12:02:20Z', updated_at: null - }, entity: {name: "mySpace"} + }, entity: {name: 'mySpace'} }, { metadata: { - guid: "b694bcb4-a5d0-4139-8733-b2eebb611362", - created_at: "2016-09-02T15:46:48Z", + guid: 'b694bcb4-a5d0-4139-8733-b2eebb611362', + created_at: '2016-09-02T15:46:48Z', updated_at: null - }, entity: {name: "mySpace2"} + }, entity: {name: 'mySpace2'} }, { metadata: { - guid: "a149c86b-c0eb-4fa8-b1a9-1b0245e3f13a", - created_at: "2016-09-02T15:46:50Z", + guid: 'a149c86b-c0eb-4fa8-b1a9-1b0245e3f13a', + created_at: '2016-09-02T15:46:50Z', updated_at: null - }, entity: {name: "mySpace3"} + }, entity: {name: 'mySpace3'} }], quota_definition: { metadata: { - guid: "1c604341-685e-4ff2-9817-4d5ae24d5861", - created_at: "2016-08-25T10:48:19Z", + guid: '1c604341-685e-4ff2-9817-4d5ae24d5861', + created_at: '2016-08-25T10:48:19Z', updated_at: null }, entity: { - name: "default", + name: 'default', non_basic_services_allowed: true, total_services: 100, memory_limit: 10240, @@ -389,8 +386,8 @@ }, managers: [{ metadata: { - guid: "a256c708-09cc-4650-ac7d-a44b291fe997", - created_at: "2016-08-25T10:49:30Z", + guid: 'a256c708-09cc-4650-ac7d-a44b291fe997', + created_at: '2016-08-25T10:49:30Z', updated_at: null }, entity: {admin: false, active: true, default_space_guid: null} }] @@ -398,41 +395,41 @@ }], managed_organizations: [{ metadata: { - guid: "guid", - created_at: "2016-08-25T12:02:01Z", + guid: 'guid', + created_at: '2016-08-25T12:02:01Z', updated_at: null }, entity: { - name: "BRUI", + name: 'BRUI', billing_enabled: false, - status: "active", + status: 'active', spaces: [{ metadata: { - guid: "89a370b9-9ba3-4cb4-8f2f-22933fba2990", - created_at: "2016-08-25T12:02:20Z", + guid: '89a370b9-9ba3-4cb4-8f2f-22933fba2990', + created_at: '2016-08-25T12:02:20Z', updated_at: null - }, entity: {name: "mySpace"} + }, entity: {name: 'mySpace'} }, { metadata: { - guid: "b694bcb4-a5d0-4139-8733-b2eebb611362", - created_at: "2016-09-02T15:46:48Z", + guid: 'b694bcb4-a5d0-4139-8733-b2eebb611362', + created_at: '2016-09-02T15:46:48Z', updated_at: null - }, entity: {name: "mySpace2"} + }, entity: {name: 'mySpace2'} }, { metadata: { - guid: "a149c86b-c0eb-4fa8-b1a9-1b0245e3f13a", - created_at: "2016-09-02T15:46:50Z", + guid: 'a149c86b-c0eb-4fa8-b1a9-1b0245e3f13a', + created_at: '2016-09-02T15:46:50Z', updated_at: null - }, entity: {name: "mySpace3"} + }, entity: {name: 'mySpace3'} }], quota_definition: { metadata: { - guid: "1c604341-685e-4ff2-9817-4d5ae24d5861", - created_at: "2016-08-25T10:48:19Z", + guid: '1c604341-685e-4ff2-9817-4d5ae24d5861', + created_at: '2016-08-25T10:48:19Z', updated_at: null }, entity: { - name: "default", + name: 'default', non_basic_services_allowed: true, total_services: 100, memory_limit: 10240, @@ -446,8 +443,8 @@ }, managers: [{ metadata: { - guid: "a256c708-09cc-4650-ac7d-a44b291fe997", - created_at: "2016-08-25T10:49:30Z", + guid: 'a256c708-09cc-4650-ac7d-a44b291fe997', + created_at: '2016-08-25T10:49:30Z', updated_at: null }, entity: {admin: false, active: true, default_space_guid: null} }] @@ -458,40 +455,40 @@ spaces: [{ metadata: { guid: mySpaceGuid, - created_at: "2016-08-25T12:02:20Z", + created_at: '2016-08-25T12:02:20Z', updated_at: null - }, entity: {name: "mySpace"} + }, entity: {name: 'mySpace'} }, { metadata: { - guid: "b694bcb4-a5d0-4139-8733-b2eebb611362", - created_at: "2016-09-02T15:46:48Z", + guid: 'b694bcb4-a5d0-4139-8733-b2eebb611362', + created_at: '2016-09-02T15:46:48Z', updated_at: null - }, entity: {name: "mySpace2"} + }, entity: {name: 'mySpace2'} }, { metadata: { - guid: "a149c86b-c0eb-4fa8-b1a9-1b0245e3f13a", - created_at: "2016-09-02T15:46:50Z", + guid: 'a149c86b-c0eb-4fa8-b1a9-1b0245e3f13a', + created_at: '2016-09-02T15:46:50Z', updated_at: null - }, entity: {name: "mySpace3"} + }, entity: {name: 'mySpace3'} }], managed_spaces: [{ metadata: { - guid: "89a370b9-9ba3-4cb4-8f2f-22933fba2990", - created_at: "2016-08-25T12:02:20Z", + guid: '89a370b9-9ba3-4cb4-8f2f-22933fba2990', + created_at: '2016-08-25T12:02:20Z', updated_at: null - }, entity: {name: "mySpace"} + }, entity: {name: 'mySpace'} }, { metadata: { - guid: "b694bcb4-a5d0-4139-8733-b2eebb611362", - created_at: "2016-09-02T15:46:48Z", + guid: 'b694bcb4-a5d0-4139-8733-b2eebb611362', + created_at: '2016-09-02T15:46:48Z', updated_at: null - }, entity: {name: "mySpace2"} + }, entity: {name: 'mySpace2'} }, { metadata: { - guid: "a149c86b-c0eb-4fa8-b1a9-1b0245e3f13a", - created_at: "2016-09-02T15:46:50Z", + guid: 'a149c86b-c0eb-4fa8-b1a9-1b0245e3f13a', + created_at: '2016-09-02T15:46:50Z', updated_at: null - }, entity: {name: "mySpace3"} + }, entity: {name: 'mySpace3'} }], audited_spaces: [] } diff --git a/components/cloud-foundry/frontend/test/unit/model/model-utils.service.spec.js b/components/cloud-foundry/frontend/test/unit/model/model-utils.service.spec.js index 0caeae1b1a..4e8e7806b1 100644 --- a/components/cloud-foundry/frontend/test/unit/model/model-utils.service.spec.js +++ b/components/cloud-foundry/frontend/test/unit/model/model-utils.service.spec.js @@ -20,8 +20,8 @@ var cnsiGuid = '12345'; expect(modelUtils.makeHttpConfig(cnsiGuid)).toEqual({ headers: { - 'x-cnap-cnsi-list': cnsiGuid, - 'x-cnap-passthrough': 'true' + 'x-cap-cnsi-list': cnsiGuid, + 'x-cap-passthrough': 'true' } }); }); diff --git a/components/cloud-foundry/frontend/test/unit/view/applications/application/services-catalogue/service-catalogue-card.directive.spec.js b/components/cloud-foundry/frontend/test/unit/view/applications/application/services-catalogue/service-catalogue-card.directive.spec.js new file mode 100644 index 0000000000..ae45de7027 --- /dev/null +++ b/components/cloud-foundry/frontend/test/unit/view/applications/application/services-catalogue/service-catalogue-card.directive.spec.js @@ -0,0 +1,155 @@ +(function () { + 'use strict'; + + describe('service-card directive', function () { + var $compile, $httpBackend, $scope, mockBindingsApi, appEventService; + + var cnsiGuid = 'cnsiGuid'; + var spaceGuid = 'spaceGuid'; + + beforeEach(module('templates')); + beforeEach(module('console-app')); + + function initController($injector, mockAuthModel, role) { + $compile = $injector.get('$compile'); + $httpBackend = $injector.get('$httpBackend'); + $scope = $injector.get('$rootScope').$new(); + var modelManager = $injector.get('modelManager'); + appEventService = $injector.get('appEventService'); + + if (mockAuthModel) { + var authModel = modelManager.retrieve('cloud-foundry.model.auth'); + spyOn(authModel, 'isAllowed').and.callFake(function () { + // Everything is allowed in tests + return true; + }); + } else { + var authModelOpts = { + role: role, + cnsiGuid: cnsiGuid, + spaceGuid: spaceGuid + }; + mock.cloudFoundryModel.Auth.initAuthModel($injector, authModelOpts); + } + // mocks + $scope.guid = 'guid'; + $scope.cnsiGuid = cnsiGuid; + $scope.app = { + summary: { + guid: '6e23689c-2844-4ebf-ab69-e52ab3439f6b', + services: [ + { + guid: '01430cca-2592-4396-ac79-b1405a488b3e', + service_plan: { + guid: 'd22b3754-d093-42a2-a294-5fda6c6db44c', + service: { + guid: '67229bc6-8fc9-4fe1-b8bc-8790cdae5334' + } + } + } + ] + } + }; + $scope.service = { + entity: { label: 'Service' }, + metadata: { guid: '67229bc6-8fc9-4fe1-b8bc-8790cdae5334' } + }; + + mockBindingsApi = mock.cloudFoundryAPI.ServiceBindings; + var ListAllServiceBindings = mockBindingsApi.ListAllServiceBindings(); + var params = '?include-relations=service_instance' + + '&inline-relations-depth=1' + + '&q=service_instance_guid+IN+01430cca-2592-4396-ac79-b1405a488b3e' + + '&results-per-page=100'; + $httpBackend.whenGET(ListAllServiceBindings.url + params) + .respond(200, ListAllServiceBindings.response['200'].body); + } + + describe('with mocked authModel', function () { + beforeEach(inject(function ($injector) { + initController($injector, true); + })); + + afterEach(function () { + $httpBackend.verifyNoOutstandingExpectation(); + $httpBackend.verifyNoOutstandingRequest(); + }); + + describe('with defaults', function () { + var serviceCardCtrl, element; + + beforeEach(function () { + var markup = '' + + ''; + element = angular.element(markup); + $compile(element)($scope); + + $scope.$apply(); + $httpBackend.flush(); + + serviceCardCtrl = element.controller('serviceCatalogueCard'); + }); + + it('should be defined and initialized', function () { + expect(element).toBeDefined(); + expect(serviceCardCtrl).toBeDefined(); + + expect(serviceCardCtrl.serviceBindings).not.toEqual([]); + expect(serviceCardCtrl.numAttached).toBe(0); + }); + + describe('init', function () { + beforeEach(function () { + spyOn(serviceCardCtrl, 'getServiceInstanceGuids').and.callThrough(); + spyOn(serviceCardCtrl, 'getServiceBindings').and.callThrough(); + }); + + afterAll(function () { + var service = { + guid: '01430cca-2592-4396-ac79-b1405a488b3e', + service_plan: { + guid: 'd22b3754-d093-42a2-a294-5fda6c6db44c', + service: { + guid: '67229bc6-8fc9-4fe1-b8bc-8790cdae5334' + } + } + }; + $scope.app.summary.services.push(service); + }); + + it('should set serviceBindings', function () { + serviceCardCtrl.init().then(function () { + expect(serviceCardCtrl.serviceBindings.length).toBe(1); + }); + + $httpBackend.flush(); + + expect(serviceCardCtrl.getServiceInstanceGuids).toHaveBeenCalled(); + expect(serviceCardCtrl.getServiceBindings).toHaveBeenCalled(); + }); + + it('should not set serviceBindings', function () { + $scope.app.summary.services.length = 0; + serviceCardCtrl.init(); + + expect(serviceCardCtrl.serviceBindings.length).toBe(0); + expect(serviceCardCtrl.numAttached).toBe(0); + expect(serviceCardCtrl.getServiceInstanceGuids).toHaveBeenCalled(); + expect(serviceCardCtrl.getServiceBindings).not.toHaveBeenCalled(); + }); + }); + + describe('addService', function () { + it('should emit cf.events.START_ADD_SERVICE_WORKFLOW event', function () { + spyOn(appEventService, '$emit'); + serviceCardCtrl.addService(); + expect(appEventService.$emit).toHaveBeenCalled(); + + var args = appEventService.$emit.calls.mostRecent().args; + expect(args[0]).toBe('cf.events.START_ADD_SERVICE_WORKFLOW'); + }); + }); + }); + }); + }); +})(); diff --git a/components/cloud-foundry/frontend/test/unit/view/applications/application/services-catalogue/services-catalogue.module.spec.js b/components/cloud-foundry/frontend/test/unit/view/applications/application/services-catalogue/services-catalogue.module.spec.js new file mode 100644 index 0000000000..d407259492 --- /dev/null +++ b/components/cloud-foundry/frontend/test/unit/view/applications/application/services-catalogue/services-catalogue.module.spec.js @@ -0,0 +1,81 @@ +(function () { + 'use strict'; + + describe('app details - services view', function () { + var $httpBackend, $scope, appServicesCtrl; + + beforeEach(module('console-app')); + + beforeEach(inject(function ($injector) { + $httpBackend = $injector.get('$httpBackend'); + $scope = $injector.get('$rootScope').$new(); + var modelManager = $injector.get('modelManager'); + var $stateParams = $injector.get('$stateParams'); + var $state = $injector.get('$state'); + + $stateParams.guid = 'app_123'; + $stateParams.cnsiGuid = 'guid'; + + var ApplicationServicesController = $state.get('cf.applications.application.service-catalogue').controller; + appServicesCtrl = new ApplicationServicesController($scope, modelManager, $stateParams); + })); + + afterEach(function () { + $httpBackend.verifyNoOutstandingExpectation(); + $httpBackend.verifyNoOutstandingRequest(); + }); + + it('should have controller defined', function () { + expect(appServicesCtrl).toBeDefined(); + expect(appServicesCtrl.model).toBeDefined(); + expect(appServicesCtrl.appModel).toBeDefined(); + }); + + it('should have IDs and services initially defined', function () { + expect(appServicesCtrl.id).toBe('app_123'); + expect(appServicesCtrl.cnsiGuid).toBe('guid'); + expect(appServicesCtrl.services).toEqual([]); + }); + + it('should set services on app summary change', function () { + var spaceGuid = 'space_123'; + + var mockSpacesApi = mock.cloudFoundryAPI.Spaces; + var ListAllServicesForSpace = mockSpacesApi.ListAllServicesForSpaceWithSSO(spaceGuid); + $httpBackend.whenGET(ListAllServicesForSpace.url) + .respond(200, ListAllServicesForSpace.response['200'].body); + + appServicesCtrl.appModel.application.summary = { + space_guid: spaceGuid, + services: [ { + service_plan: { + service: { + guid: ListAllServicesForSpace.response['200'].body.resources[0].metadata.guid + } + } + }] + }; + + $scope.$apply(); + $httpBackend.flush(); + + expect(appServicesCtrl.services.length).toBeGreaterThan(0); + expect(appServicesCtrl.services.length).toEqual(3); + expect(appServicesCtrl.services[0].attached).toBeTruthy(); + expect(appServicesCtrl.services[1].attached).toBeFalsy(); + expect(appServicesCtrl.services[2].attached).toBeFalsy(); + }); + + it('should keep services empty on app summary change with no space GUID', function () { + appServicesCtrl.appModel.application.summary = { + guid: 'app_123' + }; + + $scope.$apply(); + + expect(appServicesCtrl.services.length).toBe(0); + }); + + }); + +})(); diff --git a/components/cloud-foundry/frontend/test/unit/view/applications/application/services/manage-services.directive.spec.js b/components/cloud-foundry/frontend/test/unit/view/applications/application/services/manage-services.directive.spec.js deleted file mode 100644 index 84d5a1d688..0000000000 --- a/components/cloud-foundry/frontend/test/unit/view/applications/application/services/manage-services.directive.spec.js +++ /dev/null @@ -1,214 +0,0 @@ -(function () { - 'use strict'; - - describe('manage-services directive', function () { - var $httpBackend, $scope, appEventService, mockAppsApi, mockApp, mockService, badMockService, manageServicesCtrl, - cfServiceInstanceService; - - beforeEach(module('templates')); - beforeEach(module('console-app')); - - beforeEach(inject(function ($injector) { - var $compile = $injector.get('$compile'); - $httpBackend = $injector.get('$httpBackend'); - $scope = $injector.get('$rootScope').$new(); - appEventService = $injector.get('appEventService'); - cfServiceInstanceService = $injector.get('cfServiceInstanceService'); - - // mock UI router $stateParams - var $stateParams = $injector.get('$stateParams'); - $stateParams.cnsiGuid = 'guid'; - - var markup = ''; - var element = angular.element(markup); - $compile(element)($scope); - - $scope.$apply(); - - manageServicesCtrl = element.controller('manageServices'); - - mockService = { - metadata: {guid: '67229bc6-8fc9-4fe1-b8bc-8790cdae5334'}, - entity: { - label: 'label-19' - } - }; - badMockService = { - metadata: {guid: 'foo'} - }; - - // mock CF application model - GetAppSummary - var appGuid = 'app_123'; - mockAppsApi = mock.cloudFoundryAPI.Apps; - var GetAppSummary = mockAppsApi.GetAppSummary(appGuid); - mockApp = GetAppSummary.response['200'].body; - $httpBackend.whenGET(GetAppSummary.url) - .respond(200, GetAppSummary.response['200'].body); - // mock CF application model - ListAllServiceBindingsForApp - var ListAllServiceBindingsForApp = mockAppsApi.ListAllServiceBindingsForApp(appGuid); - var params = '?q=service_instance_guid+IN+28aa8270-ab0e-480d-b9b6-ba4ec4f15015&results-per-page=100'; - $httpBackend.whenGET(ListAllServiceBindingsForApp.url + params) - .respond(200, ListAllServiceBindingsForApp.response['200'].body); - })); - - afterEach(function () { - $httpBackend.verifyNoOutstandingExpectation(); - $httpBackend.verifyNoOutstandingRequest(); - }); - - describe('ManageServicesController', function () { - it('should be defined and initialized', function () { - expect(manageServicesCtrl).toBeDefined(); - expect(manageServicesCtrl.serviceInstances).toEqual([]); - expect(manageServicesCtrl.serviceBindings).toEqual({}); - }); - - it('should have correct functions', function () { - expect(manageServicesCtrl.reset).toBeDefined(); - expect(manageServicesCtrl.detach).toBeDefined(); - expect(manageServicesCtrl.viewEnvVariables).toBeDefined(); - expect(manageServicesCtrl.startManageServices).toBeDefined(); - }); - - it('should call reset and startManageServices on event received', function () { - spyOn(manageServicesCtrl, 'reset').and.callThrough(); - spyOn(manageServicesCtrl, 'startManageServices').and.callThrough(); - - var event = 'cf.events.START_MANAGE_SERVICES'; - var config = { - app: { - summary: mockApp - }, - cnsiGuid: 'guid', - service: mockService - }; - appEventService.$emit(event, config); - - $scope.$apply(); - $httpBackend.flush(); - - expect(manageServicesCtrl.reset).toHaveBeenCalled(); - expect(manageServicesCtrl.startManageServices).toHaveBeenCalled(); - }); - - describe('reset', function () { - it('should set serviceInstances and serviceBindings', function () { - spyOn(manageServicesCtrl, 'getServiceBindings').and.callThrough(); - - var config = { - app: { - summary: mockApp - }, - cnsiGuid: 'guid', - service: mockService - }; - manageServicesCtrl.reset(config); - - $httpBackend.flush(); - - expect(manageServicesCtrl.serviceInstances.length).toBeGreaterThan(0); - expect(manageServicesCtrl.serviceBindings).not.toEqual({}); - expect(manageServicesCtrl.getServiceBindings).toHaveBeenCalled(); - }); - - it('should empty serviceInstances and serviceBindings if no app services', function () { - spyOn(manageServicesCtrl, 'getServiceBindings').and.callThrough(); - - var config = { - app: { - summary: mockApp - }, - cnsiGuid: 'guid', - service: badMockService - }; - manageServicesCtrl.reset(config); - - expect(manageServicesCtrl.serviceInstances.length).toBe(0); - expect(manageServicesCtrl.serviceBindings).toEqual({}); - expect(manageServicesCtrl.getServiceBindings).not.toHaveBeenCalled(); - }); - }); - - describe('getServiceBindings', function () { - it('should return service bindings', function () { - manageServicesCtrl.data = { - app: { - summary: mockApp - }, - cnsiGuid: 'guid' - }; - - manageServicesCtrl.getServiceBindings(['28aa8270-ab0e-480d-b9b6-ba4ec4f15015']) - .then(function () { - expect(manageServicesCtrl.serviceBindings).not.toEqual({}); - }); - - $httpBackend.flush(); - }); - }); - - describe('detach', function () { - beforeEach(function () { - var bindingGuid = 'binding_123'; - - manageServicesCtrl.modal = { - dismiss: angular.noop - }; - manageServicesCtrl.data = { - app: { - summary: mockApp - }, - cnsiGuid: 'guid' - }; - manageServicesCtrl.serviceInstances = [ - {guid: 'instance_123', name: 'instance_123'}, - {guid: 'instance_456'} - ]; - manageServicesCtrl.serviceBindings = { - instance_123: { - metadata: {guid: bindingGuid} - }, - instance_456: { - metadata: {guid: bindingGuid} - } - }; - - spyOn(cfServiceInstanceService, 'unbindServiceFromApp'); - }); - - it('should call unbindServiceFromApp', function () { - var instance = manageServicesCtrl.serviceInstances[0]; - manageServicesCtrl.detach(instance); - expect(cfServiceInstanceService.unbindServiceFromApp) - .toHaveBeenCalled(); - var args = cfServiceInstanceService.unbindServiceFromApp.calls.argsFor(0); - expect(args[0]).toBe('guid'); - expect(args[1]).toBe('app_123'); - expect(args[2]).toBe('binding_123'); - expect(args[3]).toBe('instance_123'); - }); - }); - - describe('viewEnvVariables', function () { - beforeEach(function () { - manageServicesCtrl.data = { - app: { - summary: mockApp - }, - cnsiGuid: 'guid', - service: mockService - }; - - spyOn(cfServiceInstanceService, 'viewEnvVariables'); - }); - - it('should show env variables in detail view', function () { - manageServicesCtrl.viewEnvVariables({name: 'instance_123'}); - expect(cfServiceInstanceService.viewEnvVariables) - .toHaveBeenCalledWith('guid', mockApp, 'label-19', {name: 'instance_123'}); - }); - }); - }); - }); - -})(); diff --git a/components/cloud-foundry/frontend/test/unit/view/applications/application/services/service-card.directive.spec.js b/components/cloud-foundry/frontend/test/unit/view/applications/application/services/service-card.directive.spec.js index 78eec93c36..feb9d7cc8c 100644 --- a/components/cloud-foundry/frontend/test/unit/view/applications/application/services/service-card.directive.spec.js +++ b/components/cloud-foundry/frontend/test/unit/view/applications/application/services/service-card.directive.spec.js @@ -2,8 +2,8 @@ 'use strict'; describe('service-card directive', function () { - var $compile, $httpBackend, $scope, mockBindingsApi, appEventService, cfServiceInstanceService; - + var $compile, $httpBackend, $scope, mockBindingsApi, cfServiceInstanceService; + var APP_GUID = '6e23689c-2844-4ebf-ab69-e52ab3439f6b'; var cnsiGuid = 'cnsiGuid'; var spaceGuid = 'spaceGuid'; @@ -14,9 +14,8 @@ $compile = $injector.get('$compile'); $httpBackend = $injector.get('$httpBackend'); $scope = $injector.get('$rootScope').$new(); - var modelManager = $injector.get('modelManager'); - appEventService = $injector.get('appEventService'); cfServiceInstanceService = $injector.get('cfServiceInstanceService'); + var modelManager = $injector.get('modelManager'); if (mockAuthModel) { var authModel = modelManager.retrieve('cloud-foundry.model.auth'); @@ -37,23 +36,25 @@ $scope.cnsiGuid = cnsiGuid; $scope.app = { summary: { - guid: '6e23689c-2844-4ebf-ab69-e52ab3439f6b', - services: [ - { - guid: '01430cca-2592-4396-ac79-b1405a488b3e', - service_plan: { - guid: 'd22b3754-d093-42a2-a294-5fda6c6db44c', - service: { - guid: '67229bc6-8fc9-4fe1-b8bc-8790cdae5334' - } + guid: APP_GUID, + services: [{ + guid: '01430cca-2592-4396-ac79-b1405a488b3e', + service_plan: { + guid: 'd22b3754-d093-42a2-a294-5fda6c6db44c', + service: { + guid: '67229bc6-8fc9-4fe1-b8bc-8790cdae5334' } } - ] + }] } }; $scope.service = { - entity: {label: 'Service'}, - metadata: {guid: '67229bc6-8fc9-4fe1-b8bc-8790cdae5334'} + entity: { + label: 'Service' + }, + metadata: { + guid: '67229bc6-8fc9-4fe1-b8bc-8790cdae5334' + } }; mockBindingsApi = mock.cloudFoundryAPI.ServiceBindings; @@ -86,83 +87,22 @@ $compile(element)($scope); $scope.$apply(); - $httpBackend.flush(); serviceCardCtrl = element.controller('serviceCard'); }); - it('should be defined and initialized', function () { - expect(element).toBeDefined(); - expect(serviceCardCtrl).toBeDefined(); - - expect(serviceCardCtrl.serviceBindings).not.toEqual([]); - expect(serviceCardCtrl.numAttached).toBe(1); - expect(serviceCardCtrl.actions.length).toBe(3); - }); - - describe('init', function () { - beforeEach(function () { - spyOn(serviceCardCtrl, 'getServiceInstanceGuids').and.callThrough(); - spyOn(serviceCardCtrl, 'getServiceBindings').and.callThrough(); - spyOn(serviceCardCtrl, 'updateActions').and.callThrough(); - }); - - afterAll(function () { - var service = { - guid: '01430cca-2592-4396-ac79-b1405a488b3e', - service_plan: { - guid: 'd22b3754-d093-42a2-a294-5fda6c6db44c', - service: { - guid: '67229bc6-8fc9-4fe1-b8bc-8790cdae5334' - } - } - }; - $scope.app.summary.services.push(service); - }); - - it('should set serviceBindings', function () { - serviceCardCtrl.init().then(function () { - expect(serviceCardCtrl.serviceBindings.length).toBe(1); - expect(serviceCardCtrl.numAttached).toBe(1); - expect(serviceCardCtrl.actions[1].hidden).toBeFalsy(); - expect(serviceCardCtrl.actions[2].hidden).toBeFalsy(); - }); - - $httpBackend.flush(); - - expect(serviceCardCtrl.getServiceInstanceGuids).toHaveBeenCalled(); - expect(serviceCardCtrl.getServiceBindings).toHaveBeenCalled(); - }); - - it('should not set serviceBindings', function () { - $scope.app.summary.services.length = 0; - serviceCardCtrl.init(); - - expect(serviceCardCtrl.serviceBindings.length).toBe(0); - expect(serviceCardCtrl.numAttached).toBe(0); - expect(serviceCardCtrl.actions[1].hidden).toBeTruthy(); - expect(serviceCardCtrl.actions[2].hidden).toBeTruthy(); - expect(serviceCardCtrl.getServiceInstanceGuids).toHaveBeenCalled(); - expect(serviceCardCtrl.getServiceBindings).not.toHaveBeenCalled(); - expect(serviceCardCtrl.updateActions).toHaveBeenCalled(); - }); - }); - - describe('addService', function () { - it('should emit cf.events.START_ADD_SERVICE_WORKFLOW event', function () { - spyOn(appEventService, '$emit'); - serviceCardCtrl.addService(); - expect(appEventService.$emit).toHaveBeenCalled(); - - var args = appEventService.$emit.calls.mostRecent().args; - expect(args[0]).toBe('cf.events.START_ADD_SERVICE_WORKFLOW'); - }); - }); - - describe('detach', function () { + it('detach', function () { it('should call unbindServiceFromApp', function () { spyOn(cfServiceInstanceService, 'unbindServiceFromApp'); - serviceCardCtrl.detach(); + serviceCardCtrl.detach({ + entity: { + service_bindings: [{ + entity: { + app_guid: APP_GUID + } + }] + } + }); expect(cfServiceInstanceService.unbindServiceFromApp) .toHaveBeenCalled(); var args = cfServiceInstanceService.unbindServiceFromApp.calls.argsFor(0); @@ -171,25 +111,6 @@ expect(args[2]).toBe('571b283b-97f9-41e3-abc7-81792ee34e40'); expect(args[3]).toBe('instance_123'); }); - - it('should not call unbindServiceFromApp if no services attached', function () { - spyOn(cfServiceInstanceService, 'unbindServiceFromApp'); - serviceCardCtrl.serviceBindings.length = 0; - serviceCardCtrl.detach(); - expect(cfServiceInstanceService.unbindServiceFromApp) - .not.toHaveBeenCalled(); - }); - }); - - describe('manageInstances', function () { - it('should emit cf.START_MANAGE_SERVICES event', function () { - spyOn(appEventService, '$emit'); - serviceCardCtrl.manageInstances(); - expect(appEventService.$emit).toHaveBeenCalled(); - - var args = appEventService.$emit.calls.mostRecent().args; - expect(args[0]).toBe('cf.events.START_MANAGE_SERVICES'); - }); }); }); }); @@ -204,7 +125,7 @@ }); describe('with defaults', function () { - var serviceCardCtrl, element; + var element; beforeEach(function () { var markup = '' + @@ -217,13 +138,6 @@ serviceCardCtrl = element.controller('serviceCard'); }); - - it('should display service actions', function () { - expect(element).toBeDefined(); - expect(serviceCardCtrl).toBeDefined(); - expect(serviceCardCtrl.hideServiceActions()).toBe(false); - }); - }); }); @@ -238,7 +152,7 @@ }); describe('with defaults', function () { - var serviceCardCtrl, element; + var element; beforeEach(function () { var markup = '' + @@ -251,13 +165,6 @@ serviceCardCtrl = element.controller('serviceCard'); }); - - it('should disable service actions', function () { - expect(element).toBeDefined(); - expect(serviceCardCtrl).toBeDefined(); - expect(serviceCardCtrl.hideServiceActions()).toBe(true); - }); - }); }); }); diff --git a/components/cloud-foundry/frontend/test/unit/view/applications/application/services/services.module.spec.js b/components/cloud-foundry/frontend/test/unit/view/applications/application/services/services.module.spec.js index 5d9d67105f..02e31a2335 100644 --- a/components/cloud-foundry/frontend/test/unit/view/applications/application/services/services.module.spec.js +++ b/components/cloud-foundry/frontend/test/unit/view/applications/application/services/services.module.spec.js @@ -37,35 +37,6 @@ expect(appServicesCtrl.services).toEqual([]); }); - it('should set services on app summary change', function () { - var spaceGuid = 'space_123'; - - var mockSpacesApi = mock.cloudFoundryAPI.Spaces; - var ListAllServicesForSpace = mockSpacesApi.ListAllServicesForSpaceWithSSO(spaceGuid); - $httpBackend.whenGET(ListAllServicesForSpace.url) - .respond(200, ListAllServicesForSpace.response['200'].body); - - appServicesCtrl.appModel.application.summary = { - space_guid: spaceGuid, - services: [ { - service_plan: { - service: { - guid: ListAllServicesForSpace.response['200'].body.resources[0].metadata.guid - } - } - }] - }; - - $scope.$apply(); - $httpBackend.flush(); - - expect(appServicesCtrl.services.length).toBeGreaterThan(0); - expect(appServicesCtrl.services.length).toEqual(3); - expect(appServicesCtrl.services[0].attached).toBeTruthy(); - expect(appServicesCtrl.services[1].attached).toBeFalsy(); - expect(appServicesCtrl.services[2].attached).toBeFalsy(); - }); - it('should keep services empty on app summary change with no space GUID', function () { appServicesCtrl.appModel.application.summary = { guid: 'app_123' diff --git a/components/cloud-foundry/frontend/test/unit/view/applications/list/list.module.spec.js b/components/cloud-foundry/frontend/test/unit/view/applications/list/list.module.spec.js index 2185e5a9a5..efe18f2326 100644 --- a/components/cloud-foundry/frontend/test/unit/view/applications/list/list.module.spec.js +++ b/components/cloud-foundry/frontend/test/unit/view/applications/list/list.module.spec.js @@ -439,7 +439,7 @@ appModel.filterParams.spaceGuid = 'junk3'; setUp(); - $httpBackend.flush(); + $scope.$digest(); check(allFilterValue, 3, allFilterValue, 1, allFilterValue, 1); }); @@ -465,6 +465,16 @@ check(cnsiGuid, 3, allFilterValue, 3, allFilterValue, 1); }); + it('avoids bad value - org only', function () { + var appModel = modelManager.retrieve('cloud-foundry.model.application'); + appModel.filterParams.orgGuid = 'junk2'; + + setUp(); + $scope.$digest(); + + check(allFilterValue, 3, allFilterValue, 1, allFilterValue, 1); + }); + it('avoids bad value - space', function () { var appModel = modelManager.retrieve('cloud-foundry.model.application'); appModel.filterParams.cnsiGuid = cnsiGuid; @@ -477,6 +487,16 @@ check(cnsiGuid, 3, orgGuid, 3, allFilterValue, 3); }); + it('avoids bad value - space only', function () { + var appModel = modelManager.retrieve('cloud-foundry.model.application'); + appModel.filterParams.spaceGuid = 'junk3'; + + setUp(); + $scope.$digest(); + + check(allFilterValue, 3, allFilterValue, 1, allFilterValue, 1); + }); + }); }); diff --git a/components/cloud-foundry/frontend/test/unit/view/applications/workflows/add-app-workflow/add-app-workflow.directive.spec.js b/components/cloud-foundry/frontend/test/unit/view/applications/workflows/add-app-workflow/add-app-workflow.directive.spec.js index cb20a4ae60..230f0ae274 100644 --- a/components/cloud-foundry/frontend/test/unit/view/applications/workflows/add-app-workflow/add-app-workflow.directive.spec.js +++ b/components/cloud-foundry/frontend/test/unit/view/applications/workflows/add-app-workflow/add-app-workflow.directive.spec.js @@ -131,8 +131,7 @@ }); it('should have right title and button labels', function () { - expect($translate.instant(step.btnText.next)).toBe('Add'); - expect($translate.instant(step.btnText.cancel)).toBe('Cancel'); + expect($translate.instant(step.nextBtnText)).toBe('Add'); expect(step.showBusyOnNext).toBe(true); }); diff --git a/components/cloud-foundry/frontend/test/unit/view/applications/workflows/add-service-workflow.directive.spec.js b/components/cloud-foundry/frontend/test/unit/view/applications/workflows/add-service-workflow.directive.spec.js index 60232feb52..f98009796a 100644 --- a/components/cloud-foundry/frontend/test/unit/view/applications/workflows/add-service-workflow.directive.spec.js +++ b/components/cloud-foundry/frontend/test/unit/view/applications/workflows/add-service-workflow.directive.spec.js @@ -2,11 +2,24 @@ 'use strict'; describe('add-service-workflow directive', function () { - var $httpBackend, $scope, appEventService, mockApp, mockService, addServiceWorkflowCtrl, appModel; + var $httpBackend, $scope, appEventService, mockApp, mockService, addServiceWorkflowCtrl, appModel, createServiceDialog; beforeEach(module('templates')); beforeEach(module('console-app')); + beforeEach(module(function ($provide) { + $provide.value('frameworkAsyncTaskDialog', function (config, context, submit) { + return { + result: { + config: config, + context: context, + options: context ? context.options : {}, + submit: submit + } + }; + }); + })); + beforeEach(inject(function ($injector) { var $compile = $injector.get('$compile'); $httpBackend = $injector.get('$httpBackend'); @@ -25,6 +38,10 @@ spyOn(addServiceWorkflowCtrl, 'reset').and.callThrough(); spyOn(addServiceWorkflowCtrl, 'startWorkflow').and.callThrough(); + //frameworkAsyncTaskDialog + + createServiceDialog = $injector.get('cfServiceCreateServiceInstanceWorkflow'); + mockService = { entity: { extra: '{"displayName":"Service","longDescription":"Service description"}' }, metadata: { guid: 'b2728c78-1057-4021-9c84-d2158f8f20df' } @@ -117,6 +134,17 @@ }); }); + describe('createServiceInstanceWorkflow', function () { + it('dialog creation', function () { + var dialog = createServiceDialog.show('guid', 'space', [], []); + expect(dialog).toBeDefined(); + expect(dialog.config).toBeDefined(); + expect(dialog.context).toBeDefined(); + expect(dialog.options).toBeDefined(); + expect(dialog.submit).toBeDefined(); + }); + }); + describe('addService', function () { beforeEach(function () { var config = { @@ -146,9 +174,12 @@ addServiceWorkflowCtrl.userInput.plan = { metadata: { guid: 'a5ac915f-b746-42c5-8506-6d318bf21107' } }; - addServiceWorkflowCtrl.addService().then(function () { - expect(addServiceWorkflowCtrl.options.servicePlan).not.toBe(null); - expect(addServiceWorkflowCtrl.options.serviceInstance).not.toBe(null); + + var dialog = createServiceDialog.show('guid', mockApp.space_guid, [], []); + dialog.options.userInput = addServiceWorkflowCtrl.userInput; + dialog.submit().then(function (newInstance) { + expect(newInstance.entity.name).toEqual(newInstanceSpec.name); + expect(newInstance.entity.service_plan_guid).toEqual(newInstanceSpec.service_plan_guid); }); $httpBackend.flush(); @@ -159,31 +190,41 @@ var mockInstancesApi = mock.cloudFoundryAPI.ServiceInstances; var CreateServiceInstance = mockInstancesApi.CreateServiceInstance({}); $httpBackend.whenPOST(CreateServiceInstance.url) - .respond(200, CreateServiceInstance.response['400'].body); + .respond(400, CreateServiceInstance.response['400'].body); + addServiceWorkflowCtrl.userInput.name = 'New Instance'; addServiceWorkflowCtrl.userInput.plan = { metadata: { guid: 'a5ac915f-b746-42c5-8506-6d318bf21107' } }; - addServiceWorkflowCtrl.addService().then(angular.noop, function () { - expect(addServiceWorkflowCtrl.options.serviceInstance).toBe(null); + + var dialog = createServiceDialog.show('guid', mockApp.space_guid, [], []); + dialog.options.userInput = addServiceWorkflowCtrl.userInput; + dialog.submit().then(function () { + fail('should not succeed'); }); $httpBackend.flush(); }); it('should set existing service instance', function () { - addServiceWorkflowCtrl.options.activeTab = 1; $httpBackend.flush(); + var mockInstancesApi = mock.cloudFoundryAPI.ServiceBindings; + var CreateServiceBinding = mockInstancesApi.CreateServiceBinding({}); + $httpBackend.whenPOST(CreateServiceBinding.url) + .respond(200, CreateServiceBinding.response['200'].body); + var firstInstance = addServiceWorkflowCtrl.options.instances[0]; addServiceWorkflowCtrl.userInput.existingServiceInstance = firstInstance; - addServiceWorkflowCtrl.addService().then(function () { + addServiceWorkflowCtrl.finishWorkflow().then(function () { expect(addServiceWorkflowCtrl.options.servicePlan).not.toBe(null); expect(addServiceWorkflowCtrl.options.serviceInstance).not.toBe(null); expect(addServiceWorkflowCtrl.options.serviceInstance).toEqual(firstInstance); }); + + $httpBackend.flush(); }); }); @@ -287,7 +328,6 @@ close: angular.noop }; - spyOn(addServiceWorkflowCtrl, 'addService').and.callThrough(); spyOn(addServiceWorkflowCtrl, 'addBinding').and.callThrough(); spyOn(addServiceWorkflowCtrl.modal, 'close').and.callThrough(); @@ -300,7 +340,6 @@ $httpBackend.flush(); - expect(addServiceWorkflowCtrl.addService).toHaveBeenCalled(); expect(addServiceWorkflowCtrl.addBinding).toHaveBeenCalled(); expect(addServiceWorkflowCtrl.modal.close).toHaveBeenCalled(); }); @@ -311,13 +350,11 @@ close: angular.noop }; - spyOn(addServiceWorkflowCtrl, 'addService').and.callThrough(); spyOn(addServiceWorkflowCtrl, 'addBinding').and.callThrough(); spyOn(addServiceWorkflowCtrl.modal, 'close').and.callThrough(); addServiceWorkflowCtrl.finishWorkflow(); - expect(addServiceWorkflowCtrl.addService).not.toHaveBeenCalled(); expect(addServiceWorkflowCtrl.addBinding).not.toHaveBeenCalled(); expect(addServiceWorkflowCtrl.modal.close).toHaveBeenCalled(); }); diff --git a/components/cloud-foundry/frontend/test/unit/view/dashboard/cluster/detail/cluster-detail.module.spec.js b/components/cloud-foundry/frontend/test/unit/view/dashboard/cluster/detail/cluster-detail.module.spec.js index dcc59bfdcb..b51cbd12b9 100644 --- a/components/cloud-foundry/frontend/test/unit/view/dashboard/cluster/detail/cluster-detail.module.spec.js +++ b/components/cloud-foundry/frontend/test/unit/view/dashboard/cluster/detail/cluster-detail.module.spec.js @@ -34,7 +34,7 @@ var ClusterController = $state.get('endpoint.clusters.cluster.detail').controller; $controller = new ClusterController($stateParams, $scope, $state, $q, modelManager, apiManager,appUtilsService, - appClusterCliCommands, modelUtils, cfOrganizationModel, cfUtilsService); + appClusterCliCommands, modelUtils, cfOrganizationModel, cfUtilsService); })); diff --git a/components/cloud-foundry/frontend/test/unit/view/dashboard/cluster/organization/space/space-services.module.spec.js b/components/cloud-foundry/frontend/test/unit/view/dashboard/cluster/organization/space/space-services.module.spec.js index 1bf16656fc..d98fb518b7 100644 --- a/components/cloud-foundry/frontend/test/unit/view/dashboard/cluster/organization/space/space-services.module.spec.js +++ b/components/cloud-foundry/frontend/test/unit/view/dashboard/cluster/organization/space/space-services.module.spec.js @@ -17,6 +17,7 @@ guid: 'serviceGuid' }, entity: { + name: 'serviceName' } }; var space = { diff --git a/components/cloud-foundry/frontend/test/unit/view/dashboard/tiles/cluster-tile.directive.spec.js b/components/cloud-foundry/frontend/test/unit/view/dashboard/tiles/cluster-tile.directive.spec.js index 9a0c3f09fd..f9722ff929 100644 --- a/components/cloud-foundry/frontend/test/unit/view/dashboard/tiles/cluster-tile.directive.spec.js +++ b/components/cloud-foundry/frontend/test/unit/view/dashboard/tiles/cluster-tile.directive.spec.js @@ -125,7 +125,7 @@ it('Call succeeds', function () { spyOn(cfAPIUsers, 'ListAllUsers').and.callFake(function (params, httpConfig) { - expect(httpConfig.headers['x-cnap-cnsi-list']).toEqual(initialService.guid); + expect(httpConfig.headers['x-cap-cnsi-list']).toEqual(initialService.guid); return $q.when({ data: { total_results: 2 }}); }); _.set(consoleInfo, 'info.endpoints.cf.' + initialService.guid + '.user.admin', true); @@ -142,7 +142,7 @@ it('Call succeeds - empty list', function () { spyOn(cfAPIUsers, 'ListAllUsers').and.callFake(function (params, httpConfig) { - expect(httpConfig.headers['x-cnap-cnsi-list']).toEqual(initialService.guid); + expect(httpConfig.headers['x-cap-cnsi-list']).toEqual(initialService.guid); return $q.when({ data: { total_results: 0 }}); }); _.set(consoleInfo, 'info.endpoints.cf.' + initialService.guid + '.user.admin', true); @@ -159,7 +159,7 @@ it('Call fails', function () { spyOn(cfAPIUsers, 'ListAllUsers').and.callFake(function (params, httpConfig) { - expect(httpConfig.headers['x-cnap-cnsi-list']).toEqual(initialService.guid); + expect(httpConfig.headers['x-cap-cnsi-list']).toEqual(initialService.guid); return $q.reject(); }); _.set(consoleInfo, 'info.endpoints.cf.' + initialService.guid + '.user.admin', true); @@ -226,7 +226,7 @@ it('Call succeeds', function () { spyOn(cfAPIOrg, 'ListAllOrganizations').and.callFake(function (params, httpConfig) { - expect(httpConfig.headers['x-cnap-cnsi-list']).toEqual(initialService.guid); + expect(httpConfig.headers['x-cap-cnsi-list']).toEqual(initialService.guid); return $q.when({ data: { total_results: 2 }}); }); createCtrl(); @@ -242,7 +242,7 @@ it('Call succeeds - empty list', function () { spyOn(cfAPIOrg, 'ListAllOrganizations').and.callFake(function (params, httpConfig) { - expect(httpConfig.headers['x-cnap-cnsi-list']).toEqual(initialService.guid); + expect(httpConfig.headers['x-cap-cnsi-list']).toEqual(initialService.guid); return $q.when({ data: { total_results: 0 }}); }); createCtrl(); @@ -258,7 +258,7 @@ it('Call fails', function () { spyOn(cfAPIOrg, 'ListAllOrganizations').and.callFake(function (params, httpConfig) { - expect(httpConfig.headers['x-cnap-cnsi-list']).toEqual(initialService.guid); + expect(httpConfig.headers['x-cap-cnsi-list']).toEqual(initialService.guid); return $q.reject(); }); createCtrl(); diff --git a/components/endpoints-dashboard/src/endpoints-dashboard.module.js b/components/endpoints-dashboard/src/endpoints-dashboard.module.js index 4d9aef4001..ef0cfbf11d 100644 --- a/components/endpoints-dashboard/src/endpoints-dashboard.module.js +++ b/components/endpoints-dashboard/src/endpoints-dashboard.module.js @@ -7,13 +7,13 @@ .run(register); function register($q, $state, modelManager, appEventService, appUtilsService, - endpointsDashboardDisabledKey, appLoggedInService) { + endpointsDashboardDisabledKey, appLoggedInService) { return new EndpointsDashboard($q, $state, modelManager, appEventService, appUtilsService, endpointsDashboardDisabledKey, appLoggedInService); } function EndpointsDashboard($q, $state, modelManager, appEventService, appUtilsService, endpointsDashboardDisabledKey, - appLoggedInService) { + appLoggedInService) { var initialized = $q.defer(); appLoggedInService.setDashboardRouteFunc(getDashboardRoute); diff --git a/components/endpoints-dashboard/src/plugin.config.js b/components/endpoints-dashboard/src/plugin.config.js index 8bd25406e5..d0bf5ccbfb 100644 --- a/components/endpoints-dashboard/src/plugin.config.js +++ b/components/endpoints-dashboard/src/plugin.config.js @@ -4,10 +4,10 @@ // register this plugin application to the platform if (env && env.registerApplication) { env.registerApplication( - 'endpointsDashboard', // plugin application identity - 'endpoints-dashboard', // plugin application's root angular module name + 'endpointsDashboard', // plugin application identity + 'endpoints-dashboard', // plugin application's root angular module name 'plugins/endpoints-dashboard', // plugin application's base path - 'endpoint.dashboard' // Main start state + 'endpoint.dashboard' // Main start state ); } diff --git a/components/endpoints-dashboard/src/view/register/register-service.service.js b/components/endpoints-dashboard/src/view/register/register-service.service.js index 125ff1637f..253480b73c 100644 --- a/components/endpoints-dashboard/src/view/register/register-service.service.js +++ b/components/endpoints-dashboard/src/view/register/register-service.service.js @@ -20,7 +20,7 @@ * @returns {object} Object containing 'show' function */ function ServiceRegistrationFactory($q, $translate, modelManager, appUtilsService, appNotificationsService, - frameworkDetailView, appEndpointsCnsiService) { + frameworkDetailView, appEndpointsCnsiService) { function createInstanceUrls(serviceInstances, filter) { var filteredInstances = _.filter(serviceInstances, {cnsi_type: filter}); diff --git a/components/endpoints-dashboard/src/view/view.html b/components/endpoints-dashboard/src/view/view.html index 85441b2291..d301916b55 100644 --- a/components/endpoints-dashboard/src/view/view.html +++ b/components/endpoints-dashboard/src/view/view.html @@ -53,14 +53,14 @@ endpoints-dashboard.table.name endpoints-dashboard.table.connection endpoints-dashboard.table.type - endpoints-dashboard.table.address + endpoints-dashboard.table.address @@ -90,6 +90,8 @@ {{ endpoint.type }} {{ endpoint.url }} + + **NOTE** If the name of the application has been changed from `console` in the manifest file please also change the name in the logs statement + ### Application Security Groups If you have problems when deploying Stratos UI as a CLoud Foundry application, check that the Application Security Group you have will allow the Stratos UI to communicate with the Cloud Foundry API. @@ -140,9 +152,9 @@ applications: ### Enable Endpoints Dashboard to register additional Cloud Foundry endpoints ->**NOTE** This method is meant to demonstrate the capabilities of the console with multiple endpoints and is not meant for production environments +>**NOTE** This feature, on it's own, is meant to demonstrate the capabilities of the console with multiple endpoints and is not meant for production environments. -This method comes with two caveats. +This method comes with two caveats. To remove these caveats see [here](#Associate-Cloud-Foundry-database-service). 1. The console will lose stored data when a cf app instance is restarted 2. Multiple instances of the app will contain multiple separate stored data instances. This will mean the user may connect to a different one with a different storage when revisiting the console. @@ -162,3 +174,6 @@ applications: env: FORCE_ENDPOINT_DASHBOARD: true ``` + +### Associate Cloud Foundry database service +Follow instructions [here](db-migration/README.md). \ No newline at end of file diff --git a/deploy/cloud-foundry/db-migration/README.md b/deploy/cloud-foundry/db-migration/README.md new file mode 100644 index 0000000000..941441352f --- /dev/null +++ b/deploy/cloud-foundry/db-migration/README.md @@ -0,0 +1,59 @@ +# Associate a Cloud Foundry database service + +As described in the standard `cf push` instructions [here]("../README.md") the console when deployed via `cf push` + does not contain any way to persist date over application restarts and db entries such as registered endpoints + and user tokens are lost. To resolve this a Cloud Foundry db service can be bound to the console. Run through + the steps below to implement. + +> **NOTE** The console supports postgresql. Your Cloud Foundry deployment should contain a service for + the desired db tagged with 'stratos_postgresql'. + +1. Create a Service Instance for the Console Database + + Use `cf create-service` to create a service instance for the Postges DB - for example: + ``` + cf create-service postgresql v9.4 console_db -t stratos_postgresql + ``` + * In this example, `postgresql` is the service name for the Postgres DB service, `v9.4` is the service plan and `console_db` is the name for the service instance that will be created. + * To view services and service plans: + ``` + cf marketplace + ``` + +1. Update the Console's Manifest + + * The the Console `manifest.yml` file and add the following: + ``` + env: + FORCE_ENDPOINT_DASHBOARD: true + services: + - console_db + ``` + + * This enables the endpoints dashboard UI and specifies that the Console should bind to the service instance named `console_db` + +1. Set up the database schema for the Console. Run the following from the root of the console: + ``` + cf push -c "deploy/cloud-foundry/db-migration/db-migrate.sh" -u "process" + ``` + > **NOTE** All subsequent pushes, restarts, restaging will use this migration command. + It's therefore very important to execute the next step in order for the console to start + + Wait for the database setup to complete, by viewing the application log and waiting for the message indicating setup is complete: + + * To stream the logs + ``` + cf logs console + ``` + + * Database setup complete log message + ``` + Database successfully migrated. Please restart the application via 'cf push -c "null"' + ``` + +1. Restart the app via cf push + ``` + cf push -c "null" + ``` + + \ No newline at end of file diff --git a/deploy/cloud-foundry/db-migration/db-migrate.sh b/deploy/cloud-foundry/db-migration/db-migrate.sh new file mode 100755 index 0000000000..782f26eb2e --- /dev/null +++ b/deploy/cloud-foundry/db-migration/db-migrate.sh @@ -0,0 +1,37 @@ +#!/bin/bash + +set -e + +echo "Attempting to migrate database" + +DB_MIGRATE_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" +DEPLOY_DIR=${DB_MIGRATE_DIR}/../../ + +export STRATOS_TEMP=$(mktemp -d) + +export GOPATH=${DB_MIGRATE_DIR}/goose +export GOBIN=$GOPATH/bin +go get bitbucket.org/liamstask/goose/cmd/goose + +export STRATOS_DB_ENV="$STRATOS_TEMP/db.env" +node ${DB_MIGRATE_DIR}/parse_db_environment.js $STRATOS_DB_ENV +source $STRATOS_DB_ENV + +cd $DEPLOY_DIR +case $DB_TYPE in +"postgresql") + echo "Migrating postgresql instance on $DB_HOST" + $GOBIN/goose -env cf_postgres up + if [ $? -eq 0 ]; then + while true; do + echo "Database successfully migrated. Please restart the application via 'cf push -c \"null\"'"; + sleep 60 + done + else + echo Database migration failed + fi + ;; +*) + echo Unknown DB type \'$DB_TYPE\'? + ;; +esac diff --git a/deploy/cloud-foundry/db-migration/parse_db_environment.js b/deploy/cloud-foundry/db-migration/parse_db_environment.js new file mode 100644 index 0000000000..c82b1a606a --- /dev/null +++ b/deploy/cloud-foundry/db-migration/parse_db_environment.js @@ -0,0 +1,71 @@ +(function () { + 'use strict'; + + var fs = require('fs'); + + var args = process.argv.slice(2); + var envFile = args[0]; + var vcapServices = JSON.parse(process.env.VCAP_SERVICES); + + var DB_TYPE, DB_HOST, DB_PORT, DB_USERNAME, DB_PASSWORD, DB_NAME, DATABASE_PROVIDER; + var output = ''; + + // Discover the db by finding the first service instance with a supported type + for (var serviceKey in vcapServices) { + if (!vcapServices.hasOwnProperty(serviceKey)) { + continue; + } + var serviceInstances = vcapServices[serviceKey]; + + for (var i = 0; i < serviceInstances.length; i++) { + var serviceInstance = serviceInstances[i]; + if (!serviceInstance.tags || serviceInstance.tags.length === 0) { + continue; + } + + for (var y = 0; y < serviceInstance.tags.length; y++) { + var tag = serviceInstance.tags[y]; + if (tag === 'stratos_postgresql') { + var instance = vcapServices.postgresql[0]; + + DATABASE_PROVIDER = 'pgsql'; + DB_TYPE = 'postgresql'; + DB_HOST = instance.credentials.hostname; + DB_PORT = instance.credentials.port; + DB_USERNAME = instance.credentials.username; + DB_PASSWORD = instance.credentials.password; + DB_NAME = instance.credentials.dbname; + } + } + if (DB_TYPE) { + break; + } + } + if (DB_TYPE) { + break; + } + } + + if (DB_TYPE) { + output += exportString('DATABASE_PROVIDER', DATABASE_PROVIDER); + output += exportString('DB_TYPE', DB_TYPE); + output += exportString('DB_HOST', DB_HOST); + output += exportString('DB_PORT', DB_PORT); + output += exportString('DB_USERNAME', DB_USERNAME); + output += exportString('DB_PASSWORD', DB_PASSWORD); + output += exportString('DB_NAME', DB_NAME); + } else { + console.error('No database configuration found in VCAP_SERVICES: ', JSON.stringify(vcapServices)); + } + + fs.writeFile(envFile, output, function (err) { + if (err) { + return console.log(err); + } + }); + + function exportString(name, value) { + return '\nexport ' + name + '="' + value + '"'; + } + +})(); diff --git a/deploy/common.yml b/deploy/common.yml index bc9bdcacf6..c03e4038db 100644 --- a/deploy/common.yml +++ b/deploy/common.yml @@ -32,12 +32,22 @@ services: ports: - "5432:5432" + mariadb: + extends: imageCommon + image: mariadb:latest + env_file: + ./mariadb.env + ports: + - "3306:3306" + goose: extends: buildCommon build: context: ../deploy dockerfile: db/Dockerfile.goose.dev + environment: + - DATABASE_PROVIDER=mysql proxy: @@ -49,10 +59,6 @@ services: - "3003:3003" env_file: ./proxy.env - volumes: - - ./hsc-upgrade-volume:/hsc-upgrade-volume - - nginx: extends: buildCommon build: @@ -82,4 +88,4 @@ services: # NOTE: This is required so that the tests run against # a UAA instance that has all the correct roles image: splatform/stratos-uaa - + \ No newline at end of file diff --git a/deploy/containers/nginx/Dockerfile.k8s b/deploy/containers/nginx/Dockerfile.k8s index 83d87cfc0a..b771dfbc00 100644 --- a/deploy/containers/nginx/Dockerfile.k8s +++ b/deploy/containers/nginx/Dockerfile.k8s @@ -4,5 +4,6 @@ RUN mkdir -p /usr/share/doc/suse COPY ./LICENSE.txt /usr/share/doc/suse/LICENSE.txt COPY ./conf/nginx.k8s.conf /etc/nginx/nginx.conf COPY ./dist/ /usr/share/nginx/html +COPY ./run-nginx.sh/ /run-nginx.sh EXPOSE 80 443 -CMD [ "nginx", "-g", "daemon off;" ] +CMD [ "/run-nginx.sh" ] diff --git a/deploy/containers/nginx/conf/nginx.k8s.conf b/deploy/containers/nginx/conf/nginx.k8s.conf index dae83d2349..2d5d8caad8 100644 --- a/deploy/containers/nginx/conf/nginx.k8s.conf +++ b/deploy/containers/nginx/conf/nginx.k8s.conf @@ -47,8 +47,8 @@ http { server { listen 443 ssl; - ssl_certificate /etc/secrets/console-cert; - ssl_certificate_key /etc/secrets/console-cert-key; + ssl_certificate /ENCRYPTION_KEY_VOLUME/console.crt; + ssl_certificate_key /ENCRYPTION_KEY_VOLUME/console.key; ssl_protocols TLSv1 TLSv1.1 TLSv1.2; ssl_ciphers HIGH:!aNULL:!MD5; diff --git a/deploy/containers/nginx/run-nginx.sh b/deploy/containers/nginx/run-nginx.sh new file mode 100755 index 0000000000..2fc3c9ca4f --- /dev/null +++ b/deploy/containers/nginx/run-nginx.sh @@ -0,0 +1,12 @@ +#!/bin/bash +sed -i -e 's@ENCRYPTION_KEY_VOLUME@'"${ENCRYPTION_KEY_VOLUME}"'@g' /etc/nginx/nginx.conf +echo "Checking if certificate has been written to the encryption volume!" +while : +do + if [ -f /${ENCRYPTION_KEY_VOLUME}/console.crt ]; then + break; + fi + sleep 1; +done +echo "TLS certificate detected continuing, starting nginx." +nginx -g "daemon off;" \ No newline at end of file diff --git a/deploy/db/Dockerfile.goose.dev b/deploy/db/Dockerfile.goose.dev index f2fa0c613a..ff72335aa8 100644 --- a/deploy/db/Dockerfile.goose.dev +++ b/deploy/db/Dockerfile.goose.dev @@ -9,4 +9,4 @@ COPY db/scripts/wait-for-it.sh . RUN chmod +x wait-for-it.sh RUN chmod +x development.sh -CMD bash /src/wait-for-it.sh -t 90 postgres:5432 && bash /src/development.sh +CMD bash /src/wait-for-it.sh -t 90 mariadb:3306 && bash /src/development.sh diff --git a/deploy/db/Dockerfile.k8s.postflight-job b/deploy/db/Dockerfile.k8s.postflight-job index d2caffe43d..ab5cc9edf6 100644 --- a/deploy/db/Dockerfile.k8s.postflight-job +++ b/deploy/db/Dockerfile.k8s.postflight-job @@ -1,11 +1,11 @@ -FROM alpine +FROM golang:1.8-alpine RUN apk update && \ - apk add postgresql-client - + apk add postgresql-client mariadb-client git gcc musl-dev +RUN go get bitbucket.org/liamstask/goose/lib/goose +RUN go get github.com/go-sql-driver/mysql COPY goose /usr/local/bin/ COPY deploy/db/dbconf.yml db/dbconf.yml COPY deploy/db/migrations db/migrations COPY deploy/db/scripts/run-postflight-job.k8s.sh /run-postflight-job.sh - CMD ["/run-postflight-job.sh"] diff --git a/deploy/db/Dockerfile.preflight-job b/deploy/db/Dockerfile.preflight-job index 4baf37e077..377c0bd054 100644 --- a/deploy/db/Dockerfile.preflight-job +++ b/deploy/db/Dockerfile.preflight-job @@ -1,4 +1,5 @@ FROM debian:jessie RUN export DEBIAN_FRONTEND=noninteractive && apt-get update && apt-get install -y openssl COPY /deploy/db/scripts/run-preflight-job.sh /run-preflight-job.sh +COPY /deploy/tools/generate_cert.sh /generate_cert.sh CMD ["/run-preflight-job.sh"] diff --git a/deploy/db/dbconf.yml b/deploy/db/dbconf.yml index b7ba9eea1e..58c37b37e9 100644 --- a/deploy/db/dbconf.yml +++ b/deploy/db/dbconf.yml @@ -3,4 +3,13 @@ development: open: host='postgres' port=5432 user='stratos' password='strat0s' dbname='stratos-db' sslmode='disable' k8s: driver: postgres - open: host='$PGSQL_HOST' port=$PGSQL_PORT user='$PGSQL_USER' password='$PGSQL_PASSWORD' dbname='$PGSQL_DATABASE' sslmode='$PGSQL_SSL_MODE' + open: host='$DB_HOST' port=$DB_PORT user='$DB_USER' password='$DB_PASSWORD' dbname='$DB_DATABASE_NAME' sslmode='$DB_SSL_MODE' +cf_postgres: + driver: postgres + open: host='$DB_HOST' port=$DB_PORT user='$DB_USERNAME' password='$DB_PASSWORD' dbname='$DB_NAME' sslmode='disable' +mariadb-development: + driver: mysql + open: stratos:strat0s@tcp(mariadb:3306)/stratos-db?parseTime=true +mariadb-k8s: + driver: mysql + open: $DB_USER:$DB_PASSWORD@tcp($DB_HOST:$DB_PORT)/$DB_DATABASE_NAME?parseTime=true diff --git a/deploy/db/migrations/20160511195737_InitialSchema.sql b/deploy/db/migrations/20160511195737_InitialSchema.sql deleted file mode 100644 index 254ac225f9..0000000000 --- a/deploy/db/migrations/20160511195737_InitialSchema.sql +++ /dev/null @@ -1,64 +0,0 @@ --- +goose Down --- SQL section 'Down' is executed when this migration is rolled back - -DROP INDEX IF EXISTS tokens_token_type; -DROP INDEX IF EXISTS tokens_cnsi_guid; -DROP INDEX IF EXISTS tokens_user_guid; -DROP TABLE IF EXISTS tokens; - -DROP INDEX IF EXISTS cnsis_cnsi_type; -DROP INDEX IF EXISTS cnsis_name; -DROP TABLE IF EXISTS cnsis; - -DROP INDEX IF EXISTS vcstokens_user; -DROP INDEX IF EXISTS vcstokens_endpoint; -DROP TABLE IF EXISTS vcstokens; - - --- +goose Up --- SQL in section 'Up' is executed when this migration is applied - --- For storage of UAA and CNSI tokens -CREATE TABLE IF NOT EXISTS tokens ( - user_guid VARCHAR(36) NOT NULL, - cnsi_guid VARCHAR(36), - token_type VARCHAR(4) NOT NULL, - auth_token BYTEA NOT NULL, - refresh_token BYTEA NOT NULL, - token_expiry BIGINT NOT NULL, - last_updated TIMESTAMP WITH TIME ZONE NOT NULL DEFAULT (NOW() AT TIME ZONE 'utc') -) -WITH (OIDS=FALSE); - -CREATE INDEX tokens_user_guid ON tokens (user_guid); -CREATE INDEX tokens_cnsi_guid ON tokens (cnsi_guid); -CREATE INDEX tokens_token_type ON tokens (token_type); - --- For storage of CNSI records -CREATE TABLE IF NOT EXISTS cnsis ( - guid VARCHAR(36) NOT NULL UNIQUE, - name VARCHAR(255) NOT NULL, - cnsi_type VARCHAR(3) NOT NULL, - api_endpoint VARCHAR(255) NOT NULL, - auth_endpoint VARCHAR(255) NOT NULL, - token_endpoint VARCHAR(255) NOT NULL, - doppler_logging_endpoint VARCHAR(255) NOT NULL, - skip_ssl_validation BOOLEAN NOT NULL DEFAULT FALSE, - last_updated TIMESTAMP WITH TIME ZONE NOT NULL DEFAULT (NOW() AT TIME ZONE 'utc'), - PRIMARY KEY (guid) -); - -CREATE INDEX cnsis_name ON cnsis (name); -CREATE INDEX cnsis_cnsi_type ON cnsis (cnsi_type); - - --- For storage of VCS Tokens -CREATE TABLE IF NOT EXISTS vcstokens ( - user_guid VARCHAR(36) NOT NULL, - endpoint VARCHAR(255) NOT NULL, - access_token BYTEA NOT NULL, - PRIMARY KEY (user_guid, endpoint) -); - -CREATE INDEX vcstokens_user ON vcstokens (user_guid); -CREATE INDEX vcstokens_endpoint ON vcstokens (endpoint); diff --git a/deploy/db/migrations/20161117141922_MigrateToPat.sql b/deploy/db/migrations/20161117141922_MigrateToPat.sql deleted file mode 100644 index cf135a1093..0000000000 --- a/deploy/db/migrations/20161117141922_MigrateToPat.sql +++ /dev/null @@ -1,66 +0,0 @@ --- +goose Down --- SQL section 'Down' is executed when this migration is rolled back - -DROP INDEX IF EXISTS vcs_tokens_guid; -DROP INDEX IF EXISTS vcs_tokens_name; -DROP INDEX IF EXISTS vcs_tokens_user; -DROP INDEX IF EXISTS vcs_tokens_endpoint; -DROP TABLE IF EXISTS vcs_tokens; - -DROP INDEX IF EXISTS vcs_browse; -DROP INDEX IF EXISTS vcs_api; -DROP INDEX IF EXISTS vcs_type; -DROP TABLE IF EXISTS vcs; - --- Restore deprecated VCS tokens table -CREATE TABLE IF NOT EXISTS vcstokens ( - user_guid VARCHAR(36) NOT NULL, - endpoint VARCHAR(255) NOT NULL, - access_token BYTEA NOT NULL, - created_at TIMESTAMP WITH TIME ZONE NOT NULL DEFAULT (NOW() AT TIME ZONE 'utc'), - PRIMARY KEY (user_guid, endpoint) -); - -CREATE INDEX vcstokens_user ON vcstokens (user_guid); -CREATE INDEX vcstokens_endpoint ON vcstokens (endpoint); - --- +goose Up --- SQL in section 'Up' is executed when this migration is applied - --- Clean up deprecated VCS tokens table -DROP INDEX IF EXISTS vcstokens_user; -DROP INDEX IF EXISTS vcstokens_endpoint; -DROP TABLE IF EXISTS vcstokens; - --- For storage of VCS endpoints -CREATE TABLE IF NOT EXISTS vcs ( - guid VARCHAR(36) PRIMARY KEY, - label VARCHAR(255) NOT NULL, - type VARCHAR(36) NOT NULL, - browse_url VARCHAR(255) NOT NULL, - api_url VARCHAR(255) NOT NULL, - skip_ssl_validation BOOLEAN NOT NULL DEFAULT FALSE, - last_updated TIMESTAMP WITH TIME ZONE NOT NULL DEFAULT (NOW() AT TIME ZONE 'utc') -); - --- To be honest indexes are overkill here but let's have them for consistency -CREATE INDEX vcs_browse ON vcs (browse_url); -CREATE INDEX vcs_api ON vcs (api_url); -CREATE INDEX vcs_type ON vcs (type); - --- For storage of VCS Personal Access Tokens -CREATE TABLE IF NOT EXISTS vcs_tokens ( - guid VARCHAR(36) PRIMARY KEY, - user_guid VARCHAR(36) NOT NULL, - vcs_guid VARCHAR(36) NOT NULL REFERENCES vcs ON DELETE CASCADE, - name VARCHAR(255) NOT NULL, - token BYTEA NOT NULL, - created_at TIMESTAMP WITH TIME ZONE NOT NULL DEFAULT (NOW() AT TIME ZONE 'utc'), - UNIQUE (user_guid, vcs_guid, name) -); - --- To be honest indexes are overkill here but let's have them for consistency -CREATE INDEX vcs_tokens_guid ON vcs_tokens (guid); -CREATE INDEX vcs_tokens_name ON vcs_tokens (name); -CREATE INDEX vcs_tokens_user ON vcs_tokens (user_guid); -CREATE INDEX vcs_tokens_endpoint ON vcs_tokens (vcs_guid); diff --git a/deploy/db/migrations/20170703104100_SetupSchema.sql b/deploy/db/migrations/20170703104100_SetupSchema.sql deleted file mode 100644 index ded58fc507..0000000000 --- a/deploy/db/migrations/20170703104100_SetupSchema.sql +++ /dev/null @@ -1,17 +0,0 @@ --- +goose Up --- SQL in section 'Up' is executed when this migration is applied - --- For storage of setup data -CREATE TABLE IF NOT EXISTS console_config ( - uaa_endpoint VARCHAR(255) NOT NULL, - console_admin_scope VARCHAR(255) NOT NULL, - console_client VARCHAR(255) NOT NULL, - console_client_secret VARCHAR(255) NOT NULL, - skip_ssl_validation BOOLEAN NOT NULL DEFAULT FALSE, - is_setup_complete BOOLEAN NOT NULL DEFAULT FALSE, - last_updated TIMESTAMP WITH TIME ZONE NOT NULL DEFAULT (NOW() AT TIME ZONE 'utc') -); - --- This prevents another row being inserted -CREATE UNIQUE INDEX console_config_one_row - ON console_config((uaa_endpoint IS NOT NULL)); \ No newline at end of file diff --git a/deploy/db/migrations/20170818120003_InitialSchema.go b/deploy/db/migrations/20170818120003_InitialSchema.go new file mode 100644 index 0000000000..f341431712 --- /dev/null +++ b/deploy/db/migrations/20170818120003_InitialSchema.go @@ -0,0 +1,122 @@ +package main + +import ( + "database/sql" + "fmt" + "os" +) + +// Up is executed when this migration is applied +func Up_20170818120003(txn *sql.Tx) { + + databaseProvider := os.Getenv("DATABASE_PROVIDER") + fmt.Printf("ENV is: %s, %s", databaseProvider, os.Getenv("MYSQL_ROOT_PASSWORD")) + binaryDataType := "BYTEA" + if databaseProvider == "mysql" { + binaryDataType = "BLOB" + } + createTokens := "CREATE TABLE IF NOT EXISTS tokens (" + createTokens += "user_guid VARCHAR(36) NOT NULL, " + createTokens += "cnsi_guid VARCHAR(36), " + createTokens += "token_type VARCHAR(4) NOT NULL, " + createTokens += "auth_token " + binaryDataType + " NOT NULL, " + createTokens += "refresh_token " + binaryDataType + " NOT NULL, " + createTokens += "token_expiry BIGINT NOT NULL, " + createTokens += "last_updated TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP)" + + if databaseProvider == "pgsql" { + createTokens += " WITH (OIDS=FALSE);" + } else { + createTokens += ";" + } + + _, err := txn.Exec(createTokens) + if err != nil { + fmt.Printf("Failed to migrate due to: %v", err) + } + + createCnsisTable := "CREATE TABLE IF NOT EXISTS cnsis (" + createCnsisTable += "guid VARCHAR(36) NOT NULL UNIQUE," + createCnsisTable += "name VARCHAR(255) NOT NULL," + createCnsisTable += "cnsi_type VARCHAR(3) NOT NULL," + createCnsisTable += "api_endpoint VARCHAR(255) NOT NULL," + createCnsisTable += "auth_endpoint VARCHAR(255) NOT NULL," + createCnsisTable += "token_endpoint VARCHAR(255) NOT NULL," + createCnsisTable += "doppler_logging_endpoint VARCHAR(255) NOT NULL," + createCnsisTable += "skip_ssl_validation BOOLEAN NOT NULL DEFAULT FALSE," + createCnsisTable += "last_updated TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP," + createCnsisTable += "PRIMARY KEY (guid) );" + + _, err = txn.Exec(createCnsisTable) + if err != nil { + fmt.Printf("Failed to migrate due to: %v", err) + } + + createIndex := "CREATE INDEX tokens_user_guid ON tokens (user_guid);" + _, err = txn.Exec(createIndex) + if err != nil { + fmt.Printf("Failed to migrate due to: %v", err) + } + createIndex = "CREATE INDEX tokens_cnsi_guid ON tokens (cnsi_guid);" + _, err = txn.Exec(createIndex) + if err != nil { + fmt.Printf("Failed to migrate due to: %v", err) + } + createIndex = "CREATE INDEX tokens_token_type ON tokens (token_type);" + _, err = txn.Exec(createIndex) + if err != nil { + fmt.Printf("Failed to migrate due to: %v", err) + } + createIndex = "CREATE INDEX cnsis_name ON cnsis (name);" + _, err = txn.Exec(createIndex) + if err != nil { + fmt.Printf("Failed to migrate due to: %v", err) + } + createIndex = "CREATE INDEX cnsis_cnsi_type ON cnsis (cnsi_type);" + _, err = txn.Exec(createIndex) + if err != nil { + fmt.Printf("Failed to migrate due to: %v", err) + } + +} + +// Down is executed when this migration is rolled back +func Down_20170818120003(txn *sql.Tx) { + + dropTables := "DROP INDEX IF EXISTS tokens_token_type;" + _, err := txn.Exec(dropTables) + if err != nil { + fmt.Printf("Failed to migrate due to: %v", err) + } + dropTables = "DROP INDEX IF EXISTS tokens_cnsi_guid;" + _, err = txn.Exec(dropTables) + if err != nil { + fmt.Printf("Failed to migrate due to: %v", err) + } + dropTables = "DROP INDEX IF EXISTS tokens_user_guid;" + _, err = txn.Exec(dropTables) + if err != nil { + fmt.Printf("Failed to migrate due to: %v", err) + } + dropTables = "DROP TABLE IF EXISTS tokens;" + _, err = txn.Exec(dropTables) + if err != nil { + fmt.Printf("Failed to migrate due to: %v", err) + } + dropTables = "DROP INDEX IF EXISTS cnsis_cnsi_type;" + _, err = txn.Exec(dropTables) + if err != nil { + fmt.Printf("Failed to migrate due to: %v", err) + } + dropTables = "DROP INDEX IF EXISTS cnsis_name;" + _, err = txn.Exec(dropTables) + if err != nil { + fmt.Printf("Failed to migrate due to: %v", err) + } + dropTables = "DROP TABLE IF EXISTS cnsis;" + _, err = txn.Exec(dropTables) + if err != nil { + fmt.Printf("Failed to migrate due to: %v", err) + } + +} diff --git a/deploy/db/migrations/20170818162837_SetupSchema.go b/deploy/db/migrations/20170818162837_SetupSchema.go new file mode 100644 index 0000000000..8bffe30b19 --- /dev/null +++ b/deploy/db/migrations/20170818162837_SetupSchema.go @@ -0,0 +1,54 @@ +package main + +import ( + "database/sql" + "fmt" + "os" +) + +// Up is executed when this migration is applied +func Up_20170818162837(txn *sql.Tx) { + databaseProvider := os.Getenv("DATABASE_PROVIDER") + fmt.Printf("ENV is: %s", databaseProvider) + + consoleConfigTable := "CREATE TABLE IF NOT EXISTS console_config (" + consoleConfigTable += " uaa_endpoint VARCHAR(255) NOT NULL, " + consoleConfigTable += " console_admin_scope VARCHAR(255) NOT NULL," + consoleConfigTable += " console_client VARCHAR(255) NOT NULL," + consoleConfigTable += " console_client_secret VARCHAR(255) NOT NULL, " + consoleConfigTable += " skip_ssl_validation BOOLEAN NOT NULL DEFAULT FALSE," + consoleConfigTable += " is_setup_complete BOOLEAN NOT NULL DEFAULT FALSE," + consoleConfigTable += " last_updated TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP);" + + _, err := txn.Exec(consoleConfigTable) + if err != nil { + fmt.Printf("Failed to migrate due to: %v", err) + } + + // TODO find a way to ensure this in Mysql + if databaseProvider == "pgsql" { + createIndex := "CREATE UNIQUE INDEX console_config_one_row" + createIndex += " ON console_config((uaa_endpoint IS NOT NULL));" + _, err = txn.Exec(createIndex) + if err != nil { + fmt.Printf("Failed to migrate due to: %v", err) + } + + } + +} + +// Down is executed when this migration is rolled back +func Down_20170818162837(txn *sql.Tx) { + dropTables := "DROP TABLE IF EXISTS console_config;" + _, err := txn.Exec(dropTables) + if err != nil { + fmt.Printf("Failed ot migrate due to: %v", err) + } + dropTables = "DROP INDEX IF EXISTS console_config_one_row;" + _, err = txn.Exec(dropTables) + if err != nil { + fmt.Printf("Failed ot migrate due to: %v", err) + } + +} diff --git a/deploy/db/scripts/development.sh b/deploy/db/scripts/development.sh index 5c6c1ba77b..8e6bd21313 100755 --- a/deploy/db/scripts/development.sh +++ b/deploy/db/scripts/development.sh @@ -3,32 +3,32 @@ set -e # Check the version echo "Checking database version." -$GOPATH/bin/goose --env=development dbversion +$GOPATH/bin/goose --env=mariadb-development dbversion EXITVAL=$? while [ $EXITVAL -ne 0 ] do echo "Failed to execute dbversion check, retrying after one second" sleep 1 - $GOPATH/bin/goose --env=development dbversion + $GOPATH/bin/goose --env=mariadb-development dbversion EXITVAL=$? done # Check the status echo "Checking database status." -$GOPATH/bin/goose --env=development status +$GOPATH/bin/goose --env=mariadb-development status # Run migrations echo "Attempting database migrations." -$GOPATH/bin/goose --env=development up +$GOPATH/bin/goose --env=mariadb-development up # CHeck the status echo "Checking database status." -$GOPATH/bin/goose --env=development status +$GOPATH/bin/goose --env=mariadb-development status # Check the version echo "Checking database version." -$GOPATH/bin/goose --env=development dbversion +$GOPATH/bin/goose --env=mariadb-development dbversion echo "Database operation(s) complete." diff --git a/deploy/db/scripts/run-postflight-job.k8s.sh b/deploy/db/scripts/run-postflight-job.k8s.sh index aeca493027..1f59e7e17d 100755 --- a/deploy/db/scripts/run-postflight-job.k8s.sh +++ b/deploy/db/scripts/run-postflight-job.k8s.sh @@ -1,66 +1,79 @@ #!/bin/sh set -e -execStatement() { +function execStatement { stmt=$1 - PGPASSFILE=/tmp/pgpass psql -U $POSTGRES_USER -h $PGSQL_HOST -p $PGSQL_PORT -d postgres -w -tc "$stmt" -} -execBackupRestore() { - orig_server="hsc-stproxy-int" - dest_server=$PGSQL_HOST - bkup="pg_dump -U $PGSQL_USER -h $orig_server -p $PGSQL_PORT -w $PGSQL_DATABASE" - stor="psql -U $PGSQL_USER -h $dest_server -p $PGSQL_PORT -w $PGSQL_DATABASE" + if [ "$DATABASE_PROVIDER" = "mysql" ]; then + echo "Executing: mysql -u $DB_ADMIN_USER -h $DB_HOST -P $DB_PORT -p$DB_ADMIN_PASSWORD -e $stmt" + mysql -u $DB_ADMIN_USER -h $DB_HOST -P $DB_PORT -p$DB_ADMIN_PASSWORD -e $stmt + fi - PGPASSFILE=/tmp/pgpass $bkup | PGPASSFILE=/tmp/pgpass $stor + if [ "$DATABASE_PROVIDER" = "pgsql" ]; then + echo "Executing: PGPASSFILE=/tmp/pgpass psql -U $DB_USER -h $DB_HOST -p $DB_PORT -d postgres -w -tc \"$stmt\"" + PGPASSFILE=/tmp/pgpass psql -U $DB_USER -h $DB_HOST -p $DB_PORT -d postgres -w -tc "$stmt" + fi } -# Save the superuser info to file to ensure secure access -echo "*:$PGSQL_PORT:postgres:$POSTGRES_USER:$(cat $POSTGRES_PASSWORD_FILE)" > /tmp/pgpass -echo "*:$PGSQL_PORT:$PGSQL_DATABASE:$PGSQL_USER:$(cat $PGSQL_PASSWORDFILE)" >> /tmp/pgpass -chmod 0600 /tmp/pgpass +if [ "$DATABASE_PROVIDER" = "pgsql" ]; then + # Save the superuser info to file to ensure secure access + echo "*:$DB_PORT:postgres:$DB_USER:$(cat $DB_PASSWORD_FILE)" > /tmp/pgpass + echo "*:$DB_PORT:$DB_DATABASE_NAME:$DB_USER:$(cat $DB_PASSWORDFILE)" >> /tmp/pgpass + chmod 0600 /tmp/pgpass + stratosDbExists=$(execStatement "SELECT 1 FROM pg_database WHERE datname = '$DB_DATABASE_NAME';") + # Get db user password from secrets file + DB_PASSWORD=$(cat $DB_PASSWORDFILE) + DBCONF_KEY=k8s +fi -# Get db user password from secrets file -PWD=$(cat $PGSQL_PASSWORDFILE) +if [ "$DATABASE_PROVIDER" = "mysql" ]; then + echo "DB Provider is MYSQL" + stratosDbExists=$(execStatement "SELECT SCHEMA_NAME FROM INFORMATION_SCHEMA.SCHEMATA WHERE SCHEMA_NAME = '$DB_DATABASE_NAME';") + DBCONF_KEY=mariadb-k8s +fi -# Create the database if necessary -stratosDbExists=$(execStatement "SELECT 1 FROM pg_database WHERE datname = '$PGSQL_DATABASE';") +# Create DB if neccessary if [ -z "$stratosDbExists" ] ; then - echo "Creating database $PGSQL_DATABASE" - execStatement "CREATE DATABASE \"$PGSQL_DATABASE\";" - echo "Creating user $PGSQL_USER" - execStatement "CREATE USER $PGSQL_USER WITH ENCRYPTED PASSWORD '$PWD';" - echo "Granting privs for $PGSQL_DATABASE to $PGSQL_USER" - execStatement "GRANT ALL PRIVILEGES ON DATABASE \"$PGSQL_DATABASE\" TO $PGSQL_USER;" + echo "Creating database $DB_DATABASE_NAME" + execStatement "CREATE DATABASE \"$DB_DATABASE_NAME\";" + echo "Creating user $DB_USER" + if [ "$DATABASE_PROVIDER" = "pgsql" ]; then + execStatement "CREATE USER $DB_USER WITH ENCRYPTED PASSWORD '$DB_PASSWORD';" + fi + if [ "$DATABASE_PROVIDER" = "mysql" ]; then + execStatement "CREATE USER $DB_USER IDENTIFIED BY '$DB_PASSWORD';" + fi + + echo "Granting privs for $DB_DATABASE_NAME to $DB_USER" + execStatement "GRANT ALL PRIVILEGES ON DATABASE \"$DB_DATABASE_NAME\" TO $DB_USER;" else - echo "$PGSQL_DATABASE already exists" + echo "$DB_DATABASE_NAME already exists" fi -# Backup existing database from stolon cluster and restore it to the single instance -#execBackupRestore - # Migrate the database if necessary echo "Checking database to see if migration is necessary." +echo "DBCONFIG: $DBCONF_KEY" +echo "Connection string: $DB_USER:$DB_PASSWORD@tcp($DB_HOST:$DB_PORT)/$DB_DATABASE_NAME?parseTime=true" # Check the version echo "Checking database version." -PGSQL_PASSWORD=$PWD goose --env=k8s dbversion +goose --env=$DBCONF_KEY dbversion # Check the status echo "Checking database status." -PGSQL_PASSWORD=$PWD goose --env=k8s status +goose --env=$DBCONF_KEY status # Run migrations echo "Attempting database migrations." -PGSQL_PASSWORD=$PWD goose --env=k8s up +goose --env=$DBCONF_KEY up # CHeck the status echo "Checking database status." -PGSQL_PASSWORD=$PWD goose --env=k8s status +goose --env=$DBCONF_KEY status # Check the version echo "Checking database version." -PGSQL_PASSWORD=$PWD goose --env=k8s dbversion +goose --env=$DBCONF_KEY dbversion echo "Database operation(s) complete." diff --git a/deploy/db/scripts/run-preflight-job.sh b/deploy/db/scripts/run-preflight-job.sh index f90c8d8662..12b42ec77c 100755 --- a/deploy/db/scripts/run-preflight-job.sh +++ b/deploy/db/scripts/run-preflight-job.sh @@ -19,4 +19,18 @@ if [ ! -e /$ENCRYPTION_KEY_VOLUME/$ENCRYPTION_KEY_FILENAME ]; then echo "-- Done." fi +# Step 3 - Write out or generate SSL certificate data +if [ "${CONSOLE_CERT:-not-set}" = "not-set" -a "${CONSOLE_CERT_KEY:-not-set}" = "not-set" ]; then + echo "CONSOLE_CERT and CONSOLE_CERT_KEY not set, generating..." + export CERTS_PATH=/$ENCRYPTION_KEY_VOLUME + export DEV_CERTS_DOMAIN=console + /generate_cert.sh + echo "Certificates generated." +else + echo "CONSOLE_CERT and CONSOLE_CERT_KEY have been provided, writing them to the Encryption volume" + echo "$CONSOLE_CERT" > /$ENCRYPTION_KEY_VOLUME/console.crt + echo "$CONSOLE_CERT_KEY" > /$ENCRYPTION_KEY_VOLUME/console.key + echo "Wrote out certificates." +fi + exit 0 diff --git a/deploy/db/sqlite_schema.sql b/deploy/db/sqlite_schema.sql index 95c5db5bb8..a389127269 100644 --- a/deploy/db/sqlite_schema.sql +++ b/deploy/db/sqlite_schema.sql @@ -56,11 +56,11 @@ CREATE TABLE IF NOT EXISTS vcs_tokens ( -- Database version CREATE TABLE IF NOT EXISTS goose_db_version ( version_id INT NOT NULL, - is_applied VARCHAR(1) NOT NULL DEFAULT "t", + is_applied VARCHAR(1) NOT NULL DEFAULT "1", id VARCHAR(255) NOT NULL ); -INSERT INTO goose_db_version (version_id, is_applied, id) VALUES(1, "t", "SQLite 1.0"); +INSERT INTO goose_db_version (version_id, is_applied, id) VALUES(1, "1", "SQLite 1.0"); -- console_config CREATE TABLE IF NOT EXISTS console_config ( diff --git a/deploy/docker-compose.no-ui.development.yml b/deploy/docker-compose.no-ui.development.yml index eddb230212..8fe9101461 100644 --- a/deploy/docker-compose.no-ui.development.yml +++ b/deploy/docker-compose.no-ui.development.yml @@ -3,10 +3,10 @@ services: # The development docker-compose file. Starts everything but the UI, useful to run with "gulp dev" - postgres: + mariadb: extends: file: common.yml - service: postgres + service: mariadb goose: @@ -14,7 +14,7 @@ services: file: common.yml service: goose links: - - postgres:postgres + - mariadb:mariadb proxy: diff --git a/deploy/docker-compose.test.yml b/deploy/docker-compose.test.yml index 0bd022ed25..2e8a7c8628 100644 --- a/deploy/docker-compose.test.yml +++ b/deploy/docker-compose.test.yml @@ -16,10 +16,10 @@ services: - nginx - postgres: + mariadb: extends: file: common.yml - service: postgres + service: mariadb goose: @@ -27,7 +27,7 @@ services: file: common.yml service: goose links: - - postgres + - mariadb proxy: diff --git a/deploy/docker-compose/build.sh b/deploy/docker-compose/build.sh index 084bf4d96a..2990b9d35d 100755 --- a/deploy/docker-compose/build.sh +++ b/deploy/docker-compose/build.sh @@ -238,8 +238,8 @@ cleanup updateTagForRelease # Build all of the components that make up the Console -#buildProxy -#buildGoose +buildProxy +buildGoose buildUI # Done diff --git a/deploy/kubernetes/README.md b/deploy/kubernetes/README.md index 9397345036..c8a69956f8 100644 --- a/deploy/kubernetes/README.md +++ b/deploy/kubernetes/README.md @@ -192,3 +192,24 @@ kubectl create -f storageclass.yaml ``` See [Storage Class documentation] ( https://kubernetes.io/docs/tasks/administer-cluster/change-default-storage-class/) for more insformation. + +## Deploying Stratos UI with your own TLS certificates + +By default the console will generate self-signed certificates for demo purposes. To configure Stratos UI to use your provided TLS certificates set the `consoleCert` and `consoleCertKey` overrides. + +``` +consoleCert: | + -----BEGIN CERTIFICATE----- + MIIDXTCCAkWgAwIBAgIJAJooOiQWl1v1MA0GCSqGSIb3DQEBCwUAMEUxCzAJBgNV + ... + -----END CERTIFICATE----- +consoleCertKey: | + -----BEGIN PRIVATE KEY----- + MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQDV9+ySh0xZzM41 + .... + -----END PRIVATE KEY----- +``` +Assuming the above is stored in a file called `override-ssl.yaml`, install the chart with the override specified. +``` +helm install -f override-ssl.yaml stratos-ui/console --namespace console +``` \ No newline at end of file diff --git a/deploy/kubernetes/build.sh b/deploy/kubernetes/build.sh index 1a126741e8..11c3f2440f 100755 --- a/deploy/kubernetes/build.sh +++ b/deploy/kubernetes/build.sh @@ -191,7 +191,7 @@ function buildProxy { # publish the container image for the portal proxy echo echo "-- Build & publish the runtime container image for the Console Proxy" - buildAndPublishImage stratos-proxy deploy/Dockerfile.bk.dev ${STRATOS_UI_PATH} + buildAndPublishImage stratos-proxy deploy/Dockerfile.bk.k8s ${STRATOS_UI_PATH} # Build merged preflight & proxy image, used when deploying into multi-node k8s cluster without a shared storage backend buildAndPublishImage stratos-proxy-noshared deploy/Dockerfile.bk-preflight.dev ${STRATOS_UI_PATH} } diff --git a/deploy/kubernetes/console/requirements.lock b/deploy/kubernetes/console/requirements.lock new file mode 100644 index 0000000000..0f368ef4bd --- /dev/null +++ b/deploy/kubernetes/console/requirements.lock @@ -0,0 +1,11 @@ +dependencies: +- alias: "" + condition: "" + enabled: false + import-values: null + name: mariadb + repository: https://kubernetes-charts.storage.googleapis.com/ + tags: null + version: 1.0.1 +digest: sha256:5f5af6467b33fc5c07ddf7197b6625d3489fc5bb2e21bb362dc27867c63c85bf +generated: 2017-09-15T15:21:55.915717316+01:00 diff --git a/deploy/kubernetes/console/requirements.yaml b/deploy/kubernetes/console/requirements.yaml new file mode 100644 index 0000000000..ae6881e3ec --- /dev/null +++ b/deploy/kubernetes/console/requirements.yaml @@ -0,0 +1,4 @@ +dependencies: +- name: mariadb + version: "1.0.1" + repository: https://kubernetes-charts.storage.googleapis.com/ diff --git a/deploy/kubernetes/console/ssl/console.crt b/deploy/kubernetes/console/ssl/console.crt deleted file mode 100644 index 32c31d8fb4..0000000000 --- a/deploy/kubernetes/console/ssl/console.crt +++ /dev/null @@ -1,32 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIFfzCCBGegAwIBAgIUXGVzSL3vrRYn4pH+OGQ1Q0p6gn0wDQYJKoZIhvcNAQEL -BQAwgYgxCzAJBgNVBAYTAlVTMRMwEQYDVQQIEwpXYXNoaW5ndG9uMRAwDgYDVQQH -EwdTZWF0dGxlMSMwIQYDVQQKExpIZXdsZXR0IFBhY2thcmQgRW50ZXJwcmlzZTES -MBAGA1UECxMJSFBFIENsb3VkMRkwFwYDVQQDExBIQ1AgQm9vdHN0cmFwIENBMB4X -DTE3MDQwNTEyMjkwMFoXDTE4MDQwNTEyMjkwMFowgYExCzAJBgNVBAYTAlVTMRMw -EQYDVQQIEwpXYXNoaW5ndG9uMRAwDgYDVQQHEwdTZWF0dGxlMSMwIQYDVQQKExpI -ZXdsZXR0IFBhY2thcmQgRW50ZXJwcmlzZTESMBAGA1UECxMJSFBFIENsb3VkMRIw -EAYDVQQDEwkqLmhzYy5zdmMwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB -AQCuDMxMCWF6vUxzkXhy3fyg/sSDdQTn/W8rVavbPymJqSLoLQCoIZ1MVsFmDXeZ -Wnd896KRweglG2el/CD+Cs+JdHIwVtlw3xpD1bMdjkfNHhIeZTw6j9A9bvoDEjzP -vx3kIFarjBTcy5CZIzZjYdUI/8g81dybvktfYk7TH1j4jnFvzM5Aj4P43A+QXvJU -VrOrL5f1QlqGczyet1lrTRj1Lpa1tolAQ1ql/lYeLAqgS0CdtCQUekMoObhUfhxl -UC1Kdbsn5ziv63yRcUBxEtw2+2dPt0FBWPCyHq6HaAUy4Dq9C6DXYI39cDmnpjQ6 -RI7RowyuJDn0RTUCpczhSav5AgMBAAGjggHkMIIB4DAOBgNVHQ8BAf8EBAMCBaAw -HQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMAwGA1UdEwEB/wQCMAAwHQYD -VR0OBBYEFJfP8VkZ2TIB8EvINyZgkjWZQUBHMB8GA1UdIwQYMBaAFMMJYx4SgR2R -aRyfh+0rTx4dLcQYMIIBXwYDVR0RBIIBVjCCAVKCCSouaHNjLnN2Y4IVKi5oc2Mu -c3ZjLmNsdXN0ZXIuaGNwggtoc2MtY29uc29sZYITaHNjLWNvbnNvbGUuaHNjLnN2 -Y4IfaHNjLWNvbnNvbGUuaHNjLnN2Yy5jbHVzdGVyLmhjcIINKi5oc2MtY29uc29s -ZYIVKi5oc2MtY29uc29sZS5oc2Muc3ZjgiEqLmhzYy1jb25zb2xlLmhzYy5zdmMu -Y2x1c3Rlci5oY3CCD2hzYy1jb25zb2xlLWludIIXaHNjLWNvbnNvbGUtaW50Lmhz -Yy5zdmOCI2hzYy1jb25zb2xlLWludC5oc2Muc3ZjLmNsdXN0ZXIuaGNwghEqLmhz -Yy1jb25zb2xlLWludIIZKi5oc2MtY29uc29sZS1pbnQuaHNjLnN2Y4IlKi5oc2Mt -Y29uc29sZS1pbnQuaHNjLnN2Yy5jbHVzdGVyLmhjcDANBgkqhkiG9w0BAQsFAAOC -AQEAxt0AIiN26mdTYB8LjG0O/Q22ZMCqnPsu7HGUOVk0g59KW9PU60+8jyre/Lfc -CH09DOnTVPrlmghAqn6o2qAS+vZKHIK+50OvIKO/6SwfvmJlk1H0xAPqm/SWttHq -QIzIQxqzGA+6rqoRW5Kmqdy7xmvh5fY6spVJ0UyITe9zNZeDmB2EWJ7Gq/E/xncz -mlBFR39WXp6Ptr+Tu8ZhUfSzCpGJwElhrAD68EoJ7S1r7n2whZlUACRNAW5kwXYa -gHbKmrIDMdK9t0SksP1MBfNN09/etVUPEFebfz6uNimfpjEq+FHmve/EyrSv/ahm -IWEU0Hvz1P9whtWVZSs7t44/rg== ------END CERTIFICATE----- \ No newline at end of file diff --git a/deploy/kubernetes/console/ssl/console.key b/deploy/kubernetes/console/ssl/console.key deleted file mode 100644 index bdf3c4d28e..0000000000 --- a/deploy/kubernetes/console/ssl/console.key +++ /dev/null @@ -1,27 +0,0 @@ ------BEGIN RSA PRIVATE KEY----- -MIIEowIBAAKCAQEArgzMTAlher1Mc5F4ct38oP7Eg3UE5/1vK1Wr2z8piaki6C0A -qCGdTFbBZg13mVp3fPeikcHoJRtnpfwg/grPiXRyMFbZcN8aQ9WzHY5HzR4SHmU8 -Oo/QPW76AxI8z78d5CBWq4wU3MuQmSM2Y2HVCP/IPNXcm75LX2JO0x9Y+I5xb8zO -QI+D+NwPkF7yVFazqy+X9UJahnM8nrdZa00Y9S6WtbaJQENapf5WHiwKoEtAnbQk -FHpDKDm4VH4cZVAtSnW7J+c4r+t8kXFAcRLcNvtnT7dBQVjwsh6uh2gFMuA6vQug -12CN/XA5p6Y0OkSO0aMMriQ59EU1AqXM4Umr+QIDAQABAoIBAGjm9ctua/5aUdXl -+77f5P/0DeVdhlN9AKARxr8iVprOAmgFl7u+Ztw3/eDQhSE80X/UkXtgb9bNqa71 -Q71aLrQeJyTTc8L/9QilqItL0iLi2PDQ+3ggbdZZKP7o4xYjjpSMmTBUAc8CMmja -PFGyCYCfCcUA8TI9g5g93FyLLEjCMuO2+vmddYmT1ppN+tj2UyI8kapd4dwOw7M8 -uAs3ixmt2PbUSnS2TdVn+WDC7ZeHwguVwVdX+J4sPyYQJvzL7Lzmo1W3diP8gTdE -316pD+8K7oIN8xKgoDUB0iLaKxJ5KmAWHCMR5XFH59Ht0zPjUJb6bC/5Oic8dvxu -8vI+zHECgYEAxzEbs7yMoi3tG42nVh4PYea5xEYUgALCHx0NW9BfFKA6fU4zRFna -ZTlDLX+blZcHlwZo+GpjrVvh+FItc2RKn62hDTfSzbr+EgHTDXALL64+1i2yLhPz -echMoPSjfRNNBtrlWuIigfqtzV8mS070ravbirv4acntVtsZps5vTj8CgYEA37AY -8Bmdu1qEj0gjV9TL65jboZsd6KgIiGDeDQEmpV03lpz1xHCbLtkvg4Ec0hZsyzFc -j0HquM7GJumdLmCIbwr1zxEC15unXJbjm1NPY5VKivuFB1orTGnLXsNY7zgY/b7x -Bhlx8YwzNh2wOZVvbQt5Cnjw7QQP90uEeq6X58cCgYBAio3yUA61YfIo8l4dDkJn -s23PxfFQhRRHJo+0hzC3qy8oeNUtuXuFPuegb2+HKdegvMf4beh8PIBciKwHbqCr -WoQLl2HrnUJDrWmoOfy151ye41GPkpFajWce5AWxOjbEGNsl9o291e7I06LB1gR7 -3WqWak+UX4RSl02Zedwg2wKBgH63fYkWmdo2zv10OkFZVSPj9he4jdrsxdisN15a -lo/7HLB/vmJIAEEr29S9YZxKA9uf3PVyvAtxZ6NHmDlbii6NoO5qjpehn8+90rZ9 -HW4mdpIBJj0iAYFKNWE7fLgXqWCluFhiNcBGUgSIEPquAu9dHnamSKWcNYc8CpKN -MZSlAoGBAMbYWMoKTjSdixCmLJ5MeHTwXvy62LRxvpsKIU2j9ArLytPE57fDwOur -4eySa/9LklGjU0X1z5bZeQgu+do4ch8iXFNyx/AalgZRnFQnt9bVob2MXiR3DCNF -JAZa5VoIJHwjtOcIrT0UI0LN7qQ54GadxfbkLNizgTXwZwEx/bl5 ------END RSA PRIVATE KEY----- \ No newline at end of file diff --git a/deploy/kubernetes/console/templates/deployment.yaml b/deploy/kubernetes/console/templates/deployment.yaml index 5005a5c049..df79a695d4 100644 --- a/deploy/kubernetes/console/templates/deployment.yaml +++ b/deploy/kubernetes/console/templates/deployment.yaml @@ -1,24 +1,5 @@ --- apiVersion: v1 -kind: PersistentVolumeClaim -metadata: - name: "{{ .Release.Name }}-postgres-volume" - labels: - app: "{{ .Release.Name }}" - annotations: - {{- if .Values.storageClass }} - volume.beta.kubernetes.io/storage-class: {{ .Values.storageClass | quote }} - {{- else }} - volume.alpha.kubernetes.io/storage-class: default - {{- end }} -spec: - accessModes: - - ReadWriteMany - resources: - requests: - storage: 2Gi ---- -apiVersion: v1 kind: Secret type: Opaque metadata: @@ -27,10 +8,7 @@ metadata: app: "{{ .Release.Name }}" data: stolon: {{ .Values.dbPassword | b64enc }} - pgsql-password: {{ .Values.dbPassword | b64enc }} - console-cert-key: {{ .Files.Get "ssl/console.key" | b64enc }} - console-cert: {{ .Files.Get "ssl/console.crt" | b64enc }} - + db-password: {{ .Values.mariadb.mariadbPassword | b64enc }} --- apiVersion: apps/v1beta1 kind: StatefulSet @@ -48,10 +26,16 @@ spec: containers: - image: {{.Values.dockerRegistry}}/{{.Values.dockerOrg}}/{{.Values.images.console}}:{{.Values.consoleVersion}} name: ui + env: + - name: ENCRYPTION_KEY_VOLUME + value: "{{ .Release.Name }}-encryption-key-volume" volumeMounts: - mountPath: /etc/secrets/ name: "{{ .Release.Name }}-secret" readOnly: true + - mountPath: "/{{ .Release.Name }}-encryption-key-volume" + name: "{{ .Release.Name }}-encryption-key-volume" + readOnly: true ports: - containerPort: 80 name: http @@ -63,24 +47,22 @@ spec: - image: {{.Values.dockerRegistry}}/{{.Values.dockerOrg}}/{{.Values.images.postflight}}:{{.Values.consoleVersion}} name: "{{ .Release.Name }}-postflight" env: - - name: PGSQL_HOST - value: "{{ .Release.Name }}-postgres-int" - - name: PGSQL_PORT - value: "5432" - - name: POSTGRES_USER - value: postgres - - name: POSTGRES_PASSWORD_FILE - value: /etc/secrets/stolon - - name: PGSQL_DATABASE - value: console-db - - name: PGSQL_USER - value: console - - name: PGSQL_PASSWORDFILE - value: /etc/secrets/pgsql-password - - name: PGSQL_SSL_MODE - value: disable - - name: PGCONNECT_TIMEOUT - value: "10" + - name: DB_HOST + value: "{{ .Release.Name }}-mariadb" + - name: DB_PORT + value: "3306" + - name: DB_ADMIN_USER + value: "{{ .Values.mariadb.adminUser }}" + - name: DB_ADMIN_PASSWORD + value: "{{ .Values.mariadb.mariadbRootPassword }}" + - name: DATABASE_PROVIDER + value: "{{ .Values.dbProvider }}" + - name: DB_PASSWORD + value: "{{ .Values.mariadb.mariadbPassword }}" + - name: DB_USER + value: "{{ .Values.mariadb.mariadbUser }}" + - name: DB_DATABASE_NAME + value: "{{ .Values.mariadb.mariadbDatabase }}" - name: DO_NOT_QUIT value: "true" - name: UPGRADE_VOLUME @@ -121,23 +103,22 @@ spec: name: proxy {{- end }} env: - - name: PGSQL_USER - value: console - - name: PGSQL_PASSWORD - valueFrom: - secretKeyRef: - name: "{{ .Release.Name }}-secret" - key: pgsql-password - - name: PGSQL_DATABASE - value: console-db - - name: PGSQL_HOST - value: "{{ .Release.Name }}-postgres-int" - - name: PGSQL_PORT - value: "5432" - - name: PGSQL_CONNECT_TIMEOUT_IN_SECS - value: "5" - - name: PGSQL_SSL_MODE - value: disable + - name: DB_USER + value: "{{ .Values.mariadb.mariadbUser }}" + - name: DB_PASSWORD + value: "{{ .Values.mariadb.mariadbPassword }}" + - name: DB_DATABASE_NAME + value: "{{ .Values.mariadb.mariadbDatabase }}" + - name: DB_HOST + value: "{{ .Release.Name }}-mariadb" + - name: DB_PORT + value: "3306" + - name: DATABASE_PROVIDER + value: "{{ .Values.dbProvider }}" + - name: DB_ADMIN_USER + value: "{{ .Values.mariadb.adminUser }}" + - name: DB_ADMIN_PASSWORD + value: "{{ .Values.mariadb.mariadbRootPassword }}" - name: HTTP_CONNECTION_TIMEOUT_IN_SECS value: "10" - name: HTTP_CLIENT_TIMEOUT_IN_SECS @@ -158,6 +139,22 @@ spec: value: "{{ .Release.Name }}-encryption-key-volume" - name: ENCRYPTION_KEY_FILENAME value: key + {{- if .Values.noShared }} + {{- if .Values.consoleCert }} + - name: CONSOLE_CERT + value: | +{{ .Values.consoleCert | indent 12 }} + {{- end }} + {{- if .Values.consoleCertKey }} + - name: CONSOLE_CERT_KEY + value: | +{{ .Values.consoleCertKey | indent 12 }} + {{- end }} + {{- end }} + - name: CONSOLE_PROXY_CERT_PATH + value: "/{{ .Release.Name }}-encryption-key-volume/console.crt" + - name: CONSOLE_PROXY_CERT_KEY_PATH + value: "/{{ .Release.Name }}-encryption-key-volume/console.key" - name: HTTP_PROXY {{- if .Values.httpProxy }} value: {{.Values.httpProxy}} @@ -191,9 +188,6 @@ spec: name: "{{ .Release.Name }}-secret" readOnly: true volumes: - - name: "{{ .Release.Name }}-postgres-volume" - persistentVolumeClaim: - claimName: "{{ .Release.Name }}-postgres-volume" - name: "{{ .Release.Name }}-upgrade-volume" persistentVolumeClaim: claimName: "{{ .Release.Name }}-upgrade-volume" @@ -203,64 +197,6 @@ spec: - name: "{{ .Release.Name }}-secret" secret: secretName: "{{ .Release.Name }}-secret" ---- -apiVersion: apps/v1beta1 -kind: StatefulSet -metadata: - name: postgres -spec: - serviceName: "postgres" - replicas: 1 - template: - metadata: - labels: - app: "{{ .Release.Name }}" - component: postgres - spec: - containers: - - image: {{.Values.dockerRegistry}}/{{.Values.dockerOrg}}/{{.Values.images.postgres}}:{{.Values.consoleVersion}} - name: postgres - env: - - name: POSTGRES_USER - value: postgres - - name: POSTGRES_PASSWORD_FILE - value: /etc/secrets/stolon - - name: PGDATA - value: /stolon-data - - name: HTTP_PROXY - {{- if .Values.httpProxy }} - value: {{.Values.httpProxy}} - {{- end }} - - name: HTTPS_PROXY - {{- if .Values.httpsProxy }} - value: {{.Values.httpsProxy}} - {{- end }} - - name: NO_PROXY - {{- if .Values.noProxy }} - value: {{.Values.noProxy}} - {{- end }} - - name: FTP_PROXY - {{- if .Values.ftpProxy }} - value: {{.Values.ftpProxy}} - {{- end }} - - name: SOCKS_PROXY - {{- if .Values.socksProxy }} - value: {{.Values.socksProxy}} - {{- end }} - volumeMounts: - - mountPath: /stolon-data - name: "{{ .Release.Name }}-postgres-volume" - - mountPath: /etc/secrets/ - name: "{{ .Release.Name }}-secret" - readOnly: true - ports: - - containerPort: 5432 - name: postgres - protocol: TCP - volumes: - - name: "{{ .Release.Name }}-postgres-volume" - persistentVolumeClaim: - claimName: "{{ .Release.Name }}-postgres-volume" - name: "{{ .Release.Name }}-encryption-key-volume" persistentVolumeClaim: claimName: "{{ .Release.Name }}-encryption-key-volume" diff --git a/deploy/kubernetes/console/templates/post-install.yaml b/deploy/kubernetes/console/templates/post-install.yaml index cdd844aa8f..900e749b56 100644 --- a/deploy/kubernetes/console/templates/post-install.yaml +++ b/deploy/kubernetes/console/templates/post-install.yaml @@ -18,24 +18,22 @@ spec: spec: containers: - env: - - name: PGSQL_HOST - value: "{{ .Release.Name }}-postgres-int" - - name: PGSQL_PORT - value: "5432" - - name: POSTGRES_USER - value: postgres - - name: POSTGRES_PASSWORD_FILE - value: /etc/secrets/stolon - - name: PGSQL_DATABASE - value: console-db - - name: PGSQL_USER - value: console - - name: PGSQL_PASSWORDFILE - value: /etc/secrets/pgsql-password - - name: PGSQL_SSL_MODE - value: disable - - name: PGCONNECT_TIMEOUT - value: "10" + - name: DB_HOST + value: "{{ .Release.Name }}-mariadb" + - name: DB_PORT + value: "3306" + - name: DB_ADMIN_USER + value: "{{ .Values.mariadb.adminUser }}" + - name: DB_ADMIN_PASSWORD + value: "{{ .Values.mariadb.mariadbRootPassword }}" + - name: DATABASE_PROVIDER + value: "{{ .Values.dbProvider }}" + - name: DB_PASSWORD + value: "{{ .Values.mariadb.mariadbPassword }}" + - name: DB_USER + value: "{{ .Values.mariadb.mariadbUser }}" + - name: DB_DATABASE_NAME + value: "{{ .Values.mariadb.mariadbDatabase }}" - name: UPGRADE_VOLUME value: "{{ .Release.Name }}-upgrade-volume" - name: UPGRADE_LOCK_FILENAME diff --git a/deploy/kubernetes/console/templates/pre-install.yaml b/deploy/kubernetes/console/templates/pre-install.yaml index 38c1270740..84a1ce1e8b 100644 --- a/deploy/kubernetes/console/templates/pre-install.yaml +++ b/deploy/kubernetes/console/templates/pre-install.yaml @@ -67,8 +67,20 @@ spec: value: upgrade.lock - name: ENCRYPTION_KEY_VOLUME value: "{{ .Release.Name }}-encryption-key-volume" + - name: CERTS_PATH + value: "{{ .Release.Name }}-encryption-key-volume" - name: ENCRYPTION_KEY_FILENAME value: key + {{- if .Values.consoleCert }} + - name: CONSOLE_CERT + value: | +{{ .Values.consoleCert | indent 12 }} + {{- end }} + {{- if .Values.consoleCertKey }} + - name: CONSOLE_CERT_KEY + value: | +{{ .Values.consoleCertKey | indent 12 }} + {{- end }} image: {{.Values.dockerRegistry}}/{{.Values.dockerOrg}}/{{.Values.images.preflight}}:{{.Values.consoleVersion}} name: "{{ .Release.Name }}-preflight-job" volumeMounts: diff --git a/deploy/kubernetes/console/values.yaml b/deploy/kubernetes/console/values.yaml index 177e017eaa..1e3cdb2619 100644 --- a/deploy/kubernetes/console/values.yaml +++ b/deploy/kubernetes/console/values.yaml @@ -6,6 +6,7 @@ dockerOrg: splatform dockerRegistry: docker.io # Specify default DB password dbPassword: changeme +dbProvider: mysql # Provide Proxy settings if required #httpProxy: proxy.corp.net #httpsProxy: proxy.corp.net @@ -21,4 +22,29 @@ images: preflight: stratos-preflight-job postflight: stratos-postflight-job # Specify which storage class should be used for PVCs -#storageClass: default \ No newline at end of file +#storageClass: default +#consoleCert: | +# -----BEGIN CERTIFICATE----- +# MIIDXTCCAkWgAwIBAgIJAJooOiQWl1v1MA0GCSqGSIb3DQEBCwUAMEUxCzAJBgNV +# ... +# -----END CERTIFICATE----- +#consoleCertKey: | +# -----BEGIN PRIVATE KEY----- +# MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkdgEAAoIBAQDV9+ySh0xZzM41 +# ... +# -----END PRIVATE KEYE----- +# MariaDB chart configuration +mariadb: + # Only required for creating the databases + mariadbRootPassword: changeme + adminUser: root + # Credentials for user + mariadbUser: console + mariadbPassword: changeme + mariadbDatabase: console + persistence: + accessMode: ReadWriteMany + size: 1Gi +# storageClass: default + metrics: + enabled: false diff --git a/deploy/mariadb.env b/deploy/mariadb.env new file mode 100644 index 0000000000..723411d08e --- /dev/null +++ b/deploy/mariadb.env @@ -0,0 +1,7 @@ +# Database connectivity environment variables +MYSQL_USER=stratos +MYSQL_PASSWORD=strat0s +MYSQL_DATABASE=stratos-db +MYSQL_CONNECT_TIMEOUT=5 +MYSQL_ROOT_PASSWORD=changeme +DATABASE_PROVIDER=mysql \ No newline at end of file diff --git a/deploy/proxy.env b/deploy/proxy.env index 6b01d7f561..0156a7e711 100644 --- a/deploy/proxy.env +++ b/deploy/proxy.env @@ -1,11 +1,9 @@ # Database connectivity environment variables -PGSQL_USER=stratos -PGSQL_PASSWORD=strat0s -PGSQL_DATABASE=stratos-db -PGSQL_HOST=postgres -PGSQL_PORT=5432 -PGSQL_CONNECT_TIMEOUT_IN_SECS=100 -PGSQL_SSL_MODE=disable +DB_USER=stratos +DB_PASSWORD=strat0s +DB_DATABASE_NAME=stratos-db +DB_HOST=mariadb +DB_PORT=3306 HTTP_CONNECTION_TIMEOUT_IN_SECS=10 HTTP_CLIENT_TIMEOUT_IN_SECS=20 SKIP_SSL_VALIDATION=true diff --git a/deploy/stratos-ui-release/README.md b/deploy/stratos-ui-release/README.md new file mode 100644 index 0000000000..183523401d --- /dev/null +++ b/deploy/stratos-ui-release/README.md @@ -0,0 +1,98 @@ +## Deploying the BOSH release + +**Note:** BOSH release is currently experimental. It currently has only been tested in a BOSH Lite environment, any suggestions for improvements to support other BOSH environments are welcome. + +To build and deploy the BOSH release you will require a BOSH director. If you don't have one available follow these instructions to setup BOSH lite [here](https://bosh.io/docs/bosh-lite.html). +The rest of the instruction assume that a BOSH lite environment is being used to deploy the chart. + + +### Deploying in a BOSH lite environment + +1. To upload a cloud-config execute the following: + ``` + $ bosh -e vbox update-cloud-config ~/workspace/bosh-deployment/warden/cloud-config.yml + ``` + +2. Upload a stemcell (using the `bosh-warden-boshlite-ubuntu-trusty`) + ``` + bosh -e vbox upload-stemcell https://bosh.io/d/stemcells/bosh-warden-boshlite-ubuntu-trusty-go_agent?v=3421.9 \ + --sha1 1396d7877204e630b9e77ae680f492d26607461d + ``` + +3. Build the Stratos UI BOSH release + ``` + $ bosh create-release + ``` + + If you have outstanding changes locally add the `--force` flag. + +4. After a successful build, upload the release to your director. + ``` + $ bosh -e vbox upload-release -d stratos-ui + ``` + +5. Deploy the release + + A sample bosh-lite deployment manifest has been provided in `bosh-lite/deployment.yaml`. The following will use that command to deploy the Console. + + 5.1. Provide UAA settings in the deployment manifest if known. In the following some sample values have been provided. + ``` + uaa_address: https://my-uaa:8080 + console_admin_scope: cloud_controller.admin + console_uaa_client: cf + ``` + + 5.2. Select the database you want to use. The Stratos UI Console can be deployed using a MySQL/MariaDB store or SQLite. The following are sample values for a mysql configuration. This assumes a MySQL server has been deployed locally on the host. + + ``` + use_mysql: true + use_sqlite: false + mysql_user: stratos + mysql_admin_user: root + mysql_admin_password: changeme + mysql_user_password: strat0s + mysql_db: stratos-db + mysql_host: 127.0.0.1 + mysql_port: 3306 + + ``` + + To use SQLite, use the following and comment out the mysql parameters. + ``` + # use_mysql: true + use_sqlite: true + # mysql_user: stratos + # mysql_admin_user: root + # mysql_admin_password: changeme + # mysql_user_password: strat0s + # mysql_db: stratos-db + # mysql_host: 127.0.0.1 + # mysql_port: 3306 + ``` + + To deploy you deployment manifest execute the following. + + ``` + $ bosh -e vbox -d stratos-ui deploy bosh-lite/deployment.yml + ``` + +6. List deployment + + List deployment to get the IP address of the frontend to access the Console. In the following example to access the Console the address is `https://10.0.16.4`. + + ``` + 09:10 $ bosh -e vbox -d stratos-ui instances + Using environment '192.168.50.6' as client 'admin' + + Task 22. Done + + Deployment 'stratos-ui' + + Instance Process State AZ IPs + backend/68580d76-a241-4de2-b246-82d0a184c9bb running - 10.0.16.103 + frontend/477c94ef-3138-416c-97d7-c09682e6d5dd running - 10.0.16.4 + + 2 instances + + Succeeded + ``` diff --git a/deploy/stratos-ui-release/bosh-lite/deployment.yml b/deploy/stratos-ui-release/bosh-lite/deployment.yml new file mode 100644 index 0000000000..6ad968b327 --- /dev/null +++ b/deploy/stratos-ui-release/bosh-lite/deployment.yml @@ -0,0 +1,195 @@ +--- +name: stratos-ui + +networks: +- name: stratos-net + type: manual + subnets: + - range: 10.0.16.0/24 + gateway: 10.0.16.1 + dns: [8.8.8.8] + reserved: ["10.0.16.2 - 10.0.16.3"] + static: ["10.0.16.100 - 10.0.16.105"] + +resource_pools: +- name: stratos_rp1 + network: stratos-net + stemcell: + name: bosh-warden-boshlite-ubuntu-trusty-go_agent + version: latest + cloud_properties: + availability_zone: az1 + +compilation: + workers: 6 + network: stratos-net + reuse_compilation_vms: true + cloud_properties: + availability_zone: az1 + +disk_pools: +- name: upgrade-volume + disk_size: 50 + cloud_properties: {type: standard} + +releases: +- name: stratos-ui + version: latest + +update: + canaries: 2 + max_in_flight: 1 + canary_watch_time: 5000-60000 + update_watch_time: 5000-60000 + +instance_groups: +- name: frontend + instances: 1 + resource_pool: stratos_rp1 + jobs: + - name: frontend + release: stratos-ui + properties: + stratos_ui: + frontend: + ssl_cert_key: | + -----BEGIN PRIVATE KEY----- + MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQDV9+ySh0xZzM41 + Salbfmk1cWwUP9QYS/MKxceZ7rh/rYloRZiIr9agOHKCNSdFTSb9RTTf7mcFGPdP + XQ42uOrzlVu/PeK1Hlv2tEf7zFBMmy0dEWB3PkH2kvHjcYTHIHC4Cpy7t9KRlRCQ + 3yAGPLFzCspgz1Kj8gEu1/tGF6ODr+qvdY2d8BVRCEqrLAFefEKADiQhEkrFtBjz + dc8FcgFx1EfnGwENfR31Oyt7+/0b8FqJT/8K+GlXMQmJPNEONxrYL+/xDszFw/Ai + cAUz1XP6Iqy7r6CsMWiI2HeGqX6Z4RPWeZITur50g4BnnwSeTkFiw7Ek39+bK56w + gvRLcIpLAgMBAAECggEBANNJuycGy/JxN7+POdnLfoDzu9JTJVHIzft5Sp1LCo2q + A+Ift3xihwI4O3swmdLpWPMJACmQ9dIm0TBhp8OJ3xkiCDNVHSXVEOMRK3QOUc0T + /vyRSDz4EZM3j/0VABTSh/x1HkiQQTLZjD5C1xDRpjkAEtB+ahDSzTBAvzR761AA + +y3fQz59jUwEoC1fOmzd333brgUGG3rwaqdg5qyXQBQH3k2RC10r9GXoc5fvkwO7 + M2n2rW3WdytT3Yhb+Cvv+EZsJVs6lX8dyQcdfFLP9ivBjzRbNTxm6sA1vnmq0xf4 + 7ixC8MJk/N9ZRRGTcohxS97AfsnFqwqOTeGPrsdqFqECgYEA/5IHgr8ubnmTJ0ep + 0+n69jqVQkfMJ0/sPlXP/+1yywYxkf6kSm8JXboa1W+j3vsRMRYUWAQVLp8ALrLk + x3aQG024CayryabcdFPrfdbdQV1Ik+8RYae34uKiOgyOJVyy96YuqM4QCvqY5GYp + u+rthafJq4kGAzU6Pli7yI3ZsM8CgYEA1lP+YBHotCR993jXGa0OIwmqI7+n9EWV + k/ubNxutEqXE+VL4hXrWWn9mLD4MJ9y+umppTdzEawUcM9MoVD7eeQUwkgMiDlUd + 2c62pHHStYyKHaY85Zp1yovFDDjtROErXT9+fXcDAxSP0MOapEC9tToY1seVfJLH + pj/U52ONlcUCgYEAnCUzU43NJ5A9+QzO1Puq6k/Gq9VEBWzOUROK3rnLngFtvd5P + sG6A0XQIOwlXnL/WtB/iVBhCfNaGfQGtx7RHvXbRj4+g8bZyENzJD3x8eBgvZLr2 + 6qxXLFb9eOv82RT2/1nYPiiQIrUTPtCwhPC3KCboj1ZLhyA5MqhyKsmIDH8CgYAb + nV7dCfGtpDYGuK8eQ8nagdhGGt+M/Zo0IurwwsQd7vXeGe6jZBxSNK/5a1UtnaeF + ZUiEG7nDADmOA9riX+dSOHT1mym8JwNdmOC3d2LquVziTRTzkF805aVR2dPYWBq6 + PQATMk5VC0UsZMd7+kt3GjExGy4Liu3mYbsQxSbs8QKBgDPoTR3a39cjp4KgMS4z + 9nRT5DV72/GE5N7EDrDHrhpUyW0qkM4UcJ5Vi+c4EywzOgtYbFknSsXbYnVAkFDr + 42qv5Z0qoLTOch+GVuj0ZF1UgJh+RJWom7lPhTS0UP+VZFBc++nGl7PGTRflm3Zd + mEVvEQxyBz3V1fZ0Yz246W60 + -----END PRIVATE KEY----- + ssl_cert: | + -----BEGIN CERTIFICATE----- + MIIDXTCCAkWgAwIBAgIJAJooOiQWl1v1MA0GCSqGSIb3DQEBCwUAMEUxCzAJBgNV + BAYTAkFVMRMwEQYDVQQIDApTb21lLVN0YXRlMSEwHwYDVQQKDBhJbnRlcm5ldCBX + aWRnaXRzIFB0eSBMdGQwHhcNMTcwNjIzMTQ1MDM5WhcNMTgwNjIzMTQ1MDM5WjBF + MQswCQYDVQQGEwJBVTETMBEGA1UECAwKU29tZS1TdGF0ZTEhMB8GA1UECgwYSW50 + ZXJuZXQgV2lkZ2l0cyBQdHkgTHRkMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB + CgKCAQEA1ffskodMWczONUmpW35pNXFsFD/UGEvzCsXHme64f62JaEWYiK/WoDhy + gjUnRU0m/UU03+5nBRj3T10ONrjq85Vbvz3itR5b9rRH+8xQTJstHRFgdz5B9pLx + 43GExyBwuAqcu7fSkZUQkN8gBjyxcwrKYM9So/IBLtf7Rhejg6/qr3WNnfAVUQhK + qywBXnxCgA4kIRJKxbQY83XPBXIBcdRH5xsBDX0d9Tsre/v9G/BaiU//CvhpVzEJ + iTzRDjca2C/v8Q7MxcPwInAFM9Vz+iKsu6+grDFoiNh3hql+meET1nmSE7q+dIOA + Z58Enk5BYsOxJN/fmyuesIL0S3CKSwIDAQABo1AwTjAdBgNVHQ4EFgQUXucATEFh + 8s94Mg1+J/aP8potwhMwHwYDVR0jBBgwFoAUXucATEFh8s94Mg1+J/aP8potwhMw + DAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQsFAAOCAQEAGroqi6rKMjw3mCtr6dAU + WgGXiO96ADRzRchdp+gpHTVtybKAa1n13MAs/tl7HKUBQWwvDqPlqAAmBtCDKhfh + N8SiI8PxScaCE2NcJCJDHwxs2CucUSAIf99w+WIZ0pF2IC+73GTCR+p9Kwb5bN04 + 8vN/7YQTMwNk7GxkKas9QPR9/6rvPHLGPYvPx8mOW6HbYaWdPavJAI/XAYPxnfid + uQuNfXXbhJyxN1BUi1Kt+KkVCyG+CY0jJNbO7lTsiJSzcstLykSxTX1bw0jIvEWa + LdXmd/Dyu/EVzgOYnEPiZmHbha4KuVsb0dtAQIT8hmVRXIIOIbndERBduxeVMkLm + fw== + -----END CERTIFICATE----- + backend: + host: 10.0.16.103 + port: 443 + networks: + - name: stratos-net +- name: backend + instances: 1 + resource_pool: stratos_rp1 + persistent_disk_pool: upgrade-volume + jobs: + - name: backend + release: stratos-ui + properties: + stratos_ui: + backend: + skip_ssl_validation: true + address: 10.0.16.103 + port: 443 + # uaa_address: + # console_admin_scope: + # console_uaa_client: + frontend_origin_address: '' + ssl_cert_key: | + -----BEGIN PRIVATE KEY----- + MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQDV9+ySh0xZzM41 + Salbfmk1cWwUP9QYS/MKxceZ7rh/rYloRZiIr9agOHKCNSdFTSb9RTTf7mcFGPdP + XQ42uOrzlVu/PeK1Hlv2tEf7zFBMmy0dEWB3PkH2kvHjcYTHIHC4Cpy7t9KRlRCQ + 3yAGPLFzCspgz1Kj8gEu1/tGF6ODr+qvdY2d8BVRCEqrLAFefEKADiQhEkrFtBjz + dc8FcgFx1EfnGwENfR31Oyt7+/0b8FqJT/8K+GlXMQmJPNEONxrYL+/xDszFw/Ai + cAUz1XP6Iqy7r6CsMWiI2HeGqX6Z4RPWeZITur50g4BnnwSeTkFiw7Ek39+bK56w + gvRLcIpLAgMBAAECggEBANNJuycGy/JxN7+POdnLfoDzu9JTJVHIzft5Sp1LCo2q + A+Ift3xihwI4O3swmdLpWPMJACmQ9dIm0TBhp8OJ3xkiCDNVHSXVEOMRK3QOUc0T + /vyRSDz4EZM3j/0VABTSh/x1HkiQQTLZjD5C1xDRpjkAEtB+ahDSzTBAvzR761AA + +y3fQz59jUwEoC1fOmzd333brgUGG3rwaqdg5qyXQBQH3k2RC10r9GXoc5fvkwO7 + M2n2rW3WdytT3Yhb+Cvv+EZsJVs6lX8dyQcdfFLP9ivBjzRbNTxm6sA1vnmq0xf4 + 7ixC8MJk/N9ZRRGTcohxS97AfsnFqwqOTeGPrsdqFqECgYEA/5IHgr8ubnmTJ0ep + 0+n69jqVQkfMJ0/sPlXP/+1yywYxkf6kSm8JXboa1W+j3vsRMRYUWAQVLp8ALrLk + x3aQG024CayryabcdFPrfdbdQV1Ik+8RYae34uKiOgyOJVyy96YuqM4QCvqY5GYp + u+rthafJq4kGAzU6Pli7yI3ZsM8CgYEA1lP+YBHotCR993jXGa0OIwmqI7+n9EWV + k/ubNxutEqXE+VL4hXrWWn9mLD4MJ9y+umppTdzEawUcM9MoVD7eeQUwkgMiDlUd + 2c62pHHStYyKHaY85Zp1yovFDDjtROErXT9+fXcDAxSP0MOapEC9tToY1seVfJLH + pj/U52ONlcUCgYEAnCUzU43NJ5A9+QzO1Puq6k/Gq9VEBWzOUROK3rnLngFtvd5P + sG6A0XQIOwlXnL/WtB/iVBhCfNaGfQGtx7RHvXbRj4+g8bZyENzJD3x8eBgvZLr2 + 6qxXLFb9eOv82RT2/1nYPiiQIrUTPtCwhPC3KCboj1ZLhyA5MqhyKsmIDH8CgYAb + nV7dCfGtpDYGuK8eQ8nagdhGGt+M/Zo0IurwwsQd7vXeGe6jZBxSNK/5a1UtnaeF + ZUiEG7nDADmOA9riX+dSOHT1mym8JwNdmOC3d2LquVziTRTzkF805aVR2dPYWBq6 + PQATMk5VC0UsZMd7+kt3GjExGy4Liu3mYbsQxSbs8QKBgDPoTR3a39cjp4KgMS4z + 9nRT5DV72/GE5N7EDrDHrhpUyW0qkM4UcJ5Vi+c4EywzOgtYbFknSsXbYnVAkFDr + 42qv5Z0qoLTOch+GVuj0ZF1UgJh+RJWom7lPhTS0UP+VZFBc++nGl7PGTRflm3Zd + mEVvEQxyBz3V1fZ0Yz246W60 + -----END PRIVATE KEY----- + ssl_cert: | + -----BEGIN CERTIFICATE----- + MIIDXTCCAkWgAwIBAgIJAJooOiQWl1v1MA0GCSqGSIb3DQEBCwUAMEUxCzAJBgNV + BAYTAkFVMRMwEQYDVQQIDApTb21lLVN0YXRlMSEwHwYDVQQKDBhJbnRlcm5ldCBX + aWRnaXRzIFB0eSBMdGQwHhcNMTcwNjIzMTQ1MDM5WhcNMTgwNjIzMTQ1MDM5WjBF + MQswCQYDVQQGEwJBVTETMBEGA1UECAwKU29tZS1TdGF0ZTEhMB8GA1UECgwYSW50 + ZXJuZXQgV2lkZ2l0cyBQdHkgTHRkMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB + CgKCAQEA1ffskodMWczONUmpW35pNXFsFD/UGEvzCsXHme64f62JaEWYiK/WoDhy + gjUnRU0m/UU03+5nBRj3T10ONrjq85Vbvz3itR5b9rRH+8xQTJstHRFgdz5B9pLx + 43GExyBwuAqcu7fSkZUQkN8gBjyxcwrKYM9So/IBLtf7Rhejg6/qr3WNnfAVUQhK + qywBXnxCgA4kIRJKxbQY83XPBXIBcdRH5xsBDX0d9Tsre/v9G/BaiU//CvhpVzEJ + iTzRDjca2C/v8Q7MxcPwInAFM9Vz+iKsu6+grDFoiNh3hql+meET1nmSE7q+dIOA + Z58Enk5BYsOxJN/fmyuesIL0S3CKSwIDAQABo1AwTjAdBgNVHQ4EFgQUXucATEFh + 8s94Mg1+J/aP8potwhMwHwYDVR0jBBgwFoAUXucATEFh8s94Mg1+J/aP8potwhMw + DAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQsFAAOCAQEAGroqi6rKMjw3mCtr6dAU + WgGXiO96ADRzRchdp+gpHTVtybKAa1n13MAs/tl7HKUBQWwvDqPlqAAmBtCDKhfh + N8SiI8PxScaCE2NcJCJDHwxs2CucUSAIf99w+WIZ0pF2IC+73GTCR+p9Kwb5bN04 + 8vN/7YQTMwNk7GxkKas9QPR9/6rvPHLGPYvPx8mOW6HbYaWdPavJAI/XAYPxnfid + uQuNfXXbhJyxN1BUi1Kt+KkVCyG+CY0jJNbO7lTsiJSzcstLykSxTX1bw0jIvEWa + LdXmd/Dyu/EVzgOYnEPiZmHbha4KuVsb0dtAQIT8hmVRXIIOIbndERBduxeVMkLm + fw== + -----END CERTIFICATE----- + upgrade_volume_path: /var/vcap/store/backend + upgrade_volume_file: upgrade.lock + encryption_key_volume: /var/vcap/store/backend + encryption_key_filename: key + session_store_secret: foo + use_mysql: false + use_sqlite: true + # mysql_user: + # mysql_admin_user: + # mysql_admin_password: + # mysql_user_password: + # mysql_db: + # mysql_host: + # mysql_port: + networks: + - name: stratos-net + static_ips: [10.0.16.103] diff --git a/deploy/stratos-ui-release/config/blobs.yml b/deploy/stratos-ui-release/config/blobs.yml new file mode 100644 index 0000000000..ec72c2d999 --- /dev/null +++ b/deploy/stratos-ui-release/config/blobs.yml @@ -0,0 +1,13 @@ +--- +nginx/nginx-1.11.13.tar.gz: + size: 980784 + object_id: 214aec6b-e095-4b21-7155-d038f699eaae + sha: 84f27729754796181dc39d47da761c7e85eb3ae2 +nginx/pcre-8.40.tar.gz: + size: 2065161 + object_id: 44706e8c-255c-4ff3-9737-23ab55a1a214 + sha: sha256:1d75ce90ea3f81ee080cdc04e68c9c25a9fb984861a0618be7bbf676b18eda3e +golang/go1.8.3.linux-amd64.tar.gz: + size: 90029041 + object_id: 53346f1f-edfc-40d5-54b9-04126e05fdf3 + sha: sha256:1862f4c3d3907e59b04a757cfda0ea7aa9ef39274af99a784f5be843c80c6772 diff --git a/deploy/stratos-ui-release/config/final.yml b/deploy/stratos-ui-release/config/final.yml new file mode 100644 index 0000000000..d47c1df585 --- /dev/null +++ b/deploy/stratos-ui-release/config/final.yml @@ -0,0 +1,7 @@ +--- +name: stratos-ui +min_cli_version: 1.5.0.pre.1001 +blobstore: + provider: s3 + options: + bucket_name: capi-release-blobs diff --git a/deploy/stratos-ui-release/jobs/backend/monit b/deploy/stratos-ui-release/jobs/backend/monit new file mode 100644 index 0000000000..10ba7609a3 --- /dev/null +++ b/deploy/stratos-ui-release/jobs/backend/monit @@ -0,0 +1,5 @@ +check process backend + with pidfile /var/vcap/sys/run/backend/backend.pid + start program = "/bin/bash -c '/var/vcap/jobs/backend/bin/backend_ctl start'" + stop program = "/bin/bash -c '/var/vcap/jobs/backend/bin/backend_ctl stop'" + group vcap diff --git a/deploy/stratos-ui-release/jobs/backend/spec b/deploy/stratos-ui-release/jobs/backend/spec new file mode 100644 index 0000000000..186119617f --- /dev/null +++ b/deploy/stratos-ui-release/jobs/backend/spec @@ -0,0 +1,77 @@ +--- +name: backend +templates: + config.properties.erb: config/config.properties + ssl_cert.erb: config/dev-certs/pproxy.crt + ssl_cert_key.erb: config/dev-certs/pproxy.key + dbconf.yml.erb: /config/dbconf.yml + backend_ctl.erb: bin/backend_ctl + pre-start.erb: bin/pre-start + post-deploy.erb: bin/post-deploy + +packages: +- backend +- utils +- golang + +properties: + stratos_ui.backend.skip_ssl_validation: + description: "Skip SSL validation for connections to UAA" + default: false + stratos_ui.backend.address: + description: "Address the backend is binding to" + default: 0.0.0.0 + stratos_ui.backend.port: + description: "Port the backend is listening on" + default: 443 + stratos_ui.backend.uaa_address: + description: "UAA server address" + default: '' + stratos_ui.backend.console_admin_scope: + description: "UAA scope identifying Stratos UI Console admin" + default: '' + stratos_ui.backend.console_admin_scope: + description: "UAA scope identifying Stratos UI Console admin" + default: '' + stratos_ui.backend.console_uaa_client: + description: "UAA client for Stratos UI Console" + default: '' + stratos_ui.backend.frontend_origin_address: + description: "Frontend origin address" + stratos_ui.backend.ssl_cert_key: + description: "SSL Certificate key body" + stratos_ui.backend.ssl_cert: + description: "SSL Certificate body" + stratos_ui.backend.session_store_secret: + description: "Secret used to encrypt the backend session store" + stratos_ui.backend.use_mysql: + description: "Use mysql, need to specify relevant mysql settings" + stratos_ui.backend.mysql_user: + description: "mysql User" + stratos_ui.backend.mysql_user_password: + description: "mysql user password" + stratos_ui.backend.mysql_db: + description: "Stratos UI Console DB name" + stratos_ui.backend.mysql_host: + description: "mysql host" + stratos_ui.backend.mysql_port: + description: "mysql port" + stratos_ui.backend.mysql_admin_user: + description: "Mysql Administrator to create DB and user" + stratos_ui.backend.mysql_admin_password: + description: "Mysql Administrator port" + stratos_ui.backend.use_sqlite: + description: "Use SQLLite" + default: true + stratos_ui.backend.upgrade_volume_path: + description: "Upgrade volume path for pre-start data" + default: "/var/vcap/store/backend" + stratos_ui.backend.upgrade_volume_file: + description: "Upgrade lock file" + default: "upgrade.lock" + stratos_ui.backend.encryption_key_volume: + description: "Encryption key volume" + default: "/var/vcap/store/backend_encryption" + stratos_ui.backend.encryption_key_filename: + description: "Encryption key file name" + default: "key" diff --git a/deploy/stratos-ui-release/jobs/backend/templates/backend_ctl.erb b/deploy/stratos-ui-release/jobs/backend/templates/backend_ctl.erb new file mode 100644 index 0000000000..0cf43e7572 --- /dev/null +++ b/deploy/stratos-ui-release/jobs/backend/templates/backend_ctl.erb @@ -0,0 +1,53 @@ +#!/bin/bash + +RUN_DIR="/var/vcap/sys/run/backend" +LOG_DIR="/var/vcap/sys/log/backend" +PIDFILE="${RUN_DIR}/backend.pid" +CONFIG_DIR="/var/vcap/jobs/backend/config" + +source /var/vcap/packages/utils/syslog_utils.sh +source /var/vcap/packages/utils/pid_utils.sh + +if [ ! -d ${LOG_DIR} ]; then + mkdir ${LOG_DIR} +fi +tee_output_to_sys_log_and_file "${LOG_DIR}" "$(basename "$0")" + +function setup_environment() { + mkdir -p "${RUN_DIR}" +} + +case $1 in + + start) + setup_environment + pid_guard "$PIDFILE" "Nginx" + + cp -r $CONFIG_DIR/* /var/vcap/packages/backend/ + + <% if p('stratos_ui.backend.use_mysql') == true %> + cp -f $CONFIG_DIR/dbconf.yml /var/vcap/packages/backend/deploy/db/dbconf.yml + <% end %> + + cd /var/vcap/packages/backend/ + + chmod +x portal-proxy + echo $$ > "$PIDFILE" + + exec /var/vcap/packages/backend/portal-proxy + + ;; + + stop) + sigkill_on_timeout=0 + timeout=0 + kill_and_wait "${PIDFILE}" "${timeout}" "${sigkill_on_timeout}" + + ;; + + *) + echo "Usage: backend_ctl {start|stop}" + + ;; + +esac diff --git a/deploy/stratos-ui-release/jobs/backend/templates/config.properties.erb b/deploy/stratos-ui-release/jobs/backend/templates/config.properties.erb new file mode 100644 index 0000000000..bb4340d25f --- /dev/null +++ b/deploy/stratos-ui-release/jobs/backend/templates/config.properties.erb @@ -0,0 +1,30 @@ +HTTP_CONNECTION_TIMEOUT_IN_SECS=10 +HTTP_CLIENT_TIMEOUT_IN_SECS=20 +SKIP_SSL_VALIDATION=<%= p('stratos_ui.backend.skip_ssl_validation') %> +CONSOLE_PROXY_TLS_ADDRESS=<%= p('stratos_ui.backend.address') %>:<%= p('stratos_ui.backend.port') %> +CF_CLIENT=cf +CF_ADMIN_ROLE=cloud_controller.admin + +UAA_ENDPOINT=<%= p('stratos_ui.backend.uaa_address') %> +CONSOLE_ADMIN_SCOPE=<%= p('stratos_ui.backend.console_admin_scope') %> +CONSOLE_CLIENT=<%= p('stratos_ui.backend.console_uaa_client') %> +ALLOWED_ORIGINS=<%= p('stratos_ui.backend.frontend_origin_address') %> + +SESSION_STORE_SECRET=<%= p('stratos_ui.backend.session_store_secret') %> + +<% if p('stratos_ui.backend.use_mysql') == true %> +DATABASE_PROVIDER=mysql +DB_USER=<%= p('stratos_ui.backend.mysql_user') %> +DB_PASSWORD=<%= p('stratos_ui.backend.mysql_user_password') %> +DB_DATABASE_NAME=<%= p('stratos_ui.backend.mysql_db') %> +DB_HOST=<%= p('stratos_ui.backend.mysql_host') %> +DB_PORT=<%= p('stratos_ui.backend.mysql_port') %> +<% end %> + +<% if p('stratos_ui.backend.use_sqlite') == true %> +DATABASE_PROVIDER=sqlite +<% end %> +UPGRADE_VOLUME=<%= p('stratos_ui.backend.upgrade_volume_path') %> +UPGRADE_LOCK_FILENAME=<%= p('stratos_ui.backend.upgrade_volume_file') %> +ENCRYPTION_KEY_VOLUME=<%= p('stratos_ui.backend.encryption_key_volume') %> +ENCRYPTION_KEY_FILENAME=<%= p('stratos_ui.backend.encryption_key_filename') %> diff --git a/deploy/stratos-ui-release/jobs/backend/templates/dbconf.yml.erb b/deploy/stratos-ui-release/jobs/backend/templates/dbconf.yml.erb new file mode 100644 index 0000000000..d042ec7295 --- /dev/null +++ b/deploy/stratos-ui-release/jobs/backend/templates/dbconf.yml.erb @@ -0,0 +1,5 @@ +<% if p('stratos_ui.backend.use_mysql') == true %> +bosh-mysql: + driver: mysql + open: <%= p('stratos_ui.backend.mysql_user') %>:<%= p('stratos_ui.backend.mysql_user_password') %>@tcp(<%= p('stratos_ui.backend.mysql_host') %>:<%= p('stratos_ui.backend.mysql_port') %>)/<%= p('stratos_ui.backend.mysql_db') %>?parseTime=true +<% end %> \ No newline at end of file diff --git a/deploy/stratos-ui-release/jobs/backend/templates/post-deploy.erb b/deploy/stratos-ui-release/jobs/backend/templates/post-deploy.erb new file mode 100644 index 0000000000..ed705db9ee --- /dev/null +++ b/deploy/stratos-ui-release/jobs/backend/templates/post-deploy.erb @@ -0,0 +1,78 @@ +#!/bin/bash +<% if p('stratos_ui.backend.use_mysql') == true %> +set -e + +# TODO check if installation is required +# Check Git is installed +echo "Installing Git and MariaDB Client" +apt-get update +apt-get install -y git mariadb-client + +echo "PWD: $PWD" +export GOROOT="/var/vcap/packages/golang/" +export GOPATH="/var/vcap/packages/backend/go" +export PATH=$GOROOT/bin:$GOPATH/bin:$PATH + +function execStatement { + stmt=$1 + echo "Executing: mysql -u <%= p('stratos_ui.backend.mysql_admin_user') %> -h<%= p('stratos_ui.backend.mysql_host') %> -P <%= p('stratos_ui.backend.mysql_port') %> -pxxxxxxxxxxxx -e \"$stmt\"" + mysql -u <%= p('stratos_ui.backend.mysql_admin_user') %> -h<%= p('stratos_ui.backend.mysql_host') %> -P <%= p('stratos_ui.backend.mysql_port') %> -p<%= p('stratos_ui.backend.mysql_admin_password') %> -e "$stmt" + +} + +echo "Checking if DB exists" + +stratosDbExists=$(execStatement "SELECT SCHEMA_NAME FROM INFORMATION_SCHEMA.SCHEMATA WHERE SCHEMA_NAME = '<%= p('stratos_ui.backend.mysql_db') %>';") + +# Create DB if neccessary +if [ -z "$stratosDbExists" ] ; then + echo "Creating database <%= p('stratos_ui.backend.mysql_db') %>" + execStatement "CREATE DATABASE \"<%= p('stratos_ui.backend.mysql_db') %>\";" + echo "Creating user <%= p('stratos_ui.backend.mysql_user') %>" + execStatement "CREATE USER <%= p('stratos_ui.backend.mysql_user') %> IDENTIFIED BY '<%= p('stratos_ui.backend.mysql_user_password') %>';" + + echo "Granting privs for <%= p('stratos_ui.backend.mysql_db') %> to <%= p('stratos_ui.backend.mysql_user') %>" + execStatement "GRANT ALL PRIVILEGES ON DATABASE \"<%= p('stratos_ui.backend.mysql_db') %>\" TO <%= p('stratos_ui.backend.mysql_user') %>;" +else + echo "<%= p('stratos_ui.backend.mysql_db') %> already exists" +fi + +# Migrate the database if necessary +echo "Checking database to see if migration is necessary." + +echo "Connection string: <%= p('stratos_ui.backend.mysql_user') %>:<%= p('stratos_ui.backend.mysql_user_password') %>@tcp(<%= p('stratos_ui.backend.mysql_host') %>:<%= p('stratos_ui.backend.mysql_port') %>)/<%= p('stratos_ui.backend.mysql_db') %>?parseTime=true" +# Check the version +echo "Checking database version." +goose -path=/var/vcap/packages/backend/deploy/db -env=bosh-mysql dbversion + +# Check the status +echo "Checking database status." +goose -path=/var/vcap/packages/backend/deploy/db -env=bosh-mysql status + +# Run migrations +echo "Attempting database migrations." +goose -path=/var/vcap/packages/backend/deploy/db -env=bosh-mysql up + +# CHeck the status +echo "Checking database status." +goose -path=/var/vcap/packages/backend/deploy/db -env=bosh-mysql status + +# Check the version +echo "Checking database version." +goose -path /var/vcap/packages/backend/deploy/db -env=bosh-mysql dbversion + +echo "Database operation(s) complete." + + +# Check if Upgrade Lock file exists +if [ ! -f "<%= p('stratos_ui.backend.upgrade_volume_path') %>/<%= p('stratos_ui.backend.upgrade_volume_file') %>" ]; then + exit 1 +fi +# Remove the lock file on the shared volume +echo "Removing the <%= p('stratos_ui.backend.upgrade_volume_file') %> file from the shared upgrade volume <%= p('stratos_ui.backend.upgrade_volume_path') %>." +rm <%= p('stratos_ui.backend.upgrade_volume_path') %>/<%= p('stratos_ui.backend.upgrade_volume_file') %> || true + +echo "Removed the upgrade lock file." + +exit 0 +<% end %> diff --git a/deploy/stratos-ui-release/jobs/backend/templates/pre-start.erb b/deploy/stratos-ui-release/jobs/backend/templates/pre-start.erb new file mode 100644 index 0000000000..3452e8278a --- /dev/null +++ b/deploy/stratos-ui-release/jobs/backend/templates/pre-start.erb @@ -0,0 +1,24 @@ +#!/bin/sh +set -e + +# Step 1 - Set the lock file on the shared volume +mkdir -p <%= p('stratos_ui.backend.upgrade_volume_path') %> +<% if p('stratos_ui.backend.use_mysql') == true %> +touch <%= p('stratos_ui.backend.upgrade_volume_path') %>/<%= p('stratos_ui.backend.upgrade_volume_file') %> +chmod 440 <%= p('stratos_ui.backend.upgrade_volume_path') %>/<%= p('stratos_ui.backend.upgrade_volume_file') %> +echo "Created the upgrade lock file." +<% end %> + +# Step 2 - Create an AES-256 compliant encryption key +# in a file on a shared volume. +echo "Checking to see if we need to generate the encryption key <%= p('stratos_ui.backend.encryption_key_filename') %> file:" +if [ ! -e <%= p('stratos_ui.backend.encryption_key_volume') %>/<%= p('stratos_ui.backend.encryption_key_filename') %> ]; then + echo "-- Adding <%= p('stratos_ui.backend.encryption_key_filename') %> file to the shared volume <%= p('stratos_ui.backend.encryption_key_volume') %>." + keyfile=$(openssl enc -aes-256-cbc -k secret -P -md sha1 | grep key | cut -d '=' -f2) + printf "%s" "$keyfile" > <%= p('stratos_ui.backend.encryption_key_volume') %>/<%= p('stratos_ui.backend.encryption_key_filename') %> + chmod 440 <%= p('stratos_ui.backend.encryption_key_volume') %>/<%= p('stratos_ui.backend.encryption_key_filename') %> + echo "-- Done." +fi + +exit 0 + diff --git a/deploy/stratos-ui-release/jobs/backend/templates/ssl_cert.erb b/deploy/stratos-ui-release/jobs/backend/templates/ssl_cert.erb new file mode 100644 index 0000000000..38180c2263 --- /dev/null +++ b/deploy/stratos-ui-release/jobs/backend/templates/ssl_cert.erb @@ -0,0 +1 @@ +<%= p('stratos_ui.backend.ssl_cert') %> diff --git a/deploy/stratos-ui-release/jobs/backend/templates/ssl_cert_key.erb b/deploy/stratos-ui-release/jobs/backend/templates/ssl_cert_key.erb new file mode 100644 index 0000000000..4badf77826 --- /dev/null +++ b/deploy/stratos-ui-release/jobs/backend/templates/ssl_cert_key.erb @@ -0,0 +1 @@ +<%= p('stratos_ui.backend.ssl_cert_key') %> diff --git a/deploy/stratos-ui-release/jobs/frontend/monit b/deploy/stratos-ui-release/jobs/frontend/monit new file mode 100644 index 0000000000..7395a7ab46 --- /dev/null +++ b/deploy/stratos-ui-release/jobs/frontend/monit @@ -0,0 +1,5 @@ +check process nginx + with pidfile /var/vcap/sys/run/nginx/nginx.pid + start program = "/bin/bash -c '/var/vcap/jobs/frontend/bin/nginx_ctl start'" + stop program = "/bin/bash -c '/var/vcap/jobs/frontend/bin/nginx_ctl stop'" + group vcap diff --git a/deploy/stratos-ui-release/jobs/frontend/spec b/deploy/stratos-ui-release/jobs/frontend/spec new file mode 100644 index 0000000000..040a9c0cd5 --- /dev/null +++ b/deploy/stratos-ui-release/jobs/frontend/spec @@ -0,0 +1,24 @@ +--- +name: frontend +templates: + nginx.conf.erb: config/nginx.conf + ssl_cert.erb: config/nginx.crt + ssl_cert_key.erb: config/nginx.key + nginx_ctl.erb: bin/nginx_ctl + +packages: +- nginx +- frontend +- utils + +properties: + stratos_ui.backend.host: + description: "Host deploying the backend" + default: localhost + stratos_ui.backend.port: + description: "Port the backend is listening on" + default: 443 + stratos_ui.frontend.ssl_cert: + description: "SSL certificate" + stratos_ui.frontend.ssl_cert_key: + description: "SSL certificate key" diff --git a/deploy/stratos-ui-release/jobs/frontend/templates/nginx.conf.erb b/deploy/stratos-ui-release/jobs/frontend/templates/nginx.conf.erb new file mode 100644 index 0000000000..e770455b9b --- /dev/null +++ b/deploy/stratos-ui-release/jobs/frontend/templates/nginx.conf.erb @@ -0,0 +1,75 @@ +worker_processes 2; + +events { + worker_connections 4096; + use epoll; +} + +http { + + upstream portalproxy { + least_conn; + server <%= p('stratos_ui.backend.host') %>:<%= p('stratos_ui.backend.port') %>; + keepalive 32; + } + + add_header X-Frame-Options DENY; + + include /var/vcap/packages/nginx/conf/mime.types; + default_type application/octet-stream; + keepalive_timeout 70; + proxy_read_timeout 200; + sendfile off; + tcp_nopush on; + tcp_nodelay on; + gzip on; + gzip_min_length 1000; + gzip_proxied any; + gzip_types text/plain text/html text/css text/xml + application/x-javascript application/xml + application/atom+xml text/javascript; + + proxy_next_upstream error; + + map $http_upgrade $connection_upgrade { + default upgrade; + '' ''; + } + + ssl_session_cache shared:SSL:10m; + ssl_session_timeout 10m; + + server { + listen 80; + return 301 https://$host$request_uri; + } + + server { + listen 443 ssl; + + ssl_certificate /var/vcap/jobs/frontend/config/nginx.crt; + ssl_certificate_key /var/vcap/jobs/frontend/config/nginx.key; + ssl_protocols TLSv1 TLSv1.1 TLSv1.2; + ssl_ciphers HIGH:!aNULL:!MD5; + + client_max_body_size 50M; + + location /pp/ { + proxy_pass_header Server; + proxy_set_header Host $http_host; + proxy_redirect off; + proxy_set_header X-Real-IP $remote_addr; + proxy_set_header X-Scheme $scheme; + proxy_pass https://portalproxy/; + proxy_intercept_errors on; + proxy_http_version 1.1; + proxy_set_header Upgrade $http_upgrade; + proxy_set_header Connection $connection_upgrade; + } + + location / { + root /var/vcap/packages/frontend; + add_header Cache-Control no-cache; + } + } +} diff --git a/deploy/stratos-ui-release/jobs/frontend/templates/nginx_ctl.erb b/deploy/stratos-ui-release/jobs/frontend/templates/nginx_ctl.erb new file mode 100644 index 0000000000..0ab5b92174 --- /dev/null +++ b/deploy/stratos-ui-release/jobs/frontend/templates/nginx_ctl.erb @@ -0,0 +1,26 @@ + +#!/bin/bash -e + +RUN_DIR="/var/vcap/sys/run/nginx" +LOG_DIR="/var/vcap/sys/log/nginx" +PIDFILE="${RUN_DIR}/nginx.pid" +CONFIG_DIR="/var/vcap/jobs/frontend/config" + +mkdir -p $RUN_DIR $LOG_DIR $CONFIG_DIR + +source /var/vcap/packages/utils/syslog_utils.sh +source /var/vcap/packages/utils/pid_utils.sh +tee_output_to_sys_log_and_file "${LOG_DIR}" "$(basename "$0")" + +case $1 in + + start) + /var/vcap/packages/nginx/sbin/nginx -g "pid $PIDFILE;" -c "${CONFIG_DIR}/nginx.conf" + ;; + stop) + kill $(cat $PIDFILE) + ;; + *) + echo "Usage: nginx_ctl {start|stop}" + ;; +esac \ No newline at end of file diff --git a/deploy/stratos-ui-release/jobs/frontend/templates/ssl_cert.erb b/deploy/stratos-ui-release/jobs/frontend/templates/ssl_cert.erb new file mode 100644 index 0000000000..081bdf03dc --- /dev/null +++ b/deploy/stratos-ui-release/jobs/frontend/templates/ssl_cert.erb @@ -0,0 +1 @@ +<%= p('stratos_ui.frontend.ssl_cert') %> diff --git a/deploy/stratos-ui-release/jobs/frontend/templates/ssl_cert_key.erb b/deploy/stratos-ui-release/jobs/frontend/templates/ssl_cert_key.erb new file mode 100644 index 0000000000..8b41d9db5c --- /dev/null +++ b/deploy/stratos-ui-release/jobs/frontend/templates/ssl_cert_key.erb @@ -0,0 +1 @@ +<%= p('stratos_ui.frontend.ssl_cert_key') %> diff --git a/deploy/stratos-ui-release/packages/backend/packaging b/deploy/stratos-ui-release/packages/backend/packaging new file mode 100644 index 0000000000..818ec980f2 --- /dev/null +++ b/deploy/stratos-ui-release/packages/backend/packaging @@ -0,0 +1,4 @@ +# abort script on any command that exits with a non zero value +set -e + +cp -ar ./stratos-ui/* ${BOSH_INSTALL_TARGET} diff --git a/deploy/stratos-ui-release/packages/backend/pre_packaging b/deploy/stratos-ui-release/packages/backend/pre_packaging new file mode 100644 index 0000000000..e5d8cd7991 --- /dev/null +++ b/deploy/stratos-ui-release/packages/backend/pre_packaging @@ -0,0 +1,30 @@ +# abort script on any command that exits with a non zero value +set -ex + +cd ${BUILD_DIR}/stratos-ui +# Install Glide +build/tools/get-glide.sh + +# Build backend +npm install +export PATH=$PATH:$PWD/node_modules/.bin +npm run build-backend + +find ../stratos-ui/deploy -type d ! -path '../stratos-ui/deploy' ! -path '*/db' -maxdepth 1 | xargs rm -rf + +find ../stratos-ui -type d ! -path '*/outputs*' ! -path '*/deploy' ! -path '../stratos-ui' -maxdepth 1 | xargs rm -rf +# Delete top level files +rm -f *.* +mv outputs/* . +rm -rf outputs + + +# The following packages are required for the post-deploy task +mkdir go +export GOPATH=${PWD}/go + +# Fetch libraries +go get bitbucket.org/liamstask/goose/cmd/goose +go get bitbucket.org/liamstask/goose/lib/goose +go get github.com/go-sql-driver/mysql + diff --git a/deploy/stratos-ui-release/packages/backend/spec b/deploy/stratos-ui-release/packages/backend/spec new file mode 100644 index 0000000000..cc4df55676 --- /dev/null +++ b/deploy/stratos-ui-release/packages/backend/spec @@ -0,0 +1,11 @@ +--- +name: backend + +dependencies: +- golang + +files: +- stratos-ui/{package.json,plugins.json,bower.json,gulpfile.js} +- stratos-ui/{build,components}/**/* +- stratos-ui/deploy/db/migrations/**/*.go +- stratos-ui/deploy/db/sqlite_schema.sql diff --git a/deploy/stratos-ui-release/packages/frontend/packaging b/deploy/stratos-ui-release/packages/frontend/packaging new file mode 100644 index 0000000000..07dd36979c --- /dev/null +++ b/deploy/stratos-ui-release/packages/frontend/packaging @@ -0,0 +1,4 @@ +# abort script on any command that exits with a non zero value +set -e + +cp -a ./stratos-ui/* ${BOSH_INSTALL_TARGET} diff --git a/deploy/stratos-ui-release/packages/frontend/pre_packaging b/deploy/stratos-ui-release/packages/frontend/pre_packaging new file mode 100644 index 0000000000..6217001326 --- /dev/null +++ b/deploy/stratos-ui-release/packages/frontend/pre_packaging @@ -0,0 +1,17 @@ +# abort script on any command that exits with a non zero value +set -e -x + +cd ${BUILD_DIR}/stratos-ui + +npm install +export PATH=$PATH:$PWD/node_modules/.bin +bower install +npm run build + +# remove things we don't need +find ../stratos-ui -type d ! -path '*/dist*' ! -path '../stratos-ui' -maxdepth 1 | xargs rm -rf +# Delete top level files +rm -f *.* +# Move dist to top level +mv dist/* . +rm -rf dist diff --git a/deploy/stratos-ui-release/packages/frontend/spec b/deploy/stratos-ui-release/packages/frontend/spec new file mode 100644 index 0000000000..ae7f0b823b --- /dev/null +++ b/deploy/stratos-ui-release/packages/frontend/spec @@ -0,0 +1,9 @@ +--- +name: frontend + +dependencies: +- nginx + +files: +- stratos-ui/{package.json,plugins.json,bower.json,gulpfile.js} +- stratos-ui/{build,components}/**/* diff --git a/deploy/stratos-ui-release/packages/golang/packaging b/deploy/stratos-ui-release/packages/golang/packaging new file mode 100644 index 0000000000..1974f235f9 --- /dev/null +++ b/deploy/stratos-ui-release/packages/golang/packaging @@ -0,0 +1,4 @@ +set -e + +tar xzf golang/go1.8.3.linux-amd64.tar.gz +cp -R go/* ${BOSH_INSTALL_TARGET} diff --git a/deploy/stratos-ui-release/packages/golang/spec b/deploy/stratos-ui-release/packages/golang/spec new file mode 100644 index 0000000000..1087c543fd --- /dev/null +++ b/deploy/stratos-ui-release/packages/golang/spec @@ -0,0 +1,5 @@ +--- +name: golang + +files: + - golang/go1.8.3.linux-amd64.tar.gz diff --git a/deploy/stratos-ui-release/packages/nginx/README.md b/deploy/stratos-ui-release/packages/nginx/README.md new file mode 100644 index 0000000000..20e73c5b8d --- /dev/null +++ b/deploy/stratos-ui-release/packages/nginx/README.md @@ -0,0 +1,14 @@ +nginx-package +============ + +TODO: update this readme + +This repo is used for nginx and nginx-webdav packaging in BOSH deployments. + +The files can be downloaded from the following locations: + +| Filename | Download URL | +| -------- | ------------ | +| nginx-1.11.13.tar.gz | [nginx.org](http://nginx.org/download/nginx-1.11.13.tar.gz) | +| headers-more-nginx-module-0.32.tar.gz | [github.com/openresty/headers-more-nginx-module](https://github.com/openresty/headers-more-nginx-module/archive/v0.32.tar.gz) | +| pcre-8.40.tar.gz | [pcre.org](ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/pcre-8.40.tar.gz) | diff --git a/deploy/stratos-ui-release/packages/nginx/packaging b/deploy/stratos-ui-release/packages/nginx/packaging new file mode 100644 index 0000000000..883bdca118 --- /dev/null +++ b/deploy/stratos-ui-release/packages/nginx/packaging @@ -0,0 +1,19 @@ +set -e -x + +echo "Extracting pcre..." +tar xzvf nginx/pcre-8.40.tar.gz + +echo "Extracting nginx..." +tar xzvf nginx/nginx-1.11.13.tar.gz + +echo "Building nginx..." +pushd nginx-1.11.13 + ./configure \ + --prefix=${BOSH_INSTALL_TARGET} \ + --with-pcre=../pcre-8.40 \ + --with-http_stub_status_module \ + --with-http_ssl_module + + make + make install +popd diff --git a/deploy/stratos-ui-release/packages/nginx/spec b/deploy/stratos-ui-release/packages/nginx/spec new file mode 100644 index 0000000000..ed312aab0f --- /dev/null +++ b/deploy/stratos-ui-release/packages/nginx/spec @@ -0,0 +1,5 @@ +--- +name: nginx +files: +- nginx/nginx-1.11.13.tar.gz +- nginx/pcre-8.40.tar.gz diff --git a/deploy/stratos-ui-release/packages/utils/packaging b/deploy/stratos-ui-release/packages/utils/packaging new file mode 100644 index 0000000000..743f62e2c2 --- /dev/null +++ b/deploy/stratos-ui-release/packages/utils/packaging @@ -0,0 +1,3 @@ +set -e -x + +cp -a ./utils/* ${BOSH_INSTALL_TARGET} diff --git a/deploy/stratos-ui-release/packages/utils/spec b/deploy/stratos-ui-release/packages/utils/spec new file mode 100644 index 0000000000..ae2e9f971b --- /dev/null +++ b/deploy/stratos-ui-release/packages/utils/spec @@ -0,0 +1,5 @@ +--- +name: utils +files: +- utils/pid_utils.sh +- utils/syslog_utils.sh diff --git a/deploy/stratos-ui-release/src/stratos-ui b/deploy/stratos-ui-release/src/stratos-ui new file mode 120000 index 0000000000..1b20c9fb81 --- /dev/null +++ b/deploy/stratos-ui-release/src/stratos-ui @@ -0,0 +1 @@ +../../../ \ No newline at end of file diff --git a/deploy/stratos-ui-release/src/utils/pid_utils.sh b/deploy/stratos-ui-release/src/utils/pid_utils.sh new file mode 100644 index 0000000000..5bfa4325fc --- /dev/null +++ b/deploy/stratos-ui-release/src/utils/pid_utils.sh @@ -0,0 +1,123 @@ +#!/usr/bin/env bash + +function pid_is_running() { + declare pid="$1" + ps -p "${pid}" >/dev/null 2>&1 +} + +# pid_guard +# +# @param pidfile +# @param name [String] an arbitrary name that might show up in STDOUT on errors +# +# Run this before attempting to start new processes that may use the same :pidfile:. +# If an old process is running on the pid found in the :pidfile:, exit 1. Otherwise, +# remove the stale :pidfile: if it exists. +# +function pid_guard() { + declare pidfile="$1" name="$2" + + echo "------------ STARTING $(basename "$0") at $(date) --------------" | tee /dev/stderr + + if [ ! -f "${pidfile}" ]; then + return 0 + fi + + local pid + pid=$(head -1 "${pidfile}") + + if pid_is_running "${pid}"; then + echo "${name} is already running, please stop it first" + exit 1 + fi + + echo "Removing stale pidfile" + rm "${pidfile}" +} + +# wait_pid_death +# +# @param pid +# @param timeout +# +# Watch a :pid: for :timeout: seconds, waiting for it to die. +# If it dies before :timeout:, exit 0. If not, exit 1. +# +# Note that this should be run in a subshell, so that the current +# shell does not exit. +# +function wait_pid_death() { + declare pid="$1" timeout="$2" + + local countdown + countdown=$(( timeout * 10 )) + + while true; do + if ! pid_is_running "${pid}"; then + return 0 + fi + + if [ ${countdown} -le 0 ]; then + return 1 + fi + + countdown=$(( countdown - 1 )) + sleep 0.1 + done +} + +# kill_and_wait +# +# @param pidfile +# @param timeout [default 25s] +# +# For a pid found in :pidfile:, send a `kill -15` TERM, then wait for :timeout: seconds to +# see if it dies on its own. If not, send it a `kill -9`. If the process does die, +# exit 0 and remove the :pidfile:. If after all of this, the process does not actually +# die, exit 1. +# +# Note: +# Monit default timeout for start/stop is 30s +# Append 'with timeout {n} seconds' to monit start/stop program configs +# +function kill_and_wait() { + declare pidfile="$1" timeout="${2:-25}" sigkill_on_timeout="${3:-1}" + + if [ ! -f "${pidfile}" ]; then + echo "Pidfile ${pidfile} doesn't exist" + exit 0 + fi + + local pid + pid=$(head -1 "${pidfile}") + + if [ -z "${pid}" ]; then + echo "Unable to get pid from ${pidfile}" + exit 1 + fi + + if ! pid_is_running "${pid}"; then + echo "Process ${pid} is not running" + rm -f "${pidfile}" + exit 0 + fi + + echo "Killing ${pidfile}: ${pid} " + kill "${pid}" + + if ! wait_pid_death "${pid}" "${timeout}"; then + if [ "${sigkill_on_timeout}" = "1" ]; then + echo "Kill timed out, using kill -9 on ${pid}" + kill -9 "${pid}" + sleep 0.5 + fi + fi + + if pid_is_running "${pid}"; then + echo "Timed Out" + exit 1 + else + echo "Stopped" + rm -f "${pidfile}" + fi +} diff --git a/deploy/stratos-ui-release/src/utils/syslog_utils.sh b/deploy/stratos-ui-release/src/utils/syslog_utils.sh new file mode 100644 index 0000000000..94b968edd7 --- /dev/null +++ b/deploy/stratos-ui-release/src/utils/syslog_utils.sh @@ -0,0 +1,32 @@ +#!/usr/bin/env bash + +# tee_output_to_sys_log_and_file +# +# @param log_dir [String] the directory where the log file should be written +# @param log_name [String] used to name the log files eg: log_name.log and log_name.err.log +# used to tag the syslog message eg: vcap.log_name.stdout and vcap.log_name.stderr +# +# Send stdout and stderr to syslog as well as a specified file. Prepends datetime to output in the log file. +function tee_output_to_sys_log_and_file { + declare log_dir="$1" log_name="$2" + + exec > >(tee -a >(logger -p user.info -t "vcap.${log_name}.stdout") | prepend_datetime >>"${log_dir}/${log_name}.log") + exec 2> >(tee -a >(logger -p user.error -t "vcap.${log_name}.stderr") | prepend_datetime >>"${log_dir}/${log_name}.err.log") +} + +# tee_output_to_sys_log +# +# @param log_name [String] used to name the log files eg: log_name.log and log_name.err.log +# used to tag the syslog message eg: vcap.log_name.stdout and vcap.log_name.stderr +# +# Send stdout and stderr to syslog . Prepends datetime to stdout and stderr. +function tee_output_to_sys_log { + declare log_name="$1" + + exec > >(tee -a >(logger -p user.info -t "vcap.${log_name}.stdout") | prepend_datetime >> /dev/stdout) + exec 2> >(tee -a >(logger -p user.error -t "vcap.${log_name}.stderr") | prepend_datetime >> /dev/stderr) +} + +function prepend_datetime { + awk -W interactive '{ system("echo -n [$(date +\"%Y-%m-%d %H:%M:%S%z\")]"); print " " $0 }' +} diff --git a/deploy/ci/scripts/generate_cert.sh b/deploy/tools/generate_cert.sh similarity index 68% rename from deploy/ci/scripts/generate_cert.sh rename to deploy/tools/generate_cert.sh index 36d3d8aa02..a49e328354 100755 --- a/deploy/ci/scripts/generate_cert.sh +++ b/deploy/tools/generate_cert.sh @@ -1,14 +1,14 @@ #!/bin/sh # Settings -devcerts_path=${DEV_CERTS_PATH:-portal-proxy-output/dev-certs} -domain=pproxy -commonname=192.168.99.100 -country=US -state=Washington -locality=Seattle +devcerts_path=${CERTS_PATH:-portal-proxy-output/dev-certs} +domain=${DEV_CERTS_DOMAIN:-pproxy} +commonname=127.0.0.1 +country=UK +state=Bristol +locality=Bristol organization=SUSE -organizationalunit=HDP +organizationalunit=CAP email=SUSE # Generate a key and cert diff --git a/deploy/uaa/README.md b/deploy/uaa/README.md new file mode 100644 index 0000000000..8374ade94d --- /dev/null +++ b/deploy/uaa/README.md @@ -0,0 +1,20 @@ +# Local UAA from Build + +1. Run the prep script + +``` +./prepare.sh +``` + +2. Build the docker image + +``` +sudo docker build -f Dockerfile.dev -t local-uaa . +``` + +3. Create the container +``` +sudo docker run -p 8080:8080 local-uaa +``` + +The UAA instance will then be available at http://localhost:8080 \ No newline at end of file diff --git a/docs/development.md b/docs/development.md index 5edb089462..85fdae33b2 100644 --- a/docs/development.md +++ b/docs/development.md @@ -3,15 +3,21 @@ > **Note:** This document is work in progress. -The Stratos Console UI provides a single comprehensive and ubiquitous user -experience for: discovering, composing, developing and managing Cloud Native -workloads which are hosted in a myriad of: public, managed and private +The Stratos Console UI provides a single comprehensive and ubiquitous user +experience for: discovering, composing, developing and managing Cloud Native +workloads which are hosted in a myriad of: public, managed and private cloud/compute providers. 1. [Working on the front-end component](#working-on-the-front-end-component) 2. [Working on the back-end component](#working-on-the-backend-component) 3. [Testing](#testing) +## Dependencies + +### Node +Please check the `engine` entry of the package.json file for the required node version. + > **Note:** To manage node versions we recommend using [nvm](https://github.com/creationix/nvm) + ## Components The top-level repository contains three folders worth calling out: @@ -53,15 +59,15 @@ Other components can be included to add additional items to the navigation bar a ### Source Code Structure -The frontend code is split into component directories as listed above. -The standard set of components that exist in the console contain functionality +The frontend code is split into component directories as listed above. +The standard set of components that exist in the console contain functionality to manage Cloud Foundry instances and their applications. -The frontend code is usually found within a `frontend` folder and contains +The frontend code is usually found within a `frontend` folder and contains a structure such as that in app-core/frontend component, for example: ``` |-- frontend -| |-- assets +| |-- assets | |-- i18n | | -- en | |-- src @@ -82,16 +88,16 @@ i18n | Internationalization strings per locale. By default the console contains src | Javascript, html and scss related to the component test | Unit tests for the component -> **Note:** The bower.json is in the root of the component +> **Note:** The bower.json is in the root of the component ### Style Sheets -The frontend defines styles in SCSS which is converted to CSS at build time. -Each component is responsible for specifying it's root scss as a 'main' file -in it's bower.json. From this all other +The frontend defines styles in SCSS which is converted to CSS at build time. +Each component is responsible for specifying it's root scss as a 'main' file +in it's bower.json. From this all other component scss are gathered. ### Build Process -The build process uses gulp, see the the root gulpfile.js. Below is a list +The build process uses gulp, see the the root gulpfile.js. Below is a list of important gulp tasks. Gulp task name | Description @@ -103,14 +109,14 @@ lint | Executes linting via eslint. See ./.eslintrc for rules > **Note:** When using the `dev` task, web sockets do not get forwarded, so log streaming and ssh access will not work - use the `run` task to test these. -Some tasks can be accessed via npm, by running `npm script target` along with additional test +Some tasks can be accessed via npm, by running `npm script target` along with additional test functionality: NPM script name | Description ----------------|------------ lint | Same as gulp lint coverage | Executes both unit and e2e tests and provides a combined coverage report in `./out/coverage-report` -gate-check | Executes lint and unit tests, very handy to use before creating a PR +gate-check | Executes lint and unit tests, very handy to use before creating a PR e2e | Executes end to end tests via protractor, also handy to use before creating a PR. Screenshots of the console for each failure can be found in ./out/e2e-failures test | Executes unit tests @@ -118,13 +124,13 @@ test | Executes unit tests ### Run the frontend via gulp #### Requirements -The Console backend must be up and contactable by the developers machine. -This can be achieved via any of the methods +The Console backend must be up and contactable by the developers machine. +This can be achieved via any of the methods described in the [deploy](../deploy/README.md) instructions. #### Configuration -The Console frontend must know the address of the backend. This can be -set by creating the file ./build/dev_config.js +The Console frontend must know the address of the backend. This can be +set by creating the file ./build/dev_config.js with contents such as ``` { @@ -169,8 +175,8 @@ $ gulp lint ### Creating a successful Pull Request in github -For every new pull request, or commit to an existing request, the CI will -run a build against the requests HEAD. Before creating a PR or pushing to +For every new pull request, or commit to an existing request, the CI will +run a build against the requests HEAD. Before creating a PR or pushing to one please ensure the following two requests execute successfully ``` @@ -189,29 +195,52 @@ $ npm run e2e The portal-proxy is the back-end for the Console UI. It is written in Go. -#### Set a GOPATH +> **NOTE** WIP Instructions -#### Clone the project +#### Introduction +* Golang +* Dependency Management (Glide) -#### Dependency Management (Glide) +#### Dependencies +* go + * GOPATH, GOBIN env vars set +* glide +* UAA instance -#### Set environment variables +#### Running portal-proxy in a container +* Follow instructions in the deploy/docker-compose docs +* To apply changes (build and update docker image) simply run `deploy/tools/restart_proxy.sh` -#### Set up developer certs +#### Running "like a dev" -#### Tests +1. Set up developer certs + - Execute `deploy/ci/scripts/generate_cert.sh` + - Copy `deploy/ci/scripts/portal-proxy-output/dev-certs` to `./` +1. cd ./outputs +1. Run `gulp build-backend` +1. Update `./outputs/config.propeties` -##### Unit Testing +docker-compose +dev certs - deploy/ci/scripts/generate_cert.sh +copy deploy/ci/scripts/portal-proxy-output/dev-certs to ./ + +portal run +go and glide installed +dev_config localDevBuild true -#### Running portal-proxy in a container -#### Running "like a dev" -#### Running "like production" +copy deploy/cloud-foundry/config.properties +uaa running locally +gulp build-backend +chown /usr/local/go/ +gcc? https://randomgeekery.org/post/2014/what-is-build-essentials-for-opensuse +chmod 755 portal-proxy -##### Run the build +#### Tests + +##### Unit Testing -##### Run the server ## Testing @@ -242,8 +271,8 @@ $ npm run e2e #### Continuous Integration -Pull request submitted to the stratos-ui project will run through -frontend unit tests, backend unit tests and integration tests. The -concourse server which executes these is currently not available -externally. The result however can still be seen by the usual +Pull request submitted to the stratos-ui project will run through +frontend unit tests, backend unit tests and integration tests. The +concourse server which executes these is currently not available +externally. The result however can still be seen by the usual indications posted by github to the PR's page. diff --git a/docs/issue_template.md b/docs/issue_template.md new file mode 100644 index 0000000000..f496c5052f --- /dev/null +++ b/docs/issue_template.md @@ -0,0 +1,17 @@ +### Deployment type +* [ ] Cloud Foundry Application (cf push) +* [ ] Kubernetes, using a helm chart +* [ ] Docker, using docker compose +* [ ] Docker, single container deploying all components +* [ ] Other (please provide below) + +### Expected behaviour + +### Actual behaviour + +### Steps to reproduce the behavior + +### Log output covering before error and any error statements +``` +Insert log here +``` diff --git a/index.yaml b/index.yaml index 5ae7c89ceb..19d6b324fd 100755 --- a/index.yaml +++ b/index.yaml @@ -1,6 +1,14 @@ apiVersion: v1 entries: console: + - apiVersion: v1 + created: 2017-08-21T16:05:19.606723792Z + description: A Helm chart for deploying Console + digest: 488b5011edcc0b22a28f4e70e576351cc6b9f0f34198fb366cc53cddc197c9d1 + name: console + urls: + - https://github.com/suse/stratos-ui/releases/download/0.9.2/console-helm-chart-0.9.2.tgz + version: 0.9.2 - apiVersion: v1 created: 2017-08-01T10:54:22.706325757Z description: A Helm chart for deploying Console @@ -17,4 +25,4 @@ entries: urls: - https://github.com/suse/stratos-ui/releases/download/0.9.0/console-helm-chart-0.9.0.tgz version: 0.9.0 -generated: 2017-08-01T10:54:22.705906189Z +generated: 2017-08-21T16:05:19.605355723Z diff --git a/package-lock.json b/package-lock.json new file mode 100644 index 0000000000..3094b5d3f6 --- /dev/null +++ b/package-lock.json @@ -0,0 +1,11175 @@ +{ + "name": "stratos-ui", + "version": "0.9.0", + "lockfileVersion": 1, + "requires": true, + "dependencies": { + "@types/node": { + "version": "6.0.85", + "resolved": "https://registry.npmjs.org/@types/node/-/node-6.0.85.tgz", + "integrity": "sha512-6qLZpfQFO/g5Ns2e7RsW6brk0Q6Xzwiw7kVVU/XiQNOiJXSojhX76GP457PBYIsNMH2WfcGgcnZB4awFDHrwpA==", + "dev": true + }, + "@types/q": { + "version": "0.0.32", + "resolved": "https://registry.npmjs.org/@types/q/-/q-0.0.32.tgz", + "integrity": "sha1-vShOV8hPEyXacCur/IKlMoGQwMU=", + "dev": true + }, + "abbrev": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.0.tgz", + "integrity": "sha1-0FVMIlZjbi9W58LlrRg/hZQo2B8=" + }, + "accepts": { + "version": "1.3.3", + "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.3.tgz", + "integrity": "sha1-w8p0NJOGSMPg2cHjKN1otiLChMo=", + "dev": true, + "requires": { + "mime-types": "2.1.16", + "negotiator": "0.6.1" + } + }, + "acorn": { + "version": "2.6.4", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-2.6.4.tgz", + "integrity": "sha1-6x9FtKQ/ox0DcBpexG87Umc+kO4=" + }, + "acorn-jsx": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-3.0.1.tgz", + "integrity": "sha1-r9+UiPsezvyDSPb7IvRk4ypYs2s=", + "dev": true, + "requires": { + "acorn": "3.3.0" + }, + "dependencies": { + "acorn": { + "version": "3.3.0", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-3.3.0.tgz", + "integrity": "sha1-ReN/s56No/JbruP/U2niu18iAXo=", + "dev": true + } + } + }, + "adm-zip": { + "version": "0.4.7", + "resolved": "https://registry.npmjs.org/adm-zip/-/adm-zip-0.4.7.tgz", + "integrity": "sha1-hgbCy/HEJs6MjsABdER/1Jtur8E=", + "dev": true + }, + "after": { + "version": "0.8.1", + "resolved": "https://registry.npmjs.org/after/-/after-0.8.1.tgz", + "integrity": "sha1-q11PuIP1loFtNRX495HAr0ht1ic=", + "dev": true + }, + "agent-base": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-2.1.1.tgz", + "integrity": "sha1-1t4Q1a9hMtW9aSQn1G/FOFOQlMc=", + "dev": true, + "requires": { + "extend": "3.0.1", + "semver": "5.0.3" + }, + "dependencies": { + "semver": { + "version": "5.0.3", + "resolved": "https://registry.npmjs.org/semver/-/semver-5.0.3.tgz", + "integrity": "sha1-d0Zt5YnNXTyV8TiqeLxWmjy10no=", + "dev": true + } + } + }, + "ajv": { + "version": "4.11.8", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-4.11.8.tgz", + "integrity": "sha1-gv+wKynmYq5TvcIK8VlHcGc5xTY=", + "requires": { + "co": "4.6.0", + "json-stable-stringify": "1.0.1" + } + }, + "ajv-keywords": { + "version": "1.5.1", + "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-1.5.1.tgz", + "integrity": "sha1-MU3QpLM2j609/NxU7eYXG4htrzw=", + "dev": true + }, + "align-text": { + "version": "0.1.4", + "resolved": "https://registry.npmjs.org/align-text/-/align-text-0.1.4.tgz", + "integrity": "sha1-DNkKVhCT810KmSVsIrcGlDP60Rc=", + "requires": { + "kind-of": "3.2.2", + "longest": "1.0.1", + "repeat-string": "1.6.1" + } + }, + "alter": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/alter/-/alter-0.2.0.tgz", + "integrity": "sha1-x1iICGF1cgNKrmJICvJrHU0cs80=", + "requires": { + "stable": "0.1.6" + } + }, + "amdefine": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/amdefine/-/amdefine-1.0.1.tgz", + "integrity": "sha1-SlKCrBZHKek2Gbz9OtFR+BfOkfU=" + }, + "ansi-escapes": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-1.4.0.tgz", + "integrity": "sha1-06ioOzGapneTZisT52HHkRQiMG4=" + }, + "ansi-regex": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz", + "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=" + }, + "ansi-styles": { + "version": "2.2.1", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz", + "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=" + }, + "anymatch": { + "version": "1.3.2", + "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-1.3.2.tgz", + "integrity": "sha512-0XNayC8lTHQ2OI8aljNCN3sSx6hsr/1+rlcDAotXJR7C1oZZHCNsfpbKwMjRA3Uqb5tF1Rae2oloTr4xpq+WjA==", + "dev": true, + "requires": { + "micromatch": "2.3.11", + "normalize-path": "2.1.1" + } + }, + "aproba": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/aproba/-/aproba-1.1.2.tgz", + "integrity": "sha512-ZpYajIfO0j2cOFTO955KUMIKNmj6zhX8kVztMAxFsDaMwz+9Z9SV0uou2pC9HJqcfpffOsjnbrDMvkNy+9RXPw==" + }, + "archive-type": { + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/archive-type/-/archive-type-3.2.0.tgz", + "integrity": "sha1-nNnABpV+vpX62tW9YJiUKoE3N/Y=", + "dev": true, + "requires": { + "file-type": "3.9.0" + }, + "dependencies": { + "file-type": { + "version": "3.9.0", + "resolved": "https://registry.npmjs.org/file-type/-/file-type-3.9.0.tgz", + "integrity": "sha1-JXoHg4TR24CHvESdEH1SpSZyuek=", + "dev": true + } + } + }, + "archy": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/archy/-/archy-1.0.0.tgz", + "integrity": "sha1-+cjBN1fMHde8N5rHeyxipcKGjEA=" + }, + "are-we-there-yet": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.1.4.tgz", + "integrity": "sha1-u13KOCu5TwXhUZQ3PRb9O6HKEQ0=", + "requires": { + "delegates": "1.0.0", + "readable-stream": "2.3.3" + }, + "dependencies": { + "isarray": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", + "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=" + }, + "readable-stream": { + "version": "2.3.3", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.3.tgz", + "integrity": "sha512-m+qzzcn7KUxEmd1gMbchF+Y2eIUbieUaxkWtptyHywrX0rE8QEYqPC07Vuy4Wm32/xE16NcdBctb8S0Xe/5IeQ==", + "requires": { + "core-util-is": "1.0.2", + "inherits": "2.0.3", + "isarray": "1.0.0", + "process-nextick-args": "1.0.7", + "safe-buffer": "5.1.1", + "string_decoder": "1.0.3", + "util-deprecate": "1.0.2" + } + }, + "string_decoder": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz", + "integrity": "sha512-4AH6Z5fzNNBcH+6XDMfA/BTt87skxqJlO0lAh3Dker5zThcAxG6mKz+iGu308UKoPPQ8Dcqx/4JhujzltRa+hQ==", + "requires": { + "safe-buffer": "5.1.1" + } + } + } + }, + "argparse": { + "version": "1.0.9", + "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.9.tgz", + "integrity": "sha1-c9g7wmP4bpf4zE9rrhsOkKfSLIY=", + "dev": true, + "requires": { + "sprintf-js": "1.0.3" + } + }, + "arr-diff": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-2.0.0.tgz", + "integrity": "sha1-jzuCf5Vai9ZpaX5KQlasPOrjVs8=", + "requires": { + "arr-flatten": "1.1.0" + } + }, + "arr-flatten": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/arr-flatten/-/arr-flatten-1.1.0.tgz", + "integrity": "sha512-L3hKV5R/p5o81R7O02IGnwpDmkp6E982XhtbuwSe3O4qOtMMMtodicASA1Cny2U+aCXcNpml+m4dPsvsJ3jatg==" + }, + "arr-union": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/arr-union/-/arr-union-3.1.0.tgz", + "integrity": "sha1-45sJrqne+Gao8gbiiK9jkZuuOcQ=" + }, + "array-differ": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/array-differ/-/array-differ-1.0.0.tgz", + "integrity": "sha1-7/UuN1gknTO+QCuLuOVkuytdQDE=" + }, + "array-each": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/array-each/-/array-each-1.0.1.tgz", + "integrity": "sha1-p5SvDAWrF1KEbudTofIRoFugxE8=" + }, + "array-find-index": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/array-find-index/-/array-find-index-1.0.2.tgz", + "integrity": "sha1-3wEKoSh+Fku9pvlyOwqWoexBh6E=" + }, + "array-flatten": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz", + "integrity": "sha1-ml9pkFGx5wczKPKgCJaLZOopVdI=", + "dev": true + }, + "array-slice": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/array-slice/-/array-slice-1.0.0.tgz", + "integrity": "sha1-5zA08A3MH0CHYAj9IP6ud71LfC8=" + }, + "array-union": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/array-union/-/array-union-1.0.2.tgz", + "integrity": "sha1-mjRBDk9OPaI96jdb5b5w8kd47Dk=", + "dev": true, + "requires": { + "array-uniq": "1.0.3" + } + }, + "array-uniq": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/array-uniq/-/array-uniq-1.0.3.tgz", + "integrity": "sha1-r2rId6Jcx/dOBYiUdThY39sk/bY=" + }, + "array-unique": { + "version": "0.2.1", + "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.2.1.tgz", + "integrity": "sha1-odl8yvy8JiXMcPrc6zalDFiwGlM=" + }, + "arraybuffer.slice": { + "version": "0.0.6", + "resolved": "https://registry.npmjs.org/arraybuffer.slice/-/arraybuffer.slice-0.0.6.tgz", + "integrity": "sha1-8zshWfBTKj8xB6JywMz70a0peco=", + "dev": true + }, + "arrify": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/arrify/-/arrify-1.0.1.tgz", + "integrity": "sha1-iYUI2iIm84DfkEcoRWhJwVAaSw0=", + "dev": true + }, + "asn1": { + "version": "0.2.3", + "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.3.tgz", + "integrity": "sha1-2sh4dxPJlmhJ/IGAd36+nB3fO4Y=" + }, + "assert-plus": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-0.2.0.tgz", + "integrity": "sha1-104bh+ev/A24qttwIfP+SBAasjQ=" + }, + "async": { + "version": "1.5.2", + "resolved": "https://registry.npmjs.org/async/-/async-1.5.2.tgz", + "integrity": "sha1-7GphrlZIDAw8skHJVhjiCJL5Zyo=" + }, + "async-array-reduce": { + "version": "0.2.1", + "resolved": "https://registry.npmjs.org/async-array-reduce/-/async-array-reduce-0.2.1.tgz", + "integrity": "sha1-yL4BCitc0A3qlsgRFgNGk9/dgtE=" + }, + "async-each": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/async-each/-/async-each-1.0.1.tgz", + "integrity": "sha1-GdOGodntxufByF04iu28xW0zYC0=", + "dev": true + }, + "async-each-series": { + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/async-each-series/-/async-each-series-0.1.1.tgz", + "integrity": "sha1-dhfBkXQB/Yykooqtzj266Yr+tDI=", + "dev": true + }, + "async-foreach": { + "version": "0.1.3", + "resolved": "https://registry.npmjs.org/async-foreach/-/async-foreach-0.1.3.tgz", + "integrity": "sha1-NhIfhFwFeBct5Bmpfb6x0W7DRUI=" + }, + "asynckit": { + "version": "0.4.0", + "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz", + "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k=" + }, + "autoprefixer": { + "version": "6.7.7", + "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-6.7.7.tgz", + "integrity": "sha1-Hb0cg1ZY41zj+ZhAmdsAWFx4IBQ=", + "requires": { + "browserslist": "1.7.7", + "caniuse-db": "1.0.30000715", + "normalize-range": "0.1.2", + "num2fraction": "1.2.2", + "postcss": "5.2.17", + "postcss-value-parser": "3.3.0" + } + }, + "aws-sign2": { + "version": "0.6.0", + "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.6.0.tgz", + "integrity": "sha1-FDQt0428yU0OW4fXY81jYSwOeU8=" + }, + "aws4": { + "version": "1.6.0", + "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.6.0.tgz", + "integrity": "sha1-g+9cqGCysy5KDe7e6MdxudtXRx4=" + }, + "babel-code-frame": { + "version": "6.22.0", + "resolved": "https://registry.npmjs.org/babel-code-frame/-/babel-code-frame-6.22.0.tgz", + "integrity": "sha1-AnYgvuVnqIwyVhV05/0IAdMxGOQ=", + "dev": true, + "requires": { + "chalk": "1.1.3", + "esutils": "2.0.2", + "js-tokens": "3.0.2" + } + }, + "babylon": { + "version": "7.0.0-beta.19", + "resolved": "https://registry.npmjs.org/babylon/-/babylon-7.0.0-beta.19.tgz", + "integrity": "sha512-Vg0C9s/REX6/WIXN37UKpv5ZhRi6A4pjHlpkE34+8/a6c2W1Q692n3hmc+SZG5lKRnaExLUbxtJ1SVT+KaCQ/A==", + "dev": true + }, + "backo2": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/backo2/-/backo2-1.0.2.tgz", + "integrity": "sha1-MasayLEpNjRj41s+u2n038+6eUc=", + "dev": true + }, + "balanced-match": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz", + "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=" + }, + "base64-arraybuffer": { + "version": "0.1.5", + "resolved": "https://registry.npmjs.org/base64-arraybuffer/-/base64-arraybuffer-0.1.5.tgz", + "integrity": "sha1-c5JncZI7Whl0etZmqlzUv5xunOg=", + "dev": true + }, + "base64id": { + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/base64id/-/base64id-0.1.0.tgz", + "integrity": "sha1-As4P3u4M709ACA4ec+g08LG/zj8=", + "dev": true + }, + "batch": { + "version": "0.5.3", + "resolved": "https://registry.npmjs.org/batch/-/batch-0.5.3.tgz", + "integrity": "sha1-PzQU84AyF0O/wQQvmoP/HVgk1GQ=", + "dev": true + }, + "bcrypt-pbkdf": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.1.tgz", + "integrity": "sha1-Y7xdy2EzG5K8Bf1SiVPDNGKgb40=", + "optional": true, + "requires": { + "tweetnacl": "0.14.5" + } + }, + "beeper": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/beeper/-/beeper-1.1.1.tgz", + "integrity": "sha1-5tXqjF2tABMEpwsiY4RH9pyy+Ak=" + }, + "better-assert": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/better-assert/-/better-assert-1.0.2.tgz", + "integrity": "sha1-QIZrnhueC1W0gYlDEeaPr/rrxSI=", + "dev": true, + "requires": { + "callsite": "1.0.0" + } + }, + "bin-build": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/bin-build/-/bin-build-2.2.0.tgz", + "integrity": "sha1-EfjdYfcP/Por3KpbRvXo/t1CIcw=", + "dev": true, + "requires": { + "archive-type": "3.2.0", + "decompress": "3.0.0", + "download": "4.4.3", + "exec-series": "1.0.3", + "rimraf": "2.6.1", + "tempfile": "1.1.1", + "url-regex": "3.2.0" + }, + "dependencies": { + "tempfile": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/tempfile/-/tempfile-1.1.1.tgz", + "integrity": "sha1-W8xOrsxKsscH2LwR2ZzMmiyyh/I=", + "dev": true, + "requires": { + "os-tmpdir": "1.0.2", + "uuid": "2.0.3" + } + }, + "uuid": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/uuid/-/uuid-2.0.3.tgz", + "integrity": "sha1-Z+LoY3lyFVMN/zGOW/nc6/1Hsho=", + "dev": true + } + } + }, + "bin-check": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/bin-check/-/bin-check-2.0.0.tgz", + "integrity": "sha1-hvjm9CU4k99g3DFpV/WvAqywWTA=", + "dev": true, + "requires": { + "executable": "1.1.0" + } + }, + "bin-version": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/bin-version/-/bin-version-1.0.4.tgz", + "integrity": "sha1-nrSY7m/Xb3q5p8FgQ2+JV5Q1144=", + "dev": true, + "requires": { + "find-versions": "1.2.1" + } + }, + "bin-version-check": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/bin-version-check/-/bin-version-check-2.1.0.tgz", + "integrity": "sha1-5OXfKQuQaffRETJAMe/BP90RpbA=", + "dev": true, + "requires": { + "bin-version": "1.0.4", + "minimist": "1.2.0", + "semver": "4.3.6", + "semver-truncate": "1.1.2" + } + }, + "bin-wrapper": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/bin-wrapper/-/bin-wrapper-3.0.2.tgz", + "integrity": "sha1-Z9MwYmLksaXy+I7iNGT2plVneus=", + "dev": true, + "requires": { + "bin-check": "2.0.0", + "bin-version-check": "2.1.0", + "download": "4.4.3", + "each-async": "1.1.1", + "lazy-req": "1.1.0", + "os-filter-obj": "1.0.3" + } + }, + "binary-extensions": { + "version": "1.10.0", + "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-1.10.0.tgz", + "integrity": "sha1-muuabF6IY4qtFx4Wf1kAq+JINdA=", + "dev": true + }, + "binaryextensions": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/binaryextensions/-/binaryextensions-1.0.1.tgz", + "integrity": "sha1-HmN0iLNbWL2l9HdL+WpSEqjJB1U=" + }, + "bl": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/bl/-/bl-1.2.1.tgz", + "integrity": "sha1-ysMo977kVzDUBLaSID/LWQ4XLV4=", + "dev": true, + "requires": { + "readable-stream": "2.3.3" + }, + "dependencies": { + "isarray": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", + "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=", + "dev": true + }, + "readable-stream": { + "version": "2.3.3", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.3.tgz", + "integrity": "sha512-m+qzzcn7KUxEmd1gMbchF+Y2eIUbieUaxkWtptyHywrX0rE8QEYqPC07Vuy4Wm32/xE16NcdBctb8S0Xe/5IeQ==", + "dev": true, + "requires": { + "core-util-is": "1.0.2", + "inherits": "2.0.3", + "isarray": "1.0.0", + "process-nextick-args": "1.0.7", + "safe-buffer": "5.1.1", + "string_decoder": "1.0.3", + "util-deprecate": "1.0.2" + } + }, + "string_decoder": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz", + "integrity": "sha512-4AH6Z5fzNNBcH+6XDMfA/BTt87skxqJlO0lAh3Dker5zThcAxG6mKz+iGu308UKoPPQ8Dcqx/4JhujzltRa+hQ==", + "dev": true, + "requires": { + "safe-buffer": "5.1.1" + } + } + } + }, + "blob": { + "version": "0.0.4", + "resolved": "https://registry.npmjs.org/blob/-/blob-0.0.4.tgz", + "integrity": "sha1-vPEwUspURj8w+fx+lbmkdjCpSSE=", + "dev": true + }, + "block-stream": { + "version": "0.0.9", + "resolved": "https://registry.npmjs.org/block-stream/-/block-stream-0.0.9.tgz", + "integrity": "sha1-E+v+d4oDIFz+A3UUgeu0szAMEmo=", + "requires": { + "inherits": "2.0.3" + } + }, + "bluebird": { + "version": "3.5.0", + "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.5.0.tgz", + "integrity": "sha1-eRQg1/VR7qKJdFOop3ZT+WYG1nw=" + }, + "body-parser": { + "version": "1.17.2", + "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.17.2.tgz", + "integrity": "sha1-+IkqvI+eYn1Crtr7yma/WrmRBO4=", + "dev": true, + "requires": { + "bytes": "2.4.0", + "content-type": "1.0.2", + "debug": "2.6.7", + "depd": "1.1.1", + "http-errors": "1.6.2", + "iconv-lite": "0.4.15", + "on-finished": "2.3.0", + "qs": "6.4.0", + "raw-body": "2.2.0", + "type-is": "1.6.15" + }, + "dependencies": { + "debug": { + "version": "2.6.7", + "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.7.tgz", + "integrity": "sha1-krrR9tBbu2u6Isyoi80OyJTChh4=", + "dev": true, + "requires": { + "ms": "2.0.0" + } + }, + "http-errors": { + "version": "1.6.2", + "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.6.2.tgz", + "integrity": "sha1-CgAsyFcHGSp+eUbO7cERVfYOxzY=", + "dev": true, + "requires": { + "depd": "1.1.1", + "inherits": "2.0.3", + "setprototypeof": "1.0.3", + "statuses": "1.3.1" + } + }, + "ms": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", + "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=", + "dev": true + }, + "setprototypeof": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.0.3.tgz", + "integrity": "sha1-ZlZ+NwQ+608E2RvWWMDL77VbjgQ=", + "dev": true + } + } + }, + "boom": { + "version": "2.10.1", + "resolved": "https://registry.npmjs.org/boom/-/boom-2.10.1.tgz", + "integrity": "sha1-OciRjO/1eZ+D+UkqhI9iWt0Mdm8=", + "requires": { + "hoek": "2.16.3" + } + }, + "bower": { + "version": "1.8.0", + "resolved": "https://registry.npmjs.org/bower/-/bower-1.8.0.tgz", + "integrity": "sha1-Vdvr7wrZFVOC2enT5JfBNyNFtEo=" + }, + "bower-config": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/bower-config/-/bower-config-1.4.0.tgz", + "integrity": "sha1-FsOMETX4BxwZ8lk41hsNjL8Y0/E=", + "requires": { + "graceful-fs": "4.1.11", + "mout": "1.0.0", + "optimist": "0.6.1", + "osenv": "0.1.4", + "untildify": "2.1.0" + } + }, + "brace-expansion": { + "version": "1.1.8", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.8.tgz", + "integrity": "sha1-wHshHHyVLsH479Uad+8NHTmQopI=", + "requires": { + "balanced-match": "1.0.0", + "concat-map": "0.0.1" + } + }, + "braces": { + "version": "1.8.5", + "resolved": "https://registry.npmjs.org/braces/-/braces-1.8.5.tgz", + "integrity": "sha1-uneWLhLf+WnWt2cR6RS3N4V79qc=", + "requires": { + "expand-range": "1.8.2", + "preserve": "0.2.0", + "repeat-element": "1.1.2" + } + }, + "browser-sync": { + "version": "2.18.13", + "resolved": "https://registry.npmjs.org/browser-sync/-/browser-sync-2.18.13.tgz", + "integrity": "sha512-qhdrmgshVGwweogT/bdOKkZDxVxqiF4+9mibaDeAxvDBeoUtdgABk5x7YQ1KCcLRchAfv8AVtp9NuITl5CTNqg==", + "dev": true, + "requires": { + "browser-sync-client": "2.5.1", + "browser-sync-ui": "0.6.3", + "bs-recipes": "1.3.4", + "chokidar": "1.7.0", + "connect": "3.5.0", + "dev-ip": "1.0.1", + "easy-extender": "2.3.2", + "eazy-logger": "3.0.2", + "emitter-steward": "1.0.0", + "fs-extra": "3.0.1", + "http-proxy": "1.15.2", + "immutable": "3.8.1", + "localtunnel": "1.8.3", + "micromatch": "2.3.11", + "opn": "4.0.2", + "portscanner": "2.1.1", + "qs": "6.2.1", + "resp-modifier": "6.0.2", + "rx": "4.1.0", + "serve-index": "1.8.0", + "serve-static": "1.12.2", + "server-destroy": "1.0.1", + "socket.io": "1.6.0", + "socket.io-client": "1.6.0", + "ua-parser-js": "0.7.12", + "yargs": "6.4.0" + }, + "dependencies": { + "camelcase": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-3.0.0.tgz", + "integrity": "sha1-MvxLn82vhF/N9+c7uXysImHwqwo=", + "dev": true + }, + "http-proxy": { + "version": "1.15.2", + "resolved": "https://registry.npmjs.org/http-proxy/-/http-proxy-1.15.2.tgz", + "integrity": "sha1-ZC/cr/5S00SNK9o7AHnpQJBk2jE=", + "dev": true, + "requires": { + "eventemitter3": "1.2.0", + "requires-port": "1.0.0" + } + }, + "qs": { + "version": "6.2.1", + "resolved": "https://registry.npmjs.org/qs/-/qs-6.2.1.tgz", + "integrity": "sha1-zgPF/wk1vB2daanxTL0Y5WjWdiU=", + "dev": true + }, + "window-size": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/window-size/-/window-size-0.2.0.tgz", + "integrity": "sha1-tDFbtCFKPXBY6+7okuE/ok2YsHU=", + "dev": true + }, + "yargs": { + "version": "6.4.0", + "resolved": "https://registry.npmjs.org/yargs/-/yargs-6.4.0.tgz", + "integrity": "sha1-gW4ahm1VmMzzTlWW3c4i2S2kkNQ=", + "dev": true, + "requires": { + "camelcase": "3.0.0", + "cliui": "3.2.0", + "decamelize": "1.2.0", + "get-caller-file": "1.0.2", + "os-locale": "1.4.0", + "read-pkg-up": "1.0.1", + "require-directory": "2.1.1", + "require-main-filename": "1.0.1", + "set-blocking": "2.0.0", + "string-width": "1.0.2", + "which-module": "1.0.0", + "window-size": "0.2.0", + "y18n": "3.2.1", + "yargs-parser": "4.2.1" + } + }, + "yargs-parser": { + "version": "4.2.1", + "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-4.2.1.tgz", + "integrity": "sha1-KczqwNxPA8bIe0qfIX3RjJ90hxw=", + "dev": true, + "requires": { + "camelcase": "3.0.0" + } + } + } + }, + "browser-sync-client": { + "version": "2.5.1", + "resolved": "https://registry.npmjs.org/browser-sync-client/-/browser-sync-client-2.5.1.tgz", + "integrity": "sha1-7BrWmknC4tS2RbGLHAbCmz2a+Os=", + "dev": true, + "requires": { + "etag": "1.8.0", + "fresh": "0.3.0" + } + }, + "browser-sync-ui": { + "version": "0.6.3", + "resolved": "https://registry.npmjs.org/browser-sync-ui/-/browser-sync-ui-0.6.3.tgz", + "integrity": "sha1-ZApTfBgGiTA9W+krxHa568RBwLw=", + "dev": true, + "requires": { + "async-each-series": "0.1.1", + "connect-history-api-fallback": "1.3.0", + "immutable": "3.8.1", + "server-destroy": "1.0.1", + "stream-throttle": "0.1.3", + "weinre": "2.0.0-pre-I0Z7U9OV" + } + }, + "browserslist": { + "version": "1.7.7", + "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-1.7.7.tgz", + "integrity": "sha1-C9dnBCWL6CmyOYu1Dkti0aFmsLk=", + "requires": { + "caniuse-db": "1.0.30000715", + "electron-to-chromium": "1.3.18" + } + }, + "bs-recipes": { + "version": "1.3.4", + "resolved": "https://registry.npmjs.org/bs-recipes/-/bs-recipes-1.3.4.tgz", + "integrity": "sha1-DS1NSKcYyMBEdp/cT4lZLci2lYU=", + "dev": true + }, + "buffer-crc32": { + "version": "0.2.13", + "resolved": "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.13.tgz", + "integrity": "sha1-DTM+PwDqxQqhRUq9MO+MKl2ackI=", + "dev": true + }, + "buffer-to-vinyl": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/buffer-to-vinyl/-/buffer-to-vinyl-1.1.0.tgz", + "integrity": "sha1-APFfruOreh3aLN5tkSG//dB7ImI=", + "dev": true, + "requires": { + "file-type": "3.9.0", + "readable-stream": "2.3.3", + "uuid": "2.0.3", + "vinyl": "1.2.0" + }, + "dependencies": { + "file-type": { + "version": "3.9.0", + "resolved": "https://registry.npmjs.org/file-type/-/file-type-3.9.0.tgz", + "integrity": "sha1-JXoHg4TR24CHvESdEH1SpSZyuek=", + "dev": true + }, + "isarray": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", + "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=", + "dev": true + }, + "readable-stream": { + "version": "2.3.3", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.3.tgz", + "integrity": "sha512-m+qzzcn7KUxEmd1gMbchF+Y2eIUbieUaxkWtptyHywrX0rE8QEYqPC07Vuy4Wm32/xE16NcdBctb8S0Xe/5IeQ==", + "dev": true, + "requires": { + "core-util-is": "1.0.2", + "inherits": "2.0.3", + "isarray": "1.0.0", + "process-nextick-args": "1.0.7", + "safe-buffer": "5.1.1", + "string_decoder": "1.0.3", + "util-deprecate": "1.0.2" + } + }, + "string_decoder": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz", + "integrity": "sha512-4AH6Z5fzNNBcH+6XDMfA/BTt87skxqJlO0lAh3Dker5zThcAxG6mKz+iGu308UKoPPQ8Dcqx/4JhujzltRa+hQ==", + "dev": true, + "requires": { + "safe-buffer": "5.1.1" + } + }, + "uuid": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/uuid/-/uuid-2.0.3.tgz", + "integrity": "sha1-Z+LoY3lyFVMN/zGOW/nc6/1Hsho=", + "dev": true + }, + "vinyl": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-1.2.0.tgz", + "integrity": "sha1-XIgDbPVl5d8FVYv8kR+GVt8hiIQ=", + "dev": true, + "requires": { + "clone": "1.0.2", + "clone-stats": "0.0.1", + "replace-ext": "0.0.1" + } + } + } + }, + "bufferstreams": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/bufferstreams/-/bufferstreams-1.1.1.tgz", + "integrity": "sha1-AWE3MGCsWYjv+ZBYcxEU9uGV1R4=", + "requires": { + "readable-stream": "2.3.3" + }, + "dependencies": { + "isarray": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", + "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=" + }, + "readable-stream": { + "version": "2.3.3", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.3.tgz", + "integrity": "sha512-m+qzzcn7KUxEmd1gMbchF+Y2eIUbieUaxkWtptyHywrX0rE8QEYqPC07Vuy4Wm32/xE16NcdBctb8S0Xe/5IeQ==", + "requires": { + "core-util-is": "1.0.2", + "inherits": "2.0.3", + "isarray": "1.0.0", + "process-nextick-args": "1.0.7", + "safe-buffer": "5.1.1", + "string_decoder": "1.0.3", + "util-deprecate": "1.0.2" + } + }, + "string_decoder": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz", + "integrity": "sha512-4AH6Z5fzNNBcH+6XDMfA/BTt87skxqJlO0lAh3Dker5zThcAxG6mKz+iGu308UKoPPQ8Dcqx/4JhujzltRa+hQ==", + "requires": { + "safe-buffer": "5.1.1" + } + } + } + }, + "builtin-modules": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/builtin-modules/-/builtin-modules-1.1.1.tgz", + "integrity": "sha1-Jw8HbFpywC9bZaR9+Uxf46J4iS8=" + }, + "bytes": { + "version": "2.4.0", + "resolved": "https://registry.npmjs.org/bytes/-/bytes-2.4.0.tgz", + "integrity": "sha1-fZcZb51br39pNeJZhVSe3SpsIzk=", + "dev": true + }, + "caller-path": { + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/caller-path/-/caller-path-0.1.0.tgz", + "integrity": "sha1-lAhe9jWB7NPaqSREqP6U6CV3dR8=", + "dev": true, + "requires": { + "callsites": "0.2.0" + } + }, + "callsite": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/callsite/-/callsite-1.0.0.tgz", + "integrity": "sha1-KAOY5dZkvXQDi28JBRU+borxvCA=", + "dev": true + }, + "callsites": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/callsites/-/callsites-0.2.0.tgz", + "integrity": "sha1-r6uWJikQp/M8GaV3WCXGnzTjUMo=", + "dev": true + }, + "camelcase": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-2.1.1.tgz", + "integrity": "sha1-fB0W1nmhu+WcoCys7PsBHiAfWh8=" + }, + "camelcase-keys": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-2.1.0.tgz", + "integrity": "sha1-MIvur/3ygRkFHvodkyITyRuPkuc=", + "requires": { + "camelcase": "2.1.1", + "map-obj": "1.0.1" + } + }, + "caniuse-db": { + "version": "1.0.30000715", + "resolved": "https://registry.npmjs.org/caniuse-db/-/caniuse-db-1.0.30000715.tgz", + "integrity": "sha1-C5tceVlQ37rzAaiAa6/ofxJtqMo=" + }, + "capture-stack-trace": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/capture-stack-trace/-/capture-stack-trace-1.0.0.tgz", + "integrity": "sha1-Sm+gc5nCa7pH8LJJa00PtAjFVQ0=", + "dev": true + }, + "caseless": { + "version": "0.12.0", + "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz", + "integrity": "sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw=" + }, + "catharsis": { + "version": "0.8.9", + "resolved": "https://registry.npmjs.org/catharsis/-/catharsis-0.8.9.tgz", + "integrity": "sha1-mMyJDKZS3S7w5ws3klMQ/56Q/Is=", + "dev": true, + "requires": { + "underscore-contrib": "0.3.0" + } + }, + "caw": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/caw/-/caw-1.2.0.tgz", + "integrity": "sha1-/7Im/n78VHKI3GLuPpcHPCEtEDQ=", + "dev": true, + "requires": { + "get-proxy": "1.1.0", + "is-obj": "1.0.1", + "object-assign": "3.0.0", + "tunnel-agent": "0.4.3" + }, + "dependencies": { + "tunnel-agent": { + "version": "0.4.3", + "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.4.3.tgz", + "integrity": "sha1-Y3PbdpCf5XDgjXNYM2Xtgop07us=", + "dev": true + } + } + }, + "center-align": { + "version": "0.1.3", + "resolved": "https://registry.npmjs.org/center-align/-/center-align-0.1.3.tgz", + "integrity": "sha1-qg0yYptu6XIgBBHL1EYckHvCt60=", + "requires": { + "align-text": "0.1.4", + "lazy-cache": "1.0.4" + } + }, + "chalk": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz", + "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=", + "requires": { + "ansi-styles": "2.2.1", + "escape-string-regexp": "1.0.5", + "has-ansi": "2.0.0", + "strip-ansi": "3.0.1", + "supports-color": "2.0.0" + } + }, + "chokidar": { + "version": "1.7.0", + "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-1.7.0.tgz", + "integrity": "sha1-eY5ol3gVHIB2tLNg5e3SjNortGg=", + "dev": true, + "requires": { + "anymatch": "1.3.2", + "async-each": "1.0.1", + "fsevents": "1.1.2", + "glob-parent": "2.0.0", + "inherits": "2.0.3", + "is-binary-path": "1.0.1", + "is-glob": "2.0.1", + "path-is-absolute": "1.0.1", + "readdirp": "2.1.0" + } + }, + "circular-json": { + "version": "0.3.3", + "resolved": "https://registry.npmjs.org/circular-json/-/circular-json-0.3.3.tgz", + "integrity": "sha512-UZK3NBx2Mca+b5LsG7bY183pHWt5Y1xts4P3Pz7ENTwGVnJOUWbRb3ocjvX7hx9tq/yTAdclXm9sZ38gNuem4A==", + "dev": true + }, + "clean-css": { + "version": "4.1.7", + "resolved": "https://registry.npmjs.org/clean-css/-/clean-css-4.1.7.tgz", + "integrity": "sha1-ua6k+FZ5iJzz6ui0A0nsTr390DI=", + "requires": { + "source-map": "0.5.6" + } + }, + "cli-cursor": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-1.0.2.tgz", + "integrity": "sha1-ZNo/fValRBLll5S9Ytw1KV6PKYc=", + "requires": { + "restore-cursor": "1.0.1" + } + }, + "cli-width": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/cli-width/-/cli-width-1.1.1.tgz", + "integrity": "sha1-pNKT72frt7iNSk1CwMzwDE0eNm0=" + }, + "cliui": { + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/cliui/-/cliui-3.2.0.tgz", + "integrity": "sha1-EgYBU3qRbSmUD5NNo7SNWFo5IT0=", + "requires": { + "string-width": "1.0.2", + "strip-ansi": "3.0.1", + "wrap-ansi": "2.1.0" + } + }, + "clone": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/clone/-/clone-1.0.2.tgz", + "integrity": "sha1-Jgt6meux7f4kdTgXX3gyQ8sZ0Uk=" + }, + "clone-stats": { + "version": "0.0.1", + "resolved": "https://registry.npmjs.org/clone-stats/-/clone-stats-0.0.1.tgz", + "integrity": "sha1-uI+UqCzzi4eR1YBG6kAprYjKmdE=" + }, + "co": { + "version": "4.6.0", + "resolved": "https://registry.npmjs.org/co/-/co-4.6.0.tgz", + "integrity": "sha1-bqa989hTrlTMuOR7+gvz+QMfsYQ=" + }, + "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=" + }, + "color-convert": { + "version": "1.9.0", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.0.tgz", + "integrity": "sha1-Gsz5fdc5uYO/mU1W/sj5WFNkG3o=", + "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 + }, + "colors": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/colors/-/colors-1.1.2.tgz", + "integrity": "sha1-FopHAXVran9RoSzgyXv6KMCE7WM=", + "dev": true + }, + "combine-lists": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/combine-lists/-/combine-lists-1.0.1.tgz", + "integrity": "sha1-RYwH4J4NkA/Ci3Cj/sLazR0st/Y=", + "dev": true, + "requires": { + "lodash": "4.17.4" + } + }, + "combined-stream": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.5.tgz", + "integrity": "sha1-k4NwpXtKUd6ix3wV1cX9+JUWQAk=", + "requires": { + "delayed-stream": "1.0.0" + } + }, + "commander": { + "version": "2.11.0", + "resolved": "https://registry.npmjs.org/commander/-/commander-2.11.0.tgz", + "integrity": "sha512-b0553uYA5YAEGgyYIGYROzKQ7X5RAqedkfjiZxwi0kL1g3bOaBNNZfYkzt/CL0umgD5wc9Jec2FbB98CjkMRvQ==", + "dev": true + }, + "component-bind": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/component-bind/-/component-bind-1.0.0.tgz", + "integrity": "sha1-AMYIq33Nk4l8AAllGx06jh5zu9E=", + "dev": true + }, + "component-emitter": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.1.2.tgz", + "integrity": "sha1-KWWU8nU9qmOZbSrwjRWpURbJrsM=", + "dev": true + }, + "component-inherit": { + "version": "0.0.3", + "resolved": "https://registry.npmjs.org/component-inherit/-/component-inherit-0.0.3.tgz", + "integrity": "sha1-ZF/ErfWLcrZJ1crmUTVhnbJv8UM=", + "dev": true + }, + "concat-map": { + "version": "0.0.1", + "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", + "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=" + }, + "concat-stream": { + "version": "1.6.0", + "resolved": "https://registry.npmjs.org/concat-stream/-/concat-stream-1.6.0.tgz", + "integrity": "sha1-CqxmL9Ur54lk1VMvaUeE5wEQrPc=", + "dev": true, + "requires": { + "inherits": "2.0.3", + "readable-stream": "2.3.3", + "typedarray": "0.0.6" + }, + "dependencies": { + "isarray": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", + "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=", + "dev": true + }, + "readable-stream": { + "version": "2.3.3", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.3.tgz", + "integrity": "sha512-m+qzzcn7KUxEmd1gMbchF+Y2eIUbieUaxkWtptyHywrX0rE8QEYqPC07Vuy4Wm32/xE16NcdBctb8S0Xe/5IeQ==", + "dev": true, + "requires": { + "core-util-is": "1.0.2", + "inherits": "2.0.3", + "isarray": "1.0.0", + "process-nextick-args": "1.0.7", + "safe-buffer": "5.1.1", + "string_decoder": "1.0.3", + "util-deprecate": "1.0.2" + } + }, + "string_decoder": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz", + "integrity": "sha512-4AH6Z5fzNNBcH+6XDMfA/BTt87skxqJlO0lAh3Dker5zThcAxG6mKz+iGu308UKoPPQ8Dcqx/4JhujzltRa+hQ==", + "dev": true, + "requires": { + "safe-buffer": "5.1.1" + } + } + } + }, + "concat-with-sourcemaps": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/concat-with-sourcemaps/-/concat-with-sourcemaps-1.0.4.tgz", + "integrity": "sha1-9Vs74q60dgGxCi1SWcz7cP0vHdY=", + "requires": { + "source-map": "0.5.6" + } + }, + "connect": { + "version": "3.5.0", + "resolved": "https://registry.npmjs.org/connect/-/connect-3.5.0.tgz", + "integrity": "sha1-s1dSWgtMH1BZnNmD4dnv7qlncZg=", + "dev": true, + "requires": { + "debug": "2.2.0", + "finalhandler": "0.5.0", + "parseurl": "1.3.1", + "utils-merge": "1.0.0" + } + }, + "connect-history-api-fallback": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/connect-history-api-fallback/-/connect-history-api-fallback-1.3.0.tgz", + "integrity": "sha1-5R0X+PDvDbkKZP20feMFFVbp8Wk=", + "dev": true + }, + "console-control-strings": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz", + "integrity": "sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4=" + }, + "console-stream": { + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/console-stream/-/console-stream-0.1.1.tgz", + "integrity": "sha1-oJX+B7IEZZVfL6/Si11yvM2UnUQ=", + "dev": true + }, + "content-disposition": { + "version": "0.5.2", + "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.2.tgz", + "integrity": "sha1-DPaLud318r55YcOoUXjLhdunjLQ=", + "dev": true + }, + "content-type": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.2.tgz", + "integrity": "sha1-t9ETrueo3Se9IRM8TcJSnfFyHu0=", + "dev": true + }, + "convert-source-map": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.1.3.tgz", + "integrity": "sha1-SCnId+n+SbMWHzvzZziI4gRpmGA=" + }, + "cookie": { + "version": "0.3.1", + "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.3.1.tgz", + "integrity": "sha1-5+Ch+e9DtMi6klxcWpboBtFoc7s=", + "dev": true + }, + "cookie-signature": { + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz", + "integrity": "sha1-4wOogrNCzD7oylE6eZmXNNqzriw=", + "dev": true + }, + "core-js": { + "version": "2.5.0", + "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.5.0.tgz", + "integrity": "sha1-VpwFCRi+ZIazg3VSAorgRmtxcIY=", + "dev": true + }, + "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=" + }, + "create-error-class": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/create-error-class/-/create-error-class-3.0.2.tgz", + "integrity": "sha1-Br56vvlHo/FKMP1hBnHUAbyot7Y=", + "dev": true, + "requires": { + "capture-stack-trace": "1.0.0" + } + }, + "cross-spawn": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-3.0.1.tgz", + "integrity": "sha1-ElYDfsufDF9549bvE14wdwGEuYI=", + "requires": { + "lru-cache": "4.1.1", + "which": "1.3.0" + }, + "dependencies": { + "lru-cache": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.1.tgz", + "integrity": "sha512-q4spe4KTfsAS1SUHLO0wz8Qiyf1+vMIAgpRYioFYDMNqKfHQbg+AVDH3i4fvpl71/P1L0dBl+fQi+P37UYf0ew==", + "requires": { + "pseudomap": "1.0.2", + "yallist": "2.1.2" + } + } + } + }, + "cryptiles": { + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/cryptiles/-/cryptiles-2.0.5.tgz", + "integrity": "sha1-O9/s3GCBR8HGcgL6KR59ylnqo7g=", + "requires": { + "boom": "2.10.1" + } + }, + "currently-unhandled": { + "version": "0.4.1", + "resolved": "https://registry.npmjs.org/currently-unhandled/-/currently-unhandled-0.4.1.tgz", + "integrity": "sha1-mI3zP+qxke95mmE2nddsF635V+o=", + "requires": { + "array-find-index": "1.0.2" + } + }, + "custom-event": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/custom-event/-/custom-event-1.0.1.tgz", + "integrity": "sha1-XQKkaFCt8bSjF5RqOSj8y1v9BCU=", + "dev": true + }, + "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" + }, + "dependencies": { + "assert-plus": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz", + "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=" + } + } + }, + "dateformat": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/dateformat/-/dateformat-2.0.0.tgz", + "integrity": "sha1-J0Pjq7XD/CRi5SfcpEXgTp9N7hc=" + }, + "debug": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/debug/-/debug-2.2.0.tgz", + "integrity": "sha1-+HBX6ZWxofauaklgZkE3vFbwOdo=", + "dev": true, + "requires": { + "ms": "0.7.1" + } + }, + "decamelize": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz", + "integrity": "sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=" + }, + "decompress": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/decompress/-/decompress-3.0.0.tgz", + "integrity": "sha1-rx3VDQbjv8QyRh033hGzjA2ZG+0=", + "dev": true, + "requires": { + "buffer-to-vinyl": "1.1.0", + "concat-stream": "1.6.0", + "decompress-tar": "3.1.0", + "decompress-tarbz2": "3.1.0", + "decompress-targz": "3.1.0", + "decompress-unzip": "3.4.0", + "stream-combiner2": "1.1.1", + "vinyl-assign": "1.2.1", + "vinyl-fs": "2.4.4" + }, + "dependencies": { + "glob": { + "version": "5.0.15", + "resolved": "https://registry.npmjs.org/glob/-/glob-5.0.15.tgz", + "integrity": "sha1-G8k2ueAvSmA/zCIuz3Yz0wuLk7E=", + "dev": true, + "requires": { + "inflight": "1.0.6", + "inherits": "2.0.3", + "minimatch": "3.0.4", + "once": "1.4.0", + "path-is-absolute": "1.0.1" + } + }, + "glob-parent": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-3.1.0.tgz", + "integrity": "sha1-nmr2KZ2NO9K9QEMIMr0RPfkGxa4=", + "dev": true, + "requires": { + "is-glob": "3.1.0", + "path-dirname": "1.0.2" + } + }, + "glob-stream": { + "version": "5.3.5", + "resolved": "https://registry.npmjs.org/glob-stream/-/glob-stream-5.3.5.tgz", + "integrity": "sha1-pVZlqajM3EGRWofHAeMtTgFvrSI=", + "dev": true, + "requires": { + "extend": "3.0.1", + "glob": "5.0.15", + "glob-parent": "3.1.0", + "micromatch": "2.3.11", + "ordered-read-streams": "0.3.0", + "through2": "0.6.5", + "to-absolute-glob": "0.1.1", + "unique-stream": "2.2.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.0.34", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz", + "integrity": "sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=", + "dev": true, + "requires": { + "core-util-is": "1.0.2", + "inherits": "2.0.3", + "isarray": "0.0.1", + "string_decoder": "0.10.31" + } + }, + "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 + }, + "through2": { + "version": "0.6.5", + "resolved": "https://registry.npmjs.org/through2/-/through2-0.6.5.tgz", + "integrity": "sha1-QaucZ7KdVyCQcUEOHXp6lozTrUg=", + "dev": true, + "requires": { + "readable-stream": "1.0.34", + "xtend": "4.0.1" + } + } + } + }, + "is-extglob": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz", + "integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=", + "dev": true + }, + "is-glob": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz", + "integrity": "sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=", + "dev": true, + "requires": { + "is-extglob": "2.1.1" + } + }, + "isarray": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", + "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=", + "dev": true + }, + "object-assign": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz", + "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=", + "dev": true + }, + "ordered-read-streams": { + "version": "0.3.0", + "resolved": "https://registry.npmjs.org/ordered-read-streams/-/ordered-read-streams-0.3.0.tgz", + "integrity": "sha1-cTfmmzKYuzQiR6G77jiByA4v14s=", + "dev": true, + "requires": { + "is-stream": "1.1.0", + "readable-stream": "2.3.3" + } + }, + "readable-stream": { + "version": "2.3.3", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.3.tgz", + "integrity": "sha512-m+qzzcn7KUxEmd1gMbchF+Y2eIUbieUaxkWtptyHywrX0rE8QEYqPC07Vuy4Wm32/xE16NcdBctb8S0Xe/5IeQ==", + "dev": true, + "requires": { + "core-util-is": "1.0.2", + "inherits": "2.0.3", + "isarray": "1.0.0", + "process-nextick-args": "1.0.7", + "safe-buffer": "5.1.1", + "string_decoder": "1.0.3", + "util-deprecate": "1.0.2" + } + }, + "string_decoder": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz", + "integrity": "sha512-4AH6Z5fzNNBcH+6XDMfA/BTt87skxqJlO0lAh3Dker5zThcAxG6mKz+iGu308UKoPPQ8Dcqx/4JhujzltRa+hQ==", + "dev": true, + "requires": { + "safe-buffer": "5.1.1" + } + }, + "strip-bom": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-2.0.0.tgz", + "integrity": "sha1-YhmoVhZSBJHzV4i9vxRHqZx+aw4=", + "dev": true, + "requires": { + "is-utf8": "0.2.1" + } + }, + "unique-stream": { + "version": "2.2.1", + "resolved": "https://registry.npmjs.org/unique-stream/-/unique-stream-2.2.1.tgz", + "integrity": "sha1-WqADz76Uxf+GbE59ZouxxNuts2k=", + "dev": true, + "requires": { + "json-stable-stringify": "1.0.1", + "through2-filter": "2.0.0" + } + }, + "vinyl": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-1.2.0.tgz", + "integrity": "sha1-XIgDbPVl5d8FVYv8kR+GVt8hiIQ=", + "dev": true, + "requires": { + "clone": "1.0.2", + "clone-stats": "0.0.1", + "replace-ext": "0.0.1" + } + }, + "vinyl-fs": { + "version": "2.4.4", + "resolved": "https://registry.npmjs.org/vinyl-fs/-/vinyl-fs-2.4.4.tgz", + "integrity": "sha1-vm/zJwy1Xf19MGNkDegfJddTIjk=", + "dev": true, + "requires": { + "duplexify": "3.5.1", + "glob-stream": "5.3.5", + "graceful-fs": "4.1.11", + "gulp-sourcemaps": "1.6.0", + "is-valid-glob": "0.3.0", + "lazystream": "1.0.0", + "lodash.isequal": "4.5.0", + "merge-stream": "1.0.1", + "mkdirp": "0.5.1", + "object-assign": "4.1.1", + "readable-stream": "2.3.3", + "strip-bom": "2.0.0", + "strip-bom-stream": "1.0.0", + "through2": "2.0.3", + "through2-filter": "2.0.0", + "vali-date": "1.0.0", + "vinyl": "1.2.0" + } + } + } + }, + "decompress-tar": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/decompress-tar/-/decompress-tar-3.1.0.tgz", + "integrity": "sha1-IXx4n5uURQ76rcXF5TeXj8MzxGY=", + "dev": true, + "requires": { + "is-tar": "1.0.0", + "object-assign": "2.1.1", + "strip-dirs": "1.1.1", + "tar-stream": "1.5.4", + "through2": "0.6.5", + "vinyl": "0.4.6" + }, + "dependencies": { + "clone": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/clone/-/clone-0.2.0.tgz", + "integrity": "sha1-xhJqkK1Pctv1rNskPMN3JP6T/B8=", + "dev": true + }, + "object-assign": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-2.1.1.tgz", + "integrity": "sha1-Q8NuXVaf+OSBbE76i+AtJpZ8GKo=", + "dev": true + }, + "readable-stream": { + "version": "1.0.34", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz", + "integrity": "sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=", + "dev": true, + "requires": { + "core-util-is": "1.0.2", + "inherits": "2.0.3", + "isarray": "0.0.1", + "string_decoder": "0.10.31" + } + }, + "through2": { + "version": "0.6.5", + "resolved": "https://registry.npmjs.org/through2/-/through2-0.6.5.tgz", + "integrity": "sha1-QaucZ7KdVyCQcUEOHXp6lozTrUg=", + "dev": true, + "requires": { + "readable-stream": "1.0.34", + "xtend": "4.0.1" + } + }, + "vinyl": { + "version": "0.4.6", + "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-0.4.6.tgz", + "integrity": "sha1-LzVsh6VQolVGHza76ypbqL94SEc=", + "dev": true, + "requires": { + "clone": "0.2.0", + "clone-stats": "0.0.1" + } + } + } + }, + "decompress-tarbz2": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/decompress-tarbz2/-/decompress-tarbz2-3.1.0.tgz", + "integrity": "sha1-iyOTVoE1X58YnYclag+L3ZbZZm0=", + "dev": true, + "requires": { + "is-bzip2": "1.0.0", + "object-assign": "2.1.1", + "seek-bzip": "1.0.5", + "strip-dirs": "1.1.1", + "tar-stream": "1.5.4", + "through2": "0.6.5", + "vinyl": "0.4.6" + }, + "dependencies": { + "clone": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/clone/-/clone-0.2.0.tgz", + "integrity": "sha1-xhJqkK1Pctv1rNskPMN3JP6T/B8=", + "dev": true + }, + "object-assign": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-2.1.1.tgz", + "integrity": "sha1-Q8NuXVaf+OSBbE76i+AtJpZ8GKo=", + "dev": true + }, + "readable-stream": { + "version": "1.0.34", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz", + "integrity": "sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=", + "dev": true, + "requires": { + "core-util-is": "1.0.2", + "inherits": "2.0.3", + "isarray": "0.0.1", + "string_decoder": "0.10.31" + } + }, + "through2": { + "version": "0.6.5", + "resolved": "https://registry.npmjs.org/through2/-/through2-0.6.5.tgz", + "integrity": "sha1-QaucZ7KdVyCQcUEOHXp6lozTrUg=", + "dev": true, + "requires": { + "readable-stream": "1.0.34", + "xtend": "4.0.1" + } + }, + "vinyl": { + "version": "0.4.6", + "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-0.4.6.tgz", + "integrity": "sha1-LzVsh6VQolVGHza76ypbqL94SEc=", + "dev": true, + "requires": { + "clone": "0.2.0", + "clone-stats": "0.0.1" + } + } + } + }, + "decompress-targz": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/decompress-targz/-/decompress-targz-3.1.0.tgz", + "integrity": "sha1-ssE9+YFmJomRtxXWRH9kLpaW9aA=", + "dev": true, + "requires": { + "is-gzip": "1.0.0", + "object-assign": "2.1.1", + "strip-dirs": "1.1.1", + "tar-stream": "1.5.4", + "through2": "0.6.5", + "vinyl": "0.4.6" + }, + "dependencies": { + "clone": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/clone/-/clone-0.2.0.tgz", + "integrity": "sha1-xhJqkK1Pctv1rNskPMN3JP6T/B8=", + "dev": true + }, + "object-assign": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-2.1.1.tgz", + "integrity": "sha1-Q8NuXVaf+OSBbE76i+AtJpZ8GKo=", + "dev": true + }, + "readable-stream": { + "version": "1.0.34", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz", + "integrity": "sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=", + "dev": true, + "requires": { + "core-util-is": "1.0.2", + "inherits": "2.0.3", + "isarray": "0.0.1", + "string_decoder": "0.10.31" + } + }, + "through2": { + "version": "0.6.5", + "resolved": "https://registry.npmjs.org/through2/-/through2-0.6.5.tgz", + "integrity": "sha1-QaucZ7KdVyCQcUEOHXp6lozTrUg=", + "dev": true, + "requires": { + "readable-stream": "1.0.34", + "xtend": "4.0.1" + } + }, + "vinyl": { + "version": "0.4.6", + "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-0.4.6.tgz", + "integrity": "sha1-LzVsh6VQolVGHza76ypbqL94SEc=", + "dev": true, + "requires": { + "clone": "0.2.0", + "clone-stats": "0.0.1" + } + } + } + }, + "decompress-unzip": { + "version": "3.4.0", + "resolved": "https://registry.npmjs.org/decompress-unzip/-/decompress-unzip-3.4.0.tgz", + "integrity": "sha1-YUdbQVIGa74/7hL51inRX+ZHjus=", + "dev": true, + "requires": { + "is-zip": "1.0.0", + "read-all-stream": "3.1.0", + "stat-mode": "0.2.2", + "strip-dirs": "1.1.1", + "through2": "2.0.3", + "vinyl": "1.2.0", + "yauzl": "2.8.0" + }, + "dependencies": { + "vinyl": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-1.2.0.tgz", + "integrity": "sha1-XIgDbPVl5d8FVYv8kR+GVt8hiIQ=", + "dev": true, + "requires": { + "clone": "1.0.2", + "clone-stats": "0.0.1", + "replace-ext": "0.0.1" + } + } + } + }, + "deep-extend": { + "version": "0.4.2", + "resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.4.2.tgz", + "integrity": "sha1-SLaZwn4zS/ifEIkr5DL25MfTSn8=", + "dev": true + }, + "deep-is": { + "version": "0.1.3", + "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.3.tgz", + "integrity": "sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ=", + "dev": true + }, + "defaults": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/defaults/-/defaults-1.0.3.tgz", + "integrity": "sha1-xlYFHpgX2f8I7YgUd/P+QBnz730=", + "requires": { + "clone": "1.0.2" + } + }, + "del": { + "version": "2.2.2", + "resolved": "https://registry.npmjs.org/del/-/del-2.2.2.tgz", + "integrity": "sha1-wSyYHQZ4RshLyvhiz/kw2Qf/0ag=", + "dev": true, + "requires": { + "globby": "5.0.0", + "is-path-cwd": "1.0.0", + "is-path-in-cwd": "1.0.0", + "object-assign": "4.1.1", + "pify": "2.3.0", + "pinkie-promise": "2.0.1", + "rimraf": "2.6.1" + }, + "dependencies": { + "object-assign": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz", + "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=", + "dev": true + } + } + }, + "delayed-stream": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz", + "integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk=" + }, + "delegates": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz", + "integrity": "sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o=" + }, + "delete": { + "version": "0.3.2", + "resolved": "https://registry.npmjs.org/delete/-/delete-0.3.2.tgz", + "integrity": "sha1-fP7PXvffuAL60nq49b5a5UbFt54=", + "requires": { + "async": "1.5.2", + "bluebird": "3.5.0", + "extend-shallow": "2.0.1", + "lazy-cache": "1.0.4", + "matched": "0.4.4", + "rimraf": "2.6.1" + } + }, + "depd": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.1.tgz", + "integrity": "sha1-V4O04cRZ8G+lyif5kfPQbnoxA1k=", + "dev": true + }, + "deprecated": { + "version": "0.0.1", + "resolved": "https://registry.npmjs.org/deprecated/-/deprecated-0.0.1.tgz", + "integrity": "sha1-+cmvVGSvoeepcUWKi97yqpTVuxk=" + }, + "destroy": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.0.4.tgz", + "integrity": "sha1-l4hXRCxEdJ5CBmE+N5RiBYJqvYA=", + "dev": true + }, + "detect-file": { + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/detect-file/-/detect-file-0.1.0.tgz", + "integrity": "sha1-STXe39lIhkjgBrASlWbpOGcR6mM=", + "requires": { + "fs-exists-sync": "0.1.0" + } + }, + "dev-ip": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/dev-ip/-/dev-ip-1.0.1.tgz", + "integrity": "sha1-p2o+0YVb56ASu4rBbLgPPADcKPA=", + "dev": true + }, + "di": { + "version": "0.0.1", + "resolved": "https://registry.npmjs.org/di/-/di-0.0.1.tgz", + "integrity": "sha1-gGZJMmzqp8qjMG112YXqJ0i6kTw=", + "dev": true + }, + "doctrine": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-2.0.0.tgz", + "integrity": "sha1-xz2NKQnSIpHhoAejlYBNqLZl/mM=", + "dev": true, + "requires": { + "esutils": "2.0.2", + "isarray": "1.0.0" + }, + "dependencies": { + "isarray": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", + "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=", + "dev": true + } + } + }, + "dom-serialize": { + "version": "2.2.1", + "resolved": "https://registry.npmjs.org/dom-serialize/-/dom-serialize-2.2.1.tgz", + "integrity": "sha1-ViromZ9Evl6jB29UGdzVnrQ6yVs=", + "dev": true, + "requires": { + "custom-event": "1.0.1", + "ent": "2.2.0", + "extend": "3.0.1", + "void-elements": "2.0.1" + } + }, + "download": { + "version": "4.4.3", + "resolved": "https://registry.npmjs.org/download/-/download-4.4.3.tgz", + "integrity": "sha1-qlX9rTktldS2jowr4D4MKqIbqaw=", + "dev": true, + "requires": { + "caw": "1.2.0", + "concat-stream": "1.6.0", + "each-async": "1.1.1", + "filenamify": "1.2.1", + "got": "5.7.1", + "gulp-decompress": "1.2.0", + "gulp-rename": "1.2.2", + "is-url": "1.2.2", + "object-assign": "4.1.1", + "read-all-stream": "3.1.0", + "readable-stream": "2.3.3", + "stream-combiner2": "1.1.1", + "vinyl": "1.2.0", + "vinyl-fs": "2.4.4", + "ware": "1.3.0" + }, + "dependencies": { + "glob": { + "version": "5.0.15", + "resolved": "https://registry.npmjs.org/glob/-/glob-5.0.15.tgz", + "integrity": "sha1-G8k2ueAvSmA/zCIuz3Yz0wuLk7E=", + "dev": true, + "requires": { + "inflight": "1.0.6", + "inherits": "2.0.3", + "minimatch": "3.0.4", + "once": "1.4.0", + "path-is-absolute": "1.0.1" + } + }, + "glob-parent": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-3.1.0.tgz", + "integrity": "sha1-nmr2KZ2NO9K9QEMIMr0RPfkGxa4=", + "dev": true, + "requires": { + "is-glob": "3.1.0", + "path-dirname": "1.0.2" + } + }, + "glob-stream": { + "version": "5.3.5", + "resolved": "https://registry.npmjs.org/glob-stream/-/glob-stream-5.3.5.tgz", + "integrity": "sha1-pVZlqajM3EGRWofHAeMtTgFvrSI=", + "dev": true, + "requires": { + "extend": "3.0.1", + "glob": "5.0.15", + "glob-parent": "3.1.0", + "micromatch": "2.3.11", + "ordered-read-streams": "0.3.0", + "through2": "0.6.5", + "to-absolute-glob": "0.1.1", + "unique-stream": "2.2.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.0.34", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz", + "integrity": "sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=", + "dev": true, + "requires": { + "core-util-is": "1.0.2", + "inherits": "2.0.3", + "isarray": "0.0.1", + "string_decoder": "0.10.31" + } + }, + "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 + }, + "through2": { + "version": "0.6.5", + "resolved": "https://registry.npmjs.org/through2/-/through2-0.6.5.tgz", + "integrity": "sha1-QaucZ7KdVyCQcUEOHXp6lozTrUg=", + "dev": true, + "requires": { + "readable-stream": "1.0.34", + "xtend": "4.0.1" + } + } + } + }, + "is-extglob": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz", + "integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=", + "dev": true + }, + "is-glob": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz", + "integrity": "sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=", + "dev": true, + "requires": { + "is-extglob": "2.1.1" + } + }, + "isarray": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", + "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=", + "dev": true + }, + "object-assign": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz", + "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=", + "dev": true + }, + "ordered-read-streams": { + "version": "0.3.0", + "resolved": "https://registry.npmjs.org/ordered-read-streams/-/ordered-read-streams-0.3.0.tgz", + "integrity": "sha1-cTfmmzKYuzQiR6G77jiByA4v14s=", + "dev": true, + "requires": { + "is-stream": "1.1.0", + "readable-stream": "2.3.3" + } + }, + "readable-stream": { + "version": "2.3.3", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.3.tgz", + "integrity": "sha512-m+qzzcn7KUxEmd1gMbchF+Y2eIUbieUaxkWtptyHywrX0rE8QEYqPC07Vuy4Wm32/xE16NcdBctb8S0Xe/5IeQ==", + "dev": true, + "requires": { + "core-util-is": "1.0.2", + "inherits": "2.0.3", + "isarray": "1.0.0", + "process-nextick-args": "1.0.7", + "safe-buffer": "5.1.1", + "string_decoder": "1.0.3", + "util-deprecate": "1.0.2" + } + }, + "string_decoder": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz", + "integrity": "sha512-4AH6Z5fzNNBcH+6XDMfA/BTt87skxqJlO0lAh3Dker5zThcAxG6mKz+iGu308UKoPPQ8Dcqx/4JhujzltRa+hQ==", + "dev": true, + "requires": { + "safe-buffer": "5.1.1" + } + }, + "strip-bom": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-2.0.0.tgz", + "integrity": "sha1-YhmoVhZSBJHzV4i9vxRHqZx+aw4=", + "dev": true, + "requires": { + "is-utf8": "0.2.1" + } + }, + "unique-stream": { + "version": "2.2.1", + "resolved": "https://registry.npmjs.org/unique-stream/-/unique-stream-2.2.1.tgz", + "integrity": "sha1-WqADz76Uxf+GbE59ZouxxNuts2k=", + "dev": true, + "requires": { + "json-stable-stringify": "1.0.1", + "through2-filter": "2.0.0" + } + }, + "vinyl": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-1.2.0.tgz", + "integrity": "sha1-XIgDbPVl5d8FVYv8kR+GVt8hiIQ=", + "dev": true, + "requires": { + "clone": "1.0.2", + "clone-stats": "0.0.1", + "replace-ext": "0.0.1" + } + }, + "vinyl-fs": { + "version": "2.4.4", + "resolved": "https://registry.npmjs.org/vinyl-fs/-/vinyl-fs-2.4.4.tgz", + "integrity": "sha1-vm/zJwy1Xf19MGNkDegfJddTIjk=", + "dev": true, + "requires": { + "duplexify": "3.5.1", + "glob-stream": "5.3.5", + "graceful-fs": "4.1.11", + "gulp-sourcemaps": "1.6.0", + "is-valid-glob": "0.3.0", + "lazystream": "1.0.0", + "lodash.isequal": "4.5.0", + "merge-stream": "1.0.1", + "mkdirp": "0.5.1", + "object-assign": "4.1.1", + "readable-stream": "2.3.3", + "strip-bom": "2.0.0", + "strip-bom-stream": "1.0.0", + "through2": "2.0.3", + "through2-filter": "2.0.0", + "vali-date": "1.0.0", + "vinyl": "1.2.0" + } + } + } + }, + "duplexer": { + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/duplexer/-/duplexer-0.1.1.tgz", + "integrity": "sha1-rOb/gIwc5mtX0ev5eXessCM0z8E=" + }, + "duplexer2": { + "version": "0.0.2", + "resolved": "https://registry.npmjs.org/duplexer2/-/duplexer2-0.0.2.tgz", + "integrity": "sha1-xhTc9n4vsUmVqRcR5aYX6KYKMds=", + "requires": { + "readable-stream": "1.1.14" + } + }, + "duplexify": { + "version": "3.5.1", + "resolved": "https://registry.npmjs.org/duplexify/-/duplexify-3.5.1.tgz", + "integrity": "sha512-j5goxHTwVED1Fpe5hh3q9R93Kip0Bg2KVAt4f8CEYM3UEwYcPSvWbXaUQOzdX/HtiNomipv+gU7ASQPDbV7pGQ==", + "requires": { + "end-of-stream": "1.4.0", + "inherits": "2.0.3", + "readable-stream": "2.3.3", + "stream-shift": "1.0.0" + }, + "dependencies": { + "end-of-stream": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.0.tgz", + "integrity": "sha1-epDYM+/abPpurA9JSduw+tOmMgY=", + "requires": { + "once": "1.4.0" + } + }, + "isarray": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", + "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=" + }, + "readable-stream": { + "version": "2.3.3", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.3.tgz", + "integrity": "sha512-m+qzzcn7KUxEmd1gMbchF+Y2eIUbieUaxkWtptyHywrX0rE8QEYqPC07Vuy4Wm32/xE16NcdBctb8S0Xe/5IeQ==", + "requires": { + "core-util-is": "1.0.2", + "inherits": "2.0.3", + "isarray": "1.0.0", + "process-nextick-args": "1.0.7", + "safe-buffer": "5.1.1", + "string_decoder": "1.0.3", + "util-deprecate": "1.0.2" + } + }, + "string_decoder": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz", + "integrity": "sha512-4AH6Z5fzNNBcH+6XDMfA/BTt87skxqJlO0lAh3Dker5zThcAxG6mKz+iGu308UKoPPQ8Dcqx/4JhujzltRa+hQ==", + "requires": { + "safe-buffer": "5.1.1" + } + } + } + }, + "each-async": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/each-async/-/each-async-1.1.1.tgz", + "integrity": "sha1-3uUim98KtrogEqOV4bhpq/iBNHM=", + "dev": true, + "requires": { + "onetime": "1.1.0", + "set-immediate-shim": "1.0.1" + } + }, + "easy-extender": { + "version": "2.3.2", + "resolved": "https://registry.npmjs.org/easy-extender/-/easy-extender-2.3.2.tgz", + "integrity": "sha1-PTJI/r4rFZYHMW2PnPSRwWZIIh0=", + "dev": true, + "requires": { + "lodash": "3.10.1" + }, + "dependencies": { + "lodash": { + "version": "3.10.1", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-3.10.1.tgz", + "integrity": "sha1-W/Rejkm6QYnhfUgnid/RW9FAt7Y=", + "dev": true + } + } + }, + "eazy-logger": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/eazy-logger/-/eazy-logger-3.0.2.tgz", + "integrity": "sha1-oyWqXlPROiIliJsqxBE7K5Y29Pw=", + "dev": true, + "requires": { + "tfunk": "3.1.0" + } + }, + "ecc-jsbn": { + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.1.tgz", + "integrity": "sha1-D8c6ntXw1Tw4GTOYUj735UN3dQU=", + "optional": true, + "requires": { + "jsbn": "0.1.1" + } + }, + "ee-first": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz", + "integrity": "sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0=", + "dev": true + }, + "electron-to-chromium": { + "version": "1.3.18", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.18.tgz", + "integrity": "sha1-PcyZ2j5rZl9qu8ccKK1Ros1zGpw=" + }, + "emitter-steward": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/emitter-steward/-/emitter-steward-1.0.0.tgz", + "integrity": "sha1-80Ea3pdYp1Zd+Eiy2gy70bRsvWQ=", + "dev": true + }, + "encodeurl": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.1.tgz", + "integrity": "sha1-eePVhlU0aQn+bw9Fpd5oEDspTSA=", + "dev": true + }, + "end-of-stream": { + "version": "0.1.5", + "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-0.1.5.tgz", + "integrity": "sha1-jhdyBsPICDfYVjLouTWd/osvbq8=", + "requires": { + "once": "1.3.3" + }, + "dependencies": { + "once": { + "version": "1.3.3", + "resolved": "https://registry.npmjs.org/once/-/once-1.3.3.tgz", + "integrity": "sha1-suJhVXzkwxTsgwTz+oJmPkKXyiA=", + "requires": { + "wrappy": "1.0.2" + } + } + } + }, + "engine.io": { + "version": "1.8.0", + "resolved": "https://registry.npmjs.org/engine.io/-/engine.io-1.8.0.tgz", + "integrity": "sha1-PutfJky3XbvsG6rqJtYfWk6s4qo=", + "dev": true, + "requires": { + "accepts": "1.3.3", + "base64id": "0.1.0", + "cookie": "0.3.1", + "debug": "2.3.3", + "engine.io-parser": "1.3.1", + "ws": "1.1.1" + }, + "dependencies": { + "debug": { + "version": "2.3.3", + "resolved": "https://registry.npmjs.org/debug/-/debug-2.3.3.tgz", + "integrity": "sha1-QMRT5n5uE8kB3ewxeviYbNqe/4w=", + "dev": true, + "requires": { + "ms": "0.7.2" + } + }, + "ms": { + "version": "0.7.2", + "resolved": "https://registry.npmjs.org/ms/-/ms-0.7.2.tgz", + "integrity": "sha1-riXPJRKziFodldfwN4aNhDESR2U=", + "dev": true + } + } + }, + "engine.io-client": { + "version": "1.8.0", + "resolved": "https://registry.npmjs.org/engine.io-client/-/engine.io-client-1.8.0.tgz", + "integrity": "sha1-e3MOQSdBQIdZbZvjyI0rxf22z1w=", + "dev": true, + "requires": { + "component-emitter": "1.2.1", + "component-inherit": "0.0.3", + "debug": "2.3.3", + "engine.io-parser": "1.3.1", + "has-cors": "1.1.0", + "indexof": "0.0.1", + "parsejson": "0.0.3", + "parseqs": "0.0.5", + "parseuri": "0.0.5", + "ws": "1.1.1", + "xmlhttprequest-ssl": "1.5.3", + "yeast": "0.1.2" + }, + "dependencies": { + "component-emitter": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.2.1.tgz", + "integrity": "sha1-E3kY1teCg/ffemt8WmPhQOaUJeY=", + "dev": true + }, + "debug": { + "version": "2.3.3", + "resolved": "https://registry.npmjs.org/debug/-/debug-2.3.3.tgz", + "integrity": "sha1-QMRT5n5uE8kB3ewxeviYbNqe/4w=", + "dev": true, + "requires": { + "ms": "0.7.2" + } + }, + "ms": { + "version": "0.7.2", + "resolved": "https://registry.npmjs.org/ms/-/ms-0.7.2.tgz", + "integrity": "sha1-riXPJRKziFodldfwN4aNhDESR2U=", + "dev": true + } + } + }, + "engine.io-parser": { + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/engine.io-parser/-/engine.io-parser-1.3.1.tgz", + "integrity": "sha1-lVTxrjMQfW+9FwylRm0vgz9qB88=", + "dev": true, + "requires": { + "after": "0.8.1", + "arraybuffer.slice": "0.0.6", + "base64-arraybuffer": "0.1.5", + "blob": "0.0.4", + "has-binary": "0.1.6", + "wtf-8": "1.0.0" + }, + "dependencies": { + "has-binary": { + "version": "0.1.6", + "resolved": "https://registry.npmjs.org/has-binary/-/has-binary-0.1.6.tgz", + "integrity": "sha1-JTJvOc+k9hath4eJTjryz7x7bhA=", + "dev": true, + "requires": { + "isarray": "0.0.1" + } + } + } + }, + "ent": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/ent/-/ent-2.2.0.tgz", + "integrity": "sha1-6WQhkyWiHQX0RGai9obtbOX13R0=", + "dev": true + }, + "error-ex": { + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.1.tgz", + "integrity": "sha1-+FWobOYa3E6GIcPNoh56dhLDqNw=", + "requires": { + "is-arrayish": "0.2.1" + } + }, + "escape-html": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz", + "integrity": "sha1-Aljq5NPQwJdN4cFpGI7wBR0dGYg=", + "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=" + }, + "escodegen": { + "version": "1.8.1", + "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-1.8.1.tgz", + "integrity": "sha1-WltTr0aTEQvrsIZ6o0MN07cKEBg=", + "dev": true, + "requires": { + "esprima": "2.7.3", + "estraverse": "1.9.3", + "esutils": "2.0.2", + "optionator": "0.8.2", + "source-map": "0.2.0" + }, + "dependencies": { + "esprima": { + "version": "2.7.3", + "resolved": "https://registry.npmjs.org/esprima/-/esprima-2.7.3.tgz", + "integrity": "sha1-luO3DVd59q1JzQMmc9HDEnZ7pYE=", + "dev": true + }, + "source-map": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.2.0.tgz", + "integrity": "sha1-2rc/vPwrqBm03gO9b26qSBZLP50=", + "dev": true, + "optional": true, + "requires": { + "amdefine": "1.0.1" + } + } + } + }, + "eslint": { + "version": "4.4.1", + "resolved": "https://registry.npmjs.org/eslint/-/eslint-4.4.1.tgz", + "integrity": "sha1-mc1+r8/8ov+Zpcj18qR01jZLS9M=", + "dev": true, + "requires": { + "ajv": "5.2.2", + "babel-code-frame": "6.22.0", + "chalk": "1.1.3", + "concat-stream": "1.6.0", + "cross-spawn": "5.1.0", + "debug": "2.6.8", + "doctrine": "2.0.0", + "eslint-scope": "3.7.1", + "espree": "3.5.0", + "esquery": "1.0.0", + "estraverse": "4.2.0", + "esutils": "2.0.2", + "file-entry-cache": "2.0.0", + "functional-red-black-tree": "1.0.1", + "glob": "7.1.2", + "globals": "9.18.0", + "ignore": "3.3.3", + "imurmurhash": "0.1.4", + "inquirer": "3.2.2", + "is-resolvable": "1.0.0", + "js-yaml": "3.9.1", + "json-stable-stringify": "1.0.1", + "levn": "0.3.0", + "lodash": "4.17.4", + "minimatch": "3.0.4", + "mkdirp": "0.5.1", + "natural-compare": "1.4.0", + "optionator": "0.8.2", + "path-is-inside": "1.0.2", + "pluralize": "4.0.0", + "progress": "2.0.0", + "require-uncached": "1.0.3", + "semver": "5.4.1", + "strip-json-comments": "2.0.1", + "table": "4.0.1", + "text-table": "0.2.0" + }, + "dependencies": { + "ajv": { + "version": "5.2.2", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-5.2.2.tgz", + "integrity": "sha1-R8aNaehvXZUxA7AHSpQw3GPaXjk=", + "dev": true, + "requires": { + "co": "4.6.0", + "fast-deep-equal": "1.0.0", + "json-schema-traverse": "0.3.1", + "json-stable-stringify": "1.0.1" + } + }, + "ansi-escapes": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-2.0.0.tgz", + "integrity": "sha1-W65SvkJIeN2Xg+iRDj/Cki6DyBs=", + "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.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.0.tgz", + "integrity": "sha512-NnSOmMEYtVR2JVMIGTzynRkkaxtiq1xnFBcdQD/DnNCYPoEPsVJhM98BDyaoNOQIi7p4okdi3E27eN7GQbsUug==", + "dev": true, + "requires": { + "color-convert": "1.9.0" + } + }, + "cli-cursor": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-2.1.0.tgz", + "integrity": "sha1-s12sN2R5+sw+lHR9QdDQ9SOP/LU=", + "dev": true, + "requires": { + "restore-cursor": "2.0.0" + } + }, + "cli-width": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/cli-width/-/cli-width-2.1.0.tgz", + "integrity": "sha1-sjTKIJsp72b8UY2bmNWEewDt8Ao=", + "dev": true + }, + "cross-spawn": { + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-5.1.0.tgz", + "integrity": "sha1-6L0O/uWPz/b4+UUQoKVUu/ojVEk=", + "dev": true, + "requires": { + "lru-cache": "4.1.1", + "shebang-command": "1.2.0", + "which": "1.3.0" + } + }, + "debug": { + "version": "2.6.8", + "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.8.tgz", + "integrity": "sha1-5zFTHKLt4n0YgiJCfaF4IdaP9Pw=", + "dev": true, + "requires": { + "ms": "2.0.0" + } + }, + "estraverse": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.2.0.tgz", + "integrity": "sha1-De4/7TH81GlhjOc0IJn8GvoL2xM=", + "dev": true + }, + "figures": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/figures/-/figures-2.0.0.tgz", + "integrity": "sha1-OrGi0qYsi/tDGgyUy3l6L84nyWI=", + "dev": true, + "requires": { + "escape-string-regexp": "1.0.5" + } + }, + "has-flag": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-2.0.0.tgz", + "integrity": "sha1-6CB68cx7MNRGzHC3NLXovhj4jVE=", + "dev": true + }, + "inquirer": { + "version": "3.2.2", + "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-3.2.2.tgz", + "integrity": "sha512-bTKLzEHJVATimZO/YFdLrom0lRx1BHfRYskFHfIMVkGdp8+dIZaxuU+4yrsS1lcu6YWywVQVVsfvdwESzbeqHw==", + "dev": true, + "requires": { + "ansi-escapes": "2.0.0", + "chalk": "2.1.0", + "cli-cursor": "2.1.0", + "cli-width": "2.1.0", + "external-editor": "2.0.4", + "figures": "2.0.0", + "lodash": "4.17.4", + "mute-stream": "0.0.7", + "run-async": "2.3.0", + "rx-lite": "4.0.8", + "rx-lite-aggregates": "4.0.8", + "string-width": "2.1.1", + "strip-ansi": "4.0.0", + "through": "2.3.8" + }, + "dependencies": { + "chalk": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.1.0.tgz", + "integrity": "sha512-LUHGS/dge4ujbXMJrnihYMcL4AoOweGnw9Tp3kQuqy1Kx5c1qKjqvMJZ6nVJPMWJtKCTN72ZogH3oeSO9g9rXQ==", + "dev": true, + "requires": { + "ansi-styles": "3.2.0", + "escape-string-regexp": "1.0.5", + "supports-color": "4.2.1" + } + } + } + }, + "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 + }, + "lru-cache": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.1.tgz", + "integrity": "sha512-q4spe4KTfsAS1SUHLO0wz8Qiyf1+vMIAgpRYioFYDMNqKfHQbg+AVDH3i4fvpl71/P1L0dBl+fQi+P37UYf0ew==", + "dev": true, + "requires": { + "pseudomap": "1.0.2", + "yallist": "2.1.2" + } + }, + "ms": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", + "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=", + "dev": true + }, + "mute-stream": { + "version": "0.0.7", + "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.7.tgz", + "integrity": "sha1-MHXOk7whuPq0PhvE2n6BFe0ee6s=", + "dev": true + }, + "onetime": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/onetime/-/onetime-2.0.1.tgz", + "integrity": "sha1-BnQoIw/WdEOyeUsiu6UotoZ5YtQ=", + "dev": true, + "requires": { + "mimic-fn": "1.1.0" + } + }, + "pluralize": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/pluralize/-/pluralize-4.0.0.tgz", + "integrity": "sha1-WbcIwcAZCi9pLxx2GMRGsFL9F2I=", + "dev": true + }, + "progress": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/progress/-/progress-2.0.0.tgz", + "integrity": "sha1-ihvjZr+Pwj2yvSPxDG/pILQ4nR8=", + "dev": true + }, + "restore-cursor": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-2.0.0.tgz", + "integrity": "sha1-n37ih/gv0ybU/RYpI9YhKe7g368=", + "dev": true, + "requires": { + "onetime": "2.0.1", + "signal-exit": "3.0.2" + } + }, + "run-async": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/run-async/-/run-async-2.3.0.tgz", + "integrity": "sha1-A3GrSuC91yDUFm19/aZP96RFpsA=", + "dev": true, + "requires": { + "is-promise": "2.1.0" + } + }, + "rx-lite": { + "version": "4.0.8", + "resolved": "https://registry.npmjs.org/rx-lite/-/rx-lite-4.0.8.tgz", + "integrity": "sha1-Cx4Rr4vESDbwSmQH6S2kJGe3lEQ=", + "dev": true + }, + "semver": { + "version": "5.4.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-5.4.1.tgz", + "integrity": "sha512-WfG/X9+oATh81XtllIo/I8gOiY9EXRdv1cQdyykeXK17YcUW3EXUAi2To4pcH6nZtJPr7ZOpM5OMyWJZm+8Rsg==", + "dev": true + }, + "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" + } + }, + "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" + } + }, + "supports-color": { + "version": "4.2.1", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-4.2.1.tgz", + "integrity": "sha512-qxzYsob3yv6U+xMzPrv170y8AwGP7i74g+pbixCfD6rgso8BscLT2qXIuz6TpOaiJZ3mFgT5O9lyT9nMU4LfaA==", + "dev": true, + "requires": { + "has-flag": "2.0.0" + } + }, + "table": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/table/-/table-4.0.1.tgz", + "integrity": "sha1-qBFsEz+sLGH0pCCrbN9cTWHw5DU=", + "dev": true, + "requires": { + "ajv": "4.11.8", + "ajv-keywords": "1.5.1", + "chalk": "1.1.3", + "lodash": "4.17.4", + "slice-ansi": "0.0.4", + "string-width": "2.1.1" + }, + "dependencies": { + "ajv": { + "version": "4.11.8", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-4.11.8.tgz", + "integrity": "sha1-gv+wKynmYq5TvcIK8VlHcGc5xTY=", + "dev": true, + "requires": { + "co": "4.6.0", + "json-stable-stringify": "1.0.1" + } + } + } + } + } + }, + "eslint-plugin-angular": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/eslint-plugin-angular/-/eslint-plugin-angular-3.0.2.tgz", + "integrity": "sha1-D+0orSB0u0Tz8d5tOW+O9o9HEt4=", + "dev": true + }, + "eslint-scope": { + "version": "3.7.1", + "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-3.7.1.tgz", + "integrity": "sha1-PWPD7f2gLgbgGkUq2IyqzHzctug=", + "dev": true, + "requires": { + "esrecurse": "4.2.0", + "estraverse": "4.2.0" + }, + "dependencies": { + "estraverse": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.2.0.tgz", + "integrity": "sha1-De4/7TH81GlhjOc0IJn8GvoL2xM=", + "dev": true + } + } + }, + "espree": { + "version": "3.5.0", + "resolved": "https://registry.npmjs.org/espree/-/espree-3.5.0.tgz", + "integrity": "sha1-mDWGJb3QVYYeon4oZ+pyn69GPY0=", + "dev": true, + "requires": { + "acorn": "5.1.1", + "acorn-jsx": "3.0.1" + }, + "dependencies": { + "acorn": { + "version": "5.1.1", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-5.1.1.tgz", + "integrity": "sha512-vOk6uEMctu0vQrvuSqFdJyqj1Q0S5VTDL79qtjo+DhRr+1mmaD+tluFSCZqhvi/JUhXSzoZN2BhtstaPEeE8cw==", + "dev": true + } + } + }, + "esprima": { + "version": "1.2.5", + "resolved": "https://registry.npmjs.org/esprima/-/esprima-1.2.5.tgz", + "integrity": "sha1-CZNQL+r2aBODJXVvMPmlH+7sEek=" + }, + "esquery": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.0.0.tgz", + "integrity": "sha1-z7qLV9f7qT8XKYqKAGoEzaE9gPo=", + "dev": true, + "requires": { + "estraverse": "4.2.0" + }, + "dependencies": { + "estraverse": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.2.0.tgz", + "integrity": "sha1-De4/7TH81GlhjOc0IJn8GvoL2xM=", + "dev": true + } + } + }, + "esrecurse": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.2.0.tgz", + "integrity": "sha1-+pVo2Y04I/mkHZHpAtyrnqblsWM=", + "dev": true, + "requires": { + "estraverse": "4.2.0", + "object-assign": "4.1.1" + }, + "dependencies": { + "estraverse": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.2.0.tgz", + "integrity": "sha1-De4/7TH81GlhjOc0IJn8GvoL2xM=", + "dev": true + }, + "object-assign": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz", + "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=", + "dev": true + } + } + }, + "estraverse": { + "version": "1.9.3", + "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-1.9.3.tgz", + "integrity": "sha1-r2fy3JIlgkFZUJJgkaQAXSnJu0Q=" + }, + "esutils": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.2.tgz", + "integrity": "sha1-Cr9PHKpbyx96nYrMbepPqqBLrJs=", + "dev": true + }, + "etag": { + "version": "1.8.0", + "resolved": "https://registry.npmjs.org/etag/-/etag-1.8.0.tgz", + "integrity": "sha1-b2Ma7zNtbEY2K1F2QETOIWvjwFE=", + "dev": true + }, + "event-stream": { + "version": "3.3.4", + "resolved": "https://registry.npmjs.org/event-stream/-/event-stream-3.3.4.tgz", + "integrity": "sha1-SrTJoPWlTbkzi0w02Gv86PSzVXE=", + "requires": { + "duplexer": "0.1.1", + "from": "0.1.7", + "map-stream": "0.1.0", + "pause-stream": "0.0.11", + "split": "0.3.3", + "stream-combiner": "0.0.4", + "through": "2.3.8" + } + }, + "eventemitter3": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-1.2.0.tgz", + "integrity": "sha1-HIaZHYFq0eUEdQ5zh0Ik7PO+xQg=", + "dev": true + }, + "exec-buffer": { + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/exec-buffer/-/exec-buffer-3.2.0.tgz", + "integrity": "sha512-wsiD+2Tp6BWHoVv3B+5Dcx6E7u5zky+hUwOHjuH2hKSLR3dvRmX8fk8UD8uqQixHs4Wk6eDmiegVrMPjKj7wpA==", + "dev": true, + "requires": { + "execa": "0.7.0", + "p-finally": "1.0.0", + "pify": "3.0.0", + "rimraf": "2.6.1", + "tempfile": "2.0.0" + }, + "dependencies": { + "pify": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz", + "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=", + "dev": true + } + } + }, + "exec-series": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/exec-series/-/exec-series-1.0.3.tgz", + "integrity": "sha1-bSV6m+rEgqhyx3g7yGFYOfx3FDo=", + "dev": true, + "requires": { + "async-each-series": "1.1.0", + "object-assign": "4.1.1" + }, + "dependencies": { + "async-each-series": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/async-each-series/-/async-each-series-1.1.0.tgz", + "integrity": "sha1-9C/YFV048hpbjqB8KOBj7RcAsTg=", + "dev": true + }, + "object-assign": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz", + "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=", + "dev": true + } + } + }, + "execa": { + "version": "0.7.0", + "resolved": "https://registry.npmjs.org/execa/-/execa-0.7.0.tgz", + "integrity": "sha1-lEvs00zEHuMqY6n68nrVpl/Fl3c=", + "dev": true, + "requires": { + "cross-spawn": "5.1.0", + "get-stream": "3.0.0", + "is-stream": "1.1.0", + "npm-run-path": "2.0.2", + "p-finally": "1.0.0", + "signal-exit": "3.0.2", + "strip-eof": "1.0.0" + }, + "dependencies": { + "cross-spawn": { + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-5.1.0.tgz", + "integrity": "sha1-6L0O/uWPz/b4+UUQoKVUu/ojVEk=", + "dev": true, + "requires": { + "lru-cache": "4.1.1", + "shebang-command": "1.2.0", + "which": "1.3.0" + } + }, + "lru-cache": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.1.tgz", + "integrity": "sha512-q4spe4KTfsAS1SUHLO0wz8Qiyf1+vMIAgpRYioFYDMNqKfHQbg+AVDH3i4fvpl71/P1L0dBl+fQi+P37UYf0ew==", + "dev": true, + "requires": { + "pseudomap": "1.0.2", + "yallist": "2.1.2" + } + } + } + }, + "executable": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/executable/-/executable-1.1.0.tgz", + "integrity": "sha1-h3mA6REvM5EGbaNyZd562ENKtNk=", + "dev": true, + "requires": { + "meow": "3.7.0" + } + }, + "exit": { + "version": "0.1.2", + "resolved": "https://registry.npmjs.org/exit/-/exit-0.1.2.tgz", + "integrity": "sha1-BjJjj42HfMghB9MKD/8aF8uhzQw=", + "dev": true + }, + "exit-hook": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/exit-hook/-/exit-hook-1.1.1.tgz", + "integrity": "sha1-8FyiM7SMBdVP/wd2XfhQfpXAL/g=" + }, + "expand-braces": { + "version": "0.1.2", + "resolved": "https://registry.npmjs.org/expand-braces/-/expand-braces-0.1.2.tgz", + "integrity": "sha1-SIsdHSRRyz06axks/AMPRMWFX+o=", + "dev": true, + "requires": { + "array-slice": "0.2.3", + "array-unique": "0.2.1", + "braces": "0.1.5" + }, + "dependencies": { + "array-slice": { + "version": "0.2.3", + "resolved": "https://registry.npmjs.org/array-slice/-/array-slice-0.2.3.tgz", + "integrity": "sha1-3Tz7gO15c6dRF82sabC5nshhhvU=", + "dev": true + }, + "braces": { + "version": "0.1.5", + "resolved": "https://registry.npmjs.org/braces/-/braces-0.1.5.tgz", + "integrity": "sha1-wIVxEIUpHYt1/ddOqw+FlygHEeY=", + "dev": true, + "requires": { + "expand-range": "0.1.1" + } + }, + "expand-range": { + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/expand-range/-/expand-range-0.1.1.tgz", + "integrity": "sha1-TLjtoJk8pW+k9B/ELzy7TMrf8EQ=", + "dev": true, + "requires": { + "is-number": "0.1.1", + "repeat-string": "0.2.2" + } + }, + "is-number": { + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/is-number/-/is-number-0.1.1.tgz", + "integrity": "sha1-aaevEWlj1HIG7JvZtIoUIW8eOAY=", + "dev": true + }, + "repeat-string": { + "version": "0.2.2", + "resolved": "https://registry.npmjs.org/repeat-string/-/repeat-string-0.2.2.tgz", + "integrity": "sha1-x6jTI2BoNiBZp+RlH8aITosftK4=", + "dev": true + } + } + }, + "expand-brackets": { + "version": "0.1.5", + "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-0.1.5.tgz", + "integrity": "sha1-3wcoTjQqgHzXM6xa9yQR5YHRF3s=", + "requires": { + "is-posix-bracket": "0.1.1" + } + }, + "expand-range": { + "version": "1.8.2", + "resolved": "https://registry.npmjs.org/expand-range/-/expand-range-1.8.2.tgz", + "integrity": "sha1-opnv/TNf4nIeuujiV+x5ZE/IUzc=", + "requires": { + "fill-range": "2.2.3" + } + }, + "expand-tilde": { + "version": "1.2.2", + "resolved": "https://registry.npmjs.org/expand-tilde/-/expand-tilde-1.2.2.tgz", + "integrity": "sha1-C4HrqJflo9MdHD0QL48BRB5VlEk=", + "requires": { + "os-homedir": "1.0.2" + } + }, + "express": { + "version": "4.15.4", + "resolved": "https://registry.npmjs.org/express/-/express-4.15.4.tgz", + "integrity": "sha1-Ay4iU0ic+PzgJma+yj0R7XotrtE=", + "dev": true, + "requires": { + "accepts": "1.3.3", + "array-flatten": "1.1.1", + "content-disposition": "0.5.2", + "content-type": "1.0.2", + "cookie": "0.3.1", + "cookie-signature": "1.0.6", + "debug": "2.6.8", + "depd": "1.1.1", + "encodeurl": "1.0.1", + "escape-html": "1.0.3", + "etag": "1.8.0", + "finalhandler": "1.0.4", + "fresh": "0.5.0", + "merge-descriptors": "1.0.1", + "methods": "1.1.2", + "on-finished": "2.3.0", + "parseurl": "1.3.1", + "path-to-regexp": "0.1.7", + "proxy-addr": "1.1.5", + "qs": "6.5.0", + "range-parser": "1.2.0", + "send": "0.15.4", + "serve-static": "1.12.4", + "setprototypeof": "1.0.3", + "statuses": "1.3.1", + "type-is": "1.6.15", + "utils-merge": "1.0.0", + "vary": "1.1.1" + }, + "dependencies": { + "debug": { + "version": "2.6.8", + "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.8.tgz", + "integrity": "sha1-5zFTHKLt4n0YgiJCfaF4IdaP9Pw=", + "dev": true, + "requires": { + "ms": "2.0.0" + } + }, + "finalhandler": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.0.4.tgz", + "integrity": "sha512-16l/r8RgzlXKmFOhZpHBztvye+lAhC5SU7hXavnerC9UfZqZxxXl3BzL8MhffPT3kF61lj9Oav2LKEzh0ei7tg==", + "dev": true, + "requires": { + "debug": "2.6.8", + "encodeurl": "1.0.1", + "escape-html": "1.0.3", + "on-finished": "2.3.0", + "parseurl": "1.3.1", + "statuses": "1.3.1", + "unpipe": "1.0.0" + } + }, + "fresh": { + "version": "0.5.0", + "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.5.0.tgz", + "integrity": "sha1-9HTKXmqSRtb9jglTz6m5yAWvp44=", + "dev": true + }, + "http-errors": { + "version": "1.6.2", + "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.6.2.tgz", + "integrity": "sha1-CgAsyFcHGSp+eUbO7cERVfYOxzY=", + "dev": true, + "requires": { + "depd": "1.1.1", + "inherits": "2.0.3", + "setprototypeof": "1.0.3", + "statuses": "1.3.1" + } + }, + "mime": { + "version": "1.3.4", + "resolved": "https://registry.npmjs.org/mime/-/mime-1.3.4.tgz", + "integrity": "sha1-EV+eO2s9rylZmDyzjxSaLUDrXVM=", + "dev": true + }, + "ms": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", + "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=", + "dev": true + }, + "qs": { + "version": "6.5.0", + "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.0.tgz", + "integrity": "sha512-fjVFjW9yhqMhVGwRExCXLhJKrLlkYSaxNWdyc9rmHlrVZbk35YHH312dFd7191uQeXkI3mKLZTIbSvIeFwFemg==", + "dev": true + }, + "send": { + "version": "0.15.4", + "resolved": "https://registry.npmjs.org/send/-/send-0.15.4.tgz", + "integrity": "sha1-mF+qPihLAnPHkzZKNcZze9k5Bbk=", + "dev": true, + "requires": { + "debug": "2.6.8", + "depd": "1.1.1", + "destroy": "1.0.4", + "encodeurl": "1.0.1", + "escape-html": "1.0.3", + "etag": "1.8.0", + "fresh": "0.5.0", + "http-errors": "1.6.2", + "mime": "1.3.4", + "ms": "2.0.0", + "on-finished": "2.3.0", + "range-parser": "1.2.0", + "statuses": "1.3.1" + } + }, + "serve-static": { + "version": "1.12.4", + "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.12.4.tgz", + "integrity": "sha1-m2qpjutyU8Tu3Ewfb9vKYJkBqWE=", + "dev": true, + "requires": { + "encodeurl": "1.0.1", + "escape-html": "1.0.3", + "parseurl": "1.3.1", + "send": "0.15.4" + } + }, + "setprototypeof": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.0.3.tgz", + "integrity": "sha1-ZlZ+NwQ+608E2RvWWMDL77VbjgQ=", + "dev": true + } + } + }, + "extend": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.1.tgz", + "integrity": "sha1-p1Xqe8Gt/MWjHOfnYtuq3F5jZEQ=" + }, + "extend-shallow": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", + "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", + "requires": { + "is-extendable": "0.1.1" + } + }, + "external-editor": { + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/external-editor/-/external-editor-2.0.4.tgz", + "integrity": "sha1-HtkZnanL/i7y96MbL96LDRI2iXI=", + "dev": true, + "requires": { + "iconv-lite": "0.4.18", + "jschardet": "1.5.1", + "tmp": "0.0.31" + }, + "dependencies": { + "iconv-lite": { + "version": "0.4.18", + "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.18.tgz", + "integrity": "sha512-sr1ZQph3UwHTR0XftSbK85OvBbxe/abLGzEnPENCQwmHf7sck8Oyu4ob3LgBxWWxRoM+QszeUyl7jbqapu2TqA==", + "dev": true + } + } + }, + "extglob": { + "version": "0.3.2", + "resolved": "https://registry.npmjs.org/extglob/-/extglob-0.3.2.tgz", + "integrity": "sha1-Lhj/PS9JqydlzskCPwEdqo2DSaE=", + "requires": { + "is-extglob": "1.0.0" + } + }, + "extract-zip": { + "version": "1.6.5", + "resolved": "https://registry.npmjs.org/extract-zip/-/extract-zip-1.6.5.tgz", + "integrity": "sha1-maBnNbbqIOqbcF13ms/8yHz/BEA=", + "dev": true, + "requires": { + "concat-stream": "1.6.0", + "debug": "2.2.0", + "mkdirp": "0.5.0", + "yauzl": "2.4.1" + }, + "dependencies": { + "minimist": { + "version": "0.0.8", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz", + "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=", + "dev": true + }, + "mkdirp": { + "version": "0.5.0", + "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.0.tgz", + "integrity": "sha1-HXMHam35hs2TROFecfzAWkyavxI=", + "dev": true, + "requires": { + "minimist": "0.0.8" + } + }, + "yauzl": { + "version": "2.4.1", + "resolved": "https://registry.npmjs.org/yauzl/-/yauzl-2.4.1.tgz", + "integrity": "sha1-lSj0QtqxsihOWLQ3m7GU4i4MQAU=", + "dev": true, + "requires": { + "fd-slicer": "1.0.1" + } + } + } + }, + "extsprintf": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz", + "integrity": "sha1-lpGEQOMEGnpBT4xS48V06zw+HgU=" + }, + "fancy-log": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/fancy-log/-/fancy-log-1.3.0.tgz", + "integrity": "sha1-Rb4X0Cu5kX1gzP/UmVyZnmyMmUg=", + "requires": { + "chalk": "1.1.3", + "time-stamp": "1.1.0" + } + }, + "fast-deep-equal": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-1.0.0.tgz", + "integrity": "sha1-liVqO8l1WV6zbYLpkp0GDYk0Of8=", + "dev": true + }, + "fast-levenshtein": { + "version": "2.0.6", + "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz", + "integrity": "sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc=", + "dev": true + }, + "fd-slicer": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/fd-slicer/-/fd-slicer-1.0.1.tgz", + "integrity": "sha1-i1vL2ewyfFBBv5qwI/1nUPEXfmU=", + "dev": true, + "requires": { + "pend": "1.2.0" + } + }, + "figures": { + "version": "1.7.0", + "resolved": "https://registry.npmjs.org/figures/-/figures-1.7.0.tgz", + "integrity": "sha1-y+Hjr/zxzUS4DK3+0o3Hk6lwHS4=", + "requires": { + "escape-string-regexp": "1.0.5", + "object-assign": "4.1.1" + }, + "dependencies": { + "object-assign": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz", + "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=" + } + } + }, + "file-entry-cache": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-2.0.0.tgz", + "integrity": "sha1-w5KZDD5oR4PYOLjISkXYoEhFg2E=", + "dev": true, + "requires": { + "flat-cache": "1.2.2", + "object-assign": "4.1.1" + }, + "dependencies": { + "object-assign": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz", + "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=", + "dev": true + } + } + }, + "file-type": { + "version": "4.4.0", + "resolved": "https://registry.npmjs.org/file-type/-/file-type-4.4.0.tgz", + "integrity": "sha1-G2AOX8ofvcboDApwxxyNul95BsU=", + "dev": true + }, + "filename-regex": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/filename-regex/-/filename-regex-2.0.1.tgz", + "integrity": "sha1-wcS5vuPglyXdsQa3XB4wH+LxiyY=" + }, + "filename-reserved-regex": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/filename-reserved-regex/-/filename-reserved-regex-1.0.0.tgz", + "integrity": "sha1-5hz4BfDeHJhFZ9A4bcXfUO5a9+Q=", + "dev": true + }, + "filenamify": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/filenamify/-/filenamify-1.2.1.tgz", + "integrity": "sha1-qfL/0RxQO+0wABUCknI3jx8TZaU=", + "dev": true, + "requires": { + "filename-reserved-regex": "1.0.0", + "strip-outer": "1.0.0", + "trim-repeated": "1.0.0" + } + }, + "fileset": { + "version": "0.2.1", + "resolved": "https://registry.npmjs.org/fileset/-/fileset-0.2.1.tgz", + "integrity": "sha1-WI74lzxmI7KnbfRlEFaWuWqsgGc=", + "dev": true, + "requires": { + "glob": "5.0.15", + "minimatch": "2.0.10" + }, + "dependencies": { + "glob": { + "version": "5.0.15", + "resolved": "https://registry.npmjs.org/glob/-/glob-5.0.15.tgz", + "integrity": "sha1-G8k2ueAvSmA/zCIuz3Yz0wuLk7E=", + "dev": true, + "requires": { + "inflight": "1.0.6", + "inherits": "2.0.3", + "minimatch": "2.0.10", + "once": "1.4.0", + "path-is-absolute": "1.0.1" + } + }, + "minimatch": { + "version": "2.0.10", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-2.0.10.tgz", + "integrity": "sha1-jQh8OcazjAAbl/ynzm0OHoCvusc=", + "dev": true, + "requires": { + "brace-expansion": "1.1.8" + } + } + } + }, + "fill-range": { + "version": "2.2.3", + "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-2.2.3.tgz", + "integrity": "sha1-ULd9/X5Gm8dJJHCWNpn+eoSFpyM=", + "requires": { + "is-number": "2.1.0", + "isobject": "2.1.0", + "randomatic": "1.1.7", + "repeat-element": "1.1.2", + "repeat-string": "1.6.1" + } + }, + "finalhandler": { + "version": "0.5.0", + "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-0.5.0.tgz", + "integrity": "sha1-6VCKvs6bbbqHGmlCodeRG5GRGsc=", + "dev": true, + "requires": { + "debug": "2.2.0", + "escape-html": "1.0.3", + "on-finished": "2.3.0", + "statuses": "1.3.1", + "unpipe": "1.0.0" + } + }, + "find-index": { + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/find-index/-/find-index-0.1.1.tgz", + "integrity": "sha1-Z101iyyjiS15Whq0cjL4tuLg3eQ=" + }, + "find-up": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/find-up/-/find-up-1.1.2.tgz", + "integrity": "sha1-ay6YIrGizgpgq2TWEOzK1TyyTQ8=", + "requires": { + "path-exists": "2.1.0", + "pinkie-promise": "2.0.1" + } + }, + "find-versions": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/find-versions/-/find-versions-1.2.1.tgz", + "integrity": "sha1-y96fEuOFdaCvG+G5osXV/Y8Ya2I=", + "dev": true, + "requires": { + "array-uniq": "1.0.3", + "get-stdin": "4.0.1", + "meow": "3.7.0", + "semver-regex": "1.0.0" + } + }, + "findup-sync": { + "version": "0.4.3", + "resolved": "https://registry.npmjs.org/findup-sync/-/findup-sync-0.4.3.tgz", + "integrity": "sha1-QAQ5Kee8YK3wt/SCfExudaDeyhI=", + "requires": { + "detect-file": "0.1.0", + "is-glob": "2.0.1", + "micromatch": "2.3.11", + "resolve-dir": "0.1.1" + } + }, + "fined": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/fined/-/fined-1.1.0.tgz", + "integrity": "sha1-s33IRLdqL15wgeiE98CuNE8VNHY=", + "requires": { + "expand-tilde": "2.0.2", + "is-plain-object": "2.0.4", + "object.defaults": "1.1.0", + "object.pick": "1.2.0", + "parse-filepath": "1.0.1" + }, + "dependencies": { + "expand-tilde": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/expand-tilde/-/expand-tilde-2.0.2.tgz", + "integrity": "sha1-l+gBqgUt8CRU3kawK/YhZCzchQI=", + "requires": { + "homedir-polyfill": "1.0.1" + } + } + } + }, + "first-chunk-stream": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/first-chunk-stream/-/first-chunk-stream-1.0.0.tgz", + "integrity": "sha1-Wb+1DNkF9g18OUzT2ayqtOatk04=" + }, + "flagged-respawn": { + "version": "0.3.2", + "resolved": "https://registry.npmjs.org/flagged-respawn/-/flagged-respawn-0.3.2.tgz", + "integrity": "sha1-/xke3c1wiKZ1smEP/8l2vpuAdLU=" + }, + "flat-cache": { + "version": "1.2.2", + "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-1.2.2.tgz", + "integrity": "sha1-+oZxTnLCHbiGAXYezy9VXRq8a5Y=", + "dev": true, + "requires": { + "circular-json": "0.3.3", + "del": "2.2.2", + "graceful-fs": "4.1.11", + "write": "0.2.1" + } + }, + "for-in": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/for-in/-/for-in-1.0.2.tgz", + "integrity": "sha1-gQaNKVqBQuwKxybG4iAMMPttXoA=" + }, + "for-own": { + "version": "0.1.5", + "resolved": "https://registry.npmjs.org/for-own/-/for-own-0.1.5.tgz", + "integrity": "sha1-UmXGgaTylNq78XyVCbZ2OqhFEM4=", + "requires": { + "for-in": "1.0.2" + } + }, + "forever-agent": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz", + "integrity": "sha1-+8cfDEGt6zf5bFd60e1C2P2sypE=" + }, + "fork-stream": { + "version": "0.0.4", + "resolved": "https://registry.npmjs.org/fork-stream/-/fork-stream-0.0.4.tgz", + "integrity": "sha1-24Sfznf2cIpfjzhq5TOgkHtUrnA=" + }, + "form-data": { + "version": "2.1.4", + "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.1.4.tgz", + "integrity": "sha1-M8GDrPGTJ27KqYFDpp6Uv+4XUNE=", + "requires": { + "asynckit": "0.4.0", + "combined-stream": "1.0.5", + "mime-types": "2.1.16" + } + }, + "formidable": { + "version": "1.0.17", + "resolved": "https://registry.npmjs.org/formidable/-/formidable-1.0.17.tgz", + "integrity": "sha1-71SRSQ+UM7cF+qdyScmQKa40hVk=", + "dev": true + }, + "forwarded": { + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.1.0.tgz", + "integrity": "sha1-Ge+YdMSuHCl7zweP3mOgm2aoQ2M=", + "dev": true + }, + "fresh": { + "version": "0.3.0", + "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.3.0.tgz", + "integrity": "sha1-ZR+DjiJCTnVm3hYdg1jKoZn4PU8=", + "dev": true + }, + "from": { + "version": "0.1.7", + "resolved": "https://registry.npmjs.org/from/-/from-0.1.7.tgz", + "integrity": "sha1-g8YK/Fi5xWmXAH7Rp2izqzA6RP4=" + }, + "fs-access": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/fs-access/-/fs-access-1.0.1.tgz", + "integrity": "sha1-1qh/JiJxzv6+wwxVNAf7mV2od3o=", + "dev": true, + "requires": { + "null-check": "1.0.0" + } + }, + "fs-exists-sync": { + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/fs-exists-sync/-/fs-exists-sync-0.1.0.tgz", + "integrity": "sha1-mC1ok6+RjnLQjeyehnP/K1qNat0=" + }, + "fs-extra": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-3.0.1.tgz", + "integrity": "sha1-N5TzeMWLNC6n27sjCVEJxLO2IpE=", + "requires": { + "graceful-fs": "4.1.11", + "jsonfile": "3.0.1", + "universalify": "0.1.1" + } + }, + "fs.realpath": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", + "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=" + }, + "fsevents": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.1.2.tgz", + "integrity": "sha512-Sn44E5wQW4bTHXvQmvSHwqbuiXtduD6Rrjm2ZtUEGbyrig+nUH3t/QD4M4/ZXViY556TBpRgZkHLDx3JxPwxiw==", + "dev": true, + "optional": true, + "requires": { + "nan": "2.6.2", + "node-pre-gyp": "0.6.36" + }, + "dependencies": { + "abbrev": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.0.tgz", + "integrity": "sha1-0FVMIlZjbi9W58LlrRg/hZQo2B8=", + "dev": true, + "optional": true + }, + "ajv": { + "version": "4.11.8", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-4.11.8.tgz", + "integrity": "sha1-gv+wKynmYq5TvcIK8VlHcGc5xTY=", + "dev": true, + "optional": true, + "requires": { + "co": "4.6.0", + "json-stable-stringify": "1.0.1" + } + }, + "ansi-regex": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz", + "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=", + "dev": true + }, + "aproba": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/aproba/-/aproba-1.1.1.tgz", + "integrity": "sha1-ldNgDwdxCqDpKYxyatXs8urLq6s=", + "dev": true, + "optional": true + }, + "are-we-there-yet": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.1.4.tgz", + "integrity": "sha1-u13KOCu5TwXhUZQ3PRb9O6HKEQ0=", + "dev": true, + "optional": true, + "requires": { + "delegates": "1.0.0", + "readable-stream": "2.2.9" + } + }, + "asn1": { + "version": "0.2.3", + "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.3.tgz", + "integrity": "sha1-2sh4dxPJlmhJ/IGAd36+nB3fO4Y=", + "dev": true, + "optional": true + }, + "assert-plus": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-0.2.0.tgz", + "integrity": "sha1-104bh+ev/A24qttwIfP+SBAasjQ=", + "dev": true, + "optional": true + }, + "asynckit": { + "version": "0.4.0", + "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz", + "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k=", + "dev": true, + "optional": true + }, + "aws-sign2": { + "version": "0.6.0", + "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.6.0.tgz", + "integrity": "sha1-FDQt0428yU0OW4fXY81jYSwOeU8=", + "dev": true, + "optional": true + }, + "aws4": { + "version": "1.6.0", + "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.6.0.tgz", + "integrity": "sha1-g+9cqGCysy5KDe7e6MdxudtXRx4=", + "dev": true, + "optional": true + }, + "balanced-match": { + "version": "0.4.2", + "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.4.2.tgz", + "integrity": "sha1-yz8+PHMtwPAe5wtAPzAuYddwmDg=", + "dev": true + }, + "bcrypt-pbkdf": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.1.tgz", + "integrity": "sha1-Y7xdy2EzG5K8Bf1SiVPDNGKgb40=", + "dev": true, + "optional": true, + "requires": { + "tweetnacl": "0.14.5" + } + }, + "block-stream": { + "version": "0.0.9", + "resolved": "https://registry.npmjs.org/block-stream/-/block-stream-0.0.9.tgz", + "integrity": "sha1-E+v+d4oDIFz+A3UUgeu0szAMEmo=", + "dev": true, + "requires": { + "inherits": "2.0.3" + } + }, + "boom": { + "version": "2.10.1", + "resolved": "https://registry.npmjs.org/boom/-/boom-2.10.1.tgz", + "integrity": "sha1-OciRjO/1eZ+D+UkqhI9iWt0Mdm8=", + "dev": true, + "requires": { + "hoek": "2.16.3" + } + }, + "brace-expansion": { + "version": "1.1.7", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.7.tgz", + "integrity": "sha1-Pv/DxQ4ABTH7cg6v+A8K6O8jz1k=", + "dev": true, + "requires": { + "balanced-match": "0.4.2", + "concat-map": "0.0.1" + } + }, + "buffer-shims": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/buffer-shims/-/buffer-shims-1.0.0.tgz", + "integrity": "sha1-mXjOMXOIxkmth5MCjDR37wRKi1E=", + "dev": true + }, + "caseless": { + "version": "0.12.0", + "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz", + "integrity": "sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw=", + "dev": true, + "optional": true + }, + "co": { + "version": "4.6.0", + "resolved": "https://registry.npmjs.org/co/-/co-4.6.0.tgz", + "integrity": "sha1-bqa989hTrlTMuOR7+gvz+QMfsYQ=", + "dev": true, + "optional": true + }, + "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 + }, + "combined-stream": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.5.tgz", + "integrity": "sha1-k4NwpXtKUd6ix3wV1cX9+JUWQAk=", + "dev": true, + "requires": { + "delayed-stream": "1.0.0" + } + }, + "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 + }, + "console-control-strings": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz", + "integrity": "sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4=", + "dev": true + }, + "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=", + "dev": true + }, + "cryptiles": { + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/cryptiles/-/cryptiles-2.0.5.tgz", + "integrity": "sha1-O9/s3GCBR8HGcgL6KR59ylnqo7g=", + "dev": true, + "optional": true, + "requires": { + "boom": "2.10.1" + } + }, + "dashdash": { + "version": "1.14.1", + "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz", + "integrity": "sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA=", + "dev": true, + "optional": true, + "requires": { + "assert-plus": "1.0.0" + }, + "dependencies": { + "assert-plus": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz", + "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=", + "dev": true, + "optional": true + } + } + }, + "debug": { + "version": "2.6.8", + "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.8.tgz", + "integrity": "sha1-5zFTHKLt4n0YgiJCfaF4IdaP9Pw=", + "dev": true, + "optional": true, + "requires": { + "ms": "2.0.0" + } + }, + "deep-extend": { + "version": "0.4.2", + "resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.4.2.tgz", + "integrity": "sha1-SLaZwn4zS/ifEIkr5DL25MfTSn8=", + "dev": true, + "optional": true + }, + "delayed-stream": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz", + "integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk=", + "dev": true + }, + "delegates": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz", + "integrity": "sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o=", + "dev": true, + "optional": true + }, + "ecc-jsbn": { + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.1.tgz", + "integrity": "sha1-D8c6ntXw1Tw4GTOYUj735UN3dQU=", + "dev": true, + "optional": true, + "requires": { + "jsbn": "0.1.1" + } + }, + "extend": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.1.tgz", + "integrity": "sha1-p1Xqe8Gt/MWjHOfnYtuq3F5jZEQ=", + "dev": true, + "optional": true + }, + "extsprintf": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.0.2.tgz", + "integrity": "sha1-4QgOBljjALBilJkMxw4VAiNf1VA=", + "dev": true + }, + "forever-agent": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz", + "integrity": "sha1-+8cfDEGt6zf5bFd60e1C2P2sypE=", + "dev": true, + "optional": true + }, + "form-data": { + "version": "2.1.4", + "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.1.4.tgz", + "integrity": "sha1-M8GDrPGTJ27KqYFDpp6Uv+4XUNE=", + "dev": true, + "optional": true, + "requires": { + "asynckit": "0.4.0", + "combined-stream": "1.0.5", + "mime-types": "2.1.15" + } + }, + "fs.realpath": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", + "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=", + "dev": true + }, + "fstream": { + "version": "1.0.11", + "resolved": "https://registry.npmjs.org/fstream/-/fstream-1.0.11.tgz", + "integrity": "sha1-XB+x8RdHcRTwYyoOtLcbPLD9MXE=", + "dev": true, + "requires": { + "graceful-fs": "4.1.11", + "inherits": "2.0.3", + "mkdirp": "0.5.1", + "rimraf": "2.6.1" + } + }, + "fstream-ignore": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/fstream-ignore/-/fstream-ignore-1.0.5.tgz", + "integrity": "sha1-nDHa40dnAY/h0kmyTa2mfQktoQU=", + "dev": true, + "optional": true, + "requires": { + "fstream": "1.0.11", + "inherits": "2.0.3", + "minimatch": "3.0.4" + } + }, + "gauge": { + "version": "2.7.4", + "resolved": "https://registry.npmjs.org/gauge/-/gauge-2.7.4.tgz", + "integrity": "sha1-LANAXHU4w51+s3sxcCLjJfsBi/c=", + "dev": true, + "optional": true, + "requires": { + "aproba": "1.1.1", + "console-control-strings": "1.1.0", + "has-unicode": "2.0.1", + "object-assign": "4.1.1", + "signal-exit": "3.0.2", + "string-width": "1.0.2", + "strip-ansi": "3.0.1", + "wide-align": "1.1.2" + } + }, + "getpass": { + "version": "0.1.7", + "resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz", + "integrity": "sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo=", + "dev": true, + "optional": true, + "requires": { + "assert-plus": "1.0.0" + }, + "dependencies": { + "assert-plus": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz", + "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=", + "dev": true, + "optional": true + } + } + }, + "glob": { + "version": "7.1.2", + "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz", + "integrity": "sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ==", + "dev": true, + "requires": { + "fs.realpath": "1.0.0", + "inflight": "1.0.6", + "inherits": "2.0.3", + "minimatch": "3.0.4", + "once": "1.4.0", + "path-is-absolute": "1.0.1" + } + }, + "graceful-fs": { + "version": "4.1.11", + "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.11.tgz", + "integrity": "sha1-Dovf5NHduIVNZOBOp8AOKgJuVlg=", + "dev": true + }, + "har-schema": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/har-schema/-/har-schema-1.0.5.tgz", + "integrity": "sha1-0mMTX0MwfALGAq/I/pWXDAFRNp4=", + "dev": true, + "optional": true + }, + "har-validator": { + "version": "4.2.1", + "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-4.2.1.tgz", + "integrity": "sha1-M0gdDxu/9gDdID11gSpqX7oALio=", + "dev": true, + "optional": true, + "requires": { + "ajv": "4.11.8", + "har-schema": "1.0.5" + } + }, + "has-unicode": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.1.tgz", + "integrity": "sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk=", + "dev": true, + "optional": true + }, + "hawk": { + "version": "3.1.3", + "resolved": "https://registry.npmjs.org/hawk/-/hawk-3.1.3.tgz", + "integrity": "sha1-B4REvXwWQLD+VA0sm3PVlnjo4cQ=", + "dev": true, + "optional": true, + "requires": { + "boom": "2.10.1", + "cryptiles": "2.0.5", + "hoek": "2.16.3", + "sntp": "1.0.9" + } + }, + "hoek": { + "version": "2.16.3", + "resolved": "https://registry.npmjs.org/hoek/-/hoek-2.16.3.tgz", + "integrity": "sha1-ILt0A9POo5jpHcRxCo/xuCdKJe0=", + "dev": true + }, + "http-signature": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.1.1.tgz", + "integrity": "sha1-33LiZwZs0Kxn+3at+OE0qPvPkb8=", + "dev": true, + "optional": true, + "requires": { + "assert-plus": "0.2.0", + "jsprim": "1.4.0", + "sshpk": "1.13.0" + } + }, + "inflight": { + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz", + "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=", + "dev": true, + "requires": { + "once": "1.4.0", + "wrappy": "1.0.2" + } + }, + "inherits": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz", + "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=", + "dev": true + }, + "ini": { + "version": "1.3.4", + "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.4.tgz", + "integrity": "sha1-BTfLedr1m1mhpRff9wbIbsA5Fi4=", + "dev": true, + "optional": 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.1" + } + }, + "is-typedarray": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz", + "integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=", + "dev": true, + "optional": true + }, + "isarray": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", + "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=", + "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=", + "dev": true, + "optional": true + }, + "jodid25519": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/jodid25519/-/jodid25519-1.0.2.tgz", + "integrity": "sha1-BtSRIlUJNBlHfUJWM2BuDpB4KWc=", + "dev": true, + "optional": true, + "requires": { + "jsbn": "0.1.1" + } + }, + "jsbn": { + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz", + "integrity": "sha1-peZUwuWi3rXyAdls77yoDA7y9RM=", + "dev": true, + "optional": true + }, + "json-schema": { + "version": "0.2.3", + "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.2.3.tgz", + "integrity": "sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM=", + "dev": true, + "optional": true + }, + "json-stable-stringify": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/json-stable-stringify/-/json-stable-stringify-1.0.1.tgz", + "integrity": "sha1-mnWdOcXy/1A/1TAGRu1EX4jE+a8=", + "dev": true, + "optional": true, + "requires": { + "jsonify": "0.0.0" + } + }, + "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=", + "dev": true, + "optional": true + }, + "jsonify": { + "version": "0.0.0", + "resolved": "https://registry.npmjs.org/jsonify/-/jsonify-0.0.0.tgz", + "integrity": "sha1-LHS27kHZPKUbe1qu6PUDYx0lKnM=", + "dev": true, + "optional": true + }, + "jsprim": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.0.tgz", + "integrity": "sha1-o7h+QCmNjDgFUtjMdiigu5WiKRg=", + "dev": true, + "optional": true, + "requires": { + "assert-plus": "1.0.0", + "extsprintf": "1.0.2", + "json-schema": "0.2.3", + "verror": "1.3.6" + }, + "dependencies": { + "assert-plus": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz", + "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=", + "dev": true, + "optional": true + } + } + }, + "mime-db": { + "version": "1.27.0", + "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.27.0.tgz", + "integrity": "sha1-gg9XIpa70g7CXtVeW13oaeVDbrE=", + "dev": true + }, + "mime-types": { + "version": "2.1.15", + "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.15.tgz", + "integrity": "sha1-pOv1BkCUVpI3uM9wBGd20J/JKu0=", + "dev": true, + "requires": { + "mime-db": "1.27.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" + } + }, + "minimist": { + "version": "0.0.8", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz", + "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=", + "dev": true + }, + "mkdirp": { + "version": "0.5.1", + "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz", + "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=", + "dev": true, + "requires": { + "minimist": "0.0.8" + } + }, + "ms": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", + "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=", + "dev": true, + "optional": true + }, + "node-pre-gyp": { + "version": "0.6.36", + "resolved": "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.6.36.tgz", + "integrity": "sha1-22BBEst04NR3VU6bUFsXq936t4Y=", + "dev": true, + "optional": true, + "requires": { + "mkdirp": "0.5.1", + "nopt": "4.0.1", + "npmlog": "4.1.0", + "rc": "1.2.1", + "request": "2.81.0", + "rimraf": "2.6.1", + "semver": "5.3.0", + "tar": "2.2.1", + "tar-pack": "3.4.0" + } + }, + "nopt": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/nopt/-/nopt-4.0.1.tgz", + "integrity": "sha1-0NRoWv1UFRk8jHUFYC0NF81kR00=", + "dev": true, + "optional": true, + "requires": { + "abbrev": "1.1.0", + "osenv": "0.1.4" + } + }, + "npmlog": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-4.1.0.tgz", + "integrity": "sha512-ocolIkZYZt8UveuiDS0yAkkIjid1o7lPG8cYm05yNYzBn8ykQtaiPMEGp8fY9tKdDgm8okpdKzkvu1y9hUYugA==", + "dev": true, + "optional": true, + "requires": { + "are-we-there-yet": "1.1.4", + "console-control-strings": "1.1.0", + "gauge": "2.7.4", + "set-blocking": "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 + }, + "oauth-sign": { + "version": "0.8.2", + "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.8.2.tgz", + "integrity": "sha1-Rqarfwrq2N6unsBWV4C31O/rnUM=", + "dev": true, + "optional": true + }, + "object-assign": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz", + "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=", + "dev": true, + "optional": true + }, + "once": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", + "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=", + "dev": true, + "requires": { + "wrappy": "1.0.2" + } + }, + "os-homedir": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz", + "integrity": "sha1-/7xJiDNuDoM94MFox+8VISGqf7M=", + "dev": true, + "optional": true + }, + "os-tmpdir": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz", + "integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=", + "dev": true, + "optional": true + }, + "osenv": { + "version": "0.1.4", + "resolved": "https://registry.npmjs.org/osenv/-/osenv-0.1.4.tgz", + "integrity": "sha1-Qv5tWVPfBsgGS+bxdsPQWqqjRkQ=", + "dev": true, + "optional": true, + "requires": { + "os-homedir": "1.0.2", + "os-tmpdir": "1.0.2" + } + }, + "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 + }, + "performance-now": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-0.2.0.tgz", + "integrity": "sha1-M+8wxcd9TqIcWlOGnZG1bY8lVeU=", + "dev": true, + "optional": true + }, + "process-nextick-args": { + "version": "1.0.7", + "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.7.tgz", + "integrity": "sha1-FQ4gt1ZZCtP5EJPyWk8q2L/zC6M=", + "dev": true + }, + "punycode": { + "version": "1.4.1", + "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz", + "integrity": "sha1-wNWmOycYgArY4esPpSachN1BhF4=", + "dev": true, + "optional": true + }, + "qs": { + "version": "6.4.0", + "resolved": "https://registry.npmjs.org/qs/-/qs-6.4.0.tgz", + "integrity": "sha1-E+JtKK1rD/qpExLNO/cI7TUecjM=", + "dev": true, + "optional": true + }, + "rc": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/rc/-/rc-1.2.1.tgz", + "integrity": "sha1-LgPo5C7kULjLPc5lvhv4l04d/ZU=", + "dev": true, + "optional": true, + "requires": { + "deep-extend": "0.4.2", + "ini": "1.3.4", + "minimist": "1.2.0", + "strip-json-comments": "2.0.1" + }, + "dependencies": { + "minimist": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz", + "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=", + "dev": true, + "optional": true + } + } + }, + "readable-stream": { + "version": "2.2.9", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.2.9.tgz", + "integrity": "sha1-z3jsb0ptHrQ9JkiMrJfwQudLf8g=", + "dev": true, + "requires": { + "buffer-shims": "1.0.0", + "core-util-is": "1.0.2", + "inherits": "2.0.3", + "isarray": "1.0.0", + "process-nextick-args": "1.0.7", + "string_decoder": "1.0.1", + "util-deprecate": "1.0.2" + } + }, + "request": { + "version": "2.81.0", + "resolved": "https://registry.npmjs.org/request/-/request-2.81.0.tgz", + "integrity": "sha1-xpKJRqDgbF+Nb4qTM0af/aRimKA=", + "dev": true, + "optional": true, + "requires": { + "aws-sign2": "0.6.0", + "aws4": "1.6.0", + "caseless": "0.12.0", + "combined-stream": "1.0.5", + "extend": "3.0.1", + "forever-agent": "0.6.1", + "form-data": "2.1.4", + "har-validator": "4.2.1", + "hawk": "3.1.3", + "http-signature": "1.1.1", + "is-typedarray": "1.0.0", + "isstream": "0.1.2", + "json-stringify-safe": "5.0.1", + "mime-types": "2.1.15", + "oauth-sign": "0.8.2", + "performance-now": "0.2.0", + "qs": "6.4.0", + "safe-buffer": "5.0.1", + "stringstream": "0.0.5", + "tough-cookie": "2.3.2", + "tunnel-agent": "0.6.0", + "uuid": "3.0.1" + } + }, + "rimraf": { + "version": "2.6.1", + "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.1.tgz", + "integrity": "sha1-wjOOxkPfeht/5cVPqG9XQopV8z0=", + "dev": true, + "requires": { + "glob": "7.1.2" + } + }, + "safe-buffer": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.0.1.tgz", + "integrity": "sha1-0mPKVGls2KMGtcplUekt5XkY++c=", + "dev": true + }, + "semver": { + "version": "5.3.0", + "resolved": "https://registry.npmjs.org/semver/-/semver-5.3.0.tgz", + "integrity": "sha1-myzl094C0XxgEq0yaqa00M9U+U8=", + "dev": true, + "optional": true + }, + "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, + "optional": true + }, + "signal-exit": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.2.tgz", + "integrity": "sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0=", + "dev": true, + "optional": true + }, + "sntp": { + "version": "1.0.9", + "resolved": "https://registry.npmjs.org/sntp/-/sntp-1.0.9.tgz", + "integrity": "sha1-ZUEYTMkK7qbG57NeJlkIJEPGYZg=", + "dev": true, + "optional": true, + "requires": { + "hoek": "2.16.3" + } + }, + "sshpk": { + "version": "1.13.0", + "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.13.0.tgz", + "integrity": "sha1-/yo+T9BEl1Vf7Zezmg/YL6+zozw=", + "dev": true, + "optional": true, + "requires": { + "asn1": "0.2.3", + "assert-plus": "1.0.0", + "bcrypt-pbkdf": "1.0.1", + "dashdash": "1.14.1", + "ecc-jsbn": "0.1.1", + "getpass": "0.1.7", + "jodid25519": "1.0.2", + "jsbn": "0.1.1", + "tweetnacl": "0.14.5" + }, + "dependencies": { + "assert-plus": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz", + "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=", + "dev": true, + "optional": true + } + } + }, + "string_decoder": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.1.tgz", + "integrity": "sha1-YuIA8DmVWmgQ2N8KM//A8BNmLZg=", + "dev": true, + "requires": { + "safe-buffer": "5.0.1" + } + }, + "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.1.0", + "is-fullwidth-code-point": "1.0.0", + "strip-ansi": "3.0.1" + } + }, + "stringstream": { + "version": "0.0.5", + "resolved": "https://registry.npmjs.org/stringstream/-/stringstream-0.0.5.tgz", + "integrity": "sha1-TkhM1N5aC7vuGORjB3EKioFiGHg=", + "dev": true, + "optional": true + }, + "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.1.1" + } + }, + "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, + "optional": true + }, + "tar": { + "version": "2.2.1", + "resolved": "https://registry.npmjs.org/tar/-/tar-2.2.1.tgz", + "integrity": "sha1-jk0qJWwOIYXGsYrWlK7JaLg8sdE=", + "dev": true, + "requires": { + "block-stream": "0.0.9", + "fstream": "1.0.11", + "inherits": "2.0.3" + } + }, + "tar-pack": { + "version": "3.4.0", + "resolved": "https://registry.npmjs.org/tar-pack/-/tar-pack-3.4.0.tgz", + "integrity": "sha1-I74tf2cagzk3bL2wuP4/3r8xeYQ=", + "dev": true, + "optional": true, + "requires": { + "debug": "2.6.8", + "fstream": "1.0.11", + "fstream-ignore": "1.0.5", + "once": "1.4.0", + "readable-stream": "2.2.9", + "rimraf": "2.6.1", + "tar": "2.2.1", + "uid-number": "0.0.6" + } + }, + "tough-cookie": { + "version": "2.3.2", + "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.3.2.tgz", + "integrity": "sha1-8IH3bkyFcg5sN6X6ztc3FQ2EByo=", + "dev": true, + "optional": true, + "requires": { + "punycode": "1.4.1" + } + }, + "tunnel-agent": { + "version": "0.6.0", + "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz", + "integrity": "sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=", + "dev": true, + "optional": true, + "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=", + "dev": true, + "optional": true + }, + "uid-number": { + "version": "0.0.6", + "resolved": "https://registry.npmjs.org/uid-number/-/uid-number-0.0.6.tgz", + "integrity": "sha1-DqEOgDXo61uOREnwbaHHMGY7qoE=", + "dev": true, + "optional": true + }, + "util-deprecate": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz", + "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=", + "dev": true + }, + "uuid": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.0.1.tgz", + "integrity": "sha1-ZUS7ot/ajBzxfmKaOjBeK7H+5sE=", + "dev": true, + "optional": true + }, + "verror": { + "version": "1.3.6", + "resolved": "https://registry.npmjs.org/verror/-/verror-1.3.6.tgz", + "integrity": "sha1-z/XfEpRtKX0rqu+qJoniW+AcAFw=", + "dev": true, + "optional": true, + "requires": { + "extsprintf": "1.0.2" + } + }, + "wide-align": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.2.tgz", + "integrity": "sha512-ijDLlyQ7s6x1JgCLur53osjm/UXUYD9+0PbYKrBsYisYXzCxN+HC3mYDNy/dWdmf3AwqwU3CXwDCvsNgGK1S0w==", + "dev": true, + "optional": true, + "requires": { + "string-width": "1.0.2" + } + }, + "wrappy": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", + "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=", + "dev": true + } + } + }, + "fstream": { + "version": "1.0.11", + "resolved": "https://registry.npmjs.org/fstream/-/fstream-1.0.11.tgz", + "integrity": "sha1-XB+x8RdHcRTwYyoOtLcbPLD9MXE=", + "requires": { + "graceful-fs": "4.1.11", + "inherits": "2.0.3", + "mkdirp": "0.5.1", + "rimraf": "2.6.1" + } + }, + "functional-red-black-tree": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz", + "integrity": "sha1-GwqzvVU7Kg1jmdKcDj6gslIHgyc=", + "dev": true + }, + "gauge": { + "version": "2.7.4", + "resolved": "https://registry.npmjs.org/gauge/-/gauge-2.7.4.tgz", + "integrity": "sha1-LANAXHU4w51+s3sxcCLjJfsBi/c=", + "requires": { + "aproba": "1.1.2", + "console-control-strings": "1.1.0", + "has-unicode": "2.0.1", + "object-assign": "4.1.1", + "signal-exit": "3.0.2", + "string-width": "1.0.2", + "strip-ansi": "3.0.1", + "wide-align": "1.1.2" + }, + "dependencies": { + "object-assign": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz", + "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=" + } + } + }, + "gaze": { + "version": "0.5.2", + "resolved": "https://registry.npmjs.org/gaze/-/gaze-0.5.2.tgz", + "integrity": "sha1-QLcJU30k0dRXZ9takIaJ3+aaxE8=", + "requires": { + "globule": "0.1.0" + } + }, + "get-caller-file": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-1.0.2.tgz", + "integrity": "sha1-9wLmMSfn4jHBYKgMFVSstw1QR+U=" + }, + "get-proxy": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/get-proxy/-/get-proxy-1.1.0.tgz", + "integrity": "sha1-iUhUSRvFkbDxR9euVw9cZ4tyVus=", + "dev": true, + "requires": { + "rc": "1.2.1" + } + }, + "get-stdin": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-4.0.1.tgz", + "integrity": "sha1-uWjGsKBDhDJJAui/Gl3zJXmkUP4=" + }, + "get-stream": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz", + "integrity": "sha1-jpQ9E1jcN1VQVOy+LtsFqhdO3hQ=", + "dev": true + }, + "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" + }, + "dependencies": { + "assert-plus": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz", + "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=" + } + } + }, + "glob": { + "version": "7.1.2", + "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz", + "integrity": "sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ==", + "requires": { + "fs.realpath": "1.0.0", + "inflight": "1.0.6", + "inherits": "2.0.3", + "minimatch": "3.0.4", + "once": "1.4.0", + "path-is-absolute": "1.0.1" + } + }, + "glob-base": { + "version": "0.3.0", + "resolved": "https://registry.npmjs.org/glob-base/-/glob-base-0.3.0.tgz", + "integrity": "sha1-27Fk9iIbHAscz4Kuoyi0l98Oo8Q=", + "requires": { + "glob-parent": "2.0.0", + "is-glob": "2.0.1" + } + }, + "glob-parent": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-2.0.0.tgz", + "integrity": "sha1-gTg9ctsFT8zPUzbaqQLxgvbtuyg=", + "requires": { + "is-glob": "2.0.1" + } + }, + "glob-stream": { + "version": "3.1.18", + "resolved": "https://registry.npmjs.org/glob-stream/-/glob-stream-3.1.18.tgz", + "integrity": "sha1-kXCl8St5Awb9/lmPMT+PeVT9FDs=", + "requires": { + "glob": "4.5.3", + "glob2base": "0.0.12", + "minimatch": "2.0.10", + "ordered-read-streams": "0.1.0", + "through2": "0.6.5", + "unique-stream": "1.0.0" + }, + "dependencies": { + "glob": { + "version": "4.5.3", + "resolved": "https://registry.npmjs.org/glob/-/glob-4.5.3.tgz", + "integrity": "sha1-xstz0yJsHv7wTePFbQEvAzd+4V8=", + "requires": { + "inflight": "1.0.6", + "inherits": "2.0.3", + "minimatch": "2.0.10", + "once": "1.4.0" + } + }, + "minimatch": { + "version": "2.0.10", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-2.0.10.tgz", + "integrity": "sha1-jQh8OcazjAAbl/ynzm0OHoCvusc=", + "requires": { + "brace-expansion": "1.1.8" + } + }, + "readable-stream": { + "version": "1.0.34", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz", + "integrity": "sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=", + "requires": { + "core-util-is": "1.0.2", + "inherits": "2.0.3", + "isarray": "0.0.1", + "string_decoder": "0.10.31" + } + }, + "through2": { + "version": "0.6.5", + "resolved": "https://registry.npmjs.org/through2/-/through2-0.6.5.tgz", + "integrity": "sha1-QaucZ7KdVyCQcUEOHXp6lozTrUg=", + "requires": { + "readable-stream": "1.0.34", + "xtend": "4.0.1" + } + } + } + }, + "glob-watcher": { + "version": "0.0.6", + "resolved": "https://registry.npmjs.org/glob-watcher/-/glob-watcher-0.0.6.tgz", + "integrity": "sha1-uVtKjfdLOcgymLDAXJeLTZo7cQs=", + "requires": { + "gaze": "0.5.2" + } + }, + "glob2base": { + "version": "0.0.12", + "resolved": "https://registry.npmjs.org/glob2base/-/glob2base-0.0.12.tgz", + "integrity": "sha1-nUGbPijxLoOjYhZKJ3BVkiycDVY=", + "requires": { + "find-index": "0.1.1" + } + }, + "global-modules": { + "version": "0.2.3", + "resolved": "https://registry.npmjs.org/global-modules/-/global-modules-0.2.3.tgz", + "integrity": "sha1-6lo77ULG1s6ZWk+KEmm12uIjgo0=", + "requires": { + "global-prefix": "0.1.5", + "is-windows": "0.2.0" + } + }, + "global-prefix": { + "version": "0.1.5", + "resolved": "https://registry.npmjs.org/global-prefix/-/global-prefix-0.1.5.tgz", + "integrity": "sha1-jTvGuNo8qBEqFg2NSW/wRiv+948=", + "requires": { + "homedir-polyfill": "1.0.1", + "ini": "1.3.4", + "is-windows": "0.2.0", + "which": "1.3.0" + } + }, + "globals": { + "version": "9.18.0", + "resolved": "https://registry.npmjs.org/globals/-/globals-9.18.0.tgz", + "integrity": "sha512-S0nG3CLEQiY/ILxqtztTWH/3iRRdyBLw6KMDxnKMchrtbj2OFmehVh0WUCfW3DUrIgx/qFrJPICrq4Z4sTR9UQ==", + "dev": true + }, + "globby": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/globby/-/globby-5.0.0.tgz", + "integrity": "sha1-69hGZ8oNuzMLmbz8aOrCvFQ3Dg0=", + "dev": true, + "requires": { + "array-union": "1.0.2", + "arrify": "1.0.1", + "glob": "7.1.2", + "object-assign": "4.1.1", + "pify": "2.3.0", + "pinkie-promise": "2.0.1" + }, + "dependencies": { + "object-assign": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz", + "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=", + "dev": true + } + } + }, + "globule": { + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/globule/-/globule-0.1.0.tgz", + "integrity": "sha1-2cjt3h2nnRJaFRt5UzuXhnY0auU=", + "requires": { + "glob": "3.1.21", + "lodash": "1.0.2", + "minimatch": "0.2.14" + }, + "dependencies": { + "glob": { + "version": "3.1.21", + "resolved": "https://registry.npmjs.org/glob/-/glob-3.1.21.tgz", + "integrity": "sha1-0p4KBV3qUTj00H7UDomC6DwgZs0=", + "requires": { + "graceful-fs": "1.2.3", + "inherits": "1.0.2", + "minimatch": "0.2.14" + } + }, + "graceful-fs": { + "version": "1.2.3", + "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-1.2.3.tgz", + "integrity": "sha1-FaSAaldUfLLS2/J/QuiajDRRs2Q=" + }, + "inherits": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/inherits/-/inherits-1.0.2.tgz", + "integrity": "sha1-ykMJ2t7mtUzAuNJH6NfHoJdb3Js=" + }, + "lodash": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-1.0.2.tgz", + "integrity": "sha1-j1dWDIO1n8JwvT1WG2kAQ0MOJVE=" + }, + "minimatch": { + "version": "0.2.14", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-0.2.14.tgz", + "integrity": "sha1-x054BXT2PG+aCQ6Q775u9TpqdWo=", + "requires": { + "lru-cache": "2.7.3", + "sigmund": "1.0.1" + } + } + } + }, + "glogg": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/glogg/-/glogg-1.0.0.tgz", + "integrity": "sha1-f+DxmfV6yQbPUS/urY+Q7kooT8U=", + "requires": { + "sparkles": "1.0.0" + } + }, + "got": { + "version": "5.7.1", + "resolved": "https://registry.npmjs.org/got/-/got-5.7.1.tgz", + "integrity": "sha1-X4FjWmHkplifGAVp6k44FoClHzU=", + "dev": true, + "requires": { + "create-error-class": "3.0.2", + "duplexer2": "0.1.4", + "is-redirect": "1.0.0", + "is-retry-allowed": "1.1.0", + "is-stream": "1.1.0", + "lowercase-keys": "1.0.0", + "node-status-codes": "1.0.0", + "object-assign": "4.1.1", + "parse-json": "2.2.0", + "pinkie-promise": "2.0.1", + "read-all-stream": "3.1.0", + "readable-stream": "2.3.3", + "timed-out": "3.1.3", + "unzip-response": "1.0.2", + "url-parse-lax": "1.0.0" + }, + "dependencies": { + "duplexer2": { + "version": "0.1.4", + "resolved": "https://registry.npmjs.org/duplexer2/-/duplexer2-0.1.4.tgz", + "integrity": "sha1-ixLauHjA1p4+eJEFFmKjL8a93ME=", + "dev": true, + "requires": { + "readable-stream": "2.3.3" + } + }, + "isarray": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", + "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=", + "dev": true + }, + "object-assign": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz", + "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=", + "dev": true + }, + "readable-stream": { + "version": "2.3.3", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.3.tgz", + "integrity": "sha512-m+qzzcn7KUxEmd1gMbchF+Y2eIUbieUaxkWtptyHywrX0rE8QEYqPC07Vuy4Wm32/xE16NcdBctb8S0Xe/5IeQ==", + "dev": true, + "requires": { + "core-util-is": "1.0.2", + "inherits": "2.0.3", + "isarray": "1.0.0", + "process-nextick-args": "1.0.7", + "safe-buffer": "5.1.1", + "string_decoder": "1.0.3", + "util-deprecate": "1.0.2" + } + }, + "string_decoder": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz", + "integrity": "sha512-4AH6Z5fzNNBcH+6XDMfA/BTt87skxqJlO0lAh3Dker5zThcAxG6mKz+iGu308UKoPPQ8Dcqx/4JhujzltRa+hQ==", + "dev": true, + "requires": { + "safe-buffer": "5.1.1" + } + } + } + }, + "graceful-fs": { + "version": "4.1.11", + "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.11.tgz", + "integrity": "sha1-Dovf5NHduIVNZOBOp8AOKgJuVlg=" + }, + "graceful-readlink": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/graceful-readlink/-/graceful-readlink-1.0.1.tgz", + "integrity": "sha1-TK+tdrxi8C+gObL5Tpo906ORpyU=", + "dev": true + }, + "gulp": { + "version": "3.9.1", + "resolved": "https://registry.npmjs.org/gulp/-/gulp-3.9.1.tgz", + "integrity": "sha1-VxzkWSjdQK9lFPxAEYZgFsE4RbQ=", + "requires": { + "archy": "1.0.0", + "chalk": "1.1.3", + "deprecated": "0.0.1", + "gulp-util": "3.0.8", + "interpret": "1.0.3", + "liftoff": "2.3.0", + "minimist": "1.2.0", + "orchestrator": "0.3.8", + "pretty-hrtime": "1.0.3", + "semver": "4.3.6", + "tildify": "1.2.0", + "v8flags": "2.1.1", + "vinyl-fs": "0.3.14" + } + }, + "gulp-angular-filesort": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/gulp-angular-filesort/-/gulp-angular-filesort-1.1.1.tgz", + "integrity": "sha1-oIz/WtWzoYVU8wtNTl2IlScsskI=", + "requires": { + "event-stream": "3.3.4", + "gulp-util": "3.0.8", + "ng-dependencies": "0.2.0", + "toposort": "0.2.12" + } + }, + "gulp-angular-templatecache": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/gulp-angular-templatecache/-/gulp-angular-templatecache-2.0.0.tgz", + "integrity": "sha1-KbQHHuVXRIHAaaFivOiWdTTxcVU=", + "requires": { + "event-stream": "3.3.2", + "gulp-concat": "2.6.0", + "gulp-footer": "1.0.5", + "gulp-header": "1.8.2", + "gulp-util": "3.0.7", + "jsesc": "2.2.0" + }, + "dependencies": { + "dateformat": { + "version": "1.0.12", + "resolved": "https://registry.npmjs.org/dateformat/-/dateformat-1.0.12.tgz", + "integrity": "sha1-nxJLZ1lMk3/3BpMuSmQsyo27/uk=", + "requires": { + "get-stdin": "4.0.1", + "meow": "3.7.0" + } + }, + "event-stream": { + "version": "3.3.2", + "resolved": "https://registry.npmjs.org/event-stream/-/event-stream-3.3.2.tgz", + "integrity": "sha1-PMMQ/rHyjS9isqCF1zap71ZjeLg=", + "requires": { + "duplexer": "0.1.1", + "from": "0.1.7", + "map-stream": "0.1.0", + "pause-stream": "0.0.11", + "split": "0.3.3", + "stream-combiner": "0.0.4", + "through": "2.3.8" + } + }, + "gulp-util": { + "version": "3.0.7", + "resolved": "https://registry.npmjs.org/gulp-util/-/gulp-util-3.0.7.tgz", + "integrity": "sha1-eJJcS4+LSQBawBoBHFV+YhiUHLs=", + "requires": { + "array-differ": "1.0.0", + "array-uniq": "1.0.3", + "beeper": "1.1.1", + "chalk": "1.1.3", + "dateformat": "1.0.12", + "fancy-log": "1.3.0", + "gulplog": "1.0.0", + "has-gulplog": "0.1.0", + "lodash._reescape": "3.0.0", + "lodash._reevaluate": "3.0.0", + "lodash._reinterpolate": "3.0.0", + "lodash.template": "3.6.2", + "minimist": "1.2.0", + "multipipe": "0.1.2", + "object-assign": "3.0.0", + "replace-ext": "0.0.1", + "through2": "2.0.3", + "vinyl": "0.5.3" + } + } + } + }, + "gulp-autoprefixer": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/gulp-autoprefixer/-/gulp-autoprefixer-3.1.1.tgz", + "integrity": "sha1-dSMAUc0NFxND14O36bXREg7u+bA=", + "requires": { + "autoprefixer": "6.7.7", + "gulp-util": "3.0.8", + "postcss": "5.2.17", + "through2": "2.0.3", + "vinyl-sourcemaps-apply": "0.2.1" + } + }, + "gulp-clean-css": { + "version": "3.7.0", + "resolved": "https://registry.npmjs.org/gulp-clean-css/-/gulp-clean-css-3.7.0.tgz", + "integrity": "sha1-VLM1JtyJmTCUn7N7TKz4UcXV2Ts=", + "requires": { + "clean-css": "4.1.7", + "gulp-util": "3.0.8", + "through2": "2.0.3", + "vinyl-sourcemaps-apply": "0.2.1" + } + }, + "gulp-concat": { + "version": "2.6.0", + "resolved": "https://registry.npmjs.org/gulp-concat/-/gulp-concat-2.6.0.tgz", + "integrity": "sha1-WFz7EVQR80h3MTEUBWa2qBxpy5E=", + "requires": { + "concat-with-sourcemaps": "1.0.4", + "gulp-util": "3.0.8", + "through2": "0.6.5" + }, + "dependencies": { + "readable-stream": { + "version": "1.0.34", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz", + "integrity": "sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=", + "requires": { + "core-util-is": "1.0.2", + "inherits": "2.0.3", + "isarray": "0.0.1", + "string_decoder": "0.10.31" + } + }, + "through2": { + "version": "0.6.5", + "resolved": "https://registry.npmjs.org/through2/-/through2-0.6.5.tgz", + "integrity": "sha1-QaucZ7KdVyCQcUEOHXp6lozTrUg=", + "requires": { + "readable-stream": "1.0.34", + "xtend": "4.0.1" + } + } + } + }, + "gulp-concat-util": { + "version": "0.5.5", + "resolved": "https://registry.npmjs.org/gulp-concat-util/-/gulp-concat-util-0.5.5.tgz", + "integrity": "sha1-yPBjO05ulQ/5PEdbPI07hL4Dt9w=", + "requires": { + "concat-with-sourcemaps": "1.0.4", + "gulp-if": "2.0.2", + "gulp-util": "3.0.8", + "lodash.assign": "3.2.0", + "stream-combiner2": "1.1.1", + "through2": "2.0.3" + }, + "dependencies": { + "lodash.assign": { + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/lodash.assign/-/lodash.assign-3.2.0.tgz", + "integrity": "sha1-POnwI0tLIiPilrj6CsH+6OvKZPo=", + "requires": { + "lodash._baseassign": "3.2.0", + "lodash._createassigner": "3.1.1", + "lodash.keys": "3.1.2" + } + } + } + }, + "gulp-decompress": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/gulp-decompress/-/gulp-decompress-1.2.0.tgz", + "integrity": "sha1-jutlpeAV+O2FMsr+KEVJYGJvDcc=", + "dev": true, + "requires": { + "archive-type": "3.2.0", + "decompress": "3.0.0", + "gulp-util": "3.0.8", + "readable-stream": "2.3.3" + }, + "dependencies": { + "isarray": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", + "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=", + "dev": true + }, + "readable-stream": { + "version": "2.3.3", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.3.tgz", + "integrity": "sha512-m+qzzcn7KUxEmd1gMbchF+Y2eIUbieUaxkWtptyHywrX0rE8QEYqPC07Vuy4Wm32/xE16NcdBctb8S0Xe/5IeQ==", + "dev": true, + "requires": { + "core-util-is": "1.0.2", + "inherits": "2.0.3", + "isarray": "1.0.0", + "process-nextick-args": "1.0.7", + "safe-buffer": "5.1.1", + "string_decoder": "1.0.3", + "util-deprecate": "1.0.2" + } + }, + "string_decoder": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz", + "integrity": "sha512-4AH6Z5fzNNBcH+6XDMfA/BTt87skxqJlO0lAh3Dker5zThcAxG6mKz+iGu308UKoPPQ8Dcqx/4JhujzltRa+hQ==", + "dev": true, + "requires": { + "safe-buffer": "5.1.1" + } + } + } + }, + "gulp-eslint": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/gulp-eslint/-/gulp-eslint-4.0.0.tgz", + "integrity": "sha512-+qsePo04v1O3JshpNvww9+bOgZEJ6Cc2/w3mEktfKz0NL0zsh1SWzjyIL2FIM2zzy6IYQYv+j8REZORF8dKX4g==", + "dev": true, + "requires": { + "eslint": "4.4.1", + "gulp-util": "3.0.8" + } + }, + "gulp-file": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/gulp-file/-/gulp-file-0.2.0.tgz", + "integrity": "sha1-npRGpYNBmCGDQhfPbuvaWd1hJDU=", + "requires": { + "gulp-util": "2.2.20", + "through2": "0.4.2" + }, + "dependencies": { + "ansi-regex": { + "version": "0.2.1", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-0.2.1.tgz", + "integrity": "sha1-DY6UaWej2BQ/k+JOKYUl/BsiNfk=" + }, + "ansi-styles": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-1.1.0.tgz", + "integrity": "sha1-6uy/Zs1waIJ2Cy9GkVgrj1XXp94=" + }, + "chalk": { + "version": "0.5.1", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-0.5.1.tgz", + "integrity": "sha1-Zjs6ZItotV0EaQ1JFnqoN4WPIXQ=", + "requires": { + "ansi-styles": "1.1.0", + "escape-string-regexp": "1.0.5", + "has-ansi": "0.1.0", + "strip-ansi": "0.3.0", + "supports-color": "0.2.0" + } + }, + "dateformat": { + "version": "1.0.12", + "resolved": "https://registry.npmjs.org/dateformat/-/dateformat-1.0.12.tgz", + "integrity": "sha1-nxJLZ1lMk3/3BpMuSmQsyo27/uk=", + "requires": { + "get-stdin": "4.0.1", + "meow": "3.7.0" + } + }, + "gulp-util": { + "version": "2.2.20", + "resolved": "https://registry.npmjs.org/gulp-util/-/gulp-util-2.2.20.tgz", + "integrity": "sha1-1xRuVyiRC9jwR6awseVJvCLb1kw=", + "requires": { + "chalk": "0.5.1", + "dateformat": "1.0.12", + "lodash._reinterpolate": "2.4.1", + "lodash.template": "2.4.1", + "minimist": "0.2.0", + "multipipe": "0.1.2", + "through2": "0.5.1", + "vinyl": "0.2.3" + }, + "dependencies": { + "through2": { + "version": "0.5.1", + "resolved": "https://registry.npmjs.org/through2/-/through2-0.5.1.tgz", + "integrity": "sha1-390BLrnHAOIyP9M084rGIqs3Lac=", + "requires": { + "readable-stream": "1.0.34", + "xtend": "3.0.0" + } + } + } + }, + "has-ansi": { + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-0.1.0.tgz", + "integrity": "sha1-hPJlqujA5qiKEtcCKJS3VoiUxi4=", + "requires": { + "ansi-regex": "0.2.1" + } + }, + "lodash._reinterpolate": { + "version": "2.4.1", + "resolved": "https://registry.npmjs.org/lodash._reinterpolate/-/lodash._reinterpolate-2.4.1.tgz", + "integrity": "sha1-TxInqlqHEfxjL1sHofRgequLMiI=" + }, + "lodash.escape": { + "version": "2.4.1", + "resolved": "https://registry.npmjs.org/lodash.escape/-/lodash.escape-2.4.1.tgz", + "integrity": "sha1-LOEsXghNsKV92l5dHu659dF1o7Q=", + "requires": { + "lodash._escapehtmlchar": "2.4.1", + "lodash._reunescapedhtml": "2.4.1", + "lodash.keys": "2.4.1" + } + }, + "lodash.keys": { + "version": "2.4.1", + "resolved": "https://registry.npmjs.org/lodash.keys/-/lodash.keys-2.4.1.tgz", + "integrity": "sha1-SN6kbfj/djKxDXBrissmWR4rNyc=", + "requires": { + "lodash._isnative": "2.4.1", + "lodash._shimkeys": "2.4.1", + "lodash.isobject": "2.4.1" + } + }, + "lodash.template": { + "version": "2.4.1", + "resolved": "https://registry.npmjs.org/lodash.template/-/lodash.template-2.4.1.tgz", + "integrity": "sha1-nmEQB+32KRKal0qzxIuBez4c8g0=", + "requires": { + "lodash._escapestringchar": "2.4.1", + "lodash._reinterpolate": "2.4.1", + "lodash.defaults": "2.4.1", + "lodash.escape": "2.4.1", + "lodash.keys": "2.4.1", + "lodash.templatesettings": "2.4.1", + "lodash.values": "2.4.1" + } + }, + "lodash.templatesettings": { + "version": "2.4.1", + "resolved": "https://registry.npmjs.org/lodash.templatesettings/-/lodash.templatesettings-2.4.1.tgz", + "integrity": "sha1-6nbHXRHrhtTb6JqDiTu4YZKaxpk=", + "requires": { + "lodash._reinterpolate": "2.4.1", + "lodash.escape": "2.4.1" + } + }, + "minimist": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.2.0.tgz", + "integrity": "sha1-Tf/lJdriuGTGbC4jxicdev3s784=" + }, + "readable-stream": { + "version": "1.0.34", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz", + "integrity": "sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=", + "requires": { + "core-util-is": "1.0.2", + "inherits": "2.0.3", + "isarray": "0.0.1", + "string_decoder": "0.10.31" + } + }, + "strip-ansi": { + "version": "0.3.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-0.3.0.tgz", + "integrity": "sha1-JfSOoiynkYfzF0pNuHWTR7sSYiA=", + "requires": { + "ansi-regex": "0.2.1" + } + }, + "supports-color": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-0.2.0.tgz", + "integrity": "sha1-2S3iaU6z9nMjlz1649i1W0wiGQo=" + }, + "through2": { + "version": "0.4.2", + "resolved": "https://registry.npmjs.org/through2/-/through2-0.4.2.tgz", + "integrity": "sha1-2/WGYDEVHsg1K7bE22SiKSqEC5s=", + "requires": { + "readable-stream": "1.0.34", + "xtend": "2.1.2" + }, + "dependencies": { + "xtend": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/xtend/-/xtend-2.1.2.tgz", + "integrity": "sha1-bv7MKk2tjmlixJAbM3znuoe10os=", + "requires": { + "object-keys": "0.4.0" + } + } + } + }, + "vinyl": { + "version": "0.2.3", + "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-0.2.3.tgz", + "integrity": "sha1-vKk4IJWC7FpJrVOKAPofEl5RMlI=", + "requires": { + "clone-stats": "0.0.1" + } + }, + "xtend": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/xtend/-/xtend-3.0.0.tgz", + "integrity": "sha1-XM50B7r2Qsunvs2laBEcST9ZZlo=" + } + } + }, + "gulp-footer": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/gulp-footer/-/gulp-footer-1.0.5.tgz", + "integrity": "sha1-6Eynd+Jmvnu8LUXS3w5+uo36PlQ=", + "requires": { + "event-stream": "3.3.4", + "gulp-util": "3.0.8", + "lodash.assign": "4.2.0" + } + }, + "gulp-header": { + "version": "1.8.2", + "resolved": "https://registry.npmjs.org/gulp-header/-/gulp-header-1.8.2.tgz", + "integrity": "sha1-OrIi9TcZ0tA9gdkTQlL+fVJCWqQ=", + "requires": { + "concat-with-sourcemaps": "1.0.4", + "gulp-util": "3.0.8", + "object-assign": "3.0.0", + "through2": "2.0.3" + } + }, + "gulp-if": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/gulp-if/-/gulp-if-2.0.2.tgz", + "integrity": "sha1-pJe351cwBQQcqivIt92jyARE1ik=", + "requires": { + "gulp-match": "1.0.3", + "ternary-stream": "2.0.1", + "through2": "2.0.3" + } + }, + "gulp-inject": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/gulp-inject/-/gulp-inject-3.0.0.tgz", + "integrity": "sha1-LcHqlKlg3pCddl7yJS7ZrzvR7VA=", + "requires": { + "event-stream": "3.3.4", + "gulp-util": "3.0.8" + } + }, + "gulp-inject-string": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/gulp-inject-string/-/gulp-inject-string-1.1.0.tgz", + "integrity": "sha1-8C3e2w91GN+61Uj30t8FuuLtH2Q=", + "requires": { + "event-stream": "3.3.4", + "gulp-util": "3.0.8" + } + }, + "gulp-istanbul": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/gulp-istanbul/-/gulp-istanbul-1.1.2.tgz", + "integrity": "sha512-53+BDhGlGNHYfeFh/mSXWhNu9wSFmE8qAEFj6ViMiWzTwI9pYxedUxMmGfigwaddsHHQxBl9TgnzUydrX84Kog==", + "dev": true, + "requires": { + "gulp-util": "3.0.8", + "istanbul": "0.4.5", + "istanbul-threshold-checker": "0.2.1", + "lodash": "4.17.4", + "through2": "2.0.3", + "vinyl-sourcemaps-apply": "0.2.1" + } + }, + "gulp-match": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/gulp-match/-/gulp-match-1.0.3.tgz", + "integrity": "sha1-kcfA1/Kb7NZgbVfYCn+Hdqh6uo4=", + "requires": { + "minimatch": "3.0.4" + } + }, + "gulp-ng-annotate": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/gulp-ng-annotate/-/gulp-ng-annotate-2.0.0.tgz", + "integrity": "sha1-hKg9sfAWUgvXD5pc+p8/6J4logU=", + "requires": { + "bufferstreams": "1.1.1", + "gulp-util": "3.0.8", + "merge": "1.2.0", + "ng-annotate": "1.2.2", + "through2": "2.0.3", + "vinyl-sourcemaps-apply": "0.2.1" + } + }, + "gulp-plumber": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/gulp-plumber/-/gulp-plumber-1.1.0.tgz", + "integrity": "sha1-8SF2wtBCL2AwbCQv/2oBo5T6ugk=", + "requires": { + "gulp-util": "3.0.8", + "through2": "2.0.3" + } + }, + "gulp-rename": { + "version": "1.2.2", + "resolved": "https://registry.npmjs.org/gulp-rename/-/gulp-rename-1.2.2.tgz", + "integrity": "sha1-OtRCh2PwXidk3sHGfYaNsnVoeBc=" + }, + "gulp-replace": { + "version": "0.5.4", + "resolved": "https://registry.npmjs.org/gulp-replace/-/gulp-replace-0.5.4.tgz", + "integrity": "sha1-aaZ5FLvRPFYr/xT1BKQDeWqg2qk=", + "requires": { + "istextorbinary": "1.0.2", + "readable-stream": "2.3.3", + "replacestream": "4.0.2" + }, + "dependencies": { + "isarray": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", + "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=" + }, + "readable-stream": { + "version": "2.3.3", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.3.tgz", + "integrity": "sha512-m+qzzcn7KUxEmd1gMbchF+Y2eIUbieUaxkWtptyHywrX0rE8QEYqPC07Vuy4Wm32/xE16NcdBctb8S0Xe/5IeQ==", + "requires": { + "core-util-is": "1.0.2", + "inherits": "2.0.3", + "isarray": "1.0.0", + "process-nextick-args": "1.0.7", + "safe-buffer": "5.1.1", + "string_decoder": "1.0.3", + "util-deprecate": "1.0.2" + } + }, + "string_decoder": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz", + "integrity": "sha512-4AH6Z5fzNNBcH+6XDMfA/BTt87skxqJlO0lAh3Dker5zThcAxG6mKz+iGu308UKoPPQ8Dcqx/4JhujzltRa+hQ==", + "requires": { + "safe-buffer": "5.1.1" + } + } + } + }, + "gulp-sass": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/gulp-sass/-/gulp-sass-3.1.0.tgz", + "integrity": "sha1-U9xLaKH13f5EJKtMJHZVJpqLdLc=", + "requires": { + "gulp-util": "3.0.8", + "lodash.clonedeep": "4.5.0", + "node-sass": "4.5.3", + "through2": "2.0.3", + "vinyl-sourcemaps-apply": "0.2.1" + } + }, + "gulp-sort": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/gulp-sort/-/gulp-sort-2.0.0.tgz", + "integrity": "sha1-xnYqLx8N4KP8WVohWZ0/rI26Gso=", + "requires": { + "through2": "2.0.3" + } + }, + "gulp-sourcemaps": { + "version": "1.6.0", + "resolved": "https://registry.npmjs.org/gulp-sourcemaps/-/gulp-sourcemaps-1.6.0.tgz", + "integrity": "sha1-uG/zSdgBzrVuHZ59x7vLS33uYAw=", + "dev": true, + "requires": { + "convert-source-map": "1.1.3", + "graceful-fs": "4.1.11", + "strip-bom": "2.0.0", + "through2": "2.0.3", + "vinyl": "1.2.0" + }, + "dependencies": { + "strip-bom": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-2.0.0.tgz", + "integrity": "sha1-YhmoVhZSBJHzV4i9vxRHqZx+aw4=", + "dev": true, + "requires": { + "is-utf8": "0.2.1" + } + }, + "vinyl": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-1.2.0.tgz", + "integrity": "sha1-XIgDbPVl5d8FVYv8kR+GVt8hiIQ=", + "dev": true, + "requires": { + "clone": "1.0.2", + "clone-stats": "0.0.1", + "replace-ext": "0.0.1" + } + } + } + }, + "gulp-uglify": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/gulp-uglify/-/gulp-uglify-2.1.2.tgz", + "integrity": "sha1-bbhbHQ7mPRgFhZK2WGSdZcLsRUE=", + "requires": { + "gulplog": "1.0.0", + "has-gulplog": "0.1.0", + "lodash": "4.17.4", + "make-error-cause": "1.2.2", + "through2": "2.0.3", + "uglify-js": "2.8.29", + "uglify-save-license": "0.4.1", + "vinyl-sourcemaps-apply": "0.2.1" + } + }, + "gulp-util": { + "version": "3.0.8", + "resolved": "https://registry.npmjs.org/gulp-util/-/gulp-util-3.0.8.tgz", + "integrity": "sha1-AFTh50RQLifATBh8PsxQXdVLu08=", + "requires": { + "array-differ": "1.0.0", + "array-uniq": "1.0.3", + "beeper": "1.1.1", + "chalk": "1.1.3", + "dateformat": "2.0.0", + "fancy-log": "1.3.0", + "gulplog": "1.0.0", + "has-gulplog": "0.1.0", + "lodash._reescape": "3.0.0", + "lodash._reevaluate": "3.0.0", + "lodash._reinterpolate": "3.0.0", + "lodash.template": "3.6.2", + "minimist": "1.2.0", + "multipipe": "0.1.2", + "object-assign": "3.0.0", + "replace-ext": "0.0.1", + "through2": "2.0.3", + "vinyl": "0.5.3" + } + }, + "gulplog": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/gulplog/-/gulplog-1.0.0.tgz", + "integrity": "sha1-4oxNRdBey77YGDY86PnFkmIp/+U=", + "requires": { + "glogg": "1.0.0" + } + }, + "handlebars": { + "version": "4.0.10", + "resolved": "https://registry.npmjs.org/handlebars/-/handlebars-4.0.10.tgz", + "integrity": "sha1-PTDHGLCaPZbyPqTMH0A8TTup/08=", + "dev": true, + "requires": { + "async": "1.5.2", + "optimist": "0.6.1", + "source-map": "0.4.4", + "uglify-js": "2.8.29" + }, + "dependencies": { + "source-map": { + "version": "0.4.4", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.4.4.tgz", + "integrity": "sha1-66T12pwNyZneaAMti092FzZSA2s=", + "dev": true, + "requires": { + "amdefine": "1.0.1" + } + } + } + }, + "har-schema": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/har-schema/-/har-schema-1.0.5.tgz", + "integrity": "sha1-0mMTX0MwfALGAq/I/pWXDAFRNp4=" + }, + "har-validator": { + "version": "4.2.1", + "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-4.2.1.tgz", + "integrity": "sha1-M0gdDxu/9gDdID11gSpqX7oALio=", + "requires": { + "ajv": "4.11.8", + "har-schema": "1.0.5" + } + }, + "has-ansi": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz", + "integrity": "sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE=", + "requires": { + "ansi-regex": "2.1.1" + } + }, + "has-binary": { + "version": "0.1.7", + "resolved": "https://registry.npmjs.org/has-binary/-/has-binary-0.1.7.tgz", + "integrity": "sha1-aOYesWIQyVRaClzOBqhzkS/h5ow=", + "dev": true, + "requires": { + "isarray": "0.0.1" + } + }, + "has-cors": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/has-cors/-/has-cors-1.1.0.tgz", + "integrity": "sha1-XkdHk/fqmEPRu5nCPu9J/xJv/zk=", + "dev": true + }, + "has-flag": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz", + "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=" + }, + "has-glob": { + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/has-glob/-/has-glob-0.1.1.tgz", + "integrity": "sha1-omHEwqbGZ+DHe3AKfyl8Oe86pYk=", + "requires": { + "is-glob": "2.0.1" + } + }, + "has-gulplog": { + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/has-gulplog/-/has-gulplog-0.1.0.tgz", + "integrity": "sha1-ZBTIKRNpfaUVkDl9r7EvIpZ4Ec4=", + "requires": { + "sparkles": "1.0.0" + } + }, + "has-unicode": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.1.tgz", + "integrity": "sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk=" + }, + "hasha": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/hasha/-/hasha-2.2.0.tgz", + "integrity": "sha1-eNfL/B5tZjA/55g3NlmEUXsvbuE=", + "dev": true, + "requires": { + "is-stream": "1.1.0", + "pinkie-promise": "2.0.1" + } + }, + "hat": { + "version": "0.0.3", + "resolved": "https://registry.npmjs.org/hat/-/hat-0.0.3.tgz", + "integrity": "sha1-uwFKnmSzeIrtgAWRdBPU/z1QLYo=", + "dev": true + }, + "hawk": { + "version": "3.1.3", + "resolved": "https://registry.npmjs.org/hawk/-/hawk-3.1.3.tgz", + "integrity": "sha1-B4REvXwWQLD+VA0sm3PVlnjo4cQ=", + "requires": { + "boom": "2.10.1", + "cryptiles": "2.0.5", + "hoek": "2.16.3", + "sntp": "1.0.9" + } + }, + "hoek": { + "version": "2.16.3", + "resolved": "https://registry.npmjs.org/hoek/-/hoek-2.16.3.tgz", + "integrity": "sha1-ILt0A9POo5jpHcRxCo/xuCdKJe0=" + }, + "homedir-polyfill": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/homedir-polyfill/-/homedir-polyfill-1.0.1.tgz", + "integrity": "sha1-TCu8inWJmP7r9e1oWA921GdotLw=", + "requires": { + "parse-passwd": "1.0.0" + } + }, + "hosted-git-info": { + "version": "2.5.0", + "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.5.0.tgz", + "integrity": "sha512-pNgbURSuab90KbTqvRPsseaTxOJCZBD0a7t+haSN33piP9cCM4l0CqdzAif2hUqm716UovKB2ROmiabGAKVXyg==" + }, + "http-errors": { + "version": "1.5.1", + "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.5.1.tgz", + "integrity": "sha1-eIwNLB3iyBuebowBhDtrl+uSB1A=", + "dev": true, + "requires": { + "inherits": "2.0.3", + "setprototypeof": "1.0.2", + "statuses": "1.3.1" + } + }, + "http-proxy": { + "version": "1.16.2", + "resolved": "https://registry.npmjs.org/http-proxy/-/http-proxy-1.16.2.tgz", + "integrity": "sha1-Bt/ykpUr9k2+hHH6nfcwZtTzd0I=", + "dev": true, + "requires": { + "eventemitter3": "1.2.0", + "requires-port": "1.0.0" + } + }, + "http-signature": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.1.1.tgz", + "integrity": "sha1-33LiZwZs0Kxn+3at+OE0qPvPkb8=", + "requires": { + "assert-plus": "0.2.0", + "jsprim": "1.4.1", + "sshpk": "1.13.1" + } + }, + "https-proxy-agent": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-1.0.0.tgz", + "integrity": "sha1-NffabEjOTdv6JkiRrFk+5f+GceY=", + "dev": true, + "requires": { + "agent-base": "2.1.1", + "debug": "2.2.0", + "extend": "3.0.1" + } + }, + "iconv-lite": { + "version": "0.4.15", + "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.15.tgz", + "integrity": "sha1-/iZaIYrGpXz+hUkn6dBMGYJe3es=", + "dev": true + }, + "ignore": { + "version": "3.3.3", + "resolved": "https://registry.npmjs.org/ignore/-/ignore-3.3.3.tgz", + "integrity": "sha1-QyNS5XrM2HqzEQ6C0/6g5HgSFW0=", + "dev": true + }, + "imagemin": { + "version": "5.3.1", + "resolved": "https://registry.npmjs.org/imagemin/-/imagemin-5.3.1.tgz", + "integrity": "sha1-8Zwu7h5xumxlWMUV+fyWaAGJptQ=", + "dev": true, + "requires": { + "file-type": "4.4.0", + "globby": "6.1.0", + "make-dir": "1.0.0", + "p-pipe": "1.2.0", + "pify": "2.3.0", + "replace-ext": "1.0.0" + }, + "dependencies": { + "globby": { + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/globby/-/globby-6.1.0.tgz", + "integrity": "sha1-9abXDoOV4hyFj7BInWTfAkJNUGw=", + "dev": true, + "requires": { + "array-union": "1.0.2", + "glob": "7.1.2", + "object-assign": "4.1.1", + "pify": "2.3.0", + "pinkie-promise": "2.0.1" + } + }, + "object-assign": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz", + "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=", + "dev": true + }, + "replace-ext": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/replace-ext/-/replace-ext-1.0.0.tgz", + "integrity": "sha1-3mMSg3P8v3w8z6TeWkgMRaZ5WOs=", + "dev": true + } + } + }, + "imagemin-pngquant": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/imagemin-pngquant/-/imagemin-pngquant-5.0.1.tgz", + "integrity": "sha1-2KMp2lU6+iJrEc5i3r4Lfje0OeY=", + "dev": true, + "requires": { + "exec-buffer": "3.2.0", + "is-png": "1.1.0", + "pngquant-bin": "3.1.1" + } + }, + "immutable": { + "version": "3.8.1", + "resolved": "https://registry.npmjs.org/immutable/-/immutable-3.8.1.tgz", + "integrity": "sha1-IAgH8Rqw9ycQ6khVQt4IgHX2jNI=", + "dev": true + }, + "imurmurhash": { + "version": "0.1.4", + "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz", + "integrity": "sha1-khi5srkoojixPcT7a21XbyMUU+o=", + "dev": true + }, + "in-publish": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/in-publish/-/in-publish-2.0.0.tgz", + "integrity": "sha1-4g/146KvwmkDILbcVSaCqcf631E=" + }, + "indent-string": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-2.1.0.tgz", + "integrity": "sha1-ji1INIdCEhtKghi3oTfppSBJ3IA=", + "requires": { + "repeating": "2.0.1" + } + }, + "indexof": { + "version": "0.0.1", + "resolved": "https://registry.npmjs.org/indexof/-/indexof-0.0.1.tgz", + "integrity": "sha1-gtwzbSMrkGIXnQWrMpOmYFn9Q10=", + "dev": true + }, + "inflight": { + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz", + "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=", + "requires": { + "once": "1.4.0", + "wrappy": "1.0.2" + } + }, + "inherits": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz", + "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=" + }, + "ini": { + "version": "1.3.4", + "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.4.tgz", + "integrity": "sha1-BTfLedr1m1mhpRff9wbIbsA5Fi4=" + }, + "inquirer": { + "version": "0.11.4", + "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-0.11.4.tgz", + "integrity": "sha1-geM3ToNhvq/y2XAWIG01nQsy+k0=", + "requires": { + "ansi-escapes": "1.4.0", + "ansi-regex": "2.1.1", + "chalk": "1.1.3", + "cli-cursor": "1.0.2", + "cli-width": "1.1.1", + "figures": "1.7.0", + "lodash": "3.10.1", + "readline2": "1.0.1", + "run-async": "0.1.0", + "rx-lite": "3.1.2", + "string-width": "1.0.2", + "strip-ansi": "3.0.1", + "through": "2.3.8" + }, + "dependencies": { + "lodash": { + "version": "3.10.1", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-3.10.1.tgz", + "integrity": "sha1-W/Rejkm6QYnhfUgnid/RW9FAt7Y=" + } + } + }, + "interpret": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/interpret/-/interpret-1.0.3.tgz", + "integrity": "sha1-y8NcYu7uc/Gat7EKgBURQBr8D5A=" + }, + "invert-kv": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/invert-kv/-/invert-kv-1.0.0.tgz", + "integrity": "sha1-EEqOSqym09jNFXqO+L+rLXo//bY=" + }, + "ip-regex": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/ip-regex/-/ip-regex-1.0.3.tgz", + "integrity": "sha1-3FiQdvZZ9BnCIgOaMzFvHHOH7/0=", + "dev": true + }, + "ipaddr.js": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.4.0.tgz", + "integrity": "sha1-KWrKh4qCGBbluF0KKFqZvP9FgvA=", + "dev": true + }, + "is-absolute": { + "version": "0.2.6", + "resolved": "https://registry.npmjs.org/is-absolute/-/is-absolute-0.2.6.tgz", + "integrity": "sha1-IN5p89uULvLYe5wto28XIjWxtes=", + "requires": { + "is-relative": "0.2.1", + "is-windows": "0.2.0" + } + }, + "is-arrayish": { + "version": "0.2.1", + "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz", + "integrity": "sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0=" + }, + "is-binary-path": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-1.0.1.tgz", + "integrity": "sha1-dfFmQrSA8YenEcgUFh/TpKdlWJg=", + "dev": true, + "requires": { + "binary-extensions": "1.10.0" + } + }, + "is-buffer": { + "version": "1.1.5", + "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.5.tgz", + "integrity": "sha1-Hzsm72E7IUuIy8ojzGwB2Hlh7sw=" + }, + "is-builtin-module": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-builtin-module/-/is-builtin-module-1.0.0.tgz", + "integrity": "sha1-VAVy0096wxGfj3bDDLwbHgN6/74=", + "requires": { + "builtin-modules": "1.1.1" + } + }, + "is-bzip2": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-bzip2/-/is-bzip2-1.0.0.tgz", + "integrity": "sha1-XuWOqlounIDiFAe+3yOuWsCRs/w=", + "dev": true + }, + "is-dotfile": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/is-dotfile/-/is-dotfile-1.0.3.tgz", + "integrity": "sha1-pqLzL/0t+wT1yiXs0Pa4PPeYoeE=" + }, + "is-equal-shallow": { + "version": "0.1.3", + "resolved": "https://registry.npmjs.org/is-equal-shallow/-/is-equal-shallow-0.1.3.tgz", + "integrity": "sha1-IjgJj8Ih3gvPpdnqxMRdY4qhxTQ=", + "requires": { + "is-primitive": "2.0.0" + } + }, + "is-extendable": { + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz", + "integrity": "sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=" + }, + "is-extglob": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-1.0.0.tgz", + "integrity": "sha1-rEaBd8SUNAWgkvyPKXYMb/xiBsA=" + }, + "is-finite": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/is-finite/-/is-finite-1.0.2.tgz", + "integrity": "sha1-zGZ3aVYCvlUO8R6LSqYwU0K20Ko=", + "requires": { + "number-is-nan": "1.0.1" + } + }, + "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=", + "requires": { + "number-is-nan": "1.0.1" + } + }, + "is-glob": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-2.0.1.tgz", + "integrity": "sha1-0Jb5JqPe1WAPP9/ZEZjLCIjC2GM=", + "requires": { + "is-extglob": "1.0.0" + } + }, + "is-gzip": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-gzip/-/is-gzip-1.0.0.tgz", + "integrity": "sha1-bKiwe5nHeZgCWQDlVc7Y7YCHmoM=", + "dev": true + }, + "is-natural-number": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/is-natural-number/-/is-natural-number-2.1.1.tgz", + "integrity": "sha1-fUxXKDd+84bD4ZSpkRv1fG3DNec=", + "dev": true + }, + "is-number": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/is-number/-/is-number-2.1.0.tgz", + "integrity": "sha1-Afy7s5NGOlSPL0ZszhbezknbkI8=", + "requires": { + "kind-of": "3.2.2" + } + }, + "is-number-like": { + "version": "1.0.8", + "resolved": "https://registry.npmjs.org/is-number-like/-/is-number-like-1.0.8.tgz", + "integrity": "sha512-6rZi3ezCyFcn5L71ywzz2bS5b2Igl1En3eTlZlvKjpz1n3IZLAYMbKYAIQgFmEu0GENg92ziU/faEOA/aixjbA==", + "dev": true, + "requires": { + "lodash.isfinite": "3.3.2" + } + }, + "is-obj": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/is-obj/-/is-obj-1.0.1.tgz", + "integrity": "sha1-PkcprB9f3gJc19g6iW2rn09n2w8=", + "dev": true + }, + "is-path-cwd": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-path-cwd/-/is-path-cwd-1.0.0.tgz", + "integrity": "sha1-0iXsIxMuie3Tj9p2dHLmLmXxEG0=", + "dev": true + }, + "is-path-in-cwd": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-path-in-cwd/-/is-path-in-cwd-1.0.0.tgz", + "integrity": "sha1-ZHdYK4IU1gI0YJRWcAO+ip6sBNw=", + "dev": true, + "requires": { + "is-path-inside": "1.0.0" + } + }, + "is-path-inside": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-1.0.0.tgz", + "integrity": "sha1-/AbloWg/vaE95mev9xe7wQpI838=", + "dev": true, + "requires": { + "path-is-inside": "1.0.2" + } + }, + "is-plain-object": { + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz", + "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==", + "requires": { + "isobject": "3.0.1" + }, + "dependencies": { + "isobject": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz", + "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=" + } + } + }, + "is-png": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/is-png/-/is-png-1.1.0.tgz", + "integrity": "sha1-1XSxK/J1wDUEVVcLDltXqwYgd84=", + "dev": true + }, + "is-posix-bracket": { + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/is-posix-bracket/-/is-posix-bracket-0.1.1.tgz", + "integrity": "sha1-MzTceXdDaOkvAW5vvAqI9c1ua8Q=" + }, + "is-primitive": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/is-primitive/-/is-primitive-2.0.0.tgz", + "integrity": "sha1-IHurkWOEmcB7Kt8kCkGochADRXU=" + }, + "is-promise": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/is-promise/-/is-promise-2.1.0.tgz", + "integrity": "sha1-eaKp7OfwlugPNtKy87wWwf9L8/o=", + "dev": true + }, + "is-redirect": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-redirect/-/is-redirect-1.0.0.tgz", + "integrity": "sha1-HQPd7VO9jbDzDCbk+V02/HyH3CQ=", + "dev": true + }, + "is-relative": { + "version": "0.2.1", + "resolved": "https://registry.npmjs.org/is-relative/-/is-relative-0.2.1.tgz", + "integrity": "sha1-0n9MfVFtF1+2ENuEu+7yPDvJeqU=", + "requires": { + "is-unc-path": "0.1.2" + } + }, + "is-resolvable": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-resolvable/-/is-resolvable-1.0.0.tgz", + "integrity": "sha1-jfV8YeouPFAUCNEA+wE8+NbgzGI=", + "dev": true, + "requires": { + "tryit": "1.0.3" + } + }, + "is-retry-allowed": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/is-retry-allowed/-/is-retry-allowed-1.1.0.tgz", + "integrity": "sha1-EaBgVotnM5REAz0BJaYaINVk+zQ=", + "dev": true + }, + "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-tar": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-tar/-/is-tar-1.0.0.tgz", + "integrity": "sha1-L2suF5LB9bs2UZrKqdZcDSb+hT0=", + "dev": true + }, + "is-typedarray": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz", + "integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=" + }, + "is-unc-path": { + "version": "0.1.2", + "resolved": "https://registry.npmjs.org/is-unc-path/-/is-unc-path-0.1.2.tgz", + "integrity": "sha1-arBTpyVzwQJQ/0FqOBTDUXivObk=", + "requires": { + "unc-path-regex": "0.1.2" + } + }, + "is-url": { + "version": "1.2.2", + "resolved": "https://registry.npmjs.org/is-url/-/is-url-1.2.2.tgz", + "integrity": "sha1-SYkFpZO/R8wtnn9zg3K792lsfyY=", + "dev": true + }, + "is-utf8": { + "version": "0.2.1", + "resolved": "https://registry.npmjs.org/is-utf8/-/is-utf8-0.2.1.tgz", + "integrity": "sha1-Sw2hRCEE0bM2NA6AeX6GXPOffXI=" + }, + "is-valid-glob": { + "version": "0.3.0", + "resolved": "https://registry.npmjs.org/is-valid-glob/-/is-valid-glob-0.3.0.tgz", + "integrity": "sha1-1LVcafUYhvm2XHDWwmItN+KfSP4=" + }, + "is-windows": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/is-windows/-/is-windows-0.2.0.tgz", + "integrity": "sha1-3hqm1j6indJIc3tp8f+LgALSEIw=" + }, + "is-zip": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-zip/-/is-zip-1.0.0.tgz", + "integrity": "sha1-R7Co/004p2QxzP2ZqOFaTIa6IyU=", + "dev": true + }, + "isarray": { + "version": "0.0.1", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz", + "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=" + }, + "isbinaryfile": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/isbinaryfile/-/isbinaryfile-3.0.2.tgz", + "integrity": "sha1-Sj6XTsDLqQBNP8bN5yCeppNopiE=", + "dev": true + }, + "isexe": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz", + "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=" + }, + "isobject": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/isobject/-/isobject-2.1.0.tgz", + "integrity": "sha1-8GVWEJaj8dou9GJy+BXIQNh+DIk=", + "requires": { + "isarray": "1.0.0" + }, + "dependencies": { + "isarray": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", + "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=" + } + } + }, + "isstream": { + "version": "0.1.2", + "resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz", + "integrity": "sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo=" + }, + "istanbul": { + "version": "0.4.5", + "resolved": "https://registry.npmjs.org/istanbul/-/istanbul-0.4.5.tgz", + "integrity": "sha1-ZcfXPUxNqE1POsMQuRj7C4Azczs=", + "dev": true, + "requires": { + "abbrev": "1.0.9", + "async": "1.5.2", + "escodegen": "1.8.1", + "esprima": "2.7.3", + "glob": "5.0.15", + "handlebars": "4.0.10", + "js-yaml": "3.9.1", + "mkdirp": "0.5.1", + "nopt": "3.0.6", + "once": "1.4.0", + "resolve": "1.1.7", + "supports-color": "3.2.3", + "which": "1.3.0", + "wordwrap": "1.0.0" + }, + "dependencies": { + "abbrev": { + "version": "1.0.9", + "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.0.9.tgz", + "integrity": "sha1-kbR5JYinc4wl813W9jdSovh3YTU=", + "dev": true + }, + "esprima": { + "version": "2.7.3", + "resolved": "https://registry.npmjs.org/esprima/-/esprima-2.7.3.tgz", + "integrity": "sha1-luO3DVd59q1JzQMmc9HDEnZ7pYE=", + "dev": true + }, + "glob": { + "version": "5.0.15", + "resolved": "https://registry.npmjs.org/glob/-/glob-5.0.15.tgz", + "integrity": "sha1-G8k2ueAvSmA/zCIuz3Yz0wuLk7E=", + "dev": true, + "requires": { + "inflight": "1.0.6", + "inherits": "2.0.3", + "minimatch": "3.0.4", + "once": "1.4.0", + "path-is-absolute": "1.0.1" + } + }, + "resolve": { + "version": "1.1.7", + "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.1.7.tgz", + "integrity": "sha1-IDEU2CrSxe2ejgQRs5ModeiJ6Xs=", + "dev": true + }, + "supports-color": { + "version": "3.2.3", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz", + "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=", + "dev": true, + "requires": { + "has-flag": "1.0.0" + } + }, + "wordwrap": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-1.0.0.tgz", + "integrity": "sha1-J1hIEIkUVqQXHI0CJkQa3pDLyus=", + "dev": true + } + } + }, + "istanbul-combine": { + "version": "0.3.0", + "resolved": "https://registry.npmjs.org/istanbul-combine/-/istanbul-combine-0.3.0.tgz", + "integrity": "sha1-VrLV5joiBZi23ErIrVcucV6ZV3M=", + "dev": true, + "requires": { + "glob": "5.0.15", + "istanbul": "0.3.22", + "minimist": "1.2.0", + "q": "1.5.0" + }, + "dependencies": { + "abbrev": { + "version": "1.0.9", + "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.0.9.tgz", + "integrity": "sha1-kbR5JYinc4wl813W9jdSovh3YTU=", + "dev": true + }, + "escodegen": { + "version": "1.7.1", + "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-1.7.1.tgz", + "integrity": "sha1-MOz89mypjcZ80v0WKr626vqM5vw=", + "dev": true, + "requires": { + "esprima": "1.2.5", + "estraverse": "1.9.3", + "esutils": "2.0.2", + "optionator": "0.5.0", + "source-map": "0.2.0" + }, + "dependencies": { + "esprima": { + "version": "1.2.5", + "resolved": "https://registry.npmjs.org/esprima/-/esprima-1.2.5.tgz", + "integrity": "sha1-CZNQL+r2aBODJXVvMPmlH+7sEek=", + "dev": true + } + } + }, + "esprima": { + "version": "2.5.0", + "resolved": "https://registry.npmjs.org/esprima/-/esprima-2.5.0.tgz", + "integrity": "sha1-84ekb9NEwbGjm6+MIL+0O20AWMw=", + "dev": true + }, + "fast-levenshtein": { + "version": "1.0.7", + "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-1.0.7.tgz", + "integrity": "sha1-AXjc3uAjuSkFGTrwlZ6KdjnP3Lk=", + "dev": true + }, + "glob": { + "version": "5.0.15", + "resolved": "https://registry.npmjs.org/glob/-/glob-5.0.15.tgz", + "integrity": "sha1-G8k2ueAvSmA/zCIuz3Yz0wuLk7E=", + "dev": true, + "requires": { + "inflight": "1.0.6", + "inherits": "2.0.3", + "minimatch": "3.0.4", + "once": "1.4.0", + "path-is-absolute": "1.0.1" + } + }, + "istanbul": { + "version": "0.3.22", + "resolved": "https://registry.npmjs.org/istanbul/-/istanbul-0.3.22.tgz", + "integrity": "sha1-PhZNhQIf4ZyYXR8OfvDD4i0BLrY=", + "dev": true, + "requires": { + "abbrev": "1.0.9", + "async": "1.5.2", + "escodegen": "1.7.1", + "esprima": "2.5.0", + "fileset": "0.2.1", + "handlebars": "4.0.10", + "js-yaml": "3.9.1", + "mkdirp": "0.5.1", + "nopt": "3.0.6", + "once": "1.4.0", + "resolve": "1.1.7", + "supports-color": "3.2.3", + "which": "1.3.0", + "wordwrap": "1.0.0" + } + }, + "levn": { + "version": "0.2.5", + "resolved": "https://registry.npmjs.org/levn/-/levn-0.2.5.tgz", + "integrity": "sha1-uo0znQykphDjo/FFucr0iAcVUFQ=", + "dev": true, + "requires": { + "prelude-ls": "1.1.2", + "type-check": "0.3.2" + } + }, + "optionator": { + "version": "0.5.0", + "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.5.0.tgz", + "integrity": "sha1-t1qJlaLUF98ltuTjhi9QqohlE2g=", + "dev": true, + "requires": { + "deep-is": "0.1.3", + "fast-levenshtein": "1.0.7", + "levn": "0.2.5", + "prelude-ls": "1.1.2", + "type-check": "0.3.2", + "wordwrap": "0.0.3" + }, + "dependencies": { + "wordwrap": { + "version": "0.0.3", + "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.3.tgz", + "integrity": "sha1-o9XabNXAvAAI03I0u68b7WMFkQc=", + "dev": true + } + } + }, + "resolve": { + "version": "1.1.7", + "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.1.7.tgz", + "integrity": "sha1-IDEU2CrSxe2ejgQRs5ModeiJ6Xs=", + "dev": true + }, + "source-map": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.2.0.tgz", + "integrity": "sha1-2rc/vPwrqBm03gO9b26qSBZLP50=", + "dev": true, + "optional": true, + "requires": { + "amdefine": "1.0.1" + } + }, + "supports-color": { + "version": "3.2.3", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz", + "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=", + "dev": true, + "requires": { + "has-flag": "1.0.0" + } + }, + "wordwrap": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-1.0.0.tgz", + "integrity": "sha1-J1hIEIkUVqQXHI0CJkQa3pDLyus=", + "dev": true + } + } + }, + "istanbul-threshold-checker": { + "version": "0.2.1", + "resolved": "https://registry.npmjs.org/istanbul-threshold-checker/-/istanbul-threshold-checker-0.2.1.tgz", + "integrity": "sha1-xdyU6PLMXNP/0zVFL4S1U8QkgzE=", + "dev": true, + "requires": { + "istanbul": "0.4.5", + "lodash": "4.17.4" + } + }, + "istextorbinary": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/istextorbinary/-/istextorbinary-1.0.2.tgz", + "integrity": "sha1-rOGTVNGpoBc+/rEITOD4ewrX3s8=", + "requires": { + "binaryextensions": "1.0.1", + "textextensions": "1.0.2" + } + }, + "jasmine-core": { + "version": "2.7.0", + "resolved": "https://registry.npmjs.org/jasmine-core/-/jasmine-core-2.7.0.tgz", + "integrity": "sha1-UP+MT5LY71wLLBuEbdJj7YUVIJE=", + "dev": true + }, + "jasmine-jquery": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/jasmine-jquery/-/jasmine-jquery-2.1.1.tgz", + "integrity": "sha1-1AleZGlEomdjI1dpqwGNnzDw1Hs=", + "dev": true + }, + "jasmine-reporters": { + "version": "2.2.1", + "resolved": "https://registry.npmjs.org/jasmine-reporters/-/jasmine-reporters-2.2.1.tgz", + "integrity": "sha1-3pqSATZ4RiaefKit/1tEIhZx/L0=", + "dev": true, + "requires": { + "mkdirp": "0.5.1", + "xmldom": "0.1.27" + } + }, + "jasmine-spec-reporter": { + "version": "4.2.1", + "resolved": "https://registry.npmjs.org/jasmine-spec-reporter/-/jasmine-spec-reporter-4.2.1.tgz", + "integrity": "sha512-FZBoZu7VE5nR7Nilzy+Np8KuVIOxF4oXDPDknehCYBDE080EnlPu0afdZNmpGDBRCUBv3mj5qgqCRmk6W/K8vg==", + "dev": true, + "requires": { + "colors": "1.1.2" + } + }, + "jasminewd2": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/jasminewd2/-/jasminewd2-2.1.0.tgz", + "integrity": "sha1-2llSddGuYx3nNqwKfH2Fyfc+9lI=", + "dev": true + }, + "js-base64": { + "version": "2.1.9", + "resolved": "https://registry.npmjs.org/js-base64/-/js-base64-2.1.9.tgz", + "integrity": "sha1-8OgK4DmkvWVLXygfyT8EqRSn/M4=" + }, + "js-tokens": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-3.0.2.tgz", + "integrity": "sha1-mGbfOVECEw449/mWvOtlRDIJwls=", + "dev": true + }, + "js-yaml": { + "version": "3.9.1", + "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.9.1.tgz", + "integrity": "sha512-CbcG379L1e+mWBnLvHWWeLs8GyV/EMw862uLI3c+GxVyDHWZcjZinwuBd3iW2pgxgIlksW/1vNJa4to+RvDOww==", + "dev": true, + "requires": { + "argparse": "1.0.9", + "esprima": "4.0.0" + }, + "dependencies": { + "esprima": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.0.tgz", + "integrity": "sha512-oftTcaMu/EGrEIu904mWteKIv8vMuOgGYo7EhVJJN00R/EED9DCua/xxHRdYnKtcECzVg7xOWhflvJMnqcFZjw==", + "dev": true + } + } + }, + "js2xmlparser": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/js2xmlparser/-/js2xmlparser-3.0.0.tgz", + "integrity": "sha1-P7YOqgicVED5MZ9RdgzNB+JJlzM=", + "dev": true, + "requires": { + "xmlcreate": "1.0.2" + } + }, + "jsbn": { + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz", + "integrity": "sha1-peZUwuWi3rXyAdls77yoDA7y9RM=", + "optional": true + }, + "jschardet": { + "version": "1.5.1", + "resolved": "https://registry.npmjs.org/jschardet/-/jschardet-1.5.1.tgz", + "integrity": "sha512-vE2hT1D0HLZCLLclfBSfkfTTedhVj0fubHpJBHKwwUWX0nSbhPAfk+SG9rTX95BYNmau8rGFfCeaT6T5OW1C2A==", + "dev": true + }, + "jsdoc": { + "version": "3.5.4", + "resolved": "https://registry.npmjs.org/jsdoc/-/jsdoc-3.5.4.tgz", + "integrity": "sha512-VmTw0J+2L16IxAe0JSDSAcH0F+DbZxaj8wN1AjHtKMQU/hO0ciIl5ZE93XqrrFIbknobuqHKJCXZj6+Hk57MjA==", + "dev": true, + "requires": { + "babylon": "7.0.0-beta.19", + "bluebird": "3.5.0", + "catharsis": "0.8.9", + "escape-string-regexp": "1.0.5", + "js2xmlparser": "3.0.0", + "klaw": "2.0.0", + "marked": "0.3.6", + "mkdirp": "0.5.1", + "requizzle": "0.2.1", + "strip-json-comments": "2.0.1", + "taffydb": "2.6.2", + "underscore": "1.8.3" + }, + "dependencies": { + "underscore": { + "version": "1.8.3", + "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.8.3.tgz", + "integrity": "sha1-Tz+1OxBuYJf8+ctBCfKl6b36UCI=", + "dev": true + } + } + }, + "jsesc": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.2.0.tgz", + "integrity": "sha1-w1qGE6OAbI7DuvwLDhlvAg96qwE=" + }, + "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.3.1", + "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.3.1.tgz", + "integrity": "sha1-NJptRMU6Ud6JtAgFxdXlm0F9M0A=", + "dev": true + }, + "json-stable-stringify": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/json-stable-stringify/-/json-stable-stringify-1.0.1.tgz", + "integrity": "sha1-mnWdOcXy/1A/1TAGRu1EX4jE+a8=", + "requires": { + "jsonify": "0.0.0" + } + }, + "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=" + }, + "json3": { + "version": "3.3.2", + "resolved": "https://registry.npmjs.org/json3/-/json3-3.3.2.tgz", + "integrity": "sha1-PAQ0dD35Pi9cQq7nsZvLSDV19OE=", + "dev": true + }, + "jsonfile": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-3.0.1.tgz", + "integrity": "sha1-pezG9l9T9mLEQVx2daAzHQmS7GY=", + "requires": { + "graceful-fs": "4.1.11" + } + }, + "jsonify": { + "version": "0.0.0", + "resolved": "https://registry.npmjs.org/jsonify/-/jsonify-0.0.0.tgz", + "integrity": "sha1-LHS27kHZPKUbe1qu6PUDYx0lKnM=" + }, + "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" + }, + "dependencies": { + "assert-plus": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz", + "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=" + } + } + }, + "karma": { + "version": "1.7.0", + "resolved": "https://registry.npmjs.org/karma/-/karma-1.7.0.tgz", + "integrity": "sha1-b3oaQGRG+i4YfslTmGmPTO5HYmk=", + "dev": true, + "requires": { + "bluebird": "3.5.0", + "body-parser": "1.17.2", + "chokidar": "1.7.0", + "colors": "1.1.2", + "combine-lists": "1.0.1", + "connect": "3.6.3", + "core-js": "2.5.0", + "di": "0.0.1", + "dom-serialize": "2.2.1", + "expand-braces": "0.1.2", + "glob": "7.1.2", + "graceful-fs": "4.1.11", + "http-proxy": "1.16.2", + "isbinaryfile": "3.0.2", + "lodash": "3.10.1", + "log4js": "0.6.38", + "mime": "1.3.6", + "minimatch": "3.0.4", + "optimist": "0.6.1", + "qjobs": "1.1.5", + "range-parser": "1.2.0", + "rimraf": "2.6.1", + "safe-buffer": "5.1.1", + "socket.io": "1.7.3", + "source-map": "0.5.6", + "tmp": "0.0.31", + "useragent": "2.2.1" + }, + "dependencies": { + "after": { + "version": "0.8.2", + "resolved": "https://registry.npmjs.org/after/-/after-0.8.2.tgz", + "integrity": "sha1-/ts5T58OAqqXaOcCvaI7UF+ufh8=", + "dev": true + }, + "base64id": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/base64id/-/base64id-1.0.0.tgz", + "integrity": "sha1-R2iMuZu2gE8OBtPnY7HDLlfY5rY=", + "dev": true + }, + "component-emitter": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.2.1.tgz", + "integrity": "sha1-E3kY1teCg/ffemt8WmPhQOaUJeY=", + "dev": true + }, + "connect": { + "version": "3.6.3", + "resolved": "https://registry.npmjs.org/connect/-/connect-3.6.3.tgz", + "integrity": "sha512-GLSZqgjVxPvGYVD/2vz//gS201MEXk4b7t3nHV6OVnTdDNWi/Gm7Rpxs/ybvljPWvULys/wrzIV3jB3YvEc3nQ==", + "dev": true, + "requires": { + "debug": "2.6.8", + "finalhandler": "1.0.4", + "parseurl": "1.3.1", + "utils-merge": "1.0.0" + } + }, + "debug": { + "version": "2.6.8", + "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.8.tgz", + "integrity": "sha1-5zFTHKLt4n0YgiJCfaF4IdaP9Pw=", + "dev": true, + "requires": { + "ms": "2.0.0" + } + }, + "engine.io": { + "version": "1.8.3", + "resolved": "https://registry.npmjs.org/engine.io/-/engine.io-1.8.3.tgz", + "integrity": "sha1-jef5eJXSDTm4X4ju7nd7K9QrE9Q=", + "dev": true, + "requires": { + "accepts": "1.3.3", + "base64id": "1.0.0", + "cookie": "0.3.1", + "debug": "2.3.3", + "engine.io-parser": "1.3.2", + "ws": "1.1.2" + }, + "dependencies": { + "debug": { + "version": "2.3.3", + "resolved": "https://registry.npmjs.org/debug/-/debug-2.3.3.tgz", + "integrity": "sha1-QMRT5n5uE8kB3ewxeviYbNqe/4w=", + "dev": true, + "requires": { + "ms": "0.7.2" + } + }, + "ms": { + "version": "0.7.2", + "resolved": "https://registry.npmjs.org/ms/-/ms-0.7.2.tgz", + "integrity": "sha1-riXPJRKziFodldfwN4aNhDESR2U=", + "dev": true + } + } + }, + "engine.io-client": { + "version": "1.8.3", + "resolved": "https://registry.npmjs.org/engine.io-client/-/engine.io-client-1.8.3.tgz", + "integrity": "sha1-F5jtk0USRkU9TG9jXXogH+lA1as=", + "dev": true, + "requires": { + "component-emitter": "1.2.1", + "component-inherit": "0.0.3", + "debug": "2.3.3", + "engine.io-parser": "1.3.2", + "has-cors": "1.1.0", + "indexof": "0.0.1", + "parsejson": "0.0.3", + "parseqs": "0.0.5", + "parseuri": "0.0.5", + "ws": "1.1.2", + "xmlhttprequest-ssl": "1.5.3", + "yeast": "0.1.2" + }, + "dependencies": { + "debug": { + "version": "2.3.3", + "resolved": "https://registry.npmjs.org/debug/-/debug-2.3.3.tgz", + "integrity": "sha1-QMRT5n5uE8kB3ewxeviYbNqe/4w=", + "dev": true, + "requires": { + "ms": "0.7.2" + } + }, + "ms": { + "version": "0.7.2", + "resolved": "https://registry.npmjs.org/ms/-/ms-0.7.2.tgz", + "integrity": "sha1-riXPJRKziFodldfwN4aNhDESR2U=", + "dev": true + } + } + }, + "engine.io-parser": { + "version": "1.3.2", + "resolved": "https://registry.npmjs.org/engine.io-parser/-/engine.io-parser-1.3.2.tgz", + "integrity": "sha1-k3sHnwAH0Ik+xW1GyyILjLQ1Igo=", + "dev": true, + "requires": { + "after": "0.8.2", + "arraybuffer.slice": "0.0.6", + "base64-arraybuffer": "0.1.5", + "blob": "0.0.4", + "has-binary": "0.1.7", + "wtf-8": "1.0.0" + } + }, + "finalhandler": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.0.4.tgz", + "integrity": "sha512-16l/r8RgzlXKmFOhZpHBztvye+lAhC5SU7hXavnerC9UfZqZxxXl3BzL8MhffPT3kF61lj9Oav2LKEzh0ei7tg==", + "dev": true, + "requires": { + "debug": "2.6.8", + "encodeurl": "1.0.1", + "escape-html": "1.0.3", + "on-finished": "2.3.0", + "parseurl": "1.3.1", + "statuses": "1.3.1", + "unpipe": "1.0.0" + } + }, + "lodash": { + "version": "3.10.1", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-3.10.1.tgz", + "integrity": "sha1-W/Rejkm6QYnhfUgnid/RW9FAt7Y=", + "dev": true + }, + "mime": { + "version": "1.3.6", + "resolved": "https://registry.npmjs.org/mime/-/mime-1.3.6.tgz", + "integrity": "sha1-WR2E02U6awtKO5343lqoEI5y5eA=", + "dev": true + }, + "ms": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", + "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=", + "dev": true + }, + "object-assign": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.0.tgz", + "integrity": "sha1-ejs9DpgGPUP0wD8uiubNUahog6A=", + "dev": true + }, + "socket.io": { + "version": "1.7.3", + "resolved": "https://registry.npmjs.org/socket.io/-/socket.io-1.7.3.tgz", + "integrity": "sha1-uK+cq6AJSeVo42nxMn6pvp6iRhs=", + "dev": true, + "requires": { + "debug": "2.3.3", + "engine.io": "1.8.3", + "has-binary": "0.1.7", + "object-assign": "4.1.0", + "socket.io-adapter": "0.5.0", + "socket.io-client": "1.7.3", + "socket.io-parser": "2.3.1" + }, + "dependencies": { + "debug": { + "version": "2.3.3", + "resolved": "https://registry.npmjs.org/debug/-/debug-2.3.3.tgz", + "integrity": "sha1-QMRT5n5uE8kB3ewxeviYbNqe/4w=", + "dev": true, + "requires": { + "ms": "0.7.2" + } + }, + "ms": { + "version": "0.7.2", + "resolved": "https://registry.npmjs.org/ms/-/ms-0.7.2.tgz", + "integrity": "sha1-riXPJRKziFodldfwN4aNhDESR2U=", + "dev": true + } + } + }, + "socket.io-client": { + "version": "1.7.3", + "resolved": "https://registry.npmjs.org/socket.io-client/-/socket.io-client-1.7.3.tgz", + "integrity": "sha1-sw6GqhDV7zVGYBwJzeR2Xjgdo3c=", + "dev": true, + "requires": { + "backo2": "1.0.2", + "component-bind": "1.0.0", + "component-emitter": "1.2.1", + "debug": "2.3.3", + "engine.io-client": "1.8.3", + "has-binary": "0.1.7", + "indexof": "0.0.1", + "object-component": "0.0.3", + "parseuri": "0.0.5", + "socket.io-parser": "2.3.1", + "to-array": "0.1.4" + }, + "dependencies": { + "debug": { + "version": "2.3.3", + "resolved": "https://registry.npmjs.org/debug/-/debug-2.3.3.tgz", + "integrity": "sha1-QMRT5n5uE8kB3ewxeviYbNqe/4w=", + "dev": true, + "requires": { + "ms": "0.7.2" + } + }, + "ms": { + "version": "0.7.2", + "resolved": "https://registry.npmjs.org/ms/-/ms-0.7.2.tgz", + "integrity": "sha1-riXPJRKziFodldfwN4aNhDESR2U=", + "dev": true + } + } + }, + "ws": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/ws/-/ws-1.1.2.tgz", + "integrity": "sha1-iiRPoFJAHgjJiGz0SoUYnh/UBn8=", + "dev": true, + "requires": { + "options": "0.0.6", + "ultron": "1.0.2" + } + } + } + }, + "karma-chrome-launcher": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/karma-chrome-launcher/-/karma-chrome-launcher-2.2.0.tgz", + "integrity": "sha512-uf/ZVpAabDBPvdPdveyk1EPgbnloPvFFGgmRhYLTDH7gEB4nZdSBk8yTU47w1g/drLSx5uMOkjKk7IWKfWg/+w==", + "dev": true, + "requires": { + "fs-access": "1.0.1", + "which": "1.3.0" + } + }, + "karma-cli": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/karma-cli/-/karma-cli-1.0.1.tgz", + "integrity": "sha1-rmw8WKMTodALRRZMRVubhs4X+WA=", + "dev": true, + "requires": { + "resolve": "1.4.0" + } + }, + "karma-coverage": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/karma-coverage/-/karma-coverage-1.1.1.tgz", + "integrity": "sha1-Wv+LOc9plNwi3kyENix2ABtjfPY=", + "dev": true, + "requires": { + "dateformat": "1.0.12", + "istanbul": "0.4.5", + "lodash": "3.10.1", + "minimatch": "3.0.4", + "source-map": "0.5.6" + }, + "dependencies": { + "dateformat": { + "version": "1.0.12", + "resolved": "https://registry.npmjs.org/dateformat/-/dateformat-1.0.12.tgz", + "integrity": "sha1-nxJLZ1lMk3/3BpMuSmQsyo27/uk=", + "dev": true, + "requires": { + "get-stdin": "4.0.1", + "meow": "3.7.0" + } + }, + "lodash": { + "version": "3.10.1", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-3.10.1.tgz", + "integrity": "sha1-W/Rejkm6QYnhfUgnid/RW9FAt7Y=", + "dev": true + } + } + }, + "karma-jasmine": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/karma-jasmine/-/karma-jasmine-1.1.0.tgz", + "integrity": "sha1-IuTAa/mhguUpTR9wXjczgRuBCs8=", + "dev": true + }, + "karma-ng-html2js-preprocessor": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/karma-ng-html2js-preprocessor/-/karma-ng-html2js-preprocessor-1.0.0.tgz", + "integrity": "sha1-ENjIz6pBNvHIp22RpMvO7evsSjE=", + "dev": true + }, + "karma-phantomjs-launcher": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/karma-phantomjs-launcher/-/karma-phantomjs-launcher-1.0.4.tgz", + "integrity": "sha1-0jyjSAG9qYY60xjju0vUBisTrNI=", + "dev": true, + "requires": { + "lodash": "4.17.4", + "phantomjs-prebuilt": "2.1.15" + } + }, + "karma-wiredep": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/karma-wiredep/-/karma-wiredep-1.0.3.tgz", + "integrity": "sha1-RtkKVVjNKIfr0QfDYtMQUgAJ+9Y=", + "dev": true, + "requires": { + "wiredep": "2.2.2" + }, + "dependencies": { + "ansi-regex": { + "version": "0.2.1", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-0.2.1.tgz", + "integrity": "sha1-DY6UaWej2BQ/k+JOKYUl/BsiNfk=", + "dev": true + }, + "ansi-styles": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-1.1.0.tgz", + "integrity": "sha1-6uy/Zs1waIJ2Cy9GkVgrj1XXp94=", + "dev": true + }, + "bower-config": { + "version": "0.5.2", + "resolved": "https://registry.npmjs.org/bower-config/-/bower-config-0.5.2.tgz", + "integrity": "sha1-H30uiZ6ZtwwpphPnDUxkWQQUsi4=", + "dev": true, + "requires": { + "graceful-fs": "2.0.3", + "mout": "0.9.1", + "optimist": "0.6.1", + "osenv": "0.0.3" + } + }, + "chalk": { + "version": "0.5.1", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-0.5.1.tgz", + "integrity": "sha1-Zjs6ZItotV0EaQ1JFnqoN4WPIXQ=", + "dev": true, + "requires": { + "ansi-styles": "1.1.0", + "escape-string-regexp": "1.0.5", + "has-ansi": "0.1.0", + "strip-ansi": "0.3.0", + "supports-color": "0.2.0" + } + }, + "glob": { + "version": "4.5.3", + "resolved": "https://registry.npmjs.org/glob/-/glob-4.5.3.tgz", + "integrity": "sha1-xstz0yJsHv7wTePFbQEvAzd+4V8=", + "dev": true, + "requires": { + "inflight": "1.0.6", + "inherits": "2.0.3", + "minimatch": "2.0.10", + "once": "1.4.0" + } + }, + "graceful-fs": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-2.0.3.tgz", + "integrity": "sha1-fNLNsiiko/Nule+mzBQt59GhNtA=", + "dev": true + }, + "has-ansi": { + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-0.1.0.tgz", + "integrity": "sha1-hPJlqujA5qiKEtcCKJS3VoiUxi4=", + "dev": true, + "requires": { + "ansi-regex": "0.2.1" + } + }, + "lodash": { + "version": "2.4.2", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-2.4.2.tgz", + "integrity": "sha1-+t2DS5aDBz2hebPq5tnA0VBT9z4=", + "dev": true + }, + "minimatch": { + "version": "2.0.10", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-2.0.10.tgz", + "integrity": "sha1-jQh8OcazjAAbl/ynzm0OHoCvusc=", + "dev": true, + "requires": { + "brace-expansion": "1.1.8" + } + }, + "mout": { + "version": "0.9.1", + "resolved": "https://registry.npmjs.org/mout/-/mout-0.9.1.tgz", + "integrity": "sha1-hPDz/WrMcxf2PeKv/cwM7gCbBHc=", + "dev": true + }, + "osenv": { + "version": "0.0.3", + "resolved": "https://registry.npmjs.org/osenv/-/osenv-0.0.3.tgz", + "integrity": "sha1-zWrY3bKQkVrZ4idlV2Al1BHynLY=", + "dev": true + }, + "readable-stream": { + "version": "1.0.34", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz", + "integrity": "sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=", + "dev": true, + "requires": { + "core-util-is": "1.0.2", + "inherits": "2.0.3", + "isarray": "0.0.1", + "string_decoder": "0.10.31" + } + }, + "strip-ansi": { + "version": "0.3.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-0.3.0.tgz", + "integrity": "sha1-JfSOoiynkYfzF0pNuHWTR7sSYiA=", + "dev": true, + "requires": { + "ansi-regex": "0.2.1" + } + }, + "supports-color": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-0.2.0.tgz", + "integrity": "sha1-2S3iaU6z9nMjlz1649i1W0wiGQo=", + "dev": true + }, + "through2": { + "version": "0.6.5", + "resolved": "https://registry.npmjs.org/through2/-/through2-0.6.5.tgz", + "integrity": "sha1-QaucZ7KdVyCQcUEOHXp6lozTrUg=", + "dev": true, + "requires": { + "readable-stream": "1.0.34", + "xtend": "4.0.1" + } + }, + "wiredep": { + "version": "2.2.2", + "resolved": "https://registry.npmjs.org/wiredep/-/wiredep-2.2.2.tgz", + "integrity": "sha1-FETRirLkk3UEEJP+3d3Rto97ZrM=", + "dev": true, + "requires": { + "bower-config": "0.5.2", + "chalk": "0.5.1", + "glob": "4.5.3", + "lodash": "2.4.2", + "minimist": "1.2.0", + "propprop": "0.3.1", + "through2": "0.6.5" + } + } + } + }, + "kew": { + "version": "0.7.0", + "resolved": "https://registry.npmjs.org/kew/-/kew-0.7.0.tgz", + "integrity": "sha1-edk9LTM2PW/dKXCzNdkUGtWR15s=", + "dev": true + }, + "kind-of": { + "version": "3.2.2", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", + "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", + "requires": { + "is-buffer": "1.1.5" + } + }, + "klaw": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/klaw/-/klaw-2.0.0.tgz", + "integrity": "sha1-WcEo4Nxc5BAgEVEZTuucv4WGUPY=", + "dev": true, + "requires": { + "graceful-fs": "4.1.11" + } + }, + "lazy-cache": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/lazy-cache/-/lazy-cache-1.0.4.tgz", + "integrity": "sha1-odePw6UEdMuAhF07O24dpJpEbo4=" + }, + "lazy-req": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/lazy-req/-/lazy-req-1.1.0.tgz", + "integrity": "sha1-va6+rTD42CQDnODOFJ1Nqge6H6w=", + "dev": true + }, + "lazystream": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/lazystream/-/lazystream-1.0.0.tgz", + "integrity": "sha1-9plf4PggOS9hOWvolGJAe7dxaOQ=", + "dev": true, + "requires": { + "readable-stream": "2.3.3" + }, + "dependencies": { + "isarray": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", + "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=", + "dev": true + }, + "readable-stream": { + "version": "2.3.3", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.3.tgz", + "integrity": "sha512-m+qzzcn7KUxEmd1gMbchF+Y2eIUbieUaxkWtptyHywrX0rE8QEYqPC07Vuy4Wm32/xE16NcdBctb8S0Xe/5IeQ==", + "dev": true, + "requires": { + "core-util-is": "1.0.2", + "inherits": "2.0.3", + "isarray": "1.0.0", + "process-nextick-args": "1.0.7", + "safe-buffer": "5.1.1", + "string_decoder": "1.0.3", + "util-deprecate": "1.0.2" + } + }, + "string_decoder": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz", + "integrity": "sha512-4AH6Z5fzNNBcH+6XDMfA/BTt87skxqJlO0lAh3Dker5zThcAxG6mKz+iGu308UKoPPQ8Dcqx/4JhujzltRa+hQ==", + "dev": true, + "requires": { + "safe-buffer": "5.1.1" + } + } + } + }, + "lcid": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/lcid/-/lcid-1.0.0.tgz", + "integrity": "sha1-MIrMr6C8SDo4Z7S28rlQYlHRuDU=", + "requires": { + "invert-kv": "1.0.0" + } + }, + "levn": { + "version": "0.3.0", + "resolved": "https://registry.npmjs.org/levn/-/levn-0.3.0.tgz", + "integrity": "sha1-OwmSTt+fCDwEkP3UwLxEIeBHZO4=", + "dev": true, + "requires": { + "prelude-ls": "1.1.2", + "type-check": "0.3.2" + } + }, + "liftoff": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/liftoff/-/liftoff-2.3.0.tgz", + "integrity": "sha1-qY8v9nGD2Lp8+soQVIvX/wVQs4U=", + "requires": { + "extend": "3.0.1", + "findup-sync": "0.4.3", + "fined": "1.1.0", + "flagged-respawn": "0.3.2", + "lodash.isplainobject": "4.0.6", + "lodash.isstring": "4.0.1", + "lodash.mapvalues": "4.6.0", + "rechoir": "0.6.2", + "resolve": "1.4.0" + } + }, + "limiter": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/limiter/-/limiter-1.1.2.tgz", + "integrity": "sha512-JIKZ0xb6fZZYa3deZ0BgXCgX6HgV8Nx3mFGeFHmFWW8Fb2c08e0CyE+G3nalpD0xGvGssjGb1UdFr+PprxZEbw==", + "dev": true + }, + "load-json-file": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz", + "integrity": "sha1-lWkFcI1YtLq0wiYbBPWfMcmTdMA=", + "requires": { + "graceful-fs": "4.1.11", + "parse-json": "2.2.0", + "pify": "2.3.0", + "pinkie-promise": "2.0.1", + "strip-bom": "2.0.0" + }, + "dependencies": { + "strip-bom": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-2.0.0.tgz", + "integrity": "sha1-YhmoVhZSBJHzV4i9vxRHqZx+aw4=", + "requires": { + "is-utf8": "0.2.1" + } + } + } + }, + "localtunnel": { + "version": "1.8.3", + "resolved": "https://registry.npmjs.org/localtunnel/-/localtunnel-1.8.3.tgz", + "integrity": "sha1-3MWSL9hWUQN9S94k/ZMkjQsk6wU=", + "dev": true, + "requires": { + "debug": "2.6.8", + "openurl": "1.1.1", + "request": "2.81.0", + "yargs": "3.29.0" + }, + "dependencies": { + "camelcase": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-1.2.1.tgz", + "integrity": "sha1-m7UwTS4LVmmLLHWLCKPqqdqlijk=", + "dev": true + }, + "debug": { + "version": "2.6.8", + "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.8.tgz", + "integrity": "sha1-5zFTHKLt4n0YgiJCfaF4IdaP9Pw=", + "dev": true, + "requires": { + "ms": "2.0.0" + } + }, + "ms": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", + "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=", + "dev": true + }, + "window-size": { + "version": "0.1.4", + "resolved": "https://registry.npmjs.org/window-size/-/window-size-0.1.4.tgz", + "integrity": "sha1-+OGqHuWlPsW/FR/6CXQqatdpeHY=", + "dev": true + }, + "yargs": { + "version": "3.29.0", + "resolved": "https://registry.npmjs.org/yargs/-/yargs-3.29.0.tgz", + "integrity": "sha1-GquWYOrnnYuPZ1vK7qtu40ws9pw=", + "dev": true, + "requires": { + "camelcase": "1.2.1", + "cliui": "3.2.0", + "decamelize": "1.2.0", + "os-locale": "1.4.0", + "window-size": "0.1.4", + "y18n": "3.2.1" + } + } + } + }, + "lodash": { + "version": "4.17.4", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.4.tgz", + "integrity": "sha1-eCA6TRwyiuHYbcpkYONptX9AVa4=" + }, + "lodash._baseassign": { + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/lodash._baseassign/-/lodash._baseassign-3.2.0.tgz", + "integrity": "sha1-jDigmVAPIVrQnlnxci/QxSv+Ck4=", + "requires": { + "lodash._basecopy": "3.0.1", + "lodash.keys": "3.1.2" + } + }, + "lodash._basecopy": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/lodash._basecopy/-/lodash._basecopy-3.0.1.tgz", + "integrity": "sha1-jaDmqHbPNEwK2KVIghEd08XHyjY=" + }, + "lodash._basetostring": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/lodash._basetostring/-/lodash._basetostring-3.0.1.tgz", + "integrity": "sha1-0YYdh3+CSlL2aYMtyvPuFVZqB9U=" + }, + "lodash._basevalues": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/lodash._basevalues/-/lodash._basevalues-3.0.0.tgz", + "integrity": "sha1-W3dXYoAr3j0yl1A+JjAIIP32Ybc=" + }, + "lodash._bindcallback": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/lodash._bindcallback/-/lodash._bindcallback-3.0.1.tgz", + "integrity": "sha1-5THCdkTPi1epnhftlbNcdIeJOS4=" + }, + "lodash._createassigner": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/lodash._createassigner/-/lodash._createassigner-3.1.1.tgz", + "integrity": "sha1-g4pbri/aymOsIt7o4Z+k5taXCxE=", + "requires": { + "lodash._bindcallback": "3.0.1", + "lodash._isiterateecall": "3.0.9", + "lodash.restparam": "3.6.1" + } + }, + "lodash._escapehtmlchar": { + "version": "2.4.1", + "resolved": "https://registry.npmjs.org/lodash._escapehtmlchar/-/lodash._escapehtmlchar-2.4.1.tgz", + "integrity": "sha1-32fDu2t+jh6DGrSL+geVuSr+iZ0=", + "requires": { + "lodash._htmlescapes": "2.4.1" + } + }, + "lodash._escapestringchar": { + "version": "2.4.1", + "resolved": "https://registry.npmjs.org/lodash._escapestringchar/-/lodash._escapestringchar-2.4.1.tgz", + "integrity": "sha1-7P4iYYoq3lC/7qQ5N+Ud9m8O23I=" + }, + "lodash._getnative": { + "version": "3.9.1", + "resolved": "https://registry.npmjs.org/lodash._getnative/-/lodash._getnative-3.9.1.tgz", + "integrity": "sha1-VwvH3t5G1hzc3mh9ZdPuy6o6r/U=" + }, + "lodash._htmlescapes": { + "version": "2.4.1", + "resolved": "https://registry.npmjs.org/lodash._htmlescapes/-/lodash._htmlescapes-2.4.1.tgz", + "integrity": "sha1-MtFL8IRLbeb4tioFG09nwii2JMs=" + }, + "lodash._isiterateecall": { + "version": "3.0.9", + "resolved": "https://registry.npmjs.org/lodash._isiterateecall/-/lodash._isiterateecall-3.0.9.tgz", + "integrity": "sha1-UgOte6Ql+uhCRg5pbbnPPmqsBXw=" + }, + "lodash._isnative": { + "version": "2.4.1", + "resolved": "https://registry.npmjs.org/lodash._isnative/-/lodash._isnative-2.4.1.tgz", + "integrity": "sha1-PqZAS3hKe+g2x7V1gOHN95sUgyw=" + }, + "lodash._objecttypes": { + "version": "2.4.1", + "resolved": "https://registry.npmjs.org/lodash._objecttypes/-/lodash._objecttypes-2.4.1.tgz", + "integrity": "sha1-fAt/admKH3ZSn4kLDNsbTf7BHBE=" + }, + "lodash._reescape": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/lodash._reescape/-/lodash._reescape-3.0.0.tgz", + "integrity": "sha1-Kx1vXf4HyKNVdT5fJ/rH8c3hYWo=" + }, + "lodash._reevaluate": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/lodash._reevaluate/-/lodash._reevaluate-3.0.0.tgz", + "integrity": "sha1-WLx0xAZklTrgsSTYBpltrKQx4u0=" + }, + "lodash._reinterpolate": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/lodash._reinterpolate/-/lodash._reinterpolate-3.0.0.tgz", + "integrity": "sha1-DM8tiRZq8Ds2Y8eWU4t1rG4RTZ0=" + }, + "lodash._reunescapedhtml": { + "version": "2.4.1", + "resolved": "https://registry.npmjs.org/lodash._reunescapedhtml/-/lodash._reunescapedhtml-2.4.1.tgz", + "integrity": "sha1-dHxPxAED6zu4oJduVx96JlnpO6c=", + "requires": { + "lodash._htmlescapes": "2.4.1", + "lodash.keys": "2.4.1" + }, + "dependencies": { + "lodash.keys": { + "version": "2.4.1", + "resolved": "https://registry.npmjs.org/lodash.keys/-/lodash.keys-2.4.1.tgz", + "integrity": "sha1-SN6kbfj/djKxDXBrissmWR4rNyc=", + "requires": { + "lodash._isnative": "2.4.1", + "lodash._shimkeys": "2.4.1", + "lodash.isobject": "2.4.1" + } + } + } + }, + "lodash._root": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/lodash._root/-/lodash._root-3.0.1.tgz", + "integrity": "sha1-+6HEUkwZ7ppfgTa0YJ8BfPTe1pI=" + }, + "lodash._shimkeys": { + "version": "2.4.1", + "resolved": "https://registry.npmjs.org/lodash._shimkeys/-/lodash._shimkeys-2.4.1.tgz", + "integrity": "sha1-bpzJZm/wgfC1psl4uD4kLmlJ0gM=", + "requires": { + "lodash._objecttypes": "2.4.1" + } + }, + "lodash.assign": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/lodash.assign/-/lodash.assign-4.2.0.tgz", + "integrity": "sha1-DZnzzNem0mHRm9rrkkUAXShYCOc=" + }, + "lodash.clonedeep": { + "version": "4.5.0", + "resolved": "https://registry.npmjs.org/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz", + "integrity": "sha1-4j8/nE+Pvd6HJSnBBxhXoIblzO8=" + }, + "lodash.defaults": { + "version": "2.4.1", + "resolved": "https://registry.npmjs.org/lodash.defaults/-/lodash.defaults-2.4.1.tgz", + "integrity": "sha1-p+iIXwXmiFEUS24SqPNngCa8TFQ=", + "requires": { + "lodash._objecttypes": "2.4.1", + "lodash.keys": "2.4.1" + }, + "dependencies": { + "lodash.keys": { + "version": "2.4.1", + "resolved": "https://registry.npmjs.org/lodash.keys/-/lodash.keys-2.4.1.tgz", + "integrity": "sha1-SN6kbfj/djKxDXBrissmWR4rNyc=", + "requires": { + "lodash._isnative": "2.4.1", + "lodash._shimkeys": "2.4.1", + "lodash.isobject": "2.4.1" + } + } + } + }, + "lodash.escape": { + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/lodash.escape/-/lodash.escape-3.2.0.tgz", + "integrity": "sha1-mV7g3BjBtIzJLv+ucaEKq1tIdpg=", + "requires": { + "lodash._root": "3.0.1" + } + }, + "lodash.isarguments": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/lodash.isarguments/-/lodash.isarguments-3.1.0.tgz", + "integrity": "sha1-L1c9hcaiQon/AGY7SRwdM4/zRYo=" + }, + "lodash.isarray": { + "version": "3.0.4", + "resolved": "https://registry.npmjs.org/lodash.isarray/-/lodash.isarray-3.0.4.tgz", + "integrity": "sha1-eeTriMNqgSKvhvhEqpvNhRtfu1U=" + }, + "lodash.isequal": { + "version": "4.5.0", + "resolved": "https://registry.npmjs.org/lodash.isequal/-/lodash.isequal-4.5.0.tgz", + "integrity": "sha1-QVxEePK8wwEgwizhDtMib30+GOA=", + "dev": true + }, + "lodash.isfinite": { + "version": "3.3.2", + "resolved": "https://registry.npmjs.org/lodash.isfinite/-/lodash.isfinite-3.3.2.tgz", + "integrity": "sha1-+4m2WpqAKBgz8LdHizpRBPiY67M=", + "dev": true + }, + "lodash.isobject": { + "version": "2.4.1", + "resolved": "https://registry.npmjs.org/lodash.isobject/-/lodash.isobject-2.4.1.tgz", + "integrity": "sha1-Wi5H/mmVPx7mMafrof5k0tBlWPU=", + "requires": { + "lodash._objecttypes": "2.4.1" + } + }, + "lodash.isplainobject": { + "version": "4.0.6", + "resolved": "https://registry.npmjs.org/lodash.isplainobject/-/lodash.isplainobject-4.0.6.tgz", + "integrity": "sha1-fFJqUtibRcRcxpC4gWO+BJf1UMs=" + }, + "lodash.isstring": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/lodash.isstring/-/lodash.isstring-4.0.1.tgz", + "integrity": "sha1-1SfftUVuynzJu5XV2ur4i6VKVFE=" + }, + "lodash.keys": { + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/lodash.keys/-/lodash.keys-3.1.2.tgz", + "integrity": "sha1-TbwEcrFWvlCgsoaFXRvQsMZWCYo=", + "requires": { + "lodash._getnative": "3.9.1", + "lodash.isarguments": "3.1.0", + "lodash.isarray": "3.0.4" + } + }, + "lodash.mapvalues": { + "version": "4.6.0", + "resolved": "https://registry.npmjs.org/lodash.mapvalues/-/lodash.mapvalues-4.6.0.tgz", + "integrity": "sha1-G6+lAF3p3W9PJmaMMMo3IwzJaJw=" + }, + "lodash.mergewith": { + "version": "4.6.0", + "resolved": "https://registry.npmjs.org/lodash.mergewith/-/lodash.mergewith-4.6.0.tgz", + "integrity": "sha1-FQzwoWeR9ZA7iJHqsVRgknS96lU=" + }, + "lodash.restparam": { + "version": "3.6.1", + "resolved": "https://registry.npmjs.org/lodash.restparam/-/lodash.restparam-3.6.1.tgz", + "integrity": "sha1-k2pOMJ7zMKdkXtQUWYbIWuWyCAU=" + }, + "lodash.template": { + "version": "3.6.2", + "resolved": "https://registry.npmjs.org/lodash.template/-/lodash.template-3.6.2.tgz", + "integrity": "sha1-+M3sxhaaJVvpCYrosMU9N4kx0U8=", + "requires": { + "lodash._basecopy": "3.0.1", + "lodash._basetostring": "3.0.1", + "lodash._basevalues": "3.0.0", + "lodash._isiterateecall": "3.0.9", + "lodash._reinterpolate": "3.0.0", + "lodash.escape": "3.2.0", + "lodash.keys": "3.1.2", + "lodash.restparam": "3.6.1", + "lodash.templatesettings": "3.1.1" + } + }, + "lodash.templatesettings": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/lodash.templatesettings/-/lodash.templatesettings-3.1.1.tgz", + "integrity": "sha1-+zB4RHU7Zrnxr6VOJix0UwfbqOU=", + "requires": { + "lodash._reinterpolate": "3.0.0", + "lodash.escape": "3.2.0" + } + }, + "lodash.values": { + "version": "2.4.1", + "resolved": "https://registry.npmjs.org/lodash.values/-/lodash.values-2.4.1.tgz", + "integrity": "sha1-q/UUQ2s8twUAFieXjLzzCxKA7qQ=", + "requires": { + "lodash.keys": "2.4.1" + }, + "dependencies": { + "lodash.keys": { + "version": "2.4.1", + "resolved": "https://registry.npmjs.org/lodash.keys/-/lodash.keys-2.4.1.tgz", + "integrity": "sha1-SN6kbfj/djKxDXBrissmWR4rNyc=", + "requires": { + "lodash._isnative": "2.4.1", + "lodash._shimkeys": "2.4.1", + "lodash.isobject": "2.4.1" + } + } + } + }, + "log4js": { + "version": "0.6.38", + "resolved": "https://registry.npmjs.org/log4js/-/log4js-0.6.38.tgz", + "integrity": "sha1-LElBFmldb7JUgJQ9P8hy5mKlIv0=", + "dev": true, + "requires": { + "readable-stream": "1.0.34", + "semver": "4.3.6" + }, + "dependencies": { + "readable-stream": { + "version": "1.0.34", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz", + "integrity": "sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=", + "dev": true, + "requires": { + "core-util-is": "1.0.2", + "inherits": "2.0.3", + "isarray": "0.0.1", + "string_decoder": "0.10.31" + } + } + } + }, + "logalot": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/logalot/-/logalot-2.1.0.tgz", + "integrity": "sha1-X46MkNME7fElMJUaVVSruMXj9VI=", + "dev": true, + "requires": { + "figures": "1.7.0", + "squeak": "1.3.0" + } + }, + "longest": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/longest/-/longest-1.0.1.tgz", + "integrity": "sha1-MKCy2jj3N3DoKUoNIuZiXtd9AJc=" + }, + "loud-rejection": { + "version": "1.6.0", + "resolved": "https://registry.npmjs.org/loud-rejection/-/loud-rejection-1.6.0.tgz", + "integrity": "sha1-W0b4AUft7leIcPCG0Eghz5mOVR8=", + "requires": { + "currently-unhandled": "0.4.1", + "signal-exit": "3.0.2" + } + }, + "lowercase-keys": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-1.0.0.tgz", + "integrity": "sha1-TjNms55/VFfjXxMkvfb4jQv8cwY=", + "dev": true + }, + "lpad-align": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/lpad-align/-/lpad-align-1.1.2.tgz", + "integrity": "sha1-IfYArBwwlcPG5JfuZyce4ISB/p4=", + "dev": true, + "requires": { + "get-stdin": "4.0.1", + "indent-string": "2.1.0", + "longest": "1.0.1", + "meow": "3.7.0" + } + }, + "lru-cache": { + "version": "2.7.3", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.7.3.tgz", + "integrity": "sha1-bUUk6LlV+V1PW1iFHOId1y+06VI=" + }, + "make-dir": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-1.0.0.tgz", + "integrity": "sha1-l6ARdR6R3YfPre9Ygy67BJNt6Xg=", + "dev": true, + "requires": { + "pify": "2.3.0" + } + }, + "make-error": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/make-error/-/make-error-1.3.0.tgz", + "integrity": "sha1-Uq06M5zPEM5itAQLcI/nByRLi5Y=" + }, + "make-error-cause": { + "version": "1.2.2", + "resolved": "https://registry.npmjs.org/make-error-cause/-/make-error-cause-1.2.2.tgz", + "integrity": "sha1-3wOI/NCzeBbf8KX7gQiTl3fcvJ0=", + "requires": { + "make-error": "1.3.0" + } + }, + "map-cache": { + "version": "0.2.2", + "resolved": "https://registry.npmjs.org/map-cache/-/map-cache-0.2.2.tgz", + "integrity": "sha1-wyq9C9ZSXZsFFkW7TyasXcmKDb8=" + }, + "map-obj": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/map-obj/-/map-obj-1.0.1.tgz", + "integrity": "sha1-2TPOuSBdgr3PSIb2dCvcK03qFG0=" + }, + "map-stream": { + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/map-stream/-/map-stream-0.1.0.tgz", + "integrity": "sha1-5WqpTEyAVaFkBKBnS3jyFffI4ZQ=" + }, + "marked": { + "version": "0.3.6", + "resolved": "https://registry.npmjs.org/marked/-/marked-0.3.6.tgz", + "integrity": "sha1-ssbGGPzOzk74bE/Gy4p8v1rtqNc=", + "dev": true + }, + "matched": { + "version": "0.4.4", + "resolved": "https://registry.npmjs.org/matched/-/matched-0.4.4.tgz", + "integrity": "sha1-Vte36xgDPwz5vFLrIJD6x9weifo=", + "requires": { + "arr-union": "3.1.0", + "async-array-reduce": "0.2.1", + "extend-shallow": "2.0.1", + "fs-exists-sync": "0.1.0", + "glob": "7.1.2", + "has-glob": "0.1.1", + "is-valid-glob": "0.3.0", + "lazy-cache": "2.0.2", + "resolve-dir": "0.1.1" + }, + "dependencies": { + "lazy-cache": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/lazy-cache/-/lazy-cache-2.0.2.tgz", + "integrity": "sha1-uRkKT5EzVGlIQIWfio9whNiCImQ=", + "requires": { + "set-getter": "0.1.0" + } + } + } + }, + "media-typer": { + "version": "0.3.0", + "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz", + "integrity": "sha1-hxDXrwqmJvj/+hzgAWhUUmMlV0g=", + "dev": true + }, + "meow": { + "version": "3.7.0", + "resolved": "https://registry.npmjs.org/meow/-/meow-3.7.0.tgz", + "integrity": "sha1-cstmi0JSKCkKu/qFaJJYcwioAfs=", + "requires": { + "camelcase-keys": "2.1.0", + "decamelize": "1.2.0", + "loud-rejection": "1.6.0", + "map-obj": "1.0.1", + "minimist": "1.2.0", + "normalize-package-data": "2.4.0", + "object-assign": "4.1.1", + "read-pkg-up": "1.0.1", + "redent": "1.0.0", + "trim-newlines": "1.0.0" + }, + "dependencies": { + "object-assign": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz", + "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=" + } + } + }, + "merge": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/merge/-/merge-1.2.0.tgz", + "integrity": "sha1-dTHjnUlJwoGma4xabgJl6LBYlNo=" + }, + "merge-descriptors": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.1.tgz", + "integrity": "sha1-sAqqVW3YtEVoFQ7J0blT8/kMu2E=", + "dev": true + }, + "merge-dirs": { + "version": "0.2.1", + "resolved": "https://registry.npmjs.org/merge-dirs/-/merge-dirs-0.2.1.tgz", + "integrity": "sha1-IeZIssawJhcSUJ5N82wkJHcxYMk=", + "requires": { + "inquirer": "0.11.4", + "minimist": "1.2.0", + "node-fs": "0.1.7", + "path": "0.12.7" + } + }, + "merge-stream": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-1.0.1.tgz", + "integrity": "sha1-QEEgLVCKNCugAXQAjfDCUbjBNeE=", + "requires": { + "readable-stream": "2.3.3" + }, + "dependencies": { + "isarray": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", + "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=" + }, + "readable-stream": { + "version": "2.3.3", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.3.tgz", + "integrity": "sha512-m+qzzcn7KUxEmd1gMbchF+Y2eIUbieUaxkWtptyHywrX0rE8QEYqPC07Vuy4Wm32/xE16NcdBctb8S0Xe/5IeQ==", + "requires": { + "core-util-is": "1.0.2", + "inherits": "2.0.3", + "isarray": "1.0.0", + "process-nextick-args": "1.0.7", + "safe-buffer": "5.1.1", + "string_decoder": "1.0.3", + "util-deprecate": "1.0.2" + } + }, + "string_decoder": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz", + "integrity": "sha512-4AH6Z5fzNNBcH+6XDMfA/BTt87skxqJlO0lAh3Dker5zThcAxG6mKz+iGu308UKoPPQ8Dcqx/4JhujzltRa+hQ==", + "requires": { + "safe-buffer": "5.1.1" + } + } + } + }, + "methods": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz", + "integrity": "sha1-VSmk1nZUE07cxSZmVoNbD4Ua/O4=", + "dev": true + }, + "micromatch": { + "version": "2.3.11", + "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-2.3.11.tgz", + "integrity": "sha1-hmd8l9FyCzY0MdBNDRUpO9OMFWU=", + "requires": { + "arr-diff": "2.0.0", + "array-unique": "0.2.1", + "braces": "1.8.5", + "expand-brackets": "0.1.5", + "extglob": "0.3.2", + "filename-regex": "2.0.1", + "is-extglob": "1.0.0", + "is-glob": "2.0.1", + "kind-of": "3.2.2", + "normalize-path": "2.1.1", + "object.omit": "2.0.1", + "parse-glob": "3.0.4", + "regex-cache": "0.4.3" + } + }, + "mime": { + "version": "1.2.4", + "resolved": "https://registry.npmjs.org/mime/-/mime-1.2.4.tgz", + "integrity": "sha1-EbX9rynCUJJVF2uArVIClPXekrc=", + "dev": true + }, + "mime-db": { + "version": "1.29.0", + "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.29.0.tgz", + "integrity": "sha1-SNJtI1WJZRcErFkWygYAGRQmaHg=" + }, + "mime-types": { + "version": "2.1.16", + "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.16.tgz", + "integrity": "sha1-K4WKUuXs1RbbiXrCvodIeDBpjiM=", + "requires": { + "mime-db": "1.29.0" + } + }, + "mimic-fn": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-1.1.0.tgz", + "integrity": "sha1-5md4PZLonb00KBi1IwudYqZyrRg=", + "dev": true + }, + "minimatch": { + "version": "3.0.4", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz", + "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==", + "requires": { + "brace-expansion": "1.1.8" + } + }, + "minimist": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz", + "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=" + }, + "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" + }, + "dependencies": { + "minimist": { + "version": "0.0.8", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz", + "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=" + } + } + }, + "mktemp": { + "version": "0.4.0", + "resolved": "https://registry.npmjs.org/mktemp/-/mktemp-0.4.0.tgz", + "integrity": "sha1-bQUVYRyKjITkhKogABKbmOmB/ws=" + }, + "mout": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/mout/-/mout-1.0.0.tgz", + "integrity": "sha1-m98dSvV9ZtR8s1OmM1oygQmOFQE=" + }, + "ms": { + "version": "0.7.1", + "resolved": "https://registry.npmjs.org/ms/-/ms-0.7.1.tgz", + "integrity": "sha1-nNE8A62/8ltl7/3nzoZO6VIBcJg=", + "dev": true + }, + "multipipe": { + "version": "0.1.2", + "resolved": "https://registry.npmjs.org/multipipe/-/multipipe-0.1.2.tgz", + "integrity": "sha1-Ko8t33Du1WTf8tV/HhoTfZ8FB4s=", + "requires": { + "duplexer2": "0.0.2" + } + }, + "mute-stream": { + "version": "0.0.5", + "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.5.tgz", + "integrity": "sha1-j7+rsKmKJT0xhDMfno3rc3L6xsA=" + }, + "nan": { + "version": "2.6.2", + "resolved": "https://registry.npmjs.org/nan/-/nan-2.6.2.tgz", + "integrity": "sha1-5P805slf37WuzAjeZZb0NgWn20U=" + }, + "natives": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/natives/-/natives-1.1.0.tgz", + "integrity": "sha1-6f+EFBimsux6SV6TmYT3jxY+bjE=" + }, + "natural-compare": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz", + "integrity": "sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc=", + "dev": true + }, + "negotiator": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.1.tgz", + "integrity": "sha1-KzJxhOiZIQEXeyhWP7XnECrNDKk=", + "dev": true + }, + "ng-annotate": { + "version": "1.2.2", + "resolved": "https://registry.npmjs.org/ng-annotate/-/ng-annotate-1.2.2.tgz", + "integrity": "sha1-3D/FG6Cy+LOF2+BH9NoG9YCh/WE=", + "requires": { + "acorn": "2.6.4", + "alter": "0.2.0", + "convert-source-map": "1.1.3", + "optimist": "0.6.1", + "ordered-ast-traverse": "1.1.1", + "simple-fmt": "0.1.0", + "simple-is": "0.2.0", + "source-map": "0.5.6", + "stable": "0.1.6", + "stringmap": "0.2.2", + "stringset": "0.2.1", + "tryor": "0.1.2" + } + }, + "ng-dependencies": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/ng-dependencies/-/ng-dependencies-0.2.0.tgz", + "integrity": "sha1-GTtb3KVMOG4BB2Uw9Pq3jHKoxcw=", + "requires": { + "esprima": "1.2.5", + "estraverse": "1.9.3", + "lodash": "3.10.1" + }, + "dependencies": { + "lodash": { + "version": "3.10.1", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-3.10.1.tgz", + "integrity": "sha1-W/Rejkm6QYnhfUgnid/RW9FAt7Y=" + } + } + }, + "node-fs": { + "version": "0.1.7", + "resolved": "https://registry.npmjs.org/node-fs/-/node-fs-0.1.7.tgz", + "integrity": "sha1-MjI8zLRsn78PwRgS1FAhzDHTJbs=" + }, + "node-gyp": { + "version": "3.6.2", + "resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-3.6.2.tgz", + "integrity": "sha1-m/vlRWIoYoSDjnUOrAUpWFP6HGA=", + "requires": { + "fstream": "1.0.11", + "glob": "7.1.2", + "graceful-fs": "4.1.11", + "minimatch": "3.0.4", + "mkdirp": "0.5.1", + "nopt": "3.0.6", + "npmlog": "4.1.2", + "osenv": "0.1.4", + "request": "2.81.0", + "rimraf": "2.6.1", + "semver": "5.3.0", + "tar": "2.2.1", + "which": "1.3.0" + }, + "dependencies": { + "semver": { + "version": "5.3.0", + "resolved": "https://registry.npmjs.org/semver/-/semver-5.3.0.tgz", + "integrity": "sha1-myzl094C0XxgEq0yaqa00M9U+U8=" + } + } + }, + "node-sass": { + "version": "4.5.3", + "resolved": "https://registry.npmjs.org/node-sass/-/node-sass-4.5.3.tgz", + "integrity": "sha1-0JydEXlkEjnRuX/8YjH9zsU+FWg=", + "requires": { + "async-foreach": "0.1.3", + "chalk": "1.1.3", + "cross-spawn": "3.0.1", + "gaze": "1.1.2", + "get-stdin": "4.0.1", + "glob": "7.1.2", + "in-publish": "2.0.0", + "lodash.assign": "4.2.0", + "lodash.clonedeep": "4.5.0", + "lodash.mergewith": "4.6.0", + "meow": "3.7.0", + "mkdirp": "0.5.1", + "nan": "2.6.2", + "node-gyp": "3.6.2", + "npmlog": "4.1.2", + "request": "2.81.0", + "sass-graph": "2.2.4", + "stdout-stream": "1.4.0" + }, + "dependencies": { + "gaze": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/gaze/-/gaze-1.1.2.tgz", + "integrity": "sha1-hHIkZ3rbiHDWeSV+0ziP22HkAQU=", + "requires": { + "globule": "1.2.0" + } + }, + "globule": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/globule/-/globule-1.2.0.tgz", + "integrity": "sha1-HcScaCLdnoovoAuiopUAboZkvQk=", + "requires": { + "glob": "7.1.2", + "lodash": "4.17.4", + "minimatch": "3.0.4" + } + } + } + }, + "node-status-codes": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/node-status-codes/-/node-status-codes-1.0.0.tgz", + "integrity": "sha1-WuVUHQJGRdMqWPzdyc7s6nrjrC8=", + "dev": true + }, + "nopt": { + "version": "3.0.6", + "resolved": "https://registry.npmjs.org/nopt/-/nopt-3.0.6.tgz", + "integrity": "sha1-xkZdvwirzU2zWTF/eaxopkayj/k=", + "requires": { + "abbrev": "1.1.0" + } + }, + "normalize-package-data": { + "version": "2.4.0", + "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.4.0.tgz", + "integrity": "sha512-9jjUFbTPfEy3R/ad/2oNbKtW9Hgovl5O1FvFWKkKblNXoN/Oou6+9+KKohPK13Yc3/TyunyWhJp6gvRNR/PPAw==", + "requires": { + "hosted-git-info": "2.5.0", + "is-builtin-module": "1.0.0", + "semver": "4.3.6", + "validate-npm-package-license": "3.0.1" + } + }, + "normalize-path": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz", + "integrity": "sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=", + "requires": { + "remove-trailing-separator": "1.0.2" + } + }, + "normalize-range": { + "version": "0.1.2", + "resolved": "https://registry.npmjs.org/normalize-range/-/normalize-range-0.1.2.tgz", + "integrity": "sha1-LRDAa9/TEuqXd2laTShDlFa3WUI=" + }, + "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.1" + } + }, + "npmlog": { + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-4.1.2.tgz", + "integrity": "sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg==", + "requires": { + "are-we-there-yet": "1.1.4", + "console-control-strings": "1.1.0", + "gauge": "2.7.4", + "set-blocking": "2.0.0" + } + }, + "null-check": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/null-check/-/null-check-1.0.0.tgz", + "integrity": "sha1-l33/1xdgErnsMNKjnbXPcqBDnt0=", + "dev": true + }, + "num2fraction": { + "version": "1.2.2", + "resolved": "https://registry.npmjs.org/num2fraction/-/num2fraction-1.2.2.tgz", + "integrity": "sha1-b2gragJ6Tp3fpFZM0lidHU5mnt4=" + }, + "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=" + }, + "oauth-sign": { + "version": "0.8.2", + "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.8.2.tgz", + "integrity": "sha1-Rqarfwrq2N6unsBWV4C31O/rnUM=" + }, + "object-assign": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-3.0.0.tgz", + "integrity": "sha1-m+3VygiXlJvKR+f/QIBi1Un1h/I=" + }, + "object-component": { + "version": "0.0.3", + "resolved": "https://registry.npmjs.org/object-component/-/object-component-0.0.3.tgz", + "integrity": "sha1-8MaapQ78lbhmwYb0AKM3acsvEpE=", + "dev": true + }, + "object-keys": { + "version": "0.4.0", + "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-0.4.0.tgz", + "integrity": "sha1-KKaq50KN0sOpLz2V8hM13SBOAzY=" + }, + "object-path": { + "version": "0.9.2", + "resolved": "https://registry.npmjs.org/object-path/-/object-path-0.9.2.tgz", + "integrity": "sha1-D9mnT8X60a45aLWGvaXGMr1sBaU=", + "dev": true + }, + "object.defaults": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/object.defaults/-/object.defaults-1.1.0.tgz", + "integrity": "sha1-On+GgzS0B96gbaFtiNXNKeQ1/s8=", + "requires": { + "array-each": "1.0.1", + "array-slice": "1.0.0", + "for-own": "1.0.0", + "isobject": "3.0.1" + }, + "dependencies": { + "for-own": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/for-own/-/for-own-1.0.0.tgz", + "integrity": "sha1-xjMy9BXO3EsE2/5wz4NklMU8tEs=", + "requires": { + "for-in": "1.0.2" + } + }, + "isobject": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz", + "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=" + } + } + }, + "object.omit": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/object.omit/-/object.omit-2.0.1.tgz", + "integrity": "sha1-Gpx0SCnznbuFjHbKNXmuKlTr0fo=", + "requires": { + "for-own": "0.1.5", + "is-extendable": "0.1.1" + } + }, + "object.pick": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/object.pick/-/object.pick-1.2.0.tgz", + "integrity": "sha1-tTkr7peC2m2ft9avr1OXefEjTCs=", + "requires": { + "isobject": "2.1.0" + } + }, + "on-finished": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.3.0.tgz", + "integrity": "sha1-IPEzZIGwg811M3mSoWlxqi2QaUc=", + "dev": true, + "requires": { + "ee-first": "1.1.1" + } + }, + "once": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", + "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=", + "requires": { + "wrappy": "1.0.2" + } + }, + "onetime": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/onetime/-/onetime-1.1.0.tgz", + "integrity": "sha1-ofeDj4MUxRbwXs78vEzP4EtO14k=" + }, + "openurl": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/openurl/-/openurl-1.1.1.tgz", + "integrity": "sha1-OHW0sO96UsFW8NtB1GCduw+Us4c=", + "dev": true + }, + "opn": { + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/opn/-/opn-4.0.2.tgz", + "integrity": "sha1-erwi5kTf9jsKltWrfyeQwPAavJU=", + "dev": true, + "requires": { + "object-assign": "4.1.1", + "pinkie-promise": "2.0.1" + }, + "dependencies": { + "object-assign": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz", + "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=", + "dev": true + } + } + }, + "optimist": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/optimist/-/optimist-0.6.1.tgz", + "integrity": "sha1-2j6nRob6IaGaERwybpDrFaAZZoY=", + "requires": { + "minimist": "0.0.10", + "wordwrap": "0.0.3" + }, + "dependencies": { + "minimist": { + "version": "0.0.10", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.10.tgz", + "integrity": "sha1-3j+YVD2/lggr5IrRoMfNqDYwHc8=" + } + } + }, + "optionator": { + "version": "0.8.2", + "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.8.2.tgz", + "integrity": "sha1-NkxeQJ0/TWMB1sC0wFu6UBgK62Q=", + "dev": true, + "requires": { + "deep-is": "0.1.3", + "fast-levenshtein": "2.0.6", + "levn": "0.3.0", + "prelude-ls": "1.1.2", + "type-check": "0.3.2", + "wordwrap": "1.0.0" + }, + "dependencies": { + "wordwrap": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-1.0.0.tgz", + "integrity": "sha1-J1hIEIkUVqQXHI0CJkQa3pDLyus=", + "dev": true + } + } + }, + "options": { + "version": "0.0.6", + "resolved": "https://registry.npmjs.org/options/-/options-0.0.6.tgz", + "integrity": "sha1-7CLTEoBrtT5zF3Pnza788cZDEo8=", + "dev": true + }, + "orchestrator": { + "version": "0.3.8", + "resolved": "https://registry.npmjs.org/orchestrator/-/orchestrator-0.3.8.tgz", + "integrity": "sha1-FOfp4nZPcxX7rBhOUGx6pt+UrX4=", + "requires": { + "end-of-stream": "0.1.5", + "sequencify": "0.0.7", + "stream-consume": "0.1.0" + } + }, + "ordered-ast-traverse": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/ordered-ast-traverse/-/ordered-ast-traverse-1.1.1.tgz", + "integrity": "sha1-aEOhcLwO7otSDMjdwd3TqjD6BXw=", + "requires": { + "ordered-esprima-props": "1.1.0" + } + }, + "ordered-esprima-props": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/ordered-esprima-props/-/ordered-esprima-props-1.1.0.tgz", + "integrity": "sha1-qYJwht9fAQqmDpvQK24DNc6i/8s=" + }, + "ordered-read-streams": { + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/ordered-read-streams/-/ordered-read-streams-0.1.0.tgz", + "integrity": "sha1-/VZamvjrRHO6abbtijQ1LLVS8SY=" + }, + "os-filter-obj": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/os-filter-obj/-/os-filter-obj-1.0.3.tgz", + "integrity": "sha1-WRUzDZDs7VV9LZOKMcbdIU2cY60=", + "dev": true + }, + "os-homedir": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz", + "integrity": "sha1-/7xJiDNuDoM94MFox+8VISGqf7M=" + }, + "os-locale": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/os-locale/-/os-locale-1.4.0.tgz", + "integrity": "sha1-IPnxeuKe00XoveWDsT0gCYA8FNk=", + "requires": { + "lcid": "1.0.0" + } + }, + "os-tmpdir": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz", + "integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=" + }, + "osenv": { + "version": "0.1.4", + "resolved": "https://registry.npmjs.org/osenv/-/osenv-0.1.4.tgz", + "integrity": "sha1-Qv5tWVPfBsgGS+bxdsPQWqqjRkQ=", + "requires": { + "os-homedir": "1.0.2", + "os-tmpdir": "1.0.2" + } + }, + "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-pipe": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/p-pipe/-/p-pipe-1.2.0.tgz", + "integrity": "sha1-SxoROZoRUgpneQ7loMHViB1r7+k=", + "dev": true + }, + "parse-filepath": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/parse-filepath/-/parse-filepath-1.0.1.tgz", + "integrity": "sha1-FZ1hVdQ5BNFsEO9piRHaHpGWm3M=", + "requires": { + "is-absolute": "0.2.6", + "map-cache": "0.2.2", + "path-root": "0.1.1" + } + }, + "parse-glob": { + "version": "3.0.4", + "resolved": "https://registry.npmjs.org/parse-glob/-/parse-glob-3.0.4.tgz", + "integrity": "sha1-ssN2z7EfNVE7rdFz7wu246OIORw=", + "requires": { + "glob-base": "0.3.0", + "is-dotfile": "1.0.3", + "is-extglob": "1.0.0", + "is-glob": "2.0.1" + } + }, + "parse-json": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-2.2.0.tgz", + "integrity": "sha1-9ID0BDTvgHQfhGkJn43qGPVaTck=", + "requires": { + "error-ex": "1.3.1" + } + }, + "parse-passwd": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/parse-passwd/-/parse-passwd-1.0.0.tgz", + "integrity": "sha1-bVuTSkVpk7I9N/QKOC1vFmao5cY=" + }, + "parsejson": { + "version": "0.0.3", + "resolved": "https://registry.npmjs.org/parsejson/-/parsejson-0.0.3.tgz", + "integrity": "sha1-q343WfIJ7OmUN5c/fQ8fZK4OZKs=", + "dev": true, + "requires": { + "better-assert": "1.0.2" + } + }, + "parseqs": { + "version": "0.0.5", + "resolved": "https://registry.npmjs.org/parseqs/-/parseqs-0.0.5.tgz", + "integrity": "sha1-1SCKNzjkZ2bikbouoXNoSSGouJ0=", + "dev": true, + "requires": { + "better-assert": "1.0.2" + } + }, + "parseuri": { + "version": "0.0.5", + "resolved": "https://registry.npmjs.org/parseuri/-/parseuri-0.0.5.tgz", + "integrity": "sha1-gCBKUNTbt3m/3G6+J3jZDkvOMgo=", + "dev": true, + "requires": { + "better-assert": "1.0.2" + } + }, + "parseurl": { + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.1.tgz", + "integrity": "sha1-yKuMkiO6NIiKpkopeyiFO+wY2lY=", + "dev": true + }, + "path": { + "version": "0.12.7", + "resolved": "https://registry.npmjs.org/path/-/path-0.12.7.tgz", + "integrity": "sha1-1NwqUGxM4hl+tIHr/NWzbAFAsQ8=", + "requires": { + "process": "0.11.10", + "util": "0.10.3" + } + }, + "path-dirname": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/path-dirname/-/path-dirname-1.0.2.tgz", + "integrity": "sha1-zDPSTVJeCZpTiMAzbG4yuRYGCeA=", + "dev": true + }, + "path-exists": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-2.1.0.tgz", + "integrity": "sha1-D+tsZPD8UY2adU3V77YscCJ2H0s=", + "requires": { + "pinkie-promise": "2.0.1" + } + }, + "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=" + }, + "path-is-inside": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/path-is-inside/-/path-is-inside-1.0.2.tgz", + "integrity": "sha1-NlQX3t5EQw0cEa9hAn+s8HS9/FM=", + "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 + }, + "path-parse": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.5.tgz", + "integrity": "sha1-PBrfhx6pzWyUMbbqK9dKD/BVxME=" + }, + "path-root": { + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/path-root/-/path-root-0.1.1.tgz", + "integrity": "sha1-mkpoFMrBwM1zNgqV8yCDyOpHRbc=", + "requires": { + "path-root-regex": "0.1.2" + } + }, + "path-root-regex": { + "version": "0.1.2", + "resolved": "https://registry.npmjs.org/path-root-regex/-/path-root-regex-0.1.2.tgz", + "integrity": "sha1-v8zcjfWxLcUsi0PsONGNcsBLqW0=" + }, + "path-to-regexp": { + "version": "0.1.7", + "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.7.tgz", + "integrity": "sha1-32BBeABfUi8V60SQ5yR6G/qmf4w=", + "dev": true + }, + "path-type": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/path-type/-/path-type-1.1.0.tgz", + "integrity": "sha1-WcRPfuSR2nBNpBXaWkBwuk+P5EE=", + "requires": { + "graceful-fs": "4.1.11", + "pify": "2.3.0", + "pinkie-promise": "2.0.1" + } + }, + "pause-stream": { + "version": "0.0.11", + "resolved": "https://registry.npmjs.org/pause-stream/-/pause-stream-0.0.11.tgz", + "integrity": "sha1-/lo0sMvOErWqaitAPuLnO2AvFEU=", + "requires": { + "through": "2.3.8" + } + }, + "pend": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/pend/-/pend-1.2.0.tgz", + "integrity": "sha1-elfrVQpng/kRUzH89GY9XI4AelA=", + "dev": true + }, + "performance-now": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-0.2.0.tgz", + "integrity": "sha1-M+8wxcd9TqIcWlOGnZG1bY8lVeU=" + }, + "phantomjs-prebuilt": { + "version": "2.1.15", + "resolved": "https://registry.npmjs.org/phantomjs-prebuilt/-/phantomjs-prebuilt-2.1.15.tgz", + "integrity": "sha1-IPhugtM0nFBZF1J3RbekEeCLOQM=", + "dev": true, + "requires": { + "es6-promise": "4.0.5", + "extract-zip": "1.6.5", + "fs-extra": "1.0.0", + "hasha": "2.2.0", + "kew": "0.7.0", + "progress": "1.1.8", + "request": "2.81.0", + "request-progress": "2.0.1", + "which": "1.2.14" + }, + "dependencies": { + "es6-promise": { + "version": "4.0.5", + "resolved": "https://registry.npmjs.org/es6-promise/-/es6-promise-4.0.5.tgz", + "integrity": "sha1-eILzCt3lskDM+n99eMVIMwlRrkI=", + "dev": true + }, + "fs-extra": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-1.0.0.tgz", + "integrity": "sha1-zTzl9+fLYUWIP8rjGR6Yd/hYeVA=", + "dev": true, + "requires": { + "graceful-fs": "4.1.11", + "jsonfile": "2.4.0", + "klaw": "1.3.1" + } + }, + "jsonfile": { + "version": "2.4.0", + "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-2.4.0.tgz", + "integrity": "sha1-NzaitCi4e72gzIO1P6PWM6NcKug=", + "dev": true, + "requires": { + "graceful-fs": "4.1.11" + } + }, + "klaw": { + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/klaw/-/klaw-1.3.1.tgz", + "integrity": "sha1-QIhDO0azsbolnXh4XY6W9zugJDk=", + "dev": true, + "requires": { + "graceful-fs": "4.1.11" + } + }, + "which": { + "version": "1.2.14", + "resolved": "https://registry.npmjs.org/which/-/which-1.2.14.tgz", + "integrity": "sha1-mofEN48D6CfOyvGs31bHNsAcFOU=", + "dev": true, + "requires": { + "isexe": "2.0.0" + } + } + } + }, + "pify": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz", + "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=" + }, + "pinkie": { + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/pinkie/-/pinkie-2.0.4.tgz", + "integrity": "sha1-clVrgM+g1IqXToDnckjoDtT3+HA=" + }, + "pinkie-promise": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.1.tgz", + "integrity": "sha1-ITXW36ejWMBprJsXh3YogihFD/o=", + "requires": { + "pinkie": "2.0.4" + } + }, + "pngquant-bin": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/pngquant-bin/-/pngquant-bin-3.1.1.tgz", + "integrity": "sha1-0STZinWpSH9AwWQLTb/Lsr1aH9E=", + "dev": true, + "requires": { + "bin-build": "2.2.0", + "bin-wrapper": "3.0.2", + "logalot": "2.1.0" + } + }, + "portscanner": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/portscanner/-/portscanner-2.1.1.tgz", + "integrity": "sha1-6rtAnk3iSVD1oqUW01rnaTQ/u5Y=", + "dev": true, + "requires": { + "async": "1.5.2", + "is-number-like": "1.0.8" + } + }, + "postcss": { + "version": "5.2.17", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.17.tgz", + "integrity": "sha1-z09Ze4ZNZcikkrLqvp1wbIecOIs=", + "requires": { + "chalk": "1.1.3", + "js-base64": "2.1.9", + "source-map": "0.5.6", + "supports-color": "3.2.3" + }, + "dependencies": { + "supports-color": { + "version": "3.2.3", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz", + "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=", + "requires": { + "has-flag": "1.0.0" + } + } + } + }, + "postcss-value-parser": { + "version": "3.3.0", + "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.0.tgz", + "integrity": "sha1-h/OPnxj3dKSrTIojL1xc6IcqnRU=" + }, + "prelude-ls": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.1.2.tgz", + "integrity": "sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ=", + "dev": true + }, + "prepend-http": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/prepend-http/-/prepend-http-1.0.4.tgz", + "integrity": "sha1-1PRWKwzjaW5BrFLQ4ALlemNdxtw=", + "dev": true + }, + "preserve": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/preserve/-/preserve-0.2.0.tgz", + "integrity": "sha1-gV7R9uvGWSb4ZbMQwHE7yzMVzks=" + }, + "pretty-hrtime": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/pretty-hrtime/-/pretty-hrtime-1.0.3.tgz", + "integrity": "sha1-t+PqQkNaTJsnWdmeDyAesZWALuE=" + }, + "process": { + "version": "0.11.10", + "resolved": "https://registry.npmjs.org/process/-/process-0.11.10.tgz", + "integrity": "sha1-czIwDoQBYb2j5podHZGn1LwW8YI=" + }, + "process-nextick-args": { + "version": "1.0.7", + "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.7.tgz", + "integrity": "sha1-FQ4gt1ZZCtP5EJPyWk8q2L/zC6M=" + }, + "progress": { + "version": "1.1.8", + "resolved": "https://registry.npmjs.org/progress/-/progress-1.1.8.tgz", + "integrity": "sha1-4mDHj2Fhzdmw5WzD4Khd4Xx6V74=", + "dev": true + }, + "propprop": { + "version": "0.3.1", + "resolved": "https://registry.npmjs.org/propprop/-/propprop-0.3.1.tgz", + "integrity": "sha1-oEmjVouJZEAGfRXY7J8zc15XAXg=" + }, + "protractor": { + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/protractor/-/protractor-5.1.2.tgz", + "integrity": "sha1-myIXQXCaTGLVzVPGqt1UpxE36V8=", + "dev": true, + "requires": { + "@types/node": "6.0.85", + "@types/q": "0.0.32", + "@types/selenium-webdriver": "2.53.42", + "blocking-proxy": "0.0.5", + "chalk": "1.1.3", + "glob": "7.1.2", + "jasmine": "2.7.0", + "jasminewd2": "2.1.0", + "optimist": "0.6.1", + "q": "1.4.1", + "saucelabs": "1.3.0", + "selenium-webdriver": "3.0.1", + "source-map-support": "0.4.15", + "webdriver-js-extender": "1.0.0", + "webdriver-manager": "12.0.6" + }, + "dependencies": { + "@types/selenium-webdriver": { + "version": "2.53.42", + "resolved": "https://registry.npmjs.org/@types/selenium-webdriver/-/selenium-webdriver-2.53.42.tgz", + "integrity": "sha1-dMt3+2BS7a/yqJhN2v2I1BnyXKw=", + "dev": true + }, + "blocking-proxy": { + "version": "0.0.5", + "resolved": "https://registry.npmjs.org/blocking-proxy/-/blocking-proxy-0.0.5.tgz", + "integrity": "sha1-RikF4Nz76pcPQao3Ij3anAexkSs=", + "dev": true, + "requires": { + "minimist": "1.2.0" + } + }, + "jasmine": { + "version": "2.7.0", + "resolved": "https://registry.npmjs.org/jasmine/-/jasmine-2.7.0.tgz", + "integrity": "sha1-XPC7TllLRgC7QjVWA2YhKsWuobI=", + "dev": true, + "requires": { + "exit": "0.1.2", + "glob": "7.1.2", + "jasmine-core": "2.7.0" + } + }, + "q": { + "version": "1.4.1", + "resolved": "https://registry.npmjs.org/q/-/q-1.4.1.tgz", + "integrity": "sha1-VXBbzZPF82c1MMLCy8DCs63cKG4=", + "dev": true + }, + "selenium-webdriver": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/selenium-webdriver/-/selenium-webdriver-3.0.1.tgz", + "integrity": "sha1-ot6l2kqX9mcuiefKcnbO+jZRR6c=", + "dev": true, + "requires": { + "adm-zip": "0.4.7", + "rimraf": "2.6.1", + "tmp": "0.0.30", + "xml2js": "0.4.18" + } + }, + "semver": { + "version": "5.4.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-5.4.1.tgz", + "integrity": "sha512-WfG/X9+oATh81XtllIo/I8gOiY9EXRdv1cQdyykeXK17YcUW3EXUAi2To4pcH6nZtJPr7ZOpM5OMyWJZm+8Rsg==", + "dev": true + }, + "tmp": { + "version": "0.0.30", + "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.30.tgz", + "integrity": "sha1-ckGdSovn1s51FI/YsyTlk6cRwu0=", + "dev": true, + "requires": { + "os-tmpdir": "1.0.2" + } + }, + "webdriver-js-extender": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/webdriver-js-extender/-/webdriver-js-extender-1.0.0.tgz", + "integrity": "sha1-gcUzqeM9W/tZe05j4s2yW1R3dRU=", + "dev": true, + "requires": { + "@types/selenium-webdriver": "2.53.42", + "selenium-webdriver": "2.53.3" + }, + "dependencies": { + "adm-zip": { + "version": "0.4.4", + "resolved": "https://registry.npmjs.org/adm-zip/-/adm-zip-0.4.4.tgz", + "integrity": "sha1-ph7VrmkFw66lizplfSUDMJEFJzY=", + "dev": true + }, + "selenium-webdriver": { + "version": "2.53.3", + "resolved": "https://registry.npmjs.org/selenium-webdriver/-/selenium-webdriver-2.53.3.tgz", + "integrity": "sha1-0p/1qVff8aG0ncRXdW5OS/vc4IU=", + "dev": true, + "requires": { + "adm-zip": "0.4.4", + "rimraf": "2.6.1", + "tmp": "0.0.24", + "ws": "1.1.1", + "xml2js": "0.4.4" + } + }, + "tmp": { + "version": "0.0.24", + "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.24.tgz", + "integrity": "sha1-1qXhmNFKmDXMby18PZ4wJCjIzxI=", + "dev": true + }, + "xml2js": { + "version": "0.4.4", + "resolved": "https://registry.npmjs.org/xml2js/-/xml2js-0.4.4.tgz", + "integrity": "sha1-MREBAAMAiuGSQOuhdJe1fHKcVV0=", + "dev": true, + "requires": { + "sax": "0.6.1", + "xmlbuilder": "9.0.1" + } + } + } + }, + "webdriver-manager": { + "version": "12.0.6", + "resolved": "https://registry.npmjs.org/webdriver-manager/-/webdriver-manager-12.0.6.tgz", + "integrity": "sha1-PfGkgZdwELTL+MnYXHpXeCjA5ws=", + "dev": true, + "requires": { + "adm-zip": "0.4.7", + "chalk": "1.1.3", + "del": "2.2.2", + "glob": "7.1.2", + "ini": "1.3.4", + "minimist": "1.2.0", + "q": "1.4.1", + "request": "2.81.0", + "rimraf": "2.6.1", + "semver": "5.4.1", + "xml2js": "0.4.18" + } + }, + "xml2js": { + "version": "0.4.18", + "resolved": "https://registry.npmjs.org/xml2js/-/xml2js-0.4.18.tgz", + "integrity": "sha512-MMUtkwryoXmYoFUBT32tf7vYPHr98h6VtRLVbsjfmS5hqpp/deRMUNLZNQUHEAY4ChwyBEkisDYhH/EP15X6oA==", + "dev": true, + "requires": { + "sax": "0.6.1", + "xmlbuilder": "9.0.1" + } + } + } + }, + "protractor-jasmine2-screenshot-reporter": { + "version": "0.4.0", + "resolved": "https://registry.npmjs.org/protractor-jasmine2-screenshot-reporter/-/protractor-jasmine2-screenshot-reporter-0.4.0.tgz", + "integrity": "sha512-zujXpeSjnGIoCUEveb7Icb0rE5bar/oflMTq59njug65J/hzQVTfaPaLRV2Lmb7Ag6+1/1sCOOfNBHoVFinNpQ==", + "dev": true, + "requires": { + "hat": "0.0.3", + "lodash": "4.17.4", + "mkdirp": "0.5.1", + "rimraf": "2.6.1", + "string.prototype.startswith": "0.2.0", + "uuid": "2.0.3" + }, + "dependencies": { + "uuid": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/uuid/-/uuid-2.0.3.tgz", + "integrity": "sha1-Z+LoY3lyFVMN/zGOW/nc6/1Hsho=", + "dev": true + } + } + }, + "proxy-addr": { + "version": "1.1.5", + "resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-1.1.5.tgz", + "integrity": "sha1-ccDuOxAt4/IC87ZPYI0XP8uhqRg=", + "dev": true, + "requires": { + "forwarded": "0.1.0", + "ipaddr.js": "1.4.0" + } + }, + "pseudomap": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/pseudomap/-/pseudomap-1.0.2.tgz", + "integrity": "sha1-8FKijacOYYkX7wqKw0wa5aaChrM=" + }, + "punycode": { + "version": "1.4.1", + "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz", + "integrity": "sha1-wNWmOycYgArY4esPpSachN1BhF4=" + }, + "q": { + "version": "1.5.0", + "resolved": "https://registry.npmjs.org/q/-/q-1.5.0.tgz", + "integrity": "sha1-3QG6ydBtMObyGa7LglPunr3DCPE=" + }, + "qjobs": { + "version": "1.1.5", + "resolved": "https://registry.npmjs.org/qjobs/-/qjobs-1.1.5.tgz", + "integrity": "sha1-ZZ3p8s+NzCehSBJ28gU3cnI4LnM=", + "dev": true + }, + "qs": { + "version": "6.4.0", + "resolved": "https://registry.npmjs.org/qs/-/qs-6.4.0.tgz", + "integrity": "sha1-E+JtKK1rD/qpExLNO/cI7TUecjM=" + }, + "randomatic": { + "version": "1.1.7", + "resolved": "https://registry.npmjs.org/randomatic/-/randomatic-1.1.7.tgz", + "integrity": "sha512-D5JUjPyJbaJDkuAazpVnSfVkLlpeO3wDlPROTMLGKG1zMFNFRgrciKo1ltz/AzNTkqE0HzDx655QOL51N06how==", + "requires": { + "is-number": "3.0.0", + "kind-of": "4.0.0" + }, + "dependencies": { + "is-number": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz", + "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=", + "requires": { + "kind-of": "3.2.2" + }, + "dependencies": { + "kind-of": { + "version": "3.2.2", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", + "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", + "requires": { + "is-buffer": "1.1.5" + } + } + } + }, + "kind-of": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-4.0.0.tgz", + "integrity": "sha1-IIE989cSkosgc3hpGkUGb65y3Vc=", + "requires": { + "is-buffer": "1.1.5" + } + } + } + }, + "range-parser": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.2.0.tgz", + "integrity": "sha1-9JvmtIeJTdxA3MlKMi9hEJLgDV4=", + "dev": true + }, + "raw-body": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.2.0.tgz", + "integrity": "sha1-mUl2z2pQlqQRYoQEkvC9xdbn+5Y=", + "dev": true, + "requires": { + "bytes": "2.4.0", + "iconv-lite": "0.4.15", + "unpipe": "1.0.0" + } + }, + "rc": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/rc/-/rc-1.2.1.tgz", + "integrity": "sha1-LgPo5C7kULjLPc5lvhv4l04d/ZU=", + "dev": true, + "requires": { + "deep-extend": "0.4.2", + "ini": "1.3.4", + "minimist": "1.2.0", + "strip-json-comments": "2.0.1" + } + }, + "read-all-stream": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/read-all-stream/-/read-all-stream-3.1.0.tgz", + "integrity": "sha1-NcPhd/IHjveJ7kv6+kNzB06u9Po=", + "dev": true, + "requires": { + "pinkie-promise": "2.0.1", + "readable-stream": "2.3.3" + }, + "dependencies": { + "isarray": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", + "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=", + "dev": true + }, + "readable-stream": { + "version": "2.3.3", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.3.tgz", + "integrity": "sha512-m+qzzcn7KUxEmd1gMbchF+Y2eIUbieUaxkWtptyHywrX0rE8QEYqPC07Vuy4Wm32/xE16NcdBctb8S0Xe/5IeQ==", + "dev": true, + "requires": { + "core-util-is": "1.0.2", + "inherits": "2.0.3", + "isarray": "1.0.0", + "process-nextick-args": "1.0.7", + "safe-buffer": "5.1.1", + "string_decoder": "1.0.3", + "util-deprecate": "1.0.2" + } + }, + "string_decoder": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz", + "integrity": "sha512-4AH6Z5fzNNBcH+6XDMfA/BTt87skxqJlO0lAh3Dker5zThcAxG6mKz+iGu308UKoPPQ8Dcqx/4JhujzltRa+hQ==", + "dev": true, + "requires": { + "safe-buffer": "5.1.1" + } + } + } + }, + "read-pkg": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-1.1.0.tgz", + "integrity": "sha1-9f+qXs0pyzHAR0vKfXVra7KePyg=", + "requires": { + "load-json-file": "1.1.0", + "normalize-package-data": "2.4.0", + "path-type": "1.1.0" + } + }, + "read-pkg-up": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-1.0.1.tgz", + "integrity": "sha1-nWPBMnbAZZGNV/ACpX9AobZD+wI=", + "requires": { + "find-up": "1.1.2", + "read-pkg": "1.1.0" + } + }, + "readable-stream": { + "version": "1.1.14", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz", + "integrity": "sha1-fPTFTvZI44EwhMY23SB54WbAgdk=", + "requires": { + "core-util-is": "1.0.2", + "inherits": "2.0.3", + "isarray": "0.0.1", + "string_decoder": "0.10.31" + } + }, + "readdirp": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-2.1.0.tgz", + "integrity": "sha1-TtCtBg3zBzMAxIRANz9y0cxkLXg=", + "dev": true, + "requires": { + "graceful-fs": "4.1.11", + "minimatch": "3.0.4", + "readable-stream": "2.3.3", + "set-immediate-shim": "1.0.1" + }, + "dependencies": { + "isarray": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", + "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=", + "dev": true + }, + "readable-stream": { + "version": "2.3.3", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.3.tgz", + "integrity": "sha512-m+qzzcn7KUxEmd1gMbchF+Y2eIUbieUaxkWtptyHywrX0rE8QEYqPC07Vuy4Wm32/xE16NcdBctb8S0Xe/5IeQ==", + "dev": true, + "requires": { + "core-util-is": "1.0.2", + "inherits": "2.0.3", + "isarray": "1.0.0", + "process-nextick-args": "1.0.7", + "safe-buffer": "5.1.1", + "string_decoder": "1.0.3", + "util-deprecate": "1.0.2" + } + }, + "string_decoder": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz", + "integrity": "sha512-4AH6Z5fzNNBcH+6XDMfA/BTt87skxqJlO0lAh3Dker5zThcAxG6mKz+iGu308UKoPPQ8Dcqx/4JhujzltRa+hQ==", + "dev": true, + "requires": { + "safe-buffer": "5.1.1" + } + } + } + }, + "readline2": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/readline2/-/readline2-1.0.1.tgz", + "integrity": "sha1-QQWWCP/BVHV7cV2ZidGZ/783LjU=", + "requires": { + "code-point-at": "1.1.0", + "is-fullwidth-code-point": "1.0.0", + "mute-stream": "0.0.5" + } + }, + "rechoir": { + "version": "0.6.2", + "resolved": "https://registry.npmjs.org/rechoir/-/rechoir-0.6.2.tgz", + "integrity": "sha1-hSBLVNuoLVdC4oyWdW70OvUOM4Q=", + "requires": { + "resolve": "1.4.0" + } + }, + "redent": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/redent/-/redent-1.0.0.tgz", + "integrity": "sha1-z5Fqsf1fHxbfsggi3W7H9zDCr94=", + "requires": { + "indent-string": "2.1.0", + "strip-indent": "1.0.1" + } + }, + "regex-cache": { + "version": "0.4.3", + "resolved": "https://registry.npmjs.org/regex-cache/-/regex-cache-0.4.3.tgz", + "integrity": "sha1-mxpsNdTQ3871cRrmUejp09cRQUU=", + "requires": { + "is-equal-shallow": "0.1.3", + "is-primitive": "2.0.0" + } + }, + "remove-trailing-separator": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/remove-trailing-separator/-/remove-trailing-separator-1.0.2.tgz", + "integrity": "sha1-abBi2XhyetFNxrVrpKt3L9jXBRE=" + }, + "repeat-element": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/repeat-element/-/repeat-element-1.1.2.tgz", + "integrity": "sha1-7wiaF40Ug7quTZPrmLT55OEdmQo=" + }, + "repeat-string": { + "version": "1.6.1", + "resolved": "https://registry.npmjs.org/repeat-string/-/repeat-string-1.6.1.tgz", + "integrity": "sha1-jcrkcOHIirwtYA//Sndihtp15jc=" + }, + "repeating": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/repeating/-/repeating-2.0.1.tgz", + "integrity": "sha1-UhTFOpJtNVJwdSf7q0FdvAjQbdo=", + "requires": { + "is-finite": "1.0.2" + } + }, + "replace-ext": { + "version": "0.0.1", + "resolved": "https://registry.npmjs.org/replace-ext/-/replace-ext-0.0.1.tgz", + "integrity": "sha1-KbvZIHinOfC8zitO5B6DeVNSKSQ=" + }, + "replacestream": { + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/replacestream/-/replacestream-4.0.2.tgz", + "integrity": "sha1-DEFAcH5PAyP1DeBEhRcIz1i8N70=", + "requires": { + "escape-string-regexp": "1.0.5", + "object-assign": "4.1.1", + "readable-stream": "2.3.3" + }, + "dependencies": { + "isarray": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", + "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=" + }, + "object-assign": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz", + "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=" + }, + "readable-stream": { + "version": "2.3.3", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.3.tgz", + "integrity": "sha512-m+qzzcn7KUxEmd1gMbchF+Y2eIUbieUaxkWtptyHywrX0rE8QEYqPC07Vuy4Wm32/xE16NcdBctb8S0Xe/5IeQ==", + "requires": { + "core-util-is": "1.0.2", + "inherits": "2.0.3", + "isarray": "1.0.0", + "process-nextick-args": "1.0.7", + "safe-buffer": "5.1.1", + "string_decoder": "1.0.3", + "util-deprecate": "1.0.2" + } + }, + "string_decoder": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz", + "integrity": "sha512-4AH6Z5fzNNBcH+6XDMfA/BTt87skxqJlO0lAh3Dker5zThcAxG6mKz+iGu308UKoPPQ8Dcqx/4JhujzltRa+hQ==", + "requires": { + "safe-buffer": "5.1.1" + } + } + } + }, + "request": { + "version": "2.81.0", + "resolved": "https://registry.npmjs.org/request/-/request-2.81.0.tgz", + "integrity": "sha1-xpKJRqDgbF+Nb4qTM0af/aRimKA=", + "requires": { + "aws-sign2": "0.6.0", + "aws4": "1.6.0", + "caseless": "0.12.0", + "combined-stream": "1.0.5", + "extend": "3.0.1", + "forever-agent": "0.6.1", + "form-data": "2.1.4", + "har-validator": "4.2.1", + "hawk": "3.1.3", + "http-signature": "1.1.1", + "is-typedarray": "1.0.0", + "isstream": "0.1.2", + "json-stringify-safe": "5.0.1", + "mime-types": "2.1.16", + "oauth-sign": "0.8.2", + "performance-now": "0.2.0", + "qs": "6.4.0", + "safe-buffer": "5.1.1", + "stringstream": "0.0.5", + "tough-cookie": "2.3.2", + "tunnel-agent": "0.6.0", + "uuid": "3.1.0" + } + }, + "request-progress": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/request-progress/-/request-progress-2.0.1.tgz", + "integrity": "sha1-XTa7V5YcZzqlt4jbyBQf3yO0Tgg=", + "dev": true, + "requires": { + "throttleit": "1.0.0" + } + }, + "require-directory": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz", + "integrity": "sha1-jGStX9MNqxyXbiNE/+f3kqam30I=" + }, + "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=" + }, + "require-uncached": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/require-uncached/-/require-uncached-1.0.3.tgz", + "integrity": "sha1-Tg1W1slmL9MeQwEcS5WqSZVUIdM=", + "dev": true, + "requires": { + "caller-path": "0.1.0", + "resolve-from": "1.0.1" + } + }, + "requires-port": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/requires-port/-/requires-port-1.0.0.tgz", + "integrity": "sha1-kl0mAdOaxIXgkc8NpcbmlNw9yv8=", + "dev": true + }, + "requizzle": { + "version": "0.2.1", + "resolved": "https://registry.npmjs.org/requizzle/-/requizzle-0.2.1.tgz", + "integrity": "sha1-aUPDUwxNmn5G8c3dUcFY/GcM294=", + "dev": true, + "requires": { + "underscore": "1.6.0" + }, + "dependencies": { + "underscore": { + "version": "1.6.0", + "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.6.0.tgz", + "integrity": "sha1-izixDKze9jM3uLJOT/htRa6lKag=", + "dev": true + } + } + }, + "resolve": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.4.0.tgz", + "integrity": "sha512-aW7sVKPufyHqOmyyLzg/J+8606v5nevBgaliIlV7nUpVMsDnoBGV/cbSLNjZAg9q0Cfd/+easKVKQ8vOu8fn1Q==", + "requires": { + "path-parse": "1.0.5" + } + }, + "resolve-dir": { + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/resolve-dir/-/resolve-dir-0.1.1.tgz", + "integrity": "sha1-shklmlYC+sXFxJatiUpujMQwJh4=", + "requires": { + "expand-tilde": "1.2.2", + "global-modules": "0.2.3" + } + }, + "resolve-from": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-1.0.1.tgz", + "integrity": "sha1-Jsv+k10a7uq7Kbw/5a6wHpPUQiY=", + "dev": true + }, + "resp-modifier": { + "version": "6.0.2", + "resolved": "https://registry.npmjs.org/resp-modifier/-/resp-modifier-6.0.2.tgz", + "integrity": "sha1-sSTeXE+6/LpUH0j/pzlw9KpFa08=", + "dev": true, + "requires": { + "debug": "2.2.0", + "minimatch": "3.0.4" + } + }, + "restore-cursor": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-1.0.1.tgz", + "integrity": "sha1-NGYfRohjJ/7SmRR5FSJS35LapUE=", + "requires": { + "exit-hook": "1.1.1", + "onetime": "1.1.0" + } + }, + "right-align": { + "version": "0.1.3", + "resolved": "https://registry.npmjs.org/right-align/-/right-align-0.1.3.tgz", + "integrity": "sha1-YTObci/mo1FWiSENJOFMlhSGE+8=", + "requires": { + "align-text": "0.1.4" + } + }, + "rimraf": { + "version": "2.6.1", + "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.1.tgz", + "integrity": "sha1-wjOOxkPfeht/5cVPqG9XQopV8z0=", + "requires": { + "glob": "7.1.2" + } + }, + "run-async": { + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/run-async/-/run-async-0.1.0.tgz", + "integrity": "sha1-yK1KXhEGYeQCp9IbUw4AnyX444k=", + "requires": { + "once": "1.4.0" + } + }, + "run-sequence": { + "version": "1.2.2", + "resolved": "https://registry.npmjs.org/run-sequence/-/run-sequence-1.2.2.tgz", + "integrity": "sha1-UJWgvr6YczsBQL0I3YDsAw3azes=", + "requires": { + "chalk": "1.1.3", + "gulp-util": "3.0.8" + } + }, + "rx": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/rx/-/rx-4.1.0.tgz", + "integrity": "sha1-pfE/957zt0D+MKqAP7CfmIBdR4I=", + "dev": true + }, + "rx-lite": { + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/rx-lite/-/rx-lite-3.1.2.tgz", + "integrity": "sha1-Gc5QLKVyZl87ZHsQk5+X/RYV8QI=" + }, + "rx-lite-aggregates": { + "version": "4.0.8", + "resolved": "https://registry.npmjs.org/rx-lite-aggregates/-/rx-lite-aggregates-4.0.8.tgz", + "integrity": "sha1-dTuHqJoRyVRnxKwWJsTvxOBcZ74=", + "dev": true, + "requires": { + "rx-lite": "3.1.2" + } + }, + "safe-buffer": { + "version": "5.1.1", + "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz", + "integrity": "sha512-kKvNJn6Mm93gAczWVJg7wH+wGYWNrDHdWvpUmHyEsgCtIwwo3bqPtV4tR5tuPaUhTOo/kvhVwd8XwwOllGYkbg==" + }, + "sass-graph": { + "version": "2.2.4", + "resolved": "https://registry.npmjs.org/sass-graph/-/sass-graph-2.2.4.tgz", + "integrity": "sha1-E/vWPNHK8JCLn9k0dq1DpR0eC0k=", + "requires": { + "glob": "7.1.2", + "lodash": "4.17.4", + "scss-tokenizer": "0.2.3", + "yargs": "7.1.0" + } + }, + "saucelabs": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/saucelabs/-/saucelabs-1.3.0.tgz", + "integrity": "sha1-0kDoAJ33+ocwbsRXimm6O1xCT+4=", + "dev": true, + "requires": { + "https-proxy-agent": "1.0.0" + } + }, + "sax": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/sax/-/sax-0.6.1.tgz", + "integrity": "sha1-VjsZx8HeiS4Jv8Ty/DDjwn8JUrk=", + "dev": true + }, + "scss-tokenizer": { + "version": "0.2.3", + "resolved": "https://registry.npmjs.org/scss-tokenizer/-/scss-tokenizer-0.2.3.tgz", + "integrity": "sha1-jrBtualyMzOCTT9VMGQRSYR85dE=", + "requires": { + "js-base64": "2.1.9", + "source-map": "0.4.4" + }, + "dependencies": { + "source-map": { + "version": "0.4.4", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.4.4.tgz", + "integrity": "sha1-66T12pwNyZneaAMti092FzZSA2s=", + "requires": { + "amdefine": "1.0.1" + } + } + } + }, + "seek-bzip": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/seek-bzip/-/seek-bzip-1.0.5.tgz", + "integrity": "sha1-z+kXyz0nS8/6x5J1ivUxc+sfq9w=", + "dev": true, + "requires": { + "commander": "2.8.1" + }, + "dependencies": { + "commander": { + "version": "2.8.1", + "resolved": "https://registry.npmjs.org/commander/-/commander-2.8.1.tgz", + "integrity": "sha1-Br42f+v9oMMwqh4qBy09yXYkJdQ=", + "dev": true, + "requires": { + "graceful-readlink": "1.0.1" + } + } + } + }, + "semver": { + "version": "4.3.6", + "resolved": "https://registry.npmjs.org/semver/-/semver-4.3.6.tgz", + "integrity": "sha1-MAvG4OhjdPe6YQaLWx7NV/xlMto=" + }, + "semver-regex": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/semver-regex/-/semver-regex-1.0.0.tgz", + "integrity": "sha1-kqSWkGX5xwxpR1PVUkj8aPj2Usk=", + "dev": true + }, + "semver-truncate": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/semver-truncate/-/semver-truncate-1.1.2.tgz", + "integrity": "sha1-V/Qd5pcHpicJp+AQS6IRcQnqR+g=", + "dev": true, + "requires": { + "semver": "5.4.1" + }, + "dependencies": { + "semver": { + "version": "5.4.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-5.4.1.tgz", + "integrity": "sha512-WfG/X9+oATh81XtllIo/I8gOiY9EXRdv1cQdyykeXK17YcUW3EXUAi2To4pcH6nZtJPr7ZOpM5OMyWJZm+8Rsg==", + "dev": true + } + } + }, + "send": { + "version": "0.15.2", + "resolved": "https://registry.npmjs.org/send/-/send-0.15.2.tgz", + "integrity": "sha1-+R+rRAO8+H5xb3DOtdsvV4vcF9Y=", + "dev": true, + "requires": { + "debug": "2.6.4", + "depd": "1.1.1", + "destroy": "1.0.4", + "encodeurl": "1.0.1", + "escape-html": "1.0.3", + "etag": "1.8.0", + "fresh": "0.5.0", + "http-errors": "1.6.2", + "mime": "1.3.4", + "ms": "1.0.0", + "on-finished": "2.3.0", + "range-parser": "1.2.0", + "statuses": "1.3.1" + }, + "dependencies": { + "debug": { + "version": "2.6.4", + "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.4.tgz", + "integrity": "sha1-dYaps8OXQcAoKuM0RcTorHRzT+A=", + "dev": true, + "requires": { + "ms": "0.7.3" + }, + "dependencies": { + "ms": { + "version": "0.7.3", + "resolved": "https://registry.npmjs.org/ms/-/ms-0.7.3.tgz", + "integrity": "sha1-cIFVpeROM/X9D8U+gdDUCpG+H/8=", + "dev": true + } + } + }, + "fresh": { + "version": "0.5.0", + "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.5.0.tgz", + "integrity": "sha1-9HTKXmqSRtb9jglTz6m5yAWvp44=", + "dev": true + }, + "http-errors": { + "version": "1.6.2", + "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.6.2.tgz", + "integrity": "sha1-CgAsyFcHGSp+eUbO7cERVfYOxzY=", + "dev": true, + "requires": { + "depd": "1.1.1", + "inherits": "2.0.3", + "setprototypeof": "1.0.3", + "statuses": "1.3.1" + } + }, + "mime": { + "version": "1.3.4", + "resolved": "https://registry.npmjs.org/mime/-/mime-1.3.4.tgz", + "integrity": "sha1-EV+eO2s9rylZmDyzjxSaLUDrXVM=", + "dev": true + }, + "ms": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/ms/-/ms-1.0.0.tgz", + "integrity": "sha1-Wa3NIu3FQ/e1OBhi0xOHsfS8lHM=", + "dev": true + }, + "setprototypeof": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.0.3.tgz", + "integrity": "sha1-ZlZ+NwQ+608E2RvWWMDL77VbjgQ=", + "dev": true + } + } + }, + "sequencify": { + "version": "0.0.7", + "resolved": "https://registry.npmjs.org/sequencify/-/sequencify-0.0.7.tgz", + "integrity": "sha1-kM/xnQLgcCf9dn9erT57ldHnOAw=" + }, + "serve-index": { + "version": "1.8.0", + "resolved": "https://registry.npmjs.org/serve-index/-/serve-index-1.8.0.tgz", + "integrity": "sha1-fF2WwT+xMRAfk8HFd0+FFqHnjTs=", + "dev": true, + "requires": { + "accepts": "1.3.3", + "batch": "0.5.3", + "debug": "2.2.0", + "escape-html": "1.0.3", + "http-errors": "1.5.1", + "mime-types": "2.1.16", + "parseurl": "1.3.1" + } + }, + "serve-static": { + "version": "1.12.2", + "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.12.2.tgz", + "integrity": "sha1-5UbicmCBuBtLzsjpCAjrzdMjr7o=", + "dev": true, + "requires": { + "encodeurl": "1.0.1", + "escape-html": "1.0.3", + "parseurl": "1.3.1", + "send": "0.15.2" + } + }, + "server-destroy": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/server-destroy/-/server-destroy-1.0.1.tgz", + "integrity": "sha1-8Tv5KOQrnD55OD5hzDmYtdFObN0=", + "dev": true + }, + "set-blocking": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz", + "integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc=" + }, + "set-getter": { + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/set-getter/-/set-getter-0.1.0.tgz", + "integrity": "sha1-12nBgsnVpR9AkUXy+6guXoboA3Y=", + "requires": { + "to-object-path": "0.3.0" + } + }, + "set-immediate-shim": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/set-immediate-shim/-/set-immediate-shim-1.0.1.tgz", + "integrity": "sha1-SysbJ+uAip+NzEgaWOXlb1mfP2E=", + "dev": true + }, + "setprototypeof": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.0.2.tgz", + "integrity": "sha1-gaVSFB7BBLiOic44MQOtXGZWTQg=", + "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.7.8", + "resolved": "https://registry.npmjs.org/shelljs/-/shelljs-0.7.8.tgz", + "integrity": "sha1-3svPh0sNHl+3LhSxZKloMEjprLM=", + "dev": true, + "requires": { + "glob": "7.1.2", + "interpret": "1.0.3", + "rechoir": "0.6.2" + } + }, + "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=" + }, + "simple-fmt": { + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/simple-fmt/-/simple-fmt-0.1.0.tgz", + "integrity": "sha1-GRv1ZqWeZTBILLJatTtKjchcOms=" + }, + "simple-is": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/simple-is/-/simple-is-0.2.0.tgz", + "integrity": "sha1-Krt1qt453rXMgVzhDmGRFkhQuvA=" + }, + "slice-ansi": { + "version": "0.0.4", + "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-0.0.4.tgz", + "integrity": "sha1-7b+JA/ZvfOL46v1s7tZeJkyDGzU=", + "dev": true + }, + "sntp": { + "version": "1.0.9", + "resolved": "https://registry.npmjs.org/sntp/-/sntp-1.0.9.tgz", + "integrity": "sha1-ZUEYTMkK7qbG57NeJlkIJEPGYZg=", + "requires": { + "hoek": "2.16.3" + } + }, + "socket.io": { + "version": "1.6.0", + "resolved": "https://registry.npmjs.org/socket.io/-/socket.io-1.6.0.tgz", + "integrity": "sha1-PkDZMmN+a9kjmBslyvfFPoO24uE=", + "dev": true, + "requires": { + "debug": "2.3.3", + "engine.io": "1.8.0", + "has-binary": "0.1.7", + "object-assign": "4.1.0", + "socket.io-adapter": "0.5.0", + "socket.io-client": "1.6.0", + "socket.io-parser": "2.3.1" + }, + "dependencies": { + "debug": { + "version": "2.3.3", + "resolved": "https://registry.npmjs.org/debug/-/debug-2.3.3.tgz", + "integrity": "sha1-QMRT5n5uE8kB3ewxeviYbNqe/4w=", + "dev": true, + "requires": { + "ms": "0.7.2" + } + }, + "ms": { + "version": "0.7.2", + "resolved": "https://registry.npmjs.org/ms/-/ms-0.7.2.tgz", + "integrity": "sha1-riXPJRKziFodldfwN4aNhDESR2U=", + "dev": true + }, + "object-assign": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.0.tgz", + "integrity": "sha1-ejs9DpgGPUP0wD8uiubNUahog6A=", + "dev": true + } + } + }, + "socket.io-adapter": { + "version": "0.5.0", + "resolved": "https://registry.npmjs.org/socket.io-adapter/-/socket.io-adapter-0.5.0.tgz", + "integrity": "sha1-y21LuL7IHhB4uZZ3+c7QBGBmu4s=", + "dev": true, + "requires": { + "debug": "2.3.3", + "socket.io-parser": "2.3.1" + }, + "dependencies": { + "debug": { + "version": "2.3.3", + "resolved": "https://registry.npmjs.org/debug/-/debug-2.3.3.tgz", + "integrity": "sha1-QMRT5n5uE8kB3ewxeviYbNqe/4w=", + "dev": true, + "requires": { + "ms": "0.7.2" + } + }, + "ms": { + "version": "0.7.2", + "resolved": "https://registry.npmjs.org/ms/-/ms-0.7.2.tgz", + "integrity": "sha1-riXPJRKziFodldfwN4aNhDESR2U=", + "dev": true + } + } + }, + "socket.io-client": { + "version": "1.6.0", + "resolved": "https://registry.npmjs.org/socket.io-client/-/socket.io-client-1.6.0.tgz", + "integrity": "sha1-W2aPT3cTBN/u0XkGRwg4b6ZxeFM=", + "dev": true, + "requires": { + "backo2": "1.0.2", + "component-bind": "1.0.0", + "component-emitter": "1.2.1", + "debug": "2.3.3", + "engine.io-client": "1.8.0", + "has-binary": "0.1.7", + "indexof": "0.0.1", + "object-component": "0.0.3", + "parseuri": "0.0.5", + "socket.io-parser": "2.3.1", + "to-array": "0.1.4" + }, + "dependencies": { + "component-emitter": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.2.1.tgz", + "integrity": "sha1-E3kY1teCg/ffemt8WmPhQOaUJeY=", + "dev": true + }, + "debug": { + "version": "2.3.3", + "resolved": "https://registry.npmjs.org/debug/-/debug-2.3.3.tgz", + "integrity": "sha1-QMRT5n5uE8kB3ewxeviYbNqe/4w=", + "dev": true, + "requires": { + "ms": "0.7.2" + } + }, + "ms": { + "version": "0.7.2", + "resolved": "https://registry.npmjs.org/ms/-/ms-0.7.2.tgz", + "integrity": "sha1-riXPJRKziFodldfwN4aNhDESR2U=", + "dev": true + } + } + }, + "socket.io-parser": { + "version": "2.3.1", + "resolved": "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-2.3.1.tgz", + "integrity": "sha1-3VMgJRA85Clpcya+/WQAX8/ltKA=", + "dev": true, + "requires": { + "component-emitter": "1.1.2", + "debug": "2.2.0", + "isarray": "0.0.1", + "json3": "3.3.2" + } + }, + "source-map": { + "version": "0.5.6", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.6.tgz", + "integrity": "sha1-dc449SvwczxafwwRjYEzSiu19BI=" + }, + "source-map-support": { + "version": "0.4.15", + "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.4.15.tgz", + "integrity": "sha1-AyAt9lwG0r2MfsI2KhkwVv7407E=", + "dev": true, + "requires": { + "source-map": "0.5.6" + } + }, + "sparkles": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/sparkles/-/sparkles-1.0.0.tgz", + "integrity": "sha1-Gsu/tZJDbRC76PeFt8xvgoFQEsM=" + }, + "spdx-correct": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-1.0.2.tgz", + "integrity": "sha1-SzBz2TP/UfORLwOsVRlJikFQ20A=", + "requires": { + "spdx-license-ids": "1.2.2" + } + }, + "spdx-expression-parse": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-1.0.4.tgz", + "integrity": "sha1-m98vIOH0DtRH++JzJmGR/O1RYmw=" + }, + "spdx-license-ids": { + "version": "1.2.2", + "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-1.2.2.tgz", + "integrity": "sha1-yd96NCRZSt5r0RkA1ZZpbcBrrFc=" + }, + "split": { + "version": "0.3.3", + "resolved": "https://registry.npmjs.org/split/-/split-0.3.3.tgz", + "integrity": "sha1-zQ7qXmOiEd//frDwkcQTPi0N0o8=", + "requires": { + "through": "2.3.8" + } + }, + "sprintf-js": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz", + "integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=", + "dev": true + }, + "squeak": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/squeak/-/squeak-1.3.0.tgz", + "integrity": "sha1-MwRQN7ZDiLVnZ0uEMiplIQc5FsM=", + "dev": true, + "requires": { + "chalk": "1.1.3", + "console-stream": "0.1.1", + "lpad-align": "1.1.2" + } + }, + "sshpk": { + "version": "1.13.1", + "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.13.1.tgz", + "integrity": "sha1-US322mKHFEMW3EwY/hzx2UBzm+M=", + "requires": { + "asn1": "0.2.3", + "assert-plus": "1.0.0", + "bcrypt-pbkdf": "1.0.1", + "dashdash": "1.14.1", + "ecc-jsbn": "0.1.1", + "getpass": "0.1.7", + "jsbn": "0.1.1", + "tweetnacl": "0.14.5" + }, + "dependencies": { + "assert-plus": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz", + "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=" + } + } + }, + "stable": { + "version": "0.1.6", + "resolved": "https://registry.npmjs.org/stable/-/stable-0.1.6.tgz", + "integrity": "sha1-kQ9dKu17Ugxud3SZwfMuE5/eyxA=" + }, + "stat-mode": { + "version": "0.2.2", + "resolved": "https://registry.npmjs.org/stat-mode/-/stat-mode-0.2.2.tgz", + "integrity": "sha1-5sgLYjEj19gM8TLOU480YokHJQI=", + "dev": true + }, + "statuses": { + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.3.1.tgz", + "integrity": "sha1-+vUbnrdKrvOzrPStX2Gr8ky3uT4=", + "dev": true + }, + "stdout-stream": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/stdout-stream/-/stdout-stream-1.4.0.tgz", + "integrity": "sha1-osfIWH5U2UJ+qe2zrD8s1SLfN4s=", + "requires": { + "readable-stream": "2.3.3" + }, + "dependencies": { + "isarray": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", + "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=" + }, + "readable-stream": { + "version": "2.3.3", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.3.tgz", + "integrity": "sha512-m+qzzcn7KUxEmd1gMbchF+Y2eIUbieUaxkWtptyHywrX0rE8QEYqPC07Vuy4Wm32/xE16NcdBctb8S0Xe/5IeQ==", + "requires": { + "core-util-is": "1.0.2", + "inherits": "2.0.3", + "isarray": "1.0.0", + "process-nextick-args": "1.0.7", + "safe-buffer": "5.1.1", + "string_decoder": "1.0.3", + "util-deprecate": "1.0.2" + } + }, + "string_decoder": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz", + "integrity": "sha512-4AH6Z5fzNNBcH+6XDMfA/BTt87skxqJlO0lAh3Dker5zThcAxG6mKz+iGu308UKoPPQ8Dcqx/4JhujzltRa+hQ==", + "requires": { + "safe-buffer": "5.1.1" + } + } + } + }, + "stream-combiner": { + "version": "0.0.4", + "resolved": "https://registry.npmjs.org/stream-combiner/-/stream-combiner-0.0.4.tgz", + "integrity": "sha1-TV5DPBhSYd3mI8o/RMWGvPXErRQ=", + "requires": { + "duplexer": "0.1.1" + } + }, + "stream-combiner2": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/stream-combiner2/-/stream-combiner2-1.1.1.tgz", + "integrity": "sha1-+02KFCDqNidk4hrUeAOXvry0HL4=", + "requires": { + "duplexer2": "0.1.4", + "readable-stream": "2.3.3" + }, + "dependencies": { + "duplexer2": { + "version": "0.1.4", + "resolved": "https://registry.npmjs.org/duplexer2/-/duplexer2-0.1.4.tgz", + "integrity": "sha1-ixLauHjA1p4+eJEFFmKjL8a93ME=", + "requires": { + "readable-stream": "2.3.3" + } + }, + "isarray": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", + "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=" + }, + "readable-stream": { + "version": "2.3.3", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.3.tgz", + "integrity": "sha512-m+qzzcn7KUxEmd1gMbchF+Y2eIUbieUaxkWtptyHywrX0rE8QEYqPC07Vuy4Wm32/xE16NcdBctb8S0Xe/5IeQ==", + "requires": { + "core-util-is": "1.0.2", + "inherits": "2.0.3", + "isarray": "1.0.0", + "process-nextick-args": "1.0.7", + "safe-buffer": "5.1.1", + "string_decoder": "1.0.3", + "util-deprecate": "1.0.2" + } + }, + "string_decoder": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz", + "integrity": "sha512-4AH6Z5fzNNBcH+6XDMfA/BTt87skxqJlO0lAh3Dker5zThcAxG6mKz+iGu308UKoPPQ8Dcqx/4JhujzltRa+hQ==", + "requires": { + "safe-buffer": "5.1.1" + } + } + } + }, + "stream-consume": { + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/stream-consume/-/stream-consume-0.1.0.tgz", + "integrity": "sha1-pB6tGm1ggc63n2WwYZAbbY89HQ8=" + }, + "stream-shift": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/stream-shift/-/stream-shift-1.0.0.tgz", + "integrity": "sha1-1cdSgl5TZ+eG944Y5EXqIjoVWVI=" + }, + "stream-throttle": { + "version": "0.1.3", + "resolved": "https://registry.npmjs.org/stream-throttle/-/stream-throttle-0.1.3.tgz", + "integrity": "sha1-rdV8jXzHOoFjDTHNVdOWHPr7qcM=", + "dev": true, + "requires": { + "commander": "2.11.0", + "limiter": "1.1.2" + } + }, + "string_decoder": { + "version": "0.10.31", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz", + "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=" + }, + "string-width": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz", + "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=", + "requires": { + "code-point-at": "1.1.0", + "is-fullwidth-code-point": "1.0.0", + "strip-ansi": "3.0.1" + } + }, + "string.prototype.startswith": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/string.prototype.startswith/-/string.prototype.startswith-0.2.0.tgz", + "integrity": "sha1-2miYLjU6TprEpDtFCiBF0cRFrns=", + "dev": true + }, + "stringmap": { + "version": "0.2.2", + "resolved": "https://registry.npmjs.org/stringmap/-/stringmap-0.2.2.tgz", + "integrity": "sha1-VWwTeyWPlCuHdvWy71gqoGnX0bE=" + }, + "stringset": { + "version": "0.2.1", + "resolved": "https://registry.npmjs.org/stringset/-/stringset-0.2.1.tgz", + "integrity": "sha1-7yWcTjSTRDd/zRyRPdLoSMnAQrU=" + }, + "stringstream": { + "version": "0.0.5", + "resolved": "https://registry.npmjs.org/stringstream/-/stringstream-0.0.5.tgz", + "integrity": "sha1-TkhM1N5aC7vuGORjB3EKioFiGHg=" + }, + "strip-ansi": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz", + "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=", + "requires": { + "ansi-regex": "2.1.1" + } + }, + "strip-bom": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-1.0.0.tgz", + "integrity": "sha1-hbiGLzhEtabV7IRnqTWYFzo295Q=", + "requires": { + "first-chunk-stream": "1.0.0", + "is-utf8": "0.2.1" + } + }, + "strip-bom-stream": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/strip-bom-stream/-/strip-bom-stream-1.0.0.tgz", + "integrity": "sha1-5xRDmFd9Uaa+0PoZlPoF9D/ZiO4=", + "dev": true, + "requires": { + "first-chunk-stream": "1.0.0", + "strip-bom": "2.0.0" + }, + "dependencies": { + "strip-bom": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-2.0.0.tgz", + "integrity": "sha1-YhmoVhZSBJHzV4i9vxRHqZx+aw4=", + "dev": true, + "requires": { + "is-utf8": "0.2.1" + } + } + } + }, + "strip-dirs": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/strip-dirs/-/strip-dirs-1.1.1.tgz", + "integrity": "sha1-lgu9EoeETzl1pFWKoQOoJV4kVqA=", + "dev": true, + "requires": { + "chalk": "1.1.3", + "get-stdin": "4.0.1", + "is-absolute": "0.1.7", + "is-natural-number": "2.1.1", + "minimist": "1.2.0", + "sum-up": "1.0.3" + }, + "dependencies": { + "is-absolute": { + "version": "0.1.7", + "resolved": "https://registry.npmjs.org/is-absolute/-/is-absolute-0.1.7.tgz", + "integrity": "sha1-hHSREZ/MtftDYhfMc39/qtUPYD8=", + "dev": true, + "requires": { + "is-relative": "0.1.3" + } + }, + "is-relative": { + "version": "0.1.3", + "resolved": "https://registry.npmjs.org/is-relative/-/is-relative-0.1.3.tgz", + "integrity": "sha1-kF/uiuhvRbPsYUvDwVyGnfCHboI=", + "dev": true + } + } + }, + "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-indent": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/strip-indent/-/strip-indent-1.0.1.tgz", + "integrity": "sha1-DHlipq3vp7vUrDZkYKY4VSrhoKI=", + "requires": { + "get-stdin": "4.0.1" + } + }, + "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 + }, + "strip-outer": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/strip-outer/-/strip-outer-1.0.0.tgz", + "integrity": "sha1-qsC6YNLpDF1PJ1/Yhp/ZotMQ/7g=", + "dev": true, + "requires": { + "escape-string-regexp": "1.0.5" + } + }, + "sum-up": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/sum-up/-/sum-up-1.0.3.tgz", + "integrity": "sha1-HGYfZnBX9jvLeHWqFDi8FiUlFW4=", + "dev": true, + "requires": { + "chalk": "1.1.3" + } + }, + "supports-color": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz", + "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=" + }, + "taffydb": { + "version": "2.6.2", + "resolved": "https://registry.npmjs.org/taffydb/-/taffydb-2.6.2.tgz", + "integrity": "sha1-fLy2S1oUG2ou/CxdLGe04VCyomg=", + "dev": true + }, + "tar": { + "version": "2.2.1", + "resolved": "https://registry.npmjs.org/tar/-/tar-2.2.1.tgz", + "integrity": "sha1-jk0qJWwOIYXGsYrWlK7JaLg8sdE=", + "requires": { + "block-stream": "0.0.9", + "fstream": "1.0.11", + "inherits": "2.0.3" + } + }, + "tar-stream": { + "version": "1.5.4", + "resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-1.5.4.tgz", + "integrity": "sha1-NlSc8E7RrumyowwBQyUiONr5QBY=", + "dev": true, + "requires": { + "bl": "1.2.1", + "end-of-stream": "1.4.0", + "readable-stream": "2.3.3", + "xtend": "4.0.1" + }, + "dependencies": { + "end-of-stream": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.0.tgz", + "integrity": "sha1-epDYM+/abPpurA9JSduw+tOmMgY=", + "dev": true, + "requires": { + "once": "1.4.0" + } + }, + "isarray": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", + "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=", + "dev": true + }, + "readable-stream": { + "version": "2.3.3", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.3.tgz", + "integrity": "sha512-m+qzzcn7KUxEmd1gMbchF+Y2eIUbieUaxkWtptyHywrX0rE8QEYqPC07Vuy4Wm32/xE16NcdBctb8S0Xe/5IeQ==", + "dev": true, + "requires": { + "core-util-is": "1.0.2", + "inherits": "2.0.3", + "isarray": "1.0.0", + "process-nextick-args": "1.0.7", + "safe-buffer": "5.1.1", + "string_decoder": "1.0.3", + "util-deprecate": "1.0.2" + } + }, + "string_decoder": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz", + "integrity": "sha512-4AH6Z5fzNNBcH+6XDMfA/BTt87skxqJlO0lAh3Dker5zThcAxG6mKz+iGu308UKoPPQ8Dcqx/4JhujzltRa+hQ==", + "dev": true, + "requires": { + "safe-buffer": "5.1.1" + } + } + } + }, + "temp-dir": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/temp-dir/-/temp-dir-1.0.0.tgz", + "integrity": "sha1-CnwOom06Oa+n4OvqnB/AvE2qAR0=", + "dev": true + }, + "tempfile": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/tempfile/-/tempfile-2.0.0.tgz", + "integrity": "sha1-awRGhWqbERTRhW/8vlCczLCXcmU=", + "dev": true, + "requires": { + "temp-dir": "1.0.0", + "uuid": "3.1.0" + } + }, + "ternary-stream": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/ternary-stream/-/ternary-stream-2.0.1.tgz", + "integrity": "sha1-Bk5Im0tb9gumpre8fy9cJ07Pgmk=", + "requires": { + "duplexify": "3.5.1", + "fork-stream": "0.0.4", + "merge-stream": "1.0.1", + "through2": "2.0.3" + } + }, + "text-table": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz", + "integrity": "sha1-f17oI66AUgfACvLfSoTsP8+lcLQ=", + "dev": true + }, + "textextensions": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/textextensions/-/textextensions-1.0.2.tgz", + "integrity": "sha1-ZUhjk+4fK7A5pgy7oFsLaL2VAdI=" + }, + "tfunk": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/tfunk/-/tfunk-3.1.0.tgz", + "integrity": "sha1-OORBT8ZJd9h6/apy+sttKfgve1s=", + "dev": true, + "requires": { + "chalk": "1.1.3", + "object-path": "0.9.2" + } + }, + "throttleit": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/throttleit/-/throttleit-1.0.0.tgz", + "integrity": "sha1-nnhYNtr0Z0MUWlmEtiaNgoUorGw=", + "dev": true + }, + "through": { + "version": "2.3.8", + "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz", + "integrity": "sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU=" + }, + "through2": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.3.tgz", + "integrity": "sha1-AARWmzfHx0ujnEPzzteNGtlBQL4=", + "requires": { + "readable-stream": "2.3.3", + "xtend": "4.0.1" + }, + "dependencies": { + "isarray": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", + "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=" + }, + "readable-stream": { + "version": "2.3.3", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.3.tgz", + "integrity": "sha512-m+qzzcn7KUxEmd1gMbchF+Y2eIUbieUaxkWtptyHywrX0rE8QEYqPC07Vuy4Wm32/xE16NcdBctb8S0Xe/5IeQ==", + "requires": { + "core-util-is": "1.0.2", + "inherits": "2.0.3", + "isarray": "1.0.0", + "process-nextick-args": "1.0.7", + "safe-buffer": "5.1.1", + "string_decoder": "1.0.3", + "util-deprecate": "1.0.2" + } + }, + "string_decoder": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz", + "integrity": "sha512-4AH6Z5fzNNBcH+6XDMfA/BTt87skxqJlO0lAh3Dker5zThcAxG6mKz+iGu308UKoPPQ8Dcqx/4JhujzltRa+hQ==", + "requires": { + "safe-buffer": "5.1.1" + } + } + } + }, + "through2-filter": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/through2-filter/-/through2-filter-2.0.0.tgz", + "integrity": "sha1-YLxVoNrLdghdsfna6Zq0P4PWIuw=", + "dev": true, + "requires": { + "through2": "2.0.3", + "xtend": "4.0.1" + } + }, + "tildify": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/tildify/-/tildify-1.2.0.tgz", + "integrity": "sha1-3OwD9V3Km3qj5bBPIYF+tW5jWIo=", + "requires": { + "os-homedir": "1.0.2" + } + }, + "time-stamp": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/time-stamp/-/time-stamp-1.1.0.tgz", + "integrity": "sha1-dkpaEa9QVhkhsTPztE5hhofg9cM=" + }, + "timed-out": { + "version": "3.1.3", + "resolved": "https://registry.npmjs.org/timed-out/-/timed-out-3.1.3.tgz", + "integrity": "sha1-lYYL/MXHbCd/j4Mm/Q9bLiDrohc=", + "dev": true + }, + "tmp": { + "version": "0.0.31", + "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.31.tgz", + "integrity": "sha1-jzirlDjhcxXl29izZX6L+yd65Kc=", + "dev": true, + "requires": { + "os-tmpdir": "1.0.2" + } + }, + "to-absolute-glob": { + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/to-absolute-glob/-/to-absolute-glob-0.1.1.tgz", + "integrity": "sha1-HN+kcqnvUMI57maZm2YsoOs5k38=", + "dev": true, + "requires": { + "extend-shallow": "2.0.1" + } + }, + "to-array": { + "version": "0.1.4", + "resolved": "https://registry.npmjs.org/to-array/-/to-array-0.1.4.tgz", + "integrity": "sha1-F+bBH3PdTz10zaek/zI46a2b+JA=", + "dev": true + }, + "to-object-path": { + "version": "0.3.0", + "resolved": "https://registry.npmjs.org/to-object-path/-/to-object-path-0.3.0.tgz", + "integrity": "sha1-KXWIt7Dn4KwI4E5nL4XB9JmeF68=", + "requires": { + "kind-of": "3.2.2" + } + }, + "toposort": { + "version": "0.2.12", + "resolved": "https://registry.npmjs.org/toposort/-/toposort-0.2.12.tgz", + "integrity": "sha1-x9KYTz1IwhcxXMMtdwiIt3lJHoE=" + }, + "toSrc": { + "version": "0.1.4", + "resolved": "https://registry.npmjs.org/toSrc/-/toSrc-0.1.4.tgz", + "integrity": "sha1-pXtgueAC4cWA0yUP6hyV8iIHqaY=", + "dev": true + }, + "tough-cookie": { + "version": "2.3.2", + "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.3.2.tgz", + "integrity": "sha1-8IH3bkyFcg5sN6X6ztc3FQ2EByo=", + "requires": { + "punycode": "1.4.1" + } + }, + "trim-newlines": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/trim-newlines/-/trim-newlines-1.0.0.tgz", + "integrity": "sha1-WIeWa7WCpFA6QetST301ARgVphM=" + }, + "trim-repeated": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/trim-repeated/-/trim-repeated-1.0.0.tgz", + "integrity": "sha1-42RqLqTokTEr9+rObPsFOAvAHCE=", + "dev": true, + "requires": { + "escape-string-regexp": "1.0.5" + } + }, + "tryit": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/tryit/-/tryit-1.0.3.tgz", + "integrity": "sha1-OTvnMKlEb9Hq1tpZoBQwjzbCics=", + "dev": true + }, + "tryor": { + "version": "0.1.2", + "resolved": "https://registry.npmjs.org/tryor/-/tryor-0.1.2.tgz", + "integrity": "sha1-gUXkynyv9ArN48z5Rui4u3W0Fys=" + }, + "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.1.1" + } + }, + "tweetnacl": { + "version": "0.14.5", + "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz", + "integrity": "sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q=", + "optional": true + }, + "type-check": { + "version": "0.3.2", + "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz", + "integrity": "sha1-WITKtRLPHTVeP7eE8wgEsrUg23I=", + "dev": true, + "requires": { + "prelude-ls": "1.1.2" + } + }, + "type-is": { + "version": "1.6.15", + "resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.15.tgz", + "integrity": "sha1-yrEPtJCeRByChC6v4a1kbIGARBA=", + "dev": true, + "requires": { + "media-typer": "0.3.0", + "mime-types": "2.1.16" + } + }, + "typedarray": { + "version": "0.0.6", + "resolved": "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz", + "integrity": "sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=", + "dev": true + }, + "ua-parser-js": { + "version": "0.7.12", + "resolved": "https://registry.npmjs.org/ua-parser-js/-/ua-parser-js-0.7.12.tgz", + "integrity": "sha1-BMgamb3V3FImPqKdJMa/jUgYpLs=", + "dev": true + }, + "uglify-js": { + "version": "2.8.29", + "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-2.8.29.tgz", + "integrity": "sha1-KcVzMUgFe7Th913zW3qcty5qWd0=", + "requires": { + "source-map": "0.5.6", + "uglify-to-browserify": "1.0.2", + "yargs": "3.10.0" + }, + "dependencies": { + "camelcase": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-1.2.1.tgz", + "integrity": "sha1-m7UwTS4LVmmLLHWLCKPqqdqlijk=" + }, + "cliui": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/cliui/-/cliui-2.1.0.tgz", + "integrity": "sha1-S0dXYP+AJkx2LDoXGQMukcf+oNE=", + "requires": { + "center-align": "0.1.3", + "right-align": "0.1.3", + "wordwrap": "0.0.2" + } + }, + "wordwrap": { + "version": "0.0.2", + "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.2.tgz", + "integrity": "sha1-t5Zpu0LstAn4PVg8rVLKF+qhZD8=" + }, + "yargs": { + "version": "3.10.0", + "resolved": "https://registry.npmjs.org/yargs/-/yargs-3.10.0.tgz", + "integrity": "sha1-9+572FfdfB0tOMDnTvvWgdFDH9E=", + "requires": { + "camelcase": "1.2.1", + "cliui": "2.1.0", + "decamelize": "1.2.0", + "window-size": "0.1.0" + } + } + } + }, + "uglify-save-license": { + "version": "0.4.1", + "resolved": "https://registry.npmjs.org/uglify-save-license/-/uglify-save-license-0.4.1.tgz", + "integrity": "sha1-lXJsF8xv0XHDYX479NjYKqjEzOE=" + }, + "uglify-to-browserify": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/uglify-to-browserify/-/uglify-to-browserify-1.0.2.tgz", + "integrity": "sha1-bgkk1r2mta/jSeOabWMoUKD4grc=", + "optional": true + }, + "ultron": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/ultron/-/ultron-1.0.2.tgz", + "integrity": "sha1-rOEWq1V80Zc4ak6I9GhTeMiy5Po=", + "dev": true + }, + "unc-path-regex": { + "version": "0.1.2", + "resolved": "https://registry.npmjs.org/unc-path-regex/-/unc-path-regex-0.1.2.tgz", + "integrity": "sha1-5z3T17DXxe2G+6xrCufYxqadUPo=" + }, + "underscore": { + "version": "1.7.0", + "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.7.0.tgz", + "integrity": "sha1-a7rwh3UA02vjTsqlhODbn+8DUgk=", + "dev": true + }, + "underscore-contrib": { + "version": "0.3.0", + "resolved": "https://registry.npmjs.org/underscore-contrib/-/underscore-contrib-0.3.0.tgz", + "integrity": "sha1-ZltmwkeD+PorGMn4y7Dix9SMJsc=", + "dev": true, + "requires": { + "underscore": "1.6.0" + }, + "dependencies": { + "underscore": { + "version": "1.6.0", + "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.6.0.tgz", + "integrity": "sha1-izixDKze9jM3uLJOT/htRa6lKag=", + "dev": true + } + } + }, + "unique-stream": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/unique-stream/-/unique-stream-1.0.0.tgz", + "integrity": "sha1-1ZpKdUJ0R9mqbJHnAmP40mpLEEs=" + }, + "universalify": { + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.1.tgz", + "integrity": "sha1-+nG63UQ3r0wUiEHjs7Fl+enlkLc=" + }, + "unpipe": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz", + "integrity": "sha1-sr9O6FFKrmFltIF4KdIbLvSZBOw=", + "dev": true + }, + "untildify": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/untildify/-/untildify-2.1.0.tgz", + "integrity": "sha1-F+soB5h/dpUunASF/DEdBqgmouA=", + "requires": { + "os-homedir": "1.0.2" + } + }, + "unzip-response": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/unzip-response/-/unzip-response-1.0.2.tgz", + "integrity": "sha1-uYTwh3/AqJwsdzzB73tbIytbBv4=", + "dev": true + }, + "url-parse-lax": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/url-parse-lax/-/url-parse-lax-1.0.0.tgz", + "integrity": "sha1-evjzA2Rem9eaJy56FKxovAYJ2nM=", + "dev": true, + "requires": { + "prepend-http": "1.0.4" + } + }, + "url-regex": { + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/url-regex/-/url-regex-3.2.0.tgz", + "integrity": "sha1-260eDJ4p4QXdCx8J9oYvf9tIJyQ=", + "dev": true, + "requires": { + "ip-regex": "1.0.3" + } + }, + "user-home": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/user-home/-/user-home-1.1.1.tgz", + "integrity": "sha1-K1viOjK2Onyd640PKNSFcko98ZA=" + }, + "useragent": { + "version": "2.2.1", + "resolved": "https://registry.npmjs.org/useragent/-/useragent-2.2.1.tgz", + "integrity": "sha1-z1k+9PLRdYdei7ZY6pLhik/QbY4=", + "dev": true, + "requires": { + "lru-cache": "2.2.4", + "tmp": "0.0.31" + }, + "dependencies": { + "lru-cache": { + "version": "2.2.4", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.2.4.tgz", + "integrity": "sha1-bGWGGb7PFAMdDQtZSxYELOTcBj0=", + "dev": true + } + } + }, + "util": { + "version": "0.10.3", + "resolved": "https://registry.npmjs.org/util/-/util-0.10.3.tgz", + "integrity": "sha1-evsa/lCAUkZInj23/g7TeTNqwPk=", + "requires": { + "inherits": "2.0.1" + }, + "dependencies": { + "inherits": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz", + "integrity": "sha1-sX0I0ya0Qj5Wjv9xn5GwscvfafE=" + } + } + }, + "util-deprecate": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz", + "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=" + }, + "utils-merge": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.0.tgz", + "integrity": "sha1-ApT7kiu5N1FTVBxPcJYjHyh8ivg=", + "dev": true + }, + "uuid": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.1.0.tgz", + "integrity": "sha512-DIWtzUkw04M4k3bf1IcpS2tngXEL26YUD2M0tMDUpnUrz2hgzUBlD55a4FjdLGPvfHxS6uluGWvaVEqgBcVa+g==" + }, + "v8flags": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/v8flags/-/v8flags-2.1.1.tgz", + "integrity": "sha1-qrGh+jDUX4jdMhFIh1rALAtV5bQ=", + "requires": { + "user-home": "1.1.1" + } + }, + "vali-date": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/vali-date/-/vali-date-1.0.0.tgz", + "integrity": "sha1-G5BKWWCfsyjvB4E4Qgk09rhnCaY=", + "dev": true + }, + "validate-npm-package-license": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.1.tgz", + "integrity": "sha1-KAS6vnEq0zeUWaz74kdGqywwP7w=", + "requires": { + "spdx-correct": "1.0.2", + "spdx-expression-parse": "1.0.4" + } + }, + "vary": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/vary/-/vary-1.1.1.tgz", + "integrity": "sha1-Z1Neu2lMHVIldFeYRmUyP1h+jTc=", + "dev": true + }, + "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.3.0" + }, + "dependencies": { + "assert-plus": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz", + "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=" + } + } + }, + "vinyl": { + "version": "0.5.3", + "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-0.5.3.tgz", + "integrity": "sha1-sEVbOPxeDPMNQyUTLkYZcMIJHN4=", + "requires": { + "clone": "1.0.2", + "clone-stats": "0.0.1", + "replace-ext": "0.0.1" + } + }, + "vinyl-assign": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/vinyl-assign/-/vinyl-assign-1.2.1.tgz", + "integrity": "sha1-TRmIkbVRWRHXcajNnFSApGoHSkU=", + "dev": true, + "requires": { + "object-assign": "4.1.1", + "readable-stream": "2.3.3" + }, + "dependencies": { + "isarray": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", + "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=", + "dev": true + }, + "object-assign": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz", + "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=", + "dev": true + }, + "readable-stream": { + "version": "2.3.3", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.3.tgz", + "integrity": "sha512-m+qzzcn7KUxEmd1gMbchF+Y2eIUbieUaxkWtptyHywrX0rE8QEYqPC07Vuy4Wm32/xE16NcdBctb8S0Xe/5IeQ==", + "dev": true, + "requires": { + "core-util-is": "1.0.2", + "inherits": "2.0.3", + "isarray": "1.0.0", + "process-nextick-args": "1.0.7", + "safe-buffer": "5.1.1", + "string_decoder": "1.0.3", + "util-deprecate": "1.0.2" + } + }, + "string_decoder": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz", + "integrity": "sha512-4AH6Z5fzNNBcH+6XDMfA/BTt87skxqJlO0lAh3Dker5zThcAxG6mKz+iGu308UKoPPQ8Dcqx/4JhujzltRa+hQ==", + "dev": true, + "requires": { + "safe-buffer": "5.1.1" + } + } + } + }, + "vinyl-fs": { + "version": "0.3.14", + "resolved": "https://registry.npmjs.org/vinyl-fs/-/vinyl-fs-0.3.14.tgz", + "integrity": "sha1-mmhRzhysHBzqX+hsCTHWIMLPqeY=", + "requires": { + "defaults": "1.0.3", + "glob-stream": "3.1.18", + "glob-watcher": "0.0.6", + "graceful-fs": "3.0.11", + "mkdirp": "0.5.1", + "strip-bom": "1.0.0", + "through2": "0.6.5", + "vinyl": "0.4.6" + }, + "dependencies": { + "clone": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/clone/-/clone-0.2.0.tgz", + "integrity": "sha1-xhJqkK1Pctv1rNskPMN3JP6T/B8=" + }, + "graceful-fs": { + "version": "3.0.11", + "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-3.0.11.tgz", + "integrity": "sha1-dhPHeKGv6mLyXGMKCG1/Osu92Bg=", + "requires": { + "natives": "1.1.0" + } + }, + "readable-stream": { + "version": "1.0.34", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz", + "integrity": "sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=", + "requires": { + "core-util-is": "1.0.2", + "inherits": "2.0.3", + "isarray": "0.0.1", + "string_decoder": "0.10.31" + } + }, + "through2": { + "version": "0.6.5", + "resolved": "https://registry.npmjs.org/through2/-/through2-0.6.5.tgz", + "integrity": "sha1-QaucZ7KdVyCQcUEOHXp6lozTrUg=", + "requires": { + "readable-stream": "1.0.34", + "xtend": "4.0.1" + } + }, + "vinyl": { + "version": "0.4.6", + "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-0.4.6.tgz", + "integrity": "sha1-LzVsh6VQolVGHza76ypbqL94SEc=", + "requires": { + "clone": "0.2.0", + "clone-stats": "0.0.1" + } + } + } + }, + "vinyl-sourcemaps-apply": { + "version": "0.2.1", + "resolved": "https://registry.npmjs.org/vinyl-sourcemaps-apply/-/vinyl-sourcemaps-apply-0.2.1.tgz", + "integrity": "sha1-q2VJ1h0XLCsbh75cUI0jnI74dwU=", + "requires": { + "source-map": "0.5.6" + } + }, + "void-elements": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/void-elements/-/void-elements-2.0.1.tgz", + "integrity": "sha1-wGavtYK7HLQSjWDqkjkulNXp2+w=", + "dev": true + }, + "ware": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/ware/-/ware-1.3.0.tgz", + "integrity": "sha1-0bFPOdLiy0q4xAmPdW/ksWTkc9Q=", + "dev": true, + "requires": { + "wrap-fn": "0.1.5" + } + }, + "weinre": { + "version": "2.0.0-pre-I0Z7U9OV", + "resolved": "https://registry.npmjs.org/weinre/-/weinre-2.0.0-pre-I0Z7U9OV.tgz", + "integrity": "sha1-/viqIjkh97QLu71MPtQwL2/QqBM=", + "dev": true, + "requires": { + "express": "2.5.11", + "nopt": "3.0.6", + "underscore": "1.7.0" + }, + "dependencies": { + "connect": { + "version": "1.9.2", + "resolved": "https://registry.npmjs.org/connect/-/connect-1.9.2.tgz", + "integrity": "sha1-QogKIulDiuWait105Df1iujlKAc=", + "dev": true, + "requires": { + "formidable": "1.0.17", + "mime": "1.2.4", + "qs": "0.4.2" + } + }, + "express": { + "version": "2.5.11", + "resolved": "https://registry.npmjs.org/express/-/express-2.5.11.tgz", + "integrity": "sha1-TOjqHzY15p5J8Ou0l7aksKUc5vA=", + "dev": true, + "requires": { + "connect": "1.9.2", + "mime": "1.2.4", + "mkdirp": "0.3.0", + "qs": "0.4.2" + } + }, + "mkdirp": { + "version": "0.3.0", + "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.3.0.tgz", + "integrity": "sha1-G79asbqCevI1dRQ0kEJkVfSB/h4=", + "dev": true + }, + "qs": { + "version": "0.4.2", + "resolved": "https://registry.npmjs.org/qs/-/qs-0.4.2.tgz", + "integrity": "sha1-PKxMhh43GoycR3CsI82o3mObjl8=", + "dev": true + } + } + }, + "which": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/which/-/which-1.3.0.tgz", + "integrity": "sha512-xcJpopdamTuY5duC/KnTTNBraPK54YwpenP4lzxU8H91GudWpFv38u0CKjclE1Wi2EH2EDz5LRcHcKbCIzqGyg==", + "requires": { + "isexe": "2.0.0" + } + }, + "which-module": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/which-module/-/which-module-1.0.0.tgz", + "integrity": "sha1-u6Y8qGGUiZT/MHc2CJ47lgJsKk8=" + }, + "wide-align": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.2.tgz", + "integrity": "sha512-ijDLlyQ7s6x1JgCLur53osjm/UXUYD9+0PbYKrBsYisYXzCxN+HC3mYDNy/dWdmf3AwqwU3CXwDCvsNgGK1S0w==", + "requires": { + "string-width": "1.0.2" + } + }, + "window-size": { + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/window-size/-/window-size-0.1.0.tgz", + "integrity": "sha1-VDjNLqk7IC76Ohn+iIeu58lPnJ0=" + }, + "wiredep": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/wiredep/-/wiredep-3.0.1.tgz", + "integrity": "sha1-veYkmfmcJ7quqS+f5JhFuk6kVeo=", + "requires": { + "bower-config": "1.4.0", + "chalk": "1.1.3", + "glob": "7.1.2", + "lodash": "2.4.2", + "minimist": "1.2.0", + "propprop": "0.3.1", + "through2": "2.0.3" + }, + "dependencies": { + "lodash": { + "version": "2.4.2", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-2.4.2.tgz", + "integrity": "sha1-+t2DS5aDBz2hebPq5tnA0VBT9z4=" + } + } + }, + "wordwrap": { + "version": "0.0.3", + "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.3.tgz", + "integrity": "sha1-o9XabNXAvAAI03I0u68b7WMFkQc=" + }, + "wrap-ansi": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-2.1.0.tgz", + "integrity": "sha1-2Pw9KE3QV5T+hJc8rs3Rz4JP3YU=", + "requires": { + "string-width": "1.0.2", + "strip-ansi": "3.0.1" + } + }, + "wrap-fn": { + "version": "0.1.5", + "resolved": "https://registry.npmjs.org/wrap-fn/-/wrap-fn-0.1.5.tgz", + "integrity": "sha1-8htuQQFv9KfjFyDbxjoJAWvfmEU=", + "dev": true, + "requires": { + "co": "3.1.0" + }, + "dependencies": { + "co": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/co/-/co-3.1.0.tgz", + "integrity": "sha1-TqVOpaCJOBUxheFSEMaNkJK8G3g=", + "dev": true + } + } + }, + "wrappy": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", + "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=" + }, + "write": { + "version": "0.2.1", + "resolved": "https://registry.npmjs.org/write/-/write-0.2.1.tgz", + "integrity": "sha1-X8A4KOJkzqP+kUVUdvejxWbLB1c=", + "dev": true, + "requires": { + "mkdirp": "0.5.1" + } + }, + "ws": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/ws/-/ws-1.1.1.tgz", + "integrity": "sha1-CC3bbGQehdS7RR8D1S8G6r2x8Bg=", + "dev": true, + "requires": { + "options": "0.0.6", + "ultron": "1.0.2" + } + }, + "wtf-8": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/wtf-8/-/wtf-8-1.0.0.tgz", + "integrity": "sha1-OS2LotDxw00e4tYw8V0O+2jhBIo=", + "dev": true + }, + "xmlbuilder": { + "version": "9.0.1", + "resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-9.0.1.tgz", + "integrity": "sha1-kc1wiXdVNj66V8Et3uq0o0GmH2U=", + "dev": true + }, + "xmlcreate": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/xmlcreate/-/xmlcreate-1.0.2.tgz", + "integrity": "sha1-+mv3YqYKQT+z3Y9LA8WyaSONMI8=", + "dev": true + }, + "xmldom": { + "version": "0.1.27", + "resolved": "https://registry.npmjs.org/xmldom/-/xmldom-0.1.27.tgz", + "integrity": "sha1-1QH5ezvbQDr4757MIFcxh6rawOk=", + "dev": true + }, + "xmlhttprequest-ssl": { + "version": "1.5.3", + "resolved": "https://registry.npmjs.org/xmlhttprequest-ssl/-/xmlhttprequest-ssl-1.5.3.tgz", + "integrity": "sha1-GFqIjATspGw+QHDZn3tJ3jUomS0=", + "dev": true + }, + "xtend": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz", + "integrity": "sha1-pcbVMr5lbiPbgg77lDofBJmNY68=" + }, + "y18n": { + "version": "3.2.1", + "resolved": "https://registry.npmjs.org/y18n/-/y18n-3.2.1.tgz", + "integrity": "sha1-bRX7qITAhnnA136I53WegR4H+kE=" + }, + "yallist": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz", + "integrity": "sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI=" + }, + "yargs": { + "version": "7.1.0", + "resolved": "https://registry.npmjs.org/yargs/-/yargs-7.1.0.tgz", + "integrity": "sha1-a6MY6xaWFyf10oT46gA+jWFU0Mg=", + "requires": { + "camelcase": "3.0.0", + "cliui": "3.2.0", + "decamelize": "1.2.0", + "get-caller-file": "1.0.2", + "os-locale": "1.4.0", + "read-pkg-up": "1.0.1", + "require-directory": "2.1.1", + "require-main-filename": "1.0.1", + "set-blocking": "2.0.0", + "string-width": "1.0.2", + "which-module": "1.0.0", + "y18n": "3.2.1", + "yargs-parser": "5.0.0" + }, + "dependencies": { + "camelcase": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-3.0.0.tgz", + "integrity": "sha1-MvxLn82vhF/N9+c7uXysImHwqwo=" + } + } + }, + "yargs-parser": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-5.0.0.tgz", + "integrity": "sha1-J17PDX/+Bcd+ZOfIbkzZS/DhIoo=", + "requires": { + "camelcase": "3.0.0" + }, + "dependencies": { + "camelcase": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-3.0.0.tgz", + "integrity": "sha1-MvxLn82vhF/N9+c7uXysImHwqwo=" + } + } + }, + "yauzl": { + "version": "2.8.0", + "resolved": "https://registry.npmjs.org/yauzl/-/yauzl-2.8.0.tgz", + "integrity": "sha1-eUUK/yKyqcWkHvVOAtuQfM+/nuI=", + "dev": true, + "requires": { + "buffer-crc32": "0.2.13", + "fd-slicer": "1.0.1" + } + }, + "yeast": { + "version": "0.1.2", + "resolved": "https://registry.npmjs.org/yeast/-/yeast-0.1.2.tgz", + "integrity": "sha1-AI4G2AlDIMNy28L47XagymyKxBk=", + "dev": true + } + } +} diff --git a/package.json b/package.json index cc632968d1..0b1dacb549 100644 --- a/package.json +++ b/package.json @@ -33,7 +33,7 @@ "delete": "^0.3.2", "fs-extra": "^3.0.1", "glob": "^7.1.1", - "gulp": "^3.9.0", + "gulp": "^3.9.1", "gulp-angular-filesort": "^1.1.1", "gulp-angular-templatecache": "^2.0.0", "gulp-autoprefixer": "^3.1.0", @@ -61,36 +61,38 @@ "wiredep": "^3.0.0" }, "engines": { - "node": "6.x.x" + "node": "8.x.x" }, "devDependencies": { - "browser-sync": "^2.8.2", - "eslint": "^3.19.0", - "eslint-plugin-angular": "^1.4.1", - "express": "^4.14.0", - "gulp-eslint": "^3.0.1", - "gulp-istanbul": "^1.1.1", - "http-proxy": "^1.15.1", + "browser-sync": "^2.18.13", + "eslint": "^4.4.1", + "eslint-plugin-angular": "^3.0.2", + "express": "^4.15.4", + "gulp-eslint": "^4.0.0", + "gulp-istanbul": "^1.1.2", + "gulp-sourcemaps": "^2.6.1", + "http-proxy": "^1.16.2", "imagemin": "^5.3.1", "imagemin-pngquant": "^5.0.1", "istanbul-combine": "^0.3.0", - "jasmine-core": "^2.4.1", + "jasmine-core": "^2.7.0", "jasmine-jquery": "^2.1.1", - "jasmine-reporters": "^2.2.0", - "jasmine-spec-reporter": "^2.7.0", - "jsdoc": "^3.4.0", - "karma": "^1.3.0", - "karma-chrome-launcher": "^2.1.1", + "jasmine-reporters": "^2.2.1", + "jasmine-spec-reporter": "^4.2.1", + "jsdoc": "^3.5.4", + "karma": "^1.7.0", + "karma-chrome-launcher": "^2.2.0", "karma-cli": "^1.0.1", "karma-coverage": "^1.1.1", - "karma-jasmine": "^1.0.2", - "karma-ng-html2js-preprocessor": "^0.2.0", + "karma-jasmine": "^1.1.0", + "karma-ng-html2js-preprocessor": "^1.0.0", "karma-phantomjs-launcher": "^1.0.4", - "karma-wiredep": "1.0.1", - "phantomjs-prebuilt": "2.1.11", - "protractor": "^4.0.0", - "protractor-jasmine2-screenshot-reporter": "^0.3.3", - "request": "^2.69.0", + "karma-wiredep": "^1.0.3", + "phantomjs-prebuilt": "^2.1.15", + "protractor": "^5.1.2", + "protractor-jasmine2-screenshot-reporter": "^0.4.0", + "request": "^2.81.0", + "shelljs": "^0.7.8", "toSrc": "^0.1.4" } }