Skip to content

Commit 3404c97

Browse files
authored
fix(iac): use state-migrate for admin token resource moves (#2420)
The `moved` blocks for admin token resources conflict with `-target=module.init` in `apply-init`, causing Terraform to fail. Replace them with `terraform state mv` commands in `state-migrate`, which runs before `apply-init` in CI.
1 parent 461bf36 commit 3404c97

File tree

2 files changed

+6
-29
lines changed

2 files changed

+6
-29
lines changed

iac/provider-gcp/Makefile

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -116,6 +116,12 @@ init:
116116
.PHONY: state-migrate
117117
state-migrate:
118118
@ printf "Running Terraform state migrations for env: `tput setaf 2``tput bold`$(ENV)`tput sgr0`\n\n"
119+
@ $(tf_vars) $(TF) state mv 'random_password.api_admin_secret' 'module.init.random_password.api_admin_secret' || true
120+
@ $(tf_vars) $(TF) state mv 'google_secret_manager_secret.api_admin_token' 'module.init.google_secret_manager_secret.api_admin_token' || true
121+
@ $(tf_vars) $(TF) state mv 'google_secret_manager_secret_version.api_admin_token_value' 'module.init.google_secret_manager_secret_version.api_admin_token_value' || true
122+
@ $(tf_vars) $(TF) state mv 'random_password.dashboard_api_admin_secret' 'module.init.random_password.dashboard_api_admin_secret' || true
123+
@ $(tf_vars) $(TF) state mv 'google_secret_manager_secret.dashboard_api_admin_token' 'module.init.google_secret_manager_secret.dashboard_api_admin_token' || true
124+
@ $(tf_vars) $(TF) state mv 'google_secret_manager_secret_version.dashboard_api_admin_token_value' 'module.init.google_secret_manager_secret_version.dashboard_api_admin_token_value' || true
119125

120126
.PHONY: apply-init
121127
apply-init:

iac/provider-gcp/moved.tf

Lines changed: 0 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -34,32 +34,3 @@ moved {
3434
to = module.init.google_secret_manager_secret_version.supabase_jwt_secrets
3535
}
3636

37-
moved {
38-
from = random_password.api_admin_secret
39-
to = module.init.random_password.api_admin_secret
40-
}
41-
42-
moved {
43-
from = google_secret_manager_secret.api_admin_token
44-
to = module.init.google_secret_manager_secret.api_admin_token
45-
}
46-
47-
moved {
48-
from = google_secret_manager_secret_version.api_admin_token_value
49-
to = module.init.google_secret_manager_secret_version.api_admin_token_value
50-
}
51-
52-
moved {
53-
from = random_password.dashboard_api_admin_secret
54-
to = module.init.random_password.dashboard_api_admin_secret
55-
}
56-
57-
moved {
58-
from = google_secret_manager_secret.dashboard_api_admin_token
59-
to = module.init.google_secret_manager_secret.dashboard_api_admin_token
60-
}
61-
62-
moved {
63-
from = google_secret_manager_secret_version.dashboard_api_admin_token_value
64-
to = module.init.google_secret_manager_secret_version.dashboard_api_admin_token_value
65-
}

0 commit comments

Comments
 (0)