handle packages without setup file

Author: David Cavazos

.github/cloud-samples-tools/pkg/config/config.go

@@ -72,7 +72,8 @@ func (c *Config) Save(file *os.File) error {
 // LoadConfig loads the config from the given path.
 func LoadConfig(path string) (*Config, error) {
 	// Read the config file.
-	config, err := ReadJsonc[Config](path, nil)
+	var config Config
+	err := ReadJsonc(path, &config)
 	if err != nil {
 		return nil, err
 	}
@@ -85,7 +86,7 @@ func LoadConfig(path string) (*Config, error) {
 		config.Match = []string{"*"}
 	}
 
-	return config, nil
+	return &config, nil
 }
 
 // Match returns true if the path matches any of the patterns.
@@ -168,14 +169,15 @@ func (c *Config) Affected(log io.Writer, diffs []string) ([]Package, error) {
 
 	packages := make([]Package, 0, len(changed))
 	for _, path := range changed {
-		pkg := Package{Path: path}
+		pkg := Package{Path: path, Setup: &c.Setup.Defaults}
 		if c.Setup.FileName != "" {
 			setup_file := filepath.Join(path, c.Setup.FileName)
-			setup, err := ReadJsonc(setup_file, &c.Setup.Defaults)
-			if err != nil {
-				return nil, err
+			if fileExists(setup_file) {
+				err := ReadJsonc(setup_file, pkg.Setup)
+				if err != nil {
+					return nil, err
+				}
 			}
-			pkg.Setup = setup
 		}
 		packages = append(packages, pkg)
 	}

.github/cloud-samples-tools/pkg/config/utils.go

@@ -26,26 +26,17 @@ import (
 var multiLineCommentsRegex = regexp.MustCompile(`(?s)\s*/\*.*?\*/`)
 var singleLineCommentsRegex = regexp.MustCompile(`\s*//.*\s*`)
 
-func ReadJsonc[a any](path string, defaults *a) (*a, error) {
+func ReadJsonc[a any](path string, ref *a) error {
 	// Read the JSONC file.
 	sourceJsonc, err := os.ReadFile(path)
 	if err != nil {
-		return nil, err
+		return err
 	}
 
 	// Strip the comments and load the JSON.
 	sourceJson := multiLineCommentsRegex.ReplaceAll(sourceJsonc, []byte{})
 	sourceJson = singleLineCommentsRegex.ReplaceAll(sourceJson, []byte{})
-
-	var value a
-	if defaults != nil {
-		value = *defaults
-	}
-	err = json.Unmarshal(sourceJson, &value)
-	if err != nil {
-		return nil, err
-	}
-	return &value, nil
+	return json.Unmarshal(sourceJson, ref)
 }
 
 // fileExists returns true if the file exists.