Revamp session code to include URL

Signed-off-by: Yussuf Shaikh <[email protected]>
IBM-Cloud · Jan 14, 2022 · 59ccfe2 · 59ccfe2
1 parent bd866ac
commit 59ccfe2
Show file tree

Hide file tree

Showing 24 changed files with 815 additions and 299 deletions.
diff --git a/clients/instance/ibm-pi-helper.go b/clients/instance/ibm-pi-helper.go
@@ -21,11 +21,10 @@ type IBMPIClient struct {
 
 // NewIBMPIClient ...
 func NewIBMPIClient(ctx context.Context, sess *ibmpisession.IBMPISession, cloudInstanceID string) *IBMPIClient {
-	authInfo := ibmpisession.NewAuth(sess, cloudInstanceID)
 	return &IBMPIClient{
 		session:         sess,
 		cloudInstanceID: cloudInstanceID,
-		authInfo:        authInfo,
+		authInfo:        sess.AuthInfo(cloudInstanceID),
 		ctx:             ctx,
 	}
 }
diff --git a/clients/instance/ibm-pi-instance.go b/clients/instance/ibm-pi-instance.go
@@ -57,7 +57,7 @@ func (f *IBMPIInstanceClient) Create(body *models.PVMInstanceCreate) (*models.PV
 	params := p_cloud_p_vm_instances.NewPcloudPvminstancesPostParams().
 		WithContext(f.ctx).WithTimeout(helpers.PICreateTimeOut).
 		WithCloudInstanceID(f.cloudInstanceID).WithBody(body)
-	postok, postcreated, postAccepted, err := f.session.Power.PCloudpVMInstances.PcloudPvminstancesPost(params, ibmpisession.NewAuth(f.session, f.cloudInstanceID))
+	postok, postcreated, postAccepted, err := f.session.Power.PCloudpVMInstances.PcloudPvminstancesPost(params, f.authInfo)
 	if err != nil {
 		return nil, fmt.Errorf("failed to Create PVM Instance :%w", err)
 	}

diff --git a/clients/instance/ibm-pi-key.go b/clients/instance/ibm-pi-key.go
@@ -26,7 +26,7 @@ func NewIBMPIKeyClient(ctx context.Context, sess *ibmpisession.IBMPISession, clo
 
 // Get Key...
 func (f *IBMPIKeyClient) Get(id string) (*models.SSHKey, error) {
-	var tenantid = f.session.UserAccount
+	var tenantid = f.session.Options.UserAccount
 	params := p_cloud_tenants_ssh_keys.NewPcloudTenantsSshkeysGetParams().
 		WithContext(f.ctx).WithTimeout(helpers.PIGetTimeOut).
 		WithTenantID(tenantid).WithSshkeyName(id)
@@ -42,7 +42,7 @@ func (f *IBMPIKeyClient) Get(id string) (*models.SSHKey, error) {
 
 // GetAll Information about all the PVM Instances for a Client
 func (f *IBMPIKeyClient) GetAll() (*models.SSHKeys, error) {
-	var tenantid = f.session.UserAccount
+	var tenantid = f.session.Options.UserAccount
 	params := p_cloud_tenants_ssh_keys.NewPcloudTenantsSshkeysGetallParams().
 		WithContext(f.ctx).WithTimeout(helpers.PIGetTimeOut).
 		WithTenantID(tenantid)
@@ -58,9 +58,10 @@ func (f *IBMPIKeyClient) GetAll() (*models.SSHKeys, error) {
 
 // Create PI Key ...
 func (f *IBMPIKeyClient) Create(body *models.SSHKey) (*models.SSHKey, error) {
+	var tenantid = f.session.Options.UserAccount
 	params := p_cloud_tenants_ssh_keys.NewPcloudTenantsSshkeysPostParams().
 		WithContext(f.ctx).WithTimeout(helpers.PICreateTimeOut).
-		WithTenantID(f.session.UserAccount).WithBody(body)
+		WithTenantID(tenantid).WithBody(body)
 	postok, postcreated, err := f.session.Power.PCloudTenantsSSHKeys.PcloudTenantsSshkeysPost(params, f.authInfo)
 	if err != nil {
 		return nil, fmt.Errorf(errors.CreatePIKeyOperationFailed, err)
@@ -76,7 +77,7 @@ func (f *IBMPIKeyClient) Create(body *models.SSHKey) (*models.SSHKey, error) {
 
 // Delete ...
 func (f *IBMPIKeyClient) Delete(id string) error {
-	var tenantid = f.session.UserAccount
+	var tenantid = f.session.Options.UserAccount
 	params := p_cloud_tenants_ssh_keys.NewPcloudTenantsSshkeysDeleteParams().
 		WithContext(f.ctx).WithTimeout(helpers.PIDeleteTimeOut).
 		WithTenantID(tenantid).WithSshkeyName(id)

diff --git a/clients/instance/ibm-pi-tenant.go b/clients/instance/ibm-pi-tenant.go
@@ -41,7 +41,7 @@ func (f *IBMPITenantClient) Get(tenantid string) (*models.Tenant, error) {
 func (f *IBMPITenantClient) GetSelfTenant() (*models.Tenant, error) {
 	params := p_cloud_tenants.NewPcloudTenantsGetParams().
 		WithContext(f.ctx).WithTimeout(helpers.PIGetTimeOut).
-		WithTenantID(f.session.UserAccount)
+		WithTenantID(f.session.Options.UserAccount)
 	resp, err := f.session.Power.PCloudTenants.PcloudTenantsGet(params, f.authInfo)
 	if err != nil {
 		return nil, fmt.Errorf("failed to get self tenant with error %w", err)

diff --git a/examples/cloud-connection/main.go b/examples/cloud-connection/main.go
@@ -9,6 +9,7 @@ import (
 	v "github.com/IBM-Cloud/power-go-client/clients/instance"
 	ps "github.com/IBM-Cloud/power-go-client/ibmpisession"
 	"github.com/IBM-Cloud/power-go-client/power/models"
+	"github.com/IBM/go-sdk-core/v5/core"
 )
 
 const (
@@ -22,14 +23,30 @@ func main() {
 	region := " < REGION > "
 	zone := " < ZONE > "
 	accountID := " < ACCOUNT ID > "
-	//os.Setenv("IBMCLOUD_POWER_API_ENDPOINT", region+".power-iaas.test.cloud.ibm.com")
+	url := region + ".power-iaas.test.cloud.ibm.com"
 
 	// Cloud connection inputs
 	name := " < NAME OF THE CONNECTION > "
 	piID := " < POWER INSTANCE ID > "
 	var speed int64 = 5000
 
-	session, err := ps.New(token, region, true, accountID, zone)
+	authenticator := &core.BearerTokenAuthenticator{
+		BearerToken: token,
+	}
+	// authenticator := &core.IamAuthenticator{
+	// 	ApiKey: "< API KEY >",
+	// 	// Uncomment for test environment
+	// 	URL: "https://iam.test.cloud.ibm.com",
+	// }
+	// Create the session
+	options := &ps.IBMPIOptions{
+		Authenticator: authenticator,
+		UserAccount:   accountID,
+		Zone:          zone,
+		URL:           url,
+		Debug:         true,
+	}
+	session, err := ps.NewIBMPISession(options)
 	if err != nil {
 		log.Fatal(err)
 	}

diff --git a/examples/dhcp/main.go b/examples/dhcp/main.go
@@ -6,6 +6,7 @@ import (
 
 	v "github.com/IBM-Cloud/power-go-client/clients/instance"
 	ps "github.com/IBM-Cloud/power-go-client/ibmpisession"
+	"github.com/IBM/go-sdk-core/v5/core"
 )
 
 func main() {
@@ -15,12 +16,28 @@ func main() {
 	region := " < REGION > "
 	zone := " < ZONE > "
 	accountID := " < ACCOUNT ID > "
-	//os.Setenv("IBMCLOUD_POWER_API_ENDPOINT", region+".power-iaas.test.cloud.ibm.com")
+	url := region + ".power-iaas.test.cloud.ibm.com"
 
 	// dhcp inputs
 	piID := " < POWER INSTANCE ID > "
 
-	session, err := ps.New(token, region, true, accountID, zone)
+	authenticator := &core.BearerTokenAuthenticator{
+		BearerToken: token,
+	}
+	// authenticator := &core.IamAuthenticator{
+	// 	ApiKey: "< API KEY >",
+	// 	// Uncomment for test environment
+	// 	URL: "https://iam.test.cloud.ibm.com",
+	// }
+	// Create the session
+	options := &ps.IBMPIOptions{
+		Authenticator: authenticator,
+		UserAccount:   accountID,
+		Zone:          zone,
+		URL:           url,
+		Debug:         true,
+	}
+	session, err := ps.NewIBMPISession(options)
 	if err != nil {
 		log.Fatal(err)
 	}

diff --git a/examples/images/main.go b/examples/images/main.go
@@ -8,6 +8,7 @@ import (
 	v "github.com/IBM-Cloud/power-go-client/clients/instance"
 	ps "github.com/IBM-Cloud/power-go-client/ibmpisession"
 	"github.com/IBM-Cloud/power-go-client/power/models"
+	"github.com/IBM/go-sdk-core/v5/core"
 )
 
 func main() {
@@ -17,14 +18,30 @@ func main() {
 	region := " < REGION > "
 	zone := " < ZONE > "
 	accountID := " < ACCOUNT ID > "
-	//os.Setenv("IBMCLOUD_POWER_API_ENDPOINT", region+".power-iaas.test.cloud.ibm.com")
+	url := region + ".power-iaas.test.cloud.ibm.com"
 
 	// Image inputs
 	piID := " < POWER INSTANCE ID > "
 	name := " < NAME OF THE IMAGE > "
 	image := " <IMAGE ID> "
 
-	session, err := ps.New(token, region, true, accountID, zone)
+	authenticator := &core.BearerTokenAuthenticator{
+		BearerToken: token,
+	}
+	// authenticator := &core.IamAuthenticator{
+	// 	ApiKey: "< API KEY >",
+	// 	// Uncomment for test environment
+	// 	URL: "https://iam.test.cloud.ibm.com",
+	// }
+	// Create the session
+	options := &ps.IBMPIOptions{
+		Authenticator: authenticator,
+		UserAccount:   accountID,
+		Zone:          zone,
+		URL:           url,
+		Debug:         true,
+	}
+	session, err := ps.NewIBMPISession(options)
 	if err != nil {
 		log.Fatal(err)
 	}

diff --git a/examples/instance/main.go b/examples/instance/main.go
@@ -7,6 +7,7 @@ import (
 	v "github.com/IBM-Cloud/power-go-client/clients/instance"
 	ps "github.com/IBM-Cloud/power-go-client/ibmpisession"
 	"github.com/IBM-Cloud/power-go-client/power/models"
+	"github.com/IBM/go-sdk-core/v5/core"
 )
 
 func main() {
@@ -16,7 +17,7 @@ func main() {
 	region := " < REGION > "
 	zone := " < ZONE > "
 	accountID := " < ACCOUNT ID > "
-	//os.Setenv("IBMCLOUD_POWER_API_ENDPOINT", region+".power-iaas.test.cloud.ibm.com")
+	url := region + ".power-iaas.test.cloud.ibm.com"
 
 	// volume inputs
 	name := " < NAME OF THE volume > "
@@ -32,7 +33,23 @@ func main() {
 	procType := "shared"
 	sysType := "s922"
 
-	session, err := ps.New(token, region, true, accountID, zone)
+	authenticator := &core.BearerTokenAuthenticator{
+		BearerToken: token,
+	}
+	// authenticator := &core.IamAuthenticator{
+	// 	ApiKey: "< API KEY >",
+	// 	// Uncomment for test environment
+	// 	URL: "https://iam.test.cloud.ibm.com",
+	// }
+	// Create the session
+	options := &ps.IBMPIOptions{
+		Authenticator: authenticator,
+		UserAccount:   accountID,
+		Zone:          zone,
+		URL:           url,
+		Debug:         true,
+	}
+	session, err := ps.NewIBMPISession(options)
 	if err != nil {
 		log.Fatal(err)
 	}

diff --git a/examples/key/main.go b/examples/key/main.go
@@ -7,6 +7,7 @@ import (
 	v "github.com/IBM-Cloud/power-go-client/clients/instance"
 	ps "github.com/IBM-Cloud/power-go-client/ibmpisession"
 	"github.com/IBM-Cloud/power-go-client/power/models"
+	"github.com/IBM/go-sdk-core/v5/core"
 )
 
 func main() {
@@ -16,14 +17,31 @@ func main() {
 	region := " < REGION > "
 	zone := " < ZONE > "
 	accountID := " < ACCOUNT ID > "
-	//os.Setenv("IBMCLOUD_POWER_API_ENDPOINT", region+".power-iaas.test.cloud.ibm.com")
+	url := region + ".power-iaas.test.cloud.ibm.com"
 
 	// ssh inputs
 	name := " < NAME OF THE ssh > "
 	piID := " < POWER INSTANCE ID > "
 	ssh := " <ssh ID> "
 
-	session, err := ps.New(token, region, true, accountID, zone)
+	authenticator := &core.BearerTokenAuthenticator{
+		BearerToken: token,
+	}
+	// authenticator := &core.IamAuthenticator{
+	// 	ApiKey: "< API KEY >",
+	// 	// Uncomment for test environment
+	// 	URL: "https://iam.test.cloud.ibm.com",
+	// }
+	// Create the session
+	options := &ps.IBMPIOptions{
+		Authenticator: authenticator,
+		UserAccount:   accountID,
+		Zone:          zone,
+		URL:           url,
+		Debug:         true,
+	}
+
+	session, err := ps.NewIBMPISession(options)
 	if err != nil {
 		log.Fatal(err)
 	}

diff --git a/examples/key_authenticator/main.go b/examples/key_authenticator/main.go
diff --git a/examples/network/main.go b/examples/network/main.go
@@ -11,6 +11,7 @@ import (
 	v "github.com/IBM-Cloud/power-go-client/clients/instance"
 	ps "github.com/IBM-Cloud/power-go-client/ibmpisession"
 	"github.com/IBM-Cloud/power-go-client/power/models"
+	"github.com/IBM/go-sdk-core/v5/core"
 )
 
 func main() {
@@ -20,7 +21,7 @@ func main() {
 	region := " < REGION > "
 	zone := " < ZONE > "
 	accountID := " < ACCOUNT ID > "
-	//os.Setenv("IBMCLOUD_POWER_API_ENDPOINT", region+".power-iaas.test.cloud.ibm.com")
+	url := region + ".power-iaas.test.cloud.ibm.com"
 
 	// network public vlan inputs
 	// name := " < NAME OF THE network > "
@@ -39,7 +40,24 @@ func main() {
 	gateway, startIP, endIP := generateIPData(cidr)
 	jumbo := false
 
-	session, err := ps.New(token, region, true, accountID, zone)
+	authenticator := &core.BearerTokenAuthenticator{
+		BearerToken: token,
+	}
+	// authenticator := &core.IamAuthenticator{
+	// 	ApiKey: "< API KEY >",
+	// 	// Uncomment for test environment
+	// 	URL: "https://iam.test.cloud.ibm.com",
+	// }
+
+	// Create the session
+	options := &ps.IBMPIOptions{
+		Authenticator: authenticator,
+		UserAccount:   accountID,
+		Zone:          zone,
+		URL:           url,
+		Debug:         true,
+	}
+	session, err := ps.NewIBMPISession(options)
 	if err != nil {
 		log.Fatal(err)
 	}