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

Improve instance type validation error message #11043

Merged
merged 1 commit into from
Mar 13, 2021

Conversation

bharath-123
Copy link
Contributor

@bharath-123 bharath-123 commented Mar 13, 2021

This should be reasonably safe as the machineInfo field should not be nil on a valid instance type. Would like some opinions on this.

@k8s-ci-robot k8s-ci-robot added the size/S Denotes a PR that changes 10-29 lines, ignoring generated files. label Mar 13, 2021
@k8s-ci-robot k8s-ci-robot added area/api area/provider/aws Issues or PRs related to aws provider cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. labels Mar 13, 2021
@bharath-123
Copy link
Contributor Author

/cc @hakman @rifelpet

upup/pkg/fi/cloudup/awsup/mock_aws_cloud.go Show resolved Hide resolved
@@ -153,7 +153,7 @@ func awsValidateInstanceTypeAndImage(instanceTypeFieldPath *field.Path, imageFie
}
if !found {
allErrs = append(allErrs, field.Invalid(instanceTypeFieldPath, instanceType,
fmt.Sprintf("machine type architecture does not match image architecture: %+v - %q", machineInfo.ProcessorInfo, imageArch)))
fmt.Sprintf("machine type architecture does not match image architecture: %+v - %s", strings.Join(fi.StringSliceValue(machineInfo.ProcessorInfo.SupportedArchitectures), ","), imageArch)))
Copy link
Member

Choose a reason for hiding this comment

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

I think now we don't need %+v anymore.

Suggested change
fmt.Sprintf("machine type architecture does not match image architecture: %+v - %s", strings.Join(fi.StringSliceValue(machineInfo.ProcessorInfo.SupportedArchitectures), ","), imageArch)))
fmt.Sprintf("machine type architecture does not match image architecture: %s - %s", strings.Join(fi.StringSliceValue(machineInfo.ProcessorInfo.SupportedArchitectures), ","), imageArch)))

Copy link
Contributor Author

Choose a reason for hiding this comment

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

yup.

@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: hakman

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 lgtm "Looks good to me", indicates that a PR is ready to be merged. approved Indicates a PR has been approved by an approver from all required OWNERS files. labels Mar 13, 2021
@bharath-123
Copy link
Contributor Author

/test pull-kops-e2e-k8s-containerd

@k8s-ci-robot k8s-ci-robot merged commit 46d92da into kubernetes:master Mar 13, 2021
@k8s-ci-robot k8s-ci-robot added this to the v1.21 milestone Mar 13, 2021
k8s-ci-robot added a commit that referenced this pull request Mar 17, 2021
…-upstream-release-1.20

Automated cherry pick of #11043: Improve instance type validation error message
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. area/api area/provider/aws Issues or PRs related to aws provider 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/S Denotes a PR that changes 10-29 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants