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

modular-magician · web-flow · commit 79b564bb8d30 · 2024-10-24T09:42:38.000-07:00
[upstream:17c4060613d42178fcb9de8e9f3a578d3b243c2a]

Signed-off-by: Modular Magician &lt;magic-modules@google.com&gt;
diff --git a/.changelog/12017.txt b/.changelog/12017.txt
@@ -0,0 +1,3 @@
+```release-note:enhancement
+apphub: added `GLOBAL` enum value to `scope.type` field in `google_apphub_application` resource
+```
diff --git a/google-beta/services/apphub/resource_apphub_application.go b/google-beta/services/apphub/resource_apphub_application.go
@@ -18,6 +18,7 @@
 package apphub
 
 import (
+	"context"
 	"fmt"
 	"log"
 	"net/http"
@@ -33,6 +34,24 @@ import (
 	"github.com/hashicorp/terraform-provider-google-beta/google-beta/verify"
 )
 
+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
+}
+
 func ResourceApphubApplication() *schema.Resource {
 	return &schema.Resource{
 		Create: resourceApphubApplicationCreate,
@@ -51,6 +70,7 @@ func ResourceApphubApplication() *schema.Resource {
 		},
 
 		CustomizeDiff: customdiff.All(
+			apphubApplicationCustomizeDiff,
 			tpgresource.DefaultProviderProject,
 		),
 
@@ -77,10 +97,11 @@ func ResourceApphubApplication() *schema.Resource {
 						"type": {
 							Type:         schema.TypeString,
 							Required:     true,
-							ValidateFunc: verify.ValidateEnum([]string{"REGIONAL"}),
+							ValidateFunc: verify.ValidateEnum([]string{"REGIONAL", "GLOBAL"}),
 							Description: `Required. Scope Type. 
  Possible values:
-REGIONAL Possible values: ["REGIONAL"]`,
+REGIONAL
+GLOBAL Possible values: ["REGIONAL", "GLOBAL"]`,
 						},
 					},
 				},
diff --git a/google-beta/services/apphub/resource_apphub_application_generated_test.go b/google-beta/services/apphub/resource_apphub_application_generated_test.go
@@ -30,10 +30,12 @@ import (
 	transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport"
 )
 
-func TestAccApphubApplication_applicationBasicExample(t *testing.T) {
+func TestAccApphubApplication_apphubApplicationBasicExample(t *testing.T) {
 	t.Parallel()
 
 	context := map[string]interface{}{
+		"location":      "us-east1",
+		"scope_type":    "REGIONAL",
 		"random_suffix": acctest.RandString(t, 10),
 	}
 
@@ -43,7 +45,7 @@ func TestAccApphubApplication_applicationBasicExample(t *testing.T) {
 		CheckDestroy:             testAccCheckApphubApplicationDestroyProducer(t),
 		Steps: []resource.TestStep{
 			{
-				Config: testAccApphubApplication_applicationBasicExample(context),
+				Config: testAccApphubApplication_apphubApplicationBasicExample(context),
 			},
 			{
 				ResourceName:            "google_apphub_application.example",
@@ -55,19 +57,58 @@ func TestAccApphubApplication_applicationBasicExample(t *testing.T) {
 	})
 }
 
-func testAccApphubApplication_applicationBasicExample(context map[string]interface{}) string {
+func testAccApphubApplication_apphubApplicationBasicExample(context map[string]interface{}) string {
 	return acctest.Nprintf(`
 resource "google_apphub_application" "example" {
-  location = "us-east1"
+  location = "%{location}"
   application_id = "tf-test-example-application%{random_suffix}"
   scope {
-    type = "REGIONAL"
+    type = "%{scope_type}"
+  }
+}
+`, context)
+}
+
+func TestAccApphubApplication_apphubApplicationGlobalBasicExample(t *testing.T) {
+	t.Parallel()
+
+	context := map[string]interface{}{
+		"location":      "global",
+		"scope_type":    "GLOBAL",
+		"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_apphubApplicationGlobalBasicExample(context),
+			},
+			{
+				ResourceName:            "google_apphub_application.example",
+				ImportState:             true,
+				ImportStateVerify:       true,
+				ImportStateVerifyIgnore: []string{"application_id", "location"},
+			},
+		},
+	})
+}
+
+func testAccApphubApplication_apphubApplicationGlobalBasicExample(context map[string]interface{}) string {
+	return acctest.Nprintf(`
+resource "google_apphub_application" "example" {
+  location = "%{location}"
+  application_id = "tf-test-example-application%{random_suffix}"
+  scope {
+    type = "%{scope_type}"
   }
 }
 `, context)
 }
 
-func TestAccApphubApplication_applicationFullExample(t *testing.T) {
+func TestAccApphubApplication_apphubApplicationFullExample(t *testing.T) {
 	t.Parallel()
 
 	context := map[string]interface{}{
@@ -80,7 +121,7 @@ func TestAccApphubApplication_applicationFullExample(t *testing.T) {
 		CheckDestroy:             testAccCheckApphubApplicationDestroyProducer(t),
 		Steps: []resource.TestStep{
 			{
-				Config: testAccApphubApplication_applicationFullExample(context),
+				Config: testAccApphubApplication_apphubApplicationFullExample(context),
 			},
 			{
 				ResourceName:            "google_apphub_application.example2",
@@ -92,7 +133,7 @@ func TestAccApphubApplication_applicationFullExample(t *testing.T) {
 	})
 }
 
-func testAccApphubApplication_applicationFullExample(context map[string]interface{}) string {
+func testAccApphubApplication_apphubApplicationFullExample(context map[string]interface{}) string {
 	return acctest.Nprintf(`
 resource "google_apphub_application" "example2" {
   location = "us-east1"
diff --git a/google-beta/services/apphub/resource_apphub_application_test.go b/google-beta/services/apphub/resource_apphub_application_test.go
@@ -3,6 +3,7 @@
 package apphub_test
 
 import (
+	"regexp"
 	"testing"
 
 	"github.com/hashicorp/terraform-plugin-testing/helper/resource"
@@ -23,7 +24,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",
@@ -210,3 +211,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)
+}
diff --git a/website/docs/r/apphub_application.html.markdown b/website/docs/r/apphub_application.html.markdown
@@ -24,11 +24,11 @@ Application is a functional grouping of Services and Workloads that helps achiev
 
 
 <div class = "oics-button" style="float: right; margin: 0 0 -15px">
-  <a href="https://console.cloud.google.com/cloudshell/open?cloudshell_git_repo=https%3A%2F%2Fgithub.jpy.wang%2Fterraform-google-modules%2Fdocs-examples.git&cloudshell_image=gcr.io%2Fcloudshell-images%2Fcloudshell%3Alatest&cloudshell_print=.%2Fmotd&cloudshell_tutorial=.%2Ftutorial.md&cloudshell_working_dir=application_basic&open_in_editor=main.tf" target="_blank">
+  <a href="https://console.cloud.google.com/cloudshell/open?cloudshell_git_repo=https%3A%2F%2Fgithub.jpy.wang%2Fterraform-google-modules%2Fdocs-examples.git&cloudshell_image=gcr.io%2Fcloudshell-images%2Fcloudshell%3Alatest&cloudshell_print=.%2Fmotd&cloudshell_tutorial=.%2Ftutorial.md&cloudshell_working_dir=apphub_application_basic&open_in_editor=main.tf" target="_blank">
     <img alt="Open in Cloud Shell" src="//gstatic.com/cloudssh/images/open-btn.svg" style="max-height: 44px; margin: 32px auto; max-width: 100%;">
   </a>
 </div>
-## Example Usage - Application Basic
+## Example Usage - Apphub Application Basic
 
 
 ```hcl
@@ -41,11 +41,28 @@ resource "google_apphub_application" "example" {
 }
 ```
 <div class = "oics-button" style="float: right; margin: 0 0 -15px">
-  <a href="https://console.cloud.google.com/cloudshell/open?cloudshell_git_repo=https%3A%2F%2Fgithub.jpy.wang%2Fterraform-google-modules%2Fdocs-examples.git&cloudshell_image=gcr.io%2Fcloudshell-images%2Fcloudshell%3Alatest&cloudshell_print=.%2Fmotd&cloudshell_tutorial=.%2Ftutorial.md&cloudshell_working_dir=application_full&open_in_editor=main.tf" target="_blank">
+  <a href="https://console.cloud.google.com/cloudshell/open?cloudshell_git_repo=https%3A%2F%2Fgithub.jpy.wang%2Fterraform-google-modules%2Fdocs-examples.git&cloudshell_image=gcr.io%2Fcloudshell-images%2Fcloudshell%3Alatest&cloudshell_print=.%2Fmotd&cloudshell_tutorial=.%2Ftutorial.md&cloudshell_working_dir=apphub_application_global_basic&open_in_editor=main.tf" target="_blank">
     <img alt="Open in Cloud Shell" src="//gstatic.com/cloudssh/images/open-btn.svg" style="max-height: 44px; margin: 32px auto; max-width: 100%;">
   </a>
 </div>
-## Example Usage - Application Full
+## Example Usage - Apphub Application Global Basic
+
+
+```hcl
+resource "google_apphub_application" "example" {
+  location = "global"
+  application_id = "example-application"
+  scope {
+    type = "GLOBAL"
+  }
+}
+```
+<div class = "oics-button" style="float: right; margin: 0 0 -15px">
+  <a href="https://console.cloud.google.com/cloudshell/open?cloudshell_git_repo=https%3A%2F%2Fgithub.jpy.wang%2Fterraform-google-modules%2Fdocs-examples.git&cloudshell_image=gcr.io%2Fcloudshell-images%2Fcloudshell%3Alatest&cloudshell_print=.%2Fmotd&cloudshell_tutorial=.%2Ftutorial.md&cloudshell_working_dir=apphub_application_full&open_in_editor=main.tf" target="_blank">
+    <img alt="Open in Cloud Shell" src="//gstatic.com/cloudssh/images/open-btn.svg" style="max-height: 44px; margin: 32px auto; max-width: 100%;">
+  </a>
+</div>
+## Example Usage - Apphub Application Full
 
 
 ```hcl
@@ -106,7 +123,8 @@ The following arguments are supported:
   Required. Scope Type. 
    Possible values:
   REGIONAL
-  Possible values are: `REGIONAL`.
+  GLOBAL
+  Possible values are: `REGIONAL`, `GLOBAL`.
 
 - - -
 

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	+```release-note:enhancement
	`2`	+apphub: added `GLOBAL` enum value to `scope.type` field in `google_apphub_application` resource
	`3`	+```