Skip to content

Add branch tagging #23

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
merged 1 commit into from
Jun 27, 2025
Merged

Add branch tagging #23

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
2 changes: 1 addition & 1 deletion .github/workflows/pull-request-ephemeral-deploy.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Deploy Sandbox Environment
name: Deploy Ephemeral Sandbox Environment

on:
pull_request:
Expand Down
9 changes: 8 additions & 1 deletion terragrunt.hcl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ locals {
dynamodb_table = "${local.name_dash}-${local.region}-${local.name_hash}-tflocks"
repo_name = basename(abspath("${get_path_to_repo_root()}"))
state_filename_ephemeral = "${local.account_name}/${coalesce(local.git_branch, local.current_user)}/${local.environment_instance}/terraform.tfstate"
state_filename_persist = "${local.account_name}/${coalesce(local.git_branch, local.current_user)}/${local.environment_instance}/terraform.tfstate"
state_filename_persist = "${local.account_name}/${local.environment_instance}/terraform.tfstate"
}

# Generate the AWS provider settings
Expand All @@ -34,6 +34,7 @@ provider "aws" {
tags = {
Organization = var.organization_tag
Repository = coalesce(var.repository_tag, "${basename(abspath(dirname(find_in_parent_folders("terragrunt.hcl"))))}")
Branch = var.branch_tag
CommitHash = var.commit_hash_tag
}
}
Expand All @@ -47,6 +48,7 @@ provider "aws" {
tags = {
Organization = var.organization_tag
Repository = coalesce(var.repository_tag, "${basename(abspath(dirname(find_in_parent_folders("terragrunt.hcl"))))}")
Branch = var.branch_tag
CommitHash = var.commit_hash_tag
}
}
Expand All @@ -62,6 +64,11 @@ variable "repository_tag" {
default = ""
}

variable "branch_tag" {
type = string
default = "RUN OUTSIDE PIPELINE"
}

variable "commit_hash_tag" {
type = string
default = "RUN OUTSIDE PIPELINE"
Expand Down
Loading