Skip to content

Commit 439dd12

Browse files
kolyshkinkolyshkin
committed
cmd: fixup some IDs
Fix a bunch of golint warnings by renaming the way it suggests. The warnings are like internal/api/versions.go:32:2: const `containersApi` should be `containersAPI` (golint) containersApi = "containers" ^ Signed-off-by: Kir Kolyshkin <[email protected]>
1 parent e09046d commit 439dd12

File tree

10 files changed

+130
-130
lines changed

10 files changed

+130
-130
lines changed

‎cmd/cadvisor.go

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ import (
4444
"k8s.io/klog/v2"
4545
)
4646

47-
var argIp = flag.String("listen_ip", "", "IP to listen on, defaults to all IPs")
47+
var argIP = flag.String("listen_ip", "", "IP to listen on, defaults to all IPs")
4848
var argPort = flag.Int("port", 8080, "port to listen")
4949
var maxProcs = flag.Int("max_procs", 0, "max number of CPUs that can be used simultaneously. Less than 1 for default (number of cores).")
5050

@@ -131,9 +131,9 @@ func main() {
131131

132132
sysFs := sysfs.NewRealSysFs()
133133

134-
collectorHttpClient := createCollectorHttpClient(*collectorCert, *collectorKey)
134+
collectorHTTPClient := createCollectorHTTPClient(*collectorCert, *collectorKey)
135135

136-
resourceManager, err := manager.New(memoryStorage, sysFs, manager.HousekeepingConfigFlags, includedMetrics, &collectorHttpClient, strings.Split(*rawCgroupPrefixWhiteList, ","), strings.Split(*envMetadataWhiteList, ","), *perfEvents, *resctrlInterval)
136+
resourceManager, err := manager.New(memoryStorage, sysFs, manager.HousekeepingConfigFlags, includedMetrics, &collectorHTTPClient, strings.Split(*rawCgroupPrefixWhiteList, ","), strings.Split(*envMetadataWhiteList, ","), *perfEvents, *resctrlInterval)
137137
if err != nil {
138138
klog.Fatalf("Failed to create a manager: %s", err)
139139
}
@@ -175,7 +175,7 @@ func main() {
175175
rootMux := http.NewServeMux()
176176
rootMux.Handle(*urlBasePrefix+"/", http.StripPrefix(*urlBasePrefix, mux))
177177

178-
addr := fmt.Sprintf("%s:%d", *argIp, *argPort)
178+
addr := fmt.Sprintf("%s:%d", *argIP, *argPort)
179179
klog.Fatal(http.ListenAndServe(addr, rootMux))
180180
}
181181

@@ -212,7 +212,7 @@ func installSignalHandler(containerManager manager.Manager) {
212212
}()
213213
}
214214

