Add ability to target different organization names

Add ability for repo and gitops repo to be hosted in different organizations. This should allow for quite a few use cases, including having a client own a repository but Airnauts owning the gitops repositories

Author: amarbakir

deployment_pipeline/main.tf

@@ -484,11 +484,6 @@ resource "aws_codebuild_project" "deployment_gitops_push" {
       type  = "PLAINTEXT"
       value = var.github_user
     }
-    environment_variable {
-      name  = "GITHUB_ORG"
-      type  = "PLAINTEXT"
-      value = var.github_organization_name
-    }
     environment_variable {
       name  = "DEVOPS_WEBHOOK_URL"
       type  = "PLAINTEXT"
@@ -509,6 +504,11 @@ resource "aws_codebuild_project" "deployment_gitops_push" {
       type  = "PLAINTEXT"
       value = var.target_gitops_repository
     }
+    environment_variable {
+      name  = "GITOPS_REPOSITORY_ORGANIZATION"
+      type  = "PLAINTEXT"
+      value = coalesce(var.target_gitops_organization_name, var.github_organization_name)
+    }
   }
   source {
     type                = "CODEPIPELINE"
@@ -533,7 +533,7 @@ phases:
     - git config --global user.email '<>'
     - git config --global user.name $GITHUB_USER
     - echo "https://$GITHUB_USER:[email protected]" > ~/.git-credentials
-    - hub clone $GITHUB_ORG/$TARGET_GITOPS_REPOSITORY
+    - hub clone $GITOPS_REPOSITORY_ORGANIZATION/$TARGET_GITOPS_REPOSITORY
     - cd $TARGET_GITOPS_REPOSITORY
     - |
       export IMAGE_NAME=$(cat $CODEBUILD_SRC_DIR/build.json | jq .RepositoryUri | tr -d '"')
@@ -554,7 +554,7 @@ phases:
         git push origin master
 
         COMMIT_HASH=$(git log -n 1 --pretty=format:"%H")
-        COMMIT_URL=https://github.com/$GITHUB_ORG/$TARGET_GITOPS_REPOSITORY/commit/$COMMIT_HASH
+        COMMIT_URL=https://github.com/$GITOPS_REPOSITORY_ORGANIZATION/$TARGET_GITOPS_REPOSITORY/commit/$COMMIT_HASH
 
         curl -k -X POST -H "Content-type: application/json" --data "{\"text\":\"### Repository: *$TARGET_GITOPS_REPOSITORY* \n\n New image commited to kustomization/kustomization.yaml: *$IMAGE_NAME:$IMAGE_TAG* \n\n See commit: $COMMIT_URL\"}" $DEVOPS_WEBHOOK_URL
       else

deployment_pipeline/variables.tf

@@ -87,6 +87,12 @@ variable "enable_test_stage" {
   default = false
 }
 
+variable "target_gitops_organization_name" {
+  type = string
+  description = "Gitops organization hosting the target gitops repository. If not provided, defaults to github_organization_name"
+  default = ""
+}
+
 variable "target_gitops_repository" {
   type = string
   description = "Target gitops repository where the image tag update will be pushed (assumes existence of directory kustomization/kustomization.yaml"

main.tf

@@ -31,13 +31,14 @@ module "deployment_pipeline" {
   environment_variables            = var.pipelines[each.key].environment_variables
   secret_arns = var.pipelines[each.key].secret_arns
 
-  github_repository_name           = var.github_repository_name
-  github_user = var.github_user
-  github_organization_name         = var.github_repository_organization
-  github_repository_branch         = var.github_repository_branch
-  github_access_token              = var.github_access_token
+  github_repository_name          = var.github_repository_name
+  github_user                     = var.github_user
+  github_organization_name        = var.github_repository_organization
+  github_repository_branch        = var.github_repository_branch
+  github_access_token             = var.github_access_token
   github_access_token_secret_name = var.github_access_token_secret_name
-  target_gitops_repository = var.target_gitops_repository
+  target_gitops_repository        = var.target_gitops_repository
+  target_gitops_organization_name = var.target_gitops_organization_name
 
   devops_slack_webhook             = var.devops_slack_webhook
   devops_slack_channel_name        = var.devops_slack_channel_name

variables.tf

@@ -87,6 +87,12 @@ variable "cloudwatch_log_retention_in_days" {
   description = "CloudWatch log retention for /aws/lambda/* and cosmos-*-webhook-proxy-api-gateway"
 }
 
+variable "target_gitops_organization_name" {
+  type = string
+  description = "Gitops organization hosting the target gitops repository. If not provided, defaults to github_organization_name"
+  default = ""
+}
+
 variable "target_gitops_repository" {
   type = string
   description = "Target gitops repository where the image tag update will be pushed (assumes existence of directory kustomization/kustomization.yaml"