diff --git a/datadog/fwprovider/resource_datadog_integration_gcp.go b/datadog/fwprovider/resource_datadog_integration_gcp.go index c1be6df2f6..0da3d2375f 100644 --- a/datadog/fwprovider/resource_datadog_integration_gcp.go +++ b/datadog/fwprovider/resource_datadog_integration_gcp.go @@ -39,18 +39,19 @@ type integrationGcpResource struct { } type integrationGcpModel struct { - ID types.String `tfsdk:"id"` - ProjectID types.String `tfsdk:"project_id"` - PrivateKeyId types.String `tfsdk:"private_key_id"` - PrivateKey types.String `tfsdk:"private_key"` - ClientEmail types.String `tfsdk:"client_email"` - ClientId types.String `tfsdk:"client_id"` - Automute types.Bool `tfsdk:"automute"` - HostFilters types.String `tfsdk:"host_filters"` - CloudRunRevisionFilters types.Set `tfsdk:"cloud_run_revision_filters"` - ResourceCollectionEnabled types.Bool `tfsdk:"resource_collection_enabled"` - CspmResourceCollectionEnabled types.Bool `tfsdk:"cspm_resource_collection_enabled"` - IsSecurityCommandCenterEnabled types.Bool `tfsdk:"is_security_command_center_enabled"` + ID types.String `tfsdk:"id"` + ProjectID types.String `tfsdk:"project_id"` + PrivateKeyId types.String `tfsdk:"private_key_id"` + PrivateKey types.String `tfsdk:"private_key"` + ClientEmail types.String `tfsdk:"client_email"` + ClientId types.String `tfsdk:"client_id"` + Automute types.Bool `tfsdk:"automute"` + HostFilters types.String `tfsdk:"host_filters"` + CloudRunRevisionFilters types.Set `tfsdk:"cloud_run_revision_filters"` + ResourceCollectionEnabled types.Bool `tfsdk:"resource_collection_enabled"` + CspmResourceCollectionEnabled types.Bool `tfsdk:"cspm_resource_collection_enabled"` + IsSecurityCommandCenterEnabled types.Bool `tfsdk:"is_security_command_center_enabled"` + IsResourceChangeCollectionEnabled types.Bool `tfsdk:"is_resource_change_collection_enabled"` } func NewIntegrationGcpResource() resource.Resource { @@ -69,6 +70,9 @@ func (r *integrationGcpResource) Metadata(_ context.Context, request resource.Me func (r *integrationGcpResource) Schema(_ context.Context, _ resource.SchemaRequest, response *resource.SchemaResponse) { response.Schema = schema.Schema{ + // Avoid using default values for bool settings to prevent breaking changes for existing customers. + // Customers who have previously modified these settings via the UI should not be impacted + // https://github.com/DataDog/terraform-provider-datadog/pull/2424#issuecomment-2150871460 Description: "This resource is deprecated—use the `datadog_integration_gcp_sts` resource instead. Provides a Datadog - Google Cloud Platform integration resource. This can be used to create and manage Datadog - Google Cloud Platform integration.", Attributes: map[string]schema.Attribute{ "project_id": schema.StringAttribute{ @@ -141,6 +145,11 @@ func (r *integrationGcpResource) Schema(_ context.Context, _ resource.SchemaRequ Computed: true, Default: booldefault.StaticBool(false), }, + "is_resource_change_collection_enabled": schema.BoolAttribute{ + Description: "When enabled, Datadog scans for all resource change data in your Google Cloud environment.", + Optional: true, + Computed: true, + }, "id": utils.ResourceIDAttribute(), }, } @@ -292,6 +301,7 @@ func (r *integrationGcpResource) updateState(ctx context.Context, state *integra state.CspmResourceCollectionEnabled = types.BoolValue(resp.GetIsCspmEnabled()) state.ResourceCollectionEnabled = types.BoolValue(resp.GetResourceCollectionEnabled()) state.IsSecurityCommandCenterEnabled = types.BoolValue(resp.GetIsSecurityCommandCenterEnabled()) + state.IsResourceChangeCollectionEnabled = types.BoolValue(resp.GetIsResourceChangeCollectionEnabled()) // Non-computed values if clientId, ok := resp.GetClientIdOk(); ok { @@ -366,5 +376,9 @@ func (r *integrationGcpResource) addOptionalFieldsToBody(ctx context.Context, bo body.SetResourceCollectionEnabled(state.ResourceCollectionEnabled.ValueBool()) } + if !state.IsResourceChangeCollectionEnabled.IsUnknown() { + body.SetIsResourceChangeCollectionEnabled(state.IsResourceChangeCollectionEnabled.ValueBool()) + } + return diags } diff --git a/datadog/fwprovider/resource_datadog_integration_gcp_sts.go b/datadog/fwprovider/resource_datadog_integration_gcp_sts.go index ff7c33621d..8f7729a74d 100644 --- a/datadog/fwprovider/resource_datadog_integration_gcp_sts.go +++ b/datadog/fwprovider/resource_datadog_integration_gcp_sts.go @@ -4,6 +4,7 @@ import ( "context" "sync" + "github.com/hashicorp/terraform-plugin-framework/attr" "github.com/hashicorp/terraform-plugin-framework/resource/schema/booldefault" "github.com/DataDog/datadog-api-client-go/v2/api/datadogV2" @@ -29,17 +30,24 @@ type integrationGcpStsResource struct { Auth context.Context } +type MetricNamespaceConfigModel struct { + ID types.String `tfsdk:"id"` + Disabled types.Bool `tfsdk:"disabled"` +} + type integrationGcpStsModel struct { - ID types.String `tfsdk:"id"` - AccountTags types.Set `tfsdk:"account_tags"` - Automute types.Bool `tfsdk:"automute"` - ClientEmail types.String `tfsdk:"client_email"` - DelegateAccountEmail types.String `tfsdk:"delegate_account_email"` - HostFilters types.Set `tfsdk:"host_filters"` - CloudRunRevisionFilters types.Set `tfsdk:"cloud_run_revision_filters"` - IsCspmEnabled types.Bool `tfsdk:"is_cspm_enabled"` - IsSecurityCommandCenterEnabled types.Bool `tfsdk:"is_security_command_center_enabled"` - ResourceCollectionEnabled types.Bool `tfsdk:"resource_collection_enabled"` + ID types.String `tfsdk:"id"` + AccountTags types.Set `tfsdk:"account_tags"` + Automute types.Bool `tfsdk:"automute"` + ClientEmail types.String `tfsdk:"client_email"` + DelegateAccountEmail types.String `tfsdk:"delegate_account_email"` + HostFilters types.Set `tfsdk:"host_filters"` + CloudRunRevisionFilters types.Set `tfsdk:"cloud_run_revision_filters"` + MetricNamespaceConfigs []*MetricNamespaceConfigModel `tfsdk:"metric_namespace_configs"` + IsCspmEnabled types.Bool `tfsdk:"is_cspm_enabled"` + IsSecurityCommandCenterEnabled types.Bool `tfsdk:"is_security_command_center_enabled"` + IsResourceChangeCollectionEnabled types.Bool `tfsdk:"is_resource_change_collection_enabled"` + ResourceCollectionEnabled types.Bool `tfsdk:"resource_collection_enabled"` } func NewIntegrationGcpStsResource() resource.Resource { @@ -58,6 +66,9 @@ func (r *integrationGcpStsResource) Metadata(_ context.Context, request resource func (r *integrationGcpStsResource) Schema(_ context.Context, _ resource.SchemaRequest, response *resource.SchemaResponse) { response.Schema = schema.Schema{ + // Avoid using default values for bool settings to prevent breaking changes for existing customers. + // Customers who have previously modified these settings via the UI should not be impacted + // https://github.com/DataDog/terraform-provider-datadog/pull/2424#issuecomment-2150871460 Description: "Provides a Datadog Integration GCP Sts resource. This can be used to create and manage Datadog - Google Cloud Platform integration.", Attributes: map[string]schema.Attribute{ "account_tags": schema.SetAttribute{ @@ -94,6 +105,16 @@ func (r *integrationGcpStsResource) Schema(_ context.Context, _ resource.SchemaR Description: "Tags to filter which Cloud Run revisions are imported into Datadog. Only revisions that meet specified criteria are monitored.", ElementType: types.StringType, }, + "metric_namespace_configs": schema.SetAttribute{ + Optional: true, + Description: "Configuration for a GCP metric namespace.", + ElementType: types.ObjectType{ + AttrTypes: map[string]attr.Type{ + "id": types.StringType, + "disabled": types.BoolType, + }, + }, + }, "is_cspm_enabled": schema.BoolAttribute{ Optional: true, Computed: true, @@ -105,6 +126,11 @@ func (r *integrationGcpStsResource) Schema(_ context.Context, _ resource.SchemaR Computed: true, Default: booldefault.StaticBool(false), }, + "is_resource_change_collection_enabled": schema.BoolAttribute{ + Description: "When enabled, Datadog scans for all resource change data in your Google Cloud environment.", + Optional: true, + Computed: true, + }, "resource_collection_enabled": schema.BoolAttribute{ Description: "When enabled, Datadog scans for all resources in your GCP environment.", Optional: true, @@ -285,12 +311,24 @@ func (r *integrationGcpStsResource) updateState(ctx context.Context, state *inte if runFilters, ok := attributes.GetCloudRunRevisionFiltersOk(); ok && len(*runFilters) > 0 { state.CloudRunRevisionFilters, _ = types.SetValueFrom(ctx, types.StringType, *runFilters) } + if namespaceConfigs, ok := attributes.GetMetricNamespaceConfigsOk(); ok && len(*namespaceConfigs) > 0 { + state.MetricNamespaceConfigs = make([]*MetricNamespaceConfigModel, len(*namespaceConfigs)) + for i, namespaceConfig := range *namespaceConfigs { + state.MetricNamespaceConfigs[i] = &MetricNamespaceConfigModel{ + ID: types.StringValue(namespaceConfig.GetId()), + Disabled: types.BoolValue(namespaceConfig.GetDisabled()), + } + } + } if isCspmEnabled, ok := attributes.GetIsCspmEnabledOk(); ok { state.IsCspmEnabled = types.BoolValue(*isCspmEnabled) } if isSecurityCommandCenterEnabled, ok := attributes.GetIsSecurityCommandCenterEnabledOk(); ok { state.IsSecurityCommandCenterEnabled = types.BoolValue(*isSecurityCommandCenterEnabled) } + if isResourceChangeCollectionEnabled, ok := attributes.GetIsResourceChangeCollectionEnabledOk(); ok { + state.IsResourceChangeCollectionEnabled = types.BoolValue(*isResourceChangeCollectionEnabled) + } if resourceCollectionEnabled, ok := attributes.GetResourceCollectionEnabledOk(); ok { state.ResourceCollectionEnabled = types.BoolValue(*resourceCollectionEnabled) } @@ -325,9 +363,23 @@ func (r *integrationGcpStsResource) buildIntegrationGcpStsRequestBody(ctx contex } attributes.SetCloudRunRevisionFilters(runFilters) + namespaceConfigs := make([]datadogV2.GCPMetricNamespaceConfig, 0) + if len(state.MetricNamespaceConfigs) > 0 { + for _, namespaceConfig := range state.MetricNamespaceConfigs { + namespaceConfigs = append(namespaceConfigs, datadogV2.GCPMetricNamespaceConfig{ + Id: namespaceConfig.ID.ValueStringPointer(), + Disabled: namespaceConfig.Disabled.ValueBoolPointer(), + }) + } + } + attributes.SetMetricNamespaceConfigs(namespaceConfigs) + if !state.IsSecurityCommandCenterEnabled.IsUnknown() { attributes.SetIsSecurityCommandCenterEnabled(state.IsSecurityCommandCenterEnabled.ValueBool()) } + if !state.IsResourceChangeCollectionEnabled.IsUnknown() { + attributes.SetIsResourceChangeCollectionEnabled(state.IsResourceChangeCollectionEnabled.ValueBool()) + } if !state.ResourceCollectionEnabled.IsUnknown() { attributes.SetResourceCollectionEnabled(state.ResourceCollectionEnabled.ValueBool()) } diff --git a/datadog/tests/cassettes/TestAccDatadogIntegrationGCP.freeze b/datadog/tests/cassettes/TestAccDatadogIntegrationGCP.freeze index 612f782e3f..c0d1e75575 100644 --- a/datadog/tests/cassettes/TestAccDatadogIntegrationGCP.freeze +++ b/datadog/tests/cassettes/TestAccDatadogIntegrationGCP.freeze @@ -1 +1 @@ -2024-10-10T16:22:07.145845-04:00 \ No newline at end of file +2024-11-07T14:02:19.978741-05:00 \ No newline at end of file diff --git a/datadog/tests/cassettes/TestAccDatadogIntegrationGCP.yaml b/datadog/tests/cassettes/TestAccDatadogIntegrationGCP.yaml index 621c79e40f..d3176ec9b6 100644 --- a/datadog/tests/cassettes/TestAccDatadogIntegrationGCP.yaml +++ b/datadog/tests/cassettes/TestAccDatadogIntegrationGCP.yaml @@ -13,7 +13,7 @@ interactions: remote_addr: "" request_uri: "" body: | - {"auth_provider_x509_cert_url":"https://www.googleapis.com/oauth2/v1/certs","auth_uri":"https://accounts.google.com/o/oauth2/auth","automute":false,"client_email":"tf-TestAccDatadogIntegrationGCP-local-1728591727@awesome-project-id.iam.gserviceaccount.com","client_id":"123456789012345678901","client_x509_cert_url":"https://www.googleapis.com/robot/v1/metadata/x509/tf-TestAccDatadogIntegrationGCP-local-1728591727@awesome-project-id.iam.gserviceaccount.com","cloud_run_revision_filters":["tag:one","tag:two"],"host_filters":"foo:bar,buzz:lightyear","is_cspm_enabled":false,"is_security_command_center_enabled":false,"private_key":"-----BEGIN PRIVATE KEY-----\n...\n-----END PRIVATE KEY-----\n","private_key_id":"1234567890123456789012345678901234567890","project_id":"tf-TestAccDatadogIntegrationGCP-local-1728591727","token_uri":"https://oauth2.googleapis.com/token","type":"service_account"} + {"auth_provider_x509_cert_url":"https://www.googleapis.com/oauth2/v1/certs","auth_uri":"https://accounts.google.com/o/oauth2/auth","automute":false,"client_email":"tf-TestAccDatadogIntegrationGCP-local-1731006139@awesome-project-id.iam.gserviceaccount.com","client_id":"123456789012345678901","client_x509_cert_url":"https://www.googleapis.com/robot/v1/metadata/x509/tf-TestAccDatadogIntegrationGCP-local-1731006139@awesome-project-id.iam.gserviceaccount.com","cloud_run_revision_filters":["tag:one","tag:two"],"host_filters":"foo:bar,buzz:lightyear","is_cspm_enabled":false,"is_security_command_center_enabled":false,"private_key":"-----BEGIN PRIVATE KEY-----\n...\n-----END PRIVATE KEY-----\n","private_key_id":"1234567890123456789012345678901234567890","project_id":"tf-TestAccDatadogIntegrationGCP-local-1731006139","token_uri":"https://oauth2.googleapis.com/token","type":"service_account"} form: {} headers: Accept: @@ -37,7 +37,7 @@ interactions: - application/json status: 200 OK code: 200 - duration: 644.423334ms + duration: 511.372959ms - id: 1 request: proto: HTTP/1.1 @@ -66,13 +66,13 @@ interactions: content_length: -1 uncompressed: true body: | - [{"project_id":"","client_email":"bozo@google.com","host_filters":"","automute":false,"is_cspm_enabled":false,"resource_collection_enabled":false,"is_security_command_center_enabled":false,"is_resource_change_collection_enabled":false,"cloud_run_revision_filters":[],"errors":[]},{"project_id":"","client_email":"graytest@datadog-gcp-ints-test-b.iam.gserviceaccount.com","host_filters":"","automute":true,"is_cspm_enabled":false,"resource_collection_enabled":true,"is_security_command_center_enabled":false,"is_resource_change_collection_enabled":false,"cloud_run_revision_filters":[],"errors":[]},{"project_id":"","client_email":"ui@google.com","host_filters":"","automute":false,"is_cspm_enabled":false,"resource_collection_enabled":true,"is_security_command_center_enabled":false,"is_resource_change_collection_enabled":false,"cloud_run_revision_filters":[],"errors":[]},{"project_id":"tf-TestAccDatadogIntegrationGCP-local-1728591727","client_email":"tf-TestAccDatadogIntegrationGCP-local-1728591727@awesome-project-id.iam.gserviceaccount.com","host_filters":"foo:bar,buzz:lightyear","automute":false,"is_cspm_enabled":false,"resource_collection_enabled":true,"is_security_command_center_enabled":false,"is_resource_change_collection_enabled":false,"cloud_run_revision_filters":["tag:one","tag:two"],"errors":[]}] + [{"project_id":"","client_email":"bozo@google.com","host_filters":"","automute":false,"is_cspm_enabled":false,"resource_collection_enabled":false,"is_security_command_center_enabled":false,"is_resource_change_collection_enabled":false,"cloud_run_revision_filters":[],"errors":[]},{"project_id":"","client_email":"graytest@datadog-gcp-ints-test-b.iam.gserviceaccount.com","host_filters":"","automute":true,"is_cspm_enabled":false,"resource_collection_enabled":true,"is_security_command_center_enabled":false,"is_resource_change_collection_enabled":false,"cloud_run_revision_filters":[],"errors":[]},{"project_id":"","client_email":"tf-TestAccIntegrationGcpStsBasic-local-1730997425@test-project.iam.gserviceaccount.com","host_filters":"tag:one,tag:two","automute":false,"is_cspm_enabled":false,"resource_collection_enabled":false,"is_security_command_center_enabled":false,"is_resource_change_collection_enabled":false,"cloud_run_revision_filters":["tag:one","tag:two"],"errors":[]},{"project_id":"","client_email":"tf-TestAccIntegrationGcpStsBasic-local-1730997431@test-project.iam.gserviceaccount.com","host_filters":"tag:one,tag:two","automute":false,"is_cspm_enabled":false,"resource_collection_enabled":false,"is_security_command_center_enabled":false,"is_resource_change_collection_enabled":false,"cloud_run_revision_filters":["tag:one","tag:two"],"errors":[]},{"project_id":"","client_email":"tf-TestAccIntegrationGcpStsBasic-local-1730997435@test-project.iam.gserviceaccount.com","host_filters":"tag:one,tag:two","automute":false,"is_cspm_enabled":false,"resource_collection_enabled":false,"is_security_command_center_enabled":false,"is_resource_change_collection_enabled":false,"cloud_run_revision_filters":["tag:one","tag:two"],"errors":[]},{"project_id":"","client_email":"ui@google.com","host_filters":"","automute":false,"is_cspm_enabled":false,"resource_collection_enabled":true,"is_security_command_center_enabled":false,"is_resource_change_collection_enabled":false,"cloud_run_revision_filters":[],"errors":[]},{"project_id":"tf-TestAccDatadogIntegrationGCP-local-1731006139","client_email":"tf-TestAccDatadogIntegrationGCP-local-1731006139@awesome-project-id.iam.gserviceaccount.com","host_filters":"foo:bar,buzz:lightyear","automute":false,"is_cspm_enabled":false,"resource_collection_enabled":true,"is_security_command_center_enabled":false,"is_resource_change_collection_enabled":false,"cloud_run_revision_filters":["tag:one","tag:two"],"errors":[]}] headers: Content-Type: - application/json status: 200 OK code: 200 - duration: 83.213834ms + duration: 73.570625ms - id: 2 request: proto: HTTP/1.1 @@ -101,13 +101,13 @@ interactions: content_length: -1 uncompressed: true body: | - [{"project_id":"","client_email":"bozo@google.com","host_filters":"","automute":false,"is_cspm_enabled":false,"resource_collection_enabled":false,"is_security_command_center_enabled":false,"is_resource_change_collection_enabled":false,"cloud_run_revision_filters":[],"errors":[]},{"project_id":"","client_email":"graytest@datadog-gcp-ints-test-b.iam.gserviceaccount.com","host_filters":"","automute":true,"is_cspm_enabled":false,"resource_collection_enabled":true,"is_security_command_center_enabled":false,"is_resource_change_collection_enabled":false,"cloud_run_revision_filters":[],"errors":[]},{"project_id":"","client_email":"ui@google.com","host_filters":"","automute":false,"is_cspm_enabled":false,"resource_collection_enabled":true,"is_security_command_center_enabled":false,"is_resource_change_collection_enabled":false,"cloud_run_revision_filters":[],"errors":[]},{"project_id":"tf-TestAccDatadogIntegrationGCP-local-1728591727","client_email":"tf-TestAccDatadogIntegrationGCP-local-1728591727@awesome-project-id.iam.gserviceaccount.com","host_filters":"foo:bar,buzz:lightyear","automute":false,"is_cspm_enabled":false,"resource_collection_enabled":true,"is_security_command_center_enabled":false,"is_resource_change_collection_enabled":false,"cloud_run_revision_filters":["tag:one","tag:two"],"errors":[]}] + [{"project_id":"","client_email":"bozo@google.com","host_filters":"","automute":false,"is_cspm_enabled":false,"resource_collection_enabled":false,"is_security_command_center_enabled":false,"is_resource_change_collection_enabled":false,"cloud_run_revision_filters":[],"errors":[]},{"project_id":"","client_email":"graytest@datadog-gcp-ints-test-b.iam.gserviceaccount.com","host_filters":"","automute":true,"is_cspm_enabled":false,"resource_collection_enabled":true,"is_security_command_center_enabled":false,"is_resource_change_collection_enabled":false,"cloud_run_revision_filters":[],"errors":[]},{"project_id":"","client_email":"tf-TestAccIntegrationGcpStsBasic-local-1730997425@test-project.iam.gserviceaccount.com","host_filters":"tag:one,tag:two","automute":false,"is_cspm_enabled":false,"resource_collection_enabled":false,"is_security_command_center_enabled":false,"is_resource_change_collection_enabled":false,"cloud_run_revision_filters":["tag:one","tag:two"],"errors":[]},{"project_id":"","client_email":"tf-TestAccIntegrationGcpStsBasic-local-1730997431@test-project.iam.gserviceaccount.com","host_filters":"tag:one,tag:two","automute":false,"is_cspm_enabled":false,"resource_collection_enabled":false,"is_security_command_center_enabled":false,"is_resource_change_collection_enabled":false,"cloud_run_revision_filters":["tag:one","tag:two"],"errors":[]},{"project_id":"","client_email":"tf-TestAccIntegrationGcpStsBasic-local-1730997435@test-project.iam.gserviceaccount.com","host_filters":"tag:one,tag:two","automute":false,"is_cspm_enabled":false,"resource_collection_enabled":false,"is_security_command_center_enabled":false,"is_resource_change_collection_enabled":false,"cloud_run_revision_filters":["tag:one","tag:two"],"errors":[]},{"project_id":"","client_email":"ui@google.com","host_filters":"","automute":false,"is_cspm_enabled":false,"resource_collection_enabled":true,"is_security_command_center_enabled":false,"is_resource_change_collection_enabled":false,"cloud_run_revision_filters":[],"errors":[]},{"project_id":"tf-TestAccDatadogIntegrationGCP-local-1731006139","client_email":"tf-TestAccDatadogIntegrationGCP-local-1731006139@awesome-project-id.iam.gserviceaccount.com","host_filters":"foo:bar,buzz:lightyear","automute":false,"is_cspm_enabled":false,"resource_collection_enabled":true,"is_security_command_center_enabled":false,"is_resource_change_collection_enabled":false,"cloud_run_revision_filters":["tag:one","tag:two"],"errors":[]}] headers: Content-Type: - application/json status: 200 OK code: 200 - duration: 74.368041ms + duration: 71.7135ms - id: 3 request: proto: HTTP/1.1 @@ -136,13 +136,13 @@ interactions: content_length: -1 uncompressed: true body: | - [{"project_id":"","client_email":"bozo@google.com","host_filters":"","automute":false,"is_cspm_enabled":false,"resource_collection_enabled":false,"is_security_command_center_enabled":false,"is_resource_change_collection_enabled":false,"cloud_run_revision_filters":[],"errors":[]},{"project_id":"","client_email":"graytest@datadog-gcp-ints-test-b.iam.gserviceaccount.com","host_filters":"","automute":true,"is_cspm_enabled":false,"resource_collection_enabled":true,"is_security_command_center_enabled":false,"is_resource_change_collection_enabled":false,"cloud_run_revision_filters":[],"errors":[]},{"project_id":"","client_email":"ui@google.com","host_filters":"","automute":false,"is_cspm_enabled":false,"resource_collection_enabled":true,"is_security_command_center_enabled":false,"is_resource_change_collection_enabled":false,"cloud_run_revision_filters":[],"errors":[]},{"project_id":"tf-TestAccDatadogIntegrationGCP-local-1728591727","client_email":"tf-TestAccDatadogIntegrationGCP-local-1728591727@awesome-project-id.iam.gserviceaccount.com","host_filters":"foo:bar,buzz:lightyear","automute":false,"is_cspm_enabled":false,"resource_collection_enabled":true,"is_security_command_center_enabled":false,"is_resource_change_collection_enabled":false,"cloud_run_revision_filters":["tag:one","tag:two"],"errors":[]}] + [{"project_id":"","client_email":"bozo@google.com","host_filters":"","automute":false,"is_cspm_enabled":false,"resource_collection_enabled":false,"is_security_command_center_enabled":false,"is_resource_change_collection_enabled":false,"cloud_run_revision_filters":[],"errors":[]},{"project_id":"","client_email":"graytest@datadog-gcp-ints-test-b.iam.gserviceaccount.com","host_filters":"","automute":true,"is_cspm_enabled":false,"resource_collection_enabled":true,"is_security_command_center_enabled":false,"is_resource_change_collection_enabled":false,"cloud_run_revision_filters":[],"errors":[]},{"project_id":"","client_email":"tf-TestAccIntegrationGcpStsBasic-local-1730997425@test-project.iam.gserviceaccount.com","host_filters":"tag:one,tag:two","automute":false,"is_cspm_enabled":false,"resource_collection_enabled":false,"is_security_command_center_enabled":false,"is_resource_change_collection_enabled":false,"cloud_run_revision_filters":["tag:one","tag:two"],"errors":[]},{"project_id":"","client_email":"tf-TestAccIntegrationGcpStsBasic-local-1730997431@test-project.iam.gserviceaccount.com","host_filters":"tag:one,tag:two","automute":false,"is_cspm_enabled":false,"resource_collection_enabled":false,"is_security_command_center_enabled":false,"is_resource_change_collection_enabled":false,"cloud_run_revision_filters":["tag:one","tag:two"],"errors":[]},{"project_id":"","client_email":"tf-TestAccIntegrationGcpStsBasic-local-1730997435@test-project.iam.gserviceaccount.com","host_filters":"tag:one,tag:two","automute":false,"is_cspm_enabled":false,"resource_collection_enabled":false,"is_security_command_center_enabled":false,"is_resource_change_collection_enabled":false,"cloud_run_revision_filters":["tag:one","tag:two"],"errors":[]},{"project_id":"","client_email":"ui@google.com","host_filters":"","automute":false,"is_cspm_enabled":false,"resource_collection_enabled":true,"is_security_command_center_enabled":false,"is_resource_change_collection_enabled":false,"cloud_run_revision_filters":[],"errors":[]},{"project_id":"tf-TestAccDatadogIntegrationGCP-local-1731006139","client_email":"tf-TestAccDatadogIntegrationGCP-local-1731006139@awesome-project-id.iam.gserviceaccount.com","host_filters":"foo:bar,buzz:lightyear","automute":false,"is_cspm_enabled":false,"resource_collection_enabled":true,"is_security_command_center_enabled":false,"is_resource_change_collection_enabled":false,"cloud_run_revision_filters":["tag:one","tag:two"],"errors":[]}] headers: Content-Type: - application/json status: 200 OK code: 200 - duration: 75.9985ms + duration: 80.378917ms - id: 4 request: proto: HTTP/1.1 @@ -171,13 +171,13 @@ interactions: content_length: -1 uncompressed: true body: | - [{"project_id":"","client_email":"bozo@google.com","host_filters":"","automute":false,"is_cspm_enabled":false,"resource_collection_enabled":false,"is_security_command_center_enabled":false,"is_resource_change_collection_enabled":false,"cloud_run_revision_filters":[],"errors":[]},{"project_id":"","client_email":"graytest@datadog-gcp-ints-test-b.iam.gserviceaccount.com","host_filters":"","automute":true,"is_cspm_enabled":false,"resource_collection_enabled":true,"is_security_command_center_enabled":false,"is_resource_change_collection_enabled":false,"cloud_run_revision_filters":[],"errors":[]},{"project_id":"","client_email":"ui@google.com","host_filters":"","automute":false,"is_cspm_enabled":false,"resource_collection_enabled":true,"is_security_command_center_enabled":false,"is_resource_change_collection_enabled":false,"cloud_run_revision_filters":[],"errors":[]},{"project_id":"tf-TestAccDatadogIntegrationGCP-local-1728591727","client_email":"tf-TestAccDatadogIntegrationGCP-local-1728591727@awesome-project-id.iam.gserviceaccount.com","host_filters":"foo:bar,buzz:lightyear","automute":false,"is_cspm_enabled":false,"resource_collection_enabled":true,"is_security_command_center_enabled":false,"is_resource_change_collection_enabled":false,"cloud_run_revision_filters":["tag:one","tag:two"],"errors":[]}] + [{"project_id":"","client_email":"bozo@google.com","host_filters":"","automute":false,"is_cspm_enabled":false,"resource_collection_enabled":false,"is_security_command_center_enabled":false,"is_resource_change_collection_enabled":false,"cloud_run_revision_filters":[],"errors":[]},{"project_id":"","client_email":"graytest@datadog-gcp-ints-test-b.iam.gserviceaccount.com","host_filters":"","automute":true,"is_cspm_enabled":false,"resource_collection_enabled":true,"is_security_command_center_enabled":false,"is_resource_change_collection_enabled":false,"cloud_run_revision_filters":[],"errors":[]},{"project_id":"","client_email":"tf-TestAccIntegrationGcpStsBasic-local-1730997425@test-project.iam.gserviceaccount.com","host_filters":"tag:one,tag:two","automute":false,"is_cspm_enabled":false,"resource_collection_enabled":false,"is_security_command_center_enabled":false,"is_resource_change_collection_enabled":false,"cloud_run_revision_filters":["tag:one","tag:two"],"errors":[]},{"project_id":"","client_email":"tf-TestAccIntegrationGcpStsBasic-local-1730997431@test-project.iam.gserviceaccount.com","host_filters":"tag:one,tag:two","automute":false,"is_cspm_enabled":false,"resource_collection_enabled":false,"is_security_command_center_enabled":false,"is_resource_change_collection_enabled":false,"cloud_run_revision_filters":["tag:one","tag:two"],"errors":[]},{"project_id":"","client_email":"tf-TestAccIntegrationGcpStsBasic-local-1730997435@test-project.iam.gserviceaccount.com","host_filters":"tag:one,tag:two","automute":false,"is_cspm_enabled":false,"resource_collection_enabled":false,"is_security_command_center_enabled":false,"is_resource_change_collection_enabled":false,"cloud_run_revision_filters":["tag:one","tag:two"],"errors":[]},{"project_id":"","client_email":"ui@google.com","host_filters":"","automute":false,"is_cspm_enabled":false,"resource_collection_enabled":true,"is_security_command_center_enabled":false,"is_resource_change_collection_enabled":false,"cloud_run_revision_filters":[],"errors":[]},{"project_id":"tf-TestAccDatadogIntegrationGCP-local-1731006139","client_email":"tf-TestAccDatadogIntegrationGCP-local-1731006139@awesome-project-id.iam.gserviceaccount.com","host_filters":"foo:bar,buzz:lightyear","automute":false,"is_cspm_enabled":false,"resource_collection_enabled":true,"is_security_command_center_enabled":false,"is_resource_change_collection_enabled":false,"cloud_run_revision_filters":["tag:one","tag:two"],"errors":[]}] headers: Content-Type: - application/json status: 200 OK code: 200 - duration: 72.940458ms + duration: 76.976959ms - id: 5 request: proto: HTTP/1.1 @@ -190,7 +190,7 @@ interactions: remote_addr: "" request_uri: "" body: | - {"automute":false,"client_email":"tf-TestAccDatadogIntegrationGCP-local-1728591727@awesome-project-id.iam.gserviceaccount.com","cloud_run_revision_filters":["tag:one","tag:two"],"host_filters":"","is_cspm_enabled":false,"is_security_command_center_enabled":false,"project_id":"tf-TestAccDatadogIntegrationGCP-local-1728591727"} + {"automute":false,"client_email":"tf-TestAccDatadogIntegrationGCP-local-1731006139@awesome-project-id.iam.gserviceaccount.com","cloud_run_revision_filters":["tag:one","tag:two"],"host_filters":"","is_cspm_enabled":false,"is_security_command_center_enabled":false,"project_id":"tf-TestAccDatadogIntegrationGCP-local-1731006139"} form: {} headers: Accept: @@ -214,7 +214,7 @@ interactions: - application/json status: 200 OK code: 200 - duration: 83.431958ms + duration: 83.21825ms - id: 6 request: proto: HTTP/1.1 @@ -243,13 +243,13 @@ interactions: content_length: -1 uncompressed: true body: | - [{"project_id":"","client_email":"bozo@google.com","host_filters":"","automute":false,"is_cspm_enabled":false,"resource_collection_enabled":false,"is_security_command_center_enabled":false,"is_resource_change_collection_enabled":false,"cloud_run_revision_filters":[],"errors":[]},{"project_id":"","client_email":"graytest@datadog-gcp-ints-test-b.iam.gserviceaccount.com","host_filters":"","automute":true,"is_cspm_enabled":false,"resource_collection_enabled":true,"is_security_command_center_enabled":false,"is_resource_change_collection_enabled":false,"cloud_run_revision_filters":[],"errors":[]},{"project_id":"","client_email":"ui@google.com","host_filters":"","automute":false,"is_cspm_enabled":false,"resource_collection_enabled":true,"is_security_command_center_enabled":false,"is_resource_change_collection_enabled":false,"cloud_run_revision_filters":[],"errors":[]},{"project_id":"tf-TestAccDatadogIntegrationGCP-local-1728591727","client_email":"tf-TestAccDatadogIntegrationGCP-local-1728591727@awesome-project-id.iam.gserviceaccount.com","host_filters":"","automute":false,"is_cspm_enabled":false,"resource_collection_enabled":true,"is_security_command_center_enabled":false,"is_resource_change_collection_enabled":false,"cloud_run_revision_filters":["tag:one","tag:two"],"errors":[]}] + [{"project_id":"","client_email":"bozo@google.com","host_filters":"","automute":false,"is_cspm_enabled":false,"resource_collection_enabled":false,"is_security_command_center_enabled":false,"is_resource_change_collection_enabled":false,"cloud_run_revision_filters":[],"errors":[]},{"project_id":"","client_email":"graytest@datadog-gcp-ints-test-b.iam.gserviceaccount.com","host_filters":"","automute":true,"is_cspm_enabled":false,"resource_collection_enabled":true,"is_security_command_center_enabled":false,"is_resource_change_collection_enabled":false,"cloud_run_revision_filters":[],"errors":[]},{"project_id":"","client_email":"tf-TestAccIntegrationGcpStsBasic-local-1730997425@test-project.iam.gserviceaccount.com","host_filters":"tag:one,tag:two","automute":false,"is_cspm_enabled":false,"resource_collection_enabled":false,"is_security_command_center_enabled":false,"is_resource_change_collection_enabled":false,"cloud_run_revision_filters":["tag:one","tag:two"],"errors":[]},{"project_id":"","client_email":"tf-TestAccIntegrationGcpStsBasic-local-1730997431@test-project.iam.gserviceaccount.com","host_filters":"tag:one,tag:two","automute":false,"is_cspm_enabled":false,"resource_collection_enabled":false,"is_security_command_center_enabled":false,"is_resource_change_collection_enabled":false,"cloud_run_revision_filters":["tag:one","tag:two"],"errors":[]},{"project_id":"","client_email":"tf-TestAccIntegrationGcpStsBasic-local-1730997435@test-project.iam.gserviceaccount.com","host_filters":"tag:one,tag:two","automute":false,"is_cspm_enabled":false,"resource_collection_enabled":false,"is_security_command_center_enabled":false,"is_resource_change_collection_enabled":false,"cloud_run_revision_filters":["tag:one","tag:two"],"errors":[]},{"project_id":"","client_email":"ui@google.com","host_filters":"","automute":false,"is_cspm_enabled":false,"resource_collection_enabled":true,"is_security_command_center_enabled":false,"is_resource_change_collection_enabled":false,"cloud_run_revision_filters":[],"errors":[]},{"project_id":"tf-TestAccDatadogIntegrationGCP-local-1731006139","client_email":"tf-TestAccDatadogIntegrationGCP-local-1731006139@awesome-project-id.iam.gserviceaccount.com","host_filters":"","automute":false,"is_cspm_enabled":false,"resource_collection_enabled":true,"is_security_command_center_enabled":false,"is_resource_change_collection_enabled":false,"cloud_run_revision_filters":["tag:one","tag:two"],"errors":[]}] headers: Content-Type: - application/json status: 200 OK code: 200 - duration: 86.418791ms + duration: 73.258292ms - id: 7 request: proto: HTTP/1.1 @@ -278,13 +278,13 @@ interactions: content_length: -1 uncompressed: true body: | - [{"project_id":"","client_email":"bozo@google.com","host_filters":"","automute":false,"is_cspm_enabled":false,"resource_collection_enabled":false,"is_security_command_center_enabled":false,"is_resource_change_collection_enabled":false,"cloud_run_revision_filters":[],"errors":[]},{"project_id":"","client_email":"graytest@datadog-gcp-ints-test-b.iam.gserviceaccount.com","host_filters":"","automute":true,"is_cspm_enabled":false,"resource_collection_enabled":true,"is_security_command_center_enabled":false,"is_resource_change_collection_enabled":false,"cloud_run_revision_filters":[],"errors":[]},{"project_id":"","client_email":"ui@google.com","host_filters":"","automute":false,"is_cspm_enabled":false,"resource_collection_enabled":true,"is_security_command_center_enabled":false,"is_resource_change_collection_enabled":false,"cloud_run_revision_filters":[],"errors":[]},{"project_id":"tf-TestAccDatadogIntegrationGCP-local-1728591727","client_email":"tf-TestAccDatadogIntegrationGCP-local-1728591727@awesome-project-id.iam.gserviceaccount.com","host_filters":"","automute":false,"is_cspm_enabled":false,"resource_collection_enabled":true,"is_security_command_center_enabled":false,"is_resource_change_collection_enabled":false,"cloud_run_revision_filters":["tag:one","tag:two"],"errors":[]}] + [{"project_id":"","client_email":"bozo@google.com","host_filters":"","automute":false,"is_cspm_enabled":false,"resource_collection_enabled":false,"is_security_command_center_enabled":false,"is_resource_change_collection_enabled":false,"cloud_run_revision_filters":[],"errors":[]},{"project_id":"","client_email":"graytest@datadog-gcp-ints-test-b.iam.gserviceaccount.com","host_filters":"","automute":true,"is_cspm_enabled":false,"resource_collection_enabled":true,"is_security_command_center_enabled":false,"is_resource_change_collection_enabled":false,"cloud_run_revision_filters":[],"errors":[]},{"project_id":"","client_email":"tf-TestAccIntegrationGcpStsBasic-local-1730997425@test-project.iam.gserviceaccount.com","host_filters":"tag:one,tag:two","automute":false,"is_cspm_enabled":false,"resource_collection_enabled":false,"is_security_command_center_enabled":false,"is_resource_change_collection_enabled":false,"cloud_run_revision_filters":["tag:one","tag:two"],"errors":[]},{"project_id":"","client_email":"tf-TestAccIntegrationGcpStsBasic-local-1730997431@test-project.iam.gserviceaccount.com","host_filters":"tag:one,tag:two","automute":false,"is_cspm_enabled":false,"resource_collection_enabled":false,"is_security_command_center_enabled":false,"is_resource_change_collection_enabled":false,"cloud_run_revision_filters":["tag:one","tag:two"],"errors":[]},{"project_id":"","client_email":"tf-TestAccIntegrationGcpStsBasic-local-1730997435@test-project.iam.gserviceaccount.com","host_filters":"tag:one,tag:two","automute":false,"is_cspm_enabled":false,"resource_collection_enabled":false,"is_security_command_center_enabled":false,"is_resource_change_collection_enabled":false,"cloud_run_revision_filters":["tag:one","tag:two"],"errors":[]},{"project_id":"","client_email":"ui@google.com","host_filters":"","automute":false,"is_cspm_enabled":false,"resource_collection_enabled":true,"is_security_command_center_enabled":false,"is_resource_change_collection_enabled":false,"cloud_run_revision_filters":[],"errors":[]},{"project_id":"tf-TestAccDatadogIntegrationGCP-local-1731006139","client_email":"tf-TestAccDatadogIntegrationGCP-local-1731006139@awesome-project-id.iam.gserviceaccount.com","host_filters":"","automute":false,"is_cspm_enabled":false,"resource_collection_enabled":true,"is_security_command_center_enabled":false,"is_resource_change_collection_enabled":false,"cloud_run_revision_filters":["tag:one","tag:two"],"errors":[]}] headers: Content-Type: - application/json status: 200 OK code: 200 - duration: 79.369666ms + duration: 64.548125ms - id: 8 request: proto: HTTP/1.1 @@ -313,13 +313,13 @@ interactions: content_length: -1 uncompressed: true body: | - [{"project_id":"","client_email":"bozo@google.com","host_filters":"","automute":false,"is_cspm_enabled":false,"resource_collection_enabled":false,"is_security_command_center_enabled":false,"is_resource_change_collection_enabled":false,"cloud_run_revision_filters":[],"errors":[]},{"project_id":"","client_email":"graytest@datadog-gcp-ints-test-b.iam.gserviceaccount.com","host_filters":"","automute":true,"is_cspm_enabled":false,"resource_collection_enabled":true,"is_security_command_center_enabled":false,"is_resource_change_collection_enabled":false,"cloud_run_revision_filters":[],"errors":[]},{"project_id":"","client_email":"ui@google.com","host_filters":"","automute":false,"is_cspm_enabled":false,"resource_collection_enabled":true,"is_security_command_center_enabled":false,"is_resource_change_collection_enabled":false,"cloud_run_revision_filters":[],"errors":[]},{"project_id":"tf-TestAccDatadogIntegrationGCP-local-1728591727","client_email":"tf-TestAccDatadogIntegrationGCP-local-1728591727@awesome-project-id.iam.gserviceaccount.com","host_filters":"","automute":false,"is_cspm_enabled":false,"resource_collection_enabled":true,"is_security_command_center_enabled":false,"is_resource_change_collection_enabled":false,"cloud_run_revision_filters":["tag:one","tag:two"],"errors":[]}] + [{"project_id":"","client_email":"bozo@google.com","host_filters":"","automute":false,"is_cspm_enabled":false,"resource_collection_enabled":false,"is_security_command_center_enabled":false,"is_resource_change_collection_enabled":false,"cloud_run_revision_filters":[],"errors":[]},{"project_id":"","client_email":"graytest@datadog-gcp-ints-test-b.iam.gserviceaccount.com","host_filters":"","automute":true,"is_cspm_enabled":false,"resource_collection_enabled":true,"is_security_command_center_enabled":false,"is_resource_change_collection_enabled":false,"cloud_run_revision_filters":[],"errors":[]},{"project_id":"","client_email":"tf-TestAccIntegrationGcpStsBasic-local-1730997425@test-project.iam.gserviceaccount.com","host_filters":"tag:one,tag:two","automute":false,"is_cspm_enabled":false,"resource_collection_enabled":false,"is_security_command_center_enabled":false,"is_resource_change_collection_enabled":false,"cloud_run_revision_filters":["tag:one","tag:two"],"errors":[]},{"project_id":"","client_email":"tf-TestAccIntegrationGcpStsBasic-local-1730997431@test-project.iam.gserviceaccount.com","host_filters":"tag:one,tag:two","automute":false,"is_cspm_enabled":false,"resource_collection_enabled":false,"is_security_command_center_enabled":false,"is_resource_change_collection_enabled":false,"cloud_run_revision_filters":["tag:one","tag:two"],"errors":[]},{"project_id":"","client_email":"tf-TestAccIntegrationGcpStsBasic-local-1730997435@test-project.iam.gserviceaccount.com","host_filters":"tag:one,tag:two","automute":false,"is_cspm_enabled":false,"resource_collection_enabled":false,"is_security_command_center_enabled":false,"is_resource_change_collection_enabled":false,"cloud_run_revision_filters":["tag:one","tag:two"],"errors":[]},{"project_id":"","client_email":"ui@google.com","host_filters":"","automute":false,"is_cspm_enabled":false,"resource_collection_enabled":true,"is_security_command_center_enabled":false,"is_resource_change_collection_enabled":false,"cloud_run_revision_filters":[],"errors":[]},{"project_id":"tf-TestAccDatadogIntegrationGCP-local-1731006139","client_email":"tf-TestAccDatadogIntegrationGCP-local-1731006139@awesome-project-id.iam.gserviceaccount.com","host_filters":"","automute":false,"is_cspm_enabled":false,"resource_collection_enabled":true,"is_security_command_center_enabled":false,"is_resource_change_collection_enabled":false,"cloud_run_revision_filters":["tag:one","tag:two"],"errors":[]}] headers: Content-Type: - application/json status: 200 OK code: 200 - duration: 74.352375ms + duration: 67.319917ms - id: 9 request: proto: HTTP/1.1 @@ -348,26 +348,26 @@ interactions: content_length: -1 uncompressed: true body: | - [{"project_id":"","client_email":"bozo@google.com","host_filters":"","automute":false,"is_cspm_enabled":false,"resource_collection_enabled":false,"is_security_command_center_enabled":false,"is_resource_change_collection_enabled":false,"cloud_run_revision_filters":[],"errors":[]},{"project_id":"","client_email":"graytest@datadog-gcp-ints-test-b.iam.gserviceaccount.com","host_filters":"","automute":true,"is_cspm_enabled":false,"resource_collection_enabled":true,"is_security_command_center_enabled":false,"is_resource_change_collection_enabled":false,"cloud_run_revision_filters":[],"errors":[]},{"project_id":"","client_email":"ui@google.com","host_filters":"","automute":false,"is_cspm_enabled":false,"resource_collection_enabled":true,"is_security_command_center_enabled":false,"is_resource_change_collection_enabled":false,"cloud_run_revision_filters":[],"errors":[]},{"project_id":"tf-TestAccDatadogIntegrationGCP-local-1728591727","client_email":"tf-TestAccDatadogIntegrationGCP-local-1728591727@awesome-project-id.iam.gserviceaccount.com","host_filters":"","automute":false,"is_cspm_enabled":false,"resource_collection_enabled":true,"is_security_command_center_enabled":false,"is_resource_change_collection_enabled":false,"cloud_run_revision_filters":["tag:one","tag:two"],"errors":[]}] + [{"project_id":"","client_email":"bozo@google.com","host_filters":"","automute":false,"is_cspm_enabled":false,"resource_collection_enabled":false,"is_security_command_center_enabled":false,"is_resource_change_collection_enabled":false,"cloud_run_revision_filters":[],"errors":[]},{"project_id":"","client_email":"graytest@datadog-gcp-ints-test-b.iam.gserviceaccount.com","host_filters":"","automute":true,"is_cspm_enabled":false,"resource_collection_enabled":true,"is_security_command_center_enabled":false,"is_resource_change_collection_enabled":false,"cloud_run_revision_filters":[],"errors":[]},{"project_id":"","client_email":"tf-TestAccIntegrationGcpStsBasic-local-1730997425@test-project.iam.gserviceaccount.com","host_filters":"tag:one,tag:two","automute":false,"is_cspm_enabled":false,"resource_collection_enabled":false,"is_security_command_center_enabled":false,"is_resource_change_collection_enabled":false,"cloud_run_revision_filters":["tag:one","tag:two"],"errors":[]},{"project_id":"","client_email":"tf-TestAccIntegrationGcpStsBasic-local-1730997431@test-project.iam.gserviceaccount.com","host_filters":"tag:one,tag:two","automute":false,"is_cspm_enabled":false,"resource_collection_enabled":false,"is_security_command_center_enabled":false,"is_resource_change_collection_enabled":false,"cloud_run_revision_filters":["tag:one","tag:two"],"errors":[]},{"project_id":"","client_email":"tf-TestAccIntegrationGcpStsBasic-local-1730997435@test-project.iam.gserviceaccount.com","host_filters":"tag:one,tag:two","automute":false,"is_cspm_enabled":false,"resource_collection_enabled":false,"is_security_command_center_enabled":false,"is_resource_change_collection_enabled":false,"cloud_run_revision_filters":["tag:one","tag:two"],"errors":[]},{"project_id":"","client_email":"ui@google.com","host_filters":"","automute":false,"is_cspm_enabled":false,"resource_collection_enabled":true,"is_security_command_center_enabled":false,"is_resource_change_collection_enabled":false,"cloud_run_revision_filters":[],"errors":[]},{"project_id":"tf-TestAccDatadogIntegrationGCP-local-1731006139","client_email":"tf-TestAccDatadogIntegrationGCP-local-1731006139@awesome-project-id.iam.gserviceaccount.com","host_filters":"","automute":false,"is_cspm_enabled":false,"resource_collection_enabled":true,"is_security_command_center_enabled":false,"is_resource_change_collection_enabled":false,"cloud_run_revision_filters":["tag:one","tag:two"],"errors":[]}] headers: Content-Type: - application/json status: 200 OK code: 200 - duration: 72.514084ms + duration: 73.012584ms - id: 10 request: proto: HTTP/1.1 proto_major: 1 proto_minor: 1 - content_length: 218 + content_length: 175 transfer_encoding: [] trailer: {} host: api.datadoghq.com remote_addr: "" request_uri: "" body: | - {"client_email":"tf-TestAccDatadogIntegrationGCP-local-1728591727@awesome-project-id.iam.gserviceaccount.com","project_id":"tf-TestAccDatadogIntegrationGCP-local-1728591727"} + {"client_email":"tf-TestAccDatadogIntegrationGCP-local-1731006139@awesome-project-id.iam.gserviceaccount.com","project_id":"tf-TestAccDatadogIntegrationGCP-local-1731006139"} form: {} headers: Accept: @@ -391,7 +391,7 @@ interactions: - application/json status: 200 OK code: 200 - duration: 79.935917ms + duration: 83.375583ms - id: 11 request: proto: HTTP/1.1 @@ -404,7 +404,7 @@ interactions: remote_addr: "" request_uri: "" body: | - {"auth_provider_x509_cert_url":"https://www.googleapis.com/oauth2/v1/certs","auth_uri":"https://accounts.google.com/o/oauth2/auth","automute":true,"client_email":"tf-TestAccDatadogIntegrationGCP-local-1728591727@awesome-project-id.iam.gserviceaccount.com","client_id":"123456789012345678901","client_x509_cert_url":"https://www.googleapis.com/robot/v1/metadata/x509/tf-TestAccDatadogIntegrationGCP-local-1728591727@awesome-project-id.iam.gserviceaccount.com","cloud_run_revision_filters":[],"host_filters":"","is_cspm_enabled":false,"is_security_command_center_enabled":false,"private_key":"-----BEGIN PRIVATE KEY-----\n key updated \n-----END PRIVATE KEY-----\n","private_key_id":"1234567890123456789012345678901234567890","project_id":"tf-TestAccDatadogIntegrationGCP-local-1728591727","token_uri":"https://oauth2.googleapis.com/token","type":"service_account"} + {"auth_provider_x509_cert_url":"https://www.googleapis.com/oauth2/v1/certs","auth_uri":"https://accounts.google.com/o/oauth2/auth","automute":true,"client_email":"tf-TestAccDatadogIntegrationGCP-local-1731006139@awesome-project-id.iam.gserviceaccount.com","client_id":"123456789012345678901","client_x509_cert_url":"https://www.googleapis.com/robot/v1/metadata/x509/tf-TestAccDatadogIntegrationGCP-local-1731006139@awesome-project-id.iam.gserviceaccount.com","cloud_run_revision_filters":[],"host_filters":"","is_cspm_enabled":false,"is_security_command_center_enabled":false,"private_key":"-----BEGIN PRIVATE KEY-----\n key updated \n-----END PRIVATE KEY-----\n","private_key_id":"1234567890123456789012345678901234567890","project_id":"tf-TestAccDatadogIntegrationGCP-local-1731006139","token_uri":"https://oauth2.googleapis.com/token","type":"service_account"} form: {} headers: Accept: @@ -428,7 +428,7 @@ interactions: - application/json status: 200 OK code: 200 - duration: 514.292959ms + duration: 523.327292ms - id: 12 request: proto: HTTP/1.1 @@ -457,13 +457,13 @@ interactions: content_length: -1 uncompressed: true body: | - [{"project_id":"","client_email":"bozo@google.com","host_filters":"","automute":false,"is_cspm_enabled":false,"resource_collection_enabled":false,"is_security_command_center_enabled":false,"is_resource_change_collection_enabled":false,"cloud_run_revision_filters":[],"errors":[]},{"project_id":"","client_email":"graytest@datadog-gcp-ints-test-b.iam.gserviceaccount.com","host_filters":"","automute":true,"is_cspm_enabled":false,"resource_collection_enabled":true,"is_security_command_center_enabled":false,"is_resource_change_collection_enabled":false,"cloud_run_revision_filters":[],"errors":[]},{"project_id":"","client_email":"ui@google.com","host_filters":"","automute":false,"is_cspm_enabled":false,"resource_collection_enabled":true,"is_security_command_center_enabled":false,"is_resource_change_collection_enabled":false,"cloud_run_revision_filters":[],"errors":[]},{"project_id":"tf-TestAccDatadogIntegrationGCP-local-1728591727","client_email":"tf-TestAccDatadogIntegrationGCP-local-1728591727@awesome-project-id.iam.gserviceaccount.com","host_filters":"","automute":true,"is_cspm_enabled":false,"resource_collection_enabled":true,"is_security_command_center_enabled":false,"is_resource_change_collection_enabled":false,"cloud_run_revision_filters":[],"errors":[]}] + [{"project_id":"","client_email":"bozo@google.com","host_filters":"","automute":false,"is_cspm_enabled":false,"resource_collection_enabled":false,"is_security_command_center_enabled":false,"is_resource_change_collection_enabled":false,"cloud_run_revision_filters":[],"errors":[]},{"project_id":"","client_email":"graytest@datadog-gcp-ints-test-b.iam.gserviceaccount.com","host_filters":"","automute":true,"is_cspm_enabled":false,"resource_collection_enabled":true,"is_security_command_center_enabled":false,"is_resource_change_collection_enabled":false,"cloud_run_revision_filters":[],"errors":[]},{"project_id":"","client_email":"tf-TestAccIntegrationGcpStsBasic-local-1730997425@test-project.iam.gserviceaccount.com","host_filters":"tag:one,tag:two","automute":false,"is_cspm_enabled":false,"resource_collection_enabled":false,"is_security_command_center_enabled":false,"is_resource_change_collection_enabled":false,"cloud_run_revision_filters":["tag:one","tag:two"],"errors":[]},{"project_id":"","client_email":"tf-TestAccIntegrationGcpStsBasic-local-1730997431@test-project.iam.gserviceaccount.com","host_filters":"tag:one,tag:two","automute":false,"is_cspm_enabled":false,"resource_collection_enabled":false,"is_security_command_center_enabled":false,"is_resource_change_collection_enabled":false,"cloud_run_revision_filters":["tag:one","tag:two"],"errors":[]},{"project_id":"","client_email":"tf-TestAccIntegrationGcpStsBasic-local-1730997435@test-project.iam.gserviceaccount.com","host_filters":"tag:one,tag:two","automute":false,"is_cspm_enabled":false,"resource_collection_enabled":false,"is_security_command_center_enabled":false,"is_resource_change_collection_enabled":false,"cloud_run_revision_filters":["tag:one","tag:two"],"errors":[]},{"project_id":"","client_email":"ui@google.com","host_filters":"","automute":false,"is_cspm_enabled":false,"resource_collection_enabled":true,"is_security_command_center_enabled":false,"is_resource_change_collection_enabled":false,"cloud_run_revision_filters":[],"errors":[]},{"project_id":"tf-TestAccDatadogIntegrationGCP-local-1731006139","client_email":"tf-TestAccDatadogIntegrationGCP-local-1731006139@awesome-project-id.iam.gserviceaccount.com","host_filters":"","automute":true,"is_cspm_enabled":false,"resource_collection_enabled":true,"is_security_command_center_enabled":false,"is_resource_change_collection_enabled":false,"cloud_run_revision_filters":[],"errors":[]}] headers: Content-Type: - application/json status: 200 OK code: 200 - duration: 64.650792ms + duration: 62.771125ms - id: 13 request: proto: HTTP/1.1 @@ -492,13 +492,13 @@ interactions: content_length: -1 uncompressed: true body: | - [{"project_id":"","client_email":"bozo@google.com","host_filters":"","automute":false,"is_cspm_enabled":false,"resource_collection_enabled":false,"is_security_command_center_enabled":false,"is_resource_change_collection_enabled":false,"cloud_run_revision_filters":[],"errors":[]},{"project_id":"","client_email":"graytest@datadog-gcp-ints-test-b.iam.gserviceaccount.com","host_filters":"","automute":true,"is_cspm_enabled":false,"resource_collection_enabled":true,"is_security_command_center_enabled":false,"is_resource_change_collection_enabled":false,"cloud_run_revision_filters":[],"errors":[]},{"project_id":"","client_email":"ui@google.com","host_filters":"","automute":false,"is_cspm_enabled":false,"resource_collection_enabled":true,"is_security_command_center_enabled":false,"is_resource_change_collection_enabled":false,"cloud_run_revision_filters":[],"errors":[]},{"project_id":"tf-TestAccDatadogIntegrationGCP-local-1728591727","client_email":"tf-TestAccDatadogIntegrationGCP-local-1728591727@awesome-project-id.iam.gserviceaccount.com","host_filters":"","automute":true,"is_cspm_enabled":false,"resource_collection_enabled":true,"is_security_command_center_enabled":false,"is_resource_change_collection_enabled":false,"cloud_run_revision_filters":[],"errors":[]}] + [{"project_id":"","client_email":"bozo@google.com","host_filters":"","automute":false,"is_cspm_enabled":false,"resource_collection_enabled":false,"is_security_command_center_enabled":false,"is_resource_change_collection_enabled":false,"cloud_run_revision_filters":[],"errors":[]},{"project_id":"","client_email":"graytest@datadog-gcp-ints-test-b.iam.gserviceaccount.com","host_filters":"","automute":true,"is_cspm_enabled":false,"resource_collection_enabled":true,"is_security_command_center_enabled":false,"is_resource_change_collection_enabled":false,"cloud_run_revision_filters":[],"errors":[]},{"project_id":"","client_email":"tf-TestAccIntegrationGcpStsBasic-local-1730997425@test-project.iam.gserviceaccount.com","host_filters":"tag:one,tag:two","automute":false,"is_cspm_enabled":false,"resource_collection_enabled":false,"is_security_command_center_enabled":false,"is_resource_change_collection_enabled":false,"cloud_run_revision_filters":["tag:one","tag:two"],"errors":[]},{"project_id":"","client_email":"tf-TestAccIntegrationGcpStsBasic-local-1730997431@test-project.iam.gserviceaccount.com","host_filters":"tag:one,tag:two","automute":false,"is_cspm_enabled":false,"resource_collection_enabled":false,"is_security_command_center_enabled":false,"is_resource_change_collection_enabled":false,"cloud_run_revision_filters":["tag:one","tag:two"],"errors":[]},{"project_id":"","client_email":"tf-TestAccIntegrationGcpStsBasic-local-1730997435@test-project.iam.gserviceaccount.com","host_filters":"tag:one,tag:two","automute":false,"is_cspm_enabled":false,"resource_collection_enabled":false,"is_security_command_center_enabled":false,"is_resource_change_collection_enabled":false,"cloud_run_revision_filters":["tag:one","tag:two"],"errors":[]},{"project_id":"","client_email":"ui@google.com","host_filters":"","automute":false,"is_cspm_enabled":false,"resource_collection_enabled":true,"is_security_command_center_enabled":false,"is_resource_change_collection_enabled":false,"cloud_run_revision_filters":[],"errors":[]},{"project_id":"tf-TestAccDatadogIntegrationGCP-local-1731006139","client_email":"tf-TestAccDatadogIntegrationGCP-local-1731006139@awesome-project-id.iam.gserviceaccount.com","host_filters":"","automute":true,"is_cspm_enabled":false,"resource_collection_enabled":true,"is_security_command_center_enabled":false,"is_resource_change_collection_enabled":false,"cloud_run_revision_filters":[],"errors":[]}] headers: Content-Type: - application/json status: 200 OK code: 200 - duration: 64.214375ms + duration: 82.371375ms - id: 14 request: proto: HTTP/1.1 @@ -527,26 +527,26 @@ interactions: content_length: -1 uncompressed: true body: | - [{"project_id":"","client_email":"bozo@google.com","host_filters":"","automute":false,"is_cspm_enabled":false,"resource_collection_enabled":false,"is_security_command_center_enabled":false,"is_resource_change_collection_enabled":false,"cloud_run_revision_filters":[],"errors":[]},{"project_id":"","client_email":"graytest@datadog-gcp-ints-test-b.iam.gserviceaccount.com","host_filters":"","automute":true,"is_cspm_enabled":false,"resource_collection_enabled":true,"is_security_command_center_enabled":false,"is_resource_change_collection_enabled":false,"cloud_run_revision_filters":[],"errors":[]},{"project_id":"","client_email":"ui@google.com","host_filters":"","automute":false,"is_cspm_enabled":false,"resource_collection_enabled":true,"is_security_command_center_enabled":false,"is_resource_change_collection_enabled":false,"cloud_run_revision_filters":[],"errors":[]},{"project_id":"tf-TestAccDatadogIntegrationGCP-local-1728591727","client_email":"tf-TestAccDatadogIntegrationGCP-local-1728591727@awesome-project-id.iam.gserviceaccount.com","host_filters":"","automute":true,"is_cspm_enabled":false,"resource_collection_enabled":true,"is_security_command_center_enabled":false,"is_resource_change_collection_enabled":false,"cloud_run_revision_filters":[],"errors":[]}] + [{"project_id":"","client_email":"bozo@google.com","host_filters":"","automute":false,"is_cspm_enabled":false,"resource_collection_enabled":false,"is_security_command_center_enabled":false,"is_resource_change_collection_enabled":false,"cloud_run_revision_filters":[],"errors":[]},{"project_id":"","client_email":"graytest@datadog-gcp-ints-test-b.iam.gserviceaccount.com","host_filters":"","automute":true,"is_cspm_enabled":false,"resource_collection_enabled":true,"is_security_command_center_enabled":false,"is_resource_change_collection_enabled":false,"cloud_run_revision_filters":[],"errors":[]},{"project_id":"","client_email":"tf-TestAccIntegrationGcpStsBasic-local-1730997425@test-project.iam.gserviceaccount.com","host_filters":"tag:one,tag:two","automute":false,"is_cspm_enabled":false,"resource_collection_enabled":false,"is_security_command_center_enabled":false,"is_resource_change_collection_enabled":false,"cloud_run_revision_filters":["tag:one","tag:two"],"errors":[]},{"project_id":"","client_email":"tf-TestAccIntegrationGcpStsBasic-local-1730997431@test-project.iam.gserviceaccount.com","host_filters":"tag:one,tag:two","automute":false,"is_cspm_enabled":false,"resource_collection_enabled":false,"is_security_command_center_enabled":false,"is_resource_change_collection_enabled":false,"cloud_run_revision_filters":["tag:one","tag:two"],"errors":[]},{"project_id":"","client_email":"tf-TestAccIntegrationGcpStsBasic-local-1730997435@test-project.iam.gserviceaccount.com","host_filters":"tag:one,tag:two","automute":false,"is_cspm_enabled":false,"resource_collection_enabled":false,"is_security_command_center_enabled":false,"is_resource_change_collection_enabled":false,"cloud_run_revision_filters":["tag:one","tag:two"],"errors":[]},{"project_id":"","client_email":"ui@google.com","host_filters":"","automute":false,"is_cspm_enabled":false,"resource_collection_enabled":true,"is_security_command_center_enabled":false,"is_resource_change_collection_enabled":false,"cloud_run_revision_filters":[],"errors":[]},{"project_id":"tf-TestAccDatadogIntegrationGCP-local-1731006139","client_email":"tf-TestAccDatadogIntegrationGCP-local-1731006139@awesome-project-id.iam.gserviceaccount.com","host_filters":"","automute":true,"is_cspm_enabled":false,"resource_collection_enabled":true,"is_security_command_center_enabled":false,"is_resource_change_collection_enabled":false,"cloud_run_revision_filters":[],"errors":[]}] headers: Content-Type: - application/json status: 200 OK code: 200 - duration: 78.902459ms + duration: 64.056042ms - id: 15 request: proto: HTTP/1.1 proto_major: 1 proto_minor: 1 - content_length: 218 + content_length: 175 transfer_encoding: [] trailer: {} host: api.datadoghq.com remote_addr: "" request_uri: "" body: | - {"client_email":"tf-TestAccDatadogIntegrationGCP-local-1728591727@awesome-project-id.iam.gserviceaccount.com","project_id":"tf-TestAccDatadogIntegrationGCP-local-1728591727"} + {"client_email":"tf-TestAccDatadogIntegrationGCP-local-1731006139@awesome-project-id.iam.gserviceaccount.com","project_id":"tf-TestAccDatadogIntegrationGCP-local-1731006139"} form: {} headers: Accept: @@ -570,7 +570,7 @@ interactions: - application/json status: 200 OK code: 200 - duration: 119.419875ms + duration: 73.327542ms - id: 16 request: proto: HTTP/1.1 @@ -599,10 +599,10 @@ interactions: content_length: -1 uncompressed: true body: | - [{"project_id":"","client_email":"bozo@google.com","host_filters":"","automute":false,"is_cspm_enabled":false,"resource_collection_enabled":false,"is_security_command_center_enabled":false,"is_resource_change_collection_enabled":false,"cloud_run_revision_filters":[],"errors":[]},{"project_id":"","client_email":"graytest@datadog-gcp-ints-test-b.iam.gserviceaccount.com","host_filters":"","automute":true,"is_cspm_enabled":false,"resource_collection_enabled":true,"is_security_command_center_enabled":false,"is_resource_change_collection_enabled":false,"cloud_run_revision_filters":[],"errors":[]},{"project_id":"","client_email":"ui@google.com","host_filters":"","automute":false,"is_cspm_enabled":false,"resource_collection_enabled":true,"is_security_command_center_enabled":false,"is_resource_change_collection_enabled":false,"cloud_run_revision_filters":[],"errors":[]}] + [{"project_id":"","client_email":"bozo@google.com","host_filters":"","automute":false,"is_cspm_enabled":false,"resource_collection_enabled":false,"is_security_command_center_enabled":false,"is_resource_change_collection_enabled":false,"cloud_run_revision_filters":[],"errors":[]},{"project_id":"","client_email":"graytest@datadog-gcp-ints-test-b.iam.gserviceaccount.com","host_filters":"","automute":true,"is_cspm_enabled":false,"resource_collection_enabled":true,"is_security_command_center_enabled":false,"is_resource_change_collection_enabled":false,"cloud_run_revision_filters":[],"errors":[]},{"project_id":"","client_email":"tf-TestAccIntegrationGcpStsBasic-local-1730997425@test-project.iam.gserviceaccount.com","host_filters":"tag:one,tag:two","automute":false,"is_cspm_enabled":false,"resource_collection_enabled":false,"is_security_command_center_enabled":false,"is_resource_change_collection_enabled":false,"cloud_run_revision_filters":["tag:one","tag:two"],"errors":[]},{"project_id":"","client_email":"tf-TestAccIntegrationGcpStsBasic-local-1730997431@test-project.iam.gserviceaccount.com","host_filters":"tag:one,tag:two","automute":false,"is_cspm_enabled":false,"resource_collection_enabled":false,"is_security_command_center_enabled":false,"is_resource_change_collection_enabled":false,"cloud_run_revision_filters":["tag:one","tag:two"],"errors":[]},{"project_id":"","client_email":"tf-TestAccIntegrationGcpStsBasic-local-1730997435@test-project.iam.gserviceaccount.com","host_filters":"tag:one,tag:two","automute":false,"is_cspm_enabled":false,"resource_collection_enabled":false,"is_security_command_center_enabled":false,"is_resource_change_collection_enabled":false,"cloud_run_revision_filters":["tag:one","tag:two"],"errors":[]},{"project_id":"","client_email":"ui@google.com","host_filters":"","automute":false,"is_cspm_enabled":false,"resource_collection_enabled":true,"is_security_command_center_enabled":false,"is_resource_change_collection_enabled":false,"cloud_run_revision_filters":[],"errors":[]}] headers: Content-Type: - application/json status: 200 OK code: 200 - duration: 80.319625ms + duration: 65.802208ms diff --git a/datadog/tests/cassettes/TestAccIntegrationGcpStsBasic.freeze b/datadog/tests/cassettes/TestAccIntegrationGcpStsBasic.freeze index 99b3af2641..41f1fc6e6a 100644 --- a/datadog/tests/cassettes/TestAccIntegrationGcpStsBasic.freeze +++ b/datadog/tests/cassettes/TestAccIntegrationGcpStsBasic.freeze @@ -1 +1 @@ -2024-10-10T16:23:12.722321-04:00 \ No newline at end of file +2024-11-07T13:41:37.228942-05:00 \ No newline at end of file diff --git a/datadog/tests/cassettes/TestAccIntegrationGcpStsBasic.yaml b/datadog/tests/cassettes/TestAccIntegrationGcpStsBasic.yaml index ae9d17a9df..294c3c2960 100644 --- a/datadog/tests/cassettes/TestAccIntegrationGcpStsBasic.yaml +++ b/datadog/tests/cassettes/TestAccIntegrationGcpStsBasic.yaml @@ -37,20 +37,20 @@ interactions: - application/json status: 200 OK code: 200 - duration: 109.727167ms + duration: 127.796ms - id: 1 request: proto: HTTP/1.1 proto_major: 1 proto_minor: 1 - content_length: 420 + content_length: 531 transfer_encoding: [] trailer: {} host: api.datadoghq.com remote_addr: "" request_uri: "" body: | - {"data":{"attributes":{"account_tags":["a:tag","and:another","another:one"],"automute":false,"client_email":"tf-TestAccIntegrationGcpStsBasic-local-1728591792@test-project.iam.gserviceaccount.com","cloud_run_revision_filters":["tag:one","tag:two"],"host_filters":["tag:one","tag:two"],"is_cspm_enabled":false,"is_security_command_center_enabled":false,"resource_collection_enabled":false},"type":"gcp_service_account"}} + {"data":{"attributes":{"account_tags":["a:tag","and:another","another:one"],"automute":false,"client_email":"tf-TestAccIntegrationGcpStsBasic-local-1731004897@test-project.iam.gserviceaccount.com","cloud_run_revision_filters":["tag:one","tag:two"],"host_filters":["tag:one","tag:two"],"is_cspm_enabled":false,"is_resource_change_collection_enabled":false,"is_security_command_center_enabled":false,"metric_namespace_configs":[{"disabled":true,"id":"aiplatform"}],"resource_collection_enabled":false},"type":"gcp_service_account"}} form: {} headers: Accept: @@ -69,13 +69,13 @@ interactions: content_length: -1 uncompressed: true body: | - {"data":{"type":"gcp_service_account","attributes":{"client_email":"tf-TestAccIntegrationGcpStsBasic-local-1728591792@test-project.iam.gserviceaccount.com","is_security_command_center_enabled":false,"host_filters":["tag:one","tag:two"],"account_tags":["a:tag","and:another","another:one"],"resource_collection_enabled":false,"cloud_run_revision_filters":["tag:one","tag:two"],"is_resource_change_collection_enabled":false,"automute":false,"is_cspm_enabled":false},"id":"b554f804-4240-4fe2-a04e-af5a4d147883"}} + {"data":{"type":"gcp_service_account","attributes":{"is_security_command_center_enabled":false,"resource_collection_enabled":false,"metric_namespace_configs":[{"id":"aiplatform","disabled":true}],"is_cspm_enabled":false,"automute":false,"client_email":"tf-TestAccIntegrationGcpStsBasic-local-1731004897@test-project.iam.gserviceaccount.com","host_filters":["tag:one","tag:two"],"cloud_run_revision_filters":["tag:one","tag:two"],"is_resource_change_collection_enabled":false,"account_tags":["a:tag","and:another","another:one"]},"id":"e54bb74b-8054-4cf9-a3cd-b2b95c80b136"}} headers: Content-Type: - application/json status: 201 Created code: 201 - duration: 476.108042ms + duration: 2.152498917s - id: 2 request: proto: HTTP/1.1 @@ -104,13 +104,13 @@ interactions: content_length: -1 uncompressed: true body: | - {"data":[{"type":"gcp_service_account","attributes":{"client_email":"ui@google.com","resource_collection_enabled":true,"is_security_command_center_enabled":false,"account_tags":[],"is_cspm_enabled":false,"automute":false,"is_resource_change_collection_enabled":false,"host_filters":[],"cloud_run_revision_filters":[]},"meta":{"accessible_projects":[]},"id":"8f12ca8e-5b6e-4904-8853-4b49ee096fbe"},{"type":"gcp_service_account","attributes":{"client_email":"bozo@google.com","resource_collection_enabled":false,"is_security_command_center_enabled":false,"account_tags":[],"is_cspm_enabled":false,"automute":false,"is_resource_change_collection_enabled":false,"host_filters":[],"cloud_run_revision_filters":[]},"meta":{"accessible_projects":[]},"id":"e06c6a63-983c-4858-9d43-c4f560c132d9"},{"type":"gcp_service_account","attributes":{"client_email":"tf-TestAccIntegrationGcpStsBasic-local-1728591792@test-project.iam.gserviceaccount.com","resource_collection_enabled":false,"is_security_command_center_enabled":false,"account_tags":["a:tag","and:another","another:one"],"is_cspm_enabled":false,"automute":false,"is_resource_change_collection_enabled":false,"host_filters":["tag:one","tag:two"],"cloud_run_revision_filters":["tag:one","tag:two"]},"meta":{"accessible_projects":[]},"id":"b554f804-4240-4fe2-a04e-af5a4d147883"},{"type":"gcp_service_account","attributes":{"client_email":"graytest@datadog-gcp-ints-test-b.iam.gserviceaccount.com","resource_collection_enabled":true,"is_security_command_center_enabled":false,"account_tags":["team:gray"],"is_cspm_enabled":false,"automute":true,"is_resource_change_collection_enabled":false,"host_filters":[],"cloud_run_revision_filters":[]},"meta":{"accessible_projects":["datadog-gcp-ints-test-b","datadog-gcp-ints-test-c"]},"id":"0f2b1be3-6c1a-4570-8e97-db356fcc37a7"}]} + {"data":[{"type":"gcp_service_account","attributes":{"is_resource_change_collection_enabled":false,"is_cspm_enabled":false,"cloud_run_revision_filters":[],"resource_collection_enabled":true,"is_security_command_center_enabled":false,"automute":true,"account_tags":["team:gray"],"client_email":"graytest@datadog-gcp-ints-test-b.iam.gserviceaccount.com","metric_namespace_configs":[],"host_filters":[]},"id":"0f2b1be3-6c1a-4570-8e97-db356fcc37a7","meta":{"accessible_projects":["datadog-gcp-ints-test-b","datadog-gcp-ints-test-c"]}},{"type":"gcp_service_account","attributes":{"is_resource_change_collection_enabled":false,"is_cspm_enabled":false,"cloud_run_revision_filters":[],"resource_collection_enabled":true,"is_security_command_center_enabled":false,"automute":false,"account_tags":[],"client_email":"ui@google.com","metric_namespace_configs":[],"host_filters":[]},"id":"8f12ca8e-5b6e-4904-8853-4b49ee096fbe","meta":{"accessible_projects":[]}},{"type":"gcp_service_account","attributes":{"is_resource_change_collection_enabled":false,"is_cspm_enabled":false,"cloud_run_revision_filters":[],"resource_collection_enabled":false,"is_security_command_center_enabled":false,"automute":false,"account_tags":[],"client_email":"bozo@google.com","metric_namespace_configs":[],"host_filters":[]},"id":"e06c6a63-983c-4858-9d43-c4f560c132d9","meta":{"accessible_projects":[]}},{"type":"gcp_service_account","attributes":{"is_resource_change_collection_enabled":false,"is_cspm_enabled":false,"cloud_run_revision_filters":["tag:one","tag:two"],"resource_collection_enabled":false,"is_security_command_center_enabled":false,"automute":false,"account_tags":["a:tag","and:another","another:one"],"client_email":"tf-TestAccIntegrationGcpStsBasic-local-1730997425@test-project.iam.gserviceaccount.com","metric_namespace_configs":[{"id":"aiplatform","disabled":true}],"host_filters":["tag:one","tag:two"]},"id":"6d94b1a1-3ae8-4980-841d-7e5db743debc","meta":{"accessible_projects":[]}},{"type":"gcp_service_account","attributes":{"is_resource_change_collection_enabled":false,"is_cspm_enabled":false,"cloud_run_revision_filters":["tag:one","tag:two"],"resource_collection_enabled":false,"is_security_command_center_enabled":false,"automute":false,"account_tags":["a:tag","and:another","another:one"],"client_email":"tf-TestAccIntegrationGcpStsBasic-local-1730997431@test-project.iam.gserviceaccount.com","metric_namespace_configs":[{"id":"aiplatform","disabled":true}],"host_filters":["tag:one","tag:two"]},"id":"6f9248c6-91f8-42ca-b856-a7bbcd5b6109","meta":{"accessible_projects":[]}},{"type":"gcp_service_account","attributes":{"is_resource_change_collection_enabled":false,"is_cspm_enabled":false,"cloud_run_revision_filters":["tag:one","tag:two"],"resource_collection_enabled":false,"is_security_command_center_enabled":false,"automute":false,"account_tags":["a:tag","and:another","another:one"],"client_email":"tf-TestAccIntegrationGcpStsBasic-local-1730997435@test-project.iam.gserviceaccount.com","metric_namespace_configs":[{"id":"aiplatform","disabled":true}],"host_filters":["tag:one","tag:two"]},"id":"a4c5b7ae-0d75-47ab-9c74-0e8d544f931c","meta":{"accessible_projects":[]}},{"type":"gcp_service_account","attributes":{"is_resource_change_collection_enabled":false,"is_cspm_enabled":false,"cloud_run_revision_filters":["tag:one","tag:two"],"resource_collection_enabled":false,"is_security_command_center_enabled":false,"automute":false,"account_tags":["a:tag","and:another","another:one"],"client_email":"tf-TestAccIntegrationGcpStsBasic-local-1731004897@test-project.iam.gserviceaccount.com","metric_namespace_configs":[{"id":"aiplatform","disabled":true}],"host_filters":["tag:one","tag:two"]},"id":"e54bb74b-8054-4cf9-a3cd-b2b95c80b136","meta":{"accessible_projects":[]}}]} headers: Content-Type: - application/json status: 200 OK code: 200 - duration: 74.878625ms + duration: 85.539083ms - id: 3 request: proto: HTTP/1.1 @@ -139,13 +139,13 @@ interactions: content_length: -1 uncompressed: true body: | - {"data":[{"type":"gcp_service_account","attributes":{"client_email":"ui@google.com","is_resource_change_collection_enabled":false,"account_tags":[],"is_cspm_enabled":false,"cloud_run_revision_filters":[],"resource_collection_enabled":true,"is_security_command_center_enabled":false,"automute":false,"host_filters":[]},"meta":{"accessible_projects":[]},"id":"8f12ca8e-5b6e-4904-8853-4b49ee096fbe"},{"type":"gcp_service_account","attributes":{"client_email":"bozo@google.com","is_resource_change_collection_enabled":false,"account_tags":[],"is_cspm_enabled":false,"cloud_run_revision_filters":[],"resource_collection_enabled":false,"is_security_command_center_enabled":false,"automute":false,"host_filters":[]},"meta":{"accessible_projects":[]},"id":"e06c6a63-983c-4858-9d43-c4f560c132d9"},{"type":"gcp_service_account","attributes":{"client_email":"tf-TestAccIntegrationGcpStsBasic-local-1728591792@test-project.iam.gserviceaccount.com","is_resource_change_collection_enabled":false,"account_tags":["a:tag","and:another","another:one"],"is_cspm_enabled":false,"cloud_run_revision_filters":["tag:one","tag:two"],"resource_collection_enabled":false,"is_security_command_center_enabled":false,"automute":false,"host_filters":["tag:one","tag:two"]},"meta":{"accessible_projects":[]},"id":"b554f804-4240-4fe2-a04e-af5a4d147883"},{"type":"gcp_service_account","attributes":{"client_email":"graytest@datadog-gcp-ints-test-b.iam.gserviceaccount.com","is_resource_change_collection_enabled":false,"account_tags":["team:gray"],"is_cspm_enabled":false,"cloud_run_revision_filters":[],"resource_collection_enabled":true,"is_security_command_center_enabled":false,"automute":true,"host_filters":[]},"meta":{"accessible_projects":["datadog-gcp-ints-test-b","datadog-gcp-ints-test-c"]},"id":"0f2b1be3-6c1a-4570-8e97-db356fcc37a7"}]} + {"data":[{"type":"gcp_service_account","attributes":{"is_security_command_center_enabled":false,"is_resource_change_collection_enabled":false,"is_cspm_enabled":false,"client_email":"graytest@datadog-gcp-ints-test-b.iam.gserviceaccount.com","host_filters":[],"metric_namespace_configs":[],"account_tags":["team:gray"],"resource_collection_enabled":true,"cloud_run_revision_filters":[],"automute":true},"meta":{"accessible_projects":["datadog-gcp-ints-test-b","datadog-gcp-ints-test-c"]},"id":"0f2b1be3-6c1a-4570-8e97-db356fcc37a7"},{"type":"gcp_service_account","attributes":{"is_security_command_center_enabled":false,"is_resource_change_collection_enabled":false,"is_cspm_enabled":false,"client_email":"ui@google.com","host_filters":[],"metric_namespace_configs":[],"account_tags":[],"resource_collection_enabled":true,"cloud_run_revision_filters":[],"automute":false},"meta":{"accessible_projects":[]},"id":"8f12ca8e-5b6e-4904-8853-4b49ee096fbe"},{"type":"gcp_service_account","attributes":{"is_security_command_center_enabled":false,"is_resource_change_collection_enabled":false,"is_cspm_enabled":false,"client_email":"bozo@google.com","host_filters":[],"metric_namespace_configs":[],"account_tags":[],"resource_collection_enabled":false,"cloud_run_revision_filters":[],"automute":false},"meta":{"accessible_projects":[]},"id":"e06c6a63-983c-4858-9d43-c4f560c132d9"},{"type":"gcp_service_account","attributes":{"is_security_command_center_enabled":false,"is_resource_change_collection_enabled":false,"is_cspm_enabled":false,"client_email":"tf-TestAccIntegrationGcpStsBasic-local-1730997425@test-project.iam.gserviceaccount.com","host_filters":["tag:one","tag:two"],"metric_namespace_configs":[{"id":"aiplatform","disabled":true}],"account_tags":["a:tag","and:another","another:one"],"resource_collection_enabled":false,"cloud_run_revision_filters":["tag:one","tag:two"],"automute":false},"meta":{"accessible_projects":[]},"id":"6d94b1a1-3ae8-4980-841d-7e5db743debc"},{"type":"gcp_service_account","attributes":{"is_security_command_center_enabled":false,"is_resource_change_collection_enabled":false,"is_cspm_enabled":false,"client_email":"tf-TestAccIntegrationGcpStsBasic-local-1730997431@test-project.iam.gserviceaccount.com","host_filters":["tag:one","tag:two"],"metric_namespace_configs":[{"id":"aiplatform","disabled":true}],"account_tags":["a:tag","and:another","another:one"],"resource_collection_enabled":false,"cloud_run_revision_filters":["tag:one","tag:two"],"automute":false},"meta":{"accessible_projects":[]},"id":"6f9248c6-91f8-42ca-b856-a7bbcd5b6109"},{"type":"gcp_service_account","attributes":{"is_security_command_center_enabled":false,"is_resource_change_collection_enabled":false,"is_cspm_enabled":false,"client_email":"tf-TestAccIntegrationGcpStsBasic-local-1730997435@test-project.iam.gserviceaccount.com","host_filters":["tag:one","tag:two"],"metric_namespace_configs":[{"id":"aiplatform","disabled":true}],"account_tags":["a:tag","and:another","another:one"],"resource_collection_enabled":false,"cloud_run_revision_filters":["tag:one","tag:two"],"automute":false},"meta":{"accessible_projects":[]},"id":"a4c5b7ae-0d75-47ab-9c74-0e8d544f931c"},{"type":"gcp_service_account","attributes":{"is_security_command_center_enabled":false,"is_resource_change_collection_enabled":false,"is_cspm_enabled":false,"client_email":"tf-TestAccIntegrationGcpStsBasic-local-1731004897@test-project.iam.gserviceaccount.com","host_filters":["tag:one","tag:two"],"metric_namespace_configs":[{"id":"aiplatform","disabled":true}],"account_tags":["a:tag","and:another","another:one"],"resource_collection_enabled":false,"cloud_run_revision_filters":["tag:one","tag:two"],"automute":false},"meta":{"accessible_projects":[]},"id":"e54bb74b-8054-4cf9-a3cd-b2b95c80b136"}]} headers: Content-Type: - application/json status: 200 OK code: 200 - duration: 77.762667ms + duration: 87.936584ms - id: 4 request: proto: HTTP/1.1 @@ -174,33 +174,33 @@ interactions: content_length: -1 uncompressed: true body: | - {"data":[{"type":"gcp_service_account","attributes":{"is_resource_change_collection_enabled":false,"client_email":"ui@google.com","host_filters":[],"cloud_run_revision_filters":[],"is_security_command_center_enabled":false,"automute":false,"resource_collection_enabled":true,"account_tags":[],"is_cspm_enabled":false},"id":"8f12ca8e-5b6e-4904-8853-4b49ee096fbe","meta":{"accessible_projects":[]}},{"type":"gcp_service_account","attributes":{"is_resource_change_collection_enabled":false,"client_email":"bozo@google.com","host_filters":[],"cloud_run_revision_filters":[],"is_security_command_center_enabled":false,"automute":false,"resource_collection_enabled":false,"account_tags":[],"is_cspm_enabled":false},"id":"e06c6a63-983c-4858-9d43-c4f560c132d9","meta":{"accessible_projects":[]}},{"type":"gcp_service_account","attributes":{"is_resource_change_collection_enabled":false,"client_email":"tf-TestAccIntegrationGcpStsBasic-local-1728591792@test-project.iam.gserviceaccount.com","host_filters":["tag:one","tag:two"],"cloud_run_revision_filters":["tag:one","tag:two"],"is_security_command_center_enabled":false,"automute":false,"resource_collection_enabled":false,"account_tags":["a:tag","and:another","another:one"],"is_cspm_enabled":false},"id":"b554f804-4240-4fe2-a04e-af5a4d147883","meta":{"accessible_projects":[]}},{"type":"gcp_service_account","attributes":{"is_resource_change_collection_enabled":false,"client_email":"graytest@datadog-gcp-ints-test-b.iam.gserviceaccount.com","host_filters":[],"cloud_run_revision_filters":[],"is_security_command_center_enabled":false,"automute":true,"resource_collection_enabled":true,"account_tags":["team:gray"],"is_cspm_enabled":false},"id":"0f2b1be3-6c1a-4570-8e97-db356fcc37a7","meta":{"accessible_projects":["datadog-gcp-ints-test-b","datadog-gcp-ints-test-c"]}}]} + {"data":[{"type":"gcp_service_account","meta":{"accessible_projects":["datadog-gcp-ints-test-b","datadog-gcp-ints-test-c"]},"attributes":{"host_filters":[],"client_email":"graytest@datadog-gcp-ints-test-b.iam.gserviceaccount.com","metric_namespace_configs":[],"is_security_command_center_enabled":false,"is_resource_change_collection_enabled":false,"resource_collection_enabled":true,"automute":true,"cloud_run_revision_filters":[],"is_cspm_enabled":false,"account_tags":["team:gray"]},"id":"0f2b1be3-6c1a-4570-8e97-db356fcc37a7"},{"type":"gcp_service_account","meta":{"accessible_projects":[]},"attributes":{"host_filters":[],"client_email":"ui@google.com","metric_namespace_configs":[],"is_security_command_center_enabled":false,"is_resource_change_collection_enabled":false,"resource_collection_enabled":true,"automute":false,"cloud_run_revision_filters":[],"is_cspm_enabled":false,"account_tags":[]},"id":"8f12ca8e-5b6e-4904-8853-4b49ee096fbe"},{"type":"gcp_service_account","meta":{"accessible_projects":[]},"attributes":{"host_filters":[],"client_email":"bozo@google.com","metric_namespace_configs":[],"is_security_command_center_enabled":false,"is_resource_change_collection_enabled":false,"resource_collection_enabled":false,"automute":false,"cloud_run_revision_filters":[],"is_cspm_enabled":false,"account_tags":[]},"id":"e06c6a63-983c-4858-9d43-c4f560c132d9"},{"type":"gcp_service_account","meta":{"accessible_projects":[]},"attributes":{"host_filters":["tag:one","tag:two"],"client_email":"tf-TestAccIntegrationGcpStsBasic-local-1730997425@test-project.iam.gserviceaccount.com","metric_namespace_configs":[{"id":"aiplatform","disabled":true}],"is_security_command_center_enabled":false,"is_resource_change_collection_enabled":false,"resource_collection_enabled":false,"automute":false,"cloud_run_revision_filters":["tag:one","tag:two"],"is_cspm_enabled":false,"account_tags":["a:tag","and:another","another:one"]},"id":"6d94b1a1-3ae8-4980-841d-7e5db743debc"},{"type":"gcp_service_account","meta":{"accessible_projects":[]},"attributes":{"host_filters":["tag:one","tag:two"],"client_email":"tf-TestAccIntegrationGcpStsBasic-local-1730997431@test-project.iam.gserviceaccount.com","metric_namespace_configs":[{"id":"aiplatform","disabled":true}],"is_security_command_center_enabled":false,"is_resource_change_collection_enabled":false,"resource_collection_enabled":false,"automute":false,"cloud_run_revision_filters":["tag:one","tag:two"],"is_cspm_enabled":false,"account_tags":["a:tag","and:another","another:one"]},"id":"6f9248c6-91f8-42ca-b856-a7bbcd5b6109"},{"type":"gcp_service_account","meta":{"accessible_projects":[]},"attributes":{"host_filters":["tag:one","tag:two"],"client_email":"tf-TestAccIntegrationGcpStsBasic-local-1730997435@test-project.iam.gserviceaccount.com","metric_namespace_configs":[{"id":"aiplatform","disabled":true}],"is_security_command_center_enabled":false,"is_resource_change_collection_enabled":false,"resource_collection_enabled":false,"automute":false,"cloud_run_revision_filters":["tag:one","tag:two"],"is_cspm_enabled":false,"account_tags":["a:tag","and:another","another:one"]},"id":"a4c5b7ae-0d75-47ab-9c74-0e8d544f931c"},{"type":"gcp_service_account","meta":{"accessible_projects":[]},"attributes":{"host_filters":["tag:one","tag:two"],"client_email":"tf-TestAccIntegrationGcpStsBasic-local-1731004897@test-project.iam.gserviceaccount.com","metric_namespace_configs":[{"id":"aiplatform","disabled":true}],"is_security_command_center_enabled":false,"is_resource_change_collection_enabled":false,"resource_collection_enabled":false,"automute":false,"cloud_run_revision_filters":["tag:one","tag:two"],"is_cspm_enabled":false,"account_tags":["a:tag","and:another","another:one"]},"id":"e54bb74b-8054-4cf9-a3cd-b2b95c80b136"}]} headers: Content-Type: - application/json status: 200 OK code: 200 - duration: 84.319541ms + duration: 88.508792ms - id: 5 request: proto: HTTP/1.1 proto_major: 1 proto_minor: 1 - content_length: 239 + content_length: 314 transfer_encoding: [] trailer: {} host: api.datadoghq.com remote_addr: "" request_uri: "" body: | - {"data":{"attributes":{"account_tags":[],"automute":true,"cloud_run_revision_filters":[],"host_filters":[],"is_cspm_enabled":true,"is_security_command_center_enabled":true,"resource_collection_enabled":true},"type":"gcp_service_account"}} + {"data":{"attributes":{"account_tags":[],"automute":true,"cloud_run_revision_filters":[],"host_filters":[],"is_cspm_enabled":true,"is_resource_change_collection_enabled":true,"is_security_command_center_enabled":true,"metric_namespace_configs":[],"resource_collection_enabled":true},"type":"gcp_service_account"}} form: {} headers: Accept: - application/json Content-Type: - application/json - url: https://api.datadoghq.com/api/v2/integration/gcp/accounts/b554f804-4240-4fe2-a04e-af5a4d147883 + url: https://api.datadoghq.com/api/v2/integration/gcp/accounts/e54bb74b-8054-4cf9-a3cd-b2b95c80b136 method: PATCH response: proto: HTTP/1.1 @@ -212,13 +212,13 @@ interactions: content_length: -1 uncompressed: true body: | - {"data":{"type":"gcp_service_account","attributes":{"is_security_command_center_enabled":true,"host_filters":[],"account_tags":[],"is_resource_change_collection_enabled":false,"client_email":"tf-TestAccIntegrationGcpStsBasic-local-1728591792@test-project.iam.gserviceaccount.com","is_cspm_enabled":true,"resource_collection_enabled":true,"cloud_run_revision_filters":[],"automute":true},"id":"b554f804-4240-4fe2-a04e-af5a4d147883"}} + {"data":{"type":"gcp_service_account","attributes":{"is_security_command_center_enabled":true,"account_tags":[],"metric_namespace_configs":[],"automute":true,"is_cspm_enabled":true,"is_resource_change_collection_enabled":true,"cloud_run_revision_filters":[],"client_email":"tf-TestAccIntegrationGcpStsBasic-local-1731004897@test-project.iam.gserviceaccount.com","host_filters":[],"resource_collection_enabled":true},"id":"e54bb74b-8054-4cf9-a3cd-b2b95c80b136"}} headers: Content-Type: - application/json status: 201 Created code: 201 - duration: 627.329458ms + duration: 605.637291ms - id: 6 request: proto: HTTP/1.1 @@ -247,13 +247,13 @@ interactions: content_length: -1 uncompressed: true body: | - {"data":[{"type":"gcp_service_account","attributes":{"account_tags":[],"client_email":"ui@google.com","is_security_command_center_enabled":false,"host_filters":[],"resource_collection_enabled":true,"automute":false,"is_cspm_enabled":false,"is_resource_change_collection_enabled":false,"cloud_run_revision_filters":[]},"id":"8f12ca8e-5b6e-4904-8853-4b49ee096fbe","meta":{"accessible_projects":[]}},{"type":"gcp_service_account","attributes":{"account_tags":[],"client_email":"bozo@google.com","is_security_command_center_enabled":false,"host_filters":[],"resource_collection_enabled":false,"automute":false,"is_cspm_enabled":false,"is_resource_change_collection_enabled":false,"cloud_run_revision_filters":[]},"id":"e06c6a63-983c-4858-9d43-c4f560c132d9","meta":{"accessible_projects":[]}},{"type":"gcp_service_account","attributes":{"account_tags":[],"client_email":"tf-TestAccIntegrationGcpStsBasic-local-1728591792@test-project.iam.gserviceaccount.com","is_security_command_center_enabled":true,"host_filters":[],"resource_collection_enabled":true,"automute":true,"is_cspm_enabled":true,"is_resource_change_collection_enabled":false,"cloud_run_revision_filters":[]},"id":"b554f804-4240-4fe2-a04e-af5a4d147883","meta":{"accessible_projects":[]}},{"type":"gcp_service_account","attributes":{"account_tags":["team:gray"],"client_email":"graytest@datadog-gcp-ints-test-b.iam.gserviceaccount.com","is_security_command_center_enabled":false,"host_filters":[],"resource_collection_enabled":true,"automute":true,"is_cspm_enabled":false,"is_resource_change_collection_enabled":false,"cloud_run_revision_filters":[]},"id":"0f2b1be3-6c1a-4570-8e97-db356fcc37a7","meta":{"accessible_projects":["datadog-gcp-ints-test-b","datadog-gcp-ints-test-c"]}}]} + {"data":[{"type":"gcp_service_account","attributes":{"metric_namespace_configs":[],"is_cspm_enabled":false,"resource_collection_enabled":true,"automute":true,"host_filters":[],"is_resource_change_collection_enabled":false,"cloud_run_revision_filters":[],"client_email":"graytest@datadog-gcp-ints-test-b.iam.gserviceaccount.com","is_security_command_center_enabled":false,"account_tags":["team:gray"]},"id":"0f2b1be3-6c1a-4570-8e97-db356fcc37a7","meta":{"accessible_projects":["datadog-gcp-ints-test-b","datadog-gcp-ints-test-c"]}},{"type":"gcp_service_account","attributes":{"metric_namespace_configs":[],"is_cspm_enabled":false,"resource_collection_enabled":true,"automute":false,"host_filters":[],"is_resource_change_collection_enabled":false,"cloud_run_revision_filters":[],"client_email":"ui@google.com","is_security_command_center_enabled":false,"account_tags":[]},"id":"8f12ca8e-5b6e-4904-8853-4b49ee096fbe","meta":{"accessible_projects":[]}},{"type":"gcp_service_account","attributes":{"metric_namespace_configs":[],"is_cspm_enabled":false,"resource_collection_enabled":false,"automute":false,"host_filters":[],"is_resource_change_collection_enabled":false,"cloud_run_revision_filters":[],"client_email":"bozo@google.com","is_security_command_center_enabled":false,"account_tags":[]},"id":"e06c6a63-983c-4858-9d43-c4f560c132d9","meta":{"accessible_projects":[]}},{"type":"gcp_service_account","attributes":{"metric_namespace_configs":[{"disabled":true,"id":"aiplatform"}],"is_cspm_enabled":false,"resource_collection_enabled":false,"automute":false,"host_filters":["tag:one","tag:two"],"is_resource_change_collection_enabled":false,"cloud_run_revision_filters":["tag:one","tag:two"],"client_email":"tf-TestAccIntegrationGcpStsBasic-local-1730997425@test-project.iam.gserviceaccount.com","is_security_command_center_enabled":false,"account_tags":["a:tag","and:another","another:one"]},"id":"6d94b1a1-3ae8-4980-841d-7e5db743debc","meta":{"accessible_projects":[]}},{"type":"gcp_service_account","attributes":{"metric_namespace_configs":[{"disabled":true,"id":"aiplatform"}],"is_cspm_enabled":false,"resource_collection_enabled":false,"automute":false,"host_filters":["tag:one","tag:two"],"is_resource_change_collection_enabled":false,"cloud_run_revision_filters":["tag:one","tag:two"],"client_email":"tf-TestAccIntegrationGcpStsBasic-local-1730997431@test-project.iam.gserviceaccount.com","is_security_command_center_enabled":false,"account_tags":["a:tag","and:another","another:one"]},"id":"6f9248c6-91f8-42ca-b856-a7bbcd5b6109","meta":{"accessible_projects":[]}},{"type":"gcp_service_account","attributes":{"metric_namespace_configs":[{"disabled":true,"id":"aiplatform"}],"is_cspm_enabled":false,"resource_collection_enabled":false,"automute":false,"host_filters":["tag:one","tag:two"],"is_resource_change_collection_enabled":false,"cloud_run_revision_filters":["tag:one","tag:two"],"client_email":"tf-TestAccIntegrationGcpStsBasic-local-1730997435@test-project.iam.gserviceaccount.com","is_security_command_center_enabled":false,"account_tags":["a:tag","and:another","another:one"]},"id":"a4c5b7ae-0d75-47ab-9c74-0e8d544f931c","meta":{"accessible_projects":[]}},{"type":"gcp_service_account","attributes":{"metric_namespace_configs":[],"is_cspm_enabled":true,"resource_collection_enabled":true,"automute":true,"host_filters":[],"is_resource_change_collection_enabled":true,"cloud_run_revision_filters":[],"client_email":"tf-TestAccIntegrationGcpStsBasic-local-1731004897@test-project.iam.gserviceaccount.com","is_security_command_center_enabled":true,"account_tags":[]},"id":"e54bb74b-8054-4cf9-a3cd-b2b95c80b136","meta":{"accessible_projects":[]}}]} headers: Content-Type: - application/json status: 200 OK code: 200 - duration: 73.25975ms + duration: 97.445875ms - id: 7 request: proto: HTTP/1.1 @@ -282,13 +282,13 @@ interactions: content_length: -1 uncompressed: true body: | - {"data":[{"type":"gcp_service_account","attributes":{"is_security_command_center_enabled":false,"client_email":"ui@google.com","cloud_run_revision_filters":[],"automute":false,"account_tags":[],"resource_collection_enabled":true,"host_filters":[],"is_resource_change_collection_enabled":false,"is_cspm_enabled":false},"id":"8f12ca8e-5b6e-4904-8853-4b49ee096fbe","meta":{"accessible_projects":[]}},{"type":"gcp_service_account","attributes":{"is_security_command_center_enabled":false,"client_email":"bozo@google.com","cloud_run_revision_filters":[],"automute":false,"account_tags":[],"resource_collection_enabled":false,"host_filters":[],"is_resource_change_collection_enabled":false,"is_cspm_enabled":false},"id":"e06c6a63-983c-4858-9d43-c4f560c132d9","meta":{"accessible_projects":[]}},{"type":"gcp_service_account","attributes":{"is_security_command_center_enabled":true,"client_email":"tf-TestAccIntegrationGcpStsBasic-local-1728591792@test-project.iam.gserviceaccount.com","cloud_run_revision_filters":[],"automute":true,"account_tags":[],"resource_collection_enabled":true,"host_filters":[],"is_resource_change_collection_enabled":false,"is_cspm_enabled":true},"id":"b554f804-4240-4fe2-a04e-af5a4d147883","meta":{"accessible_projects":[]}},{"type":"gcp_service_account","attributes":{"is_security_command_center_enabled":false,"client_email":"graytest@datadog-gcp-ints-test-b.iam.gserviceaccount.com","cloud_run_revision_filters":[],"automute":true,"account_tags":["team:gray"],"resource_collection_enabled":true,"host_filters":[],"is_resource_change_collection_enabled":false,"is_cspm_enabled":false},"id":"0f2b1be3-6c1a-4570-8e97-db356fcc37a7","meta":{"accessible_projects":["datadog-gcp-ints-test-b","datadog-gcp-ints-test-c"]}}]} + {"data":[{"type":"gcp_service_account","attributes":{"host_filters":[],"cloud_run_revision_filters":[],"is_security_command_center_enabled":false,"client_email":"graytest@datadog-gcp-ints-test-b.iam.gserviceaccount.com","is_cspm_enabled":false,"resource_collection_enabled":true,"account_tags":["team:gray"],"is_resource_change_collection_enabled":false,"automute":true,"metric_namespace_configs":[]},"meta":{"accessible_projects":["datadog-gcp-ints-test-b","datadog-gcp-ints-test-c"]},"id":"0f2b1be3-6c1a-4570-8e97-db356fcc37a7"},{"type":"gcp_service_account","attributes":{"host_filters":[],"cloud_run_revision_filters":[],"is_security_command_center_enabled":false,"client_email":"ui@google.com","is_cspm_enabled":false,"resource_collection_enabled":true,"account_tags":[],"is_resource_change_collection_enabled":false,"automute":false,"metric_namespace_configs":[]},"meta":{"accessible_projects":[]},"id":"8f12ca8e-5b6e-4904-8853-4b49ee096fbe"},{"type":"gcp_service_account","attributes":{"host_filters":[],"cloud_run_revision_filters":[],"is_security_command_center_enabled":false,"client_email":"bozo@google.com","is_cspm_enabled":false,"resource_collection_enabled":false,"account_tags":[],"is_resource_change_collection_enabled":false,"automute":false,"metric_namespace_configs":[]},"meta":{"accessible_projects":[]},"id":"e06c6a63-983c-4858-9d43-c4f560c132d9"},{"type":"gcp_service_account","attributes":{"host_filters":["tag:one","tag:two"],"cloud_run_revision_filters":["tag:one","tag:two"],"is_security_command_center_enabled":false,"client_email":"tf-TestAccIntegrationGcpStsBasic-local-1730997425@test-project.iam.gserviceaccount.com","is_cspm_enabled":false,"resource_collection_enabled":false,"account_tags":["a:tag","and:another","another:one"],"is_resource_change_collection_enabled":false,"automute":false,"metric_namespace_configs":[{"id":"aiplatform","disabled":true}]},"meta":{"accessible_projects":[]},"id":"6d94b1a1-3ae8-4980-841d-7e5db743debc"},{"type":"gcp_service_account","attributes":{"host_filters":["tag:one","tag:two"],"cloud_run_revision_filters":["tag:one","tag:two"],"is_security_command_center_enabled":false,"client_email":"tf-TestAccIntegrationGcpStsBasic-local-1730997431@test-project.iam.gserviceaccount.com","is_cspm_enabled":false,"resource_collection_enabled":false,"account_tags":["a:tag","and:another","another:one"],"is_resource_change_collection_enabled":false,"automute":false,"metric_namespace_configs":[{"id":"aiplatform","disabled":true}]},"meta":{"accessible_projects":[]},"id":"6f9248c6-91f8-42ca-b856-a7bbcd5b6109"},{"type":"gcp_service_account","attributes":{"host_filters":["tag:one","tag:two"],"cloud_run_revision_filters":["tag:one","tag:two"],"is_security_command_center_enabled":false,"client_email":"tf-TestAccIntegrationGcpStsBasic-local-1730997435@test-project.iam.gserviceaccount.com","is_cspm_enabled":false,"resource_collection_enabled":false,"account_tags":["a:tag","and:another","another:one"],"is_resource_change_collection_enabled":false,"automute":false,"metric_namespace_configs":[{"id":"aiplatform","disabled":true}]},"meta":{"accessible_projects":[]},"id":"a4c5b7ae-0d75-47ab-9c74-0e8d544f931c"},{"type":"gcp_service_account","attributes":{"host_filters":[],"cloud_run_revision_filters":[],"is_security_command_center_enabled":true,"client_email":"tf-TestAccIntegrationGcpStsBasic-local-1731004897@test-project.iam.gserviceaccount.com","is_cspm_enabled":true,"resource_collection_enabled":true,"account_tags":[],"is_resource_change_collection_enabled":true,"automute":true,"metric_namespace_configs":[]},"meta":{"accessible_projects":[]},"id":"e54bb74b-8054-4cf9-a3cd-b2b95c80b136"}]} headers: Content-Type: - application/json status: 200 OK code: 200 - duration: 78.277917ms + duration: 69.15625ms - id: 8 request: proto: HTTP/1.1 @@ -305,7 +305,7 @@ interactions: headers: Accept: - '*/*' - url: https://api.datadoghq.com/api/v2/integration/gcp/accounts/b554f804-4240-4fe2-a04e-af5a4d147883 + url: https://api.datadoghq.com/api/v2/integration/gcp/accounts/e54bb74b-8054-4cf9-a3cd-b2b95c80b136 method: DELETE response: proto: HTTP/1.1 @@ -321,4 +321,4 @@ interactions: - text/html; charset=utf-8 status: 204 No Content code: 204 - duration: 96.882125ms + duration: 117.16125ms diff --git a/datadog/tests/cassettes/TestAccIntegrationGcpStsDefault.freeze b/datadog/tests/cassettes/TestAccIntegrationGcpStsDefault.freeze index 96d5f9178c..e392bd0820 100644 --- a/datadog/tests/cassettes/TestAccIntegrationGcpStsDefault.freeze +++ b/datadog/tests/cassettes/TestAccIntegrationGcpStsDefault.freeze @@ -1 +1 @@ -2024-10-10T16:23:24.600661-04:00 \ No newline at end of file +2024-11-07T13:41:47.58081-05:00 \ No newline at end of file diff --git a/datadog/tests/cassettes/TestAccIntegrationGcpStsDefault.yaml b/datadog/tests/cassettes/TestAccIntegrationGcpStsDefault.yaml index 41d1291a51..fc54d3ec9a 100644 --- a/datadog/tests/cassettes/TestAccIntegrationGcpStsDefault.yaml +++ b/datadog/tests/cassettes/TestAccIntegrationGcpStsDefault.yaml @@ -37,20 +37,20 @@ interactions: - application/json status: 200 OK code: 200 - duration: 139.198375ms + duration: 117.901333ms - id: 1 request: proto: HTTP/1.1 proto_major: 1 proto_minor: 1 - content_length: 312 + content_length: 342 transfer_encoding: [] trailer: {} host: api.datadoghq.com remote_addr: "" request_uri: "" body: | - {"data":{"attributes":{"account_tags":[],"automute":true,"client_email":"tf-TestAccIntegrationGcpStsDefault-local-1728591804@test-project.iam.gserviceaccount.com","cloud_run_revision_filters":[],"host_filters":[],"is_cspm_enabled":false,"is_security_command_center_enabled":false},"type":"gcp_service_account"}} + {"data":{"attributes":{"account_tags":[],"automute":true,"client_email":"tf-TestAccIntegrationGcpStsDefault-local-1731004907@test-project.iam.gserviceaccount.com","cloud_run_revision_filters":[],"host_filters":[],"is_cspm_enabled":false,"is_security_command_center_enabled":false,"metric_namespace_configs":[]},"type":"gcp_service_account"}} form: {} headers: Accept: @@ -69,13 +69,13 @@ interactions: content_length: -1 uncompressed: true body: | - {"data":{"type":"gcp_service_account","attributes":{"resource_collection_enabled":true,"is_resource_change_collection_enabled":false,"host_filters":[],"is_cspm_enabled":false,"cloud_run_revision_filters":[],"is_security_command_center_enabled":false,"client_email":"tf-TestAccIntegrationGcpStsDefault-local-1728591804@test-project.iam.gserviceaccount.com","account_tags":[],"automute":true},"id":"c40d3491-20ac-49a0-bbb9-26d5ac51ebc1"}} + {"data":{"type":"gcp_service_account","attributes":{"resource_collection_enabled":true,"automute":true,"client_email":"tf-TestAccIntegrationGcpStsDefault-local-1731004907@test-project.iam.gserviceaccount.com","is_security_command_center_enabled":false,"cloud_run_revision_filters":[],"is_cspm_enabled":false,"account_tags":[],"is_resource_change_collection_enabled":false,"metric_namespace_configs":[],"host_filters":[]},"id":"a1b3e1d2-811d-47f3-9616-5a1e0740289f"}} headers: Content-Type: - application/json status: 201 Created code: 201 - duration: 482.491834ms + duration: 454.355166ms - id: 2 request: proto: HTTP/1.1 @@ -104,13 +104,13 @@ interactions: content_length: -1 uncompressed: true body: | - {"data":[{"type":"gcp_service_account","attributes":{"account_tags":[],"cloud_run_revision_filters":[],"host_filters":[],"client_email":"ui@google.com","is_security_command_center_enabled":false,"automute":false,"is_cspm_enabled":false,"is_resource_change_collection_enabled":false,"resource_collection_enabled":true},"meta":{"accessible_projects":[]},"id":"8f12ca8e-5b6e-4904-8853-4b49ee096fbe"},{"type":"gcp_service_account","attributes":{"account_tags":[],"cloud_run_revision_filters":[],"host_filters":[],"client_email":"bozo@google.com","is_security_command_center_enabled":false,"automute":false,"is_cspm_enabled":false,"is_resource_change_collection_enabled":false,"resource_collection_enabled":false},"meta":{"accessible_projects":[]},"id":"e06c6a63-983c-4858-9d43-c4f560c132d9"},{"type":"gcp_service_account","attributes":{"account_tags":[],"cloud_run_revision_filters":[],"host_filters":[],"client_email":"tf-TestAccIntegrationGcpStsDefault-local-1728591804@test-project.iam.gserviceaccount.com","is_security_command_center_enabled":false,"automute":true,"is_cspm_enabled":false,"is_resource_change_collection_enabled":false,"resource_collection_enabled":true},"meta":{"accessible_projects":[]},"id":"c40d3491-20ac-49a0-bbb9-26d5ac51ebc1"},{"type":"gcp_service_account","attributes":{"account_tags":["team:gray"],"cloud_run_revision_filters":[],"host_filters":[],"client_email":"graytest@datadog-gcp-ints-test-b.iam.gserviceaccount.com","is_security_command_center_enabled":false,"automute":true,"is_cspm_enabled":false,"is_resource_change_collection_enabled":false,"resource_collection_enabled":true},"meta":{"accessible_projects":["datadog-gcp-ints-test-b","datadog-gcp-ints-test-c"]},"id":"0f2b1be3-6c1a-4570-8e97-db356fcc37a7"}]} + {"data":[{"type":"gcp_service_account","attributes":{"is_resource_change_collection_enabled":false,"cloud_run_revision_filters":[],"automute":true,"host_filters":[],"account_tags":["team:gray"],"metric_namespace_configs":[],"is_security_command_center_enabled":false,"client_email":"graytest@datadog-gcp-ints-test-b.iam.gserviceaccount.com","is_cspm_enabled":false,"resource_collection_enabled":true},"meta":{"accessible_projects":["datadog-gcp-ints-test-b","datadog-gcp-ints-test-c"]},"id":"0f2b1be3-6c1a-4570-8e97-db356fcc37a7"},{"type":"gcp_service_account","attributes":{"is_resource_change_collection_enabled":false,"cloud_run_revision_filters":[],"automute":false,"host_filters":[],"account_tags":[],"metric_namespace_configs":[],"is_security_command_center_enabled":false,"client_email":"ui@google.com","is_cspm_enabled":false,"resource_collection_enabled":true},"meta":{"accessible_projects":[]},"id":"8f12ca8e-5b6e-4904-8853-4b49ee096fbe"},{"type":"gcp_service_account","attributes":{"is_resource_change_collection_enabled":false,"cloud_run_revision_filters":[],"automute":false,"host_filters":[],"account_tags":[],"metric_namespace_configs":[],"is_security_command_center_enabled":false,"client_email":"bozo@google.com","is_cspm_enabled":false,"resource_collection_enabled":false},"meta":{"accessible_projects":[]},"id":"e06c6a63-983c-4858-9d43-c4f560c132d9"},{"type":"gcp_service_account","attributes":{"is_resource_change_collection_enabled":false,"cloud_run_revision_filters":["tag:one","tag:two"],"automute":false,"host_filters":["tag:one","tag:two"],"account_tags":["a:tag","and:another","another:one"],"metric_namespace_configs":[{"disabled":true,"id":"aiplatform"}],"is_security_command_center_enabled":false,"client_email":"tf-TestAccIntegrationGcpStsBasic-local-1730997425@test-project.iam.gserviceaccount.com","is_cspm_enabled":false,"resource_collection_enabled":false},"meta":{"accessible_projects":[]},"id":"6d94b1a1-3ae8-4980-841d-7e5db743debc"},{"type":"gcp_service_account","attributes":{"is_resource_change_collection_enabled":false,"cloud_run_revision_filters":["tag:one","tag:two"],"automute":false,"host_filters":["tag:one","tag:two"],"account_tags":["a:tag","and:another","another:one"],"metric_namespace_configs":[{"disabled":true,"id":"aiplatform"}],"is_security_command_center_enabled":false,"client_email":"tf-TestAccIntegrationGcpStsBasic-local-1730997431@test-project.iam.gserviceaccount.com","is_cspm_enabled":false,"resource_collection_enabled":false},"meta":{"accessible_projects":[]},"id":"6f9248c6-91f8-42ca-b856-a7bbcd5b6109"},{"type":"gcp_service_account","attributes":{"is_resource_change_collection_enabled":false,"cloud_run_revision_filters":["tag:one","tag:two"],"automute":false,"host_filters":["tag:one","tag:two"],"account_tags":["a:tag","and:another","another:one"],"metric_namespace_configs":[{"disabled":true,"id":"aiplatform"}],"is_security_command_center_enabled":false,"client_email":"tf-TestAccIntegrationGcpStsBasic-local-1730997435@test-project.iam.gserviceaccount.com","is_cspm_enabled":false,"resource_collection_enabled":false},"meta":{"accessible_projects":[]},"id":"a4c5b7ae-0d75-47ab-9c74-0e8d544f931c"},{"type":"gcp_service_account","attributes":{"is_resource_change_collection_enabled":false,"cloud_run_revision_filters":[],"automute":true,"host_filters":[],"account_tags":[],"metric_namespace_configs":[],"is_security_command_center_enabled":false,"client_email":"tf-TestAccIntegrationGcpStsDefault-local-1731004907@test-project.iam.gserviceaccount.com","is_cspm_enabled":false,"resource_collection_enabled":true},"meta":{"accessible_projects":[]},"id":"a1b3e1d2-811d-47f3-9616-5a1e0740289f"}]} headers: Content-Type: - application/json status: 200 OK code: 200 - duration: 106.647875ms + duration: 67.534625ms - id: 3 request: proto: HTTP/1.1 @@ -139,13 +139,13 @@ interactions: content_length: -1 uncompressed: true body: | - {"data":[{"type":"gcp_service_account","attributes":{"cloud_run_revision_filters":[],"automute":false,"client_email":"ui@google.com","is_resource_change_collection_enabled":false,"account_tags":[],"is_cspm_enabled":false,"host_filters":[],"is_security_command_center_enabled":false,"resource_collection_enabled":true},"meta":{"accessible_projects":[]},"id":"8f12ca8e-5b6e-4904-8853-4b49ee096fbe"},{"type":"gcp_service_account","attributes":{"cloud_run_revision_filters":[],"automute":false,"client_email":"bozo@google.com","is_resource_change_collection_enabled":false,"account_tags":[],"is_cspm_enabled":false,"host_filters":[],"is_security_command_center_enabled":false,"resource_collection_enabled":false},"meta":{"accessible_projects":[]},"id":"e06c6a63-983c-4858-9d43-c4f560c132d9"},{"type":"gcp_service_account","attributes":{"cloud_run_revision_filters":[],"automute":true,"client_email":"tf-TestAccIntegrationGcpStsDefault-local-1728591804@test-project.iam.gserviceaccount.com","is_resource_change_collection_enabled":false,"account_tags":[],"is_cspm_enabled":false,"host_filters":[],"is_security_command_center_enabled":false,"resource_collection_enabled":true},"meta":{"accessible_projects":[]},"id":"c40d3491-20ac-49a0-bbb9-26d5ac51ebc1"},{"type":"gcp_service_account","attributes":{"cloud_run_revision_filters":[],"automute":true,"client_email":"graytest@datadog-gcp-ints-test-b.iam.gserviceaccount.com","is_resource_change_collection_enabled":false,"account_tags":["team:gray"],"is_cspm_enabled":false,"host_filters":[],"is_security_command_center_enabled":false,"resource_collection_enabled":true},"meta":{"accessible_projects":["datadog-gcp-ints-test-b","datadog-gcp-ints-test-c"]},"id":"0f2b1be3-6c1a-4570-8e97-db356fcc37a7"}]} + {"data":[{"type":"gcp_service_account","attributes":{"is_cspm_enabled":false,"metric_namespace_configs":[],"is_resource_change_collection_enabled":false,"automute":true,"is_security_command_center_enabled":false,"account_tags":["team:gray"],"cloud_run_revision_filters":[],"host_filters":[],"resource_collection_enabled":true,"client_email":"graytest@datadog-gcp-ints-test-b.iam.gserviceaccount.com"},"id":"0f2b1be3-6c1a-4570-8e97-db356fcc37a7","meta":{"accessible_projects":["datadog-gcp-ints-test-b","datadog-gcp-ints-test-c"]}},{"type":"gcp_service_account","attributes":{"is_cspm_enabled":false,"metric_namespace_configs":[],"is_resource_change_collection_enabled":false,"automute":false,"is_security_command_center_enabled":false,"account_tags":[],"cloud_run_revision_filters":[],"host_filters":[],"resource_collection_enabled":true,"client_email":"ui@google.com"},"id":"8f12ca8e-5b6e-4904-8853-4b49ee096fbe","meta":{"accessible_projects":[]}},{"type":"gcp_service_account","attributes":{"is_cspm_enabled":false,"metric_namespace_configs":[],"is_resource_change_collection_enabled":false,"automute":false,"is_security_command_center_enabled":false,"account_tags":[],"cloud_run_revision_filters":[],"host_filters":[],"resource_collection_enabled":false,"client_email":"bozo@google.com"},"id":"e06c6a63-983c-4858-9d43-c4f560c132d9","meta":{"accessible_projects":[]}},{"type":"gcp_service_account","attributes":{"is_cspm_enabled":false,"metric_namespace_configs":[{"id":"aiplatform","disabled":true}],"is_resource_change_collection_enabled":false,"automute":false,"is_security_command_center_enabled":false,"account_tags":["a:tag","and:another","another:one"],"cloud_run_revision_filters":["tag:one","tag:two"],"host_filters":["tag:one","tag:two"],"resource_collection_enabled":false,"client_email":"tf-TestAccIntegrationGcpStsBasic-local-1730997425@test-project.iam.gserviceaccount.com"},"id":"6d94b1a1-3ae8-4980-841d-7e5db743debc","meta":{"accessible_projects":[]}},{"type":"gcp_service_account","attributes":{"is_cspm_enabled":false,"metric_namespace_configs":[{"id":"aiplatform","disabled":true}],"is_resource_change_collection_enabled":false,"automute":false,"is_security_command_center_enabled":false,"account_tags":["a:tag","and:another","another:one"],"cloud_run_revision_filters":["tag:one","tag:two"],"host_filters":["tag:one","tag:two"],"resource_collection_enabled":false,"client_email":"tf-TestAccIntegrationGcpStsBasic-local-1730997431@test-project.iam.gserviceaccount.com"},"id":"6f9248c6-91f8-42ca-b856-a7bbcd5b6109","meta":{"accessible_projects":[]}},{"type":"gcp_service_account","attributes":{"is_cspm_enabled":false,"metric_namespace_configs":[{"id":"aiplatform","disabled":true}],"is_resource_change_collection_enabled":false,"automute":false,"is_security_command_center_enabled":false,"account_tags":["a:tag","and:another","another:one"],"cloud_run_revision_filters":["tag:one","tag:two"],"host_filters":["tag:one","tag:two"],"resource_collection_enabled":false,"client_email":"tf-TestAccIntegrationGcpStsBasic-local-1730997435@test-project.iam.gserviceaccount.com"},"id":"a4c5b7ae-0d75-47ab-9c74-0e8d544f931c","meta":{"accessible_projects":[]}},{"type":"gcp_service_account","attributes":{"is_cspm_enabled":false,"metric_namespace_configs":[],"is_resource_change_collection_enabled":false,"automute":true,"is_security_command_center_enabled":false,"account_tags":[],"cloud_run_revision_filters":[],"host_filters":[],"resource_collection_enabled":true,"client_email":"tf-TestAccIntegrationGcpStsDefault-local-1731004907@test-project.iam.gserviceaccount.com"},"id":"a1b3e1d2-811d-47f3-9616-5a1e0740289f","meta":{"accessible_projects":[]}}]} headers: Content-Type: - application/json status: 200 OK code: 200 - duration: 114.205709ms + duration: 73.942458ms - id: 4 request: proto: HTTP/1.1 @@ -162,7 +162,7 @@ interactions: headers: Accept: - '*/*' - url: https://api.datadoghq.com/api/v2/integration/gcp/accounts/c40d3491-20ac-49a0-bbb9-26d5ac51ebc1 + url: https://api.datadoghq.com/api/v2/integration/gcp/accounts/a1b3e1d2-811d-47f3-9616-5a1e0740289f method: DELETE response: proto: HTTP/1.1 @@ -178,4 +178,4 @@ interactions: - text/html; charset=utf-8 status: 204 No Content code: 204 - duration: 125.098458ms + duration: 142.042834ms diff --git a/datadog/tests/resource_datadog_integration_gcp_sts_test.go b/datadog/tests/resource_datadog_integration_gcp_sts_test.go index 06aa43aae9..90d81f1fd5 100644 --- a/datadog/tests/resource_datadog_integration_gcp_sts_test.go +++ b/datadog/tests/resource_datadog_integration_gcp_sts_test.go @@ -33,10 +33,20 @@ func TestAccIntegrationGcpStsBasic(t *testing.T) { "datadog_integration_gcp_sts.foo", "is_cspm_enabled", "false"), resource.TestCheckResourceAttr( "datadog_integration_gcp_sts.foo", "is_security_command_center_enabled", "false"), + resource.TestCheckResourceAttr( + "datadog_integration_gcp_sts.foo", "is_resource_change_collection_enabled", "false"), resource.TestCheckResourceAttr( "datadog_integration_gcp_sts.foo", "resource_collection_enabled", "false"), resource.TestCheckTypeSetElemAttr( "datadog_integration_gcp_sts.foo", "host_filters.*", "tag:one"), + resource.TestCheckResourceAttr( + "datadog_integration_gcp_sts.foo", + "metric_namespace_configs.0.id", "aiplatform", + ), + resource.TestCheckResourceAttr( + "datadog_integration_gcp_sts.foo", + "metric_namespace_configs.0.disabled", "true", + ), resource.TestCheckTypeSetElemAttr( "datadog_integration_gcp_sts.foo", "cloud_run_revision_filters.*", "tag:two"), resource.TestCheckTypeSetElemAttr( @@ -63,10 +73,14 @@ func TestAccIntegrationGcpStsBasic(t *testing.T) { "datadog_integration_gcp_sts.foo", "is_cspm_enabled", "true"), resource.TestCheckResourceAttr( "datadog_integration_gcp_sts.foo", "is_security_command_center_enabled", "true"), + resource.TestCheckResourceAttr( + "datadog_integration_gcp_sts.foo", "is_resource_change_collection_enabled", "true"), resource.TestCheckResourceAttr( "datadog_integration_gcp_sts.foo", "resource_collection_enabled", "true"), resource.TestCheckNoResourceAttr( "datadog_integration_gcp_sts.foo", "host_filters"), + resource.TestCheckNoResourceAttr( + "datadog_integration_gcp_sts.foo", "metric_namespace_configs"), resource.TestCheckNoResourceAttr( "datadog_integration_gcp_sts.foo", "cloud_run_revision_filters"), resource.TestCheckNoResourceAttr( @@ -98,6 +112,8 @@ func TestAccIntegrationGcpStsDefault(t *testing.T) { "datadog_integration_gcp_sts.foo", "is_cspm_enabled", "false"), resource.TestCheckNoResourceAttr( "datadog_integration_gcp_sts.foo", "host_filters"), + resource.TestCheckNoResourceAttr( + "datadog_integration_gcp_sts.foo", "metric_namespace_configs"), resource.TestCheckNoResourceAttr( "datadog_integration_gcp_sts.foo", "cloud_run_revision_filters"), ), @@ -112,10 +128,16 @@ resource "datadog_integration_gcp_sts" "foo" { automute = "false" client_email = "%s@test-project.iam.gserviceaccount.com" host_filters = ["tag:one", "tag:two"] + metric_namespace_configs = [{ + id = "aiplatform" + disabled = true + } + ] cloud_run_revision_filters = ["tag:one", "tag:two"] is_cspm_enabled = "false" resource_collection_enabled = "false" is_security_command_center_enabled = "false" + is_resource_change_collection_enabled = "false" account_tags = ["a:tag", "another:one", "and:another"] }`, uniq) } @@ -128,6 +150,7 @@ resource "datadog_integration_gcp_sts" "foo" { is_cspm_enabled = "true" resource_collection_enabled = "true" is_security_command_center_enabled = "true" + is_resource_change_collection_enabled = "true" }`, uniq) } diff --git a/datadog/tests/resource_datadog_integration_gcp_test.go b/datadog/tests/resource_datadog_integration_gcp_test.go index ea94473473..cbe624c055 100644 --- a/datadog/tests/resource_datadog_integration_gcp_test.go +++ b/datadog/tests/resource_datadog_integration_gcp_test.go @@ -89,7 +89,13 @@ func TestAccDatadogIntegrationGCP(t *testing.T) { "automute", "false"), resource.TestCheckResourceAttr( "datadog_integration_gcp.awesome_gcp_project_integration", - "cspm_resource_collection_enabled", "false"), // false by default + "is_security_command_center_enabled", "false"), + resource.TestCheckResourceAttr( + "datadog_integration_gcp.awesome_gcp_project_integration", + "is_resource_change_collection_enabled", "false"), + resource.TestCheckResourceAttr( + "datadog_integration_gcp.awesome_gcp_project_integration", + "cspm_resource_collection_enabled", "false"), ), }, { @@ -121,6 +127,15 @@ func TestAccDatadogIntegrationGCP(t *testing.T) { resource.TestCheckResourceAttr( "datadog_integration_gcp.awesome_gcp_project_integration", "automute", "false"), + resource.TestCheckResourceAttr( + "datadog_integration_gcp.awesome_gcp_project_integration", + "is_security_command_center_enabled", "false"), + resource.TestCheckResourceAttr( + "datadog_integration_gcp.awesome_gcp_project_integration", + "is_resource_change_collection_enabled", "false"), + resource.TestCheckResourceAttr( + "datadog_integration_gcp.awesome_gcp_project_integration", + "cspm_resource_collection_enabled", "false"), ), }, { @@ -150,6 +165,15 @@ func TestAccDatadogIntegrationGCP(t *testing.T) { resource.TestCheckResourceAttr( "datadog_integration_gcp.awesome_gcp_project_integration", "automute", "true"), + resource.TestCheckResourceAttr( + "datadog_integration_gcp.awesome_gcp_project_integration", + "is_security_command_center_enabled", "false"), + resource.TestCheckResourceAttr( + "datadog_integration_gcp.awesome_gcp_project_integration", + "is_resource_change_collection_enabled", "false"), + resource.TestCheckResourceAttr( + "datadog_integration_gcp.awesome_gcp_project_integration", + "cspm_resource_collection_enabled", "false"), ), }, }, diff --git a/docs/resources/integration_gcp.md b/docs/resources/integration_gcp.md index d5653a1cb9..e6a7dda821 100644 --- a/docs/resources/integration_gcp.md +++ b/docs/resources/integration_gcp.md @@ -61,6 +61,7 @@ resource "datadog_integration_gcp" "awesome_gcp_project_integration" { - `cloud_run_revision_filters` (Set of String) Tags to filter which Cloud Run revisions are imported into Datadog. Only revisions that meet specified criteria are monitored. - `cspm_resource_collection_enabled` (Boolean) Whether Datadog collects cloud security posture management resources from your GCP project. If enabled, requires `resource_collection_enabled` to also be enabled. Defaults to `false`. - `host_filters` (String) Limit the GCE instances that are pulled into Datadog by using tags. Only hosts that match one of the defined tags are imported into Datadog. Defaults to `""`. +- `is_resource_change_collection_enabled` (Boolean) When enabled, Datadog scans for all resource change data in your Google Cloud environment. - `is_security_command_center_enabled` (Boolean) When enabled, Datadog will attempt to collect Security Command Center Findings. Note: This requires additional permissions on the service account. Defaults to `false`. - `resource_collection_enabled` (Boolean) When enabled, Datadog scans for all resources in your GCP environment. diff --git a/docs/resources/integration_gcp_sts.md b/docs/resources/integration_gcp_sts.md index 9274c371c4..5338c86a17 100644 --- a/docs/resources/integration_gcp_sts.md +++ b/docs/resources/integration_gcp_sts.md @@ -52,7 +52,9 @@ resource "datadog_integration_gcp_sts" "foo" { - `cloud_run_revision_filters` (Set of String) Tags to filter which Cloud Run revisions are imported into Datadog. Only revisions that meet specified criteria are monitored. - `host_filters` (Set of String) Your Host Filters. - `is_cspm_enabled` (Boolean) Whether Datadog collects cloud security posture management resources from your GCP project. If enabled, requires `resource_collection_enabled` to also be enabled. +- `is_resource_change_collection_enabled` (Boolean) When enabled, Datadog scans for all resource change data in your Google Cloud environment. - `is_security_command_center_enabled` (Boolean) When enabled, Datadog will attempt to collect Security Command Center Findings. Note: This requires additional permissions on the service account. Defaults to `false`. +- `metric_namespace_configs` (Set of Object) Configuration for a GCP metric namespace. (see [below for nested schema](#nestedatt--metric_namespace_configs)) - `resource_collection_enabled` (Boolean) When enabled, Datadog scans for all resources in your GCP environment. ### Read-Only @@ -60,6 +62,14 @@ resource "datadog_integration_gcp_sts" "foo" { - `delegate_account_email` (String) Datadog's STS Delegate Email. - `id` (String) The ID of this resource. + +### Nested Schema for `metric_namespace_configs` + +Optional: + +- `disabled` (Boolean) +- `id` (String) + ## Import Import is supported using the following syntax: diff --git a/go.mod b/go.mod index 0929788fd6..c9b4c214d0 100644 --- a/go.mod +++ b/go.mod @@ -1,7 +1,7 @@ module github.com/terraform-providers/terraform-provider-datadog require ( - github.com/DataDog/datadog-api-client-go/v2 v2.31.1-0.20241031172113-8704b619424c + github.com/DataDog/datadog-api-client-go/v2 v2.32.0 github.com/DataDog/dd-sdk-go-testing v0.0.0-20211116174033-1cd082e322ad github.com/Masterminds/semver/v3 v3.1.1 github.com/google/go-cmp v0.5.9 diff --git a/go.sum b/go.sum index b3e2348a16..a046204a39 100644 --- a/go.sum +++ b/go.sum @@ -2,6 +2,8 @@ cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMT github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= github.com/DataDog/datadog-api-client-go/v2 v2.31.1-0.20241031172113-8704b619424c h1:FRgVhkpYHmy6VHlhsWDhOZciWe1S+aaDCp4KYmsaeOg= github.com/DataDog/datadog-api-client-go/v2 v2.31.1-0.20241031172113-8704b619424c/go.mod h1:d3tOEgUd2kfsr9uuHQdY+nXrWp4uikgTgVCPdKNK30U= +github.com/DataDog/datadog-api-client-go/v2 v2.32.0 h1:9k6iYm/d5ycCMYainCfTOixnwgrO87b2iTmgU/12GOk= +github.com/DataDog/datadog-api-client-go/v2 v2.32.0/go.mod h1:d3tOEgUd2kfsr9uuHQdY+nXrWp4uikgTgVCPdKNK30U= github.com/DataDog/datadog-go v4.4.0+incompatible/go.mod h1:LButxg5PwREeZtORoXG3tL4fMGNddJ+vMq1mwgfaqoQ= github.com/DataDog/datadog-go v4.8.3+incompatible h1:fNGaYSuObuQb5nzeTQqowRAd9bpDIRRV4/gUtIBjh8Q= github.com/DataDog/datadog-go v4.8.3+incompatible/go.mod h1:LButxg5PwREeZtORoXG3tL4fMGNddJ+vMq1mwgfaqoQ=