diff --git a/internal/spec/templates/model_simple.mustache b/internal/spec/templates/model_simple.mustache
index 5aa3045..232dfbd 100644
--- a/internal/spec/templates/model_simple.mustache
+++ b/internal/spec/templates/model_simple.mustache
@@ -19,7 +19,7 @@ type {{classname}} struct {
 {{#deprecated}}
 	// Deprecated
 {{/deprecated}}
-	{{name}} {{^required}}*{{/required}}{{{dataType}}} `json:"{{baseName}}{{^required}},omitempty{{/required}}"{{#withXml}} xml:"{{baseName}}{{#isXmlAttribute}},attr{{/isXmlAttribute}}"{{/withXml}}{{#vendorExtensions.x-go-custom-tag}} {{{.}}}{{/vendorExtensions.x-go-custom-tag}}`
+	{{name}} {{^required}}*{{/required}}{{{dataType}}} `json:"{{baseName}}{{^required}},omitempty{{/required}}{{#isString}},string{{/isString}}"{{#withXml}} xml:"{{baseName}}{{#isXmlAttribute}},attr{{/isXmlAttribute}}"{{/withXml}}{{#vendorExtensions.x-go-custom-tag}} {{{.}}}{{/vendorExtensions.x-go-custom-tag}}`
 {{/vars}}
 {{#isAdditionalPropertiesTrue}}
 	AdditionalProperties map[string]interface{}
@@ -172,7 +172,7 @@ func (o *{{{classname}}}) UnmarshalJSON(bytes []byte) (err error) {
 	{{#deprecated}}
 		// Deprecated
 	{{/deprecated}}
-		{{name}} {{^required}}*{{/required}}{{{dataType}}} `json:"{{baseName}}{{^required}},omitempty{{/required}}"{{#withXml}} xml:"{{baseName}}{{#isXmlAttribute}},attr{{/isXmlAttribute}}"{{/withXml}}{{#vendorExtensions.x-go-custom-tag}} {{{.}}}{{/vendorExtensions.x-go-custom-tag}}`
+    {{name}} {{^required}}*{{/required}}{{{dataType}}} `json:"{{baseName}}{{^required}},omitempty{{/required}}{{#isString}},string{{/isString}}"{{#withXml}} xml:"{{baseName}}{{#isXmlAttribute}},attr{{/isXmlAttribute}}"{{/withXml}}{{#vendorExtensions.x-go-custom-tag}} {{{.}}}{{/vendorExtensions.x-go-custom-tag}}`
 	{{/vars}}
 	}
 
diff --git a/pkg/client/model_add_egress_rule_request.go b/pkg/client/model_add_egress_rule_request.go
index 15b26d4..8c563ba 100644
--- a/pkg/client/model_add_egress_rule_request.go
+++ b/pkg/client/model_add_egress_rule_request.go
@@ -25,19 +25,19 @@ import (
 // AddEgressRuleRequest AddEgressRuleRequest is the input for the rpc AddEgressRule()..
 type AddEgressRuleRequest struct {
 	// description is text that serves to document the rules purpose.
-	Description string `json:"description"`
+	Description string `json:"description,string"`
 	// destination is the endpoint (or subnetwork if CIDR) to which traffic is allowed.
-	Destination string `json:"destination"`
+	Destination string `json:"destination,string"`
 	// idempotency_key uniquely identifies this request. If not set, it will be set by the server.
-	IdempotencyKey *string `json:"idempotency_key,omitempty"`
+	IdempotencyKey *string `json:"idempotency_key,omitempty,string"`
 	// name is the name of the egress rule.
-	Name string `json:"name"`
+	Name string `json:"name,string"`
 	// paths are the allowed URL paths. If empty, all paths are allowed. Only valid if Type=\"FQDN\".
 	Paths *[]string `json:"paths,omitempty"`
 	// ports are the allowed ports for TCP protocol. If Empty, all ports are allowed.
 	Ports *[]int32 `json:"ports,omitempty"`
 	// type classifies the Destination field. Valid types include: \"FQDN\", \"CIDR\".
-	Type string `json:"type"`
+	Type string `json:"type,string"`
 }
 
 // NewAddEgressRuleRequest instantiates a new AddEgressRuleRequest object.
diff --git a/pkg/client/model_allowlist_entry.go b/pkg/client/model_allowlist_entry.go
index be1316e..302a166 100644
--- a/pkg/client/model_allowlist_entry.go
+++ b/pkg/client/model_allowlist_entry.go
@@ -24,9 +24,9 @@ import (
 
 // AllowlistEntry struct for AllowlistEntry.
 type AllowlistEntry struct {
-	CidrIp   string  `json:"cidr_ip"`
+	CidrIp   string  `json:"cidr_ip,string"`
 	CidrMask int32   `json:"cidr_mask"`
-	Name     *string `json:"name,omitempty"`
+	Name     *string `json:"name,omitempty,string"`
 	Sql      bool    `json:"sql"`
 	Ui       bool    `json:"ui"`
 }
diff --git a/pkg/client/model_allowlist_entry_1.go b/pkg/client/model_allowlist_entry_1.go
index dcce747..9e7257d 100644
--- a/pkg/client/model_allowlist_entry_1.go
+++ b/pkg/client/model_allowlist_entry_1.go
@@ -24,7 +24,7 @@ import (
 
 // AllowlistEntry1 struct for AllowlistEntry1.
 type AllowlistEntry1 struct {
-	Name *string `json:"name,omitempty"`
+	Name *string `json:"name,omitempty,string"`
 	Sql  bool    `json:"sql"`
 	Ui   bool    `json:"ui"`
 }
diff --git a/pkg/client/model_any.go b/pkg/client/model_any.go
index 104570c..85fe12f 100644
--- a/pkg/client/model_any.go
+++ b/pkg/client/model_any.go
@@ -25,7 +25,7 @@ import (
 // Any `Any` contains an arbitrary serialized protocol buffer message along with a URL that describes the type of the serialized message.  Protobuf library provides support to pack/unpack Any values in the form of utility functions or additional generated methods of the Any type.  Example 1: Pack and unpack a message in C++.      Foo foo = ...;     Any any;     any.PackFrom(foo);     ...     if (any.UnpackTo(&foo)) {       ...     }  Example 2: Pack and unpack a message in Java.      Foo foo = ...;     Any any = Any.pack(foo);     ...     if (any.is(Foo.class)) {       foo = any.unpack(Foo.class);     }  Example 3: Pack and unpack a message in Python.      foo = Foo(...)     any = Any()     any.Pack(foo)     ...     if any.Is(Foo.DESCRIPTOR):       any.Unpack(foo)       ...  Example 4: Pack and unpack a message in Go       foo := &pb.Foo{...}      any, err := anypb.New(foo)      if err != nil {        ...      }      ...      foo := &pb.Foo{}      if err := any.UnmarshalTo(foo); err != nil {        ...      }  The pack methods provided by protobuf library will by default use 'type.googleapis.com/full.type.name' as the type URL and the unpack methods only use the fully qualified type name after the last '/' in the type URL, for example \"foo.bar.com/x/y.z\" will yield type name \"y.z\".   JSON  The JSON representation of an `Any` value uses the regular representation of the deserialized, embedded message, with an additional field `@type` which contains the type URL. Example:      package google.profile;     message Person {       string first_name = 1;       string last_name = 2;     }      {       \"@type\": \"type.googleapis.com/google.profile.Person\",       \"firstName\": <string>,       \"lastName\": <string>     }  If the embedded message type is well-known and has a custom JSON representation, that representation will be embedded adding a field `value` which holds the custom JSON in addition to the `@type` field. Example (for message [google.protobuf.Duration][]):      {       \"@type\": \"type.googleapis.com/google.protobuf.Duration\",       \"value\": \"1.212s\"     }.
 type Any struct {
 	// A URL/resource name that uniquely identifies the type of the serialized protocol buffer message. This string must contain at least one \"/\" character. The last segment of the URL's path must represent the fully qualified name of the type (as in `path/google.protobuf.Duration`). The name should be in a canonical form (e.g., leading \".\" is not accepted).  In practice, teams usually precompile into the binary all types that they expect it to use in the context of Any. However, for URLs which use the scheme `http`, `https`, or no scheme, one can optionally set up a type server that maps type URLs to message definitions as follows:  * If no scheme is provided, `https` is assumed. * An HTTP GET on the URL must yield a [google.protobuf.Type][]   value in binary format, or produce an error. * Applications are allowed to cache lookup results based on the   URL, or have them precompiled into a binary to avoid any   lookup. Therefore, binary compatibility needs to be preserved   on changes to types. (Use versioned type names to manage   breaking changes.)  Note: this functionality is not currently available in the official protobuf release, and it is not used for type URLs beginning with type.googleapis.com.  Schemes other than `http`, `https` (or the empty scheme) might be used with implementation specific semantics.
-	Type *string `json:"@type,omitempty"`
+	Type *string `json:"@type,omitempty,string"`
 }
 
 // NewAny instantiates a new Any object.
diff --git a/pkg/client/model_api_database.go b/pkg/client/model_api_database.go
index 5f54c0f..6ec977f 100644
--- a/pkg/client/model_api_database.go
+++ b/pkg/client/model_api_database.go
@@ -24,8 +24,8 @@ import (
 
 // ApiDatabase struct for ApiDatabase.
 type ApiDatabase struct {
-	Name       string `json:"name"`
-	TableCount *int64 `json:"table_count,omitempty"`
+	Name       string `json:"name,string"`
+	TableCount *int64 `json:"table_count,omitempty,string"`
 }
 
 // NewApiDatabase instantiates a new ApiDatabase object.
diff --git a/pkg/client/model_aws_endpoint_connection.go b/pkg/client/model_aws_endpoint_connection.go
index 49b8409..0a0d7e9 100644
--- a/pkg/client/model_aws_endpoint_connection.go
+++ b/pkg/client/model_aws_endpoint_connection.go
@@ -26,11 +26,11 @@ import (
 type AwsEndpointConnection struct {
 	CloudProvider CloudProviderType `json:"cloud_provider"`
 	// endpoint_id is the client side of the PrivateLink connection.
-	EndpointId string `json:"endpoint_id"`
+	EndpointId string `json:"endpoint_id,string"`
 	// region_name is the cloud provider region name (i.e. us-east-1).
-	RegionName string `json:"region_name"`
+	RegionName string `json:"region_name,string"`
 	// service_id is the server side of the PrivateLink connection. This is the same as AWSPrivateLinkEndpoint.service_id.
-	ServiceId string                          `json:"service_id"`
+	ServiceId string                          `json:"service_id,string"`
 	Status    AWSEndpointConnectionStatusType `json:"status"`
 }
 
diff --git a/pkg/client/model_aws_private_link_service_detail.go b/pkg/client/model_aws_private_link_service_detail.go
index 8efcfcb..9adc1ac 100644
--- a/pkg/client/model_aws_private_link_service_detail.go
+++ b/pkg/client/model_aws_private_link_service_detail.go
@@ -27,9 +27,9 @@ type AWSPrivateLinkServiceDetail struct {
 	// availability_zone_ids are the identifiers for the availability zones that the service is available in.
 	AvailabilityZoneIds []string `json:"availability_zone_ids"`
 	// service_id is the server side of the PrivateLink connection. This is the same as AWSPrivateLinkEndpoint.service_id.
-	ServiceId string `json:"service_id"`
+	ServiceId string `json:"service_id,string"`
 	// service_name is the AWS service name customers use to create endpoints on their end.
-	ServiceName string `json:"service_name"`
+	ServiceName string `json:"service_name,string"`
 }
 
 // NewAWSPrivateLinkServiceDetail instantiates a new AWSPrivateLinkServiceDetail object.
diff --git a/pkg/client/model_client_ca_cert_info.go b/pkg/client/model_client_ca_cert_info.go
index af00594..d5ed74b 100644
--- a/pkg/client/model_client_ca_cert_info.go
+++ b/pkg/client/model_client_ca_cert_info.go
@@ -25,7 +25,7 @@ import (
 // ClientCACertInfo struct for ClientCACertInfo.
 type ClientCACertInfo struct {
 	Status      *ClientCACertStatus `json:"status,omitempty"`
-	X509PemCert *string             `json:"x509_pem_cert,omitempty"`
+	X509PemCert *string             `json:"x509_pem_cert,omitempty,string"`
 }
 
 // NewClientCACertInfo instantiates a new ClientCACertInfo object.
diff --git a/pkg/client/model_cloud_provider_region.go b/pkg/client/model_cloud_provider_region.go
index 0533ec0..dcd15b0 100644
--- a/pkg/client/model_cloud_provider_region.go
+++ b/pkg/client/model_cloud_provider_region.go
@@ -26,8 +26,8 @@ import (
 type CloudProviderRegion struct {
 	// Distance in miles, based on client IP address.
 	Distance   float32           `json:"distance"`
-	Location   string            `json:"location"`
-	Name       string            `json:"name"`
+	Location   string            `json:"location,string"`
+	Name       string            `json:"name,string"`
 	Provider   CloudProviderType `json:"provider"`
 	Serverless bool              `json:"serverless"`
 }
diff --git a/pkg/client/model_cloud_watch_metric_export_info.go b/pkg/client/model_cloud_watch_metric_export_info.go
index 2a9b829..b3bf365 100644
--- a/pkg/client/model_cloud_watch_metric_export_info.go
+++ b/pkg/client/model_cloud_watch_metric_export_info.go
@@ -24,15 +24,15 @@ import (
 
 // CloudWatchMetricExportInfo struct for CloudWatchMetricExportInfo.
 type CloudWatchMetricExportInfo struct {
-	ClusterId string `json:"cluster_id"`
+	ClusterId string `json:"cluster_id,string"`
 	// log_group_name is the customized log group name.
-	LogGroupName *string `json:"log_group_name,omitempty"`
+	LogGroupName *string `json:"log_group_name,omitempty,string"`
 	// role_arn is the IAM role used to upload metric segments to the target AWS account.
-	RoleArn string                  `json:"role_arn"`
+	RoleArn string                  `json:"role_arn,string"`
 	Status  *MetricExportStatusType `json:"status,omitempty"`
 	// target_region specifies the specific AWS region that the metrics will be exported to.
-	TargetRegion *string `json:"target_region,omitempty"`
-	UserMessage  *string `json:"user_message,omitempty"`
+	TargetRegion *string `json:"target_region,omitempty,string"`
+	UserMessage  *string `json:"user_message,omitempty,string"`
 }
 
 // NewCloudWatchMetricExportInfo instantiates a new CloudWatchMetricExportInfo object.
diff --git a/pkg/client/model_cluster.go b/pkg/client/model_cluster.go
index 570c62f..d57b068 100644
--- a/pkg/client/model_cluster.go
+++ b/pkg/client/model_cluster.go
@@ -25,22 +25,22 @@ import (
 
 // Cluster struct for Cluster.
 type Cluster struct {
-	AccountId           *string                  `json:"account_id,omitempty"`
+	AccountId           *string                  `json:"account_id,omitempty,string"`
 	CloudProvider       CloudProviderType        `json:"cloud_provider"`
-	CockroachVersion    string                   `json:"cockroach_version"`
+	CockroachVersion    string                   `json:"cockroach_version,string"`
 	Config              ClusterConfig            `json:"config"`
 	CreatedAt           *time.Time               `json:"created_at,omitempty"`
-	CreatorId           string                   `json:"creator_id"`
+	CreatorId           string                   `json:"creator_id,string"`
 	DeletedAt           *time.Time               `json:"deleted_at,omitempty"`
 	EgressTrafficPolicy *EgressTrafficPolicyType `json:"egress_traffic_policy,omitempty"`
-	Id                  string                   `json:"id"`
-	Name                string                   `json:"name"`
+	Id                  string                   `json:"id,string"`
+	Name                string                   `json:"name,string"`
 	NetworkVisibility   *NetworkVisibilityType   `json:"network_visibility,omitempty"`
 	OperationStatus     ClusterStatusType        `json:"operation_status"`
 	Plan                PlanType                 `json:"plan"`
 	Regions             []Region                 `json:"regions"`
 	// sql_dns is the DNS name of SQL interface of the cluster.
-	SqlDns        *string                  `json:"sql_dns,omitempty"`
+	SqlDns        *string                  `json:"sql_dns,omitempty,string"`
 	State         ClusterStateType         `json:"state"`
 	UpdatedAt     *time.Time               `json:"updated_at,omitempty"`
 	UpgradeStatus ClusterUpgradeStatusType `json:"upgrade_status"`
diff --git a/pkg/client/model_cluster_major_version.go b/pkg/client/model_cluster_major_version.go
index 12f58b6..1e633f5 100644
--- a/pkg/client/model_cluster_major_version.go
+++ b/pkg/client/model_cluster_major_version.go
@@ -25,7 +25,7 @@ import (
 // ClusterMajorVersion For more information about CockroachDB cluster version support, see https://www.cockroachlabs.com/docs/releases/release-support-policy.html.
 type ClusterMajorVersion struct {
 	SupportStatus ClusterMajorVersionSupportStatusType `json:"support_status"`
-	Version       string                               `json:"version"`
+	Version       string                               `json:"version,string"`
 }
 
 // NewClusterMajorVersion instantiates a new ClusterMajorVersion object.
diff --git a/pkg/client/model_cmek_key_info.go b/pkg/client/model_cmek_key_info.go
index 6cd3b6e..f41de15 100644
--- a/pkg/client/model_cmek_key_info.go
+++ b/pkg/client/model_cmek_key_info.go
@@ -29,7 +29,7 @@ type CMEKKeyInfo struct {
 	Spec        *CMEKKeySpecification `json:"spec,omitempty"`
 	Status      *CMEKStatus           `json:"status,omitempty"`
 	UpdatedAt   *time.Time            `json:"updated_at,omitempty"`
-	UserMessage *string               `json:"user_message,omitempty"`
+	UserMessage *string               `json:"user_message,omitempty,string"`
 }
 
 // NewCMEKKeyInfo instantiates a new CMEKKeyInfo object.
diff --git a/pkg/client/model_cmek_key_specification.go b/pkg/client/model_cmek_key_specification.go
index 7fa3d66..8deda9c 100644
--- a/pkg/client/model_cmek_key_specification.go
+++ b/pkg/client/model_cmek_key_specification.go
@@ -24,9 +24,9 @@ import (
 
 // CMEKKeySpecification CMEKKeySpecification contains all the details necessary to use a customer-provided encryption key.  This involves the type/location of the key and the principal to authenticate as  when accessing it..
 type CMEKKeySpecification struct {
-	AuthPrincipal *string      `json:"auth_principal,omitempty"`
+	AuthPrincipal *string      `json:"auth_principal,omitempty,string"`
 	Type          *CMEKKeyType `json:"type,omitempty"`
-	Uri           *string      `json:"uri,omitempty"`
+	Uri           *string      `json:"uri,omitempty,string"`
 }
 
 // NewCMEKKeySpecification instantiates a new CMEKKeySpecification object.
diff --git a/pkg/client/model_cmek_region_info.go b/pkg/client/model_cmek_region_info.go
index f51b695..3789ede 100644
--- a/pkg/client/model_cmek_region_info.go
+++ b/pkg/client/model_cmek_region_info.go
@@ -25,7 +25,7 @@ import (
 // CMEKRegionInfo CMEKRegionInfo contains the status of CMEK within a region.  This includes current and past key specifications used within the region,  as well as the status of those specifications.
 type CMEKRegionInfo struct {
 	KeyInfos *[]CMEKKeyInfo `json:"key_infos,omitempty"`
-	Region   *string        `json:"region,omitempty"`
+	Region   *string        `json:"region,omitempty,string"`
 	Status   *CMEKStatus    `json:"status,omitempty"`
 }
 
diff --git a/pkg/client/model_cmek_region_specification.go b/pkg/client/model_cmek_region_specification.go
index c1657eb..69268c0 100644
--- a/pkg/client/model_cmek_region_specification.go
+++ b/pkg/client/model_cmek_region_specification.go
@@ -25,7 +25,7 @@ import (
 // CMEKRegionSpecification CMEKRegionSpecification declares the customer-provided key specification that should be used in a given region..
 type CMEKRegionSpecification struct {
 	KeySpec *CMEKKeySpecification `json:"key_spec,omitempty"`
-	Region  *string               `json:"region,omitempty"`
+	Region  *string               `json:"region,omitempty,string"`
 }
 
 // NewCMEKRegionSpecification instantiates a new CMEKRegionSpecification object.
diff --git a/pkg/client/model_create_cluster_request.go b/pkg/client/model_create_cluster_request.go
index b9342c7..fd745f0 100644
--- a/pkg/client/model_create_cluster_request.go
+++ b/pkg/client/model_create_cluster_request.go
@@ -25,7 +25,7 @@ import (
 // CreateClusterRequest struct for CreateClusterRequest.
 type CreateClusterRequest struct {
 	// Name must be 6-20 characters in length and can include numbers, lowercase letters, and dashes (but no leading or trailing dashes).
-	Name     string                     `json:"name"`
+	Name     string                     `json:"name,string"`
 	Provider CloudProviderType          `json:"provider"`
 	Spec     CreateClusterSpecification `json:"spec"`
 }
diff --git a/pkg/client/model_create_database_request.go b/pkg/client/model_create_database_request.go
index 17d2d00..2bb8c5f 100644
--- a/pkg/client/model_create_database_request.go
+++ b/pkg/client/model_create_database_request.go
@@ -24,7 +24,7 @@ import (
 
 // CreateDatabaseRequest struct for CreateDatabaseRequest.
 type CreateDatabaseRequest struct {
-	Name string `json:"name"`
+	Name string `json:"name,string"`
 }
 
 // NewCreateDatabaseRequest instantiates a new CreateDatabaseRequest object.
diff --git a/pkg/client/model_create_sql_user_request.go b/pkg/client/model_create_sql_user_request.go
index 1b4e498..4fd7fc3 100644
--- a/pkg/client/model_create_sql_user_request.go
+++ b/pkg/client/model_create_sql_user_request.go
@@ -24,8 +24,8 @@ import (
 
 // CreateSQLUserRequest struct for CreateSQLUserRequest.
 type CreateSQLUserRequest struct {
-	Name     string `json:"name"`
-	Password string `json:"password"`
+	Name     string `json:"name,string"`
+	Password string `json:"password,string"`
 }
 
 // NewCreateSQLUserRequest instantiates a new CreateSQLUserRequest object.
diff --git a/pkg/client/model_datadog_metric_export_info.go b/pkg/client/model_datadog_metric_export_info.go
index f731fcc..11b1349 100644
--- a/pkg/client/model_datadog_metric_export_info.go
+++ b/pkg/client/model_datadog_metric_export_info.go
@@ -25,11 +25,11 @@ import (
 // DatadogMetricExportInfo struct for DatadogMetricExportInfo.
 type DatadogMetricExportInfo struct {
 	// api_key is the last 4 digits of a Datadog API key.
-	ApiKey      *string                 `json:"api_key,omitempty"`
-	ClusterId   string                  `json:"cluster_id"`
+	ApiKey      *string                 `json:"api_key,omitempty,string"`
+	ClusterId   string                  `json:"cluster_id,string"`
 	Site        DatadogSiteType         `json:"site"`
 	Status      *MetricExportStatusType `json:"status,omitempty"`
-	UserMessage *string                 `json:"user_message,omitempty"`
+	UserMessage *string                 `json:"user_message,omitempty,string"`
 }
 
 // NewDatadogMetricExportInfo instantiates a new DatadogMetricExportInfo object.
diff --git a/pkg/client/model_dedicated_cluster_create_specification.go b/pkg/client/model_dedicated_cluster_create_specification.go
index a8cadb6..1ae3c83 100644
--- a/pkg/client/model_dedicated_cluster_create_specification.go
+++ b/pkg/client/model_dedicated_cluster_create_specification.go
@@ -25,7 +25,7 @@ import (
 // DedicatedClusterCreateSpecification struct for DedicatedClusterCreateSpecification.
 type DedicatedClusterCreateSpecification struct {
 	// The CockroachDB version for the cluster. The current version is used if omitted.
-	CockroachVersion  *string                              `json:"cockroach_version,omitempty"`
+	CockroachVersion  *string                              `json:"cockroach_version,omitempty,string"`
 	Hardware          DedicatedHardwareCreateSpecification `json:"hardware"`
 	NetworkVisibility *NetworkVisibilityType               `json:"network_visibility,omitempty"`
 	// Region keys should match the cloud provider's zone code. For example, for Oregon, set region_name to \"us-west2\" for GCP and \"us-west-2\" for AWS. Values represent the node count.
diff --git a/pkg/client/model_dedicated_hardware_config.go b/pkg/client/model_dedicated_hardware_config.go
index 3018c82..2de9658 100644
--- a/pkg/client/model_dedicated_hardware_config.go
+++ b/pkg/client/model_dedicated_hardware_config.go
@@ -27,7 +27,7 @@ type DedicatedHardwareConfig struct {
 	// disk_iops is the number of disk I/O operations per second that are permitted on each node in the cluster. Zero indicates the cloud provider-specific default.
 	DiskIops int32 `json:"disk_iops"`
 	// machine_type is the machine type identifier within the given cloud provider, ex. m5.xlarge, n2-standard-4.
-	MachineType string `json:"machine_type"`
+	MachineType string `json:"machine_type,string"`
 	// memory_gib is the memory GiB per node in the cluster.
 	MemoryGib float32 `json:"memory_gib"`
 	// num_virtual_cpus is the number of virtual CPUs per node in the cluster.
diff --git a/pkg/client/model_dedicated_machine_type_specification.go b/pkg/client/model_dedicated_machine_type_specification.go
index 3e232a1..88dc882 100644
--- a/pkg/client/model_dedicated_machine_type_specification.go
+++ b/pkg/client/model_dedicated_machine_type_specification.go
@@ -25,7 +25,7 @@ import (
 // DedicatedMachineTypeSpecification struct for DedicatedMachineTypeSpecification.
 type DedicatedMachineTypeSpecification struct {
 	// machine_type is the machine type identifier within the given cloud provider, ex. m5.xlarge, n2-standard-4.
-	MachineType *string `json:"machine_type,omitempty"`
+	MachineType *string `json:"machine_type,omitempty,string"`
 	// num_virtual_cpus may be used to automatically select a machine type according to the desired number of vCPUs.
 	NumVirtualCpus *int32 `json:"num_virtual_cpus,omitempty"`
 }
diff --git a/pkg/client/model_delete_metric_export_response.go b/pkg/client/model_delete_metric_export_response.go
index 5cb8491..33e62eb 100644
--- a/pkg/client/model_delete_metric_export_response.go
+++ b/pkg/client/model_delete_metric_export_response.go
@@ -24,7 +24,7 @@ import (
 
 // DeleteMetricExportResponse struct for DeleteMetricExportResponse.
 type DeleteMetricExportResponse struct {
-	ClusterId string                  `json:"cluster_id"`
+	ClusterId string                  `json:"cluster_id,string"`
 	Status    *MetricExportStatusType `json:"status,omitempty"`
 }
 
diff --git a/pkg/client/model_edit_egress_rule_request.go b/pkg/client/model_edit_egress_rule_request.go
index a5c2908..131fabd 100644
--- a/pkg/client/model_edit_egress_rule_request.go
+++ b/pkg/client/model_edit_egress_rule_request.go
@@ -25,17 +25,17 @@ import (
 // EditEgressRuleRequest EditEgressRuleRequest is the input message to the EditEgressRule RPC..
 type EditEgressRuleRequest struct {
 	// description is text that serves to document the rules purpose.
-	Description *string `json:"description,omitempty"`
+	Description *string `json:"description,omitempty,string"`
 	// destination is a CIDR range or fully-qualified domain name to which outgoing traffic should be allowed. This field is required.
-	Destination *string `json:"destination,omitempty"`
+	Destination *string `json:"destination,omitempty,string"`
 	// idempotency_key uniquely identifies this request. If not set, it will be set by the server.
-	IdempotencyKey *string `json:"idempotency_key,omitempty"`
+	IdempotencyKey *string `json:"idempotency_key,omitempty,string"`
 	// paths are the allowed URL paths. If empty, all paths are allowed. Only valid if Type=\"FQDN\".
 	Paths *[]string `json:"paths,omitempty"`
 	// ports are the allowed ports for TCP protocol. If empty, all ports are allowed.
 	Ports *[]int32 `json:"ports,omitempty"`
 	// type is the destination type of this rule. Example values are FQDN or CIDR. This field is required.
-	Type *string `json:"type,omitempty"`
+	Type *string `json:"type,omitempty,string"`
 }
 
 // NewEditEgressRuleRequest instantiates a new EditEgressRuleRequest object.
diff --git a/pkg/client/model_egress_rule.go b/pkg/client/model_egress_rule.go
index 71affcf..d52fe85 100644
--- a/pkg/client/model_egress_rule.go
+++ b/pkg/client/model_egress_rule.go
@@ -26,27 +26,27 @@ import (
 // EgressRule EgressRule represents a network egress rule..
 type EgressRule struct {
 	// cluster_id identifies the cluster to which this egress rule applies.
-	ClusterId string `json:"cluster_id"`
+	ClusterId string `json:"cluster_id,string"`
 	// created_at is the time at which the time at which the egress rule was created.
 	CreatedAt *time.Time `json:"created_at,omitempty"`
 	// crl_managed indicates this egress rule is managed by CockroachDB Cloud services. This field is set by the server.
 	CrlManaged bool `json:"crl_managed"`
 	// description is a longer that serves to document the rules purpose.
-	Description string `json:"description"`
+	Description string `json:"description,string"`
 	// destination is the endpoint (or subnetwork if CIDR) to which traffic is allowed.
-	Destination string `json:"destination"`
+	Destination string `json:"destination,string"`
 	// id uniquely identifies this egress rule.
-	Id string `json:"id"`
+	Id string `json:"id,string"`
 	// name is the name of the egress rule.
-	Name string `json:"name"`
+	Name string `json:"name,string"`
 	// paths are the allowed URL paths. Only valid if Type=\"FQDN\".
 	Paths *[]string `json:"paths,omitempty"`
 	// ports are the allowed ports for TCP protocol. If Empty, all ports are allowed.
 	Ports *[]int32 `json:"ports,omitempty"`
 	// state indicates the state of the egress rule.
-	State string `json:"state"`
+	State string `json:"state,string"`
 	// type classifies the destination field. Valid types include: \"FQDN\", \"CIDR\".
-	Type string `json:"type"`
+	Type string `json:"type,string"`
 }
 
 // NewEgressRule instantiates a new EgressRule object.
diff --git a/pkg/client/model_enable_cloud_watch_metric_export_request.go b/pkg/client/model_enable_cloud_watch_metric_export_request.go
index f25a831..5298706 100644
--- a/pkg/client/model_enable_cloud_watch_metric_export_request.go
+++ b/pkg/client/model_enable_cloud_watch_metric_export_request.go
@@ -25,11 +25,11 @@ import (
 // EnableCloudWatchMetricExportRequest struct for EnableCloudWatchMetricExportRequest.
 type EnableCloudWatchMetricExportRequest struct {
 	// log_group_name is the customized log group name.
-	LogGroupName *string `json:"log_group_name,omitempty"`
+	LogGroupName *string `json:"log_group_name,omitempty,string"`
 	// role_arn is the IAM role used to upload metric segments to the target AWS account.
-	RoleArn string `json:"role_arn"`
+	RoleArn string `json:"role_arn,string"`
 	// target_region specifies the specific AWS region that the metrics will be exported to.
-	TargetRegion *string `json:"target_region,omitempty"`
+	TargetRegion *string `json:"target_region,omitempty,string"`
 }
 
 // NewEnableCloudWatchMetricExportRequest instantiates a new EnableCloudWatchMetricExportRequest object.
diff --git a/pkg/client/model_enable_datadog_metric_export_request.go b/pkg/client/model_enable_datadog_metric_export_request.go
index 0215df1..b623d01 100644
--- a/pkg/client/model_enable_datadog_metric_export_request.go
+++ b/pkg/client/model_enable_datadog_metric_export_request.go
@@ -25,7 +25,7 @@ import (
 // EnableDatadogMetricExportRequest struct for EnableDatadogMetricExportRequest.
 type EnableDatadogMetricExportRequest struct {
 	// api_key is a Datadog API key.
-	ApiKey string          `json:"api_key"`
+	ApiKey string          `json:"api_key,string"`
 	Site   DatadogSiteType `json:"site"`
 }
 
diff --git a/pkg/client/model_enable_log_export_request.go b/pkg/client/model_enable_log_export_request.go
index 3f683ae..8b426c6 100644
--- a/pkg/client/model_enable_log_export_request.go
+++ b/pkg/client/model_enable_log_export_request.go
@@ -25,15 +25,15 @@ import (
 // EnableLogExportRequest struct for EnableLogExportRequest.
 type EnableLogExportRequest struct {
 	// auth_principal is either the AWS Role ARN that identifies a role that the cluster account can assume to write to CloudWatch or the GCP Project ID that the cluster service account has permissions to write to for cloud logging.
-	AuthPrincipal string `json:"auth_principal"`
+	AuthPrincipal string `json:"auth_principal,string"`
 	// groups is a collection of log group configurations that allows the customer to define collections of CRDB log channels that are aggregated separately at the target sink.
 	Groups *[]LogExportGroup `json:"groups,omitempty"`
 	// log_name is an identifier for the logs in the customer's log sink.
-	LogName string `json:"log_name"`
+	LogName string `json:"log_name,string"`
 	// redact allows the customer to set a default redaction policy for logs before they are exported to the target sink. If a group config omits a redact flag and this one is set to `true`, then that group will receive redacted logs.
 	Redact *bool `json:"redact,omitempty"`
 	// region allows the customer to override the destination region for all logs for a cluster.
-	Region *string       `json:"region,omitempty"`
+	Region *string       `json:"region,omitempty,string"`
 	Type   LogExportType `json:"type"`
 }
 
diff --git a/pkg/client/model_get_connection_string_response.go b/pkg/client/model_get_connection_string_response.go
index 4def614..bd9da7d 100644
--- a/pkg/client/model_get_connection_string_response.go
+++ b/pkg/client/model_get_connection_string_response.go
@@ -25,7 +25,7 @@ import (
 // GetConnectionStringResponse struct for GetConnectionStringResponse.
 type GetConnectionStringResponse struct {
 	// connection_string contains the full connection string with parameters formatted inline.
-	ConnectionString *string `json:"connection_string,omitempty"`
+	ConnectionString *string `json:"connection_string,omitempty,string"`
 	// params contains a list of individual key parameters for generating nonstandard connection strings.
 	Params *map[string]string `json:"params,omitempty"`
 }
diff --git a/pkg/client/model_invoice.go b/pkg/client/model_invoice.go
index 9c57251..b6a1926 100644
--- a/pkg/client/model_invoice.go
+++ b/pkg/client/model_invoice.go
@@ -30,7 +30,7 @@ type Invoice struct {
 	// balances are the amounts of currency left at the time of the invoice.
 	Balances []CurrencyAmount `json:"balances"`
 	// invoice_id is the unique ID representing the invoice.
-	InvoiceId string `json:"invoice_id"`
+	InvoiceId string `json:"invoice_id,string"`
 	// invoice_items are sorted by the cluster name.
 	InvoiceItems []InvoiceItem `json:"invoice_items"`
 	// period_end is the end of the billing period (exclusive).
diff --git a/pkg/client/model_invoice_adjustment.go b/pkg/client/model_invoice_adjustment.go
index 75c53fc..bdbb957 100644
--- a/pkg/client/model_invoice_adjustment.go
+++ b/pkg/client/model_invoice_adjustment.go
@@ -26,7 +26,7 @@ import (
 type InvoiceAdjustment struct {
 	Amount CurrencyAmount `json:"amount"`
 	// name identifies the adjustment.
-	Name string `json:"name"`
+	Name string `json:"name,string"`
 }
 
 // NewInvoiceAdjustment instantiates a new InvoiceAdjustment object.
diff --git a/pkg/client/model_keyset_pagination_request.go b/pkg/client/model_keyset_pagination_request.go
index 4d8b33b..1ac3e7b 100644
--- a/pkg/client/model_keyset_pagination_request.go
+++ b/pkg/client/model_keyset_pagination_request.go
@@ -27,7 +27,7 @@ import (
 type KeysetPaginationRequest struct {
 	AsOfTime  *time.Time `json:"as_of_time,omitempty"`
 	Limit     *int32     `json:"limit,omitempty"`
-	Page      *string    `json:"page,omitempty"`
+	Page      *string    `json:"page,omitempty,string"`
 	SortOrder *SortOrder `json:"sort_order,omitempty"`
 }
 
diff --git a/pkg/client/model_keyset_pagination_response.go b/pkg/client/model_keyset_pagination_response.go
index b457f20..30224fb 100644
--- a/pkg/client/model_keyset_pagination_response.go
+++ b/pkg/client/model_keyset_pagination_response.go
@@ -24,8 +24,8 @@ import (
 
 // KeysetPaginationResponse struct for KeysetPaginationResponse.
 type KeysetPaginationResponse struct {
-	NextPage     *string `json:"next_page,omitempty"`
-	PreviousPage *string `json:"previous_page,omitempty"`
+	NextPage     *string `json:"next_page,omitempty,string"`
+	PreviousPage *string `json:"previous_page,omitempty,string"`
 }
 
 // NewKeysetPaginationResponse instantiates a new KeysetPaginationResponse object.
diff --git a/pkg/client/model_line_item.go b/pkg/client/model_line_item.go
index 38e92c4..acdbe81 100644
--- a/pkg/client/model_line_item.go
+++ b/pkg/client/model_line_item.go
@@ -25,7 +25,7 @@ import (
 // LineItem struct for LineItem.
 type LineItem struct {
 	// description contains the details of the line item (i.e t3 micro).
-	Description string `json:"description"`
+	Description string `json:"description,string"`
 	// quantity is the number of the specific line items used.
 	Quantity     float64          `json:"quantity"`
 	QuantityUnit QuantityUnitType `json:"quantity_unit"`
diff --git a/pkg/client/model_log_export_cluster_info.go b/pkg/client/model_log_export_cluster_info.go
index 5ee59cf..abbc9bc 100644
--- a/pkg/client/model_log_export_cluster_info.go
+++ b/pkg/client/model_log_export_cluster_info.go
@@ -25,12 +25,12 @@ import (
 
 // LogExportClusterInfo LogExportClusterInfo contains a package of information that fully describes both the intended state of the log export configuration for a specific cluster but also some metadata around its deployment status, any error messages, and some timestamps..
 type LogExportClusterInfo struct {
-	ClusterId   *string                        `json:"cluster_id,omitempty"`
+	ClusterId   *string                        `json:"cluster_id,omitempty,string"`
 	CreatedAt   *time.Time                     `json:"created_at,omitempty"`
 	Spec        *LogExportClusterSpecification `json:"spec,omitempty"`
 	Status      *LogExportStatus               `json:"status,omitempty"`
 	UpdatedAt   *time.Time                     `json:"updated_at,omitempty"`
-	UserMessage *string                        `json:"user_message,omitempty"`
+	UserMessage *string                        `json:"user_message,omitempty,string"`
 }
 
 // NewLogExportClusterInfo instantiates a new LogExportClusterInfo object.
diff --git a/pkg/client/model_log_export_cluster_specification.go b/pkg/client/model_log_export_cluster_specification.go
index 90fbecc..1402a4b 100644
--- a/pkg/client/model_log_export_cluster_specification.go
+++ b/pkg/client/model_log_export_cluster_specification.go
@@ -25,15 +25,15 @@ import (
 // LogExportClusterSpecification LogExportClusterSpecification contains all the data necessary to configure log export for an individual cluster. Users would supply this data via the API and also receive it back when inspecting the state of their log export configuration..
 type LogExportClusterSpecification struct {
 	// auth_principal is either the AWS Role ARN that identifies a role that the cluster account can assume to write to CloudWatch or the GCP Project ID that the cluster service account has permissions to write to for cloud logging.
-	AuthPrincipal *string `json:"auth_principal,omitempty"`
+	AuthPrincipal *string `json:"auth_principal,omitempty,string"`
 	// groups is a collection of log group configurations to customize which CRDB channels get aggregated into different groups at the target sink. Unconfigured channels will be sent to the default locations via the settings above.
 	Groups *[]LogExportGroup `json:"groups,omitempty"`
 	// log_name is an identifier for the logs in the customer's log sink.
-	LogName *string `json:"log_name,omitempty"`
+	LogName *string `json:"log_name,omitempty,string"`
 	// redact controls whether logs are redacted before forwarding to customer sinks. By default they are not redacted.
 	Redact *bool `json:"redact,omitempty"`
 	// region controls whether all logs are sent to a specific region in the customer sink. By default, logs will remain their region of origin depending on the cluster node's region.
-	Region *string        `json:"region,omitempty"`
+	Region *string        `json:"region,omitempty,string"`
 	Type   *LogExportType `json:"type,omitempty"`
 }
 
diff --git a/pkg/client/model_log_export_group.go b/pkg/client/model_log_export_group.go
index 0320550..412f65a 100644
--- a/pkg/client/model_log_export_group.go
+++ b/pkg/client/model_log_export_group.go
@@ -27,7 +27,7 @@ type LogExportGroup struct {
 	// channels is a list of CRDB log channels to include in this group.
 	Channels []string `json:"channels"`
 	// log_name is the name of the group, reflected in the log sink.
-	LogName  string        `json:"log_name"`
+	LogName  string        `json:"log_name,string"`
 	MinLevel *LogLevelType `json:"min_level,omitempty"`
 	// redact is a boolean that governs whether this log group should aggregate redacted logs. Redaction settings will inherit from the cluster log export defaults if unset.
 	Redact *bool `json:"redact,omitempty"`
diff --git a/pkg/client/model_node.go b/pkg/client/model_node.go
index 29a8c49..d45de69 100644
--- a/pkg/client/model_node.go
+++ b/pkg/client/model_node.go
@@ -24,8 +24,8 @@ import (
 
 // Node struct for Node.
 type Node struct {
-	Name       string         `json:"name"`
-	RegionName string         `json:"region_name"`
+	Name       string         `json:"name,string"`
+	RegionName string         `json:"region_name,string"`
 	Status     NodeStatusType `json:"status"`
 }
 
diff --git a/pkg/client/model_organization.go b/pkg/client/model_organization.go
index b73bc78..c8718dd 100644
--- a/pkg/client/model_organization.go
+++ b/pkg/client/model_organization.go
@@ -26,9 +26,9 @@ import (
 // Organization struct for Organization.
 type Organization struct {
 	CreatedAt time.Time `json:"created_at"`
-	Id        string    `json:"id"`
-	Label     string    `json:"label"`
-	Name      string    `json:"name"`
+	Id        string    `json:"id,string"`
+	Label     string    `json:"label,string"`
+	Name      string    `json:"name,string"`
 }
 
 // NewOrganization instantiates a new Organization object.
diff --git a/pkg/client/model_person_user_info.go b/pkg/client/model_person_user_info.go
index eb4c48d..db72e9c 100644
--- a/pkg/client/model_person_user_info.go
+++ b/pkg/client/model_person_user_info.go
@@ -25,9 +25,9 @@ import (
 // PersonUserInfo struct for PersonUserInfo.
 type PersonUserInfo struct {
 	// email is an email address.
-	Email *string `json:"email,omitempty"`
+	Email *string `json:"email,omitempty,string"`
 	// id is the user id.
-	Id string `json:"id"`
+	Id string `json:"id,string"`
 }
 
 // NewPersonUserInfo instantiates a new PersonUserInfo object.
diff --git a/pkg/client/model_private_endpoint_service.go b/pkg/client/model_private_endpoint_service.go
index 85ed3e5..f37ca27 100644
--- a/pkg/client/model_private_endpoint_service.go
+++ b/pkg/client/model_private_endpoint_service.go
@@ -27,7 +27,7 @@ type PrivateEndpointService struct {
 	Aws           AWSPrivateLinkServiceDetail `json:"aws"`
 	CloudProvider CloudProviderType           `json:"cloud_provider"`
 	// region_name is the cloud provider region name (i.e. us-east-1).
-	RegionName string                           `json:"region_name"`
+	RegionName string                           `json:"region_name,string"`
 	Status     PrivateEndpointServiceStatusType `json:"status"`
 }
 
diff --git a/pkg/client/model_region.go b/pkg/client/model_region.go
index 5a39db0..f45b6a8 100644
--- a/pkg/client/model_region.go
+++ b/pkg/client/model_region.go
@@ -25,16 +25,16 @@ import (
 // Region struct for Region.
 type Region struct {
 	// internal_dns is the internal DNS name of the cluster within the cloud provider's network. It is used to connect to the cluster with PrivateLink or VPC peering.
-	InternalDns string `json:"internal_dns"`
-	Name        string `json:"name"`
+	InternalDns string `json:"internal_dns,string"`
+	Name        string `json:"name,string"`
 	// node_count will be 0 for Serverless clusters.
 	NodeCount int32 `json:"node_count"`
 	// primary is true only for the primary region in a Multi Region Serverless cluster.
 	Primary *bool `json:"primary,omitempty"`
 	// sql_dns is the DNS name of SQL interface of the cluster. It is used to connect to the cluster with IP allowlisting.
-	SqlDns string `json:"sql_dns"`
+	SqlDns string `json:"sql_dns,string"`
 	// ui_dns is the DNS name used when connecting to the DB Console for the cluster.
-	UiDns string `json:"ui_dns"`
+	UiDns string `json:"ui_dns,string"`
 }
 
 // NewRegion instantiates a new Region object.
diff --git a/pkg/client/model_resource.go b/pkg/client/model_resource.go
index 6562a22..1d7de33 100644
--- a/pkg/client/model_resource.go
+++ b/pkg/client/model_resource.go
@@ -24,7 +24,7 @@ import (
 
 // Resource struct for Resource.
 type Resource struct {
-	Id   *string          `json:"id,omitempty"`
+	Id   *string          `json:"id,omitempty,string"`
 	Type ResourceTypeType `json:"type"`
 }
 
diff --git a/pkg/client/model_serverless_cluster_config.go b/pkg/client/model_serverless_cluster_config.go
index 680cbc4..b5709d5 100644
--- a/pkg/client/model_serverless_cluster_config.go
+++ b/pkg/client/model_serverless_cluster_config.go
@@ -25,7 +25,7 @@ import (
 // ServerlessClusterConfig struct for ServerlessClusterConfig.
 type ServerlessClusterConfig struct {
 	// routing_id is used to identify the cluster in a connection string.
-	RoutingId string `json:"routing_id"`
+	RoutingId string `json:"routing_id,string"`
 	// spend_limit is the maximum monthly charge for a cluster, in US cents. We recommend using usage_limits instead, since spend_limit will be deprecated in the future.
 	SpendLimit  *int32       `json:"spend_limit,omitempty"`
 	UsageLimits *UsageLimits `json:"usage_limits,omitempty"`
diff --git a/pkg/client/model_serverless_cluster_create_specification.go b/pkg/client/model_serverless_cluster_create_specification.go
index 0fee162..a784bf6 100644
--- a/pkg/client/model_serverless_cluster_create_specification.go
+++ b/pkg/client/model_serverless_cluster_create_specification.go
@@ -25,7 +25,7 @@ import (
 // ServerlessClusterCreateSpecification struct for ServerlessClusterCreateSpecification.
 type ServerlessClusterCreateSpecification struct {
 	// Preview: Specify which region should be made the primary region. This is only applicable to multi-region Serverless clusters. This field is required if you create the cluster in more than one region.
-	PrimaryRegion *string `json:"primary_region,omitempty"`
+	PrimaryRegion *string `json:"primary_region,omitempty,string"`
 	// Region values should match the cloud provider's zone code. For example, for Oregon, set region_name to \"us-west2\" for GCP and \"us-west-2\" for AWS.
 	Regions []string `json:"regions"`
 	// spend_limit is the maximum monthly charge for a cluster, in US cents. We recommend using usage_limits instead, since spend_limit will be deprecated in the future.
diff --git a/pkg/client/model_set_client_ca_cert_request.go b/pkg/client/model_set_client_ca_cert_request.go
index b24180d..7e17333 100644
--- a/pkg/client/model_set_client_ca_cert_request.go
+++ b/pkg/client/model_set_client_ca_cert_request.go
@@ -24,7 +24,7 @@ import (
 
 // SetClientCACertRequest struct for SetClientCACertRequest.
 type SetClientCACertRequest struct {
-	X509PemCert string `json:"x509_pem_cert"`
+	X509PemCert string `json:"x509_pem_cert,string"`
 }
 
 // NewSetClientCACertRequest instantiates a new SetClientCACertRequest object.
diff --git a/pkg/client/model_set_egress_traffic_policy_request.go b/pkg/client/model_set_egress_traffic_policy_request.go
index f06d124..df9c7df 100644
--- a/pkg/client/model_set_egress_traffic_policy_request.go
+++ b/pkg/client/model_set_egress_traffic_policy_request.go
@@ -27,7 +27,7 @@ type SetEgressTrafficPolicyRequest struct {
 	// allow_all, if true results in unrestricted egress traffic. If false, egress traffic is set to default-deny and is managed via the Egress Rule Management API.
 	AllowAll bool `json:"allow_all"`
 	// idempotency_key uniquely identifies this request. If not set, it will be set by the server.
-	IdempotencyKey *string `json:"idempotency_key,omitempty"`
+	IdempotencyKey *string `json:"idempotency_key,omitempty,string"`
 }
 
 // NewSetEgressTrafficPolicyRequest instantiates a new SetEgressTrafficPolicyRequest object.
diff --git a/pkg/client/model_sql_user.go b/pkg/client/model_sql_user.go
index 2478821..f174c05 100644
--- a/pkg/client/model_sql_user.go
+++ b/pkg/client/model_sql_user.go
@@ -24,7 +24,7 @@ import (
 
 // SQLUser struct for SQLUser.
 type SQLUser struct {
-	Name string `json:"name"`
+	Name string `json:"name,string"`
 }
 
 // NewSQLUser instantiates a new SQLUser object.
diff --git a/pkg/client/model_status.go b/pkg/client/model_status.go
index ca76876..f2b888e 100644
--- a/pkg/client/model_status.go
+++ b/pkg/client/model_status.go
@@ -26,7 +26,7 @@ import (
 type Status struct {
 	Code    *int32  `json:"code,omitempty"`
 	Details *[]Any  `json:"details,omitempty"`
-	Message *string `json:"message,omitempty"`
+	Message *string `json:"message,omitempty,string"`
 }
 
 // NewStatus instantiates a new Status object.
diff --git a/pkg/client/model_update_client_ca_cert_request.go b/pkg/client/model_update_client_ca_cert_request.go
index daf49de..29767c2 100644
--- a/pkg/client/model_update_client_ca_cert_request.go
+++ b/pkg/client/model_update_client_ca_cert_request.go
@@ -24,7 +24,7 @@ import (
 
 // UpdateClientCACertRequest struct for UpdateClientCACertRequest.
 type UpdateClientCACertRequest struct {
-	X509PemCert *string `json:"x509_pem_cert,omitempty"`
+	X509PemCert *string `json:"x509_pem_cert,omitempty,string"`
 }
 
 // NewUpdateClientCACertRequest instantiates a new UpdateClientCACertRequest object.
diff --git a/pkg/client/model_update_database_request.go b/pkg/client/model_update_database_request.go
index 458fc5b..5126479 100644
--- a/pkg/client/model_update_database_request.go
+++ b/pkg/client/model_update_database_request.go
@@ -24,8 +24,8 @@ import (
 
 // UpdateDatabaseRequest struct for UpdateDatabaseRequest.
 type UpdateDatabaseRequest struct {
-	Name    string `json:"name"`
-	NewName string `json:"new_name"`
+	Name    string `json:"name,string"`
+	NewName string `json:"new_name,string"`
 }
 
 // NewUpdateDatabaseRequest instantiates a new UpdateDatabaseRequest object.
diff --git a/pkg/client/model_update_database_request_1.go b/pkg/client/model_update_database_request_1.go
index d4fc058..114cddb 100644
--- a/pkg/client/model_update_database_request_1.go
+++ b/pkg/client/model_update_database_request_1.go
@@ -24,7 +24,7 @@ import (
 
 // UpdateDatabaseRequest1 struct for UpdateDatabaseRequest1.
 type UpdateDatabaseRequest1 struct {
-	NewName string `json:"new_name"`
+	NewName string `json:"new_name,string"`
 }
 
 // NewUpdateDatabaseRequest1 instantiates a new UpdateDatabaseRequest1 object.
diff --git a/pkg/client/model_update_sql_user_password_request.go b/pkg/client/model_update_sql_user_password_request.go
index bc25a99..1e03ff2 100644
--- a/pkg/client/model_update_sql_user_password_request.go
+++ b/pkg/client/model_update_sql_user_password_request.go
@@ -24,7 +24,7 @@ import (
 
 // UpdateSQLUserPasswordRequest struct for UpdateSQLUserPasswordRequest.
 type UpdateSQLUserPasswordRequest struct {
-	Password string `json:"password"`
+	Password string `json:"password,string"`
 }
 
 // NewUpdateSQLUserPasswordRequest instantiates a new UpdateSQLUserPasswordRequest object.
diff --git a/pkg/client/model_usage_limits.go b/pkg/client/model_usage_limits.go
index 2970315..7dbea92 100644
--- a/pkg/client/model_usage_limits.go
+++ b/pkg/client/model_usage_limits.go
@@ -25,9 +25,9 @@ import (
 // UsageLimits struct for UsageLimits.
 type UsageLimits struct {
 	// request_unit_limit is the maximum number of request units that the cluster can consume during the month. If this limit is exceeded, then the cluster is disabled until the limit is increased, or until the beginning of the next month when more free request units are granted. It is an error for this to be zero.
-	RequestUnitLimit int64 `json:"request_unit_limit"`
+	RequestUnitLimit int64 `json:"request_unit_limit,string"`
 	// storage_mib_limit is the maximum number of Mebibytes of storage that the cluster can have at any time during the month. If this limit is exceeded, then the cluster is throttled; only one SQL connection is allowed at a time, with the expectation that it is used to delete data to reduce storage usage. If is an error for this to be zero.
-	StorageMibLimit int64 `json:"storage_mib_limit"`
+	StorageMibLimit int64 `json:"storage_mib_limit,string"`
 }
 
 // NewUsageLimits instantiates a new UsageLimits object.
diff --git a/pkg/client/model_user_role_grants.go b/pkg/client/model_user_role_grants.go
index ce5e823..1c8b7f8 100644
--- a/pkg/client/model_user_role_grants.go
+++ b/pkg/client/model_user_role_grants.go
@@ -25,7 +25,7 @@ import (
 // UserRoleGrants struct for UserRoleGrants.
 type UserRoleGrants struct {
 	Roles  []BuiltInRole `json:"roles"`
-	UserId string        `json:"user_id"`
+	UserId string        `json:"user_id,string"`
 }
 
 // NewUserRoleGrants instantiates a new UserRoleGrants object.