From 8d313f333ec478c53670303149b67c3d2bcf66f8 Mon Sep 17 00:00:00 2001 From: tanjunchen Date: Tue, 7 Jan 2020 21:56:37 +0800 Subject: [PATCH] staticcheck:test/integration/master/ --- hack/.staticcheck_failures | 1 - test/integration/master/audit_dynamic_test.go | 3 +-- test/integration/master/crd_test.go | 18 ------------------ .../master/kms_transformation_test.go | 3 +++ test/integration/master/kube_apiserver_test.go | 7 +++++++ .../master/synthetic_master_test.go | 18 ++---------------- .../master/transformation_testcase.go | 3 +++ 7 files changed, 16 insertions(+), 37 deletions(-) diff --git a/hack/.staticcheck_failures b/hack/.staticcheck_failures index 19060e68c17..f0a99232e4b 100644 --- a/hack/.staticcheck_failures +++ b/hack/.staticcheck_failures @@ -59,7 +59,6 @@ test/integration/etcd test/integration/examples test/integration/framework test/integration/garbagecollector -test/integration/master test/integration/scheduler_perf test/integration/ttlcontroller vendor/k8s.io/apimachinery/pkg/api/meta diff --git a/test/integration/master/audit_dynamic_test.go b/test/integration/master/audit_dynamic_test.go index c7b27a6bd1c..a730cd7e6d3 100644 --- a/test/integration/master/audit_dynamic_test.go +++ b/test/integration/master/audit_dynamic_test.go @@ -274,8 +274,7 @@ func asyncOps( continue } e := expected.Load().([]utils.AuditEvent) - evList := []utils.AuditEvent{} - evList = append(e, exp...) + evList := append(e, exp...) expected.Store(evList) } } diff --git a/test/integration/master/crd_test.go b/test/integration/master/crd_test.go index 8a7514498b2..684810f3102 100644 --- a/test/integration/master/crd_test.go +++ b/test/integration/master/crd_test.go @@ -30,7 +30,6 @@ import ( apiextensionsv1beta1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1" apiextensionsclientset "k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" "k8s.io/apimachinery/pkg/runtime/schema" "k8s.io/apimachinery/pkg/util/wait" "k8s.io/client-go/dynamic" @@ -298,20 +297,3 @@ func reverse(s []string) { s[i], s[j] = s[j], s[i] } } - -type Foo struct { - metav1.TypeMeta `json:",inline"` - metav1.ObjectMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"` -} - -func unstructuredFoo(foo *Foo) (*unstructured.Unstructured, error) { - bs, err := json.Marshal(foo) - if err != nil { - return nil, err - } - ret := &unstructured.Unstructured{} - if err = ret.UnmarshalJSON(bs); err != nil { - return nil, err - } - return ret, nil -} diff --git a/test/integration/master/kms_transformation_test.go b/test/integration/master/kms_transformation_test.go index b02e3a83672..a564b123aa6 100644 --- a/test/integration/master/kms_transformation_test.go +++ b/test/integration/master/kms_transformation_test.go @@ -177,6 +177,9 @@ resources: // Secrets should be un-enveloped on direct reads from Kube API Server. s, err := test.restClient.CoreV1().Secrets(testNamespace).Get(testSecret, metav1.GetOptions{}) + if err != nil { + t.Fatalf("failed to get Secret from %s, err: %v", testNamespace, err) + } if secretVal != string(s.Data[secretKey]) { t.Fatalf("expected %s from KubeAPI, but got %s", secretVal, string(s.Data[secretKey])) } diff --git a/test/integration/master/kube_apiserver_test.go b/test/integration/master/kube_apiserver_test.go index daa511599e9..b733df65fae 100644 --- a/test/integration/master/kube_apiserver_test.go +++ b/test/integration/master/kube_apiserver_test.go @@ -297,6 +297,9 @@ func TestOpenAPIApiextensionsOverlapProtection(t *testing.T) { t.Fatalf("unexpected error: apiextensions definition doesn't exist") } bytes, err := json.Marshal(apiextensionsDefinition) + if err != nil { + t.Fatalf("unexpected error: %v", err) + } if exist := strings.Contains(string(bytes), testApiextensionsOverlapProbeString); exist { t.Fatalf("unexpected error: apiextensions definition gets overlapped") } @@ -428,6 +431,10 @@ func testReconcilersMasterLease(t *testing.T, leaseCount int, masterCount int) { // 2. verify master count servers have registered if err := wait.PollImmediate(3*time.Second, 2*time.Minute, func() (bool, error) { client, err := kubernetes.NewForConfig(masterCountServers[0].ClientConfig) + if err != nil { + t.Logf("error creating client: %v", err) + return false, nil + } endpoints, err := client.CoreV1().Endpoints("default").Get("kubernetes", metav1.GetOptions{}) if err != nil { t.Logf("error fetching endpoints: %v", err) diff --git a/test/integration/master/synthetic_master_test.go b/test/integration/master/synthetic_master_test.go index f9f018f6a6b..02212af3512 100644 --- a/test/integration/master/synthetic_master_test.go +++ b/test/integration/master/synthetic_master_test.go @@ -425,20 +425,6 @@ func autoscalingPath(resource, namespace, name string) string { return path.Join("/apis/autoscaling/v1", namespace, resource, name) } -func batchPath(resource, namespace, name string) string { - if namespace != "" { - namespace = path.Join("namespaces", namespace) - } - return path.Join("/apis/batch/v1", namespace, resource, name) -} - -func extensionsPath(resource, namespace, name string) string { - if namespace != "" { - namespace = path.Join("namespaces", namespace) - } - return path.Join("/apis/extensions/v1beta1", namespace, resource, name) -} - func appsPath(resource, namespace, name string) string { if namespace != "" { namespace = path.Join("namespaces", namespace) @@ -471,11 +457,11 @@ func TestAutoscalingGroupBackwardCompatibility(t *testing.T) { } func() { resp, err := transport.RoundTrip(req) - defer resp.Body.Close() if err != nil { t.Logf("case %v", r) t.Fatalf("unexpected error: %v", err) } + defer resp.Body.Close() b, _ := ioutil.ReadAll(resp.Body) body := string(b) if _, ok := r.expectedStatusCodes[resp.StatusCode]; !ok { @@ -519,11 +505,11 @@ func TestAppsGroupBackwardCompatibility(t *testing.T) { } func() { resp, err := transport.RoundTrip(req) - defer resp.Body.Close() if err != nil { t.Logf("case %v", r) t.Fatalf("unexpected error: %v", err) } + defer resp.Body.Close() b, _ := ioutil.ReadAll(resp.Body) body := string(b) if _, ok := r.expectedStatusCodes[resp.StatusCode]; !ok { diff --git a/test/integration/master/transformation_testcase.go b/test/integration/master/transformation_testcase.go index d4c45e138ff..311dbd19796 100644 --- a/test/integration/master/transformation_testcase.go +++ b/test/integration/master/transformation_testcase.go @@ -134,6 +134,9 @@ func (e *transformTest) run(unSealSecretFunc unSealSecret, expectedEnvelopePrefi // Secrets should be un-enveloped on direct reads from Kube API Server. s, err := e.restClient.CoreV1().Secrets(testNamespace).Get(testSecret, metav1.GetOptions{}) + if err != nil { + e.logger.Errorf("failed to get Secret from %s, err: %v", testNamespace, err) + } if secretVal != string(s.Data[secretKey]) { e.logger.Errorf("expected %s from KubeAPI, but got %s", secretVal, string(s.Data[secretKey])) }