BUG: Fixed bug in app sdk for OpenAPI lists

2021-03-04 08:17:43 +01:00
parent 5a53b34ba5
commit 62e7fa09d8
6 changed files with 256 additions and 131 deletions
@@ -1010,16 +1010,6 @@ func handleConnect(swagger *openapi3.Swagger, api WorkflowApp, extraParameters [
 	optionalQueries := []string{}
 	parameters := []string{}
 	optionalParameters := []WorkflowAppActionParameter{}
-	optionalParameters = append(optionalParameters, WorkflowAppActionParameter{
-		Name:        "ssl_verify",
-		Description: "Check if you want to verify request",
-		Multiline:   false,
-		Required:    false,
-		Example:     "True",
-		Schema: SchemaDefinition{
-			Type: "string",
-		},
-	})

 	headersFound := []string{}
 	if len(path.Connect.Parameters) > 0 {
@@ -1106,6 +1096,17 @@ func handleConnect(swagger *openapi3.Swagger, api WorkflowApp, extraParameters [
 		}
 	}

+	optionalParameters = append(optionalParameters, WorkflowAppActionParameter{
+		Name:        "ssl_verify",
+		Description: "Check if you want to verify request",
+		Multiline:   false,
+		Required:    false,
+		Example:     "True",
+		Schema: SchemaDefinition{
+			Type: "string",
+		},
+	})
+
 	// ensuring that they end up last in the specification
 	// (order is ish important for optional params) - they need to be last.
 	for _, optionalParam := range optionalParameters {
@@ -1145,16 +1146,6 @@ func handleGet(swagger *openapi3.Swagger, api WorkflowApp, extraParameters []Wor
 	// FIXME - remove this when authentication is properly introduced
 	parameters := []string{}
 	optionalParameters := []WorkflowAppActionParameter{}
-	optionalParameters = append(optionalParameters, WorkflowAppActionParameter{
-		Name:        "ssl_verify",
-		Description: "Check if you want to verify the SSL certificate request",
-		Multiline:   false,
-		Required:    false,
-		Example:     "False - default=True",
-		Schema: SchemaDefinition{
-			Type: "string",
-		},
-	})

 	headersFound := []string{}
 	if len(path.Get.Parameters) > 0 {
@@ -1241,6 +1232,17 @@ func handleGet(swagger *openapi3.Swagger, api WorkflowApp, extraParameters []Wor
 		}
 	}

+	optionalParameters = append(optionalParameters, WorkflowAppActionParameter{
+		Name:        "ssl_verify",
+		Description: "Check if you want to verify the SSL certificate request",
+		Multiline:   false,
+		Required:    false,
+		Example:     "False - default=True",
+		Schema: SchemaDefinition{
+			Type: "string",
+		},
+	})
+
 	// ensuring that they end up last in the specification
 	// (order is ish important for optional params) - they need to be last.
 	for _, optionalParam := range optionalParameters {
@@ -1280,16 +1282,6 @@ func handleHead(swagger *openapi3.Swagger, api WorkflowApp, extraParameters []Wo
 	optionalQueries := []string{}
 	parameters := []string{}
 	optionalParameters := []WorkflowAppActionParameter{}
-	optionalParameters = append(optionalParameters, WorkflowAppActionParameter{
-		Name:        "ssl_verify",
-		Description: "Check if you want to verify request",
-		Multiline:   false,
-		Required:    false,
-		Example:     "True",
-		Schema: SchemaDefinition{
-			Type: "string",
-		},
-	})

 	headersFound := []string{}
 	if len(path.Head.Parameters) > 0 {
@@ -1374,6 +1366,17 @@ func handleHead(swagger *openapi3.Swagger, api WorkflowApp, extraParameters []Wo
 		}
 	}

+	optionalParameters = append(optionalParameters, WorkflowAppActionParameter{
+		Name:        "ssl_verify",
+		Description: "Check if you want to verify request",
+		Multiline:   false,
+		Required:    false,
+		Example:     "True",
+		Schema: SchemaDefinition{
+			Type: "string",
+		},
+	})
+
 	// ensuring that they end up last in the specification
 	// (order is ish important for optional params) - they need to be last.
 	for _, optionalParam := range optionalParameters {
@@ -1413,16 +1416,6 @@ func handleDelete(swagger *openapi3.Swagger, api WorkflowApp, extraParameters []
 	optionalQueries := []string{}
 	parameters := []string{}
 	optionalParameters := []WorkflowAppActionParameter{}
-	optionalParameters = append(optionalParameters, WorkflowAppActionParameter{
-		Name:        "ssl_verify",
-		Description: "Check if you want to verify request",
-		Multiline:   false,
-		Required:    false,
-		Example:     "True",
-		Schema: SchemaDefinition{
-			Type: "string",
-		},
-	})

 	headersFound := []string{}
 	if len(path.Delete.Parameters) > 0 {
@@ -1508,6 +1501,17 @@ func handleDelete(swagger *openapi3.Swagger, api WorkflowApp, extraParameters []
 		}
 	}

+	optionalParameters = append(optionalParameters, WorkflowAppActionParameter{
+		Name:        "ssl_verify",
+		Description: "Check if you want to verify request",
+		Multiline:   false,
+		Required:    false,
+		Example:     "True",
+		Schema: SchemaDefinition{
+			Type: "string",
+		},
+	})
+
 	// ensuring that they end up last in the specification
 	// (order is ish important for optional params) - they need to be last.
 	for _, optionalParam := range optionalParameters {
@@ -1546,16 +1550,6 @@ func handlePost(swagger *openapi3.Swagger, api WorkflowApp, extraParameters []Wo
 	optionalQueries := []string{}
 	parameters := []string{}
 	optionalParameters := []WorkflowAppActionParameter{}
-	optionalParameters = append(optionalParameters, WorkflowAppActionParameter{
-		Name:        "ssl_verify",
-		Description: "Check if you want to verify request",
-		Multiline:   false,
-		Required:    false,
-		Example:     "True",
-		Schema: SchemaDefinition{
-			Type: "string",
-		},
-	})

 	fileField := ""
 	if path.Post.RequestBody != nil {
@@ -1674,6 +1668,17 @@ func handlePost(swagger *openapi3.Swagger, api WorkflowApp, extraParameters []Wo
 		}
 	}

+	optionalParameters = append(optionalParameters, WorkflowAppActionParameter{
+		Name:        "ssl_verify",
+		Description: "Check if you want to verify request",
+		Multiline:   false,
+		Required:    false,
+		Example:     "True",
+		Schema: SchemaDefinition{
+			Type: "string",
+		},
+	})
+
 	// ensuring that they end up last in the specification
 	// (order is ish important for optional params) - they need to be last.
 	for _, optionalParam := range optionalParameters {
@@ -1718,16 +1723,6 @@ func handlePatch(swagger *openapi3.Swagger, api WorkflowApp, extraParameters []W
 	optionalQueries := []string{}
 	parameters := []string{}
 	optionalParameters := []WorkflowAppActionParameter{}
-	optionalParameters = append(optionalParameters, WorkflowAppActionParameter{
-		Name:        "ssl_verify",
-		Description: "Check if you want to verify request",
-		Multiline:   false,
-		Required:    false,
-		Example:     "True",
-		Schema: SchemaDefinition{
-			Type: "string",
-		},
-	})

 	headersFound := []string{}
 	if len(path.Patch.Parameters) > 0 {
@@ -1812,6 +1807,17 @@ func handlePatch(swagger *openapi3.Swagger, api WorkflowApp, extraParameters []W
 		}
 	}

+	optionalParameters = append(optionalParameters, WorkflowAppActionParameter{
+		Name:        "ssl_verify",
+		Description: "Check if you want to verify request",
+		Multiline:   false,
+		Required:    false,
+		Example:     "True",
+		Schema: SchemaDefinition{
+			Type: "string",
+		},
+	})
+
 	// ensuring that they end up last in the specification
 	// (order is ish important for optional params) - they need to be last.
 	for _, optionalParam := range optionalParameters {
@@ -1851,16 +1857,6 @@ func handlePut(swagger *openapi3.Swagger, api WorkflowApp, extraParameters []Wor
 	optionalQueries := []string{}
 	parameters := []string{}
 	optionalParameters := []WorkflowAppActionParameter{}
-	optionalParameters = append(optionalParameters, WorkflowAppActionParameter{
-		Name:        "ssl_verify",
-		Description: "Check if you want to verify request",
-		Multiline:   false,
-		Required:    false,
-		Example:     "True",
-		Schema: SchemaDefinition{
-			Type: "string",
-		},
-	})

 	headersFound := []string{}
 	if len(path.Put.Parameters) > 0 {
@@ -1946,6 +1942,17 @@ func handlePut(swagger *openapi3.Swagger, api WorkflowApp, extraParameters []Wor
 		}
 	}

+	optionalParameters = append(optionalParameters, WorkflowAppActionParameter{
+		Name:        "ssl_verify",
+		Description: "Check if you want to verify request",
+		Multiline:   false,
+		Required:    false,
+		Example:     "True",
+		Schema: SchemaDefinition{
+			Type: "string",
+		},
+	})
+
 	// ensuring that they end up last in the specification
 	// (order is ish important for optional params) - they need to be last.
 	for _, optionalParam := range optionalParameters {
@@ -24,7 +24,6 @@ import (
 	"net/http"
 	"os"
 	"strings"
-	//"google.golang.org/appengine"
 )

 // Parses a directory with a Dockerfile into a tar for Docker images..
@@ -62,16 +62,10 @@ import (
 	// githttp "gopkg.in/src-d/go-git.v4/plumbing/transport/http"

 	// Web
-	// "github.com/gorilla/handlers"
 	"github.com/gorilla/mux"
+	"github.com/patrickmn/go-cache"
 	"google.golang.org/grpc"
 	http2 "gopkg.in/src-d/go-git.v4/plumbing/transport/http"
-	// Old items (cloud)
-	// "google.golang.org/appengine"
-	// "google.golang.org/appengine/memcache"
-	// applog "google.golang.org/appengine/log"
-	//cloudrun "google.golang.org/api/run/v1"
-	"github.com/patrickmn/go-cache"
 )

 // This is used to handle onprem vs offprem databases etc
@@ -5915,7 +5909,7 @@ func getOpenapi(resp http.ResponseWriter, request *http.Request) {
 		return
 	}

-	log.Printf("[INFO] API LENGTH GET: %d, ID: %s", len(parsedApi.Body), id)
+	log.Printf("[INFO] API LENGTH GET FOR OPENAPI %s: %d, ID: %s", id, len(parsedApi.Body), id)

 	parsedApi.Success = true
 	data, err := json.Marshal(parsedApi)
@@ -6579,7 +6573,7 @@ func verifySwagger(resp http.ResponseWriter, request *http.Request) {
 		Body: string(body),
 	}

-	log.Printf("[INFO] API LENGTH: %d, ID: %s", len(parsed.Body), newmd5)
+	log.Printf("[INFO] API LENGTH FOR %s: %d, ID: %s", api.Name, len(parsed.Body), newmd5)
 	// FIXME: Might cause versioning issues if we re-use the same!!
 	// FIXME: Need a way to track different versions of the same app properly.
 	// Hint: Save API.id somewhere, and use newmd5 to save latest version
@@ -2188,8 +2188,6 @@ func saveWorkflow(resp http.ResponseWriter, request *http.Request) {

 	// Here to check access rights
 	ctx := context.Background()
-	log.Println("GetWorkflow start")
-
 	tmpworkflow, err := getWorkflow(ctx, fileId)
 	if err != nil {
 		log.Printf("Failed getting the workflow locally (save workflow): %s", err)
@@ -2198,8 +2196,6 @@ func saveWorkflow(resp http.ResponseWriter, request *http.Request) {
 		return
 	}

-	log.Println("GetWorkflow end")
-
 	// FIXME - have a check for org etc too..
 	if user.Id != tmpworkflow.Owner && user.Role != "admin" {
 		log.Printf("Wrong user (%s) for workflow %s (save)", user.Username, tmpworkflow.ID)