Skip to content

Commit 2a07606

Browse files
kruttenkrutten
authored
Merge pull request #5052 from cloudfoundry/develop
Update Master with changes from Develop v4.8.1
2 parents a6595cb + 4a66269 commit 2a07606

File tree

1,098 files changed

+29550
-27957
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,098 files changed

+29550
-27957
lines changed

‎.github/dependabot.yaml

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
---
2+
3+
version: 2
4+
5+
updates:
6+
- package-ecosystem: "npm"
7+
directory: "/"
8+
schedule:
9+
interval: "daily"
10+
11+
- package-ecosystem: "npm"
12+
directory: "/electron"
13+
schedule:
14+
interval: "daily"
15+
16+
- package-ecosystem: "npm"
17+
directory: "/website"
18+
schedule:
19+
interval: "daily"
20+
21+
- package-ecosystem: "gomod"
22+
directory: "src/jetstream/"
23+
schedule:
24+
interval: "daily"
25+

‎.github/workflows/backend_tests.yml

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
name: Backend Tests
2+
3+
on:
4+
push:
5+
branches:
6+
- develop
7+
- master
8+
pull_request:
9+
10+
jobs:
11+
test_suite:
12+
runs-on: ubuntu-latest
13+
steps:
14+
- uses: actions/checkout@v3
15+
- uses: actions/setup-go@v4
16+
with:
17+
go-version: '1.21.0'
18+
cache-dependency-path: |
19+
src/jetstream/go.sum
20+
21+
- name: Create extra_plugins.go
22+
run: |
23+
echo 'package main
24+
// This file is auto-generated - DO NOT EDIT
25+
import _ "github.com/cloudfoundry/stratos/src/jetstream/plugins/autoscaler"
26+
import _ "github.com/cloudfoundry/stratos/src/jetstream/plugins/cloudfoundry"
27+
import _ "github.com/cloudfoundry/stratos/src/jetstream/plugins/cfapppush"
28+
import _ "github.com/cloudfoundry/stratos/src/jetstream/plugins/cfappssh"
29+
import _ "github.com/cloudfoundry/stratos/src/jetstream/plugins/userinvite"
30+
import _ "github.com/cloudfoundry/stratos/src/jetstream/plugins/analysis"
31+
import _ "github.com/cloudfoundry/stratos/src/jetstream/plugins/kubernetes"
32+
import _ "github.com/cloudfoundry/stratos/src/jetstream/plugins/monocular"' > src/jetstream/extra_plugins.go
33+
34+
- name: Run tests
35+
run: build/bk-build.sh test

‎.github/workflows/container-push-base-images-develop.yaml

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
name: container-push-base-images-develop
2+
3+
on:
4+
push:
5+
branches:
6+
- develop
7+
workflow_dispatch:
8+
9+
jobs:
10+
push-store-image:
11+
runs-on: ubuntu-latest
12+
permissions:
13+
packages: write
14+
15+
steps:
16+
- name: 'Log into GHCR'
17+
uses: docker/login-action@v2
18+
with:
19+
registry: ghcr.io
20+
username: ${{secrets.GH_PACKAGES_USER}}
21+
password: ${{secrets.GH_PACKAGES_TOKEN}}
22+
- name: 'Checkout current develop'
23+
uses: actions/checkout@v3
24+
with:
25+
ref: "develop"
26+
- name: 'Build stratos base images'
27+
run: |
28+
./deploy/stratos-base-images/build-base-images.sh -r ghcr.io -o anynines -p -s

