Skip to content

Commit aa0afbe

Browse files
ColstuwjxColstuwjx
committed
chore: change metadataEnvs to metadataEnvAllowList.
Signed-off-by: colstuwjx <[email protected]>
1 parent dcf13bc commit aa0afbe

File tree

17 files changed

+74
-74
lines changed

17 files changed

+74
-74
lines changed

‎cmd/internal/container/mesos/factory.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ func (f *mesosFactory) String() string {
5959
return MesosNamespace
6060
}
6161

62-
func (f *mesosFactory) NewContainerHandler(name string, metadataEnvs []string, inHostNamespace bool) (container.ContainerHandler, error) {
62+
func (f *mesosFactory) NewContainerHandler(name string, metadataEnvAllowList []string, inHostNamespace bool) (container.ContainerHandler, error) {
6363
client, err := Client()
6464
if err != nil {
6565
return nil, err
@@ -72,7 +72,7 @@ func (f *mesosFactory) NewContainerHandler(name string, metadataEnvs []string, i
7272
f.fsInfo,
7373
f.includedMetrics,
7474
inHostNamespace,
75-
metadataEnvs,
75+
metadataEnvAllowList,
7676
client,
7777
)
7878
}

‎cmd/internal/container/mesos/handler.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ func newMesosContainerHandler(
5757
fsInfo fs.FsInfo,
5858
includedMetrics container.MetricSet,
5959
inHostNamespace bool,
60-
metadataEnvs []string,
60+
metadataEnvAllowList []string,
6161
client mesosAgentClient,
6262
) (container.ContainerHandler, error) {
6363
cgroupPaths := common.MakeCgroupPaths(cgroupSubsystems.MountPoints, name)

‎cmd/internal/container/mesos/handler_test.go

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ import (
2222
containerlibcontainer "github.com/google/cadvisor/container/libcontainer"
2323
"github.com/google/cadvisor/fs"
2424
info "github.com/google/cadvisor/info/v1"
25-
"github.com/mesos/mesos-go/api/v1/lib"
25+
"github.com/mesos/mesos-go/api/v1/lib"
2626
"github.com/stretchr/testify/assert"
2727
)
2828

@@ -37,14 +37,14 @@ func PopulateContainer() *mContainer {
3737
func TestContainerReference(t *testing.T) {
3838
as := assert.New(t)
3939
type testCase struct {
40-
client mesosAgentClient
41-
name string
42-
machineInfoFactory info.MachineInfoFactory
43-
fsInfo fs.FsInfo
44-
cgroupSubsystems *containerlibcontainer.CgroupSubsystems
45-
inHostNamespace bool
46-
metadataEnvs []string
47-
includedMetrics container.MetricSet
40+
client mesosAgentClient
41+
name string
42+
machineInfoFactory info.MachineInfoFactory
43+
fsInfo fs.FsInfo
44+
cgroupSubsystems *containerlibcontainer.CgroupSubsystems
45+
inHostNamespace bool
46+
metadataEnvAllowList []string
47+
includedMetrics container.MetricSet
4848

4949
hasErr bool
5050
errContains string
@@ -99,7 +99,7 @@ func TestContainerReference(t *testing.T) {
9999
},
100100
},
101101
} {
102-
handler, err := newMesosContainerHandler(ts.name, ts.cgroupSubsystems, ts.machineInfoFactory, ts.fsInfo, ts.includedMetrics, ts.inHostNamespace, ts.metadataEnvs, ts.client)
102+
handler, err := newMesosContainerHandler(ts.name, ts.cgroupSubsystems, ts.machineInfoFactory, ts.fsInfo, ts.includedMetrics, ts.inHostNamespace, ts.metadataEnvAllowList, ts.client)
103103
if ts.hasErr {
104104
as.NotNil(err)
105105
if ts.errContains != "" {

‎container/containerd/factory.go

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -58,17 +58,17 @@ func (f *containerdFactory) String() string {
5858
return k8sContainerdNamespace
5959
}
6060

61-
func (f *containerdFactory) NewContainerHandler(name string, metadataEnvs []string, inHostNamespace bool) (handler container.ContainerHandler, err error) {
61+
func (f *containerdFactory) NewContainerHandler(name string, metadataEnvAllowList []string, inHostNamespace bool) (handler container.ContainerHandler, err error) {
6262
client, err := Client(*ArgContainerdEndpoint, *ArgContainerdNamespace)
6363
if err != nil {
6464
return
6565
}
6666

67-
containerdMetadataEnvs := strings.Split(*containerdEnvMetadataWhiteList, ",")
67+
containerdMetadataEnvAllowList := strings.Split(*containerdEnvMetadataWhiteList, ",")
6868

69-
// prefer using the unified metadataEnvs
70-
if len(metadataEnvs) != 0 {
71-
containerdMetadataEnvs = metadataEnvs
69+
// prefer using the unified metadataEnvAllowList
70+
if len(metadataEnvAllowList) != 0 {
71+
containerdMetadataEnvAllowList = metadataEnvAllowList
7272
}
7373

7474
return newContainerdContainerHandler(
@@ -78,7 +78,7 @@ func (f *containerdFactory) NewContainerHandler(name string, metadataEnvs []stri
7878
f.fsInfo,
7979
&f.cgroupSubsystems,
8080
inHostNamespace,
81-
containerdMetadataEnvs,
81+
containerdMetadataEnvAllowList,
8282
f.includedMetrics,
8383
)
8484
}

‎container/containerd/handler.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ func newContainerdContainerHandler(
6060
fsInfo fs.FsInfo,
6161
cgroupSubsystems *containerlibcontainer.CgroupSubsystems,
6262
inHostNamespace bool,
63-
metadataEnvs []string,
63+
metadataEnvAllowList []string,
6464
includedMetrics container.MetricSet,
6565
) (container.ContainerHandler, error) {
6666
// Create the cgroup paths.
@@ -134,9 +134,9 @@ func newContainerdContainerHandler(
134134
// Add the name and bare ID as aliases of the container.
135135
handler.image = cntr.Image
136136

137-
for _, exposedEnv := range metadataEnvs {
137+
for _, exposedEnv := range metadataEnvAllowList {
138138
if exposedEnv == "" {
139-
// if no containerdEnvWhitelist provided, len(metadataEnvs) == 1, metadataEnvs[0] == ""
139+
// if no containerdEnvWhitelist provided, len(metadataEnvAllowList) == 1, metadataEnvAllowList[0] == ""
140140
continue
141141
}
142142

‎container/containerd/handler_test.go

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -45,14 +45,14 @@ func (m *mockedMachineInfo) GetVersionInfo() (*info.VersionInfo, error) {
4545
func TestHandler(t *testing.T) {
4646
as := assert.New(t)
4747
type testCase struct {
48-
client ContainerdClient
49-
name string
50-
machineInfoFactory info.MachineInfoFactory
51-
fsInfo fs.FsInfo
52-
cgroupSubsystems *containerlibcontainer.CgroupSubsystems
53-
inHostNamespace bool
54-
metadataEnvs []string
55-
includedMetrics container.MetricSet
48+
client ContainerdClient
49+
name string
50+
machineInfoFactory info.MachineInfoFactory
51+
fsInfo fs.FsInfo
52+
cgroupSubsystems *containerlibcontainer.CgroupSubsystems
53+
inHostNamespace bool
54+
metadataEnvAllowList []string
55+
includedMetrics container.MetricSet
5656

5757
hasErr bool
5858
errContains string
@@ -121,7 +121,7 @@ func TestHandler(t *testing.T) {
121121
map[string]string{"TEST_REGION": "FRA", "TEST_ZONE": "A"},
122122
},
123123
} {
124-
handler, err := newContainerdContainerHandler(ts.client, ts.name, ts.machineInfoFactory, ts.fsInfo, ts.cgroupSubsystems, ts.inHostNamespace, ts.metadataEnvs, ts.includedMetrics)
124+
handler, err := newContainerdContainerHandler(ts.client, ts.name, ts.machineInfoFactory, ts.fsInfo, ts.cgroupSubsystems, ts.inHostNamespace, ts.metadataEnvAllowList, ts.includedMetrics)
125125
if ts.hasErr {
126126
as.NotNil(err)
127127
if ts.errContains != "" {

‎container/crio/factory.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ func (f *crioFactory) String() string {
6464
return CrioNamespace
6565
}
6666

67-
func (f *crioFactory) NewContainerHandler(name string, metadataEnvs []string, inHostNamespace bool) (handler container.ContainerHandler, err error) {
67+
func (f *crioFactory) NewContainerHandler(name string, metadataEnvAllowList []string, inHostNamespace bool) (handler container.ContainerHandler, err error) {
6868
client, err := Client()
6969
if err != nil {
7070
return
@@ -78,7 +78,7 @@ func (f *crioFactory) NewContainerHandler(name string, metadataEnvs []string, in
7878
f.storageDir,
7979
&f.cgroupSubsystems,
8080
inHostNamespace,
81-
metadataEnvs,
81+
metadataEnvAllowList,
8282
f.includedMetrics,
8383
)
8484
return

‎container/crio/handler.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ func newCrioContainerHandler(
8585
storageDir string,
8686
cgroupSubsystems *containerlibcontainer.CgroupSubsystems,
8787
inHostNamespace bool,
88-
metadataEnvs []string,
88+
metadataEnvAllowList []string,
8989
includedMetrics container.MetricSet,
9090
) (container.ContainerHandler, error) {
9191
// Create the cgroup paths.
@@ -186,7 +186,7 @@ func newCrioContainerHandler(
186186
handler.fsHandler = common.NewFsHandler(common.DefaultPeriod, rootfsStorageDir, storageLogDir, fsInfo)
187187
}
188188
// TODO for env vars we wanted to show from container.Config.Env from whitelist
189-
//for _, exposedEnv := range metadataEnvs {
189+
//for _, exposedEnv := range metadataEnvAllowList {
190190
//klog.V(4).Infof("TODO env whitelist: %v", exposedEnv)
191191
//}
192192

‎container/crio/handler_test.go

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -28,16 +28,16 @@ import (
2828
func TestHandler(t *testing.T) {
2929
as := assert.New(t)
3030
type testCase struct {
31-
client CrioClient
32-
name string
33-
machineInfoFactory info.MachineInfoFactory
34-
fsInfo fs.FsInfo
35-
storageDriver storageDriver
36-
storageDir string
37-
cgroupSubsystems *containerlibcontainer.CgroupSubsystems
38-
inHostNamespace bool
39-
metadataEnvs []string
40-
includedMetrics container.MetricSet
31+
client CrioClient
32+
name string
33+
machineInfoFactory info.MachineInfoFactory
34+
fsInfo fs.FsInfo
35+
storageDriver storageDriver
36+
storageDir string
37+
cgroupSubsystems *containerlibcontainer.CgroupSubsystems
38+
inHostNamespace bool
39+
metadataEnvAllowList []string
40+
includedMetrics container.MetricSet
4141

4242
hasErr bool
4343
errContains string
@@ -102,7 +102,7 @@ func TestHandler(t *testing.T) {
102102
},
103103
},
104104
} {
105-
handler, err := newCrioContainerHandler(ts.client, ts.name, ts.machineInfoFactory, ts.fsInfo, ts.storageDriver, ts.storageDir, ts.cgroupSubsystems, ts.inHostNamespace, ts.metadataEnvs, ts.includedMetrics)
105+
handler, err := newCrioContainerHandler(ts.client, ts.name, ts.machineInfoFactory, ts.fsInfo, ts.storageDriver, ts.storageDir, ts.cgroupSubsystems, ts.inHostNamespace, ts.metadataEnvAllowList, ts.includedMetrics)
106106
if ts.hasErr {
107107
as.NotNil(err)
108108
if ts.errContains != "" {

‎container/docker/factory.go

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -136,17 +136,17 @@ func (f *dockerFactory) String() string {
136136
return DockerNamespace
137137
}
138138

139-
func (f *dockerFactory) NewContainerHandler(name string, metadataEnvs []string, inHostNamespace bool) (handler container.ContainerHandler, err error) {
139+
func (f *dockerFactory) NewContainerHandler(name string, metadataEnvAllowList []string, inHostNamespace bool) (handler container.ContainerHandler, err error) {
140140
client, err := Client()
141141
if err != nil {
142142
return
143143
}
144144

145-
dockerMetadataEnvs := strings.Split(*dockerEnvMetadataWhiteList, ",")
145+
dockerMetadataEnvAllowList := strings.Split(*dockerEnvMetadataWhiteList, ",")
146146

147-
// prefer using the unified metadataEnvs
148-
if len(metadataEnvs) != 0 {
149-
dockerMetadataEnvs = metadataEnvs
147+
// prefer using the unified metadataEnvAllowList
148+
if len(metadataEnvAllowList) != 0 {
149+
dockerMetadataEnvAllowList = metadataEnvAllowList
150150
}
151151

152152
handler, err = newDockerContainerHandler(
@@ -158,7 +158,7 @@ func (f *dockerFactory) NewContainerHandler(name string, metadataEnvs []string,
158158
f.storageDir,
159159
&f.cgroupSubsystems,
160160
inHostNamespace,
161-
dockerMetadataEnvs,
161+
dockerMetadataEnvAllowList,
162162
f.dockerVersion,
163163
f.includedMetrics,
164164
f.thinPoolName,

0 commit comments

Comments
 (0)