refactor sigv4 logic (#798)

Signed-off-by: Rishabh Singh <[email protected]>
(cherry picked from commit 2dc5f4f)
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>

Author: github-actions[bot]

tests/jenkins/TestRunBenchmarkTestScriptMultiNode.groovy

@@ -44,7 +44,7 @@ class TestRunBenchmarkTestScriptMultiNode extends BuildPipelineTest {
                 'false',
                 '{"telemetry_setting":"value"}',
                 'false',
-                'true',
+                'false',
                 '',
                 '4'
         ))
@@ -77,7 +77,7 @@ class TestRunBenchmarkTestScriptMultiNode extends BuildPipelineTest {
                 "set +x && ./test.sh benchmark-test execute-test --bundle-manifest tests/data/opensearch-1.3.0-bundle.yml     --config /tmp/workspace/config.yml --workload nyc_taxis --benchmark-config /tmp/workspace/benchmark.ini --user-tag distribution-build-id:1236,arch:x64,os-commit-id:22408088f002a4fc8cdd3b2ed7438866c14c5069,key1:value1,security-enabled:false --without-security        --heap-size-in-gb 4 --enable-remote-store --capture-node-stat   --suffix 307 --manager-node-count 3 --data-node-count 3     --workload-params '{\"key2\":\"value2\"}' --test-procedure custom-test-procedure --exclude-tasks index-append,default --include-tasks type:search,index --additional-config cluster.indices.replication.strategy:SEGMENT --data-node-storage 200 --ml-node-storage 200  --telemetry-params '{\"telemetry_setting\":\"value\"}'".toString()
         ))
         assertThat(testScriptCommands, hasItem(
-                "set +x && ./test.sh benchmark-test execute-test --bundle-manifest tests/data/opensearch-1.3.0-bundle.yml     --config /tmp/workspace/config.yml --workload nyc_taxis --benchmark-config /tmp/workspace/benchmark.ini --user-tag distribution-build-id:1236,arch:x64,os-commit-id:22408088f002a4fc8cdd3b2ed7438866c14c5069,key1:value1,security-enabled:true  --sigv4       --heap-size-in-gb 4 --enable-remote-store --capture-node-stat   --suffix 307-secure --manager-node-count 3 --data-node-count 3     --workload-params '{\"key2\":\"value2\"}' --test-procedure custom-test-procedure --exclude-tasks index-append,default --include-tasks type:search,index --additional-config cluster.indices.replication.strategy:SEGMENT --data-node-storage 200 --ml-node-storage 200  --telemetry-params '{\"telemetry_setting\":\"value\"}'".toString()
+                "set +x && ./test.sh benchmark-test execute-test --bundle-manifest tests/data/opensearch-1.3.0-bundle.yml     --config /tmp/workspace/config.yml --workload nyc_taxis --benchmark-config /tmp/workspace/benchmark.ini --user-tag distribution-build-id:1236,arch:x64,os-commit-id:22408088f002a4fc8cdd3b2ed7438866c14c5069,key1:value1,security-enabled:true         --heap-size-in-gb 4 --enable-remote-store --capture-node-stat   --suffix 307-secure --manager-node-count 3 --data-node-count 3     --workload-params '{\"key2\":\"value2\"}' --test-procedure custom-test-procedure --exclude-tasks index-append,default --include-tasks type:search,index --additional-config cluster.indices.replication.strategy:SEGMENT --data-node-storage 200 --ml-node-storage 200  --telemetry-params '{\"telemetry_setting\":\"value\"}'".toString()
         ))
     }
 

tests/jenkins/TestRunCompareTestScript.groovy

@@ -48,7 +48,7 @@ class TestRunCompareTestScript extends BuildPipelineTest {
         super.testPipeline("tests/jenkins/jobs/CompareTest_Jenkinsfile")
     }
 
