GoogleCloudPlatform · SarahFrench · Mar 26, 2024 · Feb 20, 2024 · Feb 20, 2024 · Feb 21, 2024
diff --git a/.ci/magician/cmd/generate_comment_test.go b/.ci/magician/cmd/generate_comment_test.go
@@ -20,9 +20,8 @@ import (
 	"reflect"
 	"testing"
 
-	"magician/source"
-
 	"github.com/stretchr/testify/assert"
+	"magician/source"
 )
 
 func TestExecGenerateComment(t *testing.T) {

diff --git a/mmv1/products/integrations/Client.yaml b/mmv1/products/integrations/Client.yaml
@@ -24,8 +24,9 @@ base_url: 'projects/{{project}}/locations/{{location}}/clients'
 self_link: 'projects/{{project}}/locations/{{location}}/clients'
 immutable: true
 create_url: 'projects/{{project}}/locations/{{location}}/clients:provision'
+delete_url: 'projects/{{project}}/locations/{{location}}/clients:deprovision'
+delete_verb: :POST
 autogen_async: false
-skip_delete: true
 import_format:
   [
     'projects/{{project}}/locations/{{location}}/clients',

diff --git a/mmv1/third_party/terraform/go.mod.erb b/mmv1/third_party/terraform/go.mod.erb
@@ -5,7 +5,7 @@ go 1.21
 
 require (
 	cloud.google.com/go/bigtable v1.19.0
-	github.com/GoogleCloudPlatform/declarative-resource-client-library v1.63.0
+	github.com/GoogleCloudPlatform/declarative-resource-client-library v1.64.0
 	github.com/apparentlymart/go-cidr v1.1.0
 	github.com/davecgh/go-spew v1.1.1
 	github.com/dnaeon/go-vcr v1.0.1

diff --git a/mmv1/third_party/terraform/go.sum b/mmv1/third_party/terraform/go.sum
@@ -16,8 +16,8 @@ cloud.google.com/go/longrunning v0.5.5/go.mod h1:WV2LAxD8/rg5Z1cNW6FJ/ZpX4E4VnDn
 dario.cat/mergo v1.0.0 h1:AGCNq9Evsj31mOgNPcLyXc+4PNABt905YmuqPYYpBWk=
 dario.cat/mergo v1.0.0/go.mod h1:uNxQE+84aUszobStD9th8a29P2fMDhsBdgRYvZOxGmk=
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
-github.com/GoogleCloudPlatform/declarative-resource-client-library v1.63.0 h1:eSOBYPZVnU2fZul9sAJFGLVCgv6stNVKkmsogKF7UeY=
-github.com/GoogleCloudPlatform/declarative-resource-client-library v1.63.0/go.mod h1:pL2Qt5HT+x6xrTd806oMiM3awW6kNIXB/iiuClz6m6k=
+github.com/GoogleCloudPlatform/declarative-resource-client-library v1.64.0 h1:QA90iKudX8ijAW795f/jVbo0oEo7VoevwxLCNyi2qRc=
+github.com/GoogleCloudPlatform/declarative-resource-client-library v1.64.0/go.mod h1:pL2Qt5HT+x6xrTd806oMiM3awW6kNIXB/iiuClz6m6k=
 github.com/Microsoft/go-winio v0.6.1 h1:9/kr64B9VUZrLm5YYwbGtUJnMgqWVOdUAXu6Migciow=
 github.com/Microsoft/go-winio v0.6.1/go.mod h1:LRdKpFKfdobln8UmuiYcKPot9D2v6svN5+sAH+4kjUM=
 github.com/ProtonMail/go-crypto v1.1.0-alpha.0 h1:nHGfwXmFvJrSR9xu8qL7BkO4DqTHXE9N5vPhgY2I+j0=

diff --git a/mmv1/third_party/terraform/provider/provider_mmv1_resources.go.erb b/mmv1/third_party/terraform/provider/provider_mmv1_resources.go.erb
@@ -29,6 +29,7 @@ var handwrittenDatasources = map[string]*schema.Resource{
 	"google_artifact_registry_repository":              artifactregistry.DataSourceArtifactRegistryRepository(),
 	"google_apphub_discovered_workload":		    apphub.DataSourceApphubDiscoveredWorkload(),
 	"google_app_engine_default_service_account":        appengine.DataSourceGoogleAppEngineDefaultServiceAccount(),
+	"google_apphub_application":						apphub.DataSourceGoogleApphubApplication(),
 	"google_apphub_discovered_service":		    apphub.DataSourceApphubDiscoveredService(),
 	<% unless version == 'ga' -%>
 	"google_backup_dr_management_server":				backupdr.DataSourceGoogleCloudBackupDRService(),

diff --git a/mmv1/third_party/terraform/services/apphub/data_source_apphub_application.go b/mmv1/third_party/terraform/services/apphub/data_source_apphub_application.go
@@ -0,0 +1,45 @@
+package apphub
+
+import (
+	"fmt"
+
+	"github.com/hashicorp/terraform-provider-google/google/tpgresource"
+	transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport"
+
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
+)
+
+func DataSourceGoogleApphubApplication() *schema.Resource {
+	dsSchema := tpgresource.DatasourceSchemaFromResourceSchema(ResourceApphubApplication().Schema)
+	tpgresource.AddRequiredFieldsToSchema(dsSchema, "project")
+	tpgresource.AddRequiredFieldsToSchema(dsSchema, "application_id")
+	tpgresource.AddRequiredFieldsToSchema(dsSchema, "location")
+
+	return &schema.Resource{
+		Read:   dataSourceGoogleApphubApplicationRead,
+		Schema: dsSchema,
+	}
+}
+
+func dataSourceGoogleApphubApplicationRead(d *schema.ResourceData, meta interface{}) error {
+	config := meta.(*transport_tpg.Config)
+
+	id, err := tpgresource.ReplaceVars(d, config, "projects/{{project}}/locations/{{location}}/applications/{{application_id}}")
+	if err != nil {
+		return fmt.Errorf("Error constructing id: %s", err)
+	}
+	d.SetId(id)
+	err = resourceApphubApplicationRead(d, meta)
+	if err != nil {
+		return err
+	}
+
+	if err := tpgresource.SetDataSourceLabels(d); err != nil {
+		return err
+	}
+
+	if d.Id() == "" {
+		return fmt.Errorf("%s not found", id)
+	}
+	return nil
+}
diff --git a/mmv1/third_party/terraform/services/apphub/data_source_apphub_application_test.go b/mmv1/third_party/terraform/services/apphub/data_source_apphub_application_test.go
@@ -0,0 +1,70 @@
+package apphub_test
+
+import (
+	"testing"
+
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
+	"github.com/hashicorp/terraform-provider-google/google/acctest"
+)
+
+func TestDataSourceApphubApplication_basic(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: testDataSourceApphubApplication_basic(context),
+				Check: resource.ComposeTestCheckFunc(
+					acctest.CheckDataSourceStateMatchesResourceState("data.google_apphub_application.example_data", "google_apphub_application.example"),
+				),
+			},
+		},
+	})
+}
+
+func testDataSourceApphubApplication_basic(context map[string]interface{}) string {
+	return acctest.Nprintf(`
+
+data "google_apphub_application" "example_data" {
+	project = google_apphub_application.example.project
+	application_id = google_apphub_application.example.application_id
+	location = google_apphub_application.example.location
+}
+
+resource "google_apphub_application" "example" {
+  location = "us-central1"
+  application_id = "tf-test-example-application%{random_suffix}"
+  display_name = "Application Full New%{random_suffix}"
+  scope {
+    type = "REGIONAL"
+  }
+  attributes {
+    environment {
+      type = "STAGING"
+	  }
+    criticality {  
+      type = "MISSION_CRITICAL"
+    }
+    business_owners {
+      display_name =  "Alice%{random_suffix}"
+      email        =  "alice@google.com%{random_suffix}"
+    }
+    developer_owners {
+      display_name =  "Bob%{random_suffix}"
+      email        =  "bob@google.com%{random_suffix}"
+    }
+    operator_owners {
+      display_name =  "Charlie%{random_suffix}"
+      email        =  "charlie@google.com%{random_suffix}"
+    }
+  }
+}
+`, context)
+}
diff --git a/mmv1/third_party/terraform/services/container/resource_container_cluster_test.go.erb b/mmv1/third_party/terraform/services/container/resource_container_cluster_test.go.erb
@@ -865,7 +865,7 @@ func TestAccContainerCluster_withInvalidReleaseChannel(t *testing.T) {
 		Steps: []resource.TestStep{
 			{
 				Config: testAccContainerCluster_withReleaseChannelEnabled(clusterName, "CANARY", networkName, subnetworkName),
-				ExpectError: regexp.MustCompile(`expected release_channel\.0\.channel to be one of \[UNSPECIFIED RAPID REGULAR STABLE\], got CANARY`),
+				ExpectError: regexp.MustCompile(`expected release_channel\.0\.channel to be one of \["?UNSPECIFIED"? "?RAPID"? "?REGULAR"? "?STABLE"?\], got CANARY`),
 			},
 		},
 	})
