Skip to content

Update Azure Spec to include Resource Collection #2091

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.

Sign up for GitHub

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

Merged
api-clients-generation-pipeline merged 1 commit into from
Dec 4, 2023
Merged

Update Azure Spec to include Resource Collection #2091

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
View file
Open in desktop
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": "2023-11-21 21:47:34.013853",
"spec_repo_commit": "891a7c39"
"regenerated": "2023-12-04 14:33:54.507630",
"spec_repo_commit": "37397584"
},
"v2": {
"apigentools_version": "1.6.6",
"regenerated": "2023-11-21 21:47:34.034854",
"spec_repo_commit": "891a7c39"
"regenerated": "2023-12-04 14:33:54.534805",
"spec_repo_commit": "37397584"
}
}
}
11 changes: 9 additions & 2 deletions .generator/schemas/v1/openapi.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -808,8 +808,9 @@ components:
example: key:value,filter:example
type: string
cspm_enabled:
description: Enable Cloud Security Management Misconfigurations for your
organization.
description: "When enabled, Datadog\u2019s Cloud Security Management product
will scan resource configurations monitored by this app registration.\nNote:
This requires resource_collection_enabled to be set to true."
example: true
type: boolean
custom_metrics_enabled:
Expand Down Expand Up @@ -840,6 +841,12 @@ components:
description: Your New Azure Active Directory ID.
example: new1c44-1234-5678-9101-cc00736ftest
type: string
resource_collection_enabled:
description: When enabled, Datadog collects metadata and configuration info
from cloud resources (compute instances, databases, load balancers, etc.)
monitored by this app registration.
example: true
type: boolean
tenant_name:
description: Your Azure Active Directory ID.
example: testc44-1234-5678-9101-cc00736ftest
Expand Down
1 change: 1 addition & 0 deletions examples/v1/azure-integration/CreateAzureIntegration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ public static void main(String[] args) {
.hostFilters("key:value,filter:example")
.newClientId("new1c7f6-1234-5678-9101-3fcbf464test")
.newTenantName("new1c44-1234-5678-9101-cc00736ftest")
.resourceCollectionEnabled(true)
.tenantName("testc44-1234-5678-9101-cc00736ftest");

try {
Expand Down
1 change: 1 addition & 0 deletions examples/v1/azure-integration/DeleteAzureIntegration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ public static void main(String[] args) {
.hostFilters("key:value,filter:example")
.newClientId("new1c7f6-1234-5678-9101-3fcbf464test")
.newTenantName("new1c44-1234-5678-9101-cc00736ftest")
.resourceCollectionEnabled(true)
.tenantName("testc44-1234-5678-9101-cc00736ftest");

try {
Expand Down
1 change: 1 addition & 0 deletions examples/v1/azure-integration/UpdateAzureHostFilters.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ public static void main(String[] args) {
.hostFilters("key:value,filter:example")
.newClientId("new1c7f6-1234-5678-9101-3fcbf464test")
.newTenantName("new1c44-1234-5678-9101-cc00736ftest")
.resourceCollectionEnabled(true)
.tenantName("testc44-1234-5678-9101-cc00736ftest");

try {
Expand Down
1 change: 1 addition & 0 deletions examples/v1/azure-integration/UpdateAzureIntegration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ public static void main(String[] args) {
.hostFilters("key:value,filter:example")
.newClientId("new1c7f6-1234-5678-9101-3fcbf464test")
.newTenantName("new1c44-1234-5678-9101-cc00736ftest")
.resourceCollectionEnabled(true)
.tenantName("testc44-1234-5678-9101-cc00736ftest");

try {
Expand Down
36 changes: 35 additions & 1 deletion src/main/java/com/datadog/api/client/v1/model/AzureAccount.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@
AzureAccount.JSON_PROPERTY_HOST_FILTERS,
AzureAccount.JSON_PROPERTY_NEW_CLIENT_ID,
AzureAccount.JSON_PROPERTY_NEW_TENANT_NAME,
AzureAccount.JSON_PROPERTY_RESOURCE_COLLECTION_ENABLED,
AzureAccount.JSON_PROPERTY_TENANT_NAME
})
@jakarta.annotation.Generated(
Expand Down Expand Up @@ -70,6 +71,10 @@ public class AzureAccount {
public static final String JSON_PROPERTY_NEW_TENANT_NAME = "new_tenant_name";
private String newTenantName;

public static final String JSON_PROPERTY_RESOURCE_COLLECTION_ENABLED =
"resource_collection_enabled";
private Boolean resourceCollectionEnabled;

public static final String JSON_PROPERTY_TENANT_NAME = "tenant_name";
private String tenantName;

Expand Down Expand Up @@ -186,7 +191,9 @@ public AzureAccount cspmEnabled(Boolean cspmEnabled) {
}

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

public AzureAccount resourceCollectionEnabled(Boolean resourceCollectionEnabled) {
this.resourceCollectionEnabled = resourceCollectionEnabled;
return this;
}

/**
* When enabled, Datadog collects metadata and configuration info from cloud resources (compute
* instances, databases, load balancers, etc.) monitored by this app registration.
*
* @return resourceCollectionEnabled
*/
@jakarta.annotation.Nullable
@JsonProperty(JSON_PROPERTY_RESOURCE_COLLECTION_ENABLED)
@JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
public Boolean getResourceCollectionEnabled() {
return resourceCollectionEnabled;
}

public void setResourceCollectionEnabled(Boolean resourceCollectionEnabled) {
this.resourceCollectionEnabled = resourceCollectionEnabled;
}

public AzureAccount tenantName(String tenantName) {
this.tenantName = tenantName;
return this;
Expand Down Expand Up @@ -403,6 +432,7 @@ public boolean equals(Object o) {
&& Objects.equals(this.hostFilters, azureAccount.hostFilters)
&& Objects.equals(this.newClientId, azureAccount.newClientId)
&& Objects.equals(this.newTenantName, azureAccount.newTenantName)
&& Objects.equals(this.resourceCollectionEnabled, azureAccount.resourceCollectionEnabled)
&& Objects.equals(this.tenantName, azureAccount.tenantName)
&& Objects.equals(this.additionalProperties, azureAccount.additionalProperties);
}
Expand All @@ -421,6 +451,7 @@ public int hashCode() {
hostFilters,
newClientId,
newTenantName,
resourceCollectionEnabled,
tenantName,
additionalProperties);
}
Expand All @@ -446,6 +477,9 @@ public String toString() {
sb.append(" hostFilters: ").append(toIndentedString(hostFilters)).append("\n");
sb.append(" newClientId: ").append(toIndentedString(newClientId)).append("\n");
sb.append(" newTenantName: ").append(toIndentedString(newTenantName)).append("\n");
sb.append(" resourceCollectionEnabled: ")
.append(toIndentedString(resourceCollectionEnabled))
.append("\n");
sb.append(" tenantName: ").append(toIndentedString(tenantName)).append("\n");
sb.append(" additionalProperties: ")
.append(toIndentedString(additionalProperties))
Expand Down
36 changes: 18 additions & 18 deletions src/test/resources/com/datadog/api/client/v1/api/azure_integration.feature
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,70 +9,70 @@ Feature: Azure Integration
And a valid "appKeyAuth" key in the system
And an instance of "AzureIntegration" API

@generated @skip @team:DataDog/cloud-integrations
@generated @skip @team:DataDog/azure-integrations
Scenario: Create an Azure integration returns "Bad Request" response
Given new "CreateAzureIntegration" request
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"}
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"}
When the request is sent
Then the response status is 400 Bad Request

@generated @skip @team:DataDog/cloud-integrations
@generated @skip @team:DataDog/azure-integrations
Scenario: Create an Azure integration returns "OK" response
Given new "CreateAzureIntegration" request
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"}
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"}
When the request is sent
Then the response status is 200 OK

@generated @skip @team:DataDog/cloud-integrations
@generated @skip @team:DataDog/azure-integrations
Scenario: Delete an Azure integration returns "Bad Request" response
Given new "DeleteAzureIntegration" request
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"}
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"}
When the request is sent
Then the response status is 400 Bad Request

@generated @skip @team:DataDog/cloud-integrations
@generated @skip @team:DataDog/azure-integrations
Scenario: Delete an Azure integration returns "OK" response
Given new "DeleteAzureIntegration" request
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"}
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"}
When the request is sent
Then the response status is 200 OK

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

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

@generated @skip @team:DataDog/cloud-integrations
@generated @skip @team:DataDog/azure-integrations
Scenario: Update Azure integration host filters returns "Bad Request" response
Given new "UpdateAzureHostFilters" request
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"}
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"}
When the request is sent
Then the response status is 400 Bad Request

@generated @skip @team:DataDog/cloud-integrations
@generated @skip @team:DataDog/azure-integrations
Scenario: Update Azure integration host filters returns "OK" response
Given new "UpdateAzureHostFilters" request
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"}
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"}
When the request is sent
Then the response status is 200 OK

@generated @skip @team:DataDog/cloud-integrations
@generated @skip @team:DataDog/azure-integrations
Scenario: Update an Azure integration returns "Bad Request" response
Given new "UpdateAzureIntegration" request
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"}
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"}
When the request is sent
Then the response status is 400 Bad Request

@generated @skip @team:DataDog/cloud-integrations
@generated @skip @team:DataDog/azure-integrations
Scenario: Update an Azure integration returns "OK" response
Given new "UpdateAzureIntegration" request
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"}
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"}
When the request is sent
Then the response status is 200 OK