Add support for global application in Apphub (GoogleCloudPlatform#12017)

Author: eshagoel06

mmv1/products/apphub/Application.yaml

@@ -43,14 +43,30 @@ async:
     path: 'error'
     message: 'message'
 custom_code:
+  constants: 'templates/terraform/constants/apphub_application.go.tmpl'
+custom_diff:
+  - 'apphubApplicationCustomizeDiff'
 examples:
-  - name: 'application_basic'
+  - name: 'apphub_application_basic'
+    primary_resource_id: 'example'
+    vars:
+      application_id: 'example-application'
+      location: 'us-east1'
+      scope_type: 'REGIONAL'
+    test_vars_overrides:
+      'location': '"us-east1"'
+      'scope_type': '"REGIONAL"'
+  - name: 'apphub_application_global_basic'
     config_path: 'templates/terraform/examples/apphub_application_basic.tf.tmpl'
     primary_resource_id: 'example'
     vars:
       application_id: 'example-application'
-  - name: 'application_full'
-    config_path: 'templates/terraform/examples/apphub_application_full.tf.tmpl'
+      location: 'global'
+      scope_type: 'GLOBAL'
+    test_vars_overrides:
+      'location': '"global"'
+      'scope_type': '"GLOBAL"'
+  - name: 'apphub_application_full'
     primary_resource_id: 'example2'
     vars:
       application_id: 'example-application'
@@ -171,10 +187,11 @@ properties:
     properties:
       - name: 'type'
         type: Enum
-        description: "Required. Scope Type. \n Possible values:\nREGIONAL"
+        description: "Required. Scope Type. \n Possible values:\nREGIONAL\nGLOBAL"
         required: true
         enum_values:
           - 'REGIONAL'
+          - 'GLOBAL'
   - name: 'uid'
     type: String
     description: 'Output only. A universally unique identifier (in UUID4 format) for

mmv1/templates/terraform/constants/apphub_application.go.tmpl

@@ -0,0 +1,17 @@
+func apphubApplicationCustomizeDiff(_ context.Context, diff *schema.ResourceDiff, meta interface{}) error {
+    if diff.HasChange("location") || diff.HasChange("scope.0.type") {
+        location := diff.Get("location")
+        scope_type := diff.Get("scope.0.type")
+
+        if scope_type == "GLOBAL" {
+            if location != "global" {
+                return fmt.Errorf("Error validating location %s with %s scope type", location, scope_type)
+            }
+        } else {
+            if location == "global" {
+                return fmt.Errorf("Error validating location %s with %s scope type", location, scope_type)
+            }
+        }
+    }
+    return nil
+}

mmv1/templates/terraform/examples/apphub_application_basic.tf.tmpl

@@ -1,7 +1,7 @@
 resource "google_apphub_application" "{{$.PrimaryResourceId}}" {
-  location = "us-east1"
+  location = "{{index $.Vars "location"}}"
   application_id = "{{index $.Vars "application_id"}}"
   scope {
-    type = "REGIONAL"
+    type = "{{index $.Vars "scope_type"}}"
   }
 }

mmv1/third_party/terraform/services/apphub/resource_apphub_application_test.go

@@ -1,6 +1,7 @@
 package apphub_test
 
 import (
+	"regexp"
 	"testing"
 
 	"github.com/hashicorp/terraform-plugin-testing/helper/resource"
@@ -21,7 +22,7 @@ func TestAccApphubApplication_applicationUpdateFull(t *testing.T) {
 		CheckDestroy:             testAccCheckApphubApplicationDestroyProducer(t),
 		Steps: []resource.TestStep{
 			{
-				Config: testAccApphubApplication_applicationFullExample(context),
+				Config: testAccApphubApplication_apphubApplicationFullExample(context),
 			},
 			{
 				ResourceName:            "google_apphub_application.example2",
@@ -208,3 +209,53 @@ resource "google_apphub_application" "example2" {
 }
 `, context)
 }
+
+func TestAccApphubApplication_invalidConfigFails(t *testing.T) {
+	t.Parallel()
+
+	context := map[string]interface{}{
+		"random_suffix": acctest.RandString(t, 10),
+	}
+
+	acctest.VcrTest(t, resource.TestCase{
+		PreCheck:                 func() { acctest.AccTestPreCheck(t) },
+		ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t),
+		CheckDestroy:             testAccCheckApphubApplicationDestroyProducer(t),
+		Steps: []resource.TestStep{
+			{
+				Config:      testAccApphubApplication_applicationInvalidConfig1(context),
+				ExpectError: regexp.MustCompile("Error validating location global with REGIONAL scope type"),
+			},
+			{
+				Config:      testAccApphubApplication_applicationInvalidConfig2(context),
+				ExpectError: regexp.MustCompile("Error validating location us-east1 with GLOBAL scope type"),
+			},
+		},
+	})
+}
+
+func testAccApphubApplication_applicationInvalidConfig1(context map[string]interface{}) string {
+	return acctest.Nprintf(`
+
+resource "google_apphub_application" "invalid_example" {
+  location = "global"
+  application_id = "tf-test-invalid-example-application%{random_suffix}"
+  scope {
+    type = "REGIONAL"
+  }
+}
+`, context)
+}
+
+func testAccApphubApplication_applicationInvalidConfig2(context map[string]interface{}) string {
+	return acctest.Nprintf(`
+
+resource "google_apphub_application" "invalid_example" {
+  location = "us-east1"
+  application_id = "tf-test-invalid-example-application%{random_suffix}"
+  scope {
+    type = "GLOBAL"
+  }
+}
+`, context)
+}