Merge pull request #300 from mdr-engineering/feature/dw_MSOCI-1675_govcloud-salt-commerical-bucket

Enable govcloud salt-master to write to commercial

common/aws/mdr-common-services/110-xdr-binaries-write-role/terragrunt.hcl

@@ -23,7 +23,9 @@ include {
 
 dependencies {
   paths = [
-    "../008-xdr-binaries"
+    "../008-xdr-binaries",
+    "../../../../prod/aws/mdr-prod-c2/072-salt-master-inventory-role",
+    "../../../../test/aws/mdr-test-c2/072-salt-master-inventory-role",
   ]
 }
 
@@ -39,6 +41,15 @@ dependency "bucket" {
   config_path = "../008-xdr-binaries"
 }
 
+dependency "prod-user" {
+  config_path = "../../../../prod/aws/mdr-prod-c2/072-salt-master-inventory-role"
+}
+
+dependency "test-user" {
+  config_path = "../../../../test/aws/mdr-test-c2/072-salt-master-inventory-role"
+}
+
+
 # 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
@@ -55,6 +66,8 @@ inputs = {
   trusted_arns = [
     "arn:aws:iam::477548533976:role/salt-master-instance-role",  # Legacy prod salt master
     "arn:aws:iam::527700175026:role/salt-master-instance-role",  # Legacy test salt master
+    dependency.test-user.outputs.salt-master-c2-commercial-user-arn,
+    dependency.prod-user.outputs.salt-master-c2-commercial-user-arn,
   ]
 
   kms_key_ids = [

prod/aws/mdr-prod-c2/072-salt-master-inventory-role/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/salt_master_inventory_role?ref=v0.9.4"
+  source = "git@github.xdr.accenturefederalcyber.com:mdr-engineering/xdr-terraform-modules.git//base/salt_master_inventory_role?ref=v1.23.24"
 }
 
 # Include all settings from the root terragrunt.hcl file

test/aws/mdr-test-c2/072-salt-master-inventory-role/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/salt_master_inventory_role?ref=v0.8.8"
+  source = "git@github.xdr.accenturefederalcyber.com:mdr-engineering/xdr-terraform-modules.git//base/salt_master_inventory_role?ref=v1.23.24"
 }
 
 # Include all settings from the root terragrunt.hcl file