Skip to content

Commit 8025de2

Browse files
author
ci.datadog-api-spec
committed
Regenerate client from commit 37397584 of spec repo
1 parent a72eeff commit 8025de2

File tree

8 files changed

+70
-25
lines changed

8 files changed

+70
-25
lines changed

‎.apigentools-info‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,13 @@
44
"spec_versions": {
55
"v1": {
66
"apigentools_version": "1.6.6",
7-
"regenerated": "2023-11-21 21:47:34.013853",
8-
"spec_repo_commit": "891a7c39"
7+
"regenerated": "2023-12-04 14:33:54.507630",
8+
"spec_repo_commit": "37397584"
99
},
1010
"v2": {
1111
"apigentools_version": "1.6.6",
12-
"regenerated": "2023-11-21 21:47:34.034854",
13-
"spec_repo_commit": "891a7c39"
12+
"regenerated": "2023-12-04 14:33:54.534805",
13+
"spec_repo_commit": "37397584"
1414
}
1515
}
1616
}

‎.generator/schemas/v1/openapi.yaml‎

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -808,8 +808,9 @@ components:
808808
example: key:value,filter:example
809809
type: string
810810
cspm_enabled:
811-
description: Enable Cloud Security Management Misconfigurations for your
812-
organization.
811+
description: "When enabled, Datadog\u2019s Cloud Security Management product
812+
will scan resource configurations monitored by this app registration.\nNote:
813+
This requires resource_collection_enabled to be set to true."
813814
example: true
814815
type: boolean
815816
custom_metrics_enabled:
@@ -840,6 +841,12 @@ components:
840841
description: Your New Azure Active Directory ID.
841842
example: new1c44-1234-5678-9101-cc00736ftest
842843
type: string
844+
resource_collection_enabled:
845+
description: When enabled, Datadog collects metadata and configuration info
846+
from cloud resources (compute instances, databases, load balancers, etc.)
847+
monitored by this app registration.
848+
example: true
849+
type: boolean
843850
tenant_name:
844851
description: Your Azure Active Directory ID.
845852
example: testc44-1234-5678-9101-cc00736ftest

