Added blacklist

arduino · Oct 16, 2024 · ccc3a6f · ccc3a6f
1 parent 9bc2e93
commit ccc3a6f
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 66 deletions.
diff --git a/openapi-merger/main.go b/openapi-merger/main.go
@@ -1,12 +1,16 @@
 package main
 
 import (
+	"encoding/json"
 	"fmt"
 	"log"
 	"os"
+	"slices"
 
 	"github.com/getkin/kin-openapi/openapi3"
 	"gopkg.in/yaml.v3"
+
+	_ "embed"
 )
 
 const (
@@ -19,10 +23,22 @@ const (
 	MergedOpenApi = BasePath + "swagger.yaml"
 )
 
-var pathBlacklist = make(map[string]bool)
+//go:embed path-blacklist.json
+var pathBlacklist string
+
+type blacklist struct{
+	Blacklist []string `json:"blacklist"`
+}
 
 func main() {
 
+	// Load blacklist
+	var bl blacklist
+	_ = json.Unmarshal([]byte(pathBlacklist), &bl)
+
+	log.Println("Merging OpenAPI specifications...")
+	log.Println("Blacklisted paths: ", bl.Blacklist)
+
 	// Load the main OpenAPI specification
 	loader := openapi3.NewLoader()
 	docIOT, err := loader.LoadFromFile(IotAPIOpenApi)
@@ -32,7 +48,7 @@ func main() {
 
 	mergedPaths := []openapi3.NewPathsOption{}
 	for _, path := range docIOT.Paths.InMatchingOrder() {
-		if _, ok := pathBlacklist[path]; ok {
+		if slices.Contains(bl.Blacklist, path) {
 			continue
 		}
 		pathItem := docIOT.Paths.Find(path)
@@ -68,7 +84,8 @@ func main() {
 
 		// Merge the paths
 		for _, path := range docVIEWS.Paths.InMatchingOrder() {
-			if _, ok := pathBlacklist[path]; ok {
+			if slices.Contains(bl.Blacklist, path) {
+				log.Println("Blacklisted path: ", path)
 				continue
 			}
 			pathItem := docVIEWS.Paths.Find(path)

diff --git a/openapi-merger/path-blacklist.json b/openapi-merger/path-blacklist.json
@@ -0,0 +1,3 @@
+{
+    "blacklist": ["/groups/v1/sketches"]
+}
diff --git a/spec/v2/swagger.yaml b/spec/v2/swagger.yaml
@@ -4610,69 +4610,6 @@ paths:
             summary: Move a resource under a folder
             tags:
                 - folders
-    /groups/v1/sketches:
-        get:
-            description: Returns all sketches to which user has access to
-            operationId: ListSketches
-            parameters:
-                - example: D3FB5026-7337-4AB3-B203-2E6792C7C65B
-                  in: header
-                  name: X-Organization
-                  schema:
-                    format: uuid
-                    type: string
-                  x-oapi-codegen-extra-tags:
-                    validate: omitnil,uuid
-            responses:
-                "200":
-                    content:
-                        application/json:
-                            schema:
-                                items:
-                                    $ref: '#/components/schemas/Sketch'
-                                type: array
-                    description: Success
-                "400":
-                    content:
-                        application/json:
-                            schema:
-                                $ref: '#/components/schemas/ValidationError'
-                    description: Bad request
-                "401":
-                    content:
-                        application/json:
-                            schema:
-                                $ref: '#/components/schemas/APIError'
-                    description: Authentication failed
-                "403":
-                    content:
-                        application/json:
-                            schema:
-                                $ref: '#/components/schemas/APIError'
-                    description: Access denied
-                "404":
-                    content:
-                        application/json:
-                            schema:
-                                $ref: '#/components/schemas/APIError'
-                    description: Not found
-                "500":
-                    content:
-                        application/json:
-                            schema:
-                                $ref: '#/components/schemas/APIError'
-                    description: Internal server error
-                default:
-                    content:
-                        application/json:
-                            schema:
-                                $ref: '#/components/schemas/APIError'
-                    description: Default error
-            security:
-                - jwt_bearer_authentication: []
-            summary: Get all sketches
-            tags:
-                - views
     /groups/v1/things:
         get:
             description: Returns all things to which user has access to