Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge user.yaml #2014

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions .apigentools-info
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,13 @@
"spec_versions": {
"v1": {
"apigentools_version": "1.6.6",
"regenerated": "2024-09-23 19:10:18.354958",
"spec_repo_commit": "41592dc6"
"regenerated": "2024-09-24 14:14:06.347418",
"spec_repo_commit": "77d3d5e5"
},
"v2": {
"apigentools_version": "1.6.6",
"regenerated": "2024-09-23 19:10:18.369556",
"spec_repo_commit": "41592dc6"
"regenerated": "2024-09-24 14:14:06.362304",
"spec_repo_commit": "77d3d5e5"
}
}
}
120 changes: 120 additions & 0 deletions .generator/schemas/v2/openapi.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -24635,16 +24635,36 @@ components:
UserCreateAttributes:
description: Attributes of the created user.
properties:
created_at:
description: The `UserCreateAttributes` `created_at`.
format: date-time
type: string
disabled:
description: The `UserCreateAttributes` `disabled`.
type: boolean
email:
description: The email of the user.
example: [email protected]
type: string
handle:
description: The `UserCreateAttributes` `handle`.
type: string
modified_at:
description: The `UserCreateAttributes` `modified_at`.
format: date-time
type: string
name:
description: The name of the user.
type: string
service_account:
description: The `UserCreateAttributes` `service_account`.
type: boolean
title:
description: The title of the user.
type: string
verified:
description: The `UserCreateAttributes` `verified`.
type: boolean
required:
- email
type: object
Expand Down Expand Up @@ -24694,6 +24714,10 @@ components:
invite_type:
description: Type of invitation.
type: string
login_method:
description: The `UserInvitationDataAttributes` `login_method`.
nullable: true
type: string
uuid:
description: UUID of the user invitation.
type: string
Expand Down Expand Up @@ -24755,6 +24779,79 @@ components:
type: string
x-enum-varnames:
- USER_INVITATIONS
UserOrgsSerializable:
description: The definition of `UserOrgsSerializable` object.
properties:
attributes:
$ref: '#/components/schemas/UserOrgsSerializableAttributes'
id:
description: The `UserOrgsSerializable` `id`.
type: string
type:
$ref: '#/components/schemas/UserOrgsSerializableType'
required:
- type
type: object
UserOrgsSerializableAttributes:
description: The definition of `UserOrgsSerializableAttributes` object.
properties:
disabled:
description: The `UserOrgsSerializableAttributes` `disabled`.
type: boolean
email:
description: The `UserOrgsSerializableAttributes` `email`.
type: string
name:
description: The `UserOrgsSerializableAttributes` `name`.
type: string
org_id:
description: The `UserOrgsSerializableAttributes` `org_id`.
type: string
title:
description: The `UserOrgsSerializableAttributes` `title`.
type: string
verified:
description: The `UserOrgsSerializableAttributes` `verified`.
type: boolean
type: object
UserOrgsSerializableType:
default: users
description: The definition of `UserOrgsSerializableType` object.
enum:
- users
example: users
type: string
x-enum-varnames:
- USERS
UserOverrideIdentityProvider:
description: The definition of `UserOverrideIdentityProvider` object.
properties:
attributes:
$ref: '#/components/schemas/UserOverrideIdentityProviderAttributes'
id:
description: The `UserOverrideIdentityProvider` `id`.
type: string
type:
$ref: '#/components/schemas/UserOverrideIdentityProviderType'
required:
- type
type: object
UserOverrideIdentityProviderAttributes:
description: The definition of `UserOverrideIdentityProviderAttributes` object.
properties:
authentication_method:
description: The `UserOverrideIdentityProviderAttributes` `authentication_method`.
type: string
type: object
UserOverrideIdentityProviderType:
default: identity_providers
description: The definition of `UserOverrideIdentityProviderType` object.
enum:
- identity_providers
example: identity_providers
type: string
x-enum-varnames:
- IDENTITY_PROVIDERS
UserRelationshipData:
description: Relationship to user object.
properties:
Expand Down Expand Up @@ -24800,6 +24897,8 @@ components:
- $ref: '#/components/schemas/Organization'
- $ref: '#/components/schemas/Permission'
- $ref: '#/components/schemas/Role'
- $ref: '#/components/schemas/UserOverrideIdentityProvider'
- $ref: '#/components/schemas/UserOrgsSerializable'
UserResponseRelationships:
description: Relationships of the user object returned by the API.
properties:
Expand Down Expand Up @@ -25038,15 +25137,36 @@ components:
UserUpdateAttributes:
description: Attributes of the edited user.
properties:
created_at:
description: The `UserUpdateAttributes` `created_at`.
format: date-time
type: string
disabled:
description: If the user is enabled or disabled.
type: boolean
email:
description: The email of the user.
type: string
handle:
description: The `UserUpdateAttributes` `handle`.
type: string
modified_at:
description: The `UserUpdateAttributes` `modified_at`.
format: date-time
type: string
name:
description: The name of the user.
type: string
service_account:
description: The `UserUpdateAttributes` `service_account`.
type: boolean
title:
description: The `UserUpdateAttributes` `title`.
nullable: true
type: string
verified:
description: The `UserUpdateAttributes` `verified`.
type: boolean
type: object
UserUpdateData:
description: Object to update a user.
Expand Down
4 changes: 2 additions & 2 deletions features/v2/users.feature
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,7 @@ Feature: Users
Scenario: Update a user returns "Bad Request" response
Given new "UpdateUser" request
And request contains "user_id" parameter from "REPLACE.ME"
And body with value {"data": {"attributes": {}, "id": "00000000-0000-feed-0000-000000000000", "type": "users"}}
And body with value {"data": {"attributes": {"title": null}, "id": "00000000-0000-feed-0000-000000000000", "type": "users"}}
When the request is sent
Then the response status is 400 Bad Request

