Skip to content

Commit 72c8de1

Browse files
committed
only export functions for testing
1 parent 45c74c1 commit 72c8de1

File tree

4 files changed

+11
-10
lines changed

4 files changed

+11
-10
lines changed

internal/service/odb/cloud_autonomous_vm_cluster.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -519,7 +519,7 @@ func (r *resourceCloudAutonomousVmCluster) Create(ctx context.Context, req resou
519519
}
520520

521521
createTimeout := r.CreateTimeout(ctx, plan.Timeouts)
522-
createdAVMC, err := waitCloudAutonomousVmClusterCreated(ctx, conn, *out.CloudAutonomousVmClusterId, createTimeout)
522+
createdAVMC, err := waitCloudAutonomousVmClusterCreated(ctx, conn, aws.ToString(out.CloudAutonomousVmClusterId), createTimeout)
523523
resp.Diagnostics.Append(resp.State.SetAttribute(ctx, path.Root(names.AttrID), aws.ToString(out.CloudAutonomousVmClusterId))...)
524524
if err != nil {
525525
resp.Diagnostics.AddError(

internal/service/odb/cloud_exadata_infrastructure.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -351,7 +351,7 @@ func (r *resourceCloudExadataInfrastructure) Create(ctx context.Context, req res
351351
}
352352

353353
createTimeout := r.CreateTimeout(ctx, plan.Timeouts)
354-
createdExaInfra, err := waitCloudExadataInfrastructureCreated(ctx, conn, *out.CloudExadataInfrastructureId, createTimeout)
354+
createdExaInfra, err := waitCloudExadataInfrastructureCreated(ctx, conn, aws.ToString(out.CloudExadataInfrastructureId), createTimeout)
355355
resp.Diagnostics.Append(resp.State.SetAttribute(ctx, path.Root(names.AttrID), aws.ToString(out.CloudExadataInfrastructureId))...)
356356
if err != nil {
357357
resp.Diagnostics.AddError(

internal/service/odb/cloud_vm_cluster.go

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -476,7 +476,7 @@ func (r *resourceCloudVmCluster) Create(ctx context.Context, req resource.Create
476476
}
477477

478478
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)
480480
resp.Diagnostics.Append(resp.State.SetAttribute(ctx, path.Root(names.AttrID), aws.ToString(out.CloudVmClusterId))...)
481481
if err != nil {
482482
resp.Diagnostics.AddError(
@@ -486,8 +486,8 @@ func (r *resourceCloudVmCluster) Create(ctx context.Context, req resource.Create
486486
return
487487
}
488488
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)
491491
//scan listener port not returned by API directly
492492
plan.ScanListenerPortTcp = flex.Int32ToFramework(ctx, createdVmCluster.ListenerPort)
493493
plan.GiVersionComputed = flex.StringToFramework(ctx, createdVmCluster.GiVersion)
@@ -515,7 +515,7 @@ func (r *resourceCloudVmCluster) Read(ctx context.Context, req resource.ReadRequ
515515
return
516516
}
517517

518-
out, err := FindCloudVmClusterForResourceByID(ctx, conn, state.CloudVmClusterId.ValueString())
518+
out, err := findCloudVmClusterForResourceByID(ctx, conn, state.CloudVmClusterId.ValueString())
519519
if tfresource.NotFound(err) {
520520
resp.Diagnostics.Append(fwdiag.NewResourceNotFoundWarningDiagnostic(err))
521521
resp.State.RemoveResource(ctx)
@@ -620,7 +620,7 @@ func waitCloudVmClusterDeleted(ctx context.Context, conn *odb.Client, id string,
620620

621621
func statusCloudVmCluster(ctx context.Context, conn *odb.Client, id string) retry.StateRefreshFunc {
622622
return func() (any, string, error) {
623-
out, err := FindCloudVmClusterForResourceByID(ctx, conn, id)
623+
out, err := findCloudVmClusterForResourceByID(ctx, conn, id)
624624
if tfresource.NotFound(err) {
625625
return nil, "", nil
626626
}
@@ -633,7 +633,7 @@ func statusCloudVmCluster(ctx context.Context, conn *odb.Client, id string) retr
633633
}
634634
}
635635

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) {
637637
input := odb.GetCloudVmClusterInput{
638638
CloudVmClusterId: aws.String(id),
639639
}

internal/service/odb/exports_test.go

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ var (
88
ResourceCloudAutonomousVMCluster = newResourceCloudAutonomousVmCluster
99
ResourceCloudExadataInfrastructure = newResourceCloudExadataInfrastructure
1010

11-
FindCloudAutonomousVmClusterByID = findCloudAutonomousVmClusterByID
12-
FindExadataInfraResourceByID = findExadataInfraResourceByID
11+
FindCloudAutonomousVmClusterByID = findCloudAutonomousVmClusterByID
12+
FindExadataInfraResourceByID = findExadataInfraResourceByID
13+
FindCloudVmClusterForResourceByID = findCloudVmClusterForResourceByID
1314
)

0 commit comments

Comments
 (0)