support default values

Author: David Cavazos

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

@@ -32,8 +32,11 @@ type Config struct {
 	// Filename to look for the root of a package.
 	PackageFile []string `json:"package-file"`
 
-	// Setup filename, must be located in the same directory as the package file.
-	SetupFile string `json:"setup-file"`
+	// Setup file, must be located in the same directory as the package file.
+	Setup struct {
+		FileName string         `json:"filename"`
+		Defaults map[string]any `json:"defaults"`
+	} `json:"setup"`
 
 	// Pattern to match filenames or directories.
 	Match []string `json:"match"`
@@ -69,7 +72,7 @@ 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)
+	config, err := ReadJsonc[Config](path, nil)
 	if err != nil {
 		return nil, err
 	}
@@ -166,10 +169,9 @@ 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}
-		if c.SetupFile != "" {
-			setup_file := filepath.Join(path, c.SetupFile)
-			println(setup_file)
-			setup, err := ReadJsonc[map[string]any](setup_file)
+		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
 			}

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

@@ -26,7 +26,7 @@ import (
 var multiLineCommentsRegex = regexp.MustCompile(`(?s)\s*/\*.*?\*/`)
 var singleLineCommentsRegex = regexp.MustCompile(`\s*//.*\s*`)
 
-func ReadJsonc[a any](path string) (*a, error) {
+func ReadJsonc[a any](path string, defaults *a) (*a, error) {
 	// Read the JSONC file.
 	sourceJsonc, err := os.ReadFile(path)
 	if err != nil {
@@ -38,6 +38,9 @@ func ReadJsonc[a any](path string) (*a, error) {
 	sourceJson = singleLineCommentsRegex.ReplaceAll(sourceJson, []byte{})
 
 	var value a
+	if defaults != nil {
+		value = *defaults
+	}
 	err = json.Unmarshal(sourceJson, &value)
 	if err != nil {
 		return nil, err

.github/config/nodejs-dev.jsonc

@@ -16,7 +16,13 @@
 
 {
   "package-file": [ "package.json" ],
-  "setup-file": "setup.json",
+  "setup": {
+    "filename": "setup.json",
+    "defaults": {
+      "nodejs_version": 20,
+      "secrets": null
+    }
+  },
   "ignore": [
     ".eslintignore",
     ".eslintrc.json",

generative-ai/snippets/setup.json

@@ -1,4 +1,5 @@
 {
+  "nodejs_version": 18,
   "secrets": [
     "CAIP_PROJECT_ID:nodejs-docs-samples-tests/nodejs-docs-samples-ai-platform-caip-project-id",
     "LOCATION:nodejs-docs-samples-tests/nodejs-docs-samples-ai-platform-location",