Monitoring monitored project (#8322) (#5882)

* Allow property to work for monitoring monitored project

* Change display name

* Move handling of long form to encoder

* Add error retry predicate

* Add a pre-read

* Retry all 403 errors

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

Author: modular-magician

.changelog/8322.txt

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

google-beta/resource_monitoring_monitored_project_generated_test.go

@@ -63,12 +63,12 @@ func testAccMonitoringMonitoredProject_monitoringMonitoredProjectBasicExample(co
 	return acctest.Nprintf(`
 resource "google_monitoring_monitored_project" "primary" {
   metrics_scope = "%{project_id}"
-  name          = google_project.basic.name
+  name          = google_project.basic.project_id
 }
 
 resource "google_project" "basic" {
   project_id = "tf-test-m-id%{random_suffix}"
-  name       = "tf-test-m-id%{random_suffix}"
+  name       = "tf-test-m-id%{random_suffix}-display"
   org_id     = "%{org_id}"
 }
 `, context)

google-beta/services/monitoring/resource_monitoring_monitored_project.go

@@ -21,7 +21,6 @@ import (
 	"fmt"
 	"log"
 	"reflect"
-	"strings"
 	"time"
 
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
@@ -47,10 +46,11 @@ func ResourceMonitoringMonitoredProject() *schema.Resource {
 
 		Schema: map[string]*schema.Schema{
 			"metrics_scope": {
-				Type:        schema.TypeString,
-				Required:    true,
-				ForceNew:    true,
-				Description: `Required. The resource name of the existing Metrics Scope that will monitor this project. Example: locations/global/metricsScopes/{SCOPING_PROJECT_ID_OR_NUMBER}`,
+				Type:             schema.TypeString,
+				Required:         true,
+				ForceNew:         true,
+				DiffSuppressFunc: tpgresource.CompareResourceNames,
+				Description:      `Required. The resource name of the existing Metrics Scope that will monitor this project. Example: locations/global/metricsScopes/{SCOPING_PROJECT_ID_OR_NUMBER}`,
 			},
 			"name": {
 				Type:        schema.TypeString,
@@ -92,7 +92,6 @@ func resourceMonitoringMonitoredProjectCreate(d *schema.ResourceData, meta inter
 	if err != nil {
 		return err
 	}
-	url = strings.ReplaceAll(url, "projects/projects/", "projects/")
 
 	log.Printf("[DEBUG] Creating new MonitoredProject: %#v", obj)
 	billingProject := ""
@@ -103,13 +102,14 @@ func resourceMonitoringMonitoredProjectCreate(d *schema.ResourceData, meta inter
 	}
 
 	res, err := transport_tpg.SendRequest(transport_tpg.SendRequestOptions{
-		Config:    config,
-		Method:    "POST",
-		Project:   billingProject,
-		RawURL:    url,
-		UserAgent: userAgent,
-		Body:      obj,
-		Timeout:   d.Timeout(schema.TimeoutCreate),
+		Config:               config,
+		Method:               "POST",
+		Project:              billingProject,
+		RawURL:               url,
+		UserAgent:            userAgent,
+		Body:                 obj,
+		Timeout:              d.Timeout(schema.TimeoutCreate),
+		ErrorRetryPredicates: []transport_tpg.RetryErrorPredicateFunc{transport_tpg.IsMonitoringPermissionError},
 	})
 	if err != nil {
 		return fmt.Errorf("Error creating MonitoredProject: %s", err)
@@ -120,7 +120,6 @@ func resourceMonitoringMonitoredProjectCreate(d *schema.ResourceData, meta inter
 	if err != nil {
 		return fmt.Errorf("Error constructing id: %s", err)
 	}
-	id = strings.ReplaceAll(id, "projects/projects/", "projects/")
 	d.SetId(id)
 
 	log.Printf("[DEBUG] Finished creating MonitoredProject %q: %#v", d.Id(), res)
@@ -139,7 +138,6 @@ func resourceMonitoringMonitoredProjectRead(d *schema.ResourceData, meta interfa
 	if err != nil {
 		return err
 	}
-	url = strings.ReplaceAll(url, "projects/projects/", "projects/")
 
 	billingProject := ""
 
@@ -148,12 +146,20 @@ func resourceMonitoringMonitoredProjectRead(d *schema.ResourceData, meta interfa
 		billingProject = bp
 	}
 
+	metricsScope := d.Get("metrics_scope").(string)
+	metricsScope = tpgresource.GetResourceNameFromSelfLink(metricsScope)
+	d.Set("metrics_scope", metricsScope)
+	url, err = tpgresource.ReplaceVars(d, config, "{{MonitoringBasePath}}v1/locations/global/metricsScopes/{{metrics_scope}}")
+	if err != nil {
+		return err
+	}
 	res, err := transport_tpg.SendRequest(transport_tpg.SendRequestOptions{
-		Config:    config,
-		Method:    "GET",
-		Project:   billingProject,
-		RawURL:    url,
-		UserAgent: userAgent,
+		Config:               config,
+		Method:               "GET",
+		Project:              billingProject,
+		RawURL:               url,
+		UserAgent:            userAgent,
+		ErrorRetryPredicates: []transport_tpg.RetryErrorPredicateFunc{transport_tpg.IsMonitoringPermissionError},
 	})
 	if err != nil {
 		return transport_tpg.HandleNotFoundError(err, d, fmt.Sprintf("MonitoringMonitoredProject %q", d.Id()))
@@ -206,7 +212,6 @@ func resourceMonitoringMonitoredProjectDelete(d *schema.ResourceData, meta inter
 	if err != nil {
 		return err
 	}
-	url = strings.ReplaceAll(url, "projects/projects/", "projects/")
 
 	var obj map[string]interface{}
 	log.Printf("[DEBUG] Deleting MonitoredProject %q", d.Id())
@@ -217,13 +222,14 @@ func resourceMonitoringMonitoredProjectDelete(d *schema.ResourceData, meta inter
 	}
 
 	res, err := transport_tpg.SendRequest(transport_tpg.SendRequestOptions{
-		Config:    config,
-		Method:    "DELETE",
-		Project:   billingProject,
-		RawURL:    url,
-		UserAgent: userAgent,
-		Body:      obj,
-		Timeout:   d.Timeout(schema.TimeoutDelete),
+		Config:               config,
+		Method:               "DELETE",
+		Project:              billingProject,
+		RawURL:               url,
+		UserAgent:            userAgent,
+		Body:                 obj,
+		Timeout:              d.Timeout(schema.TimeoutDelete),
+		ErrorRetryPredicates: []transport_tpg.RetryErrorPredicateFunc{transport_tpg.IsMonitoringPermissionError},
 	})
 	if err != nil {
 		return transport_tpg.HandleNotFoundError(err, d, "MonitoredProject")
@@ -247,7 +253,6 @@ func resourceMonitoringMonitoredProjectImport(d *schema.ResourceData, meta inter
 	if err != nil {
 		return nil, fmt.Errorf("Error constructing id: %s", err)
 	}
-	id = strings.ReplaceAll(id, "projects/projects/", "projects/")
 	d.SetId(id)
 
 	return []*schema.ResourceData{d}, nil
@@ -270,6 +275,7 @@ func resourceMonitoringMonitoredProjectEncoder(d *schema.ResourceData, meta inte
 	name = tpgresource.GetResourceNameFromSelfLink(name)
 	metricsScope := d.Get("metrics_scope").(string)
 	metricsScope = tpgresource.GetResourceNameFromSelfLink(metricsScope)
+	d.Set("metrics_scope", metricsScope)
 	obj["name"] = fmt.Sprintf("locations/global/metricsScopes/%s/projects/%s", metricsScope, name)
 	return obj, nil
 }

google-beta/transport/error_retry_predicates.go

@@ -273,6 +273,16 @@ func IsMonitoringConcurrentEditError(err error) (bool, string) {
 	return false, ""
 }
 
+// Retry if Monitoring operation returns a 403
+func IsMonitoringPermissionError(err error) (bool, string) {
+	if gerr, ok := err.(*googleapi.Error); ok {
+		if gerr.Code == 403 {
+			return true, "Waiting for project to be ready for metrics scope"
+		}
+	}
+	return false, ""
+}
+
 // Retry if KMS CryptoKeyVersions returns a 400 for PENDING_GENERATION
 func IsCryptoKeyVersionsPendingGeneration(err error) (bool, string) {
 	if gerr, ok := err.(*googleapi.Error); ok && gerr.Code == 400 {

website/docs/r/monitoring_monitored_project.html.markdown

@@ -34,12 +34,12 @@ To get more information about MonitoredProject, see:
 ```hcl
 resource "google_monitoring_monitored_project" "primary" {
   metrics_scope = "my-project-name"
-  name          = google_project.basic.name
+  name          = google_project.basic.project_id
 }
 
 resource "google_project" "basic" {
   project_id = "m-id"
-  name       = "m-id"
+  name       = "m-id-display"
   org_id     = "123456789"
 }
 ```