make repository-s3 plugin installation default (#79)

Signed-off-by: Rishabh Singh <[email protected]> (cherry picked from commit b9665a6) Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
opensearch-project · Jul 22, 2024 · 2a4192d · 2a4192d
1 parent 1ad73d4
commit 2a4192d
Showing 1 changed file with 13 additions and 9 deletions.
diff --git a/lib/infra/infra-stack.ts b/lib/infra/infra-stack.ts
@@ -465,24 +465,28 @@ export class InfraStack extends Stack {
           cwd: '/home/ec2-user',
           ignoreErrors: false,
         }));
-        cfnInitConfig.push(InitCommand.shellCommand('set -ex;cd opensearch;sudo -u ec2-user bin/opensearch-plugin install repository-s3 --batch', {
-          cwd: '/home/ec2-user',
-          ignoreErrors: false,
-        }));
       } else {
         cfnInitConfig.push(InitCommand.shellCommand('set -ex;cd opensearch; echo "y"|sudo -u ec2-user bin/opensearch-plugin install '
             + `https://ci.opensearch.org/ci/dbc/distribution-build-opensearch/${props.opensearchVersion}/latest/linux/${props.cpuArch}`
             + `/tar/builds/opensearch/core-plugins/discovery-ec2-${props.opensearchVersion}.zip --batch`, {
           cwd: '/home/ec2-user',
           ignoreErrors: false,
         }));
-        cfnInitConfig.push(InitCommand.shellCommand('set -ex;cd opensearch;sudo -u ec2-user bin/opensearch-plugin install '
+      }
+    }
+
+    if (props.distributionUrl.includes('artifacts.opensearch.org') && !props.minDistribution) {
+      cfnInitConfig.push(InitCommand.shellCommand('set -ex;cd opensearch;sudo -u ec2-user bin/opensearch-plugin install repository-s3 --batch', {
+        cwd: '/home/ec2-user',
+        ignoreErrors: false,
+      }));
+    } else {
+      cfnInitConfig.push(InitCommand.shellCommand('set -ex;cd opensearch;sudo -u ec2-user bin/opensearch-plugin install '
           + `https://ci.opensearch.org/ci/dbc/distribution-build-opensearch/${props.opensearchVersion}/latest/linux/${props.cpuArch}`
           + `/tar/builds/opensearch/core-plugins/repository-s3-${props.opensearchVersion}.zip --batch`, {
-          cwd: '/home/ec2-user',
-          ignoreErrors: false,
-        }));
-      }
+        cwd: '/home/ec2-user',
+        ignoreErrors: false,
+      }));
     }
 
     // add config to disable security if required