AuthSDK changes for SingleStack IPv6

Author: pranavsriram8

pkg/oci/client/client.go

@@ -16,6 +16,8 @@ package client
 
 import (
 	"context"
+	"os"
+	"strings"
 	"time"
 
 	"github.com/oracle/oci-go-sdk/v65/common"
@@ -193,14 +195,50 @@ type client struct {
 	logger      *zap.SugaredLogger
 }
 
+func setupBaseClient(log *zap.SugaredLogger, client *common.BaseClient, signer common.HTTPRequestSigner, interceptor common.RequestInterceptor, endpointOverrideEnvVar string) {
+	client.Signer = signer
+	client.Interceptor = interceptor
+	if endpointOverrideEnvVar != "" {
+		endpointOverride, ok := os.LookupEnv(endpointOverrideEnvVar)
+		if ok && endpointOverride != "" {
+			client.Host = endpointOverride
+		}
+	}
+	clusterIpFamily, ok := os.LookupEnv(ClusterIpFamilyEnv)
+	// currently as dual stack endpoints are going to be present in selected regions, only for IPv6 single stack cluster we will be using dual stack endpoints
+	if ok && strings.EqualFold(clusterIpFamily, Ipv6Stack) {
+		// TODO: Uncomment once method is available in Public SDK
+		//client.EnableDualStackEndpoints(true)
+
+		region, ok := os.LookupEnv("OCI_RESOURCE_PRINCIPAL_REGION")
+		if !ok {
+			log.Errorf("unable to get OCI_RESOURCE_PRINCIPAL_REGION env var for region")
+		}
+
+		authEndpoint, ok := os.LookupEnv("OCI_SDK_AUTH_CLIENT_REGION_URL")
+		if !ok {
+			authDualStackEndpoint := common.StringToRegion(region).EndpointForTemplate("", "ds.auth.{region}.oci.{secondLevelDomain}")
+			if err := os.Setenv("OCI_SDK_AUTH_CLIENT_REGION_URL", authDualStackEndpoint); err != nil {
+				log.Errorf("unable to set OCI_SDK_AUTH_CLIENT_REGION_URL env var for oci auth dual stack endpoint")
+			} else {
+				log.Infof("OCI_SDK_AUTH_CLIENT_REGION_URL env var set to: %s", authDualStackEndpoint)
+			}
+		} else {
+			log.Infof("OCI_SDK_AUTH_CLIENT_REGION_URL env var set to: %s", authEndpoint)
+		}
+	}
+}
+
 // New constructs an OCI API client.
-func New(logger *zap.SugaredLogger, cp common.ConfigurationProvider, opRateLimiter *RateLimiter) (Interface, error) {
+func New(logger *zap.SugaredLogger, cp common.ConfigurationProvider, opRateLimiter *RateLimiter, targetTenancyID string) (Interface, error) {
 
 	compute, err := core.NewComputeClientWithConfigurationProvider(cp)
 	if err != nil {
 		return nil, errors.Wrap(err, "NewComputeClientWithConfigurationProvider")
 	}
 
+	setupBaseClient(logger, &compute.BaseClient, nil, nil, "")
+
 	err = configureCustomTransport(logger, &compute.BaseClient)
 	if err != nil {
 		return nil, errors.Wrap(err, "configuring load balancer client custom transport")
@@ -211,6 +249,8 @@ func New(logger *zap.SugaredLogger, cp common.ConfigurationProvider, opRateLimit
 		return nil, errors.Wrap(err, "NewVirtualNetworkClientWithConfigurationProvider")
 	}
 
+	setupBaseClient(logger, &network.BaseClient, nil, nil, "")
+
 	err = configureCustomTransport(logger, &network.BaseClient)
 	if err != nil {
 		return nil, errors.Wrap(err, "configuring load balancer client custom transport")
@@ -221,6 +261,8 @@ func New(logger *zap.SugaredLogger, cp common.ConfigurationProvider, opRateLimit
 		return nil, errors.Wrap(err, "NewLoadBalancerClientWithConfigurationProvider")
 	}
 
+	setupBaseClient(logger, &lb.BaseClient, nil, nil, "")
+
 	err = configureCustomTransport(logger, &lb.BaseClient)
 	if err != nil {
 		return nil, errors.Wrap(err, "configuring loadbalancer client custom transport")
@@ -231,6 +273,8 @@ func New(logger *zap.SugaredLogger, cp common.ConfigurationProvider, opRateLimit
 		return nil, errors.Wrap(err, "NewNetworkLoadBalancerClientWithConfigurationProvider")
 	}
 
+	setupBaseClient(logger, &nlb.BaseClient, nil, nil, "")
+
 	err = configureCustomTransport(logger, &nlb.BaseClient)
 	if err != nil {
 		return nil, errors.Wrap(err, "configuring networkloadbalancer client custom transport")
@@ -241,6 +285,8 @@ func New(logger *zap.SugaredLogger, cp common.ConfigurationProvider, opRateLimit
 		return nil, errors.Wrap(err, "NewIdentityClientWithConfigurationProvider")
 	}
 
+	setupBaseClient(logger, &identity.BaseClient, nil, nil, "")
+
 	err = configureCustomTransport(logger, &identity.BaseClient)
 	if err != nil {
 		return nil, errors.Wrap(err, "configuring identity service client custom transport")
@@ -252,6 +298,8 @@ func New(logger *zap.SugaredLogger, cp common.ConfigurationProvider, opRateLimit
 	//	return nil, errors.Wrap(err, "NewCompartmentsClientWithConfigurationProvider")
 	//}
 	//
+	//setupBaseClient(logger, &compartment.BaseClient, nil, nil, "")
+	//
 	//err = configureCustomTransport(logger, &compartment.BaseClient)
 	//if err != nil {
 	//	return nil, errors.Wrap(err, "configuring compartment service client custom transport")
@@ -262,6 +310,8 @@ func New(logger *zap.SugaredLogger, cp common.ConfigurationProvider, opRateLimit
 		return nil, errors.Wrap(err, "NewBlockstorageClientWithConfigurationProvider")
 	}
 
+	setupBaseClient(logger, &bs.BaseClient, nil, nil, "")
+
 	err = configureCustomTransport(logger, &bs.BaseClient)
 	if err != nil {
 		return nil, errors.Wrap(err, "configuring block storage service client custom transport")
@@ -272,6 +322,8 @@ func New(logger *zap.SugaredLogger, cp common.ConfigurationProvider, opRateLimit
 		return nil, errors.Wrap(err, "NewFileStorageClientWithConfigurationProvider")
 	}
 
+	setupBaseClient(logger, &fss.BaseClient, nil, nil, "")
+
 	err = configureCustomTransport(logger, &fss.BaseClient)
 	if err != nil {
 		return nil, errors.Wrap(err, "configuring file storage service client custom transport")
@@ -342,6 +394,7 @@ func (c *client) LoadBalancer(logger *zap.SugaredLogger, lbType string, targetTe
 			logger.Error("Failed to get new LB client with oke workload identity configuration provider! Error:" + err.Error())
 			return nil
 		}
+		setupBaseClient(logger, &lb.BaseClient, nil, nil, "")
 
 		err = configureCustomTransport(logger, &lb.BaseClient)
 		if err != nil {
@@ -361,6 +414,7 @@ func (c *client) LoadBalancer(logger *zap.SugaredLogger, lbType string, targetTe
 			logger.Error("Failed to get new NLB client with oke workload identity configuration provider! Error:" + err.Error())
 			return nil
 		}
+		setupBaseClient(logger, &nlb.BaseClient, nil, nil, "")
 
 		err = configureCustomTransport(logger, &nlb.BaseClient)
 		if err != nil {
@@ -391,6 +445,8 @@ func (c *client) Networking(ociClientConfig *OCIClientConfig) NetworkingInterfac
 			return nil
 		}
 
+		setupBaseClient(c.logger, &network.BaseClient, nil, nil, "")
+
 		err = configureCustomTransport(c.logger, &network.BaseClient)
 		if err != nil {
 			c.logger.Error("Failed configure custom transport for Network Client %v", err)
@@ -427,6 +483,8 @@ func (c *client) Identity(ociClientConfig *OCIClientConfig) IdentityInterface {
 			return nil
 		}
 
+		setupBaseClient(c.logger, &identity.BaseClient, nil, nil, "")
+
 		err = configureCustomTransport(c.logger, &identity.BaseClient)
 		if err != nil {
 			c.logger.Error("Failed configure custom transport for Identity Client %v", err)
@@ -440,6 +498,8 @@ func (c *client) Identity(ociClientConfig *OCIClientConfig) IdentityInterface {
 		//	return nil
 		//}
 		//
+		//setupBaseClient(c.logger, &compartment.BaseClient, nil, nil, "")
+		//
 		//err = configureCustomTransport(c.logger, &compartment.BaseClient)
 		//if err != nil {
 		//	c.logger.Error("Failed configure custom transport for Compartments Client %v", err)
@@ -476,6 +536,8 @@ func (c *client) FSS(ociClientConfig *OCIClientConfig) FileStorageInterface {
 			return nil
 		}
 
+		setupBaseClient(c.logger, &fc.BaseClient, nil, nil, "")
+
 		err = configureCustomTransport(c.logger, &fc.BaseClient)
 		if err != nil {
 			c.logger.Errorf("Failed configure custom transport for FSS Client %v", err.Error())