From 11e0767761a97b97663b7660d713624cfa18506e Mon Sep 17 00:00:00 2001 From: Emmanuel Auffray Date: Fri, 26 Jan 2024 10:42:22 +1300 Subject: [PATCH 1/5] Update template.examples.ts, typo fix on skeleton small typo fix Signed-off-by: Emmanuel Auffray --- .../src/scaffolder/actions/builtin/fetch/template.examples.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/fetch/template.examples.ts b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/fetch/template.examples.ts index 4c4628e715..1e2212b4ee 100644 --- a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/fetch/template.examples.ts +++ b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/fetch/template.examples.ts @@ -20,7 +20,7 @@ import yaml from 'yaml'; export const examples: TemplateExample[] = [ { description: - 'Downloads a skelaton directory that lives alongside the template file and fill it out with values.', + 'Downloads a skeleton directory that lives alongside the template file and fill it out with values.', example: yaml.stringify({ steps: [ { From 09f8b31f7ab7a881a9b8722fe95d4b8735ee2f54 Mon Sep 17 00:00:00 2001 From: Emmanuel Auffray Date: Fri, 26 Jan 2024 11:14:27 +0000 Subject: [PATCH 2/5] addi changeset Signed-off-by: Emmanuel Auffray --- .changeset/dry-vans-kiss.md | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 .changeset/dry-vans-kiss.md diff --git a/.changeset/dry-vans-kiss.md b/.changeset/dry-vans-kiss.md new file mode 100644 index 0000000000..96799240f9 --- /dev/null +++ b/.changeset/dry-vans-kiss.md @@ -0,0 +1,5 @@ +--- +'@backstage/plugin-scaffolder-backend': patch +--- + +simple typo fix From 347a2b764288c5f12869c48060cd81a0f3dce27d Mon Sep 17 00:00:00 2001 From: Emmanuel Auffray Date: Fri, 26 Jan 2024 11:14:27 +0000 Subject: [PATCH 3/5] amend lazy changeset description Signed-off-by: Emmanuel Auffray --- .changeset/dry-vans-kiss.md | 2 +- .devcontainer/devcontainer.json | 97 +++++++++++++++++++++++++++++++++ 2 files changed, 98 insertions(+), 1 deletion(-) create mode 100644 .devcontainer/devcontainer.json diff --git a/.changeset/dry-vans-kiss.md b/.changeset/dry-vans-kiss.md index 96799240f9..5838516b5e 100644 --- a/.changeset/dry-vans-kiss.md +++ b/.changeset/dry-vans-kiss.md @@ -2,4 +2,4 @@ '@backstage/plugin-scaffolder-backend': patch --- -simple typo fix +Simple typo fix in the the fetch:template action example on the word skeleton diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json new file mode 100644 index 0000000000..322317e382 --- /dev/null +++ b/.devcontainer/devcontainer.json @@ -0,0 +1,97 @@ +// For format details, see https://aka.ms/devcontainer.json. For config options, see the +// README at: https://github.com/devcontainers/templates/tree/main/src/typescript-node +{ + "name": "Node.js & TypeScript", + // Or use a Dockerfile or Docker Compose file. More info: https://containers.dev/guide/dockerfile + "image": "mcr.microsoft.com/devcontainers/typescript-node:1-18-bookworm", + // "build": { + // "dockerfile": "Dockerfile" + // }, + "mounts": [ + // {"source":"${localWorkspaceFolder}","target":"/workspace","type":"bind"}, + { + "source": "${localEnv:HOME}/.ssh", + "target": "/home/node/.ssh", + "type": "bind" + }, + { + "source": "${localEnv:HOME}/.kube", + "target": "/usr/local/share/kube-localhost", + "type": "bind" + }, + { + "source": "${localEnv:HOME}/.azure", + "target": "/home/node/.azure", + "type": "bind" + } + ], + + // "remoteEnv": { + // "SYNC_LOCALHOST_KUBECONFIG": "true" + // }, + + "customizations": { + "vscode": { + "extensions": [ + "GitHub.copilot", + "GitHub.copilot-chat", + "GitHub.vscode-pull-request-github", + "github.vscode-github-actions", + "Intility.vscode-backstage", + "ms-azuretools.vscode-docker", + "ms-kubernetes-tools.kind-vscode", + "ms-kubernetes-tools.vscode-kubernetes-tools", + "humao.rest-client" + ] + } + }, + + // Features to add to the dev container. More info: https://containers.dev/features. + "features": { + // Azure CLI + // "ghcr.io/devcontainers/features/azure-cli:1": { + // "installBicep": true, + // "version": "latest" + // }, + // // Docker CLI accessing the host's Docker daemon + // "ghcr.io/devcontainers/features/docker-outside-of-docker:1": { + // "moby": true, + // "installDockerBuildx": true, + // "version": "latest", + // "dockerDashComposeVersion": "v2" + // }, + // // Kubernetes CLI tools + // "ghcr.io/devcontainers/features/kubectl-helm-minikube:1": { + // "version": "latest", + // "helm": "latest", + // "minikube": "none" + // }, + // // KinD + // "ghcr.io/devcontainers-contrib/features/kind:1": { + // "version": "latest" + // }, + // "ghcr.io/rio/features/k9s:1": {}, + // "ghcr.io/devcontainers/features/azure-cli:1": { + // "version": "latest" + // }, + // "ghcr.io/rjfmachado/devcontainer-features/cloud-native:1": { + // "kubectl": "latest", + // "helm": "latest", + // "kubelogin": "latest", + // "azwi": "latest", + // "flux": "latest", + // "cilium": "latest" + // } + } + // Use 'forwardPorts' to make a list of ports inside the container available locally. + // "forwardPorts": [], + + // Use 'postCreateCommand' to run commands after the container is created. + // "postCreateCommand": "yarn install", + + // Configure tool-specific properties. + // "customizations": {}, + + // Uncomment to connect as root instead. More info: https://aka.ms/dev-containers-non-root. + // "remoteUser": "root" +} From 25ab4aaf181dc22ec934141b5ab3c68529cfb989 Mon Sep 17 00:00:00 2001 From: Emmanuel Auffray Date: Fri, 26 Jan 2024 11:14:27 +0000 Subject: [PATCH 4/5] refine changeset and signoff Signed-off-by: Emmanuel Auffray --- .changeset/dry-vans-kiss.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.changeset/dry-vans-kiss.md b/.changeset/dry-vans-kiss.md index 5838516b5e..031f31e912 100644 --- a/.changeset/dry-vans-kiss.md +++ b/.changeset/dry-vans-kiss.md @@ -2,4 +2,4 @@ '@backstage/plugin-scaffolder-backend': patch --- -Simple typo fix in the the fetch:template action example on the word skeleton +Simple typo fix in the the fetch:template action example on the word 'skeleton'. From 0504b78251e235405933aec1e1642fe931583127 Mon Sep 17 00:00:00 2001 From: Emmanuel Auffray Date: Fri, 26 Jan 2024 20:28:54 +0000 Subject: [PATCH 5/5] Cleanup my own typo and remove devcontainer Signed-off-by: Emmanuel Auffray --- .changeset/dry-vans-kiss.md | 2 +- .devcontainer/devcontainer.json | 97 --------------------------------- 2 files changed, 1 insertion(+), 98 deletions(-) delete mode 100644 .devcontainer/devcontainer.json diff --git a/.changeset/dry-vans-kiss.md b/.changeset/dry-vans-kiss.md index 031f31e912..5d11df989c 100644 --- a/.changeset/dry-vans-kiss.md +++ b/.changeset/dry-vans-kiss.md @@ -2,4 +2,4 @@ '@backstage/plugin-scaffolder-backend': patch --- -Simple typo fix in the the fetch:template action example on the word 'skeleton'. +Simple typo fix in the fetch:template action example on the word 'skeleton'. diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json deleted file mode 100644 index 322317e382..0000000000 --- a/.devcontainer/devcontainer.json +++ /dev/null @@ -1,97 +0,0 @@ -// For format details, see https://aka.ms/devcontainer.json. For config options, see the -// README at: https://github.com/devcontainers/templates/tree/main/src/typescript-node -{ - "name": "Node.js & TypeScript", - // Or use a Dockerfile or Docker Compose file. More info: https://containers.dev/guide/dockerfile - "image": "mcr.microsoft.com/devcontainers/typescript-node:1-18-bookworm", - // "build": { - // "dockerfile": "Dockerfile" - // }, - "mounts": [ - // {"source":"${localWorkspaceFolder}","target":"/workspace","type":"bind"}, - { - "source": "${localEnv:HOME}/.ssh", - "target": "/home/node/.ssh", - "type": "bind" - }, - { - "source": "${localEnv:HOME}/.kube", - "target": "/usr/local/share/kube-localhost", - "type": "bind" - }, - { - "source": "${localEnv:HOME}/.azure", - "target": "/home/node/.azure", - "type": "bind" - } - ], - - // "remoteEnv": { - // "SYNC_LOCALHOST_KUBECONFIG": "true" - // }, - - "customizations": { - "vscode": { - "extensions": [ - "GitHub.copilot", - "GitHub.copilot-chat", - "GitHub.vscode-pull-request-github", - "github.vscode-github-actions", - "Intility.vscode-backstage", - "ms-azuretools.vscode-docker", - "ms-kubernetes-tools.kind-vscode", - "ms-kubernetes-tools.vscode-kubernetes-tools", - "humao.rest-client" - ] - } - }, - - // Features to add to the dev container. More info: https://containers.dev/features. - "features": { - // Azure CLI - // "ghcr.io/devcontainers/features/azure-cli:1": { - // "installBicep": true, - // "version": "latest" - // }, - // // Docker CLI accessing the host's Docker daemon - // "ghcr.io/devcontainers/features/docker-outside-of-docker:1": { - // "moby": true, - // "installDockerBuildx": true, - // "version": "latest", - // "dockerDashComposeVersion": "v2" - // }, - // // Kubernetes CLI tools - // "ghcr.io/devcontainers/features/kubectl-helm-minikube:1": { - // "version": "latest", - // "helm": "latest", - // "minikube": "none" - // }, - // // KinD - // "ghcr.io/devcontainers-contrib/features/kind:1": { - // "version": "latest" - // }, - // "ghcr.io/rio/features/k9s:1": {}, - // "ghcr.io/devcontainers/features/azure-cli:1": { - // "version": "latest" - // }, - // "ghcr.io/rjfmachado/devcontainer-features/cloud-native:1": { - // "kubectl": "latest", - // "helm": "latest", - // "kubelogin": "latest", - // "azwi": "latest", - // "flux": "latest", - // "cilium": "latest" - // } - } - // Use 'forwardPorts' to make a list of ports inside the container available locally. - // "forwardPorts": [], - - // Use 'postCreateCommand' to run commands after the container is created. - // "postCreateCommand": "yarn install", - - // Configure tool-specific properties. - // "customizations": {}, - - // Uncomment to connect as root instead. More info: https://aka.ms/dev-containers-non-root. - // "remoteUser": "root" -}