Merge branch 'develop' into feature/INT-2933-initial-support-for-ca-c…

…ert-endpoints
anynines · Nov 6, 2023 · b907f6d · b907f6d
2 parents 6b1c3a1 + 83683da
commit b907f6d
Show file tree

Hide file tree

Showing 844 changed files with 21,691 additions and 22,688 deletions.
diff --git a/.github/workflows/backend_tests.yml b/.github/workflows/backend_tests.yml
@@ -0,0 +1,35 @@
+name: Backend Tests
+
+on:
+  push:
+    branches:
+      - develop
+      - master
+  pull_request:
+
+jobs:
+  test_suite:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v3
+    - uses: actions/setup-go@v4
+      with:
+        go-version: '1.21.0'
+        cache-dependency-path: |
+          src/jetstream/go.sum
+
+    - name: Create extra_plugins.go
+      run:  |
+        echo 'package main
+        // This file is auto-generated - DO NOT EDIT
+        import _ "github.com/cloudfoundry-incubator/stratos/src/jetstream/plugins/autoscaler"
+        import _ "github.com/cloudfoundry-incubator/stratos/src/jetstream/plugins/cloudfoundry"
+        import _ "github.com/cloudfoundry-incubator/stratos/src/jetstream/plugins/cfapppush"
+        import _ "github.com/cloudfoundry-incubator/stratos/src/jetstream/plugins/cfappssh"
+        import _ "github.com/cloudfoundry-incubator/stratos/src/jetstream/plugins/userinvite"
+        import _ "github.com/cloudfoundry-incubator/stratos/src/jetstream/plugins/analysis"
+        import _ "github.com/cloudfoundry-incubator/stratos/src/jetstream/plugins/kubernetes"
+        import _ "github.com/cloudfoundry-incubator/stratos/src/jetstream/plugins/monocular"' > src/jetstream/extra_plugins.go
+
+    - name: Run tests
+      run:  build/bk-build.sh test
diff --git a/.github/workflows/container-push-base-images-develop.yaml b/.github/workflows/container-push-base-images-develop.yaml
@@ -22,7 +22,7 @@ jobs:
       - name: 'Checkout current develop'
         uses: actions/checkout@v3
         with:
-          ref: "devlop"
+          ref: "develop"
       - name: 'Build stratos base images'
         run: |
           ./deploy/stratos-base-images/build-base-images.sh -r ghcr.io -o anynines -p -s
diff --git a/.github/workflows/frontend_tests.yml b/.github/workflows/frontend_tests.yml
@@ -0,0 +1,43 @@
+name: Frontend Tests
+
+on:
+  push:
+    branches:
+      - develop
+      - master
+  pull_request:
+
+env:
+  NODE_OPTIONS: --max-old-space-size=5500
+
+jobs:
+  test_suite:
+    runs-on: ubuntu-latest
+    steps:
+    - name: Set up Node
+      uses: actions/setup-node@v3
+      with:
+        node-version: 16
+
+    - uses: actions/checkout@v2
+
+    - name: Get npm cache directory
+      id: npm-cache-dir
+      shell: bash
+      run: echo "dir=$(npm config get cache)" >> ${GITHUB_OUTPUT}
+
+    - uses: actions/cache@v3
+      id: npm-cache # use this to check for `cache-hit` ==> if: steps.npm-cache.outputs.cache-hit != 'true'
+      with:
+        path: ${{ steps.npm-cache-dir.outputs.dir }}
+        key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}
+        restore-keys: |
+          ${{ runner.os }}-node-
+
+    - name: Install Dependencies
+      run: npm install
+
+    - name: Run Tests
+      uses: coactions/setup-xvfb@v1
+      with:
+        run: npm run test
diff --git a/.gitignore b/.gitignore
@@ -25,6 +25,7 @@
 !.vscode/extensions.json
 
 # misc
+/.angular/cache
 /.sass-cache
 /connect.lock
 /coverage
@@ -139,6 +140,9 @@ website/versioned_sidebars
 website/versions.json
 website/versions-repo
 
+# Npm package builds
+/npm_pkg
+
 /scan_tmp
 
 # Desktop app using Electron

diff --git a/angular.json b/angular.json
@@ -63,9 +63,7 @@
               "optimization": true,
               "outputHashing": "all",
               "sourceMap": false,
-              "extractCss": true,
               "namedChunks": false,
-              "aot": true,
               "extractLicenses": true,
               "vendorChunk": false,
               "buildOptimizer": true,
