Sync monorepo state at "Add yaml tags for UC TF provider schemas"

genprovider/internal/config/generation_config.go

@@ -2,16 +2,16 @@ package config
 
 // ResourceConfig describes a resource that should be generated.
 type ResourceConfig struct {
-	TypeNameSuffix      string `json:"type_name_suffix"`
-	Description         string `json:"description"`
-	MarkdownDescription string `json:"markdown_description"`
-	OpenapiSchema       string `json:"openapi_schema"`
-	RestCollectionPath  string `json:"rest_collection_path"`
-	RestResourcePath    string `json:"rest_resource_path"`
+	TypeNameSuffix      string `json:"type_name_suffix" yaml:"type_name_suffix"`
+	Description         string `json:"description" yaml:"description"`
+	MarkdownDescription string `json:"markdown_description" yaml:"markdown_description"`
+	OpenapiSchema       string `json:"openapi_schema" yaml:"openapi_schema"`
+	RestCollectionPath  string `json:"rest_collection_path" yaml:"rest_collection_path"`
+	RestResourcePath    string `json:"rest_resource_path" yaml:"rest_resource_path"`
 	// Map path param names (e.g. "id") to the name of the OpenAPI schema
 	// property whose value should be used to replace the path param in URLs.
 	// Schema property names should be lower_snake_case
-	PathParamsToSchemaProperty map[string]string `json:"path_params_to_schema_property"`
+	PathParamsToSchemaProperty map[string]string `json:"path_params_to_schema_property" yaml:"path_params_to_schema_property"`
 }
 
 // SchemaOverride allows us to tweak OpenAPI schemas before we generate Terraform schemas from them.
@@ -20,7 +20,7 @@ type SchemaOverride struct {
 	// via OpenAPI, but this doesn't work with object references:
 	// https://usercloudsworkspace.slack.com/archives/C02A3HELPPU/p1695418020075049
 	// Furthermore, swaggest doesn't currently support a `readOnly` struct tag :(
-	ReadonlyProperties []string `json:"readonly_properties"`
+	ReadonlyProperties []string `json:"readonly_properties" yaml:"readonly_properties"`
 	// In addition to having read-only properties (properties whose value can
 	// never be set), we have a notion of "immutable" properties (properties
 	// that can be set upon `create`, but not upon `update`). This is a thing we
@@ -30,18 +30,18 @@ type SchemaOverride struct {
 	// https://stackoverflow.com/a/60110172 However, that requires some
 	// significant changes to the way our backend code is structured, so this
 	// seems like a better solution for now.
-	ImmutableProperties []string `json:"immutable_properties"`
+	ImmutableProperties []string `json:"immutable_properties" yaml:"immutable_properties"`
 }
 
 // Spec configures the generation of resources from a single OpenAPI spec.
 type Spec struct {
-	File                 string                    `json:"file"`
-	GeneratedFilePackage string                    `json:"generated_file_package"`
-	Resources            []ResourceConfig          `json:"resources"`
-	SchemaOverrides      map[string]SchemaOverride `json:"schema_overrides"`
+	File                 string                    `json:"file" yaml:"file"`
+	GeneratedFilePackage string                    `json:"generated_file_package" yaml:"generated_file_package"`
+	Resources            []ResourceConfig          `json:"resources" yaml:"resources"`
+	SchemaOverrides      map[string]SchemaOverride `json:"schema_overrides" yaml:"schema_overrides"`
 }
 
 // GenerationConfig configures the generation of the Terraform provider.
 type GenerationConfig struct {
-	Specs []Spec `json:"specs"`
+	Specs []Spec `json:"specs" yaml:"specs"`
 }

genprovider/internal/schemas/schemas.go

@@ -90,7 +90,7 @@ type << .TFModelStructName >> struct {
 // << .JSONClientModelStructName >> stores data for use with jsonclient for making API requests.
 type << .JSONClientModelStructName >> struct {
 	<<- range $i, $field := .Fields >>
-	<< $field.StructName >> *<< $field.Type.JSONClientModelType >> ` + "`json:\"<< $field.JSONKey >>,omitempty\"`" + `
+	<< $field.StructName >> *<< $field.Type.JSONClientModelType >> ` + "`json:\"<< $field.JSONKey >>,omitempty\" yaml:\"<< $field.JSONKey >>,omitempty\"`" + `
 	<<- end >>
 }