Merge branch 'master' into feat-vault-1

codefresh-io · Jan 13, 2025 · 4a86f6d · 4a86f6d
2 parents 5017418 + 4c7c8d1
commit 4a86f6d
Show file tree

Hide file tree

Showing 20 changed files with 465 additions and 59 deletions.
diff --git a/graduated/git-clone/step.yaml b/graduated/git-clone/step.yaml
@@ -3,7 +3,7 @@ version: "1.0"
 metadata:
   name: git-clone
   title: Clone a Git repository
-  version: 1.0.5
+  version: 1.0.6
   isPublic: true
   description: Clone a Git repository with Codefresh's built in Git provider integration.
   sources:
@@ -77,6 +77,10 @@ spec:
           "exclude_blobs": {
               "type": "boolean",
               "description": "(boolean) Filter out all blobs (file contents). The default value is False."
+          },
+          "skip_tags_on_update": {
+              "type": "boolean",
+              "description": "When set, fetch updates without tags to minimize data transfer. If unset, tags are included in the fetch operation. The default value is False."
           }
       }
     }
diff --git a/incubating/argocd-app-status/.gitignore b/incubating/argocd-app-status/.gitignore
@@ -0,0 +1,3 @@
+build
+dist
+argocd_app_status.spec
diff --git a/incubating/argocd-app-status/CHANGELOG.md b/incubating/argocd-app-status/CHANGELOG.md
@@ -1,14 +1,24 @@
 # Changelog
-## [1.1.2] - 2023-09-18
+## [1.1.3] - 2024-11-20
 ### Changed
+* upgrade yarl to 1.17.2
+
+### Fixed
+* CVE-2024-45491 - upgrade libexpat1
+* CVE-2024-45492 - upgrade libexpat1
+* CVE-2024-37371 - upgrade libkrb5
+* CVE-2023-45853 - upgrade zlib1g
+
+## [1.1.2] - 2023-09-18
+
 
 ### Fixed
 - PYSEC-2023-135 - upgrade Python module certifi to 2023.7.22
 - CVE-2019-8457 - upgrade base image to python:3.11.5-slim-bookworm
 
 ## [1.1.1] - 2023-06-03
 ### Changed
-- Upgrade pythpn version to 3.11.3
+- Upgrade python version to 3.11.3
 
 ### Fixed
 - Link for application

diff --git a/incubating/argocd-app-status/Dockerfile b/incubating/argocd-app-status/Dockerfile
@@ -1,7 +1,24 @@
-FROM    python:3.11.5-slim-bookworm
+# stage 1 Build
+# Bookworm is debian based
+FROM    python:3.13.1-slim-bookworm AS builder
 WORKDIR /app
 COPY    requirements.txt requirements.txt
-RUN     pip3 install -r requirements.txt
 COPY    queries queries/
 COPY    argocd_app_status.py argocd_app_status.py
-CMD     [ "python3", "argocd_app_status.py"]
+
+RUN apt-get update && apt-get install -y binutils
+RUN pip3 install -r requirements.txt
+RUN pip3 install pyinstaller
+RUN pyinstaller --strip --onefile argocd_app_status.py
+
+# stage 2 : Prod
+FROM    debian:bookworm-slim
+
+# USER cfuser
+RUN adduser cfuser --home /home/codefresh --shel /bin/sh
+USER cfuser
+
+WORKDIR /app
+COPY    queries queries/
+COPY    --from=builder /app/dist/argocd_app_status argocd_app_status
+ENTRYPOINT ["/app/argocd_app_status"]
diff --git a/incubating/argocd-app-status/requirements.txt b/incubating/argocd-app-status/requirements.txt
@@ -5,10 +5,10 @@ docopt==0.6.2
 gql==3.4.0
 graphql-core==3.2.3
 idna==3.4
-multidict==6.0.4
+multidict==6.1.0
 pipreqs==0.4.13
 requests==2.31.0
 requests-toolbelt==0.10.1
 urllib3==1.26.16
 yarg==0.1.9
-yarl==1.9.2
+yarl==1.17.2
diff --git a/incubating/argocd-app-status/step.yaml b/incubating/argocd-app-status/step.yaml
@@ -1,7 +1,7 @@
 kind: step-type
 metadata:
   name: argocd-app-status
-  version: 1.1.2
+  version: 1.1.3
   isPublic: true
   description: Get Argo CD App status and return its sybc and health status
   sources:
