Generalize run samples script (#443)

* Rename run_sample_ci.py into run_in_ci.py * Add utils/ci_iot_thing.py tool that helps with creating/deleting IoT things * Use a designated Python script to run Fleet Provisioning sample
aws · Nov 22, 2023 · 175c08d · 175c08d
1 parent 5107002
commit 175c08d
Show file tree

Hide file tree

Showing 24 changed files with 271 additions and 206 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -90,10 +90,10 @@ jobs:
         aws-region: ${{ env.AWS_DEFAULT_REGION }}
     - name: run PubSub sample
       run: |
-        python ./aws-iot-device-sdk-js-v2/utils/run_sample_ci.py --file ./aws-iot-device-sdk-js-v2/.github/workflows/ci_run_pubsub_cfg.json
+        python ./aws-iot-device-sdk-js-v2/utils/run_in_ci.py --file ./aws-iot-device-sdk-js-v2/.github/workflows/ci_run_pubsub_cfg.json
     - name: run Windows Certificate Connect sample
       run: |
-        python ./aws-iot-device-sdk-js-v2/utils/run_sample_ci.py --file ./aws-iot-device-sdk-js-v2/.github/workflows/ci_run_windows_cert_connect_cfg.json
+        python ./aws-iot-device-sdk-js-v2/utils/run_in_ci.py --file ./aws-iot-device-sdk-js-v2/.github/workflows/ci_run_windows_cert_connect_cfg.json
     - name: configure AWS credentials (Device Advisor)
       uses: aws-actions/configure-aws-credentials@v1
       with:
@@ -124,14 +124,14 @@ jobs:
         aws-region: ${{ env.AWS_DEFAULT_REGION }}
     - name: run PubSub sample
       run: |
-        python3 ./aws-iot-device-sdk-js-v2/utils/run_sample_ci.py --file ./aws-iot-device-sdk-js-v2/.github/workflows/ci_run_pubsub_cfg.json
+        python3 ./aws-iot-device-sdk-js-v2/utils/run_in_ci.py --file ./aws-iot-device-sdk-js-v2/.github/workflows/ci_run_pubsub_cfg.json
     - name: run PKCS12 sample
       run: |
         cert=$(aws secretsmanager get-secret-value --region us-east-1 --secret-id "ci/PubSub/cert" --query "SecretString" | cut -f2 -d":" | cut -f2 -d\") && echo -e "$cert" > /tmp/certificate.pem
         key=$(aws secretsmanager get-secret-value --region us-east-1 --secret-id "ci/PubSub/key" --query "SecretString" | cut -f2 -d":" | cut -f2 -d\") && echo -e "$key" > /tmp/privatekey.pem
         pkcs12_password=$(aws secretsmanager get-secret-value --region us-east-1 --secret-id "ci/PubSub/key_pkcs12_password" --query "SecretString" | cut -f2 -d":" | cut -f2 -d\")
         openssl pkcs12 -export -in /tmp/certificate.pem -inkey /tmp/privatekey.pem -out /tmp/pkcs12-key.p12 -name PubSub_Thing_Alias -password pass:$pkcs12_password
-        python3 ./aws-iot-device-sdk-js-v2/utils/run_sample_ci.py --file ./aws-iot-device-sdk-js-v2/.github/workflows/ci_run_pkcs12_connect_cfg.json
+        python3 ./aws-iot-device-sdk-js-v2/utils/run_in_ci.py --file ./aws-iot-device-sdk-js-v2/.github/workflows/ci_run_pkcs12_connect_cfg.json
     - name: configure AWS credentials (Device Advisor)
       uses: aws-actions/configure-aws-credentials@v1
       with:
@@ -162,7 +162,7 @@ jobs:
         aws-region: ${{ env.AWS_DEFAULT_REGION }}
     - name: run PubSub sample
       run: |
-        python3 ./aws-iot-device-sdk-js-v2/utils/run_sample_ci.py --file ./aws-iot-device-sdk-js-v2/.github/workflows/ci_run_pubsub_cfg.json
+        python3 ./aws-iot-device-sdk-js-v2/utils/run_in_ci.py --file ./aws-iot-device-sdk-js-v2/.github/workflows/ci_run_pubsub_cfg.json
     - name: configure AWS credentials (Device Advisor)
       uses: aws-actions/configure-aws-credentials@v1
       with:
@@ -197,104 +197,98 @@ jobs:
         aws-region: ${{ env.AWS_DEFAULT_REGION }}
     - name: run Basic Connect sample
       run: |
-        python3 ./aws-iot-device-sdk-js-v2/utils/run_sample_ci.py --file ./aws-iot-device-sdk-js-v2/.github/workflows/ci_run_basic_connect_cfg.json
+        python3 ./aws-iot-device-sdk-js-v2/utils/run_in_ci.py --file ./aws-iot-device-sdk-js-v2/.github/workflows/ci_run_basic_connect_cfg.json
     - name: run Websocket Connect sample
       run: |
-        python3 ./aws-iot-device-sdk-js-v2/utils/run_sample_ci.py --file ./aws-iot-device-sdk-js-v2/.github/workflows/ci_run_websocket_connect_cfg.json
+        python3 ./aws-iot-device-sdk-js-v2/utils/run_in_ci.py --file ./aws-iot-device-sdk-js-v2/.github/workflows/ci_run_websocket_connect_cfg.json
     - name: run PubSub sample
       run: |
-        python3 ./aws-iot-device-sdk-js-v2/utils/run_sample_ci.py --file ./aws-iot-device-sdk-js-v2/.github/workflows/ci_run_pubsub_cfg.json
+        python3 ./aws-iot-device-sdk-js-v2/utils/run_in_ci.py --file ./aws-iot-device-sdk-js-v2/.github/workflows/ci_run_pubsub_cfg.json
     - name: run PubSub JS sample
       run: |
-        python3 ./aws-iot-device-sdk-js-v2/utils/run_sample_ci.py --file ./aws-iot-device-sdk-js-v2/.github/workflows/ci_run_pubsub_js_cfg.json
+        python3 ./aws-iot-device-sdk-js-v2/utils/run_in_ci.py --file ./aws-iot-device-sdk-js-v2/.github/workflows/ci_run_pubsub_js_cfg.json
     - name: run PKCS11 Connect sample
       run: |
         mkdir -p /tmp/tokens
         export SOFTHSM2_CONF=/tmp/softhsm2.conf
         echo "directories.tokendir = /tmp/tokens" > /tmp/softhsm2.conf
-        python3 ./aws-iot-device-sdk-js-v2/utils/run_sample_ci.py --file ./aws-iot-device-sdk-js-v2/.github/workflows/ci_run_pkcs11_connect_cfg.json
+        python3 ./aws-iot-device-sdk-js-v2/utils/run_in_ci.py --file ./aws-iot-device-sdk-js-v2/.github/workflows/ci_run_pkcs11_connect_cfg.json
     - name: configure AWS credentials (Cognito)
       uses: aws-actions/configure-aws-credentials@v1
       with:
         role-to-assume: ${{ env.CI_COGNITO_ROLE }}
         aws-region: ${{ env.AWS_DEFAULT_REGION }}
     - name: run Cognito Connect sample
       run: |
-        python3 ./aws-iot-device-sdk-js-v2/utils/run_sample_ci.py --file ./aws-iot-device-sdk-js-v2/.github/workflows/ci_run_cognito_connect_cfg.json
+        python3 ./aws-iot-device-sdk-js-v2/utils/run_in_ci.py --file ./aws-iot-device-sdk-js-v2/.github/workflows/ci_run_cognito_connect_cfg.json
     - name: configure AWS credentials (X509)
       uses: aws-actions/configure-aws-credentials@v1
       with:
         role-to-assume: ${{ env.CI_X509_ROLE }}
         aws-region: ${{ env.AWS_DEFAULT_REGION }}
     - name: run X509 sample
       run: |
-        python3 ./aws-iot-device-sdk-js-v2/utils/run_sample_ci.py --file ./aws-iot-device-sdk-js-v2/.github/workflows/ci_run_x509_connect_cfg.json
+        python3 ./aws-iot-device-sdk-js-v2/utils/run_in_ci.py --file ./aws-iot-device-sdk-js-v2/.github/workflows/ci_run_x509_connect_cfg.json
     - name: configure AWS credentials (Custom Authorizer)
       uses: aws-actions/configure-aws-credentials@v1
       with:
         role-to-assume: ${{ env.CI_CUSTOM_AUTHORIZER_ROLE }}
         aws-region: ${{ env.AWS_DEFAULT_REGION }}
     - name: run CustomAuthorizerConnect sample
       run: |
-        python3 ./aws-iot-device-sdk-js-v2/utils/run_sample_ci.py --file ./aws-iot-device-sdk-js-v2/.github/workflows/ci_run_custom_authorizer_connect_cfg.json
+        python3 ./aws-iot-device-sdk-js-v2/utils/run_in_ci.py --file ./aws-iot-device-sdk-js-v2/.github/workflows/ci_run_custom_authorizer_connect_cfg.json
     - name: configure AWS credentials (Shadow)
       uses: aws-actions/configure-aws-credentials@v1
       with:
         role-to-assume: ${{ env.CI_SHADOW_ROLE }}
         aws-region: ${{ env.AWS_DEFAULT_REGION }}
     - name: run Shadow sample
       run: |
-        python3 ./aws-iot-device-sdk-js-v2/utils/run_sample_ci.py --file ./aws-iot-device-sdk-js-v2/.github/workflows/ci_run_shadow_cfg.json
+        python3 ./aws-iot-device-sdk-js-v2/utils/run_in_ci.py --file ./aws-iot-device-sdk-js-v2/.github/workflows/ci_run_shadow_cfg.json
     - name: run Mqtt5 Shadow sample
       run: |
-        python3 ./aws-iot-device-sdk-js-v2/utils/run_sample_ci.py --file ./aws-iot-device-sdk-js-v2/.github/workflows/ci_run_shadow_mqtt5_cfg.json
+        python3 ./aws-iot-device-sdk-js-v2/utils/run_in_ci.py --file ./aws-iot-device-sdk-js-v2/.github/workflows/ci_run_shadow_mqtt5_cfg.json
     - name: configure AWS credentials (Jobs)
       uses: aws-actions/configure-aws-credentials@v1
       with:
         role-to-assume: ${{ env.CI_JOBS_ROLE }}
         aws-region: ${{ env.AWS_DEFAULT_REGION }}
     - name: run Jobs sample
       run: |
-        python3 ./aws-iot-device-sdk-js-v2/utils/run_sample_ci.py --file ./aws-iot-device-sdk-js-v2/.github/workflows/ci_run_jobs_cfg.json
+        python3 ./aws-iot-device-sdk-js-v2/utils/run_in_ci.py --file ./aws-iot-device-sdk-js-v2/.github/workflows/ci_run_jobs_cfg.json
     - name: run Mqtt5 Jobs sample
       run: |
-        python3 ./aws-iot-device-sdk-js-v2/utils/run_sample_ci.py --file ./aws-iot-device-sdk-js-v2/.github/workflows/ci_run_jobs_mqtt5_cfg.json
+        python3 ./aws-iot-device-sdk-js-v2/utils/run_in_ci.py --file ./aws-iot-device-sdk-js-v2/.github/workflows/ci_run_jobs_mqtt5_cfg.json
     - name: configure AWS credentials (Fleet provisioning)
       uses: aws-actions/configure-aws-credentials@v1
       with:
         role-to-assume: ${{ env.CI_FLEET_PROVISIONING_ROLE }}
         aws-region: ${{ env.AWS_DEFAULT_REGION }}
     - name: run Fleet Provisioning sample
       run: |
-        echo "Generating UUID for IoT thing"
-        Sample_UUID=$(python3  -c "import uuid; print (uuid.uuid4())")
-        python3 ./aws-iot-device-sdk-js-v2/utils/run_sample_ci.py --file ./aws-iot-device-sdk-js-v2/.github/workflows/ci_run_fleet_provisioning_cfg.json --input_uuid ${Sample_UUID}
-        python3 ./aws-iot-device-sdk-js-v2/utils/delete_iot_thing_ci.py --thing_name "Fleet_Thing_${Sample_UUID}" --region "us-east-1"
+        python3 ./aws-iot-device-sdk-js-v2/utils/run_fleet_provisioning_sample.py --file ./aws-iot-device-sdk-js-v2/.github/workflows/ci_run_fleet_provisioning_cfg.json --thing-name-prefix "Fleet_Thing_"
     - name: run Mqtt5 Fleet Provisioning sample
       run: |
-        echo "Generating UUID for IoT thing"
-        Sample_UUID=$(python3  -c "import uuid; print (uuid.uuid4())")
-        python3 ./aws-iot-device-sdk-js-v2/utils/run_sample_ci.py --file ./aws-iot-device-sdk-js-v2/.github/workflows/ci_run_fleet_provisioning_mqtt5_cfg.json --input_uuid ${Sample_UUID}
-        python3 ./aws-iot-device-sdk-js-v2/utils/delete_iot_thing_ci.py --thing_name "Fleet_Thing_${Sample_UUID}" --region "us-east-1"
+        python3 ./aws-iot-device-sdk-js-v2/utils/run_fleet_provisioning_sample.py --file ./aws-iot-device-sdk-js-v2/.github/workflows/ci_run_fleet_provisioning_mqtt5_cfg.json --thing-name-prefix "Fleet_Thing_"
     - name: configure AWS credentials (MQTT5 PubSub)
       uses: aws-actions/configure-aws-credentials@v1
       with:
         role-to-assume: ${{ env.CI_MQTT5_ROLE }}
         aws-region: ${{ env.AWS_DEFAULT_REGION }}
     - name: run MQTT5 PubSub sample
       run: |
-        python3 ./aws-iot-device-sdk-js-v2/utils/run_sample_ci.py --file ./aws-iot-device-sdk-js-v2/.github/workflows/ci_run_mqtt5_pubsub_cfg.json
+        python3 ./aws-iot-device-sdk-js-v2/utils/run_in_ci.py --file ./aws-iot-device-sdk-js-v2/.github/workflows/ci_run_mqtt5_pubsub_cfg.json
     - name: run MQTT5 Shared Subscription sample
       run: |
-        python3 ./aws-iot-device-sdk-js-v2/utils/run_sample_ci.py --file ./aws-iot-device-sdk-js-v2/.github/workflows/ci_run_mqtt5_shared_subscription_cfg.json
+        python3 ./aws-iot-device-sdk-js-v2/utils/run_in_ci.py --file ./aws-iot-device-sdk-js-v2/.github/workflows/ci_run_mqtt5_shared_subscription_cfg.json
     - name: configure AWS credentials (Greengrass)
       uses: aws-actions/configure-aws-credentials@v1
       with:
         role-to-assume: ${{ env.CI_GREENGRASS_ROLE }}
         aws-region: ${{ env.AWS_DEFAULT_REGION }}
     - name: run Greengrass Discovery sample
       run: |
-        python3 ./aws-iot-device-sdk-js-v2/utils/run_sample_ci.py --file ./aws-iot-device-sdk-js-v2/.github/workflows/ci_run_greengrass_discovery_cfg.json
+        python3 ./aws-iot-device-sdk-js-v2/utils/run_in_ci.py --file ./aws-iot-device-sdk-js-v2/.github/workflows/ci_run_greengrass_discovery_cfg.json
 
   # check that docs can still build
   check-docs:

diff --git a/.github/workflows/ci_run_basic_connect_cfg.json b/.github/workflows/ci_run_basic_connect_cfg.json
@@ -1,8 +1,8 @@
 {
     "language": "Javascript",
-    "sample_file": "./aws-iot-device-sdk-js-v2/samples/node/basic_connect",
-    "sample_region": "us-east-1",
-    "sample_main_class": "",
+    "runnable_file": "./aws-iot-device-sdk-js-v2/samples/node/basic_connect",
+    "runnable_region": "us-east-1",
+    "runnable_main_class": "",
     "arguments": [
         {
             "name": "--endpoint",

diff --git a/.github/workflows/ci_run_cognito_connect_cfg.json b/.github/workflows/ci_run_cognito_connect_cfg.json
@@ -1,8 +1,8 @@
 {
     "language": "Javascript",
-    "sample_file": "./aws-iot-device-sdk-js-v2/samples/node/cognito_connect",
-    "sample_region": "us-east-1",
-    "sample_main_class": "",
+    "runnable_file": "./aws-iot-device-sdk-js-v2/samples/node/cognito_connect",
+    "runnable_region": "us-east-1",
+    "runnable_main_class": "",
     "arguments": [
         {
             "name": "--endpoint",

diff --git a/.github/workflows/ci_run_custom_authorizer_connect_cfg.json b/.github/workflows/ci_run_custom_authorizer_connect_cfg.json
@@ -1,8 +1,8 @@
 {
     "language": "Javascript",
-    "sample_file": "./aws-iot-device-sdk-js-v2/samples/node/custom_authorizer_connect",
-    "sample_region": "us-east-1",
-    "sample_main_class": "",
+    "runnable_file": "./aws-iot-device-sdk-js-v2/samples/node/custom_authorizer_connect",
+    "runnable_region": "us-east-1",
+    "runnable_main_class": "",
     "arguments": [
         {
             "name": "--endpoint",

diff --git a/.github/workflows/ci_run_fleet_provisioning_cfg.json b/.github/workflows/ci_run_fleet_provisioning_cfg.json
@@ -1,8 +1,8 @@
 {
     "language": "Javascript",
-    "sample_file": "./aws-iot-device-sdk-js-v2/samples/node/fleet_provisioning",
-    "sample_region": "us-east-1",
-    "sample_main_class": "",
+    "runnable_file": "./aws-iot-device-sdk-js-v2/samples/node/fleet_provisioning",
+    "runnable_region": "us-east-1",
+    "runnable_main_class": "",
     "arguments": [
         {
             "name": "--endpoint",

diff --git a/.github/workflows/ci_run_fleet_provisioning_mqtt5_cfg.json b/.github/workflows/ci_run_fleet_provisioning_mqtt5_cfg.json
@@ -1,8 +1,8 @@
 {
     "language": "Javascript",
-    "sample_file": "./aws-iot-device-sdk-js-v2/samples/node/fleet_provisioning",
-    "sample_region": "us-east-1",
-    "sample_main_class": "",
+    "runnable_file": "./aws-iot-device-sdk-js-v2/samples/node/fleet_provisioning",
+    "runnable_region": "us-east-1",
+    "runnable_main_class": "",
     "arguments": [
         {
             "name": "--endpoint",

diff --git a/.github/workflows/ci_run_greengrass_discovery_cfg.json b/.github/workflows/ci_run_greengrass_discovery_cfg.json
@@ -1,8 +1,8 @@
 {
     "language": "Javascript",
-    "sample_file": "./aws-iot-device-sdk-js-v2/samples/node/basic_discovery",
-    "sample_region": "us-east-1",
-    "sample_main_class": "",
+    "runnable_file": "./aws-iot-device-sdk-js-v2/samples/node/basic_discovery",
+    "runnable_region": "us-east-1",
+    "runnable_main_class": "",
 
     "arguments": [
         {

diff --git a/.github/workflows/ci_run_jobs_cfg.json b/.github/workflows/ci_run_jobs_cfg.json
@@ -1,8 +1,8 @@
 {
     "language": "Javascript",
-    "sample_file": "./aws-iot-device-sdk-js-v2/samples/node/jobs",
-    "sample_region": "us-east-1",
-    "sample_main_class": "",
+    "runnable_file": "./aws-iot-device-sdk-js-v2/samples/node/jobs",
+    "runnable_region": "us-east-1",
+    "runnable_main_class": "",
     "arguments": [
         {
             "name": "--endpoint",

diff --git a/.github/workflows/ci_run_jobs_mqtt5_cfg.json b/.github/workflows/ci_run_jobs_mqtt5_cfg.json
@@ -1,8 +1,8 @@
 {
     "language": "Javascript",
-    "sample_file": "./aws-iot-device-sdk-js-v2/samples/node/jobs",
-    "sample_region": "us-east-1",
-    "sample_main_class": "",
+    "runnable_file": "./aws-iot-device-sdk-js-v2/samples/node/jobs",
+    "runnable_region": "us-east-1",
+    "runnable_main_class": "",
     "arguments": [
         {
             "name": "--endpoint",

diff --git a/.github/workflows/ci_run_mqtt5_pubsub_cfg.json b/.github/workflows/ci_run_mqtt5_pubsub_cfg.json
@@ -1,8 +1,8 @@
 {
     "language": "Javascript",
-    "sample_file": "./aws-iot-device-sdk-js-v2/samples/node/pub_sub_mqtt5",
-    "sample_region": "us-east-1",
-    "sample_main_class": "",
+    "runnable_file": "./aws-iot-device-sdk-js-v2/samples/node/pub_sub_mqtt5",
+    "runnable_region": "us-east-1",
+    "runnable_main_class": "",
     "arguments": [
         {
             "name": "--endpoint",

diff --git a/.github/workflows/ci_run_mqtt5_shared_subscription_cfg.json b/.github/workflows/ci_run_mqtt5_shared_subscription_cfg.json
@@ -1,8 +1,8 @@
 {
     "language": "Javascript",
-    "sample_file": "./aws-iot-device-sdk-js-v2/samples/node/shared_subscription",
-    "sample_region": "us-east-1",
-    "sample_main_class": "",
+    "runnable_file": "./aws-iot-device-sdk-js-v2/samples/node/shared_subscription",
+    "runnable_region": "us-east-1",
+    "runnable_main_class": "",
     "arguments": [
         {
             "name": "--endpoint",

diff --git a/.github/workflows/ci_run_pkcs11_connect_cfg.json b/.github/workflows/ci_run_pkcs11_connect_cfg.json
@@ -1,8 +1,8 @@
 {
     "language": "Javascript",
-    "sample_file": "./aws-iot-device-sdk-js-v2/samples/node/pkcs11_connect",
-    "sample_region": "us-east-1",
-    "sample_main_class": "",
+    "runnable_file": "./aws-iot-device-sdk-js-v2/samples/node/pkcs11_connect",
+    "runnable_region": "us-east-1",
+    "runnable_main_class": "",
     "arguments": [
         {
             "name": "--endpoint",

diff --git a/.github/workflows/ci_run_pkcs12_connect_cfg.json b/.github/workflows/ci_run_pkcs12_connect_cfg.json
@@ -1,8 +1,8 @@
 {
     "language": "Javascript",
-    "sample_file": "./aws-iot-device-sdk-js-v2/samples/node/pkcs12_connect",
-    "sample_region": "us-east-1",
-    "sample_main_class": "",
+    "runnable_file": "./aws-iot-device-sdk-js-v2/samples/node/pkcs12_connect",
+    "runnable_region": "us-east-1",
+    "runnable_main_class": "",
     "arguments": [
         {
             "name": "--endpoint",

diff --git a/.github/workflows/ci_run_pubsub_cfg.json b/.github/workflows/ci_run_pubsub_cfg.json
@@ -1,8 +1,8 @@
 {
     "language": "Javascript",
-    "sample_file": "./aws-iot-device-sdk-js-v2/samples/node/pub_sub",
-    "sample_region": "us-east-1",
-    "sample_main_class": "",
+    "runnable_file": "./aws-iot-device-sdk-js-v2/samples/node/pub_sub",
+    "runnable_region": "us-east-1",
+    "runnable_main_class": "",
     "arguments": [
         {
             "name": "--endpoint",

diff --git a/.github/workflows/ci_run_pubsub_js_cfg.json b/.github/workflows/ci_run_pubsub_js_cfg.json
@@ -1,8 +1,8 @@
 {
     "language": "Javascript",
-    "sample_file": "./aws-iot-device-sdk-js-v2/samples/node/pub_sub_js",
-    "sample_region": "us-east-1",
-    "sample_main_class": "",
+    "runnable_file": "./aws-iot-device-sdk-js-v2/samples/node/pub_sub_js",
+    "runnable_region": "us-east-1",
+    "runnable_main_class": "",
     "arguments": [
         {
             "name": "--endpoint",

diff --git a/.github/workflows/ci_run_shadow_cfg.json b/.github/workflows/ci_run_shadow_cfg.json
@@ -1,8 +1,8 @@
 {
     "language": "Javascript",
-    "sample_file": "./aws-iot-device-sdk-js-v2/samples/node/shadow",
-    "sample_region": "us-east-1",
-    "sample_main_class": "",
+    "runnable_file": "./aws-iot-device-sdk-js-v2/samples/node/shadow",
+    "runnable_region": "us-east-1",
+    "runnable_main_class": "",
     "arguments": [
         {
             "name": "--endpoint",

diff --git a/.github/workflows/ci_run_shadow_mqtt5_cfg.json b/.github/workflows/ci_run_shadow_mqtt5_cfg.json
@@ -1,8 +1,8 @@
 {
     "language": "Javascript",
-    "sample_file": "./aws-iot-device-sdk-js-v2/samples/node/shadow",
-    "sample_region": "us-east-1",
-    "sample_main_class": "",
+    "runnable_file": "./aws-iot-device-sdk-js-v2/samples/node/shadow",
+    "runnable_region": "us-east-1",
+    "runnable_main_class": "",
     "arguments": [
         {
             "name": "--endpoint",

diff --git a/.github/workflows/ci_run_websocket_connect_cfg.json b/.github/workflows/ci_run_websocket_connect_cfg.json
@@ -1,8 +1,8 @@
 {
     "language": "Javascript",
-    "sample_file": "./aws-iot-device-sdk-js-v2/samples/node/websocket_connect",
-    "sample_region": "us-east-1",
-    "sample_main_class": "",
+    "runnable_file": "./aws-iot-device-sdk-js-v2/samples/node/websocket_connect",
+    "runnable_region": "us-east-1",
+    "runnable_main_class": "",
     "arguments": [
         {
             "name": "--endpoint",

diff --git a/.github/workflows/ci_run_windows_cert_connect_cfg.json b/.github/workflows/ci_run_windows_cert_connect_cfg.json
@@ -1,8 +1,8 @@
 {
     "language": "Javascript",
-    "sample_file": "./aws-iot-device-sdk-js-v2/samples/node/windows_cert_connect",
-    "sample_region": "us-east-1",
-    "sample_main_class": "",
+    "runnable_file": "./aws-iot-device-sdk-js-v2/samples/node/windows_cert_connect",
+    "runnable_region": "us-east-1",
+    "runnable_main_class": "",
     "arguments": [
         {
             "name": "--endpoint",

diff --git a/.github/workflows/ci_run_x509_connect_cfg.json b/.github/workflows/ci_run_x509_connect_cfg.json
@@ -1,8 +1,8 @@
 {
     "language": "Javascript",
-    "sample_file": "./aws-iot-device-sdk-js-v2/samples/node/x509_connect",
-    "sample_region": "us-east-1",
-    "sample_main_class": "",
+    "runnable_file": "./aws-iot-device-sdk-js-v2/samples/node/x509_connect",
+    "runnable_region": "us-east-1",
+    "runnable_main_class": "",
     "arguments": [
         {
             "name": "--endpoint",