Skip to content

Commit 602ba5c

Browse files
richardcaseAnkitasw
richardcase
authored and
Ankitasw
committed
test: fix tests after bumping controller-runtime
The tests where failing after upgrading controller-runtime due to changes in the fake client. Signed-off-by: Richard Case <[email protected]>
1 parent 1aaf01d commit 602ba5c

File tree

9 files changed

+20
-33
lines changed

9 files changed

+20
-33
lines changed

‎controllers/awscluster_controller_unit_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@ func TestAWSClusterReconcileOperations(t *testing.T) {
157157
"SessionToken": []byte("session-token"),
158158
},
159159
}
160-
csClient := fake.NewClientBuilder().WithObjects(awsCluster, secret).Build()
160+
csClient := fake.NewClientBuilder().WithObjects(awsCluster, secret).WithStatusSubresource(awsCluster).Build()
161161

162162
mockCtrl = gomock.NewController(t)
163163
ec2Svc = mock_services.NewMockEC2Interface(mockCtrl)

‎controllers/awsmachine_controller_unit_test.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ func TestAWSMachineReconciler(t *testing.T) {
105105
},
106106
}
107107

108-
client := fake.NewClientBuilder().WithObjects(awsMachine, secret, secretIgnition).Build()
108+
client := fake.NewClientBuilder().WithObjects(awsMachine, secret, secretIgnition).WithStatusSubresource(awsMachine).Build()
109109
ms, err = scope.NewMachineScope(
110110
scope.MachineScopeParams{
111111
Client: client,
@@ -136,7 +136,7 @@ func TestAWSMachineReconciler(t *testing.T) {
136136

137137
cs, err = scope.NewClusterScope(
138138
scope.ClusterScopeParams{
139-
Client: fake.NewClientBuilder().WithObjects(awsMachine, secret).Build(),
139+
Client: fake.NewClientBuilder().WithObjects(awsMachine, secret).WithStatusSubresource(awsMachine).Build(),
140140
Cluster: &clusterv1.Cluster{},
141141
AWSCluster: &infrav1.AWSCluster{ObjectMeta: metav1.ObjectMeta{Name: "test"}},
142142
},
@@ -2534,7 +2534,7 @@ func TestAWSMachineReconcilerReconcileDefaultsToLoadBalancerTypeClassic(t *testi
25342534
},
25352535
}
25362536

2537-
fakeClient := fake.NewClientBuilder().WithObjects(ownerCluster, awsCluster, ownerMachine, awsMachine, controllerIdentity, secret).Build()
2537+
fakeClient := fake.NewClientBuilder().WithObjects(ownerCluster, awsCluster, ownerMachine, awsMachine, controllerIdentity, secret).WithStatusSubresource(awsCluster, awsMachine).Build()
25382538

25392539
recorder := record.NewFakeRecorder(10)
25402540
reconciler := &AWSMachineReconciler{

‎controllers/helpers_test.go

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -130,6 +130,10 @@ func expectAWSClusterConditions(g *WithT, m *infrav1.AWSCluster, expected []cond
130130

131131
func getAWSCluster(name, namespace string) infrav1.AWSCluster {
132132
return infrav1.AWSCluster{
133+
TypeMeta: metav1.TypeMeta{
134+
Kind: "AWSCluster",
135+
APIVersion: infrav1.GroupVersion.Identifier(),
136+
},
133137
ObjectMeta: metav1.ObjectMeta{
134138
Name: name,
135139
Namespace: namespace,

‎pkg/cloud/services/ec2/bastion_test.go

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ limitations under the License.
1717
package ec2
1818

1919
import (
20-
"context"
2120
"fmt"
2221
"testing"
2322

@@ -186,9 +185,7 @@ func TestServiceDeleteBastion(t *testing.T) {
186185
},
187186
}
188187

189-
client := fake.NewClientBuilder().WithScheme(scheme).Build()
190-
ctx := context.TODO()
191-
client.Create(ctx, awsCluster)
188+
client := fake.NewClientBuilder().WithScheme(scheme).WithObjects(awsCluster).WithStatusSubresource(awsCluster).Build()
192189

193190
scope, err := scope.NewClusterScope(scope.ClusterScopeParams{
194191
Cluster: &clusterv1.Cluster{
@@ -420,9 +417,7 @@ func TestServiceReconcileBastion(t *testing.T) {
420417
},
421418
}
422419

423-
client := fake.NewClientBuilder().WithScheme(scheme).Build()
424-
ctx := context.TODO()
425-
client.Create(ctx, awsCluster)
420+
client := fake.NewClientBuilder().WithScheme(scheme).WithObjects(awsCluster).WithStatusSubresource(awsCluster).Build()
426421

427422
scope, err := scope.NewClusterScope(scope.ClusterScopeParams{
428423
Cluster: &clusterv1.Cluster{
@@ -655,9 +650,7 @@ func TestServiceReconcileBastionUSGOV(t *testing.T) {
655650
},
656651
}
657652

658-
client := fake.NewClientBuilder().WithScheme(scheme).Build()
659-
ctx := context.TODO()
660-
client.Create(ctx, awsCluster)
653+
client := fake.NewClientBuilder().WithScheme(scheme).WithObjects(awsCluster).WithStatusSubresource(awsCluster).Build()
661654

662655
scope, err := scope.NewClusterScope(scope.ClusterScopeParams{
663656
Cluster: &clusterv1.Cluster{

‎pkg/cloud/services/eks/oidc_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,7 @@ func TestOIDCReconcile(t *testing.T) {
151151
"value": kubeConfig,
152152
},
153153
}
154-
client := fake.NewClientBuilder().WithScheme(scheme).WithObjects(controlPlane, secret).Build()
154+
client := fake.NewClientBuilder().WithScheme(scheme).WithObjects(controlPlane, secret).WithStatusSubresource(controlPlane).Build()
155155
scope, _ := scope.NewManagedControlPlaneScope(scope.ManagedControlPlaneScopeParams{
156156
Client: client,
157157
Cluster: &clusterv1.Cluster{

‎pkg/cloud/services/elb/loadbalancer_test.go

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1879,9 +1879,7 @@ func TestDeleteAPIServerELB(t *testing.T) {
18791879
},
18801880
}
18811881

1882-
client := fake.NewClientBuilder().WithScheme(scheme).Build()
1883-
ctx := context.TODO()
1884-
client.Create(ctx, awsCluster)
1882+
client := fake.NewClientBuilder().WithScheme(scheme).WithObjects(awsCluster).WithStatusSubresource(awsCluster).Build()
18851883

18861884
clusterScope, err := scope.NewClusterScope(scope.ClusterScopeParams{
18871885
Cluster: &clusterv1.Cluster{
@@ -2070,9 +2068,7 @@ func TestDeleteNLB(t *testing.T) {
20702068
},
20712069
}
20722070

2073-
client := fake.NewClientBuilder().WithScheme(scheme).Build()
2074-
ctx := context.TODO()
2075-
client.Create(ctx, awsCluster)
2071+
client := fake.NewClientBuilder().WithScheme(scheme).WithObjects(awsCluster).WithStatusSubresource(awsCluster).Build()
20762072

20772073
clusterScope, err := scope.NewClusterScope(scope.ClusterScopeParams{
20782074
Cluster: &clusterv1.Cluster{

‎pkg/cloud/services/network/natgateways_test.go

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ limitations under the License.
1717
package network
1818

1919
import (
20-
"context"
2120
"testing"
2221

2322
"github.com/aws/aws-sdk-go/aws"
@@ -382,9 +381,8 @@ func TestReconcileNatGateways(t *testing.T) {
382381
},
383382
},
384383
}
385-
client := fake.NewClientBuilder().WithScheme(scheme).Build()
386-
ctx := context.TODO()
387-
client.Create(ctx, awsCluster)
384+
client := fake.NewClientBuilder().WithScheme(scheme).WithObjects(awsCluster).WithStatusSubresource(awsCluster).Build()
385+
388386
clusterScope, err := scope.NewClusterScope(scope.ClusterScopeParams{
389387
Cluster: &clusterv1.Cluster{
390388
ObjectMeta: metav1.ObjectMeta{Name: "test-cluster"},

‎pkg/cloud/services/network/vpc_test.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ limitations under the License.
1717
package network
1818

1919
import (
20-
"context"
2120
"testing"
2221

2322
"github.com/aws/aws-sdk-go/aws"
@@ -711,7 +710,7 @@ func TestDeleteVPC(t *testing.T) {
711710
func getClusterScope(vpcSpec *infrav1.VPCSpec, additionalTags map[string]string) (*scope.ClusterScope, error) {
712711
scheme := runtime.NewScheme()
713712
_ = infrav1.AddToScheme(scheme)
714-
client := fake.NewClientBuilder().WithScheme(scheme).Build()
713+
715714
awsCluster := &infrav1.AWSCluster{
716715
ObjectMeta: metav1.ObjectMeta{Name: "test"},
717716
Spec: infrav1.AWSClusterSpec{
@@ -721,7 +720,8 @@ func getClusterScope(vpcSpec *infrav1.VPCSpec, additionalTags map[string]string)
721720
AdditionalTags: additionalTags,
722721
},
723722
}
724-
client.Create(context.TODO(), awsCluster)
723+
client := fake.NewClientBuilder().WithScheme(scheme).WithObjects(awsCluster).WithStatusSubresource(awsCluster).Build()
724+
725725
return scope.NewClusterScope(scope.ClusterScopeParams{
726726
Cluster: &clusterv1.Cluster{
727727
ObjectMeta: metav1.ObjectMeta{Name: "test-cluster"},

‎pkg/cloud/services/securitygroup/securitygroups_test.go

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1208,17 +1208,13 @@ func TestDeleteSecurityGroups(t *testing.T) {
12081208
g.Expect(infrav1.AddToScheme(scheme)).NotTo(HaveOccurred())
12091209

12101210
awsCluster := &infrav1.AWSCluster{
1211-
TypeMeta: metav1.TypeMeta{
1212-
APIVersion: infrav1.GroupVersion.String(),
1213-
Kind: "AWSCluster",
1214-
},
12151211
ObjectMeta: metav1.ObjectMeta{Name: "test"},
12161212
Spec: infrav1.AWSClusterSpec{
12171213
NetworkSpec: *tc.input,
12181214
},
12191215
}
12201216

1221-
client := fake.NewClientBuilder().WithScheme(scheme).WithObjects(awsCluster).Build()
1217+
client := fake.NewClientBuilder().WithScheme(scheme).WithObjects(awsCluster).WithStatusSubresource(awsCluster).Build()
12221218

12231219
cs, err := scope.NewClusterScope(scope.ClusterScopeParams{
12241220
Client: client,

0 commit comments

Comments
 (0)