Update the structs and adding tests.

api/v1beta1/ocicluster_conversion.go

@@ -48,7 +48,7 @@ func (src *OCICluster) ConvertTo(dstRaw conversion.Hub) error {
 	dst.Spec.NetworkSpec.Vcn.InternetGateway.Skip = restored.Spec.NetworkSpec.Vcn.InternetGateway.Skip
 	dst.Spec.NetworkSpec.Vcn.RouteTable.Skip = restored.Spec.NetworkSpec.Vcn.RouteTable.Skip
 	dst.Spec.NetworkSpec.APIServerLB.LoadBalancerType = restored.Spec.NetworkSpec.APIServerLB.LoadBalancerType
-	dst.Spec.ClientHostUrls = restored.Spec.ClientHostUrls
+	dst.Spec.ClientOverrides = restored.Spec.ClientOverrides
 
 	return nil
 }

api/v1beta1/ociclustertemplate_conversion.go

@@ -42,7 +42,7 @@ func (src *OCIClusterTemplate) ConvertTo(dstRaw conversion.Hub) error {
 	dst.Spec.Template.Spec.NetworkSpec.Vcn.RouteTable.Skip = restored.Spec.Template.Spec.NetworkSpec.Vcn.RouteTable.Skip
 	dst.Spec.Template.Spec.AvailabilityDomains = restored.Spec.Template.Spec.AvailabilityDomains
 	dst.Spec.Template.Spec.NetworkSpec.APIServerLB.LoadBalancerType = restored.Spec.Template.Spec.NetworkSpec.APIServerLB.LoadBalancerType
-	dst.Spec.Template.Spec.ClientHostUrls = restored.Spec.Template.Spec.ClientHostUrls
+	dst.Spec.Template.Spec.ClientOverrides = restored.Spec.Template.Spec.ClientOverrides
 	return nil
 }
 

api/v1beta2/ocicluster_types.go

@@ -75,11 +75,11 @@ type OCIClusterSpec struct {
 	// +optional
 	AvailabilityDomains map[string]OCIAvailabilityDomain `json:"availabilityDomains,omitempty"`
 
-	// HostUrls allows the default client SDK URLs to be changed.
+	// ClientOverrides allows the default client SDK URLs to be changed.
 	//
 	// +optional
 	// +nullable
-	ClientHostUrls *ClusterClientHostUrls `json:"clientHostUrls,omitempty"`
+	ClientOverrides *ClientOverrides `json:"clientOverrides,omitempty"`
 }
 
 // OCIClusterStatus defines the observed state of OCICluster
@@ -126,44 +126,44 @@ type OCIAvailabilityDomain struct {
 	FaultDomains []string `json:"faultDomains,omitempty"`
 }
 
