fst to solo

Signed-off-by: Jeffrey Tang <[email protected]>

.github/ISSUE_TEMPLATE/feature_enhancement.yml

@@ -22,7 +22,7 @@ body:
  placeholder: |
  _A clear and concise description of what you want to happen._
 
- Note: Feature enhancements to integrate vendor specific cloud tools (e.g. awscli, gcloud-sdk, azure-cli) will likely be rejected as the Full Stack Testing (Solo) Suite aims to be vendor agnostic.
+ Note: Feature enhancements to integrate vendor specific cloud tools (e.g. awscli, gcloud-sdk, azure-cli) will likely be rejected as the Solo Testing (Solo) Suite aims to be vendor agnostic.
  validations:
  required: true
  - type: textarea

.github/ISSUE_TEMPLATE/feature_request.yml

@@ -12,7 +12,7 @@ body:
  placeholder: |
  _A clear and concise description of what you want to happen._
 
- Note: Feature requests to integrate vendor specific cloud tools (e.g. awscli, gcloud-sdk, azure-cli) will likely be rejected as the Full Stack Testing (Solo) Suite aims to be vendor agnostic.
+ Note: Feature requests to integrate vendor specific cloud tools (e.g. awscli, gcloud-sdk, azure-cli) will likely be rejected as the Solo Suite aims to be vendor agnostic.
  validations:
  required: true
  - type: textarea

examples/custom-network-config/Taskfile.yml

@@ -5,7 +5,7 @@ dotenv:
 silent: false
 
 env:
- FST_CHART_VERSION: v0.30.0
+ SOLO_CHART_VERSION: v0.30.0
  CONSENSUS_NODE_VERSION: v0.54.1
  SOLO_NAMESPACE: solo-{{ env "USER" | replace "." "-" | trunc 63 }}
  SOLO_CLUSTER_SETUP_NAMESPACE: solo-setup
@@ -104,7 +104,7 @@ tasks:
  solo:network:deploy:
  internal: true
  cmds:
- - solo network deploy --release-tag "${CONSENSUS_NODE_VERSION}" --solo-chart-version "${FST_CHART_VERSION}" --values-file {{ .solo_values_file }} --settings-txt {{ .solo_settings_file }}
+ - solo network deploy --release-tag "${CONSENSUS_NODE_VERSION}" --solo-chart-version "${SOLO_CHART_VERSION}" --values-file {{ .solo_values_file }} --settings-txt {{ .solo_settings_file }}
  - solo node setup --release-tag "${CONSENSUS_NODE_VERSION}"
 
  solo:network:destroy:

src/commands/cluster.mjs

@@ -92,7 +92,7 @@ export class ClusterCommand extends BaseCommand {
  deployCertManagerCrds: self.configManager.getFlag(flags.deployCertManagerCrds),
  deployMinio: self.configManager.getFlag(flags.deployMinio),
  deployPrometheusStack: self.configManager.getFlag(flags.deployPrometheusStack),
- fstChartVersion: self.configManager.getFlag(flags.fstChartVersion)
+ soloChartVersion: self.configManager.getFlag(flags.soloChartVersion)
  }
 
  self.logger.debug('Prepare ctx.config', { config: ctx.config, argv })
