Merge pull request #92 from daedaleanai/ja/OptionToPersistFlags

Add config to persist flags optionally
daedaleanai · Nov 28, 2022 · c83673d · c83673d
2 parents 33d20d6 + 31818d7
commit c83673d
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 22 deletions.
diff --git a/RULES/core/flags.go b/RULES/core/flags.go
@@ -2,7 +2,6 @@ package core
 
 import (
 	"encoding/json"
-	"fmt"
 	"io/ioutil"
 	"os"
 	"path"
@@ -225,31 +224,31 @@ func initializeFlag(flag flagInterface, name string, isInitialized *bool) {
 	Fatal("flag '%s' has disallowed value '%s'", name, info.Value)
 }
 
-func lockAndGetFlags() map[string]flagInfo {
+func lockAndGetFlags(storePersistedFlags bool) map[string]flagInfo {
 	flagsLocked = true
 
 	flagInfo := map[string]flagInfo{}
 	flagValues := map[string]string{}
-	flagStrings := []string{}
 	for name, flag := range registeredFlags {
 		info := flag.info()
 		flagInfo[name] = info
 		flagValues[name] = info.Value
-		flagStrings = append(flagStrings, fmt.Sprintf("%s=%s", name, info.Value))
 	}
 
-	// Store current flag values in FLAGS.json file.
-	data, err := json.Marshal(flagValues)
-	if err != nil {
-		Fatal("failed to marshal config flag values: %s", err)
-	}
-	flagsFilePath := path.Join(input.OutputDir, flagsFileName)
-	if err := os.MkdirAll(filepath.Dir(flagsFilePath), os.ModePerm); err != nil {
-		Fatal("Failed to create directory for flags file: %s", err)
-	}
-	err = ioutil.WriteFile(flagsFilePath, data, fileMode)
-	if err != nil {
-		Fatal("failed to write config flag values: %s", err)
+	if storePersistedFlags {
+		// Store current flag values in FLAGS.json file.
+		data, err := json.Marshal(flagValues)
+		if err != nil {
+			Fatal("failed to marshal config flag values: %s", err)
+		}
+		flagsFilePath := path.Join(input.OutputDir, flagsFileName)
+		if err := os.MkdirAll(filepath.Dir(flagsFilePath), os.ModePerm); err != nil {
+			Fatal("Failed to create directory for flags file: %s", err)
+		}
+		err = ioutil.WriteFile(flagsFilePath, data, fileMode)
+		if err != nil {
+			Fatal("failed to write config flag values: %s", err)
+		}
 	}
 
 	return flagInfo

diff --git a/RULES/core/main.go b/RULES/core/main.go
@@ -31,6 +31,7 @@ type generatorInput struct {
 	Layout               string
 	SelectedTargets      []string
 	BuildAnalyzerTargets bool
+	PersistFlags         bool
 }
 
 type generatorOutput struct {
@@ -57,10 +58,8 @@ func checkHasAnySelectedTargetsOtherThanReports(vars map[string]interface{}) boo
 }
 
 func isAnalyzerReportTarget(target interface{}) bool {
-	if _, ok := target.(analyzerReportInterface); ok {
-		return true
-	}
-	return false
+	_, ok := target.(analyzerReportInterface)
+	return ok
 }
 
 func isTargetSelected(targetPath string) bool {
@@ -75,7 +74,7 @@ func isTargetSelected(targetPath string) bool {
 func GeneratorMain(vars map[string]interface{}) {
 	output := generatorOutput{
 		Targets: map[string]targetInfo{},
-		Flags:   lockAndGetFlags(),
+		Flags:   lockAndGetFlags(input.PersistFlags),
 	}
 
 	for targetPath, variable := range vars {

diff --git a/RULES/core/util.go b/RULES/core/util.go
@@ -41,7 +41,11 @@ func loadInput() generatorInput {
 		os.Exit(1)
 	}
 
-	var input generatorInput
+	input := generatorInput{
+		// If the dbt binary is too old and does not provide this value, we must default to true
+		// to keep the old behavior
+		PersistFlags: true,
+	}
 	if err := json.Unmarshal(data, &input); err != nil {
 		fmt.Fprintf(os.Stderr, "Error: Could not parse DBT input: %s.\n", err)
 		os.Exit(1)