Merge branch 'entity-catalogue-store' into store-cf-reducers2

* entity-catalogue-store: (196 commits) Improve disable polling messaging Remove console log Fix forever waiting waitForCFPermissions - seen in ibm endpoint causing users & other stats to not load (org card details) Fix orgSpacePostProcess Fix autoscaler compile errors Non-autoscaler fixes Tidy up some styling - Ensure autoscaller tiles take up full width when page is shrunk horizontally - position of polling indicator on recent apps - app-tile margin removed from top and added to bottom (fixes app/cf summary pages) - added min height to latest metrics card to avoid vertical wibble on refresh [autoscaler] using app-polling-indicator to replace refresh-icon Fix syntax error Fix unit tests Add app polling controller (#3683) Fix connect to IBM Cloud (#3715) Additional invite user logging and nav changes (#3716) Update package lock Ensure user invites template path is set Ensure both private and shared domains are included in domain lists (#3695) Fix typo in file path Ensuer user invite templates are included in the image Fix e2e tests when running against a UAA with no explicit zone (cfdev) (#3713) Add logging ...
cloudfoundry · Jul 26, 2019 · d54956c · d54956c
2 parents aa8ef7f + 34897cc
commit d54956c
Show file tree

Hide file tree

Showing 293 changed files with 15,501 additions and 3,988 deletions.
diff --git a/angular.json b/angular.json
@@ -28,6 +28,7 @@
             ],
             "styles": [
               "src/frontend/packages/core/src/styles.scss",
+              "src/frontend/packages/cf-autoscaler/src/styles.scss",
               "node_modules/xterm/dist/xterm.css"
             ],
             "scripts": []
@@ -114,7 +115,8 @@
               }
             ],
             "styles": [
-              "src/frontend/packages/core/src/styles.css"
+              "src/frontend/packages/core/src/styles.css",
+              "src/frontend/packages/cf-autoscaler/src/styles.css"
             ],
             "scripts": []
           },
@@ -285,6 +287,37 @@
           }
         }
       }
+    },
+    "cf-autoscaler": {
+      "root": "src/frontend/packages/cf-autoscaler",
+      "sourceRoot": "src/frontend/packages/cf-autoscaler/src",
+      "projectType": "library",
+      "prefix": "lib",
+      "architect": {
+        "build": {
+          "builder": "@angular-devkit/build-ng-packagr:build",
+          "options": {
+            "tsConfig": "src/frontend/packages/cf-autoscaler/tsconfig.lib.json",
+            "project": "src/frontend/packages/cf-autoscaler/ng-package.json"
+          }
+        },
+        "test": {
+          "builder": "@angular-devkit/build-angular:karma",
+          "options": {
+            "main": "src/frontend/packages/cf-autoscaler/src/test.ts",
+            "tsConfig": "src/frontend/packages/cf-autoscaler/tsconfig.spec.json",
+            "karmaConfig": "src/frontend/packages/cf-autoscaler/karma.conf.js"
+          }
+        },
+        "lint": {
+          "builder": "@angular-devkit/build-angular:tslint",
+          "options": {
+            "tsConfig": ["src/tsconfig.json"],
+            "tslintConfig": "src/frontend/packages/cf-autoscaler/tslint.json",
+            "files": ["src/frontend/packages/cf-autoscaler/src/**/*.ts"]
+          }
+        }
+      }
     }
   },
   "defaultProject": "stratos",

diff --git a/deploy/Dockerfile.all-in-one b/deploy/Dockerfile.all-in-one
@@ -23,6 +23,8 @@ COPY --from=builder /home/stratos/dev-certs /srv/dev-certs
 COPY --from=builder /home/stratos/ui /srv/ui
 COPY --from=builder /home/stratos/jetstream /srv/jetstream
 COPY --from=builder /home/stratos/config.properties /srv/config.properties
+# User Invite templates
+COPY --from=builder /home/stratos/src/jetstream/templates /srv/templates
 
 EXPOSE 443
 

diff --git a/deploy/all-in-one/config.all-in-one.properties b/deploy/all-in-one/config.all-in-one.properties
@@ -11,3 +11,5 @@ SESSION_STORE_SECRET=wheeee!
 ENCRYPTION_KEY=B374A26A71490437AA024E4FADD5B497FDFF1A8EA6FF12F6FB65AF2720B59CCF
 STRATOS_DEPLOYMENT_DOCKER_AIO=true
 SKIP_SSL_VALIDATION=true
+
+TEMPLATE_DIR=./templates
diff --git a/deploy/ci/automation/cfallinonetest.sh b/deploy/ci/automation/cfallinonetest.sh
@@ -43,8 +43,18 @@ CONTAINER_ID=$(docker run \
 -e UAA_ENDPOINT="${UAA}" \
 -e SKIP_SSL_VALIDATION='true' \
 -e CONSOLE_ADMIN_SCOPE='cloud_controller.admin' \
+-e SMTP_HOST="${SMTP_HOST}" \
+-e SMTP_FROM_ADDRESS="${SMTP_FROM_ADDRESS}" \
 $IMAGE)
 
+# Show backend log - wait a few seconds for it to start up
+
+echo "Backend startup log ..."
+sleep 20
+docker logs ${CONTAINER_ID} | tail -n 100
+
+echo "Preparing E2E Tests..."
+
 # Need node modules to run the tests
 rm -rf node_modules
 npm install

diff --git a/deploy/ci/automation/cfpushtest.sh b/deploy/ci/automation/cfpushtest.sh
@@ -1,5 +1,12 @@
 #!/bin/bash
 
+GREEN='\033[0;32m'
+RED='\033[0;31m'
+CYAN="\033[96m"
+YELLOW="\033[93m"
+BOLD="\033[1m"
+RESET='\033[0m'
+
 echo "===================="
 echo "Stratos CF Push Test"
 echo "===================="
@@ -83,6 +90,15 @@ echo "    env:" >> $MANIFEST
 echo "      SKIP_AUTO_REGISTER: true" >> $MANIFEST
 echo "      FORCE_ENABLE_PERSISTENCE_FEATURES: true" >> $MANIFEST
 
+# Make sure we add invite users config if set
+if [ -n "${SMTP_HOST}" ]; then
+  echo "      SMTP_HOST: ${SMTP_HOST}" >> $MANIFEST
+fi
+
+if [ -n "${SMTP_FROM_ADDRESS}" ]; then
+  echo "      SMTP_FROM_ADDRESS: ${SMTP_FROM_ADDRESS}" >> $MANIFEST
+fi
+
 # SSO
 SUITE=""
 if [ "$2" == "sso" ] || [ "$3" == "sso" ] ; then
@@ -101,7 +117,7 @@ cat $MANIFEST
 
 # Prebuild
 if [ "$2" == "prebuild" ]; then
-  echo "Pre-building UI ..."
+  echo -e "${CYAN}Pre-building UI ...${RESET}"
   npm install
   npm run prebuild-ui
 fi
@@ -118,9 +134,20 @@ date
 if [ $RET -ne 0 ]; then
   set +e
   echo "Push failed... showing recent log of the Stratos app"
-  cf logs console --recent
+  cf logs --recent console
   set -e
 else
+
+  # Show the recent logs just we can see startup settings
+  echo -e "${BOLD}${GREEN}Showing recent logs of the Stratos App${RESET}"
+  cf logs --recent console | tail -n 100
+
+  echo -e "${BOLD}${GREEN}"
+  echo "==============================================================================="
+  echo ""
+  echo "Running E2E Tests...."
+  echo -e "${RESET}"
+
   # Push was okay, so we can prepare and run E2E tests
   rm -rf node_modules
   npm install

diff --git a/deploy/ci/automation/e2e-clean-remnants.sh b/deploy/ci/automation/e2e-clean-remnants.sh
@@ -101,4 +101,8 @@ echo "Cleaning test Users"
 USERS=$(cf space-users e2e e2e | grep "accept" | sed -e 's/^[[:space:]]*//')
 clean "$USERS" "-" "delete-user" "^(acceptancee2etravis)(invite[0-9])(20[0-9]*)[Tt]([0-9]*)[zZ].*"
 
+# user -a with org users so we get all users (including those without roles)
+USERS=$(cf org-users -a e2e | grep "accept" | sed -e 's/^[[:space:]]*//')
+clean "$USERS" "-" "delete-user" "^(acceptancee2etravis)(invite[0-9])(20[0-9]*)[Tt]([0-9]*)[zZ].*"
+
 echo "Done"
diff --git a/deploy/ci/automation/helmtest.sh b/deploy/ci/automation/helmtest.sh
@@ -42,6 +42,7 @@ function deleteRelease {
 function waitForHelmRelease {
   echo "Waiting for Stratos Helm Release to be ready..."
   local DONE="false"
+  local TIMEOUT=0
   while [ $DONE != "true" ]; do
     COUNT=$(kubectl get po --namespace=${NAMESPACE} | wc -l)
     kubectl get po --namespace=${NAMESPACE}
@@ -63,6 +64,11 @@ function waitForHelmRelease {
     if [ "$DONE" != "true" ]; then
       echo "Waiting for Stratos Helm release to be ready..."
       sleep 5
+      TIMEOUT=$((TIMEOUT+1))
+      if [ ${TIMEOUT} -gt 60 ]; then
+        echo "Timed out waiting for Helm release to be ready"
+        exit 1
+      fi
     fi
   done
 }

diff --git a/deploy/ci/scripts/build-docker-image-resource.sh b/deploy/ci/scripts/build-docker-image-resource.sh
@@ -9,9 +9,10 @@ mkdir -p ./tmp
 cd ./tmp
 git clone https://github.com/concourse/docker-image-resource.git
 cp ../docker-image-out-asset ./docker-image-resource/assets/out
+cp ../docker-image-common.sh ./docker-image-resource/assets/common.sh
 chmod +x ./docker-image-resource/assets/out
 
-docker build ./docker-image-resource -t splatform/stratos-concourse-docker-image-resource:latest
+docker build ./docker-image-resource -f ./docker-image-resource/dockerfiles/alpine/Dockerfile -t splatform/stratos-concourse-docker-image-resource:latest
 docker push splatform/stratos-concourse-docker-image-resource:latest
 rm -rf ./tmp
 echo "All done"