Kaynağa Gözat

Merge pull request #665 from mdr-engineering/feature/ftd_MSOCI-2141_HTTPS_for_Repo

Adds HTTPS to reposerver
Frederick Damstra 3 yıl önce
ebeveyn
işleme
c4d1acc9ea

+ 7 - 6
prod/aws-us-gov/mdr-prod-c2/080-instance-repo-server/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/repo_server?ref=v3.5.16"
+  source = "git@github.xdr.accenturefederalcyber.com:mdr-engineering/xdr-terraform-modules.git//base/repo_server?ref=v4.3.6"
 }
 
 dependency "vpc-system-services" {
@@ -39,11 +39,12 @@ inputs = {
     Reserved_Type          = "t3a.xlarge"
     Reservation_Expiration = "2022-10-15"
   }
-  instance_name = "reposerver" # TODO: Fix this when actual swap is taking place.
-  instance_type = local.account_vars.locals.repo_server_instance_type
-  vpc_id        = dependency.vpc-system-services.outputs.vpc_id
-  azs           = dependency.vpc-system-services.outputs.azs
-  subnets       = dependency.vpc-system-services.outputs.public_subnets
+  instance_name   = "reposerver"
+  instance_type   = local.account_vars.locals.repo_server_instance_type
+  vpc_id          = dependency.vpc-system-services.outputs.vpc_id
+  azs             = dependency.vpc-system-services.outputs.azs
+  private_subnets = dependency.vpc-system-services.outputs.public_subnets
+  public_subnets  = dependency.vpc-system-services.outputs.public_subnets
 }
 terraform_version_constraint  = "= 1.1.6"
 terragrunt_version_constraint = "= 0.36.2"

+ 7 - 6
test/aws-us-gov/mdr-test-c2/080-instance-repo-server/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/repo_server?ref=v3.5.16"
+  source = "git@github.xdr.accenturefederalcyber.com:mdr-engineering/xdr-terraform-modules.git//base/repo_server?ref=v4.3.6"
 }
 
 dependency "vpc-system-services" {
@@ -35,11 +35,12 @@ inputs = {
     Terraform = "aws/${basename(get_parent_terragrunt_dir())}/${path_relative_to_include()}/"
     Schedule  = "24x7x365"
   }
-  instance_name = "reposerver" # TODO: Fix this when actual swap is taking place.
-  instance_type = local.account_vars.locals.repo_server_instance_type
-  vpc_id        = dependency.vpc-system-services.outputs.vpc_id
-  azs           = dependency.vpc-system-services.outputs.azs
-  subnets       = dependency.vpc-system-services.outputs.public_subnets
+  instance_name   = "reposerver"
+  instance_type   = local.account_vars.locals.repo_server_instance_type
+  vpc_id          = dependency.vpc-system-services.outputs.vpc_id
+  azs             = dependency.vpc-system-services.outputs.azs
+  private_subnets = dependency.vpc-system-services.outputs.private_subnets
+  public_subnets  = dependency.vpc-system-services.outputs.public_subnets
 }
 terraform_version_constraint  = "= 1.1.6"
 terragrunt_version_constraint = "= 0.36.2"