PSDL - Fix path manipulation (#855)

vertica · Jul 11, 2024 · f504804 · f504804
1 parent d2ea80a
commit f504804
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 19 deletions.
diff --git a/cmd/kuttl-step-gen/main.go b/cmd/kuttl-step-gen/main.go
@@ -29,12 +29,7 @@ import (
 	"go.uber.org/zap"
 )
 
-const (
-	ConfigArg = iota
-	NumPositionalArgs
-)
-
-const configDir = "/tmp"
+const configPath = "/tmp/local-soak.cfg"
 
 func setupLog() logr.Logger {
 	cfg := zap.Config{
@@ -70,26 +65,18 @@ func main() {
 		"The relative directory to the output directory where the repository scripts directory is located.")
 	flag.Parse()
 
-	if flag.NArg() < NumPositionalArgs {
-		fmt.Println("Not enough positional arguments.")
-		flag.Usage()
-		os.Exit(1)
-	}
-
-	configFileName := flag.Arg(ConfigArg)
-	configPath := fmt.Sprintf("%s/%s", configDir, configFileName)
 	if !filepath.IsAbs(configPath) {
 		fmt.Printf("'%s' is not an absolute path", configPath)
 		os.Exit(1)
 	}
 	configRaw, err := os.ReadFile(configPath)
 	if err != nil {
-		fmt.Printf("Failed to read config file %s: %s", configFileName, err.Error())
+		fmt.Printf("Failed to read config file %s: %s", configPath, err.Error())
 		os.Exit(1)
 	}
 	var config kstepgen.Config
 	if err := yaml.Unmarshal(configRaw, &config); err != nil {
-		fmt.Printf("Failed to parse config file %s: %s", configFileName, err.Error())
+		fmt.Printf("Failed to parse config file %s: %s", configPath, err.Error())
 		os.Exit(1)
 	}
 

diff --git a/scripts/soak-runner.sh b/scripts/soak-runner.sh
@@ -76,8 +76,8 @@ fi
 
 logInfo "Running $ITERATIONS_STR iterations of $TEST_STEPS steps"
 
-cp $CONFIG_FILE /tmp/
-tmpfile=/tmp/$CONFIG_FILE
+tmpfile=/tmp/local-soak.cfg
+cp $CONFIG_FILE $tmpfile
 trap "rm $tmpfile" 0 2 3 15  # Ensure deletion on script exit
 
 curIter=0
@@ -87,7 +87,7 @@ do
 
     # Generate the kuttl test steps for this iteration
     logInfo "\tGenerating test steps. Appending output to $KUTTL_STEP_GEN_OUT"
-    bin/kuttl-step-gen --output-dir=$STEP_OUTPUT_DIR --scripts-dir="../../../scripts" $CONFIG_FILE 2>> $KUTTL_STEP_GEN_OUT
+    bin/kuttl-step-gen --output-dir=$STEP_OUTPUT_DIR --scripts-dir="../../../scripts" 2>> $KUTTL_STEP_GEN_OUT
 
     KUTTL_CFG="kuttl-soak-test-iteration.yaml"
     logInfo "\tRunning kuttl.  Appending output to $KUTTL_OUT"