refactor: rename report.LayersMetadata to report.Layers

aquasecurity · Feb 18, 2025 · fb65b08 · fb65b08
1 parent 348c8d7
commit fb65b08
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 21 deletions.
diff --git a/integration/integration_test.go b/integration/integration_test.go
@@ -153,8 +153,8 @@ func readReport(t *testing.T, filePath string) types.Report {
 	// We don't compare repo tags because the archive doesn't support it
 	report.Metadata.RepoTags = nil
 	report.Metadata.RepoDigests = nil
-	for i := range report.Metadata.LayersMetadata {
-		report.Metadata.LayersMetadata[i].Digest = ""
+	for i := range report.Metadata.Layers {
+		report.Metadata.Layers[i].Digest = ""
 	}
 
 	for i, result := range report.Results {

diff --git a/integration/sbom_test.go b/integration/sbom_test.go
@@ -50,7 +50,7 @@ func TestSBOM(t *testing.T) {
 
 				// SBOM file doesn't contain info about layers
 				want.Metadata.Size = 0
-				want.Metadata.LayersMetadata = nil
+				want.Metadata.Layers = nil
 			},
 		},
 		{
@@ -103,7 +103,7 @@ func TestSBOM(t *testing.T) {
 
 				// SBOM file doesn't contain info about layers
 				want.Metadata.Size = 0
-				want.Metadata.LayersMetadata = nil
+				want.Metadata.Layers = nil
 			},
 		},
 		{
@@ -123,7 +123,7 @@ func TestSBOM(t *testing.T) {
 
 				// SBOM file doesn't contain info about layers
 				want.Metadata.Size = 0
-				want.Metadata.LayersMetadata = nil
+				want.Metadata.Layers = nil
 			},
 		},
 		{
@@ -143,7 +143,7 @@ func TestSBOM(t *testing.T) {
 
 				// SBOM file doesn't contain info about layers
 				want.Metadata.Size = 0
-				want.Metadata.LayersMetadata = nil
+				want.Metadata.Layers = nil
 			},
 		},
 		{

diff --git a/pkg/cache/fs_test.go b/pkg/cache/fs_test.go
@@ -161,7 +161,7 @@ func TestFSCache_PutBlob(t *testing.T) {
 					"Family": "alpine",
 					"Release": "3.10"
 				  },
-				  "LayersMetadata": [
+				  "Layers": [
 					{
 					  "DiffID": "sha256:24df0d4e20c0f42d3703bf1f1db2bdd77346c7956f74f423603d651e8e5ae8a7",
 					  "Size": 1000
@@ -270,7 +270,7 @@ func TestFSCache_PutBlob(t *testing.T) {
 				      ]
 				    }
 				  ],
-				  "LayersMetadata": [
+				  "Layers": [
 					{
 					  "Size": 1000,
 					  "Digest": "sha256:dffd9992ca398466a663c87c92cfea2a2db0ae0cf33fcb99da60eec52addbfc5",

diff --git a/pkg/scanner/scan.go b/pkg/scanner/scan.go
@@ -187,13 +187,13 @@ func (s Scanner) ScanArtifact(ctx context.Context, options types.ScanOptions) (t
 			OS: ptros,
 
 			// Container image
-			ImageID:        artifactInfo.ImageMetadata.ID,
-			DiffIDs:        artifactInfo.ImageMetadata.DiffIDs,
-			RepoTags:       artifactInfo.ImageMetadata.RepoTags,
-			RepoDigests:    artifactInfo.ImageMetadata.RepoDigests,
-			ImageConfig:    artifactInfo.ImageMetadata.ConfigFile,
-			Size:           layersMetadata.TotalSize(),
-			LayersMetadata: lo.Ternary(!layersMetadata.Empty(), layersMetadata, nil),
+			ImageID:     artifactInfo.ImageMetadata.ID,
+			DiffIDs:     artifactInfo.ImageMetadata.DiffIDs,
+			RepoTags:    artifactInfo.ImageMetadata.RepoTags,
+			RepoDigests: artifactInfo.ImageMetadata.RepoDigests,
+			ImageConfig: artifactInfo.ImageMetadata.ConfigFile,
+			Size:        layersMetadata.TotalSize(),
+			Layers:      lo.Ternary(!layersMetadata.Empty(), layersMetadata, nil),
 		},
 		Results: results,
 		BOM:     artifactInfo.BOM,

diff --git a/pkg/types/report.go b/pkg/types/report.go
@@ -29,12 +29,12 @@ type Metadata struct {
 	OS   *ftypes.OS `json:",omitempty"`
 
 	// Container image
-	ImageID        string                `json:",omitempty"`
-	DiffIDs        []string              `json:",omitempty"`
-	RepoTags       []string              `json:",omitempty"`
-	RepoDigests    []string              `json:",omitempty"`
-	ImageConfig    v1.ConfigFile         `json:",omitempty"`
-	LayersMetadata ftypes.LayersMetadata `json:",omitempty"`
+	ImageID     string                `json:",omitempty"`
+	DiffIDs     []string              `json:",omitempty"`
+	RepoTags    []string              `json:",omitempty"`
+	RepoDigests []string              `json:",omitempty"`
+	ImageConfig v1.ConfigFile         `json:",omitempty"`
+	Layers      ftypes.LayersMetadata `json:",omitempty"`
 }
 
 // Results to hold list of Result