Skip to content

Commit 46caf3d

Browse files
authored
Remove App Engine from Terraform (#2269)
Fun fact: You can't actually remove App Engine from a Google Cloud project (without deleting and re-creating the whole project). I've experimented with this on a test project - deleting the App Engine resource doesn't seem to do anything besides making Terraform stop tracking it. We can manually disable the App Engine application in the GCP UI, which won't delete our data.
1 parent 4014062 commit 46caf3d

File tree

2 files changed

+1
-24
lines changed

2 files changed

+1
-24
lines changed

deployment/terraform/modules/osv/gcp_apis.tf

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -80,12 +80,6 @@ resource "google_project_service" "service_usage" {
8080
disable_on_destroy = false
8181
}
8282

83-
resource "google_project_service" "app_engine" {
84-
project = var.project_id
85-
service = "appengine.googleapis.com"
86-
disable_on_destroy = false
87-
}
88-
8983
resource "google_project_service" "resource_manager" {
9084
project = var.project_id
9185
service = "cloudresourcemanager.googleapis.com"

deployment/terraform/modules/osv/main.tf

Lines changed: 1 addition & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,5 @@
11
# osv.dev terraform configuration
22

3-
# App Engine
4-
resource "google_app_engine_application" "app" {
5-
project = var.project_id
6-
location_id = "us-west2"
7-
database_type = "CLOUD_DATASTORE_COMPATIBILITY"
8-
9-
}
10-
113
# Datastore
124
resource "google_firestore_database" "datastore" {
135
project = var.project_id
@@ -16,6 +8,7 @@ resource "google_firestore_database" "datastore" {
168
type = "DATASTORE_MODE"
179

1810
lifecycle {
11+
# Destroying the resource doesn't seem to delete the database
1912
prevent_destroy = true
2013
}
2114
}
@@ -193,13 +186,3 @@ resource "google_project_iam_member" "deployment_service" {
193186
role = "roles/editor"
194187
member = "serviceAccount:${google_service_account.deployment_service.email}"
195188
}
196-
197-
data "google_app_engine_default_service_account" "default" {
198-
project = var.project_id
199-
}
200-
201-
resource "google_project_iam_member" "app_engine_service" {
202-
project = var.project_id
203-
role = "roles/editor"
204-
member = "serviceAccount:${data.google_app_engine_default_service_account.default.email}"
205-
}

0 commit comments

Comments
 (0)