Lint fixes for golangci-lint 1.49.0 (#40633)

istio · Aug 24, 2022 · 71ea0bd · 71ea0bd
1 parent 1daa243
commit 71ea0bd
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 7 deletions.
diff --git a/pkg/kube/apimirror/probe.go b/pkg/kube/apimirror/probe.go
@@ -36,7 +36,7 @@ type HTTPGetAction struct {
 	// Scheme to use for connecting to the host.
 	// Defaults to HTTP.
 	// +optional
-	Scheme URIScheme `json:"scheme,omitempty" protobuf:"bytes,4,opt,name=scheme,casttype=URIScheme"`
+	Scheme URIScheme `json:"scheme,omitempty" protobuf:"bytes,4,opt,name=scheme"`
 	// Custom headers to set in the request. HTTP allows repeated headers.
 	// +optional
 	HTTPHeaders []HTTPHeader `json:"httpHeaders,omitempty" protobuf:"bytes,5,rep,name=httpHeaders"`

diff --git a/tests/integration/security/fuzz/fuzz_test.go b/tests/integration/security/fuzz/fuzz_test.go
@@ -104,13 +104,8 @@ func deploy(t framework.TestContext, name, ns, yaml string) {
 func waitService(t framework.TestContext, name, ns string) {
 	if _, _, err := kube.WaitUntilServiceEndpointsAreReady(t.Clusters().Default().Kube(), ns, name); err != nil {
 		t.Fatalf("Wait for service %s failed: %v", name, err)
-		if name == apacheServer || name == nginxServer || name == tomcatServer {
-			if _, _, err := kube.WaitUntilServiceEndpointsAreReady(t.Clusters().Default().Kube(), ns, name); err != nil {
-				t.Fatalf("Wait for service %s failed: %v", name, err)
-			}
-		}
-		t.Logf("service %s is ready", name)
 	}
+	t.Logf("service %s is ready", name)
 }
 
 func ignoreTomcat(t framework.TestContext, line string, ignores []string) bool {