Merge pull request #31 from johanneswuerbach/use-plugin-scaffolding-h…

…elpers feat: use plugin scaffolding helpers
humanitec-architecture · May 15, 2024 · f4f7fa9 · f4f7fa9
2 parents 88178c8 + dbce719
commit f4f7fa9
Show file tree

Hide file tree

Showing 13 changed files with 274 additions and 184 deletions.
diff --git a/.github/workflows/deploy.yaml b/.github/workflows/deploy.yaml
@@ -42,9 +42,6 @@ jobs:
 
       - name: Configure correct org after copying from template
         run: |
-          # Ensure correct github org
-          find ./templates -type f -name "*.yaml" -exec sed -i 's/humanitec-architecture/${{ github.repository_owner }}/g' {} +
-
           # Ensure correct humanitec org
           sed -i 's/humanitec-architecture/${{ vars.HUMANITEC_ORG_ID }}/g' catalog-info.yaml
 

diff --git a/app-config.yaml b/app-config.yaml
@@ -62,5 +62,5 @@ catalog:
 humanitec:
   orgId: ${HUMANITEC_ORG_ID}
   token: ${HUMANITEC_TOKEN}
-
-cloudProvider: ${CLOUD_PROVIDER}
+  cloudProvider: ${CLOUD_PROVIDER}
+  githubOrgId: ${GITHUB_ORG_ID}
diff --git a/packages/app/package.json b/packages/app/package.json
@@ -41,7 +41,7 @@
     "@backstage/plugin-techdocs-react": "^1.2.3",
     "@backstage/plugin-user-settings": "^0.8.5",
     "@backstage/theme": "^0.5.3",
-    "@humanitec/backstage-plugin": "^0.5.1",
+    "@humanitec/backstage-plugin": "^0.6.0",
     "@material-ui/core": "^4.12.2",
     "@material-ui/icons": "^4.9.1",
     "backstage-plugin-techdocs-addon-mermaid": "^0.11.0",

diff --git a/packages/app/src/App.tsx b/packages/app/src/App.tsx
@@ -11,7 +11,7 @@ import {
   catalogImportPlugin,
 } from '@backstage/plugin-catalog-import';
 import { ScaffolderPage, scaffolderPlugin } from '@backstage/plugin-scaffolder';
-import { ValidateHumanitecAppIDFieldExtension } from './scaffolder/ValidateHumanitecAppID';
+import { ValidateHumanitecAppIDFieldExtension } from '@humanitec/backstage-plugin';
 import { ScaffolderFieldExtensions } from '@backstage/plugin-scaffolder-react';
 import { orgPlugin } from '@backstage/plugin-org';
 import { SearchPage } from '@backstage/plugin-search';

diff --git a/packages/app/src/scaffolder/ValidateHumanitecAppID/ValidateHumanitecAppIDExtension.tsx b/packages/app/src/scaffolder/ValidateHumanitecAppID/ValidateHumanitecAppIDExtension.tsx
diff --git a/packages/app/src/scaffolder/ValidateHumanitecAppID/extensions.ts b/packages/app/src/scaffolder/ValidateHumanitecAppID/extensions.ts
diff --git a/packages/app/src/scaffolder/ValidateHumanitecAppID/index.ts b/packages/app/src/scaffolder/ValidateHumanitecAppID/index.ts
diff --git a/packages/backend/package.json b/packages/backend/package.json
@@ -18,7 +18,6 @@
   "dependencies": {
     "@backstage/backend-common": "^0.21.7",
     "@backstage/backend-defaults": "^0.2.17",
-    "@backstage/backend-plugin-api": "^0.6.17",
     "@backstage/backend-tasks": "^0.5.22",
     "@backstage/config": "^1.2.0",
     "@backstage/plugin-app-backend": "^0.3.65",
@@ -35,14 +34,13 @@
     "@backstage/plugin-proxy-backend": "^0.4.15",
     "@backstage/plugin-scaffolder-backend": "^1.22.4",
     "@backstage/plugin-scaffolder-backend-module-github": "^0.2.7",
-    "@backstage/plugin-scaffolder-node": "^0.4.3",
     "@backstage/plugin-search-backend": "^1.5.7",
     "@backstage/plugin-search-backend-module-catalog": "^0.1.22",
     "@backstage/plugin-search-backend-module-techdocs": "^0.1.22",
     "@backstage/plugin-search-backend-node": "^1.2.21",
     "@backstage/plugin-techdocs-backend": "^1.10.4",
-    "@humanitec/backstage-plugin-backend": "^0.6.0",
-    "@humanitec/backstage-plugin-scaffolder-backend-module": "^0.1.0",
+    "@humanitec/backstage-plugin-backend": "^0.6.3",
+    "@humanitec/backstage-plugin-scaffolder-backend-module": "^0.3.0",
     "app": "link:../app",
     "better-sqlite3": "^9.0.0",
     "dockerode": "^3.3.1",

diff --git a/packages/backend/src/actions/get-environment.ts b/packages/backend/src/actions/get-environment.ts
diff --git a/packages/backend/src/index.ts b/packages/backend/src/index.ts
@@ -40,8 +40,6 @@ backend.add(import('@backstage/plugin-search-backend-module-techdocs/alpha'));
 // scaffolder plugin
 backend.add(import('@backstage/plugin-scaffolder-backend/alpha'));
 backend.add(import('@backstage/plugin-scaffolder-backend-module-github'));
-// backend:get-environment used in humanitec templates
-backend.add(import('./actions/get-environment'));
 
 // humanitec
 backend.add(import('@humanitec/backstage-plugin-backend'));

diff --git a/templates/node-service/template.yaml b/templates/node-service/template.yaml
@@ -28,7 +28,7 @@ spec:
   steps:
     - name: Read Environment
       id: environment
-      action: backend:get-environment
+      action: humanitec:get-environment
 
     - id: fetch-base
       name: Fetch Base
@@ -48,7 +48,7 @@ spec:
         allowedHosts: ['github.com']
         defaultBranch: main
         description: This is ${{ parameters.componentName }}
-        repoUrl: github.com?owner=humanitec-architecture&repo=${{ parameters.componentName }}
+        repoUrl: github.com?owner=${{ steps.environment.output.githubOrgId }}&repo=${{ parameters.componentName }}
         repoVisibility: public
         protectDefaultBranch: false
         oidcCustomization: ${{ steps.environment.output.githubOIDCCustomization }}

diff --git a/templates/podinfo-example/template.yaml b/templates/podinfo-example/template.yaml
@@ -28,7 +28,7 @@ spec:
   steps:
     - name: Read Environment
       id: environment
-      action: backend:get-environment
+      action: humanitec:get-environment
 
     - id: fetch-base
       name: Fetch Base
@@ -48,7 +48,7 @@ spec:
         allowedHosts: ['github.com']
         defaultBranch: main
         description: This is ${{ parameters.componentName }}
-        repoUrl: github.com?owner=humanitec-architecture&repo=${{ parameters.componentName }}
+        repoUrl: github.com?owner=${{ steps.environment.output.githubOrgId }}&repo=${{ parameters.componentName }}
         repoVisibility: public
         protectDefaultBranch: false
         oidcCustomization: ${{ steps.environment.output.githubOIDCCustomization }}