Skip to content

Wire pup CLI generation into the client generation pipeline #4649

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

Closed
api-clients-generation-pipeline wants to merge 1 commit into from
Closed

Wire pup CLI generation into the client generation pipeline #4649

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
527 changes: 61 additions & 466 deletions .generator/schemas/v2/openapi.yaml
View file
Open in desktop

Large diffs are not rendered by default.

9 changes: 1 addition & 8 deletions examples/v2/security-monitoring/CreateSecurityMonitoringIntegrationConfig.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,14 +19,7 @@ const params: v2.SecurityMonitoringApiCreateSecurityMonitoringIntegrationConfigR
integrationType: "GOOGLE_WORKSPACE",
name: "My GWS Integration",
secrets: {
adminEmail: "admin@example.com",
serviceAccountJson: {
clientEmail: "svc@my-project.iam.gserviceaccount.com",
privateKey:
"-----BEGIN PRIVATE KEY-----\n...\n-----END PRIVATE KEY-----",
projectId: "my-project",
type: "service_account",
},
admin_email: "test@example.com",
},
settings: {
setting1: "value1",
Expand Down
9 changes: 1 addition & 8 deletions examples/v2/security-monitoring/UpdateSecurityMonitoringIntegrationConfig.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,14 +20,7 @@ const params: v2.SecurityMonitoringApiUpdateSecurityMonitoringIntegrationConfigR
integrationType: "GOOGLE_WORKSPACE",
name: "My GWS Integration (renamed)",
secrets: {
adminEmail: "admin@example.com",
serviceAccountJson: {
clientEmail: "svc@my-project.iam.gserviceaccount.com",
privateKey:
"-----BEGIN PRIVATE KEY-----\n...\n-----END PRIVATE KEY-----",
projectId: "my-project",
type: "service_account",
},
admin_email: "test@example.com",
},
settings: {
setting1: "value1",
Expand Down
9 changes: 1 addition & 8 deletions examples/v2/security-monitoring/ValidateSecurityMonitoringIntegrationCredentials.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,14 +18,7 @@ const params: v2.SecurityMonitoringApiValidateSecurityMonitoringIntegrationCrede
domain: "siem-test.com",
integrationType: "GOOGLE_WORKSPACE",
secrets: {
adminEmail: "admin@example.com",
serviceAccountJson: {
clientEmail: "svc@my-project.iam.gserviceaccount.com",
privateKey:
"-----BEGIN PRIVATE KEY-----\n...\n-----END PRIVATE KEY-----",
projectId: "my-project",
type: "service_account",
},
admin_email: "test@example.com",
},
},
type: "integration_config",
Expand Down
14 changes: 7 additions & 7 deletions features/v2/security_monitoring.feature
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1024,15 +1024,15 @@ Feature: Security Monitoring
Scenario: Create an entity context sync configuration returns "Bad Request" response
Given operation "CreateSecurityMonitoringIntegrationConfig" enabled
And new "CreateSecurityMonitoringIntegrationConfig" request
And body with value {"data": {"attributes": {"domain": "siem-test.com", "integration_type": "GOOGLE_WORKSPACE", "name": "My GWS Integration", "secrets": {"admin_email": "admin@example.com", "service_account_json": {"client_email": "svc@my-project.iam.gserviceaccount.com", "private_key": "-----BEGIN PRIVATE KEY-----\n...\n-----END PRIVATE KEY-----", "project_id": "my-project", "type": "service_account"}}, "settings": {"setting1": "value1"}}, "type": "integration_config"}}
And body with value {"data": {"attributes": {"domain": "siem-test.com", "integration_type": "GOOGLE_WORKSPACE", "name": "My GWS Integration", "secrets": {"admin_email": "test@example.com"}, "settings": {"setting1": "value1"}}, "type": "integration_config"}}
When the request is sent
Then the response status is 400 Bad Request

@generated @skip @team:DataDog/cloud-siem
Scenario: Create an entity context sync configuration returns "OK" response
Given operation "CreateSecurityMonitoringIntegrationConfig" enabled
And new "CreateSecurityMonitoringIntegrationConfig" request
And body with value {"data": {"attributes": {"domain": "siem-test.com", "integration_type": "GOOGLE_WORKSPACE", "name": "My GWS Integration", "secrets": {"admin_email": "admin@example.com", "service_account_json": {"client_email": "svc@my-project.iam.gserviceaccount.com", "private_key": "-----BEGIN PRIVATE KEY-----\n...\n-----END PRIVATE KEY-----", "project_id": "my-project", "type": "service_account"}}, "settings": {"setting1": "value1"}}, "type": "integration_config"}}
And body with value {"data": {"attributes": {"domain": "siem-test.com", "integration_type": "GOOGLE_WORKSPACE", "name": "My GWS Integration", "secrets": {"admin_email": "test@example.com"}, "settings": {"setting1": "value1"}}, "type": "integration_config"}}
When the request is sent
Then the response status is 200 OK

Expand Down Expand Up @@ -3476,7 +3476,7 @@ Feature: Security Monitoring
Given operation "UpdateSecurityMonitoringIntegrationConfig" enabled
And new "UpdateSecurityMonitoringIntegrationConfig" request
And request contains "integration_config_id" parameter from "REPLACE.ME"
And body with value {"data": {"attributes": {"domain": "siem-test.com", "enabled": true, "integration_type": "GOOGLE_WORKSPACE", "name": "My GWS Integration (renamed)", "secrets": {"admin_email": "admin@example.com", "service_account_json": {"client_email": "svc@my-project.iam.gserviceaccount.com", "private_key": "-----BEGIN PRIVATE KEY-----\n...\n-----END PRIVATE KEY-----", "project_id": "my-project", "type": "service_account"}}, "settings": {"setting1": "value1"}}, "type": "integration_config"}}
And body with value {"data": {"attributes": {"domain": "siem-test.com", "enabled": true, "integration_type": "GOOGLE_WORKSPACE", "name": "My GWS Integration (renamed)", "secrets": {"admin_email": "test@example.com"}, "settings": {"setting1": "value1"}}, "type": "integration_config"}}
When the request is sent
Then the response status is 400 Bad Request

Expand All @@ -3485,7 +3485,7 @@ Feature: Security Monitoring
Given operation "UpdateSecurityMonitoringIntegrationConfig" enabled
And new "UpdateSecurityMonitoringIntegrationConfig" request
And request contains "integration_config_id" parameter from "REPLACE.ME"
And body with value {"data": {"attributes": {"domain": "siem-test.com", "enabled": true, "integration_type": "GOOGLE_WORKSPACE", "name": "My GWS Integration (renamed)", "secrets": {"admin_email": "admin@example.com", "service_account_json": {"client_email": "svc@my-project.iam.gserviceaccount.com", "private_key": "-----BEGIN PRIVATE KEY-----\n...\n-----END PRIVATE KEY-----", "project_id": "my-project", "type": "service_account"}}, "settings": {"setting1": "value1"}}, "type": "integration_config"}}
And body with value {"data": {"attributes": {"domain": "siem-test.com", "enabled": true, "integration_type": "GOOGLE_WORKSPACE", "name": "My GWS Integration (renamed)", "secrets": {"admin_email": "test@example.com"}, "settings": {"setting1": "value1"}}, "type": "integration_config"}}
When the request is sent
Then the response status is 404 Not Found

Expand All @@ -3494,7 +3494,7 @@ Feature: Security Monitoring
Given operation "UpdateSecurityMonitoringIntegrationConfig" enabled
And new "UpdateSecurityMonitoringIntegrationConfig" request
And request contains "integration_config_id" parameter from "REPLACE.ME"
And body with value {"data": {"attributes": {"domain": "siem-test.com", "enabled": true, "integration_type": "GOOGLE_WORKSPACE", "name": "My GWS Integration (renamed)", "secrets": {"admin_email": "admin@example.com", "service_account_json": {"client_email": "svc@my-project.iam.gserviceaccount.com", "private_key": "-----BEGIN PRIVATE KEY-----\n...\n-----END PRIVATE KEY-----", "project_id": "my-project", "type": "service_account"}}, "settings": {"setting1": "value1"}}, "type": "integration_config"}}
And body with value {"data": {"attributes": {"domain": "siem-test.com", "enabled": true, "integration_type": "GOOGLE_WORKSPACE", "name": "My GWS Integration (renamed)", "secrets": {"admin_email": "test@example.com"}, "settings": {"setting1": "value1"}}, "type": "integration_config"}}
When the request is sent
Then the response status is 200 OK

Expand Down Expand Up @@ -3634,14 +3634,14 @@ Feature: Security Monitoring
Scenario: Validate entity context sync credentials returns "Bad Request" response
Given operation "ValidateSecurityMonitoringIntegrationCredentials" enabled
And new "ValidateSecurityMonitoringIntegrationCredentials" request
And body with value {"data": {"attributes": {"domain": "siem-test.com", "integration_type": "GOOGLE_WORKSPACE", "secrets": {"admin_email": "admin@example.com", "service_account_json": {"client_email": "svc@my-project.iam.gserviceaccount.com", "private_key": "-----BEGIN PRIVATE KEY-----\n...\n-----END PRIVATE KEY-----", "project_id": "my-project", "type": "service_account"}}}, "type": "integration_config"}}
And body with value {"data": {"attributes": {"domain": "siem-test.com", "integration_type": "GOOGLE_WORKSPACE", "secrets": {"admin_email": "test@example.com"}}, "type": "integration_config"}}
When the request is sent
Then the response status is 400 Bad Request

@generated @skip @team:DataDog/cloud-siem
Scenario: Validate entity context sync credentials returns "OK" response
Given operation "ValidateSecurityMonitoringIntegrationCredentials" enabled
And new "ValidateSecurityMonitoringIntegrationCredentials" request
And body with value {"data": {"attributes": {"domain": "siem-test.com", "integration_type": "GOOGLE_WORKSPACE", "secrets": {"admin_email": "admin@example.com", "service_account_json": {"client_email": "svc@my-project.iam.gserviceaccount.com", "private_key": "-----BEGIN PRIVATE KEY-----\n...\n-----END PRIVATE KEY-----", "project_id": "my-project", "type": "service_account"}}}, "type": "integration_config"}}
And body with value {"data": {"attributes": {"domain": "siem-test.com", "integration_type": "GOOGLE_WORKSPACE", "secrets": {"admin_email": "test@example.com"}}, "type": "integration_config"}}
When the request is sent
Then the response status is 200 OK
25 changes: 0 additions & 25 deletions packages/datadog-api-client-v2/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7214,9 +7214,6 @@ export { SecurityMonitoringCriticalAssetType } from "./models/SecurityMonitoring
export { SecurityMonitoringCriticalAssetUpdateAttributes } from "./models/SecurityMonitoringCriticalAssetUpdateAttributes";
export { SecurityMonitoringCriticalAssetUpdateData } from "./models/SecurityMonitoringCriticalAssetUpdateData";
export { SecurityMonitoringCriticalAssetUpdateRequest } from "./models/SecurityMonitoringCriticalAssetUpdateRequest";
export { SecurityMonitoringCrowdStrikeIntegrationConfigCreateAttributes } from "./models/SecurityMonitoringCrowdStrikeIntegrationConfigCreateAttributes";
export { SecurityMonitoringCrowdStrikeIntegrationConfigUpdateAttributes } from "./models/SecurityMonitoringCrowdStrikeIntegrationConfigUpdateAttributes";
export { SecurityMonitoringCrowdStrikeIntegrationCredentialsValidateAttributes } from "./models/SecurityMonitoringCrowdStrikeIntegrationCredentialsValidateAttributes";
export { SecurityMonitoringDatasetAttributesRequest } from "./models/SecurityMonitoringDatasetAttributesRequest";
export { SecurityMonitoringDatasetAttributesResponse } from "./models/SecurityMonitoringDatasetAttributesResponse";
export { SecurityMonitoringDatasetColumn } from "./models/SecurityMonitoringDatasetColumn";
Expand Down Expand Up @@ -7253,14 +7250,8 @@ export { SecurityMonitoringEntraIdAzureAppRegistrationsAttributes } from "./mode
export { SecurityMonitoringEntraIdAzureAppRegistrationsData } from "./models/SecurityMonitoringEntraIdAzureAppRegistrationsData";
export { SecurityMonitoringEntraIdAzureAppRegistrationsResourceType } from "./models/SecurityMonitoringEntraIdAzureAppRegistrationsResourceType";
export { SecurityMonitoringEntraIdAzureAppRegistrationsResponse } from "./models/SecurityMonitoringEntraIdAzureAppRegistrationsResponse";
export { SecurityMonitoringEntraIdIntegrationConfigCreateAttributes } from "./models/SecurityMonitoringEntraIdIntegrationConfigCreateAttributes";
export { SecurityMonitoringEntraIdIntegrationConfigUpdateAttributes } from "./models/SecurityMonitoringEntraIdIntegrationConfigUpdateAttributes";
export { SecurityMonitoringEntraIdIntegrationCredentialsValidateAttributes } from "./models/SecurityMonitoringEntraIdIntegrationCredentialsValidateAttributes";
export { SecurityMonitoringFilter } from "./models/SecurityMonitoringFilter";
export { SecurityMonitoringFilterAction } from "./models/SecurityMonitoringFilterAction";
export { SecurityMonitoringGoogleWorkspaceIntegrationConfigCreateAttributes } from "./models/SecurityMonitoringGoogleWorkspaceIntegrationConfigCreateAttributes";
export { SecurityMonitoringGoogleWorkspaceIntegrationConfigUpdateAttributes } from "./models/SecurityMonitoringGoogleWorkspaceIntegrationConfigUpdateAttributes";
export { SecurityMonitoringGoogleWorkspaceIntegrationCredentialsValidateAttributes } from "./models/SecurityMonitoringGoogleWorkspaceIntegrationCredentialsValidateAttributes";
export { SecurityMonitoringIntegrationActivateAttributes } from "./models/SecurityMonitoringIntegrationActivateAttributes";
export { SecurityMonitoringIntegrationActivateData } from "./models/SecurityMonitoringIntegrationActivateData";
export { SecurityMonitoringIntegrationActivateRequest } from "./models/SecurityMonitoringIntegrationActivateRequest";
Expand All @@ -7269,14 +7260,9 @@ export { SecurityMonitoringIntegrationConfigAttributes } from "./models/Security
export { SecurityMonitoringIntegrationConfigCreateAttributes } from "./models/SecurityMonitoringIntegrationConfigCreateAttributes";
export { SecurityMonitoringIntegrationConfigCreateData } from "./models/SecurityMonitoringIntegrationConfigCreateData";
export { SecurityMonitoringIntegrationConfigCreateRequest } from "./models/SecurityMonitoringIntegrationConfigCreateRequest";
export { SecurityMonitoringIntegrationConfigCrowdStrikeSecrets } from "./models/SecurityMonitoringIntegrationConfigCrowdStrikeSecrets";
export { SecurityMonitoringIntegrationConfigData } from "./models/SecurityMonitoringIntegrationConfigData";
export { SecurityMonitoringIntegrationConfigGoogleWorkspaceSecrets } from "./models/SecurityMonitoringIntegrationConfigGoogleWorkspaceSecrets";
export { SecurityMonitoringIntegrationConfigGoogleWorkspaceServiceAccount } from "./models/SecurityMonitoringIntegrationConfigGoogleWorkspaceServiceAccount";
export { SecurityMonitoringIntegrationConfigOktaSecrets } from "./models/SecurityMonitoringIntegrationConfigOktaSecrets";
export { SecurityMonitoringIntegrationConfigResourceType } from "./models/SecurityMonitoringIntegrationConfigResourceType";
export { SecurityMonitoringIntegrationConfigResponse } from "./models/SecurityMonitoringIntegrationConfigResponse";
export { SecurityMonitoringIntegrationConfigSentinelOneSecrets } from "./models/SecurityMonitoringIntegrationConfigSentinelOneSecrets";
export { SecurityMonitoringIntegrationConfigsResponse } from "./models/SecurityMonitoringIntegrationConfigsResponse";
export { SecurityMonitoringIntegrationConfigState } from "./models/SecurityMonitoringIntegrationConfigState";
export { SecurityMonitoringIntegrationConfigUpdateAttributes } from "./models/SecurityMonitoringIntegrationConfigUpdateAttributes";
Expand All @@ -7286,15 +7272,7 @@ export { SecurityMonitoringIntegrationCredentialsValidateAttributes } from "./mo
export { SecurityMonitoringIntegrationCredentialsValidateData } from "./models/SecurityMonitoringIntegrationCredentialsValidateData";
export { SecurityMonitoringIntegrationCredentialsValidateRequest } from "./models/SecurityMonitoringIntegrationCredentialsValidateRequest";
export { SecurityMonitoringIntegrationType } from "./models/SecurityMonitoringIntegrationType";
export { SecurityMonitoringIntegrationTypeCrowdStrike } from "./models/SecurityMonitoringIntegrationTypeCrowdStrike";
export { SecurityMonitoringIntegrationTypeEntraId } from "./models/SecurityMonitoringIntegrationTypeEntraId";
export { SecurityMonitoringIntegrationTypeGoogleWorkspace } from "./models/SecurityMonitoringIntegrationTypeGoogleWorkspace";
export { SecurityMonitoringIntegrationTypeOkta } from "./models/SecurityMonitoringIntegrationTypeOkta";
export { SecurityMonitoringIntegrationTypeSentinelOne } from "./models/SecurityMonitoringIntegrationTypeSentinelOne";
export { SecurityMonitoringListRulesResponse } from "./models/SecurityMonitoringListRulesResponse";
export { SecurityMonitoringOktaIntegrationConfigCreateAttributes } from "./models/SecurityMonitoringOktaIntegrationConfigCreateAttributes";
export { SecurityMonitoringOktaIntegrationConfigUpdateAttributes } from "./models/SecurityMonitoringOktaIntegrationConfigUpdateAttributes";
export { SecurityMonitoringOktaIntegrationCredentialsValidateAttributes } from "./models/SecurityMonitoringOktaIntegrationCredentialsValidateAttributes";
export { SecurityMonitoringPaginatedSuppressionsResponse } from "./models/SecurityMonitoringPaginatedSuppressionsResponse";
export { SecurityMonitoringReferenceTable } from "./models/SecurityMonitoringReferenceTable";
export { SecurityMonitoringRuleAnomalyDetectionOptions } from "./models/SecurityMonitoringRuleAnomalyDetectionOptions";
Expand Down Expand Up @@ -7353,9 +7331,6 @@ export { SecurityMonitoringRuleTypeTest } from "./models/SecurityMonitoringRuleT
export { SecurityMonitoringRuleUpdatePayload } from "./models/SecurityMonitoringRuleUpdatePayload";
export { SecurityMonitoringRuleValidatePayload } from "./models/SecurityMonitoringRuleValidatePayload";
export { SecurityMonitoringSchedulingOptions } from "./models/SecurityMonitoringSchedulingOptions";
export { SecurityMonitoringSentinelOneIntegrationConfigCreateAttributes } from "./models/SecurityMonitoringSentinelOneIntegrationConfigCreateAttributes";
export { SecurityMonitoringSentinelOneIntegrationConfigUpdateAttributes } from "./models/SecurityMonitoringSentinelOneIntegrationConfigUpdateAttributes";
export { SecurityMonitoringSentinelOneIntegrationCredentialsValidateAttributes } from "./models/SecurityMonitoringSentinelOneIntegrationCredentialsValidateAttributes";
export { SecurityMonitoringSignal } from "./models/SecurityMonitoringSignal";
export { SecurityMonitoringSignalArchiveReason } from "./models/SecurityMonitoringSignalArchiveReason";
export { SecurityMonitoringSignalAssigneeUpdateAttributes } from "./models/SecurityMonitoringSignalAssigneeUpdateAttributes";
Expand Down
Loading
Loading