Conversation
Funch関連インフラの撤去に伴い、BFFからFunch Serviceを呼び出す 必要がなくなったため、terraform_remote_stateの参照、 run.invokerのIAMバインディング、FUNCH_API_URL環境変数を削除した。 このコミットではBFF側の参照のみを扱い、Funch Service本体の リソース定義は変更していない。 Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
Funch Serviceの撤去によりDBへ接続するサービスアカウントが 不要になったため、funch-svcとその環境別ユーザーを database_service_accountsから削除した。 Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
Funch Serviceの撤去に伴い監視する対象がなくなるため、 Service Server Error (Prd)のログフィルタからfunch-apiを削除した。 Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
kantacky
marked this pull request as ready for review
August 1, 2026 09:55
kantacky
requested review from
a team,
Hosoda-abo,
hikaru-0602 and
masaya-osuga
August 1, 2026 09:55
masaya-osuga
approved these changes
Aug 2, 2026
Digger run report at 2026-08-21 00:15:33 (UTC)Plan outputTerraform will perform the following actions:
# google_sql_user.service_account["funch-svc"] will be destroyed
# (because key ["funch-svc"] is not in for_each map)
- resource "google_sql_user" "service_account" {
- database_roles = [
- "dotto_service",
] -> null
- deletion_policy = "DELETE" -> null
- id = "funch-svc@swift2023groupc.iam//dotto" -> null
- instance = "dotto" -> null
- name = "funch-svc@swift2023groupc.iam" -> null
- password_wo = (write-only attribute) -> null
- project = "swift2023groupc" -> null
- sql_server_user_details = [] -> null
- type = "CLOUD_IAM_SERVICE_ACCOUNT" -> null
# (2 unchanged attributes hidden)
}
# google_sql_user.service_account["funch-svc-dev"] will be destroyed
# (because key ["funch-svc-dev"] is not in for_each map)
- resource "google_sql_user" "service_account" {
- database_roles = [
- "dotto_service",
] -> null
- deletion_policy = "DELETE" -> null
- id = "funch-svc-dev@swift2023groupc.iam//dotto" -> null
- instance = "dotto" -> null
- name = "funch-svc-dev@swift2023groupc.iam" -> null
- password_wo = (write-only attribute) -> null
- project = "swift2023groupc" -> null
- sql_server_user_details = [] -> null
- type = "CLOUD_IAM_SERVICE_ACCOUNT" -> null
# (2 unchanged attributes hidden)
}
# google_sql_user.service_account["funch-svc-stg"] will be destroyed
# (because key ["funch-svc-stg"] is not in for_each map)
- resource "google_sql_user" "service_account" {
- database_roles = [
- "dotto_service",
] -> null
- deletion_policy = "DELETE" -> null
- id = "funch-svc-stg@swift2023groupc.iam//dotto" -> null
- instance = "dotto" -> null
- name = "funch-svc-stg@swift2023groupc.iam" -> null
- password_wo = (write-only attribute) -> null
- project = "swift2023groupc" -> null
- sql_server_user_details = [] -> null
- type = "CLOUD_IAM_SERVICE_ACCOUNT" -> null
# (2 unchanged attributes hidden)
}
Plan: 0 to add, 0 to change, 3 to destroy.
Terraform plan validation check (modules-cloud-sql)Terraform plan validation checks succeeded ✅Plan summary
Instructionsdigger apply -p modules-cloud-sql⏩ To apply all changes in this PR: digger apply🚮 To unlock all projects in this PR: digger unlockPlan outputTerraform will perform the following actions:
# google_monitoring_alert_policy.cloud_run_service_server_error_prd will be updated in-place
~ resource "google_monitoring_alert_policy" "cloud_run_service_server_error_prd" {
id = "projects/swift2023groupc/alertPolicies/15636630131453410874"
name = "projects/swift2023groupc/alertPolicies/15636630131453410874"
# (9 unchanged attributes hidden)
~ conditions {
name = "projects/swift2023groupc/alertPolicies/15636630131453410874/conditions/15636630131453410703"
# (1 unchanged attribute hidden)
~ condition_matched_log {
~ filter = <<-EOT
resource.type="cloud_run_revision"
severity >= ERROR
(
resource.labels.service_name="announcement-api" OR
resource.labels.service_name="academic-api" OR
- resource.labels.service_name="funch-api" OR
resource.labels.service_name="user-api"
)
EOT
# (1 unchanged attribute hidden)
}
}
# (1 unchanged block hidden)
}
Plan: 0 to add, 1 to change, 0 to destroy.
Terraform plan validation check (modules-monitoring)Terraform plan validation checks succeeded ✅Plan summary
Instructionsdigger apply -p modules-monitoring⏩ To apply all changes in this PR: digger apply🚮 To unlock all projects in this PR: digger unlockLocking failedProject fun-dotto/infra#server-admin-api-dev locked by another PR #21(failed to acquire lock server-admin-api-dev). The locking plan must be applied or discarded before future plans can executeLocking failedProject fun-dotto/infra#server-admin-api-prd locked by another PR #21(failed to acquire lock server-admin-api-prd). The locking plan must be applied or discarded before future plans can executeLocking failedProject fun-dotto/infra#server-admin-api-stg locked by another PR #21(failed to acquire lock server-admin-api-stg). The locking plan must be applied or discarded before future plans can executeLocking failedProject fun-dotto/infra#server-app-api-dev locked by another PR #21(failed to acquire lock server-app-api-dev). The locking plan must be applied or discarded before future plans can executeLocking failedProject fun-dotto/infra#server-app-api-prd locked by another PR #21(failed to acquire lock server-app-api-prd). The locking plan must be applied or discarded before future plans can executeLocking failedProject fun-dotto/infra#server-app-api-stg locked by another PR #21(failed to acquire lock server-app-api-stg). The locking plan must be applied or discarded before future plans can execute |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
背景
Funch 関連のインフラを撤去する。本 PR はその第 1 段階として、Funch Service を参照している周辺リソースの定義を削除する。
Funch Service 本体(
terraform/google/server/funch-service)は、参照が残ったままだとterraform_remote_stateの解決に失敗するため、本 PR の apply 後に別途 destroy する。変更点
funch_serviceのterraform_remote_stateデータソース、run.invokerの IAM バインディング、FUNCH_API_URL環境変数を削除database_service_accountsからfunch-svc/funch-svc-dev/funch-svc-stgを削除funch-apiを除外Firebase Remote Config の
funchフラグは今回のスコープ外として残している。確認事項
terraform fmt -recursive -checkが通ることを確認済みFUNCH_API_URLを必須で読み込んでいないこと後続作業
terraform/google/server/funch-serviceを dev → stg → prd の順にterraform destroyfunch-serviceディレクトリとdigger.ymlの該当 project を削除する PR を作成swift2023groupc-tfstate/server/funch-service-*を削除🤖 Generated with Claude Code