Moved doc building to async to speed things up.

cmd/lint.go

@@ -110,7 +110,7 @@ func GetLintCommand() *cobra.Command {
 				Spec:              specBytes,
 				CustomFunctions:   customFunctions,
 				Base:              baseFlag,
-				AllowLookup:	   remoteFlag,
+				AllowLookup:       remoteFlag,
 				SkipDocumentCheck: skipCheckFlag,
 			})
 

go.mod

@@ -11,8 +11,8 @@ require (
 	github.com/gizak/termui/v3 v3.1.0
 	github.com/json-iterator/go v1.1.12
 	github.com/mitchellh/mapstructure v1.5.0
-	github.com/pb33f/libopenapi v0.13.7
-	github.com/pb33f/libopenapi-validator v0.0.26
+	github.com/pb33f/libopenapi v0.13.9
+	github.com/pb33f/libopenapi-validator v0.0.27
 	github.com/pterm/pterm v0.12.69
 	github.com/santhosh-tekuri/jsonschema/v5 v5.3.1
 	github.com/spf13/cobra v1.7.0

go.sum

@@ -248,10 +248,10 @@ github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1y
 github.com/onsi/gomega v1.17.0/go.mod h1:HnhC7FXeEQY45zxNK3PPoIUhzk/80Xly9PcubAlGdZY=
 github.com/onsi/gomega v1.19.0 h1:4ieX6qQjPP/BfC3mpsAtIGGlxTWPeA3Inl/7DtXw1tw=
 github.com/onsi/gomega v1.19.0/go.mod h1:LY+I3pBVzYsTBU1AnDwOSxaYi9WoWiqgwooUqq9yPro=
-github.com/pb33f/libopenapi v0.13.7 h1:5ibvwDDMBR21lr4SQvxfLbiQERxxr8Fb8O2ousw1wxA=
-github.com/pb33f/libopenapi v0.13.7/go.mod h1:Lv2eEtsAtbRFlF8hjH82L8SIGoUNgemMVoKoB6A9THk=
-github.com/pb33f/libopenapi-validator v0.0.26 h1:sDJ7xXX2C+p9TVaujcV7HaSVpULlr99dVyhZBbSTwoM=
-github.com/pb33f/libopenapi-validator v0.0.26/go.mod h1:QChIoPXJX8FkAQ9ufF7YX3KBaeUXyMucb/uajw0MaBs=
+github.com/pb33f/libopenapi v0.13.9 h1:LQKTjjhYObuw2RUISbzHx+PH6yueht3mNBx3SBVFjOY=
+github.com/pb33f/libopenapi v0.13.9/go.mod h1:Lv2eEtsAtbRFlF8hjH82L8SIGoUNgemMVoKoB6A9THk=
+github.com/pb33f/libopenapi-validator v0.0.27 h1:eO4kbEs2y5mILoFuFLFadWOWE1td2eDJ2RmzUWFswNk=
+github.com/pb33f/libopenapi-validator v0.0.27/go.mod h1:qXHUgYSewsSCOK30AMiwK39u1ZB0YZm5nff7IzYkckA=
 github.com/pelletier/go-toml/v2 v2.1.0 h1:FnwAJ4oYMvbT/34k9zzHuZNrhlz48GB3/s6at6/MHO4=
 github.com/pelletier/go-toml/v2 v2.1.0/go.mod h1:tJU2Z3ZkXwnxa4DPO899bsyIoywizdUvyaeZurnPPDc=
 github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=

motor/rule_applicator.go

@@ -139,15 +139,32 @@ func ApplyRulesToRuleSet(execution *RuleSetExecution) *RuleSetExecutionResult {
 	if docResolved == nil {
 		var err error
 		// create a new document.
-		docResolved, err = libopenapi.NewDocumentWithConfiguration(execution.Spec, docConfig)
-		docUnresolved, _ = libopenapi.NewDocumentWithConfiguration(execution.Spec, docConfig)
+
+		done := make(chan bool)
+
+		go func() {
+			docResolved, err = libopenapi.NewDocumentWithConfiguration(execution.Spec, docConfig)
+			done <- true
+		}()
+
+		go func() {
+			docUnresolved, _ = libopenapi.NewDocumentWithConfiguration(execution.Spec, docConfig)
+			done <- true
+		}()
+
+		complete := 0
+		for complete < 2 {
+			<-done
+			complete++
+		}
 
 		if err != nil {
 			// Done here, we can't do anything else.
 			return &RuleSetExecutionResult{Errors: []error{err}}
 		}
 
 		specInfo = docResolved.GetSpecInfo()
+		specInfoUnresolved = docUnresolved.GetSpecInfo()
 		indexConfig.SpecInfo = specInfo
 
 	} else {
@@ -235,18 +252,32 @@ func ApplyRulesToRuleSet(execution *RuleSetExecution) *RuleSetExecutionResult {
 		unresRoloConfig := *indexConfig
 		resRoloConfig := *indexConfig
 
-		// create an index for the unresolved spec.
-		rolodexResolved, _ = BuildRolodexFromIndexConfig(&resRoloConfig)
-		rolodexResolved.SetRootNode(resRoloConfig.SpecInfo.RootNode)
+		completeChan := make(chan bool)
+
+		go func() {
+			// create an index for the unresolved spec.
+			rolodexResolved, _ = BuildRolodexFromIndexConfig(&resRoloConfig)
+			rolodexResolved.SetRootNode(resRoloConfig.SpecInfo.RootNode)
 
-		unResInfo, _ := datamodel.ExtractSpecInfo(*specInfo.SpecBytes)
-		rolodexUnresolved, _ = BuildRolodexFromIndexConfig(&unresRoloConfig)
-		rolodexUnresolved.SetRootNode(unResInfo.RootNode)
+			_ = rolodexResolved.IndexTheRolodex()
+			rolodexResolved.Resolve()
+			completeChan <- true
+		}()
 
-		_ = rolodexResolved.IndexTheRolodex()
-		_ = rolodexUnresolved.IndexTheRolodex()
+		go func() {
+			unResInfo, _ := datamodel.ExtractSpecInfo(*specInfo.SpecBytes)
+			rolodexUnresolved, _ = BuildRolodexFromIndexConfig(&unresRoloConfig)
+			rolodexUnresolved.SetRootNode(unResInfo.RootNode)
 
-		rolodexResolved.Resolve()
+			_ = rolodexUnresolved.IndexTheRolodex()
+			completeChan <- true
+		}()
+
+		completedBuilds := 0
+		for completedBuilds < 2 {
+			<-completeChan
+			completedBuilds++
+		}
 
 		indexResolved = rolodexResolved.GetRootIndex()
 		indexUnresolved = rolodexUnresolved.GetRootIndex()
@@ -318,7 +349,9 @@ func ApplyRulesToRuleSet(execution *RuleSetExecution) *RuleSetExecutionResult {
 		for _, rule := range execution.RuleSet.Rules {
 			ruleSpec := specResolved
 			ruleIndex := indexResolved
+			info := specInfo
 			if !rule.Resolved {
+				info = specInfoUnresolved
 				ruleSpec = specUnresolved
 				ruleIndex = indexUnresolved
 			}
@@ -331,7 +364,7 @@ func ApplyRulesToRuleSet(execution *RuleSetExecution) *RuleSetExecutionResult {
 				ruleResults:       &ruleResults,
 				wg:                &ruleWaitGroup,
 				errors:            &errs,
-				specInfo:          specInfo,
+				specInfo:          info,
 				index:             ruleIndex,
 				document:          docResolved,
 				customFunctions:   execution.CustomFunctions,

motor/rule_applicator_test.go

@@ -2171,3 +2171,17 @@ func Benchmark_K8sSpecAgainstDefaultRuleSet(b *testing.B) {
 		assert.NotNil(b, results)
 	}
 }
+
+func Benchmark_StripeSpecAgainstDefaultRuleSet(b *testing.B) {
+	m, _ := os.ReadFile("../model/test_files/stripe.yaml")
+	rs := rulesets.BuildDefaultRuleSets()
+	for n := 0; n < b.N; n++ {
+		rse := &RuleSetExecution{
+			RuleSet: rs.GenerateOpenAPIDefaultRuleSet(),
+			Spec:    m,
+		}
+		results := ApplyRulesToRuleSet(rse)
+		assert.Len(b, results.Errors, 0)
+		assert.NotNil(b, results)
+	}
+}