Skip to content

Commit b0c80b1

Browse files
authored
chores(x2a): move conversion-project-template.yaml template under scaffolder-backend-module-x2a (#2615)
Signed-off-by: Marek Libra <marek.libra@gmail.com>
1 parent 844e08b commit b0c80b1

7 files changed

Lines changed: 14 additions & 36 deletions

File tree

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
'@red-hat-developer-hub/backstage-plugin-scaffolder-backend-module-x2a': patch
3+
---
4+
5+
Moving conversion-project-template.yaml template under scaffolder-backend-module-x2a for easier distribution.

workspaces/x2a/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ See the [backend plugin README](./plugins/x2a-backend/README.md) for detailed co
3737
2. **Optional:** Update `app-config.yaml` based on your environment.
3838
- **`auth:`**
3939
- Configure authentication providers for sign-in and SCM access (GitHub, GitLab). See [Backstage auth docs](https://backstage.io/docs/auth/).
40-
- Based on your options of auth-providers, mind updating the `conversion-project-template.yaml` for source and target repository URLs.
40+
- Based on your options of auth-providers, mind updating the `plugins/scaffolder-backend-module-x2a/templates/conversion-project-template.yaml` for source and target repository URLs.
4141
- **`integrations:`**
4242
- Configure SCM integrations for custom-domain hosts (e.g. self-hosted GitHub Enterprise, GitLab, or Bitbucket). The plugin reads the `integrations:` section to detect which SCM provider owns a given repository URL. Only the `host` field is required for this purpose; access tokens in `integrations:` entries are **not** needed by the x2a plugin (authentication is handled via OAuth through the `auth:` providers above). See the [SCM Provider Detection](#scm-provider-detection) section below.
4343
- **`x2a:`** - Provide LLM credentials, Ansible Automation Platform connection details, and Kubernetes resource limits. See [x2a-convertor technical details](https://github.com/x2ansible/x2a-convertor?tab=readme-ov-file#technical-details).

workspaces/x2a/app-config.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ catalog:
122122
- allow: [User, Group]
123123
# x2a Create Project template
124124
- type: file
125-
target: ../../templates/conversion-project-template.yaml
125+
target: ../../plugins/scaffolder-backend-module-x2a/templates/conversion-project-template.yaml
126126
rules:
127127
- allow: [Template]
128128

workspaces/x2a/plugins/scaffolder-backend-module-x2a/package.json

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,14 +33,15 @@
3333
"dependencies": {
3434
"@backstage/backend-plugin-api": "1.4.2",
3535
"@backstage/config": "^1.3.6",
36-
"@backstage/plugin-scaffolder-node": "^0.11.0",
36+
"@backstage/plugin-scaffolder-node": "^0.12.4",
3737
"@red-hat-developer-hub/backstage-plugin-x2a-common": "workspace:*"
3838
},
3939
"devDependencies": {
4040
"@backstage/cli": "^0.34.5",
4141
"@backstage/plugin-scaffolder-node-test-utils": "^0.3.5"
4242
},
4343
"files": [
44-
"dist"
44+
"dist",
45+
"templates"
4546
]
4647
}

workspaces/x2a/plugins/scaffolder-backend-module-x2a/src/module.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ import {
1717
coreServices,
1818
createBackendModule,
1919
} from '@backstage/backend-plugin-api';
20-
import { scaffolderActionsExtensionPoint } from '@backstage/plugin-scaffolder-node/alpha';
20+
import { scaffolderActionsExtensionPoint } from '@backstage/plugin-scaffolder-node';
2121
import { createProjectAction } from './actions/createProjectAction';
2222

2323
/**

workspaces/x2a/templates/conversion-project-template.yaml renamed to workspaces/x2a/plugins/scaffolder-backend-module-x2a/templates/conversion-project-template.yaml

File renamed without changes.

workspaces/x2a/yarn.lock

Lines changed: 3 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -2882,7 +2882,7 @@ __metadata:
28822882
languageName: node
28832883
linkType: hard
28842884

2885-
"@backstage/integration@npm:^1.18.0, @backstage/integration@npm:^1.18.2, @backstage/integration@npm:^1.19.2, @backstage/integration@npm:^1.20.0":
2885+
"@backstage/integration@npm:^1.18.2, @backstage/integration@npm:^1.19.2, @backstage/integration@npm:^1.20.0":
28862886
version: 1.20.0
28872887
resolution: "@backstage/integration@npm:1.20.0"
28882888
dependencies:
@@ -4045,7 +4045,7 @@ __metadata:
40454045
languageName: node
40464046
linkType: hard
40474047

4048-
"@backstage/plugin-scaffolder-common@npm:^1.7.1, @backstage/plugin-scaffolder-common@npm:^1.7.5, @backstage/plugin-scaffolder-common@npm:^1.7.6":
4048+
"@backstage/plugin-scaffolder-common@npm:^1.7.5, @backstage/plugin-scaffolder-common@npm:^1.7.6":
40494049
version: 1.7.6
40504050
resolution: "@backstage/plugin-scaffolder-common@npm:1.7.6"
40514051
dependencies:
@@ -4105,34 +4105,6 @@ __metadata:
41054105
languageName: node
41064106
linkType: hard
41074107

4108-
"@backstage/plugin-scaffolder-node@npm:^0.11.0":
4109-
version: 0.11.2
4110-
resolution: "@backstage/plugin-scaffolder-node@npm:0.11.2"
4111-
dependencies:
4112-
"@backstage/backend-plugin-api": "npm:^1.4.3"
4113-
"@backstage/catalog-model": "npm:^1.7.5"
4114-
"@backstage/errors": "npm:^1.2.7"
4115-
"@backstage/integration": "npm:^1.18.0"
4116-
"@backstage/plugin-permission-common": "npm:^0.9.1"
4117-
"@backstage/plugin-scaffolder-common": "npm:^1.7.1"
4118-
"@backstage/types": "npm:^1.2.2"
4119-
"@isomorphic-git/pgp-plugin": "npm:^0.0.7"
4120-
concat-stream: "npm:^2.0.0"
4121-
fs-extra: "npm:^11.2.0"
4122-
globby: "npm:^11.0.0"
4123-
isomorphic-git: "npm:^1.23.0"
4124-
jsonschema: "npm:^1.5.0"
4125-
lodash: "npm:^4.17.21"
4126-
p-limit: "npm:^3.1.0"
4127-
tar: "npm:^6.1.12"
4128-
winston: "npm:^3.2.1"
4129-
winston-transport: "npm:^4.7.0"
4130-
zod: "npm:^3.22.4"
4131-
zod-to-json-schema: "npm:^3.20.4"
4132-
checksum: 10c0/9564602307fa10270c7ed15e965b9352b26766d0721fff2a608180ff0dbbf4a880c81f09f53b80efe7897cc77197f417e2a4592895c4051fcf2dc491a7b18f4d
4133-
languageName: node
4134-
linkType: hard
4135-
41364108
"@backstage/plugin-scaffolder-node@npm:^0.12.3, @backstage/plugin-scaffolder-node@npm:^0.12.4, @backstage/plugin-scaffolder-node@npm:^0.12.5":
41374109
version: 0.12.5
41384110
resolution: "@backstage/plugin-scaffolder-node@npm:0.12.5"
@@ -12038,7 +12010,7 @@ __metadata:
1203812010
"@backstage/backend-plugin-api": "npm:1.4.2"
1203912011
"@backstage/cli": "npm:^0.34.5"
1204012012
"@backstage/config": "npm:^1.3.6"
12041-
"@backstage/plugin-scaffolder-node": "npm:^0.11.0"
12013+
"@backstage/plugin-scaffolder-node": "npm:^0.12.4"
1204212014
"@backstage/plugin-scaffolder-node-test-utils": "npm:^0.3.5"
1204312015
"@red-hat-developer-hub/backstage-plugin-x2a-common": "workspace:*"
1204412016
languageName: unknown

0 commit comments

Comments
 (0)