Fix identification of 'int-or-string' type attributes to include 3rd party types defined by aggregated APIs (#1640)

Author: alexsomesan

manifest/openapi/schema.go

@@ -32,12 +32,6 @@ func resolveSchemaRef(ref *openapi3.SchemaRef, defs map[string]*openapi3.SchemaR
 
 	// These are exceptional situations that require non-standard types.
 	switch sid {
-	case "io.k8s.apimachinery.pkg.util.intstr.IntOrString":
-		t := openapi3.Schema{
-			Type:        "string",
-			Description: "io.k8s.apimachinery.pkg.util.intstr.IntOrString", // this value later carries over as the "type hint"
-		}
-		return &t, nil
 	case "io.k8s.apiextensions-apiserver.pkg.apis.apiextensions.v1.JSONSchemaProps":
 		t := openapi3.Schema{
 			Type: "",
@@ -90,8 +84,7 @@ func getTypeFromSchema(elem *openapi3.Schema, stackdepth uint64, typeCache *sync
 	// }
 	switch elem.Type {
 	case "string":
-		switch elem.Description {
-		case "io.k8s.apimachinery.pkg.util.intstr.IntOrString":
+		if elem.Format == "int-or-string" {
 			th[ap.String()] = "io.k8s.apimachinery.pkg.util.intstr.IntOrString"
 		}
 		return tftypes.String, nil

manifest/payload/to_value.go

@@ -69,7 +69,7 @@ func ToTFValue(in interface{}, st tftypes.Type, th map[string]string, at *tftype
 			if ok && ht == "io.k8s.apimachinery.pkg.util.intstr.IntOrString" { // We store this in state as "string"
 				return tftypes.NewValue(tftypes.String, strconv.FormatInt(in.(int64), 10)), nil
 			}
-			return tftypes.Value{}, at.NewErrorf(`[%s] cannot convert payload from "in64" to "tftypes.String"`, at.String())
+			return tftypes.Value{}, at.NewErrorf(`[%s] cannot convert payload from "int64" to "tftypes.String"`, at.String())
 		default:
 			return tftypes.Value{}, at.NewErrorf(`[%s] cannot convert payload from "int64" to "%s"`, at.String(), st.String())
 		}