Merge pull request #913 from joshrwolf/test-jsonschema

fix test.environment jsonschema struct tag
chainguard-dev · Mar 7, 2024 · 1b8b1de · 1b8b1de
2 parents 7860a48 + 8617729
commit 1b8b1de
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/pkg/config/config.go b/pkg/config/config.go
@@ -413,7 +413,7 @@ type Test struct {
 	// Environment.Contents.Packages automatically get
 	// package.dependencies.runtime added to it. So, if your test needs
 	// no additional packages, you can leave it blank.
-	Environment apko_types.ImageConfiguration
+	Environment apko_types.ImageConfiguration `json:"environment" yaml:"environment"`
 
 	// Required: The list of pipelines that test the produced package.
 	Pipeline []Pipeline `json:"pipeline" yaml:"pipeline"`
@@ -861,7 +861,7 @@ func ParseConfiguration(ctx context.Context, configurationFilePath string, opts
 		defaultEnvVarGOMODCACHE = "/var/cache/melange/gomodcache"
 	)
 
-	var setIfEmpty = func(key, value string) {
+	setIfEmpty := func(key, value string) {
 		if cfg.Environment.Environment[key] == "" {
 			cfg.Environment.Environment[key] = value
 		}

diff --git a/pkg/config/schema.json b/pkg/config/schema.json
@@ -821,7 +821,7 @@
     },
     "Test": {
       "properties": {
-        "Environment": {
+        "environment": {
           "$ref": "#/$defs/ImageConfiguration",
           "description": "Additional Environment necessary for test.\nEnvironment.Contents.Packages automatically get\npackage.dependencies.runtime added to it. So, if your test needs\nno additional packages, you can leave it blank."
         },
@@ -836,7 +836,7 @@
       "additionalProperties": false,
       "type": "object",
       "required": [
-        "Environment",
+        "environment",
         "pipeline"
       ]
     },