fix(pkg/gitreceive/storage/endpoint_test.go): add test for stripScheme

Author: Aaron Schlesinger

pkg/gitreceive/storage/client.go

@@ -11,13 +11,8 @@ type Client struct {
 }
 
 // GetClient returns a S3 API compatible storage client
-<<<<<<< 7c8dc9bdf6ffed171ed952661229ae2b8590cef7
-func GetClient(regionStr string, fs sys.FS, env sys.Env) (*s3.Client, error) {
+func GetClient(regionStr string, fs sys.FS, env sys.Env) (*Client, error) {
 	auth, err := getAuth(fs)
-=======
-func GetClient(regionStr string) (*Client, error) {
-	auth, err := getAuth()
->>>>>>> fix(pkg/gitreceive): create and use a storage.Client
 	if err != nil {
 		return nil, err
 	}

pkg/gitreceive/storage/endpoint_test.go

@@ -9,34 +9,34 @@ import (
 
 type getEndpointTestCase struct {
 	envVars     map[string]string
-	expectedOut string
+	expectedOut *Endpoint
 	expectedErr error
 }
 
 func TestGetEndpoint(t *testing.T) {
 	testCases := []getEndpointTestCase{
 		getEndpointTestCase{
 			envVars:     map[string]string{"DEIS_OUTSIDE_STORAGE": "http://outside.storage.com"},
-			expectedOut: "http://outside.storage.com",
+			expectedOut: &Endpoint{URLStr: "outside.storage.com", Secure: true},
 		},
 		getEndpointTestCase{
 			envVars:     map[string]string{"DEIS_OUTSIDE_STORAGE": "https://outside.com"},
-			expectedOut: "https://outside.com",
+			expectedOut: &Endpoint{URLStr: "outside.com", Secure: true},
 		},
 		getEndpointTestCase{
 			envVars: map[string]string{
 				"DEIS_OUTSIDE_STORAGE":    "outside.com",
 				"DEIS_MINIO_SERVICE_HOST": "minio.com",
 				"DEIS_MINIO_SERVICE_PORT": "8888",
 			},
-			expectedOut: "outside.com",
+			expectedOut: &Endpoint{URLStr: "outside.com", Secure: true},
 		},
 		getEndpointTestCase{
 			envVars: map[string]string{
 				"DEIS_MINIO_SERVICE_HOST": "minio.com",
 				"DEIS_MINIO_SERVICE_PORT": "8888",
 			},
-			expectedOut: "http://minio.com:8888",
+			expectedOut: &Endpoint{URLStr: "minio.com:8888", Secure: false},
 		},
 		getEndpointTestCase{
 			envVars: map[string]string{
@@ -54,12 +54,36 @@ func TestGetEndpoint(t *testing.T) {
 	for _, testCase := range testCases {
 		fe := sys.NewFakeEnv()
 		fe.Envs = testCase.envVars
-		str, err := getEndpoint(fe)
-		assert.Equal(t, str, testCase.expectedOut, "output")
+		ep, err := getEndpoint(fe)
+
+		if testCase.expectedOut != nil {
+			assert.Equal(t, ep.URLStr, testCase.expectedOut.URLStr, "url string")
+			assert.Equal(t, ep.Secure, testCase.expectedOut.Secure, "secure boolean")
+		} else {
+			assert.True(t, ep == nil, "endpoint was non-nil when it should have been")
+		}
+
 		if testCase.expectedErr == nil {
 			assert.NoErr(t, err)
 		} else {
 			assert.Equal(t, err, testCase.expectedErr, "error")
 		}
 	}
 }
+
+type schemeTestCase struct {
+	before string
+	after  string
+}
+
+func TestStripScheme(t *testing.T) {
+	schemes := []schemeTestCase{
+		schemeTestCase{before: "https://deis.com", after: "deis.com"},
+		schemeTestCase{before: "http://deis.com", after: "deis.com"},
+		schemeTestCase{before: "deis.com", after: "deis.com"},
+		schemeTestCase{before: "://deis.com", after: "://deis.com"},
+	}
+	for i, scheme := range schemes {
+		assert.Equal(t, stripScheme(scheme.before), scheme.after, fmt.Sprintf("scheme %s (# %d)", scheme.before, i))
+	}
+}