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

Make sure we return the right version when autoscaling v2 is found #1075

Merged
merged 1 commit into from
Sep 6, 2022
Merged

Make sure we return the right version when autoscaling v2 is found #1075

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions pkg/autodetect/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ func (a *autoDetect) HPAVersion() (AutoscalingVersion, error) {

for _, version := range versions {
if version.Version == "v2" || version.Version == "v2beta2" {
return toAutoscalingVersion(version.Version), nil
return ToAutoScalingVersion(version.Version), nil
}
}
return AutoscalingVersionUnknown, errors.New("Failed to find appropriate version of apiGroup autoscaling, only v2 and v2beta2 are supported")
Expand All @@ -117,10 +117,10 @@ func (v AutoscalingVersion) String() string {
return "unknown"
}

func toAutoscalingVersion(version string) AutoscalingVersion {
func ToAutoScalingVersion(version string) AutoscalingVersion {
Copy link
Member

Choose a reason for hiding this comment

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

any reason why the function is public 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.

So it can be accessed by the test, as the test is in a different package

Copy link
Member

Choose a reason for hiding this comment

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

It's a bit unfortunate/unnecessary to have the test in a different package in this case. But it was done like that from before so I will approve the PR.

switch version {
case "v2":
return AutoscalingVersionV2Beta2
return AutoscalingVersionV2
case "v2beta2":
return AutoscalingVersionV2Beta2
}
Expand Down
6 changes: 6 additions & 0 deletions pkg/autodetect/main_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,3 +94,9 @@ func TestAutoscalingVersionToString(t *testing.T) {
assert.Equal(t, "v2beta2", autodetect.AutoscalingVersionV2Beta2.String())
assert.Equal(t, "unknown", autodetect.AutoscalingVersionUnknown.String())
}

func TestToAutoScalingVersion(t *testing.T) {
assert.Equal(t, autodetect.AutoscalingVersionV2, autodetect.ToAutoScalingVersion("v2"))
assert.Equal(t, autodetect.AutoscalingVersionV2Beta2, autodetect.ToAutoScalingVersion("v2beta2"))
assert.Equal(t, autodetect.AutoscalingVersionUnknown, autodetect.ToAutoScalingVersion("fred"))
}