From 1e9e7f3fd5f6a619b2f440b6d92b870bdab7374e Mon Sep 17 00:00:00 2001
From: bec-callow-oct <bec.callow@octopus.com>
Date: Mon, 4 Nov 2024 19:00:55 +1000
Subject: [PATCH] Add Octopus login step (#711)

* Add Octopus login step

* Allow access key auth for create-release

* Allow access key auth for deploy-release

* Allow access key auth for deploy-release-tenanted

* Allow access key auth for push-build-information

* Allow access key auth for push-package

* Allow access key auth for run-runbook

* Add login step to workflow examples
---
 .../octopusdeploy-create-release/step.yaml    | 67 +++++++++++++--
 .../step.yaml                                 | 71 ++++++++++++++--
 .../octopusdeploy-deploy-release/step.yaml    | 49 +++++++++--
 incubating/octopusdeploy-login/login.svg      |  7 ++
 incubating/octopusdeploy-login/step.yaml      | 83 +++++++++++++++++++
 .../step.yaml                                 | 45 ++++++++--
 .../octopusdeploy-push-package/step.yaml      | 43 ++++++++--
 .../octopusdeploy-run-runbook/step.yaml       | 72 ++++++++++++++--
 8 files changed, 398 insertions(+), 39 deletions(-)
 create mode 100644 incubating/octopusdeploy-login/login.svg
 create mode 100644 incubating/octopusdeploy-login/step.yaml

diff --git a/incubating/octopusdeploy-create-release/step.yaml b/incubating/octopusdeploy-create-release/step.yaml
index 43142edc..de3bb9c5 100644
--- 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,11 +96,19 @@ 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",
@@ -68,7 +116,7 @@ spec:
         },
         "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: "[["
diff --git a/incubating/octopusdeploy-deploy-release-tenanted/step.yaml b/incubating/octopusdeploy-deploy-release-tenanted/step.yaml
index 416c8d91..b292d46f 100644
--- a/incubating/octopusdeploy-deploy-release-tenanted/step.yaml
+++ b/incubating/octopusdeploy-deploy-release-tenanted/step.yaml
@@ -2,7 +2,7 @@ version: "1.0"
 kind: step-type
 metadata:
   name: octopusdeploy-deploy-release-tenanted
-  version: 1.0.1
+  version: 1.0.2
   title: Deploy a tenanted release in Octopus Deploy
   isPublic: true
   description: Deploy a tenanted release in Octopus Deploy
@@ -19,7 +19,7 @@ metadata:
   maintainers:
     - name: OctopusDeploy
   examples:
-    - description: "Deploy using tenant name"
+    - description: "Deploy using tenant name and API key"
       workflow:
         deploy-release-tenanted:
           type: octopusdeploy-deploy-release-tenanted
@@ -37,7 +37,7 @@ metadata:
               - "prompted-variable1:prompted-value1"
               - "prompted-variable2:prompted-value2"
             USE_GUIDED_FAILURE: "false"
-    - description: "Deploy using tenant tags"
+    - description: "Deploy using tenant tags and API key"
       workflow:
         deploy-release-tenanted:
           type: octopusdeploy-deploy-release-tenanted
@@ -51,6 +51,50 @@ metadata:
             TENANT_TAGS:
               - "tagSetA/someTagB"
               - "tagSetC/someTagD"
+    - description: "Deploy using tenant name and 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}}"
+        deploy-release-tenanted:
+          type: octopusdeploy-deploy-release-tenanted
+          arguments:
+            OCTOPUS_ACCESS_TOKEN: "${{OCTOPUS_ACCESS_TOKEN}}"
+            OCTOPUS_URL: "${{OCTOPUS_URL}}"
+            OCTOPUS_SPACE: "Spaces-1"
+            PROJECT: "Project Name"
+            RELEASE_NUMBER: "1.0.0"
+            ENVIRONMENT: "Production"
+            TENANTS:
+              - "Tenant1"
+              - "Tenant2"
+            VARIABLES:
+              - "prompted-variable1:prompted-value1"
+              - "prompted-variable2:prompted-value2"
+            USE_GUIDED_FAILURE: "false"
+    - description: "Deploy using tenant tags and 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}}"
+        deploy-release-tenanted:
+          type: octopusdeploy-deploy-release-tenanted
+          arguments:
+            OCTOPUS_ACCESS_TOKEN: "${{OCTOPUS_ACCESS_TOKEN}}"
+            OCTOPUS_URL: "${{OCTOPUS_URL}}"
+            OCTOPUS_SPACE: "Spaces-1"
+            PROJECT: "Another Project Name"
+            RELEASE_NUMBER: "2.0.0"
+            ENVIRONMENT: "Development"
+            TENANT_TAGS:
+              - "tagSetA/someTagB"
+              - "tagSetC/someTagD"
 spec:
   arguments: |-
     {
@@ -60,11 +104,19 @@ spec:
       "name": "octopusdeploy-deploy-release-tenanted",
       "additionalProperties": false,
       "patterns": [],
-      "required": ["OCTOPUS_API_KEY", "OCTOPUS_URL", "OCTOPUS_SPACE", "PROJECT", "RELEASE_NUMBER", "ENVIRONMENT"],
+      "required": ["OCTOPUS_URL", "OCTOPUS_SPACE", "PROJECT", "RELEASE_NUMBER", "ENVIRONMENT"],
+      "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",
@@ -72,7 +124,7 @@ spec:
         },
         "OCTOPUS_SPACE": {
           "type": "string",
-          "description": "API key for octopus deploy (required)"  
+          "description": "Workspace for octopus deploy (required)"  
         },
         "PROJECT": {
           "type": "string",
@@ -154,8 +206,13 @@ spec:
       name: octopusdeploy-deploy-release-tenanted
       image: octopuslabs/octopus-cli
       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]]'
       commands:
         - OUTPUT=$(octopus release deploy 
diff --git a/incubating/octopusdeploy-deploy-release/step.yaml b/incubating/octopusdeploy-deploy-release/step.yaml
index 205e7fea..91b66cdd 100644
--- a/incubating/octopusdeploy-deploy-release/step.yaml
+++ b/incubating/octopusdeploy-deploy-release/step.yaml
@@ -2,7 +2,7 @@ version: "1.0"
 kind: step-type
 metadata:
   name: octopusdeploy-deploy-release
-  version: 1.0.0
+  version: 1.0.1
   title: Deploy a release in Octopus Deploy
   isPublic: true
   description: Deploy a release in Octopus Deploy
@@ -19,7 +19,8 @@ metadata:
   maintainers:
     - name: OctopusDeploy
   examples:
-    - workflow:
+    - description: Usage of the deploy release with API key
+      workflow:
         deploy-release:
           type: octopusdeploy-deploy-release
           arguments:
@@ -35,6 +36,29 @@ metadata:
               - "prompted-variable1:prompted-value1"
               - "prompted-variable2:prompted-value2"
             USE_GUIDED_FAILURE: "false"
+    - description: Usage of the deploy release 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}}"
+        deploy-release:
+          type: octopusdeploy-deploy-release
+          arguments:
+            OCTOPUS_ACCESS_TOKEN: "${{OCTOPUS_ACCESS_TOKEN}}"
+            OCTOPUS_URL: "${{OCTOPUS_URL}}"
+            OCTOPUS_SPACE: "Spaces-1"
+            PROJECT: "Project Name"
+            RELEASE_NUMBER: "1.0.0"
+            ENVIRONMENTS:
+              - "Development"
+              - "Production"
+            VARIABLES:
+              - "prompted-variable1:prompted-value1"
+              - "prompted-variable2:prompted-value2"
+            USE_GUIDED_FAILURE: "false"
 spec:
   arguments: |-
     {
@@ -44,11 +68,19 @@ spec:
       "name": "octopusdeploy-deploy-release",
       "additionalProperties": false,
       "patterns": [],
-      "required": ["OCTOPUS_API_KEY", "OCTOPUS_URL", "OCTOPUS_SPACE", "PROJECT", "RELEASE_NUMBER", "ENVIRONMENTS"],
+      "required": ["OCTOPUS_URL", "OCTOPUS_SPACE", "PROJECT", "RELEASE_NUMBER", "ENVIRONMENTS"],
+      "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",
@@ -56,7 +88,7 @@ spec:
         },
         "OCTOPUS_SPACE": {
           "type": "string",
-          "description": "API key for octopus deploy (required)"  
+          "description": "Workspace for octopus deploy (required)"  
         },
         "PROJECT": {
           "type": "string",
@@ -127,8 +159,13 @@ spec:
       name: octopusdeploy-deploy-release
       image: octopuslabs/octopus-cli
       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]]'
       commands:
         - OUTPUT=$(octopus release deploy 
diff --git a/incubating/octopusdeploy-login/login.svg b/incubating/octopusdeploy-login/login.svg
new file mode 100644
index 00000000..5cf4648d
--- /dev/null
+++ b/incubating/octopusdeploy-login/login.svg
@@ -0,0 +1,7 @@
+<svg width="40" height="40" viewBox="0 0 40 40" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M30.9149 26.325H9.81462C6.81106 26.325 4.37695 23.8897 4.37695 20.8861C4.37695 17.8818 6.81145 15.4473 9.81462 15.4473H30.9149C33.9185 15.4473 36.3526 17.8826 36.3526 20.8861C36.3534 23.8897 33.9185 26.325 30.9149 26.325Z" fill="#0F61A5"/>
+<path d="M30.9176 26.703H9.8173C6.60932 26.703 4 24.0929 4 20.8845C4 17.6761 6.60932 15.0664 9.8173 15.0664H30.9176C34.1248 15.0664 36.7349 17.6761 36.7349 20.8845C36.7349 24.0929 34.1248 26.703 30.9176 26.703ZM9.8173 15.8237C7.02684 15.8237 4.7573 18.0936 4.7573 20.8845C4.7573 23.6753 7.02684 25.9453 9.8173 25.9453H30.9176C33.7077 25.9453 35.9776 23.6753 35.9776 20.8845C35.9776 18.0936 33.7077 15.8237 30.9176 15.8237H9.8173Z" fill="#142839"/>
+<path d="M30.562 24.7317H10.1721C7.20878 24.7317 4.80664 22.3291 4.80664 19.3654C4.80664 16.4025 7.20878 14 10.1721 14H30.562C33.525 14 35.9271 16.4025 35.9271 19.3662C35.9271 22.3291 33.525 24.7317 30.562 24.7317Z" fill="#0D80D8"/>
+<path d="M11.4641 21.1851V17.2916H12.2872V20.5064H13.9564V21.1851H11.4641ZM18.4096 19.2383C18.4096 19.6629 18.3291 20.0241 18.1681 20.322C18.0084 20.6198 17.7904 20.8473 17.5141 21.0045C17.2391 21.1603 16.9299 21.2383 16.5864 21.2383C16.2404 21.2383 15.9299 21.1597 15.6549 21.0026C15.3799 20.8454 15.1625 20.6179 15.0028 20.3201C14.8431 20.0222 14.7633 19.6617 14.7633 19.2383C14.7633 18.8138 14.8431 18.4526 15.0028 18.1547C15.1625 17.8569 15.3799 17.63 15.6549 17.4741C15.9299 17.317 16.2404 17.2384 16.5864 17.2384C16.9299 17.2384 17.2391 17.317 17.5141 17.4741C17.7904 17.63 18.0084 17.8569 18.1681 18.1547C18.3291 18.4526 18.4096 18.8138 18.4096 19.2383ZM17.575 19.2383C17.575 18.9633 17.5338 18.7314 17.4514 18.5426C17.3703 18.3537 17.2556 18.2105 17.1073 18.1129C16.959 18.0153 16.7854 17.9665 16.5864 17.9665C16.3874 17.9665 16.2138 18.0153 16.0655 18.1129C15.9172 18.2105 15.8019 18.3537 15.7195 18.5426C15.6384 18.7314 15.5978 18.9633 15.5978 19.2383C15.5978 19.5134 15.6384 19.7453 15.7195 19.9341C15.8019 20.123 15.9172 20.2662 16.0655 20.3638C16.2138 20.4614 16.3874 20.5102 16.5864 20.5102C16.7854 20.5102 16.959 20.4614 17.1073 20.3638C17.2556 20.2662 17.3703 20.123 17.4514 19.9341C17.5338 19.7453 17.575 19.5134 17.575 19.2383ZM22.0828 18.5502C22.0562 18.4576 22.0188 18.3759 21.9706 18.3049C21.9225 18.2327 21.8635 18.1718 21.7938 18.1224C21.7254 18.0717 21.6468 18.0331 21.5581 18.0064C21.4707 17.9798 21.3737 17.9665 21.2672 17.9665C21.0683 17.9665 20.8934 18.016 20.7425 18.1148C20.593 18.2137 20.4764 18.3575 20.3927 18.5464C20.3091 18.7339 20.2673 18.9633 20.2673 19.2345C20.2673 19.5058 20.3085 19.7364 20.3908 19.9265C20.4732 20.1166 20.5898 20.2618 20.7406 20.3619C20.8915 20.4607 21.0695 20.5102 21.2748 20.5102C21.4612 20.5102 21.6202 20.4772 21.752 20.4113C21.8851 20.3441 21.9865 20.2497 22.0562 20.1281C22.1272 20.0064 22.1627 19.8625 22.1627 19.6965L22.3299 19.7212H21.3262V19.1015H22.9554V19.592C22.9554 19.9341 22.8832 20.2282 22.7387 20.4741C22.5942 20.7187 22.3952 20.9075 22.1417 21.0406C21.8883 21.1724 21.598 21.2383 21.271 21.2383C20.906 21.2383 20.5854 21.1578 20.3091 20.9969C20.0328 20.8346 19.8173 20.6046 19.6627 20.3068C19.5094 20.0077 19.4327 19.6528 19.4327 19.2422C19.4327 18.9266 19.4783 18.6452 19.5696 18.3981C19.6621 18.1497 19.7914 17.9393 19.9574 17.7669C20.1234 17.5945 20.3167 17.4634 20.5372 17.3734C20.7577 17.2834 20.9967 17.2384 21.2539 17.2384C21.4745 17.2384 21.6798 17.2707 21.8699 17.3354C22.06 17.3987 22.2286 17.4887 22.3756 17.6053C22.5239 17.7219 22.6449 17.8607 22.7387 18.0217C22.8325 18.1813 22.8927 18.3575 22.9193 18.5502H22.0828ZM24.8787 17.2916V21.1851H24.0555V17.2916H24.8787ZM29.2943 17.2916V21.1851H28.5833L26.8895 18.7346H26.8609V21.1851H26.0378V17.2916H26.7602L28.4408 19.7402H28.475V17.2916H29.2943Z" fill="white"/>
+<path d="M33.7165 36.7988L33.7146 36.7981C33.6747 36.7829 33.6423 36.752 33.6249 36.7117L31.5678 31.9502L31.4598 31.7001L31.2613 31.8868L28.7017 34.2947C28.7017 34.2948 28.7016 34.2949 28.7015 34.2949C28.6543 34.339 28.5859 34.3509 28.5264 34.3255C28.4679 34.3 28.4295 34.2415 28.4295 34.1771V22.5307C28.4295 22.4662 28.4676 22.4081 28.5266 22.3824L28.5266 22.3824L28.5273 22.3822C28.5849 22.3569 28.6539 22.3684 28.701 22.4124L28.7011 22.4125L37.1615 30.3175C37.1615 30.3176 37.1615 30.3176 37.1616 30.3176C37.2085 30.3617 37.225 30.4292 37.2043 30.489L37.2043 30.489C37.1834 30.5497 37.1289 30.592 37.0656 30.5975L33.4753 30.9073L33.2048 30.9306L33.3179 31.1774L35.4706 35.8741C35.4707 35.8741 35.4707 35.8742 35.4707 35.8742C35.4886 35.9135 35.4901 35.9586 35.4752 35.9981L35.475 35.9986C35.4597 36.0396 35.4295 36.0719 35.391 36.0893L35.3908 36.0894L33.8416 36.7946C33.8184 36.8046 33.7954 36.8092 33.773 36.8092C33.7528 36.8092 33.7337 36.8056 33.7165 36.7988ZM28.4504 22.2071C28.5784 22.1509 28.729 22.1768 28.8317 22.2728L28.4504 22.2071Z" fill="white" stroke="#142839" stroke-width="0.382389"/>
+</svg>
diff --git a/incubating/octopusdeploy-login/step.yaml b/incubating/octopusdeploy-login/step.yaml
new file mode 100644
index 00000000..16015ee1
--- /dev/null
+++ b/incubating/octopusdeploy-login/step.yaml
@@ -0,0 +1,83 @@
+version: "1.0"
+kind: step-type
+metadata:
+  name: octopusdeploy-login
+  version: 1.0.0
+  title: Log into Octopus Deploy
+  isPublic: true
+  description: Log into Octopus Deploy
+  sources:
+    - "https://github.com/codefresh-io/steps/tree/master/incubating/octopusdeploy-login"
+  stage: incubating
+  official: true
+  categories:
+    - utility
+  icon:
+    type: svg
+    url: "https://cdn.jsdelivr.net/gh/codefresh-io/steps/incubating/octopusdeploy-login/login.svg"
+    background: "#F4F6F8"
+  maintainers:
+    - name: OctopusDeploy
+  examples:
+    - description: Basic usage of the login step
+      workflow:
+        login:
+          type: octopusdeploy-login
+          arguments:
+            ID_TOKEN: "${{ID_TOKEN}}"
+            OCTOPUS_URL: "${{OCTOPUS_URL}}"
+            OCTOPUS_SERVICE_ACCOUNT_ID: "${{OCTOPUS_SERVICE_ACCOUNT_ID}}"
+spec:
+  arguments: |-
+    {
+      "definitions": {},
+      "$schema": "http://json-schema.org/draft-07/schema#",
+      "type": "object",
+      "name": "octopusdeploy-login",
+      "additionalProperties": false,
+      "patterns": [],
+      "required": ["ID_TOKEN", "OCTOPUS_URL", "OCTOPUS_SERVICE_ACCOUNT_ID"],
+      "properties": {
+        "ID_TOKEN": {
+          "type": "string",
+          "description": "The Codefresh OIDC token (required)"
+        },
+        "OCTOPUS_URL": {
+          "type": "string",
+          "description": "URL of the octopus deploy server (required)"
+        },
+        "OCTOPUS_SERVICE_ACCOUNT_ID": {
+          "type": "string",
+          "description": "The ID (audience) of the Octopus Service Account to log into (required)"  
+        }
+      }
+    }
+  returns: |-
+    {
+      "definitions": {},
+      "$schema": "http://json-schema.org/draft-07/schema#",
+      "type": "object",
+      "patterns": [],
+      "required": [
+        "OCTOPUS_ACCESS_TOKEN"
+      ],
+      "properties": {
+        "OCTOPUS_ACCESS_TOKEN": {
+          "type": "string",
+          "description": "Access token for octopus deploy (required)"
+        }
+      }
+    }
+  stepsTemplate: |-
+    login:
+      name: octopusdeploy-login
+      image: octopuslabs/octopus-cli
+      tag: latest
+      environment:
+        - ID_TOKEN_SECRET=[[ .Arguments.ID_TOKEN ]]
+      commands:
+        - octopus login --server "[[ .Arguments.OCTOPUS_URL ]]" --service-account-id "[[ .Arguments.OCTOPUS_SERVICE_ACCOUNT_ID ]]" --id-token "${ID_TOKEN_SECRET}" --no-prompt
+        - cf_export OCTOPUS_ACCESS_TOKEN=$(octopus config get "AccessToken") --mask
+  delimiters:
+    left: "[["
+    right: "]]"
diff --git a/incubating/octopusdeploy-push-build-information/step.yaml b/incubating/octopusdeploy-push-build-information/step.yaml
index 10331d43..b993f388 100644
--- a/incubating/octopusdeploy-push-build-information/step.yaml
+++ b/incubating/octopusdeploy-push-build-information/step.yaml
@@ -2,7 +2,7 @@ version: "1.0"
 kind: step-type
 metadata:
   name: octopusdeploy-push-build-information
-  version: 1.0.0
+  version: 1.0.1
   title: Push build information to Octopus Deploy
   isPublic: true
   description: Push build information to Octopus Deploy
@@ -19,7 +19,7 @@ metadata:
   maintainers:
     - name: OctopusDeploy
   examples:
-    - description: Basic usage of the push build information step
+    - description: Basic usage of the push build information step with API key
       workflow:
         push-build-information:
           type: octopusdeploy-push-build-information
@@ -33,6 +33,26 @@ metadata:
             FILE: "SomeFile.json"
             VERSION: "1.0.0"
             OVERWRITE_MODE: "fail"
+    - description: Basic usage of the push build information 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}}"
+        push-build-information:
+          type: octopusdeploy-push-build-information
+          arguments:
+            OCTOPUS_ACCESS_TOKEN: "${{OCTOPUS_ACCESS_TOKEN}}"
+            OCTOPUS_URL: "${{OCTOPUS_URL}}"
+            OCTOPUS_SPACE: "Spaces 1"
+            PACKAGE_IDS:
+              - "SomePackage"
+              - "SomeOtherPackage"
+            FILE: "SomeFile.json"
+            VERSION: "1.0.0"
+            OVERWRITE_MODE: "fail"
 spec:
   arguments: |-
     {
@@ -42,11 +62,19 @@ spec:
       "name": "octopusdeploy-push-build-information",
       "additionalProperties": false,
       "patterns": [],
-      "required": ["OCTOPUS_API_KEY", "OCTOPUS_URL", "OCTOPUS_SPACE", "PACKAGE_IDS", "FILE", "VERSION"],
+      "required": ["OCTOPUS_URL", "OCTOPUS_SPACE", "PACKAGE_IDS", "FILE", "VERSION"],
+      "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",
@@ -54,7 +82,7 @@ spec:
         },
         "OCTOPUS_SPACE": {
           "type": "string",
-          "description": "API key for octopus deploy (required)"  
+          "description": "Workspace for octopus deploy (required)"  
         },
         "PACKAGE_IDS": {
           "type": "array",
@@ -90,8 +118,13 @@ spec:
           [[- if .Arguments.OVERWRITE_MODE ]] --overwrite-mode "[[ .Arguments.OVERWRITE_MODE ]]" [[ end ]]
           --no-prompt 
       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: "[["
diff --git a/incubating/octopusdeploy-push-package/step.yaml b/incubating/octopusdeploy-push-package/step.yaml
index 9b3ff0d9..8f8911b6 100644
--- a/incubating/octopusdeploy-push-package/step.yaml
+++ b/incubating/octopusdeploy-push-package/step.yaml
@@ -2,7 +2,7 @@ version: "1.0"
 kind: step-type
 metadata:
   name: octopusdeploy-push-package
-  version: 1.0.0
+  version: 1.0.1
   title: Push a package in Octopus Deploy
   isPublic: true
   description: Push a package in Octopus Deploy
@@ -19,7 +19,7 @@ metadata:
   maintainers:
     - name: OctopusDeploy
   examples:
-    - description: Basic usage of the push a package step
+    - description: Basic usage of the push a package step with API key
       workflow:
         push-package:
           type: octopusdeploy-push-package
@@ -31,6 +31,24 @@ metadata:
               - "SomePackage.1.0.0.zip"
               - "SomeOtherPackage.1.0.0.zip"
             OVERWRITE_MODE: "fail"
+    - description: Basic usage of the push a package 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}}"
+        push-package:
+          type: octopusdeploy-push-package
+          arguments:
+            OCTOPUS_ACCESS_TOKEN: "${{OCTOPUS_ACCESS_TOKEN}}"
+            OCTOPUS_URL: "${{OCTOPUS_URL}}"
+            OCTOPUS_SPACE: "Spaces 1"
+            PACKAGES:
+              - "SomePackage.1.0.0.zip"
+              - "SomeOtherPackage.1.0.0.zip"
+            OVERWRITE_MODE: "fail"
 spec:
   arguments: |-
     {
@@ -40,11 +58,19 @@ spec:
       "name": "octopusdeploy-push-package",
       "additionalProperties": false,
       "patterns": [],
-      "required": ["OCTOPUS_API_KEY", "OCTOPUS_URL", "OCTOPUS_SPACE", "PACKAGES"],
+      "required": ["OCTOPUS_URL", "OCTOPUS_SPACE", "PACKAGES"],
+      "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",
@@ -52,7 +78,7 @@ spec:
         },
         "OCTOPUS_SPACE": {
           "type": "string",
-          "description": "API key for octopus deploy (required)"  
+          "description": "Workspace for octopus deploy (required)"  
         },
         "PACKAGES": {
           "type": "array",
@@ -78,8 +104,13 @@ spec:
           [[- if .Arguments.OVERWRITE_MODE ]] --overwrite-mode "[[ .Arguments.OVERWRITE_MODE ]]" [[ end ]]
           --no-prompt 
       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: "[["
diff --git a/incubating/octopusdeploy-run-runbook/step.yaml b/incubating/octopusdeploy-run-runbook/step.yaml
index 25b6a051..95df6cb2 100644
--- a/incubating/octopusdeploy-run-runbook/step.yaml
+++ b/incubating/octopusdeploy-run-runbook/step.yaml
@@ -2,7 +2,7 @@ version: "1.0"
 kind: step-type
 metadata:
   name: octopusdeploy-run-runbook
-  version: 1.0.0
+  version: 1.0.1
   title: Run a runbook in Octopus Deploy
   isPublic: true
   description: Run a runbook in Octopus Deploy
@@ -19,7 +19,7 @@ metadata:
   maintainers:
     - name: OctopusDeploy
   examples:
-    - description: Basic usage of the run a runbook step
+    - description: Basic usage of the run a runbook step with API key
       workflow:
         run-runbook:
           type: octopusdeploy-run-runbook
@@ -32,7 +32,7 @@ metadata:
             ENVIRONMENTS:
               - "Development"
               - "Production"
-    - description: Complex usage of the run a runbook step
+    - description: Complex usage of the run a runbook step with API key
       workflow:
         run-runbook:
           type: octopusdeploy-run-runbook
@@ -52,6 +52,51 @@ metadata:
             TENANT_TAGS:
               - "Tenant tag 1"
             USE_GUIDED_FAILURE: "false"
+    - description: Basic usage of the run a runbook 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}}"
+        run-runbook:
+          type: octopusdeploy-run-runbook
+          arguments:
+            OCTOPUS_ACCESS_TOKEN: "${{OCTOPUS_ACCESS_TOKEN}}"
+            OCTOPUS_URL: "${{OCTOPUS_URL}}"
+            OCTOPUS_SPACE: "Spaces 1"
+            PROJECT: "Project Name"
+            NAME: "Runbook Name"
+            ENVIRONMENTS:
+              - "Development"
+              - "Production"
+    - description: Complex usage of the run a runbook 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}}"
+        run-runbook:
+          type: octopusdeploy-run-runbook
+          arguments:
+            OCTOPUS_ACCESS_TOKEN: "${{OCTOPUS_ACCESS_TOKEN}}"
+            OCTOPUS_URL: "${{OCTOPUS_URL}}"
+            OCTOPUS_SPACE: "Spaces 1"
+            PROJECT: "Project Name"
+            NAME: "Runbook Name"
+            ENVIRONMENTS:
+              - "Development"
+              - "Production"
+            VARIABLES:
+              - "Label:Value"
+            TENANTS:
+              - "Tenant 1"
+            TENANT_TAGS:
+              - "Tenant tag 1"
+            USE_GUIDED_FAILURE: "false"
 spec:
   arguments: |-
     {
@@ -61,11 +106,19 @@ spec:
       "name": "octopusdeploy-run-runbook",
       "additionalProperties": false,
       "patterns": [],
-      "required": ["OCTOPUS_API_KEY", "OCTOPUS_URL", "OCTOPUS_SPACE", "PROJECT", "NAME", "ENVIRONMENTS"],
+      "required": ["OCTOPUS_URL", "OCTOPUS_SPACE", "PROJECT", "NAME", "ENVIRONMENTS"],
+      "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",
@@ -73,7 +126,7 @@ spec:
         },
         "OCTOPUS_SPACE": {
           "type": "string",
-          "description": "API key for octopus deploy (required)"  
+          "description": "Workspace for octopus deploy (required)"  
         },
         "PROJECT": {
           "type": "string",
@@ -171,8 +224,13 @@ spec:
           --no-prompt)
         - cf_export RUNBOOK_RUNS=$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: "[["