Clean up AppEngine examples (#2512)

Merged PR #2512.

products/appengine/terraform.yaml

@@ -60,9 +60,9 @@ overrides: !ruby/object:Overrides::ResourceOverrides
     examples:
       - !ruby/object:Provider::Terraform::Examples
         name: "app_engine_standard_app_version"
-        primary_resource_id: "version_id"
+        primary_resource_id: "myapp_v1"
         ignore_read_extra:
-          - "noop_on_destroy"
+          - "delete_service_on_destroy"
         vars:
           project_id: "test-project"
           bucket_name: "appengine-static-content"
@@ -102,9 +102,8 @@ overrides: !ruby/object:Overrides::ResourceOverrides
     examples:
       - !ruby/object:Provider::Terraform::Examples
         name: "app_engine_application_url_dispatch_rules_basic"
-        primary_resource_id: "service_rules"
+        primary_resource_id: "web_service"
         vars:
-          project: "my-project"  
           bucket_name: "appengine-test-bucket"
 
 # This is for copying files over

templates/terraform/examples/app_engine_application_url_dispatch_rules_basic.tf.erb

@@ -1,43 +1,45 @@
-resource "google_storage_bucket" "bucket" {
-	name = "<%= ctx[:vars]['bucket_name'] %>"
-}
+resource "google_app_engine_application_url_dispatch_rules" "<%= ctx[:primary_resource_id] %>" {
+  dispatch_rules {
+    domain = "*"
+    path = "/*"
+    service = "default"
+  }
 
-resource "google_storage_bucket_object" "object" {
-	name   = "hello-world.zip"
-	bucket = "${google_storage_bucket.bucket.name}"
-	source = "./test-fixtures/appengine/hello-world.zip"
+  dispatch_rules {
+    domain = "*"
+    path = "/admin/*"
+    service = "${google_app_engine_standard_app_version.admin_v3.service}"
+  }
 }
 
-resource "google_app_engine_standard_app_version" "myapp_v1" {
-  version_id = "v1"
-  service = "myapp"
+resource "google_app_engine_standard_app_version" "admin_v3" {
+  version_id = "v3"
+  service = "admin"
   runtime = "nodejs10"
-  noop_on_destroy = true
+
   entrypoint {
     shell = "node ./app.js"
   }
+
   deployment {
     zip {
-      source_url = "https://storage.googleapis.com/${google_storage_bucket.bucket.name}/hello-world.zip"
-    }  
+      source_url = "https://storage.googleapis.com/${google_storage_bucket.bucket.name}/${google_storage_bucket_object.object.name}"
+    }
   }
+
   env_variables = {
     port = "8080"
-  } 
-  depends_on = ["google_storage_bucket_object.object"]
+  }
 
+  noop_on_destroy = true
 }
 
-resource "google_app_engine_application_url_dispatch_rules" "service_rules" {
-  # project = "my-project"
-  dispatch_rules {
-    domain = "*"
-    path = "/default/*"
-    service = "default"
-  }
-  dispatch_rules {
-    domain = "*"
-    path = "/myapp/*"
-    service = "${google_app_engine_standard_app_version.myapp_v1.service}"
-  }
+resource "google_storage_bucket" "bucket" {
+	name = "<%= ctx[:vars]['bucket_name'] %>"
+}
+
+resource "google_storage_bucket_object" "object" {
+	name   = "hello-world.zip"
+	bucket = "${google_storage_bucket.bucket.name}"
+	source = "./test-fixtures/appengine/hello-world.zip"
 }

templates/terraform/examples/app_engine_standard_app_version.tf.erb

@@ -1,65 +1,53 @@
-resource "google_storage_bucket" "bucket" {
-	name = "<%= ctx[:vars]['bucket_name'] %>"
-}
-
-resource "google_storage_bucket_object" "object" {
-	name   = "hello-world.zip"
-	bucket = "${google_storage_bucket.bucket.name}"
-	source = "./test-fixtures/appengine/hello-world.zip"
-}
-
 resource "google_app_engine_standard_app_version" "<%= ctx[:primary_resource_id] %>" {
-  version_id = "v2"
-  service = "default"
-  runtime = "nodejs10"
-  noop_on_destroy = true
+  version_id = "v1"
+  service    = "myapp"
+  runtime    = "nodejs10"
+
   entrypoint {
     shell = "node ./app.js"
   }
+
   deployment {
     zip {
-      source_url = "https://storage.googleapis.com/${google_storage_bucket.bucket.name}/hello-world.zip"
-    }  
+      source_url = "https://storage.googleapis.com/${google_storage_bucket.bucket.name}/${google_storage_bucket_object.object.name}"
+    }
   }
+
   env_variables = {
     port = "8080"
-  } 
-
-}
+  }
 
-resource "google_app_engine_standard_app_version" "myapp_v1" {
-  version_id = "v1"
-  service = "myapp"
-  runtime = "nodejs10"
   delete_service_on_destroy = true
-  entrypoint {
-    shell = "node ./app.js"
-  }
-  deployment {
-    zip {
-      source_url = "https://storage.googleapis.com/${google_storage_bucket.bucket.name}/hello-world.zip"
-    }  
-  }
-  env_variables = {
-    port = "8080"
-  } 
-  depends_on = ["google_storage_bucket_object.object"]
 }
+
 resource "google_app_engine_standard_app_version" "myapp_v2" {
   version_id = "v2"
-  service = "myapp"
-  runtime = "nodejs10"
+  service    = "myapp"
+  runtime    = "nodejs10"
+
   entrypoint {
     shell = "node ./app.js"
   }
+
   deployment {
     zip {
-      source_url = "https://storage.googleapis.com/${google_storage_bucket.bucket.name}/hello-world.zip"
-    }  
+      source_url = "https://storage.googleapis.com/${google_storage_bucket.bucket.name}/${google_storage_bucket_object.object.name}"
+    }
   }
+
   env_variables = {
     port = "8080"
-  } 
-  depends_on = ["google_app_engine_standard_app_version.myapp_v1"]
+  }
 
+  noop_on_destroy = true
+}
+
+resource "google_storage_bucket" "bucket" {
+	name = "<%= ctx[:vars]['bucket_name'] %>"
+}
+
+resource "google_storage_bucket_object" "object" {
+	name   = "hello-world.zip"
+	bucket = "${google_storage_bucket.bucket.name}"
+	source = "./test-fixtures/appengine/hello-world.zip"
 }