diff --git a/services/authorization/oas_commit b/services/authorization/oas_commit index c08a6770d..c2d5477e1 100644 --- a/services/authorization/oas_commit +++ b/services/authorization/oas_commit @@ -1 +1 @@ -4407196dbbef4e53e6798809e856725cbc84ae05 +72f3b665150d5f27cb0acf9a30bf8645b1dcea9e diff --git a/services/authorization/v2api/client.go b/services/authorization/v2api/client.go index bf70a230f..7feb5404c 100644 --- a/services/authorization/v2api/client.go +++ b/services/authorization/v2api/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/authorization/v2api/model_add_custom_role_response.go b/services/authorization/v2api/model_add_custom_role_response.go index 35bfc52c1..4f5f635a4 100644 --- a/services/authorization/v2api/model_add_custom_role_response.go +++ b/services/authorization/v2api/model_add_custom_role_response.go @@ -20,8 +20,8 @@ var _ MappedNullable = &AddCustomRoleResponse{} // AddCustomRoleResponse struct for AddCustomRoleResponse type AddCustomRoleResponse struct { - ResourceId string `json:"resourceId" validate:"regexp=^([a-zA-Z0-9\\/_|\\\\-=+@.]{1,})$"` - ResourceType string `json:"resourceType" validate:"regexp=^[a-z](?:-?[a-z]){1,63}$"` + ResourceId string `json:"resourceId" validate:"regexp=^([a-zA-Z0-9/_|\\-=+@.]{1\\,})$"` + ResourceType string `json:"resourceType" validate:"regexp=^[a-z](?:-?[a-z]){1\\,63}$"` Role Role `json:"role"` AdditionalProperties map[string]interface{} } diff --git a/services/authorization/v2api/model_add_members_payload.go b/services/authorization/v2api/model_add_members_payload.go index aa12f0ada..5dee5f11a 100644 --- a/services/authorization/v2api/model_add_members_payload.go +++ b/services/authorization/v2api/model_add_members_payload.go @@ -21,7 +21,7 @@ var _ MappedNullable = &AddMembersPayload{} // AddMembersPayload struct for AddMembersPayload type AddMembersPayload struct { Members []Member `json:"members"` - ResourceType string `json:"resourceType" validate:"regexp=^[a-z](?:-?[a-z]){1,63}$"` + ResourceType string `json:"resourceType" validate:"regexp=^[a-z](?:-?[a-z]){1\\,63}$"` AdditionalProperties map[string]interface{} } diff --git a/services/authorization/v2api/model_add_role_payload.go b/services/authorization/v2api/model_add_role_payload.go index 71ccf80d4..c2155db76 100644 --- a/services/authorization/v2api/model_add_role_payload.go +++ b/services/authorization/v2api/model_add_role_payload.go @@ -21,7 +21,7 @@ var _ MappedNullable = &AddRolePayload{} // AddRolePayload struct for AddRolePayload type AddRolePayload struct { Description string `json:"description"` - Name string `json:"name" validate:"regexp=^[a-z](?:[-.]?[a-z]){1,63}$"` + Name string `json:"name" validate:"regexp=^[a-z](?:[-.]?[a-z]){1\\,63}$"` Permissions []PermissionRequest `json:"permissions"` AdditionalProperties map[string]interface{} } diff --git a/services/authorization/v2api/model_existing_permission.go b/services/authorization/v2api/model_existing_permission.go index 77ba4024a..e41ed5669 100644 --- a/services/authorization/v2api/model_existing_permission.go +++ b/services/authorization/v2api/model_existing_permission.go @@ -21,7 +21,7 @@ var _ MappedNullable = &ExistingPermission{} // ExistingPermission struct for ExistingPermission type ExistingPermission struct { Description string `json:"description"` - Name string `json:"name" validate:"regexp=^[a-z](?:[-.]?[a-z]){1,63}$"` + Name string `json:"name" validate:"regexp=^[a-z](?:[-.]?[a-z]){1\\,63}$"` AdditionalProperties map[string]interface{} } diff --git a/services/authorization/v2api/model_get_role_response.go b/services/authorization/v2api/model_get_role_response.go index 42914af78..7b3cb3068 100644 --- a/services/authorization/v2api/model_get_role_response.go +++ b/services/authorization/v2api/model_get_role_response.go @@ -20,8 +20,8 @@ var _ MappedNullable = &GetRoleResponse{} // GetRoleResponse struct for GetRoleResponse type GetRoleResponse struct { - ResourceId string `json:"resourceId" validate:"regexp=^([a-zA-Z0-9\\/_|\\\\-=+@.]{1,})$"` - ResourceType string `json:"resourceType" validate:"regexp=^[a-z](?:-?[a-z]){1,63}$"` + ResourceId string `json:"resourceId" validate:"regexp=^([a-zA-Z0-9/_|\\-=+@.]{1\\,})$"` + ResourceType string `json:"resourceType" validate:"regexp=^[a-z](?:-?[a-z]){1\\,63}$"` Role Role `json:"role"` AdditionalProperties map[string]interface{} } diff --git a/services/authorization/v2api/model_list_members_response.go b/services/authorization/v2api/model_list_members_response.go index 17f1a2962..ff5866cdd 100644 --- a/services/authorization/v2api/model_list_members_response.go +++ b/services/authorization/v2api/model_list_members_response.go @@ -21,8 +21,8 @@ var _ MappedNullable = &ListMembersResponse{} // ListMembersResponse struct for ListMembersResponse type ListMembersResponse struct { Members []Member `json:"members"` - ResourceId string `json:"resourceId" validate:"regexp=^([a-zA-Z0-9\\/_|\\\\-=+@.]{1,})$"` - ResourceType string `json:"resourceType" validate:"regexp=^[a-z](?:-?[a-z]){1,63}$"` + ResourceId string `json:"resourceId" validate:"regexp=^([a-zA-Z0-9/_|\\-=+@.]{1\\,})$"` + ResourceType string `json:"resourceType" validate:"regexp=^[a-z](?:-?[a-z]){1\\,63}$"` AdditionalProperties map[string]interface{} } diff --git a/services/authorization/v2api/model_member.go b/services/authorization/v2api/model_member.go index dffc5b5fe..ae4cd72bc 100644 --- a/services/authorization/v2api/model_member.go +++ b/services/authorization/v2api/model_member.go @@ -20,7 +20,7 @@ var _ MappedNullable = &Member{} // Member struct for Member type Member 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/authorization/v2api/model_members_response.go b/services/authorization/v2api/model_members_response.go index b3c059b62..0ef49807f 100644 --- a/services/authorization/v2api/model_members_response.go +++ b/services/authorization/v2api/model_members_response.go @@ -21,8 +21,8 @@ var _ MappedNullable = &MembersResponse{} // MembersResponse struct for MembersResponse type MembersResponse struct { Members []Member `json:"members"` - ResourceId string `json:"resourceId" validate:"regexp=^([a-zA-Z0-9\\/_|\\\\-=+@.]{1,})$"` - ResourceType string `json:"resourceType" validate:"regexp=^[a-z](?:-?[a-z]){1,63}$"` + ResourceId string `json:"resourceId" validate:"regexp=^([a-zA-Z0-9/_|\\-=+@.]{1\\,})$"` + ResourceType string `json:"resourceType" validate:"regexp=^[a-z](?:-?[a-z]){1\\,63}$"` WrittenAt *Zookie `json:"writtenAt,omitempty"` AdditionalProperties map[string]interface{} } diff --git a/services/authorization/v2api/model_permission.go b/services/authorization/v2api/model_permission.go index 1d0ffdbac..852d87605 100644 --- a/services/authorization/v2api/model_permission.go +++ b/services/authorization/v2api/model_permission.go @@ -21,7 +21,7 @@ var _ MappedNullable = &Permission{} // Permission struct for Permission type Permission struct { Description string `json:"description"` - Name string `json:"name" validate:"regexp=^[a-z](?:[-.]?[a-z]){1,63}$"` + Name string `json:"name" validate:"regexp=^[a-z](?:[-.]?[a-z]){1\\,63}$"` AdditionalProperties map[string]interface{} } diff --git a/services/authorization/v2api/model_permission_request.go b/services/authorization/v2api/model_permission_request.go index 7524eb7cb..654524286 100644 --- a/services/authorization/v2api/model_permission_request.go +++ b/services/authorization/v2api/model_permission_request.go @@ -20,7 +20,7 @@ var _ MappedNullable = &PermissionRequest{} // PermissionRequest struct for PermissionRequest type PermissionRequest struct { - Name string `json:"name" validate:"regexp=^[a-z](?:[-.]?[a-z]){1,63}$"` + Name string `json:"name" validate:"regexp=^[a-z](?:[-.]?[a-z]){1\\,63}$"` AdditionalProperties map[string]interface{} } diff --git a/services/authorization/v2api/model_remove_members_payload.go b/services/authorization/v2api/model_remove_members_payload.go index c55b7cb16..42d69bad3 100644 --- a/services/authorization/v2api/model_remove_members_payload.go +++ b/services/authorization/v2api/model_remove_members_payload.go @@ -22,7 +22,7 @@ var _ MappedNullable = &RemoveMembersPayload{} type RemoveMembersPayload struct { ForceRemove *bool `json:"forceRemove,omitempty"` Members []Member `json:"members"` - ResourceType string `json:"resourceType" validate:"regexp=^[a-z](?:-?[a-z]){1,63}$"` + ResourceType string `json:"resourceType" validate:"regexp=^[a-z](?:-?[a-z]){1\\,63}$"` AdditionalProperties map[string]interface{} } diff --git a/services/authorization/v2api/model_role.go b/services/authorization/v2api/model_role.go index 348b2b1c6..3f0817ee5 100644 --- a/services/authorization/v2api/model_role.go +++ b/services/authorization/v2api/model_role.go @@ -22,8 +22,8 @@ var _ MappedNullable = &Role{} type Role struct { Description string `json:"description"` Etag *string `json:"etag,omitempty"` - Id *string `json:"id,omitempty" validate:"regexp=^([a-zA-Z0-9\\/_|\\\\-=+]{1,})$"` - Name string `json:"name" validate:"regexp=^[a-z](?:[-.]?[a-z]){1,63}$"` + Id *string `json:"id,omitempty" validate:"regexp=^([a-zA-Z0-9/_|\\-=+]{1\\,})$"` + Name string `json:"name" validate:"regexp=^[a-z](?:[-.]?[a-z]){1\\,63}$"` Permissions []Permission `json:"permissions"` AdditionalProperties map[string]interface{} } diff --git a/services/authorization/v2api/model_roles_response.go b/services/authorization/v2api/model_roles_response.go index 6725d6e09..f2031a335 100644 --- a/services/authorization/v2api/model_roles_response.go +++ b/services/authorization/v2api/model_roles_response.go @@ -20,8 +20,8 @@ var _ MappedNullable = &RolesResponse{} // RolesResponse struct for RolesResponse type RolesResponse struct { - ResourceId string `json:"resourceId" validate:"regexp=^([a-zA-Z0-9\\/_|\\\\-=+@.]{1,})$"` - ResourceType string `json:"resourceType" validate:"regexp=^[a-z](?:-?[a-z]){1,63}$"` + ResourceId string `json:"resourceId" validate:"regexp=^([a-zA-Z0-9/_|\\-=+@.]{1\\,})$"` + ResourceType string `json:"resourceType" validate:"regexp=^[a-z](?:-?[a-z]){1\\,63}$"` Roles []Role `json:"roles"` AdditionalProperties map[string]interface{} } diff --git a/services/authorization/v2api/model_update_role_payload.go b/services/authorization/v2api/model_update_role_payload.go index 9a8a3f136..34d0660f1 100644 --- a/services/authorization/v2api/model_update_role_payload.go +++ b/services/authorization/v2api/model_update_role_payload.go @@ -22,7 +22,7 @@ var _ MappedNullable = &UpdateRolePayload{} type UpdateRolePayload struct { Description string `json:"description"` Etag *string `json:"etag,omitempty"` - Name string `json:"name" validate:"regexp=^[a-z](?:[-.]?[a-z]){1,63}$"` + Name string `json:"name" validate:"regexp=^[a-z](?:[-.]?[a-z]){1\\,63}$"` Permissions []PermissionRequest `json:"permissions"` AdditionalProperties map[string]interface{} } diff --git a/services/authorization/v2api/model_update_role_response.go b/services/authorization/v2api/model_update_role_response.go index 8873d69fe..8d2f1e2c9 100644 --- a/services/authorization/v2api/model_update_role_response.go +++ b/services/authorization/v2api/model_update_role_response.go @@ -20,8 +20,8 @@ var _ MappedNullable = &UpdateRoleResponse{} // UpdateRoleResponse struct for UpdateRoleResponse type UpdateRoleResponse struct { - ResourceId string `json:"resourceId" validate:"regexp=^([a-zA-Z0-9\\/_|\\\\-=+@.]{1,})$"` - ResourceType string `json:"resourceType" validate:"regexp=^[a-z](?:-?[a-z]){1,63}$"` + ResourceId string `json:"resourceId" validate:"regexp=^([a-zA-Z0-9/_|\\-=+@.]{1\\,})$"` + ResourceType string `json:"resourceType" validate:"regexp=^[a-z](?:-?[a-z]){1\\,63}$"` Role Role `json:"role"` AdditionalProperties map[string]interface{} } diff --git a/services/authorization/v2api/model_user_membership.go b/services/authorization/v2api/model_user_membership.go index 0b59c3df4..dc6ba2209 100644 --- a/services/authorization/v2api/model_user_membership.go +++ b/services/authorization/v2api/model_user_membership.go @@ -20,9 +20,9 @@ var _ MappedNullable = &UserMembership{} // UserMembership struct for UserMembership type UserMembership struct { - ResourceId string `json:"resourceId" validate:"regexp=^([a-zA-Z0-9\\/_|\\\\-=+@.]{1,})$"` - ResourceType string `json:"resourceType" validate:"regexp=^[a-z](?:-?[a-z]){1,63}$"` - Role string `json:"role" validate:"regexp=^[a-z](?:[-.]?[a-z]){1,63}$"` + ResourceId string `json:"resourceId" validate:"regexp=^([a-zA-Z0-9/_|\\-=+@.]{1\\,})$"` + ResourceType string `json:"resourceType" 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/authorization/v2api/model_user_permission.go b/services/authorization/v2api/model_user_permission.go index 39bf1d105..2980a07d5 100644 --- a/services/authorization/v2api/model_user_permission.go +++ b/services/authorization/v2api/model_user_permission.go @@ -21,8 +21,8 @@ var _ MappedNullable = &UserPermission{} // UserPermission struct for UserPermission type UserPermission struct { Permissions []ExistingPermission `json:"permissions"` - ResourceId string `json:"resourceId" validate:"regexp=^([a-zA-Z0-9\\/_|\\\\-=+@.]{1,})$"` - ResourceType string `json:"resourceType" validate:"regexp=^[a-z](?:-?[a-z]){1,63}$"` + ResourceId string `json:"resourceId" validate:"regexp=^([a-zA-Z0-9/_|\\-=+@.]{1\\,})$"` + ResourceType string `json:"resourceType" validate:"regexp=^[a-z](?:-?[a-z]){1\\,63}$"` AdditionalProperties map[string]interface{} }