Skip to content

Commit 2816f50

Browse files
committed
refactor: prefer "ID" instead of "Id"
1 parent b93cd31 commit 2816f50

File tree

2 files changed

+8
-6
lines changed

2 files changed

+8
-6
lines changed

.golangci.yaml

+2
Original file line numberDiff line numberDiff line change
@@ -103,6 +103,8 @@ linters-settings:
103103
rules:
104104
- name: use-any
105105
disabled: false
106+
- name: var-naming
107+
disabled: false
106108

107109
issues:
108110
max-issues-per-linter: 0

extractor/standalone/containers/containerd/containerd_test.go

+6-6
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ func TestExtract(t *testing.T) {
3838
tests := []struct {
3939
name string
4040
onGoos []string
41-
nssTaskIds map[string][]string
41+
nssTaskIDs map[string][]string
4242
tsks []*task.Process
4343
ctrs []containerd.Container
4444
wantInventory []*extractor.Inventory
@@ -47,15 +47,15 @@ func TestExtract(t *testing.T) {
4747
{
4848
name: "valid with no tasks",
4949
onGoos: []string{"linux"},
50-
nssTaskIds: map[string][]string{"default": {}, "k8s.io": {}},
50+
nssTaskIDs: map[string][]string{"default": {}, "k8s.io": {}},
5151
tsks: []*task.Process{},
5252
ctrs: []containerd.Container{},
5353
wantInventory: []*extractor.Inventory{},
5454
},
5555
{
5656
name: "valid with tasks and rootfs",
5757
onGoos: []string{"linux"},
58-
nssTaskIds: map[string][]string{"default": {"123456789"}, "k8s.io": {"567890123"}},
58+
nssTaskIDs: map[string][]string{"default": {"123456789"}, "k8s.io": {"567890123"}},
5959
tsks: []*task.Process{{ID: "123456789", ContainerID: "", Pid: 12345}, {ID: "567890123", ContainerID: "", Pid: 5678}},
6060
ctrs: []containerd.Container{fakeclient.NewFakeContainer("123456789", "image1", "digest1", "/run/containerd/io.containerd.runtime.v2.task/default/123456789/rootfs"), fakeclient.NewFakeContainer("567890123", "image2", "digest2", "/run/containerd/io.containerd.runtime.v2.task/k8s.io/567890123/rootfs")},
6161
wantInventory: []*extractor.Inventory{
@@ -92,7 +92,7 @@ func TestExtract(t *testing.T) {
9292
{
9393
name: "valid with tasks and no rootfs",
9494
onGoos: []string{"linux"},
95-
nssTaskIds: map[string][]string{"default": {"123456789"}, "k8s.io": {"567890123"}},
95+
nssTaskIDs: map[string][]string{"default": {"123456789"}, "k8s.io": {"567890123"}},
9696
tsks: []*task.Process{{ID: "123456789", ContainerID: "", Pid: 12345}, {ID: "567890123", ContainerID: "", Pid: 5678}},
9797
ctrs: []containerd.Container{fakeclient.NewFakeContainer("123456789", "image1", "digest1", ""), fakeclient.NewFakeContainer("567890123", "image2", "digest2", "")},
9898
wantInventory: []*extractor.Inventory{
@@ -129,7 +129,7 @@ func TestExtract(t *testing.T) {
129129
{
130130
name: "valid with tasks and relative-path-only rootfs",
131131
onGoos: []string{"linux"},
132-
nssTaskIds: map[string][]string{"default": {"123456788"}, "k8s.io": {"567890122"}},
132+
nssTaskIDs: map[string][]string{"default": {"123456788"}, "k8s.io": {"567890122"}},
133133
tsks: []*task.Process{{ID: "123456788", ContainerID: "", Pid: 12346}, {ID: "567890122", ContainerID: "", Pid: 5677}},
134134
ctrs: []containerd.Container{fakeclient.NewFakeContainer("123456788", "image1", "digest1", "test/rootfs"), fakeclient.NewFakeContainer("567890122", "image2", "digest2", "test2/rootfs")},
135135
wantInventory: []*extractor.Inventory{
@@ -172,7 +172,7 @@ func TestExtract(t *testing.T) {
172172
}
173173

174174
var input *standalone.ScanInput
175-
cli, err := fakeclient.NewFakeCtrdClient(context.Background(), tt.nssTaskIds, tt.tsks, tt.ctrs)
175+
cli, err := fakeclient.NewFakeCtrdClient(context.Background(), tt.nssTaskIDs, tt.tsks, tt.ctrs)
176176
if err != nil {
177177
t.Fatalf("NewFakeCtrdClient() error: %v", err)
178178
}

0 commit comments

Comments
 (0)