Fix/generator issues

Makefile

@@ -1,6 +1,6 @@
 ROOT_DIR              ?= $(shell git rev-parse --show-toplevel)
 SCRIPTS_BASE          ?= $(ROOT_DIR)/scripts
-API_VERSION           ?= $(shell cat api_version|grep -v '^\#'|head -n 1)
+API_VERSIONS           ?= $(ROOT_DIR)/api-versions.json
 SDK_BRANCH            ?= main
 
 # SETUP AND TOOL INITIALIZATION TASKS
@@ -12,7 +12,7 @@ project-tools:
 
 # GENERATE
 download-oas:
-	@$(SCRIPTS_BASE)/download-oas.sh "$(OAS_REPO_NAME)" "$(OAS_REPO)" "$(ALLOW_ALPHA)" "$(API_VERSION)"
+	@$(SCRIPTS_BASE)/download-oas.sh "$(OAS_REPO_NAME)" "$(OAS_REPO)" "$(ALLOW_ALPHA)" "$(API_VERSIONS)"
 
 generate-sdk:
 	@$(SCRIPTS_BASE)/generate-sdk/generate-sdk.sh "$(GIT_HOST)" "$(GIT_USER_ID)" "$(GIT_REPO_ID)" "$(SDK_REPO_URL)" "$(LANGUAGE)" "$(SDK_BRANCH)"

api-versions.json

@@ -0,0 +1,4 @@
+{
+    "load-balancer": "9c9de238a3e650f4bed9b9d9ade151da9a97e1d6",
+    "certificates": "c592757243833f9b506a7d23ec5a80a9b3c984ae"
+}

blacklist.txt

@@ -1,2 +1 @@
-# Transitional file to disable generation for selected services
-cdn
+# Transitional file to disable generation for selected services

scripts/download-oas.sh

@@ -6,7 +6,7 @@ ROOT_DIR=$(git rev-parse --show-toplevel)
 OAS_REPO_NAME=$1
 OAS_REPO=$2
 ALLOW_ALPHA=$3
-OAS_API_VERSION=$4
+OAS_API_VERSIONS=$4
 
 if [[ -z ${OAS_REPO_NAME} ]]; then
     echo "Repo name is empty, default public OAS repo name will be used."
@@ -18,9 +18,9 @@ if [[ ! ${OAS_REPO} || -d ${OAS_REPO} ]]; then
     OAS_REPO="https://github.com/stackitcloud/${OAS_REPO_NAME}.git"
 fi
 
-if [[ -z ${OAS_API_VERSION} ]]; then
-    echo "No API version passed, main branch will be used"
-    OAS_API_VERSION="main"
+if [[ -z ${OAS_API_VERSIONS} ]]; then
+    echo "No API version passed, using ${ROOTDIR}/api-versions.json"
+    OAS_API_VERSIONS="${ROOT_DIR}/api-versions.json"
 fi
 
 # Create temp directory to clone OAS repo
@@ -41,16 +41,23 @@ mkdir ${ROOT_DIR}/oas
 cd ${work_dir}
 git clone ${OAS_REPO} --quiet
 
