Merge pull request #44527 from hashicorp/td-odb_fixup_flex

johnsonaj · web-flow · commit 595055473d64 · 2025-10-02T08:24:15.000-05:00
diff --git a/internal/service/odb/cloud_autonomous_vm_cluster.go b/internal/service/odb/cloud_autonomous_vm_cluster.go
@@ -57,8 +57,6 @@ const (
 	ResNameCloudAutonomousVmCluster = "Cloud Autonomous Vm Cluster"
 )
 
-var ResourceCloudAutonomousVMCluster = newResourceCloudAutonomousVmCluster
-
 type resourceCloudAutonomousVmCluster struct {
 	framework.ResourceWithModel[cloudAutonomousVmClusterResourceModel]
 	framework.WithTimeouts
@@ -521,7 +519,7 @@ func (r *resourceCloudAutonomousVmCluster) Create(ctx context.Context, req resou
 	}
 
 	createTimeout := r.CreateTimeout(ctx, plan.Timeouts)
-	createdAVMC, err := waitCloudAutonomousVmClusterCreated(ctx, conn, *out.CloudAutonomousVmClusterId, createTimeout)
+	createdAVMC, err := waitCloudAutonomousVmClusterCreated(ctx, conn, aws.ToString(out.CloudAutonomousVmClusterId), createTimeout)
 	resp.Diagnostics.Append(resp.State.SetAttribute(ctx, path.Root(names.AttrID), aws.ToString(out.CloudAutonomousVmClusterId))...)
 	if err != nil {
 		resp.Diagnostics.AddError(
@@ -543,7 +541,7 @@ func (r *resourceCloudAutonomousVmCluster) Read(ctx context.Context, req resourc
 		return
 	}
 
-	out, err := FindCloudAutonomousVmClusterByID(ctx, conn, state.CloudAutonomousVmClusterId.ValueString())
+	out, err := findCloudAutonomousVmClusterByID(ctx, conn, state.CloudAutonomousVmClusterId.ValueString())
 
 	if tfresource.NotFound(err) {
 		resp.Diagnostics.Append(fwdiag.NewResourceNotFoundWarningDiagnostic(err))
@@ -635,7 +633,7 @@ func waitCloudAutonomousVmClusterDeleted(ctx context.Context, conn *odb.Client,
 
 func statusCloudAutonomousVmCluster(ctx context.Context, conn *odb.Client, id string) retry.StateRefreshFunc {
 	return func() (any, string, error) {
-		out, err := FindCloudAutonomousVmClusterByID(ctx, conn, id)
+		out, err := findCloudAutonomousVmClusterByID(ctx, conn, id)
 		if tfresource.NotFound(err) {
 			return nil, "", nil
 		}
@@ -648,7 +646,7 @@ func statusCloudAutonomousVmCluster(ctx context.Context, conn *odb.Client, id st
 	}
 }
 
-func FindCloudAutonomousVmClusterByID(ctx context.Context, conn *odb.Client, id string) (*odbtypes.CloudAutonomousVmCluster, error) {
+func findCloudAutonomousVmClusterByID(ctx context.Context, conn *odb.Client, id string) (*odbtypes.CloudAutonomousVmCluster, error) {
 	input := odb.GetCloudAutonomousVmClusterInput{
 		CloudAutonomousVmClusterId: aws.String(id),
 	}
diff --git a/internal/service/odb/cloud_exadata_infrastructure.go b/internal/service/odb/cloud_exadata_infrastructure.go
@@ -53,8 +53,6 @@ const (
 	ResNameCloudExadataInfrastructure = "Cloud Exadata Infrastructure"
 )
 
-var ResourceCloudExadataInfrastructure = newResourceCloudExadataInfrastructure
-
 type resourceCloudExadataInfrastructure struct {
 	framework.ResourceWithModel[cloudExadataInfrastructureResourceModel]
 	framework.WithTimeouts
@@ -353,7 +351,7 @@ func (r *resourceCloudExadataInfrastructure) Create(ctx context.Context, req res
 	}
 
 	createTimeout := r.CreateTimeout(ctx, plan.Timeouts)
-	createdExaInfra, err := waitCloudExadataInfrastructureCreated(ctx, conn, *out.CloudExadataInfrastructureId, createTimeout)
+	createdExaInfra, err := waitCloudExadataInfrastructureCreated(ctx, conn, aws.ToString(out.CloudExadataInfrastructureId), createTimeout)
 	resp.Diagnostics.Append(resp.State.SetAttribute(ctx, path.Root(names.AttrID), aws.ToString(out.CloudExadataInfrastructureId))...)
 	if err != nil {
 		resp.Diagnostics.AddError(
@@ -379,7 +377,7 @@ func (r *resourceCloudExadataInfrastructure) Read(ctx context.Context, req resou
 		return
 	}
 
-	out, err := FindExadataInfraResourceByID(ctx, conn, state.CloudExadataInfrastructureId.ValueString())
+	out, err := findExadataInfraResourceByID(ctx, conn, state.CloudExadataInfrastructureId.ValueString())
 	if tfresource.NotFound(err) {
 		resp.Diagnostics.Append(fwdiag.NewResourceNotFoundWarningDiagnostic(err))
 		resp.State.RemoveResource(ctx)
@@ -536,7 +534,7 @@ func waitCloudExadataInfrastructureDeleted(ctx context.Context, conn *odb.Client
 
 func statusCloudExadataInfrastructure(ctx context.Context, conn *odb.Client, id string) retry.StateRefreshFunc {
 	return func() (any, string, error) {
-		out, err := FindExadataInfraResourceByID(ctx, conn, id)
+		out, err := findExadataInfraResourceByID(ctx, conn, id)
 		if tfresource.NotFound(err) {
 			return nil, "", nil
 		}
@@ -549,7 +547,7 @@ func statusCloudExadataInfrastructure(ctx context.Context, conn *odb.Client, id
 	}
 }
 
-func FindExadataInfraResourceByID(ctx context.Context, conn *odb.Client, id string) (*odbtypes.CloudExadataInfrastructure, error) {
+func findExadataInfraResourceByID(ctx context.Context, conn *odb.Client, id string) (*odbtypes.CloudExadataInfrastructure, error) {
 	input := odb.GetCloudExadataInfrastructureInput{
 		CloudExadataInfrastructureId: aws.String(id),
 	}
diff --git a/internal/service/odb/cloud_vm_cluster.go b/internal/service/odb/cloud_vm_cluster.go
@@ -476,7 +476,7 @@ func (r *resourceCloudVmCluster) Create(ctx context.Context, req resource.Create
 	}
 
 	createTimeout := r.CreateTimeout(ctx, plan.Timeouts)
-	createdVmCluster, err := waitCloudVmClusterCreated(ctx, conn, *out.CloudVmClusterId, createTimeout)
+	createdVmCluster, err := waitCloudVmClusterCreated(ctx, conn, aws.ToString(out.CloudVmClusterId), createTimeout)
 	resp.Diagnostics.Append(resp.State.SetAttribute(ctx, path.Root(names.AttrID), aws.ToString(out.CloudVmClusterId))...)
 	if err != nil {
 		resp.Diagnostics.AddError(
@@ -486,8 +486,8 @@ func (r *resourceCloudVmCluster) Create(ctx context.Context, req resource.Create
 		return
 	}
 	hostnamePrefix := strings.Split(*input.Hostname, "-")[0]
-	plan.HostnamePrefix = types.StringValue(hostnamePrefix)
-	plan.HostnamePrefixComputed = types.StringValue(*createdVmCluster.Hostname)
+	plan.HostnamePrefix = flex.StringValueToFramework(ctx, hostnamePrefix)
+	plan.HostnamePrefixComputed = flex.StringToFramework(ctx, createdVmCluster.Hostname)
 	//scan listener port not returned by API directly
 	plan.ScanListenerPortTcp = flex.Int32ToFramework(ctx, createdVmCluster.ListenerPort)
 	plan.GiVersionComputed = flex.StringToFramework(ctx, createdVmCluster.GiVersion)
@@ -515,7 +515,7 @@ func (r *resourceCloudVmCluster) Read(ctx context.Context, req resource.ReadRequ
 		return
 	}
 
-	out, err := FindCloudVmClusterForResourceByID(ctx, conn, state.CloudVmClusterId.ValueString())
+	out, err := findCloudVmClusterForResourceByID(ctx, conn, state.CloudVmClusterId.ValueString())
 	if tfresource.NotFound(err) {
 		resp.Diagnostics.Append(fwdiag.NewResourceNotFoundWarningDiagnostic(err))
 		resp.State.RemoveResource(ctx)
@@ -620,7 +620,7 @@ func waitCloudVmClusterDeleted(ctx context.Context, conn *odb.Client, id string,
 
 func statusCloudVmCluster(ctx context.Context, conn *odb.Client, id string) retry.StateRefreshFunc {
 	return func() (any, string, error) {
-		out, err := FindCloudVmClusterForResourceByID(ctx, conn, id)
+		out, err := findCloudVmClusterForResourceByID(ctx, conn, id)
 		if tfresource.NotFound(err) {
 			return nil, "", nil
 		}
@@ -633,7 +633,7 @@ func statusCloudVmCluster(ctx context.Context, conn *odb.Client, id string) retr
 	}
 }
 
-func FindCloudVmClusterForResourceByID(ctx context.Context, conn *odb.Client, id string) (*odbtypes.CloudVmCluster, error) {
+func findCloudVmClusterForResourceByID(ctx context.Context, conn *odb.Client, id string) (*odbtypes.CloudVmCluster, error) {
 	input := odb.GetCloudVmClusterInput{
 		CloudVmClusterId: aws.String(id),
 	}
diff --git a/internal/service/odb/exports_test.go b/internal/service/odb/exports_test.go
@@ -0,0 +1,14 @@
+// Copyright (c) HashiCorp, Inc.
+// SPDX-License-Identifier: MPL-2.0
+
+package odb
+
+// Exports for use in tests only.
+var (
+	ResourceCloudAutonomousVMCluster   = newResourceCloudAutonomousVmCluster
+	ResourceCloudExadataInfrastructure = newResourceCloudExadataInfrastructure
+
+	FindCloudAutonomousVmClusterByID  = findCloudAutonomousVmClusterByID
+	FindExadataInfraResourceByID      = findExadataInfraResourceByID
+	FindCloudVmClusterForResourceByID = findCloudVmClusterForResourceByID
+)

Original file line number	Diff line number	Diff line change
`@@ -57,8 +57,6 @@ const (`
`57`	`57`	`ResNameCloudAutonomousVmCluster = "Cloud Autonomous Vm Cluster"`
`58`	`58`	`)`
`59`	`59`
`60`		`-var ResourceCloudAutonomousVMCluster = newResourceCloudAutonomousVmCluster`
`61`		`-`
`62`	`60`	`type resourceCloudAutonomousVmCluster struct {`
`63`	`61`	`framework.ResourceWithModel[cloudAutonomousVmClusterResourceModel]`
`64`	`62`	`framework.WithTimeouts`
`@@ -521,7 +519,7 @@ func (r *resourceCloudAutonomousVmCluster) Create(ctx context.Context, req resou`
`521`	`519`	`}`
`522`	`520`
`523`	`521`	`createTimeout := r.CreateTimeout(ctx, plan.Timeouts)`
`524`		`- createdAVMC, err := waitCloudAutonomousVmClusterCreated(ctx, conn, *out.CloudAutonomousVmClusterId, createTimeout)`
	`522`	`+ createdAVMC, err := waitCloudAutonomousVmClusterCreated(ctx, conn, aws.ToString(out.CloudAutonomousVmClusterId), createTimeout)`
`525`	`523`	`resp.Diagnostics.Append(resp.State.SetAttribute(ctx, path.Root(names.AttrID), aws.ToString(out.CloudAutonomousVmClusterId))...)`
`526`	`524`	`if err != nil {`
`527`	`525`	`resp.Diagnostics.AddError(`
`@@ -543,7 +541,7 @@ func (r *resourceCloudAutonomousVmCluster) Read(ctx context.Context, req resourc`
`543`	`541`	`return`
`544`	`542`	`}`
`545`	`543`
`546`		`- out, err := FindCloudAutonomousVmClusterByID(ctx, conn, state.CloudAutonomousVmClusterId.ValueString())`
	`544`	`+ out, err := findCloudAutonomousVmClusterByID(ctx, conn, state.CloudAutonomousVmClusterId.ValueString())`
`547`	`545`
`548`	`546`	`if tfresource.NotFound(err) {`
`549`	`547`	`resp.Diagnostics.Append(fwdiag.NewResourceNotFoundWarningDiagnostic(err))`
`@@ -635,7 +633,7 @@ func waitCloudAutonomousVmClusterDeleted(ctx context.Context, conn *odb.Client,`
`635`	`633`
`636`	`634`	`func statusCloudAutonomousVmCluster(ctx context.Context, conn *odb.Client, id string) retry.StateRefreshFunc {`
`637`	`635`	`return func() (any, string, error) {`
`638`		`- out, err := FindCloudAutonomousVmClusterByID(ctx, conn, id)`
	`636`	`+ out, err := findCloudAutonomousVmClusterByID(ctx, conn, id)`
`639`	`637`	`if tfresource.NotFound(err) {`
`640`	`638`	`return nil, "", nil`
`641`	`639`	`}`
`@@ -648,7 +646,7 @@ func statusCloudAutonomousVmCluster(ctx context.Context, conn *odb.Client, id st`
`648`	`646`	`}`
`649`	`647`	`}`
`650`	`648`
`651`		`-func FindCloudAutonomousVmClusterByID(ctx context.Context, conn odb.Client, id string) (odbtypes.CloudAutonomousVmCluster, error) {`
	`649`	`+func findCloudAutonomousVmClusterByID(ctx context.Context, conn odb.Client, id string) (odbtypes.CloudAutonomousVmCluster, error) {`
`652`	`650`	`input := odb.GetCloudAutonomousVmClusterInput{`
`653`	`651`	`CloudAutonomousVmClusterId: aws.String(id),`
`654`	`652`	`}`
Original file line number	Diff line number	Diff line change
`@@ -53,8 +53,6 @@ const (`
`53`	`53`	`ResNameCloudExadataInfrastructure = "Cloud Exadata Infrastructure"`
`54`	`54`	`)`
`55`	`55`
`56`		`-var ResourceCloudExadataInfrastructure = newResourceCloudExadataInfrastructure`
`57`		`-`
`58`	`56`	`type resourceCloudExadataInfrastructure struct {`
`59`	`57`	`framework.ResourceWithModel[cloudExadataInfrastructureResourceModel]`
`60`	`58`	`framework.WithTimeouts`
`@@ -353,7 +351,7 @@ func (r *resourceCloudExadataInfrastructure) Create(ctx context.Context, req res`
`353`	`351`	`}`
`354`	`352`
`355`	`353`	`createTimeout := r.CreateTimeout(ctx, plan.Timeouts)`
`356`		`- createdExaInfra, err := waitCloudExadataInfrastructureCreated(ctx, conn, *out.CloudExadataInfrastructureId, createTimeout)`
	`354`	`+ createdExaInfra, err := waitCloudExadataInfrastructureCreated(ctx, conn, aws.ToString(out.CloudExadataInfrastructureId), createTimeout)`
`357`	`355`	`resp.Diagnostics.Append(resp.State.SetAttribute(ctx, path.Root(names.AttrID), aws.ToString(out.CloudExadataInfrastructureId))...)`
`358`	`356`	`if err != nil {`
`359`	`357`	`resp.Diagnostics.AddError(`
`@@ -379,7 +377,7 @@ func (r *resourceCloudExadataInfrastructure) Read(ctx context.Context, req resou`
`379`	`377`	`return`
`380`	`378`	`}`
`381`	`379`
`382`		`- out, err := FindExadataInfraResourceByID(ctx, conn, state.CloudExadataInfrastructureId.ValueString())`
	`380`	`+ out, err := findExadataInfraResourceByID(ctx, conn, state.CloudExadataInfrastructureId.ValueString())`
`383`	`381`	`if tfresource.NotFound(err) {`
`384`	`382`	`resp.Diagnostics.Append(fwdiag.NewResourceNotFoundWarningDiagnostic(err))`
`385`	`383`	`resp.State.RemoveResource(ctx)`
`@@ -536,7 +534,7 @@ func waitCloudExadataInfrastructureDeleted(ctx context.Context, conn *odb.Client`
`536`	`534`
`537`	`535`	`func statusCloudExadataInfrastructure(ctx context.Context, conn *odb.Client, id string) retry.StateRefreshFunc {`
`538`	`536`	`return func() (any, string, error) {`
`539`		`- out, err := FindExadataInfraResourceByID(ctx, conn, id)`
	`537`	`+ out, err := findExadataInfraResourceByID(ctx, conn, id)`
`540`	`538`	`if tfresource.NotFound(err) {`
`541`	`539`	`return nil, "", nil`
`542`	`540`	`}`
`@@ -549,7 +547,7 @@ func statusCloudExadataInfrastructure(ctx context.Context, conn *odb.Client, id`
`549`	`547`	`}`
`550`	`548`	`}`
`551`	`549`
`552`		`-func FindExadataInfraResourceByID(ctx context.Context, conn odb.Client, id string) (odbtypes.CloudExadataInfrastructure, error) {`
	`550`	`+func findExadataInfraResourceByID(ctx context.Context, conn odb.Client, id string) (odbtypes.CloudExadataInfrastructure, error) {`
`553`	`551`	`input := odb.GetCloudExadataInfrastructureInput{`
`554`	`552`	`CloudExadataInfrastructureId: aws.String(id),`
`555`	`553`	`}`
Original file line number	Diff line number	Diff line change
`@@ -476,7 +476,7 @@ func (r *resourceCloudVmCluster) Create(ctx context.Context, req resource.Create`
`476`	`476`	`}`
`477`	`477`
`478`	`478`	`createTimeout := r.CreateTimeout(ctx, plan.Timeouts)`
`479`		`- createdVmCluster, err := waitCloudVmClusterCreated(ctx, conn, *out.CloudVmClusterId, createTimeout)`
	`479`	`+ createdVmCluster, err := waitCloudVmClusterCreated(ctx, conn, aws.ToString(out.CloudVmClusterId), createTimeout)`
`480`	`480`	`resp.Diagnostics.Append(resp.State.SetAttribute(ctx, path.Root(names.AttrID), aws.ToString(out.CloudVmClusterId))...)`
`481`	`481`	`if err != nil {`
`482`	`482`	`resp.Diagnostics.AddError(`
`@@ -486,8 +486,8 @@ func (r *resourceCloudVmCluster) Create(ctx context.Context, req resource.Create`
`486`	`486`	`return`
`487`	`487`	`}`
`488`	`488`	`hostnamePrefix := strings.Split(*input.Hostname, "-")[0]`
`489`		`- plan.HostnamePrefix = types.StringValue(hostnamePrefix)`
`490`		`- plan.HostnamePrefixComputed = types.StringValue(*createdVmCluster.Hostname)`
	`489`	`+ plan.HostnamePrefix = flex.StringValueToFramework(ctx, hostnamePrefix)`
	`490`	`+ plan.HostnamePrefixComputed = flex.StringToFramework(ctx, createdVmCluster.Hostname)`
`491`	`491`	`//scan listener port not returned by API directly`
`492`	`492`	`plan.ScanListenerPortTcp = flex.Int32ToFramework(ctx, createdVmCluster.ListenerPort)`
`493`	`493`	`plan.GiVersionComputed = flex.StringToFramework(ctx, createdVmCluster.GiVersion)`
`@@ -515,7 +515,7 @@ func (r *resourceCloudVmCluster) Read(ctx context.Context, req resource.ReadRequ`
`515`	`515`	`return`
`516`	`516`	`}`
`517`	`517`
`518`		`- out, err := FindCloudVmClusterForResourceByID(ctx, conn, state.CloudVmClusterId.ValueString())`
	`518`	`+ out, err := findCloudVmClusterForResourceByID(ctx, conn, state.CloudVmClusterId.ValueString())`
`519`	`519`	`if tfresource.NotFound(err) {`
`520`	`520`	`resp.Diagnostics.Append(fwdiag.NewResourceNotFoundWarningDiagnostic(err))`
`521`	`521`	`resp.State.RemoveResource(ctx)`
`@@ -620,7 +620,7 @@ func waitCloudVmClusterDeleted(ctx context.Context, conn *odb.Client, id string,`
`620`	`620`
`621`	`621`	`func statusCloudVmCluster(ctx context.Context, conn *odb.Client, id string) retry.StateRefreshFunc {`
`622`	`622`	`return func() (any, string, error) {`
`623`		`- out, err := FindCloudVmClusterForResourceByID(ctx, conn, id)`
	`623`	`+ out, err := findCloudVmClusterForResourceByID(ctx, conn, id)`
`624`	`624`	`if tfresource.NotFound(err) {`
`625`	`625`	`return nil, "", nil`
`626`	`626`	`}`
`@@ -633,7 +633,7 @@ func statusCloudVmCluster(ctx context.Context, conn *odb.Client, id string) retr`
`633`	`633`	`}`
`634`	`634`	`}`
`635`	`635`
`636`		`-func FindCloudVmClusterForResourceByID(ctx context.Context, conn odb.Client, id string) (odbtypes.CloudVmCluster, error) {`
	`636`	`+func findCloudVmClusterForResourceByID(ctx context.Context, conn odb.Client, id string) (odbtypes.CloudVmCluster, error) {`
`637`	`637`	`input := odb.GetCloudVmClusterInput{`
`638`	`638`	`CloudVmClusterId: aws.String(id),`
`639`	`639`	`}`