@@ -61,7 +61,7 @@ spec:
         },
         "IMAGE_TAG": {
           "type": "string",
-          "default": "1.1.2",
+          "default": "1.1.3",
           "description": "OPTIONAL - To overwrite the tag to use"
         }
       }
@@ -97,7 +97,7 @@ spec:
       [[- end ]]
       commands:
         - cd /app
-        - python3 argocd_app_status.py
+        - /app/argocd_app_status
   delimiters:
     left: '[['
     right: ']]'
diff --git a/incubating/jira-issue-manager/script/jira_issue_manager.py b/incubating/jira-issue-manager/script/jira_issue_manager.py
@@ -66,8 +66,11 @@ def environment_setup():
     # Logic here to use the regex to grab the jira issue key and assign it to issue
     jira_issue_source_field = StepUtility.getEnvironmentVariable('JIRA_ISSUE_SOURCE_FIELD', env)
     jira_issue_source_field_regex = StepUtility.getEnvironmentVariable('JIRA_ISSUE_SOURCE_FIELD_REGEX', env)
-    ## TODO - Brandon - need to do regex work here
-    issue = jira_issue_source_field
+
+    if jira_issue_source_field_regex:
+        issue = re.match(jira_issue_source_field_regex, jira_issue_source_field).group(0)
+    else:
+        issue = jira_issue_source_field
 
     # Issue fields below
     # Retrieve the project environment variable and add the project to a dict representation

diff --git a/incubating/jira-issue-manager/step.yaml b/incubating/jira-issue-manager/step.yaml
@@ -2,7 +2,7 @@ kind: step-type
 version: '1.0'
 metadata:
   name: jira-issue-manager
-  version: 1.0.11
+  version: 1.0.12
   title: Jira Issue Manager
   isPublic: true
   description: Create, Update, & Validate Jira Issues
@@ -12,6 +12,7 @@ metadata:
   stage: incubating
   maintainers:
     - name: Brandon Phillips
+    - name: Dustin Van Buskirk
   categories:
     - build
   official: true
@@ -245,7 +246,7 @@ spec:
   stepsTemplate: |-
     main:
         name: jira-issue-manager
-        image: quay.io/codefreshplugins/jira-issue-manager:1.0.11
+        image: quay.io/codefreshplugins/jira-issue-manager:1.0.12
         environment:
         [[ range $key, $val := .Arguments ]]
           - '[[ $key ]]=[[ $val ]]'

diff --git a/incubating/newrelic-deployment-marker/step.yaml b/incubating/newrelic-deployment-marker/step.yaml
@@ -2,9 +2,9 @@ version: '1.0'
 kind: step-type
 metadata:
   name: newrelic-deployment-marker
-  version: 1.0.1
+  version: 1.0.2
   isPublic: true
-  description: Createa a new deployment marker in New Relic.
+  description: Create a new deployment marker in New Relic.
   sources:
   - >-
       https://github.com/codefresh-io/steps/tree/master/incubating/newrelic-deployment-marker

diff --git a/incubating/octopusdeploy-create-release/step.yaml b/incubating/octopusdeploy-create-release/step.yaml
@@ -2,7 +2,7 @@ version: "1.0"
 kind: step-type
 metadata:
   name: octopusdeploy-create-release
-  version: 1.0.0
+  version: 1.0.1
   title: Create a release in Octopus Deploy
   isPublic: true
   description: Create a release in Octopus Deploy
@@ -19,7 +19,7 @@ metadata:
   maintainers:
     - name: OctopusDeploy
   examples:
-    - description: Basic usage of the create release step
+    - description: Basic usage of the create release step with API key
       workflow:
         create-release:
           type: octopusdeploy-create-release
@@ -28,7 +28,7 @@ metadata:
             OCTOPUS_URL: "${{OCTOPUS_URL}}"
             OCTOPUS_SPACE: "Spaces 1"
             PROJECT: "Project Name"
-    - description: Complex usage of the create release step
+    - description: Complex usage of the create release step with API key
       workflow:
         create-release:
           type: octopusdeploy-create-release
@@ -47,6 +47,46 @@ metadata:
             RELEASE_NOTES: "This is a release note"
             RELEASE_NOTES_FILE: "/release-notes.txt"
             IGNORE_EXISTING: false
