pkg/options/options.go (1)

103-119: Add a focused regression test for GetEnvPrefixed.

This helper now sits on the option and auth lookup paths, and the default GCLOUD path plus my-gcloud -> MY_GCLOUD normalization are easy to regress. A small table-driven test around getEnv / GetEnvPrefixed would lock the new behavior down.

🤖 Prompt for AI Agents

Verify each finding against the current code and only fix it if needed.

In `@pkg/options/options.go` around lines 103 - 119, Add a focused table-driven
unit test for getEnv and GetEnvPrefixed that verifies the default provider
lookup and provider-name normalization; write cases that (1) set no
DEVPOD_PROVIDER and ensure GetEnvPrefixed looks up DEVPOD_PROVIDER_GCLOUD_<KEY>,
(2) set DEVPOD_PROVIDER="my-gcloud" and ensure it normalizes to
DEVPOD_PROVIDER_MY_GCLOUD_<KEY>, and (3) verify getEnv returns the direct env
var when present and falls back to GetEnvPrefixed otherwise; in the test mutate
os.Setenv / os.Unsetenv for DEVPOD_PROVIDER and the expected env keys and
restore environment after each case, and assert expected returned strings from
getEnv/GetEnvPrefixed (name the test TestGetEnvPrefixed_TableDriven or similar).

README.md (1)

67-73: ⚠️ Potential issue | 🟠 Major

Include KEY_FILE in the non-default provider rename example too.

This section currently shows only ..._KEY remapping. The code resolves both KEY_FILE and KEY, so readers should see both renamed forms for custom provider names.

Suggested doc update

 names of the environment variables that supply values for the options
 change accordingly: `DEVPOD_PROVIDER_GCLOUD_KEY` becomes
 `DEVPOD_PROVIDER_MY_GCLOUD_KEY`.
+Likewise, `DEVPOD_PROVIDER_GCLOUD_KEY_FILE` becomes
+`DEVPOD_PROVIDER_MY_GCLOUD_KEY_FILE`.

🤖 Prompt for AI Agents

Verify each finding against the current code and only fix it if needed.

In `@README.md` around lines 67 - 73, Update the example text around the custom
provider rename (the paragraph using the example command `devpod provider add
gcloud --name my-gcloud`) to show that both KEY and KEY_FILE environment
variables are renamed; explicitly show `DEVPOD_PROVIDER_GCLOUD_KEY` ->
`DEVPOD_PROVIDER_MY_GCLOUD_KEY` and `DEVPOD_PROVIDER_GCLOUD_KEY_FILE` ->
`DEVPOD_PROVIDER_MY_GCLOUD_KEY_FILE`, and adjust the surrounding sentence to
state that both KEY and KEY_FILE are remapped when using a non-default provider
name.

pkg/options/options.go (1)

103-110: Prefer provider-scoped env vars before unprefixed fallbacks.

Current lookup order lets generic env vars override provider-specific ones. That can cause surprising values in multi-provider/context workflows.

Suggested adjustment

 func getEnv(key string) string {
-	val := os.Getenv(key)
-	if val != "" {
-		return val
-	}
-
-	return GetEnvPrefixed(key)
+	if val := GetEnvPrefixed(key); val != "" {
+		return val
+	}
+	return os.Getenv(key)
 }

🤖 Prompt for AI Agents

Verify each finding against the current code and only fix it if needed.

In `@pkg/options/options.go` around lines 103 - 110, The getEnv function currently
returns the unprefixed os.Getenv(key) value before falling back to
GetEnvPrefixed(key), which lets generic env vars override provider-scoped ones;
change getEnv to first try the provider-scoped lookup via GetEnvPrefixed(key)
and return it if non-empty, otherwise fall back to os.Getenv(key) so
provider-scoped env vars take precedence; adjust the function body around getEnv
and references to GetEnvPrefixed to preserve the same empty-string semantics.

README.md (1)

75-78: ⚠️ Potential issue | 🟡 Minor

Fix typo in service account reference.

Line 76 has a malformed backtick/possessive: service accountssshould beservice accounts`.

📝 Suggested fix

 Since this approach uses JSON `key`s for authentication,
-and only `service accounts`s have such keys,
+and only `service accounts` have such keys,
 you need to use a `service account`.

🤖 Prompt for AI Agents

Verify each finding against the current code and only fix it if needed.

In `@README.md` around lines 75 - 78, Fix the malformed backtick/possessive in the
README by replacing the incorrect inline code string `service accounts`s` with
the correct `service accounts` in the sentence that reads "Since this approach
uses JSON `key`s for authentication, and only `service accounts`s have such
keys, you need to use a `service account`."; update the quoted token `service
accounts`s` to `service accounts` so the backticks and plural form are correct.

README.md (1)

136-152: Consider adding KEY_FILE and KEY options to the table.

The options table documents most provider options but omits KEY_FILE and KEY, which are documented separately in the Environment Variable section. For completeness and discoverability, consider adding them to this table since they are defined as provider options in hack/provider/main.go (lines 227-232).

📝 Suggested addition to options table

 | NAME                      | REQUIRED | DESCRIPTION                                                             | DEFAULT                                              |
 |---------------------------|----------|-------------------------------------------------------------------------|------------------------------------------------------|
 | AGENT_PATH                | false    | The path where to inject the DevPod agent to.                           | /var/lib/toolbox/devpod                              |
 | DISK_IMAGE                | false    | The disk image to use.                                                  | projects/cos-cloud/global/images/cos-101-17162-127-5 |
 | DISK_SIZE                 | false    | The disk size to use (GB).                                              | 40                                                   |
 | INACTIVITY_TIMEOUT        | false    | If defined, will automatically stop the VM after the inactivity period. | 5m                                                   |
 | INJECT_DOCKER_CREDENTIALS | false    | If DevPod should inject docker credentials into the remote host.        | true                                                 |
 | INJECT_GIT_CREDENTIALS    | false    | If DevPod should inject git credentials into the remote host.           | true                                                 |
+| KEY                       | false    | Google Cloud JSON key (content).                                        |                                                      |
+| KEY_FILE                  | false    | Path to the Google Cloud JSON key file.                                 |                                                      |
 | MACHINE_TYPE              | false    | The machine type to use.                                                | c2-standard-4                                        |

🤖 Prompt for AI Agents

Verify each finding against the current code and only fix it if needed.

In `@README.md` around lines 136 - 152, Add the missing provider options KEY_FILE
and KEY to the options table in README.md so they are discoverable alongside the
other variables; include entries with their REQUIRED status, a short DESCRIPTION
matching how they are used in the provider (e.g., "Path to the private key file
used for SSH" for KEY_FILE and "Private key contents or path used for SSH
authentication" for KEY), and sensible DEFAULT values or leave blank if none,
referencing the existing table format and the same terminology used for other
entries to match the definitions in hack/provider/main.go where KEY_FILE and KEY
are parsed.