Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Make cdk.context.json valid json #1022

Merged
merged 2 commits into from
Sep 27, 2024
Merged

Make cdk.context.json valid json #1022

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
049c160
Make cdk.context.json valid json
mikaylathompson Sep 26, 2024
871d43d
re-add the former defaults to testing cdk
mikaylathompson Sep 27, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions deployment/cdk/opensearch-service-migration/cdk.context.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
Expand All @@ -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"
}
Expand Down
10 changes: 9 additions & 1 deletion test/defaultMigrationContext.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
}
14 changes: 13 additions & 1 deletion vars/rfsDefaultE2ETest.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
}
"""
Expand Down
14 changes: 13 additions & 1 deletion vars/trafficReplayDefaultE2ETest.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
}
"""
Expand Down