Skip to content

Replace deprecated AWS EC2 network_interface blocks #67

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jimpudar merged 1 commit into from
May 22, 2026
+15 −9
Merged

Replace deprecated AWS EC2 network_interface blocks #67

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 10 additions & 9 deletions src/rootcell/providers/aws-ec2-terraform.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -591,6 +591,7 @@ resource "aws_route" "private_default" {
route_table_id = aws_route_table.private.id
destination_cidr_block = "0.0.0.0/0"
network_interface_id = aws_network_interface.firewall_private.id
depends_on = [aws_network_interface_attachment.firewall_private]
}

resource "aws_route_table_association" "private" {
Expand Down Expand Up @@ -748,14 +749,8 @@ resource "aws_instance" "firewall" {
key_name = aws_key_pair.control.key_name
user_data = local.rootcell_bootstrap_user_data

network_interface {
primary_network_interface {
network_interface_id = aws_network_interface.firewall_public.id
device_index = 0
}

network_interface {
network_interface_id = aws_network_interface.firewall_private.id
device_index = 1
}

metadata_options {
Expand All @@ -774,15 +769,20 @@ resource "aws_instance" "firewall" {
tags = local.rootcell_tags
}

resource "aws_network_interface_attachment" "firewall_private" {
instance_id = aws_instance.firewall.id
network_interface_id = aws_network_interface.firewall_private.id
device_index = 1
}

resource "aws_instance" "agent" {
ami = data.aws_ami.nixos_arm64.id
instance_type = var.agent_instance_type
key_name = aws_key_pair.control.key_name
user_data = local.rootcell_bootstrap_user_data

network_interface {
primary_network_interface {
network_interface_id = aws_network_interface.agent.id
device_index = 0
}

metadata_options {
Expand All @@ -804,6 +804,7 @@ resource "aws_instance" "agent" {
resource "aws_ec2_instance_state" "firewall" {
instance_id = aws_instance.firewall.id
state = var.desired_instance_state
depends_on = [aws_network_interface_attachment.firewall_private]
}

resource "aws_ec2_instance_state" "agent" {
Expand Down
5 changes: 5 additions & 0 deletions src/rootcell/rootcell.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -925,10 +925,15 @@ describe("VM and network providers", () => {
expect(hcl).toContain('instance_metadata_tags = "disabled"');
expect(hcl).toContain("source_dest_check = false");
expect(hcl).toContain("network_interface_id = aws_network_interface.firewall_private.id");
expect(hcl).toContain('resource "aws_network_interface_attachment" "firewall_private"');
expect(hcl).toContain("primary_network_interface");
expect(hcl).toContain("depends_on = [aws_network_interface_attachment.firewall_private]");
expect(hcl).toContain("depends_on = [aws_network_interface_attachment.firewall_private]");
expect(hcl).toContain("resource \"aws_ec2_instance_state\" \"agent\"");
expect(hcl).toContain("data \"aws_ami\" \"nixos_arm64\"");
expect(hcl).toContain('values = ["arm64"]');
expect(hcl).toContain("user_data = local.rootcell_bootstrap_user_data");
expect(hcl).not.toContain(" network_interface {");
expect(hcl).not.toContain("aws_s3_object");
expect(hcl).not.toContain("aws_ebs_snapshot_import");
expect(hcl).not.toContain("iam_instance_profile");
Expand Down