-echo "Using api version ${OAS_API_VERSION}"
-cd ${OAS_REPO_NAME}
-git checkout --quiet ${OAS_API_VERSION}
-cd -
-
 for service_dir in ${work_dir}/${OAS_REPO_NAME}/services/*; do
+
     max_version_dir=""
     max_version=-1
     service=$(basename "$service_dir")
 
+    apiVersion=$(jq -r -f <(cat <<EOF
+if has("${service}") then ."${service}" else "main" end
+EOF
+) ${OAS_API_VERSIONS})
+    if [ "${apiVersion}" != "main" ]; then
+        echo "Using ${apiVersion} for ${service}"
+    fi
+    cd ${work_dir}/${OAS_REPO_NAME} > /dev/null
+    git checkout -q $apiVersion || (echo "version ${apiVersion} does not exist, using main instead" && git checkout -q main)
+    cd - > /dev/null
+
     # Prioritize GA over Beta over Alpha versions
     # GA priority = 3, Beta priority = 2, Alpha priority = 1
     max_version_priority=1

templates/go/api.mustache

@@ -8,8 +8,8 @@ import (
 	"io"
 	"net/http"
 	"net/url"
-	"{{gitHost}}/{{gitUserId}}/{{gitRepoId}}/core/config"
-    "{{gitHost}}/{{gitUserId}}/{{gitRepoId}}/core/oapierror"
+	"github.com/stackitcloud/stackit-sdk-go/core/config"
+    "github.com/stackitcloud/stackit-sdk-go/core/oapierror"
 {{#imports}}	"{{import}}"
 {{/imports}}
 )

templates/go/api_test.mustache

@@ -19,20 +19,20 @@ import (
 	"net/url"
 	"strings"
 	"testing"
-	"{{gitHost}}/{{gitUserId}}/{{gitRepoId}}/core/config"
+	"github.com/stackitcloud/stackit-sdk-go/core/config"
 )
 
 func Test_{{packageName}}_{{classname}}Service(t *testing.T) {
 
 {{#operations}}
 {{#operation}}
 	t.Run("Test {{classname}}Service {{{nickname}}}", func(t *testing.T) {
-		path := "{{{path}}}"{{#pathParams}}
-		{{paramName}}Value := {{#isString}}"{{paramName}}"{{/isString}}{{#isNumber}}123{{/isNumber}}{{#isFloat}}float32(123){{/isFloat}}{{#isDouble}}float64(123){{/isDouble}}{{#isInteger}}int32(123){{/isInteger}}{{#isLong}}int64(123){{/isLong}}{{^isString}}{{^isInteger}}{{defaultValue}}{{/isInteger}}{{/isString}}
-		path = strings.Replace(path, "{"+"{{baseName}}"+"}", url.PathEscape(ParameterValueToString({{paramName}}Value, "{{paramName}}")), -1){{/pathParams}}
+		_apiUrlPath := "{{{path}}}"{{#pathParams}}
+		{{paramName}}Value := {{#isAnyType}}"unspecified type"{{/isAnyType}}{{#isString}}{{#isUuid}}uuid.NewString(){{/isUuid}}{{^isUuid}}"{{paramName}}"{{/isUuid}}{{/isString}}{{#isNumber}}123{{/isNumber}}{{#isFloat}}float32(123){{/isFloat}}{{#isDouble}}float64(123){{/isDouble}}{{#isInteger}}int32(123){{/isInteger}}{{#isLong}}int64(123){{/isLong}}{{^isString}}{{^isInteger}}{{defaultValue}}{{/isInteger}}{{/isString}}
+		_apiUrlPath = strings.Replace(_apiUrlPath, "{"+"{{baseName}}"+"}", url.PathEscape(ParameterValueToString({{paramName}}Value, "{{paramName}}")), -1){{/pathParams}}
 
 		test{{classname}}ServeMux := http.NewServeMux()
-		test{{classname}}ServeMux.HandleFunc(path, func(w http.ResponseWriter, req *http.Request) {
+		test{{classname}}ServeMux.HandleFunc(_apiUrlPath, func(w http.ResponseWriter, req *http.Request) {
 			{{! Only binary data sets a ReturnFormat}}
 			{{#returnFormat}}
 			w.Header().Add("Content-Type", "application/octet-stream")
@@ -41,7 +41,18 @@ func Test_{{packageName}}_{{classname}}Service(t *testing.T) {
 			{{/returnFormat}}
 			{{^returnFormat}}
 			{{#returnType}}
+			{{#returnProperty.isPrimitiveType}}
+			{{! according to the model, freeform objects might be primitive...}}
+			{{#returnProperty.isFreeFormObject}}
 			data := {{{.}}}{}
+			{{/returnProperty.isFreeFormObject}}
+			{{^returnProperty.isFreeFormObject}}
+			var data {{{.}}}
+			{{/returnProperty.isFreeFormObject}}
+			{{/returnProperty.isPrimitiveType}}
+			{{^returnProperty.isPrimitiveType}}
+			data := {{{.}}}{}
+			{{/returnProperty.isPrimitiveType}}
 			w.Header().Add("Content-Type", "application/json")
 			json.NewEncoder(w).Encode(data)
 			{{/returnType}}
@@ -79,7 +90,7 @@ func Test_{{packageName}}_{{classname}}Service(t *testing.T) {
 		{{#allParams}}
 		{{#required}}
 		{{#isPathParam}}
-		{{paramName}} := {{#isString}}"{{paramName}}"{{/isString}}{{#isNumber}}123{{/isNumber}}{{#isFloat}}float32(123){{/isFloat}}{{#isDouble}}float64(123){{/isDouble}}{{#isInteger}}int32(123){{/isInteger}}{{#isLong}}int64(123){{/isLong}}{{^isString}}{{^isInteger}}{{defaultValue}}{{/isInteger}}{{/isString}}
+		{{paramName}} := {{paramName}}Value
 		{{/isPathParam}}
 		{{^isPathParam}}
 		{{#isPrimitiveType}}
@@ -98,7 +109,7 @@ func Test_{{packageName}}_{{classname}}Service(t *testing.T) {
 			t.Fatalf("error in call: %v", reqErr)
 		}
 		{{#returnType}}
-		if resp == nil {
+		if IsNil(resp) {
 			t.Fatalf("response not present")
 		}
 		{{/returnType}}

templates/go/client.mustache

@@ -21,8 +21,8 @@ import (
 	"strings"
 	"time"
 	"unicode/utf8"
-	"{{gitHost}}/{{gitUserId}}/{{gitRepoId}}/core/config"
-	"{{gitHost}}/{{gitUserId}}/{{gitRepoId}}/core/auth"
+	"github.com/stackitcloud/stackit-sdk-go/core/config"
+	"github.com/stackitcloud/stackit-sdk-go/core/auth"
 
 	{{#hasOAuthMethods}}
 	"golang.org/x/oauth2"

templates/go/configuration.mustache

@@ -2,7 +2,7 @@
 package {{packageName}}
 
 import (
-	"{{gitHost}}/{{gitUserId}}/{{gitRepoId}}/core/config"
+	"github.com/stackitcloud/stackit-sdk-go/core/config"
 )
 
 // NewConfiguration returns a new Configuration object

templates/go/go.mod.mustache

@@ -3,5 +3,5 @@ module {{gitHost}}/{{gitUserId}}/{{gitRepoId}}/services{{#isGoSubmodule}}/{{pack
 go 1.21
 
 require (
-	{{gitHost}}/{{gitUserId}}/{{gitRepoId}}/core v0.16.0
+	github.com/stackitcloud/stackit-sdk-go/core v0.16.0
 )