Skip to content
This repository has been archived by the owner on Jan 24, 2023. It is now read-only.

Convert scripts to nodejs so they work on Windows #4462

Merged
merged 11 commits into from
Jul 23, 2020
Merged

Convert scripts to nodejs so they work on Windows #4462

merged 11 commits into from
Jul 23, 2020

Conversation

nwmac
Copy link
Contributor

@nwmac nwmac commented Jul 21, 2020

No description provided.

@nwmac nwmac self-assigned this Jul 21, 2020
@codecov-commenter
Copy link

codecov-commenter commented Jul 21, 2020 •
edited

Codecov Report

Merging #4462 into master will not change coverage.
The diff coverage is n/a.

@@           Coverage Diff           @@
##           master    #4462   +/-   ##
=======================================
  Coverage   58.89%   58.89%           
=======================================
  Files         895      895           
  Lines       29203    29203           
  Branches     4219     4219           
=======================================
  Hits        17199    17199           
  Misses      12004    12004

@linux-foundation-easycla
Copy link

linux-foundation-easycla bot commented Jul 22, 2020 •
edited

CLA Check

  • ❌The commit (168dc34 ,1785349d74eae74d1eb774b195fe7b1a77d97af4 ,177d237abe503c466cea38fea7dc49e00253e2aa ,83b3c3b9876b21cc650e8a25393afa67df1dc13e ,68b4f5dbd51c9dea617a4fc4c366b6fe0b20feb2 ,fab39869c91eec0f9b410ef0917b9303215c65a4) is missing the User's ID, preventing the EasyCLA check. Consult GitHub Help to resolve. For further assistance with EasyCLA, please submit a support request ticket.

@richard-cox richard-cox mentioned this pull request Jul 22, 2020
Merged
richard-cox
richard-cox suggested changes Jul 22, 2020
View reviewed changes
Copy link
Contributor

@richard-cox richard-cox left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

  • fe-build.js was references in customizing.md, that'll get updated during the docs overhaul?

package.json Outdated
@@ -7,13 +7,13 @@
"build-backend": "./build/bk-build.sh",
"full-build-dev": "npm run build-dev; npm run build-backend",
"fetch-backend-deps": "./build/bk-fetch-deps.sh",
"bosh-build-backend": "gulp bosh-build-backend",
"test-backend": "./build/bk-build.sh test",
"update-webdriver": "webdriver-manager update",
"build": "node --max_old_space_size=8192 node_modules/@angular/cli/bin/ng build --prod",
"build-cf": "node --max_old_space_size=1500 --gc_interval=100 node_modules/@angular/cli/bin/ng build --prod",
"build-dev": "ng build --dev",
"prebuild-ui": "npm run build && gulp package-prebuild",
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

gulp package-rebuild should now be npm run prebuild-zip?

src/jetstream/config.neil Outdated
@@ -0,0 +1,68 @@
# Database connectivity environment variables
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I like that this is checked in, but should it be?

