Resolve nilnil and nilaway issues (#447)

vladcristi · web-flow · commit 286d66681a96 · 2025-09-11T15:55:41.000+03:00
* addressed nilaway issues

* addressed nilnil issues

* added nolint:nilnil and nolint:nilaway where needed

* added changes to error messages
diff --git a/cloud/config/config.go b/cloud/config/config.go
@@ -146,26 +146,30 @@ func getConfigFromDir(path string) (*AuthConfig, error) {
 }
 
 func NewConfigurationProvider(cfg *AuthConfig) (common.ConfigurationProvider, error) {
+	if cfg == nil {
+		return nil, errors.New("auth config must not be nil")
+	}
 	if cfg.UseInstancePrincipals {
 		return auth.InstancePrincipalConfigurationProvider()
 	} else {
 		return NewConfigurationProviderWithUserPrincipal(cfg)
 	}
 }
 
+// nolint:nilnil
 func NewConfigurationProviderWithUserPrincipal(cfg *AuthConfig) (common.ConfigurationProvider, error) {
 	var conf common.ConfigurationProvider
-	if cfg != nil {
-		conf = common.NewRawConfigurationProvider(
-			cfg.TenancyID,
-			cfg.UserID,
-			cfg.Region,
-			cfg.Fingerprint,
-			cfg.PrivateKey,
-			common.String(cfg.Passphrase))
-		return conf, nil
-	}
-	return nil, nil
+	if cfg == nil {
+		return nil, errors.New("cfg cannot be nil")
+	}
+	conf = common.NewRawConfigurationProvider(
+		cfg.TenancyID,
+		cfg.UserID,
+		cfg.Region,
+		cfg.Fingerprint,
+		cfg.PrivateKey,
+		common.String(cfg.Passphrase))
+	return conf, nil
 }
 
 func ReadFile(path string, key string) (string, error) {
diff --git a/cloud/ociutil/ociutil.go b/cloud/ociutil/ociutil.go
@@ -49,6 +49,8 @@ var ErrNotFound = errors.New("not found")
 
 // IsNotFound returns true if the given error indicates that a resource could
 // not be found.
+// nolint:nilaway // We don't need to check if serviceErr is nil, because once ok is true,
+// serviceErr is non-nil and will not have any issue in accesing GetHTTPStatusCode() field
 func IsNotFound(err error) bool {
 	if err == nil {
 		return false
diff --git a/cloud/scope/clients.go b/cloud/scope/clients.go
@@ -101,12 +101,16 @@ func NewClientProvider(params ClientProviderParams) (*ClientProvider, error) {
 }
 
 // GetAuthProvider returns the client provider auth config
+// nolint:nilaway
 func (c *ClientProvider) GetAuthProvider() common.ConfigurationProvider {
 	return c.ociAuthConfigProvider
 }
 
 // GetOrBuildClient if the OCIClients exist for the region they are returned, if not clients will build them
 func (c *ClientProvider) GetOrBuildClient(region string) (OCIClients, error) {
+	if c == nil || c.ociClients == nil {
+		return OCIClients{}, errors.New("Client provider is not initialized")
+	}
 	if len(region) <= 0 {
 		return OCIClients{}, errors.New("ClientProvider.GetOrBuildClient region can not be empty")
 	}
diff --git a/cloud/scope/clients_test.go b/cloud/scope/clients_test.go
@@ -83,7 +83,7 @@ func TestClients_NewClientProviderWithClientOverrides(t *testing.T) {
 		t.Errorf("Expected clientProvider:%v to equal nil", clientProvider)
 	}
 
-	if !reflect.DeepEqual(clientProvider.ociClientOverrides, clientOverrides) {
+	if clientProvider != nil && !reflect.DeepEqual(clientProvider.ociClientOverrides, clientOverrides) {
 		t.Errorf("clientProvider.ociClientOverrides: %v doesn't equal clientOverrides: %v", clientProvider.ociClientOverrides, clientOverrides)
 	}
 }
@@ -124,7 +124,7 @@ func TestClients_NewClientProviderWithMissingOverrides(t *testing.T) {
 		t.Errorf("Expected clientProvider:%v to equal nil", clientProvider)
 	}
 
-	if !reflect.DeepEqual(clientProvider.ociClientOverrides, clientOverrides) {
+	if clientProvider != nil && !reflect.DeepEqual(clientProvider.ociClientOverrides, clientOverrides) {
 		t.Errorf("clientProvider.ociClientOverrides: %v doesn't equal clientOverrides: %v", clientProvider.ociClientOverrides, clientOverrides)
 	}
 }
diff --git a/cloud/scope/drg_reconciler.go b/cloud/scope/drg_reconciler.go
@@ -64,6 +64,7 @@ func (s *ClusterScope) ReconcileDRG(ctx context.Context) error {
 // 1. the OCICluster's spec Drg
 //
 // 2. Listing the Drgs for the Compartment (by ID) and filtering by tag
+// nolint:nilnil
 func (s *ClusterScope) GetDRG(ctx context.Context) (*core.Drg, error) {
 	drgId := s.getDRG().ID
 	if drgId != nil {
diff --git a/cloud/scope/drg_rpc_attachment_reconciler.go b/cloud/scope/drg_rpc_attachment_reconciler.go
@@ -158,6 +158,7 @@ func (s *ClusterScope) createRPC(ctx context.Context, drgId *string, displayName
 	return &response.RemotePeeringConnection, nil
 }
 
+// nolint:nilnil
 func (s *ClusterScope) lookupRPC(ctx context.Context, drgId *string, rpcId *string, vcnClient vcn.Client) (*core.RemotePeeringConnection, error) {
 	if rpcId != nil {
 		attachment, err := s.getRPC(ctx, rpcId, vcnClient)
diff --git a/cloud/scope/drg_vcn_attachment_reconciler.go b/cloud/scope/drg_vcn_attachment_reconciler.go
@@ -63,6 +63,7 @@ func (s *ClusterScope) ReconcileDRGVCNAttachment(ctx context.Context) error {
 	return nil
 }
 
+// nolint:nilnil
 func (s *ClusterScope) GetDRGAttachment(ctx context.Context) (*core.DrgAttachment, error) {
 	if s.getDRG().VcnAttachmentId != nil {
 		response, err := s.VCNClient.GetDrgAttachment(ctx, core.GetDrgAttachmentRequest{
diff --git a/cloud/scope/internet_gateway_reconciler.go b/cloud/scope/internet_gateway_reconciler.go
@@ -58,6 +58,7 @@ func (s *ClusterScope) ReconcileInternetGateway(ctx context.Context) error {
 // 1. the OCICluster's spec InternetGatewayId
 //
 // 2. Listing the Internet Gateways for the Compartment (by ID) and filtering by tag
+// nolint:nilnil
 func (s *ClusterScope) GetInternetGateway(ctx context.Context) (*core.InternetGateway, error) {
 	gwId := s.OCIClusterAccessor.GetNetworkSpec().Vcn.InternetGateway.Id
 	if gwId != nil {
diff --git a/cloud/scope/load_balancer_reconciler.go b/cloud/scope/load_balancer_reconciler.go
@@ -259,6 +259,7 @@ func (s *ClusterScope) IsLBEqual(actual *loadbalancer.LoadBalancer, desired infr
 // 1. the OCICluster's spec LoadBalancerId
 //
 // 2. Listing the LoadBalancers for the Compartment (by ID) and DisplayName then filtering by tag
+// nolint:nilnil
 func (s *ClusterScope) GetLoadBalancers(ctx context.Context) (*loadbalancer.LoadBalancer, error) {
 	lbOcid := s.OCIClusterAccessor.GetNetworkSpec().APIServerLB.LoadBalancerId
 	if lbOcid != nil {
diff --git a/cloud/scope/machine.go b/cloud/scope/machine.go
@@ -348,6 +348,7 @@ func (m *MachineScope) getMachineFromOCID(ctx context.Context, instanceID *strin
 
 // GetMachineByDisplayName returns the machine from the compartment if there is a matching DisplayName,
 // and it was created by the cluster
+// nolint:nilnil
 func (m *MachineScope) GetMachineByDisplayName(ctx context.Context, name string) (*core.Instance, error) {
 	var page *string
 	for {
diff --git a/cloud/scope/machine_pool.go b/cloud/scope/machine_pool.go
@@ -524,6 +524,7 @@ func (m *MachinePoolScope) ListInstancePoolSummaries(ctx context.Context, req co
 
 // FindInstancePool attempts to find the instance pool by name and checks to make sure
 // the instance pool was created by the cluster before returning the correct pool
+// nolint:nilnil
 func (m *MachinePoolScope) FindInstancePool(ctx context.Context) (*core.InstancePool, error) {
 	if m.OCIMachinePool.Spec.OCID != nil {
 		response, err := m.ComputeManagementClient.GetInstancePool(ctx, core.GetInstancePoolRequest{
@@ -878,6 +879,7 @@ func (m *MachinePoolScope) getWorkerMachineNSGs() []string {
 }
 
 // GetInstanceConfiguration returns the instance configuration associated with the instance pool
+// nolint:nilnil
 func (m *MachinePoolScope) GetInstanceConfiguration(ctx context.Context) (*core.InstanceConfiguration, error) {
 	instanceConfigurationId := m.GetInstanceConfigurationId()
 	if instanceConfigurationId != nil {
diff --git a/cloud/scope/managed_control_plane.go b/cloud/scope/managed_control_plane.go
@@ -278,10 +278,8 @@ func getOKEClusterTypeFromSpecType(controlPlaneSpec infrastructurev1beta2.OCIMan
 		switch controlPlaneSpec.ClusterType {
 		case infrastructurev1beta2.BasicClusterType:
 			return oke.ClusterTypeBasicCluster
-			break
 		case infrastructurev1beta2.EnhancedClusterType:
 			return oke.ClusterTypeEnhancedCluster
-			break
 		default:
 			break
 		}
@@ -314,6 +312,7 @@ func (s *ManagedControlPlaneScope) getOKEClusterFromOCID(ctx context.Context, cl
 	return &resp.Cluster, nil
 }
 
+// nolint:nilnil
 func (s *ManagedControlPlaneScope) getOKEClusterByDisplayName(ctx context.Context, name string) (*oke.Cluster, error) {
 	var page *string
 	for {
@@ -450,10 +449,18 @@ func (s *ManagedControlPlaneScope) createCAPIKubeconfigSecret(ctx context.Contex
 	if err != nil {
 		return err
 	}
+	if reflect.DeepEqual(rawConfig, api.Config{}) {
+		return errors.Wrap(err, "failed to create kubeconfig")
+	}
 	userName := getKubeConfigUserName(*okeCluster.Name, false)
 	currentContext := rawConfig.Contexts[rawConfig.CurrentContext]
+	if currentContext == nil {
+		return errors.Wrap(err, "failed to create context")
+	}
 	currentCluster := rawConfig.Clusters[currentContext.Cluster]
-
+	if currentCluster == nil {
+		return errors.Wrap(err, "failed to create cluster")
+	}
 	cfg, err := createBaseKubeConfig(userName, currentCluster, currentContext.Cluster, rawConfig.CurrentContext)
 	if err != nil {
 		return err
@@ -557,13 +564,24 @@ func (s *ManagedControlPlaneScope) ReconcileBootstrapSecret(ctx context.Context,
 			return err
 		}
 		config, err := clientcmd.NewClientConfigFromBytes(body)
-
+		if err != nil {
+			return err
+		}
 		rawConfig, err := config.RawConfig()
 		if err != nil {
 			return err
 		}
+		if reflect.DeepEqual(rawConfig, api.Config{}) {
+			return errors.Wrap(err, "failed to create kubeconfig")
+		}
 		currentContext := rawConfig.Contexts[rawConfig.CurrentContext]
+		if currentContext == nil {
+			return errors.Wrap(err, "failed to create context")
+		}
 		currentCluster := rawConfig.Clusters[currentContext.Cluster]
+		if currentCluster == nil {
+			return errors.Wrap(err, "failed to create cluster")
+		}
 		certData := base64.StdEncoding.EncodeToString(currentCluster.CertificateAuthorityData)
 
 		endpoint := strings.Split(*okeCluster.Endpoints.PrivateEndpoint, ":")[0]
@@ -616,7 +634,11 @@ func (s *ManagedControlPlaneScope) updateCAPIKubeconfigSecret(ctx context.Contex
 	}
 
 	userName := getKubeConfigUserName(*okeCluster.Name, false)
-	config.AuthInfos[userName].Token = token
+	if authInfo := config.AuthInfos[userName]; authInfo != nil {
+		authInfo.Token = token
+	} else {
+		return fmt.Errorf("user %s not found in config", userName)
+	}
 
 	out, err := clientcmd.Write(*config)
 	if err != nil {
diff --git a/cloud/scope/managed_machine_pool.go b/cloud/scope/managed_machine_pool.go
@@ -162,7 +162,8 @@ func (m *ManagedMachinePoolScope) IsResourceCreatedByClusterAPI(resourceFreeForm
 }
 
 // FindNodePool attempts to find the node pool by id if the id exists or by name. It checks to make sure
-// the node pool was created by the cluster before returning the correct pool
+// the node pool was created by the cluster before returning the correct pool.
+// nolint:nilnil
 func (m *ManagedMachinePoolScope) FindNodePool(ctx context.Context) (*oke.NodePool, error) {
 	if m.OCIManagedMachinePool.Spec.ID != nil {
 		response, err := m.ContainerEngineClient.GetNodePool(ctx, oke.GetNodePoolRequest{
diff --git a/cloud/scope/nat_gateway_reconciler.go b/cloud/scope/nat_gateway_reconciler.go
@@ -55,6 +55,7 @@ func (s *ClusterScope) ReconcileNatGateway(ctx context.Context) error {
 // 1. the OCICluster's spec NatGatewayId
 //
 // 2. Listing the NAT Gateways for the Compartment (by ID), VCN and DisplayName and filtering by tag
+// nolint:nilnil
 func (s *ClusterScope) GetNatGateway(ctx context.Context) (*core.NatGateway, error) {
 	ngwId := s.OCIClusterAccessor.GetNetworkSpec().Vcn.NATGateway.Id
 	if ngwId != nil {
diff --git a/cloud/scope/network_load_balancer_reconciler.go b/cloud/scope/network_load_balancer_reconciler.go
@@ -274,6 +274,7 @@ func (s *ClusterScope) IsNLBEqual(actual *networkloadbalancer.NetworkLoadBalance
 // 1. the OCICluster's spec LoadBalancerId
 //
 // 2. Listing the NetworkLoadBalancers for the Compartment (by ID) and DisplayName then filtering by tag
+// nolint:nilnil
 func (s *ClusterScope) GetNetworkLoadBalancers(ctx context.Context) (*networkloadbalancer.NetworkLoadBalancer, error) {
 	nlbOcid := s.OCIClusterAccessor.GetNetworkSpec().APIServerLB.LoadBalancerId
 	if nlbOcid != nil {
diff --git a/cloud/scope/nsg_reconciler.go b/cloud/scope/nsg_reconciler.go
@@ -94,6 +94,7 @@ func (s *ClusterScope) adjustNSGRulesSpec(desiredNSG *infrastructurev1beta2.NSG,
 	desiredNSG.EgressRules = egressRules
 }
 
+// nolint:nilnil
 func (s *ClusterScope) GetNSG(ctx context.Context, spec infrastructurev1beta2.NSG) (*core.NetworkSecurityGroup, error) {
 	nsgOCID := spec.ID
 	if nsgOCID != nil {
diff --git a/cloud/scope/route_table_reconciler.go b/cloud/scope/route_table_reconciler.go
@@ -69,6 +69,7 @@ func (s *ClusterScope) GetDesiredRouteTables() []string {
 	return desiredRouteTables
 }
 
+// nolint:nilnil
 func (s *ClusterScope) getRouteTable(ctx context.Context, routeTableType string) (*core.RouteTable, error) {
 	routeTableId := s.OCIClusterAccessor.GetNetworkSpec().Vcn.RouteTable.PublicRouteTableId
 	if routeTableType == infrastructurev1beta2.Private {
diff --git a/cloud/scope/security_list_reconciler.go b/cloud/scope/security_list_reconciler.go
@@ -255,6 +255,7 @@ func (s *ClusterScope) IsSecurityListExitsByRole(role infrastructurev1beta2.Role
 	return false
 }
 
+// nolint:nilnil
 func (s *ClusterScope) GetSecurityList(ctx context.Context, spec infrastructurev1beta2.SecurityList) (*core.SecurityList, error) {
 	securityListOcid := spec.ID
 	if securityListOcid != nil {
diff --git a/cloud/scope/service_gateway_reconciler.go b/cloud/scope/service_gateway_reconciler.go
@@ -113,6 +113,7 @@ func (s *ClusterScope) DeleteServiceGateway(ctx context.Context) error {
 	return nil
 }
 
+// nolint:nilnil
 func (s *ClusterScope) GetServiceGateway(ctx context.Context) (*core.ServiceGateway, error) {
 	sgwId := s.OCIClusterAccessor.GetNetworkSpec().Vcn.ServiceGateway.Id
 	if sgwId != nil {
diff --git a/cloud/scope/subnet_reconciler.go b/cloud/scope/subnet_reconciler.go
@@ -221,6 +221,7 @@ func (s *ClusterScope) DeleteSubnets(ctx context.Context) error {
 	return nil
 }
 
+// nolint:nilnil
 func (s *ClusterScope) GetSubnet(ctx context.Context, spec infrastructurev1beta2.Subnet) (*core.Subnet, error) {
 	subnetOcid := spec.ID
 	if subnetOcid != nil {
diff --git a/cloud/scope/vcn_reconciler.go b/cloud/scope/vcn_reconciler.go
@@ -75,6 +75,7 @@ func (s *ClusterScope) GetVcnCidrs() []string {
 	return []string{VcnDefaultCidr}
 }
 
+// nolint:nilnil
 func (s *ClusterScope) GetVCN(ctx context.Context) (*core.Vcn, error) {
 	vcnId := s.getVcnId()
 	if vcnId != nil {
diff --git a/cloud/scope/virtual_machine_pool.go b/cloud/scope/virtual_machine_pool.go
@@ -197,6 +197,7 @@ func (m *VirtualMachinePoolScope) IsResourceCreatedByClusterAPI(resourceFreeForm
 
 // FindVirtualNodePool attempts to find the node pool by id if the id exists or by name. It checks to make sure
 // the node pool was created by the cluster before returning the correct pool
+// nolint:nilnil
 func (m *VirtualMachinePoolScope) FindVirtualNodePool(ctx context.Context) (*oke.VirtualNodePool, error) {
 	if m.OCIVirtualMachinePool.Spec.ID != nil {
 		response, err := m.ContainerEngineClient.GetVirtualNodePool(ctx, oke.GetVirtualNodePoolRequest{
diff --git a/cloud/util/util.go b/cloud/util/util.go
@@ -27,6 +27,7 @@ import (
 	"time"
 
 	"github.com/go-logr/logr"
+	"github.com/oracle/cluster-api-provider-oci/api/v1beta2"
 	infrastructurev1beta2 "github.com/oracle/cluster-api-provider-oci/api/v1beta2"
 	"github.com/oracle/cluster-api-provider-oci/cloud/config"
 	"github.com/oracle/cluster-api-provider-oci/cloud/scope"
@@ -57,6 +58,7 @@ var (
 )
 
 // GetClusterIdentityFromRef returns the OCIClusterIdentity referenced by the OCICluster.
+// nolint:nilnil
 func GetClusterIdentityFromRef(ctx context.Context, c client.Client, ociClusterNamespace string, ref *corev1.ObjectReference) (*infrastructurev1beta2.OCIClusterIdentity, error) {
 	identity := &infrastructurev1beta2.OCIClusterIdentity{}
 	if ref != nil {
@@ -88,7 +90,7 @@ func getOCIClientCertFromSecret(ctx context.Context, c client.Client, ociCluster
 		}
 		return secret, nil
 	}
-	return nil, nil
+	return nil, errors.New("OCI Client Cert not found")
 }
 
 func getOCIClientCertPool(ctx context.Context, c client.Client, namespace string, clientOverrides *infrastructurev1beta2.ClientOverrides) (*x509.CertPool, error) {
@@ -99,6 +101,9 @@ func getOCIClientCertPool(ctx context.Context, c client.Client, namespace string
 			return nil, errors.Wrap(err, "Unable to fetch CertOverrideSecret")
 		}
 		pool = x509.NewCertPool()
+		if cert == nil {
+			return nil, errors.New("Cert Secret is nil")
+		}
 		if cert, ok := cert.Data["cert"]; ok {
 			pool.AppendCertsFromPEM(cert)
 		} else {
@@ -109,9 +114,10 @@ func getOCIClientCertPool(ctx context.Context, c client.Client, namespace string
 }
 
 // GetOrBuildClientFromIdentity creates ClientProvider from OCIClusterIdentity object
+// nolint:nilaway
 func GetOrBuildClientFromIdentity(ctx context.Context, c client.Client, identity *infrastructurev1beta2.OCIClusterIdentity, defaultRegion string, clientOverrides *infrastructurev1beta2.ClientOverrides, namespace string) (*scope.ClientProvider, error) {
 	logger := log.FromContext(ctx)
-	if identity.Spec.Type == infrastructurev1beta2.UserPrincipal {
+	if !reflect.DeepEqual(identity.Spec, v1beta2.OCIClusterIdentitySpec{}) && identity.Spec.Type == infrastructurev1beta2.UserPrincipal {
 		secretRef := identity.Spec.PrincipalSecret
 		key := types.NamespacedName{
 			Namespace: secretRef.Namespace,
@@ -315,16 +321,17 @@ func InitClientsAndRegion(ctx context.Context, client client.Client, defaultRegi
 }
 
 // CreateClientProviderFromClusterIdentity creates scope.ClientProvider from Cluster Identity
+// nolint:nilaway
 func CreateClientProviderFromClusterIdentity(ctx context.Context, client client.Client, namespace string, defaultRegion string, clusterAccessor scope.OCIClusterAccessor, identityRef *corev1.ObjectReference) (*scope.ClientProvider, error) {
 	identity, err := GetClusterIdentityFromRef(ctx, client, namespace, identityRef)
 	if err != nil {
 		return nil, err
 	}
+
 	if !IsClusterNamespaceAllowed(ctx, client, identity.Spec.AllowedNamespaces, namespace) {
 		clusterAccessor.MarkConditionFalse(infrastructurev1beta2.ClusterReadyCondition, infrastructurev1beta2.NamespaceNotAllowedByIdentity, clusterv1.ConditionSeverityError, "")
 		return nil, errors.Errorf("OCIClusterIdentity list of allowed namespaces doesn't include current cluster namespace %s", namespace)
 	}
-
 	clientProvider, err := GetOrBuildClientFromIdentity(ctx, client, identity, defaultRegion, clusterAccessor.GetClientOverrides(), namespace)
 	if err != nil {
 		return nil, err
@@ -458,6 +465,9 @@ func DeleteOrphanedMachinePoolMachines(ctx context.Context, params MachineParams
 }
 func getRegionInfoFromInstanceMetadataServiceProd() ([]byte, error) {
 	request, err := http.NewRequest(http.MethodGet, instanceMetadataRegionInfoURLV2, nil)
+	if err != nil {
+		return nil, err
+	}
 	request.Header.Add("Authorization", "Bearer Oracle")
 
 	client := &http.Client{
diff --git a/exp/controllers/ocimachinepool_controller.go b/exp/controllers/ocimachinepool_controller.go
@@ -253,6 +253,7 @@ func machinePoolToInfrastructureMapFunc(gvk schema.GroupVersionKind, logger logr
 }
 
 // getOwnerMachinePool returns the MachinePool object owning the current resource.
+// nolint:nilnil
 func getOwnerMachinePool(ctx context.Context, c client.Client, obj metav1.ObjectMeta) (*expclusterv1.MachinePool, error) {
 	for _, ref := range obj.OwnerReferences {
 		if ref.Kind != "MachinePool" {

Original file line number	Diff line number	Diff line change
`@@ -101,12 +101,16 @@ func NewClientProvider(params ClientProviderParams) (*ClientProvider, error) {`
`101`	`101`	`}`
`102`	`102`
`103`	`103`	`// GetAuthProvider returns the client provider auth config`
	`104`	`+// nolint:nilaway`
`104`	`105`	`func (c *ClientProvider) GetAuthProvider() common.ConfigurationProvider {`
`105`	`106`	`return c.ociAuthConfigProvider`
`106`	`107`	`}`
`107`	`108`
`108`	`109`	`// GetOrBuildClient if the OCIClients exist for the region they are returned, if not clients will build them`
`109`	`110`	`func (c *ClientProvider) GetOrBuildClient(region string) (OCIClients, error) {`
	`111`	`+ if c == nil \|\| c.ociClients == nil {`
	`112`	`+ return OCIClients{}, errors.New("Client provider is not initialized")`
	`113`	`+ }`
`110`	`114`	`if len(region) <= 0 {`
`111`	`115`	`return OCIClients{}, errors.New("ClientProvider.GetOrBuildClient region can not be empty")`
`112`	`116`	`}`
Original file line number	Diff line number	Diff line change
`@@ -83,7 +83,7 @@ func TestClients_NewClientProviderWithClientOverrides(t *testing.T) {`
`83`	`83`	`t.Errorf("Expected clientProvider:%v to equal nil", clientProvider)`
`84`	`84`	`}`
`85`	`85`
`86`		`- if !reflect.DeepEqual(clientProvider.ociClientOverrides, clientOverrides) {`
	`86`	`+ if clientProvider != nil && !reflect.DeepEqual(clientProvider.ociClientOverrides, clientOverrides) {`
`87`	`87`	`t.Errorf("clientProvider.ociClientOverrides: %v doesn't equal clientOverrides: %v", clientProvider.ociClientOverrides, clientOverrides)`
`88`	`88`	`}`
`89`	`89`	`}`
`@@ -124,7 +124,7 @@ func TestClients_NewClientProviderWithMissingOverrides(t *testing.T) {`
`124`	`124`	`t.Errorf("Expected clientProvider:%v to equal nil", clientProvider)`
`125`	`125`	`}`
`126`	`126`
`127`		`- if !reflect.DeepEqual(clientProvider.ociClientOverrides, clientOverrides) {`
	`127`	`+ if clientProvider != nil && !reflect.DeepEqual(clientProvider.ociClientOverrides, clientOverrides) {`
`128`	`128`	`t.Errorf("clientProvider.ociClientOverrides: %v doesn't equal clientOverrides: %v", clientProvider.ociClientOverrides, clientOverrides)`
`129`	`129`	`}`
`130`	`130`	`}`
Original file line number	Diff line number	Diff line change
`@@ -158,6 +158,7 @@ func (s ClusterScope) createRPC(ctx context.Context, drgId string, displayName`
`158`	`158`	`return &response.RemotePeeringConnection, nil`
`159`	`159`	`}`
`160`	`160`
	`161`	`+// nolint:nilnil`
`161`	`162`	`func (s ClusterScope) lookupRPC(ctx context.Context, drgId string, rpcId string, vcnClient vcn.Client) (core.RemotePeeringConnection, error) {`
`162`	`163`	`if rpcId != nil {`
`163`	`164`	`attachment, err := s.getRPC(ctx, rpcId, vcnClient)`
Original file line number	Diff line number	Diff line change
`@@ -63,6 +63,7 @@ func (s *ClusterScope) ReconcileDRGVCNAttachment(ctx context.Context) error {`
`63`	`63`	`return nil`
`64`	`64`	`}`
`65`	`65`
	`66`	`+// nolint:nilnil`
`66`	`67`	`func (s ClusterScope) GetDRGAttachment(ctx context.Context) (core.DrgAttachment, error) {`
`67`	`68`	`if s.getDRG().VcnAttachmentId != nil {`
`68`	`69`	`response, err := s.VCNClient.GetDrgAttachment(ctx, core.GetDrgAttachmentRequest{`