Skip to content

Commit 8f74630

Browse files
kostis-codefreshkostis-codefresh
authored
test: remove test conditionals (#189)
* test: remove test conditionals Signed-off-by: Kostis Kapelonis <kostis.kapelonis@octopus.com> * test: fixed lint error Signed-off-by: Kostis Kapelonis <kostis.kapelonis@octopus.com> --------- Signed-off-by: Kostis Kapelonis <kostis.kapelonis@octopus.com>
1 parent 8238001 commit 8f74630

8 files changed

Lines changed: 231 additions & 265 deletions

File tree

‎pkg/plugin/experiment.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import (
1212
gatewayApiClientset "sigs.k8s.io/gateway-api/pkg/client/clientset/versioned"
1313
)
1414

15-
func HandleExperiment(ctx context.Context, clientset *kubernetes.Clientset, gatewayClient *gatewayApiClientset.Clientset, logger *logrus.Entry, rollout *v1alpha1.Rollout, httpRoute *gatewayv1.HTTPRoute, additionalDestinations []v1alpha1.WeightDestination) error {
15+
func HandleExperiment(ctx context.Context, clientset *kubernetes.Clientset, gatewayClient gatewayApiClientset.Interface, logger *logrus.Entry, rollout *v1alpha1.Rollout, httpRoute *gatewayv1.HTTPRoute, additionalDestinations []v1alpha1.WeightDestination) error {
1616
ruleIdx := -1
1717
stableService := rollout.Spec.Strategy.Canary.StableService
1818
canaryService := rollout.Spec.Strategy.Canary.CanaryService

‎pkg/plugin/grpcroute.go‎

Lines changed: 6 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -13,19 +13,14 @@ import (
1313

1414
func (r *RpcPlugin) setGRPCRouteWeight(rollout *v1alpha1.Rollout, desiredWeight int32, gatewayAPIConfig *GatewayAPITrafficRouting) pluginTypes.RpcError {
1515
ctx := context.TODO()
16-
grpcRouteClient := r.GRPCRouteClient
17-
if !r.IsTest {
18-
gatewayClientv1 := r.GatewayAPIClientset.GatewayV1()
19-
grpcRouteClient = gatewayClientv1.GRPCRoutes(gatewayAPIConfig.Namespace)
20-
}
16+
grpcRouteClient := r.GatewayAPIClientset.GatewayV1().GRPCRoutes(gatewayAPIConfig.Namespace)
2117

2218
canaryServiceName := rollout.Spec.Strategy.Canary.CanaryService
2319
stableServiceName := rollout.Spec.Strategy.Canary.StableService
2420
canaryServiceObjName := gatewayv1.ObjectName(canaryServiceName)
2521
restWeight := 100 - desiredWeight
2622
managedNames := managedRouteNamesSet(rollout)
2723

28-
var updatedGRPCRoute *gatewayv1.GRPCRoute
2924
err := retry.RetryOnConflict(retry.DefaultRetry, func() error {
3025
grpcRoute, err := grpcRouteClient.Get(ctx, gatewayAPIConfig.GRPCRoute, metav1.GetOptions{})
3126
if err != nil {
@@ -59,13 +54,10 @@ func (r *RpcPlugin) setGRPCRouteWeight(rollout *v1alpha1.Rollout, desiredWeight
5954

6055
ensureInProgressLabel(grpcRoute, desiredWeight, gatewayAPIConfig)
6156

62-
updatedGRPCRoute, err = grpcRouteClient.Update(ctx, grpcRoute, metav1.UpdateOptions{})
57+
_, err = grpcRouteClient.Update(ctx, grpcRoute, metav1.UpdateOptions{})
6358
return err
6459
})
6560

66-
if r.IsTest {
67-
r.UpdatedGRPCRouteMock = updatedGRPCRoute
68-
}
6961
if err != nil {
7062
return pluginTypes.RpcError{
7163
ErrorString: err.Error(),
@@ -79,11 +71,7 @@ func (r *RpcPlugin) setGRPCHeaderRoute(rollout *v1alpha1.Rollout, headerRouting
7971
return r.removeGRPCManagedRoutes(rollout, gatewayAPIConfig)
8072
}
8173
ctx := context.TODO()
82-
grpcRouteClient := r.GRPCRouteClient
83-
if !r.IsTest {
84-
gatewayClientV1 := r.GatewayAPIClientset.GatewayV1()
85-
grpcRouteClient = gatewayClientV1.GRPCRoutes(gatewayAPIConfig.Namespace)
86-
}
74+
grpcRouteClient := r.GatewayAPIClientset.GatewayV1().GRPCRoutes(gatewayAPIConfig.Namespace)
8775
grpcHeaderRouteRuleList, rpcError := getGRPCHeaderRouteRuleList(headerRouting)
8876
if rpcError.HasError() {
8977
return rpcError
@@ -93,7 +81,6 @@ func (r *RpcPlugin) setGRPCHeaderRoute(rollout *v1alpha1.Rollout, headerRouting
9381
stableServiceName := rollout.Spec.Strategy.Canary.StableService
9482
managedName := gatewayv1.SectionName(headerRouting.Name)
9583

96-
var updatedGRPCRoute *gatewayv1.GRPCRoute
9784
err := retry.RetryOnConflict(retry.DefaultRetry, func() error {
9885
grpcRoute, err := grpcRouteClient.Get(ctx, gatewayAPIConfig.GRPCRoute, metav1.GetOptions{})
9986
if err != nil {
@@ -183,13 +170,10 @@ func (r *RpcPlugin) setGRPCHeaderRoute(rollout *v1alpha1.Rollout, headerRouting
183170
}
184171
grpcRoute.Spec.Rules = grpcRouteRuleList
185172

186-
updatedGRPCRoute, err = grpcRouteClient.Update(ctx, grpcRoute, metav1.UpdateOptions{})
173+
_, err = grpcRouteClient.Update(ctx, grpcRoute, metav1.UpdateOptions{})
187174
return err
188175
})
189176

190-
if r.IsTest {
191-
r.UpdatedGRPCRouteMock = updatedGRPCRoute
192-
}
193177
if err != nil {
194178
return pluginTypes.RpcError{
195179
ErrorString: err.Error(),
@@ -267,16 +251,11 @@ func getGRPCHeaderRouteRuleList(headerRouting *v1alpha1.SetHeaderRoute) ([]gatew
267251

268252
func (r *RpcPlugin) removeGRPCManagedRoutes(rollout *v1alpha1.Rollout, gatewayAPIConfig *GatewayAPITrafficRouting) pluginTypes.RpcError {
269253
ctx := context.TODO()
270-
grpcRouteClient := r.GRPCRouteClient
271-
if !r.IsTest {
272-
gatewayClientv1 := r.GatewayAPIClientset.GatewayV1()
273-
grpcRouteClient = gatewayClientv1.GRPCRoutes(gatewayAPIConfig.Namespace)
274-
}
254+
grpcRouteClient := r.GatewayAPIClientset.GatewayV1().GRPCRoutes(gatewayAPIConfig.Namespace)
275255

276256
canaryServiceName := gatewayv1.ObjectName(rollout.Spec.Strategy.Canary.CanaryService)
277257
managedNames := managedRouteNamesSet(rollout)
278258

279-
var updatedGRPCRoute *gatewayv1.GRPCRoute
280259
err := retry.RetryOnConflict(retry.DefaultRetry, func() error {
281260
grpcRoute, err := grpcRouteClient.Get(ctx, gatewayAPIConfig.GRPCRoute, metav1.GetOptions{})
282261
if err != nil {
@@ -298,13 +277,10 @@ func (r *RpcPlugin) removeGRPCManagedRoutes(rollout *v1alpha1.Rollout, gatewayAP
298277
}
299278
grpcRoute.Spec.Rules = newRules
300279

301-
updatedGRPCRoute, err = grpcRouteClient.Update(ctx, grpcRoute, metav1.UpdateOptions{})
280+
_, err = grpcRouteClient.Update(ctx, grpcRoute, metav1.UpdateOptions{})
302281
return err
303282
})
304283

305-
if r.IsTest {
306-
r.UpdatedGRPCRouteMock = updatedGRPCRoute
307-
}
308284
if err != nil {
309285
return pluginTypes.RpcError{
310286
ErrorString: err.Error(),

‎pkg/plugin/httproute.go‎

Lines changed: 6 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -13,19 +13,14 @@ import (
1313

1414
func (r *RpcPlugin) setHTTPRouteWeight(rollout *v1alpha1.Rollout, desiredWeight int32, additionalDestinations []v1alpha1.WeightDestination, gatewayAPIConfig *GatewayAPITrafficRouting) pluginTypes.RpcError {
1515
ctx := context.TODO()
16-
httpRouteClient := r.HTTPRouteClient
17-
if !r.IsTest {
18-
gatewayClientV1 := r.GatewayAPIClientset.GatewayV1()
19-
httpRouteClient = gatewayClientV1.HTTPRoutes(gatewayAPIConfig.Namespace)
20-
}
16+
httpRouteClient := r.GatewayAPIClientset.GatewayV1().HTTPRoutes(gatewayAPIConfig.Namespace)
2117

2218
canaryServiceName := rollout.Spec.Strategy.Canary.CanaryService
2319
stableServiceName := rollout.Spec.Strategy.Canary.StableService
2420
canaryServiceObjName := gatewayv1.ObjectName(canaryServiceName)
2521
restWeight := 100 - desiredWeight
2622
managedNames := managedRouteNamesSet(rollout)
2723

28-
var updatedHTTPRoute *gatewayv1.HTTPRoute
2924
err := retry.RetryOnConflict(retry.DefaultRetry, func() error {
3025
httpRoute, err := httpRouteClient.Get(ctx, gatewayAPIConfig.HTTPRoute, metav1.GetOptions{})
3126
if err != nil {
@@ -64,13 +59,10 @@ func (r *RpcPlugin) setHTTPRouteWeight(rollout *v1alpha1.Rollout, desiredWeight
6459

6560
ensureInProgressLabel(httpRoute, desiredWeight, gatewayAPIConfig)
6661

67-
updatedHTTPRoute, err = httpRouteClient.Update(ctx, httpRoute, metav1.UpdateOptions{})
62+
_, err = httpRouteClient.Update(ctx, httpRoute, metav1.UpdateOptions{})
6863
return err
6964
})
7065

71-
if r.IsTest {
72-
r.UpdatedHTTPRouteMock = updatedHTTPRoute
73-
}
7466
if err != nil {
7567
return pluginTypes.RpcError{
7668
ErrorString: err.Error(),
@@ -84,11 +76,7 @@ func (r *RpcPlugin) setHTTPHeaderRoute(rollout *v1alpha1.Rollout, headerRouting
8476
return r.removeHTTPManagedRoutes(rollout, gatewayAPIConfig)
8577
}
8678
ctx := context.TODO()
87-
httpRouteClient := r.HTTPRouteClient
88-
if !r.IsTest {
89-
gatewayClientv1 := r.GatewayAPIClientset.GatewayV1()
90-
httpRouteClient = gatewayClientv1.HTTPRoutes(gatewayAPIConfig.Namespace)
91-
}
79+
httpRouteClient := r.GatewayAPIClientset.GatewayV1().HTTPRoutes(gatewayAPIConfig.Namespace)
9280
httpHeaderRouteRuleList, rpcError := getHTTPHeaderRouteRuleList(headerRouting)
9381
if rpcError.HasError() {
9482
return rpcError
@@ -98,7 +86,6 @@ func (r *RpcPlugin) setHTTPHeaderRoute(rollout *v1alpha1.Rollout, headerRouting
9886
stableServiceName := rollout.Spec.Strategy.Canary.StableService
9987
managedName := gatewayv1.SectionName(headerRouting.Name)
10088

101-
var updatedHTTPRoute *gatewayv1.HTTPRoute
10289
err := retry.RetryOnConflict(retry.DefaultRetry, func() error {
10390
httpRoute, err := httpRouteClient.Get(ctx, gatewayAPIConfig.HTTPRoute, metav1.GetOptions{})
10491
if err != nil {
@@ -192,13 +179,10 @@ func (r *RpcPlugin) setHTTPHeaderRoute(rollout *v1alpha1.Rollout, headerRouting
192179
}
193180
httpRoute.Spec.Rules = httpRouteRuleList
194181

195-
updatedHTTPRoute, err = httpRouteClient.Update(ctx, httpRoute, metav1.UpdateOptions{})
182+
_, err = httpRouteClient.Update(ctx, httpRoute, metav1.UpdateOptions{})
196183
return err
197184
})
198185

199-
if r.IsTest {
200-
r.UpdatedHTTPRouteMock = updatedHTTPRoute
201-
}
202186
if err != nil {
203187
return pluginTypes.RpcError{
204188
ErrorString: err.Error(),
@@ -276,16 +260,11 @@ func getHTTPHeaderRouteRuleList(headerRouting *v1alpha1.SetHeaderRoute) ([]gatew
276260

277261
func (r *RpcPlugin) removeHTTPManagedRoutes(rollout *v1alpha1.Rollout, gatewayAPIConfig *GatewayAPITrafficRouting) pluginTypes.RpcError {
278262
ctx := context.TODO()
279-
httpRouteClient := r.HTTPRouteClient
280-
if !r.IsTest {
281-
gatewayClientv1 := r.GatewayAPIClientset.GatewayV1()
282-
httpRouteClient = gatewayClientv1.HTTPRoutes(gatewayAPIConfig.Namespace)
283-
}
263+
httpRouteClient := r.GatewayAPIClientset.GatewayV1().HTTPRoutes(gatewayAPIConfig.Namespace)
284264

285265
canaryServiceName := gatewayv1.ObjectName(rollout.Spec.Strategy.Canary.CanaryService)
286266
managedNames := managedRouteNamesSet(rollout)
287267

288-
var updatedHTTPRoute *gatewayv1.HTTPRoute
289268
err := retry.RetryOnConflict(retry.DefaultRetry, func() error {
290269
httpRoute, err := httpRouteClient.Get(ctx, gatewayAPIConfig.HTTPRoute, metav1.GetOptions{})
291270
if err != nil {
@@ -307,13 +286,10 @@ func (r *RpcPlugin) removeHTTPManagedRoutes(rollout *v1alpha1.Rollout, gatewayAP
307286
}
308287
httpRoute.Spec.Rules = newRules
309288

310-
updatedHTTPRoute, err = httpRouteClient.Update(ctx, httpRoute, metav1.UpdateOptions{})
289+
_, err = httpRouteClient.Update(ctx, httpRoute, metav1.UpdateOptions{})
311290
return err
312291
})
313292

314-
if r.IsTest {
315-
r.UpdatedHTTPRouteMock = updatedHTTPRoute
316-
}
317293
if err != nil {
318294
return pluginTypes.RpcError{
319295
ErrorString: err.Error(),

‎pkg/plugin/plugin.go‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,6 @@ const (
2323
func (r *RpcPlugin) InitPlugin() pluginTypes.RpcError {
2424
log := utils.SetupLog()
2525

26-
if r.IsTest {
27-
return pluginTypes.RpcError{}
28-
}
2926
kubeConfig, err := utils.GetKubeConfig()
3027
if err != nil {
3128
return pluginTypes.RpcError{

0 commit comments

Comments
 (0)