Decouple schema parsing from validation parsing

Author: tstirrat15

Diff for: .golangci.yaml

@@ -29,9 +29,9 @@ linters:
     - "rowserrcheck"
     - "staticcheck"
     - "stylecheck"
-    - "tenv"
     - "typecheck"
     - "unconvert"
     - "unused"
+    - "usetesting"
     - "wastedassign"
     - "whitespace"

Diff for: internal/client/client_test.go

@@ -14,7 +14,7 @@ import (
 
 func TestGetTokenWithCLIOverride(t *testing.T) {
 	require := require.New(t)
-	testCert, err := os.CreateTemp("", "")
+	testCert, err := os.CreateTemp(t.TempDir(), "")
 	require.NoError(err)
 	_, err = testCert.Write([]byte("hi"))
 	require.NoError(err)
@@ -100,10 +100,9 @@ func TestGetCurrentTokenWithCLIOverrideWithoutSecretFile(t *testing.T) {
 
 	bTrue := true
 
-	tmpDir, err := os.MkdirTemp("", "")
-	require.NoError(err)
+	tmpDir := t.TempDir()
 	configPath := path.Join(tmpDir, "config.json")
-	err = os.WriteFile(configPath, []byte("{}"), 0o600)
+	err := os.WriteFile(configPath, []byte("{}"), 0o600)
 	require.NoError(err)
 
 	configStore := &storage.JSONConfigStore{ConfigPath: tmpDir}

Diff for: internal/cmd/backup_test.go

@@ -168,7 +168,7 @@ func TestBackupParseRelsCmdFunc(t *testing.T) {
 
 			cmd := zedtesting.CreateTestCobraCommandWithFlagValue(t, zedtesting.StringFlag{FlagName: "prefix-filter", FlagValue: tt.filter})
 			backupName := createTestBackup(t, tt.schema, tt.relationships)
-			f, err := os.CreateTemp("", "parse-output")
+			f, err := os.CreateTemp(t.TempDir(), "parse-output")
 			require.NoError(t, err)
 			defer func() {
 				_ = f.Close()
@@ -189,7 +189,7 @@ func TestBackupParseRelsCmdFunc(t *testing.T) {
 func TestBackupParseRevisionCmdFunc(t *testing.T) {
 	cmd := zedtesting.CreateTestCobraCommandWithFlagValue(t, zedtesting.StringFlag{FlagName: "prefix-filter", FlagValue: "test"})
 	backupName := createTestBackup(t, testSchema, testRelationships)
-	f, err := os.CreateTemp("", "parse-output")
+	f, err := os.CreateTemp(t.TempDir(), "parse-output")
 	require.NoError(t, err)
 	defer func() {
 		_ = f.Close()
@@ -249,7 +249,7 @@ func TestBackupParseSchemaCmdFunc(t *testing.T) {
 				zedtesting.StringFlag{FlagName: "prefix-filter", FlagValue: tt.filter},
 				zedtesting.BoolFlag{FlagName: "rewrite-legacy", FlagValue: tt.rewriteLegacy})
 			backupName := createTestBackup(t, tt.schema, nil)
-			f, err := os.CreateTemp("", "parse-output")
+			f, err := os.CreateTemp(t.TempDir(), "parse-output")
 			require.NoError(t, err)
 			defer func() {
 				_ = f.Close()

Diff for: internal/cmd/helpers_test.go

@@ -42,7 +42,7 @@ func readLines(t *testing.T, fileName string) []string {
 func createTestBackup(t *testing.T, schema string, relationships []string) string {
 	t.Helper()
 
-	f, err := os.CreateTemp("", "test-backup")
+	f, err := os.CreateTemp(t.TempDir(), "test-backup")
 	require.NoError(t, err)
 	defer f.Close()
 	t.Cleanup(func() {

Diff for: internal/cmd/test/happy-path-validation-file.yaml renamed to internal/cmd/import-test/happy-path-validation-file.yaml

@@ -23,7 +23,7 @@ func TestImportCmdHappyPath(t *testing.T) {
 		zedtesting.IntFlag{FlagName: "batch-size", FlagValue: 100},
 		zedtesting.IntFlag{FlagName: "workers", FlagValue: 1},
 	)
-	f := filepath.Join("test", "happy-path-validation-file.yaml")
+	f := filepath.Join("import-test", "happy-path-validation-file.yaml")
 
 	// Set up client
 	ctx, cancel := context.WithCancel(context.Background())

Diff for: internal/cmd/test/happy-path-validation-schema.zed renamed to internal/cmd/import-test/happy-path-validation-schema.zed

@@ -0,0 +1,4 @@
+definition resource {
+  relation user: user
+  permission view = user
+}

Diff for: internal/cmd/import_test.go

@@ -0,0 +1 @@
+definition user {}

Diff for: internal/cmd/validate-test/composable-schema-root.zed

@@ -0,0 +1,9 @@
+---
+schemaFile: "./external-schema.zed"
+relationships: >-
+  resource:1#user@user:1
+assertions:
+  assertTrue:
+    - "resource:1#user@user:1"
+  assertFalse:
+    - "resource:1#user@user:2"

Diff for: internal/cmd/validate-test/composable-schema-user.zed

@@ -0,0 +1,6 @@
+definition user {}
+
+definition resource {
+  relation user: user
+  permission view = user
+}

Diff for: internal/cmd/validate-test/external-schema.yaml

@@ -0,0 +1 @@
+something something {}

Diff for: internal/cmd/validate-test/external-schema.zed

@@ -0,0 +1,8 @@
+---
+relationships: >-
+  resource:1#user@user:1
+assertions:
+  assertTrue:
+    - "resource:1#user@user:1"
+  assertFalse:
+    - "resource:1#user@user:2"

Diff for: internal/cmd/validate-test/invalid-schema.zed

@@ -0,0 +1,5 @@
+partial foo {}
+
+definition bar {
+  ...foo
+}

Diff for: internal/cmd/validate-test/missing-schema.yaml

@@ -0,0 +1,2 @@
+// "or" is a reserved keyword in composable schemas
+definition or {}

Diff for: internal/cmd/validate-test/only-passes-composable.zed

@@ -0,0 +1,6 @@
+definition user {}
+
+definition resource {
+  relation user: user
+  permission view = user
+}

Diff for: internal/cmd/validate-test/only-passes-standard.zed

@@ -0,0 +1,15 @@
+---
+schema: |-
+  definition user {}
+
+  definition resource {
+    relation user: user
+    permission view = user
+  }
+relationships: >-
+  resource:1#user@user:1
+assertions:
+  assertTrue:
+    - "resource:1#user@user:1"
+  assertFalse:
+    - "resource:1#user@user:2"

Diff for: internal/cmd/validate-test/schema-only.zed

@@ -4,7 +4,6 @@ import (
 	"errors"
 	"fmt"
 	"net/url"
-	"os"
 	"strings"
 
 	"github.com/ccoveille/go-safecast"
@@ -94,6 +93,12 @@ func validatePreRunE(cmd *cobra.Command, _ []string) error {
 	return nil
 }
 
+/*
+Okay so
+TODO: add flag to force one kind of resolution or the other
+TODO: display error output from composable schema if both fail
+*/
+
 func validateCmdFunc(cmd *cobra.Command, filenames []string) error {
 	// Initialize variables for multiple files
 	var (
@@ -122,7 +127,7 @@ func validateCmdFunc(cmd *cobra.Command, filenames []string) error {
 		if err != nil {
 			var errWithSource spiceerrors.WithSourceError
 			if errors.As(err, &errWithSource) {
-				ouputErrorWithSource(validateContents, errWithSource)
+				outputErrorWithSource(validateContents, errWithSource)
 			}
 			return err
 		}
@@ -145,13 +150,17 @@ func validateCmdFunc(cmd *cobra.Command, filenames []string) error {
 			return err
 		}
 		if devErrs != nil {
+			// TODO: this depends on where `schema:` is in the file
 			schemaOffset := 1 /* for the 'schema:' */
 			if isOnlySchema {
 				schemaOffset = 0
 			}
 
 			// Output errors
 			outputDeveloperErrorsWithLineOffset(validateContents, devErrs.InputErrors, schemaOffset)
+			// TODO: this may not make sense
+			// Return the first error up the chain
+			return errors.New(devErrs.InputErrors[0].Message)
 		}
 		// Run assertions
 		adevErrs, aerr := development.RunAllAssertions(devCtx, &parsed.Assertions)
@@ -160,6 +169,9 @@ func validateCmdFunc(cmd *cobra.Command, filenames []string) error {
 		}
 		if adevErrs != nil {
 			outputDeveloperErrors(validateContents, adevErrs)
+			// TODO: this may not make sense
+			// Return the first of the errors up the chain
+			return errors.New(adevErrs[0].Message)
 		}
 		successfullyValidatedFiles++
 
@@ -170,6 +182,9 @@ func validateCmdFunc(cmd *cobra.Command, filenames []string) error {
 		}
 		if erDevErrs != nil {
 			outputDeveloperErrors(validateContents, erDevErrs)
+			// TODO: this may not make sense
+			// Return the first of the errors up the chain
+			return errors.New(erDevErrs[0].Message)
 		}
 		// Print out any warnings for all files
 		warnings, err := development.GetWarnings(ctx, devCtx)
@@ -203,10 +218,9 @@ func validateCmdFunc(cmd *cobra.Command, filenames []string) error {
 	return nil
 }
 
-func ouputErrorWithSource(validateContents []byte, errWithSource spiceerrors.WithSourceError) {
+func outputErrorWithSource(validateContents []byte, errWithSource spiceerrors.WithSourceError) {
 	console.Printf("%s%s\n", errorPrefix(), errorMessageStyle().Render(errWithSource.Error()))
 	outputForLine(validateContents, errWithSource.LineNumber, errWithSource.SourceCodeString, 0) // errWithSource.LineNumber is 1-indexed
-	os.Exit(1)
 }
 
 func outputForLine(validateContents []byte, oneIndexedLineNumber uint64, sourceCodeString string, oneIndexedColumnPosition uint64) {
@@ -234,8 +248,6 @@ func outputDeveloperErrorsWithLineOffset(validateContents []byte, devErrors []*d
 	for _, devErr := range devErrors {
 		outputDeveloperError(devErr, lines, lineOffset)
 	}
-
-	os.Exit(1)
 }
 
 func outputDeveloperError(devError *devinterface.DeveloperError, lines []string, lineOffset int) {