> ## Documentation Index
> Fetch the complete documentation index at: https://notes.kodekloud.com/llms.txt
> Use this file to discover all available pages before exploring further.
# Lab Solution Version Control Branching and Workspaces
> This guide explains integrating Terraform Cloud with GitHub for managing infrastructure across development, staging, and production environments.
In this guide, you’ll learn how to integrate Terraform Cloud with GitHub to manage infrastructure across **development**, **staging**, and **production** environments. You will:
1. Create `development` and `staging` branches in GitHub
2. Configure a shared Terraform Cloud variable set for AWS credentials
3. Point the development workspace to the `development` branch
4. Provision a staging workspace on the `staging` branch
5. Trigger and verify runs in each workspace
6. Create a production workspace on the `main` branch
7. Confirm all workspaces and their run statuses
* A Terraform Cloud organization and [Terraform CLI installed](https://developer.hashicorp.com/terraform/tutorials/aws-get-started/install-cli).
* A GitHub repository (`clumsy_bird`) containing your Terraform configurations.
***
## 1. Create Development and Staging Branches
Clone your GitHub repository, then create and push the feature branches:
```bash theme={null}
git clone https://github.com/your-org/clumsy_bird.git
cd clumsy_bird
git checkout -b development
git push -u origin development
git checkout main
git checkout -b staging
git push -u origin staging
```
Alternatively, use the GitHub UI to add the `development` and `staging` branches.
***
## 2. Configure a Terraform Cloud Variable Set
In Terraform Cloud, navigate to **Organization Settings → Variable Sets** and create or verify a set containing:
| Variable Name | Category | Description |
| ----------------------- | -------------------- | ------------------- |
| `AWS_ACCESS_KEY_ID` | Environment Variable | Your AWS access key |
| `AWS_SECRET_ACCESS_KEY` | Environment Variable | Your AWS secret key |
This centralizes AWS credentials for all workspaces in your organization.
Never commit AWS credentials to Git. Always use Terraform Cloud variable sets or [Vault](https://www.vaultproject.io/) for secret management.
***
## 3. Update the Development Workspace
1. Open the **devops-aws-myapp-dev** workspace in Terraform Cloud.
2. Go to **Settings → Version Control**.
3. Change **VCS Branch** to `development` and **Save**.
Terraform Cloud will automatically queue and apply a run on the `development` branch:
***
## 4. Create the Staging Workspace
1. In Terraform Cloud, select **Workspaces → New Workspace**.
2. Choose **Version Control Workflow** and connect to `gmaentz/clumsy_bird`.
3. Configure the workspace:
| Setting | Value |
| --------------------------- | ------------------------ |
| Name | devops-aws-myapp-staging |
| VCS Branch | staging |
| Auto Apply | Enabled |
| Automatic Speculative Plans | Enabled |
4. (Optional) Add Terraform variables for environment context:
```hcl theme={null}
prefix = "clumsy"
project = "Clumsy Bird"
environment = "staging"
```
Save and monitor the initial plan/apply run.
***
## 5. Trigger Manual Runs
To validate both environments:
* **Development**: Open **devops-aws-myapp-dev** and click **Start new run**.
* **Staging**: Open **devops-aws-myapp-staging** and click **Start new run**.
Auto Apply simplifies continuous delivery, but manual runs offer more control for production-critical changes.
***
## 6. Create the Production Workspace
Repeat the workspace creation steps for production:
| Setting | Value |
| ------------------- | ------------------------------ |
| Name | devops-aws-myapp-prod |
| VCS Branch | main |
| Auto Apply | Enabled (or Manual per policy) |
| Always Trigger Runs | Enabled |
1. **Workspaces → New Workspace → Version Control**
2. Select `gmaentz/clumsy_bird` and set **VCS Branch** to `main`.
3. Add the same Terraform variables (`prefix`, `project`, `environment = "production"`).
Save the workspace to kick off the initial production run.
***
## 7. Verify All Workspaces
Head to **Workspaces** overview. You should see all three environments configured:
| Workspace Name | Branch | Status |
| ------------------------ | ----------- | ----------------- |
| devops-aws-myapp-dev | development | Applied |
| devops-aws-myapp-staging | staging | Applied |
| devops-aws-myapp-prod | main | Pending / Applied |
Congratulations! You’ve successfully implemented version control branching strategies and workspace management in Terraform Cloud. Next, explore GitOps-native workflows with Terraform Enterprise or integrate policy as code using Sentinel.
***
## References
* [Terraform Cloud Version Control Workflow](https://developer.hashicorp.com/terraform/cloud-docs/workspaces/vcs)
* [Git Branching Strategies](https://www.atlassian.com/git/tutorials/using-branches)
* [Managing Variables in Terraform Cloud](https://developer.hashicorp.com/terraform/cloud-docs/variables)