Rename scan request type

Signed-off-by: stonezdj <[email protected]>
goharbor · Apr 17, 2024 · 49d6636 · 49d6636
1 parent 6709c78
commit 49d6636
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 11 deletions.
diff --git a/api/v2.0/swagger.yaml b/api/v2.0/swagger.yaml
@@ -1176,11 +1176,11 @@ paths:
         - $ref: '#/parameters/projectName'
         - $ref: '#/parameters/repositoryName'
         - $ref: '#/parameters/reference'
-        - name: scan_request_type
+        - name: scanType
           in: body
           required: false
           schema:
-            $ref: '#/definitions/ScanRequestType'
+            $ref: '#/definitions/ScanType'
       responses:
         '202':
           $ref: '#/responses/202'
@@ -6766,13 +6766,6 @@ definitions:
         type: string
         description: Version of the scanner adapter
         example: "v0.9.1"
-  ScanRequestType:
-    type: object
-    properties:
-      scan_type:
-        type: string
-        description: 'The scan type for the scan request. Two options are currently supported, vulnerability and sbom'
-        enum: [vulnerability, sbom]
   ScanOverview:
     type: object
     description: 'The scan overview attached in the metadata of tag'

diff --git a/src/server/v2.0/handler/scan.go b/src/server/v2.0/handler/scan.go
@@ -82,8 +82,8 @@ func (s *scanAPI) ScanArtifact(ctx context.Context, params operation.ScanArtifac
 	if !distribution.IsDigest(params.Reference) {
 		options = append(options, scan.WithTag(params.Reference))
 	}
-	if params.ScanRequestType != nil && validScanType(params.ScanRequestType.ScanType) {
-		scanType = params.ScanRequestType.ScanType
+	if params.ScanType != nil && validScanType(params.ScanType.ScanType) {
+		scanType = params.ScanType.ScanType
 		options = append(options, scan.WithScanType(scanType))
 	}
 	res := rbac.ResourceScan