From 36c8123571ac73e44e260983aac87c7923cb9126 Mon Sep 17 00:00:00 2001
From: stonezdj <stone.zhang@broadcom.com>
Date: Wed, 17 Apr 2024 09:12:13 +0800
Subject: [PATCH] Rename scan request type

Signed-off-by: stonezdj <stone.zhang@broadcom.com>
---
 api/v2.0/swagger.yaml                  | 11 ++---------
 src/controller/scan/base_controller.go |  3 ++-
 src/server/v2.0/handler/scan.go        |  4 ++--
 3 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/api/v2.0/swagger.yaml b/api/v2.0/swagger.yaml
index 0f5c18e737e..5f04577909b 100644
--- 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/controller/scan/base_controller.go b/src/controller/scan/base_controller.go
index be168098acc..25f0fc79111 100644
--- a/src/controller/scan/base_controller.go
+++ b/src/controller/scan/base_controller.go
@@ -742,10 +742,11 @@ func (bc *basicController) GetSBOMSummary(ctx context.Context, art *ar.Artifact,
 		return map[string]interface{}{}, nil
 	}
 	reportContent := reports[0].Report
+	result := map[string]interface{}{}
 	if len(reportContent) == 0 {
 		log.Warning("no content for current report")
+		return result, nil
 	}
-	result := map[string]interface{}{}
 	err = json.Unmarshal([]byte(reportContent), &result)
 	return result, err
 }
diff --git a/src/server/v2.0/handler/scan.go b/src/server/v2.0/handler/scan.go
index 80b70131fc7..a22eaaaede2 100644
--- 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