feat: separate commands for solo node delete (#597)

Signed-off-by: Ivo Yankov <[email protected]> Signed-off-by: Jeffrey Tang <[email protected]> Co-authored-by: Jeffrey Tang <[email protected]>
hashgraph · Oct 1, 2024 · b251276 · b251276
1 parent 538e40d
commit b251276
Show file tree

Hide file tree

Showing 11 changed files with 644 additions and 246 deletions.
diff --git a/.github/workflows/flow-build-application.yaml b/.github/workflows/flow-build-application.yaml
@@ -181,6 +181,19 @@ jobs:
       coverage-subdirectory: ${{ needs.env-vars.outputs.e2e-node-delete-test-subdir }}
       coverage-report-name: ${{ needs.env-vars.outputs.e2e-node-delete-coverage-report }}
 
+  e2e-node-delete-separate-commands-tests:
+    name: E2E Tests
+    if: ${{ github.event_name == 'push' || github.event.inputs.enable-e2e-tests == 'true' }}
+    uses: ./.github/workflows/zxc-e2e-test.yaml
+    needs:
+      - env-vars
+      - code-style
+    with:
+      custom-job-label: Node Delete - Separate commands
+      npm-test-script: test-${{ needs.env-vars.outputs.e2e-node-delete-separate-commands-test-subdir }}
+      coverage-subdirectory: ${{ needs.env-vars.outputs.e2e-node-delete-separate-commands-test-subdir }}
+      coverage-report-name: ${{ needs.env-vars.outputs.e2e-node-delete-separate-commands-coverage-report }}
+
   e2e-relay-tests:
     name: E2E Tests
     if: ${{ github.event_name == 'push' || github.event.inputs.enable-e2e-tests == 'true' }}
@@ -209,6 +222,7 @@ jobs:
       - e2e-node-add-separate-commands-tests
       - e2e-node-update-tests
       - e2e-node-delete-tests
+      - e2e-node-delete-separate-commands-tests
       - e2e-relay-tests
     if: ${{ (github.event_name == 'push' || github.event.inputs.enable-unit-tests == 'true' || github.event.inputs.enable-e2e-tests == 'true') && !failure() && !cancelled() }}
     with:
@@ -226,6 +240,7 @@ jobs:
       e2e-node-add-separate-commands-test-subdir: ${{ needs.env-vars.outputs.e2e-node-add-separate-commands-test-subdir }}
       e2e-node-update-test-subdir: ${{ needs.env-vars.outputs.e2e-node-update-test-subdir }}
       e2e-node-delete-test-subdir: ${{ needs.env-vars.outputs.e2e-node-delete-test-subdir }}
+      e2e-node-delete-separate-commands-test-subdir: ${{ needs.env-vars.outputs.e2e-node-delete-separate-commands-test-subdir }}
       e2e-relay-test-subdir: ${{ needs.env-vars.outputs.e2e-relay-test-subdir }}
       e2e-standard-coverage-report: ${{ needs.env-vars.outputs.e2e-standard-coverage-report }}
       e2e-mirror-node-coverage-report: ${{ needs.env-vars.outputs.e2e-mirror-node-coverage-report }}
@@ -236,6 +251,7 @@ jobs:
       e2e-node-add-separate-commands-coverage-report: ${{ needs.env-vars.outputs.e2e-node-add-separate-commands-coverage-report }}
       e2e-node-update-coverage-report: ${{ needs.env-vars.outputs.e2e-node-update-coverage-report }}
       e2e-node-delete-coverage-report: ${{ needs.env-vars.outputs.e2e-node-delete-coverage-report }}
+      e2e-node-delete-separate-commands-coverage-report: ${{ needs.env-vars.outputs.e2e-node-delete-separate-commands-coverage-report }}
       e2e-relay-coverage-report: ${{ needs.env-vars.outputs.e2e-relay-coverage-report }}
     secrets:
       snyk-token: ${{ secrets.SNYK_TOKEN }}

diff --git a/.github/workflows/flow-pull-request-checks.yaml b/.github/workflows/flow-pull-request-checks.yaml
@@ -179,6 +179,19 @@ jobs:
       coverage-subdirectory: ${{ needs.env-vars.outputs.e2e-node-delete-test-subdir }}
       coverage-report-name: ${{ needs.env-vars.outputs.e2e-node-delete-coverage-report }}
 
+  e2e-node-delete-separate-commands-tests:
+    name: E2E Tests
+    if: ${{ !cancelled() && always() }}
+    uses: ./.github/workflows/zxc-e2e-test.yaml
+    needs:
+      - env-vars
+      - code-style
+    with:
+      custom-job-label: Node Delete - Separate commands
+      npm-test-script: test-${{ needs.env-vars.outputs.e2e-node-delete-separate-commands-test-subdir }}
+      coverage-subdirectory: ${{ needs.env-vars.outputs.e2e-node-delete-separate-commands-test-subdir }}
+      coverage-report-name: ${{ needs.env-vars.outputs.e2e-node-delete-separate-commands-coverage-report }}
+
   e2e-relay-tests:
     name: E2E Tests
     if: ${{ !cancelled() && always() }}
@@ -207,6 +220,7 @@ jobs:
       - e2e-node-add-separate-commands-tests
       - e2e-node-update-tests
       - e2e-node-delete-tests
+      - e2e-node-delete-separate-commands-tests
       - e2e-relay-tests
     if: ${{ github.event.pull_request.head.repo.full_name == github.event.pull_request.base.repo.full_name }}
     with:
@@ -222,6 +236,7 @@ jobs:
       e2e-node-add-separate-commands-test-subdir: ${{ needs.env-vars.outputs.e2e-node-add-separate-commands-test-subdir }}
       e2e-node-update-test-subdir: ${{ needs.env-vars.outputs.e2e-node-update-test-subdir }}
       e2e-node-delete-test-subdir: ${{ needs.env-vars.outputs.e2e-node-delete-test-subdir }}
+      e2e-node-delete-separate-commands-test-subdir: ${{ needs.env-vars.outputs.e2e-node-delete-separate-commands-test-subdir }}
       e2e-relay-test-subdir: ${{ needs.env-vars.outputs.e2e-relay-test-subdir }}
       e2e-standard-coverage-report: ${{ needs.env-vars.outputs.e2e-standard-coverage-report }}
       e2e-mirror-node-coverage-report: ${{ needs.env-vars.outputs.e2e-mirror-node-coverage-report }}
@@ -232,6 +247,7 @@ jobs:
       e2e-node-add-separate-commands-coverage-report: ${{ needs.env-vars.outputs.e2e-node-add-separate-commands-coverage-report }}
       e2e-node-update-coverage-report: ${{ needs.env-vars.outputs.e2e-node-update-coverage-report }}
       e2e-node-delete-coverage-report: ${{ needs.env-vars.outputs.e2e-node-delete-coverage-report }}
+      e2e-node-delete-separate-commands-coverage-report: ${{ needs.env-vars.outputs.e2e-node-delete-separate-commands-coverage-report }}
       e2e-relay-coverage-report: ${{ needs.env-vars.outputs.e2e-relay-coverage-report }}
     secrets:
       codecov-token: ${{ secrets.CODECOV_TOKEN }}
@@ -251,6 +267,7 @@ jobs:
       - e2e-node-add-separate-commands-tests
       - e2e-node-update-tests
       - e2e-node-delete-tests
+      - e2e-node-delete-separate-commands-tests
       - e2e-relay-tests
     if: ${{ github.event.pull_request.head.repo.full_name == github.event.pull_request.base.repo.full_name }}
     with:
@@ -266,6 +283,7 @@ jobs:
       e2e-node-add-separate-commands-test-subdir: ${{ needs.env-vars.outputs.e2e-node-add-separate-commands-test-subdir }}
       e2e-node-update-test-subdir: ${{ needs.env-vars.outputs.e2e-node-update-test-subdir }}
       e2e-node-delete-test-subdir: ${{ needs.env-vars.outputs.e2e-node-delete-test-subdir }}
+      e2e-node-delete-separate-commands-test-subdir: ${{ needs.env-vars.outputs.e2e-node-delete-separate-commands-test-subdir }}
       e2e-relay-test-subdir: ${{ needs.env-vars.outputs.e2e-relay-test-subdir }}
       e2e-standard-coverage-report: ${{ needs.env-vars.outputs.e2e-standard-coverage-report }}
       e2e-mirror-node-coverage-report: ${{ needs.env-vars.outputs.e2e-mirror-node-coverage-report }}
@@ -276,6 +294,7 @@ jobs:
       e2e-node-add-separate-commands-coverage-report: ${{ needs.env-vars.outputs.e2e-node-add-separate-commands-coverage-report }}
       e2e-node-update-coverage-report: ${{ needs.env-vars.outputs.e2e-node-update-coverage-report }}
       e2e-node-delete-coverage-report: ${{ needs.env-vars.outputs.e2e-node-delete-coverage-report }}
+      e2e-node-delete-separate-commands-coverage-report: ${{ needs.env-vars.outputs.e2e-node-delete-separate-commands-coverage-report }}
       e2e-relay-coverage-report: ${{ needs.env-vars.outputs.e2e-relay-coverage-report }}
     secrets:
       codacy-project-token: ${{ secrets.CODACY_PROJECT_TOKEN }}
diff --git a/.github/workflows/templates/config.yaml b/.github/workflows/templates/config.yaml
@@ -21,5 +21,7 @@ tests:
     jestPostfix: --testRegex=\".*\\/e2e\\/commands\\/node_update.*\\.test\\.mjs\"
   - name: Node Delete
     jestPostfix: --testRegex=\".*\\/e2e\\/commands\\/node_delete.*\\.test\\.mjs\"
+  - name: Node Delete - Separate commands
+    jestPostfix: --testRegex=\".*\\/e2e\\/commands\\/separate_node_delete.*\\.test\\.mjs\"
   - name: Relay
     jestPostfix: --testRegex=\".*\\/e2e\\/commands\\/relay\\.test\\.mjs\"
diff --git a/.github/workflows/zxc-code-analysis.yaml b/.github/workflows/zxc-code-analysis.yaml
@@ -100,6 +100,11 @@ on:
         type: string
         required: false
         default: "e2e-node-delete"
+      e2e-node-delete-separate-commands-test-subdir:
+        description: "E2E Node Delete - Separate commands Test Subdirectory:"
+        type: string
+        required: false
+        default: "e2e-node-delete-separate-commands"
       e2e-relay-test-subdir:
         description: "E2E Relay Test Subdirectory:"
         type: string
@@ -150,6 +155,11 @@ on:
         type: string
         required: false
         default: "E2E Node Delete Tests Coverage Report"
+      e2e-node-delete-separate-commands-coverage-report:
+        description: "E2E Node Delete - Separate commands Coverage Report:"
+        type: string
+        required: false
+        default: "E2E Node Delete - Separate commands Tests Coverage Report"
       e2e-relay-coverage-report:
         description: "E2E Relay Coverage Report:"
         type: string
@@ -268,19 +278,19 @@ jobs:
           name: ${{ inputs.e2e-node-delete-coverage-report }}
           path: 'coverage/${{ inputs.e2e-node-delete-test-subdir }}'
 
-      - name: Download E2E Relay Coverage Report
+      - name: Download E2E Node Delete - Separate commands Coverage Report
         uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 # v4.1.8
         if: ${{ (inputs.enable-codecov-analysis || inputs.enable-codacy-coverage) && inputs.enable-e2e-coverage-report && !cancelled() && !failure() }}
         with:
-          name: ${{ inputs.e2e-relay-coverage-report }}
-          path: 'coverage/${{ inputs.e2e-relay-test-subdir }}'
+          name: ${{ inputs.e2e-node-delete-separate-commands-coverage-report }}
+          path: 'coverage/${{ inputs.e2e-node-delete-separate-commands-test-subdir }}'
 
-      - name: Download E2E Test Report
+      - name: Download E2E Relay Coverage Report
         uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 # v4.1.8
         if: ${{ (inputs.enable-codecov-analysis || inputs.enable-codacy-coverage) && inputs.enable-e2e-coverage-report && !cancelled() && !failure() }}
         with:
-          pattern: "e2e_test_report_*"
-          path: "e2e_test_report"
+          name: ${{ inputs.e2e-relay-coverage-report }}
+          path: 'coverage/${{ inputs.e2e-relay-test-subdir }}'
 
       - name: Publish E2E Test Report
         uses: EnricoMi/publish-unit-test-result-action@82082dac68ad6a19d980f8ce817e108b9f496c2a # v2.17.1

diff --git a/.github/workflows/zxc-env-vars.yaml b/.github/workflows/zxc-env-vars.yaml
@@ -53,6 +53,9 @@ on:
       e2e-node-delete-test-subdir:
         description: "E2E Node Delete Test Subdirectory"
         value: ${{ jobs.env-vars.outputs.e2e_node_delete_test_subdir }}
+      e2e-node-delete-separate-commands-test-subdir:
+        description: "E2E Node Delete - Separate commands Test Subdirectory"
+        value: ${{ jobs.env-vars.outputs.e2e_node_delete_separate_commands_test_subdir }}
       e2e-relay-test-subdir:
         description: "E2E Relay Test Subdirectory"
         value: ${{ jobs.env-vars.outputs.e2e_relay_test_subdir }}
@@ -83,6 +86,9 @@ on:
       e2e-node-delete-coverage-report:
         description: "E2E Node Delete Tests Coverage Report"
         value: ${{ jobs.env-vars.outputs.e2e_node_delete_coverage_report }}
+      e2e-node-delete-separate-commands-coverage-report:
+        description: "E2E Node Delete - Separate commands Tests Coverage Report"
+        value: ${{ jobs.env-vars.outputs.e2e_node_delete_separate_commands_coverage_report }}
       e2e-relay-coverage-report:
         description: "E2E Relay Tests Coverage Report"
         value: ${{ jobs.env-vars.outputs.e2e_relay_coverage_report }}
@@ -105,6 +111,7 @@ jobs:
       e2e_node_add_separate_commands_test_subdir: e2e-node-add-separate-commands
       e2e_node_update_test_subdir: e2e-node-update
       e2e_node_delete_test_subdir: e2e-node-delete
+      e2e_node_delete_separate_commands_test_subdir: e2e-node-delete-separate-commands
       e2e_relay_test_subdir: e2e-relay
       e2e_standard_coverage_report: "E2E Standard Tests Coverage Report"
       e2e_mirror_node_coverage_report: "E2E Mirror Node Tests Coverage Report"
@@ -115,6 +122,7 @@ jobs:
       e2e_node_add_separate_commands_coverage_report: "E2E Node Add - Separate commands Tests Coverage Report"
       e2e_node_update_coverage_report: "E2E Node Update Tests Coverage Report"
       e2e_node_delete_coverage_report: "E2E Node Delete Tests Coverage Report"
+      e2e_node_delete_separate_commands_coverage_report: "E2E Node Delete - Separate commands Tests Coverage Report"
       e2e_relay_coverage_report: "E2E Relay Tests Coverage Report"
     steps:
       - run: echo "Exposing environment variables to reusable workflows"
diff --git a/package.json b/package.json
@@ -22,6 +22,7 @@
     "test-e2e-node-add-separate-commands": "NODE_OPTIONS=--experimental-vm-modules JEST_SUITE_NAME='Jest E2E Node Add - Separate commands Tests' JEST_JUNIT_OUTPUT_NAME='junit-e2e-node-add-separate-commands.xml' jest --runInBand --detectOpenHandles --forceExit --coverage --coverageDirectory='coverage/e2e-node-add-separate-commands' --testRegex=\".*\\/e2e\\/commands\\/separate_node_add.*\\.test\\.mjs\"",
     "test-e2e-node-update": "NODE_OPTIONS=--experimental-vm-modules JEST_SUITE_NAME='Jest E2E Node Update Tests' JEST_JUNIT_OUTPUT_NAME='junit-e2e-node-update.xml' jest --runInBand --detectOpenHandles --forceExit --coverage --coverageDirectory='coverage/e2e-node-update' --testRegex=\".*\\/e2e\\/commands\\/node_update.*\\.test\\.mjs\"",
     "test-e2e-node-delete": "NODE_OPTIONS=--experimental-vm-modules JEST_SUITE_NAME='Jest E2E Node Delete Tests' JEST_JUNIT_OUTPUT_NAME='junit-e2e-node-delete.xml' jest --runInBand --detectOpenHandles --forceExit --coverage --coverageDirectory='coverage/e2e-node-delete' --testRegex=\".*\\/e2e\\/commands\\/node_delete.*\\.test\\.mjs\"",
+    "test-e2e-node-delete-separate-commands": "NODE_OPTIONS=--experimental-vm-modules JEST_SUITE_NAME='Jest E2E Node Delete - Separate commands Tests' JEST_JUNIT_OUTPUT_NAME='junit-e2e-node-delete-separate-commands.xml' jest --runInBand --detectOpenHandles --forceExit --coverage --coverageDirectory='coverage/e2e-node-delete-separate-commands' --testRegex=\".*\\/e2e\\/commands\\/separate_node_delete.*\\.test\\.mjs\"",
     "test-e2e-relay": "NODE_OPTIONS=--experimental-vm-modules JEST_SUITE_NAME='Jest E2E Relay Tests' JEST_JUNIT_OUTPUT_NAME='junit-e2e-relay.xml' jest --runInBand --detectOpenHandles --forceExit --coverage --coverageDirectory='coverage/e2e-relay' --testRegex=\".*\\/e2e\\/commands\\/relay\\.test\\.mjs\"",
     "merge-clean": "rm -rf .nyc_output && mkdir  .nyc_output && rm -rf coverage/lcov-report && rm -rf coverage/solo && rm coverage/*.*",
     "merge-e2e": "nyc merge ./coverage/e2e/ .nyc_output/coverage.json",