feat: fallback to env var if configuration not set

JoshVee · JoshVee · commit 2d6ae426c83f · 2023-11-03T16:39:11.000+11:00
diff --git a/.DS_Store b/.DS_Store
diff --git a/package.json b/package.json
@@ -64,7 +64,7 @@
           "default": ""
         },
         "coder.headerCommand": {
-          "markdownDescription": "An external command that outputs additional HTTP headers added to all requests. The command must output each header as `key=value` on its own line. The following environment variables will be available to the process: `CODER_URL`.",
+          "markdownDescription": "An external command that outputs additional HTTP headers added to all requests. The command must output each header as `key=value` on its own line. The following environment variables will be available to the process: `CODER_URL`. Defaults to the value of `CODER_HEADER_COMMAND` if not set.",
           "type": "string",
           "default": ""
         },
@@ -291,4 +291,4 @@
     "trim": "0.0.3",
     "word-wrap": "1.2.5"
   }
-}
+}
diff --git a/src/remote.ts b/src/remote.ts
@@ -537,7 +537,8 @@ export class Remote {
 
     // Add headers from the header command.
     let headerArg = ""
-    const headerCommand = vscode.workspace.getConfiguration().get("coder.headerCommand")
+    const headerCommand =
+      vscode.workspace.getConfiguration().get("coder.headerCommand") || process.env.CODER_HEADER_COMMAND
     if (typeof headerCommand === "string" && headerCommand.trim().length > 0) {
       headerArg = ` --header-command ${escape(headerCommand)}`
     }
diff --git a/src/storage.ts b/src/storage.ts
@@ -397,7 +397,13 @@ export class Storage {
   }
 
   public async getHeaders(url = this.getURL()): Promise<Record<string, string>> {
-    return getHeaders(url, vscode.workspace.getConfiguration().get("coder.headerCommand"), this)
+    console.log(process.env)
+
+    return getHeaders(
+      url,
+      vscode.workspace.getConfiguration().get("coder.headerCommand") || process.env.CODER_HEADER_COMMAND,
+      this,
+    )
   }
 }
 

Original file line number	Diff line number	Diff line change
`@@ -537,7 +537,8 @@ export class Remote {`
`537`	`537`
`538`	`538`	`// Add headers from the header command.`
`539`	`539`	`let headerArg = ""`
`540`		`- const headerCommand = vscode.workspace.getConfiguration().get("coder.headerCommand")`
	`540`	`+ const headerCommand =`
	`541`	`+ vscode.workspace.getConfiguration().get("coder.headerCommand") \|\| process.env.CODER_HEADER_COMMAND`
`541`	`542`	`if (typeof headerCommand === "string" && headerCommand.trim().length > 0) {`
`542`	`543`	headerArg = ` --header-command ${escape(headerCommand)}`
`543`	`544`	`}`
Original file line number	Diff line number	Diff line change
`@@ -397,7 +397,13 @@ export class Storage {`
`397`	`397`	`}`
`398`	`398`
`399`	`399`	`public async getHeaders(url = this.getURL()): Promise<Record<string, string>> {`
`400`		`- return getHeaders(url, vscode.workspace.getConfiguration().get("coder.headerCommand"), this)`
	`400`	`+ console.log(process.env)`
	`401`	`+`
	`402`	`+ return getHeaders(`
	`403`	`+ url,`
	`404`	`+ vscode.workspace.getConfiguration().get("coder.headerCommand") \|\| process.env.CODER_HEADER_COMMAND,`
	`405`	`+ this,`
	`406`	`+ )`
`401`	`407`	`}`
`402`	`408`	`}`
`403`	`409`