diff --git a/services/secretsmanager/oas_commit b/services/secretsmanager/oas_commit index c08a6770d..c2d5477e1 100644 --- a/services/secretsmanager/oas_commit +++ b/services/secretsmanager/oas_commit @@ -1 +1 @@ -4407196dbbef4e53e6798809e856725cbc84ae05 +72f3b665150d5f27cb0acf9a30bf8645b1dcea9e diff --git a/services/secretsmanager/v1alphaapi/client.go b/services/secretsmanager/v1alphaapi/client.go index d19f6e19e..8e7af9497 100644 --- a/services/secretsmanager/v1alphaapi/client.go +++ b/services/secretsmanager/v1alphaapi/client.go @@ -461,6 +461,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/secretsmanager/v1alphaapi/model_add_instance_role_bindings_payload.go b/services/secretsmanager/v1alphaapi/model_add_instance_role_bindings_payload.go index dd63a8627..8988aa19e 100644 --- a/services/secretsmanager/v1alphaapi/model_add_instance_role_bindings_payload.go +++ b/services/secretsmanager/v1alphaapi/model_add_instance_role_bindings_payload.go @@ -20,7 +20,7 @@ var _ MappedNullable = &AddInstanceRoleBindingsPayload{} // AddInstanceRoleBindingsPayload struct for AddInstanceRoleBindingsPayload type AddInstanceRoleBindingsPayload struct { - Role string `json:"role" validate:"regexp=^[a-z](?:[-.]?[a-z]){1,63}$"` + Role string `json:"role" validate:"regexp=^[a-z](?:[-.]?[a-z]){1\\,63}$"` Subject string `json:"subject"` AdditionalProperties map[string]interface{} } diff --git a/services/secretsmanager/v1alphaapi/model_add_secret_group_role_bindings_payload.go b/services/secretsmanager/v1alphaapi/model_add_secret_group_role_bindings_payload.go index affc39456..11cc9379d 100644 --- a/services/secretsmanager/v1alphaapi/model_add_secret_group_role_bindings_payload.go +++ b/services/secretsmanager/v1alphaapi/model_add_secret_group_role_bindings_payload.go @@ -20,7 +20,7 @@ var _ MappedNullable = &AddSecretGroupRoleBindingsPayload{} // AddSecretGroupRoleBindingsPayload struct for AddSecretGroupRoleBindingsPayload type AddSecretGroupRoleBindingsPayload struct { - Role string `json:"role" validate:"regexp=^[a-z](?:[-.]?[a-z]){1,63}$"` + Role string `json:"role" validate:"regexp=^[a-z](?:[-.]?[a-z]){1\\,63}$"` Subject string `json:"subject"` AdditionalProperties map[string]interface{} } diff --git a/services/secretsmanager/v1alphaapi/model_edit_instance_role_bindings_payload.go b/services/secretsmanager/v1alphaapi/model_edit_instance_role_bindings_payload.go index 386f33cdc..d78b400e2 100644 --- a/services/secretsmanager/v1alphaapi/model_edit_instance_role_bindings_payload.go +++ b/services/secretsmanager/v1alphaapi/model_edit_instance_role_bindings_payload.go @@ -20,7 +20,7 @@ var _ MappedNullable = &EditInstanceRoleBindingsPayload{} // EditInstanceRoleBindingsPayload struct for EditInstanceRoleBindingsPayload type EditInstanceRoleBindingsPayload struct { - Role string `json:"role" validate:"regexp=^[a-z](?:[-.]?[a-z]){1,63}$"` + Role string `json:"role" validate:"regexp=^[a-z](?:[-.]?[a-z]){1\\,63}$"` Subject string `json:"subject"` AdditionalProperties map[string]interface{} } diff --git a/services/secretsmanager/v1alphaapi/model_edit_secret_group_role_bindings_payload.go b/services/secretsmanager/v1alphaapi/model_edit_secret_group_role_bindings_payload.go index 611a2324e..e7a4c74e6 100644 --- a/services/secretsmanager/v1alphaapi/model_edit_secret_group_role_bindings_payload.go +++ b/services/secretsmanager/v1alphaapi/model_edit_secret_group_role_bindings_payload.go @@ -20,7 +20,7 @@ var _ MappedNullable = &EditSecretGroupRoleBindingsPayload{} // EditSecretGroupRoleBindingsPayload struct for EditSecretGroupRoleBindingsPayload type EditSecretGroupRoleBindingsPayload struct { - Role string `json:"role" validate:"regexp=^[a-z](?:[-.]?[a-z]){1,63}$"` + Role string `json:"role" validate:"regexp=^[a-z](?:[-.]?[a-z]){1\\,63}$"` Subject string `json:"subject"` AdditionalProperties map[string]interface{} } diff --git a/services/secretsmanager/v1alphaapi/model_get_instance_role_bindings_payload.go b/services/secretsmanager/v1alphaapi/model_get_instance_role_bindings_payload.go index 8397d2a48..1414b5839 100644 --- a/services/secretsmanager/v1alphaapi/model_get_instance_role_bindings_payload.go +++ b/services/secretsmanager/v1alphaapi/model_get_instance_role_bindings_payload.go @@ -20,7 +20,7 @@ var _ MappedNullable = &GetInstanceRoleBindingsPayload{} // GetInstanceRoleBindingsPayload struct for GetInstanceRoleBindingsPayload type GetInstanceRoleBindingsPayload struct { - Role string `json:"role" validate:"regexp=^[a-z](?:[-.]?[a-z]){1,63}$"` + Role string `json:"role" validate:"regexp=^[a-z](?:[-.]?[a-z]){1\\,63}$"` Subject string `json:"subject"` AdditionalProperties map[string]interface{} } diff --git a/services/secretsmanager/v1alphaapi/model_get_secret_group_role_bindings_payload.go b/services/secretsmanager/v1alphaapi/model_get_secret_group_role_bindings_payload.go index f974b17cc..53a02841a 100644 --- a/services/secretsmanager/v1alphaapi/model_get_secret_group_role_bindings_payload.go +++ b/services/secretsmanager/v1alphaapi/model_get_secret_group_role_bindings_payload.go @@ -20,7 +20,7 @@ var _ MappedNullable = &GetSecretGroupRoleBindingsPayload{} // GetSecretGroupRoleBindingsPayload struct for GetSecretGroupRoleBindingsPayload type GetSecretGroupRoleBindingsPayload struct { - Role string `json:"role" validate:"regexp=^[a-z](?:[-.]?[a-z]){1,63}$"` + Role string `json:"role" validate:"regexp=^[a-z](?:[-.]?[a-z]){1\\,63}$"` Subject string `json:"subject"` AdditionalProperties map[string]interface{} } diff --git a/services/secretsmanager/v1alphaapi/model_remove_instance_role_bindings_payload.go b/services/secretsmanager/v1alphaapi/model_remove_instance_role_bindings_payload.go index 4b9474ed3..e68d6bdf1 100644 --- a/services/secretsmanager/v1alphaapi/model_remove_instance_role_bindings_payload.go +++ b/services/secretsmanager/v1alphaapi/model_remove_instance_role_bindings_payload.go @@ -20,7 +20,7 @@ var _ MappedNullable = &RemoveInstanceRoleBindingsPayload{} // RemoveInstanceRoleBindingsPayload struct for RemoveInstanceRoleBindingsPayload type RemoveInstanceRoleBindingsPayload struct { - Role string `json:"role" validate:"regexp=^[a-z](?:[-.]?[a-z]){1,63}$"` + Role string `json:"role" validate:"regexp=^[a-z](?:[-.]?[a-z]){1\\,63}$"` Subject string `json:"subject"` AdditionalProperties map[string]interface{} } diff --git a/services/secretsmanager/v1alphaapi/model_remove_secret_group_role_bindings_payload.go b/services/secretsmanager/v1alphaapi/model_remove_secret_group_role_bindings_payload.go index 0dc4b82ca..a47df0cf3 100644 --- a/services/secretsmanager/v1alphaapi/model_remove_secret_group_role_bindings_payload.go +++ b/services/secretsmanager/v1alphaapi/model_remove_secret_group_role_bindings_payload.go @@ -20,7 +20,7 @@ var _ MappedNullable = &RemoveSecretGroupRoleBindingsPayload{} // RemoveSecretGroupRoleBindingsPayload struct for RemoveSecretGroupRoleBindingsPayload type RemoveSecretGroupRoleBindingsPayload struct { - Role string `json:"role" validate:"regexp=^[a-z](?:[-.]?[a-z]){1,63}$"` + Role string `json:"role" validate:"regexp=^[a-z](?:[-.]?[a-z]){1\\,63}$"` Subject string `json:"subject"` AdditionalProperties map[string]interface{} } diff --git a/services/secretsmanager/v1alphaapi/model_role_binding.go b/services/secretsmanager/v1alphaapi/model_role_binding.go index a897d05ca..22a536f1d 100644 --- a/services/secretsmanager/v1alphaapi/model_role_binding.go +++ b/services/secretsmanager/v1alphaapi/model_role_binding.go @@ -20,7 +20,7 @@ var _ MappedNullable = &RoleBinding{} // RoleBinding struct for RoleBinding type RoleBinding struct { - Role string `json:"role" validate:"regexp=^[a-z](?:[-.]?[a-z]){1,63}$"` + Role string `json:"role" validate:"regexp=^[a-z](?:[-.]?[a-z]){1\\,63}$"` Subject string `json:"subject"` AdditionalProperties map[string]interface{} } diff --git a/services/secretsmanager/v1api/client.go b/services/secretsmanager/v1api/client.go index b1df2dc3e..4745ba467 100644 --- a/services/secretsmanager/v1api/client.go +++ b/services/secretsmanager/v1api/client.go @@ -461,6 +461,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 {