Skip to content

Repository navigation

Render the secondary IPv4 command without Python indentation #672

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
ejc3 merged 1 commit into from
Oct 25, 2026
Merged

Render the secondary IPv4 command without Python indentation #672

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
9 changes: 4 additions & 5 deletions firecracker-dev.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -340,11 +340,10 @@ resource "aws_ssm_association" "firecracker_dev_secondary_ipv4" {
}

parameters = {
commands = <<-EOT
python3 - '${one(setsubtract(aws_network_interface.firecracker_dev[0].private_ips, [aws_network_interface.firecracker_dev[0].private_ip]))}' <<'PYSECONDARY'
${indent(6, chomp(file("${path.module}/scripts/fcvm-secondary-ipv4.py")))}
PYSECONDARY
EOT
commands = templatefile("${path.module}/scripts/fcvm-secondary-ipv4-command.tftpl", {
address = one(setsubtract(aws_network_interface.firecracker_dev[0].private_ips, [aws_network_interface.firecracker_dev[0].private_ip]))
script = chomp(file("${path.module}/scripts/fcvm-secondary-ipv4.py"))
})
executionTimeout = "120"
}
}
Expand Down
3 changes: 3 additions & 0 deletions scripts/fcvm-secondary-ipv4-command.tftpl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
python3 - '${address}' <<'PYSECONDARY'
${script}
PYSECONDARY
18 changes: 18 additions & 0 deletions scripts/test-fcvm-secondary-ipv4.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@
"""The added address survives boot and never restarts the live primary interface."""
import importlib.util
import json
import os
import sys
from pathlib import Path
import subprocess
import tempfile
Expand Down Expand Up @@ -60,6 +62,22 @@ def run(args, **kwargs):
module.configure('10.0.1.42; reboot', config, run)
self.assertFalse(config.exists())

def test_managed_shell_command_passes_unindented_python_on_stdin(self):
template = ROOT / 'scripts/fcvm-secondary-ipv4-command.tftpl'
command = template.read_text().replace('${address}', '10.0.1.42').replace(
'${script}', (ROOT / 'scripts/fcvm-secondary-ipv4.py').read_text().rstrip())
with tempfile.TemporaryDirectory() as directory:
interpreter = Path(directory) / 'python3'
interpreter.write_text(f'#!{sys.executable}\nimport sys\n'
'assert sys.argv[1:] == ["-", "10.0.1.42"]\n'
'compile(sys.stdin.read(), "<secondary-ipv4>", "exec")\n')
interpreter.chmod(0o700)
subprocess.run(['/bin/sh', '-ec', command], check=True, capture_output=True,
text=True, env={**os.environ, 'PATH': directory})
association = (ROOT / 'firecracker-dev.tf').read_text().split(
'resource "aws_ssm_association" "firecracker_dev_secondary_ipv4"', 1)[1]
self.assertIn('templatefile("${path.module}/scripts/fcvm-secondary-ipv4-command.tftpl"', association)

def test_managed_association_runs_the_script_on_the_arm_host(self):
tf = (ROOT / 'firecracker-dev.tf').read_text()
self.assertIn('resource "aws_ssm_association" "firecracker_dev_secondary_ipv4"', tf)
Expand Down
Loading