@@ -118,7 +118,7 @@ export class ClusterCommand extends BaseCommand {
  title: `Install '${constants.SOLO_CLUSTER_SETUP_CHART}' chart`,
  task: async (ctx, _) => {
  const clusterSetupNamespace = ctx.config.clusterSetupNamespace
- const version = ctx.config.fstChartVersion
+ const version = ctx.config.soloChartVersion
 
  const chartPath = ctx.chartPath
  const valuesArg = ctx.valuesArg
@@ -276,7 +276,7 @@ export class ClusterCommand extends BaseCommand {
  flags.deployCertManagerCrds,
  flags.deployMinio,
  flags.deployPrometheusStack,
- flags.fstChartVersion
+ flags.soloChartVersion
  ),
  handler: argv => {
  clusterCmd.logger.debug("==== Running 'cluster setup' ===", { argv })

src/commands/flags.mjs

@@ -418,12 +418,12 @@ export const deleteSecrets = {
 }
 
 /** @type {CommandFlag} **/
-export const fstChartVersion = {
- constName: 'fstChartVersion',
+export const soloChartVersion = {
+ constName: 'soloChartVersion',
  name: 'solo-chart-version',
  definition: {
  describe: 'Solo testing chart version',
- defaultValue: version.FST_CHART_VERSION,
+ defaultValue: version.SOLO_CHART_VERSION,
  type: 'string'
  }
 }
@@ -807,7 +807,7 @@ export const allFlags = [
  enableHederaExplorerTls,
  enablePrometheusSvcMonitor,
  endpointType,
- fstChartVersion,
+ soloChartVersion,
  generateGossipKeys,
  generateTlsKeys,
  gossipEndpoints,

src/commands/init.mjs

@@ -160,7 +160,7 @@ export class InitCommand extends BaseCommand {
  flags.cacheDir,
  flags.chartDirectory,
  flags.clusterSetupNamespace,
- flags.fstChartVersion,
+ flags.soloChartVersion,
  flags.namespace,
  flags.nodeAliasesUnparsed,
  flags.profileFile,

src/commands/mirror_node.mjs

@@ -53,7 +53,7 @@ export class MirrorNodeCommand extends BaseCommand {
  flags.chartDirectory,
  flags.deployHederaExplorer,
  flags.enableHederaExplorerTls,
- flags.fstChartVersion,
+ flags.soloChartVersion,
  flags.hederaExplorerTlsHostName,
  flags.hederaExplorerTlsLoadBalancerIp,
  flags.namespace,
@@ -151,7 +151,7 @@ export class MirrorNodeCommand extends BaseCommand {
  flags.chartDirectory,
  flags.deployHederaExplorer,
  flags.enableHederaExplorerTls,
- flags.fstChartVersion,
+ flags.soloChartVersion,
  flags.hederaExplorerTlsHostName,
  flags.hederaExplorerTlsLoadBalancerIp,
  flags.tlsClusterIssuerType,
@@ -167,7 +167,7 @@ export class MirrorNodeCommand extends BaseCommand {
  * @property {string} chartDirectory
  * @property {boolean} deployHederaExplorer
  * @property {string} enableHederaExplorerTls
- * @property {string} fstChartVersion
+ * @property {string} soloChartVersion
  * @property {string} hederaExplorerTlsHostName
  * @property {string} hederaExplorerTlsLoadBalancerIp
  * @property {string} namespace
@@ -221,7 +221,7 @@ export class MirrorNodeCommand extends BaseCommand {
  constants.SOLO_DEPLOYMENT_CHART,
  ctx.config.chartPath,
  ctx.config.valuesArg,
- ctx.config.fstChartVersion
+ ctx.config.soloChartVersion
  )
  }
  }
@@ -385,7 +385,7 @@ export class MirrorNodeCommand extends BaseCommand {
 
  ctx.config = {
  chartDirectory: self.configManager.getFlag(flags.chartDirectory),
- fstChartVersion: this.configManager.getFlag(flags.fstChartVersion),
+ soloChartVersion: this.configManager.getFlag(flags.soloChartVersion),
  namespace: self.configManager.getFlag(flags.namespace)
  }
 
@@ -409,7 +409,7 @@ export class MirrorNodeCommand extends BaseCommand {
  constants.SOLO_DEPLOYMENT_CHART,
  ctx.config.chartPath,
  ctx.config.valuesArg,
- ctx.config.fstChartVersion
+ ctx.config.soloChartVersion
  )
  }
  },
@@ -483,7 +483,7 @@ export class MirrorNodeCommand extends BaseCommand {
  builder: y => flags.setCommandFlags(y,
  flags.chartDirectory,
  flags.force,
- flags.fstChartVersion,
+ flags.soloChartVersion,
  flags.namespace
  ),
  handler: argv => {

src/commands/network.mjs

@@ -69,7 +69,7 @@ export class NetworkCommand extends BaseCommand {
  flags.chainId,
  flags.chartDirectory,
  flags.enablePrometheusSvcMonitor,
- flags.fstChartVersion,
+ flags.soloChartVersion,
  flags.debugNodeAlias,
  flags.log4j2Xml,
  flags.namespace,
@@ -106,7 +106,7 @@ export class NetworkCommand extends BaseCommand {
  }
 
  const profileName = this.configManager.getFlag(flags.profileName)
- this.profileValuesFile = await this.profileManager.prepareValuesForFstChart(profileName)
+ this.profileValuesFile = await this.profileManager.prepareValuesForSoloChart(profileName)
  if (this.profileValuesFile) {
  valuesArg += this.prepareValuesFiles(this.profileValuesFile)
  }
@@ -165,7 +165,7 @@ export class NetworkCommand extends BaseCommand {
  * @property {string} cacheDir
  * @property {string} chartDirectory
  * @property {boolean} enablePrometheusSvcMonitor
- * @property {string} fstChartVersion
+ * @property {string} soloChartVersion
  * @property {string} namespace
  * @property {string} nodeAliasesUnparsed
  * @property {string} persistentVolumeClaims
@@ -306,7 +306,7 @@ export class NetworkCommand extends BaseCommand {
  config.namespace,
  constants.SOLO_DEPLOYMENT_CHART,
  config.chartPath,
- config.fstChartVersion,
+ config.soloChartVersion,
  config.valuesArg)
  }
  },
@@ -522,7 +522,7 @@ export class NetworkCommand extends BaseCommand {
  constants.SOLO_DEPLOYMENT_CHART,
  config.chartPath,
  config.valuesArg,
- config.fstChartVersion
+ config.soloChartVersion
  )
  }
  },

src/commands/node.mjs

@@ -212,7 +212,7 @@ export class NodeCommand extends BaseCommand {
  flags.devMode,
  flags.debugNodeAlias,
  flags.endpointType,
- flags.fstChartVersion,
+ flags.soloChartVersion,
  flags.generateGossipKeys,
  flags.generateTlsKeys,
  flags.gossipEndpoints,
@@ -331,7 +331,7 @@ export class NodeCommand extends BaseCommand {
  flags.devMode,
  flags.debugNodeAlias,
  flags.endpointType,
- flags.fstChartVersion,
+ flags.soloChartVersion,
  flags.gossipEndpoints,
  flags.gossipPrivateKey,
  flags.gossipPublicKey,
@@ -790,7 +790,7 @@ export class NodeCommand extends BaseCommand {
  constants.SOLO_DEPLOYMENT_CHART,
  config.chartPath,
  valuesArg,
- config.fstChartVersion
+ config.soloChartVersion
  )
  }
 
@@ -1650,7 +1650,7 @@ export class NodeCommand extends BaseCommand {
  flags.debugNodeAlias,
  flags.endpointType,
  flags.force,
- flags.fstChartVersion,
+ flags.soloChartVersion,
  flags.localBuildPath,
  flags.gossipEndpoints,
  flags.grpcEndpoints
@@ -1668,7 +1668,7 @@ export class NodeCommand extends BaseCommand {
  * @property {boolean} devMode
  * @property {string} debugNodeAlias
  * @property {string} endpointType
- * @property {string} fstChartVersion
+ * @property {string} soloChartVersion
  * @property {boolean} generateGossipKeys
  * @property {boolean} generateTlsKeys
  * @property {string} gossipEndpoints
@@ -2653,7 +2653,7 @@ export class NodeCommand extends BaseCommand {
  flags.debugNodeAlias,
  flags.endpointType,
  flags.force,
- flags.fstChartVersion,
+ flags.soloChartVersion,
  flags.gossipEndpoints,
  flags.gossipPrivateKey,
  flags.gossipPublicKey,
@@ -2676,7 +2676,7 @@ export class NodeCommand extends BaseCommand {
  * @property {boolean} devMode
  * @property {string} debugNodeAlias
  * @property {string} endpointType
- * @property {string} fstChartVersion
+ * @property {string} soloChartVersion
  * @property {string} gossipEndpoints
  * @property {string} gossipPrivateKey
  * @property {string} gossipPublicKey
@@ -3059,7 +3059,7 @@ export class NodeCommand extends BaseCommand {
  flags.debugNodeAlias,
  flags.endpointType,
  flags.force,
- flags.fstChartVersion,
+ flags.soloChartVersion,
  flags.localBuildPath
  ])
 
@@ -3074,7 +3074,7 @@ export class NodeCommand extends BaseCommand {
  * @property {boolean} devMode
  * @property {string} debugNodeAlias
  * @property {string} endpointType
- * @property {string} fstChartVersion
+ * @property {string} soloChartVersion
  * @property {string} localBuildPath
  * @property {string} namespace
  * @property {NodeAlias} nodeAlias

src/commands/prompts.mjs

@@ -341,12 +341,12 @@ export async function promptDeleteSecrets (task, input) {
  flags.deleteSecrets.name)
 }
 
-export async function promptFstChartVersion (task, input) {
+export async function promptSoloChartVersion (task, input) {
  return await promptText(task, input,
- flags.fstChartVersion.definition.defaultValue,
+ flags.soloChartVersion.definition.defaultValue,
  'Enter solo testing chart version: ',
  null,
- flags.fstChartVersion.name)
+ flags.soloChartVersion.name)
 }
 
 export async function promptUpdateAccountKeys (task, input) {
@@ -450,7 +450,7 @@ export function getPromptMap () {
  .set(flags.enableHederaExplorerTls.name, promptEnableHederaExplorerTls)
  .set(flags.enablePrometheusSvcMonitor.name, promptEnablePrometheusSvcMonitor)
  .set(flags.force.name, promptForce)
- .set(flags.fstChartVersion.name, promptFstChartVersion)
+ .set(flags.soloChartVersion.name, promptSoloChartVersion)
  .set(flags.generateGossipKeys.name, promptGenerateGossipKeys)
  .set(flags.generateTlsKeys.name, promptGenerateTLSKeys)
  .set(flags.hederaExplorerTlsHostName.name, promptHederaExplorerTlsHostName)

src/core/helpers.mjs

@@ -109,10 +109,10 @@ export function packageVersion () {
 export function getRootImageRepository (releaseTag) {
  const releaseVersion = semver.parse(releaseTag, { includePrerelease: true })
  if (releaseVersion.minor < 46) {
- return 'hashgraph/solo-charts/ubi8-init-java17'
+ return 'hashgraph/solo-containers/ubi8-init-java17'
  }
 
- return 'hashgraph/solo-charts/ubi8-init-java21'
+ return 'hashgraph/solo-containers/ubi8-init-java21'
 }
 
 /**

src/core/profile_manager.mjs

@@ -297,7 +297,7 @@ export class ProfileManager {
  * @param {string} profileName resource profile name
  * @returns {Promise<string>} return the full path to the values file
  */
- prepareValuesForFstChart (profileName) {
+ prepareValuesForSoloChart (profileName) {
  if (!profileName) throw new MissingArgumentError('profileName is required')
  const profile = this.getProfile(profileName)
 

test/e2e/commands/account.test.mjs

@@ -51,9 +51,9 @@ describe('AccountCommand', () => {
  argv[flags.generateGossipKeys.name] = true
  argv[flags.generateTlsKeys.name] = true
  argv[flags.clusterName.name] = TEST_CLUSTER
- argv[flags.fstChartVersion.name] = version.FST_CHART_VERSION
- // set the env variable SOLO_FST_CHARTS_DIR if developer wants to use local Solo charts
- argv[flags.chartDirectory.name] = process.env.SOLO_FST_CHARTS_DIR ? process.env.SOLO_FST_CHARTS_DIR : undefined
+ argv[flags.soloChartVersion.name] = version.SOLO_CHART_VERSION
+ // set the env variable SOLO_CHARTS_DIR if developer wants to use local Solo charts
+ argv[flags.chartDirectory.name] = process.env.SOLO_CHARTS_DIR ? process.env.SOLO_CHARTS_DIR : undefined
  const bootstrapResp = bootstrapNetwork(testName, argv)
  const accountCmd = new AccountCommand(bootstrapResp.opts, testSystemAccounts)
  bootstrapResp.cmd.accountCmd = accountCmd

test/e2e/commands/cluster.test.mjs

@@ -51,10 +51,10 @@ describe('ClusterCommand', () => {
  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.soloChartVersion.name] = version.SOLO_CHART_VERSION
  argv[flags.force.name] = true
- // set the env variable SOLO_FST_CHARTS_DIR if developer wants to use local Solo charts
- argv[flags.chartDirectory.name] = process.env.SOLO_FST_CHARTS_DIR ? process.env.SOLO_FST_CHARTS_DIR : undefined
+ // set the env variable SOLO_CHARTS_DIR if developer wants to use local Solo charts
+ argv[flags.chartDirectory.name] = process.env.SOLO_CHARTS_DIR ? process.env.SOLO_CHARTS_DIR : undefined
 
  const bootstrapResp = bootstrapTestVariables(testName, argv)
  const k8 = bootstrapResp.opts.k8

test/e2e/commands/mirror_node.test.mjs

@@ -51,11 +51,11 @@ describe('MirrorNodeCommand', () => {
  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.soloChartVersion.name] = version.SOLO_CHART_VERSION
  argv[flags.force.name] = true
  argv[flags.relayReleaseTag.name] = flags.relayReleaseTag.definition.defaultValue
- // set the env variable SOLO_FST_CHARTS_DIR if developer wants to use local Solo charts
- argv[flags.chartDirectory.name] = process.env.SOLO_FST_CHARTS_DIR ? process.env.SOLO_FST_CHARTS_DIR : undefined
+ // set the env variable SOLO_CHARTS_DIR if developer wants to use local Solo charts
+ argv[flags.chartDirectory.name] = process.env.SOLO_CHARTS_DIR ? process.env.SOLO_CHARTS_DIR : undefined
  argv[flags.quiet.name] = true
 
  const bootstrapResp = bootstrapNetwork(testName, argv)

test/e2e/commands/network.test.mjs

@@ -52,11 +52,11 @@ describe('NetworkCommand', () => {
  argv[flags.generateGossipKeys.name] = true
  argv[flags.generateTlsKeys.name] = true
  argv[flags.deployMinio.name] = true
- argv[flags.fstChartVersion.name] = version.FST_CHART_VERSION
+ argv[flags.soloChartVersion.name] = version.SOLO_CHART_VERSION
  argv[flags.force.name] = true
  argv[flags.applicationEnv.name] = applicationEnvFilePath
- // set the env variable SOLO_FST_CHARTS_DIR if developer wants to use local Solo charts
- argv[flags.chartDirectory.name] = process.env.SOLO_FST_CHARTS_DIR ? process.env.SOLO_FST_CHARTS_DIR : undefined
+ // set the env variable SOLO_CHARTS_DIR if developer wants to use local Solo charts
+ argv[flags.chartDirectory.name] = process.env.SOLO_CHARTS_DIR ? process.env.SOLO_CHARTS_DIR : undefined
  argv[flags.quiet.name] = true
 
  const bootstrapResp = bootstrapTestVariables(testName, argv)