‎.github/workflows/frontend_tests.yml

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
name: Frontend Tests
2+
3+
on:
4+
push:
5+
branches:
6+
- develop
7+
- master
8+
pull_request:
9+
10+
env:
11+
NODE_OPTIONS: --max-old-space-size=5500
12+
13+
jobs:
14+
test_suite:
15+
runs-on: ubuntu-latest
16+
steps:
17+
- name: Set up Node
18+
uses: actions/setup-node@v3
19+
with:
20+
node-version: 16
21+
22+
- uses: actions/checkout@v2
23+
24+
- name: Get npm cache directory
25+
id: npm-cache-dir
26+
shell: bash
27+
run: echo "dir=$(npm config get cache)" >> ${GITHUB_OUTPUT}
28+
29+
- uses: actions/cache@v3
30+
id: npm-cache # use this to check for `cache-hit` ==> if: steps.npm-cache.outputs.cache-hit != 'true'
31+
with:
32+
path: ${{ steps.npm-cache-dir.outputs.dir }}
33+
key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}
34+
restore-keys: |
35+
${{ runner.os }}-node-
36+
37+
- name: Install Dependencies
38+
run: npm install
39+
40+
- name: Run Tests
41+
uses: coactions/setup-xvfb@v1
42+
with:
43+
run: npm run test

‎.gitignore

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
/tmp
55
/out-tsc
66
/out
7+
/jetstream
78

89
# dependencies
910
/node_modules
@@ -25,6 +26,7 @@
2526
!.vscode/extensions.json
2627

2728
# misc
29+
/.angular/cache
2830
/.sass-cache
2931
/connect.lock
3032
/coverage
@@ -139,6 +141,9 @@ website/versioned_sidebars
139141
website/versions.json
140142
website/versions-repo
141143

144+
# Npm package builds
145+
/npm_pkg
146+
142147
/scan_tmp
143148

144149
# Desktop app using Electron
@@ -147,4 +152,9 @@ website/versions-repo
147152
/electron/out
148153
/electron/dev-ssl
149154
/electron/jetstream
150-
/electron/version
155+
/electron/version
156+
157+
# Packager
158+
/stratos-ui/
159+
/stratos-ui-packaged.zip
160+

‎CHANGELOG.md

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,32 @@
1+
### 4.5.0 - 2023-11-10
2+
* Make builds work and abstract away architecture (#1)
3+
* Improvements in vulnerability checking (#8)
4+
* Fix the CVEs in the jetstream backend (#12)
5+
* Fix backend unit tests (also code quality improvements) (#15)
6+
* Theme Builder: Cast types (#16)
7+
* Update required disk space (#17)
8+
* Migrate to github.com/pressly/goose (#18)
9+
* Move repository/interfaces to its own submodule: api (#19)
10+
* Build and push base images on push to develop (#11)
11+
* Add Helm support for local repos in desktop mode (#14)
12+
* Fix dependency for database migrations (#20)
13+
* Adapt https://github.com/cloudfoundry/stratos/pull/4580: Update store references in core package to refer to @stratosui/store (#26)
14+
* Fix database migrations by casting dialect correctly (#22)
15+
* add Github Actions for Backend and Frontend Tests (#29)
16+
* Add script to help with building as packages and fix devkit and package info
17+
* Fix typo (#31)
18+
* Code quality improvements via `staticcheck` (#24)
19+
* tidy up github action workflow for backend tests to resolve wrong golang version during tests (#32)
20+
* Update to node v20 (#34)
21+
* Remove sass-lint and stratos-protractor-reporter (#37)
22+
* Apply changes from https://github.com/cloudfoundry/stratos/pull/4583 (#33)
23+
* Upgrade code.cloudfoundry.org/cli to v8 (#42)
24+
* Cherry pick commit 69ac7dc from other branch; now works without any restrictions; original commit message: (#45)
25+
* fix gogoproto related panic when retrieving logs upgrade github.com/cloudfoundry/noaa/consumer to 2.3.0 (#46)
26+
* Fix frontend CVEs (#40)
27+
* feat: add errorz package to combine errors as enum in there (#47)
28+
* allow newer pgsql versions (#51)
29+
130
# Change Log
231

332
## 4.4.0

0 commit comments

Comments
 (0)