@@ -3355,7 +3355,7 @@ func TestAccContainerCluster_withInvalidAutoscalingProfile(t *testing.T) {
 		Steps: []resource.TestStep{
 			{
 				Config: testAccContainerCluster_withAutoscalingProfile(clusterName, "AS_CHEAP_AS_POSSIBLE", networkName, subnetworkName),
-				ExpectError: regexp.MustCompile(`expected cluster_autoscaling\.0\.autoscaling_profile to be one of \[BALANCED OPTIMIZE_UTILIZATION\], got AS_CHEAP_AS_POSSIBLE`),
+				ExpectError: regexp.MustCompile(`expected cluster_autoscaling\.0\.autoscaling_profile to be one of \["?BALANCED"? "?OPTIMIZE_UTILIZATION"?\], got AS_CHEAP_AS_POSSIBLE`),
 			},
 		},
 	})

diff --git a/mmv1/third_party/terraform/services/container/resource_container_node_pool_test.go.erb b/mmv1/third_party/terraform/services/container/resource_container_node_pool_test.go.erb
@@ -574,7 +574,7 @@ func TestAccContainerNodePool_withInvalidKubeletCpuManagerPolicy(t *testing.T) {
 		Steps: []resource.TestStep{
 			{
 				Config:      testAccContainerNodePool_withKubeletConfig(cluster, np, "dontexist", "100us", networkName, subnetworkName, true, 1024),
-				ExpectError: regexp.MustCompile(`.*to be one of \[static none \].*`),
+				ExpectError: regexp.MustCompile(`.*to be one of \["?static"? "?none"? "?"?\].*`),
 			},
 		},
 	})

