Merge pull request #47808 from bonclay7/f-observabilityadmin_telemetry_evaluation_for_organization

r/observabilityadmin_telemetry_evaluation_for_organization

Author: ewbankkit

.changelog/47808.txt

@@ -0,0 +1,3 @@
+```release-note:new-resource
+aws_observabilityadmin_telemetry_evaluation_for_organization
+```

internal/service/observabilityadmin/exports_test.go

@@ -5,13 +5,15 @@ package observabilityadmin
 
 // Exports for use in tests only.
 var (
-	ResourceCentralizationRuleForOrganization = newCentralizationRuleForOrganizationResource
-	ResourceTelemetryEnrichment               = newTelemetryEnrichmentResource
-	ResourceTelemetryEvaluation               = newTelemetryEvaluationResource
-	ResourceTelemetryPipeline                 = newTelemetryPipelineResource
+	ResourceCentralizationRuleForOrganization  = newCentralizationRuleForOrganizationResource
+	ResourceTelemetryEnrichment                = newTelemetryEnrichmentResource
+	ResourceTelemetryEvaluation                = newTelemetryEvaluationResource
+	ResourceTelemetryEvaluationForOrganization = newTelemetryEvaluationForOrganizationResource
+	ResourceTelemetryPipeline                  = newTelemetryPipelineResource
 
 	FindCentralizationRuleForOrganizationByID = findCentralizationRuleForOrganizationByID
 	FindTelemetryEnrichment                   = findTelemetryEnrichment
 	FindTelemetryEvaluation                   = findTelemetryEvaluation
+	FindTelemetryEvaluationForOrganization    = findTelemetryEvaluationForOrganization
 	FindTelemetryPipelineByARN                = findTelemetryPipelineByARN
 )

internal/service/observabilityadmin/observabilityadmin_test.go

@@ -0,0 +1,34 @@
+// Copyright IBM Corp. 2014, 2026
+// SPDX-License-Identifier: MPL-2.0
+
+package observabilityadmin_test
+
+import (
+	"testing"
+
+	"github.com/hashicorp/terraform-provider-aws/internal/acctest"
+)
+
+func TestAccObservabilityAdmin_serial(t *testing.T) {
+	t.Parallel()
+
+	testCases := map[string]map[string]func(t *testing.T){
+		"TelemetryEnrichment": {
+			acctest.CtBasic:      testAccTelemetryEnrichment_basic,
+			acctest.CtDisappears: testAccTelemetryEnrichment_disappears,
+			"Identity":           testAccObservabilityAdminTelemetryEnrichment_identitySerial,
+		},
+		"TelemetryEvaluation": {
+			acctest.CtBasic:      testAccTelemetryEvaluation_basic,
+			acctest.CtDisappears: testAccTelemetryEvaluation_disappears,
+			"Identity":           testAccObservabilityAdminTelemetryEvaluation_identitySerial,
+		},
+		"TelemetryEvaluationForOrganization": {
+			acctest.CtBasic:      testAccTelemetryEvaluationForOrganization_basic,
+			acctest.CtDisappears: testAccTelemetryEvaluationForOrganization_disappears,
+			"Identity":           testAccObservabilityAdminTelemetryEvaluationForOrganization_identitySerial,
+		},
+	}
+
+	acctest.RunSerialTests2Levels(t, testCases, 0)
+}

internal/service/observabilityadmin/service_package_gen.go

