scan-listener-port computation added

Author: ab-cs13

internal/service/odb/cloud_vm_cluster.go

@@ -5,25 +5,26 @@ package odb
 import (
 	"context"
 	"errors"
-	"github.com/hashicorp/terraform-plugin-framework-timetypes/timetypes"
-	"github.com/hashicorp/terraform-plugin-framework-validators/listvalidator"
-	"github.com/hashicorp/terraform-plugin-framework/resource/schema/listplanmodifier"
-	"github.com/hashicorp/terraform-plugin-framework/schema/validator"
 	"strings"
 	"time"
 
 	"github.com/aws/aws-sdk-go-v2/aws"
 	"github.com/aws/aws-sdk-go-v2/service/odb"
 	odbtypes "github.com/aws/aws-sdk-go-v2/service/odb/types"
 	"github.com/hashicorp/terraform-plugin-framework-timeouts/resource/timeouts"
+	"github.com/hashicorp/terraform-plugin-framework-timetypes/timetypes"
+	"github.com/hashicorp/terraform-plugin-framework-validators/listvalidator"
+	"github.com/hashicorp/terraform-plugin-framework/path"
 	"github.com/hashicorp/terraform-plugin-framework/resource"
 	"github.com/hashicorp/terraform-plugin-framework/resource/schema"
 	"github.com/hashicorp/terraform-plugin-framework/resource/schema/boolplanmodifier"
 	"github.com/hashicorp/terraform-plugin-framework/resource/schema/float64planmodifier"
 	"github.com/hashicorp/terraform-plugin-framework/resource/schema/int32planmodifier"
+	"github.com/hashicorp/terraform-plugin-framework/resource/schema/listplanmodifier"
 	"github.com/hashicorp/terraform-plugin-framework/resource/schema/planmodifier"
 	"github.com/hashicorp/terraform-plugin-framework/resource/schema/setplanmodifier"
 	"github.com/hashicorp/terraform-plugin-framework/resource/schema/stringplanmodifier"
+	"github.com/hashicorp/terraform-plugin-framework/schema/validator"
 	"github.com/hashicorp/terraform-plugin-framework/types"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/retry"
 	"github.com/hashicorp/terraform-provider-aws/internal/create"
@@ -59,6 +60,7 @@ var ResourceCloudVmCluster = newResourceCloudVmCluster
 type resourceCloudVmCluster struct {
 	framework.ResourceWithModel[cloudVmClusterResourceModel]
 	framework.WithTimeouts
+	framework.WithImportByID
 }
 
 func (r *resourceCloudVmCluster) Schema(ctx context.Context, req resource.SchemaRequest, resp *resource.SchemaResponse) {
@@ -391,6 +393,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)
+	resp.Diagnostics.Append(resp.State.SetAttribute(ctx, path.Root(names.AttrID), aws.ToString(out.CloudVmClusterId))...)
 	if err != nil {
 		resp.Diagnostics.AddError(
 			create.ProblemStandardMessage(names.ODB, create.ErrActionWaitingForCreation, ResNameCloudVmCluster, plan.DisplayName.ValueString(), err),
@@ -401,6 +404,8 @@ func (r *resourceCloudVmCluster) Create(ctx context.Context, req resource.Create
 	hostnamePrefix := strings.Split(*input.Hostname, "-")[0]
 	plan.HostnamePrefix = types.StringValue(hostnamePrefix)
 	plan.HostnamePrefixComputed = types.StringValue(*createdVmCluster.Hostname)
+	//scan listener port not returned by API directly
+	plan.ScanListenerPortTcp = types.Int32PointerValue(createdVmCluster.ListenerPort)
 	resp.Diagnostics.Append(flex.Flatten(ctx, createdVmCluster, &plan)...)
 	if resp.Diagnostics.HasError() {
 		return
@@ -432,8 +437,10 @@ func (r *resourceCloudVmCluster) Read(ctx context.Context, req resource.ReadRequ
 	hostnamePrefix := strings.Split(*out.Hostname, "-")[0]
 	state.HostnamePrefix = types.StringValue(hostnamePrefix)
 	state.HostnamePrefixComputed = types.StringValue(*out.Hostname)
-	resp.Diagnostics.Append(flex.Flatten(ctx, out, &state)...)
+	//scan listener port not returned by API directly
+	state.ScanListenerPortTcp = types.Int32PointerValue(out.ListenerPort)
 
+	resp.Diagnostics.Append(flex.Flatten(ctx, out, &state)...)
 	if resp.Diagnostics.HasError() {
 		return
 	}
@@ -492,24 +499,6 @@ func waitCloudVmClusterCreated(ctx context.Context, conn *odb.Client, id string,
 	return nil, err
 }
 
-func waitCloudVmClusterUpdated(ctx context.Context, conn *odb.Client, id string, timeout time.Duration) (*odbtypes.CloudVmCluster, error) {
-	stateConf := &retry.StateChangeConf{
-		Pending:                   enum.Slice(odbtypes.ResourceStatusUpdating),
-		Target:                    enum.Slice(odbtypes.ResourceStatusAvailable, odbtypes.ResourceStatusFailed),
-		Refresh:                   statusCloudVmCluster(ctx, conn, id),
-		Timeout:                   timeout,
-		NotFoundChecks:            20,
-		ContinuousTargetOccurence: 2,
-	}
-
-	outputRaw, err := stateConf.WaitForStateContext(ctx)
-	if out, ok := outputRaw.(*odbtypes.CloudVmCluster); ok {
-		return out, err
-	}
-
-	return nil, err
-}
-
 func waitCloudVmClusterDeleted(ctx context.Context, conn *odb.Client, id string, timeout time.Duration) (*odbtypes.CloudVmCluster, error) {
 	stateConf := &retry.StateChangeConf{
 		Pending: enum.Slice(odbtypes.ResourceStatusTerminating),
@@ -545,7 +534,6 @@ func FindCloudVmClusterForResourceByID(ctx context.Context, conn *odb.Client, id
 	input := odb.GetCloudVmClusterInput{
 		CloudVmClusterId: aws.String(id),
 	}
-
 	out, err := conn.GetCloudVmCluster(ctx, &input)
 	if err != nil {
 		if errs.IsA[*odbtypes.ResourceNotFoundException](err) {
@@ -554,7 +542,6 @@ func FindCloudVmClusterForResourceByID(ctx context.Context, conn *odb.Client, id
 				LastRequest: &input,
 			}
 		}
-
 		return nil, err
 	}
 
@@ -608,7 +595,7 @@ type cloudVmClusterResourceModel struct {
 	VipIds                       fwtypes.ListValueOf[types.String]                                           `tfsdk:"vip_ids"`
 	CreatedAt                    timetypes.RFC3339                                                           `tfsdk:"created_at"`
 	ComputeModel                 fwtypes.StringEnum[odbtypes.ComputeModel]                                   `tfsdk:"compute_model"`
-	ScanListenerPortTcp          types.Int32                                                                 `tfsdk:"scan_listener_port_tcp"`
+	ScanListenerPortTcp          types.Int32                                                                 `tfsdk:"scan_listener_port_tcp" autoflex:",noflatten"`
 	Tags                         tftags.Map                                                                  `tfsdk:"tags"`
 	TagsAll                      tftags.Map                                                                  `tfsdk:"tags_all"`
 }

internal/service/odb/cloud_vm_cluster_data_source_test.go

@@ -171,6 +171,11 @@ resource "aws_odb_cloud_vm_cluster" "test" {
   db_servers                      = [for db_server in data.aws_odb_db_servers_list.test.db_servers : db_server.id]
   db_node_storage_size_in_gbs     = 120.0
   memory_size_in_gbs              = 60
+  data_collection_options {
+    is_diagnostics_events_enabled = false
+    is_health_monitoring_enabled  = false
+    is_incident_logs_enabled      = false
+  }
   tags = {
     "env" = "dev"
   }

internal/service/odb/cloud_vm_cluster_test.go

@@ -115,7 +115,6 @@ func TestAccODBCloudVmCluster_taggingTest(t *testing.T) {
 	}
 	var cloudvmcluster1 odbtypes.CloudVmCluster
 	var cloudvmcluster2 odbtypes.CloudVmCluster
-	var cloudvmcluster3 odbtypes.CloudVmCluster
 	vmcDisplayName := sdkacctest.RandomWithPrefix(vmClusterTestEntity.vmClusterDisplayNamePrefix)
 	resourceName := "aws_odb_cloud_vm_cluster.test"
 
@@ -140,8 +139,6 @@ func TestAccODBCloudVmCluster_taggingTest(t *testing.T) {
 						return nil
 					}),
 					vmClusterTestEntity.testAccCheckCloudVmClusterExists(ctx, resourceName, &cloudvmcluster1),
-					resource.TestCheckResourceAttr(resourceName, acctest.CtTagsPercent, "1"),
-					resource.TestCheckResourceAttr(resourceName, "tags.env", "dev"),
 				),
 			},
 			{
@@ -169,26 +166,6 @@ func TestAccODBCloudVmCluster_taggingTest(t *testing.T) {
 				ImportState:       true,
 				ImportStateVerify: true,
 			},
-			{
-				Config: vmClusterTestEntity.testAccCloudVmClusterConfigBasic(vmcDisplayName, publicKey),
-				Check: resource.ComposeAggregateTestCheckFunc(
-					vmClusterTestEntity.testAccCheckCloudVmClusterExists(ctx, resourceName, &cloudvmcluster3),
-					resource.ComposeTestCheckFunc(func(state *terraform.State) error {
-						if strings.Compare(*(cloudvmcluster1.CloudVmClusterId), *(cloudvmcluster3.CloudVmClusterId)) != 0 {
-							return errors.New("Should  not create a new cloud vm cluster for tag update")
-						}
-						return nil
-					}),
-
-					resource.TestCheckResourceAttr(resourceName, acctest.CtTagsPercent, "1"),
-					resource.TestCheckResourceAttr(resourceName, "tags.env", "dev"),
-				),
-			},
-			{
-				ResourceName:      resourceName,
-				ImportState:       true,
-				ImportStateVerify: true,
-			},
 		},
 	})
 }
@@ -308,8 +285,10 @@ resource "aws_odb_cloud_vm_cluster" "test" {
   db_servers                      = [for db_server in data.aws_odb_db_servers_list.test.db_servers : db_server.id]
   db_node_storage_size_in_gbs     = 120.0
   memory_size_in_gbs              = 60
-  tags = {
-    "env" = "dev"
+  data_collection_options {
+    is_diagnostics_events_enabled = false
+    is_health_monitoring_enabled  = false
+    is_incident_logs_enabled      = false
   }
 
 }