215-
func createCollectorHttpClient(collectorCert, collectorKey string) http.Client {
215+
func createCollectorHTTPClient(collectorCert, collectorKey string) http.Client {
216216
//Enable accessing insecure endpoints. We should be able to access metrics from any endpoint
217217
tlsConfig := &tls.Config{
218218
InsecureSkipVerify: true,

‎cmd/internal/api/handler.go

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -41,14 +41,14 @@ const (
4141
)
4242

4343
func RegisterHandlers(mux httpmux.Mux, m manager.Manager) error {
44-
apiVersions := getApiVersions()
45-
supportedApiVersions := make(map[string]ApiVersion, len(apiVersions))
44+
apiVersions := getAPIVersions()
45+
supportedAPIVersions := make(map[string]ApiVersion, len(apiVersions))
4646
for _, v := range apiVersions {
47-
supportedApiVersions[v.Version()] = v
47+
supportedAPIVersions[v.Version()] = v
4848
}
4949

5050
mux.HandleFunc(apiResource, func(w http.ResponseWriter, r *http.Request) {
51-
err := handleRequest(supportedApiVersions, m, w, r)
51+
err := handleRequest(supportedAPIVersions, m, w, r)
5252
if err != nil {
5353
http.Error(w, err.Error(), 500)
5454
}
@@ -65,7 +65,7 @@ const (
6565
apiRequestArgs
6666
)
6767

68-
func handleRequest(supportedApiVersions map[string]ApiVersion, m manager.Manager, w http.ResponseWriter, r *http.Request) error {
68+
func handleRequest(supportedAPIVersions map[string]ApiVersion, m manager.Manager, w http.ResponseWriter, r *http.Request) error {
6969
start := time.Now()
7070
defer func() {
7171
klog.V(4).Infof("Request took %s", time.Since(start))
@@ -80,8 +80,8 @@ func handleRequest(supportedApiVersions map[string]ApiVersion, m manager.Manager
8080

8181
// If the request doesn't have an API version, list those.
8282
if request == apiPrefix || request == apiResource {
83-
versions := make([]string, 0, len(supportedApiVersions))
84-
for v := range supportedApiVersions {
83+
versions := make([]string, 0, len(supportedAPIVersions))
84+
for v := range supportedAPIVersions {
8585
versions = append(versions, v)
8686
}
8787
sort.Strings(versions)
@@ -100,7 +100,7 @@ func handleRequest(supportedApiVersions map[string]ApiVersion, m manager.Manager
100100
requestArgs := strings.Split(requestElements[apiRequestArgs], "/")
101101

102102
// Check supported versions.
103-
versionHandler, ok := supportedApiVersions[version]
103+
versionHandler, ok := supportedAPIVersions[version]
104104
if !ok {
105105
return fmt.Errorf("unsupported API version %q", version)
106106
}

‎cmd/internal/api/versions.go

Lines changed: 38 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -29,20 +29,20 @@ import (
2929
)
3030

3131
const (
32-
containersApi = "containers"
33-
subcontainersApi = "subcontainers"
34-
machineApi = "machine"
35-
machineStatsApi = "machinestats"
36-
dockerApi = "docker"
37-
summaryApi = "summary"
38-
statsApi = "stats"
39-
specApi = "spec"
40-
eventsApi = "events"
41-
storageApi = "storage"
42-
attributesApi = "attributes"
43-
versionApi = "version"
44-
psApi = "ps"
45-
customMetricsApi = "appmetrics"
32+
containersAPI = "containers"
33+
subcontainersAPI = "subcontainers"
34+
machineAPI = "machine"
35+
machineStatsAPI = "machinestats"
36+
dockerAPI = "docker"
37+
summaryAPI = "summary"
38+
statsAPI = "stats"
39+
specAPI = "spec"
40+
eventsAPI = "events"
41+
storageAPI = "storage"
42+
attributesAPI = "attributes"
43+
versionAPI = "version"
44+
psAPI = "ps"
45+
customMetricsAPI = "appmetrics"
4646
)
4747

4848
// Interface for a cAdvisor API version
@@ -58,7 +58,7 @@ type ApiVersion interface {
5858
}
5959

6060
// Gets all supported API versions.
61-
func getApiVersions() []ApiVersion {
61+
func getAPIVersions() []ApiVersion {
6262
v1_0 := &version1_0{}
6363
v1_1 := newVersion1_1(v1_0)
6464
v1_2 := newVersion1_2(v1_1)
@@ -80,12 +80,12 @@ func (api *version1_0) Version() string {
8080
}
8181

8282
func (api *version1_0) SupportedRequestTypes() []string {
83-
return []string{containersApi, machineApi}
83+
return []string{containersAPI, machineAPI}
8484
}
8585

8686
func (api *version1_0) HandleRequest(requestType string, request []string, m manager.Manager, w http.ResponseWriter, r *http.Request) error {
8787
switch requestType {
88-
case machineApi:
88+
case machineAPI:
8989
klog.V(4).Infof("Api - Machine")
9090

9191
// Get the MachineInfo
@@ -98,7 +98,7 @@ func (api *version1_0) HandleRequest(requestType string, request []string, m man
9898
if err != nil {
9999
return err
100100
}
101-
case containersApi:
101+
case containersAPI:
102102
containerName := getContainerName(request)
103103
klog.V(4).Infof("Api - Container(%s)", containerName)
104104

@@ -143,12 +143,12 @@ func (api *version1_1) Version() string {
143143
}
144144

145145
func (api *version1_1) SupportedRequestTypes() []string {
146-
return append(api.baseVersion.SupportedRequestTypes(), subcontainersApi)
146+
return append(api.baseVersion.SupportedRequestTypes(), subcontainersAPI)
147147
}
148148

149149
func (api *version1_1) HandleRequest(requestType string, request []string, m manager.Manager, w http.ResponseWriter, r *http.Request) error {
150150
switch requestType {
151-
case subcontainersApi:
151+
case subcontainersAPI:
152152
containerName := getContainerName(request)
153153
klog.V(4).Infof("Api - Subcontainers(%s)", containerName)
154154

@@ -193,12 +193,12 @@ func (api *version1_2) Version() string {
193193
}
194194

195195
func (api *version1_2) SupportedRequestTypes() []string {
196-
return append(api.baseVersion.SupportedRequestTypes(), dockerApi)
196+
return append(api.baseVersion.SupportedRequestTypes(), dockerAPI)
197197
}
198198

199199
func (api *version1_2) HandleRequest(requestType string, request []string, m manager.Manager, w http.ResponseWriter, r *http.Request) error {
200200
switch requestType {
201-
case dockerApi:
201+
case dockerAPI:
202202
klog.V(4).Infof("Api - Docker(%v)", request)
203203

204204
// Get the query request.
@@ -262,12 +262,12 @@ func (api *version1_3) Version() string {
262262
}
263263

264264
func (api *version1_3) SupportedRequestTypes() []string {
265-
return append(api.baseVersion.SupportedRequestTypes(), eventsApi)
265+
return append(api.baseVersion.SupportedRequestTypes(), eventsAPI)
266266
}
267267

268268
func (api *version1_3) HandleRequest(requestType string, request []string, m manager.Manager, w http.ResponseWriter, r *http.Request) error {
269269
switch requestType {
270-
case eventsApi:
270+
case eventsAPI:
271271
return handleEventRequest(request, m, w, r)
272272
default:
273273
return api.baseVersion.HandleRequest(requestType, request, m, w, r)
@@ -310,7 +310,7 @@ func (api *version2_0) Version() string {
310310
}
311311

312312
func (api *version2_0) SupportedRequestTypes() []string {
313-
return []string{versionApi, attributesApi, eventsApi, machineApi, summaryApi, statsApi, specApi, storageApi, psApi, customMetricsApi}
313+
return []string{versionAPI, attributesAPI, eventsAPI, machineAPI, summaryAPI, statsAPI, specAPI, storageAPI, psAPI, customMetricsAPI}
314314
}
315315

316316
func (api *version2_0) HandleRequest(requestType string, request []string, m manager.Manager, w http.ResponseWriter, r *http.Request) error {
@@ -319,14 +319,14 @@ func (api *version2_0) HandleRequest(requestType string, request []string, m man
319319
return err
320320
}
321321
switch requestType {
322-
case versionApi:
322+
case versionAPI:
323323
klog.V(4).Infof("Api - Version")
324324
versionInfo, err := m.GetVersionInfo()
325325
if err != nil {
326326
return err
327327
}
328328
return writeResult(versionInfo.CadvisorVersion, w)
329-
case attributesApi:
329+
case attributesAPI:
330330
klog.V(4).Info("Api - Attributes")
331331

332332
machineInfo, err := m.GetMachineInfo()
@@ -339,7 +339,7 @@ func (api *version2_0) HandleRequest(requestType string, request []string, m man
339339
}
340340
info := v2.GetAttributes(machineInfo, versionInfo)
341341
return writeResult(info, w)
342-
case machineApi:
342+
case machineAPI:
343343
klog.V(4).Info("Api - Machine")
344344

345345
// TODO(rjnagal): Move machineInfo from v1.
@@ -348,7 +348,7 @@ func (api *version2_0) HandleRequest(requestType string, request []string, m man
348348
return err
349349
}
350350
return writeResult(machineInfo, w)
351-
case summaryApi:
351+
case summaryAPI:
352352
containerName := getContainerName(request)
353353
klog.V(4).Infof("Api - Summary for container %q, options %+v", containerName, opt)
354354

@@ -357,7 +357,7 @@ func (api *version2_0) HandleRequest(requestType string, request []string, m man
357357
return err
358358
}
359359
return writeResult(stats, w)
360-
case statsApi:
360+
case statsAPI:
361361
name := getContainerName(request)
362362
klog.V(4).Infof("Api - Stats: Looking for stats for container %q, options %+v", name, opt)
363363
infos, err := m.GetRequestedContainersInfo(name, opt)
@@ -372,7 +372,7 @@ func (api *version2_0) HandleRequest(requestType string, request []string, m man
372372
contStats[name] = v2.DeprecatedStatsFromV1(cinfo)
373373
}
374374
return writeResult(contStats, w)
375-
case customMetricsApi:
375+
case customMetricsAPI:
376376
containerName := getContainerName(request)
377377
klog.V(4).Infof("Api - Custom Metrics: Looking for metrics for container %q, options %+v", containerName, opt)
378378
infos, err := m.GetContainerInfoV2(containerName, opt)
@@ -412,15 +412,15 @@ func (api *version2_0) HandleRequest(requestType string, request []string, m man
412412
contMetrics[containerName] = metrics
413413
}
414414
return writeResult(contMetrics, w)
415-
case specApi:
415+
case specAPI:
416416
containerName := getContainerName(request)
417417
klog.V(4).Infof("Api - Spec for container %q, options %+v", containerName, opt)
418418
specs, err := m.GetContainerSpec(containerName, opt)
419419
if err != nil {
420420
return err
421421
}
422422
return writeResult(specs, w)
423-
case storageApi:
423+
case storageAPI:
424424
label := r.URL.Query().Get("label")
425425
uuid := r.URL.Query().Get("uuid")
426426
switch {
@@ -445,9 +445,9 @@ func (api *version2_0) HandleRequest(requestType string, request []string, m man
445445
}
446446
return writeResult(fi, w)
447447
}
448-
case eventsApi:
448+
case eventsAPI:
449449
return handleEventRequest(request, m, w, r)
450-
case psApi:
450+
case psAPI:
451451
// reuse container type from request.
452452
// ignore recursive.
453453
// TODO(rjnagal): consider count to limit ps output.
@@ -478,7 +478,7 @@ func (api *version2_1) Version() string {
478478
}
479479

480480
func (api *version2_1) SupportedRequestTypes() []string {
481-
return append([]string{machineStatsApi}, api.baseVersion.SupportedRequestTypes()...)
481+
return append([]string{machineStatsAPI}, api.baseVersion.SupportedRequestTypes()...)
482482
}
483483

484484
func (api *version2_1) HandleRequest(requestType string, request []string, m manager.Manager, w http.ResponseWriter, r *http.Request) error {
@@ -489,7 +489,7 @@ func (api *version2_1) HandleRequest(requestType string, request []string, m man
489489
}
490490

491491
switch requestType {
492-
case machineStatsApi:
492+
case machineStatsAPI:
493493
klog.V(4).Infof("Api - MachineStats(%v)", request)
494494
cont, err := m.GetRequestedContainersInfo("/", opt)
495495
if err != nil {
@@ -499,7 +499,7 @@ func (api *version2_1) HandleRequest(requestType string, request []string, m man
499499
klog.Errorf("Error calling GetRequestedContainersInfo: %v", err)
500500
}
501501
return writeResult(v2.MachineStatsFromV1(cont["/"]), w)
502-
case statsApi:
502+
case statsAPI:
503503
name := getContainerName(request)
504504
klog.V(4).Infof("Api - Stats: Looking for stats for container %q, options %+v", name, opt)
505505
conts, err := m.GetRequestedContainersInfo(name, opt)

‎cmd/internal/pages/pages.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,9 +67,9 @@ type pageData struct {
6767
}
6868

6969
func init() {
70-
containersHtmlTemplate, _ := Asset("cmd/internal/pages/assets/html/containers.html")
70+
containersHTMLTemplate, _ := Asset("cmd/internal/pages/assets/html/containers.html")
7171
pageTemplate = template.New("containersTemplate").Funcs(funcMap)
72-
_, err := pageTemplate.Parse(string(containersHtmlTemplate))
72+
_, err := pageTemplate.Parse(string(containersHTMLTemplate))
7373
if err != nil {
7474
klog.Fatalf("Failed to parse template: %s", err)
7575
}

‎cmd/internal/pages/static/static.go

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -29,24 +29,24 @@ import (
2929
const StaticResource = "/static/"
3030

3131
var popper, _ = Asset("cmd/internal/pages/assets/js/popper.min.js")
32-
var bootstrapJs, _ = Asset("cmd/internal/pages/assets/js/bootstrap-4.0.0-beta.2.min.js")
33-
var containersJs, _ = Asset("cmd/internal/pages/assets/js/containers.js")
34-
var loaderJs, _ = Asset("cmd/internal/pages/assets/js/loader.js")
35-
var jqueryJs, _ = Asset("cmd/internal/pages/assets/js/jquery-3.5.1.min.js")
32+
var bootstrapJS, _ = Asset("cmd/internal/pages/assets/js/bootstrap-4.0.0-beta.2.min.js")
33+
var containersJS, _ = Asset("cmd/internal/pages/assets/js/containers.js")
34+
var loaderJS, _ = Asset("cmd/internal/pages/assets/js/loader.js")
35+
var jqueryJS, _ = Asset("cmd/internal/pages/assets/js/jquery-3.5.1.min.js")
3636

37-
var bootstrapCss, _ = Asset("cmd/internal/pages/assets/styles/bootstrap-4.0.0-beta.2.min.css")
38-
var bootstrapThemeCss, _ = Asset("cmd/internal/pages/assets/styles/bootstrap-theme-3.1.1.min.css")
39-
var containersCss, _ = Asset("cmd/internal/pages/assets/styles/containers.css")
37+
var bootstrapCSS, _ = Asset("cmd/internal/pages/assets/styles/bootstrap-4.0.0-beta.2.min.css")
38+
var bootstrapThemeCSS, _ = Asset("cmd/internal/pages/assets/styles/bootstrap-theme-3.1.1.min.css")
39+
var containersCSS, _ = Asset("cmd/internal/pages/assets/styles/containers.css")
4040

4141
var staticFiles = map[string][]byte{
4242
"popper.min.js": popper,
43-
"bootstrap-4.0.0-beta.2.min.css": bootstrapCss,
44-
"bootstrap-4.0.0-beta.2.min.js": bootstrapJs,
45-
"bootstrap-theme-3.1.1.min.css": bootstrapThemeCss,
46-
"containers.css": containersCss,
47-
"containers.js": containersJs,
48-
"loader.js": loaderJs,
49-
"jquery-3.5.1.min.js": jqueryJs,
43+
"bootstrap-4.0.0-beta.2.min.css": bootstrapCSS,
44+
"bootstrap-4.0.0-beta.2.min.js": bootstrapJS,
45+
"bootstrap-theme-3.1.1.min.css": bootstrapThemeCSS,
46+
"containers.css": containersCSS,
47+
"containers.js": containersJS,
48+
"loader.js": loaderJS,
49+
"jquery-3.5.1.min.js": jqueryJS,
5050
}
5151

5252
func HandleRequest(w http.ResponseWriter, u *url.URL) {

0 commit comments

Comments
 (0)