Merge pull request #363 from SUSE/upstream-merge

Upstream merge - RC1

CHANGELOG.md

@@ -1,5 +1,37 @@
 # Change Log
 
+## 3.1.0
+
+[Full Changelog](https://github.com/cloudfoundry/stratos/compare/3.0.0...3.1.0)
+
+This release contains a number of fixes and improvements:
+
+**Improvements:**
+
+- Update Feature Flags with new entries [\#4188](https://github.com/cloudfoundry/stratos/issues/4188)
+- Improve Application Deployment UI [\#4183](https://github.com/cloudfoundry/stratos/pull/4183)
+- Scalability: Improve handling of 'maxed' lists [\#4180](https://github.com/cloudfoundry/stratos/issues/4180)
+- Scalability: Add button to load maxed lists [\#4179](https://github.com/cloudfoundry/stratos/issues/4179)
+- Scalability: Improve scaling of service instances [\#4162](https://github.com/cloudfoundry/stratos/pull/4162)
+- Scalability: Improve scaling of users and organisations [\#4156](https://github.com/cloudfoundry/stratos/pull/4156)
+- Local Admin User: Auto-login user if they have just set up account [\#4135](https://github.com/cloudfoundry/stratos/issues/4135)
+- Add support for showing Gravatar for the user icon [\#4134](https://github.com/cloudfoundry/stratos/pull/4134)
+- Disable Jetstream API logging via Env Var [\#4130](https://github.com/cloudfoundry/stratos/issues/4130)
+- Improve UI element sizing and presentation on desktop [\#4129](https://github.com/cloudfoundry/stratos/pull/4129)
+- Allow org managers to add users outside of org [\#4103](https://github.com/cloudfoundry/stratos/issues/4103)
+
+**Fixes:**
+
+- CF Quota's `Maximum Application Instance Memory Usage` not formatted correctly [\#4206](https://github.com/cloudfoundry/stratos/issues/4206)
+- Notification and error pages loop when using 'X' [\#4202](https://github.com/cloudfoundry/stratos/issues/4202)
+- Cf app redeploy stepper starts with empty step, cannot continue [\#4185](https://github.com/cloudfoundry/stratos/issues/4185)
+- Can't push apps with multiple buildpacks [\#4181](https://github.com/cloudfoundry/stratos/issues/4181)
+- Deleting a Service Instance or User Provided Service Instance breaks list [\#4157](https://github.com/cloudfoundry/stratos/issues/4157)
+- Deleting an organisation with spaces fails [\#4155](https://github.com/cloudfoundry/stratos/issues/4155)
+- App Deploy should accept manifest .YML or .YAML [\#4152](https://github.com/cloudfoundry/stratos/issues/4152)
+- Only fetch first page of maxed lists [\#4138](https://github.com/cloudfoundry/stratos/pull/4138)
+- 'Register an endpoint' arrow misaligned [\#3519](https://github.com/cloudfoundry/stratos/issues/3519)
+
 ## 3.0.0
 
 [Full Changelog](https://github.com/SUSE/stratos/compare/2.7.0...3.0.0)

build/tools/changelog.sh

@@ -0,0 +1,87 @@
+#!/bin/bash
+
+# Colours
+CYAN="\033[96m"
+YELLOW="\033[93m"
+RED="\033[91m"
+RESET="\033[0m"
+BOLD="\033[1m"
+
+# Program Paths:
+PROG=$(basename ${BASH_SOURCE[0]})
+PROG_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+STRATOS_DIR="$( cd "${PROG_DIR}/../.." && pwd )"
+CHANGELOG="${STRATOS_DIR}/CHANGELOG.md"
+
+echo -e "${CYAN}${BOLD}===================================${RESET}"
+echo -e "${CYAN}${BOLD}Generating Changelog from Milestone${RESET}"
+echo -e "${CYAN}${BOLD}===================================${RESET}"
+
+echo -e "${YELLOW}Stratos Directory: ${STRATOS_DIR}${RESET}"
+echo ""
+
+# Get the version number from the package.json file
+
+REPO=${1:-cloudfoundry/stratos}
+
+MILESTONE=$(cat "${STRATOS_DIR}/package.json" | jq -r .version)
+echo -e "${YELLOW}Current version  : ${BOLD}${MILESTONE}${RESET}"
+
+# Find the last release from the Changelog
+CURRENT=$(cat "${STRATOS_DIR}/CHANGELOG.md" | grep -m1  '## [0-9]*.[0-9]*.[0-9]*')
+CURRENT="${CURRENT:3}"
+if [ "$CURRENT" == "$MILESTONE" ]; then
+  CURRENT=$(cat "${STRATOS_DIR}/CHANGELOG.md" | grep -m2  '## [0-9]*.[0-9]*.[0-9]*' | tail -n1)
+  CURRENT="${CURRENT:3}"
+
+  # There is already a section for this release - so remove it
+  echo "Removing old changelog for release ${MILESTONE}"
+  sed -i.bak '/^# Change Log/,/^\## '"${CURRENT}"'/{//!d;};' ${CHANGELOG}
+fi
+
+echo -e "${YELLOW}Previous version : ${BOLD}$CURRENT${RESET}"
+
+function search() {
+  QUERY=$1
+  curl -s "https://api.github.com/search/issues?q=${QUERY}" | jq -r '.items | .[] | "- \(.title) [\\#\(.number)](\(.html_url))"' | tee -a ${CHANGELOG}
+}
+
+function log() {
+  echo $1 | tee -a ${CHANGELOG}
+}
+
+QUERY="repo:${REPO}+milestone:3.1.0+state:closed"
+
+BUGS="$QUERY+label:bug"
+NON_BUGS="$QUERY+-label:bug"
+
+mv ${CHANGELOG} CHANGELOG.old
+
+echo ""
+echo -e "${CYAN}${BOLD}Generating Change log - content for version ${MILESTONE} will be shown below"
+echo -e "---------------------------------------------------------------------${RESET}"
+
+echo  "# Change Log" > ${CHANGELOG}
+log ""
+log "## ${MILESTONE}"
+log ""
+log "[Full Changelog](https://github.com/${REPO}/compare/${CURRENT}...${MILESTONE})"
+log ""
+log "This release contains a number of fixes and improvements:"
+log ""
+log "**Improvements:**"
+log ""
+search $NON_BUGS
+
+log ""
+
+log "**Fixes:**"
+log ""
+search $BUGS
+
+log ""
+
+tail -n +2 CHANGELOG.old >> ${CHANGELOG}
+rm CHANGELOG.old 
+
+sed -i.bak 's/\# Change Log.*\#\# ${CURRENT}//' ${CHANGELOG}

deploy/stratos-base-images/Dockerfile.stratos-go-build-base.tmpl

@@ -11,7 +11,7 @@ RUN zypper ref
 
 RUN zypper -n ref && \
     zypper -n up && \
-    zypper in -y which tar git gcc curl wget gzip xz unzip && \
+    zypper in -y which tar git gcc curl wget gzip xz unzip make && \
     zypper clean -a && \
     rm -f /var/log/zypper.log /var/log/zypp/history
 
@@ -24,14 +24,6 @@ RUN wget https://storage.googleapis.com/golang/go1.13.4.linux-amd64.tar.gz && \
 ENV PATH $PATH:/usr/local/go/bin:/home/stratos/go/bin
 ENV GOPATH /home/stratos/go
 
-# Install both glide and dep for now, so that this base image can use either
-
-# Install glide for backend go dependency management (legacy)
-RUN curl https://glide.sh/get | sh
-
-# Install dep for backend go dependency management
-RUN curl https://raw.githubusercontent.com/golang/dep/master/install.sh | sh
-
 {{#IS_SLE}}
 RUN zypper rr base_ga
 RUN zypper rr base_update

deploy/stratos-base-images/Dockerfile.stratos-ruby-base.tmpl

@@ -0,0 +1,27 @@
+FROM {{BASE_IMAGE}}
+
+{{#IS_SLE}}
+RUN rm -f /usr/lib/zypp/plugins/services/container-suseconnect-zypp
+RUN zypper addrepo -G -c -p 90 '{{ZYP_REPO_BASE_GA}}' base_ga
+RUN zypper addrepo -G -c -p 80 '{{ZYP_REPO_BASE_UPDATE}}' base_update
+RUN zypper addrepo -G -c -p 70 '{{ZYP_REPO_SP_GA}}' sp_ga
+RUN zypper addrepo -G -c -p 60 '{{ZYP_REPO_SP_UPDATE}}' sp_update
+RUN zypper ref
+{{/IS_SLE}}
+
+RUN zypper -n ref && \
+    zypper -n up && \
+    zypper in -y which tar curl wget gzip jq && \
+    zypper in -y ruby && \
+    zypper clean -a && \
+    rm -f /var/log/zypper.log /var/log/zypp/history
+
+WORKDIR /
+USER root
+
+{{#IS_SLE}}
+RUN zypper rr base_ga
+RUN zypper rr base_update
+RUN zypper rr sp_ga
+RUN zypper rr sp_update
+{{/IS_SLE}}

deploy/stratos-base-images/Dockerfile.stratos-ruby-build-base.tmpl

@@ -11,16 +11,17 @@ RUN zypper ref
 
 RUN zypper -n ref && \
     zypper -n up && \
-    zypper in -y which tar curl wget gzip && \
+    zypper in -y which tar curl wget gzip jq && \
+    zypper in -y ruby && \
+    zypper in -y make gcc-c++ && \
+    zypper in -y libopenssl-devel readline-devel && \
+    zypper in -y ruby-devel && \
     zypper clean -a && \
     rm -f /var/log/zypper.log /var/log/zypp/history
 
 WORKDIR /
 USER root
 
-ADD install-ruby.sh /install-ruby.sh
-RUN /install-ruby.sh
-
 {{#IS_SLE}}
 RUN zypper rr base_ga
 RUN zypper rr base_update

deploy/stratos-base-images/build-base-images.sh

@@ -151,6 +151,9 @@ tag_and_push_image() {
 build_and_push_image stratos-base Dockerfile.stratos-base
 
 # Base with ruby
+build_and_push_image stratos-ruby-base Dockerfile.stratos-ruby-base
+
+# Build base with ruby
 build_and_push_image stratos-ruby-build-base Dockerfile.stratos-ruby-build-base
 
 # Base with go

package.json

@@ -1,6 +1,6 @@
 {
   "name": "stratos",
-  "version": "3.0.0",
+  "version": "3.1.0",
   "description": "Stratos Console",
   "main": "index.js",
   "scripts": {

src/frontend/packages/cloud-foundry/src/actions/application.actions.ts

@@ -68,7 +68,7 @@ export class GetAllApplications extends CFStartAction implements PaginatedAction
     'results-per-page': 100,
   };
   flattenPagination = true;
-  flattenPaginationMax = 600;
+  flattenPaginationMax = true;
 }
 
 export class GetApplication extends CFStartAction implements ICFAction, EntityInlineParentAction {

src/frontend/packages/cloud-foundry/src/actions/organization.actions.ts

@@ -256,7 +256,7 @@ export class GetAllOrgUsers extends CFStartAction implements PaginatedAction, En
     'order-direction-field': 'username',
   };
   flattenPagination = true;
-  flattenPaginationMax = 600;
+  flattenPaginationMax = true;
   skipValidation: boolean;
   populateMissing: boolean;
 }

src/frontend/packages/cloud-foundry/src/actions/route.actions.ts

@@ -59,10 +59,10 @@ export class CreateRoute extends BaseRouteAction {
         ...route,
         port: generatePort ? undefined : route.port
       }, {
-        params: new HttpParams(generatePort ? {
-          fromObject: { generate_port: 'true' }
-        } : {})
-      }
+      params: new HttpParams(generatePort ? {
+        fromObject: { generate_port: 'true' }
+      } : {})
+    }
     );
   }
   actions = [CREATE_ROUTE, CREATE_ROUTE_SUCCESS, CREATE_ROUTE_ERROR];
@@ -153,6 +153,6 @@ export class GetAllRoutes extends CFStartAction implements PaginatedAction, Enti
     'order-direction': 'desc',
     'order-direction-field': 'route',
   };
-  flattenPaginationMax = 800;
+  flattenPaginationMax = true;
   flattenPagination = true;
 }

src/frontend/packages/cloud-foundry/src/actions/service-instances.actions.ts

@@ -60,6 +60,7 @@ export class GetServiceInstances
     q: []
   };
   flattenPagination = true;
+  flattenPaginationMax = true;
 }
 
 export class GetServiceInstance

src/frontend/packages/cloud-foundry/src/actions/service.actions.ts

@@ -1,12 +1,13 @@
-import { entityCatalog } from '../../../store/src/entity-catalog/entity-catalog.service';
+import { HttpRequest } from '@angular/common/http';
+
 import { getActions } from '../../../store/src/actions/action.helper';
+import { entityCatalog } from '../../../store/src/entity-catalog/entity-catalog.service';
 import { PaginatedAction } from '../../../store/src/types/pagination.types';
-import { CF_ENDPOINT_TYPE } from '../cf-types';
 import { cfEntityFactory } from '../cf-entity-factory';
 import { serviceEntityType, servicePlanEntityType } from '../cf-entity-types';
+import { CF_ENDPOINT_TYPE } from '../cf-types';
 import { createEntityRelationKey, EntityInlineParentAction } from '../entity-relations/entity-relations.types';
 import { CFStartAction } from './cf-action.types';
-import { HttpRequest } from '@angular/common/http';
 
 export class GetAllServices extends CFStartAction implements PaginatedAction, EntityInlineParentAction {
   constructor(
@@ -34,6 +35,7 @@ export class GetAllServices extends CFStartAction implements PaginatedAction, En
     'order-direction-field': 'label',
   };
   flattenPagination = true;
+  flattenPaginationMax = true;
 }
 export class GetService extends CFStartAction implements EntityInlineParentAction {
   constructor(

src/frontend/packages/cloud-foundry/src/actions/user-provided-service.actions.ts

@@ -1,7 +1,8 @@
-import { EntityCatalogEntityConfig } from '../../../store/src/entity-catalog/entity-catalog.types';
+import { HttpRequest } from '@angular/common/http';
+
 import { getActions } from '../../../store/src/actions/action.helper';
+import { EntityCatalogEntityConfig } from '../../../store/src/entity-catalog/entity-catalog.types';
 import { endpointSchemaKey } from '../../../store/src/helpers/entity-factory';
-import { QParam, QParamJoiners } from '../shared/q-param';
 import { PaginatedAction } from '../../../store/src/types/pagination.types';
 import { ICFAction } from '../../../store/src/types/request.types';
 import { cfEntityFactory } from '../cf-entity-factory';
@@ -18,8 +19,8 @@ import {
   createEntityRelationPaginationKey,
   EntityInlineParentAction,
 } from '../entity-relations/entity-relations.types';
+import { QParam, QParamJoiners } from '../shared/q-param';
 import { CFStartAction } from './cf-action.types';
-import { HttpRequest } from '@angular/common/http';
 
 export const getUserProvidedServiceInstanceRelations = [
   createEntityRelationKey(userProvidedServiceInstanceEntityType, spaceWithOrgEntityType),
@@ -59,6 +60,7 @@ export class GetAllUserProvidedServices extends CFStartAction implements Paginat
     q: []
   };
   flattenPagination = true;
+  flattenPaginationMax = true;
   paginationKey: string;
 }
 

src/frontend/packages/cloud-foundry/src/actions/users.actions.ts

@@ -74,7 +74,7 @@ export class GetAllUsersAsAdmin extends CFStartAction implements PaginatedAction
     'order-direction-field': 'username',
   };
   flattenPagination = true;
-  flattenPaginationMax = 600;
+  flattenPaginationMax = true;
   static is(action: any): boolean {
     return !!action.isGetAllUsersAsAdmin;
   }