Support both HTTP and HTTPS schemes in esti lakectl doctor tests (#6619)

treeverse · Sep 19, 2023 · b92356b · b92356b
1 parent bf964ef
commit b92356b
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 3 deletions.
diff --git a/.gitallowed b/.gitallowed
@@ -2,5 +2,6 @@ AKIAIO5FODNN7EXAMPLE
 AKIAIOSFODNN3EXAMPLE
 AKIAIOSFODNN7EXAMPLE
 AKIAJVHTOKZWGCD2QQYQ
+AKIAJZZZZZZZZZZZZZZQ
 wJalrXUtnFEMI/K3MDENG/bPxRfiCYEXAMPLEKEY
 wJalrXUtnFEMI/K7MDENG/bPxRfiCYEXAMPLEKEY
diff --git a/esti/golden/lakectl_doctor_wrong_endpoint.golden b/esti/golden/lakectl_doctor_wrong_endpoint.golden
@@ -1,3 +1,3 @@
 It looks like endpoint url is wrong.
 
-Suspicious URI format for server.endpoint_url: http://${HOST}/api/v11
+Suspicious URI format for server.endpoint_url: ${HOST}/api/v11
diff --git a/esti/golden/lakectl_doctor_wrong_endpoint_verbose.golden b/esti/golden/lakectl_doctor_wrong_endpoint_verbose.golden
@@ -9,4 +9,4 @@ Couldn't find a problem with access key format.
 Trying to validate secret access key format.
 Couldn't find a problem with secret access key format.
 Trying to validate endpoint URL format.
-Suspicious URI format for server.endpoint_url: http://${HOST}/api/v11
+Suspicious URI format for server.endpoint_url: ${HOST}/api/v11
diff --git a/esti/lakectl_doctor_test.go b/esti/lakectl_doctor_test.go
@@ -1,6 +1,7 @@
 package esti
 
 import (
+	"fmt"
 	"net/url"
 	"testing"
 
@@ -17,7 +18,7 @@ func TestLakectlDoctor(t *testing.T) {
 	require.NoError(t, err)
 	vars := map[string]string{
 		"LAKEFS_ENDPOINT": endPointURL,
-		"HOST":            u.Host,
+		"HOST":            fmt.Sprintf("%s://%s", u.Scheme, u.Host),
 	}
 
 	RunCmdAndVerifySuccessWithFile(t, LakectlWithParams(accessKeyID, secretAccessKey, endPointURL)+" doctor", false, "lakectl_doctor_ok", vars)