fix(docs): resolve issues due to npx in taskfile for the custom-netwo…

…rk-config example Signed-off-by: Nathan Klick <nathan@swirldslabs.com>
hashgraph · Oct 2, 2024 · 038e6df · 038e6df
1 parent 8273bc4
commit 038e6df
Showing 1 changed file with 16 additions and 8 deletions.
diff --git a/examples/custom-network-config/Taskfile.yml b/examples/custom-network-config/Taskfile.yml
@@ -83,9 +83,10 @@ tasks:
       - test -f {{ .solo_cache_dir }}/templates/bootstrap.properties
       - test -f {{ .solo_cache_dir }}/templates/settings.txt
       - test -f {{ .solo_cache_dir }}/templates/log4j2.xml
-      - set -x; test "$(jq -r '.flags."node-ids"' < {{ .solo_user_dir }}/solo.config)" == "{{ .node_identifiers }}"
+      #- test "$(yq -r '.flags."node-ids"' < {{ .solo_user_dir }}/solo.yaml)" == "{{ .node_identifiers }}"
+      - test "$(jq -r '.flags."node-ids"' < {{ .solo_user_dir }}/solo.config)" == "{{ .node_identifiers }}"
     cmds:
-      - npx solo init --namespace "${SOLO_NAMESPACE}" --node-ids {{.node_identifiers}} --release-tag "${CONSENSUS_NODE_VERSION}" --cluster-setup-namespace "${SOLO_CLUSTER_SETUP_NAMESPACE}"
+      - solo init --namespace "${SOLO_NAMESPACE}" --node-ids {{.node_identifiers}} --release-tag "${CONSENSUS_NODE_VERSION}" --cluster-setup-namespace "${SOLO_CLUSTER_SETUP_NAMESPACE}"
 
   solo:keys:
     internal: true
@@ -98,29 +99,29 @@ tasks:
           test -f {{ .solo_keys_dir }}/s-private-node${n}.pem
          done
     cmds:
-      - npx solo node keys --gossip-keys --tls-keys
+      - solo node keys --gossip-keys --tls-keys
 
   solo:network:deploy:
     internal: true
     cmds:
-      - npx solo network deploy --release-tag "${CONSENSUS_NODE_VERSION}" --fst-chart-version "${FST_CHART_VERSION}" --values-file {{ .solo_values_file }} --settings-txt {{ .solo_settings_file }}
-      - npx solo node setup --release-tag "${CONSENSUS_NODE_VERSION}"
+      - solo network deploy --release-tag "${CONSENSUS_NODE_VERSION}" --fst-chart-version "${FST_CHART_VERSION}" --values-file {{ .solo_values_file }} --settings-txt {{ .solo_settings_file }}
+      - solo node setup --release-tag "${CONSENSUS_NODE_VERSION}"
 
   solo:network:destroy:
     internal: true
     cmds:
-      - npx solo network destroy --namespace "${SOLO_NAMESPACE}" --delete-pvcs --delete-secrets --force
+      - solo network destroy --namespace "${SOLO_NAMESPACE}" --delete-pvcs --delete-secrets --force
 
   solo:node:start:
     internal: true
     cmds:
-      - npx solo node start --namespace "${SOLO_NAMESPACE}" {{ .CLI_ARGS }}
+      - solo node start --namespace "${SOLO_NAMESPACE}" {{ .CLI_ARGS }}
 
   solo:node:stop:
     internal: true
     ignore_error: true
     cmds:
-      - npx solo node stop --namespace "${SOLO_NAMESPACE}" {{ .CLI_ARGS }}
+      - solo node stop --namespace "${SOLO_NAMESPACE}" {{ .CLI_ARGS }}
 
   solo:node:addresses:
     internal: true
@@ -141,6 +142,13 @@ tasks:
     cmds:
       - rm -rf {{ .solo_logs_dir }}
 
+  solo:config:remove:
+    internal: true
+    status:
+      - test [[ ! -f {{ .solo_user_dir }}/solo.yaml ]]
+    cmds:
+      - rm -rf {{ .solo_user_dir }}/solo.yaml
+
   install:solo:
     internal: true
     status: