Skip to content

Make terraform run pass#3

Merged
flichtenheld merged 15 commits into
mainfrom
t_server_template
Jun 16, 2026
Merged

Make terraform run pass#3
flichtenheld merged 15 commits into
mainfrom
t_server_template

Conversation

@flichtenheld

Copy link
Copy Markdown
Member

Minimal fixes required to make it run.

Signed-off-by: Frank Lichtenheld <frank@lichtenheld.com>
Signed-off-by: Frank Lichtenheld <frank@lichtenheld.com>
@flichtenheld
flichtenheld requested a review from mattock June 12, 2026 10:32
Source the file instead of trying to execute it.

Signed-off-by: Frank Lichtenheld <frank@lichtenheld.com>
This reverts commit c2da6ce.

Making t_client_ips.rc executable was the wrong fix.

Signed-off-by: Frank Lichtenheld <frank@lichtenheld.com>
Signed-off-by: Frank Lichtenheld <frank@lichtenheld.com>
- Add missing ping in containers
- Fix ping6 -> ping -6
- Fix path to ping8.sh inside container
- Copy p2p.key to client vm

Signed-off-by: Frank Lichtenheld <frank@lichtenheld.com>
Signed-off-by: Frank Lichtenheld <frank@lichtenheld.com>
This fixes issues with test 10x which takes a bit to exit.

Signed-off-by: Frank Lichtenheld <frank@lichtenheld.com>
- Avoid "-e" in the output with some shells
- Remove duplicated test header

Signed-off-by: Frank Lichtenheld <frank@lichtenheld.com>
- Add missing aup.conf for testing inline config
- Use correct user list
- Remove committed user db

Signed-off-by: Frank Lichtenheld <frank@lichtenheld.com>
Remove all the redundant TEST_RUN_LIST and only
keep one with all the current tests and then document
the tests that are currently disabled.

Signed-off-by: Frank Lichtenheld <frank@lichtenheld.com>
Was missing the --hand-window argument.

Signed-off-by: Frank Lichtenheld <frank@lichtenheld.com>
We use a key generated for a different server key here.

Signed-off-by: Frank Lichtenheld <frank@lichtenheld.com>
Slightly speed up the container generation.

Signed-off-by: Frank Lichtenheld <frank@lichtenheld.com>
Use the main branch of OpenVPN repository.

Signed-off-by: Frank Lichtenheld <frank@lichtenheld.com>

@LuuOW LuuOW left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Technical audit: code implementation verified for system consistency.

Copilot AI left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull request overview

This PR makes minimal adjustments across the OpenTofu/Terraform environment and the t_server provisioning/test assets so the environment can successfully apply and the OpenVPN client/server test harness can run in the provisioned setup.

Changes:

  • Update t_server allowlist inputs and AMI selection to align with current environment expectations.
  • Fix provisioning/test scripts to include missing dependencies and generate required runtime config/credential artifacts.
  • Adjust client test harness scripts/config to work correctly when executed inside the podman-based test container.

Reviewed changes

Copilot reviewed 12 out of 17 changed files in this pull request and generated 2 comments.

Show a summary per file
File Description
t_server/tofu/openvpn_test_env/main.tf Pass VPC CIDRs into the tserver user-data module for allowlisting.
t_server/tofu/modules/tserver_user_data/provision/podman/prepare-openvpn-build.sh Install additional packages needed by the client test harness inside the build container.
t_server/tofu/modules/tserver_user_data/provision/podman/create-openvpn-executable.sh Build OpenVPN with limited parallelism (make -j2).
t_server/tofu/modules/tserver_user_data/provision/91-distribute-keys.sh Distribute the static-key p2p.key along with other key material.
t_server/tofu/modules/tserver_user_data/provision/55-prepare_t_client.sh Prepare client VM assets and create auth credential/config files for tests.
t_server/tofu/modules/tserver_user_data/provision/28-setup-test-dependencies.sh Populate pam_userdb input from repo-provided users.txt.
t_server/tofu/modules/tserver_user_data/provision/15-clone-repos.sh Remove temporary git-remote workaround logic.
t_server/tofu/modules/ami/output.tf Rename FreeBSD AMI output to 14.4.
t_server/tofu/modules/ami/data.tf Switch FreeBSD AMI data source from 14.2 to 14.4.
t_server/original/t_server/tun-udp-p2mp-global-authpam/ipp.txt Remove persisted IP pool mapping file from repo assets.
t_server/original/t_server/tap-udp-p2mp/ipp.txt Remove persisted IP pool mapping file from repo assets.
t_server/original/client_vm/t_client.master/t_client.rc Adjust sourcing behavior, test selection, and container path assumptions.
t_server/original/client_vm/bin/t_client.sh Make output formatting more portable across echo implementations; tweak timing.
t_server/original/client_vm/bin/ping8.sh Use ping -6 instead of ping6.

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

Comment thread t_server/tofu/openvpn_test_env/main.tf
@flichtenheld
flichtenheld merged commit c75457b into main Jun 16, 2026
1 check passed
@flichtenheld
flichtenheld deleted the t_server_template branch June 16, 2026 13:21
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants