matcher: Update matcher client to match server definition

The matcher client is currently creating requests to the matcher component with a trailing slash, which for the read operations doesn't match what the server is expecting. ie. GET /matcher/api/v1/internal/update_operation/. This removes the trailing slash from both URL paths that the matcher client is requesting. And adds a dedicated path variable for deleting update_operations. Signed-off-by: crozzy <joseph.crosland@gmail.com>
quay · May 25, 2022 · e5cb6a9 · e5cb6a9
1 parent 1a1d566
commit e5cb6a9
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 17 deletions.
diff --git a/httptransport/client/matcher.go b/httptransport/client/matcher.go
@@ -59,7 +59,7 @@ func (c *HTTP) Scan(ctx context.Context, ir *claircore.IndexReport) (*claircore.
 
 // DeleteUpdateOperations attempts to delete the referenced update operations.
 func (c *HTTP) DeleteUpdateOperations(ctx context.Context, ref ...uuid.UUID) (int64, error) {
-	u, err := c.addr.Parse(httptransport.UpdateOperationAPIPath)
+	u, err := c.addr.Parse(httptransport.UpdateOperationDeleteAPIPath)
 	if err != nil {
 		return 0, err
 	}

diff --git a/httptransport/server.go b/httptransport/server.go
@@ -21,22 +21,23 @@ import (
 )
 
 const (
-	apiRoot                 = "/api/v1/"
-	indexerRoot             = "/indexer"
-	matcherRoot             = "/matcher"
-	notifierRoot            = "/notifier"
-	internalRoot            = apiRoot + "internal/"
-	IndexAPIPath            = indexerRoot + apiRoot + "index_report"
-	IndexReportAPIPath      = indexerRoot + apiRoot + "index_report/"
-	IndexStateAPIPath       = indexerRoot + apiRoot + "index_state"
-	AffectedManifestAPIPath = indexerRoot + internalRoot + "affected_manifest/"
-	VulnerabilityReportPath = matcherRoot + apiRoot + "vulnerability_report/"
-	UpdateOperationAPIPath  = matcherRoot + internalRoot + "update_operation/"
-	UpdateDiffAPIPath       = matcherRoot + internalRoot + "update_diff/"
-	NotificationAPIPath     = notifierRoot + apiRoot + "notification/"
-	KeysAPIPath             = notifierRoot + apiRoot + "services/notifier/keys"
-	KeyByIDAPIPath          = notifierRoot + apiRoot + "services/notifier/keys/"
-	OpenAPIV1Path           = "/openapi/v1"
+	apiRoot                      = "/api/v1/"
+	indexerRoot                  = "/indexer"
+	matcherRoot                  = "/matcher"
+	notifierRoot                 = "/notifier"
+	internalRoot                 = apiRoot + "internal/"
+	IndexAPIPath                 = indexerRoot + apiRoot + "index_report"
+	IndexReportAPIPath           = indexerRoot + apiRoot + "index_report/"
+	IndexStateAPIPath            = indexerRoot + apiRoot + "index_state"
+	AffectedManifestAPIPath      = indexerRoot + internalRoot + "affected_manifest/"
+	VulnerabilityReportPath      = matcherRoot + apiRoot + "vulnerability_report/"
+	UpdateOperationAPIPath       = matcherRoot + internalRoot + "update_operation"
+	UpdateOperationDeleteAPIPath = matcherRoot + internalRoot + "update_operation/"
+	UpdateDiffAPIPath            = matcherRoot + internalRoot + "update_diff"
+	NotificationAPIPath          = notifierRoot + apiRoot + "notification/"
+	KeysAPIPath                  = notifierRoot + apiRoot + "services/notifier/keys"
+	KeyByIDAPIPath               = notifierRoot + apiRoot + "services/notifier/keys/"
+	OpenAPIV1Path                = "/openapi/v1"
 )
 
 // Server is the primary http server Clair exposes its functionality on.