Remove OneOf manual parsing workaround for file_metadata

The workaround is no longer needed because we fixed the root cause in the OpenAPI spec by making access_details required in CloudStorage schema. This allows the Go client OneOf unmarshaler to properly distinguish between CloudStorage and LocalFile types.

The spec fix makes access_details required for CloudStorage, which provides a clear discriminator:
- CloudStorage requires access_details (AWS/GCP/Azure config)
- LocalFile has no required fields

This PR removes the temporary manual parsing logic and relies on the properly generated Go client code once the spec changes are merged and the client is regenerated.

Author: g-brizolier

datadog/fwprovider/data_source_datadog_reference_table.go

@@ -27,32 +27,32 @@ type datadogReferenceTableDataSourceModel struct {
 	TableName types.String `tfsdk:"table_name"`
 
 	// Computed values
-	CreatedBy     types.String                                         `tfsdk:"created_by"`
-	Description   types.String                                         `tfsdk:"description"`
-	LastUpdatedBy types.String                                         `tfsdk:"last_updated_by"`
-	RowCount      types.Int64                                          `tfsdk:"row_count"`
-	Source        types.String                                         `tfsdk:"source"`
-	Status        types.String                                         `tfsdk:"status"`
-	UpdatedAt     types.String                                         `tfsdk:"updated_at"`
-	Tags          types.List                                           `tfsdk:"tags"`
-	FileMetadata  *tableResultV2DataAttributesFileMetadataModel        `tfsdk:"file_metadata"`
-	Schema        *schemaModel                                         `tfsdk:"schema"`
+	CreatedBy     types.String                                   `tfsdk:"created_by"`
+	Description   types.String                                   `tfsdk:"description"`
+	LastUpdatedBy types.String                                   `tfsdk:"last_updated_by"`
+	RowCount      types.Int64                                    `tfsdk:"row_count"`
+	Source        types.String                                   `tfsdk:"source"`
+	Status        types.String                                   `tfsdk:"status"`
+	UpdatedAt     types.String                                   `tfsdk:"updated_at"`
+	Tags          types.List                                     `tfsdk:"tags"`
+	FileMetadata  *referenceTableDataAttributesFileMetadataModel `tfsdk:"file_metadata"`
+	Schema        *schemaModel                                   `tfsdk:"schema"`
 }
 
