Skip to content

Commit 68e6787

Browse files
lgarciaoglgarciaog
committed
Merge branch '2609-add-dry-run-parameter-on-form' into 'main'
Resolve "Add a dry run parameter for all the StackGres UI" Closes #2609 See merge request ongresinc/stackgres!1565
2 parents a5bc7d7 + ec501e0 commit 68e6787

54 files changed

Lines changed: 1472 additions & 1910 deletions

File tree

Some content is hidden

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

‎stackgres-k8s/src/admin-ui/cypress/e2e/03-forms/01-create-sgcluster.cy.js‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1294,6 +1294,19 @@ describe('Create SGCluster', () => {
12941294
cy.get('select[data-field="spec.nonProductionOptions.disableClusterResourceRequirements"]')
12951295
.select('Disable')
12961296

1297+
// Test Dry Run
1298+
cy.get('form#createCluster button[data-field="dryRun"]')
1299+
.click()
1300+
1301+
cy.get('#clusterSummary')
1302+
.should('be.visible')
1303+
1304+
cy.get('#clusterSummary span.close')
1305+
.click()
1306+
1307+
cy.get('#clusterSummary')
1308+
.should('not.exist')
1309+
12971310
// Setup get and put mock to check resource is not found and all fields are correctly set
12981311
cy.intercept('GET', '/stackgres/namespaces/' + namespace + '/sgclusters/advanced-' + resourceName)
12991312
.as('getCluster')

‎stackgres-k8s/src/admin-ui/cypress/e2e/03-forms/02-create-sginstanceprofile.cy.js‎

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,10 @@ describe('Create SGInstanceProfile', () => {
1313
});
1414

1515
beforeEach( () => {
16-
Cypress.Cookies.preserveOnce('sgToken')
16+
cy.gc()
17+
cy.login()
18+
cy.setCookie('sgReload', '0')
19+
cy.setCookie('sgTimezone', 'utc')
1720
cy.visit(namespace + '/sginstanceprofiles/new')
1821
});
1922

@@ -183,6 +186,18 @@ describe('Create SGInstanceProfile', () => {
183186
cy.get('input[data-field="spec.requests.initContainers[1].cpu"]')
184187
.type('1')
185188

189+
// Test Dry Run
190+
cy.get('form#createProfile button[data-field="dryRun"]')
191+
.click()
192+
193+
cy.get('#crdSummary')
194+
.should('be.visible')
195+
196+
cy.get('#crdSummary span.close')
197+
.click()
198+
199+
cy.get('#crdSummary')
200+
.should('not.exist')
186201

187202
// Test Submit form
188203
cy.get('form#createProfile button[type="submit"]')

‎stackgres-k8s/src/admin-ui/cypress/e2e/03-forms/03-create-sgpgconfig.cy.js‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,19 @@ describe('Create SGPostgresConfig', () => {
4949
cy.get('[data-field="spec.postgresql\\\\.conf"]')
5050
.type('autovacuum_max_workers = 2')
5151

52+
// Test Dry Run
53+
cy.get('form#createPgConfig button[data-field="dryRun"]')
54+
.click()
55+
56+
cy.get('#crdSummary')
57+
.should('be.visible')
58+
59+
cy.get('#crdSummary span.close')
60+
.click()
61+
62+
cy.get('#crdSummary')
63+
.should('not.exist')
64+
5265
// Test Submit form
5366
cy.get('form#createPgConfig button[type="submit"]')
5467
.click()

‎stackgres-k8s/src/admin-ui/cypress/e2e/03-forms/04-create-sgpoolconfig.cy.js‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,19 @@ describe('Create SGPoolingConfig', () => {
4545
cy.get('[data-field="spec.pgBouncer.pgbouncer\\\\.ini"]')
4646
.type('max_client_conn = 1001')
4747

48+
// Test Dry Run
49+
cy.get('form#createPoolConfig button[data-field="dryRun"]')
50+
.click()
51+
52+
cy.get('#crdSummary')
53+
.should('be.visible')
54+
55+
cy.get('#crdSummary span.close')
56+
.click()
57+
58+
cy.get('#crdSummary')
59+
.should('not.exist')
60+
4861
// Test Submit form
4962
cy.get('form#createPoolConfig button[type="submit"]')
5063
.click()

‎stackgres-k8s/src/admin-ui/cypress/e2e/03-forms/05-create-sgobjectstorage.cy.js‎

Lines changed: 52 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,19 @@ describe('Create SGObjectStorage', () => {
8282

8383
cy.get('[data-field="spec.s3.awsCredentials.secretKeySelectors.secretAccessKey"]')
8484
.type(resourceName)
85+
86+
// Test Dry Run
87+
cy.get('form#createObjectStorage button[data-field="dryRun"]')
88+
.click()
89+
90+
cy.get('#crdSummary')
91+
.should('be.visible')
92+
93+
cy.get('#crdSummary span.close')
94+
.click()
95+
96+
cy.get('#crdSummary')
97+
.should('not.exist')
8598

8699
// Submit
87100
cy.get('form#createObjectStorage button[type="submit"]')
@@ -130,6 +143,19 @@ describe('Create SGObjectStorage', () => {
130143

131144
cy.get('#enablePathStyleAddressing')
132145
.click()
146+
147+
// Test Dry Run
148+
cy.get('form#createObjectStorage button[data-field="dryRun"]')
149+
.click()
150+
151+
cy.get('#crdSummary')
152+
.should('be.visible')
153+
154+
cy.get('#crdSummary span.close')
155+
.click()
156+
157+
cy.get('#crdSummary')
158+
.should('not.exist')
133159

134160
// Submit
135161
cy.get('form#createObjectStorage button[type="submit"]')
@@ -162,6 +188,19 @@ describe('Create SGObjectStorage', () => {
162188

163189
cy.get('#fetchGCSCredentials')
164190
.click()
191+
192+
// Test Dry Run
193+
cy.get('form#createObjectStorage button[data-field="dryRun"]')
194+
.click()
195+
196+
cy.get('#crdSummary')
197+
.should('be.visible')
198+
199+
cy.get('#crdSummary span.close')
200+
.click()
201+
202+
cy.get('#crdSummary')
203+
.should('not.exist')
165204

166205
// Submit
167206
cy.get('form#createObjectStorage button[type="submit"]')
@@ -198,6 +237,19 @@ describe('Create SGObjectStorage', () => {
198237
cy.get('[data-field="spec.azureBlob.azureCredentials.secretKeySelectors.accessKey"]')
199238
.type(resourceName)
200239

240+
// Test Dry Run
241+
cy.get('form#createObjectStorage button[data-field="dryRun"]')
242+
.click()
243+
244+
cy.get('#crdSummary')
245+
.should('be.visible')
246+
247+
cy.get('#crdSummary span.close')
248+
.click()
249+
250+
cy.get('#crdSummary')
251+
.should('not.exist')
252+
201253
// Submit
202254
cy.get('form#createObjectStorage button[type="submit"]')
203255
.click()

‎stackgres-k8s/src/admin-ui/cypress/e2e/03-forms/06-create-sgdistributedlog.cy.js‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -196,6 +196,19 @@ describe('Create SGDistributedLog', () => {
196196
cy.get('select[data-field="spec.nonProductionOptions.disableClusterResourceRequirements"]')
197197
.select('Disable')
198198

199+
// Test Dry Run
200+
cy.get('form#createLogsServer button[data-field="dryRun"]')
201+
.click()
202+
203+
cy.get('#crdSummary')
204+
.should('be.visible')
205+
206+
cy.get('#crdSummary span.close')
207+
.click()
208+
209+
cy.get('#crdSummary')
210+
.should('not.exist')
211+
199212
// Test Submit form
200213
cy.get('form#createLogsServer button[type="submit"]')
201214
.click()

‎stackgres-k8s/src/admin-ui/cypress/e2e/03-forms/07-create-sgbackup.cy.js‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -147,6 +147,19 @@ describe('Create SGBackup', () => {
147147
cy.get('label[data-field="spec.managedLifecycle"]')
148148
.click()
149149

150+
// Test Dry Run
151+
cy.get('form#createBackup button[data-field="dryRun"]')
152+
.click()
153+
154+
cy.get('#crdSummary')
155+
.should('be.visible')
156+
157+
cy.get('#crdSummary span.close')
158+
.click()
159+
160+
cy.get('#crdSummary')
161+
.should('not.exist')
162+
150163
// Test Submit form
151164
cy.get('form#createBackup button[type="submit"]')
152165
.click()

‎stackgres-k8s/src/admin-ui/cypress/e2e/03-forms/08-create-sgdbop.cy.js‎

Lines changed: 78 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -198,6 +198,19 @@ describe('Create SGDbOp', () => {
198198
cy.get('select[data-field="spec.benchmark.pgbench.duration.seconds"]')
199199
.select('40')
200200

201+
// Test Dry Run
202+
cy.get('form#createDbops button[data-field="dryRun"]')
203+
.click()
204+
205+
cy.get('#crdSummary')
206+
.should('be.visible')
207+
208+
cy.get('#crdSummary span.close')
209+
.click()
210+
211+
cy.get('#crdSummary')
212+
.should('not.exist')
213+
201214
// Test Submit form
202215
cy.get('form#createDbops button[type="submit"]')
203216
.click()
@@ -257,6 +270,19 @@ describe('Create SGDbOp', () => {
257270
cy.get('select[data-field="spec.vacuum.databases[0].disablePageSkipping"]')
258271
.select('true')
259272

273+
// Test Dry Run
274+
cy.get('form#createDbops button[data-field="dryRun"]')
275+
.click()
276+
277+
cy.get('#crdSummary')
278+
.should('be.visible')
279+
280+
cy.get('#crdSummary span.close')
281+
.click()
282+
283+
cy.get('#crdSummary')
284+
.should('not.exist')
285+
260286
// Test Submit form
261287
cy.get('form#createDbops button[type="submit"]')
262288
.click()
@@ -294,6 +320,19 @@ describe('Create SGDbOp', () => {
294320
cy.get('select[data-field="spec.securityUpgrade.method"]')
295321
.select('ReducedImpact')
296322

323+
// Test Dry Run
324+
cy.get('form#createDbops button[data-field="dryRun"]')
325+
.click()
326+
327+
cy.get('#crdSummary')
328+
.should('be.visible')
329+
330+
cy.get('#crdSummary span.close')
331+
.click()
332+
333+
cy.get('#crdSummary')
334+
.should('not.exist')
335+
297336
// Test Submit form
298337
cy.get('form#createDbops button[type="submit"]')
299338
.click()
@@ -334,6 +373,19 @@ describe('Create SGDbOp', () => {
334373
cy.get('select[data-field="spec.minorVersionUpgrade.postgresVersion"]')
335374
.select('14.5')
336375

376+
// Test Dry Run
377+
cy.get('form#createDbops button[data-field="dryRun"]')
378+
.click()
379+
380+
cy.get('#crdSummary')
381+
.should('be.visible')
382+
383+
cy.get('#crdSummary span.close')
384+
.click()
385+
386+
cy.get('#crdSummary')
387+
.should('not.exist')
388+
337389
// Test Submit form
338390
cy.get('form#createDbops button[type="submit"]')
339391
.click()
@@ -384,6 +436,19 @@ describe('Create SGDbOp', () => {
384436
cy.get('select[data-field="spec.majorVersionUpgrade.sgPostgresConfig"]')
385437
.select(pgConfigName)
386438

439+
// Test Dry Run
440+
cy.get('form#createDbops button[data-field="dryRun"]')
441+
.click()
442+
443+
cy.get('#crdSummary')
444+
.should('be.visible')
445+
446+
cy.get('#crdSummary span.close')
447+
.click()
448+
449+
cy.get('#crdSummary')
450+
.should('not.exist')
451+
387452
// Test Submit form
388453
cy.get('form#createDbops button[type="submit"]')
389454
.click()
@@ -424,6 +489,19 @@ describe('Create SGDbOp', () => {
424489
cy.get('label[data-field="spec.restart.onlyPendingRestart"]')
425490
.click()
426491

492+
// Test Dry Run
493+
cy.get('form#createDbops button[data-field="dryRun"]')
494+
.click()
495+
496+
cy.get('#crdSummary')
497+
.should('be.visible')
498+
499+
cy.get('#crdSummary span.close')
500+
.click()
501+
502+
cy.get('#crdSummary')
503+
.should('not.exist')
504+
427505
// Test Submit form
428506
cy.get('form#createDbops button[type="submit"]')
429507
.click()

‎stackgres-k8s/src/admin-ui/cypress/e2e/03-forms/09-create-sgscript.cy.js‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,19 @@ describe('Create SGScripts', () => {
5757
// Test Entry script textarea
5858
cy.get('[data-field="spec.scripts[0].script"]')
5959
.type(resourceName)
60+
61+
// Test Dry Run
62+
cy.get('form#createScripts button[data-field="dryRun"]')
63+
.click()
64+
65+
cy.get('#crdSummary')
66+
.should('be.visible')
67+
68+
cy.get('#crdSummary span.close')
69+
.click()
70+
71+
cy.get('#crdSummary')
72+
.should('not.exist')
6073

6174
// Test Submit form
6275
cy.get('form#createScripts button[type="submit"]')

‎stackgres-k8s/src/admin-ui/cypress/e2e/03-forms/10-create-sgshardedcluster.cy.js‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2140,6 +2140,19 @@ describe('Create SGShardedCluster', () => {
21402140
.clear()
21412141
.type('10')
21422142

2143+
// Test Dry Run
2144+
cy.get('form#createShardedCluster button[data-field="dryRun"]')
2145+
.click()
2146+
2147+
cy.get('#crdSummary')
2148+
.should('be.visible')
2149+
2150+
cy.get('#crdSummary span.close')
2151+
.click()
2152+
2153+
cy.get('#crdSummary')
2154+
.should('not.exist')
2155+
21432156
// Setup get and put mock to check resource is not found and all fields are correctly set
21442157
cy.intercept('GET', '/stackgres/namespaces/' + namespace + '/sgshardedclusters/advanced-' + resourceName)
21452158
.as('getCluster')

0 commit comments

Comments
 (0)