‎examples/v1/azure-integration/CreateAzureIntegration.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ public static void main(String[] args) {
2424
.hostFilters("key:value,filter:example")
2525
.newClientId("new1c7f6-1234-5678-9101-3fcbf464test")
2626
.newTenantName("new1c44-1234-5678-9101-cc00736ftest")
27+
.resourceCollectionEnabled(true)
2728
.tenantName("testc44-1234-5678-9101-cc00736ftest");
2829

2930
try {

‎examples/v1/azure-integration/DeleteAzureIntegration.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ public static void main(String[] args) {
2424
.hostFilters("key:value,filter:example")
2525
.newClientId("new1c7f6-1234-5678-9101-3fcbf464test")
2626
.newTenantName("new1c44-1234-5678-9101-cc00736ftest")
27+
.resourceCollectionEnabled(true)
2728
.tenantName("testc44-1234-5678-9101-cc00736ftest");
2829

2930
try {

‎examples/v1/azure-integration/UpdateAzureHostFilters.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ public static void main(String[] args) {
2424
.hostFilters("key:value,filter:example")
2525
.newClientId("new1c7f6-1234-5678-9101-3fcbf464test")
2626
.newTenantName("new1c44-1234-5678-9101-cc00736ftest")
27+
.resourceCollectionEnabled(true)
2728
.tenantName("testc44-1234-5678-9101-cc00736ftest");
2829

2930
try {

‎examples/v1/azure-integration/UpdateAzureIntegration.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ public static void main(String[] args) {
2424
.hostFilters("key:value,filter:example")
2525
.newClientId("new1c7f6-1234-5678-9101-3fcbf464test")
2626
.newTenantName("new1c44-1234-5678-9101-cc00736ftest")
27+
.resourceCollectionEnabled(true)
2728
.tenantName("testc44-1234-5678-9101-cc00736ftest");
2829

2930
try {

‎src/main/java/com/datadog/api/client/v1/model/AzureAccount.java‎

Lines changed: 35 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@
3131
AzureAccount.JSON_PROPERTY_HOST_FILTERS,
3232
AzureAccount.JSON_PROPERTY_NEW_CLIENT_ID,
3333
AzureAccount.JSON_PROPERTY_NEW_TENANT_NAME,
34+
AzureAccount.JSON_PROPERTY_RESOURCE_COLLECTION_ENABLED,
3435
AzureAccount.JSON_PROPERTY_TENANT_NAME
3536
})
3637
@jakarta.annotation.Generated(
@@ -70,6 +71,10 @@ public class AzureAccount {
7071
public static final String JSON_PROPERTY_NEW_TENANT_NAME = "new_tenant_name";
7172
private String newTenantName;
7273

74+
public static final String JSON_PROPERTY_RESOURCE_COLLECTION_ENABLED =
75+
"resource_collection_enabled";
76+
private Boolean resourceCollectionEnabled;
77+
7378
public static final String JSON_PROPERTY_TENANT_NAME = "tenant_name";
7479
private String tenantName;
7580

@@ -186,7 +191,9 @@ public AzureAccount cspmEnabled(Boolean cspmEnabled) {
186191
}
187192

188193
/**
189-
* Enable Cloud Security Management Misconfigurations for your organization.
194+
* When enabled, Datadog’s Cloud Security Management product will scan resource configurations
195+
* monitored by this app registration. Note: This requires resource_collection_enabled to be set
196+
* to true.
190197
*
191198
* @return cspmEnabled
192199
*/
@@ -315,6 +322,28 @@ public void setNewTenantName(String newTenantName) {
315322
this.newTenantName = newTenantName;
316323
}
317324

325+
public AzureAccount resourceCollectionEnabled(Boolean resourceCollectionEnabled) {
326+
this.resourceCollectionEnabled = resourceCollectionEnabled;
327+
return this;
328+
}
329+
330+
/**
331+
* When enabled, Datadog collects metadata and configuration info from cloud resources (compute
332+
* instances, databases, load balancers, etc.) monitored by this app registration.
333+
*
334+
* @return resourceCollectionEnabled
335+
*/
336+
@jakarta.annotation.Nullable
337+
@JsonProperty(JSON_PROPERTY_RESOURCE_COLLECTION_ENABLED)
338+
@JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
339+
public Boolean getResourceCollectionEnabled() {
340+
return resourceCollectionEnabled;
341+
}
342+
343+
public void setResourceCollectionEnabled(Boolean resourceCollectionEnabled) {
344+
this.resourceCollectionEnabled = resourceCollectionEnabled;
345+
}
346+
318347
public AzureAccount tenantName(String tenantName) {
319348
this.tenantName = tenantName;
320349
return this;
@@ -403,6 +432,7 @@ public boolean equals(Object o) {
403432
&& Objects.equals(this.hostFilters, azureAccount.hostFilters)
404433
&& Objects.equals(this.newClientId, azureAccount.newClientId)
405434
&& Objects.equals(this.newTenantName, azureAccount.newTenantName)
435+
&& Objects.equals(this.resourceCollectionEnabled, azureAccount.resourceCollectionEnabled)
406436
&& Objects.equals(this.tenantName, azureAccount.tenantName)
407437
&& Objects.equals(this.additionalProperties, azureAccount.additionalProperties);
408438
}
@@ -421,6 +451,7 @@ public int hashCode() {
421451
hostFilters,
422452
newClientId,
423453
newTenantName,
454+
resourceCollectionEnabled,
424455
tenantName,
425456
additionalProperties);
426457
}
@@ -446,6 +477,9 @@ public String toString() {
446477
sb.append(" hostFilters: ").append(toIndentedString(hostFilters)).append("\n");
447478
sb.append(" newClientId: ").append(toIndentedString(newClientId)).append("\n");
448479
sb.append(" newTenantName: ").append(toIndentedString(newTenantName)).append("\n");
480+
sb.append(" resourceCollectionEnabled: ")
481+
.append(toIndentedString(resourceCollectionEnabled))
482+
.append("\n");
449483
sb.append(" tenantName: ").append(toIndentedString(tenantName)).append("\n");
450484
sb.append(" additionalProperties: ")
451485
.append(toIndentedString(additionalProperties))

‎src/test/resources/com/datadog/api/client/v1/api/azure_integration.feature‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -9,70 +9,70 @@ Feature: Azure Integration
99
And a valid "appKeyAuth" key in the system
1010
And an instance of "AzureIntegration" API
1111

12-
@generated @skip @team:DataDog/cloud-integrations
12+
@generated @skip @team:DataDog/azure-integrations
1313
Scenario: Create an Azure integration returns "Bad Request" response
1414
Given new "CreateAzureIntegration" request
15-
And body with value {"app_service_plan_filters": "key:value,filter:example", "automute": true, "client_id": "testc7f6-1234-5678-9101-3fcbf464test", "client_secret": "testingx./Sw*g/Y33t..R1cH+hScMDt", "container_app_filters": "key:value,filter:example", "cspm_enabled": true, "custom_metrics_enabled": true, "errors": ["*"], "host_filters": "key:value,filter:example", "new_client_id": "new1c7f6-1234-5678-9101-3fcbf464test", "new_tenant_name": "new1c44-1234-5678-9101-cc00736ftest", "tenant_name": "testc44-1234-5678-9101-cc00736ftest"}
15+
And body with value {"app_service_plan_filters": "key:value,filter:example", "automute": true, "client_id": "testc7f6-1234-5678-9101-3fcbf464test", "client_secret": "testingx./Sw*g/Y33t..R1cH+hScMDt", "container_app_filters": "key:value,filter:example", "cspm_enabled": true, "custom_metrics_enabled": true, "errors": ["*"], "host_filters": "key:value,filter:example", "new_client_id": "new1c7f6-1234-5678-9101-3fcbf464test", "new_tenant_name": "new1c44-1234-5678-9101-cc00736ftest", "resource_collection_enabled": true, "tenant_name": "testc44-1234-5678-9101-cc00736ftest"}
1616
When the request is sent
1717
Then the response status is 400 Bad Request
1818

19-
@generated @skip @team:DataDog/cloud-integrations
19+
@generated @skip @team:DataDog/azure-integrations
2020
Scenario: Create an Azure integration returns "OK" response
2121
Given new "CreateAzureIntegration" request
22-
And body with value {"app_service_plan_filters": "key:value,filter:example", "automute": true, "client_id": "testc7f6-1234-5678-9101-3fcbf464test", "client_secret": "testingx./Sw*g/Y33t..R1cH+hScMDt", "container_app_filters": "key:value,filter:example", "cspm_enabled": true, "custom_metrics_enabled": true, "errors": ["*"], "host_filters": "key:value,filter:example", "new_client_id": "new1c7f6-1234-5678-9101-3fcbf464test", "new_tenant_name": "new1c44-1234-5678-9101-cc00736ftest", "tenant_name": "testc44-1234-5678-9101-cc00736ftest"}
22+
And body with value {"app_service_plan_filters": "key:value,filter:example", "automute": true, "client_id": "testc7f6-1234-5678-9101-3fcbf464test", "client_secret": "testingx./Sw*g/Y33t..R1cH+hScMDt", "container_app_filters": "key:value,filter:example", "cspm_enabled": true, "custom_metrics_enabled": true, "errors": ["*"], "host_filters": "key:value,filter:example", "new_client_id": "new1c7f6-1234-5678-9101-3fcbf464test", "new_tenant_name": "new1c44-1234-5678-9101-cc00736ftest", "resource_collection_enabled": true, "tenant_name": "testc44-1234-5678-9101-cc00736ftest"}
2323
When the request is sent
2424
Then the response status is 200 OK
2525

26-
@generated @skip @team:DataDog/cloud-integrations
26+
@generated @skip @team:DataDog/azure-integrations
2727
Scenario: Delete an Azure integration returns "Bad Request" response
2828
Given new "DeleteAzureIntegration" request
29-
And body with value {"app_service_plan_filters": "key:value,filter:example", "automute": true, "client_id": "testc7f6-1234-5678-9101-3fcbf464test", "client_secret": "testingx./Sw*g/Y33t..R1cH+hScMDt", "container_app_filters": "key:value,filter:example", "cspm_enabled": true, "custom_metrics_enabled": true, "errors": ["*"], "host_filters": "key:value,filter:example", "new_client_id": "new1c7f6-1234-5678-9101-3fcbf464test", "new_tenant_name": "new1c44-1234-5678-9101-cc00736ftest", "tenant_name": "testc44-1234-5678-9101-cc00736ftest"}
29+
And body with value {"app_service_plan_filters": "key:value,filter:example", "automute": true, "client_id": "testc7f6-1234-5678-9101-3fcbf464test", "client_secret": "testingx./Sw*g/Y33t..R1cH+hScMDt", "container_app_filters": "key:value,filter:example", "cspm_enabled": true, "custom_metrics_enabled": true, "errors": ["*"], "host_filters": "key:value,filter:example", "new_client_id": "new1c7f6-1234-5678-9101-3fcbf464test", "new_tenant_name": "new1c44-1234-5678-9101-cc00736ftest", "resource_collection_enabled": true, "tenant_name": "testc44-1234-5678-9101-cc00736ftest"}
3030
When the request is sent
3131
Then the response status is 400 Bad Request
3232

33-
@generated @skip @team:DataDog/cloud-integrations
33+
@generated @skip @team:DataDog/azure-integrations
3434
Scenario: Delete an Azure integration returns "OK" response
3535
Given new "DeleteAzureIntegration" request
36-
And body with value {"app_service_plan_filters": "key:value,filter:example", "automute": true, "client_id": "testc7f6-1234-5678-9101-3fcbf464test", "client_secret": "testingx./Sw*g/Y33t..R1cH+hScMDt", "container_app_filters": "key:value,filter:example", "cspm_enabled": true, "custom_metrics_enabled": true, "errors": ["*"], "host_filters": "key:value,filter:example", "new_client_id": "new1c7f6-1234-5678-9101-3fcbf464test", "new_tenant_name": "new1c44-1234-5678-9101-cc00736ftest", "tenant_name": "testc44-1234-5678-9101-cc00736ftest"}
36+
And body with value {"app_service_plan_filters": "key:value,filter:example", "automute": true, "client_id": "testc7f6-1234-5678-9101-3fcbf464test", "client_secret": "testingx./Sw*g/Y33t..R1cH+hScMDt", "container_app_filters": "key:value,filter:example", "cspm_enabled": true, "custom_metrics_enabled": true, "errors": ["*"], "host_filters": "key:value,filter:example", "new_client_id": "new1c7f6-1234-5678-9101-3fcbf464test", "new_tenant_name": "new1c44-1234-5678-9101-cc00736ftest", "resource_collection_enabled": true, "tenant_name": "testc44-1234-5678-9101-cc00736ftest"}
3737
When the request is sent
3838
Then the response status is 200 OK
3939

40-
@generated @skip @team:DataDog/cloud-integrations
40+
@generated @skip @team:DataDog/azure-integrations
4141
Scenario: List all Azure integrations returns "Bad Request" response
4242
Given new "ListAzureIntegration" request
4343
When the request is sent
4444
Then the response status is 400 Bad Request
4545

46-
@generated @skip @team:DataDog/cloud-integrations
46+
@generated @skip @team:DataDog/azure-integrations
4747
Scenario: List all Azure integrations returns "OK" response
4848
Given new "ListAzureIntegration" request
4949
When the request is sent
5050
Then the response status is 200 OK
5151

52-
@generated @skip @team:DataDog/cloud-integrations
52+
@generated @skip @team:DataDog/azure-integrations
5353
Scenario: Update Azure integration host filters returns "Bad Request" response
5454
Given new "UpdateAzureHostFilters" request
55-
And body with value {"app_service_plan_filters": "key:value,filter:example", "automute": true, "client_id": "testc7f6-1234-5678-9101-3fcbf464test", "client_secret": "testingx./Sw*g/Y33t..R1cH+hScMDt", "container_app_filters": "key:value,filter:example", "cspm_enabled": true, "custom_metrics_enabled": true, "errors": ["*"], "host_filters": "key:value,filter:example", "new_client_id": "new1c7f6-1234-5678-9101-3fcbf464test", "new_tenant_name": "new1c44-1234-5678-9101-cc00736ftest", "tenant_name": "testc44-1234-5678-9101-cc00736ftest"}
55+
And body with value {"app_service_plan_filters": "key:value,filter:example", "automute": true, "client_id": "testc7f6-1234-5678-9101-3fcbf464test", "client_secret": "testingx./Sw*g/Y33t..R1cH+hScMDt", "container_app_filters": "key:value,filter:example", "cspm_enabled": true, "custom_metrics_enabled": true, "errors": ["*"], "host_filters": "key:value,filter:example", "new_client_id": "new1c7f6-1234-5678-9101-3fcbf464test", "new_tenant_name": "new1c44-1234-5678-9101-cc00736ftest", "resource_collection_enabled": true, "tenant_name": "testc44-1234-5678-9101-cc00736ftest"}
5656
When the request is sent
5757
Then the response status is 400 Bad Request
5858

59-
@generated @skip @team:DataDog/cloud-integrations
59+
@generated @skip @team:DataDog/azure-integrations
6060
Scenario: Update Azure integration host filters returns "OK" response
6161
Given new "UpdateAzureHostFilters" request
62-
And body with value {"app_service_plan_filters": "key:value,filter:example", "automute": true, "client_id": "testc7f6-1234-5678-9101-3fcbf464test", "client_secret": "testingx./Sw*g/Y33t..R1cH+hScMDt", "container_app_filters": "key:value,filter:example", "cspm_enabled": true, "custom_metrics_enabled": true, "errors": ["*"], "host_filters": "key:value,filter:example", "new_client_id": "new1c7f6-1234-5678-9101-3fcbf464test", "new_tenant_name": "new1c44-1234-5678-9101-cc00736ftest", "tenant_name": "testc44-1234-5678-9101-cc00736ftest"}
62+
And body with value {"app_service_plan_filters": "key:value,filter:example", "automute": true, "client_id": "testc7f6-1234-5678-9101-3fcbf464test", "client_secret": "testingx./Sw*g/Y33t..R1cH+hScMDt", "container_app_filters": "key:value,filter:example", "cspm_enabled": true, "custom_metrics_enabled": true, "errors": ["*"], "host_filters": "key:value,filter:example", "new_client_id": "new1c7f6-1234-5678-9101-3fcbf464test", "new_tenant_name": "new1c44-1234-5678-9101-cc00736ftest", "resource_collection_enabled": true, "tenant_name": "testc44-1234-5678-9101-cc00736ftest"}
6363
When the request is sent
6464
Then the response status is 200 OK
6565

66-
@generated @skip @team:DataDog/cloud-integrations
66+
@generated @skip @team:DataDog/azure-integrations
6767
Scenario: Update an Azure integration returns "Bad Request" response
6868
Given new "UpdateAzureIntegration" request
69-
And body with value {"app_service_plan_filters": "key:value,filter:example", "automute": true, "client_id": "testc7f6-1234-5678-9101-3fcbf464test", "client_secret": "testingx./Sw*g/Y33t..R1cH+hScMDt", "container_app_filters": "key:value,filter:example", "cspm_enabled": true, "custom_metrics_enabled": true, "errors": ["*"], "host_filters": "key:value,filter:example", "new_client_id": "new1c7f6-1234-5678-9101-3fcbf464test", "new_tenant_name": "new1c44-1234-5678-9101-cc00736ftest", "tenant_name": "testc44-1234-5678-9101-cc00736ftest"}
69+
And body with value {"app_service_plan_filters": "key:value,filter:example", "automute": true, "client_id": "testc7f6-1234-5678-9101-3fcbf464test", "client_secret": "testingx./Sw*g/Y33t..R1cH+hScMDt", "container_app_filters": "key:value,filter:example", "cspm_enabled": true, "custom_metrics_enabled": true, "errors": ["*"], "host_filters": "key:value,filter:example", "new_client_id": "new1c7f6-1234-5678-9101-3fcbf464test", "new_tenant_name": "new1c44-1234-5678-9101-cc00736ftest", "resource_collection_enabled": true, "tenant_name": "testc44-1234-5678-9101-cc00736ftest"}
7070
When the request is sent
7171
Then the response status is 400 Bad Request
7272

73-
@generated @skip @team:DataDog/cloud-integrations
73+
@generated @skip @team:DataDog/azure-integrations
7474
Scenario: Update an Azure integration returns "OK" response
7575
Given new "UpdateAzureIntegration" request
76-
And body with value {"app_service_plan_filters": "key:value,filter:example", "automute": true, "client_id": "testc7f6-1234-5678-9101-3fcbf464test", "client_secret": "testingx./Sw*g/Y33t..R1cH+hScMDt", "container_app_filters": "key:value,filter:example", "cspm_enabled": true, "custom_metrics_enabled": true, "errors": ["*"], "host_filters": "key:value,filter:example", "new_client_id": "new1c7f6-1234-5678-9101-3fcbf464test", "new_tenant_name": "new1c44-1234-5678-9101-cc00736ftest", "tenant_name": "testc44-1234-5678-9101-cc00736ftest"}
76+
And body with value {"app_service_plan_filters": "key:value,filter:example", "automute": true, "client_id": "testc7f6-1234-5678-9101-3fcbf464test", "client_secret": "testingx./Sw*g/Y33t..R1cH+hScMDt", "container_app_filters": "key:value,filter:example", "cspm_enabled": true, "custom_metrics_enabled": true, "errors": ["*"], "host_filters": "key:value,filter:example", "new_client_id": "new1c7f6-1234-5678-9101-3fcbf464test", "new_tenant_name": "new1c44-1234-5678-9101-cc00736ftest", "resource_collection_enabled": true, "tenant_name": "testc44-1234-5678-9101-cc00736ftest"}
7777
When the request is sent
7878
Then the response status is 200 OK

0 commit comments

Comments
 (0)