-// ClusterClientHostUrls contains information about client host url overrides.
-type ClusterClientHostUrls struct {
+// ClientOverrides contains information about client host url overrides.
+type ClientOverrides struct {
 
-	// ComputeClientHost allows the default compute SDK client URL to be changed.
+	// ComputeClientUrl allows the default compute SDK client URL to be changed.
 	//
 	// +optional
 	// +nullable
-	ComputeClientHost *string `json:"computeClientHost,omitempty"`
+	ComputeClientUrl *string `json:"computeClientUrl,omitempty"`
 
-	// ComputeManagementClientHost allows the default compute management SDK client URL to be changed.
+	// ComputeManagementClientUrl allows the default compute management SDK client URL to be changed.
 	//
 	// +optional
 	// +nullable
-	ComputeManagementClientHost *string `json:"computeManagementClientHost,omitempty"`
+	ComputeManagementClientUrl *string `json:"computeManagementClientUrl,omitempty"`
 
-	// VCNClientHost allows the default vcn SDK client URL to be changed.
+	// VCNClientUrl allows the default vcn SDK client URL to be changed.
 	//
 	// +optional
 	// +nullable
-	VCNClientHost *string `json:"vCNClientHost,omitempty"`
+	VCNClientUrl *string `json:"vCNClientUrl,omitempty"`
 
-	// LoadBalancerClientHost allows the default load balancer SDK client URL to be changed.
+	// LoadBalancerClientUrl allows the default load balancer SDK client URL to be changed.
 	//
 	// +optional
 	// +nullable
-	LoadBalancerClientHost *string `json:"loadBalancerClientHost,omitempty"`
+	LoadBalancerClientUrl *string `json:"loadBalancerClientUrl,omitempty"`
 
-	// IdentityClientHost allows the default identity SDK client URL to be changed.
+	// IdentityClientUrl allows the default identity SDK client URL to be changed.
 	//
 	// +optional
 	// +nullable
-	IdentityClientHost *string `json:"identityClientHost,omitempty"`
+	IdentityClientUrl *string `json:"identityClientUrl,omitempty"`
 
-	// ContainerEngineClientHost allows the default container engine SDK client URL to be changed.
+	// ContainerEngineClientUrl allows the default container engine SDK client URL to be changed.
 	//
 	// +optional
 	// +nullable
-	ContainerEngineClientHost *string `json:"containerEngineClientHost,omitempty"`
+	ContainerEngineClientUrl *string `json:"containerEngineClientUrl,omitempty"`
 }
 
 // GetConditions returns the list of conditions for an OCICluster API object.

cloud/scope/clients.go

@@ -59,23 +59,29 @@ type ClientProvider struct {
 	ociClients            map[string]OCIClients
 	ociClientsLock        *sync.RWMutex
 	ociAuthConfigProvider common.ConfigurationProvider
-	ociClientHostUrls     *v1beta2.ClusterClientHostUrls
+	ociClientOverrides    *v1beta2.ClientOverrides
+}
+
+// TODO: add docs
+type ClientProviderParams struct {
+	OciAuthConfigProvider common.ConfigurationProvider
+	ClientOverrides       *v1beta2.ClientOverrides
 }
 
 // NewClientProvider builds the ClientProvider with a client for the given region
-func NewClientProvider(ociAuthConfigProvider common.ConfigurationProvider, clientHostUrlOverrides *v1beta2.ClusterClientHostUrls) (*ClientProvider, error) {
+func NewClientProvider(params ClientProviderParams) (*ClientProvider, error) {
 	log := klogr.New()
 
-	if ociAuthConfigProvider == nil {
+	if params.OciAuthConfigProvider == nil {
 		return nil, errors.New("ConfigurationProvider can not be nil")
 	}
 
 	provider := ClientProvider{
 		Logger:                &log,
-		ociAuthConfigProvider: ociAuthConfigProvider,
+		ociAuthConfigProvider: params.OciAuthConfigProvider,
 		ociClients:            map[string]OCIClients{},
 		ociClientsLock:        new(sync.RWMutex),
-		ociClientHostUrls:     clientHostUrlOverrides,
+		ociClientOverrides:    params.ClientOverrides,
 	}
 
 	return &provider, nil
@@ -173,8 +179,8 @@ func (c *ClientProvider) createVncClient(region string, ociAuthConfigProvider co
 		return nil, err
 	}
 	vcnClient.SetRegion(region)
-	if c.ociClientHostUrls != nil && c.ociClientHostUrls.VCNClientHost != nil {
-		vcnClient.Host = *c.ociClientHostUrls.VCNClientHost
+	if c.ociClientOverrides != nil && c.ociClientOverrides.VCNClientUrl != nil {
+		vcnClient.Host = *c.ociClientOverrides.VCNClientUrl
 	}
 	vcnClient.Interceptor = setVersionHeader()
 
@@ -200,8 +206,8 @@ func (c *ClientProvider) createLBClient(region string, ociAuthConfigProvider com
 		return nil, err
 	}
 	lbClient.SetRegion(region)
-	if c.ociClientHostUrls != nil && c.ociClientHostUrls.LoadBalancerClientHost != nil {
-		lbClient.Host = *c.ociClientHostUrls.LoadBalancerClientHost
+	if c.ociClientOverrides != nil && c.ociClientOverrides.LoadBalancerClientUrl != nil {
+		lbClient.Host = *c.ociClientOverrides.LoadBalancerClientUrl
 	}
 	lbClient.Interceptor = setVersionHeader()
 
@@ -216,8 +222,8 @@ func (c *ClientProvider) createIdentityClient(region string, ociAuthConfigProvid
 	}
 	identityClient.SetRegion(region)
 
-	if c.ociClientHostUrls != nil && c.ociClientHostUrls.IdentityClientHost != nil {
-		identityClient.Host = *c.ociClientHostUrls.IdentityClientHost
+	if c.ociClientOverrides != nil && c.ociClientOverrides.IdentityClientUrl != nil {
+		identityClient.Host = *c.ociClientOverrides.IdentityClientUrl
 	}
 	identityClient.Interceptor = setVersionHeader()
 
@@ -232,8 +238,8 @@ func (c *ClientProvider) createComputeClient(region string, ociAuthConfigProvide
 	}
 	computeClient.SetRegion(region)
 	//https://dyn.slack.com/archives/C7MS7QWC8/p1675719244230459?thread_ts=1675460644.801049&cid=C7MS7QWC8
-	if c.ociClientHostUrls != nil && c.ociClientHostUrls.ComputeClientHost != nil {
-		computeClient.Host = *c.ociClientHostUrls.ComputeClientHost
+	if c.ociClientOverrides != nil && c.ociClientOverrides.ComputeClientUrl != nil {
+		computeClient.Host = *c.ociClientOverrides.ComputeClientUrl
 	}
 	computeClient.Interceptor = setVersionHeader()
 
@@ -247,8 +253,8 @@ func (c *ClientProvider) createComputeManagementClient(region string, ociAuthCon
 		return nil, err
 	}
 	computeManagementClient.SetRegion(region)
-	if c.ociClientHostUrls != nil && c.ociClientHostUrls.ComputeManagementClientHost != nil {
-		computeManagementClient.Host = *c.ociClientHostUrls.ComputeManagementClientHost
+	if c.ociClientOverrides != nil && c.ociClientOverrides.ComputeManagementClientUrl != nil {
+		computeManagementClient.Host = *c.ociClientOverrides.ComputeManagementClientUrl
 	}
 	computeManagementClient.Interceptor = setVersionHeader()
 
@@ -262,8 +268,8 @@ func (c *ClientProvider) createContainerEngineClient(region string, ociAuthConfi
 		return nil, err
 	}
 	containerEngineClient.SetRegion(region)
-	if c.ociClientHostUrls != nil && c.ociClientHostUrls.ContainerEngineClientHost != nil {
-		containerEngineClient.Host = *c.ociClientHostUrls.ContainerEngineClientHost
+	if c.ociClientOverrides != nil && c.ociClientOverrides.ContainerEngineClientUrl != nil {
+		containerEngineClient.Host = *c.ociClientOverrides.ContainerEngineClientUrl
 	}
 	containerEngineClient.Interceptor = setVersionHeader()