Renamed gitlab-permissions module to gitlab-authorization

Makefile

@@ -60,7 +60,7 @@ tf/state/renovate-runners:
 	cd live/${ENV}/renovate-runners && terragrunt state show github_repository.repository
 
 tf/init/github-automerge:
-	cd live/${ENV}/github-automerge && terragrunt run-all --terragrunt-non-interactive init
+	cd live/${ENV}/github-automerge && terragrunt run-all --terragrunt-non-interactive init -upgrade
 
 tf/plan/github-automerge:
 	cd live/${ENV}/github-automerge && terragrunt run-all --terragrunt-non-interactive plan

live/ci/gitlab-permissions/terragrunt.hcl → live/ci/gitlab-authorization/terragrunt.hcl

@@ -1,9 +1,5 @@
 terraform {
-  source = "../../../modules//gitlab-permissions"
-  extra_arguments "var-file" {
-    commands  = ["apply", "plan"]
-    arguments = ["-var-file=ci.tfvars"]
-  }
+  source = "../../../modules//gitlab-authorization"
 }
 
 include "root" {

live/dev/gitlab-permissions/terragrunt.hcl → live/dev/gitlab-authorization/terragrunt.hcl

@@ -1,9 +1,5 @@
 terraform {
-  source = "../../../modules//gitlab-permissions"
-  extra_arguments "var-file" {
-    commands  = ["apply", "plan"]
-    arguments = ["-var-file=dev.tfvars"]
-  }
+  source = "../../../modules//gitlab-authorization"
 }
 
 include "root" {

live/prod/gitlab-permissions/terragrunt.hcl → live/prod/gitlab-authorization/terragrunt.hcl

@@ -1,9 +1,5 @@
 terraform {
-  source = "../../../modules//gitlab-permissions"
-  extra_arguments "var-file" {
-    commands  = ["apply", "plan"]
-    arguments = ["-var-file=prod.tfvars"]
-  }
+  source = "../../../modules//gitlab-authorization"
 }
 
 include "root" {

modules/gitlab-permissions/main.tf → modules/gitlab-authorization/main.tf

@@ -1,9 +1,3 @@
-resource "gitlab_user" "bot_user" {
-  name     = var.gitlab_bot_user_name
-  username = var.gitlab_bot_user_username
-  email    = var.gitlab_bot_user_email
-}
-
 resource "gitlab_group" "top_level_group" {
   name = var.top_level_group_name
   path = var.top_level_group_path
@@ -19,6 +13,6 @@ resource "gitlab_group_ldap_link" "developers_group" {
 resource "gitlab_group_ldap_link" "owners_group" {
   group         = gitlab_group.top_level_group.id
   cn            = var.ldap_owners_group
-  group_access  = "developer"
+  group_access  = "owner"
   ldap_provider = "ldapmain"
 }

modules/gitlab-permissions/variables.tf → modules/gitlab-authorization/variables.tf

@@ -37,27 +37,3 @@ variable "ldap_owners_group" {
   description = "LDAP owners group"
   sensitive   = true
 }
-
-variable "gitlab_bot_user_id" {
-  type        = number
-  description = "GitLab bot user id"
-  sensitive   = true
-}
-
-variable "gitlab_bot_user_name" {
-  type        = string
-  description = "GitLab bot user name"
-  sensitive   = true
-}
-
-variable "gitlab_bot_user_username" {
-  type        = string
-  description = "GitLab bot user username"
-  sensitive   = true
-}
-
-variable "gitlab_bot_user_email" {
-  type        = string
-  description = "GitLab bot user email"
-  sensitive   = true
-}