Support http server mainly for tests

Signed-off-by: Yussuf Shaikh <yussuf.shaikh@ibm.com>
IBM-Cloud · Jan 14, 2022 · 03c4a61 · 03c4a61
1 parent b0182c0
commit 03c4a61
Show file tree

Hide file tree

Showing 4 changed files with 92 additions and 6 deletions.
diff --git a/ibmpisession/session.go b/ibmpisession/session.go
@@ -86,13 +86,23 @@ func NewIBMPISession(o *IBMPIOptions) (*IBMPISession, error) {
 	}
 
 	// We need just the server host from the URL
-	serviceURL = strings.TrimPrefix(serviceURL, "https://")
-	serviceURL = strings.TrimPrefix(serviceURL, "http://")
+	var host, scheme string
+	if strings.HasPrefix(serviceURL, "https://") {
+		scheme = SCHEME_HTTPS
+		host = strings.TrimPrefix(serviceURL, "https://")
+	} else if strings.HasPrefix(serviceURL, "http://") {
+		scheme = SCHEME_HTTP
+		host = strings.TrimPrefix(serviceURL, "http://")
+	} else {
+		// by default we use "https"
+		scheme = SCHEME_HTTPS
+		host = serviceURL
+	}
 
 	return &IBMPISession{
-		CRNFormat: crnBuilder(o.UserAccount, o.Zone, serviceURL),
+		CRNFormat: crnBuilder(o.UserAccount, o.Zone, host),
 		Options:   o,
-		Power:     getPIClient(o.Debug, serviceURL),
+		Power:     getPIClient(o.Debug, host, scheme),
 	}, nil
 }
 

diff --git a/ibmpisession/session_test.go b/ibmpisession/session_test.go
@@ -111,6 +111,42 @@ func TestNewIBMPISession(t *testing.T) {
 				CRNFormat: "crn:v1:bluemix:public:power-iaas:dal12:a/1234:%s::",
 			},
 		},
+		{
+			name: "Simple URL with https",
+			args: args{
+				o: &IBMPIOptions{
+					Authenticator: &core.NoAuthAuthenticator{},
+					UserAccount:   "1234",
+					Region:        "dal",
+					Zone:          "dal12",
+					URL:           "https://dal.power-iaas.test.cloud.ibm.com",
+				},
+			},
+			want: &IBMPISession{
+				Options: &IBMPIOptions{
+					Authenticator: &core.NoAuthAuthenticator{},
+				},
+				CRNFormat: "crn:v1:staging:public:power-iaas:dal12:a/1234:%s::",
+			},
+		},
+		{
+			name: "Simple URL with http",
+			args: args{
+				o: &IBMPIOptions{
+					Authenticator: &core.NoAuthAuthenticator{},
+					UserAccount:   "1234",
+					Region:        "dal",
+					Zone:          "dal12",
+					URL:           "http://dal.power-iaas.test.cloud.ibm.com",
+				},
+			},
+			want: &IBMPISession{
+				Options: &IBMPIOptions{
+					Authenticator: &core.NoAuthAuthenticator{},
+				},
+				CRNFormat: "crn:v1:staging:public:power-iaas:dal12:a/1234:%s::",
+			},
+		},
 	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {

diff --git a/ibmpisession/utils.go b/ibmpisession/utils.go
@@ -15,6 +15,11 @@ import (
 	httptransport "github.com/go-openapi/runtime/client"
 )
 
+const (
+	SCHEME_HTTPS = "https"
+	SCHEME_HTTP  = "http"
+)
+
 // fetchAuthorizationData Fetch Authorization token using the Authenticator
 func fetchAuthorizationData(a core.Authenticator) (string, error) {
 	req := &http.Request{
@@ -56,9 +61,12 @@ func powerJSONConsumer() runtime.Consumer {
 }
 
 // getPIClient generates a PowerIaas client
-func getPIClient(debug bool, host string) *client.PowerIaasAPI {
+func getPIClient(debug bool, host string, scheme string) *client.PowerIaasAPI {
 	http.DefaultTransport.(*http.Transport).TLSClientConfig = &tls.Config{InsecureSkipVerify: false}
-	transport := httptransport.New(host, "/", []string{"https"})
+	if scheme == "" {
+		scheme = SCHEME_HTTPS
+	}
+	transport := httptransport.New(host, "/", []string{scheme})
 	transport.Debug = debug
 	transport.SetLogger(IBMPILogger{})
 	transport.Consumers[runtime.JSONMime] = powerJSONConsumer()

diff --git a/ibmpisession/utils_test.go b/ibmpisession/utils_test.go
@@ -123,3 +123,35 @@ func Test_powerJSONConsumer(t *testing.T) {
 		})
 	}
 }
+
+func Test_getPIClient(t *testing.T) {
+	type args struct {
+		debug  bool
+		host   string
+		scheme string
+	}
+	tests := []struct {
+		name string
+		args args
+	}{
+		{
+			name: "Scheme HTTTP",
+			args: args{debug: true, host: "", scheme: "http"},
+		},
+		{
+			name: "Scheme HTTTPS",
+			args: args{debug: true, host: "", scheme: "https"},
+		},
+		{
+			name: "Scheme Empty",
+			args: args{debug: true, host: "", scheme: ""},
+		},
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			if got := getPIClient(tt.args.debug, tt.args.host, tt.args.scheme); got == nil {
+				t.Errorf("getPIClient() = %v", got)
+			}
+		})
+	}
+}