API: Update oapi-codegen version to v1.12.0 of our fork (#4707)

Updates the version of oapi-codegen which is installed via
the buildtools to our v1.12.0 release. Also changes the
Makefile targets and adds config files which are the preferred
way of configuration instead of the old CLI flags.

The generated types definitions have also been updated using
the oapi-codegen commit which ensures all required Enums are generated
for enums embedded in response types.

cmd/goal/account.go

@@ -550,7 +550,7 @@ func printAccountInfo(client libgoal.Client, address string, onlyShowAssetIds bo
 		heldAssets = make([]generatedV2.AssetHolding, len(*account.Assets))
 		copy(heldAssets, *account.Assets)
 		sort.Slice(heldAssets, func(i, j int) bool {
-			return heldAssets[i].AssetId < heldAssets[j].AssetId
+			return heldAssets[i].AssetID < heldAssets[j].AssetID
 		})
 	}
 
@@ -608,14 +608,14 @@ func printAccountInfo(client libgoal.Client, address string, onlyShowAssetIds bo
 	}
 	for _, assetHolding := range heldAssets {
 		if onlyShowAssetIds {
-			fmt.Fprintf(report, "\tID %d\n", assetHolding.AssetId)
+			fmt.Fprintf(report, "\tID %d\n", assetHolding.AssetID)
 			continue
 		}
-		assetParams, err := client.AssetInformationV2(assetHolding.AssetId)
+		assetParams, err := client.AssetInformationV2(assetHolding.AssetID)
 		if err != nil {
 			hasError = true
-			fmt.Fprintf(errorReport, "Error: Unable to retrieve asset information for asset %d referred to by account %s: %v\n", assetHolding.AssetId, address, err)
-			fmt.Fprintf(report, "\tID %d, error\n", assetHolding.AssetId)
+			fmt.Fprintf(errorReport, "Error: Unable to retrieve asset information for asset %d referred to by account %s: %v\n", assetHolding.AssetID, address, err)
+			fmt.Fprintf(report, "\tID %d, error\n", assetHolding.AssetID)
 		}
 
 		amount := assetDecimalsFmt(assetHolding.Amount, assetParams.Params.Decimals)
@@ -635,7 +635,7 @@ func printAccountInfo(client libgoal.Client, address string, onlyShowAssetIds bo
 			frozen = " (frozen)"
 		}
 
-		fmt.Fprintf(report, "\tID %d, %s, balance %s %s%s\n", assetHolding.AssetId, assetName, amount, unitName, frozen)
+		fmt.Fprintf(report, "\tID %d, %s, balance %s %s%s\n", assetHolding.AssetID, assetName, amount, unitName, frozen)
 	}
 
 	fmt.Fprintln(report, "Created Apps:")

daemon/algod/api/Makefile

@@ -8,16 +8,16 @@ all:	server/v2/generated/types.go server/v2/generated/routes.go server/v2/genera
 generate:	oapi-codegen all
 
 server/v2/generated/types.go:	algod.oas3.yml
-	$(GOPATH1)/bin/oapi-codegen -package generated -type-mappings integer=uint64 -generate types -exclude-tags=private,common -o ./server/v2/generated/types.go algod.oas3.yml
+	$(GOPATH1)/bin/oapi-codegen -config ./generated_types.yml algod.oas3.yml
 
 server/v2/generated/routes.go:	algod.oas3.yml
-	$(GOPATH1)/bin/oapi-codegen -package generated -type-mappings integer=uint64 -generate server,spec -exclude-tags=private,common -o ./server/v2/generated/routes.go algod.oas3.yml
+	$(GOPATH1)/bin/oapi-codegen -config ./generated_server.yml algod.oas3.yml
 
 server/v2/generated/private/types.go:	algod.oas3.yml
-	$(GOPATH1)/bin/oapi-codegen -package private -type-mappings integer=uint64 -generate types -include-tags=private -o ./server/v2/generated/private/types.go algod.oas3.yml
+	$(GOPATH1)/bin/oapi-codegen -config ./private_types.yml algod.oas3.yml
 
 server/v2/generated/private/routes.go:	algod.oas3.yml
-	$(GOPATH1)/bin/oapi-codegen -package private -type-mappings integer=uint64 -generate server,spec -include-tags=private -o ./server/v2/generated/private/routes.go algod.oas3.yml
+	$(GOPATH1)/bin/oapi-codegen -config ./private_server.yml algod.oas3.yml
 
 algod.oas3.yml:	algod.oas2.json
 	curl -s -X POST "https://converter.swagger.io/api/convert" -H "accept: application/json" -H "Content-Type: application/json" -d @./algod.oas2.json -o .3tmp.json

daemon/algod/api/generated_server.yml

@@ -0,0 +1,12 @@
+package: generated
+generate:
+  echo-server: true
+  embedded-spec: true
+output-options:
+  exclude-tags:
+  - private
+  - common
+  type-mappings:
+    integer: uint64
+  skip-prune: true
+output: ./server/v2/generated/routes.go

daemon/algod/api/generated_types.yml

@@ -0,0 +1,11 @@
+package: generated
+generate:
+  models: true
+output-options:
+  exclude-tags:
+  - private
+  - common
+  type-mappings:
+    integer: uint64
+  skip-prune: true
+output: ./server/v2/generated/types.go

daemon/algod/api/private_server.yml

@@ -0,0 +1,11 @@
+package: private
+generate:
+  echo-server: true
+  embedded-spec: true
+output-options:
+  include-tags:
+  - private
+  type-mappings:
+    integer: uint64
+  skip-prune: true
+output: ./server/v2/generated/private/routes.go

daemon/algod/api/private_types.yml

@@ -0,0 +1,10 @@
+package: private
+generate:
+  models: true
+output-options:
+  include-tags:
+  - private
+  type-mappings:
+    integer: uint64
+  skip-prune: true
+output: ./server/v2/generated/private/types.go

daemon/algod/api/server/v2/account.go

@@ -41,14 +41,14 @@ func AccountDataToAccount(
 		// longer fetch the creator
 		holding := generated.AssetHolding{
 			Amount:   holding.Amount,
-			AssetId:  uint64(curid),
+			AssetID:  uint64(curid),
 			IsFrozen: holding.Frozen,
 		}
 
 		assets = append(assets, holding)
 	}
 	sort.Slice(assets, func(i, j int) bool {
-		return assets[i].AssetId < assets[j].AssetId
+		return assets[i].AssetID < assets[j].AssetID
 	})
 
 	createdAssets := make([]generated.Asset, 0, len(record.AssetParams))
@@ -281,7 +281,7 @@ func AccountToAccountData(a *generated.Account) (basics.AccountData, error) {
 	if a.Assets != nil && len(*a.Assets) > 0 {
 		assets = make(map[basics.AssetIndex]basics.AssetHolding, len(*a.Assets))
 		for _, h := range *a.Assets {
-			assets[basics.AssetIndex(h.AssetId)] = basics.AssetHolding{
+			assets[basics.AssetIndex(h.AssetID)] = basics.AssetHolding{
 				Amount: h.Amount,
 				Frozen: h.IsFrozen,
 			}