From cd38d43a7a53adc40f87cacda43b0f233eb8f40e Mon Sep 17 00:00:00 2001 From: JM Faircloth Date: Fri, 8 Mar 2024 10:11:09 -0600 Subject: [PATCH] update require got to import got --- .github/workflows/local-test.yaml | 30 +++++++++++++------ integrationTests/basic/approle_auth.test.js | 2 +- integrationTests/basic/integration.test.js | 2 +- integrationTests/basic/jwt_auth.test.js | 2 +- integrationTests/basic/userpass_auth.test.js | 2 +- integrationTests/e2e-tls/setup.js | 2 +- integrationTests/e2e/setup.js | 2 +- .../enterprise/enterprise.test.js | 2 +- package.json | 2 +- src/action.js | 5 ++-- src/action.test.js | 2 +- src/auth.test.js | 2 +- 12 files changed, 34 insertions(+), 21 deletions(-) diff --git a/.github/workflows/local-test.yaml b/.github/workflows/local-test.yaml index 9c24861..21585c8 100644 --- a/.github/workflows/local-test.yaml +++ b/.github/workflows/local-test.yaml @@ -48,14 +48,26 @@ jobs: token: testtoken secrets: | secret/data/test-json-string jsonString; + secret/data/test-json-data jsonData; - - name: Check Secrets - run: | - touch secrets.json - echo "${{ steps.import-secrets.outputs.jsonString }}" >> secrets.json + - uses: actions/github-script@v7 + with: + github-token: "foobar" + script: | + const { JSONSTRING, JSONDATA } = process.env - - name: Check json file format - run: | - echo - cat secrets.json - jq -c . < secrets.json + console.log(`string ${JSONSTRING}`) + console.log(`data ${JSONDATA}`) + const str = JSONDATA + + let valid = true + try { + JSON.parse(str) + } catch (e) { + valid = false + } + if (valid) { + console.log("valid json") + } else { + console.log("not valid json") + } diff --git a/integrationTests/basic/approle_auth.test.js b/integrationTests/basic/approle_auth.test.js index 39e9c8c..a16d10b 100644 --- a/integrationTests/basic/approle_auth.test.js +++ b/integrationTests/basic/approle_auth.test.js @@ -2,7 +2,7 @@ jest.mock('@actions/core'); jest.mock('@actions/core/lib/command'); const core = require('@actions/core'); -const got = require('got'); +import got from 'got'; const { when } = require('jest-when'); const { exportSecrets } = require('../../src/action'); diff --git a/integrationTests/basic/integration.test.js b/integrationTests/basic/integration.test.js index 39a874e..3e85b92 100644 --- a/integrationTests/basic/integration.test.js +++ b/integrationTests/basic/integration.test.js @@ -2,7 +2,7 @@ jest.mock('@actions/core'); jest.mock('@actions/core/lib/command'); const core = require('@actions/core'); -const got = require('got'); +import got from 'got'; const { when } = require('jest-when'); const { exportSecrets } = require('../../src/action'); diff --git a/integrationTests/basic/jwt_auth.test.js b/integrationTests/basic/jwt_auth.test.js index df2703b..4163b46 100644 --- a/integrationTests/basic/jwt_auth.test.js +++ b/integrationTests/basic/jwt_auth.test.js @@ -8,7 +8,7 @@ const { publicRsaKey } = require('./rsa_keys'); -const got = require('got'); +import got from 'got'; const { when } = require('jest-when'); const { exportSecrets } = require('../../src/action'); diff --git a/integrationTests/basic/userpass_auth.test.js b/integrationTests/basic/userpass_auth.test.js index a8a9933..407ea6a 100644 --- a/integrationTests/basic/userpass_auth.test.js +++ b/integrationTests/basic/userpass_auth.test.js @@ -2,7 +2,7 @@ jest.mock('@actions/core'); jest.mock('@actions/core/lib/command'); const core = require('@actions/core'); -const got = require('got'); +import got from 'got'; const { when } = require('jest-when'); const { exportSecrets } = require('../../src/action'); diff --git a/integrationTests/e2e-tls/setup.js b/integrationTests/e2e-tls/setup.js index 0e25646..0709256 100644 --- a/integrationTests/e2e-tls/setup.js +++ b/integrationTests/e2e-tls/setup.js @@ -1,4 +1,4 @@ -const got = require('got'); +import got from 'got'; const core = require('@actions/core'); const vaultUrl = `${process.env.VAULT_HOST}:${process.env.VAULT_PORT}`; diff --git a/integrationTests/e2e/setup.js b/integrationTests/e2e/setup.js index 33daf37..2a60038 100644 --- a/integrationTests/e2e/setup.js +++ b/integrationTests/e2e/setup.js @@ -1,4 +1,4 @@ -const got = require('got'); +import got from 'got'; const vaultUrl = `${process.env.VAULT_HOST}:${process.env.VAULT_PORT}`; const vaultToken = `${process.env.VAULT_TOKEN}` === undefined ? `${process.env.VAULT_TOKEN}` : "testtoken"; diff --git a/integrationTests/enterprise/enterprise.test.js b/integrationTests/enterprise/enterprise.test.js index 9fa3f08..c96e2d9 100644 --- a/integrationTests/enterprise/enterprise.test.js +++ b/integrationTests/enterprise/enterprise.test.js @@ -2,7 +2,7 @@ jest.mock('@actions/core'); jest.mock('@actions/core/lib/command'); const core = require('@actions/core'); -const got = require('got'); +import got from 'got'; const { when } = require('jest-when'); const { exportSecrets } = require('../../src/action'); diff --git a/package.json b/package.json index 56354bc..e91a8a4 100644 --- a/package.json +++ b/package.json @@ -5,7 +5,7 @@ "main": "dist/index.js", "scripts": { "build": "ncc build src/entry.js -o dist", - "test": "jest", + "test": "NODE_OPTIONS=--experimental-vm-modules npx jest", "test:integration:basic": "jest -c integrationTests/basic/jest.config.js", "test:integration:enterprise": "jest -c integrationTests/enterprise/jest.config.js", "test:integration:e2e": "jest -c integrationTests/e2e/jest.config.js", diff --git a/src/action.js b/src/action.js index 94c8f8e..332ed78 100644 --- a/src/action.js +++ b/src/action.js @@ -1,7 +1,7 @@ // @ts-check const core = require('@actions/core'); const command = require('@actions/core/lib/command'); -const got = require('got').default; +import got from 'got'; const jsonata = require('jsonata'); const { normalizeOutputKey } = require('./utils'); const { WILDCARD } = require('./constants'); @@ -110,7 +110,8 @@ async function exportSecrets() { for (const line of value.replace(/\r/g, '').split('\n')) { if (line.length > 0) { - core.setSecret(line); + // core.setSecret(line); + core.setOutput(line); } } if (exportEnv) { diff --git a/src/action.test.js b/src/action.test.js index eb99bfa..b987b20 100644 --- a/src/action.test.js +++ b/src/action.test.js @@ -4,7 +4,7 @@ jest.mock('@actions/core/lib/command'); const command = require('@actions/core/lib/command'); const core = require('@actions/core'); -const got = require('got'); +import got from 'got'; const { exportSecrets, parseSecretsInput, diff --git a/src/auth.test.js b/src/auth.test.js index ac689d3..405fcb6 100644 --- a/src/auth.test.js +++ b/src/auth.test.js @@ -9,7 +9,7 @@ jest.mock('fs', () => ({ })); const core = require('@actions/core'); -const got = require('got'); +import * as got from 'got' const fs = require("fs") const { when } = require('jest-when');