@@ -27,11 +27,11 @@ import (
2727 . "github.com/onsi/gomega"
2828 "github.com/redhat-developer/gitops-operator/test/openshift/e2e/ginkgo/fixture"
2929 argocdFixture "github.com/redhat-developer/gitops-operator/test/openshift/e2e/ginkgo/fixture/argocd"
30- "github.com/redhat-developer/gitops-operator/test/openshift/e2e/ginkgo/fixture/configmap"
31- "github.com/redhat-developer/gitops-operator/test/openshift/e2e/ginkgo/fixture/deployment"
30+ configmapFixture "github.com/redhat-developer/gitops-operator/test/openshift/e2e/ginkgo/fixture/configmap"
31+ deploymentFixture "github.com/redhat-developer/gitops-operator/test/openshift/e2e/ginkgo/fixture/deployment"
3232 k8sFixture "github.com/redhat-developer/gitops-operator/test/openshift/e2e/ginkgo/fixture/k8s"
33- "github.com/redhat-developer/gitops-operator/test/openshift/e2e/ginkgo/fixture/notificationsconfiguration"
34- "github.com/redhat-developer/gitops-operator/test/openshift/e2e/ginkgo/fixture/os"
33+ notificationsconfigurationFixture "github.com/redhat-developer/gitops-operator/test/openshift/e2e/ginkgo/fixture/notificationsconfiguration"
34+ osFixture "github.com/redhat-developer/gitops-operator/test/openshift/e2e/ginkgo/fixture/os"
3535 fixtureUtils "github.com/redhat-developer/gitops-operator/test/openshift/e2e/ginkgo/fixture/utils"
3636 appsv1 "k8s.io/api/apps/v1"
3737 corev1 "k8s.io/api/core/v1"
@@ -281,7 +281,7 @@ Xq+NinfrqOLJkIZ/u/PJu4KqN3M=
281281 }
282282
283283 Expect (k8sClient .Create (ctx , depl )).To (Succeed ())
284- Eventually (depl , "4m" , "5s" ).Should (deployment .HaveAvailableReplicas (1 ))
284+ Eventually (depl , "4m" , "5s" ).Should (deploymentFixture .HaveAvailableReplicas (1 ))
285285
286286 argocd := & argov1beta1api.ArgoCD {
287287 ObjectMeta : metav1.ObjectMeta {
@@ -350,7 +350,7 @@ UVwpFuaKz5vTCD36Gmmy/u8y
350350 }
351351 Eventually (nc ).Should (k8sFixture .ExistByName ())
352352
353- notificationsconfiguration .Update (nc , func (nc * argov1alpha1api.NotificationsConfiguration ) {
353+ notificationsconfigurationFixture .Update (nc , func (nc * argov1alpha1api.NotificationsConfiguration ) {
354354
355355 nc .Spec .Services = map [string ]string {
356356 "service.webhook.test-webhook" : "url: https://webhook/hooks/example" ,
@@ -377,7 +377,7 @@ UVwpFuaKz5vTCD36Gmmy/u8y
377377 },
378378 }
379379 Eventually (notifConfigMap ).Should (k8sFixture .ExistByName ())
380- Eventually (notifConfigMap ).Should (configmap .HaveStringDataKeyValueContainsSubstring ("template.test-app-created" , `{"created":"{{.app.metadata.name}}","type":"{{(call .repo.GetAppDetails).Type}}"}` ))
380+ Eventually (notifConfigMap ).Should (configmapFixture .HaveStringDataKeyValueContainsSubstring ("template.test-app-created" , `{"created":"{{.app.metadata.name}}","type":"{{(call .repo.GetAppDetails).Type}}"}` ))
381381
382382 By ("creating an Argo CD Application that contains a notification annotation, which will trigger the notifications controller" )
383383 app := & argocdv1alpha1.Application {
@@ -403,14 +403,14 @@ UVwpFuaKz5vTCD36Gmmy/u8y
403403 }
404404 Expect (k8sClient .Create (ctx , app )).To (Succeed ())
405405
406- out , err := os .ExecCommand ("kubectl" , "-n" , ns .Name , "logs" , "deployment.apps/argocd-notifications-controller" )
406+ out , err := osFixture .ExecCommand ("kubectl" , "-n" , ns .Name , "logs" , "deployment.apps/argocd-notifications-controller" )
407407 Expect (err ).ToNot (HaveOccurred ())
408408 Expect (out ).ToNot (ContainSubstring ("x509" ))
409409
410410 By ("waiting for notifications controller to POST to the webhook workload, indicating that the workload event was successfully processed" )
411411 Eventually (func () bool {
412412
413- out , err := os .ExecCommand ("kubectl" , "-n" , ns .Name , "logs" , "deployment.apps/webhook" )
413+ out , err := osFixture .ExecCommand ("kubectl" , "-n" , ns .Name , "logs" , "deployment.apps/webhook" )
414414 if err != nil {
415415 GinkgoWriter .Println (err )
416416 return false
0 commit comments