fix: added support for prefixes

ribbon-studios · Aug 8, 2023 · cb91dc1 · cb91dc1
1 parent 214ee97
commit cb91dc1
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 5 deletions.
diff --git a/packages/aws/index.ts b/packages/aws/index.ts
@@ -1,5 +1,5 @@
 import { AccessKey, CreateAccessKeyCommand, DeleteAccessKeyCommand, IAMClient } from '@aws-sdk/client-iam';
-import { SourceModule, KeyInfo, getEnv } from '@refreshly/core';
+import { SourceModule, KeyInfo, getEnv, prefix } from '@refreshly/core';
 import * as assert from 'assert';
 
 class AWSSourceModule extends SourceModule {
@@ -48,11 +48,11 @@ class AWSSourceModule extends SourceModule {
 
     return [
       {
-        name: 'AWS_ACCESS_KEY_ID',
+        name: prefix(this.#options.prefix, 'AWS_ACCESS_KEY_ID'),
         value: this.#accessKey.AccessKeyId,
       },
       {
-        name: 'AWS_SECRET_ACCESS_KEY',
+        name: prefix(this.#options.prefix, 'AWS_SECRET_ACCESS_KEY'),
         value: this.#accessKey.SecretAccessKey,
       },
     ];
@@ -101,6 +101,7 @@ namespace AWSSourceModule {
   export type Options = {
     key?: string;
     secretKey?: string;
+    prefix?: string;
     user: string;
   };
 

diff --git a/packages/core/index.ts b/packages/core/index.ts
@@ -23,4 +23,8 @@ export function getEnv<T>(configKey: string, configValue?: T, ...keys: string[])
   throw new Error(`Expected ${configKey} to be provided via... (${keys.join(', ')})`);
 }
 
+export function prefix(...values: string[]): string {
+  return values.filter(Boolean).join('');
+}
+
 export * from './@types';
diff --git a/packages/github/index.ts b/packages/github/index.ts
@@ -1,6 +1,6 @@
 import { Octokit } from 'octokit';
 import * as sodium from 'libsodium-wrappers';
-import { KeyInfo, ITargetModule, getEnv } from '@refreshly/core';
+import { KeyInfo, ITargetModule, getEnv, prefix } from '@refreshly/core';
 
 class GitHubTargetModule implements ITargetModule {
   #options: GitHubTargetModule.Options;
@@ -57,7 +57,7 @@ class GitHubTargetModule implements ITargetModule {
         await this.#octokit.rest.actions.createOrUpdateOrgSecret({
           key_id,
           org: this.#options.org,
-          secret_name: keyInfo.name,
+          secret_name: prefix(this.#options.prefix, keyInfo.name),
           visibility: 'all',
           encrypted_value: sodium.to_base64(encBytes, sodium.base64_variants.ORIGINAL),
         });
@@ -72,6 +72,7 @@ class GitHubTargetModule implements ITargetModule {
 namespace GitHubTargetModule {
   export interface Options {
     token?: string;
+    prefix?: string;
     org: string;
   }
 }