Skip to content

Commit 51e5fde

Browse files
committed
fix(devbox): drop infisical identity name prompt
1 parent b34bfc5 commit 51e5fde

4 files changed

Lines changed: 8 additions & 11 deletions

File tree

docs/devbox.md

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -69,10 +69,10 @@ One-time setup:
6969
```
7070

7171
The helper prompts locally for the Infisical domain, project ID, environment,
72-
machine identity name, machine identity client ID, and machine identity client
73-
secret. Humans should source the initial client ID/secret from their secret
74-
manager, usually 1Password or Infisical, and enter them locally. Do not paste
75-
them into agent chat.
72+
machine identity client ID, and machine identity client secret. Humans should
73+
source the initial client ID/secret from their secret manager, usually
74+
1Password or Infisical, and enter them locally. Do not paste them into agent
75+
chat.
7676

7777
It writes non-secret selectors to `~/.config/uinaf/devbox.env` and machine
7878
credentials to `~/.config/uinaf/infisical-machine.env`. Both files must be mode
@@ -223,7 +223,6 @@ The file should be mode `0600`. Persistent machine credentials live separately
223223
in `~/.config/uinaf/infisical-machine.env`, also mode `0600`:
224224

225225
```sh
226-
INFISICAL_MACHINE_IDENTITY=example-devbox
227226
INFISICAL_CLIENT_ID=...
228227
INFISICAL_CLIENT_SECRET=...
229228
```

scripts/secrets/configure-infisical-devbox.sh

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ write_devbox_config() {
102102
local existing_path="$2"
103103

104104
if [ -e "$existing_path" ]; then
105-
grep -Ev '^(INFISICAL_DOMAIN|INFISICAL_PROJECT_ID|INFISICAL_ENV|INFISICAL_SECRET_PATH|INFISICAL_MACHINE_IDENTITY|INFISICAL_CLIENT_ID|INFISICAL_CLIENT_SECRET|INFISICAL_TOKEN)=' "$existing_path" > "$tmp_path" || true
105+
grep -Ev '^(INFISICAL_DOMAIN|INFISICAL_PROJECT_ID|INFISICAL_ENV|INFISICAL_SECRET_PATH|INFISICAL_CLIENT_ID|INFISICAL_CLIENT_SECRET|INFISICAL_TOKEN)=' "$existing_path" > "$tmp_path" || true
106106
fi
107107

108108
{
@@ -116,7 +116,6 @@ write_machine_config() {
116116
local tmp_path="$1"
117117

118118
{
119-
quote_assignment INFISICAL_MACHINE_IDENTITY "$infisical_machine_identity"
120119
quote_assignment INFISICAL_CLIENT_ID "$infisical_client_id"
121120
quote_assignment INFISICAL_CLIENT_SECRET "$infisical_client_secret"
122121
} > "$tmp_path"
@@ -138,15 +137,14 @@ command -v infisical >/dev/null || fail "missing infisical"
138137
infisical --version >/dev/null || fail "infisical CLI does not run"
139138

140139
load_if_present "$config_path"
141-
unset INFISICAL_MACHINE_IDENTITY INFISICAL_CLIENT_ID INFISICAL_CLIENT_SECRET
140+
unset INFISICAL_CLIENT_ID INFISICAL_CLIENT_SECRET
142141
load_if_present "$machine_config_path"
143142

144143
printf 'Configuring Infisical devbox machine auth. Press Enter to accept defaults.\n' >&2
145144

146145
infisical_domain="$(prompt_value "Infisical domain" "${INFISICAL_DOMAIN:-https://eu.infisical.com/api}")"
147146
infisical_project_id="$(prompt_value "Infisical project ID" "${INFISICAL_PROJECT_ID:-}")"
148147
infisical_env="$(prompt_value "Infisical env" "${INFISICAL_ENV:-dev}")"
149-
infisical_machine_identity="$(prompt_value "Machine identity name" "${INFISICAL_MACHINE_IDENTITY:-}")"
150148
infisical_client_id="$(prompt_value "Machine identity client ID" "${INFISICAL_CLIENT_ID:-}")"
151149
infisical_client_secret="$(prompt_secret "Machine identity client secret")"
152150

scripts/secrets/infisical-devbox-run.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ command -v infisical >/dev/null || fail "missing infisical"
7575
infisical --version >/dev/null || fail "infisical CLI does not run"
7676

7777
load_required_config "$config_path"
78-
unset INFISICAL_MACHINE_IDENTITY INFISICAL_CLIENT_ID INFISICAL_CLIENT_SECRET
78+
unset INFISICAL_CLIENT_ID INFISICAL_CLIENT_SECRET
7979
load_required_config "$machine_config_path"
8080

8181
if [ -n "$override_infisical_domain" ]; then

scripts/verify/devbox-services.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ check_no_default_secret_exports() {
120120
load_machine_config() {
121121
if [ -e "$machine_config_path" ]; then
122122
check_mode "$machine_config_path" 600
123-
unset INFISICAL_MACHINE_IDENTITY INFISICAL_CLIENT_ID INFISICAL_CLIENT_SECRET
123+
unset INFISICAL_CLIENT_ID INFISICAL_CLIENT_SECRET
124124
# shellcheck disable=SC1090
125125
. "$machine_config_path"
126126
printf 'ok loaded Infisical machine config\n'

0 commit comments

Comments
 (0)