From 049c160af08b28bf815890cc1205ddb41babe1c3 Mon Sep 17 00:00:00 2001
From: Mikayla Thompson <thomika@amazon.com>
Date: Thu, 26 Sep 2024 17:09:49 -0600
Subject: [PATCH 1/2] Make cdk.context.json valid json

Signed-off-by: Mikayla Thompson <thomika@amazon.com>
---
 .../cdk/opensearch-service-migration/cdk.context.json     | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/deployment/cdk/opensearch-service-migration/cdk.context.json b/deployment/cdk/opensearch-service-migration/cdk.context.json
index 352e052aa..91cf401ae 100644
--- a/deployment/cdk/opensearch-service-migration/cdk.context.json
+++ b/deployment/cdk/opensearch-service-migration/cdk.context.json
@@ -5,10 +5,10 @@
       "endpoint": "<TARGET_CLUSTER_ENDPOINT>",
       "auth": {
         "type": "none | basic | sigv4",
-        // if basic
+        "// basic auth documentation": "The next two lines are releavant for basic auth only",
         "username": "<USERNAME>",
         "password_from_secret_arn": "<ARN_OF_SECRET_CONTAINING_PASSWORD>",
-        // if sigv4
+        "// sigv4 documentation": "The next two lines are releavant for sigv4 only",
         "region": "<REGION>",
         "serviceSigningName": "es | aoss"
       }
@@ -17,10 +17,10 @@
       "endpoint": "<SOURCE_CLUSTER_ENDPOINT>",
       "auth": {
         "type": "none | basic | sigv4",
-        // if basic
+        "// basic auth documentation": "The next two lines are releavant for basic auth only",
         "username": "<USERNAME>",
         "password_from_secret_arn": "<ARN_OF_SECRET_CONTAINING_PASSWORD>",
-        // if sigv4
+        "// sigv4 documentation": "The next two lines are releavant for sigv4 only",
         "region": "<REGION>",
         "serviceSigningName": "es | aoss"
       }

From 871d43d2c15d2894f74a4b41442725e4e5d59277 Mon Sep 17 00:00:00 2001
From: Mikayla Thompson <thomika@amazon.com>
Date: Thu, 26 Sep 2024 20:34:29 -0600
Subject: [PATCH 2/2] re-add the former defaults to testing cdk

Signed-off-by: Mikayla Thompson <thomika@amazon.com>
---
 test/defaultMigrationContext.json       | 10 +++++++++-
 vars/rfsDefaultE2ETest.groovy           | 14 +++++++++++++-
 vars/trafficReplayDefaultE2ETest.groovy | 14 +++++++++++++-
 3 files changed, 35 insertions(+), 3 deletions(-)

diff --git a/test/defaultMigrationContext.json b/test/defaultMigrationContext.json
index 07e1ba4c4..0f209aedd 100644
--- a/test/defaultMigrationContext.json
+++ b/test/defaultMigrationContext.json
@@ -13,6 +13,14 @@
     "reindexFromSnapshotServiceEnabled": true,
     "sourceClusterEndpoint": "<SOURCE_CLUSTER_ENDPOINT>",
     "migrationConsoleEnableOSI": true,
-    "migrationAPIEnabled": true
+    "migrationAPIEnabled": true,
+    "tlsSecurityPolicy": "TLS_1_2",
+    "enforceHTTPS": true,
+    "nodeToNodeEncryptionEnabled": true,
+    "encryptionAtRestEnabled": true,
+    "vpcAZCount": 2,
+    "domainAZCount": 2,
+    "mskAZCount": 2,
+    "replayerOutputEFSRemovalPolicy": "DESTROY"
   }
 }
diff --git a/vars/rfsDefaultE2ETest.groovy b/vars/rfsDefaultE2ETest.groovy
index aac9db03a..5a5115e55 100644
--- a/vars/rfsDefaultE2ETest.groovy
+++ b/vars/rfsDefaultE2ETest.groovy
@@ -39,7 +39,19 @@ def call(Map config = [:]) {
             "artifactBucketRemovalPolicy": "DESTROY",
             "trafficReplayerServiceEnabled": false,
             "reindexFromSnapshotServiceEnabled": true,
-            "sourceClusterEndpoint": "<SOURCE_CLUSTER_ENDPOINT>"
+            "sourceClusterEndpoint": "<SOURCE_CLUSTER_ENDPOINT>",
+            "tlsSecurityPolicy": "TLS_1_2",
+            "enforceHTTPS": true,
+            "nodeToNodeEncryptionEnabled": true,
+            "encryptionAtRestEnabled": true,
+            "vpcEnabled": true,
+            "vpcAZCount": 2,
+            "domainAZCount": 2,
+            "mskAZCount": 2,
+            "migrationAssistanceEnabled": true,
+            "replayerOutputEFSRemovalPolicy": "DESTROY",
+            "migrationConsoleServiceEnabled": true,
+            "otelCollectorEnabled": true
           }
         }
     """
diff --git a/vars/trafficReplayDefaultE2ETest.groovy b/vars/trafficReplayDefaultE2ETest.groovy
index 5094e1829..e2822bbd7 100644
--- a/vars/trafficReplayDefaultE2ETest.groovy
+++ b/vars/trafficReplayDefaultE2ETest.groovy
@@ -43,7 +43,19 @@ def call(Map config = [:]) {
         "reindexFromSnapshotServiceEnabled": true,
         "sourceClusterEndpoint": "<SOURCE_CLUSTER_ENDPOINT>",
         "migrationConsoleEnableOSI": true,
-        "migrationAPIEnabled": true
+        "migrationAPIEnabled": true,
+        "tlsSecurityPolicy": "TLS_1_2",
+        "enforceHTTPS": true,
+        "nodeToNodeEncryptionEnabled": true,
+        "encryptionAtRestEnabled": true,
+        "vpcEnabled": true,
+        "vpcAZCount": 2,
+        "domainAZCount": 2,
+        "mskAZCount": 2,
+        "migrationAssistanceEnabled": true,
+        "replayerOutputEFSRemovalPolicy": "DESTROY",
+        "migrationConsoleServiceEnabled": true,
+        "otelCollectorEnabled": true
       }
     }
     """