From 7efe763ee984017d6a893cbbe6aaae46a4948e14 Mon Sep 17 00:00:00 2001
From: Neil MacDougall <nwmac@users.noreply.github.com>
Date: Sun, 22 Sep 2019 22:36:15 +0100
Subject: [PATCH 01/18] E2E Test should run as user not admin (#3894)

---
 .../cloud-foundry/space-level/cf-space-level-e2e.spec.ts      | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/test-e2e/cloud-foundry/space-level/cf-space-level-e2e.spec.ts b/src/test-e2e/cloud-foundry/space-level/cf-space-level-e2e.spec.ts
index ebe3690d44..36ef6c6792 100644
--- a/src/test-e2e/cloud-foundry/space-level/cf-space-level-e2e.spec.ts
+++ b/src/test-e2e/cloud-foundry/space-level/cf-space-level-e2e.spec.ts
@@ -129,8 +129,8 @@ describe('CF - Space Level -', () => {
 
   describe('As User -', () => {
     beforeAll(() => {
-      e2e.setup(ConsoleUserType.admin)
-        .loginAs(ConsoleUserType.admin);
+      e2e.setup(ConsoleUserType.user)
+        .loginAs(ConsoleUserType.user);
     });
 
     describe('Basic Tests -', () => {

From 8cd1aa667da4ad380a33de08f94502ceabfabd42 Mon Sep 17 00:00:00 2001
From: Neil MacDougall <nwmac@users.noreply.github.com>
Date: Sun, 22 Sep 2019 23:46:32 +0100
Subject: [PATCH 02/18] Ensure stepper buttons are always visible and content
 scrolls (#3890)

---
 .../shared/components/stepper/steppers/steppers.component.scss  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/frontend/packages/core/src/shared/components/stepper/steppers/steppers.component.scss b/src/frontend/packages/core/src/shared/components/stepper/steppers/steppers.component.scss
index 82950c5d34..c899e137ca 100644
--- a/src/frontend/packages/core/src/shared/components/stepper/steppers/steppers.component.scss
+++ b/src/frontend/packages/core/src/shared/components/stepper/steppers/steppers.component.scss
@@ -59,7 +59,7 @@
   }
   &__contents {
     display: flex;
-    flex: 1;
+    flex: 1 1 auto;
     height: 0;
     min-height: 160px;
     overflow-y: auto;

From 7b8f2362f410cdcdefdaa10fe9392af1b7edfd98 Mon Sep 17 00:00:00 2001
From: Neil MacDougall <nwmac@users.noreply.github.com>
Date: Mon, 23 Sep 2019 00:14:08 +0100
Subject: [PATCH 03/18] FIx setup detection for local users (#3888)

---
 .../repository/interfaces/structs.go          | 33 +++++++++++++++++++
 1 file changed, 33 insertions(+)

diff --git a/src/jetstream/repository/interfaces/structs.go b/src/jetstream/repository/interfaces/structs.go
index 31d99dfb0d..70082958ba 100644
--- a/src/jetstream/repository/interfaces/structs.go
+++ b/src/jetstream/repository/interfaces/structs.go
@@ -255,8 +255,41 @@ type ConsoleConfig struct {
 	UseSSO                bool     `json:"use_sso" configName:"SSO_LOGIN"`
 }
 
+const defaultAdminScope = "stratos.admin"
+
 // IsSetupComplete indicates if we have enough config
 func (consoleConfig *ConsoleConfig) IsSetupComplete() bool {
+
+	// Local user - check setup complete
+	if AuthEndpointTypes[consoleConfig.AuthEndpointType] == Local {
+
+		// Need LocalUser and LocalUserPassword
+		if len(consoleConfig.LocalUser) == 0 || len(consoleConfig.LocalUserPassword) == 0 {
+			return false
+		}
+
+		// Also, we will make sure that admin scopes are set up for admin, if not specified
+		if len(consoleConfig.LocalUserScope) == 0 {
+			if len(consoleConfig.ConsoleAdminScope) == 0 {
+				// Neither set, so use default for both
+				consoleConfig.LocalUserScope = defaultAdminScope
+				consoleConfig.ConsoleAdminScope = defaultAdminScope
+			} else {
+				// admin scope set, so just use that
+				consoleConfig.LocalUserScope = consoleConfig.ConsoleAdminScope
+			}
+		} else {
+			if len(consoleConfig.ConsoleAdminScope) == 0 {
+				// Console admin scope not set, so use local user scope
+				consoleConfig.ConsoleAdminScope = consoleConfig.LocalUserScope
+			}
+		}
+
+		// Setup is complete if we have LocalUser and LocalUserPassword set
+		return true
+	}
+
+	// UAA - check setup complete for UAA
 	if consoleConfig.UAAEndpoint == nil {
 		return false
 	}

From 07aa1376c3cb9e3ef4a77039d00dcba0f6f8a92f Mon Sep 17 00:00:00 2001
From: Neil MacDougall <nwmac@users.noreply.github.com>
Date: Mon, 23 Sep 2019 06:34:16 +0100
Subject: [PATCH 04/18] Add fix to wait until delete indicator has been removed
 (#3889)

---
 src/test-e2e/cloud-foundry/cf-level/manage-quota-e2e.spec.ts | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/test-e2e/cloud-foundry/cf-level/manage-quota-e2e.spec.ts b/src/test-e2e/cloud-foundry/cf-level/manage-quota-e2e.spec.ts
index c06c33d7d9..f9c62f5ce0 100644
--- a/src/test-e2e/cloud-foundry/cf-level/manage-quota-e2e.spec.ts
+++ b/src/test-e2e/cloud-foundry/cf-level/manage-quota-e2e.spec.ts
@@ -6,6 +6,7 @@ import { ConsoleUserType, E2EHelpers } from '../../helpers/e2e-helpers';
 import { extendE2ETestTime } from '../../helpers/extend-test-helpers';
 import { CfTopLevelPage } from './cf-top-level-page.po';
 import { QuotaFormPage } from './quota-form-page.po';
+import { TableComponent } from '../../po/table.po';
 
 describe('Manage Quota', () => {
   let e2eSetup;
@@ -103,6 +104,9 @@ describe('Manage Quota', () => {
     it('- should not delete quota if attached to org', () => {
       expect(element(by.tagName('app-table')).getText()).toContain(quotaName);
       cfTopLevelPage.deleteQuota(quotaName, false);
+      // Wait until the delete operation has finished
+      const table = new TableComponent();
+      table.waitUntilNotBusy();
       expect(element(by.css('.table-row__error')).getText()).toContain('Please delete the organization associations');
     });
   });

From 39323bbe153cc24fe2f8c05a34d01d7f835585ea Mon Sep 17 00:00:00 2001
From: Neil MacDougall <nwmac@users.noreply.github.com>
Date: Mon, 23 Sep 2019 08:12:01 +0100
Subject: [PATCH 05/18] Add support for view and edit profile for local user
 (#3883)

* Add support for view and edit profile for local user

* Fix required on profile edit
---
 .../edit-profile-info.component.html          |   9 +-
 .../edit-profile-info.component.ts            |  12 +-
 .../profile-info/profile-info.component.html  |  20 ++-
 .../profile-info/profile-info.component.ts    |   2 +
 .../user-profile-banner.component.html        |   7 +-
 .../user-profile-banner.component.ts          |  10 +-
 .../store/src/effects/user-profile.effects.ts |   6 +-
 src/jetstream/auth.go                         |   4 +
 .../20190918092300_LocalUsersUpdates.go       |  33 ++++
 src/jetstream/plugins/userinfo/local_user.go  | 152 ++++++++++++++++++
 src/jetstream/plugins/userinfo/main.go        | 145 ++++++++++++++++-
 src/jetstream/plugins/userinfo/types.go       |  40 +++++
 .../userinfo/{user_info.go => uaa_user.go}    |  75 ++++++---
 .../repository/interfaces/localuser.go        |   2 +
 .../repository/localusers/psql_localusers.go  |  22 ++-
 src/jetstream/setup_console.go                |  10 +-
 16 files changed, 497 insertions(+), 52 deletions(-)
 create mode 100644 src/jetstream/datastore/20190918092300_LocalUsersUpdates.go
 create mode 100644 src/jetstream/plugins/userinfo/local_user.go
 create mode 100644 src/jetstream/plugins/userinfo/types.go
 rename src/jetstream/plugins/userinfo/{user_info.go => uaa_user.go} (57%)

diff --git a/src/frontend/packages/core/src/features/user-profile/edit-profile-info/edit-profile-info.component.html b/src/frontend/packages/core/src/features/user-profile/edit-profile-info/edit-profile-info.component.html
index f83ef80ba6..8377145582 100644
--- a/src/frontend/packages/core/src/features/user-profile/edit-profile-info/edit-profile-info.component.html
+++ b/src/frontend/packages/core/src/features/user-profile/edit-profile-info/edit-profile-info.component.html
@@ -19,13 +19,16 @@ <h1>Edit User Profile</h1>
         <mat-form-field>
           <input matInput placeholder="Primary Email Address" formControlName="emailAddress">
         </mat-form-field>
-        <p *ngIf="!(canChangePassword | async)">Current password is required when changing email address</p>
-        <p *ngIf="(canChangePassword | async)">Current password is required when changing email address or password</p>
-        <mat-form-field>
+        <p *ngIf="!(canChangePassword | async) && needsPasswordForEmailChange">Current password is required when changing email address</p>
+        <p *ngIf="(canChangePassword | async) && needsPasswordForEmailChange">Current password is required when changing email address or password</p>
+        <mat-form-field *ngIf="needsPasswordForEmailChange">
           <input matInput placeholder="Current Password" type="password" formControlName="currentPassword" [required]="passwordRequired">
         </mat-form-field>
         <div *ngIf="(canChangePassword | async)" class="edit-profile__group">
           <p>Change Password (Leave blank to keep current password)</p>
+          <mat-form-field *ngIf="!needsPasswordForEmailChange">
+            <input matInput placeholder="Current Password" type="password" formControlName="currentPassword" [required]="passwordRequired">
+          </mat-form-field>
           <mat-form-field>
             <input matInput placeholder="New Password" type="password" formControlName="newPassword">
           </mat-form-field>
diff --git a/src/frontend/packages/core/src/features/user-profile/edit-profile-info/edit-profile-info.component.ts b/src/frontend/packages/core/src/features/user-profile/edit-profile-info/edit-profile-info.component.ts
index c05f60543f..d76fa89193 100644
--- a/src/frontend/packages/core/src/features/user-profile/edit-profile-info/edit-profile-info.component.ts
+++ b/src/frontend/packages/core/src/features/user-profile/edit-profile-info/edit-profile-info.component.ts
@@ -23,6 +23,8 @@ export class EditProfileInfoComponent implements OnInit, OnDestroy {
 
   editProfileForm: FormGroup;
 
+  needsPasswordForEmailChange: boolean;
+
   constructor(
     private userProfileService: UserProfileService,
     private fb: FormBuilder,
@@ -36,6 +38,8 @@ export class EditProfileInfoComponent implements OnInit, OnDestroy {
       newPassword: '',
       confirmPassword: '',
     });
+
+    this.needsPasswordForEmailChange = false;
   }
 
   private sub: Subscription;
@@ -56,6 +60,9 @@ export class EditProfileInfoComponent implements OnInit, OnDestroy {
   ngOnInit() {
     this.userProfileService.fetchUserProfile();
     this.userProfileService.userProfile$.pipe(first()).subscribe(profile => {
+      // UAA needs the user's password for email changes. Local user does not
+      // Both need it for password change
+      this.needsPasswordForEmailChange = (profile.origin === 'uaa');
       this.profile = profile;
       this.emailAddress = this.userProfileService.getPrimaryEmailAddress(profile);
       this.editProfileForm.setValue({
@@ -76,7 +83,10 @@ export class EditProfileInfoComponent implements OnInit, OnDestroy {
 
   onChanges() {
     this.sub = this.editProfileForm.valueChanges.subscribe(values => {
-      const required = values.emailAddress !== this.emailAddress || values.newPassword.length;
+      // Old password is required if either email or new pw is specified (uaa)
+      // or only if new pw is specified (local account)
+      const required = this.needsPasswordForEmailChange ?
+        values.emailAddress !== this.emailAddress || values.newPassword.length : values.newPassword.length;
       this.passwordRequired = !!required;
       if (required !== this.lastRequired) {
         this.lastRequired = required;
diff --git a/src/frontend/packages/core/src/features/user-profile/profile-info/profile-info.component.html b/src/frontend/packages/core/src/features/user-profile/profile-info/profile-info.component.html
index b949cbccb2..92ae47a731 100644
--- a/src/frontend/packages/core/src/features/user-profile/profile-info/profile-info.component.html
+++ b/src/frontend/packages/core/src/features/user-profile/profile-info/profile-info.component.html
@@ -12,7 +12,7 @@ <h1>User Profile</h1>
     text: ''
   }"></app-no-content-message>
   <app-user-profile-banner *ngIf="userProfile$ | async as profile"
-    name="{{ profile.name.givenName }} {{ profile.name.familyName }}" email="{{ primaryEmailAddress$ | async }}">
+    name="{{ profile.name.givenName }} {{ profile.name.familyName }}" email="{{ primaryEmailAddress$ | async }}" username="{{ profile.userName }}">
   </app-user-profile-banner>
   <div class="user-profile__info" *ngIf="userProfile$ | async as profile">
     <div class="user-profile__content">
@@ -24,11 +24,17 @@ <h1>User Profile</h1>
           <div class="app-metadata">
             <div class="app-metadata__two-cols">
               <app-metadata-item icon="person" label="User id">{{ profile.userName }}</app-metadata-item>
-              <app-metadata-item icon="title" label="Name">{{ profile.name.givenName }} {{ profile.name.familyName }}
-              </app-metadata-item>
-              <app-metadata-item icon="email" label="Email">{{ primaryEmailAddress$ | async }}</app-metadata-item>
+              <app-metadata-item *ngIf="(profile.name.givenName || profile.name.familyName); else noName" icon="title" label="Name">{{ profile.name.givenName }} {{ profile.name.familyName }}</app-metadata-item>
+              <ng-template #noName>
+                <app-metadata-item icon="title" label="Name">No Name</app-metadata-item>
+              </ng-template>
+              <app-metadata-item *ngIf="primaryEmailAddress$ | async; else noEmail" icon="email" label="Email">{{ primaryEmailAddress$ | async }}</app-metadata-item>
+              <ng-template #noEmail>
+                <app-metadata-item icon="email" label="Email">No Email Address</app-metadata-item>
+              </ng-template>
+              <app-metadata-item *ngIf="(this.userService.isAdmin$ | async)" icon="security" label="User Type">Administrator</app-metadata-item>
             </div>
-            <div class="app-metadata__two-cols">
+            <div class="app-metadata__two-cols" *ngIf="profile.origin === 'uaa'">
               <app-metadata-item icon="date_range" label="Account Created">{{ profile.meta.created | date:'medium' }}
               </app-metadata-item>
               <app-metadata-item icon="date_range" label="Account Last Modified">
@@ -77,12 +83,12 @@ <h1>User Profile</h1>
               [color]="pollingEnabled === 'true' ? 'warn' : 'primary'">
               {{ pollingEnabled === 'true' ? 'Disable' : 'Enable' }} polling
             </button>
-            <div class="user-profile__option-subtext">Disabling polling wil result in some pages not automatically
+            <div class="user-profile__option-subtext">Disabling polling will result in some views not automatically
               updating.</div>
           </div>
         </div>
       </mat-card>
-      <mat-card>
+      <mat-card *ngIf="profile.origin === 'uaa'">
         <mat-card-header>
           <mat-card-title>Groups</mat-card-title>
         </mat-card-header>
diff --git a/src/frontend/packages/core/src/features/user-profile/profile-info/profile-info.component.ts b/src/frontend/packages/core/src/features/user-profile/profile-info/profile-info.component.ts
index 8f1803d274..0bee290cd4 100644
--- a/src/frontend/packages/core/src/features/user-profile/profile-info/profile-info.component.ts
+++ b/src/frontend/packages/core/src/features/user-profile/profile-info/profile-info.component.ts
@@ -10,6 +10,7 @@ import { UserProfileInfo } from '../../../../../store/src/types/user-profile.typ
 import { ConfirmationDialogConfig } from '../../../shared/components/confirmation-dialog.config';
 import { ConfirmationDialogService } from '../../../shared/components/confirmation-dialog.service';
 import { UserProfileService } from '../user-profile.service';
+import { UserService } from '../../../core/user.service';
 
 @Component({
   selector: 'app-profile-info',
@@ -58,6 +59,7 @@ export class ProfileInfoComponent implements OnInit {
     private userProfileService: UserProfileService,
     private store: Store<AppState>,
     private confirmDialog: ConfirmationDialogService,
+    public userService: UserService,
   ) {
     this.isError$ = userProfileService.isError$;
     this.userProfile$ = userProfileService.userProfile$;
diff --git a/src/frontend/packages/core/src/shared/components/user-profile-banner/user-profile-banner.component.html b/src/frontend/packages/core/src/shared/components/user-profile-banner/user-profile-banner.component.html
index 01fb197c6d..e46a59b0f6 100644
--- a/src/frontend/packages/core/src/shared/components/user-profile-banner/user-profile-banner.component.html
+++ b/src/frontend/packages/core/src/shared/components/user-profile-banner/user-profile-banner.component.html
@@ -2,8 +2,13 @@
   <div class="user-profile-banner__avatar">
     <mat-icon>account_circle</mat-icon>
   </div>
-  <div class="user-profile-banner__title">
+  <div class="user-profile-banner__title" *ngIf="(name || email); else noNameOrEmail">
     <div>{{ name }}</div>
     <div class="user-profile-banner__email">{{ email }}</div>
   </div>
+  <ng-template #noNameOrEmail>
+    <div class="user-profile-banner__title">
+      <div>{{ username }}</div>
+    </div>
+  </ng-template>
 </div>
diff --git a/src/frontend/packages/core/src/shared/components/user-profile-banner/user-profile-banner.component.ts b/src/frontend/packages/core/src/shared/components/user-profile-banner/user-profile-banner.component.ts
index cc08da9e85..85fc1dd52a 100644
--- a/src/frontend/packages/core/src/shared/components/user-profile-banner/user-profile-banner.component.ts
+++ b/src/frontend/packages/core/src/shared/components/user-profile-banner/user-profile-banner.component.ts
@@ -7,8 +7,16 @@ import { Component, OnInit, Input } from '@angular/core';
 })
 export class UserProfileBannerComponent implements OnInit {
 
-  @Input() name: string;
+  private uName: string;
+
+  @Input()
+  get name(): string { return this.uName; }
+  set name(name: string) {
+    this.uName = name.trim();
+  }
+
   @Input() email: string;
+  @Input() username: string;
 
   constructor() { }
 
diff --git a/src/frontend/packages/store/src/effects/user-profile.effects.ts b/src/frontend/packages/store/src/effects/user-profile.effects.ts
index 7354f453c3..728a2eb24f 100644
--- a/src/frontend/packages/store/src/effects/user-profile.effects.ts
+++ b/src/frontend/packages/store/src/effects/user-profile.effects.ts
@@ -49,7 +49,7 @@ export class UserProfileEffect {
         type: action.type,
       } as IRequestAction;
       this.store.dispatch(new StartRequestAction(apiAction));
-      return this.httpClient.get(`/pp/${proxyAPIVersion}/uaa/Users/${action.guid}`).pipe(
+      return this.httpClient.get(`/pp/${proxyAPIVersion}/users/${action.guid}`).pipe(
         mergeMap((info: UserProfileInfo) => {
           return [
             new WrapperRequestActionSuccess({
@@ -82,7 +82,7 @@ export class UserProfileEffect {
         headers['x-stratos-password'] = action.password;
       }
 
-      return this.httpClient.put(`/pp/${proxyAPIVersion}/uaa/Users/${guid}`, action.profile, { headers }).pipe(
+      return this.httpClient.put(`/pp/${proxyAPIVersion}/users/${guid}`, action.profile, { headers }).pipe(
         mergeMap((info: UserProfileInfo) => {
           return [
             new WrapperRequestActionSuccess({
@@ -114,7 +114,7 @@ export class UserProfileEffect {
         'x-stratos-password': action.passwordChanges.oldPassword,
         'x-stratos-password-new': action.passwordChanges.password
       };
-      return this.httpClient.put(`/pp/${proxyAPIVersion}/uaa/Users/${guid}/password`, action.passwordChanges, { headers }).pipe(
+      return this.httpClient.put(`/pp/${proxyAPIVersion}/users/${guid}/password`, action.passwordChanges, { headers }).pipe(
         switchMap((info: UserProfileInfo) => {
           return [
             new WrapperRequestActionSuccess({
diff --git a/src/jetstream/auth.go b/src/jetstream/auth.go
index 79f16ddbbf..f4b1d2bf9c 100644
--- a/src/jetstream/auth.go
+++ b/src/jetstream/auth.go
@@ -1248,6 +1248,10 @@ func (p *portalProxy) getLocalUser(userGUID string) (*interfaces.ConnectedUser,
 	}
 
 	var scopes []string
+	scopes = make([]string, 2)
+	scopes[0] = user.Scope
+	scopes[1] = "password.write"
+
 	uaaAdmin := (user.Scope == p.Config.ConsoleConfig.ConsoleAdminScope)
 	uaaEntry := &interfaces.ConnectedUser{
 		GUID:   userGUID,
diff --git a/src/jetstream/datastore/20190918092300_LocalUsersUpdates.go b/src/jetstream/datastore/20190918092300_LocalUsersUpdates.go
new file mode 100644
index 0000000000..1c5517b90d
--- /dev/null
+++ b/src/jetstream/datastore/20190918092300_LocalUsersUpdates.go
@@ -0,0 +1,33 @@
+package datastore
+
+import (
+	"database/sql"
+
+	"bitbucket.org/liamstask/goose/lib/goose"
+)
+
+func init() {
+	
+	RegisterMigration(20190918092300, "LocalUsersUpdates", func(txn *sql.Tx, conf *goose.DBConf) error {
+		addGivenNameColumn := "ALTER TABLE local_users ADD given_name VARCHAR(128);"
+		_, err := txn.Exec(addGivenNameColumn)
+		if err != nil {
+			return err
+		}
+
+		addFamilyNameColumn := "ALTER TABLE local_users ADD family_name VARCHAR(128);"
+		_, err = txn.Exec(addFamilyNameColumn)
+		if err != nil {
+			return err
+		}
+
+		// All existing data will not have values, so set to defaults
+		populate := "UPDATE local_users SET given_name='Admin', family_name='User'"
+		_, err = txn.Exec(populate)
+		if err != nil {
+			return err
+		}
+
+		return nil
+	})
+}
diff --git a/src/jetstream/plugins/userinfo/local_user.go b/src/jetstream/plugins/userinfo/local_user.go
new file mode 100644
index 0000000000..fb1c2b08a7
--- /dev/null
+++ b/src/jetstream/plugins/userinfo/local_user.go
@@ -0,0 +1,152 @@
+package userinfo
+
+import (
+	"encoding/json"
+	"net/http"
+
+	"golang.org/x/crypto/bcrypt"
+
+	"github.com/cloudfoundry-incubator/stratos/src/jetstream/repository/localusers"
+	"github.com/cloudfoundry-incubator/stratos/src/jetstream/repository/interfaces"
+)
+
+// LocalUserInfo is a plugin to fetch user info
+type LocalUserInfo struct {
+	portalProxy interfaces.PortalProxy
+}
+
+// InitLocalUserInfo creates a new local user info provider
+func InitLocalUserInfo(portalProxy interfaces.PortalProxy) Provider {
+	return &LocalUserInfo{portalProxy: portalProxy}
+}
+
+// GetUserInfo gets info for the specified user
+func (userInfo *LocalUserInfo) GetUserInfo(id string) (int, []byte, error) {
+
+	localUsersRepo, err := localusers.NewPgsqlLocalUsersRepository(userInfo.portalProxy.GetDatabaseConnection())
+	if err != nil {
+		return 500, nil, err
+	}
+
+	user, err := localUsersRepo.FindUser(id)
+	if err != nil {
+		return 500, nil, err
+	}
+
+	uaaUser := &uaaUser{
+		ID: id,
+		Origin: "local",
+		Username: user.Username,
+	}
+
+	emails := make([]uaaUserEmail, 1)
+	emails[0] = uaaUserEmail{Value: user.Email}
+	uaaUser.Emails = emails
+
+	uaaUser.Name.GivenName = user.GivenName
+	uaaUser.Name.FamilyName = user.FamilyName
+
+	groups := make([]uaaUserGroup, 2)
+	groups[0] = uaaUserGroup{Display: user.Scope}
+	groups[1] = uaaUserGroup{Display: "password.write"}
+	uaaUser.Groups = groups
+
+	uaaUser.Meta.Version = 0
+
+	jsonString, err := json.Marshal(uaaUser)
+	if err != nil {
+		return 500, nil, err
+	}
+
+	return 200, jsonString, nil
+}
+
+// UpdateUserInfo updates the user's info
+func (userInfo *LocalUserInfo) UpdateUserInfo(profile *uaaUser) (error) {
+
+	// Fetch the user, make updates and save
+	id := profile.ID
+	localUsersRepo, err := localusers.NewPgsqlLocalUsersRepository(userInfo.portalProxy.GetDatabaseConnection())
+	if err != nil {
+		return err
+	}
+
+	user, err := localUsersRepo.FindUser(id)
+	if err != nil {
+		return err
+	}
+
+	hash, err := localUsersRepo.FindPasswordHash(id)
+	if err != nil {
+		return err
+	}
+
+	user.PasswordHash = hash
+
+	if len(profile.Emails) == 1 {
+		email := profile.Emails[0]
+		if len(email.Value) >0 {
+			user.Email = email.Value
+		}
+	}
+
+	user.GivenName = profile.Name.GivenName
+	user.FamilyName = profile.Name.FamilyName
+
+	err = localUsersRepo.UpdateLocalUser(user)
+	if err != nil {
+		return err
+	}
+
+	return nil
+}
+
+// UpdatePassword updates the user's password
+func (userInfo *LocalUserInfo) UpdatePassword(id string, passwordInfo *passwordChangeInfo) (error) {
+
+	// Fetch the user, make updates and save
+	localUsersRepo, err := localusers.NewPgsqlLocalUsersRepository(userInfo.portalProxy.GetDatabaseConnection())
+	if err != nil {
+		return err
+	}
+
+	user, err := localUsersRepo.FindUser(id)
+	if err != nil {
+		return err
+	}
+
+	hash, err := localUsersRepo.FindPasswordHash(id)
+	if err != nil {
+		return err
+	}
+
+	// Check old password is correct
+	err = bcrypt.CompareHashAndPassword(hash, []byte(passwordInfo.OldPassword))
+	if err != nil {
+		// Old password is incorrect
+		return interfaces.NewHTTPShadowError(
+			http.StatusBadRequest,
+			"Current password is incorrect",
+			"Current password is incorrect: %v", err,
+		)
+	}
+
+	passwordHash, err := HashPassword(passwordInfo.NewPassword)
+	if err != nil {
+		return err
+	}
+
+	user.PasswordHash = passwordHash
+
+	err = localUsersRepo.UpdateLocalUser(user)
+	if err != nil {
+		return err
+	}
+	return nil
+}
+
+//HashPassword accepts a plaintext password string and generates a salted hash
+func HashPassword(password string) ([]byte, error) {
+	bytes, err := bcrypt.GenerateFromPassword([]byte(password), 14)
+	return bytes, err
+}
\ No newline at end of file
diff --git a/src/jetstream/plugins/userinfo/main.go b/src/jetstream/plugins/userinfo/main.go
index 3dd7798c68..2ebf881e02 100644
--- a/src/jetstream/plugins/userinfo/main.go
+++ b/src/jetstream/plugins/userinfo/main.go
@@ -1,7 +1,12 @@
 package userinfo
 
 import (
+	"encoding/json"
 	"errors"
+	"io/ioutil"
+	"net/http"
+
+	log "github.com/sirupsen/logrus"
 
 	"github.com/cloudfoundry-incubator/stratos/src/jetstream/repository/interfaces"
 	"github.com/labstack/echo"
@@ -39,11 +44,147 @@ func (userInfo *UserInfo) AddAdminGroupRoutes(echoGroup *echo.Group) {
 
 // AddSessionGroupRoutes adds the session routes for this plugin to the Echo server
 func (userInfo *UserInfo) AddSessionGroupRoutes(echoGroup *echo.Group) {
-	// User Info
-	echoGroup.Any("/uaa/*", userInfo.uaa)
+
+	// Only make available specific endpoints for the User Profile for now
+	// Get the user information for the current user session
+	echoGroup.GET("/users/:id", userInfo.userInfo)
+	echoGroup.PUT("/users/:id", userInfo.updateUserInfo)
+	echoGroup.PUT("/users/:id/password", userInfo.updateUserPassword)
 }
 
 // Init performs plugin initialization
 func (userInfo *UserInfo) Init() error {
 	return nil
 }
+
+func (userInfo *UserInfo) getProvider(c echo.Context) Provider {
+	if interfaces.AuthEndpointTypes[userInfo.portalProxy.GetConfig().ConsoleConfig.AuthEndpointType] == interfaces.Local {
+		return InitLocalUserInfo(userInfo.portalProxy)
+	}
+
+	return InitUaaUserInfo(userInfo.portalProxy, c)
+}
+
+func (userInfo *UserInfo) preFlightChecks(c echo.Context) (string, error) {
+	// Check session
+	_, err := userInfo.portalProxy.GetSessionInt64Value(c, "exp")
+	if err != nil {
+		msg := "Could not find session date"
+		log.Error(msg)
+		return "", echo.NewHTTPError(http.StatusForbidden, msg)
+	}
+
+	sessionUser, err := userInfo.portalProxy.GetSessionStringValue(c, "user_id")
+	if err != nil {
+		msg := "Could not find user_id in Session"
+		log.Error(msg)
+		return "", echo.NewHTTPError(http.StatusForbidden, msg)
+	}
+
+	id := c.Param("id")
+	if id != sessionUser {
+		return id, echo.NewHTTPError(http.StatusForbidden, "Invalid user id")
+	}
+
+	return id, nil
+}
+
+// get user info for the current user
+func (userInfo *UserInfo) userInfo(c echo.Context) error {
+	id, err := userInfo.preFlightChecks(c)
+	if err != nil {
+		return err
+	}
+
+	provider := userInfo.getProvider(c)
+	statusCode, body, err := provider.GetUserInfo(id)
+	if err != nil {
+		return err
+	}
+
+	c.Response().WriteHeader(statusCode)
+	_, _ = c.Response().Write(body)
+
+	return nil
+}
+
+
+// update the user info for the current user
+func (userInfo *UserInfo) updateUserInfo(c echo.Context) error {
+	_, err := userInfo.preFlightChecks(c)
+	if err != nil {
+		return err
+	}
+
+	provider := userInfo.getProvider(c)
+
+	body, err := ioutil.ReadAll(c.Request().Body)
+	if err != nil {
+		log.Errorf("Unexpected response: %v", err)
+		return echo.NewHTTPError(http.StatusBadRequest, "Invalid message body")
+	}
+
+	updatedProfile := &uaaUser{}
+	updatedProfile.Raw = body
+	err = json.Unmarshal(body, updatedProfile)
+	if err != nil {
+		return echo.NewHTTPError(http.StatusBadRequest, "Invalid message body")
+	}
+
+	err = provider.UpdateUserInfo(updatedProfile)
+	if err != nil {
+		if httpError, ok := err.(interfaces.ErrHTTPShadow); ok {
+			return httpError
+		}
+
+		return interfaces.NewHTTPShadowError(
+			http.StatusInternalServerError,
+			"Unable to update user profile",
+			"Unable to update user profile: %v", err,
+		)
+	}		
+	
+	c.Response().WriteHeader(http.StatusOK)
+
+	return nil
+}
+
+// update the user info for the current user
+func (userInfo *UserInfo) updateUserPassword(c echo.Context) error {
+	id, err := userInfo.preFlightChecks(c)
+	if err != nil {
+		return err
+	}
+
+	provider := userInfo.getProvider(c)
+
+	body, err := ioutil.ReadAll(c.Request().Body)
+	if err != nil {
+		log.Errorf("Unexpected response: %v", err)
+		return echo.NewHTTPError(http.StatusBadRequest, "Invalid message body")
+	}
+
+	passwordInfo := &passwordChangeInfo{}
+	passwordInfo.Raw = body
+	err = json.Unmarshal(body, passwordInfo)
+	if err != nil {
+		return echo.NewHTTPError(http.StatusBadRequest, "Invalid message body")
+	}
+
+	err = provider.UpdatePassword(id, passwordInfo)
+	if err != nil {
+		if httpError, ok := err.(interfaces.ErrHTTPShadow); ok {
+			return httpError
+		}
+
+		return interfaces.NewHTTPShadowError(
+			http.StatusInternalServerError,
+			"Unable to update user password",
+			"Unable to update user password: %v", err,
+		)
+	}		
+	
+	c.Response().WriteHeader(http.StatusOK)
+
+	return nil
+}
\ No newline at end of file
diff --git a/src/jetstream/plugins/userinfo/types.go b/src/jetstream/plugins/userinfo/types.go
new file mode 100644
index 0000000000..6a65d73905
--- /dev/null
+++ b/src/jetstream/plugins/userinfo/types.go
@@ -0,0 +1,40 @@
+package userinfo
+
+// Provider manages user info for a provider
+type Provider interface {
+	GetUserInfo(id string) (int, []byte, error)
+	UpdateUserInfo(*uaaUser) error
+	UpdatePassword(id string, info *passwordChangeInfo) error
+}
+
+type uaaUserEmail struct {
+	Value string `json:"value"`
+}
+
+type uaaUserName struct {
+	FamilyName string `json:"familyName"`
+	GivenName string `json:"givenName"`
+}
+
+type uaaUserGroup struct {
+	Display string `json:"display"`
+}
+
+type uaaUser struct {
+	Raw []byte
+	ID string `json:"id"`
+	Username string `json:"userName"`
+	Emails []uaaUserEmail `json:"emails"`
+	Name uaaUserName `json:"name"`
+	Origin string `json:"origin"`
+	Groups []uaaUserGroup `json:"groups"`
+	Meta struct {
+		Version int `json:"version"`
+	} `json:"meta"`
+}
+
+type passwordChangeInfo struct {
+	Raw []byte
+	OldPassword string `json:"oldPassword"`
+	NewPassword string `json:"password"`
+}
\ No newline at end of file
diff --git a/src/jetstream/plugins/userinfo/user_info.go b/src/jetstream/plugins/userinfo/uaa_user.go
similarity index 57%
rename from src/jetstream/plugins/userinfo/user_info.go
rename to src/jetstream/plugins/userinfo/uaa_user.go
index cbf5860c31..711a5c19b4 100644
--- a/src/jetstream/plugins/userinfo/user_info.go
+++ b/src/jetstream/plugins/userinfo/uaa_user.go
@@ -1,6 +1,7 @@
 package userinfo
 
 import (
+	"bytes"
 	"fmt"
 	"io/ioutil"
 	"net/http"
@@ -8,86 +9,114 @@ import (
 
 	"github.com/labstack/echo"
 	log "github.com/sirupsen/logrus"
+
+	"github.com/cloudfoundry-incubator/stratos/src/jetstream/repository/interfaces"
 )
 
-func (userInfo *UserInfo) uaa(c echo.Context) error {
+// UaaUserInfo for UAA User Info
+type UaaUserInfo struct {
+	portalProxy interfaces.PortalProxy
+	echo        echo.Context
+}
+
+// InitUaaUserInfo creates a new UAA user info provider
+func InitUaaUserInfo(portalProxy interfaces.PortalProxy, c echo.Context) Provider {
+	return &UaaUserInfo{portalProxy: portalProxy, echo: c}
+}
+
+// GetUserInfo gets info for the specified user
+func (userInfo *UaaUserInfo) GetUserInfo(id string) (int, []byte, error) {
+	target := fmt.Sprintf("Users/%s", id)
+	return userInfo.uaa(target, nil)
+}
+
+// UpdateUserInfo updates the user's info
+func (userInfo *UaaUserInfo) UpdateUserInfo(profile *uaaUser) (error) {
+	target := fmt.Sprintf("Users/%s", profile.ID)
+	_, _, err := userInfo.uaa(target, profile.Raw)
+	return err
+}
+
+// UpdatePassword updates the user's password
+func (userInfo *UaaUserInfo) UpdatePassword(id string, passwordInfo *passwordChangeInfo) (error) {
+	target := fmt.Sprintf("Users/%s/password", id)
+	_, _, err := userInfo.uaa(target, passwordInfo.Raw)
+	return err
+}
+
+func (userInfo *UaaUserInfo) uaa(target string, body []byte) (int, []byte, error)  {
 	log.Debug("uaa request")
 
 	// Check session
-	_, err := userInfo.portalProxy.GetSessionInt64Value(c, "exp")
+	_, err := userInfo.portalProxy.GetSessionInt64Value(userInfo.echo, "exp")
 	if err != nil {
 		msg := "Could not find session date"
 		log.Error(msg)
-		return echo.NewHTTPError(http.StatusForbidden, msg)
+		return http.StatusForbidden, nil, echo.NewHTTPError(http.StatusForbidden, msg)
 	}
 
-	sessionUser, err := userInfo.portalProxy.GetSessionStringValue(c, "user_id")
+	sessionUser, err := userInfo.portalProxy.GetSessionStringValue(userInfo.echo, "user_id")
 	if err != nil {
 		msg := "Could not find user_id in Session"
 		log.Error(msg)
-		return echo.NewHTTPError(http.StatusForbidden, msg)
+		return http.StatusForbidden, nil, echo.NewHTTPError(http.StatusForbidden, msg)
 	}
 
 	uaaEndpoint := userInfo.portalProxy.GetConfig().ConsoleConfig.UAAEndpoint
-	path := c.Path()
 
 	// Now get the URL of the request and remove the path to give the path of the API that is being requested
-	target := c.Request().URL.Path
-	target = target[(len(path) - 1):]
 	url := fmt.Sprintf("%s/%s", uaaEndpoint, target)
 
 	username, err := userInfo.portalProxy.GetUsername(sessionUser)
 	if err != nil {
-		return err
+		return http.StatusInternalServerError, nil, err
 	}
 
 	// Check for custom header - if present, verify the user's password before making the request
-	password := c.Request().Header.Get("x-stratos-password")
+	password := userInfo.echo.Request().Header.Get("x-stratos-password")
 	if len(password) > 0 {
 		// Need to verify the user's login
 		err := userInfo.portalProxy.RefreshUAALogin(username, password, false)
 		if err != nil {
-			return err
+			return  http.StatusInternalServerError, nil, err
 		}
 	}
 
-	statusCode, body, err := userInfo.doAPIRequest(sessionUser, url, c.Request())
+	statusCode, body, err := userInfo.doAPIRequest(sessionUser, url, userInfo.echo.Request(), body)
 	if err != nil {
-		return err
+		return http.StatusInternalServerError, nil, err
 	}
 
 	// Refresh the access token
 	if statusCode == 401 {
 		_, err := userInfo.portalProxy.RefreshUAAToken(sessionUser)
 		if err != nil {
-			return err
+			return  http.StatusInternalServerError, nil, err
 		}
-		statusCode, body, err = userInfo.doAPIRequest(sessionUser, url, c.Request())
+		statusCode, body, err = userInfo.doAPIRequest(sessionUser, url, userInfo.echo.Request(), body)
 		if err != nil {
-			return err
+			return  http.StatusInternalServerError, nil, err
 		}
 	}
 
 	// If we have the user's password, log them in again
 	// This is used when the API call that is being made revokes the current access and refresh tokens
 	if len(password) > 0 {
-		newPassword := c.Request().Header.Get("x-stratos-password-new")
+		newPassword := userInfo.echo.Request().Header.Get("x-stratos-password-new")
 		if len(newPassword) > 0 {
 			password = newPassword
 		}
 		err := userInfo.portalProxy.RefreshUAALogin(username, password, true)
 		if err != nil {
-			return err
+			return  http.StatusInternalServerError, nil, err
 		}
 	}
 
-	c.Response().WriteHeader(statusCode)
-	_, _ = c.Response().Write(body)
+	return statusCode, body, nil
 
-	return nil
 }
 
-func (userInfo *UserInfo) doAPIRequest(sessionUser string, url string, echoReq *http.Request) (stausCode int, body []byte, err error) {
+func (userInfo *UaaUserInfo) doAPIRequest(sessionUser string, url string, echoReq *http.Request, body []byte) (int, []byte, error) {
 	// Proxy the request to the UAA on behalf of the user
 	log.Debugf("doAPIRequest: %s", url)
 
@@ -100,7 +129,7 @@ func (userInfo *UserInfo) doAPIRequest(sessionUser string, url string, echoReq *
 	var res *http.Response
 	var req *http.Request
 
-	req, err = http.NewRequest(echoReq.Method, url, echoReq.Body)
+	req, err = http.NewRequest(echoReq.Method, url, bytes.NewReader(body))
 	if err != nil {
 		return 0, nil, err
 	}
diff --git a/src/jetstream/repository/interfaces/localuser.go b/src/jetstream/repository/interfaces/localuser.go
index 33e0438f42..94f149c8f6 100644
--- a/src/jetstream/repository/interfaces/localuser.go
+++ b/src/jetstream/repository/interfaces/localuser.go
@@ -7,4 +7,6 @@ type LocalUser struct {
 	Username     string `json:"username"`
 	Email        string `json:"email"`
 	Scope        string `json:"scope"`
+	GivenName    string `json:"given_name"`
+	FamilyName   string `json:"family_name"`
 }
diff --git a/src/jetstream/repository/localusers/psql_localusers.go b/src/jetstream/repository/localusers/psql_localusers.go
index bd131c1389..956e7c68ad 100644
--- a/src/jetstream/repository/localusers/psql_localusers.go
+++ b/src/jetstream/repository/localusers/psql_localusers.go
@@ -16,12 +16,12 @@ var findPasswordHash = `SELECT password_hash
 									WHERE user_guid = $1`
 var findUserGUID = `SELECT user_guid FROM local_users WHERE user_name = $1`
 var findUserScope = `SELECT user_scope FROM local_users WHERE user_guid = $1`
-var insertLocalUser = `INSERT INTO local_users (user_guid, password_hash, user_name, user_email, user_scope) VALUES ($1, $2, $3, $4, $5)`
-var updateLocalUser = `UPDATE local_users SET password_hash=$1, user_name=$2, user_email=$3, user_scope=$4 WHERE user_guid=$5`
+var insertLocalUser = `INSERT INTO local_users (user_guid, password_hash, user_name, user_email, user_scope, given_name, family_name) VALUES ($1, $2, $3, $4, $5, $6, $7)`
+var updateLocalUser = `UPDATE local_users SET password_hash=$1, user_name=$2, user_email=$3, user_scope=$4, given_name=$5, family_name=$6 WHERE user_guid=$7`
 var updateLastLoginTime = `UPDATE local_users SET last_login=$1 WHERE user_guid = $2`
 var findLastLoginTime = `SELECT last_login FROM local_users WHERE user_guid = $1`
 var getTableCount = `SELECT count(user_guid) FROM local_users`
-var findUser = `SELECT user_name, user_email, user_scope FROM local_users WHERE user_guid = $1`
+var findUser = `SELECT user_name, user_email, user_scope, given_name, family_name FROM local_users WHERE user_guid = $1`
 
 // PgsqlLocalUsersRepository is a PostgreSQL-backed local users repository
 type PgsqlLocalUsersRepository struct {
@@ -114,10 +114,12 @@ func (p *PgsqlLocalUsersRepository) FindUser(userGUID string) (interfaces.LocalU
 	var (
 		email sql.NullString
 		scope sql.NullString
+		givenName sql.NullString
+		familyName sql.NullString
 	)
 
 	// Look for the user
-	err := p.db.QueryRow(findUser, userGUID).Scan(&user.Username, &email, &scope)
+	err := p.db.QueryRow(findUser, userGUID).Scan(&user.Username, &email, &scope, &givenName, &familyName)
 	if err != nil {
 		msg := "Unable to find user: %v"
 		log.Debugf(msg, err)
@@ -132,6 +134,14 @@ func (p *PgsqlLocalUsersRepository) FindUser(userGUID string) (interfaces.LocalU
 		user.Scope = scope.String
 	}
 
+	if givenName.Valid {
+		user.GivenName = givenName.String
+	}
+
+	if familyName.Valid {
+		user.FamilyName = familyName.String
+	}
+
 	return user, nil
 }
 
@@ -245,7 +255,7 @@ func (p *PgsqlLocalUsersRepository) AddLocalUser(user interfaces.LocalUser) erro
 
 	// Add the new local user to the DB
 	var result sql.Result
-	if result, err = p.db.Exec(insertLocalUser, user.UserGUID, user.PasswordHash, user.Username, user.Email, user.Scope); err != nil {
+	if result, err = p.db.Exec(insertLocalUser, user.UserGUID, user.PasswordHash, user.Username, user.Email, user.Scope, user.GivenName, user.FamilyName); err != nil {
 		msg := "unable to INSERT local user: %v"
 		log.Debugf(msg)
 		err = fmt.Errorf(msg, err)
@@ -294,7 +304,7 @@ func (p *PgsqlLocalUsersRepository) UpdateLocalUser(user interfaces.LocalUser) e
 
 	// Update the local user to the DB
 	var result sql.Result
-	if result, err = p.db.Exec(updateLocalUser, user.PasswordHash, user.Username, user.Email, user.Scope, user.UserGUID); err != nil {
+	if result, err = p.db.Exec(updateLocalUser, user.PasswordHash, user.Username, user.Email, user.Scope, user.GivenName, user.FamilyName, user.UserGUID); err != nil {
 		msg := "unable to UPDATE local user: %v"
 		log.Debugf(msg)
 		err = fmt.Errorf(msg, err)
diff --git a/src/jetstream/setup_console.go b/src/jetstream/setup_console.go
index 3939a005e7..95b133f779 100644
--- a/src/jetstream/setup_console.go
+++ b/src/jetstream/setup_console.go
@@ -257,13 +257,13 @@ func initialiseLocalUsersConfiguration(consoleConfig *interfaces.ConsoleConfig,
 	}
 	scope := localUserScope
 	email := ""
-	user := interfaces.LocalUser{UserGUID: userGUID, PasswordHash: passwordHash, Username: localUserName, Email: email, Scope: scope}
+	user := interfaces.LocalUser{UserGUID: userGUID, PasswordHash: passwordHash, Username: localUserName, Email: email, Scope: scope, GivenName: "Admin", FamilyName: "User"}
 
-	// Don't add the user if they already exist - update instead
-	guid, err := localUsersRepo.FindUserGUID(localUserName)
+	// Don't add the user if they already exist
+	_, err = localUsersRepo.FindUserGUID(localUserName)
 	if err == nil {
-		user.UserGUID = guid
-		return localUsersRepo.UpdateLocalUser(user)
+		// Can't modify the user once created else we loose any updates that might have neen made
+		return nil
 	}
 
 	err = localUsersRepo.AddLocalUser(user)

From 48e8e496bec073e216850885fad8070863d56362 Mon Sep 17 00:00:00 2001
From: Richard Cox <richard-cox@users.noreply.github.com>
Date: Mon, 23 Sep 2019 09:45:02 +0100
Subject: [PATCH 06/18] Ensure MB is only shown for memory based quota values
 in edit quota forms (#3892)

---
 .../unlimited-input/unlimited-input.component.html     | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/frontend/packages/core/src/shared/components/unlimited-input/unlimited-input.component.html b/src/frontend/packages/core/src/shared/components/unlimited-input/unlimited-input.component.html
index 07e0895258..bd7b739480 100644
--- a/src/frontend/packages/core/src/shared/components/unlimited-input/unlimited-input.component.html
+++ b/src/frontend/packages/core/src/shared/components/unlimited-input/unlimited-input.component.html
@@ -1,7 +1,9 @@
 <div class="unlimited-input">
   <mat-form-field>
-    <input type="number" [id]="name" matInput [formControlName]="name" [placeholder]="placeholder" [required]="required" min="0">
-    <span matSuffix>MB</span>
+    <input type="number" [id]="name" matInput [formControlName]="name" [placeholder]="placeholder" [required]="required"
+      min="0">
+    <span *ngIf="suffix" matSuffix>{{suffix}}</span>
   </mat-form-field>
-  <mat-checkbox matInput [(ngModel)]="unlimited" [ngModelOptions]="{standalone: true}" value="-1" (change)="onChange()" min>Unlimited</mat-checkbox>
-</div>
+  <mat-checkbox matInput [(ngModel)]="unlimited" [ngModelOptions]="{standalone: true}" value="-1" (change)="onChange()"
+    min>Unlimited</mat-checkbox>
+</div>
\ No newline at end of file

From 6b3310585873a1b4a6df3a6969512f2c3c3a22cb Mon Sep 17 00:00:00 2001
From: Neil MacDougall <neil.macdougall@suse.com>
Date: Mon, 23 Sep 2019 09:46:57 +0100
Subject: [PATCH 07/18] Improve user clean up

---
 deploy/ci/automation/e2e-clean-remnants.sh | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/deploy/ci/automation/e2e-clean-remnants.sh b/deploy/ci/automation/e2e-clean-remnants.sh
index 4f87d94a0b..c9eac080a6 100755
--- a/deploy/ci/automation/e2e-clean-remnants.sh
+++ b/deploy/ci/automation/e2e-clean-remnants.sh
@@ -105,4 +105,14 @@ clean "$USERS" "-" "delete-user" "^(acceptancee2etravis)(invite[0-9])(20[0-9]*)[
 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].*"
 
+# Users without roles
+echo "Cleaning users without roles"
+USERS=$(cf curl "/v2/users?results-per-page=100" | jq -r .resources[].entity.username)
+clean "$USERS" "-" "delete-user" "^(acceptance\.e2e\.travisci)(-remove-users)\.(20[0-9]*)[Tt]([0-9]*)[zZ].*"
+clean "$USERS" "-" "delete-user" "^(acceptance\.e2e\.travis)(-remove-users)\.(20[0-9]*)[Tt]([0-9]*)[zZ].*"
+
+
 echo "Done"
+
+# Get users without usernames
+#cf curl "/v2/users?results-per-page=10" | jq '.resources[] | { "username": .entity.username, "guid": .metadata.guid, "created": .metadata.created_at }' | jq 'select(.username==null)' | jq '. | select(.guid|match("^[0-9a-z]*-[0-9a-z]*-[0-9a-z]*[0-9a-z]*"))'

From b32b89590f679ec35338cf6c6a97ac408183455a Mon Sep 17 00:00:00 2001
From: Neil MacDougall <nwmac@users.noreply.github.com>
Date: Mon, 23 Sep 2019 13:58:02 +0100
Subject: [PATCH 08/18] Travis: Build once and share build in e2e tests (#3901)

* Build once and share build in e2e tests

* Fix stage order

* Fix typo

* Only build if needed

* Fix

* Fix typo when editing

* Ensure we configure

* Do not exit in build script

* Use better ID for the build package
---
 .travis.yml                                |  7 ++
 deploy/ci/travis/e2e-build-script.sh       | 76 ++++++++++++++++++++++
 deploy/ci/travis/e2e-mc-helper.sh          | 19 ++++++
 deploy/ci/travis/run-e2e-tests.sh          | 14 ++--
 deploy/ci/travis/upload-e2e-test-report.sh | 14 ++--
 5 files changed, 112 insertions(+), 18 deletions(-)
 create mode 100755 deploy/ci/travis/e2e-build-script.sh
 create mode 100644 deploy/ci/travis/e2e-mc-helper.sh

diff --git a/.travis.yml b/.travis.yml
index 8a5f932ef5..5a2afefa68 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -28,6 +28,7 @@ cache:
   - node_modules
 stages:
 - Lint
+- Build
 - Test
 jobs:
   include:
@@ -44,6 +45,12 @@ jobs:
     script:
     - golint src/jetstream/...
     - ./deploy/ci/travis/update-go-report-card.sh
+  - stage: Build
+    name: Build Frontend and Backend
+    env:
+    - CI_ENV=true
+    script:
+    - "./deploy/ci/travis/e2e-build-script.sh build"
   - stage: Test
     name: Frontend Unit Tests
     env:
diff --git a/deploy/ci/travis/e2e-build-script.sh b/deploy/ci/travis/e2e-build-script.sh
new file mode 100755
index 0000000000..fee8595eed
--- /dev/null
+++ b/deploy/ci/travis/e2e-build-script.sh
@@ -0,0 +1,76 @@
+#!/bin/bash
+
+echo "Stratos e2e build"
+echo "================="
+
+MC_HOST="s3"
+
+LOCAL_BUILD="true"
+
+# Use Travis env vars:
+# TRAVIS_PULL_REQUEST
+# TRAVIS_REPO_SLUG
+# TRAVIS_COMMIT
+
+if [ -z "$TRAVIS_REPO_SLUG" ]; then
+  echo "Need to be running in Trvis"
+  exit 1
+fi
+
+if [ -z "$TRAVIS_COMMIT" ]; then
+  echo "Need to be running in Trvis"
+  exit 1
+fi
+
+GIT_ID="${TRAVIS_REPO_SLUG}_${TRAVIS_COMMIT}_${TRAVIS_PULL_REQUEST}"
+GIT_ID="${GIT_ID//\//_}"
+echo $GIT_ID
+
+TAR_NAME="${GIT_ID}.tar"
+GZIP_NAME="${GIT_ID}.tgz"
+
+# Ensure we have the mc command
+DIRNAME="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+source "${DIRNAME}/e2e-mc-helper.sh"
+
+function tryGetExistingBuild() {
+  echo "Looking for existing build: ${GIT_ID}"
+
+  mc cp -q --insecure ${MC_HOST}/${S3_BUILDS_BUCKET}/${GZIP_NAME} ./
+  if [ $? -eq 0 ]; then
+    # We found an existing build, so download and unpack it
+    echo "Downloading build package"
+    tar -xvf ${GZIP_NAME}
+    if [ $? -eq 0 ]; then
+      LOCAL_BUILD="false"
+    fi
+    rm -rf ${GZIP_NAME}
+  fi
+}
+
+if [ -n "${AWS_ENDPOINT}" ]; then
+  tryGetExistingBuild
+fi
+
+if [ "${LOCAL_BUILD}" == "false" ]; then
+  echo "Downloaded and unpacked an existing build - no need to build locally"
+else
+
+  set -e
+
+# Get go
+curl -sL -o ~/bin/gimme https://raw.githubusercontent.com/travis-ci/gimme/master/gimme
+chmod +x ~/bin/gimme
+eval "$(gimme 1.12.4)"
+go version
+
+npm run build
+npm run build-backend
+
+  set +e
+  tar cvfz ${GZIP_NAME} dist/* src/jetstream/jetstream
+
+# Upload
+  mc cp -q --insecure ${GZIP_NAME} ${MC_HOST}/${S3_BUILDS_BUCKET}
+
+fi
diff --git a/deploy/ci/travis/e2e-mc-helper.sh b/deploy/ci/travis/e2e-mc-helper.sh
new file mode 100644
index 0000000000..4dbb3109b6
--- /dev/null
+++ b/deploy/ci/travis/e2e-mc-helper.sh
@@ -0,0 +1,19 @@
+# Helper for mc command
+
+mc version > /dev/null
+if [ $? -eq 0 ]; then
+  echo "mc command already installed and confgiured"
+else
+  echo "Installing and configuring mc command ..."
+
+  wget https://dl.minio.io/client/mc/release/linux-amd64/mc
+  chmod +x mc
+  cp mc ~/bin
+
+  mc -install -y >/dev/null 2>&1
+
+  echo "Configuring mc client"
+  mc config host add s3 ${AWS_ENDPOINT} ${AWS_ACCESS_KEY_ID} ${AWS_SECRET_ACCESS_KEY} --insecure
+
+  echo "mc command ready"
+fi
diff --git a/deploy/ci/travis/run-e2e-tests.sh b/deploy/ci/travis/run-e2e-tests.sh
index 0b2ab023a9..3159e8f75e 100755
--- a/deploy/ci/travis/run-e2e-tests.sh
+++ b/deploy/ci/travis/run-e2e-tests.sh
@@ -43,14 +43,12 @@ echo "Using local deployment for e2e tests"
 # Start a local UAA - this will take a few seconds to come up in the background
 docker run -d -p 8080:8080 splatform/stratos-uaa
 
-# Get go
-curl -sL -o ~/bin/gimme https://raw.githubusercontent.com/travis-ci/gimme/master/gimme
-chmod +x ~/bin/gimme
-eval "$(gimme 1.12.4)"
-go version
-
-npm run build
-npm run build-backend
+# Build if needed or use existing build for this commit
+DIRNAME="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+set +e
+source "${DIRNAME}/e2e-build-script.sh"
+set -e
+
 # Copy travis config.properties file
 cp deploy/ci/travis/config.properties src/jetstream/
 pushd src/jetstream
diff --git a/deploy/ci/travis/upload-e2e-test-report.sh b/deploy/ci/travis/upload-e2e-test-report.sh
index 8a54092604..cc20deb2e1 100755
--- a/deploy/ci/travis/upload-e2e-test-report.sh
+++ b/deploy/ci/travis/upload-e2e-test-report.sh
@@ -8,19 +8,13 @@ if [ -z "${AWS_ENDPOINT}" ]; then
   exit 0
 fi
 
-wget https://dl.minio.io/client/mc/release/linux-amd64/mc
-chmod +x mc
+DIRNAME="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+source "${DIRNAME}/e2e-mc-helper.sh"
 
-echo "Uploading test report...."
+echo "Uploading test report ..."
 
-./mc -install -y
-
-echo "Configuring upload client"
-./mc config host add s3 ${AWS_ENDPOINT} ${AWS_ACCESS_KEY_ID} ${AWS_SECRET_ACCESS_KEY} --insecure
-
-echo "Uploading ..."
 # Sync the E2E reports
-./mc cp -q --insecure -r e2e-reports s3/${S3_BUCKET}
+mc cp -q --insecure -r e2e-reports s3/${S3_BUCKET}
 
 if [[ $? != 0 ]]; then
   echo 'Error uploading test reports: $?'

From e80d818c79afb5a682cf0d7e0322ee04973206f9 Mon Sep 17 00:00:00 2001
From: Richard Cox <richard.cox@suse.com>
Date: Mon, 23 Sep 2019 16:54:27 +0100
Subject: [PATCH 09/18] Ensure multi endpoint requests only go out to
 connected/unconnectable endpoints - Fixes #3887

---
 .../base-single-entity-request.pipeline.ts    |  3 +-
 .../entity-pagination-request-pipeline.ts     |  3 +-
 .../make-request-entity-request.pipe.ts       | 12 ++++---
 .../entity-request-pipeline.ts                |  6 ++--
 .../entity-request-pipeline.types.ts          |  7 ++--
 .../pagination-iterator.pipe.ts               |  2 +-
 .../pipline-http-client.service.ts            | 31 +++++++++++++-----
 .../store/src/selectors/endpoint.selectors.ts | 32 ++++++++++++++-----
 8 files changed, 67 insertions(+), 29 deletions(-)

diff --git a/src/frontend/packages/store/src/entity-request-pipeline/base-single-entity-request.pipeline.ts b/src/frontend/packages/store/src/entity-request-pipeline/base-single-entity-request.pipeline.ts
index 0cbff41dfe..b708b1deaa 100644
--- a/src/frontend/packages/store/src/entity-request-pipeline/base-single-entity-request.pipeline.ts
+++ b/src/frontend/packages/store/src/entity-request-pipeline/base-single-entity-request.pipeline.ts
@@ -3,6 +3,7 @@ import { Observable } from 'rxjs';
 import { map } from 'rxjs/operators';
 
 import { StratosBaseCatalogueEntity } from '../../../core/src/core/entity-catalogue/entity-catalogue-entity';
+import { entityCatalogue } from '../../../core/src/core/entity-catalogue/entity-catalogue.service';
 import { IStratosEntityDefinition } from '../../../core/src/core/entity-catalogue/entity-catalogue.types';
 import { AppState, InternalAppState } from '../app-state';
 import { EntityRequestAction } from '../types/request.types';
@@ -36,7 +37,7 @@ export const baseRequestPipelineFactory: EntityRequestPipeline = (
   return makeRequestEntityPipe(
     httpClient,
     request,
-    action.endpointType,
+    entityCatalogue.getEndpoint(action.endpointType, action.subType),
     action.endpointGuid,
     action.externalRequest
   ).pipe(
diff --git a/src/frontend/packages/store/src/entity-request-pipeline/entity-pagination-request-pipeline.ts b/src/frontend/packages/store/src/entity-request-pipeline/entity-pagination-request-pipeline.ts
index 387fa70ae0..5bd62130e0 100644
--- a/src/frontend/packages/store/src/entity-request-pipeline/entity-pagination-request-pipeline.ts
+++ b/src/frontend/packages/store/src/entity-request-pipeline/entity-pagination-request-pipeline.ts
@@ -7,6 +7,7 @@ import {
   StratosBaseCatalogueEntity,
   StratosCatalogueEntity,
 } from '../../../core/src/core/entity-catalogue/entity-catalogue-entity';
+import { entityCatalogue } from '../../../core/src/core/entity-catalogue/entity-catalogue.service';
 import { IStratosEntityDefinition } from '../../../core/src/core/entity-catalogue/entity-catalogue.types';
 import { AppState, InternalAppState } from '../app-state';
 import { PaginationFlattenerConfig } from '../helpers/paginated-request-helpers';
@@ -44,7 +45,7 @@ function getRequestObservable(
   const initialRequest = makeRequestEntityPipe(
     httpClient,
     request,
-    action.endpointType,
+    entityCatalogue.getEndpoint(action.endpointType, action.subType),
     action.endpointGuid,
     action.externalRequest
   );
diff --git a/src/frontend/packages/store/src/entity-request-pipeline/entity-request-base-handlers/make-request-entity-request.pipe.ts b/src/frontend/packages/store/src/entity-request-pipeline/entity-request-base-handlers/make-request-entity-request.pipe.ts
index 122b842493..657afac20c 100644
--- a/src/frontend/packages/store/src/entity-request-pipeline/entity-request-base-handlers/make-request-entity-request.pipe.ts
+++ b/src/frontend/packages/store/src/entity-request-pipeline/entity-request-base-handlers/make-request-entity-request.pipe.ts
@@ -1,18 +1,20 @@
-import { MakeEntityRequestPipe } from '../entity-request-pipeline.types';
 import { HttpRequest } from '@angular/common/http';
 import { switchMap } from 'rxjs/operators';
 
+import { StratosCatalogueEndpointEntity } from '../../../../core/src/core/entity-catalogue/entity-catalogue-entity';
+import { MakeEntityRequestPipe } from '../entity-request-pipeline.types';
+
 export const makeRequestEntityPipe: MakeEntityRequestPipe = (
   httpClient,
   requestOrObservable,
-  endpointType,
-  endpointGuids,
+  endpointConfig: StratosCatalogueEndpointEntity,
+  endpointGuids: string[],
   externalRequest: boolean = false
 ) => {
   if (requestOrObservable instanceof HttpRequest) {
     return httpClient.pipelineRequest(
       requestOrObservable,
-      endpointType,
+      endpointConfig,
       endpointGuids,
       externalRequest
     );
@@ -20,7 +22,7 @@ export const makeRequestEntityPipe: MakeEntityRequestPipe = (
   return requestOrObservable.pipe(
     switchMap(request => httpClient.pipelineRequest(
       request,
-      endpointType,
+      endpointConfig,
       endpointGuids,
       externalRequest
     ))
diff --git a/src/frontend/packages/store/src/entity-request-pipeline/entity-request-pipeline.ts b/src/frontend/packages/store/src/entity-request-pipeline/entity-request-pipeline.ts
index f1aa7a0d96..097adb2977 100644
--- a/src/frontend/packages/store/src/entity-request-pipeline/entity-request-pipeline.ts
+++ b/src/frontend/packages/store/src/entity-request-pipeline/entity-request-pipeline.ts
@@ -7,15 +7,15 @@ import { entityCatalogue } from '../../../core/src/core/entity-catalogue/entity-
 import { AppState, InternalAppState } from '../app-state';
 import { RecursiveDelete } from '../effects/recursive-entity-delete.effect';
 import { ApiRequestTypes, getRequestTypeFromMethod } from '../reducers/api-request-reducer/request-helpers';
+import { PaginatedAction } from '../types/pagination.types';
 import { EntityRequestAction } from '../types/request.types';
 import { failedEntityHandler } from './entity-request-base-handlers/fail-entity-request.handler';
+import { patchActionWithForcedConfig } from './entity-request-base-handlers/forced-action-type.helpers';
 import { jetstreamErrorHandler } from './entity-request-base-handlers/jetstream-error.handler';
 import { startEntityHandler } from './entity-request-base-handlers/start-entity-request.handler';
 import { successEntityHandler } from './entity-request-base-handlers/success-entity-request.handler';
 import { EntityRequestPipeline, PreApiRequest, SuccessfulApiResponseDataMapper } from './entity-request-pipeline.types';
 import { PipelineHttpClient } from './pipline-http-client.service';
-import { patchActionWithForcedConfig } from './entity-request-base-handlers/forced-action-type.helpers';
-import { PaginatedAction } from '../types/pagination.types';
 
 export interface PipelineFactoryConfig<T extends AppState = InternalAppState> {
   store: Store<AppState>;
@@ -46,7 +46,7 @@ export const apiRequestPipelineFactory = (
   const actionDispatcher = (actionToDispatch: Action) => store.dispatch(actionToDispatch);
   const requestType = getRequestTypeFromMethod(patchedAction);
 
-  const catalogueEntity = entityCatalogue.getEntity(patchedAction.endpointType, patchedAction.entityType);
+  const catalogueEntity = entityCatalogue.getEntity(patchedAction);
   const recursivelyDelete = shouldRecursivelyDelete(requestType, patchedAction);
 
   if (recursivelyDelete) {
diff --git a/src/frontend/packages/store/src/entity-request-pipeline/entity-request-pipeline.types.ts b/src/frontend/packages/store/src/entity-request-pipeline/entity-request-pipeline.types.ts
index e5af76edad..b1238b410f 100644
--- a/src/frontend/packages/store/src/entity-request-pipeline/entity-request-pipeline.types.ts
+++ b/src/frontend/packages/store/src/entity-request-pipeline/entity-request-pipeline.types.ts
@@ -3,7 +3,10 @@ import { RequestOptions } from '@angular/http';
 import { Action, Store } from '@ngrx/store';
 import { Observable } from 'rxjs';
 
-import { StratosBaseCatalogueEntity } from '../../../core/src/core/entity-catalogue/entity-catalogue-entity';
+import {
+  StratosBaseCatalogueEntity,
+  StratosCatalogueEndpointEntity,
+} from '../../../core/src/core/entity-catalogue/entity-catalogue-entity';
 import { JetStreamErrorResponse } from '../../../core/src/jetstream.helpers';
 import { AppState, InternalAppState } from '../app-state';
 import { ApiRequestTypes } from '../reducers/api-request-reducer/request-helpers';
@@ -47,7 +50,7 @@ export type MakeEntityRequestPipe<
   > = (
     httpClient: PipelineHttpClient,
     request: HttpRequest<any> | Observable<HttpRequest<any>>,
-    endpointType: string,
+    endpointConfig: StratosCatalogueEndpointEntity,
     endpointGuids: string | string[],
     externalRequest?: boolean
   ) => Observable<JetstreamResponse<T>>;
diff --git a/src/frontend/packages/store/src/entity-request-pipeline/pagination-request-base-handlers/pagination-iterator.pipe.ts b/src/frontend/packages/store/src/entity-request-pipeline/pagination-request-base-handlers/pagination-iterator.pipe.ts
index b410111966..9165d3bbbe 100644
--- a/src/frontend/packages/store/src/entity-request-pipeline/pagination-request-base-handlers/pagination-iterator.pipe.ts
+++ b/src/frontend/packages/store/src/entity-request-pipeline/pagination-request-base-handlers/pagination-iterator.pipe.ts
@@ -35,7 +35,7 @@ export class PaginationPageIterator<R = any, E = any> {
   private makeRequest(httpRequest: HttpRequest<JetstreamResponse<R>>) {
     return this.httpClient.pipelineRequest<JetstreamResponse<R>>(
       httpRequest,
-      this.action.endpointType,
+      entityCatalogue.getEndpoint(this.action.endpointType, this.action.subType),
       this.action.endpointGuid,
       this.action.externalRequest
     );
diff --git a/src/frontend/packages/store/src/entity-request-pipeline/pipline-http-client.service.ts b/src/frontend/packages/store/src/entity-request-pipeline/pipline-http-client.service.ts
index 21ddc2fb6a..272fa82b43 100644
--- a/src/frontend/packages/store/src/entity-request-pipeline/pipline-http-client.service.ts
+++ b/src/frontend/packages/store/src/entity-request-pipeline/pipline-http-client.service.ts
@@ -3,9 +3,12 @@ import { Injectable } from '@angular/core';
 import { Store } from '@ngrx/store';
 import { Observable } from 'rxjs';
 import { filter, first, map, mergeMap } from 'rxjs/operators';
-import { InternalAppState } from '../app-state';
-import { registeredEndpointsOfTypesSelector } from '../selectors/endpoint.selectors';
+
+import { StratosCatalogueEndpointEntity } from '../../../core/src/core/entity-catalogue/entity-catalogue-entity';
+import { IStratosEndpointDefinition } from '../../../core/src/core/entity-catalogue/entity-catalogue.types';
 import { environment } from '../../../core/src/environments/environment';
+import { InternalAppState } from '../app-state';
+import { connectedEndpointsOfTypesSelector, registeredEndpointsOfTypesSelector } from '../selectors/endpoint.selectors';
 
 const { proxyAPIVersion, cfAPIVersion } = environment;
 
@@ -19,20 +22,32 @@ export class PipelineHttpClient {
     private store: Store<InternalAppState>,
   ) { }
 
-  private makeRequest<R>(hr: HttpRequest<any>, endpointType: string, endpointGuids: string | string[] = null, externalRequest = false) {
+  private makeRequest<R>(
+    hr: HttpRequest<any>,
+    endpointConfig: IStratosEndpointDefinition,
+    endpointGuids: string | string[] = null,
+    externalRequest = false
+  ) {
     if (externalRequest) {
       return this.externalRequest(hr);
     }
-    return this.jetstreamRequest(hr, endpointType, endpointGuids);
+    return this.jetstreamRequest(hr, endpointConfig, endpointGuids);
   }
 
-  private jetstreamRequest<R>(hr: HttpRequest<any>, endpointType: string, endpointGuids: string | string[]) {
+  private jetstreamRequest<R>(
+    hr: HttpRequest<any>,
+    endpointConfig: IStratosEndpointDefinition,
+    endpointGuids: string | string[]) {
     const url = `/pp/${proxyAPIVersion}/proxy/${cfAPIVersion}/${hr.url}`;
     if (endpointGuids && endpointGuids.length) {
       const headers = hr.headers.set(PipelineHttpClient.EndpointHeader, endpointGuids);
       return this.httpClient.request<R>(hr.clone({ headers, url }));
     } else {
-      return this.store.select(registeredEndpointsOfTypesSelector(endpointType)).pipe(
+      const selector = endpointConfig.unConnectable ?
+        registeredEndpointsOfTypesSelector(endpointConfig.type) :
+        connectedEndpointsOfTypesSelector(endpointConfig.type);
+
+      return this.store.select(selector).pipe(
         first(),
         mergeMap(endpoints => {
           const headers = hr.headers.set(PipelineHttpClient.EndpointHeader, Object.keys(endpoints));
@@ -48,11 +63,11 @@ export class PipelineHttpClient {
 
   public pipelineRequest<R>(
     hr: HttpRequest<any>,
-    endpointType: string,
+    endpointConfig: StratosCatalogueEndpointEntity,
     endpointGuids: string | string[] = null,
     externalRequest = false
   ): Observable<R> {
-    return this.makeRequest<R>(hr, endpointType, endpointGuids, externalRequest).pipe(
+    return this.makeRequest<R>(hr, endpointConfig.definition, endpointGuids, externalRequest).pipe(
       filter(event => event instanceof HttpResponse),
       map((response: HttpResponse<R>) => response.body)
     );
diff --git a/src/frontend/packages/store/src/selectors/endpoint.selectors.ts b/src/frontend/packages/store/src/selectors/endpoint.selectors.ts
index b00b2233b3..e6f43d2ea5 100644
--- a/src/frontend/packages/store/src/selectors/endpoint.selectors.ts
+++ b/src/frontend/packages/store/src/selectors/endpoint.selectors.ts
@@ -1,4 +1,4 @@
-import { createSelector } from '@ngrx/store';
+import { compose, createSelector } from '@ngrx/store';
 
 import { STRATOS_ENDPOINT_TYPE } from '../../../core/src/base-entity-schemas';
 import { EntityCatalogueHelpers } from '../../../core/src/core/entity-catalogue/entity-catalogue.helper';
@@ -24,36 +24,52 @@ export const endpointOfTypeSelector = (type: string) =>
       return endpointsOfType;
     }, {});
   };
-// TODO More this #3769
+
+// TODO: Move this #3769
 export const cfEndpointEntitiesSelector = endpointOfTypeSelector('cf');
 
-export const getRegisteredEndpoints = (endpoints: IRequestEntityTypeState<EndpointModel>) => {
-  const registered = {} as IRequestEntityTypeState<EndpointModel>;
-  Object.values(endpoints).map(endpoint => {
+export const getRegisteredEndpoints = (endpoints: IRequestEntityTypeState<EndpointModel>) =>
+  Object.values(endpoints).reduce((registered, endpoint) => {
     if (endpoint.registered) {
       registered[endpoint.guid] = endpoint;
     }
     return registered;
-  });
-  return registered;
-};
+  }, {} as IRequestEntityTypeState<EndpointModel>);
+
+export const getConnectedEndpoints = (endpoints: IRequestEntityTypeState<EndpointModel>) =>
+  Object.values(endpoints).reduce((connected, endpoint) => {
+    if (endpoint.connectionStatus === 'connected') {
+      connected[endpoint.guid] = endpoint;
+    }
+    return connected;
+  }, {} as IRequestEntityTypeState<EndpointModel>);
+
 // All Registered  endpoint request data
 export const endpointsRegisteredEntitiesSelector = createSelector(
   endpointEntitiesSelector,
   getRegisteredEndpoints
 );
 
+export const connectedEndpointsOfTypesSelector = (endpointType: string) => compose(
+  getConnectedEndpoints,
+  endpointOfTypeSelector(endpointType),
+  getRegisteredEndpoints,
+  endpointEntitiesSelector,
+);
+
 export const registeredEndpointsOfTypesSelector = (endpointType: string) => createSelector(
   endpointEntitiesSelector,
   endpointOfTypeSelector(endpointType),
   getRegisteredEndpoints
 );
 
+// TODO: Move this #3769
 export const endpointsCFEntitiesSelector = createSelector(
   endpointEntitiesSelector,
   cfEndpointEntitiesSelector
 );
 
+// TODO: Move this #3769
 export const endpointsRegisteredCFEntitiesSelector = createSelector(
   endpointsCFEntitiesSelector,
   getRegisteredEndpoints

From 0659b5a5be9c2d55992fa47fdca3251b5df5e7c0 Mon Sep 17 00:00:00 2001
From: Richard Cox <richard.cox@suse.com>
Date: Mon, 23 Sep 2019 17:45:56 +0100
Subject: [PATCH 10/18] Fix two actionBuilder params issues - Fix three places
 where `includeRelations` were passed incorrectly to actionBuilder - Fix bind
 service

---
 .../add-service-instance/csi-mode.service.ts  |  2 +-
 .../app-service-binding-data-source.ts        | 28 ++++++++--------
 ...cf-spaces-service-instances-data-source.ts | 32 ++++++++++---------
 .../cf-org-space-service.service.ts           |  9 ++++--
 4 files changed, 39 insertions(+), 32 deletions(-)

diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/add-service-instance/csi-mode.service.ts b/src/frontend/packages/cloud-foundry/src/shared/components/add-service-instance/csi-mode.service.ts
index a7b230244a..634c4b54df 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/components/add-service-instance/csi-mode.service.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/add-service-instance/csi-mode.service.ts
@@ -130,8 +130,8 @@ export class CsiModeService {
     const servceBindingEntity = entityCatalogue.getEntity(CF_ENDPOINT_TYPE, serviceBindingEntityType);
     const actionBuilder = servceBindingEntity.actionOrchestrator.getActionBuilder('create');
     const createServiceBindingAction = actionBuilder(
-      cfGuid,
       guid,
+      cfGuid,
       { applicationGuid: appGuid, serviceInstanceGuid, params }
     );
     this.store.dispatch(createServiceBindingAction);
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/app-sevice-bindings/app-service-binding-data-source.ts b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/app-sevice-bindings/app-service-binding-data-source.ts
index 8f3479bc96..ed612953d8 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/app-sevice-bindings/app-service-binding-data-source.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/app-sevice-bindings/app-service-binding-data-source.ts
@@ -1,6 +1,5 @@
 import { Store } from '@ngrx/store';
 
-import { GetAppServiceBindings } from '../../../../../../../cloud-foundry/src/actions/application-service-routes.actions';
 import { CFAppState } from '../../../../../../../cloud-foundry/src/cf-app-state';
 import {
   applicationEntityType,
@@ -10,21 +9,21 @@ import {
   serviceInstancesEntityType,
   servicePlanEntityType,
 } from '../../../../../../../cloud-foundry/src/cf-entity-factory';
+import {
+  createEntityRelationKey,
+  createEntityRelationPaginationKey,
+} from '../../../../../../../cloud-foundry/src/entity-relations/entity-relations.types';
 import { ApplicationService } from '../../../../../../../cloud-foundry/src/features/applications/application.service';
 import { getRowMetadata } from '../../../../../../../cloud-foundry/src/features/cloud-foundry/cf.helpers';
 import { IServiceBinding } from '../../../../../../../core/src/core/cf-api-svc.types';
+import { entityCatalogue } from '../../../../../../../core/src/core/entity-catalogue/entity-catalogue.service';
 import {
   ListDataSource,
 } from '../../../../../../../core/src/shared/components/list/data-sources-controllers/list-data-source';
 import { IListConfig } from '../../../../../../../core/src/shared/components/list/list.component.types';
-import {
-  createEntityRelationKey,
-  createEntityRelationPaginationKey,
-} from '../../../../../../../cloud-foundry/src/entity-relations/entity-relations.types';
 import { APIResource } from '../../../../../../../store/src/types/api.types';
-import { entityCatalogue } from '../../../../../../../core/src/core/entity-catalogue/entity-catalogue.service';
-import { CF_ENDPOINT_TYPE } from '../../../../../../cf-types';
 import { PaginatedAction } from '../../../../../../../store/src/types/pagination.types';
+import { CF_ENDPOINT_TYPE } from '../../../../../../cf-types';
 
 export class AppServiceBindingDataSource extends ListDataSource<APIResource<IServiceBinding>> {
   static createGetAllServiceBindings(appGuid: string, cfGuid: string) {
@@ -32,12 +31,15 @@ export class AppServiceBindingDataSource extends ListDataSource<APIResource<ISer
     const serviceBindingEntity = entityCatalogue.getEntity(CF_ENDPOINT_TYPE, serviceBindingEntityType);
     const actionBuilder = serviceBindingEntity.actionOrchestrator.getActionBuilder('getAllForApplication');
     const getAppServiceBindingsAction = actionBuilder(
-      appGuid, cfGuid, paginationKey, [
-        createEntityRelationKey(serviceInstancesEntityType, servicePlanEntityType),
-        createEntityRelationKey(serviceInstancesEntityType, serviceEntityType),
-        createEntityRelationKey(serviceBindingEntityType, applicationEntityType),
-        createEntityRelationKey(serviceBindingEntityType, serviceInstancesEntityType),
-      ]) as PaginatedAction;
+      appGuid, cfGuid, paginationKey, {
+        includeRelations: [
+          createEntityRelationKey(serviceInstancesEntityType, servicePlanEntityType),
+          createEntityRelationKey(serviceInstancesEntityType, serviceEntityType),
+          createEntityRelationKey(serviceBindingEntityType, applicationEntityType),
+          createEntityRelationKey(serviceBindingEntityType, serviceInstancesEntityType),
+        ],
+        populateMissing: true
+      }) as PaginatedAction;
     return getAppServiceBindingsAction;
   }
 
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-spaces-service-instances/cf-spaces-service-instances-data-source.ts b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-spaces-service-instances/cf-spaces-service-instances-data-source.ts
index d273c78865..a0c548049a 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-spaces-service-instances/cf-spaces-service-instances-data-source.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-spaces-service-instances/cf-spaces-service-instances-data-source.ts
@@ -1,5 +1,6 @@
 import { Store } from '@ngrx/store';
 
+import { CF_ENDPOINT_TYPE } from '../../../../../../../cloud-foundry/cf-types';
 import { CFAppState } from '../../../../../../../cloud-foundry/src/cf-app-state';
 import {
   applicationEntityType,
@@ -11,33 +12,34 @@ import {
   servicePlanEntityType,
   spaceEntityType,
 } from '../../../../../../../cloud-foundry/src/cf-entity-factory';
-import {
-  ListDataSource,
-} from '../../../../../../../core/src/shared/components/list/data-sources-controllers/list-data-source';
-import { IListConfig } from '../../../../../../../core/src/shared/components/list/list.component.types';
 import {
   createEntityRelationKey,
   createEntityRelationPaginationKey,
 } from '../../../../../../../cloud-foundry/src/entity-relations/entity-relations.types';
+import { entityCatalogue } from '../../../../../../../core/src/core/entity-catalogue/entity-catalogue.service';
+import {
+  ListDataSource,
+} from '../../../../../../../core/src/shared/components/list/data-sources-controllers/list-data-source';
+import { IListConfig } from '../../../../../../../core/src/shared/components/list/list.component.types';
 import { APIResource } from '../../../../../../../store/src/types/api.types';
-import { getRowMetadata } from '../../../../../features/cloud-foundry/cf.helpers';
-
-import { CF_ENDPOINT_TYPE } from '../../../../../../../cloud-foundry/cf-types';
 import { PaginatedAction } from '../../../../../../../store/src/types/pagination.types';
-import { entityCatalogue } from '../../../../../../../core/src/core/entity-catalogue/entity-catalogue.service';
+import { getRowMetadata } from '../../../../../features/cloud-foundry/cf.helpers';
 
 export class CfSpacesServiceInstancesDataSource extends ListDataSource<APIResource> {
   constructor(cfGuid: string, spaceGuid: string, store: Store<CFAppState>, listConfig?: IListConfig<APIResource>) {
     const paginationKey = createEntityRelationPaginationKey(spaceEntityType, spaceGuid);
     const serviceInstanceEntity = entityCatalogue.getEntity(CF_ENDPOINT_TYPE, serviceInstancesEntityType);
     const actionBuilder = serviceInstanceEntity.actionOrchestrator.getActionBuilder('getAllInSpace');
-    const action = actionBuilder(spaceGuid, cfGuid, paginationKey, null, [
-      createEntityRelationKey(serviceInstancesEntityType, serviceBindingEntityType),
-      createEntityRelationKey(serviceInstancesEntityType, serviceEntityType),
-      createEntityRelationKey(serviceInstancesEntityType, servicePlanEntityType),
-      createEntityRelationKey(serviceInstancesEntityType, spaceEntityType),
-      createEntityRelationKey(serviceBindingEntityType, applicationEntityType),
-    ], true, false) as PaginatedAction;
+    const action = actionBuilder(spaceGuid, cfGuid, paginationKey, null, {
+      includeRelations: [
+        createEntityRelationKey(serviceInstancesEntityType, serviceBindingEntityType),
+        createEntityRelationKey(serviceInstancesEntityType, serviceEntityType),
+        createEntityRelationKey(serviceInstancesEntityType, servicePlanEntityType),
+        createEntityRelationKey(serviceInstancesEntityType, spaceEntityType),
+        createEntityRelationKey(serviceBindingEntityType, applicationEntityType),
+      ],
+      populateMissing: true
+    }) as PaginatedAction;
     super({
       store,
       action,
diff --git a/src/frontend/packages/cloud-foundry/src/shared/data-services/cf-org-space-service.service.ts b/src/frontend/packages/cloud-foundry/src/shared/data-services/cf-org-space-service.service.ts
index 5480ef6ae9..413643fd67 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/data-services/cf-org-space-service.service.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/data-services/cf-org-space-service.service.ts
@@ -299,9 +299,12 @@ export class CfOrgSpaceDataService implements OnDestroy {
   private createPaginationAction() {
     const organizationEntity = entityCatalogue.getEntity(CF_ENDPOINT_TYPE, organizationEntityType);
     const actionBuilder = organizationEntity.actionOrchestrator.getActionBuilder('getMultiple');
-    const getAllOrganizationsAction = actionBuilder(null, CfOrgSpaceDataService.CfOrgSpaceServicePaginationKey, [
-      createEntityRelationKey(organizationEntityType, spaceEntityType),
-    ]);
+    const getAllOrganizationsAction = actionBuilder(null, CfOrgSpaceDataService.CfOrgSpaceServicePaginationKey, {
+      includeRelations: [
+        createEntityRelationKey(organizationEntityType, spaceEntityType),
+      ],
+      populateMissing: true
+    });
     return getAllOrganizationsAction;
   }
 

From ac68d3328dbf3e7d73703b7c497549389f2343ed Mon Sep 17 00:00:00 2001
From: Richard Cox <richard.cox@suse.com>
Date: Mon, 23 Sep 2019 17:57:02 +0100
Subject: [PATCH 11/18] WIP

---
 .../entity-action-builders/git-action-builder.ts |  2 --
 .../deploy-application-step2.component.ts        | 14 +++++++++-----
 .../github-commits/github-commits-data-source.ts | 16 +++++++++-------
 3 files changed, 18 insertions(+), 14 deletions(-)

diff --git a/src/frontend/packages/cloud-foundry/src/entity-action-builders/git-action-builder.ts b/src/frontend/packages/cloud-foundry/src/entity-action-builders/git-action-builder.ts
index 533cd5bcce..72a04ec36f 100644
--- a/src/frontend/packages/cloud-foundry/src/entity-action-builders/git-action-builder.ts
+++ b/src/frontend/packages/cloud-foundry/src/entity-action-builders/git-action-builder.ts
@@ -13,8 +13,6 @@ import {
 
 export const gitRepoActionBuilders = {
   getRepoInfo: (
-    repoEntityID: string,
-    endpointGuid: string,
     projectEnvVars: EnvVarStratosProject
   ) => new FetchGitHubRepoInfo(projectEnvVars)
 } as OrchestratedActionBuilders;
diff --git a/src/frontend/packages/cloud-foundry/src/features/applications/deploy-application/deploy-application-step2/deploy-application-step2.component.ts b/src/frontend/packages/cloud-foundry/src/features/applications/deploy-application/deploy-application-step2/deploy-application-step2.component.ts
index d9644ba4dd..88e21e8b81 100644
--- a/src/frontend/packages/cloud-foundry/src/features/applications/deploy-application/deploy-application-step2/deploy-application-step2.component.ts
+++ b/src/frontend/packages/cloud-foundry/src/features/applications/deploy-application/deploy-application-step2/deploy-application-step2.component.ts
@@ -25,7 +25,7 @@ import {
   withLatestFrom,
 } from 'rxjs/operators';
 
-import { CFEntityConfig, CF_ENDPOINT_TYPE } from '../../../../../../cloud-foundry/cf-types';
+import { CF_ENDPOINT_TYPE, CFEntityConfig } from '../../../../../../cloud-foundry/cf-types';
 import {
   FetchBranchesForProject,
   FetchCommit,
@@ -47,6 +47,7 @@ import {
 import { GitAppDetails, SourceType } from '../../../../../../cloud-foundry/src/store/types/deploy-application.types';
 import { GitCommit, GitRepo } from '../../../../../../cloud-foundry/src/store/types/git.types';
 import { GitBranch } from '../../../../../../cloud-foundry/src/store/types/github.types';
+import { entityCatalogue } from '../../../../../../core/src/core/entity-catalogue/entity-catalogue.service';
 import { EntityServiceFactory } from '../../../../../../core/src/core/entity-service-factory.service';
 import { StepOnNextFunction } from '../../../../../../core/src/shared/components/stepper/step/step.component';
 import { GitSCM } from '../../../../../../core/src/shared/data-services/scm/scm';
@@ -59,8 +60,6 @@ import {
   getApplicationDeploySourceTypes,
   getAutoSelectedDeployType,
 } from '../deploy-application-steps.types';
-import { entityCatalogue } from '../../../../../../core/src/core/entity-catalogue/entity-catalogue.service';
-import { STRATOS_ENDPOINT_TYPE } from '../../../../../../core/src/base-entity-schemas';
 
 @Component({
   selector: 'app-deploy-application-step2',
@@ -231,8 +230,13 @@ export class DeployApplicationStep2Component
           const commitSha = commit || branch.commit.sha;
           const entityID = projectInfo.full_name + '-' + commitSha;
           const gitCommitEntity = entityCatalogue.getEntity(CF_ENDPOINT_TYPE, gitCommitEntityType);
-          const fetchCommitActionBuilder = gitCommitEntity.actionOrchestrator.getActionBuilder('fetchCommit');
-          const fetchCommitAction = fetchCommitActionBuilder(this.scm, commitSha, projectInfo.full_name) as FetchCommit;
+          const fetchCommitActionBuilder = gitCommitEntity.actionOrchestrator.getActionBuilder('get');
+          const fetchCommitAction = fetchCommitActionBuilder(null, null, {
+            scm: this.scm,
+            projectName: projectInfo.full_name,
+            commitId: commitSha
+          }) as FetchCommit;
+          // const fetchCommitAction = fetchCommitActionBuilder(this.scm, commitSha, projectInfo.full_name) as FetchCommit;
           const commitEntityService = this.entityServiceFactory.create<EntityInfo>(
             entityID,
             fetchCommitAction
diff --git a/src/frontend/packages/core/src/shared/components/list/list-types/github-commits/github-commits-data-source.ts b/src/frontend/packages/core/src/shared/components/list/list-types/github-commits/github-commits-data-source.ts
index 1f41e06ac2..8539fbe5d5 100644
--- a/src/frontend/packages/core/src/shared/components/list/list-types/github-commits/github-commits-data-source.ts
+++ b/src/frontend/packages/core/src/shared/components/list/list-types/github-commits/github-commits-data-source.ts
@@ -1,17 +1,15 @@
 import { Store } from '@ngrx/store';
 import { of as observableOf } from 'rxjs';
 
-import { FetchCommits } from '../../../../../../../cloud-foundry/src/actions/deploy-applications.actions';
+import { CF_ENDPOINT_TYPE } from '../../../../../../../cloud-foundry/cf-types';
 import { CFAppState } from '../../../../../../../cloud-foundry/src/cf-app-state';
 import { CFEntitySchema, gitCommitEntityType } from '../../../../../../../cloud-foundry/src/cf-entity-factory';
 import { GitCommit } from '../../../../../../../cloud-foundry/src/store/types/git.types';
+import { PaginatedAction } from '../../../../../../../store/src/types/pagination.types';
+import { entityCatalogue } from '../../../../../core/entity-catalogue/entity-catalogue.service';
 import { GitSCM } from '../../../../data-services/scm/scm';
 import { ListDataSource } from '../../data-sources-controllers/list-data-source';
 import { IListConfig } from '../../list.component.types';
-import { entityCatalogue } from '../../../../../core/entity-catalogue/entity-catalogue.service';
-import { STRATOS_ENDPOINT_TYPE } from '../../../../../base-entity-schemas';
-import { PaginatedAction } from '../../../../../../../store/src/types/pagination.types';
-import { CF_ENDPOINT_TYPE } from '../../../../../../../cloud-foundry/cf-types';
 
 
 export class GithubCommitsDataSource extends ListDataSource<GitCommit> {
@@ -31,8 +29,12 @@ export class GithubCommitsDataSource extends ListDataSource<GitCommit> {
     commitSha?: string,
   ) {
     const gitCommitEntity = entityCatalogue.getEntity(CF_ENDPOINT_TYPE, gitCommitEntityType);
-    const fetchCommitActionBuilder = gitCommitEntity.actionOrchestrator.getActionBuilder('fetchCommit');
-    const fetchCommitAction = fetchCommitActionBuilder(scm, projectName, sha) as PaginatedAction;
+    const fetchCommitActionBuilder = gitCommitEntity.actionOrchestrator.getActionBuilder('getMultiple');
+    const fetchCommitAction = fetchCommitActionBuilder(sha, null, {
+      scm,
+      projectName,
+      commitId: sha
+    }) as PaginatedAction;
     const action = fetchCommitAction;
     const paginationKey = action.paginationKey;
     const rowsState = observableOf(commitSha ? {

From 06f18aa307e145e4dfad3af029ac63b4773ff13b Mon Sep 17 00:00:00 2001
From: Richard Cox <richard.cox@suse.com>
Date: Tue, 24 Sep 2019 10:18:48 +0100
Subject: [PATCH 12/18] Fix git commit world

---
 .../src/entity-action-builders/git-action-builder.ts            | 2 +-
 .../deploy-application-step2.component.ts                       | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/frontend/packages/cloud-foundry/src/entity-action-builders/git-action-builder.ts b/src/frontend/packages/cloud-foundry/src/entity-action-builders/git-action-builder.ts
index 72a04ec36f..5622cac9b4 100644
--- a/src/frontend/packages/cloud-foundry/src/entity-action-builders/git-action-builder.ts
+++ b/src/frontend/packages/cloud-foundry/src/entity-action-builders/git-action-builder.ts
@@ -44,7 +44,7 @@ export const gitCommitActionBuilders: GitCommitActionBuildersConfig = {
     commitSha: string,
     endpointGuid: string,
     commitMeta: GitMeta
-  ) => new FetchCommits(commitMeta.scm, commitSha, commitMeta.projectName)
+  ) => new FetchCommits(commitMeta.scm, commitMeta.projectName, commitSha)
 };
 
 export interface GitBranchActionBuilders extends OrchestratedActionBuilders {
diff --git a/src/frontend/packages/cloud-foundry/src/features/applications/deploy-application/deploy-application-step2/deploy-application-step2.component.ts b/src/frontend/packages/cloud-foundry/src/features/applications/deploy-application/deploy-application-step2/deploy-application-step2.component.ts
index 88e21e8b81..7777c383da 100644
--- a/src/frontend/packages/cloud-foundry/src/features/applications/deploy-application/deploy-application-step2/deploy-application-step2.component.ts
+++ b/src/frontend/packages/cloud-foundry/src/features/applications/deploy-application/deploy-application-step2/deploy-application-step2.component.ts
@@ -236,7 +236,6 @@ export class DeployApplicationStep2Component
             projectName: projectInfo.full_name,
             commitId: commitSha
           }) as FetchCommit;
-          // const fetchCommitAction = fetchCommitActionBuilder(this.scm, commitSha, projectInfo.full_name) as FetchCommit;
           const commitEntityService = this.entityServiceFactory.create<EntityInfo>(
             entityID,
             fetchCommitAction

From 860e01e47f90088244e16c0d6406591636595f0d Mon Sep 17 00:00:00 2001
From: Richard Cox <richard.cox@suse.com>
Date: Tue, 24 Sep 2019 10:19:13 +0100
Subject: [PATCH 13/18] Fix domains in create app shell stepper

---
 .../create-application-step3.component.ts         | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/frontend/packages/cloud-foundry/src/features/applications/create-application/create-application-step3/create-application-step3.component.ts b/src/frontend/packages/cloud-foundry/src/features/applications/create-application/create-application-step3/create-application-step3.component.ts
index b2ac617e34..a2d86b1c1a 100644
--- a/src/frontend/packages/cloud-foundry/src/features/applications/create-application/create-application-step3/create-application-step3.component.ts
+++ b/src/frontend/packages/cloud-foundry/src/features/applications/create-application/create-application-step3/create-application-step3.component.ts
@@ -5,10 +5,7 @@ import { Store } from '@ngrx/store';
 import { combineLatest, Observable, of as observableOf } from 'rxjs';
 import { catchError, filter, first, map, mergeMap, switchMap, tap } from 'rxjs/operators';
 
-import { AssignRouteToApplication } from '../../../../../../cloud-foundry/src/actions/application-service-routes.actions';
 import { CreateNewApplication } from '../../../../../../cloud-foundry/src/actions/application.actions';
-import { GetOrganization } from '../../../../../../cloud-foundry/src/actions/organization.actions';
-import { CreateRoute } from '../../../../../../cloud-foundry/src/actions/route.actions';
 import { CFAppState } from '../../../../../../cloud-foundry/src/cf-app-state';
 import {
   applicationEntityType,
@@ -20,14 +17,14 @@ import { selectNewAppState } from '../../../../../../cloud-foundry/src/store/eff
 import { selectCfRequestInfo } from '../../../../../../cloud-foundry/src/store/selectors/api.selectors';
 import { CreateNewApplicationState } from '../../../../../../cloud-foundry/src/store/types/create-application.types';
 import { IDomain } from '../../../../../../core/src/core/cf-api.types';
+import { entityCatalogue } from '../../../../../../core/src/core/entity-catalogue/entity-catalogue.service';
 import { EntityServiceFactory } from '../../../../../../core/src/core/entity-service-factory.service';
 import { StepOnNextFunction } from '../../../../../../core/src/shared/components/stepper/step/step.component';
 import { RouterNav } from '../../../../../../store/src/actions/router.actions';
 import { getDefaultRequestState, RequestInfoState } from '../../../../../../store/src/reducers/api-request-reducer/types';
 import { APIResource } from '../../../../../../store/src/types/api.types';
-import { createEntityRelationKey } from '../../../../entity-relations/entity-relations.types';
-import { entityCatalogue } from '../../../../../../core/src/core/entity-catalogue/entity-catalogue.service';
 import { CF_ENDPOINT_TYPE } from '../../../../../cf-types';
+import { createEntityRelationKey } from '../../../../entity-relations/entity-relations.types';
 import { createGetApplicationAction } from '../../application.service';
 
 
@@ -168,8 +165,12 @@ export class CreateApplicationStep3Component implements OnInit {
         this.newAppData = state;
         const orgEntity = entityCatalogue.getEntity(CF_ENDPOINT_TYPE, organizationEntityType);
         const getOrgActionBuilder = orgEntity.actionOrchestrator.getActionBuilder('get');
-        const getOrgAction = getOrgActionBuilder(state.cloudFoundryDetails.org, state.cloudFoundryDetails.cloudFoundry, [
-          createEntityRelationKey(organizationEntityType, domainEntityType)]);
+        const getOrgAction = getOrgActionBuilder(state.cloudFoundryDetails.org, state.cloudFoundryDetails.cloudFoundry, {
+          includeRelations: [
+            createEntityRelationKey(organizationEntityType, domainEntityType)
+          ],
+          populateMissing: true
+        });
 
         const orgEntService = this.entityServiceFactory.create<APIResource<any>>(
           state.cloudFoundryDetails.org,

From 89477b73c2e6f2ec811bc2a1933d66852f344f1b Mon Sep 17 00:00:00 2001
From: Richard Cox <richard-cox@users.noreply.github.com>
Date: Mon, 23 Sep 2019 09:45:02 +0100
Subject: [PATCH 14/18] Ensure MB is only shown for memory based quota values
 in edit quota forms (#3892)

---
 .../unlimited-input/unlimited-input.component.html     | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/frontend/packages/core/src/shared/components/unlimited-input/unlimited-input.component.html b/src/frontend/packages/core/src/shared/components/unlimited-input/unlimited-input.component.html
index 07e0895258..bd7b739480 100644
--- a/src/frontend/packages/core/src/shared/components/unlimited-input/unlimited-input.component.html
+++ b/src/frontend/packages/core/src/shared/components/unlimited-input/unlimited-input.component.html
@@ -1,7 +1,9 @@
 <div class="unlimited-input">
   <mat-form-field>
-    <input type="number" [id]="name" matInput [formControlName]="name" [placeholder]="placeholder" [required]="required" min="0">
-    <span matSuffix>MB</span>
+    <input type="number" [id]="name" matInput [formControlName]="name" [placeholder]="placeholder" [required]="required"
+      min="0">
+    <span *ngIf="suffix" matSuffix>{{suffix}}</span>
   </mat-form-field>
-  <mat-checkbox matInput [(ngModel)]="unlimited" [ngModelOptions]="{standalone: true}" value="-1" (change)="onChange()" min>Unlimited</mat-checkbox>
-</div>
+  <mat-checkbox matInput [(ngModel)]="unlimited" [ngModelOptions]="{standalone: true}" value="-1" (change)="onChange()"
+    min>Unlimited</mat-checkbox>
+</div>
\ No newline at end of file

From 07220f4b6ac8245d983966f44805fb2f85239cc0 Mon Sep 17 00:00:00 2001
From: Neil MacDougall <neil.macdougall@suse.com>
Date: Mon, 23 Sep 2019 09:46:57 +0100
Subject: [PATCH 15/18] Improve user clean up

---
 deploy/ci/automation/e2e-clean-remnants.sh | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/deploy/ci/automation/e2e-clean-remnants.sh b/deploy/ci/automation/e2e-clean-remnants.sh
index 4f87d94a0b..c9eac080a6 100755
--- a/deploy/ci/automation/e2e-clean-remnants.sh
+++ b/deploy/ci/automation/e2e-clean-remnants.sh
@@ -105,4 +105,14 @@ clean "$USERS" "-" "delete-user" "^(acceptancee2etravis)(invite[0-9])(20[0-9]*)[
 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].*"
 
+# Users without roles
+echo "Cleaning users without roles"
+USERS=$(cf curl "/v2/users?results-per-page=100" | jq -r .resources[].entity.username)
+clean "$USERS" "-" "delete-user" "^(acceptance\.e2e\.travisci)(-remove-users)\.(20[0-9]*)[Tt]([0-9]*)[zZ].*"
+clean "$USERS" "-" "delete-user" "^(acceptance\.e2e\.travis)(-remove-users)\.(20[0-9]*)[Tt]([0-9]*)[zZ].*"
+
+
 echo "Done"
+
+# Get users without usernames
+#cf curl "/v2/users?results-per-page=10" | jq '.resources[] | { "username": .entity.username, "guid": .metadata.guid, "created": .metadata.created_at }' | jq 'select(.username==null)' | jq '. | select(.guid|match("^[0-9a-z]*-[0-9a-z]*-[0-9a-z]*[0-9a-z]*"))'

From 7579969fba01bf2a5c202f656e08cb21379d874f Mon Sep 17 00:00:00 2001
From: Neil MacDougall <nwmac@users.noreply.github.com>
Date: Mon, 23 Sep 2019 13:58:02 +0100
Subject: [PATCH 16/18] Travis: Build once and share build in e2e tests (#3901)

* Build once and share build in e2e tests

* Fix stage order

* Fix typo

* Only build if needed

* Fix

* Fix typo when editing

* Ensure we configure

* Do not exit in build script

* Use better ID for the build package
---
 .travis.yml                                |  7 ++
 deploy/ci/travis/e2e-build-script.sh       | 76 ++++++++++++++++++++++
 deploy/ci/travis/e2e-mc-helper.sh          | 19 ++++++
 deploy/ci/travis/run-e2e-tests.sh          | 14 ++--
 deploy/ci/travis/upload-e2e-test-report.sh | 14 ++--
 5 files changed, 112 insertions(+), 18 deletions(-)
 create mode 100755 deploy/ci/travis/e2e-build-script.sh
 create mode 100644 deploy/ci/travis/e2e-mc-helper.sh

diff --git a/.travis.yml b/.travis.yml
index ee1714c787..751a9102e0 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -28,6 +28,7 @@ cache:
     - node_modules
 stages:
   - Lint
+  - Build
   - Test
 jobs:
   include:
@@ -44,6 +45,12 @@ jobs:
       script:
         - golint src/jetstream/...
         - ./deploy/ci/travis/update-go-report-card.sh
+    - stage: Build
+      name: Build Frontend and Backend
+      env:
+        - CI_ENV=true
+      script:
+        - "./deploy/ci/travis/e2e-build-script.sh build"
     - stage: Test
       name: Frontend Unit Tests
       env:
diff --git a/deploy/ci/travis/e2e-build-script.sh b/deploy/ci/travis/e2e-build-script.sh
new file mode 100755
index 0000000000..fee8595eed
--- /dev/null
+++ b/deploy/ci/travis/e2e-build-script.sh
@@ -0,0 +1,76 @@
+#!/bin/bash
+
+echo "Stratos e2e build"
+echo "================="
+
+MC_HOST="s3"
+
+LOCAL_BUILD="true"
+
+# Use Travis env vars:
+# TRAVIS_PULL_REQUEST
+# TRAVIS_REPO_SLUG
+# TRAVIS_COMMIT
+
+if [ -z "$TRAVIS_REPO_SLUG" ]; then
+  echo "Need to be running in Trvis"
+  exit 1
+fi
+
+if [ -z "$TRAVIS_COMMIT" ]; then
+  echo "Need to be running in Trvis"
+  exit 1
+fi
+
+GIT_ID="${TRAVIS_REPO_SLUG}_${TRAVIS_COMMIT}_${TRAVIS_PULL_REQUEST}"
+GIT_ID="${GIT_ID//\//_}"
+echo $GIT_ID
+
+TAR_NAME="${GIT_ID}.tar"
+GZIP_NAME="${GIT_ID}.tgz"
+
+# Ensure we have the mc command
+DIRNAME="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+source "${DIRNAME}/e2e-mc-helper.sh"
+
+function tryGetExistingBuild() {
+  echo "Looking for existing build: ${GIT_ID}"
+
+  mc cp -q --insecure ${MC_HOST}/${S3_BUILDS_BUCKET}/${GZIP_NAME} ./
+  if [ $? -eq 0 ]; then
+    # We found an existing build, so download and unpack it
+    echo "Downloading build package"
+    tar -xvf ${GZIP_NAME}
+    if [ $? -eq 0 ]; then
+      LOCAL_BUILD="false"
+    fi
+    rm -rf ${GZIP_NAME}
+  fi
+}
+
+if [ -n "${AWS_ENDPOINT}" ]; then
+  tryGetExistingBuild
+fi
+
+if [ "${LOCAL_BUILD}" == "false" ]; then
+  echo "Downloaded and unpacked an existing build - no need to build locally"
+else
+
+  set -e
+
+# Get go
+curl -sL -o ~/bin/gimme https://raw.githubusercontent.com/travis-ci/gimme/master/gimme
+chmod +x ~/bin/gimme
+eval "$(gimme 1.12.4)"
+go version
+
+npm run build
+npm run build-backend
+
+  set +e
+  tar cvfz ${GZIP_NAME} dist/* src/jetstream/jetstream
+
+# Upload
+  mc cp -q --insecure ${GZIP_NAME} ${MC_HOST}/${S3_BUILDS_BUCKET}
+
+fi
diff --git a/deploy/ci/travis/e2e-mc-helper.sh b/deploy/ci/travis/e2e-mc-helper.sh
new file mode 100644
index 0000000000..4dbb3109b6
--- /dev/null
+++ b/deploy/ci/travis/e2e-mc-helper.sh
@@ -0,0 +1,19 @@
+# Helper for mc command
+
+mc version > /dev/null
+if [ $? -eq 0 ]; then
+  echo "mc command already installed and confgiured"
+else
+  echo "Installing and configuring mc command ..."
+
+  wget https://dl.minio.io/client/mc/release/linux-amd64/mc
+  chmod +x mc
+  cp mc ~/bin
+
+  mc -install -y >/dev/null 2>&1
+
+  echo "Configuring mc client"
+  mc config host add s3 ${AWS_ENDPOINT} ${AWS_ACCESS_KEY_ID} ${AWS_SECRET_ACCESS_KEY} --insecure
+
+  echo "mc command ready"
+fi
diff --git a/deploy/ci/travis/run-e2e-tests.sh b/deploy/ci/travis/run-e2e-tests.sh
index 0b2ab023a9..3159e8f75e 100755
--- a/deploy/ci/travis/run-e2e-tests.sh
+++ b/deploy/ci/travis/run-e2e-tests.sh
@@ -43,14 +43,12 @@ echo "Using local deployment for e2e tests"
 # Start a local UAA - this will take a few seconds to come up in the background
 docker run -d -p 8080:8080 splatform/stratos-uaa
 
-# Get go
-curl -sL -o ~/bin/gimme https://raw.githubusercontent.com/travis-ci/gimme/master/gimme
-chmod +x ~/bin/gimme
-eval "$(gimme 1.12.4)"
-go version
-
-npm run build
-npm run build-backend
+# Build if needed or use existing build for this commit
+DIRNAME="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+set +e
+source "${DIRNAME}/e2e-build-script.sh"
+set -e
+
 # Copy travis config.properties file
 cp deploy/ci/travis/config.properties src/jetstream/
 pushd src/jetstream
diff --git a/deploy/ci/travis/upload-e2e-test-report.sh b/deploy/ci/travis/upload-e2e-test-report.sh
index 8a54092604..cc20deb2e1 100755
--- a/deploy/ci/travis/upload-e2e-test-report.sh
+++ b/deploy/ci/travis/upload-e2e-test-report.sh
@@ -8,19 +8,13 @@ if [ -z "${AWS_ENDPOINT}" ]; then
   exit 0
 fi
 
-wget https://dl.minio.io/client/mc/release/linux-amd64/mc
-chmod +x mc
+DIRNAME="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+source "${DIRNAME}/e2e-mc-helper.sh"
 
-echo "Uploading test report...."
+echo "Uploading test report ..."
 
-./mc -install -y
-
-echo "Configuring upload client"
-./mc config host add s3 ${AWS_ENDPOINT} ${AWS_ACCESS_KEY_ID} ${AWS_SECRET_ACCESS_KEY} --insecure
-
-echo "Uploading ..."
 # Sync the E2E reports
-./mc cp -q --insecure -r e2e-reports s3/${S3_BUCKET}
+mc cp -q --insecure -r e2e-reports s3/${S3_BUCKET}
 
 if [[ $? != 0 ]]; then
   echo 'Error uploading test reports: $?'

From 7fe6a026b5d8bd00a4b5045635500166ce83bc1a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?V=C3=ADtor=20Avelino?= <vavelino@suse.com>
Date: Tue, 24 Sep 2019 09:34:39 -0300
Subject: [PATCH 17/18] catalogue: fixed initial state that was overwritten
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Vítor Avelino <vavelino@suse.com>
---
 .../core/entity-catalogue/entity-catalogue.store-setup.ts    | 5 +++--
 .../api-request-data-reducer/request-data-reducer.factory.ts | 2 +-
 .../reducers/api-request-reducer/request-reducer.factory.ts  | 2 +-
 .../src/reducers/pagination-reducer/pagination.reducer.ts    | 2 +-
 4 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/frontend/packages/core/src/core/entity-catalogue/entity-catalogue.store-setup.ts b/src/frontend/packages/core/src/core/entity-catalogue/entity-catalogue.store-setup.ts
index 7da7052ec9..d3b141728a 100644
--- a/src/frontend/packages/core/src/core/entity-catalogue/entity-catalogue.store-setup.ts
+++ b/src/frontend/packages/core/src/core/entity-catalogue/entity-catalogue.store-setup.ts
@@ -1,3 +1,4 @@
+import { IRequestTypeState } from '../../../../store/src/app-state';
 import { entityCatalogue } from './entity-catalogue.service';
 
 // FIXME: These should be removed/come from the entity catalogue - STRAT-151
@@ -14,7 +15,7 @@ export function getAllEntityStoreKeys() {
   ];
 }
 
-export function getDefaultStateFromEntityCatalogue<T = any>(entityKeys: string[], defaultState: T) {
+export function getDefaultStateFromEntityCatalogue<T = any>(entityKeys: string[], defaultState: T, initialState: IRequestTypeState) {
   return entityKeys.reduce((currentState, entityKey) => {
     if (currentState[entityKey]) {
       return currentState;
@@ -23,5 +24,5 @@ export function getDefaultStateFromEntityCatalogue<T = any>(entityKeys: string[]
       ...currentState,
       [entityKey]: defaultState
     };
-  }, {}) as T;
+  }, initialState) as T;
 }
diff --git a/src/frontend/packages/store/src/reducers/api-request-data-reducer/request-data-reducer.factory.ts b/src/frontend/packages/store/src/reducers/api-request-data-reducer/request-data-reducer.factory.ts
index 15c7831856..0a9311a58f 100644
--- a/src/frontend/packages/store/src/reducers/api-request-data-reducer/request-data-reducer.factory.ts
+++ b/src/frontend/packages/store/src/reducers/api-request-data-reducer/request-data-reducer.factory.ts
@@ -15,7 +15,7 @@ export function requestDataReducerFactory(actions: IRequestArray): ActionReducer
   return function entitiesReducer(state = {}, action: Action): Record<string, any> {
     switch (action.type) {
       case InitCatalogueEntitiesAction.ACTION_TYPE:
-        return getDefaultStateFromEntityCatalogue((action as InitCatalogueEntitiesAction).entityKeys, {});
+        return getDefaultStateFromEntityCatalogue((action as InitCatalogueEntitiesAction).entityKeys, {}, state);
       case successAction:
         const success = action as ISuccessRequestAction;
         if (!success.apiAction.updatingKey && success.requestType === 'delete') {
diff --git a/src/frontend/packages/store/src/reducers/api-request-reducer/request-reducer.factory.ts b/src/frontend/packages/store/src/reducers/api-request-reducer/request-reducer.factory.ts
index 7e8db1c818..d0f9e207d7 100644
--- a/src/frontend/packages/store/src/reducers/api-request-reducer/request-reducer.factory.ts
+++ b/src/frontend/packages/store/src/reducers/api-request-reducer/request-reducer.factory.ts
@@ -26,7 +26,7 @@ export function requestReducerFactory(actions: IRequestArray) {
   return function apiRequestReducer(state = {}, action: Action) {
     switch (action.type) {
       case InitCatalogueEntitiesAction.ACTION_TYPE:
-        return getDefaultStateFromEntityCatalogue((action as InitCatalogueEntitiesAction).entityKeys, {});
+        return getDefaultStateFromEntityCatalogue((action as InitCatalogueEntitiesAction).entityKeys, {}, state);
       case startAction:
         return startRequest(state, action as StartRequestAction);
       case successAction:
diff --git a/src/frontend/packages/store/src/reducers/pagination-reducer/pagination.reducer.ts b/src/frontend/packages/store/src/reducers/pagination-reducer/pagination.reducer.ts
index 0b6e68c40c..f8f19d8615 100644
--- a/src/frontend/packages/store/src/reducers/pagination-reducer/pagination.reducer.ts
+++ b/src/frontend/packages/store/src/reducers/pagination-reducer/pagination.reducer.ts
@@ -100,7 +100,7 @@ function paginate(action, state = {}, updatePagination) {
   }
 
   if (action.type === InitCatalogueEntitiesAction.ACTION_TYPE) {
-    return getDefaultStateFromEntityCatalogue((action as InitCatalogueEntitiesAction).entityKeys, {});
+    return getDefaultStateFromEntityCatalogue((action as InitCatalogueEntitiesAction).entityKeys, {}, state);
   }
 
   if (action.type === CREATE_PAGINATION) {

From 2a081d83b92492713b2d6cdc814154a4f0d0a9eb Mon Sep 17 00:00:00 2001
From: Richard Cox <richard.cox@suse.com>
Date: Tue, 24 Sep 2019 14:26:00 +0100
Subject: [PATCH 18/18] Fix cf summary unit test failures - cf now has
 dependency on autoscaler - see #3916

---
 .../cloud-foundry/src/cloud-foundry-test.module.ts   |  4 +++-
 .../cloud-foundry-summary-tab.component.spec.ts      | 12 ++++++++++--
 .../card-cf-info/card-cf-info.component.spec.ts      | 12 ++++++++++--
 .../cards/card-cf-info/card-cf-info.component.ts     |  1 +
 4 files changed, 24 insertions(+), 5 deletions(-)

diff --git a/src/frontend/packages/cloud-foundry/src/cloud-foundry-test.module.ts b/src/frontend/packages/cloud-foundry/src/cloud-foundry-test.module.ts
index fbe7825d20..d5d1be5d1d 100644
--- a/src/frontend/packages/cloud-foundry/src/cloud-foundry-test.module.ts
+++ b/src/frontend/packages/cloud-foundry/src/cloud-foundry-test.module.ts
@@ -3,6 +3,7 @@ import { NgModule } from '@angular/core';
 import { HttpModule } from '@angular/http';
 import { EffectsModule } from '@ngrx/effects';
 
+import { generateASEntities } from '../../cf-autoscaler/src/store/autoscaler-entity-generator';
 import { generateStratosEntities } from '../../core/src/base-entity-types';
 import { CATALOGUE_ENTITIES, EntityCatalogueFeatureModule } from '../../core/src/core/entity-catalogue.module';
 import { entityCatalogue, TestEntityCatalogue } from '../../core/src/core/entity-catalogue/entity-catalogue.service';
@@ -23,7 +24,8 @@ import { CloudFoundryStoreModule } from './store/cloud-foundry.store.module';
             testEntityCatalogue.clear();
             return [
               ...generateCFEntities(),
-              ...generateStratosEntities()
+              ...generateStratosEntities(),
+              ...generateASEntities(), // FIXME: CF should not depend on autoscaler. See #3916
             ];
           }
         }
diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-summary-tab/cloud-foundry-summary-tab.component.spec.ts b/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-summary-tab/cloud-foundry-summary-tab.component.spec.ts
index 418aa5b77f..25dec485d3 100644
--- a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-summary-tab/cloud-foundry-summary-tab.component.spec.ts
+++ b/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-summary-tab/cloud-foundry-summary-tab.component.spec.ts
@@ -20,9 +20,17 @@ describe('CloudFoundrySummaryTabComponent', () => {
   beforeEach(
     async(() => {
       TestBed.configureTestingModule({
-        declarations: [CloudFoundrySummaryTabComponent, CardCfInfoComponent, CardCfRecentAppsComponent, CompactAppCardComponent],
+        declarations: [
+          CloudFoundrySummaryTabComponent,
+          CardCfInfoComponent,
+          CardCfRecentAppsComponent,
+          CompactAppCardComponent
+        ],
         imports: generateCfBaseTestModules(),
-        providers: [...generateTestCfEndpointServiceProvider(), TabNavService]
+        providers: [
+          ...generateTestCfEndpointServiceProvider(),
+          TabNavService
+        ]
       }).compileComponents();
     })
   );
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/cards/card-cf-info/card-cf-info.component.spec.ts b/src/frontend/packages/cloud-foundry/src/shared/components/cards/card-cf-info/card-cf-info.component.spec.ts
index 0f02ebaf4d..eb08f04ef7 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/components/cards/card-cf-info/card-cf-info.component.spec.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/cards/card-cf-info/card-cf-info.component.spec.ts
@@ -18,9 +18,17 @@ describe('CardCfInfoComponent', () => {
   beforeEach(
     async(() => {
       TestBed.configureTestingModule({
-        declarations: [CardCfInfoComponent, MetadataItemComponent, BooleanIndicatorComponent],
+        declarations: [
+          CardCfInfoComponent,
+          MetadataItemComponent,
+          BooleanIndicatorComponent
+        ],
         imports: generateCfBaseTestModulesNoShared(),
-        providers: [generateTestCfEndpointService(), UserInviteService, ConfirmationDialogService]
+        providers: [
+          generateTestCfEndpointService(),
+          UserInviteService,
+          ConfirmationDialogService
+        ]
       }).compileComponents();
     })
   );
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/cards/card-cf-info/card-cf-info.component.ts b/src/frontend/packages/cloud-foundry/src/shared/components/cards/card-cf-info/card-cf-info.component.ts
index a78c004789..657b2a422a 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/components/cards/card-cf-info/card-cf-info.component.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/cards/card-cf-info/card-cf-info.component.ts
@@ -45,6 +45,7 @@ export class CardCfInfoComponent implements OnInit, OnDestroy {
       map(entity => this.getDescription(entity))
     );
 
+    // FIXME: CF should not depend on autoscaler. See #3916
     this.autoscalerVersion$ = fetchAutoscalerInfo(this.cfEndpointService.cfGuid, this.esf).pipe(
       map(e => e.entityRequestInfo.error ?
         null :