Skip to content

Commit

Permalink
Client fix
Browse files Browse the repository at this point in the history
  • Loading branch information
@l-technicore
l-technicore committed Nov 25, 2024
1 parent e6bd30a commit d3bfa81
Showing 1 changed file with 7 additions and 65 deletions.
72 changes: 7 additions & 65 deletions pkg/oci/client/client.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,6 @@ package client

import (
"context"
"os"
"strings"
"time"

"github.com/oracle/oci-go-sdk/v65/common"
Expand Down Expand Up @@ -195,40 +193,6 @@ 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, targetTenancyID string) (Interface, error) {

Expand All @@ -237,8 +201,6 @@ func New(logger *zap.SugaredLogger, cp common.ConfigurationProvider, opRateLimit
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")
Expand All @@ -249,8 +211,6 @@ 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")
Expand All @@ -261,8 +221,6 @@ 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")
Expand All @@ -273,8 +231,6 @@ 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")
Expand All @@ -285,8 +241,6 @@ 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")
Expand All @@ -298,7 +252,7 @@ func New(logger *zap.SugaredLogger, cp common.ConfigurationProvider, opRateLimit
// return nil, errors.Wrap(err, "NewCompartmentsClientWithConfigurationProvider")
//}
//
//setupBaseClient(logger, &compartment.BaseClient, nil, nil, "")
//setupBaseClient(logger, &compartment.BaseClient, signer, interceptor, "")
//
//err = configureCustomTransport(logger, &compartment.BaseClient)
//if err != nil {
Expand All @@ -310,8 +264,6 @@ 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")
Expand All @@ -322,8 +274,6 @@ 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")
Expand Down Expand Up @@ -394,7 +344,6 @@ 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 {
Expand All @@ -414,7 +363,6 @@ 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 {
Expand Down Expand Up @@ -445,8 +393,6 @@ 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)
Expand Down Expand Up @@ -483,8 +429,6 @@ 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)
Expand All @@ -498,7 +442,7 @@ func (c *client) Identity(ociClientConfig *OCIClientConfig) IdentityInterface {
// return nil
//}
//
//setupBaseClient(c.logger, &compartment.BaseClient, nil, nil, "")
//setupBaseClient(c.logger, &compartment.BaseClient, signer, interceptor, "")
//
//err = configureCustomTransport(c.logger, &compartment.BaseClient)
//if err != nil {
Expand All @@ -508,11 +452,11 @@ func (c *client) Identity(ociClientConfig *OCIClientConfig) IdentityInterface {

return &client{
//compartment: &compartment,
identity: &identity,
requestMetadata: c.requestMetadata,
rateLimiter: c.rateLimiter,
subnetCache: cache.NewTTLStore(subnetCacheKeyFn, time.Duration(24)*time.Hour),
logger: c.logger,
identity: &identity,
requestMetadata: c.requestMetadata,
rateLimiter: c.rateLimiter,
subnetCache: cache.NewTTLStore(subnetCacheKeyFn, time.Duration(24)*time.Hour),
logger: c.logger,
}
}
return c
Expand All @@ -536,8 +480,6 @@ 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())
Expand Down

0 comments on commit d3bfa81

Please sign in to comment.