Merge remote-tracking branch 'origin/master' into katie.mckew/awsmc-1…

…070-aws-v2-terraform-provider

datadog/fwprovider/framework_provider.go

@@ -36,7 +36,7 @@ var Resources = []func() resource.Resource{
 	NewApplicationKeyResource,
 	NewApmRetentionFilterResource,
 	NewApmRetentionFiltersOrderResource,
-	NewAwsAccountV2Resource,
+	NewCatalogEntityResource,
 	NewDashboardListResource,
 	NewDowntimeScheduleResource,
 	NewIntegrationAzureResource,
@@ -395,10 +395,6 @@ func defaultConfigureFunc(p *FrameworkProvider, request *provider.ConfigureReque
 	ddClientConfig.SetUnstableOperationEnabled("v2.UpdateOpenAPI", true)
 	ddClientConfig.SetUnstableOperationEnabled("v2.GetOpenAPI", true)
 	ddClientConfig.SetUnstableOperationEnabled("v2.DeleteOpenAPI", true)
-	ddClientConfig.SetUnstableOperationEnabled("v2.CreateAWSAccount", true)
-	ddClientConfig.SetUnstableOperationEnabled("v2.UpdateAWSAccount", true)
-	ddClientConfig.SetUnstableOperationEnabled("v2.DeleteAWSAccount", true)
-	ddClientConfig.SetUnstableOperationEnabled("v2.GetAWSAccount", true)
 
 	if !config.ApiUrl.IsNull() && config.ApiUrl.ValueString() != "" {
 		parsedAPIURL, parseErr := url.Parse(config.ApiUrl.ValueString())

datadog/internal/utils/api_instances_helper.go

@@ -44,44 +44,45 @@
 	webhooksIntegrationApiV1              *datadogV1.WebhooksIntegrationApi
 
 	//V2 APIs
-	apiManagementAPIV2         *datadogV2.APIManagementApi
-	apmRetentionFiltersApiV2   *datadogV2.APMRetentionFiltersApi
-	awsIntegrationApiV2        *datadogV2.AWSIntegrationApi
-	auditApiV2                 *datadogV2.AuditApi
-	authNMappingsApiV2         *datadogV2.AuthNMappingsApi
-	cloudflareIntegrationApiV2 *datadogV2.CloudflareIntegrationApi
-	csmThreatsApiV2            *datadogV2.CSMThreatsApi
-	confluentCloudApiV2        *datadogV2.ConfluentCloudApi
-	dashboardListsApiV2        *datadogV2.DashboardListsApi
-	downtimesApiV2             *datadogV2.DowntimesApi
-	eventsApiV2                *datadogV2.EventsApi
-	fastlyIntegrationApiV2     *datadogV2.FastlyIntegrationApi
-	gcpStsIntegrationApiV2     *datadogV2.GCPIntegrationApi
-	incidentServicesApiV2      *datadogV2.IncidentServicesApi
-	incidentTeamsApiV2         *datadogV2.IncidentTeamsApi
-	incidentsApiV2             *datadogV2.IncidentsApi
-	ipAllowlistApiV2           *datadogV2.IPAllowlistApi
-	keyManagementApiV2         *datadogV2.KeyManagementApi
-	logsApiV2                  *datadogV2.LogsApi
-	logsArchivesApiV2          *datadogV2.LogsArchivesApi
-	logsMetricsApiV2           *datadogV2.LogsMetricsApi
-	metricsApiV2               *datadogV2.MetricsApi
-	monitorsApiV2              *datadogV2.MonitorsApi
-	opsgenieIntegrationApiV2   *datadogV2.OpsgenieIntegrationApi
-	organizationsApiV2         *datadogV2.OrganizationsApi
-	processesApiV2             *datadogV2.ProcessesApi
-	powerpackApiV2             *datadogV2.PowerpackApi
-	restrictionPolicyApiV2     *datadogV2.RestrictionPoliciesApi
-	rolesApiV2                 *datadogV2.RolesApi
-	rumApiV2                   *datadogV2.RUMApi
-	securityMonitoringApiV2    *datadogV2.SecurityMonitoringApi
-	sensitiveDataScannerApiV2  *datadogV2.SensitiveDataScannerApi
-	serviceAccountsApiV2       *datadogV2.ServiceAccountsApi
-	spansMetricsApiV2          *datadogV2.SpansMetricsApi
-	syntheticsApiV2            *datadogV2.SyntheticsApi
-	teamsApiV2                 *datadogV2.TeamsApi
-	usageMeteringApiV2         *datadogV2.UsageMeteringApi
-	usersApiV2                 *datadogV2.UsersApi
+	apiManagementAPIV2          *datadogV2.APIManagementApi
+	apmRetentionFiltersApiV2    *datadogV2.APMRetentionFiltersApi
+	auditApiV2                  *datadogV2.AuditApi
+	authNMappingsApiV2          *datadogV2.AuthNMappingsApi
+	awsIntegrationApiV2         *datadogV2.AWSIntegrationApi
+	cloudflareIntegrationApiV2  *datadogV2.CloudflareIntegrationApi
+	csmThreatsApiV2             *datadogV2.CSMThreatsApi
+	confluentCloudApiV2         *datadogV2.ConfluentCloudApi
+	dashboardListsApiV2         *datadogV2.DashboardListsApi
+	downtimesApiV2              *datadogV2.DowntimesApi
+	eventsApiV2                 *datadogV2.EventsApi
+	fastlyIntegrationApiV2      *datadogV2.FastlyIntegrationApi
+	gcpStsIntegrationApiV2      *datadogV2.GCPIntegrationApi
+	incidentServicesApiV2       *datadogV2.IncidentServicesApi
+	incidentTeamsApiV2          *datadogV2.IncidentTeamsApi
+	incidentsApiV2              *datadogV2.IncidentsApi
+	ipAllowlistApiV2            *datadogV2.IPAllowlistApi
+	keyManagementApiV2          *datadogV2.KeyManagementApi
+	logsApiV2                   *datadogV2.LogsApi
+	logsArchivesApiV2           *datadogV2.LogsArchivesApi
+	logsCustomDestinationsApiV2 *datadogV2.LogsCustomDestinationsApi
+	logsMetricsApiV2            *datadogV2.LogsMetricsApi
+	metricsApiV2                *datadogV2.MetricsApi
+	monitorsApiV2               *datadogV2.MonitorsApi
+	opsgenieIntegrationApiV2    *datadogV2.OpsgenieIntegrationApi
+	organizationsApiV2          *datadogV2.OrganizationsApi
+	processesApiV2              *datadogV2.ProcessesApi
+	powerpackApiV2              *datadogV2.PowerpackApi
+	restrictionPolicyApiV2      *datadogV2.RestrictionPoliciesApi
+	rolesApiV2                  *datadogV2.RolesApi
+	rumApiV2                    *datadogV2.RUMApi
+	securityMonitoringApiV2     *datadogV2.SecurityMonitoringApi
+	sensitiveDataScannerApiV2   *datadogV2.SensitiveDataScannerApi
+	serviceAccountsApiV2        *datadogV2.ServiceAccountsApi
+	spansMetricsApiV2           *datadogV2.SpansMetricsApi
+	syntheticsApiV2             *datadogV2.SyntheticsApi
+	teamsApiV2                  *datadogV2.TeamsApi
+	usageMeteringApiV2          *datadogV2.UsageMeteringApi
+	usersApiV2                  *datadogV2.UsersApi
 }
 
 // GetAuthenticationApiV1 get instance of AuthenticationApi
@@ -332,14 +333,6 @@
 	return i.webhooksIntegrationApiV1
 }
 
-// GetAWSIntegrationApiV2 get instance of AWSIntegrationApi
-func (i *ApiInstances) GetAWSIntegrationApiV2() *datadogV2.AWSIntegrationApi {
-	if i.awsIntegrationApiV2 == nil {
-		i.awsIntegrationApiV2 = datadogV2.NewAWSIntegrationApi(i.HttpClient)
-	}
-	return i.awsIntegrationApiV2
-}
-
 // GetAuditApiV2 get instance of AuditApi
 func (i *ApiInstances) GetAuditApiV2() *datadogV2.AuditApi {
 	if i.auditApiV2 == nil {

datadog/resource_datadog_synthetics_test_.go

@@ -1972,7 +1972,10 @@ func buildDatadogSyntheticsAPITest(d *schema.ResourceData) *datadogV1.Synthetics
 		request.SetHost(attr.(string))
 	}
 	if attr, ok := d.GetOk("request_definition.0.port"); ok {
-		request.SetPort(attr.(string))
+		port := attr.(string)
+		request.SetPort(datadogV1.SyntheticsTestRequestPort{
+			SyntheticsTestRequestVariablePort: &port,
+		})
 	}
 	if attr, ok := d.GetOk("request_definition.0.dns_server"); ok {
 		request.SetDnsServer(attr.(string))
@@ -2066,7 +2069,10 @@ func buildDatadogSyntheticsAPITest(d *schema.ResourceData) *datadogV1.Synthetics
 					request.SetAllowInsecure(requestMap["allow_insecure"].(bool))
 					if step.SyntheticsAPITestStep.GetSubtype() == "grpc" {
 						request.SetHost(requestMap["host"].(string))
-						request.SetPort(requestMap["port"].(string))
+						port := requestMap["port"].(string)
+						request.SetPort(datadogV1.SyntheticsTestRequestPort{
+							SyntheticsTestRequestVariablePort: &port,
+						})
 						request.SetService(requestMap["service"].(string))
 						request.SetMessage(requestMap["message"].(string))
 						if v, ok := requestMap["call_type"].(string); ok && v != "" {

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.20241016211119-1852b9d9d253
+	github.com/DataDog/datadog-api-client-go/v2 v2.31.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
@@ -96,6 +96,4 @@ require (
 	google.golang.org/protobuf v1.33.0 // indirect
 )
 
-go 1.22
-
-toolchain go1.22.8
+go 1.23

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.31.1-0.20241016211119-1852b9d9d253 h1:XKPq+9pkZSrszdeSDN7BdOhXcaN0/9GN4T0ECjoELSo=
-github.com/DataDog/datadog-api-client-go/v2 v2.31.1-0.20241016211119-1852b9d9d253/go.mod h1:d3tOEgUd2kfsr9uuHQdY+nXrWp4uikgTgVCPdKNK30U=
+github.com/DataDog/datadog-api-client-go/v2 v2.31.0 h1:JfJhYlHfLzvauI8u6h23smTooWYe6quNhhg9gpTszWY=
+github.com/DataDog/datadog-api-client-go/v2 v2.31.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=