fix(generator): add missing err return

aiven · Feb 7, 2024 · 97c342a · 97c342a
1 parent 6be21d8
commit 97c342a
Show file tree

Hide file tree

Showing 35 changed files with 664 additions and 1 deletion.
diff --git a/client_generated.go b/client_generated.go
diff --git a/generator/main.go b/generator/main.go
@@ -314,9 +314,11 @@ func exec() error {
 				),
 			}
 
+			ifErr := jen.If(jen.Err().Op("!=").Nil()).Block(returnErr)
 			if rsp == nil {
 				block = append(block, jen.Return(jen.Err()))
 			} else {
+				block = append(block, ifErr)
 				outReturn := jen.Id("out")
 				if rsp.CamelName != schemaOut.CamelName {
 					// Takes original name and turns to camel.
@@ -333,7 +335,7 @@ func exec() error {
 					block,
 					jen.Id("out").Op(":=").New(jen.Id(schemaOut.CamelName)),
 					jen.Err().Op("=").Qual("encoding/json", "Unmarshal").Call(jen.Id("b"), jen.Id("out")),
-					jen.If(jen.Err().Op("!=").Nil()).Block(returnErr),
+					ifErr,
 					jen.Return(outReturn, jen.Nil()),
 				)
 			}

diff --git a/handler/account/account.go b/handler/account/account.go
diff --git a/handler/accountauthentication/accountauthentication.go b/handler/accountauthentication/accountauthentication.go
diff --git a/handler/accountteam/accountteam.go b/handler/accountteam/accountteam.go
diff --git a/handler/accountteammember/accountteammember.go b/handler/accountteammember/accountteammember.go
diff --git a/handler/billinggroup/billinggroup.go b/handler/billinggroup/billinggroup.go
diff --git a/handler/clickhouse/clickhouse.go b/handler/clickhouse/clickhouse.go
diff --git a/handler/cloud/cloud.go b/handler/cloud/cloud.go