Merge pull request #109 from aquasecurity/108-read-version-map

feat: move version_map.yaml into configdir, fixes #108

.goreleaser.yml

@@ -20,4 +20,3 @@ archives:
       }}v{{.Arm }}{{ end }}"
     files:
       - cfg/*
-      - version_map.yaml

cmd/app_test.go

@@ -36,9 +36,8 @@ func (p mockPowerShell) Execute(customConfig ...interface{}) (result string, err
 
 func init() {
 	here, _ := os.Getwd()
-	// cfgDir and rootDir are defined in root.go
-	rootDir = fmt.Sprintf("%s/..", here)
-	cfgDir = fmt.Sprintf("%s/cfg", rootDir)
+	// cfgDir is defined in root.go
+	cfgDir = fmt.Sprintf("%s/../cfg", here)
 }
 
 func TestGetControls(t *testing.T) {

cmd/root.go

@@ -35,7 +35,6 @@ var (
 
 	windowsCisVersion string
 	cfgDir            string
-	rootDir           string
 	cfgFile           string
 	checkList         string
 	jsonFmt           bool
@@ -115,13 +114,6 @@ func init() {
 	goflag.CommandLine.VisitAll(func(goflag *goflag.Flag) {
 		RootCmd.PersistentFlags().AddGoFlag(goflag)
 	})
-
-	// Initialize global variables
-	var err error
-	rootDir, err = os.Getwd()
-	if err != nil {
-		glog.Fatalf("Failed to get the current working directory: %v", err)
-	}
 }
 
 // initConfig reads in config file and ENV variables if set.

cmd/util.go

@@ -102,7 +102,7 @@ func loadConfig(cisVersion, serverVersion, serverType string) (string, error) {
 	var err error
 	versionMap := make(map[string]string)
 	key := fmt.Sprintf("%s_%s_%s", serverVersion, serverType, cisVersion)
-	path := filepath.Join(rootDir, "version_map.yaml")
+	path := filepath.Join(cfgDir, "version_map.yaml")
 	in, err := os.ReadFile(path)
 	if err != nil {
 		return "", err