Fix: Add httpsPrefix to endpoint override

Author: Thean Lim

agent/ecr/factory.go

@@ -18,6 +18,7 @@ import (
 	"context"
 	"fmt"
 	"net/http"
+	"strings"
 	"time"
 
 	apicontainer "github.com/aws/amazon-ecs-agent/agent/api/container"
@@ -33,6 +34,8 @@ import (
 	ecrservice "github.com/aws/aws-sdk-go-v2/service/ecr"
 )
 
+const httpsPrefix = "https://"
+
 // ECRFactory defines the interface to produce an ECR SDK client
 type ECRFactory interface {
 	GetClient(*apicontainer.ECRAuthData) (ECRClient, error)
@@ -71,10 +74,11 @@ func getClientConfig(httpClient *http.Client, authData *apicontainer.ECRAuthData
 	}
 
 	if authData.EndpointOverride != "" {
-		opts = append(
-			opts,
-			awsconfig.WithBaseEndpoint(authData.EndpointOverride),
-		)
+		endpoint := authData.EndpointOverride
+		if !strings.HasPrefix(endpoint, httpsPrefix) {
+			endpoint = httpsPrefix + endpoint
+		}
+		opts = append(opts, awsconfig.WithBaseEndpoint(endpoint))
 	}
 
 	var credentialsOpt awsconfig.LoadOptionsFunc

agent/ecr/factory_test.go

@@ -34,5 +34,5 @@ func TestGetClientConfigEndpointOverride(t *testing.T) {
 	cfg, err := getClientConfig(nil, testAuthData)
 
 	assert.Nil(t, err)
-	assert.Equal(t, testAuthData.EndpointOverride, *cfg.BaseEndpoint)
+	assert.Equal(t, httpsPrefix+testAuthData.EndpointOverride, *cfg.BaseEndpoint)
 }