Merge branch 'master' into adding-shared-vpc-arn

Author: steve-fraser

castai/resource_edge_location.go

@@ -61,7 +61,8 @@ type awsModel struct {
 	VpcID             types.String `tfsdk:"vpc_id"`
 	SecurityGroupID   types.String `tfsdk:"security_group_id"`
 	SubnetIDs         types.Map    `tfsdk:"subnet_ids"`
-	NameTag           types.String `tfsdk:"name_tag"`
+	// Deprecated. Should be removed with name_tag attribute removal.
+	NameTag types.String `tfsdk:"name_tag"`
 }
 
 type gcpModel struct {
@@ -94,8 +95,7 @@ func (m awsModel) Equal(other *awsModel) bool {
 	return m.AccountID.Equal(other.AccountID) &&
 		m.VpcID.Equal(other.VpcID) &&
 		m.SecurityGroupID.Equal(other.SecurityGroupID) &&
-		m.SubnetIDs.Equal(other.SubnetIDs) &&
-		m.NameTag.Equal(other.NameTag)
+		m.SubnetIDs.Equal(other.SubnetIDs)
 }
 
 func (m gcpModel) credentials() types.String {
@@ -249,8 +249,9 @@ func (r *edgeLocationResource) Schema(_ context.Context, _ resource.SchemaReques
 						Description: "Map of zone names to subnet IDs to be used in the selected region",
 					},
 					"name_tag": schema.StringAttribute{
-						Required:    true,
-						Description: "The value of a 'Name' tag applied to VPC resources",
+						Optional:           true,
+						Description:        "The value of a 'Name' tag applied to VPC resources",
+						DeprecationMessage: "Deprecated. Can be omitted",
 					},
 				},
 			},
@@ -691,9 +692,11 @@ func (r *edgeLocationResource) toAWS(ctx context.Context, plan, config *awsModel
 			VpcId:           plan.VpcID.ValueString(),
 			SecurityGroupId: plan.SecurityGroupID.ValueString(),
 			SubnetIds:       subnetMap,
-			NameTag:         plan.NameTag.ValueString(),
 		},
 	}
+	if !plan.NameTag.IsNull() {
+		out.Networking.NameTag = lo.ToPtr(plan.NameTag.ValueString())
+	}
 
 	return out, diags
 }
@@ -717,7 +720,9 @@ func (r *edgeLocationResource) toAWSModel(ctx context.Context, config *omni.AWSP
 	if config.Networking != nil {
 		aws.VpcID = types.StringValue(config.Networking.VpcId)
 		aws.SecurityGroupID = types.StringValue(config.Networking.SecurityGroupId)
-		aws.NameTag = types.StringValue(config.Networking.NameTag)
+		if config.Networking.NameTag != nil && *config.Networking.NameTag != "" {
+			aws.NameTag = types.StringValue(*config.Networking.NameTag)
+		}
 
 		if config.Networking.SubnetIds != nil {
 			subnetMap, d := types.MapValueFrom(ctx, types.StringType, config.Networking.SubnetIds)

castai/resource_edge_location_test.go

@@ -220,7 +220,6 @@ resource "castai_edge_location" "test" {
     security_group_id    = "sg-12345678"
     subnet_ids = {%[4]s
     }
-    name_tag             = "test-edge-location"
   }
 }
 `, rName, description, zonesConfig, subnetConfig, organizationID, awsCredentials))