From 5cf732e1b55ff72cc6fca34a0955dfffc6ceedf6 Mon Sep 17 00:00:00 2001 From: HantingZhang2 <42933443+HantingZhang2@users.noreply.github.com> Date: Wed, 28 Feb 2024 13:08:08 +0100 Subject: [PATCH] [provider] Update go version (#2295) * update version * make docs --- .../fwprovider/data_source_security_monitoring_suppression.go | 1 + datadog/fwprovider/resource_datadog_ip_allowlist.go | 1 + datadog/fwprovider/resource_datadog_openapi_api.go | 1 + .../resource_datadog_security_monitoring_suppression.go | 1 + datadog/fwprovider/resource_datadog_service_account.go | 1 + datadog/internal/planmodifiers/types_string_ip_normalizer.go | 1 + ...ta_source_datadog_security_monitoring_suppressions_test.go | 1 + datadog/tests/resource_datadog_openapi_api_test.go | 1 + .../resource_datadog_security_monitoring_suppression_test.go | 1 + datadog/tests/resource_datadog_service_account_test.go | 1 + docs/resources/monitor.md | 2 +- docs/resources/synthetics_test.md | 2 +- go.mod | 2 +- go.sum | 4 ++-- 14 files changed, 15 insertions(+), 5 deletions(-) diff --git a/datadog/fwprovider/data_source_security_monitoring_suppression.go b/datadog/fwprovider/data_source_security_monitoring_suppression.go index b88109013e..8cb0dc33fa 100644 --- a/datadog/fwprovider/data_source_security_monitoring_suppression.go +++ b/datadog/fwprovider/data_source_security_monitoring_suppression.go @@ -10,6 +10,7 @@ import ( "github.com/hashicorp/terraform-plugin-framework/datasource" "github.com/hashicorp/terraform-plugin-framework/datasource/schema" "github.com/hashicorp/terraform-plugin-framework/types" + "github.com/terraform-providers/terraform-provider-datadog/datadog/internal/utils" ) diff --git a/datadog/fwprovider/resource_datadog_ip_allowlist.go b/datadog/fwprovider/resource_datadog_ip_allowlist.go index e6f53acd87..7401a8f653 100644 --- a/datadog/fwprovider/resource_datadog_ip_allowlist.go +++ b/datadog/fwprovider/resource_datadog_ip_allowlist.go @@ -10,6 +10,7 @@ import ( "github.com/hashicorp/terraform-plugin-framework/resource/schema/planmodifier" "github.com/hashicorp/terraform-plugin-framework/schema/validator" "github.com/hashicorp/terraform-plugin-framework/types" + "github.com/terraform-providers/terraform-provider-datadog/datadog/internal/planmodifiers" "github.com/terraform-providers/terraform-provider-datadog/datadog/internal/utils" "github.com/terraform-providers/terraform-provider-datadog/datadog/internal/validators" diff --git a/datadog/fwprovider/resource_datadog_openapi_api.go b/datadog/fwprovider/resource_datadog_openapi_api.go index 671ca5d27f..15cbf31fc7 100644 --- a/datadog/fwprovider/resource_datadog_openapi_api.go +++ b/datadog/fwprovider/resource_datadog_openapi_api.go @@ -12,6 +12,7 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" "github.com/google/uuid" + "github.com/terraform-providers/terraform-provider-datadog/datadog/internal/utils" ) diff --git a/datadog/fwprovider/resource_datadog_security_monitoring_suppression.go b/datadog/fwprovider/resource_datadog_security_monitoring_suppression.go index 76de03cdef..6f37d28295 100644 --- a/datadog/fwprovider/resource_datadog_security_monitoring_suppression.go +++ b/datadog/fwprovider/resource_datadog_security_monitoring_suppression.go @@ -9,6 +9,7 @@ import ( "github.com/hashicorp/terraform-plugin-framework/resource" "github.com/hashicorp/terraform-plugin-framework/resource/schema" "github.com/hashicorp/terraform-plugin-framework/types" + "github.com/terraform-providers/terraform-provider-datadog/datadog/internal/utils" ) diff --git a/datadog/fwprovider/resource_datadog_service_account.go b/datadog/fwprovider/resource_datadog_service_account.go index 2950000069..2df13434b1 100644 --- a/datadog/fwprovider/resource_datadog_service_account.go +++ b/datadog/fwprovider/resource_datadog_service_account.go @@ -12,6 +12,7 @@ import ( "github.com/hashicorp/terraform-plugin-framework/resource/schema" "github.com/hashicorp/terraform-plugin-framework/resource/schema/booldefault" "github.com/hashicorp/terraform-plugin-framework/types" + "github.com/terraform-providers/terraform-provider-datadog/datadog/internal/utils" ) diff --git a/datadog/internal/planmodifiers/types_string_ip_normalizer.go b/datadog/internal/planmodifiers/types_string_ip_normalizer.go index 54f744735c..fdf6e8c4fc 100644 --- a/datadog/internal/planmodifiers/types_string_ip_normalizer.go +++ b/datadog/internal/planmodifiers/types_string_ip_normalizer.go @@ -5,6 +5,7 @@ import ( "github.com/hashicorp/terraform-plugin-framework/resource/schema/planmodifier" "github.com/hashicorp/terraform-plugin-framework/types" + "github.com/terraform-providers/terraform-provider-datadog/datadog/internal/utils" ) diff --git a/datadog/tests/data_source_datadog_security_monitoring_suppressions_test.go b/datadog/tests/data_source_datadog_security_monitoring_suppressions_test.go index c02c09f8ae..57ae7cf30e 100644 --- a/datadog/tests/data_source_datadog_security_monitoring_suppressions_test.go +++ b/datadog/tests/data_source_datadog_security_monitoring_suppressions_test.go @@ -8,6 +8,7 @@ import ( "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-plugin-testing/terraform" + "github.com/terraform-providers/terraform-provider-datadog/datadog/fwprovider" ) diff --git a/datadog/tests/resource_datadog_openapi_api_test.go b/datadog/tests/resource_datadog_openapi_api_test.go index c2a1e7d395..a99e50a6c8 100644 --- a/datadog/tests/resource_datadog_openapi_api_test.go +++ b/datadog/tests/resource_datadog_openapi_api_test.go @@ -9,6 +9,7 @@ import ( "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/google/uuid" + "github.com/terraform-providers/terraform-provider-datadog/datadog/fwprovider" "github.com/terraform-providers/terraform-provider-datadog/datadog/internal/utils" ) diff --git a/datadog/tests/resource_datadog_security_monitoring_suppression_test.go b/datadog/tests/resource_datadog_security_monitoring_suppression_test.go index e03ac49672..5682e8794d 100644 --- a/datadog/tests/resource_datadog_security_monitoring_suppression_test.go +++ b/datadog/tests/resource_datadog_security_monitoring_suppression_test.go @@ -8,6 +8,7 @@ import ( "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-plugin-testing/terraform" + "github.com/terraform-providers/terraform-provider-datadog/datadog/fwprovider" ) diff --git a/datadog/tests/resource_datadog_service_account_test.go b/datadog/tests/resource_datadog_service_account_test.go index b0ead000c8..7b8b0707c9 100644 --- a/datadog/tests/resource_datadog_service_account_test.go +++ b/datadog/tests/resource_datadog_service_account_test.go @@ -8,6 +8,7 @@ import ( "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-plugin-testing/terraform" + "github.com/terraform-providers/terraform-provider-datadog/datadog/fwprovider" ) diff --git a/docs/resources/monitor.md b/docs/resources/monitor.md index 8b879aea32..ff3f8b3da7 100644 --- a/docs/resources/monitor.md +++ b/docs/resources/monitor.md @@ -164,7 +164,7 @@ Optional: Required: - `compute` (Block List, Min: 1) The compute options. (see [below for nested schema](#nestedblock--variables--event_query--compute)) -- `data_source` (String) The data source for event platform-based queries. Valid values are `rum`, `ci_pipelines`, `ci_tests`, `audit`, `events`, `logs`, `spans`. +- `data_source` (String) The data source for event platform-based queries. Valid values are `rum`, `ci_pipelines`, `ci_tests`, `audit`, `events`, `logs`, `spans`, `database_queries`. - `name` (String) The name of query for use in formulas. - `search` (Block List, Min: 1, Max: 1) The search options. (see [below for nested schema](#nestedblock--variables--event_query--search)) diff --git a/docs/resources/synthetics_test.md b/docs/resources/synthetics_test.md index 2fdc2d49fa..00412b7437 100644 --- a/docs/resources/synthetics_test.md +++ b/docs/resources/synthetics_test.md @@ -461,7 +461,7 @@ Optional: - `request_proxy` (Block List, Max: 1) The proxy to perform the test. (see [below for nested schema](#nestedblock--api_step--request_proxy)) - `request_query` (Map of String) Query arguments name and value map. - `retry` (Block List, Max: 1) (see [below for nested schema](#nestedblock--api_step--retry)) -- `subtype` (String) The subtype of the Synthetic multistep API test step. Valid values are `http`. Defaults to `"http"`. +- `subtype` (String) The subtype of the Synthetic multistep API test step. Valid values are `http`, `grpc`. Defaults to `"http"`. ### Nested Schema for `api_step.assertion` diff --git a/go.mod b/go.mod index 41aa671331..e680de8d19 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.22.0 + github.com/DataDog/datadog-api-client-go/v2 v2.23.0 github.com/DataDog/dd-sdk-go-testing v0.0.0-20211116174033-1cd082e322ad github.com/google/uuid v1.5.0 github.com/hashicorp/go-cleanhttp v0.5.2 diff --git a/go.sum b/go.sum index 581a3f3f57..8429f9ee27 100644 --- a/go.sum +++ b/go.sum @@ -1,7 +1,7 @@ cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= -github.com/DataDog/datadog-api-client-go/v2 v2.22.0 h1:+DtWu4PjGxsJU8FESjPi7C2rTDMojNungejsIzNFe70= -github.com/DataDog/datadog-api-client-go/v2 v2.22.0/go.mod h1:QKOu6vscsh87fMY1lHfLEmNSunyXImj8BUaUWJXOehc= +github.com/DataDog/datadog-api-client-go/v2 v2.23.0 h1:1ziqo+mhG8GSuxsxLVBNNe/SXGbSOn8D5INWsy7dul8= +github.com/DataDog/datadog-api-client-go/v2 v2.23.0/go.mod h1:QKOu6vscsh87fMY1lHfLEmNSunyXImj8BUaUWJXOehc= 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=