Merge pull request #2838 from LittleWat/patch-1

🐛 Nit: trim unncessary if check in templates/controllers/controller-test.go

Author: k8s-ci-robot

pkg/plugins/golang/deploy-image/v1alpha1/scaffolds/internal/templates/controllers/controller-test.go

@@ -135,19 +135,13 @@ var _ = Describe("{{ .Resource.Kind }} controller", func() {
 				}
 				
 				err = k8sClient.Create(ctx, {{ lower .Resource.Kind }})
-				if err != nil {
-					Expect(err).To(Not(HaveOccurred()))
-				}
+				Expect(err).To(Not(HaveOccurred()))
 			} 
 
 			By("Checking if the custom resource was successfully created")
 			Eventually(func() error {
 				found := &{{ .Resource.ImportAlias }}.{{ .Resource.Kind }}{}
-				err = k8sClient.Get(ctx, typeNamespaceName, found)
-				if err != nil {
-					return err
-				}
-				return nil
+				return k8sClient.Get(ctx, typeNamespaceName, found)
 			}, time.Minute, time.Second).Should(Succeed())
 
 			By("Reconciling the custom resource created")
@@ -164,11 +158,7 @@ var _ = Describe("{{ .Resource.Kind }} controller", func() {
 			By("Checking if Deployment was successfully created in the reconciliation")
 			Eventually(func() error {
 				found := &appsv1.Deployment{}
-				err = k8sClient.Get(ctx, typeNamespaceName, found)
-				if err != nil {
-					return err
-				}
-				return nil
+				return k8sClient.Get(ctx, typeNamespaceName, found)
 			}, time.Minute, time.Second).Should(Succeed())
 		})
 	})

testdata/project-v3-with-deploy-image/controllers/busybox_controller_test.go

@@ -85,19 +85,13 @@ var _ = Describe("Busybox controller", func() {
 				}
 
 				err = k8sClient.Create(ctx, busybox)
-				if err != nil {
-					Expect(err).To(Not(HaveOccurred()))
-				}
+				Expect(err).To(Not(HaveOccurred()))
 			}
 
 			By("Checking if the custom resource was successfully created")
 			Eventually(func() error {
 				found := &examplecomv1alpha1.Busybox{}
-				err = k8sClient.Get(ctx, typeNamespaceName, found)
-				if err != nil {
-					return err
-				}
-				return nil
+				return k8sClient.Get(ctx, typeNamespaceName, found)
 			}, time.Minute, time.Second).Should(Succeed())
 
 			By("Reconciling the custom resource created")
@@ -114,11 +108,7 @@ var _ = Describe("Busybox controller", func() {
 			By("Checking if Deployment was successfully created in the reconciliation")
 			Eventually(func() error {
 				found := &appsv1.Deployment{}
-				err = k8sClient.Get(ctx, typeNamespaceName, found)
-				if err != nil {
-					return err
-				}
-				return nil
+				return k8sClient.Get(ctx, typeNamespaceName, found)
 			}, time.Minute, time.Second).Should(Succeed())
 		})
 	})

testdata/project-v3-with-deploy-image/controllers/memcached_controller_test.go

@@ -86,19 +86,13 @@ var _ = Describe("Memcached controller", func() {
 				}
 
 				err = k8sClient.Create(ctx, memcached)
-				if err != nil {
-					Expect(err).To(Not(HaveOccurred()))
-				}
+				Expect(err).To(Not(HaveOccurred()))
 			}
 
 			By("Checking if the custom resource was successfully created")
 			Eventually(func() error {
 				found := &examplecomv1alpha1.Memcached{}
-				err = k8sClient.Get(ctx, typeNamespaceName, found)
-				if err != nil {
-					return err
-				}
-				return nil
+				return k8sClient.Get(ctx, typeNamespaceName, found)
 			}, time.Minute, time.Second).Should(Succeed())
 
 			By("Reconciling the custom resource created")
@@ -115,11 +109,7 @@ var _ = Describe("Memcached controller", func() {
 			By("Checking if Deployment was successfully created in the reconciliation")
 			Eventually(func() error {
 				found := &appsv1.Deployment{}
-				err = k8sClient.Get(ctx, typeNamespaceName, found)
-				if err != nil {
-					return err
-				}
-				return nil
+				return k8sClient.Get(ctx, typeNamespaceName, found)
 			}, time.Minute, time.Second).Should(Succeed())
 		})
 	})

testdata/project-v4-with-deploy-image/controllers/busybox_controller_test.go

@@ -85,19 +85,13 @@ var _ = Describe("Busybox controller", func() {
 				}
 
 				err = k8sClient.Create(ctx, busybox)
-				if err != nil {
-					Expect(err).To(Not(HaveOccurred()))
-				}
+				Expect(err).To(Not(HaveOccurred()))
 			}
 
 			By("Checking if the custom resource was successfully created")
 			Eventually(func() error {
 				found := &examplecomv1alpha1.Busybox{}
-				err = k8sClient.Get(ctx, typeNamespaceName, found)
-				if err != nil {
-					return err
-				}
-				return nil
+				return k8sClient.Get(ctx, typeNamespaceName, found)
 			}, time.Minute, time.Second).Should(Succeed())
 
 			By("Reconciling the custom resource created")
@@ -114,11 +108,7 @@ var _ = Describe("Busybox controller", func() {
 			By("Checking if Deployment was successfully created in the reconciliation")
 			Eventually(func() error {
 				found := &appsv1.Deployment{}
-				err = k8sClient.Get(ctx, typeNamespaceName, found)
-				if err != nil {
-					return err
-				}
-				return nil
+				return k8sClient.Get(ctx, typeNamespaceName, found)
 			}, time.Minute, time.Second).Should(Succeed())
 		})
 	})

testdata/project-v4-with-deploy-image/controllers/memcached_controller_test.go

@@ -86,19 +86,13 @@ var _ = Describe("Memcached controller", func() {
 				}
 
 				err = k8sClient.Create(ctx, memcached)
-				if err != nil {
-					Expect(err).To(Not(HaveOccurred()))
-				}
+				Expect(err).To(Not(HaveOccurred()))
 			}
 
 			By("Checking if the custom resource was successfully created")
 			Eventually(func() error {
 				found := &examplecomv1alpha1.Memcached{}
-				err = k8sClient.Get(ctx, typeNamespaceName, found)
-				if err != nil {
-					return err
-				}
-				return nil
+				return k8sClient.Get(ctx, typeNamespaceName, found)
 			}, time.Minute, time.Second).Should(Succeed())
 
 			By("Reconciling the custom resource created")
@@ -115,11 +109,7 @@ var _ = Describe("Memcached controller", func() {
 			By("Checking if Deployment was successfully created in the reconciliation")
 			Eventually(func() error {
 				found := &appsv1.Deployment{}
-				err = k8sClient.Get(ctx, typeNamespaceName, found)
-				if err != nil {
-					return err
-				}
-				return nil
+				return k8sClient.Get(ctx, typeNamespaceName, found)
 			}, time.Minute, time.Second).Should(Succeed())
 		})
 	})