-type tableResultV2DataAttributesFileMetadataModel struct {
-	CloudStorage *tableResultV2DataAttributesFileMetadataCloudStorageModel `tfsdk:"cloud_storage"`
-	LocalFile    *tableResultV2DataAttributesFileMetadataLocalFileModel    `tfsdk:"local_file"`
+type referenceTableDataAttributesFileMetadataModel struct {
+	CloudStorage *referenceTableDataAttributesFileMetadataCloudStorageModel `tfsdk:"cloud_storage"`
+	LocalFile    *referenceTableDataAttributesFileMetadataLocalFileModel    `tfsdk:"local_file"`
 }
 
-type tableResultV2DataAttributesFileMetadataCloudStorageModel struct {
+type referenceTableDataAttributesFileMetadataCloudStorageModel struct {
 	ErrorMessage  types.String        `tfsdk:"error_message"`
 	ErrorRowCount types.Int64         `tfsdk:"error_row_count"`
 	ErrorType     types.String        `tfsdk:"error_type"`
 	SyncEnabled   types.Bool          `tfsdk:"sync_enabled"`
 	AccessDetails *accessDetailsModel `tfsdk:"access_details"`
 }
 
-type tableResultV2DataAttributesFileMetadataLocalFileModel struct {
+type referenceTableDataAttributesFileMetadataLocalFileModel struct {
 	ErrorMessage  types.String `tfsdk:"error_message"`
 	ErrorRowCount types.Int64  `tfsdk:"error_row_count"`
 	UploadId      types.String `tfsdk:"upload_id"`
@@ -386,11 +386,11 @@ func (d *datadogReferenceTableDataSource) updateState(ctx context.Context, state
 
 	// Handle FileMetadata (OneOf union type)
 	if fileMetadata, ok := attributes.GetFileMetadataOk(); ok {
-		fileMetadataTf := &tableResultV2DataAttributesFileMetadataModel{}
+		fileMetadataTf := &referenceTableDataAttributesFileMetadataModel{}
 
 		// Check if it's CloudStorage type
 		if cloudStorage := fileMetadata.TableResultV2DataAttributesFileMetadataCloudStorage; cloudStorage != nil {
-			cloudStorageTf := &tableResultV2DataAttributesFileMetadataCloudStorageModel{}
+			cloudStorageTf := &referenceTableDataAttributesFileMetadataCloudStorageModel{}
 
 			if syncEnabled, ok := cloudStorage.GetSyncEnabledOk(); ok {
 				cloudStorageTf.SyncEnabled = types.BoolValue(*syncEnabled)
@@ -474,7 +474,7 @@ func (d *datadogReferenceTableDataSource) updateState(ctx context.Context, state
 
 		// Check if it's LocalFile type
 		if localFile := fileMetadata.TableResultV2DataAttributesFileMetadataLocalFile; localFile != nil {
-			localFileTf := &tableResultV2DataAttributesFileMetadataLocalFileModel{}
+			localFileTf := &referenceTableDataAttributesFileMetadataLocalFileModel{}
 
 			if uploadId, ok := localFile.GetUploadIdOk(); ok {
 				localFileTf.UploadId = types.StringValue(*uploadId)

datadog/fwprovider/models_reference_table.go

@@ -7,7 +7,7 @@ import (
 // Shared model definitions for reference table resource and data sources
 
 type schemaModel struct {
-	PrimaryKeys types.List  `tfsdk:"primary_keys"`
+	PrimaryKeys types.List     `tfsdk:"primary_keys"`
 	Fields      []*fieldsModel `tfsdk:"fields"`
 }
 
@@ -29,17 +29,16 @@ type awsDetailModel struct {
 }
 
 type azureDetailModel struct {
-	AzureTenantId          types.String `tfsdk:"azure_tenant_id"`
-	AzureClientId          types.String `tfsdk:"azure_client_id"`
+	AzureTenantId           types.String `tfsdk:"azure_tenant_id"`
+	AzureClientId           types.String `tfsdk:"azure_client_id"`
 	AzureStorageAccountName types.String `tfsdk:"azure_storage_account_name"`
-	AzureContainerName     types.String `tfsdk:"azure_container_name"`
-	FilePath               types.String `tfsdk:"file_path"`
+	AzureContainerName      types.String `tfsdk:"azure_container_name"`
+	FilePath                types.String `tfsdk:"file_path"`
 }
 
 type gcpDetailModel struct {
-	GcpProjectId            types.String `tfsdk:"gcp_project_id"`
-	GcpBucketName           types.String `tfsdk:"gcp_bucket_name"`
-	FilePath                types.String `tfsdk:"file_path"`
-	GcpServiceAccountEmail  types.String `tfsdk:"gcp_service_account_email"`
+	GcpProjectId           types.String `tfsdk:"gcp_project_id"`
+	GcpBucketName          types.String `tfsdk:"gcp_bucket_name"`
+	FilePath               types.String `tfsdk:"file_path"`
+	GcpServiceAccountEmail types.String `tfsdk:"gcp_service_account_email"`
 }
-

datadog/fwprovider/resource_datadog_reference_table.go

@@ -134,64 +134,64 @@ func (r *referenceTableResource) Schema(_ context.Context, _ resource.SchemaRequ
 						Description: "Cloud storage access configuration. Exactly one of aws_detail, gcp_detail, or azure_detail must be specified.",
 						Blocks: map[string]schema.Block{
 							"aws_detail": schema.SingleNestedBlock{
-								Description: "AWS S3 access configuration.",
+								Description: "AWS S3 access configuration. Required when source is S3.",
 								Attributes: map[string]schema.Attribute{
 									"aws_account_id": schema.StringAttribute{
-										Required:    true,
+										Optional:    true,
 										Description: "The ID of the AWS account.",
 									},
 									"aws_bucket_name": schema.StringAttribute{
-										Required:    true,
+										Optional:    true,
 										Description: "The name of the Amazon S3 bucket.",
 									},
 									"file_path": schema.StringAttribute{
-										Required:    true,
+										Optional:    true,
 										Description: "The relative file path from the S3 bucket root to the CSV file.",
 									},
 								},
 							},
 							"gcp_detail": schema.SingleNestedBlock{
-								Description: "Google Cloud Storage access configuration.",
+								Description: "Google Cloud Storage access configuration. Required when source is GCS.",
 								Attributes: map[string]schema.Attribute{
 									"gcp_project_id": schema.StringAttribute{
-										Required:    true,
+										Optional:    true,
 										Description: "The ID of the GCP project.",
 									},
 									"gcp_bucket_name": schema.StringAttribute{
-										Required:    true,
+										Optional:    true,
 										Description: "The name of the GCP bucket.",
 									},
 									"file_path": schema.StringAttribute{
-										Required:    true,
+										Optional:    true,
 										Description: "The relative file path from the GCS bucket root to the CSV file.",
 									},
 									"gcp_service_account_email": schema.StringAttribute{
-										Required:    true,
+										Optional:    true,
 										Description: "The email of the GCP service account used to access the bucket.",
 									},
 								},
 							},
 							"azure_detail": schema.SingleNestedBlock{
-								Description: "Azure Blob Storage access configuration.",
+								Description: "Azure Blob Storage access configuration. Required when source is AZURE.",
 								Attributes: map[string]schema.Attribute{
 									"azure_tenant_id": schema.StringAttribute{
-										Required:    true,
+										Optional:    true,
 										Description: "The ID of the Azure tenant.",
 									},
 									"azure_client_id": schema.StringAttribute{
-										Required:    true,
+										Optional:    true,
 										Description: "The Azure client ID (application ID).",
 									},
 									"azure_storage_account_name": schema.StringAttribute{
-										Required:    true,
+										Optional:    true,
 										Description: "The name of the Azure storage account.",
 									},
 									"azure_container_name": schema.StringAttribute{
-										Required:    true,
+										Optional:    true,
 										Description: "The name of the Azure container.",
 									},
 									"file_path": schema.StringAttribute{
-										Required:    true,
+										Optional:    true,
 										Description: "The relative file path from the Azure container root to the CSV file.",
 									},
 								},
@@ -279,15 +279,64 @@ func (r *referenceTableResource) Create(ctx context.Context, request resource.Cr
 		return
 	}
 
-	resp, _, err := r.Api.CreateReferenceTable(r.Auth, *body)
+	resp, httpResp, err := r.Api.CreateReferenceTable(r.Auth, *body)
 	if err != nil {
-		response.Diagnostics.Append(utils.FrameworkErrorDiag(err, "error retrieving ReferenceTable"))
+		response.Diagnostics.Append(utils.FrameworkErrorDiag(err, "error creating ReferenceTable"))
 		return
 	}
 	if err := utils.CheckForUnparsed(resp); err != nil {
 		response.Diagnostics.AddError("response contains unparsedObject", err.Error())
 		return
 	}
+
+	// If the create response doesn't include data, fetch it with a list+filter request
+	if resp.Data == nil {
+		if httpResp != nil && httpResp.StatusCode == 201 {
+			// Table was created successfully, but response was empty - list tables and find by exact name
+			tableName := state.TableName.ValueString()
+			listResp, _, listErr := r.Api.ListTables(r.Auth)
+			if listErr != nil {
+				response.Diagnostics.Append(utils.FrameworkErrorDiag(listErr, "table created but error listing tables"))
+				return
+			}
+
+			// Find the table by exact name match
+			var foundTable *datadogV2.TableResultV2Data
+			if listResp.Data != nil {
+				for _, table := range listResp.Data {
+					if attrs, ok := table.GetAttributesOk(); ok {
+						if name, nameOk := attrs.GetTableNameOk(); nameOk && *name == tableName {
+							tableCopy := table
+							foundTable = &tableCopy
+							break
+						}
+					}
+				}
+			}
+
+			if foundTable == nil {
+				response.Diagnostics.AddError("API Error", fmt.Sprintf("Table %s was created but not found in list", tableName))
+				return
+			}
+
+			// Get the full table details by ID
+			tableID := foundTable.GetId()
+			getResp, _, getErr := r.Api.GetTable(r.Auth, tableID)
+			if getErr != nil {
+				response.Diagnostics.Append(utils.FrameworkErrorDiag(getErr, fmt.Sprintf("table created but error fetching details for ID %s", tableID)))
+				return
+			}
+			resp = getResp
+		} else {
+			statusCode := 0
+			if httpResp != nil {
+				statusCode = httpResp.StatusCode
+			}
+			response.Diagnostics.AddError("API Error", fmt.Sprintf("CreateReferenceTable returned an empty response (HTTP %d).", statusCode))
+			return
+		}
+	}
+
 	r.updateState(ctx, &state, &resp)
 
 	// Save data into Terraform state
@@ -339,6 +388,11 @@ func (r *referenceTableResource) Delete(ctx context.Context, request resource.De
 }
 
 func (r *referenceTableResource) updateState(ctx context.Context, state *referenceTableModel, resp *datadogV2.TableResultV2) {
+	// Check if Data is present
+	if resp == nil || resp.Data == nil {
+		return
+	}
+
 	attributes := resp.Data.GetAttributes()
 
 	state.ID = types.StringValue(*resp.GetData().Id)
@@ -568,7 +622,7 @@ func (r *referenceTableResource) buildReferenceTableRequestBody(ctx context.Cont
 	}
 
 	req := datadogV2.NewCreateTableRequestWithDefaults()
-	req.Data = datadogV2.NewCreateTableRequestDataWithDefaults()
+	req.Data = datadogV2.NewCreateTableRequestData(datadogV2.CREATETABLEREQUESTDATATYPE_REFERENCE_TABLE)
 	req.Data.SetAttributes(*attributes)
 
 	return req, diags
@@ -664,7 +718,7 @@ func (r *referenceTableResource) buildReferenceTableUpdateRequestBody(ctx contex
 	}
 
 	req := datadogV2.NewPatchTableRequestWithDefaults()
-	req.Data = datadogV2.NewPatchTableRequestDataWithDefaults()
+	req.Data = datadogV2.NewPatchTableRequestData(datadogV2.PATCHTABLEREQUESTDATATYPE_REFERENCE_TABLE)
 	req.Data.SetAttributes(*attributes)
 
 	return req, diags

datadog/tests/cassettes/TestAccApmRetentionFilter.freeze

@@ -1 +1 @@
-2025-04-15T00:18:22.067179+01:00
+2025-11-05T18:58:39.164037-05:00