Skip to content

Commit abe2911

Browse files
josvazgs-urbaniak
josvazg
and
s-urbaniak
authored
CLOUDP-353832: Upgrade to AWS SDK v2 (#2840)
* Migrate to AWS SDK v2 * Remove unused GCP constant * Default to AWS_REGION explicitly for SDK v2 * wire context * gci * fix nil context * pass context.Context * remove ginkgo T usage * wire context to gcp tests * use context.Background for server --------- Co-authored-by: Sergiusz Urbaniak <[email protected]>
1 parent f854be8 commit abe2911

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

58 files changed

+1100
-1365
lines changed

‎.github/workflows/test-e2e-gov.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ jobs:
2727
AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
2828
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
2929
AWS_ACCOUNT_ARN_LIST: ${{ secrets.AWS_ACCOUNT_ARN_LIST }}
30+
AWS_REGION: ${{ vars.AWS_REGION }}
3031
PAGER_DUTY_SERVICE_KEY: ${{ secrets.PAGER_DUTY_SERVICE_KEY }}
3132
TEST_NAME: "atlas-gov"
3233
USE_NEXT_VERSION: "true"

‎.github/workflows/test-e2e.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -146,6 +146,7 @@ jobs:
146146
AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
147147
AWS_ACCOUNT_ARN_LIST: ${{ secrets.AWS_ACCOUNT_ARN_LIST }}
148148
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
149+
AWS_REGION: ${{ vars.AWS_REGION }}
149150
AZURE_CLIENT_ID: ${{ secrets.AZURE_CLIENT_ID }}
150151
AZURE_TENANT_ID: ${{ secrets.AZURE_TENANT_ID }}
151152
AZURE_CLIENT_SECRET: ${{ secrets.AZURE_CLIENT_SECRET }}

‎.github/workflows/tests-selectable.yaml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -247,6 +247,7 @@ jobs:
247247
AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
248248
AWS_ACCOUNT_ARN_LIST: ${{ secrets.AWS_ACCOUNT_ARN_LIST }}
249249
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
250+
AWS_REGION: ${{ vars.AWS_REGION }}
250251
AZURE_CLIENT_ID: ${{ secrets.AZURE_CLIENT_ID }}
251252
AZURE_TENANT_ID: ${{ secrets.AZURE_TENANT_ID }}
252253
AZURE_CLIENT_SECRET: ${{ secrets.AZURE_CLIENT_SECRET }}

‎go.mod‎

Lines changed: 21 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,14 @@ require (
1515
github.com/Azure/go-autorest/autorest/azure/auth v0.5.13
1616
github.com/Azure/go-autorest/autorest/to v0.4.1
1717
github.com/Masterminds/semver v1.5.0
18-
github.com/aws/aws-sdk-go v1.55.8
18+
github.com/aws/aws-sdk-go-v2 v1.39.4
19+
github.com/aws/aws-sdk-go-v2/config v1.31.15
20+
github.com/aws/aws-sdk-go-v2/service/ec2 v1.258.1
21+
github.com/aws/aws-sdk-go-v2/service/iam v1.49.0
22+
github.com/aws/aws-sdk-go-v2/service/kms v1.46.2
23+
github.com/aws/aws-sdk-go-v2/service/s3 v1.88.7
24+
github.com/aws/aws-sdk-go-v2/service/sts v1.38.9
25+
github.com/aws/smithy-go v1.23.1
1926
github.com/go-logr/zapr v1.3.0
2027
github.com/go-test/deep v1.1.1
2128
github.com/google/go-cmp v0.7.0
@@ -54,6 +61,19 @@ require (
5461
github.com/AzureAD/microsoft-authentication-library-for-go v1.5.0 // indirect
5562
github.com/Masterminds/semver/v3 v3.4.0 // indirect
5663
github.com/antlr4-go/antlr/v4 v4.13.0 // indirect
64+
github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.7.2 // indirect
65+
github.com/aws/aws-sdk-go-v2/credentials v1.18.19 // indirect
66+
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.18.11 // indirect
67+
github.com/aws/aws-sdk-go-v2/internal/configsources v1.4.11 // indirect
68+
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.7.11 // indirect
69+
github.com/aws/aws-sdk-go-v2/internal/ini v1.8.4 // indirect
70+
github.com/aws/aws-sdk-go-v2/internal/v4a v1.4.11 // indirect
71+
github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.13.2 // indirect
72+
github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.9.2 // indirect
73+
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.13.11 // indirect
74+
github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.19.11 // indirect
75+
github.com/aws/aws-sdk-go-v2/service/sso v1.29.8 // indirect
76+
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.35.3 // indirect
5777
github.com/blang/semver/v4 v4.0.0 // indirect
5878
github.com/felixge/httpsnoop v1.0.4 // indirect
5979
github.com/fsnotify/fsnotify v1.9.0 // indirect
@@ -67,7 +87,6 @@ require (
6787
github.com/google/pprof v0.0.0-20250403155104-27863c87afa6 // indirect
6888
github.com/google/s2a-go v0.1.9 // indirect
6989
github.com/inconshreveable/mousetrap v1.1.0 // indirect
70-
github.com/jmespath/go-jmespath v0.4.0 // indirect
7190
github.com/kylelemons/godebug v1.1.0 // indirect
7291
github.com/onsi/ginkgo v1.16.5 // indirect
7392
github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c // indirect

‎go.sum‎

Lines changed: 42 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -71,8 +71,48 @@ github.com/Masterminds/semver/v3 v3.4.0 h1:Zog+i5UMtVoCU8oKka5P7i9q9HgrJeGzI9SA1
7171
github.com/Masterminds/semver/v3 v3.4.0/go.mod h1:4V+yj/TJE1HU9XfppCwVMZq3I84lprf4nC11bSS5beM=
7272
github.com/antlr4-go/antlr/v4 v4.13.0 h1:lxCg3LAv+EUK6t1i0y1V6/SLeUi0eKEKdhQAlS8TVTI=
7373
github.com/antlr4-go/antlr/v4 v4.13.0/go.mod h1:pfChB/xh/Unjila75QW7+VU4TSnWnnk9UTnmpPaOR2g=
74-
github.com/aws/aws-sdk-go v1.55.8 h1:JRmEUbU52aJQZ2AjX4q4Wu7t4uZjOu71uyNmaWlUkJQ=
75-
github.com/aws/aws-sdk-go v1.55.8/go.mod h1:ZkViS9AqA6otK+JBBNH2++sx1sgxrPKcSzPPvQkUtXk=
74+
github.com/aws/aws-sdk-go-v2 v1.39.4 h1:qTsQKcdQPHnfGYBBs+Btl8QwxJeoWcOcPcixK90mRhg=
75+
github.com/aws/aws-sdk-go-v2 v1.39.4/go.mod h1:yWSxrnioGUZ4WVv9TgMrNUeLV3PFESn/v+6T/Su8gnM=
76+
github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.7.2 h1:t9yYsydLYNBk9cJ73rgPhPWqOh/52fcWDQB5b1JsKSY=
77+
github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.7.2/go.mod h1:IusfVNTmiSN3t4rhxWFaBAqn+mcNdwKtPcV16eYdgko=
78+
github.com/aws/aws-sdk-go-v2/config v1.31.15 h1:gE3M4xuNXfC/9bG4hyowGm/35uQTi7bUKeYs5e/6uvU=
79+
github.com/aws/aws-sdk-go-v2/config v1.31.15/go.mod h1:HvnvGJoE2I95KAIW8kkWVPJ4XhdrlvwJpV6pEzFQa8o=
80+
github.com/aws/aws-sdk-go-v2/credentials v1.18.19 h1:Jc1zzwkSY1QbkEcLujwqRTXOdvW8ppND3jRBb/VhBQc=
81+
github.com/aws/aws-sdk-go-v2/credentials v1.18.19/go.mod h1:DIfQ9fAk5H0pGtnqfqkbSIzky82qYnGvh06ASQXXg6A=
82+
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.18.11 h1:X7X4YKb+c0rkI6d4uJ5tEMxXgCZ+jZ/D6mvkno8c8Uw=
83+
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.18.11/go.mod h1:EqM6vPZQsZHYvC4Cai35UDg/f5NCEU+vp0WfbVqVcZc=
84+
github.com/aws/aws-sdk-go-v2/internal/configsources v1.4.11 h1:7AANQZkF3ihM8fbdftpjhken0TP9sBzFbV/Ze/Y4HXA=
85+
github.com/aws/aws-sdk-go-v2/internal/configsources v1.4.11/go.mod h1:NTF4QCGkm6fzVwncpkFQqoquQyOolcyXfbpC98urj+c=
86+
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.7.11 h1:ShdtWUZT37LCAA4Mw2kJAJtzaszfSHFb5n25sdcv4YE=
87+
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.7.11/go.mod h1:7bUb2sSr2MZ3M/N+VyETLTQtInemHXb/Fl3s8CLzm0Y=
88+
github.com/aws/aws-sdk-go-v2/internal/ini v1.8.4 h1:WKuaxf++XKWlHWu9ECbMlha8WOEGm0OUEZqm4K/Gcfk=
89+
github.com/aws/aws-sdk-go-v2/internal/ini v1.8.4/go.mod h1:ZWy7j6v1vWGmPReu0iSGvRiise4YI5SkR3OHKTZ6Wuc=
90+
github.com/aws/aws-sdk-go-v2/internal/v4a v1.4.11 h1:bKgSxk1TW//00PGQqYmrq83c+2myGidEclp+t9pPqVI=
91+
github.com/aws/aws-sdk-go-v2/internal/v4a v1.4.11/go.mod h1:vrPYCQ6rFHL8jzQA8ppu3gWX18zxjLIDGTeqDxkBmSI=
92+
github.com/aws/aws-sdk-go-v2/service/ec2 v1.258.1 h1:D8cBaI1TsIF+cbB8qPmiZWsMqGsbs1/e7qYQ0NMDscY=
93+
github.com/aws/aws-sdk-go-v2/service/ec2 v1.258.1/go.mod h1:DT0XByGaNaOff3CtLVmj3jKcMeVDfOj5DkLD39UPJY0=
94+
github.com/aws/aws-sdk-go-v2/service/iam v1.49.0 h1:3wiwzsfXBaykcbC4c6vaWkx9B46LXhFR8jyVMCZXK/k=
95+
github.com/aws/aws-sdk-go-v2/service/iam v1.49.0/go.mod h1:QvuzFFqvuknv43XjhxdWTMHt1ESYlQPaLJtb6iBlD3M=
96+
github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.13.2 h1:xtuxji5CS0JknaXoACOunXOYOQzgfTvGAc9s2QdCJA4=
97+
github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.13.2/go.mod h1:zxwi0DIR0rcRcgdbl7E2MSOvxDyyXGBlScvBkARFaLQ=
98+
github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.9.2 h1:DGFpGybmutVsCuF6vSuLZ25Vh55E3VmsnJmFfjeBx4M=
99+
github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.9.2/go.mod h1:hm/wU1HDvXCFEDzOLorQnZZ/CVvPXvWEmHMSmqgQRuA=
100+
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.13.11 h1:GpMf3z2KJa4RnJ0ew3Hac+hRFYLZ9DDjfgXjuW+pB54=
101+
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.13.11/go.mod h1:6MZP3ZI4QQsgUCFTwMZA2V0sEriNQ8k2hmoHF3qjimQ=
102+
github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.19.11 h1:weapBOuuFIBEQ9OX/NVW3tFQCvSutyjZYk/ga5jDLPo=
103+
github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.19.11/go.mod h1:3C1gN4FmIVLwYSh8etngUS+f1viY6nLCDVtZmrFbDy0=
104+
github.com/aws/aws-sdk-go-v2/service/kms v1.46.2 h1:hz2rJseQXnVQtVbByFpeSCNJBBU7oFN+yenW4biJtvs=
105+
github.com/aws/aws-sdk-go-v2/service/kms v1.46.2/go.mod h1:E4ink1KCQgqIe2pHFD9E+b5CNXovm50rQbWFuh0cM+I=
106+
github.com/aws/aws-sdk-go-v2/service/s3 v1.88.7 h1:Wer3W0GuaedWT7dv/PiWNZGSQFSTcBY2rZpbiUp5xcA=
107+
github.com/aws/aws-sdk-go-v2/service/s3 v1.88.7/go.mod h1:UHKgcRSx8PVtvsc1Poxb/Co3PD3wL7P+f49P0+cWtuY=
108+
github.com/aws/aws-sdk-go-v2/service/sso v1.29.8 h1:M5nimZmugcZUO9wG7iVtROxPhiqyZX6ejS1lxlDPbTU=
109+
github.com/aws/aws-sdk-go-v2/service/sso v1.29.8/go.mod h1:mbef/pgKhtKRwrigPPs7SSSKZgytzP8PQ6P6JAAdqyM=
110+
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.35.3 h1:S5GuJZpYxE0lKeMHKn+BRTz6PTFpgThyJ+5mYfux7BM=
111+
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.35.3/go.mod h1:X4OF+BTd7HIb3L+tc4UlWHVrpgwZZIVENU15pRDVTI0=
112+
github.com/aws/aws-sdk-go-v2/service/sts v1.38.9 h1:Ekml5vGg6sHSZLZJQJagefnVe6PmqC2oiRkBq4F7fU0=
113+
github.com/aws/aws-sdk-go-v2/service/sts v1.38.9/go.mod h1:/e15V+o1zFHWdH3u7lpI3rVBcxszktIKuHKCY2/py+k=
114+
github.com/aws/smithy-go v1.23.1 h1:sLvcH6dfAFwGkHLZ7dGiYF7aK6mg4CgKA/iDKjLDt9M=
115+
github.com/aws/smithy-go v1.23.1/go.mod h1:LEj2LM3rBRQJxPZTB4KuzZkaZYnZPnvgIhb4pu07mx0=
76116
github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM=
77117
github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw=
78118
github.com/blang/semver/v4 v4.0.0 h1:1PFHFE6yCCTv8C1TeyNNarDzntLi7wMI5i/pzqYIsAM=
@@ -183,10 +223,6 @@ github.com/googleapis/gax-go/v2 v2.15.0/go.mod h1:zVVkkxAQHa1RQpg9z2AUCMnKhi0Qld
183223
github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU=
184224
github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2s0bqwp9tc8=
185225
github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw=
186-
github.com/jmespath/go-jmespath v0.4.0 h1:BEgLn5cpjn8UN1mAw4NjwDrS35OdebyEtFe+9YPoQUg=
187-
github.com/jmespath/go-jmespath v0.4.0/go.mod h1:T8mJZnbsbmF+m6zOOFylbeCJqk5+pHWvzYPziyZiYoo=
188-
github.com/jmespath/go-jmespath/internal/testify v1.5.1 h1:shLQSRRSCCPj3f2gpwzGwWFoC7ycTf1rcQZHOlsJ6N8=
189-
github.com/jmespath/go-jmespath/internal/testify v1.5.1/go.mod h1:L3OGu8Wl2/fWfCI6z80xFu9LTZmf1ZRjMHUOPmWr69U=
190226
github.com/josharian/intern v1.0.0 h1:vlS4z54oSdjm0bgjRigI+G1HpF+tI+9rE5LLzOg8HmY=
191227
github.com/josharian/intern v1.0.0/go.mod h1:5DoeVV0s6jJacbCEi61lwdGj/aVlrQvzHFFd8Hwg//Y=
192228
github.com/joshdk/go-junit v1.0.0 h1:S86cUKIdwBHWwA6xCmFlf3RTLfVXYQfvanM5Uh+K6GE=
@@ -479,7 +515,6 @@ gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 h1:uRGJdciOHaEIrze2W8Q3AKkep
479515
gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw=
480516
gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
481517
gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
482-
gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
483518
gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
484519
gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY=
485520
gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=

‎test/e2e/alert_config_test.go‎

Lines changed: 16 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
package e2e_test
1616

1717
import (
18+
"context"
1819
"os"
1920
"time"
2021

@@ -53,18 +54,15 @@ var _ = Describe("Alert configuration tests", Label("alert-config", "alert-confi
5354
})
5455

5556
DescribeTable("Namespaced operators working only with its own namespace with different configuration",
56-
func(test *model.TestDataProvider, alertConfigurations []akov2.AlertConfiguration) {
57-
testData = test
58-
actions.ProjectCreationFlow(test)
59-
alertConfigFlow(test, alertConfigurations)
57+
func(ctx SpecContext, test func(ctx context.Context) *model.TestDataProvider, alertConfigurations []akov2.AlertConfiguration) {
58+
testData = test(ctx)
59+
actions.ProjectCreationFlow(testData)
60+
alertConfigFlow(testData, alertConfigurations)
6061
},
6162
Entry("Test[alert-configs-1]: Project with 2 identical alert configs", Label("focus-alert-configs-1"),
62-
model.DataProvider(
63-
"alert-configs-1",
64-
model.NewEmptyAtlasKeyType().UseDefaultFullAccess(),
65-
40000,
66-
[]func(*model.TestDataProvider){},
67-
).WithProject(data.DefaultProject()),
63+
func(ctx context.Context) *model.TestDataProvider {
64+
return model.DataProvider(ctx, "alert-configs-1", model.NewEmptyAtlasKeyType().UseDefaultFullAccess(), 40000, []func(*model.TestDataProvider){}).WithProject(data.DefaultProject())
65+
},
6866
[]akov2.AlertConfiguration{
6967
{
7068
EventTypeName: "REPLICATION_OPLOG_WINDOW_RUNNING_OUT",
@@ -112,12 +110,9 @@ var _ = Describe("Alert configuration tests", Label("alert-config", "alert-confi
112110
},
113111
),
114112
Entry("Test[alert-configs-2]: Project with 2 different alert configs", Label("focus-alert-configs-2"),
115-
model.DataProvider(
116-
"alert-configs-2",
117-
model.NewEmptyAtlasKeyType().UseDefaultFullAccess(),
118-
40000,
119-
[]func(*model.TestDataProvider){},
120-
).WithProject(data.DefaultProject()),
113+
func(ctx context.Context) *model.TestDataProvider {
114+
return model.DataProvider(ctx, "alert-configs-2", model.NewEmptyAtlasKeyType().UseDefaultFullAccess(), 40000, []func(*model.TestDataProvider){}).WithProject(data.DefaultProject())
115+
},
121116
[]akov2.AlertConfiguration{
122117
{
123118
EventTypeName: "JOINED_GROUP",
@@ -159,12 +154,9 @@ var _ = Describe("Alert configuration tests", Label("alert-config", "alert-confi
159154
},
160155
),
161156
Entry("Test[alert-configs-3]: Project with an alert config containing a matcher", Label("focus-alert-configs-3"),
162-
model.DataProvider(
163-
"alert-configs-3",
164-
model.NewEmptyAtlasKeyType().UseDefaultFullAccess(),
165-
40000,
166-
[]func(*model.TestDataProvider){},
167-
).WithProject(data.DefaultProject()),
157+
func(ctx context.Context) *model.TestDataProvider {
158+
return model.DataProvider(ctx, "alert-configs-3", model.NewEmptyAtlasKeyType().UseDefaultFullAccess(), 40000, []func(*model.TestDataProvider){}).WithProject(data.DefaultProject())
159+
},
168160
[]akov2.AlertConfiguration{
169161
{
170162
EventTypeName: "REPLICATION_OPLOG_WINDOW_RUNNING_OUT",
@@ -336,13 +328,8 @@ var _ = Describe("Alert configuration with secrets test", Label("alert-config",
336328
actions.AfterEachFinalCleanup([]model.TestDataProvider{*testData})
337329
})
338330

339-
It("Should be able to create AtlasProject with Alert Config and secrets", func() {
340-
testData = model.DataProvider(
341-
"alert-configs-1",
342-
model.NewEmptyAtlasKeyType().UseDefaultFullAccess(),
343-
40000,
344-
[]func(*model.TestDataProvider){},
345-
).WithProject(data.DefaultProject())
331+
It("Should be able to create AtlasProject with Alert Config and secrets", func(ctx SpecContext) {
332+
testData = model.DataProvider(ctx, "alert-configs-1", model.NewEmptyAtlasKeyType().UseDefaultFullAccess(), 40000, []func(*model.TestDataProvider){}).WithProject(data.DefaultProject())
346333

347334
By("Creating an AtlasProject", func() {
348335
actions.ProjectCreationFlow(testData)

‎test/e2e/annotations_test.go‎

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@
1515
package e2e_test
1616

1717
import (
18+
"context"
19+
1820
. "github.com/onsi/ginkgo/v2"
1921
. "github.com/onsi/gomega"
2022

@@ -41,23 +43,20 @@ var _ = Describe("Annotations base test.", Label("deployment-annotations-ns"), f
4143
})
4244

4345
DescribeTable("Namespaced operators working only with its own namespace with different configuration",
44-
func(test *model.TestDataProvider) {
45-
testData = test
46-
mainCycle(test)
46+
func(ctx SpecContext, test func(context.Context) *model.TestDataProvider) {
47+
testData = test(ctx)
48+
mainCycle(testData)
4749
},
4850
// TODO: fix test for deletion protection on, as it would fail to re-take the cluster after deletion
4951
Entry("Simple configuration with keep resource policy annotation on deployment", Label("focus-ns-crd"),
50-
model.DataProvider(
51-
"operator-ns-crd",
52-
model.NewEmptyAtlasKeyType().UseDefaultFullAccess(),
53-
30000,
54-
[]func(*model.TestDataProvider){
52+
func(ctx context.Context) *model.TestDataProvider {
53+
return model.DataProvider(ctx, "operator-ns-crd", model.NewEmptyAtlasKeyType().UseDefaultFullAccess(), 30000, []func(*model.TestDataProvider){
5554
actions.DeleteDeploymentCRWithKeepAnnotation,
5655
actions.RedeployDeployment,
5756
actions.RemoveKeepAnnotation,
58-
},
59-
).WithInitialDeployments(data.CreateDeploymentWithKeepPolicy("atlascluster-annotation")).
60-
WithProject(data.DefaultProject()),
57+
}).WithInitialDeployments(data.CreateDeploymentWithKeepPolicy("atlascluster-annotation")).
58+
WithProject(data.DefaultProject())
59+
},
6160
),
6261
)
6362
})

0 commit comments

Comments
 (0)