From 917b378f4e86dbfb224d391a53117cdb7ec03812 Mon Sep 17 00:00:00 2001 From: cpu1 Date: Mon, 24 Jan 2022 18:16:10 +0530 Subject: [PATCH] Fix fetching EKS AMI release archive This changelist fixes fetching the EKS AMI release archive by removing the check for adding a `v` prefix if it does not exist. The last release published a [tag](https://github.com/awslabs/amazon-eks-ami/releases/tag/V20220123) that begins with an uppercase `V` and the code ends up prepending an additional `v`, rendering the URL incorrect. Rather than accounting for this case in code, this changelist removes that check altogether as `amazon-eks-ami` has been consistently adding the `v` prefix to their tags. --- pkg/selector/eks.go | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/pkg/selector/eks.go b/pkg/selector/eks.go index e951cd5..184131f 100644 --- a/pkg/selector/eks.go +++ b/pkg/selector/eks.go @@ -41,7 +41,7 @@ func (e *EKS) Filters(version string) (Filters, error) { if e.AMIRepoURL == "" { e.AMIRepoURL = eksAMIRepoURL } - filters := Filters{} + var filters Filters if version == "" { var err error @@ -51,9 +51,6 @@ func (e *EKS) Filters(version string) (Filters, error) { version = eksFallbackLatestAMIVersion } } - if !strings.HasPrefix(version, "v") { - version = fmt.Sprintf("v%s", version) - } supportedInstanceTypes, err := e.getSupportedInstanceTypes(version) if err != nil { log.Printf("Unable to retrieve EKS supported instance types for version %s: %v", version, err) @@ -72,7 +69,7 @@ func (e *EKS) getSupportedInstanceTypes(version string) ([]string, error) { } defer resp.Body.Close() - if resp.StatusCode != 200 { + if resp.StatusCode != http.StatusOK { return supportedInstanceTypes, fmt.Errorf("Unable to retrieve EKS supported instance types, got non-200 status code: %d", resp.StatusCode) } @@ -119,7 +116,7 @@ func (e EKS) getLatestAMIVersion() (string, error) { if err != nil { return "", err } - if resp.StatusCode != 302 { + if resp.StatusCode != http.StatusFound { return "", fmt.Errorf("Can't retrieve latest release from github because redirect was not sent") } versionRedirect := resp.Header.Get("location")