Skip to content

Commit 3181a4c

Browse files
tatarutytataruty
committed
Fix review comments
1 parent b311251 commit 3181a4c

11 files changed

+34
-71
lines changed

‎tests/framework/resourcemanager.go‎

Lines changed: 7 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -165,6 +165,7 @@ func (rm *ResourceManager) ApplyFromFiles(files []string, namespace string, opts
165165
func (rm *ResourceManager) ApplyFromBuffer(buffer *bytes.Buffer, namespace string, opts ...Option) error {
166166
ctx, cancel := context.WithTimeout(context.Background(), rm.TimeoutConfig.CreateTimeout)
167167
defer cancel()
168+
168169
options := LogOptions(opts...)
169170
if options.logEnabled {
170171
GinkgoWriter.Printf("Applying resources from buffer to namespace %q\n", namespace)
@@ -198,9 +199,7 @@ func (rm *ResourceManager) ApplyFromBuffer(buffer *bytes.Buffer, namespace strin
198199
})
199200
if err != nil {
200201
retryErr := fmt.Errorf("error updating resource: %w", err)
201-
GinkgoWriter.Printf("%s\n",
202-
retryErr,
203-
)
202+
GinkgoWriter.Printf("%s\n", retryErr)
204203

205204
return retryErr
206205
}
@@ -723,7 +722,7 @@ func (rm *ResourceManager) GetPodNames(namespace string, labels client.MatchingL
723722
for _, pod := range podList.Items {
724723
names = append(names, pod.Name)
725724
}
726-
GinkgoWriter.Printf("Found pod name in namespace %q: %v\n", namespace, names)
725+
GinkgoWriter.Printf("Found pod names in namespace %q: %v\n", namespace, names)
727726

728727
return names, nil
729728
}
@@ -1251,8 +1250,7 @@ func (rm *ResourceManager) Get(
12511250
opts ...Option,
12521251
) error {
12531252
options := LogOptions(opts...)
1254-
err := rm.K8sClient.Get(ctx, key, obj)
1255-
if err != nil {
1253+
if err := rm.K8sClient.Get(ctx, key, obj); err != nil {
12561254
if options.logEnabled {
12571255
GinkgoWriter.Printf("Could not get k8s resource %q error: %v\n", obj.GetName(), err)
12581256
}
@@ -1268,8 +1266,7 @@ func (rm *ResourceManager) Create(
12681266
ctx context.Context,
12691267
obj client.Object,
12701268
) error {
1271-
err := rm.K8sClient.Create(ctx, obj)
1272-
if err != nil {
1269+
if err := rm.K8sClient.Create(ctx, obj); err != nil {
12731270
createErr := fmt.Errorf("error creating k8s resource %q: %w", obj.GetName(), err)
12741271
GinkgoWriter.Printf("%v\n", createErr)
12751272

@@ -1286,8 +1283,7 @@ func (rm *ResourceManager) Delete(
12861283
opts ...Option,
12871284
) error {
12881285
options := LogOptions(opts...)
1289-
err := rm.K8sClient.Delete(ctx, obj, deleteOpts...)
1290-
if err != nil {
1286+
if err := rm.K8sClient.Delete(ctx, obj, deleteOpts...); err != nil {
12911287
if options.logEnabled {
12921288
GinkgoWriter.Printf("Could not delete k8s resource %q: %w\n", obj.GetName(), err)
12931289
}
@@ -1328,8 +1324,7 @@ func (rm *ResourceManager) List(
13281324
list client.ObjectList,
13291325
listOpts ...client.ListOption,
13301326
) error {
1331-
err := rm.K8sClient.List(ctx, list, listOpts...)
1332-
if err != nil {
1327+
if err := rm.K8sClient.List(ctx, list, listOpts...); err != nil {
13331328
listErr := fmt.Errorf("error listing k8s resources: %w", err)
13341329
GinkgoWriter.Printf("%v\n", listErr)
13351330

‎tests/suite/advanced_routing_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ var _ = Describe("AdvancedRouting", Ordered, Label("functional", "routing"), fun
3838

3939
Expect(resourceManager.Apply([]client.Object{ns})).To(Succeed())
4040
Expect(resourceManager.ApplyFromFiles(files, namespace)).To(Succeed())
41-
Expect(resourceManager.WaitForAppsToBeReady(namespace, framework.WithLoggingDisabled())).To(Succeed())
41+
Expect(resourceManager.WaitForAppsToBeReady(namespace)).To(Succeed())
4242

4343
nginxPodNames, err := resourceManager.GetReadyNginxPodNames(
4444
namespace,

‎tests/suite/dataplane_perf_test.go‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -63,13 +63,12 @@ var _ = Describe("Dataplane performance", Ordered, Label("nfr", "performance"),
6363
}
6464

6565
Expect(resourceManager.Apply([]client.Object{&ns})).To(Succeed())
66-
Expect(resourceManager.ApplyFromFiles(files, ns.Name, framework.WithLoggingDisabled())).To(Succeed())
67-
Expect(resourceManager.WaitForAppsToBeReady(ns.Name, framework.WithLoggingDisabled())).To(Succeed())
66+
Expect(resourceManager.ApplyFromFiles(files, ns.Name)).To(Succeed())
67+
Expect(resourceManager.WaitForAppsToBeReady(ns.Name)).To(Succeed())
6868

6969
nginxPodNames, err := resourceManager.GetReadyNginxPodNames(
7070
namespace,
7171
timeoutConfig.GetTimeout,
72-
framework.WithLoggingDisabled(),
7372
)
7473
Expect(err).ToNot(HaveOccurred())
7574
Expect(nginxPodNames).To(HaveLen(1))
@@ -92,7 +91,7 @@ var _ = Describe("Dataplane performance", Ordered, Label("nfr", "performance"),
9291
})
9392

9493
AfterAll(func() {
95-
framework.AddNginxLogsAndEventsToReport(resourceManager, namespace, framework.WithLoggingDisabled())
94+
framework.AddNginxLogsAndEventsToReport(resourceManager, namespace)
9695
cleanUpPortForward()
9796

9897
Expect(resourceManager.DeleteFromFiles(files, namespace)).To(Succeed())

‎tests/suite/graceful_recovery_test.go‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -230,7 +230,6 @@ var _ = Describe("Graceful Recovery test", Ordered, FlakeAttempts(2), Label("gra
230230
nginxPodNames, err = resourceManager.GetReadyNginxPodNames(
231231
ns.Name,
232232
timeoutConfig.GetStatusTimeout,
233-
framework.WithLoggingDisabled(),
234233
)
235234
return len(nginxPodNames) == 1 && err == nil
236235
}).
@@ -309,7 +308,6 @@ var _ = Describe("Graceful Recovery test", Ordered, FlakeAttempts(2), Label("gra
309308
ngfNamespace,
310309
releaseName,
311310
timeoutConfig.GetStatusTimeout,
312-
framework.WithLoggingDisabled(),
313311
)
314312
return len(podNames) == 1 && err == nil
315313
}).
@@ -334,7 +332,6 @@ var _ = Describe("Graceful Recovery test", Ordered, FlakeAttempts(2), Label("gra
334332
nginxPodNames, err = resourceManager.GetReadyNginxPodNames(
335333
ns.Name,
336334
timeoutConfig.GetStatusTimeout,
337-
framework.WithLoggingDisabled(),
338335
)
339336
return len(nginxPodNames) == 1 && err == nil
340337
}).
@@ -416,7 +413,6 @@ var _ = Describe("Graceful Recovery test", Ordered, FlakeAttempts(2), Label("gra
416413
ngfNamespace,
417414
releaseName,
418415
timeoutConfig.GetStatusTimeout,
419-
framework.WithLoggingDisabled(),
420416
)
421417
Expect(err).ToNot(HaveOccurred())
422418
Expect(podNames).To(HaveLen(1))
@@ -436,7 +432,6 @@ var _ = Describe("Graceful Recovery test", Ordered, FlakeAttempts(2), Label("gra
436432
nginxPodNames, err := resourceManager.GetReadyNginxPodNames(
437433
ns.Name,
438434
timeoutConfig.GetStatusTimeout,
439-
framework.WithLoggingDisabled(),
440435
)
441436
Expect(err).ToNot(HaveOccurred())
442437
Expect(nginxPodNames).To(HaveLen(1))
@@ -474,7 +469,6 @@ var _ = Describe("Graceful Recovery test", Ordered, FlakeAttempts(2), Label("gra
474469
nginxPodNames, err := resourceManager.GetReadyNginxPodNames(
475470
ns.Name,
476471
timeoutConfig.GetStatusTimeout,
477-
framework.WithLoggingDisabled(),
478472
)
479473
Expect(err).ToNot(HaveOccurred())
480474
Expect(nginxPodNames).To(HaveLen(1))
@@ -513,7 +507,6 @@ var _ = Describe("Graceful Recovery test", Ordered, FlakeAttempts(2), Label("gra
513507
ngfNamespace,
514508
releaseName,
515509
timeoutConfig.GetStatusTimeout,
516-
framework.WithLoggingDisabled(),
517510
)
518511
return len(newNGFPodNames) == 1 && err == nil
519512
}).

‎tests/suite/longevity_test.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -82,9 +82,9 @@ var _ = Describe("Longevity", Label("longevity-setup", "longevity-teardown"), fu
8282
Expect(writeTrafficResults(resultsFile, homeDir, "coffee.txt", "HTTP")).To(Succeed())
8383
Expect(writeTrafficResults(resultsFile, homeDir, "tea.txt", "HTTPS")).To(Succeed())
8484

85-
framework.AddNginxLogsAndEventsToReport(resourceManager, ns.Name, framework.WithLoggingDisabled())
85+
framework.AddNginxLogsAndEventsToReport(resourceManager, ns.Name)
8686
Expect(resourceManager.DeleteFromFiles(files, ns.Name)).To(Succeed())
87-
Expect(resourceManager.DeleteNamespace(ns.Name, framework.WithLoggingDisabled())).To(Succeed())
87+
Expect(resourceManager.DeleteNamespace(ns.Name)).To(Succeed())
8888
})
8989
})
9090

‎tests/suite/reconfig_test.go‎

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -64,10 +64,8 @@ var _ = Describe("Reconfiguration Performance Testing", Ordered, Label("nfr", "r
6464
Expect(err).ToNot(HaveOccurred())
6565

6666
k8sConfig := ctlr.GetConfigOrDie()
67-
6867
if !clusterInfo.IsGKE {
69-
pfErr := promInstance.PortForward(k8sConfig, promPortForwardStopCh)
70-
Expect(pfErr).NotTo(HaveOccurred())
68+
Expect(promInstance.PortForward(k8sConfig, promPortForwardStopCh)).To(Succeed())
7169
}
7270
})
7371

@@ -103,7 +101,7 @@ var _ = Describe("Reconfiguration Performance Testing", Ordered, Label("nfr", "r
103101
data := bytes.NewBufferString(fileString)
104102
appliedResources = append(appliedResources, namespace)
105103

106-
if err := resourceManager.ApplyFromBuffer(data, namespace, framework.WithLoggingDisabled()); err != nil {
104+
if err := resourceManager.ApplyFromBuffer(data, namespace); err != nil {
107105
manifestErr := fmt.Errorf("error processing manifest file: %w", err)
108106
GinkgoWriter.Printf(
109107
"ERROR on creating and applying unique resources, could proceed %v\n the error happened on %q: %v\n",
@@ -137,14 +135,13 @@ var _ = Describe("Reconfiguration Performance Testing", Ordered, Label("nfr", "r
137135
Expect(resourceManager.Create(ctx, &ns)).To(Succeed())
138136
}
139137

140-
Expect(resourceManager.Apply([]client.Object{&reconfigNamespace}, framework.WithLoggingDisabled())).To(Succeed())
138+
Expect(resourceManager.Apply([]client.Object{&reconfigNamespace})).To(Succeed())
141139
Expect(resourceManager.ApplyFromFiles(
142140
[]string{
143141
"reconfig/cafe-secret.yaml",
144142
"reconfig/reference-grant.yaml",
145143
},
146144
reconfigNamespace.Name,
147-
framework.WithLoggingDisabled(),
148145
)).To(Succeed())
149146

150147
Expect(createUniqueResources(resourceCount, "manifests/reconfig/cafe.yaml")).To(Succeed())
@@ -157,7 +154,7 @@ var _ = Describe("Reconfiguration Performance Testing", Ordered, Label("nfr", "r
157154
Name: "namespace" + strconv.Itoa(i),
158155
},
159156
}
160-
Expect(resourceManager.WaitForPodsToBeReady(ctx, ns.Name, framework.WithLoggingDisabled())).To(Succeed())
157+
Expect(resourceManager.WaitForPodsToBeReady(ctx, ns.Name)).To(Succeed())
161158
}
162159
}
163160

@@ -271,7 +268,6 @@ var _ = Describe("Reconfiguration Performance Testing", Ordered, Label("nfr", "r
271268
q,
272269
getStartTime,
273270
modifyStartTime,
274-
framework.WithLoggingDisabled(),
275271
),
276272
).WithTimeout(metricExistTimeout).WithPolling(metricExistPolling).Should(Succeed())
277273
}

0 commit comments

Comments
 (0)