Merge upstream (#392)

* WIP * First pass at permission effects * First pass at reducer * Final set of cloud-foundry code out of common * Renames, todos * Minor fixes * Fix unit tests * Tweaks * Finish todos * Fix transition from space summary to app summary page - an entity service for a space with no org was cached by guid - an entity service for a space requiring org used cached version - solution is to make cache id include schema key (determines with/without org) * Add comment, tidy up rootUpdatingKey * Fix issue where gitlab summary tab threw errors in console - fixes cloudfoundry#4325 * Fix misaligned user button - fixes cloudfoundry#4316 * Temporarily add branch v3.2.1 to travis * check sso whitelist in more places Signed-off-by: Ben Berry <[email protected]> * refactor sso state checks into single function Signed-off-by: Ben Berry <[email protected]> * Update version * First pass at changelog (additional SSO fix required) * Update changelog * Push combine of permission configs into checkers - overcomes some weird change of permission type * Fix issue where default add/remove setting in change role by username was incorrect - add/remove radio button default value governed by add/remove feature flags - when one is set to false the radio button should be disabled and the other selected * Fix store-test-helper * Fix package-lock.json * Remove v3.2.1 was .travis.taml * Remove need for --recreate-pods when upgrading * Update readme following move to Travis-ci.com * Add support for helm chart customizations * Removed change not needed * Ensure the correct key is used metacard favourite info (cloudfoundry#4321) * Fix display of details in endpoint card in endpoint list (cloudfoundry#4319) * Clean default/blocked logic * Rename @Stratos to @stratosui * FIx references in tsconfig.json * Fix endpoint connect * Fix unit test * Fix e2e test * Change following review #1 * Bump github.com/gorilla/websocket from 1.4.1 to 1.4.2 in /src/jetstream (cloudfoundry#4199) * Bump github.com/gorilla/websocket from 1.4.1 to 1.4.2 in /src/jetstream Bumps [github.com/gorilla/websocket](https://github.com/gorilla/websocket) from 1.4.1 to 1.4.2. - [Release notes](https://github.com/gorilla/websocket/releases) - [Commits](gorilla/websocket@v1.4.1...v1.4.2) Signed-off-by: dependabot-preview[bot] <[email protected]> * Update go.sum Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com> Co-authored-by: Neil MacDougall <[email protected]> * Fix errors in console log during setup screens * Helm: Change default image pull policy to Always * Add copy address and edit to endpoint list view * Use icon that is less confusing with refresh * Change following review #2 - Fix cf package module file name - Make CUSTOM_USER_PERMISSION_CHECKERS optional - Remove need to inject CUSTOM_USER_PERMISSION_CHECKERS in multiple cf modules * Add newline at end for codeclimate * Fix for buildpack filename wrapping on card * Fix code climate issue * Update endpoint-list.helpers.ts * Improve naming * Tidy up * Change following review * Bump gopkg.in/yaml.v2 from 2.2.8 to 2.3.0 in /src/jetstream (cloudfoundry#4336) * Bump gopkg.in/yaml.v2 from 2.2.8 to 2.3.0 in /src/jetstream Bumps [gopkg.in/yaml.v2](https://github.com/go-yaml/yaml) from 2.2.8 to 2.3.0. - [Release notes](https://github.com/go-yaml/yaml/releases) - [Commits](go-yaml/yaml@v2.2.8...v2.3.0) Signed-off-by: dependabot-preview[bot] <[email protected]> * CI bump Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com> Co-authored-by: Neil MacDougall <[email protected]> * [Security] Bump websocket-extensions from 0.1.3 to 0.1.4 (cloudfoundry#4356) Bumps [websocket-extensions](https://github.com/faye/websocket-extensions-node) from 0.1.3 to 0.1.4. **This update includes a security fix.** - [Release notes](https://github.com/faye/websocket-extensions-node/releases) - [Changelog](https://github.com/faye/websocket-extensions-node/blob/master/CHANGELOG.md) - [Commits](faye/websocket-extensions-node@0.1.3...0.1.4) Signed-off-by: dependabot-preview[bot] <[email protected]> Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com> * Fail CI build if imagelist generation fails * Updated __stratos.tpl as per changes in deploy/kubernetes/console/templates/deployment.yaml * Fix build * Helm Chart: Icon is missing - fixes #393 * Fixes following review Co-authored-by: Ben Berry <[email protected]> Co-authored-by: Neil MacDougall <[email protected]> Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com> Co-authored-by: Neil MacDougall <[email protected]> Co-authored-by: Neil MacDougall <[email protected]>
SUSE · Jun 23, 2020 · 8cc207d · 8cc207d
1 parent 790a37f
commit 8cc207d
Show file tree

Hide file tree

Showing 321 changed files with 4,154 additions and 3,043 deletions.
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -6,10 +6,10 @@ There are two main forms of contribution: reporting issues and performing code c
 
 ## Reporting Issues
 
-If you find a problem with Stratos UI, report it using [GitHub issues](https://github.com/cloudfoundry/stratos/issues/new).
+If you find a problem with Stratos UI, report it using [GitHub issues](https://github.com/suse/stratos/issues/new).
 
 Before reporting a new issue, please take a moment to check whether it has already been reported
-[here](https://github.com/cloudfoundry/stratos/issues). If this is the case, please:
+[here](https://github.com/suse/stratos/issues). If this is the case, please:
 
 - Read all the comments to confirm that it's the same issue you're having.
 - Refrain from adding "same thing here" or "+1" comments. Just hit the

diff --git a/README.md b/README.md
@@ -1,17 +1,17 @@
 # Stratos
 
-<a href="https://travis-ci.org/cloudfoundry/stratos/branches"><img src="https://travis-ci.org/cloudfoundry/stratos.svg?branch=master"></a>&nbsp;<a style="padding-left: 4px" href="https://codeclimate.com/github/cloudfoundry/stratos/maintainability"><img src="https://api.codeclimate.com/v1/badges/61af8b605f385e894632/maintainability" /></a>
-<a href="https://goreportcard.com/report/github.com/cloudfoundry/stratos"><img src="https://goreportcard.com/badge/github.com/cloudfoundry-incubator/stratos"/></a>
-<a href="https://codecov.io/gh/cloudfoundry/stratos/branch/master"><img src="https://codecov.io/gh/cloudfoundry/stratos/branch/graph/badge.svg"/></a>
-[![GitHub release](https://img.shields.io/github/release/cloudfoundry/stratos.svg)](https://github.com/cloudfoundry/stratos/releases/latest)
-[![License](https://img.shields.io/badge/License-Apache%202.0-blue.svg)](https://github.com/cloudfoundry/stratos/blob/master/LICENSE)
+<a href="https://travis-ci.com/suse/stratos/branches"><img src="https://travis-ci.com/suse/stratos.svg?branch=master"></a>&nbsp;<a style="padding-left: 4px" href="https://codeclimate.com/github/suse/stratos/maintainability"><img src="https://api.codeclimate.com/v1/badges/61af8b605f385e894632/maintainability" /></a>
+<a href="https://goreportcard.com/report/github.com/suse/stratos"><img src="https://goreportcard.com/badge/github.com/suse/stratos"/></a>
+<a href="https://codecov.io/gh/suse/stratos/branch/master"><img src="https://codecov.io/gh/suse/stratos/branch/master/graph/badge.svg"/></a>
+[![GitHub release](https://img.shields.io/github/release/suse/stratos.svg)](https://github.com/suse/stratos/releases/latest)
+[![License](https://img.shields.io/badge/License-Apache%202.0-blue.svg)](https://github.com/suse/stratos/blob/master/LICENSE)
 [![slack.cloudfoundry.org](https://slack.cloudfoundry.org/badge.svg)](https://cloudfoundry.slack.com/messages/C80EP4Y57/)
 
 Stratos is an Open Source Web-based UI (Console) for managing Cloud Foundry. It allows users and administrators to both manage applications running in the Cloud Foundry cluster and perform cluster management tasks.
 
 If you are looking for a version of Stratos, you can find ..
-- V1 in the [v1-master](https://github.com/cloudfoundry/stratos/tree/v1-master) branch.
-- V2 in the [v2-master](https://github.com/cloudfoundry/stratos/tree/v2-master) branch.
+- V1 in the [v1-master](https://github.com/suse/stratos/tree/v1-master) branch.
+- V2 in the [v2-master](https://github.com/suse/stratos/tree/v2-master) branch.
 
 ![Stratos Application view](docs/images/screenshots/app-summary.png)
 
@@ -46,7 +46,7 @@ Get an [Overview](docs/overview.md) of Stratos, its components and the different
 
 Take a look at the [Development Roadmap](docs/roadmap.md) to see where we are heading. We update our status page each week to summarize what we are working on - see the [Status Page](docs/status_updates.md).
 
-Browse through features and issues in the project's [issues](https://github.com/cloudfoundry/stratos/issues) page or [Zenhub Board](https://github.com/cloudfoundry-incubator/stratos#boards).
+Browse through features and issues in the project's [issues](https://github.com/suse/stratos/issues) page.
 
 What kind of code is in Stratos? We've integrated [Code Climate](https://codeclimate.com) for some code quality and maintainability metrics. Take a stroll around the [project page](https://codeclimate.com/github/SUSE/stratos)
 

diff --git a/custom-src/deploy/kubernetes/__stratos.tpl b/custom-src/deploy/kubernetes/__stratos.tpl
@@ -0,0 +1,15 @@
+# Customizations for the Helm Chart
+
+# Extra env vars for the Jetstream Pod in deployment.yaml
+{{- define "stratosJetstreamEnv" }}
+- name: MONOCULAR_CRT_PATH
+  value: "/etc/monocular-certs/tls.crt"
+- name: MONOCULAR_KEY_PATH
+  value: "/etc/monocular-certs/tls.key"
+- name: MONOCULAR_CA_CRT_PATH
+  value: "/etc/monocular-certs/ca.crt"
+- name: FDB_URL
+  value: "mongodb://{{ .Release.Name }}-fdbdoclayer:27016"
+- name: SYNC_SERVER_URL
+  value: "http://{{ .Release.Name }}-chartsync:8080"
+{{- end }}
diff --git a/custom-src/frontend/app/custom/helm/list-types/monocular-repository-list-config.service.ts b/custom-src/frontend/app/custom/helm/list-types/monocular-repository-list-config.service.ts
@@ -16,8 +16,8 @@ import { InternalEventMonitorFactory } from '../../../../../store/src/monitors/i
 import { PaginationMonitorFactory } from '../../../../../store/src/monitors/pagination-monitor.factory';
 import { EndpointModel } from '../../../../../store/src/types/endpoint.types';
 import { STRATOS_ENDPOINT_TYPE } from '../../../base-entity-schemas';
-import { CurrentUserPermissions } from '../../../core/current-user-permissions.config';
-import { CurrentUserPermissionsService } from '../../../core/current-user-permissions.service';
+import { CurrentUserPermissionsService } from '../../../core/permissions/current-user-permissions.service';
+import { StratosCurrentUserPermissions } from '../../../core/permissions/stratos-user-permissions.checker';
 import { environment } from '../../../environments/environment';
 import { getFullEndpointApiUrl } from '../../../features/endpoints/endpoint-helpers';
 import { ConfirmationDialogConfig } from '../../../shared/components/confirmation-dialog.config';
@@ -127,7 +127,7 @@ export class MonocularRepositoryListConfig implements IListConfig<EndpointModel>
     },
     label: 'Delete',
     description: 'Delete Helm Repository',
-    createVisible: () => this.currentUserPermissionsService.can(CurrentUserPermissions.ENDPOINT_REGISTER)
+    createVisible: () => this.currentUserPermissionsService.can(StratosCurrentUserPermissions.ENDPOINT_REGISTER)
   };
 
   private handleDeleteAction(item, handleChange) {
@@ -148,6 +148,7 @@ export class MonocularRepositoryListConfig implements IListConfig<EndpointModel>
       });
   }
 
+
   constructor(
     public store: Store<AppState>,
     public activatedRoute: ActivatedRoute,

diff --git a/deploy/ci/automation/helmtest.sh b/deploy/ci/automation/helmtest.sh
@@ -164,7 +164,7 @@ CHART_FILE="${KUBE_FOLDER}/console-${DEV_IMAGE_VERSION}.tgz"
 echo "Chart file path: ${CHART_FILE}"
 
 log "Upgrading using latest Helm Chart"
-helm upgrade ${NAME} "${CHART_FILE}" --recreate-pods --debug --set consoleVersion=${DEV_IMAGE_VERSION} --set imagePullPolicy=Always
+helm upgrade ${NAME} "${CHART_FILE}" --debug --set consoleVersion=${DEV_IMAGE_VERSION} --set imagePullPolicy=Always
 
 checkVersion console-${DEV_IMAGE_VERSION}
 waitForHelmRelease
@@ -177,7 +177,7 @@ sed -i.bak -e 's/appVersion: '"${DEV_IMAGE_VERSION}"'/appVersion: 0.2.0/g' "${HE
 cat "${HELM_TMP}/Chart.yaml"
 
 log "Upgrading using latest Helm Chart (checking chart upgrade)"
-helm upgrade ${NAME} "${HELM_TMP}" --recreate-pods --debug --set imagePullPolicy=Always
+helm upgrade ${NAME} "${HELM_TMP}" --debug --set imagePullPolicy=Always
 
 waitForHelmRelease
 checkVersion console-0.2.0
@@ -204,7 +204,7 @@ helm install ${HELM_REPO_NAME}/console --name ${NAME} --namespace ${NAMESPACE}
 waitForHelmRelease
 
 log "Upgrading using --reuse-values"
-helm upgrade ${NAME} "${HELM_TMP}" --recreate-pods --debug --reuse-values
+helm upgrade ${NAME} "${HELM_TMP}" --debug --reuse-values
 
 waitForHelmRelease
 # Should have used same values as before

diff --git a/deploy/cloud-foundry/README.md b/deploy/cloud-foundry/README.md
@@ -73,7 +73,7 @@ and binding a database service instance to Stratos - for more information see [h
 To do so, `clone` the **stratos** repository, `cd` into the newly cloned repository and `push` to Cloud Foundry. This can be done with:
 
 ```
-git clone https://github.com/cloudfoundry/stratos
+git clone https://github.com/suse/stratos
 cd stratos
 git checkout tags/stable -b stable
 ./build/store-git-metadata.sh
@@ -91,7 +91,7 @@ If you wish to enable AOT or reduce the push time, you can pre-build the UI befo
 This can be done with:
 
 ```
-git clone https://github.com/cloudfoundry/stratos
+git clone https://github.com/suse/stratos
 cd stratos
 npm install
 npm run prebuild-ui

diff --git a/deploy/kubernetes/README.md b/deploy/kubernetes/README.md
@@ -105,7 +105,7 @@ After the install, you should be able to access the Console in a web browser by
 
 ### Deploy using an archive of the Helm Chart
 
-Helm chart archives are available for Stratos releases from our GitHub repository, under releases - see https://github.com/cloudfoundry/stratos/releases.
+Helm chart archives are available for Stratos releases from our GitHub repository, under releases - see https://github.com/suse/stratos/releases.
 
 Download the appropriate release `console-helm-chart.X.Y.Z.tgz` from the GitHub repository and unpack the archive to a local folder. The Helm Chart will be extracted to a sub-folder named `console`.
 
@@ -122,7 +122,7 @@ helm install console --namespace=console --name my-console
 Clone the Stratos GitHub repository:
 
 ```
-git clone https://github.com/cloudfoundry/stratos.git
+git clone https://github.com/suse/stratos.git
 ```
 
 Open a terminal and cd to the `deploy/kubernetes` directory:
@@ -220,7 +220,7 @@ $ helm repo update
 To update an instance, the following assumes your instance is called `my-console`, and overrides have been specified in a file called `overrides.yaml`.
 
 ```
-$ helm upgrade -f overrides.yaml my-console stratos/console --recreate-pods
+$ helm upgrade -f overrides.yaml my-console stratos/console
 ```
 
 After the upgrade, perform a `helm list` to ensure your console is the latest version.

diff --git a/deploy/kubernetes/build.sh b/deploy/kubernetes/build.sh
@@ -236,6 +236,7 @@ pushd "${DEST_HELM_CHART_PATH}" > /dev/null
 rm -rf "${DEST_HELM_CHART_PATH}/**/*.orig"
 
 # Run customization script if there is one
+# This can do things like provide a custom __stratos.tpl file
 if [ -f "${STRATOS_PATH}/custom-src/deploy/kubernetes/customize-helm.sh" ]; then
   printf "${YELLOW}${BOLD}Applying Helm Chart customizations${RESET}\n"
   "${STRATOS_PATH}/custom-src/deploy/kubernetes/customize-helm.sh" "${DEST_HELM_CHART_PATH}"

diff --git a/deploy/kubernetes/console/Chart.yaml b/deploy/kubernetes/console/Chart.yaml
@@ -5,4 +5,4 @@ version: 0.1.0
 appVersion: 0.1.0
 sources:
   - https://github.com/cloudfoundry/stratos
-icon: https://raw.githubusercontent.com/cloudfoundry/stratos/master/deploy/kubernetes/icon.png
+icon: https://github.com/cloudfoundry/stratos/raw/master/deploy/kubernetes/console/icon.png
diff --git a/deploy/kubernetes/console/README.md b/deploy/kubernetes/console/README.md
@@ -155,11 +155,9 @@ helm repo update
 To update an instance, the following assumes your instance is called `my-console`:
 
 ```
-helm upgrade my-console stratos/console --recreate-pods
+helm upgrade my-console stratos/console
 ```
 
-> Note: You *must* use the `--recreate-pods` flag when upgrading
-
 After the upgrade, perform a `helm list` to ensure your console is the latest version.
 
 ## Uninstalling

diff --git a/deploy/kubernetes/console/templates/__stratos.tpl b/deploy/kubernetes/console/templates/__stratos.tpl
@@ -0,0 +1,5 @@
+# Customizations for the Helm Chart
+
+# Extra env vars for the Jetstream Pod in deployment.yaml
+{{- define "stratosJetstreamEnv" }}
+{{- end }}
diff --git a/deploy/kubernetes/console/templates/config-init.yaml b/deploy/kubernetes/console/templates/config-init.yaml
@@ -102,6 +102,8 @@ spec:
 {{- end }}
       containers:
       - env:
+        - name: STRATOS_IMAGE_REF
+          value: "{{.Values.consoleVersion}}:{{ .Release.Revision }}"
         - name: "STRATOS_VOLUME_MIGRATION"
           value: "true"
         - name: "IS_UPGRADE"

diff --git a/deploy/kubernetes/console/templates/database.yaml b/deploy/kubernetes/console/templates/database.yaml
@@ -60,6 +60,8 @@ spec:
         image: {{.Values.kube.registry.hostname}}/{{.Values.kube.organization}}/{{.Values.images.mariadb}}:{{.Values.consoleVersion}}
         imagePullPolicy: {{.Values.imagePullPolicy}}
         env:
+        - name: STRATOS_IMAGE_REF
+          value: "{{.Values.consoleVersion}}:{{ .Release.Revision }}"
         - name: MYSQL_ROOT_PASSWORD
           valueFrom:
             secretKeyRef:

diff --git a/deploy/kubernetes/console/templates/deployment.yaml b/deploy/kubernetes/console/templates/deployment.yaml
@@ -65,6 +65,8 @@ spec:
           name: https
           protocol: TCP
         env:
+        - name: STRATOS_IMAGE_REF
+          value: "{{.Values.consoleVersion}}:{{ .Release.Revision }}"
         - name: CONSOLE_CERT_PATH
           value: "/{{ .Release.Name }}-cert-volume"
         volumeMounts:
@@ -75,6 +77,8 @@ spec:
         imagePullPolicy: {{.Values.imagePullPolicy}}
         name: proxy
         env:
+        - name: STRATOS_IMAGE_REF
+          value: "{{.Values.consoleVersion}}:{{ .Release.Revision }}"
         - name: STRATOS_HELM_RELEASE
           value: "{{ .Release.Name }}"
         - name: DB_USER
@@ -277,16 +281,7 @@ spec:
         - name: UI_LIST_ALLOW_LOAD_MAXED
           value: {{ default "false" .Values.console.ui.listAllowLoadMaxed | quote }}
         {{- end }}
-        - name: MONOCULAR_CRT_PATH
-          value: "/etc/monocular-certs/tls.crt"
-        - name: MONOCULAR_KEY_PATH
-          value: "/etc/monocular-certs/tls.key"
-        - name: MONOCULAR_CA_CRT_PATH
-          value: "/etc/monocular-certs/ca.crt"
-        - name: FDB_URL
-          value: "mongodb://{{ .Release.Name }}-fdbdoclayer:27016"
-        - name: SYNC_SERVER_URL
-          value: "http://{{ .Release.Name }}-chartsync:8080"
+        {{- include "stratosJetstreamEnv" . | indent 8 }}
         readinessProbe:
           httpGet:
             path: /pp/v1/ping

diff --git a/deploy/kubernetes/console/values.yaml b/deploy/kubernetes/console/values.yaml
@@ -8,7 +8,7 @@ dockerRegistrySecret: regsecret
 #noProxy: localhost
 #ftpProxy: proxy.corp.net
 #socksProxy: sock-proxy.corp.net
-imagePullPolicy: IfNotPresent
+imagePullPolicy: Always
 
 console:
   cookieDomain:

diff --git a/deploy/kubernetes/imagelist-gen.sh b/deploy/kubernetes/imagelist-gen.sh
@@ -37,6 +37,10 @@ ls -alR
 echo ""
 
 helm template -f ${__DIRNAME}/imagelist.values.yaml ${CHART_FOLDER} | grep "image:" | grep --extended --only-matching '([^"/[:space:]]+/)?[^"/[:space:]]+/[^:[:space:]]+:[a-zA-Z0-9\._-]+' | sort | uniq | awk -F'/' '{print $2}' > imagelist.txt
+if [ $? -ne 0 ]; then
+  echo -e "${BOLD}${RED}ERROR: Failed to render Helm Chart in order to generate image list"
+  exit 1
+fi
 popd > /dev/null
 
 printf "${CYAN}"

diff --git a/...ustom-src/frontend/app/custom/app-action-extension/app-action-extension.component.spec.ts b/...ustom-src/frontend/app/custom/app-action-extension/app-action-extension.component.spec.ts
@@ -1,10 +1,10 @@
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+import { RouterTestingModule } from '@angular/router/testing';
+import { createBasicStoreModule } from '@stratosui/store/testing';
 
-import { AppActionExtensionComponent } from './app-action-extension.component';
 import { CoreModule } from '../../core/core.module';
-import { RouterTestingModule } from '@angular/router/testing';
 import { SharedModule } from '../../shared/shared.module';
-import { createBasicStoreModule } from '@stratos/store/testing';
+import { AppActionExtensionComponent } from './app-action-extension.component';
 
 describe('AppActionExtensionComponent', () => {
   let component: AppActionExtensionComponent;

diff --git a/package-lock.json b/package-lock.json
diff --git a/src/frontend/packages/cf-autoscaler/src/features/autoscaler-base.component.spec.ts b/src/frontend/packages/cf-autoscaler/src/features/autoscaler-base.component.spec.ts
@@ -2,7 +2,7 @@ import { DatePipe } from '@angular/common';
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 import { NoopAnimationsModule } from '@angular/platform-browser/animations';
 import { RouterTestingModule } from '@angular/router/testing';
-import { createEmptyStoreModule } from '@stratos/store/testing';
+import { createEmptyStoreModule } from '@stratosui/store/testing';
 
 import { ApplicationService } from '../../../cloud-foundry/src/features/applications/application.service';
 import { ApplicationServiceMock } from '../../../cloud-foundry/test-framework/application-service-helper';

diff --git a/...f-autoscaler/src/features/autoscaler-metric-page/autoscaler-metric-page.component.spec.ts b/...f-autoscaler/src/features/autoscaler-metric-page/autoscaler-metric-page.component.spec.ts
@@ -2,7 +2,7 @@ import { DatePipe } from '@angular/common';
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 import { NoopAnimationsModule } from '@angular/platform-browser/animations';
 import { RouterTestingModule } from '@angular/router/testing';
-import { createEmptyStoreModule } from '@stratos/store/testing';
+import { createEmptyStoreModule } from '@stratosui/store/testing';
 
 import { ApplicationService } from '../../../../cloud-foundry/src/features/applications/application.service';
 import { ApplicationServiceMock } from '../../../../cloud-foundry/test-framework/application-service-helper';

diff --git a/...rc/features/autoscaler-scale-history-page/autoscaler-scale-history-page.component.spec.ts b/...rc/features/autoscaler-scale-history-page/autoscaler-scale-history-page.component.spec.ts
@@ -2,7 +2,7 @@ import { DatePipe } from '@angular/common';
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 import { NoopAnimationsModule } from '@angular/platform-browser/animations';
 import { RouterTestingModule } from '@angular/router/testing';
-import { createEmptyStoreModule } from '@stratos/store/testing';
+import { createEmptyStoreModule } from '@stratosui/store/testing';
 
 import { ApplicationService } from '../../../../cloud-foundry/src/features/applications/application.service';
 import { ApplicationServiceMock } from '../../../../cloud-foundry/test-framework/application-service-helper';

diff --git a/...toscaler/src/features/autoscaler-tab-extension/autoscaler-tab-extension.component.spec.ts b/...toscaler/src/features/autoscaler-tab-extension/autoscaler-tab-extension.component.spec.ts
@@ -2,7 +2,7 @@ import { DatePipe } from '@angular/common';
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 import { NoopAnimationsModule } from '@angular/platform-browser/animations';
 import { RouterTestingModule } from '@angular/router/testing';
-import { createEmptyStoreModule } from '@stratos/store/testing';
+import { createEmptyStoreModule } from '@stratosui/store/testing';
 import { NgxChartsModule } from '@swimlane/ngx-charts';
 
 import { ApplicationService } from '../../../../cloud-foundry/src/features/applications/application.service';

diff --git a/...utoscaler/src/features/edit-autoscaler-credential/edit-autoscaler-credential.component.ts b/...utoscaler/src/features/edit-autoscaler-credential/edit-autoscaler-credential.component.ts
@@ -109,7 +109,6 @@ export class EditAutoscalerCredentialComponent implements OnInit, OnDestroy {
     );
     this.appAutoscalerCredential$ = updateAppAutoscalerCredentialService.entityObs$.pipe(
       filter(({ entity, entityRequestInfo }) => {
-        console.log(entity, entityRequestInfo)
         return entityRequestInfo && !entityRequestInfo.creating && !entityRequestInfo.deleting.busy;
       }),
       map(({ entity }) => entity ? entity.entity : null),

diff --git a/.../cf-autoscaler/src/features/edit-autoscaler-policy/edit-autoscaler-policy-service.spec.ts b/.../cf-autoscaler/src/features/edit-autoscaler-policy/edit-autoscaler-policy-service.spec.ts
@@ -1,5 +1,5 @@
 import { inject, TestBed } from '@angular/core/testing';
-import { createEmptyStoreModule } from '@stratos/store/testing';
+import { createEmptyStoreModule } from '@stratosui/store/testing';
 
 import { ApplicationsModule } from '../../../../cloud-foundry/src/features/applications/applications.module';
 import { EntityServiceFactory } from '../../../../store/src/entity-service-factory.service';