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

Fix initialisms in product names #2272

Merged
merged 8 commits into from
Aug 29, 2019
Merged

Fix initialisms in product names #2272

merged 8 commits into from
Aug 29, 2019

Conversation

rileykarson
Copy link
Member

@rileykarson rileykarson commented Aug 29, 2019 •
edited
Loading

For a handful of products, we've collapsed initialisms like TPU into Tpu. This should correct a handful of those. Previously, no providers cared, but KCC will.

In addition, this moves off some janky string manipulation code onto ActiveSupport ones.

Release Note for Downstream PRs (will be copied)

@modular-magician
Copy link
Collaborator

Hi! I'm the modular magician, I work on Magic Modules.
This PR seems not to have generated downstream PRs before, as of bf1966c.

Pull request statuses

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#1105
depends: GoogleCloudPlatform/terraform-google-conversion#185
depends: hashicorp/terraform-provider-google#4372

@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, 6eddcc3.

Pull request statuses

terraform-provider-google-beta already has an open PR.
terraform-google-conversion already has an open PR.
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, 6b457cf.

Pull request statuses

terraform-provider-google-beta already has an open PR.
terraform-google-conversion already has an open PR.
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, 2713250.

Pull request statuses

terraform-provider-google-beta already has an open PR.
terraform-google-conversion already has an open PR.
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.

@rileykarson rileykarson requested a review from slevenick August 29, 2019 20:35
slevenick
slevenick approved these changes Aug 29, 2019
View reviewed changes
Copy link
Contributor

@slevenick slevenick left a comment

Choose a reason for hiding this comment

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

Looks like there are some sorting changes in the downstream. Not a big deal, but it looks like somewhere we sort case sensitively before snake_casing, making things like sql_field to be ordered before something_else

third_party/terraform/utils/config.go.erb
@@ -268,7 +268,7 @@ func (c *Config) LoadAndValidate() error {
c.clientContainerBeta.UserAgent = userAgent
c.clientContainerBeta.BasePath = containerBetaClientBasePath

dnsClientBasePath := removeBasePathVersion(c.DnsBasePath) + "v1/projects/"
dnsClientBasePath := removeBasePathVersion(c.DNSBasePath) + "v1/projects/"
Copy link
Contributor

Choose a reason for hiding this comment

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

Is there no TPUBasePath?

Copy link
Member Author

Choose a reason for hiding this comment

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

This part only exists for products where we have both generated + handwritten resources.

google/extensions.rb
@@ -18,14 +18,6 @@ def underscore
Google::StringUtils.underscore(self)
end

def camelize(style = :lower)
Copy link
Contributor

Choose a reason for hiding this comment

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

camelize is coming out of active support now?

Copy link
Member Author

Choose a reason for hiding this comment

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

It has been ever since we started using ActiveSupport in the first place, I believe. This specific change was a no-op.

@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, ae91878.

Pull request statuses

terraform-provider-google-beta already has an open PR.
terraform-google-conversion already has an open PR.
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 modular-magician force-pushed the fix-initialisms-products branch from ae91878 to a9fc441 Compare August 29, 2019 22:06
@modular-magician modular-magician merged commit d965cf7 into GoogleCloudPlatform:master Aug 29, 2019
@rileykarson rileykarson mentioned this pull request Aug 30, 2019
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@slevenick slevenick slevenick approved these changes

Assignees
No one assigned
Labels
automerged cla: yes downstream-generated terraform-google-conversion 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
@rileykarson @modular-magician @slevenick @googlebot