Merge pull request #19 from Peefy/refactor-vet-cli

refactor: vet cli using the validate API
kcl-lang · Nov 29, 2023 · 4444f1e · 4444f1e
2 parents 791f875 + e141e5c
commit 4444f1e
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 16 deletions.
diff --git a/cmd/kcl/commands/vet.go b/cmd/kcl/commands/vet.go
@@ -57,16 +57,16 @@ func NewVetCmd() *cobra.Command {
 
 func doValidate(dataFile, codeFile string, o *validate.ValidateOptions) error {
 	var ok bool
-	code, err := os.ReadFile(codeFile)
-	if err != nil {
-		return err
-	}
 	if dataFile == "-" {
 		// Read data from stdin
 		input, err := io.ReadAll(os.Stdin)
 		if err != nil {
 			return err
 		}
+		code, err := os.ReadFile(codeFile)
+		if err != nil {
+			return err
+		}
 		ok, err = validate.ValidateCode(string(input), string(code), o)
 		if err != nil {
 			return err
@@ -78,18 +78,14 @@ func doValidate(dataFile, codeFile string, o *validate.ValidateOptions) error {
 			return err
 		}
 		for _, dataFile := range dataFiles {
-			data, err := os.ReadFile(dataFile)
-			if err != nil {
-				return err
-			}
-			ok, err = validate.ValidateCode(string(data), string(code), o)
+			ok, err = validate.Validate(dataFile, codeFile, o)
 			if err != nil {
 				return err
 			}
 		}
 	}
 	if ok {
-		fmt.Println("Validate success")
+		fmt.Println("Validate success!")
 	}
 	return nil
 }
diff --git a/go.mod b/go.mod
@@ -5,7 +5,7 @@ go 1.19
 require (
 	github.com/acarl005/stripansi v0.0.0-20180116102854-5a71ef0e047d
 	github.com/spf13/cobra v1.7.0
-	kcl-lang.io/kcl-go v0.7.0-beta.1.0.20231127032754-434db4c2e176
+	kcl-lang.io/kcl-go v0.7.0-beta.1.0.20231129132340-83897a56d087
 	kcl-lang.io/kcl-openapi v0.5.2-0.20231116071001-d8316c05cd2d
 	kcl-lang.io/kcl-playground v0.5.1-0.20230919072953-347ab8959295
 	kcl-lang.io/kpm v0.4.1
@@ -81,7 +81,7 @@ require (
 	k8s.io/klog/v2 v2.100.1 // indirect
 	k8s.io/kube-openapi v0.0.0-20230717233707-2695361300d9 // indirect
 	k8s.io/utils v0.0.0-20230406110748-d93618cff8a2 // indirect
-	kcl-lang.io/kcl-artifact-go v0.7.0-beta.1 // indirect
+	kcl-lang.io/kcl-artifact-go v0.7.0-beta.2 // indirect
 	sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
 	sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
 	sigs.k8s.io/yaml v1.3.0 // indirect

diff --git a/go.sum b/go.sum
@@ -1284,10 +1284,10 @@ k8s.io/utils v0.0.0-20210802155522-efc7438f0176/go.mod h1:jPW/WVKK9YHAvNhRxK0md/
 k8s.io/utils v0.0.0-20220210201930-3a6ce19ff2f9/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA=
 k8s.io/utils v0.0.0-20230406110748-d93618cff8a2 h1:qY1Ad8PODbnymg2pRbkyMT/ylpTrCM8P2RJ0yroCyIk=
 k8s.io/utils v0.0.0-20230406110748-d93618cff8a2/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
-kcl-lang.io/kcl-artifact-go v0.7.0-beta.1 h1:u1l/OXWblOiDHabN+6ApSHTZwNyOskuOCf90fXreGu4=
-kcl-lang.io/kcl-artifact-go v0.7.0-beta.1/go.mod h1:c07mqi9Hu2UjPW7lYfHhAAWOlZiB7lo7Vkr4jL5ov/M=
-kcl-lang.io/kcl-go v0.7.0-beta.1.0.20231127032754-434db4c2e176 h1:CG59UuhIAH30Fj0mEYxn2bokHi/+UWjqop2WINOfRtQ=
-kcl-lang.io/kcl-go v0.7.0-beta.1.0.20231127032754-434db4c2e176/go.mod h1:yf8pMkic+1m4wedG9MLxrkeVoqFhIrMbY+x4nPPg2O8=
+kcl-lang.io/kcl-artifact-go v0.7.0-beta.2 h1:7L5qbEqD8y672XNTk2snv8/UXScABFdM3g9Bu2Ama1Q=
+kcl-lang.io/kcl-artifact-go v0.7.0-beta.2/go.mod h1:c07mqi9Hu2UjPW7lYfHhAAWOlZiB7lo7Vkr4jL5ov/M=
+kcl-lang.io/kcl-go v0.7.0-beta.1.0.20231129132340-83897a56d087 h1:shfYD/EiBuacHQJ63XuM7X1OgieiyfaqrpqhU0ECVCE=
+kcl-lang.io/kcl-go v0.7.0-beta.1.0.20231129132340-83897a56d087/go.mod h1:dxF3hghkxoJKOkBrXwrqc8nRT0HylrOvsI83FxdQT6M=
 kcl-lang.io/kcl-openapi v0.5.2-0.20231116071001-d8316c05cd2d h1:wbaI/FjzeMbzFGEjzBBA4o5AotRAy376IoHXZh/oNJQ=
 kcl-lang.io/kcl-openapi v0.5.2-0.20231116071001-d8316c05cd2d/go.mod h1:Ai9mFztCVKkRSFabczO/r5hCNdqaNtAc2ZIRxTeV0Mk=
 kcl-lang.io/kcl-playground v0.5.1-0.20230919072953-347ab8959295 h1:RUY3w6jNAB6GoMo27CO1oS4C4gjyWdMXfOTNpTEnkjs=