diff --git a/...erraform/services/firebaseappcheck/resource_firebase_app_check_service_config_test.go.erb b/...erraform/services/firebaseappcheck/resource_firebase_app_check_service_config_test.go.erb
@@ -26,7 +26,6 @@ func TestAccFirebaseAppCheckServiceConfig_firebaseAppCheckServiceConfigUpdate(t
 		ProtoV5ProviderFactories: acctest.ProtoV5ProviderBetaFactories(t),
 		CheckDestroy:             testAccCheckFirebaseAppCheckServiceConfigDestroyProducer(t),
 		ExternalProviders: map[string]resource.ExternalProvider{
-			"random": {},
 			"time":   {},
 		},
 		Steps: []resource.TestStep{
@@ -86,22 +85,26 @@ resource "google_project_service" "database" {
   project  = google_project.default.project_id
   service  = "firebasedatabase.googleapis.com"
   disable_on_destroy = false
+  depends_on = [
+    google_project_service.firebase,
+  ]
 }
 
 resource "google_project_service" "appcheck" {
   provider = google-beta
   project  = google_project.default.project_id
   service  = "firebaseappcheck.googleapis.com"
   disable_on_destroy = false
+  depends_on = [
+    google_project_service.database,
+  ]
 }
 
 resource "google_firebase_project" "default" {
   provider = google-beta
   project  = google_project.default.project_id
 
   depends_on = [
-    google_project_service.firebase,
-    google_project_service.database,
     google_project_service.appcheck,
   ]
 }

diff --git a/mmv1/third_party/terraform/website/docs/d/apphub_application.html.markdown b/mmv1/third_party/terraform/website/docs/d/apphub_application.html.markdown
@@ -0,0 +1,26 @@
+---
+subcategory: "App Hub"
+description: |-
+  Application is a functional grouping of Services and Workloads that helps achieve a desired end-to-end business functionality.
+---
+
+# google\_apphub\_application
+
+Application is a functional grouping of Services and Workloads that helps achieve a desired end-to-end business functionality. Services and Workloads are owned by the Application.
+
+
+## Example Usage
+
+
+```hcl
+data "google_apphub_application" "application" {
+  project = "project-id"
+  application_id = "application"
+  location = "location"
+}
+```
+
+## Argument Reference
+
+See [google_resource_application](https://registry.terraform.io/providers/hashicorp/google/latest/docs/resources/apphub_application#argument-reference) resource for details of the available attributes.
+
diff --git a/tpgtools/go.mod b/tpgtools/go.mod
@@ -4,7 +4,7 @@ go 1.21
 
 require (
 	bitbucket.org/creachadair/stringset v0.0.11
-	github.com/GoogleCloudPlatform/declarative-resource-client-library v1.63.0
+	github.com/GoogleCloudPlatform/declarative-resource-client-library v1.64.0
 	github.com/golang/glog v1.1.2
 	github.com/hashicorp/hcl v1.0.0
 	github.com/kylelemons/godebug v1.1.0

diff --git a/tpgtools/go.sum b/tpgtools/go.sum
@@ -6,8 +6,8 @@ cloud.google.com/go/compute v1.23.0/go.mod h1:4tCnrn48xsqlwSAiLf1HXMQk8CONslYbdi
 cloud.google.com/go/compute/metadata v0.2.3 h1:mg4jlk7mCAj6xXp9UJ4fjI9VUI5rubuGBW5aJ7UnBMY=
 cloud.google.com/go/compute/metadata v0.2.3/go.mod h1:VAV5nSsACxMJvgaAuX6Pk2AawlZn8kiOGuCv6gTkwuA=
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
-github.com/GoogleCloudPlatform/declarative-resource-client-library v1.63.0 h1:eSOBYPZVnU2fZul9sAJFGLVCgv6stNVKkmsogKF7UeY=
-github.com/GoogleCloudPlatform/declarative-resource-client-library v1.63.0/go.mod h1:pL2Qt5HT+x6xrTd806oMiM3awW6kNIXB/iiuClz6m6k=
+github.com/GoogleCloudPlatform/declarative-resource-client-library v1.64.0 h1:QA90iKudX8ijAW795f/jVbo0oEo7VoevwxLCNyi2qRc=
+github.com/GoogleCloudPlatform/declarative-resource-client-library v1.64.0/go.mod h1:pL2Qt5HT+x6xrTd806oMiM3awW6kNIXB/iiuClz6m6k=
 github.com/cenkalti/backoff v2.2.1+incompatible h1:tNowT99t7UNflLxfYYSlKYsBpXdEet03Pg2g16Swow4=
 github.com/cenkalti/backoff v2.2.1+incompatible/go.mod h1:90ReRw6GdpyfrHakVjL/QHaoyV4aDUVVkXQJJJ3NXXM=
 github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=