Fix GoLand analyzer errors under runsc/...

PiperOrigin-RevId: 384344990

2 files changed, 20 insertions, 52 deletions

diff --git a/runsc/mitigate/mitigate.go b/runsc/mitigate/mitigate.go
index 88409af8f..9f29ec873 100644
--- a/runsc/mitigate/mitigate.go
+++ b/runsc/mitigate/mitigate.go
@@ -159,7 +159,7 @@ func (c ThreadGroup) String() string {
 func getThreads(data string) ([]Thread, error) {
 	// Each processor entry should start with the
 	// processor key. Find the beginings of each.
-	r := buildRegex(processorKey, `\d+`)
+	r := buildRegex(processorKey)
 	indices := r.FindAllStringIndex(data, -1)
 	if len(indices) < 1 {
 		return nil, fmt.Errorf("no cpus found for: %q", data)
@@ -437,14 +437,14 @@ func parseIntegerResult(data, key string) (int64, error) {
 }
 
 // buildRegex builds a regex for parsing each CPU field.
-func buildRegex(key, match string) *regexp.Regexp {
+func buildRegex(key string) *regexp.Regexp {
 	reg := fmt.Sprintf(`(?m)^%s\s*:\s*(.*)$`, key)
 	return regexp.MustCompile(reg)
 }
 
 // parseRegex parses data with key inserted into a standard regex template.
 func parseRegex(data, key, match string) (string, error) {
-	r := buildRegex(key, match)
+	r := buildRegex(key)
 	matches := r.FindStringSubmatch(data)
 
 	if len(matches) < 2 {
diff --git a/runsc/mitigate/mitigate_test.go b/runsc/mitigate/mitigate_test.go
index 890c65f05..1a3b880ca 100644
--- a/runsc/mitigate/mitigate_test.go
+++ b/runsc/mitigate/mitigate_test.go
@@ -126,15 +126,15 @@ bugs		: cpu_meltdown spectre_v1 spectre_v2 spec_store_bypass l1tf mds swapgs taa
 			coreID:     0,
 		},
 		bugs: map[string]struct{}{
-			"cpu_meltdown":      struct{}{},
-			"spectre_v1":        struct{}{},
-			"spectre_v2":        struct{}{},
-			"spec_store_bypass": struct{}{},
-			"l1tf":              struct{}{},
-			"mds":               struct{}{},
-			"swapgs":            struct{}{},
-			"taa":               struct{}{},
-			"itlb_multihit":     struct{}{},
+			"cpu_meltdown":      {},
+			"spectre_v1":        {},
+			"spectre_v2":        {},
+			"spec_store_bypass": {},
+			"l1tf":              {},
+			"mds":               {},
+			"swapgs":            {},
+			"taa":               {},
+			"itlb_multihit":     {},
 		},
 	}
 
@@ -235,13 +235,13 @@ power management:
 		cpuFamily: 6,
 		model:     63,
 		bugs: map[string]struct{}{
-			"cpu_meltdown":      struct{}{},
-			"spectre_v1":        struct{}{},
-			"spectre_v2":        struct{}{},
-			"spec_store_bypass": struct{}{},
-			"l1tf":              struct{}{},
-			"mds":               struct{}{},
-			"swapgs":            struct{}{},
+			"cpu_meltdown":      {},
+			"spectre_v1":        {},
+			"spectre_v2":        {},
+			"spec_store_bypass": {},
+			"l1tf":              {},
+			"mds":               {},
+			"swapgs":            {},
 		},
 	}
 
@@ -334,38 +334,6 @@ cache_alignment : 64
 address sizes   : 46 bits physical, 48 bits virtual
 power management:`
 
-	const cascade = `processor       : 0
-vendor_id       : GenuineIntel
-cpu family      : 6
-model           : 85
-model name      : Intel(R) Xeon(R) CPU
-stepping        : 7
-microcode       : 0x1
-cpu MHz         : 2800.198
-cache size      : 33792 KB
-physical id     : 0
-siblings        : 2
-core id         : 0
-cpu cores       : 1
-apicid          : 0
-initial apicid  : 0
-fpu             : yes
-fpu_exception   : yes
-cpuid level     : 13
-wp              : yes
-flags           : fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush mmx fxsr sse sse2
- ss ht syscall nx pdpe1gb rdtscp lm constant_tsc rep_good nopl xtopology nonstop_tsc cpuid tsc_known_freq pni pclmu
-lqdq ssse3 fma cx16 pcid sse4_1 sse4_2 x2apic movbe popcnt aes xsave avx f16c rdrand hypervisor lahf_lm abm 3dnowpr
-efetch invpcid_single ssbd ibrs ibpb stibp ibrs_enhanced fsgsbase tsc_adjust bmi1 hle avx2 smep bmi2 erms invpcid r
-tm mpx avx512f avx512dq rdseed adx smap clflushopt clwb avx512cd avx512bw avx512vl xsaveopt xsavec xgetbv1 xsaves a
-rat avx512_vnni md_clear arch_capabilities
-bugs            : spectre_v1 spectre_v2 spec_store_bypass mds swapgs taa
-bogomips        : 5600.39
-clflush size    : 64
-cache_alignment : 64
-address sizes   : 46 bits physical, 48 bits virtual
-power management:`
-
 	const amd = `processor       : 0
 vendor_id       : AuthenticAMD
 cpu family      : 23
@@ -429,7 +397,7 @@ power management:`
 				}()
 
 				if got != tc.vulnerable {
-					t.Fatalf("Mismatch vulnerable for cpu %+s: got %t want: %t", tc.name, tc.vulnerable, got)
+					t.Fatalf("Mismatch vulnerable for cpu %s: got %t want: %t", tc.name, tc.vulnerable, got)
 				}
 			}
 		})