Merge pull request #46 from stackql/feature/aot-v2-0-3

aot-v2-0-3

Author: general-kroll-4-life

anysdk/loader.go

@@ -885,6 +885,7 @@ func resolveSQLVerbFromResource(rsc Resource, component *OpenAPIOperationStoreRe
 	}
 	rv := resolved
 	rv.setSQLVerb(sqlVerb)
+	jsonpointer.SetForToken(rsc, component.Ref, *rv)
 	return rv, nil
 }
 

anysdk/resource.go

@@ -12,6 +12,7 @@ import (
 var (
 	_ Resource                  = &standardResource{}
 	_ jsonpointer.JSONPointable = standardResource{}
+	_ jsonpointer.JSONSetable   = standardResource{}
 )
 
 type Resource interface {
@@ -92,6 +93,9 @@ func (r *standardResource) setService(s OpenAPIService) {
 
 func (r *standardResource) mutateSQLVerb(k string, idx int, v OpenAPIOperationStoreRef) {
 	r.SQLVerbs[k][idx] = v
+	if v.Value != nil {
+		v.Value.setSQLVerb(k)
+	}
 }
 
 func (r *standardResource) setMethod(k string, v *standardOpenAPIOperationStore) {
@@ -196,6 +200,28 @@ func (rsc standardResource) JSONLookup(token string) (interface{}, error) {
 	}
 }
 
+func (rsc standardResource) JSONSet(token string, value interface{}) error {
+	ss := strings.Split(token, "/")
+	tokenRoot := ""
+	if len(ss) > 1 {
+		tokenRoot = ss[len(ss)-2]
+	}
+	switch tokenRoot {
+	case "methods":
+		if rsc.Methods == nil {
+			return fmt.Errorf("Provider.JSONLookup() failure due to prov.ProviderServices == nil")
+		}
+		newMethod, isMethod := value.(standardOpenAPIOperationStore)
+		if !isMethod {
+			return fmt.Errorf("cannot resolve json pointer path '%s'", token)
+		}
+		rsc.Methods[ss[len(ss)-1]] = newMethod
+		return nil
+	default:
+		return fmt.Errorf("cannot set json pointer path '%s'", token)
+	}
+}
+
 func (rs *standardResource) GetDefaultMethodKeysForSQLVerb(sqlVerb string) []string {
 	return rs.getDefaultMethodKeysForSQLVerb(sqlVerb)
 }

public/discovery/static_analyzer.go

@@ -516,12 +516,21 @@ func (osa *serviceLevelStaticAnalyzer) Analyze() error {
 		//   - expected response attributes:
 		//        -  LocalSchemaRef x 2 for sync and async schema overrides
 		//   - OpenAPIOperationStoreRef via resolveSQLVerb()
-		_, svcErr := osa.registryAPI.GetServiceFragment(providerService, resourceKey)
-		if svcErr != nil {
-			osa.errors = append(osa.errors, fmt.Errorf("failed to get service fragment for svc name = %s: %v", providerService.GetName(), svcErr))
+
+		// This is a crude trick to prevent pointless service doc re-processing
+		methods := resource.GetMethods()
+		if len(methods) == 0 {
+			_, svcErr := osa.registryAPI.GetServiceFragment(providerService, resourceKey)
+			if svcErr != nil {
+				osa.errors = append(osa.errors, fmt.Errorf("failed to get service fragment for svc name = %s: %v", providerService.GetName(), svcErr))
+				continue
+			}
+			methods = resource.GetMethods()
+		}
+		if len(methods) == 0 {
+			osa.errors = append(osa.errors, fmt.Errorf("no methods found for resource %s", resourceKey))
 			continue
 		}
-		methods := resource.GetMethods()
 		for methodName, method := range methods {
 			// Perform analysis on each method
 
@@ -532,6 +541,17 @@ func (osa *serviceLevelStaticAnalyzer) Analyze() error {
 				if isGraphQL {
 					continue // TODO: GraphQL methods analysis
 				}
+				// Does this method have selection semantics?
+				sqlVerb := strings.ToLower(method.GetSQLVerb())
+				isSelectMethod := sqlVerb == "select"
+				selectItemsKey := method.GetSelectItemsKey()
+				hasSelectionSemantics := selectItemsKey != ""
+				if !hasSelectionSemantics && isSelectMethod {
+					osa.warnings = append(osa.warnings, fmt.Sprintf("apparent select method %s for resource %s does not have selection semantics", methodName, resourceKey))
+				}
+				if sqlVerb == "" {
+					osa.warnings = append(osa.warnings, fmt.Sprintf("method %s for resource %s has no SQL verb", methodName, resourceKey))
+				}
 				shouldBeSelectable := method.ShouldBeSelectable()
 				if shouldBeSelectable {
 					responseSchema, mediaType, responseInferenceErr := method.GetFinalResponseBodySchemaAndMediaType()