Merge branch 'main' into 00096-node-refresh

Author: jeromy-cannon

.github/workflows/zxc-compile-code.yaml

@@ -76,13 +76,6 @@ jobs:
           node-version: ${{ inputs.node-version }}
           cache: npm
 
-      - name: Setup Java
-        uses: actions/setup-java@9704b39bf258b59bc04b50fa2dd55e9ed76b47a8 # v4.1.0
-        if: ${{ inputs.enable-e2e-tests && !cancelled() && !failure() }}
-        with:
-          distribution: temurin
-          java-version: 21
-
       - name: Setup Kind
         uses: helm/kind-action@99576bfa6ddf9a8e612d83b513da5a75875caced # v1.9.0
         if: ${{ inputs.enable-e2e-tests && !cancelled() && !failure() }}
@@ -94,12 +87,6 @@ jobs:
           verbosity: 3
           wait: 120s
 
-      - name: Setup Helm
-        uses: azure/setup-helm@29960d0f5f19214b88e1d9ba750a9914ab0f1a2f # v4.0.0
-        if: ${{ (inputs.enable-unit-tests || inputs.enable-e2e-tests) && !cancelled() && !failure() }}
-        with:
-          version: "v3.12.3" #  helm version
-
       - name: Install Dependencies
         id: npm-deps
         run: npm ci

test/e2e/commands/relay.test.mjs

@@ -0,0 +1,92 @@
+/**
+ * Copyright (C) 2024 Hedera Hashgraph, LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the ""License"");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an ""AS IS"" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+import {
+  afterAll, afterEach, describe,
+  expect,
+  it
+} from '@jest/globals'
+import { flags } from '../../../src/commands/index.mjs'
+import {
+  constants
+} from '../../../src/core/index.mjs'
+import {
+  bootstrapNetwork,
+  getDefaultArgv,
+  TEST_CLUSTER
+} from '../../test_util.js'
+import * as version from '../../../version.mjs'
+import { sleep } from '../../../src/core/helpers.mjs'
+import { RelayCommand } from '../../../src/commands/relay.mjs'
+
+describe('RelayCommand', () => {
+  const testName = 'relay-cmd-e2e'
+  const namespace = testName
+  const argv = getDefaultArgv()
+  argv[flags.namespace.name] = namespace
+  argv[flags.releaseTag.name] = 'v0.47.0-alpha.0'
+  argv[flags.keyFormat.name] = constants.KEY_FORMAT_PEM
+
+  argv[flags.nodeIDs.name] = 'node0,node1,node2'
+  argv[flags.generateGossipKeys.name] = true
+  argv[flags.generateTlsKeys.name] = true
+  argv[flags.clusterName.name] = TEST_CLUSTER
+  argv[flags.fstChartVersion.name] = version.FST_CHART_VERSION
+  argv[flags.force.name] = true
+  argv[flags.relayReleaseTag.name] = flags.relayReleaseTag.definition.defaultValue
+
+  const bootstrapResp = bootstrapNetwork(testName, argv)
+  const k8 = bootstrapResp.opts.k8
+  const configManager = bootstrapResp.opts.configManager
+  const relayCmd = new RelayCommand(bootstrapResp.opts)
+
+  afterAll(async () => {
+    await k8.deleteNamespace(namespace)
+  })
+
+  afterEach(async () => {
+    await sleep(5) // give a few ticks so that connections can close
+  })
+
+  it.each([
+    { relayNodes: 'node0' },
+    { relayNodes: 'node0,node1' },
+    { relayNodes: 'node0,node1,node2' }
+  ])('relay deploy and destroy should work with different number of relay nodes', async (input) => {
+    argv[flags.nodeIDs.name] = input.relayNodes
+    configManager.update(argv)
+    expect.assertions(2)
+
+    // test relay deploy
+    try {
+      await expect(relayCmd.deploy(argv)).resolves.toBeTruthy()
+    } catch (e) {
+      relayCmd.logger.showUserError(e)
+      expect(e).toBeNull()
+    }
+
+    await sleep(500)
+
+    // test relay destroy
+    try {
+      await expect(relayCmd.destroy(argv)).resolves.toBeTruthy()
+    } catch (e) {
+      relayCmd.logger.showUserError(e)
+      expect(e).toBeNull()
+    }
+  }, 60000)
+})