Fix api docs generci usage

deepfence · Sep 8, 2023 · 70837f9 · 70837f9
1 parent 42f99f2
commit 70837f9
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 6 deletions.
diff --git a/deepfence_agent/plugins/package-scanner b/deepfence_agent/plugins/package-scanner
diff --git a/deepfence_server/apiDocs/operation.go b/deepfence_server/apiDocs/operation.go
@@ -755,17 +755,17 @@ func (d *OpenApiDocs) AddSettingsOperations() {
 func (d *OpenApiDocs) AddDiffAddOperations() {
 	d.AddOperation("addDiffAdd", http.MethodPost, "/deepfence/diff-add/vulnerability",
 		"Get Vulnerability Diff", "Get Vulnerability Diff between two scans",
-		http.StatusOK, []string{tagDiffAdd}, bearerToken, new(ScanCompareReq), new(ScanCompareRes[Vulnerability]))
+		http.StatusOK, []string{tagDiffAdd}, bearerToken, new(ScanCompareReq), new(ScanCompareResVulnerability))
 	d.AddOperation("addDiffAdd", http.MethodPost, "/deepfence/diff-add/secret",
 		"Get Secret Diff", "Get Secret Diff between two scans",
-		http.StatusOK, []string{tagDiffAdd}, bearerToken, new(ScanCompareReq), new(ScanCompareRes[Secret]))
+		http.StatusOK, []string{tagDiffAdd}, bearerToken, new(ScanCompareReq), new(ScanCompareResSecret))
 	d.AddOperation("addDiffAdd", http.MethodPost, "/deepfence/diff-add/compliance",
 		"Get Compliance Diff", "Get Compliance Diff between two scans",
-		http.StatusOK, []string{tagDiffAdd}, bearerToken, new(ScanCompareReq), new(ScanCompareRes[Compliance]))
+		http.StatusOK, []string{tagDiffAdd}, bearerToken, new(ScanCompareReq), new(ScanCompareResCompliance))
 	d.AddOperation("addDiffAdd", http.MethodPost, "/deepfence/diff-add/malware",
 		"Get Malware Diff", "Get Malware Diff between two scans",
-		http.StatusOK, []string{tagDiffAdd}, bearerToken, new(ScanCompareReq), new(ScanCompareRes[Malware]))
+		http.StatusOK, []string{tagDiffAdd}, bearerToken, new(ScanCompareReq), new(ScanCompareResMalware))
 	d.AddOperation("addDiffAdd", http.MethodPost, "/deepfence/diff-add/cloud-compliance",
 		"Get Cloud Compliance Diff", "Get Cloud Compliance Diff between two scans",
-		http.StatusOK, []string{tagDiffAdd}, bearerToken, new(ScanCompareReq), new(ScanCompareRes[CloudCompliance]))
+		http.StatusOK, []string{tagDiffAdd}, bearerToken, new(ScanCompareReq), new(ScanCompareResCloudCompliance))
 }
diff --git a/deepfence_server/model/scans.go b/deepfence_server/model/scans.go
@@ -41,6 +41,13 @@ type ScanCompareReq struct {
 type ScanCompareRes[T any] struct {
 	New []T `json:"new" required:"true"`
 }
+
+type ScanCompareResVulnerability = ScanCompareRes[Vulnerability]
+type ScanCompareResSecret = ScanCompareRes[Secret]
+type ScanCompareResMalware = ScanCompareRes[Malware]
+type ScanCompareResCompliance = ScanCompareRes[Compliance]
+type ScanCompareResCloudCompliance = ScanCompareRes[CloudCompliance]
+
 type ScanFilter struct {
 	ImageScanFilter             reporters.ContainsFilter `json:"image_scan_filter" required:"true"`
 	ContainerScanFilter         reporters.ContainsFilter `json:"container_scan_filter" required:"true"`
+1 −1		main.go
+20 −17		sbom/syft/syft.go
+11 −14		scanner/grype/grype.go
+0 −14		utils/type.go