Requesting Recommendations - Git Strategy for AWS Infrastructure with Terraform

[ctgopinaath]

Why are you starting this discussion?

Question

What GitHub Actions topic or product is this about?

Misc

Discussion Details

I’m working on a requirement to deploy AWS EKS along with other AWS infrastructure components using Terraform. The code has been developed, and I’m planning to implement CI/CD using GitHub Actions.

We have four environments: Dev, QA, Staging (STG), and Production.

I’d like your expert opinion on the best branching strategy for managing these environments. Specifically:

Should we maintain separate branches for each environment (e.g., dev, qa, stg, prod)?

Or would it be more effective to have just dev and prod branches, with feature branches merging into dev?

Your guidance and recommendations would be greatly appreciated.

Thanks in advance!

[yashasam]

Option 1: Separate Branches for Each Environment (dev, qa, stg, prod)
Option 2: Dev and Prod Branches, with Feature Branches Merging into Dev

The second approach with feature branches merging into a dev branch and then into a prod branch is a better starting point. However, to make it effective for multiple environments, you'll need to use:
Directory-based separation: Organize your Terraform code with separate directories for each environment (e.g., environments/dev, environments/qa, environments/stg, environments/prod), suggests Scalr.
Terraform .tfvars files: Define environment-specific variables within the respective environment directories using .tfvars files. For example, environments/dev/dev.tfvars.

[github-actions[bot]]

🕒 Discussion Activity Reminder 🕒

This Discussion has been labeled as dormant by an automated system for having no activity in the last 60 days. Please consider one the following actions:

1️⃣ Close as Out of Date: If the topic is no longer relevant, close the Discussion as out of date at the bottom of the page.

2️⃣ Provide More Information: Share additional details or context — or let the community know if you've found a solution on your own.

3️⃣ Mark a Reply as Answer: If your question has been answered by a reply, mark the most helpful reply as the solution.

Note: This dormant notification will only apply to Discussions with the Question label. To learn more, see our recent announcement.

Thank you for helping bring this Discussion to a resolution! 💬