validate that json is concrete

this avoids the need to use a forked cue

Signed-off-by: Evan Cordell <[email protected]>

Author: ecordell

pkg/schema/validation/validate.go

@@ -39,9 +39,11 @@ func (c configValidator) Validate(b []byte, key string) error {
 		c.logger.WithError(err).Debugf(key)
 		return err
 	}
-
-	err = json.Validate(b, v)
+	jsonAsCue, err := json.Decode(c.runtime, c.instance.Dir, b)
 	if err != nil {
+		return fmt.Errorf("could not parse json: %v", err)
+	}
+	if err := v.Unify(jsonAsCue.Value()).Validate(cue.Concrete(true)); err != nil {
 		c.logger.WithError(err).Debugf("Validation error")
 		return err
 	}

pkg/schema/validation/validate_test.go

@@ -127,32 +127,34 @@ func TestValidateConfig(t *testing.T) {
 	}
 
 	for _, tt := range table {
-		logger := logrus.NewEntry(logrus.New())
-		// load schema for config definitions
-		instance := load.Instances([]string{"."}, &load.Config{
-			Dir: schemaPath,
-		})
-		if len(instance) > 1 {
-			t.Fatalf("multiple instance loading currently not supported: %s", schemaPath)
-		}
-		if len(instance) < 1 {
-			t.Fatalf("no instances found: %s", schemaPath)
-		}
+		t.Run(tt.description, func(t *testing.T) {
+			logger := logrus.NewEntry(logrus.New())
+			// load schema for config definitions
+			instance := load.Instances([]string{"."}, &load.Config{
+				Dir: schemaPath,
+			})
+			if len(instance) > 1 {
+				t.Fatalf("multiple instance loading currently not supported: %s", schemaPath)
+			}
+			if len(instance) < 1 {
+				t.Fatalf("no instances found: %s", schemaPath)
+			}
 
-		// Config validator
-		configValidator := NewConfigValidator(instance[0], logger)
-		// Read json file
-		content, err := ioutil.ReadFile(tt.filename)
-		require.NoError(t, err)
+			// Config validator
+			configValidator := NewConfigValidator(instance[0], logger)
+			// Read json file
+			content, err := ioutil.ReadFile(tt.filename)
+			require.NoError(t, err)
 
-		// Validate json against schema
-		err = configValidator.Validate(content, tt.kind)
+			// Validate json against schema
+			err = configValidator.Validate(content, tt.kind)
 
-		if tt.hasError {
-			require.Error(t, err)
-			require.Contains(t, err.Error(), tt.errString)
-		} else {
-			require.NoError(t, err)
-		}
+			if tt.hasError {
+				require.Error(t, err)
+				require.Contains(t, err.Error(), tt.errString)
+			} else {
+				require.NoError(t, err)
+			}
+		})
 	}
 }