allow org set in /etc

saml-to · Dec 12, 2023 · 81ec145 · 81ec145
1 parent c1e722d
commit 81ec145
Showing 1 changed file with 12 additions and 3 deletions.
diff --git a/src/config.ts b/src/config.ts
@@ -51,7 +51,10 @@ class GitHubConfiguration {
   }
 
   get org(): string | undefined {
-    return this.repository ? this.repository.split("/")[0] : undefined;
+    const fromFs = this.samlTo.org;
+    const fromEnv = this.repository ? this.repository.split("/")[0] : undefined;
+    // TODO: make this a config option?
+    return fromFs || fromEnv;
   }
 
   get repository(): string | undefined {
@@ -178,6 +181,7 @@ class AssumeAwsConfiguration {
 }
 
 export class SamlToConfiguration {
+  #org: string | undefined;
   #provider: string | undefined;
   #githubToken: string | undefined;
   #awsRole: string | undefined;
@@ -208,6 +212,7 @@ export class SamlToConfiguration {
     this.#provider = await readFile(
       path.join(root, "etc", "saml-to", "provider")
     );
+    this.#org = await readFile(path.join(root, "etc", "saml-to", "org"));
     this.#awsRole = await readFile(
       path.join(root, "etc", "saml-to", "aws", "role")
     );
@@ -219,14 +224,18 @@ export class SamlToConfiguration {
     );
   }
 
-  get githubToken(): string | undefined {
-    return this.#githubToken;
+  get org(): string | undefined {
+    return this.#org;
   }
 
   get provider(): string | undefined {
     return this.#provider;
   }
 
+  get githubToken(): string | undefined {
+    return this.#githubToken;
+  }
+
   get awsRole(): string | undefined {
     return this.#awsRole;
   }