Merge branch 'main' into vmyroslav-org-vpc

aiven · Jan 26, 2025 · fcd6c82 · fcd6c82
2 parents 60b219e + 5e19aa6
commit fcd6c82
Show file tree

Hide file tree

Showing 14 changed files with 284 additions and 223 deletions.
diff --git a/.trunk/trunk.yaml b/.trunk/trunk.yaml
@@ -2,7 +2,7 @@
 # To learn more about the format of this file, see https://docs.trunk.io/reference/trunk-yaml
 version: 0.1
 cli:
-  version: 1.22.8
+  version: 1.22.9
 # Trunk provides extensibility via plugins. (https://docs.trunk.io/plugins)
 plugins:
   sources:
@@ -18,16 +18,16 @@ runtimes:
 # This is the section where you manage your linters. (https://docs.trunk.io/check/configuration)
 lint:
   enabled:
-    - [email protected].5
-    - [email protected].346
+    - [email protected].6
+    - [email protected].353
     - git-diff-check
     - [email protected]
-    - golangci-lint@1.62.2
+    - golangci-lint@1.63.4
     - [email protected]
     - [email protected]
     - [email protected]
-    - [email protected].1
-    - [email protected].0
+    - [email protected].2
+    - [email protected].2
     - [email protected]
 actions:
   enabled:

diff --git a/generator/main.go b/generator/main.go
@@ -553,7 +553,9 @@ func fmtStruct(s *Schema) *jen.Statement {
 
 		// Adds json tags
 		tag := jsonName
-		if !p.required {
+		if !(p.required || p.Nullable) {
+			// There are optional nullable fields.
+			// Which become required in Go.
 			tag += ",omitempty"
 		}
 

diff --git a/generator/models.go b/generator/models.go
@@ -163,6 +163,7 @@ type Schema struct {
 	Ref                  string             `json:"$ref"`
 	Description          string             `json:"description"`
 	CamelName            string             `json:"for-hash-only!"`
+	Nullable             bool               `json:"nullable"`
 	required             bool
 	name                 string
 	propertyNames        []string

diff --git a/handler/account/account.go b/handler/account/account.go
diff --git a/handler/accountteam/accountteam.go b/handler/accountteam/accountteam.go