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

[Datadog] Add terms APIs #11435

Merged
merged 6 commits into from
Nov 10, 2020
Merged
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
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,91 @@
}
},
"paths": {
"/subscriptions/{subscriptionId}/providers/Microsoft.Datadog/agreements": {
"get": {
"tags": [
"Agreements"
],
"summary": "List Datadog marketplace agreements in the subscription.",
"operationId": "MarketplaceAgreements_List",
"produces": [
"application/json"
],
"parameters": [
{
"$ref": "#/parameters/SubscriptionIdParameter"
}
],
"responses": {
"200": {
"description": "Success",
"schema": {
"$ref": "#/definitions/DatadogAgreementResourceListResponse"
}
},
"default": {
"description": "Default error response.",
"schema": {
"$ref": "#/definitions/ResourceProviderDefaultErrorResponse"
}
}
},
"x-ms-pageable": {
"nextLinkName": "nextLink"
},
"x-ms-examples": {
"MarketplaceAgreements_List": {
"$ref": "./examples/MarketplaceAgreements_List.json"
}
}
}
},
"/subscriptions/{subscriptionId}/providers/Microsoft.Datadog/agreements/default": {
"put": {
"tags": [
"Agreements"
],
"summary": "Create Datadog marketplace agreement in the subscription.",
"operationId": "MarketplaceAgreements_Create",
"consumes": [
"application/json"
],
"produces": [
"application/json"
],
"parameters": [
{
"$ref": "#/parameters/SubscriptionIdParameter"
},
{
"in": "body",
"name": "body",
"schema": {
"$ref": "#/definitions/DatadogAgreementResource"
}
}
],
"responses": {
"200": {
"description": "Success",
"schema": {
"$ref": "#/definitions/DatadogAgreementResource"
}
},
"default": {
"description": "Default error response.",
"schema": {
"$ref": "#/definitions/ResourceProviderDefaultErrorResponse"
}
}
},
"x-ms-examples": {
"MarketplaceAgreements_Create": {
"$ref": "./examples/MarketplaceAgreements_Create.json"
}
}
}
},
"/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Datadog/monitors/{monitorName}/listApiKeys": {
"post": {
"tags": [
Expand Down Expand Up @@ -766,6 +851,7 @@
"$ref": "#/parameters/MonitorNameParameter"
},
{
"description": "Rule set name",
"in": "path",
"name": "ruleSetName",
"required": true,
Expand Down Expand Up @@ -822,6 +908,7 @@
"$ref": "#/parameters/MonitorNameParameter"
},
{
"description": "Rule set name",
"in": "path",
"name": "ruleSetName",
"required": true,
Expand Down Expand Up @@ -924,6 +1011,7 @@
"$ref": "#/parameters/MonitorNameParameter"
},
{
"description": "Configuration name",
"in": "path",
"name": "configurationName",
"required": true,
Expand Down Expand Up @@ -990,6 +1078,7 @@
"$ref": "#/parameters/MonitorNameParameter"
},
{
"description": "Configuration name",
"in": "path",
"name": "configurationName",
"required": true,
Expand Down Expand Up @@ -1022,6 +1111,87 @@
}
},
"definitions": {
"DatadogAgreementProperties": {
"description": "Terms properties.",
"type": "object",
"properties": {
"publisher": {
"description": "Publisher identifier string.",
"type": "string"
},
"product": {
"description": "Product identifier string.",
"type": "string"
},
"plan": {
"description": "Plan identifier string.",
"type": "string"
},
"licenseTextLink": {
"description": "Link to HTML with Microsoft and Publisher terms.",
"type": "string"
},
"privacyPolicyLink": {
"description": "Link to the privacy policy of the publisher.",
"type": "string"
},
"retrieveDatetime": {
"format": "date-time",
"description": "Date and time in UTC of when the terms were accepted. This is empty if Accepted is false.",
"type": "string"
},
"signature": {
limingu marked this conversation as resolved.
Show resolved Hide resolved
"description": "Terms signature.",
"type": "string"
},
"accepted": {
"description": "If any version of the terms have been accepted, otherwise false.",
"type": "boolean"
}
}
},
"DatadogAgreementResource": {
"type": "object",
"x-ms-azure-resource": true,
"properties": {
"id": {
"description": "ARM id of the resource.",
"type": "string",
"readOnly": true
},
"name": {
"description": "Name of the agreement.",
"type": "string",
"readOnly": true
},
"type": {
"description": "The type of the resource.",
"type": "string",
"readOnly": true
},
"properties": {
"$ref": "#/definitions/DatadogAgreementProperties",
"description": "Represents the properties of the resource."
}
}
},
"DatadogAgreementResourceListResponse": {
"description": "Response of a list operation.",
"type": "object",
"properties": {
"value": {
"description": "Results of a list operation.",
"type": "array",
"items": {
"$ref": "#/definitions/DatadogAgreementResource"
}
},
"nextLink": {
"description": "Link to the next set of results, if any.",
"type": "string"
}
}
},
"DatadogApiKey": {
"required": [
"key"
Expand Down Expand Up @@ -1356,6 +1526,7 @@
}
},
"DatadogOrganizationProperties": {
"description": "Datadog organization properties",
"type": "object",
"properties": {
"name": {
Expand Down Expand Up @@ -1392,6 +1563,7 @@
}
},
"UserInfo": {
"description": "User info",
"type": "object",
"properties": {
"name": {
Expand Down Expand Up @@ -1459,6 +1631,7 @@
"UserAssigned"
],
"type": "string",
"description": "Identity type",
"x-ms-enum": {
"modelAsString": true,
"name": "ManagedIdentityTypes"
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
{
"parameters": {
"api-version": "2020-02-01-preview",
"subscriptionId": "00000000-0000-0000-0000-000000000000",
"requestBody": {
"properties": {
"accepted": true
}
}
},
"responses": {
"200": {
"body": {
"id": "/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Datadog/agreements/default",
"name": "default",
"type": "Microsoft.Datadog/agreements",
"properties": {
"publisher": "pubid1",
"product": "offid1",
"plan": "planid1",
"licenseTextLink": "test.licenseLink1",
"privacyPolicyLink": "test.privacyPolicyLink1",
"retrieveDatetime": "2017-08-15T11:33:07.12132Z",
"signature": "ASDFSDAFWEFASDGWERLWER",
"accepted": true
}
}
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
{
"parameters": {
"api-version": "2020-02-01-preview",
"subscriptionId": "00000000-0000-0000-0000-000000000000"
},
"responses": {
"200": {
"body": {
"value": [
{
"id": "/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Datadog/agreements/id1",
"name": "planid1",
"type": "Microsoft.Datadog/agreements",
"properties": {
"publisher": "pubid1",
"product": "offid1",
"plan": "planid1",
"licenseTextLink": "test.licenseLink1",
"privacyPolicyLink": "test.privacyPolicyLink1",
"retrieveDatetime": "2017-08-15T11:33:07.12132Z",
"signature": "ASDFSDAFWEFASDGWERLWER",
"accepted": false
}
},
{
"id": "/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Datadog/agreements/id2",
"name": "planid2",
"type": "Microsoft.Datadog/agreements",
"properties": {
"publisher": "pubid2",
"product": "offid2",
"plan": "planid2",
"licenseTextLink": "test.licenseLin2k",
"privacyPolicyLink": "test.privacyPolicyLink2",
"retrieveDatetime": "2017-08-14T11:33:07.12132Z",
"signature": "ASDFSDAFWEFASDGWERLWER",
"accepted": false
}
}
],
"nextLink": null
}
}
}
}
28 changes: 28 additions & 0 deletions specification/datadog/resource-manager/readme.cli.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,32 @@
These settings don't need to apply `--cli` on the command line.

``` yaml
cli:
cli-directive:
- where:
group: 'RefreshSetPassword'
name: 'set_password_link'
- where:
group: 'SingleSignOnConfigurations'
name: 'sso_config'
- where:
group: 'Monitors'
op: 'Create'
param: 'monitoringStatus'
removed: true
- where:
group: 'Monitors'
op: 'Create'
param: 'MarketplaceSubscriptionStatus'
removed: true
- where:
group: 'Monitors'
op: 'Create'
param: 'ProvisioningState'
removed: true
- where:
group: 'Monitors'
op: 'Update'
param: 'monitoringStatus'
removed: true
```
14 changes: 10 additions & 4 deletions specification/datadog/resource-manager/readme.python.md
Original file line number Diff line number Diff line change
Expand Up @@ -26,18 +26,24 @@ no-namespace-folders: true
package-version: 1.0.0
```

``` yaml $(python) && $(python-mode) == 'update'
``` yaml $(python) && $(python-mode) == 'update' && !$(track2)
python:
no-namespace-folders: true
output-folder: $(python-sdks-folder)/datadog/azure-mgmt-datadog/azure/mgmt/datadog
no-namespace-folders: true
output-folder: $(python-sdks-folder)/datadog/azure-mgmt-datadog/azure/mgmt/datadog
```

``` yaml $(python) && $(python-mode) == 'create'
``` yaml $(python) && $(python-mode) == 'create' && !$(track2)
python:
basic-setup-py: true
output-folder: $(python-sdks-folder)/datadog/azure-mgmt-datadog
```

``` yaml $(python) && $(python-mode) == 'update' && $(track2)
no-namespace-folders: true
output-folder: $(python-sdks-folder)/datadog/azure-mgmt-datadog/azure/mgmt/datadog
```

``` yaml $(python) && $(python-mode) == 'create' && $(track2)
basic-setup-py: true
output-folder: $(python-sdks-folder)/datadog/azure-mgmt-datadog
```