RFS Jar Swap Complete

Signed-off-by: Chris Helma <chelma+github@amazon.com>
chelma · Jun 19, 2024 · dd1abd3 · dd1abd3
1 parent b28b347
commit dd1abd3
Show file tree

Hide file tree

Showing 5 changed files with 2 additions and 15 deletions.
diff --git a/DocumentsFromSnapshotMigration/build.gradle b/DocumentsFromSnapshotMigration/build.gradle
@@ -24,7 +24,7 @@ dependencies {
 }
 
 application {
-    mainClassName = 'com.rfs.MigrateDocuments'
+    mainClassName = 'com.rfs.RfsMigrateDocuments'
 }
 
 // Utility task to allow copying required libraries into a 'dependencies' folder for security scanning

diff --git a/...ain/java/com/rfs/RfsMigrateDocuments.java → ...ain/java/com/rfs/RfsMigrateDocuments.java b/...ain/java/com/rfs/RfsMigrateDocuments.java → ...ain/java/com/rfs/RfsMigrateDocuments.java
@@ -7,9 +7,6 @@
 import java.nio.file.Paths;
 
 import lombok.extern.slf4j.Slf4j;
-import org.apache.logging.log4j.Level;
-import org.apache.logging.log4j.Logger;
-import org.apache.logging.log4j.LogManager;
 
 
 import com.rfs.cms.CmsClient;
@@ -18,7 +15,6 @@
 import com.rfs.common.DefaultSourceRepoAccessor;
 import com.rfs.common.DocumentReindexer;
 import com.rfs.common.IndexMetadata;
-import com.rfs.common.Logging;
 import com.rfs.common.LuceneDocumentsReader;
 import com.rfs.common.OpenSearchClient;
 import com.rfs.common.S3Uri;

diff --git a/...c/main/java/com/rfs/MigrateDocuments.java → ...c/main/java/com/rfs/MigrateDocuments.java b/...c/main/java/com/rfs/MigrateDocuments.java → ...c/main/java/com/rfs/MigrateDocuments.java
diff --git a/deployment/cdk/opensearch-service-migration/lib/service-stacks/migration-service-core.ts b/deployment/cdk/opensearch-service-migration/lib/service-stacks/migration-service-core.ts
@@ -54,11 +54,8 @@ export interface MigrationServiceCoreProps extends StackPropsExt {
     readonly ulimits?: Ulimit[],
     readonly maxUptime?: Duration,
     readonly otelCollectorEnabled?: boolean,
-<<<<<<< Updated upstream
     readonly targetGroups?: ELBTargetGroup[],
-=======
     readonly ephemeralStorageGiB?: number
->>>>>>> Stashed changes
 }
 
 export type ELBTargetGroup = IApplicationTargetGroup | INetworkTargetGroup;

diff --git a/...oyment/cdk/opensearch-service-migration/lib/service-stacks/reindex-from-snapshot-stack.ts b/...oyment/cdk/opensearch-service-migration/lib/service-stacks/reindex-from-snapshot-stack.ts
@@ -60,18 +60,12 @@ export class ReindexFromSnapshotStack extends MigrationServiceCore {
         const openSearchServerlessPolicy = createOpenSearchServerlessIAMAccessPolicy(this.partition, this.region, this.account)
         let servicePolicies = [artifactS3PublishPolicy, openSearchPolicy, openSearchServerlessPolicy]
 
-<<<<<<< Updated upstream
         const osClusterEndpoint = getMigrationStringParameterValue(this, {
             ...props,
             parameter: MigrationSSMParameter.OS_CLUSTER_ENDPOINT,
         });
         const s3Uri = `s3://migration-artifacts-${this.account}-${props.stage}-${this.region}/rfs-snapshot-repo`;
-        let rfsCommand = `/rfs-app/runJavaWithClasspath.sh com.rfs.ReindexFromSnapshot --s3-local-dir /tmp/s3_files --s3-repo-uri ${s3Uri} --s3-region ${this.region} --snapshot-name rfs-snapshot --min-replicas 1 --enable-persistent-run --lucene-dir '/lucene' --source-host ${sourceEndpoint} --target-host ${osClusterEndpoint} --source-version es_7_10 --target-version os_2_11`
-=======
-        const osClusterEndpoint = StringParameter.valueForStringParameter(this, `/migration/${props.stage}/${props.defaultDeployId}/osClusterEndpoint`)
-        const s3Uri = `s3://migration-artifacts-${this.account}-${props.stage}-${this.region}/rfs-snapshot-repo`
-        let rfsCommand = `/rfs-app/runJavaWithClasspath.sh com.rfs.RfsMigrateDocuments --s3-local-dir /tmp/s3_files --s3-repo-uri ${s3Uri} --s3-region ${this.region} --snapshot-name rfs-snapshot --min-replicas 1 --lucene-dir '/lucene' --target-host ${osClusterEndpoint}`
->>>>>>> Stashed changes
+        let rfsCommand = `/rfs-app/runJavaWithClasspath.sh com.rfs.MigrateDocuments --s3-local-dir /tmp/s3_files --s3-repo-uri ${s3Uri} --s3-region ${this.region} --snapshot-name rfs-snapshot --lucene-dir '/lucene' --target-host ${osClusterEndpoint}`
         rfsCommand = props.extraArgs ? rfsCommand.concat(` ${props.extraArgs}`) : rfsCommand
 
         this.createService({