set serviceUid as opc-retry-token

pranavsriram8 · YashwantGohokar · commit 346136f83dce · 2024-07-04T12:55:43.000+05:30
diff --git a/pkg/cloudprovider/providers/oci/instances_test.go b/pkg/cloudprovider/providers/oci/instances_test.go
@@ -439,7 +439,7 @@ func (c *MockLoadBalancerClient) ListWorkRequests(ctx context.Context, compartme
 	return nil, nil
 }
 
-func (c *MockLoadBalancerClient) CreateLoadBalancer(ctx context.Context, details *client.GenericCreateLoadBalancerDetails) (string, error) {
+func (c *MockLoadBalancerClient) CreateLoadBalancer(ctx context.Context, details *client.GenericCreateLoadBalancerDetails, serviceUid *string) (string, error) {
 	return "", nil
 }
 
@@ -533,7 +533,7 @@ func (c *MockNetworkLoadBalancerClient) ListWorkRequests(ctx context.Context, co
 	return nil, nil
 }
 
-func (c *MockNetworkLoadBalancerClient) CreateLoadBalancer(ctx context.Context, details *client.GenericCreateLoadBalancerDetails) (string, error) {
+func (c *MockNetworkLoadBalancerClient) CreateLoadBalancer(ctx context.Context, details *client.GenericCreateLoadBalancerDetails, serviceUid *string) (string, error) {
 	return "", nil
 }
 
diff --git a/pkg/cloudprovider/providers/oci/load_balancer.go b/pkg/cloudprovider/providers/oci/load_balancer.go
@@ -394,7 +394,8 @@ func (clb *CloudLoadBalancerProvider) createLoadBalancer(ctx context.Context, sp
 		}
 	}
 
-	wrID, err := clb.lbClient.CreateLoadBalancer(ctx, &details)
+	serviceUid := fmt.Sprintf("%s", spec.service.UID)
+	wrID, err := clb.lbClient.CreateLoadBalancer(ctx, &details, &serviceUid)
 	if err != nil {
 		return nil, "", errors.Wrap(err, "creating load balancer")
 	}
diff --git a/pkg/csi/driver/bv_controller_test.go b/pkg/csi/driver/bv_controller_test.go
@@ -465,7 +465,7 @@ func (c *MockLoadBalancerClient) ListWorkRequests(ctx context.Context, compartme
 	return nil, nil
 }
 
-func (c *MockLoadBalancerClient) CreateLoadBalancer(ctx context.Context, details *client.GenericCreateLoadBalancerDetails) (string, error) {
+func (c *MockLoadBalancerClient) CreateLoadBalancer(ctx context.Context, details *client.GenericCreateLoadBalancerDetails, serviceUid *string) (string, error) {
 	return "", nil
 }
 
diff --git a/pkg/oci/client/load_balancer.go b/pkg/oci/client/load_balancer.go
@@ -39,7 +39,7 @@ type loadbalancerClientStruct struct {
 }
 
 type GenericLoadBalancerInterface interface {
-	CreateLoadBalancer(ctx context.Context, details *GenericCreateLoadBalancerDetails) (string, error)
+	CreateLoadBalancer(ctx context.Context, details *GenericCreateLoadBalancerDetails, serviceUid *string) (string, error)
 
 	GetLoadBalancer(ctx context.Context, id string) (*GenericLoadBalancer, error)
 	GetLoadBalancerByName(ctx context.Context, compartmentID, name string) (*GenericLoadBalancer, error)
@@ -111,11 +111,10 @@ func (c *loadbalancerClientStruct) GetLoadBalancerByName(ctx context.Context, co
 	return nil, errors.WithStack(errNotFound)
 }
 
-func (c *loadbalancerClientStruct) CreateLoadBalancer(ctx context.Context, details *GenericCreateLoadBalancerDetails) (string, error) {
+func (c *loadbalancerClientStruct) CreateLoadBalancer(ctx context.Context, details *GenericCreateLoadBalancerDetails, serviceUid *string) (string, error) {
 	if !c.rateLimiter.Writer.TryAccept() {
 		return "", RateLimitError(true, "CreateLoadBalancer")
 	}
-
 	resp, err := c.loadbalancer.CreateLoadBalancer(ctx, loadbalancer.CreateLoadBalancerRequest{
 		CreateLoadBalancerDetails: loadbalancer.CreateLoadBalancerDetails{
 			CompartmentId:           details.CompartmentId,
@@ -133,7 +132,7 @@ func (c *loadbalancerClientStruct) CreateLoadBalancer(ctx context.Context, detai
 			DefinedTags:             details.DefinedTags,
 		},
 		RequestMetadata: c.requestMetadata,
-		OpcRetryToken:   details.DisplayName,
+		OpcRetryToken:   serviceUid,
 	})
 	incRequestCounter(err, createVerb, loadBalancerResource)
 
diff --git a/pkg/oci/client/network_load_balancer.go b/pkg/oci/client/network_load_balancer.go
@@ -84,7 +84,7 @@ func (c *networkLoadbalancer) GetLoadBalancerByName(ctx context.Context, compart
 	return nil, errors.WithStack(errNotFound)
 }
 
-func (c *networkLoadbalancer) CreateLoadBalancer(ctx context.Context, details *GenericCreateLoadBalancerDetails) (string, error) {
+func (c *networkLoadbalancer) CreateLoadBalancer(ctx context.Context, details *GenericCreateLoadBalancerDetails, serviceUid *string) (string, error) {
 	if !c.rateLimiter.Writer.TryAccept() {
 		return "", RateLimitError(true, "CreateLoadBalancer")
 	}
@@ -104,7 +104,7 @@ func (c *networkLoadbalancer) CreateLoadBalancer(ctx context.Context, details *G
 			DefinedTags:                 details.DefinedTags,
 		},
 		RequestMetadata: c.requestMetadata,
-		OpcRetryToken:   details.DisplayName,
+		OpcRetryToken:   serviceUid,
 	})
 	incRequestCounter(err, createVerb, networkLoadBalancerResource)
 
diff --git a/pkg/oci/client/networking.go b/pkg/oci/client/networking.go
@@ -232,7 +232,7 @@ func (c *client) CreateNetworkSecurityGroup(ctx context.Context, compartmentId,
 			DisplayName:   &displayName,
 			FreeformTags:  map[string]string{"CreatedBy": "CCM", "ServiceUid": serviceUid},
 		},
-		OpcRetryToken:   &displayName,
+		OpcRetryToken:   &serviceUid,
 		RequestMetadata: requestMetadata,
 	})
 
diff --git a/pkg/volume/provisioner/block/block_test.go b/pkg/volume/provisioner/block/block_test.go
@@ -394,7 +394,7 @@ func (c *MockLoadBalancerClient) ListWorkRequests(ctx context.Context, compartme
 	return nil, nil
 }
 
-func (c *MockLoadBalancerClient) CreateLoadBalancer(ctx context.Context, details *client.GenericCreateLoadBalancerDetails) (string, error) {
+func (c *MockLoadBalancerClient) CreateLoadBalancer(ctx context.Context, details *client.GenericCreateLoadBalancerDetails, serviceUid *string) (string, error) {
 	return "", nil
 }
 
diff --git a/pkg/volume/provisioner/fss/fss_test.go b/pkg/volume/provisioner/fss/fss_test.go
@@ -392,7 +392,7 @@ func (c *MockLoadBalancerClient) ListWorkRequests(ctx context.Context, compartme
 	return nil, nil
 }
 
-func (c *MockLoadBalancerClient) CreateLoadBalancer(ctx context.Context, details *client.GenericCreateLoadBalancerDetails) (string, error) {
+func (c *MockLoadBalancerClient) CreateLoadBalancer(ctx context.Context, details *client.GenericCreateLoadBalancerDetails, serviceUid *string) (string, error) {
 	return "", nil
 }
 

Original file line number	Diff line number	Diff line change
`@@ -439,7 +439,7 @@ func (c *MockLoadBalancerClient) ListWorkRequests(ctx context.Context, compartme`
`439`	`439`	`return nil, nil`
`440`	`440`	`}`
`441`	`441`
`442`		`-func (c MockLoadBalancerClient) CreateLoadBalancer(ctx context.Context, details client.GenericCreateLoadBalancerDetails) (string, error) {`
	`442`	`+func (c MockLoadBalancerClient) CreateLoadBalancer(ctx context.Context, details client.GenericCreateLoadBalancerDetails, serviceUid *string) (string, error) {`
`443`	`443`	`return "", nil`
`444`	`444`	`}`
`445`	`445`
`@@ -533,7 +533,7 @@ func (c *MockNetworkLoadBalancerClient) ListWorkRequests(ctx context.Context, co`
`533`	`533`	`return nil, nil`
`534`	`534`	`}`
`535`	`535`
`536`		`-func (c MockNetworkLoadBalancerClient) CreateLoadBalancer(ctx context.Context, details client.GenericCreateLoadBalancerDetails) (string, error) {`
	`536`	`+func (c MockNetworkLoadBalancerClient) CreateLoadBalancer(ctx context.Context, details client.GenericCreateLoadBalancerDetails, serviceUid *string) (string, error) {`
`537`	`537`	`return "", nil`
`538`	`538`	`}`
`539`	`539`
Original file line number	Diff line number	Diff line change
`@@ -394,7 +394,8 @@ func (clb *CloudLoadBalancerProvider) createLoadBalancer(ctx context.Context, sp`
`394`	`394`	`}`
`395`	`395`	`}`
`396`	`396`
`397`		`- wrID, err := clb.lbClient.CreateLoadBalancer(ctx, &details)`
	`397`	`+ serviceUid := fmt.Sprintf("%s", spec.service.UID)`
	`398`	`+ wrID, err := clb.lbClient.CreateLoadBalancer(ctx, &details, &serviceUid)`
`398`	`399`	`if err != nil {`
`399`	`400`	`return nil, "", errors.Wrap(err, "creating load balancer")`
`400`	`401`	`}`
Original file line number	Diff line number	Diff line change
`@@ -465,7 +465,7 @@ func (c *MockLoadBalancerClient) ListWorkRequests(ctx context.Context, compartme`
`465`	`465`	`return nil, nil`
`466`	`466`	`}`
`467`	`467`
`468`		`-func (c MockLoadBalancerClient) CreateLoadBalancer(ctx context.Context, details client.GenericCreateLoadBalancerDetails) (string, error) {`
	`468`	`+func (c MockLoadBalancerClient) CreateLoadBalancer(ctx context.Context, details client.GenericCreateLoadBalancerDetails, serviceUid *string) (string, error) {`
`469`	`469`	`return "", nil`
`470`	`470`	`}`
`471`	`471`
Original file line number	Diff line number	Diff line change
`@@ -394,7 +394,7 @@ func (c *MockLoadBalancerClient) ListWorkRequests(ctx context.Context, compartme`
`394`	`394`	`return nil, nil`
`395`	`395`	`}`
`396`	`396`
`397`		`-func (c MockLoadBalancerClient) CreateLoadBalancer(ctx context.Context, details client.GenericCreateLoadBalancerDetails) (string, error) {`
	`397`	`+func (c MockLoadBalancerClient) CreateLoadBalancer(ctx context.Context, details client.GenericCreateLoadBalancerDetails, serviceUid *string) (string, error) {`
`398`	`398`	`return "", nil`
`399`	`399`	`}`
`400`	`400`
Original file line number	Diff line number	Diff line change
`@@ -392,7 +392,7 @@ func (c *MockLoadBalancerClient) ListWorkRequests(ctx context.Context, compartme`
`392`	`392`	`return nil, nil`
`393`	`393`	`}`
`394`	`394`
`395`		`-func (c MockLoadBalancerClient) CreateLoadBalancer(ctx context.Context, details client.GenericCreateLoadBalancerDetails) (string, error) {`
	`395`	`+func (c MockLoadBalancerClient) CreateLoadBalancer(ctx context.Context, details client.GenericCreateLoadBalancerDetails, serviceUid *string) (string, error) {`
`396`	`396`	`return "", nil`
`397`	`397`	`}`
`398`	`398`