use env

see actions/github-script#287 chore: change variable names
elastic · Nov 7, 2023 · 252447f · 252447f
1 parent 8f5ff0b
commit 252447f
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 14 deletions.
diff --git a/.github/actions/oblt-cli-cluster-credentials/action.yml b/.github/actions/oblt-cli-cluster-credentials/action.yml
@@ -29,16 +29,17 @@ runs:
         CLUSTER_INFO_FILE_INPUT: ${{ inputs.cluster-info-file }}
       with:
         script: |
-          const clusterName = process.env.CLUSTER_NAME_INPUT
+          const clusterNameInput = process.env.CLUSTER_NAME_INPUT
           const clusterInfoFile = process.env.CLUSTER_INFO_FILE_INPUT
 
-          console.log(`clusterName is "${clusterName}"`)
+          console.log(`clusterName is "${clusterNameInput}"`)
           console.log(`clusterInfoFile is "${clusterInfoFile}"`)
-          if (clusterName && clusterInfoFile) {
+
+          if (clusterNameInput && clusterInfoFile) {
             core.setFailed(`Either cluster-name or cluster-info-file but no both`)
           }
 
-          var cluster = clusterName
+          var clusterName = clusterNameInput
 
           if (clusterInfoFile) {
             const fs = require('fs')
@@ -50,13 +51,15 @@ runs:
             if (jsonObject && jsonObject.ClusterName === undefined) {
               core.setFailed(`cluster-info-file does not contain the field ClusterName`)
             }
-            cluster = jsonObject.ClusterName
+            clusterName = jsonObject.ClusterName
           }
 
-          if (cluster.trim().length === 0) {
+          if (clusterName.trim().length === 0) {
             core.setFailed(`cluster name is empty`)
           }
-          core.exportVariable('CLUSTER_NAME', `${cluster}`)
+
+          console.log(`clusterName is "${clusterName}"`)
+          core.exportVariable('CLUSTER_NAME', `${clusterName}`)
 
     - uses: elastic/apm-pipeline-library/.github/actions/setup-oblt-cli@current
       with:

diff --git a/.github/actions/oblt-cli-destroy-cluster/action.yml b/.github/actions/oblt-cli-destroy-cluster/action.yml
@@ -15,16 +15,19 @@ runs:
   steps:
     - name: Process inputs
       uses: actions/github-script@v6
+      env:
+        CLUSTER_NAME_INPUT: ${{ inputs.cluster-name }}
+        CLUSTER_INFO_FILE_INPUT: ${{ inputs.cluster-info-file }}
       with:
         script: |
-          const clusterName = core.getInput('cluster-name')
-          const clusterInfoFile = core.getInput('cluster-info-file')
+          const clusterNameInput = process.env.CLUSTER_NAME_INPUT
+          const clusterInfoFile = process.env.CLUSTER_INFO_FILE_INPUT
 
-          if (clusterName && clusterInfoFile) {
+          if (clusterNameInput && clusterInfoFile) {
             core.setFailed(`Either cluster-name or cluster-info-file but no both`)
           }
 
-          var cluster = clusterName
+          var clusterName = clusterNameInput
 
           if (clusterInfoFile) {
             const fs = require('fs')
@@ -33,13 +36,15 @@ runs:
             if (jsonObject && jsonObject.ClusterName === undefined) {
               core.setFailed(`cluster-info-file does not contain the field ClusterName`)
             }
-            cluster = jsonObject.ClusterName
+            clusterName = jsonObject.ClusterName
           }
 
-          if (cluster.trim().length === 0) {
+          if (clusterName.trim().length === 0) {
             core.setFailed(`cluster name is empty`)
           }
-          core.exportVariable('CLUSTER_NAME', `${cluster}`)
+
+          console.log(`clusterName is "${clusterName}"`)
+          core.exportVariable('CLUSTER_NAME', `${clusterName}`)
 
     - uses: elastic/apm-pipeline-library/.github/actions/oblt-cli@current
       with: