From 888fc3be2a0976d79e31f67e765aa38dc64d29c1 Mon Sep 17 00:00:00 2001 From: Daniel M Date: Mon, 2 Sep 2024 15:15:54 -0600 Subject: [PATCH 1/8] fix: remove playground2 --- terraform/production/repositories.tfvars | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/terraform/production/repositories.tfvars b/terraform/production/repositories.tfvars index f74cf4b..f6bd92f 100644 --- a/terraform/production/repositories.tfvars +++ b/terraform/production/repositories.tfvars @@ -77,14 +77,4 @@ repositories = { members = [] } - - "playground2" = { - description = "Tests" - - admins = [ - "cunla", - ] - committers = [] - members = [] - } } From 708c4b87b295f26f6b63ee13d85cb310a554dcd8 Mon Sep 17 00:00:00 2001 From: Daniel M Date: Mon, 2 Sep 2024 15:23:43 -0600 Subject: [PATCH 2/8] fix: remove playground2 --- terraform/variables.tf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/terraform/variables.tf b/terraform/variables.tf index 00cd00b..790d223 100644 --- a/terraform/variables.tf +++ b/terraform/variables.tf @@ -46,8 +46,8 @@ variable "repositories" { members = optional(set(string), []) # Members of the repository team. Have triage permissions # The following are valid combinations for the merge commit title and message: PR_TITLE and PR_BODY, PR_TITLE and BLANK, MERGE_MESAGE and PR_TITLE. (invalid_merge_commit_setting_combo)}] - merge_commit_title = optional(string, "PR_TITLE") - merge_commit_message = optional(string, "PR_BODY") + merge_commit_title = optional(string, "MERGE_MESSAGE") + merge_commit_message = optional(string, "PR_TITLE") squash_merge_commit_title = optional(string, "PR_TITLE") squash_merge_commit_message = optional(string, "PR_BODY") })) From 4e96011afd7f8af68972922a4259eafaa557a571 Mon Sep 17 00:00:00 2001 From: Daniel M Date: Mon, 2 Sep 2024 15:24:40 -0600 Subject: [PATCH 3/8] fix: remove playground2 --- terraform/production/repositories.tfvars | 2 ++ 1 file changed, 2 insertions(+) diff --git a/terraform/production/repositories.tfvars b/terraform/production/repositories.tfvars index f6bd92f..33c34e0 100644 --- a/terraform/production/repositories.tfvars +++ b/terraform/production/repositories.tfvars @@ -69,6 +69,8 @@ repositories = { allow_merge_commit = false allow_rebase_merge = true has_projects = false + merge_commit_message = "BLANK" + admins = [ "pfouque", "natim", From a5d59c7f2dd935bd50c8c5662c4523ebfd5d3ed9 Mon Sep 17 00:00:00 2001 From: cunla Date: Mon, 2 Sep 2024 21:25:12 +0000 Subject: [PATCH 4/8] [AUTO]Format code Files changed: M terraform/production/repositories.tfvars --- terraform/production/repositories.tfvars | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/terraform/production/repositories.tfvars b/terraform/production/repositories.tfvars index 33c34e0..4f93623 100644 --- a/terraform/production/repositories.tfvars +++ b/terraform/production/repositories.tfvars @@ -64,11 +64,11 @@ repositories = { } "django-fsm-2" = { - description = "Django friendly finite state machine support" - homepage_url = "https://github.com/django-commons/django-fsm-2" - allow_merge_commit = false - allow_rebase_merge = true - has_projects = false + description = "Django friendly finite state machine support" + homepage_url = "https://github.com/django-commons/django-fsm-2" + allow_merge_commit = false + allow_rebase_merge = true + has_projects = false merge_commit_message = "BLANK" admins = [ From 6ae7b888ecd30adf552a16d3982dc84b86b3d7fc Mon Sep 17 00:00:00 2001 From: Daniel M Date: Mon, 2 Sep 2024 15:33:56 -0600 Subject: [PATCH 5/8] fix: remove playground2 --- terraform/resources-repos.tf | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/terraform/resources-repos.tf b/terraform/resources-repos.tf index e9c8afc..480cd79 100644 --- a/terraform/resources-repos.tf +++ b/terraform/resources-repos.tf @@ -15,12 +15,12 @@ resource "github_repository" "this" { homepage_url = each.value.homepage_url allow_auto_merge = each.value.allow_auto_merge allow_merge_commit = each.value.allow_merge_commit - merge_commit_title = each.value.merge_commit_title - merge_commit_message = each.value.merge_commit_message + merge_commit_title = each.value.allow_merge_commit ? each.value.merge_commit_title : null + merge_commit_message = each.value.allow_merge_commit ? each.value.merge_commit_message : null allow_rebase_merge = each.value.allow_rebase_merge allow_squash_merge = each.value.allow_squash_merge - squash_merge_commit_title = each.value.squash_merge_commit_title - squash_merge_commit_message = each.value.squash_merge_commit_message + squash_merge_commit_title = each.value.allow_squash_merge ? each.value.squash_merge_commit_title : null + squash_merge_commit_message = each.value.allow_squash_merge ? each.value.squash_merge_commit_message : null allow_update_branch = each.value.allow_update_branch archive_on_destroy = true delete_branch_on_merge = each.value.delete_branch_on_merge From 420b0b4181fc5f9c2267722e91e5536ea710088f Mon Sep 17 00:00:00 2001 From: Daniel M Date: Mon, 2 Sep 2024 15:37:15 -0600 Subject: [PATCH 6/8] fix: remove playground2 --- terraform/production/repositories.tfvars | 1 - 1 file changed, 1 deletion(-) diff --git a/terraform/production/repositories.tfvars b/terraform/production/repositories.tfvars index 4f93623..fec05eb 100644 --- a/terraform/production/repositories.tfvars +++ b/terraform/production/repositories.tfvars @@ -69,7 +69,6 @@ repositories = { allow_merge_commit = false allow_rebase_merge = true has_projects = false - merge_commit_message = "BLANK" admins = [ "pfouque", From 1f45808f41976e4988b1c95601f663bf55a03123 Mon Sep 17 00:00:00 2001 From: cunla Date: Mon, 2 Sep 2024 21:37:49 +0000 Subject: [PATCH 7/8] [AUTO]Format code Files changed: M terraform/production/repositories.tfvars --- terraform/production/repositories.tfvars | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/terraform/production/repositories.tfvars b/terraform/production/repositories.tfvars index fec05eb..6c1d289 100644 --- a/terraform/production/repositories.tfvars +++ b/terraform/production/repositories.tfvars @@ -64,11 +64,11 @@ repositories = { } "django-fsm-2" = { - description = "Django friendly finite state machine support" - homepage_url = "https://github.com/django-commons/django-fsm-2" - allow_merge_commit = false - allow_rebase_merge = true - has_projects = false + description = "Django friendly finite state machine support" + homepage_url = "https://github.com/django-commons/django-fsm-2" + allow_merge_commit = false + allow_rebase_merge = true + has_projects = false admins = [ "pfouque", From 56968fed5cffe9fb0a21eb48f65ff69f35077d39 Mon Sep 17 00:00:00 2001 From: Daniel M Date: Mon, 2 Sep 2024 15:38:48 -0600 Subject: [PATCH 8/8] fix: remove playground2 --- terraform/variables.tf | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/terraform/variables.tf b/terraform/variables.tf index 790d223..b05c444 100644 --- a/terraform/variables.tf +++ b/terraform/variables.tf @@ -46,10 +46,10 @@ variable "repositories" { members = optional(set(string), []) # Members of the repository team. Have triage permissions # The following are valid combinations for the merge commit title and message: PR_TITLE and PR_BODY, PR_TITLE and BLANK, MERGE_MESAGE and PR_TITLE. (invalid_merge_commit_setting_combo)}] - merge_commit_title = optional(string, "MERGE_MESSAGE") - merge_commit_message = optional(string, "PR_TITLE") - squash_merge_commit_title = optional(string, "PR_TITLE") - squash_merge_commit_message = optional(string, "PR_BODY") + merge_commit_title = optional(string, null) + merge_commit_message = optional(string, null) + squash_merge_commit_title = optional(string, null) + squash_merge_commit_message = optional(string, null) })) }