From c468dc9be45b67e2f45955a86692f22f55692059 Mon Sep 17 00:00:00 2001 From: Evan Shortiss Date: Mon, 23 Feb 2026 13:50:08 -0800 Subject: [PATCH 1/3] refactor: remove double escaping for after-replace logic Replace {{ '${{ ... }}' }} patterns with ${{ ... }} since the gitlab init playbook now uses ansible.builtin.replace instead of builtin.template. Placeholders like {{ gitlab_host }} are retained for the replace job. Co-Authored-By: Claude Opus 4.6 --- template.yaml | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/template.yaml b/template.yaml index b728565..b29d7ca 100644 --- a/template.yaml +++ b/template.yaml @@ -135,20 +135,20 @@ spec: targetPath: ./patch values: applicationType: "API" - component_id: {{ '${{ parameters.componentName }}' }} - componentName: {{ '${{ parameters.componentName }}' }} - componentLifecycle: {{ '${{ parameters.componentLifecycle }}' }} - description: {{ '${{ parameters.description }}' }} + component_id: ${{ parameters.componentName }} + componentName: ${{ parameters.componentName }} + componentLifecycle: ${{ parameters.componentLifecycle }} + description: ${{ parameters.description }} destination: {{ '"${{ parameters.gitlabHost }}/${{ parameters.gitlabOrganization }}/${{ parameters.repositoryName }}"' }} - host: {{ '${{ parameters.gitlabHost }}' }} - owner: {{ '${{ parameters.componentOwner }}' }} - orgName: {{ '${{ parameters.gitlabOrganization }}' }} - repoName: {{ '${{ parameters.repositoryName }}' }} - system: {{ '${{ parameters.system }}' }} - apiType: {{ '${{ parameters.apiType }}' }} - apiPathText: {{ '${{ parameters.apiPathText }}' }} - allLocationGitlabOrganization: {{ '${{ parameters.allLocationGitlabOrganization }}' }} - allLocationRepositoryName: {{ '${{ parameters.allLocationRepositoryName }}' }} + host: ${{ parameters.gitlabHost }} + owner: ${{ parameters.componentOwner }} + orgName: ${{ parameters.gitlabOrganization }} + repoName: ${{ parameters.repositoryName }} + system: ${{ parameters.system }} + apiType: ${{ parameters.apiType }} + apiPathText: ${{ parameters.apiPathText }} + allLocationGitlabOrganization: ${{ parameters.allLocationGitlabOrganization }} + allLocationRepositoryName: ${{ parameters.allLocationRepositoryName }} # Merge catalog-info and techdocs into EXISTING repo - only EXISTING REPO - id: publishComponentMergeRequest @@ -165,5 +165,5 @@ spec: removeSourceBranch: true output: links: - - url: {{ '${{ steps.publishComponentMergeRequest.output.mergeRequestUrl }}' }} + - url: ${{ steps.publishComponentMergeRequest.output.mergeRequestUrl }} title: 'Component merge request' From f996062968e21e1fa485e1c707a11b817784bcc1 Mon Sep 17 00:00:00 2001 From: Evan Shortiss Date: Tue, 24 Feb 2026 12:33:32 -0800 Subject: [PATCH 2/3] fix: additional braces --- template.yaml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/template.yaml b/template.yaml index b29d7ca..a042c53 100644 --- a/template.yaml +++ b/template.yaml @@ -123,7 +123,7 @@ spec: action: fetch:template targetPath: ../. input: - url: {{ 'https://${{ parameters.gitlabHost }}/${{ parameters.gitlabOrganization }}/${{ parameters.allLocationRepositoryName }}' }} + url: 'https://${{ parameters.gitlabHost }}/${{ parameters.gitlabOrganization }}/${{ parameters.allLocationRepositoryName }}' # Step1: Create catalog-info file for the component @@ -139,7 +139,7 @@ spec: componentName: ${{ parameters.componentName }} componentLifecycle: ${{ parameters.componentLifecycle }} description: ${{ parameters.description }} - destination: {{ '"${{ parameters.gitlabHost }}/${{ parameters.gitlabOrganization }}/${{ parameters.repositoryName }}"' }} + destination: '"${{ parameters.gitlabHost }}/${{ parameters.gitlabOrganization }}/${{ parameters.repositoryName }}"' host: ${{ parameters.gitlabHost }} owner: ${{ parameters.componentOwner }} orgName: ${{ parameters.gitlabOrganization }} @@ -155,12 +155,12 @@ spec: name: Open PR with for all-catalog action: publish:gitlab:merge-request input: - repoUrl: {{ '"${{ parameters.gitlabHost }}?repo=${{ parameters.allLocationRepositoryName }}&owner=${{ parameters.gitlabOrganization }}"' }} + repoUrl: '"${{ parameters.gitlabHost }}?repo=${{ parameters.allLocationRepositoryName }}&owner=${{ parameters.gitlabOrganization }}"' title: Open PR with catalog-info.yaml description: Open PR with catalog-info.yaml - branchName: {{ '"${{ parameters.componentName }}-create"' }} + branchName: '"${{ parameters.componentName }}-create"' sourcePath: ./patch - targetPath: {{ '"./${{ parameters.repositoryName }}"' }} + targetPath: '"./${{ parameters.repositoryName }}"' commitAction: create removeSourceBranch: true output: From 488051f28f6b77f07e8d0ee038872210c92c3799 Mon Sep 17 00:00:00 2001 From: Evan Shortiss Date: Tue, 24 Feb 2026 12:38:30 -0800 Subject: [PATCH 3/3] fix: remove extra quotes/chars --- template.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/template.yaml b/template.yaml index a042c53..a438377 100644 --- a/template.yaml +++ b/template.yaml @@ -139,7 +139,7 @@ spec: componentName: ${{ parameters.componentName }} componentLifecycle: ${{ parameters.componentLifecycle }} description: ${{ parameters.description }} - destination: '"${{ parameters.gitlabHost }}/${{ parameters.gitlabOrganization }}/${{ parameters.repositoryName }}"' + destination: "${{ parameters.gitlabHost }}/${{ parameters.gitlabOrganization }}/${{ parameters.repositoryName }}" host: ${{ parameters.gitlabHost }} owner: ${{ parameters.componentOwner }} orgName: ${{ parameters.gitlabOrganization }} @@ -155,12 +155,12 @@ spec: name: Open PR with for all-catalog action: publish:gitlab:merge-request input: - repoUrl: '"${{ parameters.gitlabHost }}?repo=${{ parameters.allLocationRepositoryName }}&owner=${{ parameters.gitlabOrganization }}"' + repoUrl: "${{ parameters.gitlabHost }}?repo=${{ parameters.allLocationRepositoryName }}&owner=${{ parameters.gitlabOrganization }}" title: Open PR with catalog-info.yaml description: Open PR with catalog-info.yaml - branchName: '"${{ parameters.componentName }}-create"' + branchName: "${{ parameters.componentName }}-create" sourcePath: ./patch - targetPath: '"./${{ parameters.repositoryName }}"' + targetPath: "./${{ parameters.repositoryName }}" commitAction: create removeSourceBranch: true output: