Add override flag support

Author: sscotth

.github/workflows/e2e.yml

@@ -46,6 +46,23 @@ jobs:
           true
         shell: bash
 
+  test-override:
+    runs-on: ubuntu-latest
+    env:
+      SECRET_1: DONT_OVERRIDE
+    steps:
+      - uses: actions/checkout@v3
+      - name: Export secrets to env variables (override)
+        uses: ./
+        with:
+          override: false
+          secrets: ${{ toJSON(secrets) }}
+      - name: Verify secrets to env variables (override)
+        run: |
+          [[ "${SECRET_1}" != "DONT_OVERRIDE" ]] && echo "Override test failed" && exit 1
+          true
+        shell: bash
+
   test-convert:
     runs-on: ubuntu-latest
     steps:

README.md

@@ -113,6 +113,23 @@ steps:
 - run: echo "Value of PREFIXED_MY_SECRET: $PREFIXED_MY_SECRET"
 ```
 
+**Override:**
+
+Overrides already existing variables (default is true)
+
+```yaml
+env:
+  MY_SECRET: DONT_OVERRIDE
+steps:
+- uses: actions/checkout@v3
+- uses: oNaiPs/secrets-to-env-action@v1
+  with:
+    secrets: ${{ toJSON(secrets) }}
+    override: false
+- run: echo "Value of MY_SECRET: $MY_SECRET"
+Value of MY_SECRET: DONT_OVERRIDE
+```
+
 **Convert:**
 
 Converts all exported secrets according to a [template](https://github.com/blakeembrey/change-case#core).

__tests__/main.test.ts

@@ -212,4 +212,35 @@ describe('secrets-to-env-action', () => {
       PREFIX_my_secret_2: inputSecrets.MY_SECRET_2
     })
   })
+
+  it('overrides variables', () => {
+    process.env = {
+      MY_SECRET_1: 'OVERRIDE'
+    }
+
+    mockInputs({
+      secrets: JSON.stringify(inputSecrets),
+      override: 'true'
+    })
+    main()
+
+    expect(newSecrets).toEqual(inputSecrets)
+  })
+
+  it('does not override variables', () => {
+    process.env = {
+      MY_SECRET_1: 'DONT_OVERRIDE'
+    }
+
+    mockInputs({
+      secrets: JSON.stringify(inputSecrets),
+      override: 'false'
+    })
+    main()
+
+    const filteredNewSecrets = Object.assign({}, newSecrets)
+    delete filteredNewSecrets.MY_SECRET_1
+
+    expect(newSecrets).toEqual(filteredNewSecrets)
+  })
 })

dist/index.js

@@ -32,6 +32,8 @@ export default async function run(): Promise<void> {
     const convertPrefix = convertPrefixStr.length
       ? convertPrefixStr === 'true'
       : true
+    const overrideStr: string = core.getInput('override')
+    const override = overrideStr.length ? overrideStr === 'true' : true
 
     let secrets: Record<string, string>
     try {
@@ -89,7 +91,12 @@ with:
       }
 
       if (process.env[newKey]) {
-        core.warning(`Will re-write "${newKey}" environment variable.`)
+        if (override) {
+          core.warning(`Will re-write "${newKey}" environment variable.`)
+        } else {
+          core.info(`Skip overwriting secret ${newKey}`)
+          continue
+        }
       }
 
       core.exportVariable(newKey, secrets[key])