Repository: helm/helm
Pull request #11080 (2022-06-24 14:09:29)

chore(deps): bump github.com/stretchr/testify from 1.7.4 to 1.7.5
Bumps [github.com/stretchr/testify](https://github.com/stretchr/testify) from 1.7.4 to 1.7.5.
<details>
<summary>Commits</summary>
<ul>
<li><a href="https://github.com/stretchr/testify/commit/b5ce16571001d6e96e1693ac891fed5c2510c651"><code>b5ce165</code></a> fixing panic in calls to assertion with nil m.mutex (<a href="https://github-redirect.dependabot.com/stretchr/testify/issues/1212">#1212</a>)</li>
<li><a href="https://github.com/stretchr/testify/commit/c206b2e823e70c1e4e7ca8eded9e410acc8f71be"><code>c206b2e</code></a> Mock can be deadlocked by a panic (<a href="https://github-redirect.dependabot.com/stretchr/testify/issues/1157">#1157</a>)</li>
<li><a href="https://github.com/stretchr/testify/commit/1b73601ae8d1c3e389e93092f595b1f6e3d68251"><code>1b73601</code></a> suite: correctly set stats on test panic (<a href="https://github-redirect.dependabot.com/stretchr/testify/issues/1195">#1195</a>)</li>
<li><a href="https://github.com/stretchr/testify/commit/ba1076d8b3b67cdaf7bf92c95b3641636a039be2"><code>ba1076d</code></a> Add .Unset method to mock (<a href="https://github-redirect.dependabot.com/stretchr/testify/issues/982">#982</a>)</li>
<li><a href="https://github.com/stretchr/testify/commit/c31ea0312f8a96ca55801db5ebdf62119800fb70"><code>c31ea03</code></a> Support comparing byte slice (<a href="https://github-redirect.dependabot.com/stretchr/testify/issues/1202">#1202</a>)</li>
<li>See full diff in <a href="https://github.com/stretchr/testify/compare/v1.7.4...v1.7.5">compare view</a></li>
</ul>
</details>
<br />


[![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=github.com/stretchr/testify&package-manager=go_modules&previous-version=1.7.4&new-version=1.7.5)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores)

Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`.

[//]: # (dependabot-automerge-start)
[//]: # (dependabot-automerge-end)

---

<details>
<summary>Dependabot commands and options</summary>
<br />

You can trigger Dependabot actions by commenting on this PR:
- `@dependabot rebase` will rebase this PR
- `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it
- `@dependabot merge` will merge this PR after your CI passes on it
- `@dependabot squash and merge` will squash and merge this PR after your CI passes on it
- `@dependabot cancel merge` will cancel a previously requested merge and block automerging
- `@dependabot reopen` will reopen this PR if it is closed
- `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually
- `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself)
- `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself)
- `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)


</details>


Patch:
diff --git a/cmd/helm/load_plugins.go b/cmd/helm/load_plugins.go
index 6b67ac28f..a97d49a93 100644
--- a/cmd/helm/load_plugins.go
+++ b/cmd/helm/load_plugins.go
@@ -154,7 +154,7 @@ func callPluginExecutable(pluginName string, main string, argv []string, out io.
 func manuallyProcessArgs(args []string) ([]string, []string) {
 	known := []string{}
 	unknown := []string{}
-	kvargs := []string{"--kube-context", "--namespace", "-n", "--kubeconfig", "--kube-apiserver", "--kube-token", "--kube-as-user", "--kube-as-group", "--kube-ca-file", "--registry-config", "--repository-cache", "--repository-config", "--insecure-skip-tls-verify", "--tls-server-name"}
+	kvargs := []string{"--kube-context", "--namespace", "-n", "--kubeconfig", "--kube-apiserver", "--kube-token", "--kube-as-user", "--kube-as-group", "--kube-ca-file", "--registry-config", "--repository-cache", "--repository-config"}
 	knownArg := func(a string) bool {
 		for _, pre := range kvargs {
 			if strings.HasPrefix(a, pre+"=") {
diff --git a/cmd/helm/root.go b/cmd/helm/root.go
index 0230cf5b1..53b0c0ce8 100644
--- a/cmd/helm/root.go
+++ b/cmd/helm/root.go
@@ -67,8 +67,6 @@ Environment variables:
 | $HELM_KUBEASUSER                   | set the Username to impersonate for the operation.                                                |
 | $HELM_KUBECONTEXT                  | set the name of the kubeconfig context.                                                           |
 | $HELM_KUBETOKEN                    | set the Bearer KubeToken used for authentication.                                                 |
-| $HELM_KUBEINSECURE_SKIP_TLS_VERIFY | indicate if the Kubernetes API server's certificate validation should be skipped (insecure)       |
-| $HELM_KUBETLS_SERVER_NAME          | set the server name used to validate the Kubernetes API server certificate                        |
 | $HELM_BURST_LIMIT                  | set the default burst limit in the case the server contains many CRDs (default 100, -1 to disable)|
 
 Helm stores cache, configuration, and data based on the following configuration order:
diff --git a/go.mod b/go.mod
index 996c56bff..877bfb388 100644
--- a/go.mod
+++ b/go.mod
@@ -29,7 +29,7 @@ require (
 	github.com/sirupsen/logrus v1.8.1
 	github.com/spf13/cobra v1.5.0
 	github.com/spf13/pflag v1.0.5
-	github.com/stretchr/testify v1.7.4
+	github.com/stretchr/testify v1.7.5
 	github.com/xeipuuv/gojsonschema v1.2.0
 	golang.org/x/crypto v0.0.0-20220315160706-3147a52a75dd
 	golang.org/x/term v0.0.0-20210927222741-03fcf44c2211
diff --git a/go.sum b/go.sum
index 58d44366b..b2a30d798 100644
--- a/go.sum
+++ b/go.sum
@@ -1051,8 +1051,8 @@ github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5
 github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
-github.com/stretchr/testify v1.7.4 h1:wZRexSlwd7ZXfKINDLsO4r7WBt3gTKONc6K/VesHvHM=
-github.com/stretchr/testify v1.7.4/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
+github.com/stretchr/testify v1.7.5 h1:s5PTfem8p8EbKQOctVV53k6jCJt3UX4IEJzwh+C324Q=
+github.com/stretchr/testify v1.7.5/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
 github.com/subosito/gotenv v1.2.0/go.mod h1:N0PQaV/YGNqwC0u51sEeR/aUtSLEXKX9iv69rRypqCw=
 github.com/syndtr/gocapability v0.0.0-20170704070218-db04d3cc01c8/go.mod h1:hkRG7XYTFWNJGYcbNJQlaLq0fg1yr4J4t/NcTQtrfww=
 github.com/syndtr/gocapability v0.0.0-20180916011248-d98352740cb2/go.mod h1:hkRG7XYTFWNJGYcbNJQlaLq0fg1yr4J4t/NcTQtrfww=
diff --git a/pkg/cli/environment.go b/pkg/cli/environment.go
index ac3093629..b17172db4 100644
--- a/pkg/cli/environment.go
+++ b/pkg/cli/environment.go
@@ -60,12 +60,6 @@ type EnvSettings struct {
 	KubeAPIServer string
 	// Custom certificate authority file.
 	KubeCaFile string
-	// KubeInsecureSkipTLSVerify indicates if server's certificate will not be checked for validity.
-	// This makes the HTTPS connections insecure
-	KubeInsecureSkipTLSVerify bool
-	// KubeTLSServerName overrides the name to use for server certificate validation.
-	// If it is not provided, the hostname used to contact the server is used
-	KubeTLSServerName string
 	// Debug indicates whether or not Helm is running in Debug mode.
 	Debug bool
 	// RegistryConfig is the path to the registry config file.
@@ -84,21 +78,19 @@ type EnvSettings struct {
 
 func New() *EnvSettings {
 	env := &EnvSettings{
-		namespace:                 os.Getenv("HELM_NAMESPACE"),
-		MaxHistory:                envIntOr("HELM_MAX_HISTORY", defaultMaxHistory),
-		KubeContext:               os.Getenv("HELM_KUBECONTEXT"),
-		KubeToken:                 os.Getenv("HELM_KUBETOKEN"),
-		KubeAsUser:                os.Getenv("HELM_KUBEASUSER"),
-		KubeAsGroups:              envCSV("HELM_KUBEASGROUPS"),
-		KubeAPIServer:             os.Getenv("HELM_KUBEAPISERVER"),
-		KubeCaFile:                os.Getenv("HELM_KUBECAFILE"),
-		KubeTLSServerName:         os.Getenv("HELM_KUBETLS_SERVER_NAME"),
-		KubeInsecureSkipTLSVerify: envBoolOr("HELM_KUBEINSECURE_SKIP_TLS_VERIFY", false),
-		PluginsDirectory:          envOr("HELM_PLUGINS", helmpath.DataPath("plugins")),
-		RegistryConfig:            envOr("HELM_REGISTRY_CONFIG", helmpath.ConfigPath("registry/config.json")),
-		RepositoryConfig:          envOr("HELM_REPOSITORY_CONFIG", helmpath.ConfigPath("repositories.yaml")),
-		RepositoryCache:           envOr("HELM_REPOSITORY_CACHE", helmpath.CachePath("repository")),
-		BurstLimit:                envIntOr("HELM_BURST_LIMIT", defaultBurstLimit),
+		namespace:        os.Getenv("HELM_NAMESPACE"),
+		MaxHistory:       envIntOr("HELM_MAX_HISTORY", defaultMaxHistory),
+		KubeContext:      os.Getenv("HELM_KUBECONTEXT"),
+		KubeToken:        os.Getenv("HELM_KUBETOKEN"),
+		KubeAsUser:       os.Getenv("HELM_KUBEASUSER"),
+		KubeAsGroups:     envCSV("HELM_KUBEASGROUPS"),
+		KubeAPIServer:    os.Getenv("HELM_KUBEAPISERVER"),
+		KubeCaFile:       os.Getenv("HELM_KUBECAFILE"),
+		PluginsDirectory: envOr("HELM_PLUGINS", helmpath.DataPath("plugins")),
+		RegistryConfig:   envOr("HELM_REGISTRY_CONFIG", helmpath.ConfigPath("registry/config.json")),
+		RepositoryConfig: envOr("HELM_REPOSITORY_CONFIG", helmpath.ConfigPath("repositories.yaml")),
+		RepositoryCache:  envOr("HELM_REPOSITORY_CACHE", helmpath.CachePath("repository")),
+		BurstLimit:       envIntOr("HELM_BURST_LIMIT", defaultBurstLimit),
 	}
 	env.Debug, _ = strconv.ParseBool(os.Getenv("HELM_DEBUG"))
 
@@ -111,8 +103,6 @@ func New() *EnvSettings {
 		CAFile:           &env.KubeCaFile,
 		KubeConfig:       &env.KubeConfig,
 		Impersonate:      &env.KubeAsUser,
-		Insecure:         &env.KubeInsecureSkipTLSVerify,
-		TLSServerName:    &env.KubeTLSServerName,
 		ImpersonateGroup: &env.KubeAsGroups,
 		WrapConfigFn: func(config *rest.Config) *rest.Config {
 			config.Burst = env.BurstLimit
@@ -132,8 +122,6 @@ func (s *EnvSettings) AddFlags(fs *pflag.FlagSet) {
 	fs.StringArrayVar(&s.KubeAsGroups, "kube-as-group", s.KubeAsGroups, "group to impersonate for the operation, this flag can be repeated to specify multiple groups.")
 	fs.StringVar(&s.KubeAPIServer, "kube-apiserver", s.KubeAPIServer, "the address and the port for the Kubernetes API server")
 	fs.StringVar(&s.KubeCaFile, "kube-ca-file", s.KubeCaFile, "the certificate authority file for the Kubernetes API server connection")
-	fs.StringVar(&s.KubeTLSServerName, "kube-tls-server-name", s.KubeTLSServerName, "server name to use for Kubernetes API server certificate validation. If it is not provided, the hostname used to contact the server is used")
-	fs.BoolVar(&s.KubeInsecureSkipTLSVerify, "kube-insecure-skip-tls-verify", s.KubeInsecureSkipTLSVerify, "if true, the Kubernetes API server's certificate will not be checked for validity. This will make your HTTPS connections insecure")
 	fs.BoolVar(&s.Debug, "debug", s.Debug, "enable verbose output")
 	fs.StringVar(&s.RegistryConfig, "registry-config", s.RegistryConfig, "path to the registry config file")
 	fs.StringVar(&s.RepositoryConfig, "repository-config", s.RepositoryConfig, "path to the file containing repository names and URLs")
@@ -148,18 +136,6 @@ func envOr(name, def string) string {
 	return def
 }
 
-func envBoolOr(name string, def bool) bool {
-	if name == "" {
-		return def
-	}
-	envVal := envOr(name, strconv.FormatBool(def))
-	ret, err := strconv.ParseBool(envVal)
-	if err != nil {
-		return def
-	}
-	return ret
-}
-
 func envIntOr(name string, def int) int {
 	if name == "" {
 		return def
@@ -196,14 +172,12 @@ func (s *EnvSettings) EnvVars() map[string]string {
 		"HELM_BURST_LIMIT":       strconv.Itoa(s.BurstLimit),
 
 		// broken, these are populated from helm flags and not kubeconfig.
-		"HELM_KUBECONTEXT":                  s.KubeContext,
-		"HELM_KUBETOKEN":                    s.KubeToken,
-		"HELM_KUBEASUSER":                   s.KubeAsUser,
-		"HELM_KUBEASGROUPS":                 strings.Join(s.KubeAsGroups, ","),
-		"HELM_KUBEAPISERVER":                s.KubeAPIServer,
-		"HELM_KUBECAFILE":                   s.KubeCaFile,
-		"HELM_KUBEINSECURE_SKIP_TLS_VERIFY": strconv.FormatBool(s.KubeInsecureSkipTLSVerify),
-		"HELM_KUBETLS_SERVER_NAME":          s.KubeTLSServerName,
+		"HELM_KUBECONTEXT":   s.KubeContext,
+		"HELM_KUBETOKEN":     s.KubeToken,
+		"HELM_KUBEASUSER":    s.KubeAsUser,
+		"HELM_KUBEASGROUPS":  strings.Join(s.KubeAsGroups, ","),
+		"HELM_KUBEAPISERVER": s.KubeAPIServer,
+		"HELM_KUBECAFILE":    s.KubeCaFile,
 	}
 	if s.KubeConfig != "" {
 		envvars["KUBECONFIG"] = s.KubeConfig


Test patch:
diff --git a/cmd/helm/testdata/output/env-comp.txt b/cmd/helm/testdata/output/env-comp.txt
index b7d93c12e..e14e83472 100644
--- a/cmd/helm/testdata/output/env-comp.txt
+++ b/cmd/helm/testdata/output/env-comp.txt
@@ -9,8 +9,6 @@ HELM_KUBEASGROUPS
 HELM_KUBEASUSER
 HELM_KUBECAFILE
 HELM_KUBECONTEXT
-HELM_KUBEINSECURE_SKIP_TLS_VERIFY
-HELM_KUBETLS_SERVER_NAME
 HELM_KUBETOKEN
 HELM_MAX_HISTORY
 HELM_NAMESPACE
diff --git a/pkg/cli/environment_test.go b/pkg/cli/environment_test.go
index dbf056e3a..d77799c9d 100644
--- a/pkg/cli/environment_test.go
+++ b/pkg/cli/environment_test.go
@@ -48,15 +48,13 @@ func TestEnvSettings(t *testing.T) {
 		envvars map[string]string
 
 		// expected values
-		ns, kcontext  string
-		debug         bool
-		maxhistory    int
-		kubeAsUser    string
-		kubeAsGroups  []string
-		kubeCaFile    string
-		kubeInsecure  bool
-		kubeTLSServer string
-		burstLimit    int
+		ns, kcontext string
+		debug        bool
+		maxhistory   int
+		kubeAsUser   string
+		kubeAsGroups []string
+		kubeCaFile   string
+		burstLimit   int
 	}{
 		{
 			name:       "defaults",
@@ -65,44 +63,38 @@ func TestEnvSettings(t *testing.T) {
 			burstLimit: defaultBurstLimit,
 		},
 		{
-			name:          "with flags set",
-			args:          "--debug --namespace=myns --kube-as-user=poro --kube-as-group=admins --kube-as-group=teatime --kube-as-group=snackeaters --kube-ca-file=/tmp/ca.crt --burst-limit 100 --kube-insecure-skip-tls-verify=true --kube-tls-server-name=example.org",
-			ns:            "myns",
-			debug:         true,
-			maxhistory:    defaultMaxHistory,
-			burstLimit:    100,
-			kubeAsUser:    "poro",
-			kubeAsGroups:  []string{"admins", "teatime", "snackeaters"},
-			kubeCaFile:    "/tmp/ca.crt",
-			kubeTLSServer: "example.org",
-			kubeInsecure:  true,
+			name:         "with flags set",
+			args:         "--debug --namespace=myns --kube-as-user=poro --kube-as-group=admins --kube-as-group=teatime --kube-as-group=snackeaters --kube-ca-file=/tmp/ca.crt --burst-limit 100",
+			ns:           "myns",
+			debug:        true,
+			maxhistory:   defaultMaxHistory,
+			burstLimit:   100,
+			kubeAsUser:   "poro",
+			kubeAsGroups: []string{"admins", "teatime", "snackeaters"},
+			kubeCaFile:   "/tmp/ca.crt",
 		},
 		{
-			name:          "with envvars set",
-			envvars:       map[string]string{"HELM_DEBUG": "1", "HELM_NAMESPACE": "yourns", "HELM_KUBEASUSER": "pikachu", "HELM_KUBEASGROUPS": ",,,operators,snackeaters,partyanimals", "HELM_MAX_HISTORY": "5", "HELM_KUBECAFILE": "/tmp/ca.crt", "HELM_BURST_LIMIT": "150", "HELM_KUBEINSECURE_SKIP_TLS_VERIFY": "true", "HELM_KUBETLS_SERVER_NAME": "example.org"},
-			ns:            "yourns",
-			maxhistory:    5,
-			burstLimit:    150,
-			debug:         true,
-			kubeAsUser:    "pikachu",
-			kubeAsGroups:  []string{"operators", "snackeaters", "partyanimals"},
-			kubeCaFile:    "/tmp/ca.crt",
-			kubeTLSServer: "example.org",
-			kubeInsecure:  true,
+			name:         "with envvars set",
+			envvars:      map[string]string{"HELM_DEBUG": "1", "HELM_NAMESPACE": "yourns", "HELM_KUBEASUSER": "pikachu", "HELM_KUBEASGROUPS": ",,,operators,snackeaters,partyanimals", "HELM_MAX_HISTORY": "5", "HELM_KUBECAFILE": "/tmp/ca.crt", "HELM_BURST_LIMIT": "150"},
+			ns:           "yourns",
+			maxhistory:   5,
+			burstLimit:   150,
+			debug:        true,
+			kubeAsUser:   "pikachu",
+			kubeAsGroups: []string{"operators", "snackeaters", "partyanimals"},
+			kubeCaFile:   "/tmp/ca.crt",
 		},
 		{
-			name:          "with flags and envvars set",
-			args:          "--debug --namespace=myns --kube-as-user=poro --kube-as-group=admins --kube-as-group=teatime --kube-as-group=snackeaters --kube-ca-file=/my/ca.crt --burst-limit 175 --kube-insecure-skip-tls-verify=true --kube-tls-server-name=example.org",
-			envvars:       map[string]string{"HELM_DEBUG": "1", "HELM_NAMESPACE": "yourns", "HELM_KUBEASUSER": "pikachu", "HELM_KUBEASGROUPS": ",,,operators,snackeaters,partyanimals", "HELM_MAX_HISTORY": "5", "HELM_KUBECAFILE": "/tmp/ca.crt", "HELM_BURST_LIMIT": "200", "HELM_KUBEINSECURE_SKIP_TLS_VERIFY": "true", "HELM_KUBETLS_SERVER_NAME": "example.org"},
-			ns:            "myns",
-			debug:         true,
-			maxhistory:    5,
-			burstLimit:    175,
-			kubeAsUser:    "poro",
-			kubeAsGroups:  []string{"admins", "teatime", "snackeaters"},
-			kubeCaFile:    "/my/ca.crt",
-			kubeTLSServer: "example.org",
-			kubeInsecure:  true,
+			name:         "with flags and envvars set",
+			args:         "--debug --namespace=myns --kube-as-user=poro --kube-as-group=admins --kube-as-group=teatime --kube-as-group=snackeaters --kube-ca-file=/my/ca.crt --burst-limit 175",
+			envvars:      map[string]string{"HELM_DEBUG": "1", "HELM_NAMESPACE": "yourns", "HELM_KUBEASUSER": "pikachu", "HELM_KUBEASGROUPS": ",,,operators,snackeaters,partyanimals", "HELM_MAX_HISTORY": "5", "HELM_KUBECAFILE": "/tmp/ca.crt", "HELM_BURST_LIMIT": "200"},
+			ns:           "myns",
+			debug:        true,
+			maxhistory:   5,
+			burstLimit:   175,
+			kubeAsUser:   "poro",
+			kubeAsGroups: []string{"admins", "teatime", "snackeaters"},
+			kubeCaFile:   "/my/ca.crt",
 		},
 	}
 
@@ -144,89 +136,6 @@ func TestEnvSettings(t *testing.T) {
 			if tt.burstLimit != settings.BurstLimit {
 				t.Errorf("expected BurstLimit %d, got %d", tt.burstLimit, settings.BurstLimit)
 			}
-			if tt.kubeInsecure != settings.KubeInsecureSkipTLSVerify {
-				t.Errorf("expected kubeInsecure %t, got %t", tt.kubeInsecure, settings.KubeInsecureSkipTLSVerify)
-			}
-			if tt.kubeTLSServer != settings.KubeTLSServerName {
-				t.Errorf("expected kubeTLSServer %q, got %q", tt.kubeTLSServer, settings.KubeTLSServerName)
-			}
-		})
-	}
-}
-
-func TestEnvOrBool(t *testing.T) {
-	const envName = "TEST_ENV_OR_BOOL"
-	tests := []struct {
-		name     string
-		env      string
-		val      string
-		def      bool
-		expected bool
-	}{
-		{
-			name:     "unset with default false",
-			def:      false,
-			expected: false,
-		},
-		{
-			name:     "unset with default true",
-			def:      true,
-			expected: true,
-		},
-		{
-			name:     "blank env with default false",
-			env:      envName,
-			def:      false,
-			expected: false,
-		},
-		{
-			name:     "blank env with default true",
-			env:      envName,
-			def:      true,
-			expected: true,
-		},
-		{
-			name:     "env true with default false",
-			env:      envName,
-			val:      "true",
-			def:      false,
-			expected: true,
-		},
-		{
-			name:     "env false with default true",
-			env:      envName,
-			val:      "false",
-			def:      true,
-			expected: false,
-		},
-		{
-			name:     "env fails parsing with default true",
-			env:      envName,
-			val:      "NOT_A_BOOL",
-			def:      true,
-			expected: true,
-		},
-		{
-			name:     "env fails parsing with default false",
-			env:      envName,
-			val:      "NOT_A_BOOL",
-			def:      false,
-			expected: false,
-		},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			if tt.env != "" {
-				t.Cleanup(func() {
-					os.Unsetenv(tt.env)
-				})
-				os.Setenv(tt.env, tt.val)
-			}
-			actual := envBoolOr(tt.env, tt.def)
-			if actual != tt.expected {
-				t.Errorf("expected result %t, got %t", tt.expected, actual)
-			}
 		})
 	}
 }