Fixed a few bugs in the gradle setup for rfs (#736)

* Fixed a few bugs in the gradle setup for rfs Signed-off-by: Chris Helma <chelma+github@amazon.com> * Switched RFS Docker Compose back to ES 7.10 Signed-off-by: Chris Helma <chelma+github@amazon.com> --------- Signed-off-by: Chris Helma <chelma+github@amazon.com>
opensearch-project · Jun 19, 2024 · b797e4f · b797e4f
1 parent 4f59ac8
commit b797e4f
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 12 deletions.
diff --git a/RFS/build-preloaded-source-image.gradle b/RFS/build-preloaded-source-image.gradle
@@ -23,11 +23,10 @@ def createNetworkTask = task createNetwork(type: Exec) {
     }
 }
 task createInitialElasticsearchContainer(type: DockerCreateContainer) {
-    dependsOn createNetwork, buildDockerImage_emptyElasticsearchSource_7_17
-    targetImageId 'migrations/emptyElasticsearchSource_7_17:latest'
+    dependsOn createNetwork, buildDockerImage_emptyElasticsearchSource_7_10
+    targetImageId 'migrations/empty_elasticsearch_source_7_10:latest'
     containerName = "elasticsearch-${uniqueId}"
     hostConfig.network = myNetworkName
-    hostConfig.dns = ['elasticsearch']
     networkAliases = ['elasticsearch']
     hostName = 'elasticsearch'
 }
@@ -64,14 +63,14 @@ def sourceContainerCommitTask = task commitSourceContainer() {
         def containerId = createInitialElasticsearchContainer.getContainerId().get()
 
         client.commitCmd(containerId)
-                .withRepository("elasticsearch_rfs_source")
+                .withRepository("migrations/elasticsearch_rfs_source")
                 .withTag("latest")
                 .exec()
     }
 }
 
 task removeClientContainer(type: DockerRemoveContainer) {
-    dependsOn waitClientContainer
+    dependsOn commitSourceContainer
     targetContainerId createClientContainer.getContainerId()
 }
 startClientTask.finalizedBy(removeClientContainer)

diff --git a/RFS/build.gradle b/RFS/build.gradle
@@ -78,7 +78,7 @@ dependencies {
 }
 
 application {
-    mainClassName = 'com.rfs.ReindexFromSnapshot'
+    mainClassName = 'com.rfs.RfsMigrateDocuments'
 }
 
 task runRfsWorker (type: JavaExec) {
@@ -180,6 +180,7 @@ task buildDockerImages {
     for (dockerService in dockerServices) {
         dependsOn "buildDockerImage_${dockerService.projectName}"
     }
+    dependsOn buildDockerImage_elasticsearchRFSSource
 }
 
 tasks.named("buildDockerImage_elasticsearchRFSSource") {

diff --git a/RFS/docker/TestSource_ES_7_10/container-start.sh b/RFS/docker/TestSource_ES_7_10/container-start.sh
@@ -2,11 +2,11 @@
 
 echo "Setting AWS Creds from ENV Variables"
 bin/elasticsearch-keystore create
-echo $AWS_ACCESS_KEY_ID | bin/elasticsearch-keystore add s3.client.default.access_key --stdin
-echo $AWS_SECRET_ACCESS_KEY | bin/elasticsearch-keystore add s3.client.default.secret_key --stdin
+echo $AWS_ACCESS_KEY_ID | bin/elasticsearch-keystore add --stdin s3.client.default.access_key --force
+echo $AWS_SECRET_ACCESS_KEY | bin/elasticsearch-keystore add --stdin s3.client.default.secret_key --force
 
 if [ -n "$AWS_SESSION_TOKEN" ]; then
-    echo $AWS_SESSION_TOKEN | bin/elasticsearch-keystore add s3.client.default.session_token --stdin
+    echo $AWS_SESSION_TOKEN | bin/elasticsearch-keystore add --stdin s3.client.default.session_token --force
 fi
 
 echo "Starting Elasticsearch"

diff --git a/RFS/docker/TestSource_ES_7_17/container-start.sh b/RFS/docker/TestSource_ES_7_17/container-start.sh
@@ -2,11 +2,11 @@
 
 echo "Setting AWS Creds from ENV Variables"
 bin/elasticsearch-keystore create
-echo $AWS_ACCESS_KEY_ID | bin/elasticsearch-keystore add s3.client.default.access_key --stdin
-echo $AWS_SECRET_ACCESS_KEY | bin/elasticsearch-keystore add s3.client.default.secret_key --stdin
+echo $AWS_ACCESS_KEY_ID | bin/elasticsearch-keystore add --stdin s3.client.default.access_key --force
+echo $AWS_SECRET_ACCESS_KEY | bin/elasticsearch-keystore add --stdin s3.client.default.secret_key --force
 
 if [ -n "$AWS_SESSION_TOKEN" ]; then
-    echo $AWS_SESSION_TOKEN | bin/elasticsearch-keystore add s3.client.default.session_token --stdin
+    echo $AWS_SESSION_TOKEN | bin/elasticsearch-keystore add --stdin s3.client.default.session_token --force
 fi
 
 echo "Starting Elasticsearch"