Expand Down Expand Up @@ -189,6 +189,6 @@ Feature: Users
Scenario: Update a user returns "Unprocessable Entity" response
Given new "UpdateUser" request
And request contains "user_id" parameter from "REPLACE.ME"
And body with value {"data": {"attributes": {}, "id": "00000000-0000-feed-0000-000000000000", "type": "users"}}
And body with value {"data": {"attributes": {"title": null}, "id": "00000000-0000-feed-0000-000000000000", "type": "users"}}
When the request is sent
Then the response status is 422 Unprocessable Entity
6 changes: 6 additions & 0 deletions lib/datadog_api_client/inflector.rb
Original file line number Diff line number Diff line change
Expand Up @@ -2436,6 +2436,12 @@ def overrides
"v2.user_invitations_request" => "UserInvitationsRequest",
"v2.user_invitations_response" => "UserInvitationsResponse",
"v2.user_invitations_type" => "UserInvitationsType",
"v2.user_orgs_serializable" => "UserOrgsSerializable",
"v2.user_orgs_serializable_attributes" => "UserOrgsSerializableAttributes",
"v2.user_orgs_serializable_type" => "UserOrgsSerializableType",
"v2.user_override_identity_provider" => "UserOverrideIdentityProvider",
"v2.user_override_identity_provider_attributes" => "UserOverrideIdentityProviderAttributes",
"v2.user_override_identity_provider_type" => "UserOverrideIdentityProviderType",
"v2.user_relationship_data" => "UserRelationshipData",
"v2.user_relationships" => "UserRelationships",
"v2.user_resource_type" => "UserResourceType",
Expand Down
68 changes: 64 additions & 4 deletions lib/datadog_api_client/v2/models/user_create_attributes.rb
Original file line number Diff line number Diff line change
Expand Up @@ -21,34 +21,64 @@ module DatadogAPIClient::V2
class UserCreateAttributes
include BaseGenericModel

# The `UserCreateAttributes` `created_at`.
attr_accessor :created_at

# The `UserCreateAttributes` `disabled`.
attr_accessor :disabled

# The email of the user.
attr_reader :email

# The `UserCreateAttributes` `handle`.
attr_accessor :handle

# The `UserCreateAttributes` `modified_at`.
attr_accessor :modified_at

# The name of the user.
attr_accessor :name

# The `UserCreateAttributes` `service_account`.
attr_accessor :service_account

# The title of the user.
attr_accessor :title

# The `UserCreateAttributes` `verified`.
attr_accessor :verified

attr_accessor :additional_properties

# Attribute mapping from ruby-style variable name to JSON key.
# @!visibility private
def self.attribute_map
{
:'created_at' => :'created_at',
:'disabled' => :'disabled',
:'email' => :'email',
:'handle' => :'handle',
:'modified_at' => :'modified_at',
:'name' => :'name',
:'title' => :'title'
:'service_account' => :'service_account',
:'title' => :'title',
:'verified' => :'verified'
}
end

# Attribute type mapping.
# @!visibility private
def self.openapi_types
{
:'created_at' => :'Time',
:'disabled' => :'Boolean',
:'email' => :'String',
:'handle' => :'String',
:'modified_at' => :'Time',
:'name' => :'String',
:'title' => :'String'
:'service_account' => :'Boolean',
:'title' => :'String',
:'verified' => :'Boolean'
}
end

Expand All @@ -70,17 +100,41 @@ def initialize(attributes = {})
end
}

if attributes.key?(:'created_at')
self.created_at = attributes[:'created_at']
end

if attributes.key?(:'disabled')
self.disabled = attributes[:'disabled']
end

if attributes.key?(:'email')
self.email = attributes[:'email']
end

if attributes.key?(:'handle')
self.handle = attributes[:'handle']
end

if attributes.key?(:'modified_at')
self.modified_at = attributes[:'modified_at']
end

if attributes.key?(:'name')
self.name = attributes[:'name']
end

if attributes.key?(:'service_account')
self.service_account = attributes[:'service_account']
end

if attributes.key?(:'title')
self.title = attributes[:'title']
end

if attributes.key?(:'verified')
self.verified = attributes[:'verified']
end
end

# Check to see if the all the properties in the model are valid
Expand Down Expand Up @@ -127,17 +181,23 @@ def to_hash
def ==(o)
return true if self.equal?(o)
self.class == o.class &&
created_at == o.created_at &&
disabled == o.disabled &&
email == o.email &&
handle == o.handle &&
modified_at == o.modified_at &&
name == o.name &&
title == o.title
service_account == o.service_account &&
title == o.title &&
verified == o.verified
additional_properties == o.additional_properties
end

# Calculates hash code according to all attributes.
# @return [Integer] Hash code
# @!visibility private
def hash
[email, name, title].hash
[created_at, disabled, email, handle, modified_at, name, service_account, title, verified].hash
end
end
end
Loading
Loading