swagger container, handler fixes, makefile adds

Makefile

@@ -23,6 +23,7 @@ local-dev-up:
 	go mod vendor
 	$(docker-compose) up -d indexer
 	$(docker-compose) up -d matcher
+	$(docker-compose) up -d swagger-ui
 
 # tear down the entire local development environment
 .PHONY: local-dev-down
@@ -44,3 +45,8 @@ local-dev-indexer-restart:
 .PHONY: local-dev-matcher-restart
 local-dev-matcher-restart:
 	$(docker-compose) up -d --force-recreate matcher
+
+# restart the local development swagger-ui, any local code changes will take effect
+.PHONY: local-dev-swagger-ui-restart
+local-dev-swagger-ui-restart:
+	$(docker-compose) up -d --force-recreate swagger-ui

docker-compose.yaml

@@ -35,3 +35,12 @@ services:
       - "./:/src/clair/"
     command:
       [ "bash", "-c", "cd /src/clair/cmd/clair; go run -mod vendor . -conf /src/clair/local-dev/matcher/matcher.config.yaml" ]
+
+  swagger-ui:
+    image: swaggerapi/swagger-ui
+    ports:
+      - "8082:8080"
+    volumes:
+      - "./:/clair"
+    environment:
+      SWAGGER_JSON: "/clair/openapi.yaml"

indexer/indexreporthandler.go

@@ -27,28 +27,29 @@ func IndexReportHandler(service Service) http.HandlerFunc {
 			return
 		}
 
-		parts := strings.Split(r.URL.Path, "/")
-		if len(parts) != 5 {
+		manifestHash := strings.TrimPrefix(r.URL.Path, IndexReportAPIPath)
+		if manifestHash == "" {
 			resp := &je.Response{
 				Code:    "bad-request",
 				Message: "malformed path. provide a single manifest hash",
 			}
 			je.Error(w, resp, http.StatusBadRequest)
 			return
 		}
-		manifestHash := parts[4]
 
 		report, err := service.IndexReport(context.Background(), manifestHash)
 		if err != nil {
-			if errors.Is(err, &clairerror.ErrIndexReportNotFound{}) {
+			var e *clairerror.ErrIndexReportNotFound
+			if errors.As(err, &e) {
 				resp := &je.Response{
 					Code:    "not-found",
 					Message: fmt.Sprintf("index report for manifest %s not found", manifestHash),
 				}
 				je.Error(w, resp, http.StatusNotFound)
 				return
 			}
-			if errors.Is(err, &clairerror.ErrIndexReportRetrieval{}) {
+			var ee *clairerror.ErrIndexReportRetrieval
+			if errors.As(err, &ee) {
 				resp := &je.Response{
 					Code:    "retrieval-failure",
 					Message: fmt.Sprintf("failed to retrieve manifest: %w", err),

matcher/matchhander.go

@@ -29,16 +29,15 @@ func MatchHandler(service Service) http.HandlerFunc {
 			return
 		}
 
-		parts := strings.Split(r.URL.Path, "/")
-		if len(parts) != 5 {
+		manifestHash := strings.TrimPrefix(r.URL.Path, VulnerabilityReportAPIPath)
+		if manifestHash == "" {
 			resp := &je.Response{
 				Code:    "bad-request",
 				Message: "malformed path. provide a single manifest hash",
 			}
 			je.Error(w, resp, http.StatusBadRequest)
 			return
 		}
-		manifestHash := parts[4]
 
 		report, err := service.Match(context.Background(), manifestHash)
 		if err != nil {