@@ -78,9 +76,7 @@
               "optimization": false,
               "outputHashing": "all",
               "sourceMap": false,
-              "extractCss": true,
               "namedChunks": false,
-              "aot": false,
               "extractLicenses": true,
               "vendorChunk": false,
               "buildOptimizer": false,
@@ -95,7 +91,6 @@
         "serve": {
           "builder": "@angular-builders/custom-webpack:dev-server",
           "options": {
-            "aot": true,
             "sslCert": "dev-ssl/server.crt",
             "proxyConfig": "proxy.conf.js",
             "ssl": true,
@@ -154,7 +149,7 @@
       "schematics": {},
       "architect": {
         "build": {
-          "builder": "@angular-devkit/build-ng-packagr:build",
+          "builder": "@angular-devkit/build-angular:ng-packagr",
           "options": {
             "preserveSymlinks": true,
             "outputPath": "dist/core",
@@ -168,20 +163,22 @@
           },
           "configurations": {
             "production": {
-              "budgets": [{
-                "type": "anyComponentStyle",
-                "maximumWarning": "6kb"
-              }],
-              "fileReplacements": [{
-                "replace": "src/frontend/packages/core/src/environments/environment.ts",
-                "with": "src/frontend/packages/core/src/environments/environment.prod.ts"
-              }],
+              "budgets": [
+                {
+                  "type": "anyComponentStyle",
+                  "maximumWarning": "6kb"
+                }
+              ],
+              "fileReplacements": [
+                {
+                  "replace": "src/frontend/packages/core/src/environments/environment.ts",
+                  "with": "src/frontend/packages/core/src/environments/environment.prod.ts"
+                }
+              ],
               "optimization": true,
               "outputHashing": "all",
               "sourceMap": false,
-              "extractCss": true,
               "namedChunks": false,
-              "aot": true,
               "extractLicenses": true,
               "vendorChunk": false,
               "buildOptimizer": true
@@ -214,18 +211,6 @@
               }
             ]
           }
-        },
-        "lint": {
-          "builder": "@angular-devkit/build-angular:tslint",
-          "options": {
-            "tsConfig": [
-              "src/tsconfig.json"
-            ],
-            "tslintConfig": "src/frontend/packages/core/tslint.json",
-            "files": [
-              "src/frontend/packages/core/src/**/*.ts"
-            ]
-          }
         }
       }
     },
@@ -236,7 +221,7 @@
       "prefix": "lib",
       "architect": {
         "build": {
-          "builder": "@angular-devkit/build-ng-packagr:build",
+          "builder": "@angular-devkit/build-angular:ng-packagr",
           "options": {
             "tsConfig": "src/frontend/packages/store/tsconfig.lib.json",
             "project": "src/frontend/packages/store/ng-package.json"
@@ -254,29 +239,57 @@
             "tsConfig": "src/frontend/packages/store/tsconfig.spec.json",
             "karmaConfig": "src/frontend/packages/store/karma.conf.js"
           }
+        }
+      }
+    },
+    "extension": {
+      "root": "src/frontend/packages/extension",
+      "sourceRoot": "src/frontend/packages/extension/src",
+      "projectType": "library",
+      "prefix": "ext",
+      "architect": {
+        "build": {
+          "builder": "@angular-devkit/build-ng-packagr:build",
+          "options": {
+            "tsConfig": "src/frontend/packages/extension/tsconfig.lib.json",
+            "project": "src/frontend/packages/extension/ng-package.json"
+          },
+          "configurations": {
+            "production": {
+              "tsConfig": "src/frontend/packages/extension/tsconfig.lib.prod.json"
+            }
+          }
+        },
+        "test": {
+          "builder": "@angular-devkit/build-angular:karma",
+          "options": {
+            "main": "src/frontend/packages/extension/src/test.ts",
+            "tsConfig": "src/frontend/packages/extension/tsconfig.spec.json",
+            "karmaConfig": "src/frontend/packages/extension/karma.conf.js"
+          }
         },
         "lint": {
           "builder": "@angular-devkit/build-angular:tslint",
           "options": {
             "tsConfig": [
               "src/tsconfig.json"
             ],
-            "tslintConfig": "src/frontend/packages/store/tslint.json",
+            "tslintConfig": "src/frontend/packages/extension/tslint.json",
             "files": [
-              "src/frontend/packages/store/src/**/*.ts"
+              "src/frontend/packages/extension/src/**/*.ts"
             ]
           }
         }
       }
-    },
+    },    
     "shared": {
       "root": "src/frontend/packages/shared",
       "sourceRoot": "src/frontend/packages/shared/src",
       "projectType": "library",
       "prefix": "lib",
       "architect": {
         "build": {
-          "builder": "@angular-devkit/build-ng-packagr:build",
+          "builder": "@angular-devkit/build-angular:ng-packagr",
           "options": {
             "tsConfig": "src/frontend/packages/shared/tsconfig.lib.json",
             "project": "src/frontend/packages/shared/ng-package.json"
@@ -289,14 +302,6 @@
             "tsConfig": "src/frontend/packages/shared/tsconfig.spec.json",
             "karmaConfig": "src/frontend/packages/shared/karma.conf.js"
           }
-        },
-        "lint": {
-          "builder": "@angular-devkit/build-angular:tslint",
-          "options": {
-            "tsConfig": ["src/tsconfig.json"],
-            "tslintConfig": "src/frontend/packages/shared/tslint.json",
-            "files": ["src/frontend/packages/shared/src/**/*.ts"]
-          }
         }
       }
     },
