fix(deps): go client string pointers update

aiven · Jul 2, 2024 · 529adae · 529adae
1 parent 5ca8853
commit 529adae
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 10 deletions.
diff --git a/controllers/kafkaschemaregistryacl_controller.go b/controllers/kafkaschemaregistryacl_controller.go
@@ -70,7 +70,13 @@ func (h KafkaSchemaRegistryACLHandler) createOrUpdate(ctx context.Context, avn *
 
 		for _, v := range list {
 			if in.Permission == v.Permission && in.Resource == v.Resource && in.Username == v.Username {
-				acl.Status.ACLId = v.Id
+				// fixme: The ID is optional in the response.
+				//  It must be a mistake.
+				//  https://api.aiven.io/doc/#tag/Service:_Kafka/operation/ServiceSchemaRegistryAclAdd
+				if v.Id == nil {
+					return fmt.Errorf("received empty ID in response")
+				}
+				acl.Status.ACLId = *v.Id
 				break
 			}
 		}
@@ -111,7 +117,7 @@ func (h KafkaSchemaRegistryACLHandler) exists(ctx context.Context, avnGen avngen
 	}
 
 	for _, v := range list {
-		if v.Id == acl.Status.ACLId {
+		if v.Id != nil && *v.Id == acl.Status.ACLId {
 			return true, nil
 		}
 	}

diff --git a/controllers/serviceintegration_controller.go b/controllers/serviceintegration_controller.go
@@ -67,13 +67,13 @@ func (h ServiceIntegrationHandler) createOrUpdate(ctx context.Context, avn *aive
 			ctx,
 			si.Spec.Project,
 			&serviceintegration.ServiceIntegrationCreateIn{
-				DestEndpointId:   si.Spec.DestinationEndpointID,
-				DestService:      si.Spec.DestinationServiceName,
-				DestProject:      si.Spec.DestinationProjectName,
+				DestEndpointId:   &si.Spec.DestinationEndpointID,
+				DestService:      &si.Spec.DestinationServiceName,
+				DestProject:      &si.Spec.DestinationProjectName,
 				IntegrationType:  serviceintegration.IntegrationType(si.Spec.IntegrationType),
-				SourceEndpointId: si.Spec.SourceEndpointID,
-				SourceService:    si.Spec.SourceServiceName,
-				SourceProject:    si.Spec.SourceProjectName,
+				SourceEndpointId: &si.Spec.SourceEndpointID,
+				SourceService:    &si.Spec.SourceServiceName,
+				SourceProject:    &si.Spec.SourceProjectName,
 				UserConfig:       &userConfigMap,
 			},
 		)

diff --git a/tests/kafkschemaregistryaacl_test.go b/tests/kafkschemaregistryaacl_test.go
@@ -123,7 +123,7 @@ func TestKafkaSchemaRegistryACL(t *testing.T) {
 
 	var aclAvn *kafkaschemaregistry.AclOut
 	for _, v := range aclListAvn {
-		if v.Id == acl.Status.ACLId {
+		if v.Id != nil && *v.Id == acl.Status.ACLId {
 			aclAvn = &v
 			break
 		}
@@ -146,7 +146,7 @@ func TestKafkaSchemaRegistryACL(t *testing.T) {
 		}
 
 		for _, v := range list {
-			if v.Id == acl.Status.ACLId {
+			if v.Id != nil && *v.Id == acl.Status.ACLId {
 				return nil
 			}
 		}