feat(iam): allow passing iam url (#31)

* feat(iam): allow passing iam url

* test(iam): update tests for new param

* test(iam): address pr feedback to support it with other endpoints

* fix(integration-sample): remove to address conflicts

Co-authored-by: Steven Collins <Steven.Collins@ibm.com>

client/actions/channels/channel_client_test.go

@@ -22,7 +22,7 @@ var _ = Describe("ClusterClient", func() {
 
 		BeforeEach(func() {
 			endpoint = "https://satcon.foo"
-			iamClient, err = iam.NewIAMClient("some_key")
+			iamClient, err = iam.NewIAMClient("some_key", "")
 			Expect(err).ToNot(HaveOccurred())
 		})
 

client/actions/clusters/cluster_client_test.go

@@ -22,7 +22,7 @@ var _ = Describe("ClusterClient", func() {
 
 		BeforeEach(func() {
 			endpoint = "https://satcon.foo"
-			iamClient, err = iam.NewIAMClient("some_key")
+			iamClient, err = iam.NewIAMClient("some_key", "")
 			Expect(err).ToNot(HaveOccurred())
 
 		})

client/actions/subscriptions/subscription_client_test.go

@@ -22,7 +22,7 @@ var _ = Describe("ClusterClient", func() {
 
 		BeforeEach(func() {
 			endpoint = "https://satcon.foo"
-			iamClient, err = iam.NewIAMClient("some_key")
+			iamClient, err = iam.NewIAMClient("some_key", "")
 			Expect(err).ToNot(HaveOccurred())
 		})
 

client/actions/users/user_client_test.go

@@ -22,7 +22,7 @@ var _ = Describe("UserClient", func() {
 
 		BeforeEach(func() {
 			endpoint = "https://satcon.foo"
-			iamClient, err = iam.NewIAMClient("some_key")
+			iamClient, err = iam.NewIAMClient("some_key", "")
 			Expect(err).ToNot(HaveOccurred())
 		})
 

client/actions/versions/version_client_test.go

@@ -22,7 +22,7 @@ var _ = Describe("ClusterClient", func() {
 
 		BeforeEach(func() {
 			endpoint = "https://satcon.foo"
-			iamClient, err = iam.NewIAMClient("some_key")
+			iamClient, err = iam.NewIAMClient("some_key", "")
 			Expect(err).ToNot(HaveOccurred())
 
 		})

client/auth/iam/client.go

@@ -11,9 +11,9 @@ type Client struct {
 }
 
 //NewIAMClient returns a new core.IamAuthenticator struct and also returns the error
-func NewIAMClient(apiKey string) (*Client, error) {
+func NewIAMClient(apiKey string, url string) (*Client, error) {
 
-	iamClient, err := core.NewIamAuthenticator(apiKey, "", "", "", false, nil)
+	iamClient, err := core.NewIamAuthenticator(apiKey, url, "", "", false, nil)
 
 	if err == nil {
 		return &Client{Client: iamClient}, nil

client/auth/iam/client_test.go

@@ -15,7 +15,7 @@ var _ = Describe("Client", func() {
 
 	It("returns a new IAMClient", func() {
 
-		iamClient, err := iam.NewIAMClient(apiKey)
+		iamClient, err := iam.NewIAMClient(apiKey, "")
 		Expect(iamClient.Client).NotTo(BeNil())
 		Expect(err).NotTo(HaveOccurred())
 
@@ -30,7 +30,7 @@ var _ = Describe("Client", func() {
 
 		It("returns an error", func() {
 
-			iamClient, err := iam.NewIAMClient(apiKey)
+			iamClient, err := iam.NewIAMClient(apiKey, "")
 			Expect(err).To(HaveOccurred())
 			Expect(iamClient).To(BeNil())
 

client/client_test.go

@@ -25,7 +25,7 @@ var _ = Describe("Client", func() {
 
 		BeforeEach(func() {
 			endpointURL = "https://foo.bar"
-			iamClient, err = iam.NewIAMClient("some_key")
+			iamClient, err = iam.NewIAMClient("some_key", "")
 			Expect(err).NotTo(HaveOccurred())
 		})
 

test/integration/channels_test.go

@@ -20,7 +20,7 @@ var _ = Describe("Channels", func() {
 	BeforeEach(func() {
 		var err error
 		var iamClient *iam.Client
-		iamClient, err = iam.NewIAMClient(testConfig.APIKey)
+		iamClient, err = iam.NewIAMClient(testConfig.APIKey, testConfig.IAMEndpoint)
 		Expect(err).ToNot(HaveOccurred())
 		c, _ = client.New(testConfig.SatConEndpoint, nil, iamClient.Client)
 		Expect(c.Channels).NotTo(BeNil())

test/integration/clusters_test.go

@@ -20,7 +20,7 @@ var _ = Describe("Clusters", func() {
 
 	BeforeEach(func() {
 		var err error
-		iamClient, err = iam.NewIAMClient(testConfig.APIKey)
+		iamClient, err = iam.NewIAMClient(testConfig.APIKey, testConfig.IAMEndpoint)
 		Expect(err).ToNot(HaveOccurred())
 		c, _ = client.New(testConfig.SatConEndpoint, nil, iamClient.Client)
 		Expect(c.Clusters).NotTo(BeNil())

test/integration/groups_test.go

@@ -22,7 +22,7 @@ var _ = Describe("Groups", func() {
 
 	BeforeEach(func() {
 		var err error
-		iamClient, err = iam.NewIAMClient(testConfig.APIKey)
+		iamClient, err = iam.NewIAMClient(testConfig.APIKey, testConfig.IAMEndpoint)
 		Expect(err).ToNot(HaveOccurred())
 		c, _ = client.New(testConfig.SatConEndpoint, nil, iamClient.Client)
 		Expect(c.Groups).NotTo(BeNil())

test/integration/subscriptions_test.go

@@ -3,6 +3,7 @@ package integration_test
 import (
 	"encoding/base64"
 	"fmt"
+
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 
@@ -20,7 +21,7 @@ var _ = Describe("Subscriptions", func() {
 
 	BeforeEach(func() {
 		var err error
-		iamClient, err = iam.NewIAMClient(testConfig.APIKey)
+		iamClient, err = iam.NewIAMClient(testConfig.APIKey, testConfig.IAMEndpoint)
 		Expect(err).ToNot(HaveOccurred())
 		c, _ = client.New(testConfig.SatConEndpoint, nil, iamClient.Client)
 		Expect(c.Subscriptions).NotTo(BeNil())

test/integration/users_test.go

@@ -18,7 +18,7 @@ var _ = Describe("Users", func() {
 
 	BeforeEach(func() {
 		var err error
-		iamClient, err = iam.NewIAMClient(testConfig.APIKey)
+		iamClient, err = iam.NewIAMClient(testConfig.APIKey, testConfig.IAMEndpoint)
 		Expect(err).ToNot(HaveOccurred())
 		c, _ = client.New(testConfig.SatConEndpoint, nil, iamClient.Client)
 		Expect(c.Clusters).NotTo(BeNil())

test/integration/versions_test.go

@@ -22,7 +22,7 @@ var _ = Describe("Versions", func() {
 
 	BeforeEach(func() {
 		var err error
-		iamClient, err = iam.NewIAMClient(testConfig.APIKey)
+		iamClient, err = iam.NewIAMClient(testConfig.APIKey, testConfig.IAMEndpoint)
 		Expect(err).ToNot(HaveOccurred())
 		c, _ = client.New(testConfig.SatConEndpoint, nil, iamClient.Client)
 		Expect(c.Versions).NotTo(BeNil())