-    @Test 
+    @Test
     void testRunCompareTestScript_verifyScriptExecutionSingleNode() {
         runScript("tests/jenkins/jobs/CompareTest_Jenkinsfile")
 

tests/jenkins/jobs/BenchmarkTestMultinode_Jenkinsfile

@@ -24,7 +24,7 @@ pipeline {
                             distributionVersion: DISTRIBUTION_VERSION,
                             workload: TEST_WORKLOAD,
                             insecure: "false",
-                            sigv4: "true",
+                            sigv4: "false",
                             region: "",
                             service: "",
                             singleNode: SINGLE_NODE_CLUSTER,

tests/jenkins/jobs/BenchmarkTestMultinode_Jenkinsfile.txt

@@ -12,24 +12,22 @@
                   downloadBuildManifest.sh(curl -sSL --retry 5 test://artifact.url --output tests/data/opensearch-1.3.0-bundle.yml)
                   downloadBuildManifest.readYaml({file=tests/data/opensearch-1.3.0-bundle.yml})
                   BuildManifest.asBoolean()
-               BenchmarkTestMultinode_Jenkinsfile.runBenchmarkTestScript({command=execute-test, bundleManifest=tests/data/opensearch-1.3.0-bundle.yml, distributionUrl=, distributionVersion=, workload=nyc_taxis, insecure=false, sigv4=true, region=, service=, singleNode=false, minDistribution=false, heapSizeInGb=4, enableRemoteStore=true, suffix=307-secure, managerNodeCount=3, dataNodeCount=3, clientNodeCount=, ingestNodeCount=, mlNodeCount=, dataInstanceType=, pluginUrl=, userTag=key1:value1,security-enabled:true, workloadParams={"key2":"value2"}, testProcedure=custom-test-procedure, excludeTasks=index-append,default, includeTasks=type:search,index, additionalConfig=cluster.indices.replication.strategy:SEGMENT, dataStorageSize=200, mlStorageSize=200, enableInstanceStorage=false, jvmSysProps=, captureNodeStat=true, captureSegmentReplicationStat=false, telemetryParams={"telemetry_setting":"value"}})
+               BenchmarkTestMultinode_Jenkinsfile.runBenchmarkTestScript({command=execute-test, bundleManifest=tests/data/opensearch-1.3.0-bundle.yml, distributionUrl=, distributionVersion=, workload=nyc_taxis, insecure=false, sigv4=false, region=, service=, singleNode=false, minDistribution=false, heapSizeInGb=4, enableRemoteStore=true, suffix=307-secure, managerNodeCount=3, dataNodeCount=3, clientNodeCount=, ingestNodeCount=, mlNodeCount=, dataInstanceType=, pluginUrl=, userTag=key1:value1,security-enabled:true, workloadParams={"key2":"value2"}, testProcedure=custom-test-procedure, excludeTasks=index-append,default, includeTasks=type:search,index, additionalConfig=cluster.indices.replication.strategy:SEGMENT, dataStorageSize=200, mlStorageSize=200, enableInstanceStorage=false, jvmSysProps=, captureNodeStat=true, captureSegmentReplicationStat=false, telemetryParams={"telemetry_setting":"value"}})
                   runBenchmarkTestScript.legacySCM(groovy.lang.Closure)
                   runBenchmarkTestScript.library({[email protected], retriever=null})
                   runBenchmarkTestScript.readYaml({file=tests/data/opensearch-1.3.0-bundle.yml})
                   BuildManifest.asBoolean()
                   runBenchmarkTestScript.withSecrets({secrets=[{envVar=ARTIFACT_BUCKET_NAME, secretRef=op://opensearch-infra-secrets/aws-resource-arns/jenkins-artifact-bucket-name}, {envVar=AWS_ACCOUNT_PUBLIC, secretRef=op://opensearch-infra-secrets/aws-accounts/jenkins-aws-account-public}]}, groovy.lang.Closure)
                      runBenchmarkTestScript.withAWS({role=opensearch-test, roleAccount=dummy_account, duration=900, roleSessionName=jenkins-session}, groovy.lang.Closure)
                         runBenchmarkTestScript.s3Download({file=config.yml, bucket=test_bucket, path=test_config/config.yml, force=true})
-                        runBenchmarkTestScript.s3Download({file=benchmark.ini, bucket=test_bucket, path=test_config/benchmark_sigv4.ini, force=true})
+                        runBenchmarkTestScript.s3Download({file=benchmark.ini, bucket=test_bucket, path=test_config/benchmark.ini, force=true})
                   runBenchmarkTestScript.withSecrets({secrets=[{envVar=DATASTORE_USER, secretRef=op://opensearch-infra-secrets/benchmark-metrics/benchmark-metrics-datastore-user}, {envVar=DATASTORE_PASSWORD, secretRef=op://opensearch-infra-secrets/benchmark-metrics/benchmark-metrics-datastore-password}]}, groovy.lang.Closure)
                      runBenchmarkTestScript.readFile({file=/tmp/workspace/benchmark.ini})
                      runBenchmarkTestScript.writeFile({file=/tmp/workspace/benchmark.ini, text=})
                   BuildManifest.getArtifactBuildId()
                   BuildManifest.getArtifactArchitecture()
                   BuildManifest.getCommitId(OpenSearch)
-                  runBenchmarkTestScript.withSecrets({secrets=[{envVar=PERF_TEST_ACCOUNT_ID, secretRef=op://opensearch-infra-secrets/aws-accounts/perf-test-account-id}]}, groovy.lang.Closure)
-                     runBenchmarkTestScript.withAWS({role=opensearch-full-access-nightlies, roleAccount=PERF_TEST_ACCOUNT_ID, duration=43200, roleSessionName=jenkins-session}, groovy.lang.Closure)
-                        runBenchmarkTestScript.sh(set +x && ./test.sh benchmark-test execute-test --bundle-manifest tests/data/opensearch-1.3.0-bundle.yml     --config /tmp/workspace/config.yml --workload nyc_taxis --benchmark-config /tmp/workspace/benchmark.ini --user-tag distribution-build-id:1236,arch:x64,os-commit-id:22408088f002a4fc8cdd3b2ed7438866c14c5069,key1:value1,security-enabled:true  --sigv4       --heap-size-in-gb 4 --enable-remote-store --capture-node-stat   --suffix 307-secure --manager-node-count 3 --data-node-count 3     --workload-params '{"key2":"value2"}' --test-procedure custom-test-procedure --exclude-tasks index-append,default --include-tasks type:search,index --additional-config cluster.indices.replication.strategy:SEGMENT --data-node-storage 200 --ml-node-storage 200  --telemetry-params '{"telemetry_setting":"value"}')
+                  runBenchmarkTestScript.sh(set +x && ./test.sh benchmark-test execute-test --bundle-manifest tests/data/opensearch-1.3.0-bundle.yml     --config /tmp/workspace/config.yml --workload nyc_taxis --benchmark-config /tmp/workspace/benchmark.ini --user-tag distribution-build-id:1236,arch:x64,os-commit-id:22408088f002a4fc8cdd3b2ed7438866c14c5069,key1:value1,security-enabled:true         --heap-size-in-gb 4 --enable-remote-store --capture-node-stat   --suffix 307-secure --manager-node-count 3 --data-node-count 3     --workload-params '{"key2":"value2"}' --test-procedure custom-test-procedure --exclude-tasks index-append,default --include-tasks type:search,index --additional-config cluster.indices.replication.strategy:SEGMENT --data-node-storage 200 --ml-node-storage 200  --telemetry-params '{"telemetry_setting":"value"}')
          BenchmarkTestMultinode_Jenkinsfile.stage(test-without-security, groovy.lang.Closure)
             BenchmarkTestMultinode_Jenkinsfile.script(groovy.lang.Closure)
                BenchmarkTestMultinode_Jenkinsfile.downloadBuildManifest({url=test://artifact.url, path=tests/data/opensearch-1.3.0-bundle.yml})
@@ -56,6 +54,4 @@
                   BuildManifest.getArtifactBuildId()
                   BuildManifest.getArtifactArchitecture()
                   BuildManifest.getCommitId(OpenSearch)
-                  runBenchmarkTestScript.withSecrets({secrets=[{envVar=PERF_TEST_ACCOUNT_ID, secretRef=op://opensearch-infra-secrets/aws-accounts/perf-test-account-id}]}, groovy.lang.Closure)
-                     runBenchmarkTestScript.withAWS({role=opensearch-full-access-nightlies, roleAccount=PERF_TEST_ACCOUNT_ID, duration=43200, roleSessionName=jenkins-session}, groovy.lang.Closure)
-                        runBenchmarkTestScript.sh(set +x && ./test.sh benchmark-test execute-test --bundle-manifest tests/data/opensearch-1.3.0-bundle.yml     --config /tmp/workspace/config.yml --workload nyc_taxis --benchmark-config /tmp/workspace/benchmark.ini --user-tag distribution-build-id:1236,arch:x64,os-commit-id:22408088f002a4fc8cdd3b2ed7438866c14c5069,key1:value1,security-enabled:false --without-security        --heap-size-in-gb 4 --enable-remote-store --capture-node-stat   --suffix 307 --manager-node-count 3 --data-node-count 3     --workload-params '{"key2":"value2"}' --test-procedure custom-test-procedure --exclude-tasks index-append,default --include-tasks type:search,index --additional-config cluster.indices.replication.strategy:SEGMENT --data-node-storage 200 --ml-node-storage 200  --telemetry-params '{"telemetry_setting":"value"}')
+                  runBenchmarkTestScript.sh(set +x && ./test.sh benchmark-test execute-test --bundle-manifest tests/data/opensearch-1.3.0-bundle.yml     --config /tmp/workspace/config.yml --workload nyc_taxis --benchmark-config /tmp/workspace/benchmark.ini --user-tag distribution-build-id:1236,arch:x64,os-commit-id:22408088f002a4fc8cdd3b2ed7438866c14c5069,key1:value1,security-enabled:false --without-security        --heap-size-in-gb 4 --enable-remote-store --capture-node-stat   --suffix 307 --manager-node-count 3 --data-node-count 3     --workload-params '{"key2":"value2"}' --test-procedure custom-test-procedure --exclude-tasks index-append,default --include-tasks type:search,index --additional-config cluster.indices.replication.strategy:SEGMENT --data-node-storage 200 --ml-node-storage 200  --telemetry-params '{"telemetry_setting":"value"}')

tests/jenkins/jobs/BenchmarkTestNoManifest_Jenkinsfile.txt

@@ -13,9 +13,7 @@
                   runBenchmarkTestScript.withSecrets({secrets=[{envVar=DATASTORE_USER, secretRef=op://opensearch-infra-secrets/benchmark-metrics/benchmark-metrics-datastore-user}, {envVar=DATASTORE_PASSWORD, secretRef=op://opensearch-infra-secrets/benchmark-metrics/benchmark-metrics-datastore-password}]}, groovy.lang.Closure)
                      runBenchmarkTestScript.readFile({file=/tmp/workspace/benchmark.ini})
                      runBenchmarkTestScript.writeFile({file=/tmp/workspace/benchmark.ini, text=})
-                  runBenchmarkTestScript.withSecrets({secrets=[{envVar=PERF_TEST_ACCOUNT_ID, secretRef=op://opensearch-infra-secrets/aws-accounts/perf-test-account-id}]}, groovy.lang.Closure)
-                     runBenchmarkTestScript.withAWS({role=opensearch-full-access-nightlies, roleAccount=PERF_TEST_ACCOUNT_ID, duration=43200, roleSessionName=jenkins-session}, groovy.lang.Closure)
-                        runBenchmarkTestScript.sh(set +x && ./test.sh benchmark-test execute-test  --distribution-url https://www.example.com/example.tar.gz --plugin-url www.example.com/plugin.zip --distribution-version 3.0.0  --config /tmp/workspace/config.yml --workload nyc_taxis --benchmark-config /tmp/workspace/benchmark.ini --user-tag security-enabled:true       --single-node  --heap-size-in-gb 4   --enable-instance-storage --capture-segment-replication-stat --suffix 307-secure      --data-instance-type r5.8xlarge  --test-procedure custom-test-procedure   --additional-config cluster.indices.replication.strategy:SEGMENT --data-node-storage 200 --ml-node-storage 200)
+                  runBenchmarkTestScript.sh(set +x && ./test.sh benchmark-test execute-test  --distribution-url https://www.example.com/example.tar.gz --plugin-url www.example.com/plugin.zip --distribution-version 3.0.0  --config /tmp/workspace/config.yml --workload nyc_taxis --benchmark-config /tmp/workspace/benchmark.ini --user-tag security-enabled:true       --single-node  --heap-size-in-gb 4   --enable-instance-storage --capture-segment-replication-stat --suffix 307-secure      --data-instance-type r5.8xlarge  --test-procedure custom-test-procedure   --additional-config cluster.indices.replication.strategy:SEGMENT --data-node-storage 200 --ml-node-storage 200)
          BenchmarkTestNoManifest_Jenkinsfile.stage(test-without-security, groovy.lang.Closure)
             BenchmarkTestNoManifest_Jenkinsfile.script(groovy.lang.Closure)
                BenchmarkTestNoManifest_Jenkinsfile.runBenchmarkTestScript({command=execute-test, bundleManifest=, distributionUrl=https://www.example.com/example.tar.gz, distributionVersion=3.0.0, workload=nyc_taxis, insecure=true, sigv4=false, region=, service=, singleNode=true, minDistribution=false, heapSizeInGb=4, enableRemoteStore=false, suffix=307, managerNodeCount=, dataNodeCount=, clientNodeCount=, ingestNodeCount=, mlNodeCount=, dataInstanceType=r5.8xlarge, pluginUrl=www.example.com/plugin.zip, userTag=security-enabled:false, workloadParams=, testProcedure=custom-test-procedure, excludeTasks=, includeTasks=, additionalConfig=cluster.indices.replication.strategy:SEGMENT, dataStorageSize=200, mlStorageSize=200, enableInstanceStorage=true, jvmSysProps=, captureNodeStat=false, captureSegmentReplicationStat=true, telemetryParams=})
@@ -28,6 +26,4 @@
                   runBenchmarkTestScript.withSecrets({secrets=[{envVar=DATASTORE_USER, secretRef=op://opensearch-infra-secrets/benchmark-metrics/benchmark-metrics-datastore-user}, {envVar=DATASTORE_PASSWORD, secretRef=op://opensearch-infra-secrets/benchmark-metrics/benchmark-metrics-datastore-password}]}, groovy.lang.Closure)
                      runBenchmarkTestScript.readFile({file=/tmp/workspace/benchmark.ini})
                      runBenchmarkTestScript.writeFile({file=/tmp/workspace/benchmark.ini, text=})
-                  runBenchmarkTestScript.withSecrets({secrets=[{envVar=PERF_TEST_ACCOUNT_ID, secretRef=op://opensearch-infra-secrets/aws-accounts/perf-test-account-id}]}, groovy.lang.Closure)
-                     runBenchmarkTestScript.withAWS({role=opensearch-full-access-nightlies, roleAccount=PERF_TEST_ACCOUNT_ID, duration=43200, roleSessionName=jenkins-session}, groovy.lang.Closure)
-                        runBenchmarkTestScript.sh(set +x && ./test.sh benchmark-test execute-test  --distribution-url https://www.example.com/example.tar.gz --plugin-url www.example.com/plugin.zip --distribution-version 3.0.0  --config /tmp/workspace/config.yml --workload nyc_taxis --benchmark-config /tmp/workspace/benchmark.ini --user-tag security-enabled:false --without-security      --single-node  --heap-size-in-gb 4   --enable-instance-storage --capture-segment-replication-stat --suffix 307      --data-instance-type r5.8xlarge  --test-procedure custom-test-procedure   --additional-config cluster.indices.replication.strategy:SEGMENT --data-node-storage 200 --ml-node-storage 200)
+                  runBenchmarkTestScript.sh(set +x && ./test.sh benchmark-test execute-test  --distribution-url https://www.example.com/example.tar.gz --plugin-url www.example.com/plugin.zip --distribution-version 3.0.0  --config /tmp/workspace/config.yml --workload nyc_taxis --benchmark-config /tmp/workspace/benchmark.ini --user-tag security-enabled:false --without-security      --single-node  --heap-size-in-gb 4   --enable-instance-storage --capture-segment-replication-stat --suffix 307      --data-instance-type r5.8xlarge  --test-procedure custom-test-procedure   --additional-config cluster.indices.replication.strategy:SEGMENT --data-node-storage 200 --ml-node-storage 200)