Skip to content

Commit

Permalink
Merge master into datadog-api-spec/test/rolf/hourly-usage-attribution
Browse files Browse the repository at this point in the history
  • Loading branch information
2 parents cde061f + 91107ee commit b20b72f
Show file tree
Hide file tree
Showing 23 changed files with 849 additions and 64 deletions.
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.5.1.dev2",
"regenerated": "2021-12-21 23:32:18.512614",
"spec_repo_commit": "4bb7a8e"
"regenerated": "2021-12-22 15:40:58.067618",
"spec_repo_commit": "fa551a3"
},
"v2": {
"apigentools_version": "1.5.1.dev2",
"regenerated": "2021-12-21 23:32:18.535031",
"spec_repo_commit": "4bb7a8e"
"regenerated": "2021-12-22 15:40:58.086721",
"spec_repo_commit": "fa551a3"
}
}
}
62 changes: 56 additions & 6 deletions .generator/schemas/v2/openapi.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -477,8 +477,21 @@ components:
properties:
name:
description: Name of the application key.
example: Application Key for submitting metrics
example: Application Key for managing dashboards
type: string
scopes:
description: Array of scopes to grant the application key. This feature
is in private beta, please contact Datadog support to enable scopes for
your application keys.
example:
- dashboards_read
- dashboards_write
- dashboards_public_share
items:
description: Name of scope.
type: string
nullable: true
type: array
required:
- name
type: object
Expand Down Expand Up @@ -529,10 +542,21 @@ components:
properties:
name:
description: Name of the application key.
example: Application Key for submitting metrics
example: Application Key for managing dashboards
type: string
required:
- name
scopes:
description: Array of scopes to grant the application key. This feature
is in private beta, please contact Datadog support to enable scopes for
your application keys.
example:
- dashboards_read
- dashboards_write
- dashboards_public_share
items:
description: Name of scope.
type: string
nullable: true
type: array
type: object
ApplicationKeyUpdateData:
description: Object used to update an application key.
Expand Down Expand Up @@ -852,8 +876,21 @@ components:
type: string
name:
description: Name of the application key.
example: Application Key for submitting metrics
example: Application Key for managing dashboards
type: string
scopes:
description: Array of scopes to grant the application key. This feature
is in private beta, please contact Datadog support to enable scopes for
your application keys.
example:
- dashboards_read
- dashboards_write
- dashboards_public_share
items:
description: Name of scope.
type: string
nullable: true
type: array
type: object
HTTPLog:
description: Structured log message.
Expand Down Expand Up @@ -3537,8 +3574,21 @@ components:
type: string
name:
description: Name of the application key.
example: Application Key for submitting metrics
example: Application Key for managing dashboards
type: string
scopes:
description: Array of scopes to grant the application key. This feature
is in private beta, please contact Datadog support to enable scopes for
your application keys.
example:
- dashboards_read
- dashboards_write
- dashboards_public_share
items:
description: Name of scope.
type: string
nullable: true
type: array
type: object
PartialApplicationKeyResponse:
description: Response for retrieving a partial application key.
Expand Down
36 changes: 36 additions & 0 deletions api/v2/datadog/docs/ApplicationKeyCreateAttributes.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
Name | Type | Description | Notes
---- | ---- | ----------- | ------
**Name** | **string** | Name of the application key. |
**Scopes** | Pointer to **[]string** | Array of scopes to grant the application key. This feature is in private beta, please contact Datadog support to enable scopes for your application keys. | [optional]

## Methods

Expand Down Expand Up @@ -45,6 +46,41 @@ and a boolean to check if the value has been set.
SetName sets Name field to given value.


### GetScopes

`func (o *ApplicationKeyCreateAttributes) GetScopes() []string`

GetScopes returns the Scopes field if non-nil, zero value otherwise.

### GetScopesOk

`func (o *ApplicationKeyCreateAttributes) GetScopesOk() (*[]string, bool)`

GetScopesOk returns a tuple with the Scopes field if it's non-nil, zero value otherwise
and a boolean to check if the value has been set.

### SetScopes

`func (o *ApplicationKeyCreateAttributes) SetScopes(v []string)`

SetScopes sets Scopes field to given value.

### HasScopes

`func (o *ApplicationKeyCreateAttributes) HasScopes() bool`

HasScopes returns a boolean if a field has been set.

### SetScopesNil

`func (o *ApplicationKeyCreateAttributes) SetScopesNil(b bool)`

SetScopesNil sets the value for Scopes to be an explicit nil

### UnsetScopes
`func (o *ApplicationKeyCreateAttributes) UnsetScopes()`

UnsetScopes ensures that no value is present for Scopes, not even an explicit nil

[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)

Expand Down
45 changes: 43 additions & 2 deletions api/v2/datadog/docs/ApplicationKeyUpdateAttributes.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,14 @@

Name | Type | Description | Notes
---- | ---- | ----------- | ------
**Name** | **string** | Name of the application key. |
**Name** | Pointer to **string** | Name of the application key. | [optional]
**Scopes** | Pointer to **[]string** | Array of scopes to grant the application key. This feature is in private beta, please contact Datadog support to enable scopes for your application keys. | [optional]

## Methods

### NewApplicationKeyUpdateAttributes

`func NewApplicationKeyUpdateAttributes(name string) *ApplicationKeyUpdateAttributes`
`func NewApplicationKeyUpdateAttributes() *ApplicationKeyUpdateAttributes`

NewApplicationKeyUpdateAttributes instantiates a new ApplicationKeyUpdateAttributes object.
This constructor will assign default values to properties that have it defined,
Expand Down Expand Up @@ -44,7 +45,47 @@ and a boolean to check if the value has been set.

SetName sets Name field to given value.

### HasName

`func (o *ApplicationKeyUpdateAttributes) HasName() bool`

HasName returns a boolean if a field has been set.

### GetScopes

`func (o *ApplicationKeyUpdateAttributes) GetScopes() []string`

GetScopes returns the Scopes field if non-nil, zero value otherwise.

### GetScopesOk

`func (o *ApplicationKeyUpdateAttributes) GetScopesOk() (*[]string, bool)`

GetScopesOk returns a tuple with the Scopes field if it's non-nil, zero value otherwise
and a boolean to check if the value has been set.

### SetScopes

`func (o *ApplicationKeyUpdateAttributes) SetScopes(v []string)`

SetScopes sets Scopes field to given value.

### HasScopes

`func (o *ApplicationKeyUpdateAttributes) HasScopes() bool`

HasScopes returns a boolean if a field has been set.

### SetScopesNil

`func (o *ApplicationKeyUpdateAttributes) SetScopesNil(b bool)`

SetScopesNil sets the value for Scopes to be an explicit nil

### UnsetScopes
`func (o *ApplicationKeyUpdateAttributes) UnsetScopes()`

UnsetScopes ensures that no value is present for Scopes, not even an explicit nil

[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)

Expand Down
36 changes: 36 additions & 0 deletions api/v2/datadog/docs/FullApplicationKeyAttributes.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ Name | Type | Description | Notes
**Key** | Pointer to **string** | The application key. | [optional] [readonly]
**Last4** | Pointer to **string** | The last four characters of the application key. | [optional] [readonly]
**Name** | Pointer to **string** | Name of the application key. | [optional]
**Scopes** | Pointer to **[]string** | Array of scopes to grant the application key. This feature is in private beta, please contact Datadog support to enable scopes for your application keys. | [optional]

## Methods

Expand Down Expand Up @@ -128,6 +129,41 @@ SetName sets Name field to given value.

HasName returns a boolean if a field has been set.

### GetScopes

`func (o *FullApplicationKeyAttributes) GetScopes() []string`

GetScopes returns the Scopes field if non-nil, zero value otherwise.

### GetScopesOk

`func (o *FullApplicationKeyAttributes) GetScopesOk() (*[]string, bool)`

GetScopesOk returns a tuple with the Scopes field if it's non-nil, zero value otherwise
and a boolean to check if the value has been set.

### SetScopes

`func (o *FullApplicationKeyAttributes) SetScopes(v []string)`

SetScopes sets Scopes field to given value.

### HasScopes

`func (o *FullApplicationKeyAttributes) HasScopes() bool`

HasScopes returns a boolean if a field has been set.

### SetScopesNil

`func (o *FullApplicationKeyAttributes) SetScopesNil(b bool)`

SetScopesNil sets the value for Scopes to be an explicit nil

### UnsetScopes
`func (o *FullApplicationKeyAttributes) UnsetScopes()`

UnsetScopes ensures that no value is present for Scopes, not even an explicit nil

[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)

