فهرست منبع

Upgrades TF Providers plugins - Vault & Github Integrations

- Upgrades Vault / Github Integrations TF Provider code version
- Updates syntax for Github Integrations due to deprecations: 'organization' syntax is deprecated; use 'owner' or a variable
- Updates Sensu / Vault / Integrations / AWS TF providers syntax / alignment eye-candy too
- Updates tag
Jeremy Cooper [AFS MBP] 3 سال پیش
والد
کامیت
2f16036948
27فایلهای تغییر یافته به همراه228 افزوده شده و 228 حذف شده
  1. 8 8
      000-skeleton/360-codebuild-splunk-apps/terragrunt.hcl
  2. 19 19
      common/aws-us-gov/afs-mdr-common-services-gov/075-codebuild-ecr-base/terragrunt.hcl
  3. 5 5
      common/aws-us-gov/afs-mdr-common-services-gov/080-codebuild-ecr-sample/terragrunt.hcl
  4. 4 4
      common/aws-us-gov/afs-mdr-common-services-gov/081-codebuild-rpm-collectd/terragrunt.hcl
  5. 10 10
      common/aws-us-gov/afs-mdr-common-services-gov/085-codebuild-ecr-customer-portal/terragrunt.hcl
  6. 4 4
      common/aws-us-gov/afs-mdr-common-services-gov/090-codebuild-rpm-tmux/terragrunt.hcl
  7. 4 4
      common/aws-us-gov/afs-mdr-common-services-gov/095-codebuild-rpm-aws-efs-utils/terragrunt.hcl
  8. 4 4
      common/aws-us-gov/afs-mdr-common-services-gov/100-codebuild-rpm-syslog-ng/terragrunt.hcl
  9. 4 4
      common/aws-us-gov/afs-mdr-common-services-gov/105-codebuild-ecr-mcas-container/terragrunt.hcl
  10. 9 9
      common/aws-us-gov/afs-mdr-common-services-gov/350-codebuild-ecr-content-generator-build-image/terragrunt.hcl
  11. 8 8
      common/aws-us-gov/afs-mdr-common-services-gov/351-codebuild-splunk-uf-configs/terragrunt.hcl
  12. 18 18
      common/aws-us-gov/afs-mdr-common-services-gov/355-codebuild-xdr-base-image/terragrunt.hcl
  13. 9 9
      prod/aws-us-gov/mdr-prod-afs/360-codebuild-splunk-apps/terragrunt.hcl
  14. 9 9
      prod/aws-us-gov/mdr-prod-bas/360-codebuild-splunk-apps/terragrunt.hcl
  15. 9 9
      prod/aws-us-gov/mdr-prod-c2/360-codebuild-splunk-apps/terragrunt.hcl
  16. 9 9
      prod/aws-us-gov/mdr-prod-c2/380-codebuild-portal-lambda/terragrunt.hcl
  17. 9 9
      prod/aws-us-gov/mdr-prod-ca-c19/360-codebuild-splunk-apps/terragrunt.hcl
  18. 9 9
      prod/aws-us-gov/mdr-prod-dc-c19/360-codebuild-splunk-apps/terragrunt.hcl
  19. 9 9
      prod/aws-us-gov/mdr-prod-dgi/360-codebuild-splunk-apps/terragrunt.hcl
  20. 9 9
      prod/aws-us-gov/mdr-prod-frtib/360-codebuild-splunk-apps/terragrunt.hcl
  21. 9 9
      prod/aws-us-gov/mdr-prod-la-c19/360-codebuild-splunk-apps/terragrunt.hcl
  22. 9 9
      prod/aws-us-gov/mdr-prod-nga/360-codebuild-splunk-apps/terragrunt.hcl
  23. 6 6
      terragrunt.hcl
  24. 8 8
      test/aws-us-gov/mdr-test-c2/096-sensu-configuration/terragrunt.hcl
  25. 9 9
      test/aws-us-gov/mdr-test-c2/360-codebuild-splunk-apps/terragrunt.hcl
  26. 9 9
      test/aws-us-gov/mdr-test-c2/380-codebuild-portal-lambda/terragrunt.hcl
  27. 9 9
      test/aws-us-gov/mdr-test-modelclient/360-codebuild-splunk-apps/terragrunt.hcl

+ 8 - 8
000-skeleton/360-codebuild-splunk-apps/terragrunt.hcl

