Merge pull request #4036 from fengshunli/var

k8s-ci-robot · web-flow · commit 73848f898062 · 2024-07-22T23:04:23.000-07:00
🐛 cleanup/enhancement: keep all variables used defined on top of`main.go`
diff --git a/docs/book/src/cronjob-tutorial/testdata/project/cmd/main.go b/docs/book/src/cronjob-tutorial/testdata/project/cmd/main.go
@@ -77,6 +77,7 @@ func main() {
 	var probeAddr string
 	var secureMetrics bool
 	var enableHTTP2 bool
+	var tlsOpts []func(*tls.Config)
 	flag.StringVar(&metricsAddr, "metrics-bind-address", "0", "The address the metrics endpoint binds to. "+
 		"Use :8443 for HTTPS or :8080 for HTTP, or leave as 0 to disable the metrics service.")
 	flag.StringVar(&probeAddr, "health-probe-bind-address", ":8081", "The address the probe endpoint binds to.")
@@ -106,7 +107,6 @@ func main() {
 		c.NextProtos = []string{"http/1.1"}
 	}
 
-	tlsOpts := []func(*tls.Config){}
 	if !enableHTTP2 {
 		tlsOpts = append(tlsOpts, disableHTTP2)
 	}
diff --git a/docs/book/src/getting-started/testdata/project/cmd/main.go b/docs/book/src/getting-started/testdata/project/cmd/main.go
@@ -58,6 +58,7 @@ func main() {
 	var probeAddr string
 	var secureMetrics bool
 	var enableHTTP2 bool
+	var tlsOpts []func(*tls.Config)
 	flag.StringVar(&metricsAddr, "metrics-bind-address", "0", "The address the metrics endpoint binds to. "+
 		"Use :8443 for HTTPS or :8080 for HTTP, or leave as 0 to disable the metrics service.")
 	flag.StringVar(&probeAddr, "health-probe-bind-address", ":8081", "The address the probe endpoint binds to.")
@@ -87,7 +88,6 @@ func main() {
 		c.NextProtos = []string{"http/1.1"}
 	}
 
-	tlsOpts := []func(*tls.Config){}
 	if !enableHTTP2 {
 		tlsOpts = append(tlsOpts, disableHTTP2)
 	}
diff --git a/pkg/plugins/golang/v4/scaffolds/internal/templates/main.go b/pkg/plugins/golang/v4/scaffolds/internal/templates/main.go
@@ -226,6 +226,7 @@ func main() {
 	var probeAddr string
 	var secureMetrics bool
 	var enableHTTP2 bool
+	var tlsOpts []func(*tls.Config)
 	flag.StringVar(&metricsAddr, "metrics-bind-address", "0", "The address the metrics endpoint binds to. " +
 		"Use :8443 for HTTPS or :8080 for HTTP, or leave as 0 to disable the metrics service.")
 	flag.StringVar(&probeAddr, "health-probe-bind-address", ":8081", "The address the probe endpoint binds to.")
@@ -255,7 +256,6 @@ func main() {
 		c.NextProtos = []string{"http/1.1"}
 	}
 
-	tlsOpts := []func(*tls.Config){}
 	if !enableHTTP2 {
 		tlsOpts = append(tlsOpts, disableHTTP2)
 	}
diff --git a/testdata/project-v4-multigroup-with-deploy-image/cmd/main.go b/testdata/project-v4-multigroup-with-deploy-image/cmd/main.go
@@ -83,6 +83,7 @@ func main() {
 	var probeAddr string
 	var secureMetrics bool
 	var enableHTTP2 bool
+	var tlsOpts []func(*tls.Config)
 	flag.StringVar(&metricsAddr, "metrics-bind-address", "0", "The address the metrics endpoint binds to. "+
 		"Use :8443 for HTTPS or :8080 for HTTP, or leave as 0 to disable the metrics service.")
 	flag.StringVar(&probeAddr, "health-probe-bind-address", ":8081", "The address the probe endpoint binds to.")
@@ -112,7 +113,6 @@ func main() {
 		c.NextProtos = []string{"http/1.1"}
 	}
 
-	tlsOpts := []func(*tls.Config){}
 	if !enableHTTP2 {
 		tlsOpts = append(tlsOpts, disableHTTP2)
 	}
diff --git a/testdata/project-v4-multigroup/cmd/main.go b/testdata/project-v4-multigroup/cmd/main.go
@@ -83,6 +83,7 @@ func main() {
 	var probeAddr string
 	var secureMetrics bool
 	var enableHTTP2 bool
+	var tlsOpts []func(*tls.Config)
 	flag.StringVar(&metricsAddr, "metrics-bind-address", "0", "The address the metrics endpoint binds to. "+
 		"Use :8443 for HTTPS or :8080 for HTTP, or leave as 0 to disable the metrics service.")
 	flag.StringVar(&probeAddr, "health-probe-bind-address", ":8081", "The address the probe endpoint binds to.")
@@ -112,7 +113,6 @@ func main() {
 		c.NextProtos = []string{"http/1.1"}
 	}
 
-	tlsOpts := []func(*tls.Config){}
 	if !enableHTTP2 {
 		tlsOpts = append(tlsOpts, disableHTTP2)
 	}
diff --git a/testdata/project-v4-with-deploy-image/cmd/main.go b/testdata/project-v4-with-deploy-image/cmd/main.go
@@ -58,6 +58,7 @@ func main() {
 	var probeAddr string
 	var secureMetrics bool
 	var enableHTTP2 bool
+	var tlsOpts []func(*tls.Config)
 	flag.StringVar(&metricsAddr, "metrics-bind-address", "0", "The address the metrics endpoint binds to. "+
 		"Use :8443 for HTTPS or :8080 for HTTP, or leave as 0 to disable the metrics service.")
 	flag.StringVar(&probeAddr, "health-probe-bind-address", ":8081", "The address the probe endpoint binds to.")
@@ -87,7 +88,6 @@ func main() {
 		c.NextProtos = []string{"http/1.1"}
 	}
 
-	tlsOpts := []func(*tls.Config){}
 	if !enableHTTP2 {
 		tlsOpts = append(tlsOpts, disableHTTP2)
 	}
diff --git a/testdata/project-v4-with-grafana/cmd/main.go b/testdata/project-v4-with-grafana/cmd/main.go
@@ -54,6 +54,7 @@ func main() {
 	var probeAddr string
 	var secureMetrics bool
 	var enableHTTP2 bool
+	var tlsOpts []func(*tls.Config)
 	flag.StringVar(&metricsAddr, "metrics-bind-address", "0", "The address the metrics endpoint binds to. "+
 		"Use :8443 for HTTPS or :8080 for HTTP, or leave as 0 to disable the metrics service.")
 	flag.StringVar(&probeAddr, "health-probe-bind-address", ":8081", "The address the probe endpoint binds to.")
@@ -83,7 +84,6 @@ func main() {
 		c.NextProtos = []string{"http/1.1"}
 	}
 
-	tlsOpts := []func(*tls.Config){}
 	if !enableHTTP2 {
 		tlsOpts = append(tlsOpts, disableHTTP2)
 	}
diff --git a/testdata/project-v4/cmd/main.go b/testdata/project-v4/cmd/main.go
@@ -58,6 +58,7 @@ func main() {
 	var probeAddr string
 	var secureMetrics bool
 	var enableHTTP2 bool
+	var tlsOpts []func(*tls.Config)
 	flag.StringVar(&metricsAddr, "metrics-bind-address", "0", "The address the metrics endpoint binds to. "+
 		"Use :8443 for HTTPS or :8080 for HTTP, or leave as 0 to disable the metrics service.")
 	flag.StringVar(&probeAddr, "health-probe-bind-address", ":8081", "The address the probe endpoint binds to.")
@@ -87,7 +88,6 @@ func main() {
 		c.NextProtos = []string{"http/1.1"}
 	}
 
-	tlsOpts := []func(*tls.Config){}
 	if !enableHTTP2 {
 		tlsOpts = append(tlsOpts, disableHTTP2)
 	}

Original file line number	Diff line number	Diff line change
`@@ -77,6 +77,7 @@ func main() {`
`77`	`77`	`var probeAddr string`
`78`	`78`	`var secureMetrics bool`
`79`	`79`	`var enableHTTP2 bool`
	`80`	`+ var tlsOpts []func(*tls.Config)`
`80`	`81`	`flag.StringVar(&metricsAddr, "metrics-bind-address", "0", "The address the metrics endpoint binds to. "+`
`81`	`82`	`"Use :8443 for HTTPS or :8080 for HTTP, or leave as 0 to disable the metrics service.")`
`82`	`83`	`flag.StringVar(&probeAddr, "health-probe-bind-address", ":8081", "The address the probe endpoint binds to.")`
`@@ -106,7 +107,6 @@ func main() {`
`106`	`107`	`c.NextProtos = []string{"http/1.1"}`
`107`	`108`	`}`
`108`	`109`
`109`		`- tlsOpts := []func(*tls.Config){}`
`110`	`110`	`if !enableHTTP2 {`
`111`	`111`	`tlsOpts = append(tlsOpts, disableHTTP2)`
`112`	`112`	`}`
Original file line number	Diff line number	Diff line change
`@@ -58,6 +58,7 @@ func main() {`
`58`	`58`	`var probeAddr string`
`59`	`59`	`var secureMetrics bool`
`60`	`60`	`var enableHTTP2 bool`
	`61`	`+ var tlsOpts []func(*tls.Config)`
`61`	`62`	`flag.StringVar(&metricsAddr, "metrics-bind-address", "0", "The address the metrics endpoint binds to. "+`
`62`	`63`	`"Use :8443 for HTTPS or :8080 for HTTP, or leave as 0 to disable the metrics service.")`
`63`	`64`	`flag.StringVar(&probeAddr, "health-probe-bind-address", ":8081", "The address the probe endpoint binds to.")`
`@@ -87,7 +88,6 @@ func main() {`
`87`	`88`	`c.NextProtos = []string{"http/1.1"}`
`88`	`89`	`}`
`89`	`90`
`90`		`- tlsOpts := []func(*tls.Config){}`
`91`	`91`	`if !enableHTTP2 {`
`92`	`92`	`tlsOpts = append(tlsOpts, disableHTTP2)`
`93`	`93`	`}`
Original file line number	Diff line number	Diff line change
`@@ -226,6 +226,7 @@ func main() {`
`226`	`226`	`var probeAddr string`
`227`	`227`	`var secureMetrics bool`
`228`	`228`	`var enableHTTP2 bool`
	`229`	`+ var tlsOpts []func(*tls.Config)`
`229`	`230`	`flag.StringVar(&metricsAddr, "metrics-bind-address", "0", "The address the metrics endpoint binds to. " +`
`230`	`231`	`"Use :8443 for HTTPS or :8080 for HTTP, or leave as 0 to disable the metrics service.")`
`231`	`232`	`flag.StringVar(&probeAddr, "health-probe-bind-address", ":8081", "The address the probe endpoint binds to.")`
`@@ -255,7 +256,6 @@ func main() {`
`255`	`256`	`c.NextProtos = []string{"http/1.1"}`
`256`	`257`	`}`
`257`	`258`
`258`		`- tlsOpts := []func(*tls.Config){}`
`259`	`259`	`if !enableHTTP2 {`
`260`	`260`	`tlsOpts = append(tlsOpts, disableHTTP2)`
`261`	`261`	`}`
Original file line number	Diff line number	Diff line change
`@@ -83,6 +83,7 @@ func main() {`
`83`	`83`	`var probeAddr string`
`84`	`84`	`var secureMetrics bool`
`85`	`85`	`var enableHTTP2 bool`
	`86`	`+ var tlsOpts []func(*tls.Config)`
`86`	`87`	`flag.StringVar(&metricsAddr, "metrics-bind-address", "0", "The address the metrics endpoint binds to. "+`
`87`	`88`	`"Use :8443 for HTTPS or :8080 for HTTP, or leave as 0 to disable the metrics service.")`
`88`	`89`	`flag.StringVar(&probeAddr, "health-probe-bind-address", ":8081", "The address the probe endpoint binds to.")`
`@@ -112,7 +113,6 @@ func main() {`
`112`	`113`	`c.NextProtos = []string{"http/1.1"}`
`113`	`114`	`}`
`114`	`115`
`115`		`- tlsOpts := []func(*tls.Config){}`
`116`	`116`	`if !enableHTTP2 {`
`117`	`117`	`tlsOpts = append(tlsOpts, disableHTTP2)`
`118`	`118`	`}`
Original file line number	Diff line number	Diff line change
`@@ -54,6 +54,7 @@ func main() {`
`54`	`54`	`var probeAddr string`
`55`	`55`	`var secureMetrics bool`
`56`	`56`	`var enableHTTP2 bool`
	`57`	`+ var tlsOpts []func(*tls.Config)`
`57`	`58`	`flag.StringVar(&metricsAddr, "metrics-bind-address", "0", "The address the metrics endpoint binds to. "+`
`58`	`59`	`"Use :8443 for HTTPS or :8080 for HTTP, or leave as 0 to disable the metrics service.")`
`59`	`60`	`flag.StringVar(&probeAddr, "health-probe-bind-address", ":8081", "The address the probe endpoint binds to.")`
`@@ -83,7 +84,6 @@ func main() {`
`83`	`84`	`c.NextProtos = []string{"http/1.1"}`
`84`	`85`	`}`
`85`	`86`
`86`		`- tlsOpts := []func(*tls.Config){}`
`87`	`87`	`if !enableHTTP2 {`
`88`	`88`	`tlsOpts = append(tlsOpts, disableHTTP2)`
`89`	`89`	`}`