Merge upstream - #2 (#416)

* Improve recent and favourites display (cloudfoundry#4421) * Improve recent and favourites display * Remove debug logging * Remove debug logging/subscription leak * Unit test fix * Tweaks following review * Changes following review - favourite & recent icon changes Co-authored-by: Richard Cox <richard.cox@suse.com> * Add line-height to favourite and recent entity labels (cloudfoundry#4438) - missed out from another PR following review * Autoscaler e2e tests: Give better failure error when the test can't find the scaling row (cloudfoundry#4424) * Improve autoscaler e2e tests * Remove duplicate fail statement * Helm Chart: Remove encryption key volume (cloudfoundry#4355) * Remove encryption key volume * Remove encrpytion key volume migration from config-init job * Improve the logout experience (cloudfoundry#4439) * Add support for including breaking changes in the changelog * Improve the logout experience * Fix unit tests * Add request for version info to github issues template (cloudfoundry#4443) * Merge downstream (cloudfoundry#4441) * Merge src/frontend from downstream * Merge src/jetstream from jetstream * Remove examples/custom-src * Merge deploy from downstream Does not include changes to - deploy/all-in-one/* - deploy/aio-entrypoint.sh - deploy/Dockerfile.all-in-one * Merge build from downstream * Add missing merge items from deploy * Updates to package-lock * Remove fdescribe * Fix e2e core tests * Remove favicon from packages/core/src * Changes following review * Show all favorites for an endpoint favorite if there is only one (cloudfoundry#4440) * Show all favorites for the endpoint favorite if there is only one * Missing changes * Merge downstream - JSON Viewer with dark mode & Header Fixes (cloudfoundry#4444) * Fix json-viewer dark mode * Fix profile page and side nav top position following header diet - Fix side nav top position - Update fix for profile page to also work in non-desktop mode * Fix issues with tests not running if build upload fails (cloudfoundry#4453) * Fix issues with tests not running if build upload fails * Fix script * One more fix for script * Fix white space at start of file * Improve autoscaler e2e logging (cloudfoundry#4456) * Improve autoscaler e2e logging - it looks like the AS returns scaling events 1-2 mins after they occur, which is too late for the test - add additional logging to print out event table data in case of alternative events being raised - fix logging if wait for events times out - add hint in later test that depends on AS scaling event * Ensure only the schedule rule results in scaling events * Fix check-e2e-pr.sh for pr's from other repos (cloudfoundry#4459) - switch from TRAVIS_PULL_REQUEST_SLUG to TRAVIS_REPO_SLUG * Convert Client Secret Input Fields to `password` (cloudfoundry#4455) * Insecure tlsv10 and tlsv11 ciphers in Stratos UI, bsc#1173295 (#411) (cloudfoundry#4460) Co-authored-by: Michal Jura <mjura@users.noreply.github.com> * [Security] Bump codecov from 3.7.0 to 3.7.1 (cloudfoundry#4457) Bumps [codecov](https://github.com/codecov/codecov-node) from 3.7.0 to 3.7.1. **This update includes a security fix.** - [Release notes](https://github.com/codecov/codecov-node/releases) - [Commits](codecov/codecov-node@v3.7.0...v3.7.1) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com> * Bump lodash from 4.17.15 to 4.17.19 (cloudfoundry#4452) Bumps [lodash](https://github.com/lodash/lodash) from 4.17.15 to 4.17.19. - [Release notes](https://github.com/lodash/lodash/releases) - [Commits](lodash/lodash@4.17.15...4.17.19) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Convert scripts to nodejs so they work on Windows (cloudfoundry#4462) * Convert scripts to js so they work on Windows * Improve initial developer experience * Fix scss compile on windows * Fix windows build * Use fs not fs-extra where possible (can work without npm install) * Remove gulp * Cleaner fixes for Windows * Reset * Fix whitespace * Address PR feedback Co-authored-by: Neil MacDougall <nmacdougall@suse.com> * Shorten file paths containing `cloudfoundry`/`cloud-foundry` (cloudfoundry#4466) * Fix 'too long' file paths * Fix build issues * Convert scripts to js so they work on Windows * Fix scss compile on windows * Improve initial developer experience * Fix scss compile on windows * Fix windows build * Use fs not fs-extra where possible (can work without npm install) * Remove gulp * Cleaner fixes for Windows * Reset * Fix whitespace * Fix merge Co-authored-by: Neil MacDougall <neil.macdougall@suse.com> Co-authored-by: Neil MacDougall <nmacdougall@suse.com> Co-authored-by: Neil MacDougall <nwmac@users.noreply.github.com> * Fix log out page when there's a custom log in page * Fix log out page given previous commit changes Co-authored-by: Neil MacDougall <nwmac@users.noreply.github.com> Co-authored-by: Michal Jura <mjura@users.noreply.github.com> Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Neil MacDougall <nmacdougall@suse.com> Co-authored-by: Neil MacDougall <neil.macdougall@suse.com>
SUSE · Jul 24, 2020 · 7298642 · 7298642
1 parent 8cde7b6
commit 7298642
Show file tree

Hide file tree

Showing 404 changed files with 652 additions and 579 deletions.
diff --git a/build/clean-symlinks.js b/build/clean-symlinks.js
@@ -0,0 +1,40 @@
+// Clean any symlinks from a pre 4.0 Stratos
+// These are no longer used for customization and need to be removed
+
+// Implemented as a single script here so that it works on Windows, Linux and Mac
+
+const path = require('path');
+const fs = require('fs');
+
+// __dirname is the folder where build.js is located
+const STRATOS_DIR= path.resolve(__dirname, '..');
+
+function processFile(filepath) {
+  if (fs.existsSync(filepath)) {
+    const stats = fs.lstatSync(filepath);
+    if (stats.isSymbolicLink()) {
+      console.log(`Removing symlink ${filepath}`);
+      fs.unlinkSync(filepath);
+    }
+  }
+}
+
+function processFolder(dir) {
+  if (!fs.existsSync(dir)) {
+    return
+  }
+  fs.readdirSync(dir).forEach( f => {
+    let dirPath = path.join(dir, f);
+    const realPath = fs.realpathSync(dirPath);
+    const stats = fs.lstatSync(realPath);
+    if (stats.isDirectory()) {
+      processFolder(dirPath);
+    } else {
+      processFile(dirPath);
+    }
+  });
+};
+
+processFolder(path.join(STRATOS_DIR, 'src', 'frontend', 'packages', 'core', 'sass'));
+processFolder(path.join(STRATOS_DIR, 'src', 'frontend', 'packages', 'core', 'assets'));
+processFile(path.join(STRATOS_DIR, 'src', 'frontend', 'packages', 'core', 'favicon.ico'));
diff --git a/build/clean-symlinks.sh b/build/clean-symlinks.sh
diff --git a/build/dev-setup.js b/build/dev-setup.js
@@ -0,0 +1,30 @@
+// Copy files required for developer quick start
+// Implemented as a single script here so that it works on Windows, Linux and Mac
+
+const path = require('path');
+const fs = require('fs');
+
+// __dirname is the folder where build.js is located
+const STRATOS_DIR= path.resolve(__dirname, '..');
+
+// Only copy files if they are not already there - just make sure initial versions are in place for developer
+
+// Proxy config file
+const PROXY_CONF = path.join(STRATOS_DIR, 'proxy.conf.js');
+if (!fs.existsSync(PROXY_CONF)) {
+  let err = fs.copyFileSync(path.join(__dirname, 'proxy.conf.localdev.js'), PROXY_CONF);
+  if (err) {
+    console.log(err);
+  }
+}
+
+// config.properties
+const BACKEND_DIR = path.join(STRATOS_DIR, 'src', 'jetstream');
+const BACKEND_CONF = path.join(BACKEND_DIR, 'config.properties');
+const BACKEND_CONF_DEV = path.join(BACKEND_DIR, 'config.dev');
+if (!fs.existsSync(BACKEND_CONF)) {
+  let err = fs.copyFileSync(BACKEND_CONF_DEV, BACKEND_CONF);
+  if (err) {
+    console.log(err);
+  }
+}
diff --git a/build/fe-build.js b/build/fe-build.js
diff --git a/build/gulp.config.js b/build/gulp.config.js
diff --git a/build/prebuild-zip.js b/build/prebuild-zip.js
@@ -0,0 +1,16 @@
+// Zip the dist folder
+// Implemented as a single script here so that it works on Windows, Linux and Mac
+
+const path = require('path');
+const fs = require('fs');
+const AdmZip = require('adm-zip');
+
+// __dirname is the folder where build.js is located
+const STRATOS_DIR= path.resolve(__dirname, '..');
+const DIST_DIR= path.join(STRATOS_DIR, 'dist');
+const ZIP_FILE= path.join(STRATOS_DIR, 'stratos-frontend-prebuild.zip');
+
+var zip = new AdmZip();
+
+zip.addLocalFolder(DIST_DIR);
+zip.writeZip(path.join(ZIP_FILE));
diff --git a/build/store-git-metadata.js b/build/store-git-metadata.js
@@ -0,0 +1,38 @@
+// Generate the git metadata file
+
+// Implemented as a single script here so that it works on Windows, Linux and Mac
+
+const path = require('path');
+const fs = require('fs');
+const execSync = require('child_process').execSync;
+
+// __dirname is the folder where build.js is located
+const STRATOS_DIR = path.resolve(__dirname, '..');
+const GIT_FOLDER = path.join(STRATOS_DIR, '.git');
+const GIT_METADATA = path.join(STRATOS_DIR, '.stratos-git-metadata.json');
+
+function execGit(cmd) {
+  try {
+    var response = execSync(cmd);
+    return response.toString().trim();
+  } catch (e) {
+    console.log(e)
+    return '';
+  }
+}
+
+// We can only do this if we have a git repository checkout
+// We'll store this in a file which we will then use - when in environments like Docker, we will run this
+// in the host environment so that we can pick it up when we're running in the Docker world
+// Do we have a git folder?
+if (!fs.existsSync(GIT_FOLDER)) {
+  console.log('  + Unable to store git repository metadata - .git folder not found');
+  return;
+}
+var gitMetadata = {
+  project: execGit('git config --get remote.origin.url'),
+  branch: execGit('git rev-parse --abbrev-ref HEAD'),
+  commit: execGit('git rev-parse HEAD')
+};
+
+fs.writeFileSync(GIT_METADATA, JSON.stringify(gitMetadata, null, 2));
diff --git a/deploy/ci/travis/check-e2e-pr.sh b/deploy/ci/travis/check-e2e-pr.sh
@@ -2,8 +2,8 @@
 
 if [ -n "${TRAVIS_PULL_REQUEST}" ]; then
   if [ "${TRAVIS_PULL_REQUEST}" != "false" ]; then
-    echo "Checking labels on ${TRAVIS_PULL_REQUEST_SLUG} #${TRAVIS_PULL_REQUEST}"
-    LABEL=$(curl -s "https://api.github.com/repos/${TRAVIS_PULL_REQUEST_SLUG}/pulls/${TRAVIS_PULL_REQUEST}" | jq -r '.labels[] | select(.name == "e2e-debug") | .name')
+    echo "Checking labels on ${TRAVIS_REPO_SLUG} #${TRAVIS_PULL_REQUEST}"
+    LABEL=$(curl -s "https://api.github.com/repos/${TRAVIS_REPO_SLUG}/pulls/${TRAVIS_PULL_REQUEST}" | jq -r '.labels[] | select(.name == "e2e-debug") | .name')
     if [ "${LABEL}" == "e2e-debug" ]; then
       echo "PR has the 'e2e-debug' label - enabling debug logging for E2E tests"
       export STRATOS_E2E_DEBUG=true

diff --git a/deploy/stratos-ui-release/packages/backend/pre_packaging b/deploy/stratos-ui-release/packages/backend/pre_packaging
@@ -11,7 +11,7 @@ curl https://raw.githubusercontent.com/golang/dep/master/install.sh | sh
 # Build backend
 npm install
 export PATH=$PATH:$PWD/node_modules/.bin
-npm run bosh-build-backend
+npm run build-backend
 
 find ../stratos/deploy -type d   ! -path '../stratos/deploy' ! -path '*/db' -maxdepth 1 |  xargs rm -rf
 

diff --git a/docs/developers-guide.md b/docs/developers-guide.md
@@ -212,7 +212,7 @@ db provider this can be done by deleting `src/jetstream/console-database.db`
 
 #### Configure by Environment Variables and/or Config File
 
-By default, the configuration in file `src/jetstream/default.config.properties` will be used. These can be changed by environment variables
+By default, the configuration in file `src/jetstream/config.properties` will be used. These can be changed by environment variables
 or an overrides file.
 
 ##### Environment variable
@@ -238,7 +238,7 @@ If you have a custom uaa, ensure you have set the following environment variable
 
 ##### Config File
 
-To easily persist configuration settings copy `src/jetstream/default.config.properties` to `src/jetstream/config.properties`. The backend will load its
+To easily persist configuration settings copy `src/jetstream/config.example` to `src/jetstream/config.properties`. The backend will load its
 configuration from this file in preference to the default config file, if it exists. You can also modify individual configuration settings
 by setting the corresponding environment variable.
 

diff --git a/gulpfile.js b/gulpfile.js
diff --git a/package-lock.json b/package-lock.json