fix(service_intergration): empty user config to API convertion

aiven · Nov 10, 2023 · bcf6c47 · bcf6c47
1 parent 7a74eaf
commit bcf6c47
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/controllers/common.go b/controllers/common.go
@@ -176,7 +176,7 @@ func getSecretPrefix(o objWithSecret) string {
 // userConfigurationToAPI converts user config into a map
 func userConfigurationToAPI(c any, groups ...string) (map[string]any, error) {
 	if c == nil || (reflect.ValueOf(c).Kind() == reflect.Ptr && reflect.ValueOf(c).IsNil()) {
-		return nil, nil
+		return map[string]any{}, nil
 	}
 
 	o := &sheriff.Options{
@@ -192,7 +192,7 @@ func userConfigurationToAPI(c any, groups ...string) (map[string]any, error) {
 	if !ok {
 		// It is an empty pointer
 		// sheriff just returned the very same object
-		return nil, nil
+		return map[string]any{}, nil
 	}
 
 	return m, nil

diff --git a/controllers/serviceintegration_controller.go b/controllers/serviceintegration_controller.go
@@ -92,7 +92,7 @@ func (h ServiceIntegrationHandler) createOrUpdate(ctx context.Context, avn *aive
 		)
 		reason = "Updated"
 		if err != nil {
-			if strings.Contains(err.Error(), "user config not changed") {
+			if strings.Contains(strings.ToLower(err.Error()), "user config not changed") {
 				return nil
 			}
 			return err