Skip to content
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

Jump to bottom

Add back support for renamed project services in reads (lost in 3.0.0) #2698

Merged
merged 2 commits into from
Nov 14, 2019
Merged

Add back support for renamed project services in reads (lost in 3.0.0) #2698

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fe424d8
Add back support for renamed project services in reads (lost in 3.0.0)
rileykarson Nov 14, 2019
74d7a48
Update tracked submodules -> HEAD on Thu Nov 14 17:59:52 UTC 2019
modular-magician Nov 14, 2019
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
2 changes: 1 addition & 1 deletion build/ansible
Open in desktop
Submodule ansible updated from aa51f4 to 188f2f
2 changes: 1 addition & 1 deletion build/terraform
Open in desktop
Submodule terraform updated from 05e1db to 6a0d5f
2 changes: 1 addition & 1 deletion build/terraform-beta
Open in desktop
Submodule terraform-beta updated from c80c20 to 4ead6c
14 changes: 13 additions & 1 deletion third_party/terraform/resources/resource_google_project.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -535,6 +535,9 @@ func doEnableServicesRequest(services []string, project string, config *Config,
}

// Retrieve a project's services from the API
// if a service has been renamed, this function will list both the old and new
// forms of the service. LIST responses are expected to return only the old or
// new form, but we'll always return both.
func listCurrentlyEnabledServices(project string, config *Config, timeout time.Duration) (map[string]struct{}, error) {
// Verify project for services still exists
p, err := config.clientResourceManager.Projects.Get(project).Do()
Expand All @@ -559,10 +562,19 @@ func listCurrentlyEnabledServices(project string, config *Config, timeout time.D
Filter("state:ENABLED").
Pages(ctx, func(r *serviceusage.ListServicesResponse) error {
for _, v := range r.Services {
// services are returned as "projects/PROJECT/services/NAME"
// services are returned as "projects/{{project}}/services/{{name}}"
name := GetResourceNameFromSelfLink(v.Name)

// if name not in ignoredProjectServicesSet
if _, ok := ignoredProjectServicesSet[name]; !ok {
apiServices[name] = struct{}{}

// if a service has been renamed, set both. We'll deal
// with setting the right values later.
if v, ok := renamedServicesByOldAndNewServiceNames[name]; ok {
log.Printf("[DEBUG] Adding service alias for %s to enabled services: %s", name, v)
apiServices[v] = struct{}{}
}
}
}
return nil
Expand Down