Expand Down
6 changes: 3 additions & 3 deletions api/v2/datadog/docs/KeyManagementApi.md
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ import (
func main() {
ctx := datadog.NewDefaultContext(context.Background())

body := *datadog.NewApplicationKeyCreateRequest(*datadog.NewApplicationKeyCreateData(*datadog.NewApplicationKeyCreateAttributes("Application Key for submitting metrics"), datadog.ApplicationKeysType("application_keys"))) // ApplicationKeyCreateRequest |
body := *datadog.NewApplicationKeyCreateRequest(*datadog.NewApplicationKeyCreateData(*datadog.NewApplicationKeyCreateAttributes("Application Key for managing dashboards"), datadog.ApplicationKeysType("application_keys"))) // ApplicationKeyCreateRequest |

configuration := datadog.NewConfiguration()

Expand Down Expand Up @@ -958,7 +958,7 @@ func main() {
ctx := datadog.NewDefaultContext(context.Background())

appKeyId := "appKeyId_example" // string | The ID of the application key.
body := *datadog.NewApplicationKeyUpdateRequest(*datadog.NewApplicationKeyUpdateData(*datadog.NewApplicationKeyUpdateAttributes("Application Key for submitting metrics"), "00112233-4455-6677-8899-aabbccddeeff", datadog.ApplicationKeysType("application_keys"))) // ApplicationKeyUpdateRequest |
body := *datadog.NewApplicationKeyUpdateRequest(*datadog.NewApplicationKeyUpdateData(*datadog.NewApplicationKeyUpdateAttributes(), "00112233-4455-6677-8899-aabbccddeeff", datadog.ApplicationKeysType("application_keys"))) // ApplicationKeyUpdateRequest |

configuration := datadog.NewConfiguration()

Expand Down Expand Up @@ -1030,7 +1030,7 @@ func main() {
ctx := datadog.NewDefaultContext(context.Background())

appKeyId := "appKeyId_example" // string | The ID of the application key.
body := *datadog.NewApplicationKeyUpdateRequest(*datadog.NewApplicationKeyUpdateData(*datadog.NewApplicationKeyUpdateAttributes("Application Key for submitting metrics"), "00112233-4455-6677-8899-aabbccddeeff", datadog.ApplicationKeysType("application_keys"))) // ApplicationKeyUpdateRequest |
body := *datadog.NewApplicationKeyUpdateRequest(*datadog.NewApplicationKeyUpdateData(*datadog.NewApplicationKeyUpdateAttributes(), "00112233-4455-6677-8899-aabbccddeeff", datadog.ApplicationKeysType("application_keys"))) // ApplicationKeyUpdateRequest |

configuration := datadog.NewConfiguration()

Expand Down
36 changes: 36 additions & 0 deletions api/v2/datadog/docs/PartialApplicationKeyAttributes.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ Name | Type | Description | Notes
**CreatedAt** | Pointer to **string** | Creation date of the application key. | [optional] [readonly]
**Last4** | Pointer to **string** | The last four characters of the application key. | [optional] [readonly]
**Name** | Pointer to **string** | Name of the application key. | [optional]
**Scopes** | Pointer to **[]string** | Array of scopes to grant the application key. This feature is in private beta, please contact Datadog support to enable scopes for your application keys. | [optional]

## Methods

Expand Down Expand Up @@ -102,6 +103,41 @@ SetName sets Name field to given value.

HasName returns a boolean if a field has been set.

### GetScopes

`func (o *PartialApplicationKeyAttributes) GetScopes() []string`

GetScopes returns the Scopes field if non-nil, zero value otherwise.

### GetScopesOk

`func (o *PartialApplicationKeyAttributes) GetScopesOk() (*[]string, bool)`

GetScopesOk returns a tuple with the Scopes field if it's non-nil, zero value otherwise
and a boolean to check if the value has been set.

### SetScopes

`func (o *PartialApplicationKeyAttributes) SetScopes(v []string)`

SetScopes sets Scopes field to given value.

### HasScopes

`func (o *PartialApplicationKeyAttributes) HasScopes() bool`

HasScopes returns a boolean if a field has been set.

### SetScopesNil

`func (o *PartialApplicationKeyAttributes) SetScopesNil(b bool)`

SetScopesNil sets the value for Scopes to be an explicit nil

### UnsetScopes
`func (o *PartialApplicationKeyAttributes) UnsetScopes()`

UnsetScopes ensures that no value is present for Scopes, not even an explicit nil

[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)

Expand Down
4 changes: 2 additions & 2 deletions api/v2/datadog/docs/ServiceAccountsApi.md
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ func main() {
ctx := datadog.NewDefaultContext(context.Background())

serviceAccountId := "00000000-0000-0000-0000-000000000000" // string | The ID of the service account.
body := *datadog.NewApplicationKeyCreateRequest(*datadog.NewApplicationKeyCreateData(*datadog.NewApplicationKeyCreateAttributes("Application Key for submitting metrics"), datadog.ApplicationKeysType("application_keys"))) // ApplicationKeyCreateRequest |
body := *datadog.NewApplicationKeyCreateRequest(*datadog.NewApplicationKeyCreateData(*datadog.NewApplicationKeyCreateAttributes("Application Key for managing dashboards"), datadog.ApplicationKeysType("application_keys"))) // ApplicationKeyCreateRequest |

configuration := datadog.NewConfiguration()

Expand Down Expand Up @@ -342,7 +342,7 @@ func main() {

serviceAccountId := "00000000-0000-0000-0000-000000000000" // string | The ID of the service account.
appKeyId := "appKeyId_example" // string | The ID of the application key.
body := *datadog.NewApplicationKeyUpdateRequest(*datadog.NewApplicationKeyUpdateData(*datadog.NewApplicationKeyUpdateAttributes("Application Key for submitting metrics"), "00112233-4455-6677-8899-aabbccddeeff", datadog.ApplicationKeysType("application_keys"))) // ApplicationKeyUpdateRequest |
body := *datadog.NewApplicationKeyUpdateRequest(*datadog.NewApplicationKeyUpdateData(*datadog.NewApplicationKeyUpdateAttributes(), "00112233-4455-6677-8899-aabbccddeeff", datadog.ApplicationKeysType("application_keys"))) // ApplicationKeyUpdateRequest |

configuration := datadog.NewConfiguration()

Expand Down
Loading

0 comments on commit b20b72f

Please sign in to comment.