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.

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

Refactor writing of Terraform data sources #14713

Merged
merged 2 commits into from
Dec 4, 2022

Conversation

johngmyers
Copy link
Member

No description provided.

@k8s-ci-robot k8s-ci-robot added the cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. label Dec 3, 2022
@k8s-ci-robot k8s-ci-robot requested review from hakman and zetaab December 3, 2022 08:14
@k8s-ci-robot k8s-ci-robot added the size/L Denotes a PR that changes 100-499 lines, ignoring generated files. label Dec 3, 2022
if s, ok := item.(string); ok {
return terraformWriter.LiteralFromStringValue(s), nil
}
if s, ok := item.(*string); ok {
Copy link
Member

Choose a reason for hiding this comment

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

Nit: Could probably swap the string and *string checks and just fall-through (as we do with reflect.Pointer below)

Copy link
Member Author

Choose a reason for hiding this comment

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

I was trying to avoid calling reflect on strings. But that's an unnecessary micro-optimization.

for _, field := range reflect.VisibleFields(v.Type()) {
key := field.Tag.Get("cty")
if key == "" {
var b strings.Builder
Copy link
Member

Choose a reason for hiding this comment

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

Maybe refactor this into its own method, defaultCtyName or similar, just because it would make this method much easier to read?

Copy link
Member Author

Choose a reason for hiding this comment

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

Refactored

@justinsb
Copy link
Member

justinsb commented Dec 3, 2022

LGTM. I see the tests are passing. Do we have test coverage on the formatting, or are we testing only after passing through a tf fmt?

@johngmyers
Copy link
Member Author

johngmyers commented Dec 3, 2022

The integration tests give us coverage. This particular change is covered by TestSharedVPCIPv6(). There is no reformatting done by integration tests.

@johngmyers
Copy link
Member Author

/retest

1 similar comment
@johngmyers
Copy link
Member Author

/retest

@justinsb
Copy link
Member

justinsb commented Dec 4, 2022

Thanks @johngmyers - looks great

/approve
/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Dec 4, 2022
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: justinsb

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@k8s-ci-robot k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Dec 4, 2022
@k8s-ci-robot k8s-ci-robot merged commit 2f1fc3f into kubernetes:master Dec 4, 2022
@k8s-ci-robot k8s-ci-robot added this to the v1.26 milestone Dec 4, 2022
@johngmyers johngmyers deleted the tf-refactor branch December 4, 2022 17:26
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. lgtm "Looks good to me", indicates that a PR is ready to be merged. size/L Denotes a PR that changes 100-499 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants