chore(updater): bump pkg/dist/*.yml (2025-07-09) (#334)

Co-authored-by: Murad Biashimov <[email protected]>

Author: github-actions[bot]

.golangci.yaml

@@ -13,7 +13,7 @@ linters:
     - gocyclo
     - gofmt
     - goimports
-    - gomnd
+    - mnd
     - gosec
     - gosimple
     - govet
@@ -40,7 +40,7 @@ linters-settings:
     min-len: 2
     min-occurrences: 2
   govet:
-    check-shadowing: true
+    shadowing: true
   lll:
     line-length: 120
     tab-width: 4

.trunk/trunk.yaml

@@ -25,7 +25,7 @@ lint:
         - pkg/dist/*.yml
 runtimes:
   enabled:
-    - go@1.22.4
+    - go@1.24.1
     - [email protected]
     - [email protected]
 actions:

go.mod

@@ -1,6 +1,6 @@
 module github.com/aiven/go-api-schemas
 
-go 1.22
+go 1.24
 
 require (
 	github.com/google/go-cmp v0.7.0

internal/gen/gen.go

@@ -5,6 +5,7 @@ import (
 	"encoding/json"
 	"fmt"
 	"log"
+	"maps"
 	"os"
 	"path/filepath"
 	"regexp"
@@ -133,6 +134,19 @@ func toUserConfig(src *schema) (*types.UserConfigSchema, error) { // nolint: fun
 		return nil, err
 	}
 
+	// Convert "null" type to a "nullable" boolean field.
+	// It is easier to ask a bool field and cast a single "type" instead of a list.
+	normTypes = slices.DeleteFunc(normTypes, func(s string) bool {
+		if s != "null" {
+			return false
+		}
+		src.Nullable = true
+		return true
+	})
+
+	// Only mark required fields as nullable since optional fields can't be null in Go.
+	src.Nullable = src.isRequired && src.Nullable
+
 	uc := types.UserConfigSchema{
 		Properties:  make(map[string]types.UserConfigSchema),
 		Title:       src.Title,
@@ -143,6 +157,7 @@ func toUserConfig(src *schema) (*types.UserConfigSchema, error) { // nolint: fun
 		MaxLength:   src.MaxLength,
 		MaxItems:    src.MaxItems,
 		Pattern:     src.Pattern,
+		Nullable:    src.Nullable,
 		UserError:   or(src.XUserError, src.UserError),
 		Secure:      or(src.XSecure, src.Secure),
 		CreateOnly:  or(src.XCreateOnly, src.CreateOnly),
@@ -213,18 +228,6 @@ func toUserConfig(src *schema) (*types.UserConfigSchema, error) { // nolint: fun
 	return &uc, nil
 }
 
-func distinct[T comparable](list []T) []T {
-	seen := make(map[T]bool)
-	result := make([]T, 0, len(list))
-	for _, v := range list {
-		if !seen[v] {
-			seen[v] = true
-			result = append(result, v)
-		}
-	}
-	return result
-}
-
 // or returns the first non-zero value.
 func or[T comparable](args ...T) T {
 	var zero T
@@ -237,44 +240,45 @@ func or[T comparable](args ...T) T {
 }
 
 func normalizeType(s *schema) ([]string, error) {
-	result := make([]string, 0)
+	result := make(map[string]bool)
 	switch t := s.Type.(type) {
 	case string:
 		return []string{t}, nil
 	case []any:
 		for _, v := range t {
-			if v == "null" {
-				s.Nullable = true
-			} else {
-				result = append(result, fmt.Sprintf("%v", v))
-			}
+			result[fmt.Sprintf("%v", v)] = true
 		}
 	case nil:
 	default:
 		return nil, fmt.Errorf("unknown type %T", s.Type)
 	}
 
-	// Golang supports null for required fields only
-	if s.isRequired && s.Nullable {
-		result = append(result, "null")
-	}
-
 	for _, v := range s.AnyOf {
 		if v.Type != nil {
 			vType, err := normalizeType(v)
 			if err != nil {
 				return nil, err
 			}
 
-			result = append(result, vType...)
+			for _, t := range vType {
+				result[t] = true
+			}
 		}
 	}
 
+	// Fixes the case when there is no type defined
 	if len(result) == 0 {
-		result = append(result, "string")
+		result["string"] = true
+	}
+
+	// Prioritize number over integer, because number is more general, and Go can't have both.
+	if result["number"] && result["integer"] {
+		delete(result, "integer")
 	}
 
-	return distinct(result), nil
+	keys := slices.Collect(maps.Keys(result))
+	slices.Sort(keys)
+	return keys, nil
 }
 
 func formatValue(t string, v any) any {

internal/pkg/types/types.go

@@ -43,6 +43,7 @@ type UserConfigSchema struct {
 	Example     interface{}                 `yaml:"example,omitempty"`
 	UserError   string                      `yaml:"user_error,omitempty"`
 	Secure      bool                        `yaml:"_secure,omitempty"`
+	Nullable    bool                        `yaml:"nullable,omitempty"`
 }
 
 // GenerationResult represents the result of a generation.

pkg/dist/service_types.yml

@@ -75,8 +75,8 @@ alloydbomni:
       items:
         title: CIDR address block, either as a string, or in a dict with an optional description field
         type:
-          - string
           - object
+          - string
         required:
           - network
         properties:
@@ -802,8 +802,8 @@ cassandra:
       items:
         title: CIDR address block, either as a string, or in a dict with an optional description field
         type:
-          - string
           - object
+          - string
         required:
           - network
         properties:
@@ -915,8 +915,8 @@ clickhouse:
       items:
         title: CIDR address block, either as a string, or in a dict with an optional description field
         type:
-          - string
           - object
+          - string
         required:
           - network
         properties:
@@ -1052,8 +1052,8 @@ dragonfly:
       items:
         title: CIDR address block, either as a string, or in a dict with an optional description field
         type:
-          - string
           - object
+          - string
         required:
           - network
         properties:
@@ -1233,8 +1233,8 @@ flink:
       items:
         title: CIDR address block, either as a string, or in a dict with an optional description field
         type:
-          - string
           - object
+          - string
         required:
           - network
         properties:
@@ -1854,8 +1854,8 @@ grafana:
       items:
         title: CIDR address block, either as a string, or in a dict with an optional description field
         type:
-          - string
           - object
+          - string
         required:
           - network
         properties:
@@ -2104,8 +2104,8 @@ influxdb:
       items:
         title: CIDR address block, either as a string, or in a dict with an optional description field
         type:
-          - string
           - object
+          - string
         required:
           - network
         properties:
@@ -2233,8 +2233,8 @@ kafka:
       items:
         title: CIDR address block, either as a string, or in a dict with an optional description field
         type:
-          - string
           - object
+          - string
         required:
           - network
         properties:
@@ -3104,8 +3104,8 @@ kafka_connect:
       items:
         title: CIDR address block, either as a string, or in a dict with an optional description field
         type:
-          - string
           - object
+          - string
         required:
           - network
         properties:
@@ -3417,8 +3417,8 @@ kafka_mirrormaker:
       items:
         title: CIDR address block, either as a string, or in a dict with an optional description field
         type:
-          - string
           - object
+          - string
         required:
           - network
         properties:
@@ -3551,8 +3551,8 @@ m3aggregator:
       items:
         title: CIDR address block, either as a string, or in a dict with an optional description field
         type:
-          - string
           - object
+          - string
         required:
           - network
         properties:
@@ -3625,8 +3625,8 @@ m3db:
       items:
         title: CIDR address block, either as a string, or in a dict with an optional description field
         type:
-          - string
           - object
+          - string
         required:
           - network
         properties:
@@ -4017,8 +4017,8 @@ mysql:
       items:
         title: CIDR address block, either as a string, or in a dict with an optional description field
         type:
-          - string
           - object
+          - string
         required:
           - network
         properties:
@@ -4637,8 +4637,8 @@ opensearch:
       items:
         title: CIDR address block, either as a string, or in a dict with an optional description field
         type:
-          - string
           - object
+          - string
         required:
           - network
         properties:
@@ -4884,12 +4884,10 @@ opensearch:
         cluster.filecache.remote_data_ratio:
           title: The limit of how much total remote data can be referenced
           description: Defines a limit of how much total remote data can be referenced as a ratio of the size of the disk reserved for the file cache. This is designed to be a safeguard to prevent oversubscribing a cluster. Defaults to 0.
-          type:
-            - integer
-            - number
+          type: number
           minimum: 0
           maximum: 100
-          example: "5"
+          example: "5.0"
         cluster.remote_store:
           type: object
           properties:
@@ -5881,8 +5879,8 @@ pg:
       items:
         title: CIDR address block, either as a string, or in a dict with an optional description field
         type:
-          - string
           - object
+          - string
         required:
           - network
         properties:
@@ -6702,8 +6700,8 @@ redis:
       items:
         title: CIDR address block, either as a string, or in a dict with an optional description field
         type:
-          - string
           - object
+          - string
         required:
           - network
         properties:
@@ -6949,8 +6947,8 @@ thanos:
       items:
         title: CIDR address block, either as a string, or in a dict with an optional description field
         type:
-          - string
           - object
+          - string
         required:
           - network
         properties:
@@ -7153,8 +7151,8 @@ valkey:
       items:
         title: CIDR address block, either as a string, or in a dict with an optional description field
         type:
-          - string
           - object
+          - string
         required:
           - network
         properties: