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

Alibaba: fix: replace the ic.ClusterName in the validateClusterName #5461

Merged
merged 1 commit into from
Dec 10, 2021
Merged

Alibaba: fix: replace the ic.ClusterName in the validateClusterName #5461

merged 1 commit into from
Dec 10, 2021

Conversation

bd233
Copy link
Contributor

@bd233 bd233 commented Dec 8, 2021

The ic.ClusterName is empty in the validateClusterName, and the
ic.ObjectMeta.Name is correct, not ic.ClusterName.

staebler
staebler reviewed Dec 8, 2021
View reviewed changes
Copy link
Contributor

@staebler staebler left a comment

Choose a reason for hiding this comment

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

While we are here fixing field errors, can we fix the typo in namePath where it uses "matedata" instead of "metadata"?

pkg/asset/installconfig/alibabacloud/validation.go
@@ -117,7 +117,7 @@ func validateClusterName(client *Client, ic *types.InstallConfig) field.ErrorLis
allErrs = append(allErrs, field.InternalError(namePath, err))
}
if response.TotalItems > 0 {
allErrs = append(allErrs, field.Invalid(namePath, ic.ClusterName, fmt.Sprintf("cluster name is unavailable, private zone name %s already exists", zoneName)))
allErrs = append(allErrs, field.Invalid(namePath, ic.ObjectMeta.Name, fmt.Sprintf("cluster name is unavailable, private zone name %s already exists", zoneName)))
Copy link
Contributor

Choose a reason for hiding this comment

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

Suggested change
allErrs = append(allErrs, field.Invalid(namePath, ic.ObjectMeta.Name, fmt.Sprintf("cluster name is unavailable, private zone name %s already exists", zoneName)))
allErrs = append(allErrs, field.Invalid(namePath, ic.Name, fmt.Sprintf("cluster name is unavailable, private zone name %s already exists", zoneName)))

Copy link
Contributor Author

Choose a reason for hiding this comment

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

While we are here fixing field errors, can we fix the typo in namePath where it uses "matedata" instead of "metadata"?

Thanks for reminding！

Sorry, I did not understand this suggestion, the type types.InstallConfig does not exist Name, or modify validateClusterName(client *Client, ic *types.InstallConfig) to validateClusterName(client *Client, ic *ObjectMeta) ?

Copy link
Contributor

Choose a reason for hiding this comment

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

My suggestion is just to get the name via ic.Name rather than ic.ObjectMeta.Name. The ObjectMeta part is unnecessary as ObjectMeta is an anonymous field. See http://golangtutorials.blogspot.com/2011/06/anonymous-fields-in-structs-like-object.html.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I remember, because ic.ObjectMeta.Name and ic.Platform.Name exist at the same time, so ic.Name will cause "ambiguous selector" error.

@bd233
Alibaba: fix: replace the ic.ClusterName in the validateClusterName
d3f0cf8 
1. The `ic.ClusterName` is empty in the `validateClusterName`, and the
`ic.ObjectMeta.Name` is correct, not `ic.ClusterName`.

2. Fix the spelling errors, use "metadata" instead of "matedata"

Signed-off-by: sunhui <wb-sh373163@alibaba-inc.com>
@bd233 bd233 force-pushed the alibabacloud-fix-validation branch from d8cab2d to d3f0cf8 Compare December 9, 2021 02:35
staebler
staebler approved these changes Dec 9, 2021
View reviewed changes
Copy link
Contributor

@staebler staebler left a comment

Choose a reason for hiding this comment

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

/lgtm
/approve

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Dec 9, 2021
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Dec 9, 2021

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: staebler

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

@openshift-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Dec 9, 2021
@openshift-bot
Copy link
Contributor

/retest-required

Please review the full test history for this PR and help us cut down flakes.

3 similar comments
@openshift-bot
Copy link
Contributor

/retest-required

Please review the full test history for this PR and help us cut down flakes.

@openshift-bot
Copy link
Contributor

/retest-required

Please review the full test history for this PR and help us cut down flakes.

@openshift-bot
Copy link
Contributor

/retest-required

Please review the full test history for this PR and help us cut down flakes.

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Dec 9, 2021 •
edited
Loading

@bd233: The following tests failed, say /retest to rerun all failed tests or /retest-required to rerun all mandatory failed tests:

Test name Commit Details Required Rerun command
ci/prow/e2e-libvirt d3f0cf8 link false /test e2e-libvirt
ci/prow/e2e-crc d3f0cf8 link false /test e2e-crc
ci/prow/e2e-openstack d3f0cf8 link false /test e2e-openstack
ci/prow/e2e-aws-fips d3f0cf8 link false /test e2e-aws-fips
ci/prow/e2e-aws-workers-rhel7 d3f0cf8 link false /test e2e-aws-workers-rhel7
ci/prow/e2e-aws-single-node d3f0cf8 link false /test e2e-aws-single-node
ci/prow/okd-e2e-aws-upgrade d3f0cf8 link false /test okd-e2e-aws-upgrade

Full PR test history. Your PR dashboard.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository. I understand the commands that are listed here.

@openshift-bot
Copy link
Contributor

/retest-required

Please review the full test history for this PR and help us cut down flakes.

14 similar comments
@openshift-bot
Copy link
Contributor

/retest-required

Please review the full test history for this PR and help us cut down flakes.

@openshift-bot
Copy link
Contributor

/retest-required

Please review the full test history for this PR and help us cut down flakes.

@openshift-bot
Copy link
Contributor

/retest-required

Please review the full test history for this PR and help us cut down flakes.

@openshift-bot
Copy link
Contributor

/retest-required

Please review the full test history for this PR and help us cut down flakes.

@openshift-bot
Copy link
Contributor

/retest-required

Please review the full test history for this PR and help us cut down flakes.

@openshift-bot
Copy link
Contributor

/retest-required

Please review the full test history for this PR and help us cut down flakes.

@openshift-bot
Copy link
Contributor

/retest-required

Please review the full test history for this PR and help us cut down flakes.

@openshift-bot
Copy link
Contributor

/retest-required

Please review the full test history for this PR and help us cut down flakes.

@openshift-bot
Copy link
Contributor

/retest-required

Please review the full test history for this PR and help us cut down flakes.

@openshift-bot
Copy link
Contributor

/retest-required

Please review the full test history for this PR and help us cut down flakes.

@openshift-bot
Copy link
Contributor

/retest-required

Please review the full test history for this PR and help us cut down flakes.

@openshift-bot
Copy link
Contributor

/retest-required

Please review the full test history for this PR and help us cut down flakes.

@openshift-bot
Copy link
Contributor

/retest-required

Please review the full test history for this PR and help us cut down flakes.

@openshift-bot
Copy link
Contributor

/retest-required

Please review the full test history for this PR and help us cut down flakes.

@openshift-bot
Copy link
Contributor

/retest-required

Please review the full test history for this PR and help us cut down flakes.

6 similar comments
@openshift-bot
Copy link
Contributor

/retest-required

Please review the full test history for this PR and help us cut down flakes.

@openshift-bot
Copy link
Contributor

/retest-required

Please review the full test history for this PR and help us cut down flakes.

@openshift-bot
Copy link
Contributor

/retest-required

Please review the full test history for this PR and help us cut down flakes.

@openshift-bot
Copy link
Contributor

/retest-required

Please review the full test history for this PR and help us cut down flakes.

@openshift-bot
Copy link
Contributor

/retest-required

Please review the full test history for this PR and help us cut down flakes.

@openshift-bot
Copy link
Contributor

/retest-required

Please review the full test history for this PR and help us cut down flakes.

@openshift-merge-robot openshift-merge-robot merged commit 5c43db3 into openshift:master Dec 10, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@staebler staebler staebler approved these changes

@jhixson74 jhixson74 Awaiting requested review from jhixson74

@squidboylan squidboylan Awaiting requested review from squidboylan

Assignees

@staebler staebler

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. lgtm Indicates that a PR is ready to be merged.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@bd233 @openshift-bot @staebler @openshift-merge-robot