Merge pull request #2 from PatAKnight/bulk-import-simple-template

Bulk import simple template

Author: AndrienkoAleksandr

workspaces/bulk-import/examples/template/content/catalog-info.yaml

@@ -1,8 +1,10 @@
 apiVersion: backstage.io/v1alpha1
 kind: Component
 metadata:
-  name: ${{ values.name | dump }}
+  name: ${{ values.name }}
+  annotations:
+    github.com/project-slug: ${{ values.organization }}/${{ values.name }}
 spec:
-  type: service
-  owner: user:guest
-  lifecycle: experimental
+  type: other
+  owner: ${{ values.organization }}
+  lifecycle: unknown

workspaces/bulk-import/examples/template/content/index.js

@@ -18,49 +18,36 @@ spec:
           type: string
           title: Repository URL (Backstage format)
           description: 'e.g. github.com?owner=Org&repo=repoName'
+        organization:
+          type: string
+          title: Owner of the Repository
+        branchName:
+          type: string
+          title: The branch to add the catalog entity to
+        targetBranchName:
+          type: string
+          title: The branch to target the PR to
+        name:
+          type: string
+          title: Name of the repository
 
   steps:
-    - id: parse-query
-      name: Parse GitHub Query
-      action: roadiehq:utils:jsonata
-      input:
-        data: ${{ parameters.repoUrl }}
-        expression: |
-          {
-            "owner": $substringAfter($substringBefore($, "&repo="), "?owner="),
-            "repo": $substringAfter($, "&repo=")
-          }
-
-    - id: get-default-branch
-      name: Get Default Branch
-      action: git:get-default-repository-branch
-      input:
-        repoUrl: ${{ parameters.repoUrl }}
-
-    - id: createCatalogInfo
-      name: Prepare catalog-info.yaml
-      action: roadiehq:utils:fs:write
+    - id: fetch-base
+      name: Fetch Base
+      action: fetch:template
       input:
-        path: ./catalog-info.yaml
-        content: |
-          apiVersion: backstage.io/v1alpha1
-          kind: Component
-          metadata:
-            name: ${{ steps['parse-query'].output.result.repo }}
-            annotations:
-              github.com/project-slug: ${{ steps['parse-query'].output.result.owner }}/${{ steps['parse-query'].output.result.repo }}
-          spec:
-            type: other
-            lifecycle: unknown
-            owner: user:default/test-user
+        url: ./content
+        values:
+          name: ${{ parameters.name }}
+          organization: ${{ parameters.organization }}
 
     - id: publish
       name: Create PR to add catalog-info.yaml
       action: publish:github:pull-request
       input:
         repoUrl: ${{ parameters.repoUrl }}
-        branchName: add-catalog-info-${{ steps['parse-query'].output.result.repo }}
-        targetBranchName: ${{ steps['get-default-branch'].output.defaultBranch }}
+        branchName: ${{ parameters.branchName }}
+        targetBranchName: ${{ parameters.targetBranchName }}
         title: 'Add catalog-info.yaml'
         description: 'This PR adds a default catalog-info.yaml for Backstage.'
 
@@ -69,4 +56,4 @@ spec:
       action: catalog:register
       input:
         optional: true
-        repoContentsUrl: https://github.com/${{ steps['parse-query'].output.result.owner }}/${{ steps['parse-query'].output.result.repo }}/blob/${{ steps['get-default-branch'].output.defaultBranch }}/catalog-info.yaml
+        repoContentsUrl: https://github.com/${{ parameters.organization }}/${{ parameters.name }}/blob/${{ parameters.branchName }}/catalog-info.yaml

workspaces/bulk-import/examples/template/content/package.json

@@ -6,7 +6,7 @@
     "node": "18 || 20"
   },
   "scripts": {
-    "start": "backstage-cli repo start",
+    "start": "NODE_OPTIONS=--no-node-snapshot backstage-cli repo start",
     "tsc": "tsc",
     "tsc:full": "tsc --skipLibCheck true --incremental false",
     "build:all": "backstage-cli repo build --all",

workspaces/bulk-import/examples/template/create-pr-with-catalog-info.yaml

@@ -45,8 +45,6 @@
     "@backstage/plugin-search-backend-node": "^1.3.14",
     "@backstage/plugin-techdocs-backend": "^2.0.5",
     "@red-hat-developer-hub/backstage-plugin-bulk-import-backend": "workspace:^",
-    "@red-hat-developer-hub/backstage-plugin-scaffolder-backend-module-bulk-get-git-default-branch": "workspace:^",
-    "@red-hat-developer-hub/backstage-plugin-scaffolder-backend-module-catalog-register-with-events": "workspace:^",
     "@roadiehq/scaffolder-backend-module-utils": "^3.6.0",
     "app": "link:../app",
     "better-sqlite3": "^9.0.0",

workspaces/bulk-import/examples/template/get-default-branch.yaml

@@ -64,14 +64,4 @@ backend.add(
 );
 backend.add(import('@backstage/plugin-scaffolder-backend-module-github'));
 backend.add(import('@roadiehq/scaffolder-backend-module-utils'));
-backend.add(
-  import(
-    '@red-hat-developer-hub/backstage-plugin-scaffolder-backend-module-bulk-get-git-default-branch'
-  ),
-);
-backend.add(
-  import(
-    '@red-hat-developer-hub/backstage-plugin-scaffolder-backend-module-catalog-register-with-events'
-  ),
-);
 backend.start();

workspaces/bulk-import/examples/template/import-components-from-existing-repo.yaml

@@ -297,7 +297,11 @@ export const createTaskImportJobs = async (
         const normalizedUrl = `${new URL(importReq.repository.url).hostname}?owner=${owner}&repo=${repoName}`;
 
         const scaffolderOptions = {
+          name: repoName,
+          organization: owner,
           repoUrl: normalizedUrl,
+          branchName: `bulk-import-catalog-entity`,
+          targetBranchName: importReq.repository.defaultBranch,
         };
         const { taskId, status, createdAt } =
           await executeTask(scaffolderOptions);