fix: derive the project attribute from resource or compute api or fallback to provider (#12305) (#20358)

[upstream:c09b3029dfcb6b8233e39ec11177a37801e45424]

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

Author: modular-magician

.changelog/12305.txt

@@ -0,0 +1,3 @@
+```release-note:bug
+storage: derive the project attribute from resource or compute api or fallback to provider in `resource_storage_bucket`
+```

google/services/storage/resource_storage_bucket.go

@@ -1847,18 +1847,16 @@ func setStorageBucket(d *schema.ResourceData, config *transport_tpg.Config, res
 	// block, or the resource or an environment variable, we use the compute API to lookup the projectID
 	// from the projectNumber which is included in the bucket API response
 	if d.Get("project") == "" {
-		project, _ := tpgresource.GetProject(d, config)
-		if err := d.Set("project", project); err != nil {
-			return fmt.Errorf("Error setting project: %s", err)
-		}
-	}
-	if d.Get("project") == "" {
+		projectName, _ := tpgresource.GetProject(d, config)
 		proj, err := config.NewComputeClient(userAgent).Projects.Get(strconv.FormatUint(res.ProjectNumber, 10)).Do()
 		if err != nil {
-			return err
+			log.Printf("[ERROR] Missing Compute API permissions, fallback to provider/resource default")
+		}
+
+		if proj != nil && projectName != "" && projectName != proj.Name {
+			projectName = proj.Name
 		}
-		log.Printf("[DEBUG] Bucket %v is in project number %v, which is project ID %s.\n", res.Name, res.ProjectNumber, proj.Name)
-		if err := d.Set("project", proj.Name); err != nil {
+		if err := d.Set("project", projectName); err != nil {
 			return fmt.Errorf("Error setting project: %s", err)
 		}
 	}

website/docs/d/storage_bucket.html.markdown

@@ -26,7 +26,7 @@ The following arguments are supported:
 
 * `name` - (Required) The name of the bucket.
 
-* `project` - (Optional) The ID of the project in which the resource belongs. If it is not provided, the provider project is used. If no value is supplied in the configuration or through provider defaults then the data source will use the Compute API to find the project id that corresponds to the project number returned from the Storage API. Supplying a value for `project` doesn't influence retrieving data about the bucket but it can be used to prevent use of the Compute API. If you do provide a `project` value ensure that it is the correct value for that bucket; the data source will not check that the project id and project number match.
+* `project` - (Optional) The ID of the project in which the resource belongs. If it is not provided then the data source will use the Compute API to find the project id that corresponds to the project number returned from the Storage API, and if no Compute API permissions are available or if the Compute API is disabled it defaults to the provider value. Supplying a value for `project` doesn't influence retrieving data about the bucket but it can be used to prevent use of the Compute API. If you do provide a `project` value ensure that it is the correct value for that bucket; the data source will not check that the project id and project number match.
 
 ## Attributes Reference