@@ -72,7 +72,12 @@ func (r *telemetryEnrichmentResource) Create(ctx context.Context, req resource.C
 	conn := r.Meta().ObservabilityAdminClient(ctx)
 
 	var input observabilityadmin.StartTelemetryEnrichmentInput
-	_, err := conn.StartTelemetryEnrichment(ctx, &input)
+	const (
+		timeout = 1 * time.Minute
+	)
+	_, err := tfresource.RetryWhenIsA[any, *awstypes.ConflictException](ctx, timeout, func(ctx context.Context) (any, error) {
+		return conn.StartTelemetryEnrichment(ctx, &input)
+	})
 	if err != nil {
 		smerr.AddError(ctx, &resp.Diagnostics, err)
 		return

internal/service/observabilityadmin/telemetry_enrichment.go

@@ -24,18 +24,6 @@ import (
 	"github.com/hashicorp/terraform-provider-aws/names"
 )
 
-func TestAccObservabilityAdminTelemetryEnrichment_serial(t *testing.T) {
-	t.Parallel()
-
-	testCases := map[string]func(t *testing.T){
-		acctest.CtBasic:      testAccTelemetryEnrichment_basic,
-		acctest.CtDisappears: testAccTelemetryEnrichment_disappears,
-		"Identity":           testAccObservabilityAdminTelemetryEnrichment_identitySerial,
-	}
-
-	acctest.RunSerialTests1Level(t, testCases, 0)
-}
-
 func testAccTelemetryEnrichment_basic(t *testing.T) {
 	ctx := acctest.Context(t)
 	resourceName := "aws_observabilityadmin_telemetry_enrichment.test"

internal/service/observabilityadmin/telemetry_enrichment_test.go

@@ -50,11 +50,11 @@ type telemetryEvaluationResource struct {
 func (r *telemetryEvaluationResource) Schema(ctx context.Context, req resource.SchemaRequest, resp *resource.SchemaResponse) {
 	resp.Schema = schema.Schema{
 		Attributes: map[string]schema.Attribute{
-			names.AttrID: framework.IDAttributeDeprecatedWithAlternate(path.Root(names.AttrRegion)),
-			names.AttrStatus: schema.StringAttribute{
+			"failure_reason": schema.StringAttribute{
 				Computed: true,
 			},
-			"failure_reason": schema.StringAttribute{
+			names.AttrID: framework.IDAttributeDeprecatedWithAlternate(path.Root(names.AttrRegion)),
+			names.AttrStatus: schema.StringAttribute{
 				Computed: true,
 			},
 		},
@@ -77,7 +77,12 @@ func (r *telemetryEvaluationResource) Create(ctx context.Context, req resource.C
 	conn := r.Meta().ObservabilityAdminClient(ctx)
 
 	var input observabilityadmin.StartTelemetryEvaluationInput
-	_, err := conn.StartTelemetryEvaluation(ctx, &input)
+	const (
+		timeout = 1 * time.Minute
+	)
+	_, err := tfresource.RetryWhenIsA[any, *awstypes.ConflictException](ctx, timeout, func(ctx context.Context) (any, error) {
+		return conn.StartTelemetryEvaluation(ctx, &input)
+	})
 	if err != nil {
 		smerr.AddError(ctx, &resp.Diagnostics, err)
 		return
@@ -89,9 +94,9 @@ func (r *telemetryEvaluationResource) Create(ctx context.Context, req resource.C
 		return
 	}
 
-	data.Status = fwflex.StringToFramework(ctx, (*string)(&out.Status))
 	data.FailureReason = fwflex.StringToFramework(ctx, out.FailureReason)
 	data.ID = fwflex.StringValueToFramework(ctx, r.Meta().Region(ctx))
+	data.Status = fwflex.StringValueToFramework(ctx, out.Status)
 
 	smerr.AddEnrich(ctx, &resp.Diagnostics, resp.State.Set(ctx, data))
 }
@@ -116,8 +121,8 @@ func (r *telemetryEvaluationResource) Read(ctx context.Context, req resource.Rea
 		return
 	}
 
-	data.Status = fwflex.StringToFramework(ctx, (*string)(&out.Status))
 	data.FailureReason = fwflex.StringToFramework(ctx, out.FailureReason)
+	data.Status = fwflex.StringValueToFramework(ctx, out.Status)
 
 	smerr.AddEnrich(ctx, &resp.Diagnostics, resp.State.Set(ctx, &data))
 }
@@ -238,8 +243,8 @@ func waitTelemetryEvaluationStopped(ctx context.Context, conn *observabilityadmi
 
 type telemetryEvaluationResourceModel struct {
 	framework.WithRegionModel
+	FailureReason types.String   `tfsdk:"failure_reason"`
 	ID            types.String   `tfsdk:"id"`
 	Status        types.String   `tfsdk:"status"`
-	FailureReason types.String   `tfsdk:"failure_reason"`
 	Timeouts      timeouts.Value `tfsdk:"timeouts"`
 }