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

google_project_services is deprecated - use google_project_service #2411

Merged
merged 5 commits into from
Oct 2, 2019
Merged

google_project_services is deprecated - use google_project_service #2411

merged 5 commits into from
Oct 2, 2019

Conversation

nat-henderson
Copy link
Contributor

This also migrates the library code in google_project_services which is used in other portions of the provider out, so that the 3.0.0 change can be a simple git rm.

@modular-magician
Copy link
Collaborator

Hi! I'm the modular magician, I work on Magic Modules.
I see that this PR has already had some downstream PRs generated. Any open downstreams are already updated to your most recent commit, e61812f.

Pull request statuses

WARNING: The following files changed in commit e61812f may need corresponding changes in third_party/validator:

  • third_party/terraform/resources/resource_google_project.go

No diff detected in terraform-google-conversion.
No diff detected in Ansible.
No diff detected in Inspec.

New Pull Requests

I built this PR into one or more new PRs on other repositories, and when those are closed, this PR will also be merged and closed.
depends: hashicorp/terraform-provider-google-beta#1226
depends: hashicorp/terraform-provider-google#4599

@nat-henderson nat-henderson mentioned this pull request Oct 1, 2019
Merged
@modular-magician
Copy link
Collaborator

Hi! I'm the modular magician, I work on Magic Modules.
I see that this PR has already had some downstream PRs generated. Any open downstreams are already updated to your most recent commit, 16d00cf.

Pull request statuses

WARNING: The following files changed in commit 16d00cf may need corresponding changes in third_party/validator:

  • third_party/terraform/resources/resource_google_project.go

terraform-provider-google-beta already has an open PR.
No diff detected in terraform-google-conversion.
terraform-provider-google already has an open PR.
No diff detected in Ansible.
No diff detected in Inspec.

New Pull Requests

I didn't open any new pull requests because of this PR.

@nat-henderson
Copy link
Contributor Author

Running tests in the downstream.

@modular-magician
Copy link
Collaborator

Hi! I'm the modular magician, I work on Magic Modules.
I see that this PR has already had some downstream PRs generated. Any open downstreams are already updated to your most recent commit, 597cc1e.

Pull request statuses

terraform-provider-google-beta already has an open PR.
No diff detected in terraform-google-conversion.
terraform-provider-google already has an open PR.
No diff detected in Ansible.
No diff detected in Inspec.

New Pull Requests

I didn't open any new pull requests because of this PR.

@modular-magician
Copy link
Collaborator

Hi! I'm the modular magician, I work on Magic Modules.
I see that this PR has already had some downstream PRs generated. Any open downstreams are already updated to your most recent commit, f9ea6ef.

Pull request statuses

terraform-provider-google-beta already has an open PR.
No diff detected in terraform-google-conversion.
terraform-provider-google already has an open PR.
No diff detected in Ansible.
No diff detected in Inspec.

New Pull Requests

I didn't open any new pull requests because of this PR.

@nat-henderson
Copy link
Contributor Author

Tests pass in the downstream now.

rileykarson
rileykarson approved these changes Oct 2, 2019
View reviewed changes
third_party/terraform/resources/resource_google_project_services.go
@@ -355,3 +220,43 @@ func expandServiceUsageProjectServicesServices(v interface{}, d TerraformResourc
}
return convertStringArr(v.(*schema.Set).List()), nil
}

// Retrieve a project's services from the API
func listCurrentlyEnabledServices(project string, config *Config, timeout time.Duration) (map[string]struct{}, error) {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We expect this to move within the same file?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah, I moved it and then moved it back, and mistargeted where it was supposed to go. NBD either way.

@modular-magician modular-magician force-pushed the remove-project-services branch from f9ea6ef to 8c1d994 Compare October 2, 2019 19:38
@modular-magician modular-magician merged commit a0aff00 into master Oct 2, 2019
@nat-henderson nat-henderson deleted the remove-project-services branch October 2, 2019 19:41
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@rileykarson rileykarson rileykarson approved these changes

Assignees
No one assigned
Labels
automerged cla: yes downstream-generated terraform-provider-google terraform-provider-google-beta
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@nat-henderson @modular-magician @rileykarson @googlebot