From 549de5d767100650ea4fe7fd8e945c010cda91db Mon Sep 17 00:00:00 2001
From: Marco Pfatschbacher <marco@graylog.com>
Date: Mon, 11 Dec 2023 17:44:45 +0000
Subject: [PATCH] refactor chocolatey env passing

---
 .github/shared/docker-chocolatey/action.yml | 9 +--------
 .github/workflows/pr-and-release-build.yml  | 3 ++-
 2 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/.github/shared/docker-chocolatey/action.yml b/.github/shared/docker-chocolatey/action.yml
index 16466bb..9ee7892 100644
--- a/.github/shared/docker-chocolatey/action.yml
+++ b/.github/shared/docker-chocolatey/action.yml
@@ -1,4 +1,3 @@
-
 name: 'Docker chocolatey action'
 description: 'Runs commands in a slightly modified chocolatey container'
 
@@ -6,15 +5,9 @@ inputs:
   command:
     description: 'The command to exec'
     required: true
-  jsonEnv:
-    description: 'Environment to pass to docker run as json string'
-    required: false
-    default: "{}"
 
 runs:
   using: 'docker'
   image: 'Dockerfile'
-  env: ${{ fromJSON(inputs.jsonEnv) }}
   args:
-    - ${{ inputs.command }}
-
+    - ${{ inputs.command }}
\ No newline at end of file
diff --git a/.github/workflows/pr-and-release-build.yml b/.github/workflows/pr-and-release-build.yml
index 30fe8bd..00bd0f6 100644
--- a/.github/workflows/pr-and-release-build.yml
+++ b/.github/workflows/pr-and-release-build.yml
@@ -86,7 +86,8 @@ jobs:
         uses: ./.github/shared/docker-chocolatey
         with:
           command: make push-chocolatey
-          jsonEnv: '{ "CHOCO_API_KEY": "${{ secrets.CHOCO_API_KEY }}" }'
+        env:
+          CHOCO_API_KEY: ${{ secrets.CHOCO_API_KEY }}
 
       - name: "Upload sidecar artifacts to S3"
         if: startsWith(github.ref, 'refs/tags/')