From a7b4122c23f0fcf8d9795ad681e74a6b91f45055 Mon Sep 17 00:00:00 2001
From: Chris Kim <chris.kim@octopus.com>
Date: Wed, 18 Sep 2024 17:50:34 +1200
Subject: [PATCH 1/2] Adds create package step

---
 .../create_package.svg                        |   9 ++
 .../octopusdeploy-create-package/step.yaml    | 123 ++++++++++++++++++
 2 files changed, 132 insertions(+)
 create mode 100644 incubating/octopusdeploy-create-package/create_package.svg
 create mode 100644 incubating/octopusdeploy-create-package/step.yaml

diff --git a/incubating/octopusdeploy-create-package/create_package.svg b/incubating/octopusdeploy-create-package/create_package.svg
new file mode 100644
index 000000000..eca5ce70b
--- /dev/null
+++ b/incubating/octopusdeploy-create-package/create_package.svg
@@ -0,0 +1,9 @@
+<svg width="40" height="40" viewBox="0 0 40 40" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M17.1377 16.9007C16.9607 16.9276 16.7797 16.9086 16.6121 16.8453L9.10776 14.0135C8.42499 13.7558 7.69531 14.2604 7.69531 14.9902V27.6893C7.69531 28.0498 7.88137 28.3848 8.18745 28.5754L16.7933 33.9338C16.8469 33.9672 16.9164 33.9286 16.9164 33.8654V33.8654V33.8654C16.9171 33.9398 16.9869 33.9942 17.0592 33.9767L31.9517 30.3763C32.4202 30.263 32.7502 29.8437 32.7502 29.3617V15.7396C32.7502 15.1005 32.1811 14.6115 31.5493 14.7076L17.1377 16.9007Z" fill="#0D80D8"/>
+<path d="M27.3908 7.04262C27.4765 6.93718 27.6157 6.89124 27.7473 6.92498L36.8338 9.25424C37.076 9.31635 37.1756 9.60616 37.0227 9.80407L34.3884 13.2132L31.011 14.6988L23.0078 12.4371L27.3908 7.04262Z" fill="#2FA2FA"/>
+<path d="M5.87655 7.61203C5.82745 7.40468 5.97455 7.2023 6.18692 7.18502L20.4781 6.02178C20.6358 6.00895 20.7822 6.10404 20.8347 6.25325L23.0075 12.4373L7.34904 13.8292L5.87655 7.61203Z" fill="#2FA2FA"/>
+<path d="M11.0039 13.4819L23.0087 12.438L23.3566 16.6136L16.9193 18.3534L11.0039 13.4819Z" fill="#0064BC"/>
+<path d="M23.0078 12.438L26.8354 13.4819L23.0078 14.0038V12.438Z" fill="#0055AD"/>
+<path d="M20.5724 13.6383C20.63 13.564 20.7152 13.5161 20.8086 13.5056L35.7211 11.8301C35.8763 11.8126 35.9741 11.9927 35.8749 12.1134L32.7504 15.9175L16.918 18.3533L20.5724 13.6383Z" fill="#2194EC"/>
+<path d="M3.57266 10.9011C3.43818 10.7716 3.57436 10.55 3.75065 10.6115L10.4212 12.9384C10.4609 12.9522 10.4978 12.9732 10.53 13.0002L16.9186 18.3528L7.69752 14.8731L3.57266 10.9011Z" fill="#2485DD"/>
+</svg>
diff --git a/incubating/octopusdeploy-create-package/step.yaml b/incubating/octopusdeploy-create-package/step.yaml
new file mode 100644
index 000000000..da5892d03
--- /dev/null
+++ b/incubating/octopusdeploy-create-package/step.yaml
@@ -0,0 +1,123 @@
+version: "1.0"
+kind: step-type
+metadata:
+  name: octopusdeploy-create-package
+  version: 1.0.0
+  title: Create a package
+  isPublic: true
+  description: Creates a zip package in the format expected by Octopus Deploy
+  sources:
+    - "https://github.com/codefresh-io/steps/tree/master/incubating/octopusdeploy-create-package"
+  stage: incubating
+  official: true
+  categories:
+    - utility
+  icon:
+    type: svg
+    url: "https://cdn.jsdelivr.net/gh/codefresh-io/steps/incubating/octopusdeploy-create-package/create_package.svg"
+    background: "#F4F6F8"
+  maintainers:
+    - name: OctopusDeploy
+  examples:
+    - description: Package the current working directory
+      workflow:
+        create-package:
+          type: octopusdeploy-create-package
+          arguments:
+            ID: "SomePackage"
+            VERSION: "1.0.0"
+    - description: Complex usage
+      workflow:
+        create-package:
+          type: octopusdeploy-create-package
+          arguments:
+            ID: "SomePackage"
+            VERSION: "1.0.0"
+            BASE_PATH: "/codefresh/volume"
+            OUT_FOLDER: "/codefresh/volume"
+            INCLUDE:
+              - "*.html"
+              - "*.css"
+spec:
+  arguments: |-
+    {
+      "definitions": {},
+      "$schema": "http://json-schema.org/draft-07/schema#",
+      "type": "object",
+      "name": "octopusdeploy-create-package",
+      "additionalProperties": false,
+      "patterns": [],
+      "required": ["ID", "VERSION"],
+      "properties": {
+        "ID": {
+          "type": "string",
+          "description": "The ID of the package. (required)"
+        },
+        "VERSION": {
+          "type": "string",
+          "description": "The version of the package, must be a valid SemVer. (required)"
+        },
+        "BASE_PATH": {
+          "type": "string",
+          "description": "Root folder containing the contents to zip. (optional)"
+        },
+        "OUT_FOLDER": {
+          "type": "string",
+          "description": "Folder into which the zip file will be written. (optional)"
+        },
+        "INCLUDE": {
+          "type": "array",
+          "items": {
+            "type": "string"
+          },
+          "description": "Add a file pattern to include, relative to the base path e.g. /bin/*.dll; defaults to '**'. (optional)"
+        },
+        "OVERWRITE": {
+          "type": "boolean",
+          "description": "Allow an existing package file of the same ID/version to be overwritten. (optional)"
+        }
+      }
+    }
+  returns: |-
+    {
+      "definitions": {},
+      "$schema": "http://json-schema.org/draft-07/schema#",
+      "type": "object",
+      "additionalProperties": true,
+      "patterns": [],
+      "required": [
+        "FILE"
+      ],
+      "properties": {
+        "FILE": {
+          "additionalProperties": true,
+          "type": "object",
+          "description": "The zip file that was created",
+          "properties": {
+            "Path": {
+              "type": "string",
+              "description": "The path to the zip file"
+            }
+          }
+        }
+      }
+    }
+  stepsTemplate: |-
+    create-package:
+      name: octopusdeploy-create-package
+      image: octopuslabs/octopus-cli
+      tag: latest
+      commands:
+        - OUTPUT=$(octopus package zip create 
+          --id "[[ .Arguments.ID ]]"
+          --version "[[ .Arguments.VERSION ]]"
+          [[- if .Arguments.BASE_PATH ]] --base-path "[[ .Arguments.BASE_PATH ]]" [[ end ]]
+          [[- if .Arguments.OUT_FOLDER ]] --out-folder "[[ .Arguments.OUT_FOLDER ]]" [[ end ]]
+          [[- range $val := .Arguments.INCLUDE ]] --include "[[ $val ]]" [[ end ]]
+          [[- if .Arguments.OVERWRITE ]] --overwrite [[ end ]]
+          --output-format json 
+          --no-prompt)
+        - cf_export FILE=$OUTPUT
+  delimiters:
+    left: "[["
+    right: "]]"