@@ -307,7 +312,7 @@
       "prefix": "lib",
       "architect": {
         "build": {
-          "builder": "@angular-devkit/build-ng-packagr:build",
+          "builder": "@angular-devkit/build-angular:ng-packagr",
           "options": {
             "tsConfig": "src/frontend/packages/cloud-foundry/tsconfig.lib.json",
             "project": "src/frontend/packages/cloud-foundry/ng-package.json"
@@ -325,18 +330,6 @@
             "tsConfig": "src/frontend/packages/cloud-foundry/tsconfig.spec.json",
             "karmaConfig": "src/frontend/packages/cloud-foundry/karma.conf.js"
           }
-        },
-        "lint": {
-          "builder": "@angular-devkit/build-angular:tslint",
-          "options": {
-            "tsConfig": [
-              "src/tsconfig.json"
-            ],
-            "tslintConfig": "src/frontend/packages/cloud-foundry/tslint.json",
-            "files": [
-              "src/frontend/packages/cloud-foundry/src/**/*.ts"
-            ]
-          }
         }
       }
     },
@@ -347,7 +340,7 @@
       "prefix": "lib",
       "architect": {
         "build": {
-          "builder": "@angular-devkit/build-ng-packagr:build",
+          "builder": "@angular-devkit/build-angular:ng-packagr",
           "options": {
             "tsConfig": "src/frontend/packages/cf-autoscaler/tsconfig.lib.json",
             "project": "src/frontend/packages/cf-autoscaler/ng-package.json"
@@ -365,18 +358,6 @@
             "tsConfig": "src/frontend/packages/cf-autoscaler/tsconfig.spec.json",
             "karmaConfig": "src/frontend/packages/cf-autoscaler/karma.conf.js"
           }
-        },
-        "lint": {
-          "builder": "@angular-devkit/build-angular:tslint",
-          "options": {
-            "tsConfig": [
-              "src/tsconfig.json"
-            ],
-            "tslintConfig": "src/frontend/packages/cf-autoscaler/tslint.json",
-            "files": [
-              "src/frontend/packages/cf-autoscaler/src/**/*.ts"
-            ]
-          }
         }
       }
     },
@@ -393,18 +374,6 @@
             "tsConfig": "src/frontend/packages/kubernetes/tsconfig.spec.json",
             "karmaConfig": "src/frontend/packages/kubernetes/karma.conf.js"
           }
-        },
-        "lint": {
-          "builder": "@angular-devkit/build-angular:tslint",
-          "options": {
-            "tsConfig": [
-              "src/tsconfig.json"
-            ],
-            "tslintConfig": "src/frontend/packages/kubernetes/tslint.json",
-            "files": [
-              "src/frontend/packages/kubernetes/src/**/*.ts"
-            ]
-          }
         }
       }
     },
@@ -421,24 +390,11 @@
             "tsConfig": "src/frontend/packages/git/tsconfig.spec.json",
             "karmaConfig": "src/frontend/packages/git/karma.conf.js"
           }
-        },
-        "lint": {
-          "builder": "@angular-devkit/build-angular:tslint",
-          "options": {
-            "tsConfig": [
-              "src/tsconfig.json"
-            ],
-            "tslintConfig": "src/frontend/packages/git/tslint.json",
-            "files": [
-              "src/frontend/packages/git/src/**/*.ts"
-            ]
-          }
         }
       }
     }
 
   },
-  "defaultProject": "stratos",
   "schematics": {
     "@schematics/angular:component": {
       "prefix": "app",