From dac6d36a3a143b4d7d170faaa882d2d021f0c468 Mon Sep 17 00:00:00 2001
From: Aaron D Borden <adborden@a14n.net>
Date: Thu, 13 Aug 2020 15:29:28 -0700
Subject: [PATCH 1/2] [catalog-next] add fgdc2iso service

---
 sandbox/catalog-next.tf | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/sandbox/catalog-next.tf b/sandbox/catalog-next.tf
index 4ea027a..a210dc6 100644
--- a/sandbox/catalog-next.tf
+++ b/sandbox/catalog-next.tf
@@ -1,5 +1,5 @@
 module "catalog_next" {
-  source = "github.com/gsa/datagov-infrastructure-modules.git//modules/catalog?ref=v3.7.1"
+  source = "github.com/gsa/datagov-infrastructure-modules.git//modules/catalog?ref=v4.1.1"
 
   bastion_host            = module.jumpbox.jumpbox_dns
   database_subnet_group   = module.vpc.database_subnet_group
@@ -9,6 +9,7 @@ module "catalog_next" {
   dns_zone_public         = module.vpc.dns_zone_public
   enable_redis            = true
   env                     = var.env
+  fgdc2iso_instance_name  = "catalog-next-fgdc2iso"
   harvester_ansible_group = "catalog_harvester,catalog_harvester_next,v2"
   harvester_instance_name = "catalog-harvester-next"
   key_name                = var.key_name

From 8ac275c708aeab8604a409465e9b609820a63847 Mon Sep 17 00:00:00 2001
From: Aaron D Borden <adborden@a14n.net>
Date: Thu, 13 Aug 2020 16:47:53 -0700
Subject: [PATCH 2/2] Pin AWS provider version

Avoid jumping to 3.x where breaking changes need to be addressed.

See https://github.com/GSA/datagov-deploy/issues/2032
---
 sandbox/main.tf | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/sandbox/main.tf b/sandbox/main.tf
index e0264a8..e783125 100644
--- a/sandbox/main.tf
+++ b/sandbox/main.tf
@@ -1,5 +1,7 @@
 provider "aws" {
   region = "us-east-1"
+  # TODO https://github.com/GSA/datagov-deploy/issues/2032
+  version = "2.70.0"
 }
 
 terraform {