From 60ab651fbf30d1a4925e3602d30d9c9afdff8fe9 Mon Sep 17 00:00:00 2001
From: Bec Callow <bec.callow@octopus.com>
Date: Mon, 23 Sep 2024 11:11:51 +1000
Subject: [PATCH 2/2] Change output format to string

---
 .../octopusdeploy-create-package/step.yaml    | 20 ++++++-------------
 1 file changed, 6 insertions(+), 14 deletions(-)

diff --git a/incubating/octopusdeploy-create-package/step.yaml b/incubating/octopusdeploy-create-package/step.yaml
index da5892d03..9de9cf7ab 100644
--- a/incubating/octopusdeploy-create-package/step.yaml
+++ b/incubating/octopusdeploy-create-package/step.yaml
@@ -83,22 +83,14 @@ spec:
       "definitions": {},
       "$schema": "http://json-schema.org/draft-07/schema#",
       "type": "object",
-      "additionalProperties": true,
       "patterns": [],
       "required": [
-        "FILE"
+        "PATH"
       ],
       "properties": {
-        "FILE": {
-          "additionalProperties": true,
-          "type": "object",
-          "description": "The zip file that was created",
-          "properties": {
-            "Path": {
-              "type": "string",
-              "description": "The path to the zip file"
-            }
-          }
+        "PATH": {
+          "type": "string",
+          "description": "The zip file path that was created"
         }
       }
     }
@@ -115,9 +107,9 @@ spec:
           [[- if .Arguments.OUT_FOLDER ]] --out-folder "[[ .Arguments.OUT_FOLDER ]]" [[ end ]]
           [[- range $val := .Arguments.INCLUDE ]] --include "[[ $val ]]" [[ end ]]
           [[- if .Arguments.OVERWRITE ]] --overwrite [[ end ]]
-          --output-format json 
+          --output-format basic 
           --no-prompt)
-        - cf_export FILE=$OUTPUT
+        - cf_export PATH="$OUTPUT"
   delimiters:
     left: "[["
     right: "]]"