Migrate monitoring monitored project to mmv1 (#8008) (#5835)

* Migrate monitoring monitored project to mmv1

* Use function from tpgresource package

* Remove extra blank line

Signed-off-by: Modular Magician <[email protected]>

Author: modular-magician

.changelog/8008.txt

@@ -0,0 +1,3 @@
+```release-note:none
+
+```

google-beta/provider/provider.go

@@ -1054,9 +1054,9 @@ func DatasourceMapWithErrors() (map[string]*schema.Resource, error) {
 		})
 }
 
-// Generated resources: 354
+// Generated resources: 355
 // Generated IAM resources: 228
-// Total generated resources: 582
+// Total generated resources: 583
 func ResourceMap() map[string]*schema.Resource {
 	resourceMap, _ := ResourceMapWithErrors()
 	return resourceMap
@@ -1502,6 +1502,7 @@ func ResourceMapWithErrors() (map[string]*schema.Resource, error) {
 			"google_monitoring_service":                                      monitoring.ResourceMonitoringGenericService(),
 			"google_monitoring_group":                                        monitoring.ResourceMonitoringGroup(),
 			"google_monitoring_metric_descriptor":                            monitoring.ResourceMonitoringMetricDescriptor(),
+			"google_monitoring_monitored_project":                            monitoring.ResourceMonitoringMonitoredProject(),
 			"google_monitoring_notification_channel":                         monitoring.ResourceMonitoringNotificationChannel(),
 			"google_monitoring_custom_service":                               monitoring.ResourceMonitoringService(),
 			"google_monitoring_slo":                                          monitoring.ResourceMonitoringSlo(),

google-beta/provider/provider_dcl_resources.go

@@ -34,7 +34,6 @@ import (
 	"github.com/hashicorp/terraform-provider-google-beta/google-beta/services/eventarc"
 	"github.com/hashicorp/terraform-provider-google-beta/google-beta/services/firebaserules"
 	"github.com/hashicorp/terraform-provider-google-beta/google-beta/services/gkehub"
-	"github.com/hashicorp/terraform-provider-google-beta/google-beta/services/monitoring"
 	"github.com/hashicorp/terraform-provider-google-beta/google-beta/services/networkconnectivity"
 	"github.com/hashicorp/terraform-provider-google-beta/google-beta/services/orgpolicy"
 	"github.com/hashicorp/terraform-provider-google-beta/google-beta/services/privateca"
@@ -74,7 +73,6 @@ var dclResources = map[string]*schema.Resource{
 	"google_firebaserules_release":                              firebaserules.ResourceFirebaserulesRelease(),
 	"google_firebaserules_ruleset":                              firebaserules.ResourceFirebaserulesRuleset(),
 	"google_gke_hub_feature_membership":                         gkehub.ResourceGkeHubFeatureMembership(),
-	"google_monitoring_monitored_project":                       monitoring.ResourceMonitoringMonitoredProject(),
 	"google_network_connectivity_hub":                           networkconnectivity.ResourceNetworkConnectivityHub(),
 	"google_network_connectivity_spoke":                         networkconnectivity.ResourceNetworkConnectivitySpoke(),
 	"google_org_policy_policy":                                  orgpolicy.ResourceOrgPolicyPolicy(),

google-beta/resource_monitoring_monitored_project_generated_test.go

@@ -3,42 +3,41 @@
 
 // ----------------------------------------------------------------------------
 //
-//     ***     AUTO GENERATED CODE    ***    Type: DCL     ***
+//     ***     AUTO GENERATED CODE    ***    Type: MMv1     ***
 //
 // ----------------------------------------------------------------------------
 //
-//     This file is managed by Magic Modules (https://github.com/GoogleCloudPlatform/magic-modules)
-//     and is based on the DCL (https://github.com/GoogleCloudPlatform/declarative-resource-client-library).
-//     Changes will need to be made to the DCL or Magic Modules instead of here.
+//     This file is automatically generated by Magic Modules and manual
+//     changes will be clobbered when the file is regenerated.
 //
-//     We are not currently able to accept contributions to this file. If changes
-//     are required, please file an issue at https://github.com/hashicorp/terraform-provider-google/issues/new/choose
+//     Please read more about how to change this file in
+//     .github/CONTRIBUTING.md.
 //
 // ----------------------------------------------------------------------------
 
 package google
 
 import (
-	"context"
 	"fmt"
-	dcl "github.com/GoogleCloudPlatform/declarative-resource-client-library/dcl"
-	monitoring "github.com/GoogleCloudPlatform/declarative-resource-client-library/services/google/monitoring/beta"
-	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
-	"github.com/hashicorp/terraform-plugin-sdk/v2/terraform"
+	"strconv"
 	"strings"
 	"testing"
 
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
+	"github.com/hashicorp/terraform-plugin-sdk/v2/terraform"
+
 	"github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest"
 	"github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar"
+	"github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource"
 	transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport"
 )
 
-func TestAccMonitoringMonitoredProject_BasicMonitoredProject(t *testing.T) {
+func TestAccMonitoringMonitoredProject_monitoringMonitoredProjectBasicExample(t *testing.T) {
 	t.Parallel()
 
 	context := map[string]interface{}{
 		"org_id":        envvar.GetTestOrgFromEnv(t),
-		"project_name":  envvar.GetTestProjectFromEnv(),
+		"project_id":    envvar.GetTestProjectFromEnv(),
 		"random_suffix": RandString(t, 10),
 	}
 
@@ -48,38 +47,37 @@ func TestAccMonitoringMonitoredProject_BasicMonitoredProject(t *testing.T) {
 		CheckDestroy:             testAccCheckMonitoringMonitoredProjectDestroyProducer(t),
 		Steps: []resource.TestStep{
 			{
-				Config: testAccMonitoringMonitoredProject_BasicMonitoredProject(context),
+				Config: testAccMonitoringMonitoredProject_monitoringMonitoredProjectBasicExample(context),
 			},
 			{
-				ResourceName:      "google_monitoring_monitored_project.primary",
-				ImportState:       true,
-				ImportStateVerify: true,
+				ResourceName:            "google_monitoring_monitored_project.primary",
+				ImportState:             true,
+				ImportStateVerify:       true,
+				ImportStateVerifyIgnore: []string{"metrics_scope"},
 			},
 		},
 	})
 }
 
-func testAccMonitoringMonitoredProject_BasicMonitoredProject(context map[string]interface{}) string {
+func testAccMonitoringMonitoredProject_monitoringMonitoredProjectBasicExample(context map[string]interface{}) string {
 	return acctest.Nprintf(`
 resource "google_monitoring_monitored_project" "primary" {
-  metrics_scope = "%{project_name}"
+  metrics_scope = "%{project_id}"
   name          = google_project.basic.name
 }
 
 resource "google_project" "basic" {
-  project_id = "tf-test-id%{random_suffix}"
-  name       = "tf-test-id%{random_suffix}"
+  project_id = "tf-test-m-id%{random_suffix}"
+  name       = "tf-test-m-id%{random_suffix}"
   org_id     = "%{org_id}"
 }
-
-
 `, context)
 }
 
 func testAccCheckMonitoringMonitoredProjectDestroyProducer(t *testing.T) func(s *terraform.State) error {
 	return func(s *terraform.State) error {
 		for name, rs := range s.RootModule().Resources {
-			if rs.Type != "rs.google_monitoring_monitored_project" {
+			if rs.Type != "google_monitoring_monitored_project" {
 				continue
 			}
 			if strings.HasPrefix(name, "data.") {
@@ -88,23 +86,36 @@ func testAccCheckMonitoringMonitoredProjectDestroyProducer(t *testing.T) func(s
 
 			config := GoogleProviderConfig(t)
 
+			url, err := tpgresource.ReplaceVarsForTest(config, rs, "{{MonitoringBasePath}}v1/locations/global/metricsScopes/{{metrics_scope}}")
+			if err != nil {
+				return err
+			}
+
 			billingProject := ""
+
 			if config.BillingProject != "" {
 				billingProject = config.BillingProject
 			}
 
-			obj := &monitoring.MonitoredProject{
-				MetricsScope: dcl.String(rs.Primary.Attributes["metrics_scope"]),
-				Name:         dcl.String(rs.Primary.Attributes["name"]),
-				CreateTime:   dcl.StringOrNil(rs.Primary.Attributes["create_time"]),
-			}
-
-			client := transport_tpg.NewDCLMonitoringClient(config, config.UserAgent, billingProject, 0)
-			_, err := client.GetMonitoredProject(context.Background(), obj)
-			if err == nil {
-				return fmt.Errorf("google_monitoring_monitored_project still exists %v", obj)
+			res, err := transport_tpg.SendRequest(transport_tpg.SendRequestOptions{
+				Config:    config,
+				Method:    "GET",
+				Project:   billingProject,
+				RawURL:    url,
+				UserAgent: config.UserAgent,
+			})
+
+			rName := tpgresource.GetResourceNameFromSelfLink(rs.Primary.Attributes["name"])
+			project, err := config.NewResourceManagerClient(config.UserAgent).Projects.Get(rName).Do()
+			rName = strconv.FormatInt(project.ProjectNumber, 10)
+
+			for _, monitoredProject := range res["monitoredProjects"].([]any) {
+				if strings.HasSuffix(monitoredProject.(map[string]any)["name"].(string), rName) {
+					return fmt.Errorf("MonitoringMonitoredProject still exists at %s", url)
+				}
 			}
 		}
+
 		return nil
 	}
 }