Merge branch 'infobloxopen:master' into tags

infobloxopen · May 1, 2024 · 2a3a80c · 2a3a80c
2 parents c846d8a + 23db084
commit 2a3a80c
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 8 deletions.
diff --git a/dfp/api/openapi.yaml b/dfp/api/openapi.yaml
@@ -133,6 +133,8 @@ paths:
         required: true
         schema:
           type: string
+          x-gosdk-type: resource_id
+        x-gosdk-type: resource_id
       requestBody:
         content:
           application/json:
@@ -188,6 +190,8 @@ paths:
         required: true
         schema:
           type: string
+          x-gosdk-type: resource_id
+        x-gosdk-type: resource_id
       - description: The DNS Forwarding Proxy object identifier.
         in: query
         name: id

diff --git a/dfp/api_infra_services.go b/dfp/api_infra_services.go
diff --git a/internal/client.go b/internal/client.go
@@ -132,11 +132,24 @@ func typeCheckParameter(obj interface{}, expected string, name string) error {
 }
 
 func ParameterValueToString(obj interface{}, key string) string {
+	if key == "id" {
+		// "id" is always assumed to be a resource_id
+		// If "id" is not a resource_id, it should be explicitly set to have a different type using "x-gosdk-type" extension
+		return ParameterValueToStringForType(obj, key, "resource_id")
+	}
+	return ParameterValueToStringForType(obj, key, "")
+}
+
+func ParameterValueToStringForType(obj interface{}, key string, objType string) string {
+	if objType == "resource_id" {
+		return extractResourceId(parameterValueToString(obj, key))
+	}
+	return parameterValueToString(obj, key)
+}
+
+func parameterValueToString(obj interface{}, key string) string {
 	if reflect.TypeOf(obj).Kind() != reflect.Ptr {
 		s := fmt.Sprintf("%v", obj)
-		if key == "id" {
-			s = extractResourceId(s)
-		}
 		return s
 	}
 	var param, ok = obj.(MappedNullable)
@@ -148,9 +161,6 @@ func ParameterValueToString(obj interface{}, key string) string {
 		return ""
 	}
 	s := fmt.Sprintf("%v", dataMap[key])
-	if key == "id" {
-		s = extractResourceId(s)
-	}
 	return s
 }