From 87507acbbbf218ba8364a8a86d3f521587f6d327 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Wei=C3=9Fe?= <dw@edgeless.systems>
Date: Thu, 19 Oct 2023 15:00:22 +0200
Subject: [PATCH] Remove force flag from CLI commands
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Daniel Weiße <dw@edgeless.systems>
---
 .github/actions/constellation_create/action.yml | 7 ++-----
 .github/actions/e2e_recover/action.yml          | 6 +++---
 .github/actions/e2e_verify/action.yml           | 6 +++---
 3 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/.github/actions/constellation_create/action.yml b/.github/actions/constellation_create/action.yml
index d1cc605299..b6dab3450c 100644
--- a/.github/actions/constellation_create/action.yml
+++ b/.github/actions/constellation_create/action.yml
@@ -124,16 +124,13 @@ runs:
       run: |
         yq eval -i '(.internalLoadBalancer) = true' constellation-conf.yaml
 
-    # Uses --force flag since the CLI currently does not have a pre-release version and is always on the latest released version.
-    # However, many of our pipelines work on prerelease images. Thus the used images are newer than the CLI's version.
-    # This makes the version validation in the CLI fail.
     - name: Constellation create
       shell: bash
       run: |
         echo "Creating cluster using config:"
         cat constellation-conf.yaml
         sudo sh -c 'echo "127.0.0.1 license.confidential.cloud" >> /etc/hosts' || true
-        constellation create -y --force --debug --tf-log=DEBUG
+        constellation create -y --debug --tf-log=DEBUG
 
     - name: Cdbg deploy
       if: inputs.isDebugImage == 'true'
@@ -150,7 +147,7 @@ runs:
       id: constellation-init
       shell: bash
       run: |
-        constellation init --force --debug
+        constellation init --debug
         echo "KUBECONFIG=$(pwd)/constellation-admin.conf" | tee -a $GITHUB_OUTPUT
 
     - name: Wait for nodes to join and become ready
diff --git a/.github/actions/e2e_recover/action.yml b/.github/actions/e2e_recover/action.yml
index 1f1dfaf525..221931e817 100644
--- a/.github/actions/e2e_recover/action.yml
+++ b/.github/actions/e2e_recover/action.yml
@@ -27,7 +27,7 @@ runs:
         echo "Re-enabling the join-service and waiting for the node to be back up"
         kubectl patch daemonset -n kube-system join-service --type=json -p='[{"op": "remove", "path": "/spec/template/spec/nodeSelector/some-tag"}]'
         kubectl wait --for=condition=Ready=true --timeout=10m --all nodes
-      
+
     - name: Restart all control plane nodes
       shell: bash
       env:
@@ -37,7 +37,7 @@ runs:
         for CONTROL_PLANE_NODE in ${CONTROL_PLANE_NODES}; do
           kubectl debug node/$CONTROL_PLANE_NODE --image=ubuntu -- bash -c "echo reboot > reboot.sh && chroot /host < reboot.sh"
         done
-      
+
     - name: Constellation recover
       shell: bash
       run: |
@@ -45,7 +45,7 @@ runs:
         start_time=$(date +%s)
         recovered=0
         while true; do
-            output=$(constellation recover --force)
+            output=$(constellation recover)
             if echo "$output" | grep -q "Pushed recovery key."; then
                 echo "$output"
                 i=$(echo "$output" | grep -o "Pushed recovery key." | wc -l | sed 's/ //g')
diff --git a/.github/actions/e2e_verify/action.yml b/.github/actions/e2e_verify/action.yml
index c0406d2c2c..1515cb3913 100644
--- a/.github/actions/e2e_verify/action.yml
+++ b/.github/actions/e2e_verify/action.yml
@@ -39,7 +39,7 @@ runs:
 
     - name: Constellation verify
       shell: bash
-      run: constellation verify --cluster-id $(yq -r ".clusterValues.clusterID" constellation-state.yaml) --force
+      run: constellation verify --cluster-id $(yq -r ".clusterValues.clusterID" constellation-state.yaml)
 
     - name: Verify all nodes
       shell: bash
@@ -68,9 +68,9 @@ runs:
 
           if [[ ${{ inputs.cloudProvider }} == "azure" ]]; then
             echo "Extracting Azure TCB versions for API update"
-            constellation verify --cluster-id "${clusterID}" --force --node-endpoint localhost:9090 -o json > "snp-report-${node}.json"
+            constellation verify --cluster-id "${clusterID}" --node-endpoint localhost:9090 -o json > "snp-report-${node}.json"
           else
-            constellation verify --cluster-id "${clusterID}" --force --node-endpoint localhost:9090
+            constellation verify --cluster-id "${clusterID}" --node-endpoint localhost:9090
           fi
 
           kill $forwarderPID