Skip to content

Commit 5533979

Browse files
author
ci.datadog-api-spec
committed
Regenerate client from commit 1eecd04 of spec repo
1 parent 1fda269 commit 5533979

8 files changed

Lines changed: 48 additions & 10 deletions

File tree

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -791,6 +791,11 @@ components:
791791
items:
792792
$ref: "#/components/schemas/ResourceProviderConfig"
793793
type: array
794+
secretless_auth_enabled:
795+
description: |-
796+
When enabled, Datadog authenticates with this app registration using federated workload identity credentials instead of a client secret.
797+
example: true
798+
type: boolean
794799
tenant_name:
795800
description: Your Azure Active Directory ID.
796801
example: "testc44-1234-5678-9101-cc00736ftest"

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ public static void main(String[] args) {
3333
new ResourceProviderConfig()
3434
.metricsEnabled(true)
3535
.namespace("Microsoft.Compute")))
36+
.secretlessAuthEnabled(true)
3637
.tenantName("testc44-1234-5678-9101-cc00736ftest")
3738
.usageMetricsEnabled(true);
3839

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ public static void main(String[] args) {
2525
.newClientId("9b1deb4d-3b7d-4bad-9bdd-2b0d7b3dcb6d")
2626
.newTenantName("9b1deb4d-3b7d-4bad-9bdd-2b0d7b3dcb6d")
2727
.resourceCollectionEnabled(true)
28+
.secretlessAuthEnabled(true)
2829
.tenantName("9b1deb4d-3b7d-4bad-9bdd-2b0d7b3dcb6d");
2930

3031
try {

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

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@
3535
AzureAccount.JSON_PROPERTY_NEW_TENANT_NAME,
3636
AzureAccount.JSON_PROPERTY_RESOURCE_COLLECTION_ENABLED,
3737
AzureAccount.JSON_PROPERTY_RESOURCE_PROVIDER_CONFIGS,
38+
AzureAccount.JSON_PROPERTY_SECRETLESS_AUTH_ENABLED,
3839
AzureAccount.JSON_PROPERTY_TENANT_NAME,
3940
AzureAccount.JSON_PROPERTY_USAGE_METRICS_ENABLED
4041
})
@@ -88,6 +89,9 @@ public class AzureAccount {
8889
public static final String JSON_PROPERTY_RESOURCE_PROVIDER_CONFIGS = "resource_provider_configs";
8990
private List<ResourceProviderConfig> resourceProviderConfigs = null;
9091

92+
public static final String JSON_PROPERTY_SECRETLESS_AUTH_ENABLED = "secretless_auth_enabled";
93+
private Boolean secretlessAuthEnabled;
94+
9195
public static final String JSON_PROPERTY_TENANT_NAME = "tenant_name";
9296
private String tenantName;
9397

@@ -438,6 +442,28 @@ public void setResourceProviderConfigs(List<ResourceProviderConfig> resourceProv
438442
this.resourceProviderConfigs = resourceProviderConfigs;
439443
}
440444

445+
public AzureAccount secretlessAuthEnabled(Boolean secretlessAuthEnabled) {
446+
this.secretlessAuthEnabled = secretlessAuthEnabled;
447+
return this;
448+
}
449+
450+
/**
451+
* When enabled, Datadog authenticates with this app registration using federated workload
452+
* identity credentials instead of a client secret.
453+
*
454+
* @return secretlessAuthEnabled
455+
*/
456+
@jakarta.annotation.Nullable
457+
@JsonProperty(JSON_PROPERTY_SECRETLESS_AUTH_ENABLED)
458+
@JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
459+
public Boolean getSecretlessAuthEnabled() {
460+
return secretlessAuthEnabled;
461+
}
462+
463+
public void setSecretlessAuthEnabled(Boolean secretlessAuthEnabled) {
464+
this.secretlessAuthEnabled = secretlessAuthEnabled;
465+
}
466+
441467
public AzureAccount tenantName(String tenantName) {
442468
this.tenantName = tenantName;
443469
return this;
@@ -551,6 +577,7 @@ public boolean equals(Object o) {
551577
&& Objects.equals(this.newTenantName, azureAccount.newTenantName)
552578
&& Objects.equals(this.resourceCollectionEnabled, azureAccount.resourceCollectionEnabled)
553579
&& Objects.equals(this.resourceProviderConfigs, azureAccount.resourceProviderConfigs)
580+
&& Objects.equals(this.secretlessAuthEnabled, azureAccount.secretlessAuthEnabled)
554581
&& Objects.equals(this.tenantName, azureAccount.tenantName)
555582
&& Objects.equals(this.usageMetricsEnabled, azureAccount.usageMetricsEnabled)
556583
&& Objects.equals(this.additionalProperties, azureAccount.additionalProperties);
@@ -574,6 +601,7 @@ public int hashCode() {
574601
newTenantName,
575602
resourceCollectionEnabled,
576603
resourceProviderConfigs,
604+
secretlessAuthEnabled,
577605
tenantName,
578606
usageMetricsEnabled,
579607
additionalProperties);
@@ -610,6 +638,9 @@ public String toString() {
610638
sb.append(" resourceProviderConfigs: ")
611639
.append(toIndentedString(resourceProviderConfigs))
612640
.append("\n");
641+
sb.append(" secretlessAuthEnabled: ")
642+
.append(toIndentedString(secretlessAuthEnabled))
643+
.append("\n");
613644
sb.append(" tenantName: ").append(toIndentedString(tenantName)).append("\n");
614645
sb.append(" usageMetricsEnabled: ")
615646
.append(toIndentedString(usageMetricsEnabled))

‎src/test/resources/cassettes/features/v1/Delete_an_Azure_integration_returns_OK_response.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"httpRequest": {
44
"body": {
55
"type": "JSON",
6-
"json": "{\"app_service_plan_filters\":\"key:value,filter:example\",\"automute\":true,\"client_id\":\"17344717-0000-0000-0000-173447178000\",\"client_secret\":\"TestingRh2nx664kUy5dIApvM54T4AtO\",\"container_app_filters\":\"key:value,filter:example\",\"cspm_enabled\":true,\"custom_metrics_enabled\":true,\"errors\":[\"*\"],\"host_filters\":\"key:value,filter:example\",\"metrics_enabled\":true,\"metrics_enabled_default\":true,\"new_client_id\":\"17344717-0000-0000-0000-173447178000\",\"new_tenant_name\":\"17344717-0000-0000-0000-173447178000\",\"resource_collection_enabled\":true,\"resource_provider_configs\":[{\"metrics_enabled\":false,\"namespace\":\"Microsoft.Compute\"},{\"metrics_enabled\":false,\"namespace\":\"Microsoft.Web\"}],\"tenant_name\":\"17344717-0000-0000-0000-173447178000\",\"usage_metrics_enabled\":true}"
6+
"json": "{\"app_service_plan_filters\":\"key:value,filter:example\",\"automute\":true,\"client_id\":\"17344717-0000-0000-0000-173447178000\",\"client_secret\":\"TestingRh2nx664kUy5dIApvM54T4AtO\",\"container_app_filters\":\"key:value,filter:example\",\"cspm_enabled\":true,\"custom_metrics_enabled\":true,\"errors\":[\"*\"],\"host_filters\":\"key:value,filter:example\",\"metrics_enabled\":true,\"metrics_enabled_default\":true,\"new_client_id\":\"17344717-0000-0000-0000-173447178000\",\"new_tenant_name\":\"17344717-0000-0000-0000-173447178000\",\"resource_collection_enabled\":true,\"resource_provider_configs\":[{\"metrics_enabled\":false,\"namespace\":\"Microsoft.Compute\"},{\"metrics_enabled\":false,\"namespace\":\"Microsoft.Web\"}],\"secretless_auth_enabled\":false,\"tenant_name\":\"17344717-0000-0000-0000-173447178000\",\"usage_metrics_enabled\":true}"
77
},
88
"headers": {},
99
"method": "POST",

‎src/test/resources/cassettes/features/v1/Update_an_Azure_integration_returns_OK_response.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"httpRequest": {
44
"body": {
55
"type": "JSON",
6-
"json": "{\"app_service_plan_filters\":\"key:value,filter:example\",\"automute\":true,\"client_id\":\"17344717-0000-0000-0000-173447178100\",\"client_secret\":\"TestingRh2nx664kUy5dIApvM54T4AtO\",\"container_app_filters\":\"key:value,filter:example\",\"cspm_enabled\":true,\"custom_metrics_enabled\":true,\"errors\":[\"*\"],\"host_filters\":\"key:value,filter:example\",\"metrics_enabled\":true,\"metrics_enabled_default\":true,\"new_client_id\":\"17344717-0000-0000-0000-173447178100\",\"new_tenant_name\":\"17344717-0000-0000-0000-173447178100\",\"resource_collection_enabled\":true,\"resource_provider_configs\":[{\"metrics_enabled\":false,\"namespace\":\"Microsoft.Compute\"},{\"metrics_enabled\":false,\"namespace\":\"Microsoft.Web\"}],\"tenant_name\":\"17344717-0000-0000-0000-173447178100\",\"usage_metrics_enabled\":true}"
6+
"json": "{\"app_service_plan_filters\":\"key:value,filter:example\",\"automute\":true,\"client_id\":\"17344717-0000-0000-0000-173447178100\",\"client_secret\":\"TestingRh2nx664kUy5dIApvM54T4AtO\",\"container_app_filters\":\"key:value,filter:example\",\"cspm_enabled\":true,\"custom_metrics_enabled\":true,\"errors\":[\"*\"],\"host_filters\":\"key:value,filter:example\",\"metrics_enabled\":true,\"metrics_enabled_default\":true,\"new_client_id\":\"17344717-0000-0000-0000-173447178100\",\"new_tenant_name\":\"17344717-0000-0000-0000-173447178100\",\"resource_collection_enabled\":true,\"resource_provider_configs\":[{\"metrics_enabled\":false,\"namespace\":\"Microsoft.Compute\"},{\"metrics_enabled\":false,\"namespace\":\"Microsoft.Web\"}],\"secretless_auth_enabled\":false,\"tenant_name\":\"17344717-0000-0000-0000-173447178100\",\"usage_metrics_enabled\":true}"
77
},
88
"headers": {},
99
"method": "POST",
@@ -33,7 +33,7 @@
3333
"httpRequest": {
3434
"body": {
3535
"type": "JSON",
36-
"json": "{\"app_service_plan_filters\":\"key:value,filter:example\",\"automute\":true,\"client_id\":\"17344717-0000-0000-0000-173447178100\",\"client_secret\":\"TestingRh2nx664kUy5dIApvM54T4AtO\",\"container_app_filters\":\"key:value,filter:example\",\"cspm_enabled\":true,\"custom_metrics_enabled\":true,\"errors\":[\"*\"],\"host_filters\":\"key:value,filter:example\",\"new_client_id\":\"17344717-0000-0000-0000-173447178100\",\"new_tenant_name\":\"17344717-0000-0000-0000-173447178100\",\"resource_collection_enabled\":true,\"tenant_name\":\"17344717-0000-0000-0000-173447178100\"}"
36+
"json": "{\"app_service_plan_filters\":\"key:value,filter:example\",\"automute\":true,\"client_id\":\"17344717-0000-0000-0000-173447178100\",\"client_secret\":\"TestingRh2nx664kUy5dIApvM54T4AtO\",\"container_app_filters\":\"key:value,filter:example\",\"cspm_enabled\":true,\"custom_metrics_enabled\":true,\"errors\":[\"*\"],\"host_filters\":\"key:value,filter:example\",\"new_client_id\":\"17344717-0000-0000-0000-173447178100\",\"new_tenant_name\":\"17344717-0000-0000-0000-173447178100\",\"resource_collection_enabled\":true,\"secretless_auth_enabled\":true,\"tenant_name\":\"17344717-0000-0000-0000-173447178100\"}"
3737
},
3838
"headers": {},
3939
"method": "PUT",

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ Feature: Azure Integration
1212
@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": "TestingRh2nx664kUy5dIApvM54T4AtO", "container_app_filters": "key:value,filter:example", "cspm_enabled": true, "custom_metrics_enabled": true, "errors": ["*"], "host_filters": "key:value,filter:example", "metrics_enabled": true, "metrics_enabled_default": true, "new_client_id": "new1c7f6-1234-5678-9101-3fcbf464test", "new_tenant_name": "new1c44-1234-5678-9101-cc00736ftest", "resource_collection_enabled": true, "resource_provider_configs": [{"metrics_enabled": true, "namespace": "Microsoft.Compute"}], "tenant_name": "testc44-1234-5678-9101-cc00736ftest", "usage_metrics_enabled": true}
15+
And body with value {"app_service_plan_filters": "key:value,filter:example", "automute": true, "client_id": "testc7f6-1234-5678-9101-3fcbf464test", "client_secret": "TestingRh2nx664kUy5dIApvM54T4AtO", "container_app_filters": "key:value,filter:example", "cspm_enabled": true, "custom_metrics_enabled": true, "errors": ["*"], "host_filters": "key:value,filter:example", "metrics_enabled": true, "metrics_enabled_default": true, "new_client_id": "new1c7f6-1234-5678-9101-3fcbf464test", "new_tenant_name": "new1c44-1234-5678-9101-cc00736ftest", "resource_collection_enabled": true, "resource_provider_configs": [{"metrics_enabled": true, "namespace": "Microsoft.Compute"}], "secretless_auth_enabled": true, "tenant_name": "testc44-1234-5678-9101-cc00736ftest", "usage_metrics_enabled": true}
1616
When the request is sent
1717
Then the response status is 400 Bad Request
1818

@@ -26,7 +26,7 @@ Feature: Azure Integration
2626
@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": "TestingRh2nx664kUy5dIApvM54T4AtO", "container_app_filters": "key:value,filter:example", "cspm_enabled": true, "custom_metrics_enabled": true, "errors": ["*"], "host_filters": "key:value,filter:example", "metrics_enabled": true, "metrics_enabled_default": true, "new_client_id": "new1c7f6-1234-5678-9101-3fcbf464test", "new_tenant_name": "new1c44-1234-5678-9101-cc00736ftest", "resource_collection_enabled": true, "resource_provider_configs": [{"metrics_enabled": true, "namespace": "Microsoft.Compute"}], "tenant_name": "testc44-1234-5678-9101-cc00736ftest", "usage_metrics_enabled": true}
29+
And body with value {"app_service_plan_filters": "key:value,filter:example", "automute": true, "client_id": "testc7f6-1234-5678-9101-3fcbf464test", "client_secret": "TestingRh2nx664kUy5dIApvM54T4AtO", "container_app_filters": "key:value,filter:example", "cspm_enabled": true, "custom_metrics_enabled": true, "errors": ["*"], "host_filters": "key:value,filter:example", "metrics_enabled": true, "metrics_enabled_default": true, "new_client_id": "new1c7f6-1234-5678-9101-3fcbf464test", "new_tenant_name": "new1c44-1234-5678-9101-cc00736ftest", "resource_collection_enabled": true, "resource_provider_configs": [{"metrics_enabled": true, "namespace": "Microsoft.Compute"}], "secretless_auth_enabled": true, "tenant_name": "testc44-1234-5678-9101-cc00736ftest", "usage_metrics_enabled": true}
3030
When the request is sent
3131
Then the response status is 400 Bad Request
3232

@@ -53,28 +53,28 @@ Feature: Azure Integration
5353
@generated @skip @team:DataDog/azure-integrations
5454
Scenario: Update Azure integration host filters returns "Bad Request" response
5555
Given new "UpdateAzureHostFilters" request
56-
And body with value {"app_service_plan_filters": "key:value,filter:example", "automute": true, "client_id": "testc7f6-1234-5678-9101-3fcbf464test", "client_secret": "TestingRh2nx664kUy5dIApvM54T4AtO", "container_app_filters": "key:value,filter:example", "cspm_enabled": true, "custom_metrics_enabled": true, "errors": ["*"], "host_filters": "key:value,filter:example", "metrics_enabled": true, "metrics_enabled_default": true, "new_client_id": "new1c7f6-1234-5678-9101-3fcbf464test", "new_tenant_name": "new1c44-1234-5678-9101-cc00736ftest", "resource_collection_enabled": true, "resource_provider_configs": [{"metrics_enabled": true, "namespace": "Microsoft.Compute"}], "tenant_name": "testc44-1234-5678-9101-cc00736ftest", "usage_metrics_enabled": true}
56+
And body with value {"app_service_plan_filters": "key:value,filter:example", "automute": true, "client_id": "testc7f6-1234-5678-9101-3fcbf464test", "client_secret": "TestingRh2nx664kUy5dIApvM54T4AtO", "container_app_filters": "key:value,filter:example", "cspm_enabled": true, "custom_metrics_enabled": true, "errors": ["*"], "host_filters": "key:value,filter:example", "metrics_enabled": true, "metrics_enabled_default": true, "new_client_id": "new1c7f6-1234-5678-9101-3fcbf464test", "new_tenant_name": "new1c44-1234-5678-9101-cc00736ftest", "resource_collection_enabled": true, "resource_provider_configs": [{"metrics_enabled": true, "namespace": "Microsoft.Compute"}], "secretless_auth_enabled": true, "tenant_name": "testc44-1234-5678-9101-cc00736ftest", "usage_metrics_enabled": true}
5757
When the request is sent
5858
Then the response status is 400 Bad Request
5959

6060
@generated @skip @team:DataDog/azure-integrations
6161
Scenario: Update Azure integration host filters returns "OK" response
6262
Given new "UpdateAzureHostFilters" request
63-
And body with value {"app_service_plan_filters": "key:value,filter:example", "automute": true, "client_id": "testc7f6-1234-5678-9101-3fcbf464test", "client_secret": "TestingRh2nx664kUy5dIApvM54T4AtO", "container_app_filters": "key:value,filter:example", "cspm_enabled": true, "custom_metrics_enabled": true, "errors": ["*"], "host_filters": "key:value,filter:example", "metrics_enabled": true, "metrics_enabled_default": true, "new_client_id": "new1c7f6-1234-5678-9101-3fcbf464test", "new_tenant_name": "new1c44-1234-5678-9101-cc00736ftest", "resource_collection_enabled": true, "resource_provider_configs": [{"metrics_enabled": true, "namespace": "Microsoft.Compute"}], "tenant_name": "testc44-1234-5678-9101-cc00736ftest", "usage_metrics_enabled": true}
63+
And body with value {"app_service_plan_filters": "key:value,filter:example", "automute": true, "client_id": "testc7f6-1234-5678-9101-3fcbf464test", "client_secret": "TestingRh2nx664kUy5dIApvM54T4AtO", "container_app_filters": "key:value,filter:example", "cspm_enabled": true, "custom_metrics_enabled": true, "errors": ["*"], "host_filters": "key:value,filter:example", "metrics_enabled": true, "metrics_enabled_default": true, "new_client_id": "new1c7f6-1234-5678-9101-3fcbf464test", "new_tenant_name": "new1c44-1234-5678-9101-cc00736ftest", "resource_collection_enabled": true, "resource_provider_configs": [{"metrics_enabled": true, "namespace": "Microsoft.Compute"}], "secretless_auth_enabled": true, "tenant_name": "testc44-1234-5678-9101-cc00736ftest", "usage_metrics_enabled": true}
6464
When the request is sent
6565
Then the response status is 200 OK
6666

6767
@generated @skip @team:DataDog/azure-integrations
6868
Scenario: Update an Azure integration returns "Bad Request" response
6969
Given new "UpdateAzureIntegration" request
70-
And body with value {"app_service_plan_filters": "key:value,filter:example", "automute": true, "client_id": "testc7f6-1234-5678-9101-3fcbf464test", "client_secret": "TestingRh2nx664kUy5dIApvM54T4AtO", "container_app_filters": "key:value,filter:example", "cspm_enabled": true, "custom_metrics_enabled": true, "errors": ["*"], "host_filters": "key:value,filter:example", "metrics_enabled": true, "metrics_enabled_default": true, "new_client_id": "new1c7f6-1234-5678-9101-3fcbf464test", "new_tenant_name": "new1c44-1234-5678-9101-cc00736ftest", "resource_collection_enabled": true, "resource_provider_configs": [{"metrics_enabled": true, "namespace": "Microsoft.Compute"}], "tenant_name": "testc44-1234-5678-9101-cc00736ftest", "usage_metrics_enabled": true}
70+
And body with value {"app_service_plan_filters": "key:value,filter:example", "automute": true, "client_id": "testc7f6-1234-5678-9101-3fcbf464test", "client_secret": "TestingRh2nx664kUy5dIApvM54T4AtO", "container_app_filters": "key:value,filter:example", "cspm_enabled": true, "custom_metrics_enabled": true, "errors": ["*"], "host_filters": "key:value,filter:example", "metrics_enabled": true, "metrics_enabled_default": true, "new_client_id": "new1c7f6-1234-5678-9101-3fcbf464test", "new_tenant_name": "new1c44-1234-5678-9101-cc00736ftest", "resource_collection_enabled": true, "resource_provider_configs": [{"metrics_enabled": true, "namespace": "Microsoft.Compute"}], "secretless_auth_enabled": true, "tenant_name": "testc44-1234-5678-9101-cc00736ftest", "usage_metrics_enabled": true}
7171
When the request is sent
7272
Then the response status is 400 Bad Request
7373

7474
@team:DataDog/azure-integrations
7575
Scenario: Update an Azure integration returns "OK" response
7676
Given there is a valid "azure_account" in the system
7777
And new "UpdateAzureIntegration" request
78-
And body with value {"app_service_plan_filters": "key:value,filter:example", "automute": true, "client_id": "{{ uuid }}", "client_secret": "TestingRh2nx664kUy5dIApvM54T4AtO", "container_app_filters": "key:value,filter:example", "cspm_enabled": true, "custom_metrics_enabled": true, "errors": ["*"], "host_filters": "key:value,filter:example", "new_client_id": "{{ uuid }}", "new_tenant_name": "{{ uuid }}", "resource_collection_enabled": true, "tenant_name": "{{ uuid }}"}
78+
And body with value {"app_service_plan_filters": "key:value,filter:example", "automute": true, "client_id": "{{ uuid }}", "client_secret": "TestingRh2nx664kUy5dIApvM54T4AtO", "container_app_filters": "key:value,filter:example", "cspm_enabled": true, "custom_metrics_enabled": true, "errors": ["*"], "host_filters": "key:value,filter:example", "new_client_id": "{{ uuid }}", "new_tenant_name": "{{ uuid }}", "resource_collection_enabled": true, "secretless_auth_enabled": true, "tenant_name": "{{ uuid }}"}
7979
When the request is sent
8080
Then the response status is 200 OK

0 commit comments

Comments
 (0)