Skip to content

Allow overwriting challenge branch on a per-challenge basis #32

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

Draft
The0mikkel wants to merge 1 commit into
base: develop
Choose a base branch
from
Draft

Allow overwriting challenge branch on a per-challenge basis #32

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
17 changes: 11 additions & 6 deletions challenges/challenge/challenge.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ variable "category" {
}

variable "identifier" {
description = "The identifier of the challenge"
description = "The identifier of the challenge. The identifier may contain the revision in the format of `<identifier>:<revision>`. If the revision is not specified, the variable provided revision will be used."
}

variable "path" {
Expand Down Expand Up @@ -54,26 +54,31 @@ variable "helm" {
default = null
}

locals {
revision = strcontains(var.identifier, ":") ? split(":", var.identifier)[1] : var.revision
identifier = strcontains(var.identifier, ":") ? split(":", var.identifier)[0] : var.identifier
}

module "argocd-challenge" {
source = "../../tf-modules/argocd/application"

count = var.enabled ? 1 : 0

argocd_namespace = var.argocd_namespace
application_namespace = var.challenge_namespace
application_name = var.application_name != null ? var.application_name : "${var.category}-${var.identifier}"
application_name = var.application_name != null ? var.application_name : "${var.category}-${local.identifier}"
application_repo_url = var.application_repo_url
application_repo_path = var.path != null ? var.path : "challenges/${var.category}/${var.identifier}/k8s/challenge"
application_repo_revision = var.revision
application_repo_path = var.path != null ? var.path : "challenges/${var.category}/${local.identifier}/k8s/challenge"
application_repo_revision = local.revision
application_project = var.argocd_project
helm = var.helm

argocd_labels = {
"part-of" = "ctfpilot"
"component" = "challenge"
"version" = replace(var.revision, "/", "-")
"version" = replace(local.revision, "/", "-")
"category" = var.category
"instance" = var.identifier
"instance" = local.identifier
}
}

17 changes: 11 additions & 6 deletions challenges/config/config.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ variable "category" {
}

variable "identifier" {
description = "The identifier of the challenge"
description = "The identifier of the challenge. The identifier may contain the revision in the format of `<identifier>:<revision>`. If the revision is not specified, the variable provided revision will be used."
}

variable "path" {
Expand Down Expand Up @@ -48,23 +48,28 @@ variable "helm" {
default = null
}

locals {
revision = strcontains(var.identifier, ":") ? split(":", var.identifier)[1] : var.revision
identifier = strcontains(var.identifier, ":") ? split(":", var.identifier)[0] : var.identifier
}

module "argocd-challenge-config" {
source = "../../tf-modules/argocd/application"

argocd_namespace = var.argocd_namespace
application_namespace = var.config_namespace
application_name = var.application_name != null ? "${var.application_name}-config" : "${var.category}-${var.identifier}-config"
application_name = var.application_name != null ? "${var.application_name}-config" : "${var.category}-${local.identifier}-config"
application_repo_url = var.application_repo_url
application_repo_path = var.path != null ? var.path : "challenges/${var.category}/${var.identifier}/k8s/config"
application_repo_revision = var.revision
application_repo_path = var.path != null ? var.path : "challenges/${var.category}/${local.identifier}/k8s/config"
application_repo_revision = local.revision
application_project = var.argocd_project
helm = var.helm

argocd_labels = {
"part-of" = "ctfpilot"
"component" = "challenge-config"
"version" = replace(var.revision, "/", "-")
"version" = replace(local.revision, "/", "-")
"category" = var.category
"instance" = var.identifier
"instance" = local.identifier
}
}
6 changes: 3 additions & 3 deletions challenges/tfvars/template.tfvars
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,13 +43,13 @@ chall_whitelist_ips = ["<ip1>", "<ip2>"] # List of IPs to whitelist for challeng

challenges_static = {
"<category>" = ["<challenge_slug1>", "<challenge_slug2>"],
} # List of static challenges to deploy. Needs to be the slugs of the challenges
} # List of static challenges to deploy. Needs to be the slugs of the challenges, in the format `{ \"<category>\" = [\"<challenge_slug1>\", \"<challenge_slug2>\"] }`. Challenge slug may be defined as `<challenge_slug>:<branch>` to deploy a specific branch of the challenge. If no branch is specified, the default branch will be used.
challenges_shared = {
"<category>" = ["<challenge_slug1>", "<challenge_slug2>"],
} # List of shared challenges to deploy. Needs to be the slugs of the challenges
} # List of shared challenges to deploy. Needs to be the slugs of the challenges, in the format `{ \"<category>\" = [\"<challenge_slug1>\", \"<challenge_slug2>\"] }`. Challenge slug may be defined as `<challenge_slug>:<branch>` to deploy a specific branch of the challenge. If no branch is specified, the default branch will be used.
challenges_instanced = {
"<category>" = ["<challenge_slug1>", "<challenge_slug2>"],
} # List of instanced challenges to deploy. Needs to be the slugs of the challenges
} # List of instanced challenges to deploy. Needs to be the slugs of the challenges, in the format `{ \"<category>\" = [\"<challenge_slug1>\", \"<challenge_slug2>\"] }`. Challenge slug may be defined as `<challenge_slug>:<branch>` to deploy a specific branch of the challenge. If no branch is specified, the default branch will be used.

