wesley/load-secrets-action
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove protocol prepending (#66)

Browse Source 
This code is no longer needed. Instead, we will enforce users to add the protocol themselves.
This commit is contained in:
Eduard Filip
2024-02-21 21:19:05 +01:00
committed by GitHub
parent 2792fede48
commit cf1a288161
4 changed files with 1 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/test.yml vendored
View File

@@ -39,7 +39,7 @@ jobs:
if: ${{ matrix.auth == 'connect' }}
uses: ./configure # 1password/load-secrets-action/configure@<version>
with:
connect-host: localhost:8080
connect-host: http://localhost:8080
connect-token: ${{ secrets.OP_CONNECT_TOKEN }}
- name: Load secrets
id: load_secrets

9
dist/index.js vendored
View File

@@ -30086,15 +30086,6 @@ const validateAuth = () => {
throw new Error(authErr);
}
const authType = isConnect ? "Connect" : "Service account";
// Adjust Connect host to have a protocol
if (process.env[envConnectHost] &&
// The following lint error is not an issue because we are checking for the presence of the `http://` prefix;
// we are not using it as an insecure connection protocol to link out to another resource.
// eslint-disable-next-line no-restricted-syntax
!process.env[envConnectHost].startsWith("http://") &&
!process.env[envConnectHost].startsWith("https://")) {
process.env[envConnectHost] = `http://${process.env[envConnectHost]}`;
}
core.info(`Authenticated with ${authType}.`);
};
const extractSecret = (envName, shouldExportEnv) => {

17
src/utils.test.ts
View File

@@ -47,23 +47,6 @@ describe("validateAuth", () => {
expect(validateAuth).toThrowError(authErr);
});
it("should append protocol if Connect host doesn't have it", () => {
process.env[envConnectHost] = "localhost:8080";
process.env[envConnectToken] = testConnectToken;
expect(validateAuth).not.toThrowError(authErr);
// The following lint error is not an issue because we are checking for the presence of the `http://` prefix;
// we are not using it as an insecure connection protocol to link out to another resource.
// eslint-disable-next-line no-restricted-syntax
expect(process.env[envConnectHost]).toBe("http://localhost:8080");
});
it("should not append protocol if Connect host has one", () => {
process.env[envConnectHost] = testConnectHost;
process.env[envConnectToken] = testConnectToken;
expect(validateAuth).not.toThrowError(authErr);
expect(process.env[envConnectHost]).toBe(testConnectHost);
});
it("should be authenticated as a Connect client", () => {
process.env[envConnectHost] = testConnectHost;
process.env[envConnectToken] = testConnectToken;

12
src/utils.ts
View File

@@ -26,18 +26,6 @@ export const validateAuth = (): void => {
const authType = isConnect ? "Connect" : "Service account";
// Adjust Connect host to have a protocol
if (
process.env[envConnectHost] &&
// The following lint error is not an issue because we are checking for the presence of the `http://` prefix;
// we are not using it as an insecure connection protocol to link out to another resource.
// eslint-disable-next-line no-restricted-syntax
!process.env[envConnectHost].startsWith("http://") &&
!process.env[envConnectHost].startsWith("https://")
) {
process.env[envConnectHost] = `http://${process.env[envConnectHost]}`;
}
core.info(`Authenticated with ${authType}.`);
};