Add vpc peered flag (#640)

Author: anjmao

castai/resource_commitments_test.go

@@ -100,7 +100,7 @@ func TestCommitmentsResourceCreateAndUpdate(t *testing.T) {
 						Cpu:      lo.ToPtr("10"),
 						CudId:    lo.ToPtr("123456789"),
 						MemoryMb: lo.ToPtr("20480"),
-						Plan:     lo.ToPtr(sdk.TWELVEMONTH),
+						Plan:     lo.ToPtr(sdk.CastaiInventoryV1beta1GCPResourceCUDCUDPlanTWELVEMONTH),
 						Status:   lo.ToPtr("Active"),
 						Type:     lo.ToPtr("COMPUTE_OPTIMIZED_C2D"),
 					},

castai/resource_edge_location.go

@@ -59,6 +59,7 @@ type awsModel struct {
 	AccessKeyIDWO     types.String `tfsdk:"access_key_id_wo"`
 	SecretAccessKeyWO types.String `tfsdk:"secret_access_key_wo"`
 	VpcID             types.String `tfsdk:"vpc_id"`
+	VpcPeered         types.Bool   `tfsdk:"vpc_peered"`
 	SecurityGroupID   types.String `tfsdk:"security_group_id"`
 	SubnetIDs         types.Map    `tfsdk:"subnet_ids"`
 	// Deprecated. Should be removed with name_tag attribute removal.
@@ -94,6 +95,7 @@ func (m awsModel) Equal(other *awsModel) bool {
 	}
 	return m.AccountID.Equal(other.AccountID) &&
 		m.VpcID.Equal(other.VpcID) &&
+		m.VpcPeered.Equal(other.VpcPeered) &&
 		m.SecurityGroupID.Equal(other.SecurityGroupID) &&
 		m.SubnetIDs.Equal(other.SubnetIDs)
 }
@@ -239,6 +241,10 @@ func (r *edgeLocationResource) Schema(_ context.Context, _ resource.SchemaReques
 						Required:    true,
 						Description: "VPC ID to be used in the selected region",
 					},
+					"vpc_peered": schema.BoolAttribute{
+						Optional:    true,
+						Description: "Whether existing VPC is peered with main cluster's VPC. Field is ignored if vpc_id is not provided or main cluster is not EKS",
+					},
 					"security_group_id": schema.StringAttribute{
 						Required:    true,
 						Description: "Security group ID to be used in the selected region",
@@ -690,6 +696,7 @@ func (r *edgeLocationResource) toAWS(ctx context.Context, plan, config *awsModel
 		},
 		Networking: &omni.AWSParamAWSNetworking{
 			VpcId:           plan.VpcID.ValueString(),
+			VpcPeered:       plan.VpcPeered.ValueBoolPointer(),
 			SecurityGroupId: plan.SecurityGroupID.ValueString(),
 			SubnetIds:       subnetMap,
 		},
@@ -711,6 +718,7 @@ func (r *edgeLocationResource) toAWSModel(ctx context.Context, config *omni.AWSP
 		AccountID:         types.StringValue(lo.FromPtr(config.AccountId)),
 		VpcID:             types.StringNull(),
 		SecurityGroupID:   types.StringNull(),
+		VpcPeered:         types.BoolNull(),
 		SubnetIDs:         types.MapNull(types.StringType),
 		NameTag:           types.StringNull(),
 		AccessKeyIDWO:     types.StringNull(),
@@ -719,6 +727,7 @@ func (r *edgeLocationResource) toAWSModel(ctx context.Context, config *omni.AWSP
 
 	if config.Networking != nil {
 		aws.VpcID = types.StringValue(config.Networking.VpcId)
+		aws.VpcPeered = types.BoolPointerValue(config.Networking.VpcPeered)
 		aws.SecurityGroupID = types.StringValue(config.Networking.SecurityGroupId)
 		if config.Networking.NameTag != nil && *config.Networking.NameTag != "" {
 			aws.NameTag = types.StringValue(*config.Networking.NameTag)

castai/resource_edge_location_test.go

@@ -35,6 +35,7 @@ func TestAccCloudAgnostic_ResourceEdgeLocationAWS(t *testing.T) {
 					resource.TestCheckResourceAttr(resourceName, "zones.1.name", "us-east-1b"),
 					resource.TestCheckResourceAttrSet(resourceName, "aws.account_id"),
 					resource.TestCheckResourceAttrSet(resourceName, "aws.vpc_id"),
+					resource.TestCheckResourceAttrSet(resourceName, "aws.vpc_peered"),
 					resource.TestCheckResourceAttrSet(resourceName, "aws.security_group_id"),
 					resource.TestCheckResourceAttr(resourceName, "aws.subnet_ids.%", "2"),
 					resource.TestCheckResourceAttrSet(resourceName, "id"),
@@ -217,6 +218,7 @@ resource "castai_edge_location" "test" {
     account_id           = "123456789012"
     %[6]s
     vpc_id               = "vpc-12345678"
+	vpc_peered           = true
     security_group_id    = "sg-12345678"
     subnet_ids = {%[4]s
     }

castai/resource_node_configuration_eks_test.go

@@ -46,7 +46,7 @@ func TestAccEKS_ResourceNodeConfiguration(t *testing.T) {
 					resource.TestCheckResourceAttr(resourceName, "eks.0.volume_throughput", "131"),
 					resource.TestCheckResourceAttr(resourceName, "eks.0.imds_v1", "true"),
 					resource.TestCheckResourceAttr(resourceName, "eks.0.imds_hop_limit", "3"),
-					resource.TestCheckResourceAttr(resourceName, "eks.0.volume_kms_key_arn", "arn:aws:kms:eu-central-1:012345:key/1d989ee1-59cd-4238-8018-79bae29d1109"),
+					resource.TestCheckResourceAttr(resourceName, "eks.0.volume_kms_key_arn", "arn:aws:kms:us-east-1:123456789012:key/1234abcd-12ab-34cd-56ef-1234567890ab"),
 					resource.TestCheckResourceAttr(resourceName, "eks.0.target_group.#", "1"),
 					resource.TestCheckResourceAttr(resourceName, "eks.0.max_pods_per_node_formula", "NUM_IP_PER_PREFIX-NUM_MAX_NET_INTERFACES"),
 					resource.TestCheckResourceAttr(resourceName, "eks.0.ips_per_prefix", "4"),
@@ -138,7 +138,7 @@ resource "castai_node_configuration" "test" {
 	  volume_type 		 = "gp3"
     volume_iops		     = 3100
 	  volume_throughput 	 = 131
-    volume_kms_key_arn   = "arn:aws:kms:eu-central-1:012345:key/1d989ee1-59cd-4238-8018-79bae29d1109"
+    volume_kms_key_arn   = "arn:aws:kms:us-east-1:123456789012:key/1234abcd-12ab-34cd-56ef-1234567890ab"
 	  imds_v1				 = true
 	  imds_hop_limit       = 3
     max_pods_per_node_formula = "NUM_IP_PER_PREFIX-NUM_MAX_NET_INTERFACES"

castai/resource_node_template_test.go

@@ -1016,6 +1016,7 @@ resource "castai_edge_location" "test_1" {
     secret_access_key_wo = "wJalrXUtnFEMI/K7MDENG/bPxRfiCYEXAMPLEKEY"
     vpc_id               = "vpc-12345678"
     security_group_id    = "sg-12345678"
+	vpc_peered           = false
     subnet_ids = {
       "us-east-1a" = "subnet-12345678"
       "us-east-1b" = "subnet-12345679"
@@ -1044,6 +1045,7 @@ resource "castai_edge_location" "test_2" {
     secret_access_key_wo = "wJalrXUtnFEMI/K7MDENG/bPxRfiCYEXAMPLEKEY"
     vpc_id               = "vpc-87654321"
     security_group_id    = "sg-87654321"
+	vpc_peered           = false
     subnet_ids = {
       "us-west-2a" = "subnet-87654321"
     }