challenges_repository = "<url>" # URL of the Git repository containing the challenge definitions
challenges_branch = "<branch>" # Branch of the Git repository to use for the challenge definitions. Leave empty for environment based branch (environment == prod ? main : develop)
Expand Down
6 changes: 3 additions & 3 deletions challenges/variables.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,19 +91,19 @@ variable "chall_whitelist_ips" {

variable "challenges_static" {
type = map(list(string))
description = "List of static challenges to deploy. In the format { \"<category>\" = [\"<challenge_slug1>\", \"<challenge_slug2>\"] }"
description = "List of static challenges to deploy. In the format `{ \"<category>\" = [\"<challenge_slug1>\", \"<challenge_slug2>\"] }`. Challenge slug may be defined as `<challenge_slug>:<branch>` to deploy a specific branch of the challenge. If no branch is specified, the default branch will be used."
default = {}
}

variable "challenges_shared" {
type = map(list(string))
description = "List of shared challenges to deploy. In the format { \"<category>\" = [\"<challenge_slug1>\", \"<challenge_slug2>\"] }"
description = "List of shared challenges to deploy. In the format `{ \"<category>\" = [\"<challenge_slug1>\", \"<challenge_slug2>\"] }`. Challenge slug may be defined as `<challenge_slug>:<branch>` to deploy a specific branch of the challenge. If no branch is specified, the default branch will be used."
default = {}
}

variable "challenges_instanced" {
type = map(list(string))
description = "List of instanced challenges to deploy. In the format { \"<category>\" = [\"<challenge_slug1>\", \"<challenge_slug2>\"] }"
description = "List of instanced challenges to deploy. In the format `{ \"<category>\" = [\"<challenge_slug1>\", \"<challenge_slug2>\"] }`. Challenge slug may be defined as `<challenge_slug>:<branch>` to deploy a specific branch of the challenge. If no branch is specified, the default branch will be used."
default = {}
}

Expand Down
6 changes: 3 additions & 3 deletions template.automated.tfvars
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -264,13 +264,13 @@ chall_whitelist_ips = ["<ip1>", "<ip2>"] # List of IPs to whitelist for challeng

challenges_static = {
"<category>" = ["<challenge_slug1>", "<challenge_slug2>"],
} # List of static challenges to deploy. Needs to be the slugs of the challenges
} # List of static challenges to deploy. Needs to be the slugs of the challenges, in the format `{ \"<category>\" = [\"<challenge_slug1>\", \"<challenge_slug2>\"] }`. Challenge slug may be defined as `<challenge_slug>:<branch>` to deploy a specific branch of the challenge. If no branch is specified, the default branch will be used.
challenges_shared = {
"<category>" = ["<challenge_slug1>", "<challenge_slug2>"],
} # List of shared challenges to deploy. Needs to be the slugs of the challenges
} # List of shared challenges to deploy. Needs to be the slugs of the challenges, in the format `{ \"<category>\" = [\"<challenge_slug1>\", \"<challenge_slug2>\"] }`. Challenge slug may be defined as `<challenge_slug>:<branch>` to deploy a specific branch of the challenge. If no branch is specified, the default branch will be used.
challenges_instanced = {
"<category>" = ["<challenge_slug1>", "<challenge_slug2>"],
} # List of instanced challenges to deploy. Needs to be the slugs of the challenges
} # List of instanced challenges to deploy. Needs to be the slugs of the challenges, in the format `{ \"<category>\" = [\"<challenge_slug1>\", \"<challenge_slug2>\"] }`. Challenge slug may be defined as `<challenge_slug>:<branch>` to deploy a specific branch of the challenge. If no branch is specified, the default branch will be used.

challenges_repository = "https://github.com/<repo>" # URL of the Git repository containing the challenge definitions
challenges_branch = "" # Branch of the Git repository to use for the challenge definitions. Leave empty for environment based branch (environment == prod ? main : develop)
Expand Down
Loading