refactor: cleanup and naming changes (#152)

Signed-off-by: chenk <[email protected]>
aquasecurity · May 11, 2023 · 45388f0 · 45388f0
1 parent 7d503d9
commit 45388f0
Showing 1 changed file with 17 additions and 30 deletions.
diff --git a/pkg/bom/model.go b/pkg/bom/model.go
@@ -7,38 +7,25 @@ type Result struct {
 	NodesInfo  []NodeInfo  `json:"nodesInfo,omitempty"`
 }
 
-type Package struct {
-	ID         string     `json:",omitempty"`
-	Name       string     `json:",omitempty"`
-	Version    string     `json:",omitempty"`
-	Properties []KeyValue `json:",omitempty"`
-	Digest     string     `json:",omitempty"`
-}
-
-type KeyValue struct {
-	Name  string
-	Value string
-}
-
 type Component struct {
-	Type       string `json:"type,omitempty"`
-	ID         string `json:"id,omitempty"`
-	Version    string `json:"version,omitempty"`
-	Repository string `json:"repository,omitempty"`
-	Registry   string `json:"registry,omitempty"`
-	Digest     string `json:"digest,omitempty"`
+	Type       string
+	ID         string
+	Version    string
+	Repository string
+	Registry   string
+	Digest     string
 }
 
 type NodeInfo struct {
-	NodeRole                string   `json:"node_role,omitempty"`
-	NodeName                string   `json:"node_name,omitempty"`
-	KubeletVersion          string   `json:"kubelet_version,omitempty"`
-	ContainerRuntimeVersion string   `json:"container_runtime_version,omitempty"`
-	OsImage                 string   `json:"os_image,omitempty"`
-	Hostname                string   `json:"host_name,omitempty"`
-	KernelVersion           string   `json:"kernel_version,omitempty"`
-	KubeProxyVersion        string   `json:"kube_proxy_version,omitempty"`
-	OperatingSystem         string   `json:"operating_system,omitempty"`
-	Architecture            string   `json:"architecture,omitempty"`
-	Images                  []string `json:"images,omitempty"`
+	NodeRole                string
+	NodeName                string
+	KubeletVersion          string
+	ContainerRuntimeVersion string
+	OsImage                 string
+	Hostname                string
+	KernelVersion           string
+	KubeProxyVersion        string
+	OperatingSystem         string
+	Architecture            string
+	Images                  []string
 }