Update to Omicron 0dad016 (#276)

Updates to Omicron 0dad016 and fixes a small bug with the type
generation.

Author: karencfv

.changelog/v0.4.0.toml

@@ -3,7 +3,7 @@ title = "Integers as pointers"
 description = "All integers within the SDK's types are now `*int`. This is due to Go's handling of 0 as the empty value. This is specifically necessary when a field is an integer and also not required. [#274](https://github.com/oxidecomputer/oxide.go/pull/274)"
 
 [[features]]
-title = "Affinity and anti-affinity groups"
+title = "Anti-affinity groups"
 description = "CRUD methods. [#269](https://github.com/oxidecomputer/oxide.go/pull/269)"
 
 [[bugs]]

VERSION_OMICRON

@@ -1 +1 @@
-8a40bb8
+0dad016

internal/generate/paths.go

@@ -251,7 +251,7 @@ func getSuccessResponseType(o *openapi3.Operation, isGetAllPages bool) (string,
 			if isGetAllPages {
 
 				if items, ok := content.Schema.Value.Properties["items"]; ok {
-					getAllPagesType = convertToValidGoType("", items)
+					getAllPagesType = convertToValidGoType("", "", items)
 				} else {
 					fmt.Printf("[WARN] TODO: skipping response for %q, since it is a get all pages response and has no `items` property:\n%#v\n", o.OperationID, content.Schema.Value.Properties)
 					return "", "", nil
@@ -361,10 +361,11 @@ func buildPathOrQueryParams(paramType string, params map[string]*openapi3.Parame
 		}
 		sort.Strings(keys)
 		for _, name := range keys {
+			typeName := strcase.ToCamel(name)
 			p := params[name]
-			n := "params." + strcase.ToCamel(name)
+			n := "params." + strcase.ToCamel(typeName)
 
-			switch t := convertToValidGoType(name, p.Schema); t {
+			switch t := convertToValidGoType(name, typeName, p.Schema); t {
 			case "string":
 				pathParams = append(pathParams, fmt.Sprintf("%q: %s,", name, n))
 			case "bool":

internal/generate/types.go

@@ -138,7 +138,7 @@ func constructParamTypes(paths map[string]*openapi3.PathItem) []TypeTemplate {
 					paramName := strcase.ToCamel(p.Value.Name)
 					field := TypeFields{
 						Name: paramName,
-						Type: convertToValidGoType("", p.Value.Schema),
+						Type: convertToValidGoType("", "", p.Value.Schema),
 					}
 
 					if p.Value.Required {
@@ -167,7 +167,7 @@ func constructParamTypes(paths map[string]*openapi3.PathItem) []TypeTemplate {
 
 						field = TypeFields{
 							Name:              "Body",
-							Type:              "*" + convertToValidGoType("", r.Schema),
+							Type:              "*" + convertToValidGoType("", "", r.Schema),
 							SerializationInfo: "`json:\"body,omitempty\" yaml:\"body,omitempty\"`",
 						}
 					}
@@ -507,7 +507,7 @@ func createTypeObject(schema *openapi3.Schema, name, typeName, description strin
 	for _, k := range keys {
 		v := schemas[k]
 		// Check if we need to generate a type for this type.
-		typeName := convertToValidGoType(k, v)
+		typeName := convertToValidGoType(k, typeName, v)
 
 		if isLocalEnum(v) {
 			typeName = fmt.Sprintf("%s%s", name, strcase.ToCamel(k))
@@ -664,7 +664,7 @@ func createOneOf(s *openapi3.Schema, name, typeName string) ([]TypeTemplate, []E
 		for _, prop := range keys {
 			p := v.Value.Properties[prop]
 			// We want to collect all the unique properties to create our global oneOf type.
-			propertyType := convertToValidGoType(prop, p)
+			propertyType := convertToValidGoType(prop, typeName, p)
 			properties = append(properties, prop+"="+propertyType)
 		}
 	}
@@ -715,7 +715,7 @@ func createOneOf(s *openapi3.Schema, name, typeName string) ([]TypeTemplate, []E
 		for _, prop := range keys {
 			p := v.Value.Properties[prop]
 			// We want to collect all the unique properties to create our global oneOf type.
-			propertyType := convertToValidGoType(prop, p)
+			propertyType := convertToValidGoType(prop, typeName, p)
 
 			// Check if we have an enum in order to use the corresponding type instead of
 			// "string"

internal/generate/utils.go

@@ -106,7 +106,7 @@ func isPageParam(s string) bool {
 }
 
 // convertToValidGoType converts a schema type to a valid Go type.
-func convertToValidGoType(property string, r *openapi3.SchemaRef) string {
+func convertToValidGoType(property, typeName string, r *openapi3.SchemaRef) string {
 	// Use reference as it is the type
 	if r.Ref != "" {
 		return getReferenceSchema(r)
@@ -131,7 +131,7 @@ func convertToValidGoType(property string, r *openapi3.SchemaRef) string {
 			return "TODO"
 		}
 
-		return convertToValidGoType(property, r.Value.AllOf[0])
+		return convertToValidGoType(property, "", r.Value.AllOf[0])
 	}
 
 	var schemaType string
@@ -155,8 +155,9 @@ func convertToValidGoType(property string, r *openapi3.SchemaRef) string {
 		// TODO: handle if it is not a reference.
 		schemaType = "[]string"
 	} else if r.Value.Type.Is("object") {
-		// Most likely this is a local object, we will handle it.
-		schemaType = strcase.ToCamel(property)
+		// This is a local object, we make sure there are no duplicates
+		// by concactenating the type name and the property name.
+		schemaType = typeName + strcase.ToCamel(property)
 	} else {
 		fmt.Printf("[WARN] TODO: handle type %q for %q, marking as interface{} for now\n", r.Value.Type, property)
 		schemaType = "interface{}"