Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge upstream #400

Merged
merged 199 commits into from
Jun 29, 2020
Merged

Merge upstream #400

merged 199 commits into from
Jun 29, 2020

Conversation

richard-cox
Copy link
Member

@richard-cox richard-cox commented Jun 25, 2020

No description provided.

richard-cox and others added 20 commits June 24, 2020 13:43
# Conflicts:
#	angular.json
#	package-lock.json
#	src/frontend/packages/cloud-foundry/src/shared/components/service-plan-public/service-plan-public.component.ts
… Entities (cloudfoundry#4387)

* WIP

* WIP

* WIP

* Endpoint changes

* Fix failure handling during connect on stepper

* Fix favourites

* Removed some TODOs

* Fixes & todos

* Unit test fixes

* Fixes following merge

* Fix cf unit tests

* Changes following review
Co-authored-by: Neil MacDougall <neil.macdougall@suse.com>
@richard-cox richard-cox added the ready for review Ready for review label Jun 25, 2020
@richard-cox richard-cox self-assigned this Jun 25, 2020
@codecov-commenter
Copy link

codecov-commenter commented Jun 25, 2020

Codecov Report

Merging #400 into master will decrease coverage by 2.81%.
The diff coverage is 73.69%.

@@            Coverage Diff             @@
##           master     #400      +/-   ##
==========================================
- Coverage   59.29%   56.48%   -2.82%     
==========================================
  Files        1070      886     -184     
  Lines       33847    28978    -4869     
  Branches     4764     4215     -549     
==========================================
- Hits        20071    16368    -3703     
+ Misses      13776    12610    -1166     

@nwmac nwmac merged commit 669b40e into master Jun 29, 2020
@nwmac nwmac deleted the merge-upstream branch June 29, 2020 11:40
richard-cox added a commit that referenced this pull request Jun 29, 2020
* WIP

* Add theme migration

* File moves

* WIP

* Add theme migration

* Start to make core a separate library

* Tweaks

* WIP

* Fix package imports

* Fix migration script

* First pass at permission effects

* Fix merge issues

* First pass at reducer

* Tidy up logging

* Fix dark theme support

* Final set of cloud-foundry code out of common

* TIdy up and get themable packages working

* Tidy up custom build code

* Tidy ups

* Set defaults when no stratos.yaml file is present

* FIx migrate script for when stratos.yaml not present

* Remove comments

* Disable scss linter from code climate

* Rejig example extensions to be a package for v4 build

* Renames, todos

* Minor fixes

* Fix frontend unit test

* Fix removed e2e target

* Fix unit tests

* Tweaks

* Finish todos

* Fix transition from space summary to app summary page
- an entity service for a space with no org was cached by guid
- an entity service for a space requiring org used cached version
- solution is to make cache id include schema key (determines with/without org)

* Add comment, tidy up rootUpdatingKey

* Fix issue where gitlab summary tab threw errors in console
- fixes cloudfoundry#4325

* Push combine of permission configs into checkers
- overcomes some weird change of permission type

* Fix issue where default add/remove setting in change role by username was incorrect
- add/remove radio button default value governed by add/remove feature flags
- when one is set to false the radio button should be disabled and the other selected

* Fix store-test-helper

* Update readme following move to Travis-ci.com

* Ensure the correct key is used metacard favourite info (cloudfoundry#4321)

* Fix display of details in endpoint card in endpoint list (cloudfoundry#4319)

* Clean default/blocked logic

* Rename @Stratos to @stratosui

* FIx references in tsconfig.json

* Revert change to @stratosui in code

* Revert change to @stratosui in code

* Fix endpoint connect

* Fix unit test

* Fix e2e test

* Change following review #1

* Bump github.com/gorilla/websocket from 1.4.1 to 1.4.2 in /src/jetstream (cloudfoundry#4199)

* Bump github.com/gorilla/websocket from 1.4.1 to 1.4.2 in /src/jetstream

Bumps [github.com/gorilla/websocket](https://github.com/gorilla/websocket) from 1.4.1 to 1.4.2.
- [Release notes](https://github.com/gorilla/websocket/releases)
- [Commits](gorilla/websocket@v1.4.1...v1.4.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

* Update go.sum

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
Co-authored-by: Neil MacDougall <neil.macdougall@suse.com>

* Fix errors in console log during setup screens

* Helm: Change default image pull policy to Always

* Add copy address and edit to endpoint list view

* Use icon that is less confusing with refresh

* Change following review #2
- Fix cf package module file name
- Make CUSTOM_USER_PERMISSION_CHECKERS optional
- Remove need to inject CUSTOM_USER_PERMISSION_CHECKERS in multiple cf modules

* Add newline at end for codeclimate

* Tidy up code and add some more comments

* Fix for buildpack filename wrapping on card

* Fix code climate issue

* Fix compilation issues

* Update endpoint-list.helpers.ts

* Improve naming

* Tidy up

* Update .gitignore

* Tidy up. Build tools in dist/tools

* Change following review

* Rename tools to devkit. Add schematics

* More improvements and theme schematic added.

* Bump gopkg.in/yaml.v2 from 2.2.8 to 2.3.0 in /src/jetstream (cloudfoundry#4336)

* Bump gopkg.in/yaml.v2 from 2.2.8 to 2.3.0 in /src/jetstream

Bumps [gopkg.in/yaml.v2](https://github.com/go-yaml/yaml) from 2.2.8 to 2.3.0.
- [Release notes](https://github.com/go-yaml/yaml/releases)
- [Commits](go-yaml/yaml@v2.2.8...v2.3.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

* CI bump

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
Co-authored-by: Neil MacDougall <neil_macdougall@hotmail.com>

* Remove unused import

* Remove unused import

* [Security] Bump websocket-extensions from 0.1.3 to 0.1.4 (cloudfoundry#4356)

Bumps [websocket-extensions](https://github.com/faye/websocket-extensions-node) from 0.1.3 to 0.1.4. **This update includes a security fix.**
- [Release notes](https://github.com/faye/websocket-extensions-node/releases)
- [Changelog](https://github.com/faye/websocket-extensions-node/blob/master/CHANGELOG.md)
- [Commits](faye/websocket-extensions-node@0.1.3...0.1.4)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>

* Hide deployment info card if not space developer
- fixes cloudfoundry#4322

* Only space developers can create/unmap/delete routes in app routes table
- fixes cloudfoundry#4324

* Only Space Developers should be able to change count, terminate or ssh to instances
- fixes cloudfoundry#4330

* Permissions: Only Space Developers should be able to create/edit/delete an Autoscaler policy
- fixes cloudfoundry#4323

* Users with no developer roles could click on add app button
- fixes cloudfoundry#4361

* Fix tests

* Fail CI build if imagelist generation fails

* Org Managers: Disable org role checkboxes in roles stepper if not admin/org manager
- fixes cloudfoundry#4332

* Routes List: Filter by org breaks when user is an org auditor
- fixes cloudfoundry#4343

* Rename the e2e cf helper file

* Fix autoscaler tab

* Changes following review

* A few minor tidy-ups to help with review

* Fix several space developer permission bugs (cloudfoundry#4362)

* Hide deployment info card if not space developer
- fixes cloudfoundry#4322

* Only space developers can create/unmap/delete routes in app routes table
- fixes cloudfoundry#4324

* Only Space Developers should be able to change count, terminate or ssh to instances
- fixes cloudfoundry#4330

* Permissions: Only Space Developers should be able to create/edit/delete an Autoscaler policy
- fixes cloudfoundry#4323

* Users with no developer roles could click on add app button
- fixes cloudfoundry#4361

* Fix tests

* Fix autoscaler tab

* Changes following review

* Fix service stepper navigation (cloudfoundry#4366)

* Fix service stepper navigation on create/edit cancel/sumbit
- create service stepper from app service tab, marketplace service summary, service wall
- edit service stepper from marketplace service instances, service wall instances, space service instances and app service instances lists
- fixes cloudfoundry#4052, contrinbutes to cloudfoundry#4079, cloudfoundry#4051

* Fix subscription leak
- fixes cloudfoundry#4295
- code no-longer needed

* Force return location of service stepper, fix table edit of upsi and other improvements

* Fix unit tests

* Fix e2e tests

* Fix e2e tests, add search to marketplace service instances table

* Changes following review

* Move base-entity-* to store package

* Add snackbar

* Remove pathget

* Remove more store -> core dependencies

* Move extension-types to store

* Move favourite mgr and helper from core to store

* Move user fav manager and helper to store package

* More references

* Fix logger service removal

* Fix build

* Address PR feedback

* Fix LoggerService after code moves

* Fix logger service ref

* Fix build issues

* Fix health check import

* Move sortStringify (only used once)

* NonOptionalKeys - only used once

* Move KnownKeys

* Move BrowserStandardEncoder

* Remove last environment link

* Move favourite config mapper

* Remove dependency on StratosScopeStrings

* Move BaseEndpointAuth

* Move StratosTheme

* Move ThemeService

* Move types from utils.service that are only used once in store

* Move PermissionValues

* Move http and jetstream helpers

* Move StyleService

* Move MetricQueryType

* Move getFullEndpointApiUrl

* Move StratosStatus

* Move generateStratosEntities back to core

* Finish store -> core sep

* Address PR feedback

* Fix compilation issue

* Fix merge weirdness

* Merge downstream (cloudfoundry#4369)

* src based changes

* changes to ./build

* ./docs

* ./

* Changes following review

* Address PR feedback

* fix build

* whitespace changes

* Fix in core public-api after merge

* Fix duplicated k8s docs

* Typed access to actions and entities via catalog entity: Core Stratos Entities (cloudfoundry#4387)

* WIP

* WIP

* WIP

* Endpoint changes

* Fix failure handling during connect on stepper

* Fix favourites

* Removed some TODOs

* Fixes & todos

* Unit test fixes

* Fixes following merge

* Fix cf unit tests

* Changes following review

* Theming improvements for header

* Tweaks, Migration Script Docs & Notes on others (cloudfoundry#4389)

Co-authored-by: Neil MacDougall <neil.macdougall@suse.com>

* Build devkit outside of dist folder

* Ignore example packages when there's a stratos config file

* Add dist-devkit to git ignore

* Changes following review

* Revert change needed downstream... (only needed when suse extension is included)

* Fix after merge

Co-authored-by: Neil MacDougall <neil.macdougall@suse.com>
Co-authored-by: Neil MacDougall <nwmac@users.noreply.github.com>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
Co-authored-by: Neil MacDougall <neil_macdougall@hotmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
ready for review Ready for review
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants