lint

hashicorp · Dec 20, 2024 · 9358451 · 9358451
1 parent ae9fb02
commit 9358451
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 8 deletions.
diff --git a/enos/enos-scenario-autopilot.hcl b/enos/enos-scenario-autopilot.hcl
@@ -82,7 +82,7 @@ scenario "autopilot" {
     manage_service                     = matrix.artifact_type == "bundle"
     vault_install_dir                  = global.vault_install_dir[matrix.artifact_type]
     vault_autopilot_default_max_leases = semverconstraint(var.vault_upgrade_initial_version, ">=1.16.0-0") ? "300000" : ""
-    verify_removed_step_module         = semverconstraint(var.vault_product_version, ">=1.19.0-0") && matrix.backend == "raft" ? "vault_verify_raft_removed" : "vault_removed_do_nothing"
+    verify_removed_step_module         = semverconstraint(var.vault_upgrade_initial_version, ">=1.19.0-0") ? "vault_verify_raft_removed" : "vault_removed_do_nothing"
   }
 
   step "build_vault" {

diff --git a/enos/modules/vault_raft_remove_and_verify/main.tf b/enos/modules/vault_raft_remove_and_verify/main.tf
@@ -107,7 +107,7 @@ module "remove_raft_node" {
 }
 
 module "verify_removed" {
-  source     = "../vault_verify_raft_removed"
+  source = "../vault_verify_raft_removed"
   depends_on = [
     module.remove_raft_node
   ]

diff --git a/enos/modules/vault_verify_raft_removed/scripts/verify_manual_rejoin_fails.sh b/enos/modules/vault_verify_raft_removed/scripts/verify_manual_rejoin_fails.sh
@@ -17,5 +17,5 @@ test -x "$binpath" || fail "unable to locate vault binary at $binpath"
 result=$($binpath operator raft join "$VAULT_LEADER_ADDR")
 output=$?
 if [ $output -ne 2 ]; then
-  fail "Joining did not return code 2, instead $output: $result"  
+  fail "Joining did not return code 2, instead $output: $result"
 fi
diff --git a/enos/modules/vault_verify_raft_removed/scripts/verify_raft_remove_peer.sh b/enos/modules/vault_verify_raft_removed/scripts/verify_raft_remove_peer.sh
@@ -31,14 +31,14 @@ expectRemoved() {
     echo "unexpected status $status"
     return 1
   fi
-  
+
   local health
   health=$(getSysHealth)
   if [[ "$health" != "true" ]]; then
     echo "unexpected health $health"
-  fi 
-  
-  return 0 
+  fi
+
+  return 0
 }
 
 begin_time=$(date +%s)

diff --git a/enos/modules/vault_verify_raft_removed/scripts/verify_unseal_fails.sh b/enos/modules/vault_verify_raft_removed/scripts/verify_unseal_fails.sh
@@ -20,4 +20,3 @@ code=$?
 if [ $code -eq 0 ]; then
   fail "expected unseal to fail but got exit code $code: $result"
 fi
-
Original file line number	Diff line number	Diff line change
Expand Up		@@ -20,4 +20,3 @@ code=$?
		if [ $code -eq 0 ]; then
		fail "expected unseal to fail but got exit code $code: $result"
		fi