@richard-cox richard-cox merged commit e19ae6c into master Jul 23, 2020
@richard-cox richard-cox deleted the remove-scripts branch July 23, 2020 08:19
This was referenced Jul 23, 2020
Closed
Closed
nwmac added a commit to SUSE/stratos that referenced this pull request Jul 24, 2020
@richard-cox @nwmac
@mjura @dependabot-preview @dependabot
Merge upstream - #2 (#416)
7298642 
* Improve recent and favourites display (cloudfoundry#4421)

* Improve recent and favourites display

* Remove debug logging

* Remove debug logging/subscription leak

* Unit test fix

* Tweaks following review

* Changes following review
- favourite & recent icon changes

Co-authored-by: Richard Cox <richard.cox@suse.com>

* Add line-height to favourite and recent entity labels (cloudfoundry#4438)

- missed out from another PR following review

* Autoscaler e2e tests: Give better failure error when the test can't find the scaling row (cloudfoundry#4424)

* Improve autoscaler e2e tests

* Remove duplicate fail statement

* Helm Chart: Remove encryption key volume (cloudfoundry#4355)

* Remove encryption key volume

* Remove encrpytion key volume migration from config-init job

* Improve the logout experience (cloudfoundry#4439)

* Add support for including breaking changes in the changelog

* Improve the logout experience

* Fix unit tests

* Add request for version info to github issues template (cloudfoundry#4443)

* Merge downstream (cloudfoundry#4441)

* Merge src/frontend from downstream

* Merge src/jetstream from jetstream

* Remove examples/custom-src

* Merge deploy from downstream
Does not include changes to
- deploy/all-in-one/*
- deploy/aio-entrypoint.sh
- deploy/Dockerfile.all-in-one

* Merge build from downstream

* Add missing merge items from deploy

* Updates to package-lock

* Remove fdescribe

* Fix e2e core tests

* Remove favicon from packages/core/src

* Changes following review

* Show all favorites for an endpoint favorite if there is only one (cloudfoundry#4440)

* Show all favorites for the endpoint favorite if there is only one

* Missing changes

* Merge downstream - JSON Viewer with dark mode & Header Fixes (cloudfoundry#4444)

* Fix json-viewer dark mode

* Fix profile page and side nav top position following header diet
- Fix side nav top position
- Update fix for profile page to also work in non-desktop mode

* Fix issues with tests not running if build upload fails (cloudfoundry#4453)

* Fix issues with tests not running if build upload fails

* Fix script

* One more fix for script

* Fix white space at start of file

* Improve autoscaler e2e logging (cloudfoundry#4456)

* Improve autoscaler e2e logging
- it looks like the AS returns scaling events 1-2 mins after they occur, which is too late for the test
- add additional logging to print out event table data in case of alternative events being raised
- fix logging if wait for events times out
- add hint in later test that depends on AS scaling event

* Ensure only the schedule rule results in scaling events

* Fix check-e2e-pr.sh for pr's from other repos (cloudfoundry#4459)

- switch from TRAVIS_PULL_REQUEST_SLUG to TRAVIS_REPO_SLUG

* Convert Client Secret Input Fields to `password` (cloudfoundry#4455)

* Insecure tlsv10 and tlsv11 ciphers in Stratos UI, bsc#1173295 (#411) (cloudfoundry#4460)

Co-authored-by: Michal Jura <mjura@users.noreply.github.com>

* [Security] Bump codecov from 3.7.0 to 3.7.1 (cloudfoundry#4457)

Bumps [codecov](https://github.com/codecov/codecov-node) from 3.7.0 to 3.7.1. **This update includes a security fix.**
- [Release notes](https://github.com/codecov/codecov-node/releases)
- [Commits](codecov/codecov-node@v3.7.0...v3.7.1)

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

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

* Bump lodash from 4.17.15 to 4.17.19 (cloudfoundry#4452)

Bumps [lodash](https://github.com/lodash/lodash) from 4.17.15 to 4.17.19.
- [Release notes](https://github.com/lodash/lodash/releases)
- [Commits](lodash/lodash@4.17.15...4.17.19)

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

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

* Convert scripts to nodejs so they work on Windows (cloudfoundry#4462)

* Convert scripts to js so they work on Windows

* Improve initial developer experience

* Fix scss compile on windows

* Fix windows build

* Use fs not fs-extra where possible (can work without npm install)

* Remove gulp

* Cleaner fixes for Windows

* Reset

* Fix whitespace

* Address PR feedback

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

* Shorten file paths containing `cloudfoundry`/`cloud-foundry` (cloudfoundry#4466)

* Fix 'too long' file paths

* Fix build issues

* Convert scripts to js so they work on Windows

* Fix scss compile on windows

* Improve initial developer experience

* Fix scss compile on windows

* Fix windows build

* Use fs not fs-extra where possible (can work without npm install)

* Remove gulp

* Cleaner fixes for Windows

* Reset

* Fix whitespace

* Fix merge

Co-authored-by: Neil MacDougall <neil.macdougall@suse.com>
Co-authored-by: Neil MacDougall <nmacdougall@suse.com>
Co-authored-by: Neil MacDougall <nwmac@users.noreply.github.com>

* Fix log out page when there's a custom log in page

* Fix log out page given previous commit changes

Co-authored-by: Neil MacDougall <nwmac@users.noreply.github.com>
Co-authored-by: Michal Jura <mjura@users.noreply.github.com>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Neil MacDougall <nmacdougall@suse.com>
Co-authored-by: Neil MacDougall <neil.macdougall@suse.com>
richard-cox added a commit to SUSE/stratos that referenced this pull request Jul 24, 2020
@richard-cox @nwmac
@mjura @dependabot-preview @dependabot
Merge upstream #3 (#421)
a5b29fa 
* Improve recent and favourites display (cloudfoundry#4421)

* Improve recent and favourites display

* Remove debug logging

* Remove debug logging/subscription leak

* Unit test fix

* Tweaks following review

* Changes following review
- favourite & recent icon changes

Co-authored-by: Richard Cox <richard.cox@suse.com>

* Add line-height to favourite and recent entity labels (cloudfoundry#4438)

- missed out from another PR following review

* Autoscaler e2e tests: Give better failure error when the test can't find the scaling row (cloudfoundry#4424)

* Improve autoscaler e2e tests

* Remove duplicate fail statement

* Helm Chart: Remove encryption key volume (cloudfoundry#4355)

* Remove encryption key volume

* Remove encrpytion key volume migration from config-init job

* Improve the logout experience (cloudfoundry#4439)

* Add support for including breaking changes in the changelog

* Improve the logout experience

* Fix unit tests

* Add request for version info to github issues template (cloudfoundry#4443)

* Merge downstream (cloudfoundry#4441)

* Merge src/frontend from downstream

* Merge src/jetstream from jetstream

* Remove examples/custom-src

* Merge deploy from downstream
Does not include changes to
- deploy/all-in-one/*
- deploy/aio-entrypoint.sh
- deploy/Dockerfile.all-in-one

* Merge build from downstream

* Add missing merge items from deploy

* Updates to package-lock

* Remove fdescribe

* Fix e2e core tests

* Remove favicon from packages/core/src

* Changes following review

* Show all favorites for an endpoint favorite if there is only one (cloudfoundry#4440)

* Show all favorites for the endpoint favorite if there is only one

* Missing changes

* Merge downstream - JSON Viewer with dark mode & Header Fixes (cloudfoundry#4444)

* Fix json-viewer dark mode

* Fix profile page and side nav top position following header diet
- Fix side nav top position
- Update fix for profile page to also work in non-desktop mode

* Fix issues with tests not running if build upload fails (cloudfoundry#4453)

* Fix issues with tests not running if build upload fails

* Fix script

* One more fix for script

* Fix white space at start of file

* Improve autoscaler e2e logging (cloudfoundry#4456)

* Improve autoscaler e2e logging
- it looks like the AS returns scaling events 1-2 mins after they occur, which is too late for the test
- add additional logging to print out event table data in case of alternative events being raised
- fix logging if wait for events times out
- add hint in later test that depends on AS scaling event

* Ensure only the schedule rule results in scaling events

* Fix check-e2e-pr.sh for pr's from other repos (cloudfoundry#4459)

- switch from TRAVIS_PULL_REQUEST_SLUG to TRAVIS_REPO_SLUG

* Convert Client Secret Input Fields to `password` (cloudfoundry#4455)

* Insecure tlsv10 and tlsv11 ciphers in Stratos UI, bsc#1173295 (#411) (cloudfoundry#4460)

Co-authored-by: Michal Jura <mjura@users.noreply.github.com>

* [Security] Bump codecov from 3.7.0 to 3.7.1 (cloudfoundry#4457)

Bumps [codecov](https://github.com/codecov/codecov-node) from 3.7.0 to 3.7.1. **This update includes a security fix.**
- [Release notes](https://github.com/codecov/codecov-node/releases)
- [Commits](codecov/codecov-node@v3.7.0...v3.7.1)

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

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

* Bump lodash from 4.17.15 to 4.17.19 (cloudfoundry#4452)

Bumps [lodash](https://github.com/lodash/lodash) from 4.17.15 to 4.17.19.
- [Release notes](https://github.com/lodash/lodash/releases)
- [Commits](lodash/lodash@4.17.15...4.17.19)

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

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

* Convert scripts to nodejs so they work on Windows (cloudfoundry#4462)

* Convert scripts to js so they work on Windows

* Improve initial developer experience

* Fix scss compile on windows

* Fix windows build

* Use fs not fs-extra where possible (can work without npm install)

* Remove gulp

* Cleaner fixes for Windows

* Reset

* Fix whitespace

* Address PR feedback

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

* Shorten file paths containing `cloudfoundry`/`cloud-foundry` (cloudfoundry#4466)

* Fix 'too long' file paths

* Fix build issues

* Convert scripts to js so they work on Windows

* Fix scss compile on windows

* Improve initial developer experience

* Fix scss compile on windows

* Fix windows build

* Use fs not fs-extra where possible (can work without npm install)

* Remove gulp

* Cleaner fixes for Windows

* Reset

* Fix whitespace

* Fix merge

Co-authored-by: Neil MacDougall <neil.macdougall@suse.com>
Co-authored-by: Neil MacDougall <nmacdougall@suse.com>
Co-authored-by: Neil MacDougall <nwmac@users.noreply.github.com>

* Fix log out page when there's a custom log in page (cloudfoundry#4467)

* Add service broker space scope information to service wall list (cloudfoundry#4463)

* Add service broker space scope information to service wall list

* Split out `Space Scope` into it's own `Scope` row/column

* Add service broker scope to service instance list (card and table) & app binding list (card)

* Fix e2e test

* Fix services table, cater for brokers that return 403

* Changes following review
- Show space scope link in app service list (quick access)
- Harmonize names (Service, broker, scope, etc)
- Fix space scope link in services wall

* Remove recents and favorites when entities are deleted (cloudfoundry#4431)

* Improve recent and favourites display

* Remove debug logging

* Remove debug logging/subscription leak

* Unit test fix

* Remove recents and favorites when entities are deleted

* Fix merge issues

* Fix merge issue

* Tidy up and improve following PR feedback

* Remove out of date comment

* Fixed problem where clear was not working

* Check favorite exists before deleting

* Version bump and change log (cloudfoundry#4469)

* Version bump and change log

* Update changelog

Co-authored-by: Neil MacDougall <nwmac@users.noreply.github.com>
Co-authored-by: Michal Jura <mjura@users.noreply.github.com>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Neil MacDougall <nmacdougall@suse.com>
Co-authored-by: Neil MacDougall <neil.macdougall@suse.com>
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@richard-cox richard-cox richard-cox approved these changes

Assignees

@nwmac nwmac

Labels
ready for review
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@nwmac @codecov-commenter @richard-cox