Merge branch 'v2-master' into tabs-layout-change

* v2-master: (415 commits) CC Fix CC Fixed and copy change Update fetch all users max pagination Merge fixes Minor text change Small text change Minor change to the invite table header Update invite users text Update the docs guide Update docs Fix unit test Fix imports Publish release pipeline fix (#3404) Re-instate setup mode Weekly update Ensure we don't add invalid state when reseting pagination Add create-many-users script Automated test script improvements and fixes (#3402) Fixed date --> data typo Remove TODOs for now ...
cloudfoundry · Feb 19, 2019 · e2f41a1 · e2f41a1
2 parents ede7a61 + 7eabb7d
commit e2f41a1
Show file tree

Hide file tree

Showing 622 changed files with 19,401 additions and 6,750 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -59,6 +59,9 @@ jobs:
     - curl https://raw.githubusercontent.com/golang/dep/master/install.sh | sh
     script:
     - npm run test-backend
+  - name: Helm Chart Unit Tests
+    script:
+    - "./deploy/ci/travis/helm-chart-unit-tests.sh"
   - name: E2E Tests - Long Suite
     before_script:
     - "./deploy/ci/travis/job-e2e-before_script.sh"

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,66 @@
 # Change Log
 
+## 2.3.0
+
+[Full Changelog](https://github.com/cloudfoundry-incubator/stratos/compare/2.2.0...2.3.0)
+
+This release contains a number of fixes and improvements:
+
+**Fixes:**
+- Service instance names should be limited to 50 chars [\#3262](https://github.com/cloudfoundry-incubator/stratos/issues/3262)
+- Metrics Charts: CPU usage tooltip should round value [\#3336](https://github.com/cloudfoundry-incubator/stratos/issues/3336)
+- Allow apps in "offline while updating" state to be started[\#3332](https://github.com/cloudfoundry-incubator/stratos/issues/3332)
+- Manage Users - space table filtering does not work “Search by space name” [\#3329](https://github.com/cloudfoundry-incubator/stratos/issues/3329)
+- Make it clearer that you can manage roles for multiple users [\#3250](https://github.com/cloudfoundry-incubator/stratos/issues/3250)
+- Register an endpoint arrow misaligned [\#3221](https://github.com/cloudfoundry-incubator/stratos/issues/3221)
+- Fix exception when navigating away from the first deploy app step [\#3277](https://github.com/cloudfoundry-incubator/stratos/pull/3277)
+- Ensure we don't try to get length of undefined endpoint description [\#3274](https://github.com/cloudfoundry-incubator/stratos/pull/3274)
+- Fix null exception after creating a space in an new org [\#3351](https://github.com/cloudfoundry-incubator/stratos/pull/3351)
+- Fixes double requests when single cf connected for lists with cf filter [\#3313](https://github.com/cloudfoundry-incubator/stratos/pull/3313)
+- Fix auto select of single items in multi filter list [\#3306](https://github.com/cloudfoundry-incubator/stratos/pull/3306)
+- Ensure an empty errorResponse gets picked up as a jetstream error [\#3301](https://github.com/cloudfoundry-incubator/stratos/pull/3301)
+- Validate entity names locally [\#3296](https://github.com/cloudfoundry-incubator/stratos/pull/3296)
+- Application Environment Variables fixes & improvements [\#3286](https://github.com/cloudfoundry-incubator/stratos/pull/3286)
+- Hide app vars tab if user is not a space developer [\#3247](https://github.com/cloudfoundry-incubator/stratos/pull/3247)
+- Limit card titles to two-lines with ellipsis/fade out [\#3241](https://github.com/cloudfoundry-incubator/stratos/pull/3241)
+- Fix CLI info formatting [\#3237](https://github.com/cloudfoundry-incubator/stratos/pull/3237)
+- Add Route: Use correct label for submit button [\#3231](https://github.com/cloudfoundry-incubator/stratos/pull/3231)
+- Fix for cancel broken on add route [\#3228](https://github.com/cloudfoundry-incubator/stratos/pull/3228)
+- Fix display of generic error bar [\#3214](https://github.com/cloudfoundry-incubator/stratos/pull/3214)
+- Only show + icon when we have at least one connected CF [\#3211](https://github.com/cloudfoundry-incubator/stratos/pull/3211)
+- Cannot deploy application from folder upload [\#3188](https://github.com/cloudfoundry-incubator/stratos/pull/3188)
+- Fix issue where only first 100 services were shown in service marketplace [\#3161](https://github.com/cloudfoundry-incubator/stratos/pull/3161)
+- Fix marketplace provisioning for asynchronous services [\#3086](https://github.com/cloudfoundry-incubator/stratos/pull/3086)
+
+**Improvements:**
+- App Deploy: Add Public GitLab Repository support [\#3239](https://github.com/cloudfoundry-incubator/stratos/pull/3239)
+- Add a routes list to the CF tabs, Routes Refactor & Route Bug Fixes [\#3292](https://github.com/cloudfoundry-incubator/stratos/pull/3292)
+- Add deployment info for apps deployed via docker & fix info for local/archive apps [\#3291](https://github.com/cloudfoundry-incubator/stratos/pull/3291)
+- Add service plan list to service pages [\#3275](https://github.com/cloudfoundry-incubator/stratos/pull/3275)
+- Add Org and Space status bar to Org/Space Cards [\#3265](https://github.com/cloudfoundry-incubator/stratos/pull/3265)
+- Add service provider name to marketplace service card [\#3268](https://github.com/cloudfoundry-incubator/stratos/pull/3268)
+- Add link to dashboard in service instance table [\#3267](https://github.com/cloudfoundry-incubator/stratos/pull/3267)
+- Add confirmation dialog to `Restage` app [\#3263](https://github.com/cloudfoundry-incubator/stratos/pull/3263)
+- Add support for JSON Schemas when binding services to applications [\#3050](https://github.com/cloudfoundry-incubator/stratos/pull/3050)
+- Scalability Improvements: Handle large number of apps in cf dashboards [\#3212](https://github.com/cloudfoundry-incubator/stratos/pull/3212)
+- Support prometheus-boshrelease as a metrics endpoint [\#3202](https://github.com/cloudfoundry-incubator/stratos/pull/3202)
+- Show better error message on login screen when account locked [\#3235](https://github.com/cloudfoundry-incubator/stratos/pull/3235)
+- Helm Chart Service port configuration improvements  [\#3264](https://github.com/cloudfoundry-incubator/stratos/pull/3264)
+- List Multifilter Improvements [\#3270](https://github.com/cloudfoundry-incubator/stratos/pull/3270)
+- Stratos can now be deployed as a CF App using docker image [\#3294](https://github.com/cloudfoundry-incubator/stratos/pull/3294)
+- Create stable docker image [\#3307](https://github.com/cloudfoundry-incubator/stratos/issues/3307)
+- About Page Title customization support [\#3356](https://github.com/cloudfoundry-incubator/stratos/pull/3356)
+- Make the table multi actions more obvious [\#3251](https://github.com/cloudfoundry-incubator/stratos/pull/3251)
+- Use SHA256 to compare SSH public key fingerprint [\#3249](https://github.com/cloudfoundry-incubator/stratos/pull/3249)
+- Show refresh button for latest modified application lists [\#3213](https://github.com/cloudfoundry-incubator/stratos/pull/3213)
+- Improve focus & tabbing [\#3288](https://github.com/cloudfoundry-incubator/stratos/pull/3288)
+- Tidy up CLI login info [\#3269](https://github.com/cloudfoundry-incubator/stratos/pull/3269)
+- Reduce size of Docker All-in-one image [\#3261](https://github.com/cloudfoundry-incubator/stratos/pull/3261)
+- Remove global manage apps link [\#3259](https://github.com/cloudfoundry-incubator/stratos/pull/3259)
+- Add user has roles filter to users tables [\#3258](https://github.com/cloudfoundry-incubator/stratos/pull/3258)
+- Deploy App: Add notification toast [\#3242](https://github.com/cloudfoundry-incubator/stratos/pull/3242)
+- Update app instance cell data when scaling up [\#3133](https://github.com/cloudfoundry-incubator/stratos/pull/3133)
+
 ## 2.2.0
 
 [Full Changelog](https://github.com/cloudfoundry-incubator/stratos/compare/2.1.2...2.2.0)

diff --git a/Gopkg.lock b/Gopkg.lock
diff --git a/Gopkg.toml b/Gopkg.toml
@@ -30,6 +30,14 @@
   source = "github.com/nwmac/go-flags"
   version = "=1.1"
 
+[[override]]
+  name = "github.com/labstack/echo"
+  version = ">=3.3.7"
+
 [prune]
   go-tests = true
   unused-packages = true
+
+[[constraint]]
+  name = "github.com/domodwyer/mailyak"
+  version = "3.1.1"
diff --git a/deploy/all-in-one/README.md b/deploy/all-in-one/README.md
@@ -8,6 +8,18 @@ You will need to have installed Docker, see:
 
 * [Docker](https://docs.docker.com/engine/installation/)
 
+## Note regarding the Stratos Session Store Secret
+
+Stratos uses a secret to protect the Session cookie it uses to identify users. By default it will generate a random value for this secret.
+
+We recommend configuring an alphanumeric secret of your choice by setting the `SESSION_STORE_SECRET` environment variable.
+
+This can be done by adding the following to the docker run command shown in the section below:
+
+```
+-e SESSION_STORE_SECRET=<alphanumeric secret>
+```
+
 ## Building the container:
 
 To build the container, change directory to the root of the project and open a command prompt:
@@ -35,6 +47,8 @@ You will be presented with the Stratos Setup welcome screen - you will need to e
 
 ## Pushing the All-In-One Docker Image to Cloud Foundry
 
+> Note: We recommend setting the session store secret - please use a manifest file for this and set the `SESSION_STORE_SECRET` environment variable.
+
 The All-In-One Docker Image can be pushed to Cloud Foundry.
 
 Firstly, build the image and push it to a Docker registry, so that it is available to Cloud Foundry, e.g. to build and push to Docker Hub, in the project root directory run:

diff --git a/deploy/ci/README.md b/deploy/ci/README.md
@@ -0,0 +1 @@
+Concourse pipelines
diff --git a/deploy/ci/automation/cfallinonetest.sh b/deploy/ci/automation/cfallinonetest.sh
@@ -29,20 +29,22 @@ fi
 
 echo "Running Stratos All-in-one"
 
+CF=https://api.${CF_DOMAIN}
+UAA=$(curl -k -s $CF | jq -r .links.uaa.href)
+
+echo "Using UAA Endpoint: ${UAA}"
+
 # Run the all-in-one Stratos
 # Configure env to use the UAA provided by PCF dev
 CONTAINER_ID=$(docker run \
 -d \
 -p 5443:443 \
 -e CONSOLE_CLIENT='cf' \
--e UAA_ENDPOINT='https://login.local.pcfdev.io' \
+-e UAA_ENDPOINT="${UAA}" \
 -e SKIP_SSL_VALIDATION='true' \
 -e CONSOLE_ADMIN_SCOPE='cloud_controller.admin' \
 $IMAGE)
 
-# Get the E2E config
-curl -k ${TEST_CONFIG_URL} --output secrets.yaml
-
 # Need node modules to run the tests
 rm -rf node_modules
 npm install
@@ -61,10 +63,7 @@ set +e
 # Kill the docker container
 docker kill $CONTAINER_ID
 
-# Pause the PCF Dev instance for now
-echo "Suspending PCF Dev"
-cf pcfdev suspend
-cf pcfdev status
+echo "All done"
 
 # Return exit code form the e2e tests
 exit $RET
diff --git a/deploy/ci/automation/cfdockercomposetest.sh b/deploy/ci/automation/cfdockercomposetest.sh
@@ -31,20 +31,31 @@ mkdir -p "${E2E_REPORT_FOLDER}/logs"
 
 echo "Running Stratos in Docker Compose"
 pushd deploy
-#docker-compose -f docker-compose.development.yml up -d | tee "${E2E_REPORT_FOLDER}/logs/build.log"
-docker-compose -f docker-compose.development.yml up -d
+
+# Patch the docker compose file to run Stratos on a different port
+rm -f docker-compose.testing.yml
+rm -f common.testing.yml
+rm -f *.bak
+sed -e 's/80:80/2080:80/g' common.yml > common.testing.yml
+sed -i.bak -e 's/443:443/2443:443/g' common.testing.yml
+sed -e 's/file: common.yml/file: common.testing.yml/g' docker-compose.development.yml > docker-compose.testing.yml
+
+docker-compose -f docker-compose.testing.yml up -d
 popd
 
-# Get the E2E config
-rm -f secrets.yaml
-curl -k ${TEST_CONFIG_URL} --output secrets.yaml
+echo "Docker Containers"
+docker ps
+
+# Wait for the UAA to become available
+echo "Waiting 30 seconds for UAA to start up ..."
+sleep 30
 
 # Need node modules to run the tests
 rm -rf node_modules
 npm install
 
 # Run the E2E tests
-"$DIRPATH/runandrecord.sh" https://localhost:443
+"$DIRPATH/runandrecord.sh" https://127.0.0.1:2443
 RET=$?
 
 set +e
@@ -53,19 +64,16 @@ pushd deploy
 
 # Store logs if there was a test failure
 if [ $RET -ne 0 ]; then
-  docker-compose -f docker-compose.development.yml logs proxy > "${E2E_REPORT_FOLDER}/logs/jetstream.log"
-  docker-compose -f docker-compose.development.yml logs db-migrator > "${E2E_REPORT_FOLDER}/logs/db-migrator.log"
-  docker-compose -f docker-compose.development.yml logs nginx > "${E2E_REPORT_FOLDER}/logs/nginx.log"
-  docker-compose -f docker-compose.development.yml logs mariadb > "${E2E_REPORT_FOLDER}/logs/mariadb.log"
+  docker-compose -f docker-compose.testing.yml logs proxy > "${E2E_REPORT_FOLDER}/logs/jetstream.log"
+  docker-compose -f docker-compose.testing.yml logs db-migrator > "${E2E_REPORT_FOLDER}/logs/db-migrator.log"
+  docker-compose -f docker-compose.testing.yml logs nginx > "${E2E_REPORT_FOLDER}/logs/nginx.log"
+  docker-compose -f docker-compose.testing.yml logs mariadb > "${E2E_REPORT_FOLDER}/logs/mariadb.log"
 fi
 
-docker-compose -f docker-compose.development.yml down
+docker-compose -f docker-compose.testing.yml down
 popd
 
-# Pause the PCF Dev instance for now
-echo "Suspending PCF Dev"
-cf pcfdev suspend
-cf pcfdev status
+echo "All done"
 
 # Return exit code form the e2e tests
 exit $RET