@@ -24,19 +24,19 @@ generate "required_providers" {
 terraform {
   required_providers {
     aws = {
-      source = "hashicorp/aws"
-      version = "= 4.4.0" # 2022-03-08: upgrade from 3.63.0; 2021-09-21: upgrade from 3.37.0
+      source  = "hashicorp/aws"
+      version = "4.4.0" # 2022-03-08: upgrade from 3.63.0; 2021-09-21: upgrade from 3.37.0
     }
     vault = {
-      source = "hashicorp/vault"
-      version = "= 2.19.1" # 2021-04-29: upgrade from 2.18.0
+      source  = "hashicorp/vault"
+      version = "3.4.1" # 2022-04-08: upgrade from 2.19.1; 2021-04-29: upgrade from 2.18.0
     }
     sensu = {
-      source = "jtopjian/sensu"
-      version = "= 0.12.1" # 2022-04-06: upgrade from 0.10.5
+      source  = "jtopjian/sensu"
+      version = "0.12.1" # 2022-04-06: upgrade from 0.10.5
     }
     github = {
-      source = "integrations/github"
+      source  = "integrations/github"
       version = "~> 4.0" # 2022-04-06: upgrade from 4.2.0
     }
   }
@@ -49,7 +49,7 @@ generate "github-provider" {
   if_exists = "overwrite_terragrunt"
   contents  = <<EOF
 provider "github" {
-  organization = "content-delivery"
+  owner        = "content-delivery"
   base_url     = "https://github.xdr.accenturefederalcyber.com/"
 }
 EOF

+ 19 - 19
common/aws-us-gov/afs-mdr-common-services-gov/075-codebuild-ecr-base/terragrunt.hcl

@@ -9,6 +9,18 @@ locals {
   global_vars = read_terragrunt_config(find_in_parent_folders("globals.hcl"))
 }
 
+# Terragrunt will copy the Terraform configurations specified by the source parameter, along with any files in the
+# working directory, into a temporary folder, and execute your Terraform commands in that folder.
+terraform {
+  # Double slash is intentional and required to show root of modules
+  source = "git@github.xdr.accenturefederalcyber.com:mdr-engineering/xdr-terraform-modules.git//base/codebuild_ecr_base?ref=v4.1.5"
+}
+
+# Include all settings from the root terragrunt.hcl file
+include {
+  path = find_in_parent_folders()
+}
+
 #Github specific provider
 generate "required_providers" {
   path      = "required_provider.tf"
@@ -17,19 +29,19 @@ generate "required_providers" {
 terraform {
   required_providers {
     aws = {
-      source = "hashicorp/aws"
-      version = "= 4.4.0" # 2022-03-08: upgrade from 3.63.0; 2021-09-21: upgrade from 3.37.0
+      source  = "hashicorp/aws"
+      version = "4.4.0" # 2022-03-08: upgrade from 3.63.0; 2021-09-21: upgrade from 3.37.0
     }
     vault = {
-      source = "hashicorp/vault"
-      version = "= 2.19.1" # 2021-04-29: upgrade from 2.18.0
+      source  = "hashicorp/vault"
+      version = "3.4.1" # 2022-04-08: upgrade from 2.19.1; 2021-04-29: upgrade from 2.18.0
     }
     sensu = {
-      source = "jtopjian/sensu"
-      version = "= 0.12.1" # 2022-04-06: upgrade from 0.10.5
+      source  = "jtopjian/sensu"
+      version = "0.12.1" # 2022-04-06: upgrade from 0.10.5
     }
     github = {
-      source = "integrations/github"
+      source  = "integrations/github"
       version = "~> 4.0" # 2022-04-06: upgrade from 4.2.0
     }
   }
@@ -37,18 +49,6 @@ terraform {
 EOF
 }
 
-# Terragrunt will copy the Terraform configurations specified by the source parameter, along with any files in the
-# working directory, into a temporary folder, and execute your Terraform commands in that folder.
-terraform {
-  # Double slash is intentional and required to show root of modules
-  source = "git@github.xdr.accenturefederalcyber.com:mdr-engineering/xdr-terraform-modules.git//base/codebuild_ecr_base?ref=v4.1.4"
-}
-
-# Include all settings from the root terragrunt.hcl file
-include {
-  path = find_in_parent_folders()
-}
-
 # These are the variables we have to pass in to use the module specified in the terragrunt source above
 inputs = {
   # All of the inputs from the inherited hcl files are available automatically

+ 5 - 5
common/aws-us-gov/afs-mdr-common-services-gov/080-codebuild-ecr-sample/terragrunt.hcl

@@ -13,7 +13,7 @@ locals {
 # working directory, into a temporary folder, and execute your Terraform commands in that folder.
 terraform {
   # Double slash is intentional and required to show root of modules
-  source = "git@github.xdr.accenturefederalcyber.com:mdr-engineering/xdr-terraform-modules.git//base/codebuild_ecr_project?ref=v3.5.16"
+  source = "git@github.xdr.accenturefederalcyber.com:mdr-engineering/xdr-terraform-modules.git//base/codebuild_ecr_project?ref=v4.1.5"
 }
 
 dependency "codebuild-ecr-base" {
@@ -27,20 +27,20 @@ generate "github-provider" {
   contents  = <<EOF
 terraform {
   required_providers {
-    github = {
-      source = "integrations/github"
+    github  = {
+      source  = "integrations/github"
       version = "~> 4.0" # 2022-04-06: upgrade from 4.2.0
     }
   }
 }
 #Provider block for Github engineering. 
 provider "github" {
-  organization = "mdr-engineering"
+  owner        = "mdr-engineering"
   base_url     = "https://github.xdr.accenturefederalcyber.com/"
 }
 #Provider block for Github MDR Content. 
 #provider "github" {
-#  organization = "MDR-Content"
+#  owner        = "MDR-Content"
 #  base_url     = "https://github.xdr.accenturefederalcyber.com/"
 #}
 EOF

+ 4 - 4
common/aws-us-gov/afs-mdr-common-services-gov/081-codebuild-rpm-collectd/terragrunt.hcl

@@ -13,7 +13,7 @@ locals {
 # working directory, into a temporary folder, and execute your Terraform commands in that folder.
 terraform {
   # Double slash is intentional and required to show root of modules
-  source = "git@github.xdr.accenturefederalcyber.com:mdr-engineering/xdr-terraform-modules.git//base/codebuild_artifact?ref=v3.5.16"
+  source = "git@github.xdr.accenturefederalcyber.com:mdr-engineering/xdr-terraform-modules.git//base/codebuild_artifact?ref=v4.1.5"
 }
 
 dependency "codebuild-ecr-base" {
@@ -28,19 +28,19 @@ generate "github-provider" {
 terraform {
   required_providers {
     github = {
-      source = "integrations/github"
+      source  = "integrations/github"
       version = "~> 4.0" # 2022-04-06: upgrade from 4.2.0
     }
   }
 }
 #Provider block for Github engineering. 
 provider "github" {
-  organization = "mdr-engineering"
+  owner        = "mdr-engineering"
   base_url     = "https://github.xdr.accenturefederalcyber.com/"
 }
 #Provider block for Github MDR Content. 
 #provider "github" {
-#  organization = "MDR-Content"
+#  owner        = "MDR-Content"
 #  base_url     = "https://github.xdr.accenturefederalcyber.com/"
 #}
 EOF

+ 10 - 10
common/aws-us-gov/afs-mdr-common-services-gov/085-codebuild-ecr-customer-portal/terragrunt.hcl

@@ -13,7 +13,7 @@ locals {
 # working directory, into a temporary folder, and execute your Terraform commands in that folder.
 terraform {
   # Double slash is intentional and required to show root of modules
-  source = "git@github.xdr.accenturefederalcyber.com:mdr-engineering/xdr-terraform-modules.git//base/codebuild_ecr_customer_portal?ref=v4.1.4"
+  source = "git@github.xdr.accenturefederalcyber.com:mdr-engineering/xdr-terraform-modules.git//base/codebuild_ecr_customer_portal?ref=v4.1.5"
 }
 
 dependency "codebuild-ecr-base" {
@@ -28,19 +28,19 @@ generate "required_providers" {
 terraform {
   required_providers {
     aws = {
-      source = "hashicorp/aws"
-      version = "= 4.4.0" # 2022-03-08: upgrade from 3.63.0; 2021-09-21: upgrade from 3.37.0
+      source  = "hashicorp/aws"
+      version = "4.4.0" # 2022-03-08: upgrade from 3.63.0; 2021-09-21: upgrade from 3.37.0
     }
     vault = {
-      source = "hashicorp/vault"
-      version = "= 2.19.1" # 2021-04-29: upgrade from 2.18.0
+      source  = "hashicorp/vault"
+      version = "3.4.1" # 2022-04-08: upgrade from 2.19.1; 2021-04-29: upgrade from 2.18.0
     }
     sensu = {
-      source = "jtopjian/sensu"
-      version = "= 0.12.1" # 2022-04-06: upgrade from 0.10.5
+      source  = "jtopjian/sensu"
+      version = "0.12.1" # 2022-04-06: upgrade from 0.10.5
     }
     github = {
-      source = "integrations/github"
+      source  = "integrations/github"
       version = "~> 4.0" # 2022-04-06: upgrade from 4.2.0
     }
   }
@@ -54,12 +54,12 @@ generate "github-provider" {
   contents  = <<EOF
 #Provider block for Github engineering. 
 #provider "github" {
-#  organization = "mdr-engineering"
+#  owner        = "mdr-engineering"
 #  base_url     = "https://github.xdr.accenturefederalcyber.com/"
 #}
 #Provider block for Github MDR Content. 
 provider "github" {
-  organization = "MDR-Content"
+  owner        = "MDR-Content"
   base_url     = "https://github.xdr.accenturefederalcyber.com/"
 }
 EOF

+ 4 - 4
common/aws-us-gov/afs-mdr-common-services-gov/090-codebuild-rpm-tmux/terragrunt.hcl

@@ -13,7 +13,7 @@ locals {
 # working directory, into a temporary folder, and execute your Terraform commands in that folder.
 terraform {
   # Double slash is intentional and required to show root of modules
-  source = "git@github.xdr.accenturefederalcyber.com:mdr-engineering/xdr-terraform-modules.git//base/codebuild_artifact?ref=v3.5.16"
+  source = "git@github.xdr.accenturefederalcyber.com:mdr-engineering/xdr-terraform-modules.git//base/codebuild_artifact?ref=v4.1.5"
 }
 
 dependency "codebuild-ecr-base" {
@@ -28,19 +28,19 @@ generate "github-provider" {
 terraform {
   required_providers {
     github = {
-      source = "integrations/github"
+      source  = "integrations/github"
       version = "~> 4.0" # 2022-04-06: upgrade from 4.2.0
     }
   }
 }
 #Provider block for Github engineering. 
 provider "github" {
-  organization = "mdr-engineering"
+  owner        = "mdr-engineering"
   base_url     = "https://github.xdr.accenturefederalcyber.com/"
 }
 #Provider block for Github MDR Content. 
 #provider "github" {
-#  organization = "MDR-Content"
+#  owner        = "MDR-Content"
 #  base_url     = "https://github.xdr.accenturefederalcyber.com/"
 #}
 EOF

+ 4 - 4
common/aws-us-gov/afs-mdr-common-services-gov/095-codebuild-rpm-aws-efs-utils/terragrunt.hcl

@@ -13,7 +13,7 @@ locals {
 # working directory, into a temporary folder, and execute your Terraform commands in that folder.
 terraform {
   # Double slash is intentional and required to show root of modules
-  source = "git@github.xdr.accenturefederalcyber.com:mdr-engineering/xdr-terraform-modules.git//base/codebuild_artifact?ref=v3.5.16"
+  source = "git@github.xdr.accenturefederalcyber.com:mdr-engineering/xdr-terraform-modules.git//base/codebuild_artifact?ref=v4.1.5"
 }
 
 dependency "codebuild-ecr-base" {
@@ -28,19 +28,19 @@ generate "github-provider" {
 terraform {
   required_providers {
     github = {
-      source = "integrations/github"
+      source  = "integrations/github"
       version = "~> 4.0" # 2022-04-06: upgrade from 4.2.0
     }
   }
 }
 #Provider block for Github engineering. 
 provider "github" {
-  organization = "mdr-engineering"
+  owner        = "mdr-engineering"
   base_url     = "https://github.xdr.accenturefederalcyber.com/"
 }
 #Provider block for Github MDR Content. 
 #provider "github" {
-#  organization = "MDR-Content"
+#  owner        = "MDR-Content"
 #  base_url     = "https://github.xdr.accenturefederalcyber.com/"
 #}
 EOF

+ 4 - 4
common/aws-us-gov/afs-mdr-common-services-gov/100-codebuild-rpm-syslog-ng/terragrunt.hcl

@@ -13,7 +13,7 @@ locals {
 # working directory, into a temporary folder, and execute your Terraform commands in that folder.
 terraform {
   # Double slash is intentional and required to show root of modules
-  source = "git@github.xdr.accenturefederalcyber.com:mdr-engineering/xdr-terraform-modules.git//base/codebuild_artifact?ref=v3.5.16"
+  source = "git@github.xdr.accenturefederalcyber.com:mdr-engineering/xdr-terraform-modules.git//base/codebuild_artifact?ref=v4.1.5"
 }
 
 dependency "codebuild-ecr-base" {
@@ -28,19 +28,19 @@ generate "github-provider" {
 terraform {
   required_providers {
     github = {
-      source = "integrations/github"
+      source  = "integrations/github"
       version = "~> 4.0" # 2022-04-06: upgrade from 4.2.0
     }
   }
 }
 #Provider block for Github engineering. 
 provider "github" {
-  organization = "mdr-engineering"
+  owner        = "mdr-engineering"
   base_url     = "https://github.xdr.accenturefederalcyber.com/"
 }
 #Provider block for Github MDR Content. 
 #provider "github" {
-#  organization = "MDR-Content"
+#  owner        = "MDR-Content"
 #  base_url     = "https://github.xdr.accenturefederalcyber.com/"
 #}
 EOF

+ 4 - 4
common/aws-us-gov/afs-mdr-common-services-gov/105-codebuild-ecr-mcas-container/terragrunt.hcl

@@ -13,7 +13,7 @@ locals {
 # working directory, into a temporary folder, and execute your Terraform commands in that folder.
 terraform {
   # Double slash is intentional and required to show root of modules
-  source = "git@github.xdr.accenturefederalcyber.com:mdr-engineering/xdr-terraform-modules.git//base/codebuild_ecr_project?ref=v4.0.0"
+  source = "git@github.xdr.accenturefederalcyber.com:mdr-engineering/xdr-terraform-modules.git//base/codebuild_ecr_project?ref=v4.1.5"
 }
 
 dependency "codebuild-ecr-base" {
@@ -28,19 +28,19 @@ generate "github-provider" {
 terraform {
   required_providers {
     github = {
-      source = "integrations/github"
+      source  = "integrations/github"
       version = "~> 4.0" # 2022-04-06: upgrade from 4.2.0
     }
   }
 }
 #Provider block for Github engineering. 
 provider "github" {
-  organization = "mdr-engineering"
+  owner        = "mdr-engineering"
   base_url     = "https://github.xdr.accenturefederalcyber.com/"
 }
 #Provider block for Github MDR Content. 
 #provider "github" {
-#  organization = "MDR-Content"
+#  owner        = "MDR-Content"
 #  base_url     = "https://github.xdr.accenturefederalcyber.com/"
 #}
 EOF

+ 9 - 9
common/aws-us-gov/afs-mdr-common-services-gov/350-codebuild-ecr-content-generator-build-image/terragrunt.hcl

@@ -13,7 +13,7 @@ locals {
 # working directory, into a temporary folder, and execute your Terraform commands in that folder.
 terraform {
   # Double slash is intentional and required to show root of modules
-  source = "git@github.xdr.accenturefederalcyber.com:mdr-engineering/xdr-terraform-modules.git//base/codebuild_ecr_project?ref=v4.1.4"
+  source = "git@github.xdr.accenturefederalcyber.com:mdr-engineering/xdr-terraform-modules.git//base/codebuild_ecr_project?ref=v4.1.5"
 }
 
 dependency "codebuild-ecr-base" {
@@ -28,19 +28,19 @@ generate "required_providers" {
 terraform {
   required_providers {
     aws = {
-      source = "hashicorp/aws"
-      version = "= 4.4.0" # 2022-03-08: upgrade from 3.63.0; 2021-09-21: upgrade from 3.37.0
+      source  = "hashicorp/aws"
+      version = "4.4.0" # 2022-03-08: upgrade from 3.63.0; 2021-09-21: upgrade from 3.37.0
     }
     vault = {
-      source = "hashicorp/vault"
-      version = "= 2.19.1" # 2021-04-29: upgrade from 2.18.0
+      source  = "hashicorp/vault"
+      version = "3.4.1" # 2022-04-08: upgrade from 2.19.1; 2021-04-29: upgrade from 2.18.0
     }
     sensu = {
-      source = "jtopjian/sensu"
-      version = "= 0.12.1" # 2022-04-06: upgrade from 0.10.5
+      source  = "jtopjian/sensu"
+      version = "0.12.1" # 2022-04-06: upgrade from 0.10.5
     }
     github = {
-      source = "integrations/github"
+      source  = "integrations/github"
       version = "~> 4.0" # 2022-04-06: upgrade from 4.2.0
     }
   }
@@ -53,7 +53,7 @@ generate "github-provider" {
   if_exists = "overwrite_terragrunt"
   contents  = <<EOF
 provider "github" {
-  organization = "content-delivery"
+  owner        = "content-delivery"
   base_url     = "https://github.xdr.accenturefederalcyber.com/"
 }
 EOF

+ 8 - 8
common/aws-us-gov/afs-mdr-common-services-gov/351-codebuild-splunk-uf-configs/terragrunt.hcl

@@ -13,7 +13,7 @@ locals {
 # working directory, into a temporary folder, and execute your Terraform commands in that folder.
 terraform {
   # Double slash is intentional and required to show root of modules
-  source = "git@github.xdr.accenturefederalcyber.com:mdr-engineering/xdr-terraform-modules.git//base/codebuild_artifact?ref=v4.1.4"
+  source = "git@github.xdr.accenturefederalcyber.com:mdr-engineering/xdr-terraform-modules.git//base/codebuild_artifact?ref=v4.1.5"
 }
 
 dependency "codebuild-ecr-base" {
@@ -28,19 +28,19 @@ generate "required_providers" {
 terraform {
   required_providers {
     aws = {
-      source = "hashicorp/aws"
-      version = "= 4.4.0" # 2022-03-08: upgrade from 3.63.0; 2021-09-21: upgrade from 3.37.0
+      source  = "hashicorp/aws"
+      version = "4.4.0" # 2022-03-08: upgrade from 3.63.0; 2021-09-21: upgrade from 3.37.0
     }
     vault = {
-      source = "hashicorp/vault"
-      version = "= 2.19.1" # 2021-04-29: upgrade from 2.18.0
+      source  = "hashicorp/vault"
+      version = "3.4.1" # 2022-04-08: upgrade from 2.19.1; 2021-04-29: upgrade from 2.18.0
     }
     sensu = {
-      source = "jtopjian/sensu"
-      version = "= 0.12.1" # 2022-04-06: upgrade from 0.10.5
+      source  = "jtopjian/sensu"
+      version = "0.12.1" # 2022-04-06: upgrade from 0.10.5
     }
     github = {
-      source = "integrations/github"
+      source  = "integrations/github"
       version = "~> 4.0" # 2022-04-06: upgrade from 4.2.0
     }
   }

+ 18 - 18
common/aws-us-gov/afs-mdr-common-services-gov/355-codebuild-xdr-base-image/terragrunt.hcl

@@ -9,6 +9,17 @@ locals {
   global_vars = read_terragrunt_config(find_in_parent_folders("globals.hcl"))
 }
 
+# Terragrunt will copy the Terraform configurations specified by the source parameter, along with any files in the
+# working directory, into a temporary folder, and execute your Terraform commands in that folder.
+terraform {
+  # Double slash is intentional and required to show root of modules
+  source = "git@github.xdr.accenturefederalcyber.com:mdr-engineering/xdr-terraform-modules.git//base/codebuild_project_no_artifact?ref=v4.1.5"
+}
+
+dependency "codebuild-ecr-base" {
+  config_path = "../075-codebuild-ecr-base"
+}
+
 #Github specific provider
 generate "required_providers" {
   path      = "required_provider.tf"
@@ -17,19 +28,19 @@ generate "required_providers" {
 terraform {
   required_providers {
     aws = {
-      source = "hashicorp/aws"
-      version = "= 4.4.0" # 2022-03-08: upgrade from 3.63.0; 2021-09-21: upgrade from 3.37.0
+      source  = "hashicorp/aws"
+      version = "4.4.0" # 2022-03-08: upgrade from 3.63.0; 2021-09-21: upgrade from 3.37.0
     }
     vault = {
-      source = "hashicorp/vault"
-      version = "= 2.19.1" # 2021-04-29: upgrade from 2.18.0
+      source  = "hashicorp/vault"
+      version = "3.4.1" # 2022-04-08: upgrade from 2.19.1; 2021-04-29: upgrade from 2.18.0
     }
     sensu = {
-      source = "jtopjian/sensu"
-      version = "= 0.12.1" # 2022-04-06: upgrade from 0.10.5
+      source  = "jtopjian/sensu"
+      version = "0.12.1" # 2022-04-06: upgrade from 0.10.5
     }
     github = {
-      source = "integrations/github"
+      source  = "integrations/github"
       version = "~> 4.0" # 2022-04-06: upgrade from 4.2.0
     }
   }
@@ -37,22 +48,11 @@ terraform {
 EOF
 }
 
-# Terragrunt will copy the Terraform configurations specified by the source parameter, along with any files in the
-# working directory, into a temporary folder, and execute your Terraform commands in that folder.
-terraform {
-  # Double slash is intentional and required to show root of modules
-  source = "git@github.xdr.accenturefederalcyber.com:mdr-engineering/xdr-terraform-modules.git//base/codebuild_project_no_artifact?ref=v4.1.4"
-}
-
 # Include all settings from the root terragrunt.hcl file
 include {
   path = find_in_parent_folders()
 }
 
-dependency "codebuild-ecr-base" {
-  config_path = "../075-codebuild-ecr-base"
-}
-
 # These are the variables we have to pass in to use the module specified in the terragrunt source above
 inputs = {
   # All of the inputs from the inherited hcl files are available automatically

+ 9 - 9
prod/aws-us-gov/mdr-prod-afs/360-codebuild-splunk-apps/terragrunt.hcl

@@ -13,7 +13,7 @@ locals {
 # working directory, into a temporary folder, and execute your Terraform commands in that folder.
 terraform {
   # Double slash is intentional and required to show root of modules
-  source = "git@github.xdr.accenturefederalcyber.com:mdr-engineering/xdr-terraform-modules.git//base/codebuild_splunk_apps?ref=v4.1.4"
+  source = "git@github.xdr.accenturefederalcyber.com:mdr-engineering/xdr-terraform-modules.git//base/codebuild_splunk_apps?ref=v4.1.5"
 }
 
 #Github specific provider
@@ -24,19 +24,19 @@ generate "required_providers" {
 terraform {
   required_providers {
     aws = {
-      source = "hashicorp/aws"
-      version = "= 4.4.0" # 2022-03-08: upgrade from 3.63.0; 2021-09-21: upgrade from 3.37.0
+      source  = "hashicorp/aws"
+      version = "4.4.0" # 2022-03-08: upgrade from 3.63.0; 2021-09-21: upgrade from 3.37.0
     }
     vault = {
-      source = "hashicorp/vault"
-      version = "= 2.19.1" # 2021-04-29: upgrade from 2.18.0
+      source  = "hashicorp/vault"
+      version = "3.4.1" # 2022-04-08: upgrade from 2.19.1; 2021-04-29: upgrade from 2.18.0
     }
     sensu = {
-      source = "jtopjian/sensu"
-      version = "= 0.12.1" # 2022-04-06: upgrade from 0.10.5
+      source  = "jtopjian/sensu"
+      version = "0.12.1" # 2022-04-06: upgrade from 0.10.5
     }
     github = {
-      source = "integrations/github"
+      source  = "integrations/github"
       version = "~> 4.0" # 2022-04-06: upgrade from 4.2.0
     }
   }
@@ -49,7 +49,7 @@ generate "github-provider" {
   if_exists = "overwrite_terragrunt"
   contents  = <<EOF
 provider "github" {
-  organization = "content-delivery"
+  owner        = "content-delivery"
   base_url     = "https://github.xdr.accenturefederalcyber.com/"
 }
 EOF

+ 9 - 9
prod/aws-us-gov/mdr-prod-bas/360-codebuild-splunk-apps/terragrunt.hcl

@@ -13,7 +13,7 @@ locals {
 # working directory, into a temporary folder, and execute your Terraform commands in that folder.
 terraform {
   # Double slash is intentional and required to show root of modules
-  source = "git@github.xdr.accenturefederalcyber.com:mdr-engineering/xdr-terraform-modules.git//base/codebuild_splunk_apps?ref=v4.1.4"
+  source = "git@github.xdr.accenturefederalcyber.com:mdr-engineering/xdr-terraform-modules.git//base/codebuild_splunk_apps?ref=v4.1.5"
 }
 
 #Github specific provider
@@ -24,19 +24,19 @@ generate "required_providers" {
 terraform {
   required_providers {
     aws = {
-      source = "hashicorp/aws"
-      version = "= 4.4.0" # 2022-03-08: upgrade from 3.63.0; 2021-09-21: upgrade from 3.37.0
+      source  = "hashicorp/aws"
+      version = "4.4.0" # 2022-03-08: upgrade from 3.63.0; 2021-09-21: upgrade from 3.37.0
     }
     vault = {
-      source = "hashicorp/vault"
-      version = "= 2.19.1" # 2021-04-29: upgrade from 2.18.0
+      source  = "hashicorp/vault"
+      version = "3.4.1" # 2022-04-08: upgrade from 2.19.1; 2021-04-29: upgrade from 2.18.0
     }
     sensu = {
-      source = "jtopjian/sensu"
-      version = "= 0.12.1" # 2022-04-06: upgrade from 0.10.5
+      source  = "jtopjian/sensu"
+      version = "0.12.1" # 2022-04-06: upgrade from 0.10.5
     }
     github = {
-      source = "integrations/github"
+      source  = "integrations/github"
       version = "~> 4.0" # 2022-04-06: upgrade from 4.2.0
     }
   }
@@ -49,7 +49,7 @@ generate "github-provider" {
   if_exists = "overwrite_terragrunt"
   contents  = <<EOF
 provider "github" {
-  organization = "content-delivery"
+  owner        = "content-delivery"
   base_url     = "https://github.xdr.accenturefederalcyber.com/"
 }
 EOF

+ 9 - 9
prod/aws-us-gov/mdr-prod-c2/360-codebuild-splunk-apps/terragrunt.hcl

@@ -13,7 +13,7 @@ locals {
 # working directory, into a temporary folder, and execute your Terraform commands in that folder.
 terraform {
   # Double slash is intentional and required to show root of modules
-  source = "git@github.xdr.accenturefederalcyber.com:mdr-engineering/xdr-terraform-modules.git//base/codebuild_splunk_apps?ref=v4.1.4"
+  source = "git@github.xdr.accenturefederalcyber.com:mdr-engineering/xdr-terraform-modules.git//base/codebuild_splunk_apps?ref=v4.1.5"
 }
 
 #Github specific provider
@@ -24,19 +24,19 @@ generate "required_providers" {
 terraform {
   required_providers {
     aws = {
-      source = "hashicorp/aws"
-      version = "= 4.4.0" # 2022-03-08: upgrade from 3.63.0; 2021-09-21: upgrade from 3.37.0
+      source  = "hashicorp/aws"
+      version = "4.4.0" # 2022-03-08: upgrade from 3.63.0; 2021-09-21: upgrade from 3.37.0
     }
     vault = {
-      source = "hashicorp/vault"
-      version = "= 2.19.1" # 2021-04-29: upgrade from 2.18.0
+      source  = "hashicorp/vault"
+      version = "3.4.1" # 2022-04-08: upgrade from 2.19.1; 2021-04-29: upgrade from 2.18.0
     }
     sensu = {
-      source = "jtopjian/sensu"
-      version = "= 0.12.1" # 2022-04-06: upgrade from 0.10.5
+      source  = "jtopjian/sensu"
+      version = "0.12.1" # 2022-04-06: upgrade from 0.10.5
     }
     github = {
-      source = "integrations/github"
+      source  = "integrations/github"
       version = "~> 4.0" # 2022-04-06: upgrade from 4.2.0
     }
   }
@@ -49,7 +49,7 @@ generate "github-provider" {
   if_exists = "overwrite_terragrunt"
   contents  = <<EOF
 provider "github" {
-  organization = "content-delivery"
+  owner        = "content-delivery"
   base_url     = "https://github.xdr.accenturefederalcyber.com/"
 }
 EOF

+ 9 - 9
prod/aws-us-gov/mdr-prod-c2/380-codebuild-portal-lambda/terragrunt.hcl

@@ -13,7 +13,7 @@ locals {
 # working directory, into a temporary folder, and execute your Terraform commands in that folder.
 terraform {
   # Double slash is intentional and required to show root of modules
-  source = "git@github.xdr.accenturefederalcyber.com:mdr-engineering/xdr-terraform-modules.git//base/codebuild_portal_lambda?ref=v4.1.4"
+  source = "git@github.xdr.accenturefederalcyber.com:mdr-engineering/xdr-terraform-modules.git//base/codebuild_portal_lambda?ref=v4.1.5"
 }
 
 #Github specific provider
@@ -24,19 +24,19 @@ generate "required_providers" {
 terraform {
   required_providers {
     aws = {
-      source = "hashicorp/aws"
-      version = "= 4.4.0" # 2022-03-08: upgrade from 3.63.0; 2021-09-21: upgrade from 3.37.0
+      source  = "hashicorp/aws"
+      version = "4.4.0" # 2022-03-08: upgrade from 3.63.0; 2021-09-21: upgrade from 3.37.0
     }
     vault = {
-      source = "hashicorp/vault"
-      version = "= 2.19.1" # 2021-04-29: upgrade from 2.18.0
+      source  = "hashicorp/vault"
+      version = "3.4.1" # 2022-04-08: upgrade from 2.19.1; 2021-04-29: upgrade from 2.18.0
     }
     sensu = {
-      source = "jtopjian/sensu"
-      version = "= 0.12.1" # 2022-04-06: upgrade from 0.10.5
+      source  = "jtopjian/sensu"
+      version = "0.12.1" # 2022-04-06: upgrade from 0.10.5
     }
     github = {
-      source = "integrations/github"
+      source  = "integrations/github"
       version = "~> 4.0" # 2022-04-06: upgrade from 4.2.0
     }
   }
@@ -49,7 +49,7 @@ generate "github-provider" {
   if_exists = "overwrite_terragrunt"
   contents  = <<EOF
 provider "github" {
-  organization = "MDR-Content"
+  owner        = "MDR-Content"
   base_url     = "https://github.xdr.accenturefederalcyber.com/"
 }
 EOF

+ 9 - 9
prod/aws-us-gov/mdr-prod-ca-c19/360-codebuild-splunk-apps/terragrunt.hcl

@@ -13,7 +13,7 @@ locals {
 # working directory, into a temporary folder, and execute your Terraform commands in that folder.
 terraform {
   # Double slash is intentional and required to show root of modules
-  source = "git@github.xdr.accenturefederalcyber.com:mdr-engineering/xdr-terraform-modules.git//base/codebuild_splunk_apps?ref=v4.1.4"
+  source = "git@github.xdr.accenturefederalcyber.com:mdr-engineering/xdr-terraform-modules.git//base/codebuild_splunk_apps?ref=v4.1.5"
 }
 
 #Github specific provider
@@ -24,19 +24,19 @@ generate "required_providers" {
 terraform {
   required_providers {
     aws = {
-      source = "hashicorp/aws"
-      version = "= 4.4.0" # 2022-03-08: upgrade from 3.63.0; 2021-09-21: upgrade from 3.37.0
+      source  = "hashicorp/aws"
+      version = "4.4.0" # 2022-03-08: upgrade from 3.63.0; 2021-09-21: upgrade from 3.37.0
     }
     vault = {
-      source = "hashicorp/vault"
-      version = "= 2.19.1" # 2021-04-29: upgrade from 2.18.0
+      source  = "hashicorp/vault"
+      version = "3.4.1" # 2022-04-08: upgrade from 2.19.1; 2021-04-29: upgrade from 2.18.0
     }
     sensu = {
-      source = "jtopjian/sensu"
-      version = "= 0.12.1" # 2022-04-06: upgrade from 0.10.5
+      source  = "jtopjian/sensu"
+      version = "0.12.1" # 2022-04-06: upgrade from 0.10.5
     }
     github = {
-      source = "integrations/github"
+      source  = "integrations/github"
       version = "~> 4.0" # 2022-04-06: upgrade from 4.2.0
     }
   }
@@ -49,7 +49,7 @@ generate "github-provider" {
   if_exists = "overwrite_terragrunt"
   contents  = <<EOF
 provider "github" {
-  organization = "content-delivery"
+  owner        = "content-delivery"
   base_url     = "https://github.xdr.accenturefederalcyber.com/"
 }
 EOF

+ 9 - 9
prod/aws-us-gov/mdr-prod-dc-c19/360-codebuild-splunk-apps/terragrunt.hcl

@@ -13,7 +13,7 @@ locals {
 # working directory, into a temporary folder, and execute your Terraform commands in that folder.
 terraform {
   # Double slash is intentional and required to show root of modules
-  source = "git@github.xdr.accenturefederalcyber.com:mdr-engineering/xdr-terraform-modules.git//base/codebuild_splunk_apps?ref=v4.1.4"
+  source = "git@github.xdr.accenturefederalcyber.com:mdr-engineering/xdr-terraform-modules.git//base/codebuild_splunk_apps?ref=v4.1.5"
 }
 
 #Github specific provider
@@ -24,19 +24,19 @@ generate "required_providers" {
 terraform {
   required_providers {
     aws = {
-      source = "hashicorp/aws"
-      version = "= 4.4.0" # 2022-03-08: upgrade from 3.63.0; 2021-09-21: upgrade from 3.37.0
+      source  = "hashicorp/aws"
+      version = "4.4.0" # 2022-03-08: upgrade from 3.63.0; 2021-09-21: upgrade from 3.37.0
     }
     vault = {
-      source = "hashicorp/vault"
-      version = "= 2.19.1" # 2021-04-29: upgrade from 2.18.0
+      source  = "hashicorp/vault"
+      version = "3.4.1" # 2022-04-08: upgrade from 2.19.1; 2021-04-29: upgrade from 2.18.0
     }
     sensu = {
-      source = "jtopjian/sensu"
-      version = "= 0.12.1" # 2022-04-06: upgrade from 0.10.5
+      source  = "jtopjian/sensu"
+      version = "0.12.1" # 2022-04-06: upgrade from 0.10.5
     }
     github = {
-      source = "integrations/github"
+      source  = "integrations/github"
       version = "~> 4.0" # 2022-04-06: upgrade from 4.2.0
     }
   }
@@ -49,7 +49,7 @@ generate "github-provider" {
   if_exists = "overwrite_terragrunt"
   contents  = <<EOF
 provider "github" {
-  organization = "content-delivery"
+  owner        = "content-delivery"
   base_url     = "https://github.xdr.accenturefederalcyber.com/"
 }
 EOF

+ 9 - 9
prod/aws-us-gov/mdr-prod-dgi/360-codebuild-splunk-apps/terragrunt.hcl

@@ -13,7 +13,7 @@ locals {
 # working directory, into a temporary folder, and execute your Terraform commands in that folder.
 terraform {
   # Double slash is intentional and required to show root of modules
-  source = "git@github.xdr.accenturefederalcyber.com:mdr-engineering/xdr-terraform-modules.git//base/codebuild_splunk_apps?ref=v4.1.4"
+  source = "git@github.xdr.accenturefederalcyber.com:mdr-engineering/xdr-terraform-modules.git//base/codebuild_splunk_apps?ref=v4.1.5"
 }
 
 #Github specific provider
@@ -24,19 +24,19 @@ generate "required_providers" {
 terraform {
   required_providers {
     aws = {
-      source = "hashicorp/aws"
-      version = "= 4.4.0" # 2022-03-08: upgrade from 3.63.0; 2021-09-21: upgrade from 3.37.0
+      source  = "hashicorp/aws"
+      version = "4.4.0" # 2022-03-08: upgrade from 3.63.0; 2021-09-21: upgrade from 3.37.0
     }
     vault = {
-      source = "hashicorp/vault"
-      version = "= 2.19.1" # 2021-04-29: upgrade from 2.18.0
+      source  = "hashicorp/vault"
+      version = "3.4.1" # 2022-04-08: upgrade from 2.19.1; 2021-04-29: upgrade from 2.18.0
     }
     sensu = {
-      source = "jtopjian/sensu"
-      version = "= 0.12.1" # 2022-04-06: upgrade from 0.10.5
+      source  = "jtopjian/sensu"
+      version = "0.12.1" # 2022-04-06: upgrade from 0.10.5
     }
     github = {
-      source = "integrations/github"
+      source  = "integrations/github"
       version = "~> 4.0" # 2022-04-06: upgrade from 4.2.0
     }
   }
@@ -49,7 +49,7 @@ generate "github-provider" {
   if_exists = "overwrite_terragrunt"
   contents  = <<EOF
 provider "github" {
-  organization = "content-delivery"
+  owner        = "content-delivery"
   base_url     = "https://github.xdr.accenturefederalcyber.com/"
 }
 EOF

+ 9 - 9
prod/aws-us-gov/mdr-prod-frtib/360-codebuild-splunk-apps/terragrunt.hcl

@@ -13,7 +13,7 @@ locals {
 # working directory, into a temporary folder, and execute your Terraform commands in that folder.
 terraform {
   # Double slash is intentional and required to show root of modules
-  source = "git@github.xdr.accenturefederalcyber.com:mdr-engineering/xdr-terraform-modules.git//base/codebuild_splunk_apps?ref=v4.1.4"
+  source = "git@github.xdr.accenturefederalcyber.com:mdr-engineering/xdr-terraform-modules.git//base/codebuild_splunk_apps?ref=v4.1.5"
 }
 
 #Github specific provider
@@ -24,19 +24,19 @@ generate "required_providers" {
 terraform {
   required_providers {
     aws = {
-      source = "hashicorp/aws"
-      version = "= 4.4.0" # 2022-03-08: upgrade from 3.63.0; 2021-09-21: upgrade from 3.37.0
+      source  = "hashicorp/aws"
+      version = "4.4.0" # 2022-03-08: upgrade from 3.63.0; 2021-09-21: upgrade from 3.37.0
     }
     vault = {
-      source = "hashicorp/vault"
-      version = "= 2.19.1" # 2021-04-29: upgrade from 2.18.0
+      source  = "hashicorp/vault"
+      version = "3.4.1" # 2022-04-08: upgrade from 2.19.1; 2021-04-29: upgrade from 2.18.0
     }
     sensu = {
-      source = "jtopjian/sensu"
-      version = "= 0.12.1" # 2022-04-06: upgrade from 0.10.5
+      source  = "jtopjian/sensu"
+      version = "0.12.1" # 2022-04-06: upgrade from 0.10.5
     }
     github = {
-      source = "integrations/github"
+      source  = "integrations/github"
       version = "~> 4.0" # 2022-04-06: upgrade from 4.2.0
     }
   }
@@ -49,7 +49,7 @@ generate "github-provider" {
   if_exists = "overwrite_terragrunt"
   contents  = <<EOF
 provider "github" {
-  organization = "content-delivery"
+  owner        = "content-delivery"
   base_url     = "https://github.xdr.accenturefederalcyber.com/"
 }
 EOF

+ 9 - 9
prod/aws-us-gov/mdr-prod-la-c19/360-codebuild-splunk-apps/terragrunt.hcl

@@ -13,7 +13,7 @@ locals {
 # working directory, into a temporary folder, and execute your Terraform commands in that folder.
 terraform {
   # Double slash is intentional and required to show root of modules
-  source = "git@github.xdr.accenturefederalcyber.com:mdr-engineering/xdr-terraform-modules.git//base/codebuild_splunk_apps?ref=v4.1.4"
+  source = "git@github.xdr.accenturefederalcyber.com:mdr-engineering/xdr-terraform-modules.git//base/codebuild_splunk_apps?ref=v4.1.5"
 }
 
 #Github specific provider
@@ -24,19 +24,19 @@ generate "required_providers" {
 terraform {
   required_providers {
     aws = {
-      source = "hashicorp/aws"
-      version = "= 4.4.0" # 2022-03-08: upgrade from 3.63.0; 2021-09-21: upgrade from 3.37.0
+      source  = "hashicorp/aws"
+      version = "4.4.0" # 2022-03-08: upgrade from 3.63.0; 2021-09-21: upgrade from 3.37.0
     }
     vault = {
-      source = "hashicorp/vault"
-      version = "= 2.19.1" # 2021-04-29: upgrade from 2.18.0
+      source  = "hashicorp/vault"
+      version = "3.4.1" # 2022-04-08: upgrade from 2.19.1; 2021-04-29: upgrade from 2.18.0
     }
     sensu = {
-      source = "jtopjian/sensu"
-      version = "= 0.12.1" # 2022-04-06: upgrade from 0.10.5
+      source  = "jtopjian/sensu"
+      version = "0.12.1" # 2022-04-06: upgrade from 0.10.5
     }
     github = {
-      source = "integrations/github"
+      source  = "integrations/github"
       version = "~> 4.0" # 2022-04-06: upgrade from 4.2.0
     }
   }
@@ -49,7 +49,7 @@ generate "github-provider" {
   if_exists = "overwrite_terragrunt"
   contents  = <<EOF
 provider "github" {
-  organization = "content-delivery"
+  owner        = "content-delivery"
   base_url     = "https://github.xdr.accenturefederalcyber.com/"
 }
 EOF

+ 9 - 9
prod/aws-us-gov/mdr-prod-nga/360-codebuild-splunk-apps/terragrunt.hcl

@@ -13,7 +13,7 @@ locals {
 # working directory, into a temporary folder, and execute your Terraform commands in that folder.
 terraform {
   # Double slash is intentional and required to show root of modules
-  source = "git@github.xdr.accenturefederalcyber.com:mdr-engineering/xdr-terraform-modules.git//base/codebuild_splunk_apps?ref=v4.1.4"
+  source = "git@github.xdr.accenturefederalcyber.com:mdr-engineering/xdr-terraform-modules.git//base/codebuild_splunk_apps?ref=v4.1.5"
 }
 
 #Github specific provider
@@ -24,19 +24,19 @@ generate "required_providers" {
 terraform {
   required_providers {
     aws = {
-      source = "hashicorp/aws"
-      version = "= 4.4.0" # 2022-03-08: upgrade from 3.63.0; 2021-09-21: upgrade from 3.37.0
+      source  = "hashicorp/aws"
+      version = "4.4.0" # 2022-03-08: upgrade from 3.63.0; 2021-09-21: upgrade from 3.37.0
     }
     vault = {
-      source = "hashicorp/vault"
-      version = "= 2.19.1" # 2021-04-29: upgrade from 2.18.0
+      source  = "hashicorp/vault"
+      version = "3.4.1" # 2022-04-08: upgrade from 2.19.1; 2021-04-29: upgrade from 2.18.0
     }
     sensu = {
-      source = "jtopjian/sensu"
-      version = "= 0.12.1" # 2022-04-06: upgrade from 0.10.5
+      source  = "jtopjian/sensu"
+      version = "0.12.1" # 2022-04-06: upgrade from 0.10.5
     }
     github = {
-      source = "integrations/github"
+      source  = "integrations/github"
       version = "~> 4.0" # 2022-04-06: upgrade from 4.2.0
     }
   }
@@ -49,7 +49,7 @@ generate "github-provider" {
   if_exists = "overwrite_terragrunt"
   contents  = <<EOF
 provider "github" {
-  organization = "content-delivery"
+  owner        = "content-delivery"
   base_url     = "https://github.xdr.accenturefederalcyber.com/"
 }
 EOF

+ 6 - 6
terragrunt.hcl

@@ -68,16 +68,16 @@ generate "required_providers" {
 terraform {
   required_providers {
     aws = {
-      source = "hashicorp/aws"
-      version = "= 4.4.0" # 2022-03-08: upgrade from 3.63.0; 2021-09-21: upgrade from 3.37.0
+      source  = "hashicorp/aws"
+      version = "4.4.0" # 2022-03-08: upgrade from 3.63.0; 2021-09-21: upgrade from 3.37.0
     }
     vault = {
-      source = "hashicorp/vault"
-      version = "= 2.19.1" # 2021-04-29: upgrade from 2.18.0
+      source  = "hashicorp/vault"
+      version = "3.4.1" # 2022-04-08: upgrade from 2.19.1; 2021-04-29: upgrade from 2.18.0
     }
     sensu = {
-      source = "jtopjian/sensu"
-      version = "= 0.12.1" # 2022-04-06: upgrade from 0.10.5
+      source  = "jtopjian/sensu"
+      version = "0.12.1" # 2022-04-06: upgrade from 0.10.5
     }
   }
 }

+ 8 - 8
test/aws-us-gov/mdr-test-c2/096-sensu-configuration/terragrunt.hcl

@@ -13,7 +13,7 @@ locals {
 # working directory, into a temporary folder, and execute your Terraform commands in that folder.
 terraform {
   # Double slash is intentional and required to show root of modules
-  source = "git@github.xdr.accenturefederalcyber.com:mdr-engineering/xdr-terraform-modules.git//base/sensu-configuration?ref=v4.1.4"
+  source = "git@github.xdr.accenturefederalcyber.com:mdr-engineering/xdr-terraform-modules.git//base/sensu-configuration?ref=v4.1.5"
 }
 
 dependency "vpc-system-services" {
@@ -32,19 +32,19 @@ generate "required_providers" {
 terraform {
   required_providers {
     aws = {
-      source = "hashicorp/aws"
-      version = "= 4.4.0" # 2022-03-08: upgrade from 3.63.0; 2021-09-21: upgrade from 3.37.0
+      source  = "hashicorp/aws"
+      version = "4.4.0" # 2022-03-08: upgrade from 3.63.0; 2021-09-21: upgrade from 3.37.0
     }
     vault = {
-      source = "hashicorp/vault"
-      version = "= 3.4.0" # 2022-04-06 upgrade from 2.19.1; 2021-04-29: upgrade from 2.18.0
+      source  = "hashicorp/vault"
+      version = "3.4.1" # 2022-04-08: upgrade from 2.19.1; 2021-04-29: upgrade from 2.18.0
     }
     sensu = {
-      source = "jtopjian/sensu"
-      version = "= 0.12.1" # 2022-04-06: upgrade from 0.10.5
+      source  = "jtopjian/sensu"
+      version = "0.12.1" # 2022-04-06: upgrade from 0.10.5
     }
     github = {
-      source = "integrations/github"
+      source  = "integrations/github"
       version = "~> 4.0" # 2022-04-06: upgrade from 4.2.0
     }
   }

+ 9 - 9
test/aws-us-gov/mdr-test-c2/360-codebuild-splunk-apps/terragrunt.hcl

@@ -13,7 +13,7 @@ locals {
 # working directory, into a temporary folder, and execute your Terraform commands in that folder.
 terraform {
   # Double slash is intentional and required to show root of modules
-  source = "git@github.xdr.accenturefederalcyber.com:mdr-engineering/xdr-terraform-modules.git//base/codebuild_splunk_apps?ref=v4.1.4"
+  source = "git@github.xdr.accenturefederalcyber.com:mdr-engineering/xdr-terraform-modules.git//base/codebuild_splunk_apps?ref=v4.1.5"
 }
 
 #Github specific provider
@@ -24,19 +24,19 @@ generate "required_providers" {
 terraform {
   required_providers {
     aws = {
-      source = "hashicorp/aws"
-      version = "= 4.4.0" # 2022-03-08: upgrade from 3.63.0; 2021-09-21: upgrade from 3.37.0
+      source  = "hashicorp/aws"
+      version = "4.4.0" # 2022-03-08: upgrade from 3.63.0; 2021-09-21: upgrade from 3.37.0
     }
     vault = {
-      source = "hashicorp/vault"
-      version = "= 2.19.1" # 2021-04-29: upgrade from 2.18.0
+      source  = "hashicorp/vault"
+      version = "3.4.1" # 2022-04-08: upgrade from 2.19.1; 2021-04-29: upgrade from 2.18.0
     }
     sensu = {
-      source = "jtopjian/sensu"
-      version = "= 0.12.1" # 2022-04-06: upgrade from 0.10.5
+      source  = "jtopjian/sensu"
+      version = "0.12.1" # 2022-04-06: upgrade from 0.10.5
     }
     github = {
-      source = "integrations/github"
+      source  = "integrations/github"
       version = "~> 4.0" # 2022-04-06: upgrade from 4.2.0
     }
   }
@@ -49,7 +49,7 @@ generate "github-provider" {
   if_exists = "overwrite_terragrunt"
   contents  = <<EOF
 provider "github" {
-  organization = "content-delivery"
+  owner        = "content-delivery"
   base_url     = "https://github.xdr.accenturefederalcyber.com/"
 }
 EOF

+ 9 - 9
test/aws-us-gov/mdr-test-c2/380-codebuild-portal-lambda/terragrunt.hcl

@@ -13,7 +13,7 @@ locals {
 # working directory, into a temporary folder, and execute your Terraform commands in that folder.
 terraform {
   # Double slash is intentional and required to show root of modules
-  source = "git@github.xdr.accenturefederalcyber.com:mdr-engineering/xdr-terraform-modules.git//base/codebuild_portal_lambda?ref=v4.1.4"
+  source = "git@github.xdr.accenturefederalcyber.com:mdr-engineering/xdr-terraform-modules.git//base/codebuild_portal_lambda?ref=v4.1.5"
 }
 
 #Github specific provider
@@ -24,19 +24,19 @@ generate "required_providers" {
 terraform {
   required_providers {
     aws = {
-      source = "hashicorp/aws"
-      version = "= 4.4.0" # 2022-03-08: upgrade from 3.63.0; 2021-09-21: upgrade from 3.37.0
+      source  = "hashicorp/aws"
+      version = "4.4.0" # 2022-03-08: upgrade from 3.63.0; 2021-09-21: upgrade from 3.37.0
     }
     vault = {
-      source = "hashicorp/vault"
-      version = "= 2.19.1" # 2021-04-29: upgrade from 2.18.0
+      source  = "hashicorp/vault"
+      version = "3.4.1" # 2022-04-08: upgrade from 2.19.1; 2021-04-29: upgrade from 2.18.0
     }
     sensu = {
-      source = "jtopjian/sensu"
-      version = "= 0.12.1" # 2022-04-06: upgrade from 0.10.5
+      source  = "jtopjian/sensu"
+      version = "0.12.1" # 2022-04-06: upgrade from 0.10.5
     }
     github = {
-      source = "integrations/github"
+      source  = "integrations/github"
       version = "~> 4.0" # 2022-04-06: upgrade from 4.2.0
     }
   }
@@ -49,7 +49,7 @@ generate "github-provider" {
   if_exists = "overwrite_terragrunt"
   contents  = <<EOF
 provider "github" {
-  organization = "MDR-Content"
+  owner        = "MDR-Content"
   base_url     = "https://github.xdr.accenturefederalcyber.com/"
 }
 EOF

+ 9 - 9
test/aws-us-gov/mdr-test-modelclient/360-codebuild-splunk-apps/terragrunt.hcl

@@ -13,7 +13,7 @@ locals {
 # working directory, into a temporary folder, and execute your Terraform commands in that folder.
 terraform {
   # Double slash is intentional and required to show root of modules
-  source = "git@github.xdr.accenturefederalcyber.com:mdr-engineering/xdr-terraform-modules.git//base/codebuild_splunk_apps?ref=v4.1.4"
+  source = "git@github.xdr.accenturefederalcyber.com:mdr-engineering/xdr-terraform-modules.git//base/codebuild_splunk_apps?ref=v4.1.5"
 }
 
 #Github specific provider
@@ -24,19 +24,19 @@ generate "required_providers" {
 terraform {
   required_providers {
     aws = {
-      source = "hashicorp/aws"
-      version = "= 4.4.0" # 2022-03-08: upgrade from 3.63.0; 2021-09-21: upgrade from 3.37.0
+      source  = "hashicorp/aws"
+      version = "4.4.0" # 2022-03-08: upgrade from 3.63.0; 2021-09-21: upgrade from 3.37.0
     }
     vault = {
-      source = "hashicorp/vault"
-      version = "= 2.19.1" # 2021-04-29: upgrade from 2.18.0
+      source  = "hashicorp/vault"
+      version = "3.4.1" # 2022-04-08: upgrade from 2.19.1; 2021-04-29: upgrade from 2.18.0
     }
     sensu = {
-      source = "jtopjian/sensu"
-      version = "= 0.12.1" # 2022-04-06: upgrade from 0.10.5
+      source  = "jtopjian/sensu"
+      version = "0.12.1" # 2022-04-06: upgrade from 0.10.5
     }
     github = {
-      source = "integrations/github"
+      source  = "integrations/github"
       version = "~> 4.0" # 2022-04-06: upgrade from 4.2.0
     }
   }
@@ -49,7 +49,7 @@ generate "github-provider" {
   if_exists = "overwrite_terragrunt"
   contents  = <<EOF
 provider "github" {
-  organization = "content-delivery"
+  owner        = "content-delivery"
   base_url     = "https://github.xdr.accenturefederalcyber.com/"
 }
 EOF