diff --git a/services/mongodbflex/oas_commit b/services/mongodbflex/oas_commit index 5c05d0ead..c2d5477e1 100644 --- a/services/mongodbflex/oas_commit +++ b/services/mongodbflex/oas_commit @@ -1 +1 @@ -58dbd39e05f1ddc2d44b191eb3476225130c4ded +72f3b665150d5f27cb0acf9a30bf8645b1dcea9e diff --git a/services/mongodbflex/v1api/client.go b/services/mongodbflex/v1api/client.go index 94587858c..f035f334f 100644 --- a/services/mongodbflex/v1api/client.go +++ b/services/mongodbflex/v1api/client.go @@ -462,6 +462,15 @@ func (c *APIClient) decode(v interface{}, b []byte, contentType string) (err err *s = string(b) return nil } + if r, ok := v.(*io.Reader); ok { + *r = bytes.NewReader(b) + return nil + } + // Must stay before the JSON branch: json.Unmarshal would base64-decode into *[]byte. + if p, ok := v.(*[]byte); ok { + *p = b + return nil + } if f, ok := v.(*os.File); ok { f, err = os.CreateTemp("", "HttpClientFile") if err != nil { diff --git a/services/mongodbflex/v1api/model_create_instance_payload.go b/services/mongodbflex/v1api/model_create_instance_payload.go index 210fc474e..db730fd6d 100644 --- a/services/mongodbflex/v1api/model_create_instance_payload.go +++ b/services/mongodbflex/v1api/model_create_instance_payload.go @@ -26,7 +26,7 @@ type CreateInstancePayload struct { FlavorId string `json:"flavorId"` // Labels field is not certain/clear Labels *map[string]string `json:"labels,omitempty"` - Name string `json:"name" validate:"regexp=^[A-Za-z_][A-Za-z0-9-_]{1,61}[A-Za-z0-9_]$"` + Name string `json:"name" validate:"regexp=^[A-Za-z_][A-Za-z0-9-_]{1\\,61}[A-Za-z0-9_]$"` Options map[string]string `json:"options"` Replicas int32 `json:"replicas"` Storage Storage `json:"storage"` diff --git a/services/mongodbflex/v1api/model_create_user_payload.go b/services/mongodbflex/v1api/model_create_user_payload.go index 3d48daa15..4bbef3f22 100644 --- a/services/mongodbflex/v1api/model_create_user_payload.go +++ b/services/mongodbflex/v1api/model_create_user_payload.go @@ -21,10 +21,10 @@ var _ MappedNullable = &CreateUserPayload{} // CreateUserPayload struct for CreateUserPayload type CreateUserPayload struct { - Database string `json:"database" validate:"regexp=^[A-Za-z_][A-Za-z0-9-_]{1,61}[A-Za-z0-9_]$"` + Database string `json:"database" validate:"regexp=^[A-Za-z_][A-Za-z0-9-_]{1\\,61}[A-Za-z0-9_]$"` // The roles defined for a user. Currently only one role in the list is supported, therefore only the first role from this list is used. The *roles* attribute can contain the following values: 'read', 'readWrite', 'readAnyDatabase', 'readWriteAnyDatabase', 'stackitAdmin'. **The 'readAnyDatabase', 'readWriteAnyDatabase' and 'stackitAdmin' roles will always be created in the admin database.** Roles []string `json:"roles"` - Username *string `json:"username,omitempty" validate:"regexp=^[A-Za-z][A-Za-z0-9-]{1,61}[A-Za-z0-9]$"` + Username *string `json:"username,omitempty" validate:"regexp=^[A-Za-z][A-Za-z0-9-]{1\\,61}[A-Za-z0-9]$"` AdditionalProperties map[string]interface{} } diff --git a/services/mongodbflex/v1api/model_instance_response_user.go b/services/mongodbflex/v1api/model_instance_response_user.go index d73093392..74897eab2 100644 --- a/services/mongodbflex/v1api/model_instance_response_user.go +++ b/services/mongodbflex/v1api/model_instance_response_user.go @@ -20,7 +20,7 @@ var _ MappedNullable = &InstanceResponseUser{} // InstanceResponseUser struct for InstanceResponseUser type InstanceResponseUser struct { - Database *string `json:"database,omitempty" validate:"regexp=^[A-Za-z_][A-Za-z0-9-_]{1,61}[A-Za-z0-9_]$"` + Database *string `json:"database,omitempty" validate:"regexp=^[A-Za-z_][A-Za-z0-9-_]{1\\,61}[A-Za-z0-9_]$"` Host *string `json:"host,omitempty"` Id *string `json:"id,omitempty"` Port *int32 `json:"port,omitempty"` diff --git a/services/mongodbflex/v1api/model_partial_update_instance_payload.go b/services/mongodbflex/v1api/model_partial_update_instance_payload.go index 85385f2b5..cab4cc042 100644 --- a/services/mongodbflex/v1api/model_partial_update_instance_payload.go +++ b/services/mongodbflex/v1api/model_partial_update_instance_payload.go @@ -25,7 +25,7 @@ type PartialUpdateInstancePayload struct { FlavorId *string `json:"flavorId,omitempty"` // Labels field is not certain/clear Labels *map[string]string `json:"labels,omitempty"` - Name *string `json:"name,omitempty" validate:"regexp=^[A-Za-z_][A-Za-z0-9-_]{1,61}[A-Za-z0-9_]$"` + Name *string `json:"name,omitempty" validate:"regexp=^[A-Za-z_][A-Za-z0-9-_]{1\\,61}[A-Za-z0-9_]$"` Options *map[string]string `json:"options,omitempty"` Replicas *int32 `json:"replicas,omitempty"` Storage *Storage `json:"storage,omitempty"` diff --git a/services/mongodbflex/v1api/model_update_instance_payload.go b/services/mongodbflex/v1api/model_update_instance_payload.go index 8f8dab394..ffac1f282 100644 --- a/services/mongodbflex/v1api/model_update_instance_payload.go +++ b/services/mongodbflex/v1api/model_update_instance_payload.go @@ -26,7 +26,7 @@ type UpdateInstancePayload struct { FlavorId string `json:"flavorId"` // Labels field is not certain/clear Labels *map[string]string `json:"labels,omitempty"` - Name string `json:"name" validate:"regexp=^[A-Za-z_][A-Za-z0-9-_]{1,61}[A-Za-z0-9_]$"` + Name string `json:"name" validate:"regexp=^[A-Za-z_][A-Za-z0-9-_]{1\\,61}[A-Za-z0-9_]$"` Options map[string]string `json:"options"` Replicas int32 `json:"replicas"` Storage Storage `json:"storage"` diff --git a/services/mongodbflex/v1api/model_update_user_payload.go b/services/mongodbflex/v1api/model_update_user_payload.go index 08ad0151d..ba3d0dbff 100644 --- a/services/mongodbflex/v1api/model_update_user_payload.go +++ b/services/mongodbflex/v1api/model_update_user_payload.go @@ -21,7 +21,7 @@ var _ MappedNullable = &UpdateUserPayload{} // UpdateUserPayload struct for UpdateUserPayload type UpdateUserPayload struct { - Database string `json:"database" validate:"regexp=^[A-Za-z_][A-Za-z0-9-_]{1,61}[A-Za-z0-9_]$"` + Database string `json:"database" validate:"regexp=^[A-Za-z_][A-Za-z0-9-_]{1\\,61}[A-Za-z0-9_]$"` // The roles defined for a user. Currently only one role in the list is supported, therefore only the first role from this list is used. The *roles* attribute can contain the following values: 'read', 'readWrite', 'readAnyDatabase', 'readWriteAnyDatabase', 'stackitAdmin'. **The 'readAnyDatabase', 'readWriteAnyDatabase' and 'stackitAdmin' roles will always be created in the admin database.** Roles []string `json:"roles"` AdditionalProperties map[string]interface{} diff --git a/services/mongodbflex/v2api/client.go b/services/mongodbflex/v2api/client.go index 1abf3a268..5e908e875 100644 --- a/services/mongodbflex/v2api/client.go +++ b/services/mongodbflex/v2api/client.go @@ -462,6 +462,15 @@ func (c *APIClient) decode(v interface{}, b []byte, contentType string) (err err *s = string(b) return nil } + if r, ok := v.(*io.Reader); ok { + *r = bytes.NewReader(b) + return nil + } + // Must stay before the JSON branch: json.Unmarshal would base64-decode into *[]byte. + if p, ok := v.(*[]byte); ok { + *p = b + return nil + } if f, ok := v.(*os.File); ok { f, err = os.CreateTemp("", "HttpClientFile") if err != nil { diff --git a/services/mongodbflex/v2api/model_create_instance_payload.go b/services/mongodbflex/v2api/model_create_instance_payload.go index b00662622..5364fd4bf 100644 --- a/services/mongodbflex/v2api/model_create_instance_payload.go +++ b/services/mongodbflex/v2api/model_create_instance_payload.go @@ -27,7 +27,7 @@ type CreateInstancePayload struct { FlavorId string `json:"flavorId"` // Labels field is not certain/clear Labels *map[string]string `json:"labels,omitempty"` - Name string `json:"name" validate:"regexp=^[A-Za-z_][A-Za-z0-9-_]{1,61}[A-Za-z0-9_]$"` + Name string `json:"name" validate:"regexp=^[A-Za-z_][A-Za-z0-9-_]{1\\,61}[A-Za-z0-9_]$"` Options map[string]string `json:"options"` Replicas int32 `json:"replicas"` Storage Storage `json:"storage"` diff --git a/services/mongodbflex/v2api/model_create_user_payload.go b/services/mongodbflex/v2api/model_create_user_payload.go index 6681f54bc..b4e934ece 100644 --- a/services/mongodbflex/v2api/model_create_user_payload.go +++ b/services/mongodbflex/v2api/model_create_user_payload.go @@ -21,10 +21,10 @@ var _ MappedNullable = &CreateUserPayload{} // CreateUserPayload struct for CreateUserPayload type CreateUserPayload struct { - Database string `json:"database" validate:"regexp=^[A-Za-z_][A-Za-z0-9-_]{1,61}[A-Za-z0-9_]$"` + Database string `json:"database" validate:"regexp=^[A-Za-z_][A-Za-z0-9-_]{1\\,61}[A-Za-z0-9_]$"` // The roles defined for a user. Currently only one role in the list is supported, therefore only the first role from this list is used. The *roles* attribute can contain the following values: 'read', 'readWrite', 'readAnyDatabase', 'readWriteAnyDatabase', 'stackitAdmin'. **The 'readAnyDatabase', 'readWriteAnyDatabase' and 'stackitAdmin' roles will always be created in the admin database.** Roles []string `json:"roles"` - Username *string `json:"username,omitempty" validate:"regexp=^[A-Za-z][A-Za-z0-9-]{1,61}[A-Za-z0-9]$"` + Username *string `json:"username,omitempty" validate:"regexp=^[A-Za-z][A-Za-z0-9-]{1\\,61}[A-Za-z0-9]$"` AdditionalProperties map[string]interface{} } diff --git a/services/mongodbflex/v2api/model_partial_update_instance_payload.go b/services/mongodbflex/v2api/model_partial_update_instance_payload.go index 8cf5db8d6..59102e655 100644 --- a/services/mongodbflex/v2api/model_partial_update_instance_payload.go +++ b/services/mongodbflex/v2api/model_partial_update_instance_payload.go @@ -25,7 +25,7 @@ type PartialUpdateInstancePayload struct { FlavorId *string `json:"flavorId,omitempty"` // Labels field is not certain/clear Labels *map[string]string `json:"labels,omitempty"` - Name *string `json:"name,omitempty" validate:"regexp=^[A-Za-z_][A-Za-z0-9-_]{1,61}[A-Za-z0-9_]$"` + Name *string `json:"name,omitempty" validate:"regexp=^[A-Za-z_][A-Za-z0-9-_]{1\\,61}[A-Za-z0-9_]$"` Options *map[string]string `json:"options,omitempty"` Replicas *int32 `json:"replicas,omitempty"` Storage *Storage `json:"storage,omitempty"` diff --git a/services/mongodbflex/v2api/model_partial_update_user_payload.go b/services/mongodbflex/v2api/model_partial_update_user_payload.go index c7c007651..9cd7b4ceb 100644 --- a/services/mongodbflex/v2api/model_partial_update_user_payload.go +++ b/services/mongodbflex/v2api/model_partial_update_user_payload.go @@ -20,7 +20,7 @@ var _ MappedNullable = &PartialUpdateUserPayload{} // PartialUpdateUserPayload struct for PartialUpdateUserPayload type PartialUpdateUserPayload struct { - Database *string `json:"database,omitempty" validate:"regexp=^[A-Za-z_][A-Za-z0-9-_]{1,61}[A-Za-z0-9_]$"` + Database *string `json:"database,omitempty" validate:"regexp=^[A-Za-z_][A-Za-z0-9-_]{1\\,61}[A-Za-z0-9_]$"` // The roles defined for a user. Currently only one role in the list is supported, therefore only the first role from this list is used. The *roles* attribute can contain the following values: 'read', 'readWrite', 'readAnyDatabase', 'readWriteAnyDatabase', 'stackitAdmin'. **The 'readAnyDatabase', 'readWriteAnyDatabase' and 'stackitAdmin' roles will always be created in the admin database.** Roles []string `json:"roles,omitempty"` AdditionalProperties map[string]interface{} diff --git a/services/mongodbflex/v2api/model_update_instance_payload.go b/services/mongodbflex/v2api/model_update_instance_payload.go index d0bc87aac..3f01b49b7 100644 --- a/services/mongodbflex/v2api/model_update_instance_payload.go +++ b/services/mongodbflex/v2api/model_update_instance_payload.go @@ -26,7 +26,7 @@ type UpdateInstancePayload struct { FlavorId string `json:"flavorId"` // Labels field is not certain/clear Labels *map[string]string `json:"labels,omitempty"` - Name string `json:"name" validate:"regexp=^[A-Za-z_][A-Za-z0-9-_]{1,61}[A-Za-z0-9_]$"` + Name string `json:"name" validate:"regexp=^[A-Za-z_][A-Za-z0-9-_]{1\\,61}[A-Za-z0-9_]$"` Options map[string]string `json:"options"` Replicas int64 `json:"replicas"` Storage Storage `json:"storage"` diff --git a/services/mongodbflex/v2api/model_update_user_payload.go b/services/mongodbflex/v2api/model_update_user_payload.go index 503b91b58..3ef0fba1a 100644 --- a/services/mongodbflex/v2api/model_update_user_payload.go +++ b/services/mongodbflex/v2api/model_update_user_payload.go @@ -21,7 +21,7 @@ var _ MappedNullable = &UpdateUserPayload{} // UpdateUserPayload struct for UpdateUserPayload type UpdateUserPayload struct { - Database string `json:"database" validate:"regexp=^[A-Za-z_][A-Za-z0-9-_]{1,61}[A-Za-z0-9_]$"` + Database string `json:"database" validate:"regexp=^[A-Za-z_][A-Za-z0-9-_]{1\\,61}[A-Za-z0-9_]$"` // The roles defined for a user. Currently only one role in the list is supported, therefore only the first role from this list is used. The *roles* attribute can contain the following values: 'read', 'readWrite', 'readAnyDatabase', 'readWriteAnyDatabase', 'stackitAdmin'. **The 'readAnyDatabase', 'readWriteAnyDatabase' and 'stackitAdmin' roles will always be created in the admin database.** Roles []string `json:"roles"` AdditionalProperties map[string]interface{}