Skip to content

Commit 10a072c

Browse files
committed
fix nil context
1 parent bf7fdd8 commit 10a072c

File tree

2 files changed

+7
-7
lines changed

2 files changed

+7
-7
lines changed

test/e2e/encryption_at_rest_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -418,7 +418,7 @@ var _ = Describe("Encryption at rest AWS", Label("encryption-at-rest-aws"), Orde
418418
Expect(len(userData.Project.Status.CloudProviderIntegrations)).NotTo(Equal(0))
419419
aRole := userData.Project.Status.CloudProviderIntegrations[0]
420420

421-
fillKMSforAWS(nil, userData, &encAtRest, aRole.AtlasAWSAccountArn, aRole.IamAssumedRoleArn)
421+
fillKMSforAWS(ctx, userData, &encAtRest, aRole.AtlasAWSAccountArn, aRole.IamAssumedRoleArn)
422422

423423
Expect(userData.K8SClient.Get(userData.Context, types.NamespacedName{
424424
Name: userData.Project.Name,

test/e2e/privateendpoint_test.go

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ var _ = Describe("Private Endpoints", Label("private-endpoint"), FlakeAttempts(3
106106
Expect(err).ToNot(HaveOccurred())
107107

108108
Expect(action.SetupNetwork(ctx, provider.ProviderName(pe.Spec.Provider), cloud.WithAWSConfig(awsConfig))).ToNot(BeEmpty())
109-
privateEndpointDetails = action.SetupPrivateEndpoint(nil, &cloud.AWSPrivateEndpointRequest{
109+
privateEndpointDetails = action.SetupPrivateEndpoint(ctx, &cloud.AWSPrivateEndpointRequest{
110110
ID: fmt.Sprintf("aws-e2e-pe-%s", testData.Resources.TestID),
111111
Region: awsConfig.Region,
112112
ServiceName: pe.Status.ServiceName,
@@ -116,7 +116,7 @@ var _ = Describe("Private Endpoints", Label("private-endpoint"), FlakeAttempts(3
116116
Expect(err).ToNot(HaveOccurred())
117117

118118
Expect(action.SetupNetwork(ctx, provider.ProviderName(pe.Spec.Provider), cloud.WithAzureConfig(azureConfig))).ToNot(BeEmpty())
119-
privateEndpointDetails = action.SetupPrivateEndpoint(nil, &cloud.AzurePrivateEndpointRequest{
119+
privateEndpointDetails = action.SetupPrivateEndpoint(ctx, &cloud.AzurePrivateEndpointRequest{
120120
ID: fmt.Sprintf("azure-e2e-pe-%s", testData.Resources.TestID),
121121
Region: azureConfig.Region,
122122
ServiceResourceID: pe.Status.ResourceID,
@@ -127,7 +127,7 @@ var _ = Describe("Private Endpoints", Label("private-endpoint"), FlakeAttempts(3
127127
Expect(err).ToNot(HaveOccurred())
128128

129129
Expect(action.SetupNetwork(ctx, provider.ProviderName(pe.Spec.Provider), cloud.WithGCPConfig(gcpConfig))).ToNot(BeEmpty())
130-
privateEndpointDetails = action.SetupPrivateEndpoint(nil, &cloud.GCPPrivateEndpointRequest{
130+
privateEndpointDetails = action.SetupPrivateEndpoint(ctx, &cloud.GCPPrivateEndpointRequest{
131131
ID: fmt.Sprintf("gcp-e2e-pe-%s", testData.Resources.TestID),
132132
Region: gcpConfig.Region,
133133
Targets: pe.Status.ServiceAttachmentNames,
@@ -330,7 +330,7 @@ var _ = Describe("Migrate private endpoints from sub-resources to separate custo
330330
Expect(err).ToNot(HaveOccurred())
331331

332332
Expect(action.SetupNetwork(ctx, pe.Provider, cloud.WithAWSConfig(awsConfig))).ToNot(BeEmpty())
333-
privateEndpointDetails[string(pe.Provider)] = action.SetupPrivateEndpoint(nil, &cloud.AWSPrivateEndpointRequest{
333+
privateEndpointDetails[string(pe.Provider)] = action.SetupPrivateEndpoint(ctx, &cloud.AWSPrivateEndpointRequest{
334334
ID: fmt.Sprintf("aws-e2e-pe-%s", testData.Resources.TestID),
335335
Region: awsConfig.Region,
336336
ServiceName: peStatus.ServiceName,
@@ -340,7 +340,7 @@ var _ = Describe("Migrate private endpoints from sub-resources to separate custo
340340
Expect(err).ToNot(HaveOccurred())
341341

342342
Expect(action.SetupNetwork(ctx, pe.Provider, cloud.WithAzureConfig(azureConfig))).ToNot(BeEmpty())
343-
privateEndpointDetails[string(pe.Provider)] = action.SetupPrivateEndpoint(nil, &cloud.AzurePrivateEndpointRequest{
343+
privateEndpointDetails[string(pe.Provider)] = action.SetupPrivateEndpoint(ctx, &cloud.AzurePrivateEndpointRequest{
344344
ID: fmt.Sprintf("azure-e2e-pe-%s", testData.Resources.TestID),
345345
Region: azureConfig.Region,
346346
ServiceResourceID: peStatus.ServiceResourceID,
@@ -351,7 +351,7 @@ var _ = Describe("Migrate private endpoints from sub-resources to separate custo
351351
Expect(err).ToNot(HaveOccurred())
352352

353353
Expect(action.SetupNetwork(ctx, pe.Provider, cloud.WithGCPConfig(gcpConfig))).ToNot(BeEmpty())
354-
privateEndpointDetails[string(pe.Provider)] = action.SetupPrivateEndpoint(nil, &cloud.GCPPrivateEndpointRequest{
354+
privateEndpointDetails[string(pe.Provider)] = action.SetupPrivateEndpoint(ctx, &cloud.GCPPrivateEndpointRequest{
355355
ID: fmt.Sprintf("pe-migration-gcp--%s-%s", pe.EndpointGroupName, testData.Resources.TestID),
356356
Region: gcpConfig.Region,
357357
Targets: peStatus.ServiceAttachmentNames,

0 commit comments

Comments
 (0)