Fix bug in wrapper returning response for NSG rules

Author: pranavsriram8

pkg/cloudprovider/providers/oci/load_balancer.go

@@ -1994,7 +1994,7 @@ func (cp *CloudProvider) checkAllBackendNodesNotReady(nodeList []*v1.Node) bool
 func (cp *CloudProvider) deleteNsg(ctx context.Context, logger *zap.SugaredLogger, id, etag string) (bool, error) {
 	opcRequestId, err := cp.client.Networking(nil).DeleteNetworkSecurityGroup(ctx, id, etag)
 	if err != nil {
-		logger.Errorf("failed to delete nsg %s OpcRequestId %s", id, pointer.StringDeref(opcRequestId, ""))
+		logger.Errorf("failed to delete nsg %s", id)
 		return false, err
 	}
 	logger.Infof("delete nsg OpcRequestId %s", pointer.StringDeref(opcRequestId, ""))

pkg/cloudprovider/providers/oci/load_balancer_network_security_group.go

@@ -242,7 +242,7 @@ func (s *CloudProvider) addNetworkSecurityGroupSecurityRules(ctx context.Context
 			*nsgId,
 			core.AddNetworkSecurityGroupSecurityRulesDetails{SecurityRules: securityRuleToAddSecurityRuleDetails(rulesInBatches[i])})
 		if err != nil {
-			return nil, errors.Wrapf(err, "failed to add security rules for nsg: %s OpcRequestId: %s", *nsgId, pointer.StringDeref(response.OpcRequestId, ""))
+			return nil, errors.Wrapf(err, "failed to add security rules for nsg: %s", *nsgId)
 		}
 		s.logger.Infof("AddNetworkSecurityGroupSecurityRules OpcRequestId %s", pointer.StringDeref(response.OpcRequestId, ""))
 	}
@@ -258,7 +258,7 @@ func (s *CloudProvider) removeNetworkSecurityGroupSecurityRules(ctx context.Cont
 		response, err = s.client.Networking(nil).RemoveNetworkSecurityGroupSecurityRules(ctx, *nsgId,
 			core.RemoveNetworkSecurityGroupSecurityRulesDetails{SecurityRuleIds: rulesInBatches[i]})
 		if err != nil {
-			return nil, errors.Wrapf(err, "failed to remove security rules for nsg: %s OpcRequestId: %s", *nsgId, pointer.StringDeref(response.OpcRequestId, ""))
+			return nil, errors.Wrapf(err, "failed to remove security rules for nsg: %s", *nsgId)
 		}
 		s.logger.Infof("RemoveNetworkSecurityGroupSecurityRules OpcRequestId %s", pointer.StringDeref(response.OpcRequestId, ""))
 	}

pkg/oci/client/networking.go

@@ -478,7 +478,7 @@ func (c *client) AddNetworkSecurityGroupSecurityRules(ctx context.Context, id st
 
 	if err != nil {
 		c.logger.With(id).Infof("AddNetworkSecurityGroupSecurityRules failed %s", pointer.StringDeref(resp.OpcRequestId, ""))
-		return nil, errors.WithStack(err)
+		return &resp, errors.WithStack(err)
 	}
 	return &resp, nil
 }
@@ -497,7 +497,7 @@ func (c *client) RemoveNetworkSecurityGroupSecurityRules(ctx context.Context, id
 
 	if err != nil {
 		c.logger.With(id).Infof("RemoveNetworkSecurityGroupSecurityRules failed %s", pointer.StringDeref(resp.OpcRequestId, ""))
-		return nil, errors.WithStack(err)
+		return &resp, errors.WithStack(err)
 	}
 	return &resp, nil
 }
@@ -519,7 +519,7 @@ func (c *client) ListNetworkSecurityGroupSecurityRules(ctx context.Context, id s
 
 		if err != nil {
 			c.logger.With(id).Infof("ListNetworkSecurityGroupSecurityRules failed %s", pointer.StringDeref(resp.OpcRequestId, ""))
-			return nil, errors.WithStack(err)
+			return []core.SecurityRule{}, errors.WithStack(err)
 		}
 		for _, rule := range resp.Items {
 			nsgRules = append(nsgRules, rule)
@@ -545,7 +545,7 @@ func (c *client) UpdateNetworkSecurityGroupSecurityRules(ctx context.Context, id
 
 	if err != nil {
 		c.logger.With(id).Infof("UpdateNetworkSecurityGroupSecurityRules failed %s", pointer.StringDeref(resp.OpcRequestId, ""))
-		return nil, errors.WithStack(err)
+		return &resp, errors.WithStack(err)
 	}
 	return &resp, nil
 }