+    - description: Basic usage of the create release step with Octopus access token
+      workflow:
+        login:
+          type: octopusdeploy-login
+          arguments:
+            ID_TOKEN: "${{ID_TOKEN}}"
+            OCTOPUS_URL: "${{OCTOPUS_URL}}"
+            OCTOPUS_SERVICE_ACCOUNT_ID: "${{OCTOPUS_SERVICE_ACCOUNT_ID}}"
+        create-release:
+          type: octopusdeploy-create-release
+          arguments:
+            OCTOPUS_ACCESS_TOKEN: "${{OCTOPUS_ACCESS_TOKEN}}"
+            OCTOPUS_URL: "${{OCTOPUS_URL}}"
+            OCTOPUS_SPACE: "Spaces 1"
+            PROJECT: "Project Name"
+    - description: Complex usage of the create release step with Octopus access token
+      workflow:
+        login:
+          type: octopusdeploy-login
+          arguments:
+            ID_TOKEN: "${{ID_TOKEN}}"
+            OCTOPUS_URL: "${{OCTOPUS_URL}}"
+            OCTOPUS_SERVICE_ACCOUNT_ID: "${{OCTOPUS_SERVICE_ACCOUNT_ID}}"
+        create-release:
+          type: octopusdeploy-create-release
+          arguments:
+            OCTOPUS_ACCESS_TOKEN: "${{OCTOPUS_ACCESS_TOKEN}}"
+            OCTOPUS_URL: "${{OCTOPUS_URL}}"
+            OCTOPUS_SPACE: "Spaces 1"
+            PROJECT: "Project Name"
+            RELEASE_NUMBER: "1.0.0"
+            CHANNEL: "Channel Name"
+            GIT_REF: "refs/heads/main"
+            GIT_COMMIT: "Commit ID"
+            PACKAGE_VERSION: "1.0.0"
+            PACKAGES:
+              - "Package:1.0.0"
+            RELEASE_NOTES: "This is a release note"
+            RELEASE_NOTES_FILE: "/release-notes.txt"
+            IGNORE_EXISTING: false
 spec:
   arguments: |-
     {
@@ -56,19 +96,27 @@ spec:
       "name": "octopusdeploy-create-release",
       "additionalProperties": false,
       "patterns": [],
-      "required": ["OCTOPUS_API_KEY", "OCTOPUS_URL", "OCTOPUS_SPACE", "PROJECT"],
+      "required": ["OCTOPUS_URL", "OCTOPUS_SPACE", "PROJECT"],
+      "oneOf": [
+        {"required": ["OCTOPUS_API_KEY"]},
+        {"required": ["OCTOPUS_ACCESS_TOKEN"]}
+      ],
       "properties": {
         "OCTOPUS_API_KEY": {
           "type": "string",
-          "description": "API key for octopus deploy (required)"
+          "description": "API key for octopus deploy (required when OCTOPUS_ACCESS_TOKEN is not provided)"
+        },
+        "OCTOPUS_ACCESS_TOKEN": {
+          "type": "string",
+          "description": "Access token for octopus deploy (required when OCTOPUS_API_KEY is not provided)"
         },
         "OCTOPUS_URL": {
           "type": "string",
           "description": "URL of the octopus deploy server (required)"
         },
         "OCTOPUS_SPACE": {
           "type": "string",
-          "description": "API key for octopus deploy (required)"  
+          "description": "Workspace for octopus deploy (required)"  
         },
         "PROJECT": {
           "type": "string",
@@ -149,8 +197,13 @@ spec:
           [[- if .Arguments.IGNORE_EXISTING ]] --ignore-existing [[ end ]])
         - cf_export RELEASE=$OUTPUT
       environment:
-        - 'OCTOPUS_URL=[[.Arguments.OCTOPUS_URL]]'
+      [[ if .Arguments.OCTOPUS_API_KEY ]]
         - 'OCTOPUS_API_KEY=[[.Arguments.OCTOPUS_API_KEY]]'
+      [[- end ]]
+      [[ if .Arguments.OCTOPUS_ACCESS_TOKEN ]]
+        - 'OCTOPUS_ACCESS_TOKEN=[[.Arguments.OCTOPUS_ACCESS_TOKEN]]'
+      [[- end ]]
+        - 'OCTOPUS_URL=[[.Arguments.OCTOPUS_URL]]'
         - 'OCTOPUS_SPACE=[[.Arguments.OCTOPUS_SPACE]]'
   delimiters:
     left: "[["