Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Nov 15, 2024
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9c50aa3
derive the project attribute from compute api and fallback to resourc…
gurusai-voleti Nov 12, 2024
6c71e7b
Merge branch 'GoogleCloudPlatform:main' into project_attribute_dataso…
gurusai-voleti Nov 15, 2024
3351d06
update document
gurusai-voleti Nov 15, 2024
d69e141
Small change to the docs
SirGitsalot Nov 15, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 7 additions & 9 deletions mmv1/third_party/terraform/services/storage/resource_storage_bucket.go.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1845,18 +1845,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)
}
}
Expand Down
2 changes: 1 addition & 1 deletion mmv1/third_party/terraform/website/docs/d/storage_bucket.html.markdown
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
Loading