Fixed golangci-lint issues: /fission/pkg (#1902)
This commit is contained in:
+26
-18
@@ -69,7 +69,7 @@ func functionTests(crdClient genInformerCoreV1.CoreV1Interface) {
|
||||
fi := crdClient.Functions(testNS)
|
||||
|
||||
// cleanup from old crashed tests, ignore errors
|
||||
fi.Delete(function.ObjectMeta.Name, nil)
|
||||
fi.Delete(function.ObjectMeta.Name, nil) //nolint: errcheck
|
||||
|
||||
// create
|
||||
f, err := fi.Create(function)
|
||||
@@ -117,7 +117,10 @@ func functionTests(crdClient genInformerCoreV1.CoreV1Interface) {
|
||||
function.ObjectMeta.ResourceVersion = ""
|
||||
f, err = fi.Create(function)
|
||||
panicIf(err)
|
||||
defer fi.Delete(f.ObjectMeta.Name, nil)
|
||||
defer func() {
|
||||
err := fi.Delete(f.ObjectMeta.Name, nil)
|
||||
panicIf(err)
|
||||
}()
|
||||
|
||||
// assert that we get a watch event for the new function
|
||||
recvd := false
|
||||
@@ -135,9 +138,7 @@ func functionTests(crdClient genInformerCoreV1.CoreV1Interface) {
|
||||
log.Panicf("Bad object from watch: %#v", wf)
|
||||
}
|
||||
log.Printf("watch event took %v", time.Since(start))
|
||||
recvd = true
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
func environmentTests(crdClient genInformerCoreV1.CoreV1Interface) {
|
||||
@@ -167,7 +168,7 @@ func environmentTests(crdClient genInformerCoreV1.CoreV1Interface) {
|
||||
ei := crdClient.Environments(testNS)
|
||||
|
||||
// cleanup from old crashed tests, ignore errors
|
||||
ei.Delete(environment.ObjectMeta.Name, nil)
|
||||
ei.Delete(environment.ObjectMeta.Name, nil) //nolint: errCheck
|
||||
|
||||
// create
|
||||
e, err := ei.Create(environment)
|
||||
@@ -211,7 +212,10 @@ func environmentTests(crdClient genInformerCoreV1.CoreV1Interface) {
|
||||
environment.ObjectMeta.ResourceVersion = ""
|
||||
e, err = ei.Create(environment)
|
||||
panicIf(err)
|
||||
defer ei.Delete(e.ObjectMeta.Name, nil)
|
||||
defer func() {
|
||||
err := ei.Delete(e.ObjectMeta.Name, nil)
|
||||
panicIf(err)
|
||||
}()
|
||||
|
||||
// assert that we get a watch event for the new environment
|
||||
recvd := false
|
||||
@@ -229,9 +233,7 @@ func environmentTests(crdClient genInformerCoreV1.CoreV1Interface) {
|
||||
log.Panicf("Bad object from watch: %#v", obj)
|
||||
}
|
||||
log.Printf("watch event took %v", time.Since(start))
|
||||
recvd = true
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
func httpTriggerTests(crdClient genInformerCoreV1.CoreV1Interface) {
|
||||
@@ -259,7 +261,7 @@ func httpTriggerTests(crdClient genInformerCoreV1.CoreV1Interface) {
|
||||
ei := crdClient.HTTPTriggers(testNS)
|
||||
|
||||
// cleanup from old crashed tests, ignore errors
|
||||
ei.Delete(httpTrigger.ObjectMeta.Name, nil)
|
||||
ei.Delete(httpTrigger.ObjectMeta.Name, nil) //nolint: errCheck
|
||||
|
||||
// create
|
||||
e, err := ei.Create(httpTrigger)
|
||||
@@ -303,7 +305,10 @@ func httpTriggerTests(crdClient genInformerCoreV1.CoreV1Interface) {
|
||||
httpTrigger.ObjectMeta.ResourceVersion = ""
|
||||
e, err = ei.Create(httpTrigger)
|
||||
panicIf(err)
|
||||
defer ei.Delete(e.ObjectMeta.Name, nil)
|
||||
defer func() {
|
||||
err := ei.Delete(e.ObjectMeta.Name, nil)
|
||||
panicIf(err)
|
||||
}()
|
||||
|
||||
// assert that we get a watch event for the new httpTrigger
|
||||
recvd := false
|
||||
@@ -321,9 +326,7 @@ func httpTriggerTests(crdClient genInformerCoreV1.CoreV1Interface) {
|
||||
log.Panicf("Bad object from watch: %#v", obj)
|
||||
}
|
||||
log.Printf("watch event took %v", time.Since(start))
|
||||
recvd = true
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
func kubernetesWatchTriggerTests(crdClient genInformerCoreV1.CoreV1Interface) {
|
||||
@@ -354,7 +357,7 @@ func kubernetesWatchTriggerTests(crdClient genInformerCoreV1.CoreV1Interface) {
|
||||
ei := crdClient.KubernetesWatchTriggers(testNS)
|
||||
|
||||
// cleanup from old crashed tests, ignore errors
|
||||
ei.Delete(kubernetesWatchTrigger.ObjectMeta.Name, nil)
|
||||
ei.Delete(kubernetesWatchTrigger.ObjectMeta.Name, nil) //nolint: errCheck
|
||||
|
||||
// create
|
||||
e, err := ei.Create(kubernetesWatchTrigger)
|
||||
@@ -398,7 +401,10 @@ func kubernetesWatchTriggerTests(crdClient genInformerCoreV1.CoreV1Interface) {
|
||||
kubernetesWatchTrigger.ObjectMeta.ResourceVersion = ""
|
||||
e, err = ei.Create(kubernetesWatchTrigger)
|
||||
panicIf(err)
|
||||
defer ei.Delete(e.ObjectMeta.Name, nil)
|
||||
defer func() {
|
||||
err := ei.Delete(e.ObjectMeta.Name, nil)
|
||||
panicIf(err)
|
||||
}()
|
||||
|
||||
// assert that we get a watch event for the new kubernetesWatchTrigger
|
||||
recvd := false
|
||||
@@ -416,9 +422,7 @@ func kubernetesWatchTriggerTests(crdClient genInformerCoreV1.CoreV1Interface) {
|
||||
log.Panicf("Bad object from watch: %#v", obj)
|
||||
}
|
||||
log.Printf("watch event took %v", time.Since(start))
|
||||
recvd = true
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
func TestCrd(t *testing.T) {
|
||||
@@ -442,12 +446,16 @@ func TestCrd(t *testing.T) {
|
||||
|
||||
// testNS isolation for running multiple CI builds concurrently.
|
||||
testNS = uuid.NewV4().String()
|
||||
kubeClient.CoreV1().Namespaces().Create(&v1.Namespace{
|
||||
_, err = kubeClient.CoreV1().Namespaces().Create(&v1.Namespace{
|
||||
ObjectMeta: metav1.ObjectMeta{
|
||||
Name: testNS,
|
||||
},
|
||||
})
|
||||
defer kubeClient.CoreV1().Namespaces().Delete(testNS, nil)
|
||||
panicIf(err)
|
||||
defer func() {
|
||||
err := kubeClient.CoreV1().Namespaces().Delete(testNS, nil)
|
||||
panicIf(err)
|
||||
}()
|
||||
|
||||
// init our types
|
||||
err = EnsureFissionCRDs(logger, apiExtClient)
|
||||
|
||||
Reference in New Issue
Block a user