From c5401be4ea9c27af492a08faa60f199fc46f33f3 Mon Sep 17 00:00:00 2001 From: eti-codefresh Date: Mon, 1 Aug 2022 15:11:50 +0300 Subject: [PATCH 1/7] add support for CF_RUNTIME_NAME --- incubating/codefresh-report-image/step.yaml | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/incubating/codefresh-report-image/step.yaml b/incubating/codefresh-report-image/step.yaml index 562a413db..7cba2f141 100644 --- a/incubating/codefresh-report-image/step.yaml +++ b/incubating/codefresh-report-image/step.yaml @@ -29,7 +29,7 @@ metadata: arguments: CF_API_KEY: codefresh-cd-api-token CF_IMAGE: docker.io/${{CF_REPO_OWNER}}/${{CF_REPO_NAME}}:${{CF_REVISION}} - CF_HOST: https://codefresh.mydomain.com + CF_RUNTIME_NAME: codefresh-hosted - description: report-image-metadata-all workflow: ReportImageMetadataAll: @@ -39,7 +39,7 @@ metadata: arguments: CF_API_KEY: codefresh-cd-api-token CF_IMAGE: docker.io/${{CF_REPO_OWNER}}/${{CF_REPO_NAME}}:${{CF_REVISION}} - CF_HOST: https://codefresh.mydomain.com + CF_RUNTIME_NAME: codefresh-hosted CF_ENRICHERS: ${{CF_ENRICHERS}} CF_GITHUB_TOKEN: ${{GITHUB_TOKEN}} CF_GIT_PROVIDER: github @@ -60,8 +60,7 @@ spec: "patterns": [], "required": [ "CF_API_KEY", - "CF_IMAGE", - "CF_HOST" + "CF_IMAGE" ], "properties": { "CF_API_KEY": { @@ -109,6 +108,10 @@ spec: "type": "string", "description": "Codefresh Runtime Ingress URL. (ie. https://codefresh.mycompany.com)" }, + "CF_RUNTIME_NAME": { + "type": "string", + "description": "Name of runtime to implement the enrichment" + }, "CF_JIRA_API_TOKEN": { "type": "string", "description": "When no jira integration is specified: Jira token for authenticating." @@ -186,6 +189,7 @@ spec: environment: - CF_CI_TYPE=classic - CF_WORKFLOW_URL=${{CF_BUILD_URL}} + - CF_WORKFLOW_NAME=${{CF_REPO_OWNER}}/${{CF_PIPELINE_NAME}} [[ range $key, $val := .Arguments ]] - '[[ $key ]]=[[ $val ]]' [[- end ]] From d6bd0375f45cfc133db56733fa05c71e7dd5a04b Mon Sep 17 00:00:00 2001 From: eti-codefresh Date: Wed, 3 Aug 2022 17:26:26 +0300 Subject: [PATCH 2/7] add support for CF_RUNTIME_NAME --- incubating/codefresh-report-image/step.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/incubating/codefresh-report-image/step.yaml b/incubating/codefresh-report-image/step.yaml index 7cba2f141..d34c75c84 100644 --- a/incubating/codefresh-report-image/step.yaml +++ b/incubating/codefresh-report-image/step.yaml @@ -2,7 +2,7 @@ kind: step-type version: '1.0' metadata: name: codefresh-report-image - version: 1.0.2 + version: 1.0.3 isPublic: true description: Report Docker Image Metadata to Codefresh CD sources: @@ -189,7 +189,7 @@ spec: environment: - CF_CI_TYPE=classic - CF_WORKFLOW_URL=${{CF_BUILD_URL}} - - CF_WORKFLOW_NAME=${{CF_REPO_OWNER}}/${{CF_PIPELINE_NAME}} + - CF_WORKFLOW_NAME=${{CF_PIPELINE_NAME}} [[ range $key, $val := .Arguments ]] - '[[ $key ]]=[[ $val ]]' [[- end ]] From 543d4380dbd3690b5c680774eba616c7b55f2719 Mon Sep 17 00:00:00 2001 From: eti-codefresh Date: Mon, 24 Oct 2022 12:20:50 +0300 Subject: [PATCH 3/7] add support for CF_PLATFORM_URL & CF_ISSUE_TRACKING_INTEGRATION --- incubating/codefresh-report-image/step.yaml | 42 ++++++++++++--------- 1 file changed, 25 insertions(+), 17 deletions(-) diff --git a/incubating/codefresh-report-image/step.yaml b/incubating/codefresh-report-image/step.yaml index d34c75c84..824a933da 100644 --- a/incubating/codefresh-report-image/step.yaml +++ b/incubating/codefresh-report-image/step.yaml @@ -2,7 +2,7 @@ kind: step-type version: '1.0' metadata: name: codefresh-report-image - version: 1.0.3 + version: 1.0.4 isPublic: true description: Report Docker Image Metadata to Codefresh CD sources: @@ -40,7 +40,7 @@ metadata: CF_API_KEY: codefresh-cd-api-token CF_IMAGE: docker.io/${{CF_REPO_OWNER}}/${{CF_REPO_NAME}}:${{CF_REVISION}} CF_RUNTIME_NAME: codefresh-hosted - CF_ENRICHERS: ${{CF_ENRICHERS}} + CF_CONTAINER_REGISTRY_INTEGRATION: docker-integration CF_GITHUB_TOKEN: ${{GITHUB_TOKEN}} CF_GIT_PROVIDER: github CF_GIT_REPO: ${{CF_REPO_OWNER}}/${{CF_REPO_NAME}} @@ -65,11 +65,31 @@ spec: "properties": { "CF_API_KEY": { "type": "string", - "description": "API Key from Codefresh CD platform." + "description": "Codefresh API KEY" + }, + "CF_HOST": { + "type": "string", + "description": "Codefresh Runtime Ingress URL. (ie. https://codefresh.mycompany.com)" + }, + "CF_PLATFORM_URL": { + "type": "string", + "description": "Required for integrations in on-premises environments only. The root URL of the codefresh application. If not specified, uses the default value of https://g.codefresh.io." + }, + "CF_RUNTIME_NAME": { + "type": "string", + "description": "Name of runtime to implement the enrichment" + }, + "CF_IMAGE": { + "type": "string", + "description": "Fully qualified image name to be reported to Codefresh CD. (i.e. docker.io/codefresh/example-app:1.0.0)" }, "CF_CONTAINER_REGISTRY_INTEGRATION": { "type": "string", - "description": "Codefresh Gitops Registry integration name." + "description": "Codefresh CD Gitops Registry integration name." + }, + "CF_ISSUE_TRACKING_INTEGRATION": { + "type": "string", + "description": "The issue tracking integration name." }, "CF_DOCKERHUB_PASSWORD": { "type": "string", @@ -81,7 +101,7 @@ spec: }, "CF_ENRICHERS": { "type": "string", - "description": "Comma delimited list of integrations for collecting metadata on the build image/" + "description": "*deprecated* list of integrations separated by commas: Acceptable values are git, jira. ex: 'jira, git'" }, "CF_GIT_BRANCH": { "type": "string", @@ -104,22 +124,10 @@ spec: "type": "string", "description": "Github personal access token. Scope: repo." }, - "CF_HOST": { - "type": "string", - "description": "Codefresh Runtime Ingress URL. (ie. https://codefresh.mycompany.com)" - }, - "CF_RUNTIME_NAME": { - "type": "string", - "description": "Name of runtime to implement the enrichment" - }, "CF_JIRA_API_TOKEN": { "type": "string", "description": "When no jira integration is specified: Jira token for authenticating." }, - "CF_IMAGE": { - "type": "string", - "description": "Fully qualified image name to be reported to Codefresh CD. (i.e. docker.io/codefresh/example-app:1.0.0)" - }, "CF_JIRA_EMAIL": { "type": "string", "description": "When no jira integration is specified: user email for authenticating with jira." From 27e17f97d32406f038d27ec99c121a4c54d1f8e0 Mon Sep 17 00:00:00 2001 From: eti-codefresh Date: Mon, 24 Oct 2022 12:24:36 +0300 Subject: [PATCH 4/7] add support for CF_PLATFORM_URL & CF_ISSUE_TRACKING_INTEGRATION --- incubating/codefresh-report-image/step.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/incubating/codefresh-report-image/step.yaml b/incubating/codefresh-report-image/step.yaml index 824a933da..081211bb9 100644 --- a/incubating/codefresh-report-image/step.yaml +++ b/incubating/codefresh-report-image/step.yaml @@ -204,3 +204,4 @@ spec: delimiters: left: '[[' right: ']]' + From 045d94f66e4058b7ee023ac7fa071d8c7eb1337b Mon Sep 17 00:00:00 2001 From: eti-codefresh Date: Mon, 24 Oct 2022 13:17:59 +0300 Subject: [PATCH 5/7] wip --- incubating/codefresh-report-image/step.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/incubating/codefresh-report-image/step.yaml b/incubating/codefresh-report-image/step.yaml index 824a933da..1384de91b 100644 --- a/incubating/codefresh-report-image/step.yaml +++ b/incubating/codefresh-report-image/step.yaml @@ -109,7 +109,7 @@ spec: }, "CF_GIT_PROVIDER": { "type": "string", - "description": "The git integration type use (i.e. github)" + "description": "The Git provider: Acceptable values are github, gitlab, bitbucket, or bitbucket-server. In case this not provided git credentials will be taken form your runtime git context" }, "CF_GIT_REPO": { "type": "string", From 15e6f1e33e58c5b5ab00d9055eb7cb930d26d07e Mon Sep 17 00:00:00 2001 From: eti-codefresh Date: Thu, 3 Nov 2022 11:57:46 +0200 Subject: [PATCH 6/7] wip --- incubating/codefresh-report-image/step.yaml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/incubating/codefresh-report-image/step.yaml b/incubating/codefresh-report-image/step.yaml index 1384de91b..5d26abad1 100644 --- a/incubating/codefresh-report-image/step.yaml +++ b/incubating/codefresh-report-image/step.yaml @@ -117,8 +117,7 @@ spec: }, "CF_GITHUB_API_URL": { "type": "string", - "description": "Specify github host api url.", - "default": "https://api.github.com" + "description": "Specify github host api url." }, "CF_GITHUB_TOKEN": { "type": "string", From c0fd78fcdacbefe6c330c241f3fbe53cbbc220c4 Mon Sep 17 00:00:00 2001 From: eti-codefresh Date: Thu, 3 Nov 2022 12:00:45 +0200 Subject: [PATCH 7/7] wip --- incubating/codefresh-report-image/step.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/incubating/codefresh-report-image/step.yaml b/incubating/codefresh-report-image/step.yaml index 5d26abad1..cd32051c3 100644 --- a/incubating/codefresh-report-image/step.yaml +++ b/incubating/codefresh-report-image/step.yaml @@ -69,7 +69,7 @@ spec: }, "CF_HOST": { "type": "string", - "description": "Codefresh Runtime Ingress URL. (ie. https://codefresh.mycompany.com)" + "description": "*deprecated* Codefresh Runtime Ingress URL. (ie. https://codefresh.mycompany.com)" }, "CF_PLATFORM_URL": { "type": "string",