Skip to content

Commit 251712b

Browse files
author
Arik Kfir
committed
Fix Cloud SQL resource tests after adding support for "users" configuration property.
1 parent 2d8b26a commit 251712b

15 files changed

Lines changed: 74 additions & 0 deletions

‎tests/scenarios/gcp_cloud_sql/condition_composites.yaml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ mock:
1212
sql1:
1313
state: RUNNABLE
1414
region: europe-west1
15+
users: []
1516
settings:
1617
locationPreference: {zone: europe-west1-a}
1718
tier: db-1
@@ -43,6 +44,7 @@ scenarios:
4344
staleState:
4445
state: RUNNABLE
4546
region: europe-west1
47+
users: []
4648
settings:
4749
locationPreference: {zone: europe-west1-a}
4850
tier: db-1
@@ -75,6 +77,7 @@ scenarios:
7577
state:
7678
state: RUNNABLE
7779
region: europe-west1
80+
users: []
7881
settings: {locationPreference: {zone: europe-west1-a}, tier: db-1, maintenanceWindow: {day: 2, hour: 18}, dataDiskSizeGb: '15', dataDiskType: PD_SSD, ipConfiguration: {requireSsl: true, authorizedNetworks: []}, storageAutoResize: true, storageAutoResizeLimit: 150}
7982
- description: ANY-nested-conditions-none-fulfilled
8083
mock:
@@ -95,6 +98,7 @@ scenarios:
9598
state:
9699
state: RUNNABLE
97100
region: europe-west1
101+
users: []
98102
settings: {locationPreference: {zone: europe-west1-a}, tier: db-1, maintenanceWindow: {day: 2, hour: 18}, dataDiskSizeGb: '15', dataDiskType: PD_SSD, ipConfiguration: {requireSsl: true, authorizedNetworks: []}, storageAutoResize: true, storageAutoResizeLimit: 150}
99103
- description: ANY-nested-conditions-one-fulfilled
100104
mock:
@@ -115,6 +119,7 @@ scenarios:
115119
staleState:
116120
state: RUNNABLE
117121
region: europe-west1
122+
users: []
118123
settings: {locationPreference: {zone: europe-west1-a}, tier: db-1, maintenanceWindow: {day: 2, hour: 18}, dataDiskSizeGb: '15', dataDiskType: PD_SSD, ipConfiguration: {requireSsl: true, authorizedNetworks: []}, storageAutoResize: true, storageAutoResizeLimit: 150}
119124
actions:
120125
- {name: execute-script, description: 'Execute ''my-script'' SQL scripts', args: [execute_scripts, my-script]}

‎tests/scenarios/gcp_cloud_sql/condition_schemas.yaml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ mock:
1212
sql1:
1313
state: RUNNABLE
1414
region: europe-west1
15+
users: []
1516
settings:
1617
locationPreference: {zone: europe-west1-a}
1718
tier: db-1
@@ -37,6 +38,7 @@ scenarios:
3738
staleState:
3839
state: RUNNABLE
3940
region: europe-west1
41+
users: []
4042
settings: {locationPreference: {zone: europe-west1-a}, tier: db-1, maintenanceWindow: {day: 2, hour: 18}, dataDiskSizeGb: '15', dataDiskType: PD_SSD, ipConfiguration: {requireSsl: true, authorizedNetworks: []}, storageAutoResize: true, storageAutoResizeLimit: 150}
4143
actions:
4244
- {name: execute-script, description: 'Execute ''my-script'' SQL scripts', args: [execute_scripts, my-script]}
@@ -56,6 +58,7 @@ scenarios:
5658
state:
5759
state: RUNNABLE
5860
region: europe-west1
61+
users: []
5962
settings: {locationPreference: {zone: europe-west1-a}, tier: db-1, maintenanceWindow: {day: 2, hour: 18}, dataDiskSizeGb: '15', dataDiskType: PD_SSD, ipConfiguration: {requireSsl: true, authorizedNetworks: []}, storageAutoResize: true, storageAutoResizeLimit: 150}
6063
- description: any_missing_with_existing_schemas
6164
mock:
@@ -73,6 +76,7 @@ scenarios:
7376
staleState:
7477
state: RUNNABLE
7578
region: europe-west1
79+
users: []
7680
settings: {locationPreference: {zone: europe-west1-a}, tier: db-1, maintenanceWindow: {day: 2, hour: 18}, dataDiskSizeGb: '15', dataDiskType: PD_SSD, ipConfiguration: {requireSsl: true, authorizedNetworks: []}, storageAutoResize: true, storageAutoResizeLimit: 150}
7781
actions:
7882
- {name: execute-script, description: 'Execute ''my-script'' SQL scripts', args: [execute_scripts, my-script]}

‎tests/scenarios/gcp_cloud_sql/condition_sql.yaml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ mock:
1212
sql1:
1313
state: RUNNABLE
1414
region: europe-west1
15+
users: []
1516
settings:
1617
locationPreference: {zone: europe-west1-a}
1718
tier: db-1
@@ -43,6 +44,7 @@ scenarios:
4344
staleState:
4445
state: RUNNABLE
4546
region: europe-west1
47+
users: []
4648
settings: {locationPreference: {zone: europe-west1-a}, tier: db-1, maintenanceWindow: {day: 2, hour: 18}, dataDiskSizeGb: '15', dataDiskType: PD_SSD, ipConfiguration: {requireSsl: true, authorizedNetworks: []}, storageAutoResize: true, storageAutoResizeLimit: 150}
4749
actions:
4850
- {name: execute-script, description: 'Execute ''my-script'' SQL scripts', args: [execute_scripts, my-script]}
@@ -67,4 +69,5 @@ scenarios:
6769
state:
6870
state: RUNNABLE
6971
region: europe-west1
72+
users: []
7073
settings: {locationPreference: {zone: europe-west1-a}, tier: db-1, maintenanceWindow: {day: 2, hour: 18}, dataDiskSizeGb: '15', dataDiskType: PD_SSD, ipConfiguration: {requireSsl: true, authorizedNetworks: []}, storageAutoResize: true, storageAutoResizeLimit: 150}

‎tests/scenarios/gcp_cloud_sql/condition_tables.yaml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ mock:
1212
sql1:
1313
state: RUNNABLE
1414
region: europe-west1
15+
users: []
1516
settings:
1617
locationPreference: {zone: europe-west1-a}
1718
tier: db-1
@@ -39,6 +40,7 @@ scenarios:
3940
state:
4041
state: RUNNABLE
4142
region: europe-west1
43+
users: []
4244
settings: {locationPreference: {zone: europe-west1-a}, tier: db-1, maintenanceWindow: {day: 2, hour: 18}, dataDiskSizeGb: '15', dataDiskType: PD_SSD, ipConfiguration: {requireSsl: true, authorizedNetworks: []}, storageAutoResize: true, storageAutoResizeLimit: 150}
4345
- description: any_missing_with_missing_table
4446
mock:
@@ -55,6 +57,7 @@ scenarios:
5557
staleState:
5658
state: RUNNABLE
5759
region: europe-west1
60+
users: []
5861
settings: {locationPreference: {zone: europe-west1-a}, tier: db-1, maintenanceWindow: {day: 2, hour: 18}, dataDiskSizeGb: '15', dataDiskType: PD_SSD, ipConfiguration: {requireSsl: true, authorizedNetworks: []}, storageAutoResize: true, storageAutoResizeLimit: 150}
5962
actions:
6063
- {name: execute-script, description: 'Execute ''my-script'' SQL scripts', args: [execute_scripts, my-script]}
@@ -75,6 +78,7 @@ scenarios:
7578
staleState:
7679
state: RUNNABLE
7780
region: europe-west1
81+
users: []
7882
settings: {locationPreference: {zone: europe-west1-a}, tier: db-1, maintenanceWindow: {day: 2, hour: 18}, dataDiskSizeGb: '15', dataDiskType: PD_SSD, ipConfiguration: {requireSsl: true, authorizedNetworks: []}, storageAutoResize: true, storageAutoResizeLimit: 150}
7983
actions:
8084
- {name: execute-script, description: 'Execute ''my-script'' SQL scripts', args: [execute_scripts, my-script]}
@@ -93,4 +97,5 @@ scenarios:
9397
state:
9498
state: RUNNABLE
9599
region: europe-west1
100+
users: []
96101
settings: {locationPreference: {zone: europe-west1-a}, tier: db-1, maintenanceWindow: {day: 2, hour: 18}, dataDiskSizeGb: '15', dataDiskType: PD_SSD, ipConfiguration: {requireSsl: true, authorizedNetworks: []}, storageAutoResize: true, storageAutoResizeLimit: 150}

‎tests/scenarios/gcp_cloud_sql/scripts.yaml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ mock:
1212
sql1:
1313
state: RUNNABLE
1414
region: europe-west1
15+
users: []
1516
settings:
1617
locationPreference: {zone: europe-west1-a}
1718
tier: db-1
@@ -31,6 +32,7 @@ scenarios:
3132
staleState:
3233
state: RUNNABLE
3334
region: europe-west1
35+
users: []
3436
settings: {locationPreference: {zone: europe-west1-a}, tier: db-1, maintenanceWindow: {day: 2, hour: 18}, dataDiskSizeGb: '15', dataDiskType: PD_SSD, ipConfiguration: {requireSsl: true, authorizedNetworks: []}, storageAutoResize: true, storageAutoResizeLimit: 150}
3537
actions:
3638
- {name: execute-script, description: 'Execute ''my-script'' SQL scripts', args: [execute_scripts, my-script]}

‎tests/scenarios/gcp_cloud_sql/update_backup.yaml‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ mock:
1212
sql1:
1313
state: RUNNABLE
1414
region: europe-west1
15+
users: []
1516
settings:
1617
locationPreference: {zone: europe-west1-a}
1718
tier: db-1
@@ -33,6 +34,7 @@ scenarios:
3334
staleState:
3435
state: RUNNABLE
3536
region: europe-west1
37+
users: []
3638
settings: {locationPreference: {zone: europe-west1-a}, tier: db-1, maintenanceWindow: {day: 2, hour: 18}, dataDiskSizeGb: '15', dataDiskType: PD_SSD, ipConfiguration: {requireSsl: true, authorizedNetworks: []}, backupConfiguration: {enabled: true, binaryLogEnabled: true, startTime: '02:00'}, storageAutoResize: true, storageAutoResizeLimit: 150}
3739
actions:
3840
- {name: update-backup, description: 'Update SQL instance backup schedule to ''03:00''', args: [update_backup]}
@@ -47,6 +49,7 @@ scenarios:
4749
staleState:
4850
state: RUNNABLE
4951
region: europe-west1
52+
users: []
5053
settings: {locationPreference: {zone: europe-west1-a}, tier: db-1, maintenanceWindow: {day: 2, hour: 18}, dataDiskSizeGb: '15', dataDiskType: PD_SSD, ipConfiguration: {requireSsl: true, authorizedNetworks: []}, backupConfiguration: {enabled: true, binaryLogEnabled: true, startTime: '02:00'}, storageAutoResize: true, storageAutoResizeLimit: 150}
5154
actions:
5255
- {name: update-backup, description: 'Disable SQL instance backups/binary-logging', args: [update_backup]}
@@ -68,6 +71,7 @@ scenarios:
6871
state:
6972
state: RUNNABLE
7073
region: europe-west1
74+
users: []
7175
settings: {locationPreference: {zone: europe-west1-a}, tier: db-1, maintenanceWindow: {day: 2, hour: 18}, dataDiskSizeGb: '15', dataDiskType: PD_SSD, ipConfiguration: {requireSsl: true, authorizedNetworks: []}, backupConfiguration: {enabled: true, binaryLogEnabled: true, startTime: '02:00'}, storageAutoResize: true, storageAutoResizeLimit: 150}
7276
- description: enable_when_disabled
7377
mock:
@@ -80,6 +84,7 @@ scenarios:
8084
staleState:
8185
state: RUNNABLE
8286
region: europe-west1
87+
users: []
8388
settings: {locationPreference: {zone: europe-west1-a}, tier: db-1, maintenanceWindow: {day: 2, hour: 18}, dataDiskSizeGb: '15', dataDiskType: PD_SSD, ipConfiguration: {requireSsl: true, authorizedNetworks: []}, backupConfiguration: {enabled: false, binaryLogEnabled: false, startTime: '02:00'}, storageAutoResize: true, storageAutoResizeLimit: 150}
8489
actions:
8590
- {name: update-backup, description: 'Enable SQL instance backup/binary-logging', args: [update_backup]}
@@ -94,6 +99,7 @@ scenarios:
9499
staleState:
95100
state: RUNNABLE
96101
region: europe-west1
102+
users: []
97103
settings: {locationPreference: {zone: europe-west1-a}, tier: db-1, maintenanceWindow: {day: 2, hour: 18}, dataDiskSizeGb: '15', dataDiskType: PD_SSD, ipConfiguration: {requireSsl: true, authorizedNetworks: []}, backupConfiguration: {enabled: true, binaryLogEnabled: false, startTime: '02:00'}, storageAutoResize: true, storageAutoResizeLimit: 150}
98104
actions:
99105
- {name: update-backup, description: 'Enable SQL instance backup/binary-logging', args: [update_backup]}
@@ -108,6 +114,7 @@ scenarios:
108114
state:
109115
state: RUNNABLE
110116
region: europe-west1
117+
users: []
111118
settings: {locationPreference: {zone: europe-west1-a}, tier: db-1, maintenanceWindow: {day: 2, hour: 18}, dataDiskSizeGb: '15', dataDiskType: PD_SSD, ipConfiguration: {requireSsl: true, authorizedNetworks: []}, backupConfiguration: {enabled: true, binaryLogEnabled: true, startTime: '02:00'}, storageAutoResize: true, storageAutoResizeLimit: 150}
112119
- description: disable_when_actual_state_has_no_backup_property
113120
resource:
@@ -118,6 +125,7 @@ scenarios:
118125
state:
119126
state: RUNNABLE
120127
region: europe-west1
128+
users: []
121129
settings: {locationPreference: {zone: europe-west1-a}, tier: db-1, maintenanceWindow: {day: 2, hour: 18}, dataDiskSizeGb: '15', dataDiskType: PD_SSD, ipConfiguration: {requireSsl: true, authorizedNetworks: []}, storageAutoResize: true, storageAutoResizeLimit: 150}
122130
- description: enable_with_schedule_when_already_enabled
123131
mock:
@@ -130,6 +138,7 @@ scenarios:
130138
state:
131139
state: RUNNABLE
132140
region: europe-west1
141+
users: []
133142
settings: {locationPreference: {zone: europe-west1-a}, tier: db-1, maintenanceWindow: {day: 2, hour: 18}, dataDiskSizeGb: '15', dataDiskType: PD_SSD, ipConfiguration: {requireSsl: true, authorizedNetworks: []}, backupConfiguration: {enabled: false, binaryLogEnabled: false}, storageAutoResize: true, storageAutoResizeLimit: 150}
134143
- description: enable_when_disabled_implicitly
135144
resource:
@@ -141,6 +150,7 @@ scenarios:
141150
staleState:
142151
state: RUNNABLE
143152
region: europe-west1
153+
users: []
144154
settings: {locationPreference: {zone: europe-west1-a}, tier: db-1, maintenanceWindow: {day: 2, hour: 18}, dataDiskSizeGb: '15', dataDiskType: PD_SSD, ipConfiguration: {requireSsl: true, authorizedNetworks: []}, storageAutoResize: true, storageAutoResizeLimit: 150}
145155
actions:
146156
- {name: update-backup, description: 'Enable SQL instance backups', args: [update_backup]}

‎tests/scenarios/gcp_cloud_sql/update_flags.yaml‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ mock:
1818
sql1:
1919
state: RUNNABLE
2020
region: europe-west1
21+
users: []
2122
settings:
2223
locationPreference: {zone: europe-west1-a}
2324
tier: db-1
@@ -57,6 +58,7 @@ scenarios:
5758
staleState:
5859
state: RUNNABLE
5960
region: europe-west1
61+
users: []
6062
settings: {locationPreference: {zone: europe-west1-a}, tier: db-1, maintenanceWindow: {day: 2, hour: 18}, dataDiskSizeGb: '15', dataDiskType: PD_SSD, databaseFlags: [{name: bool-flag, value: 'off'}], ipConfiguration: {requireSsl: true, authorizedNetworks: []}, storageAutoResize: true, storageAutoResizeLimit: 150}
6163
actions:
6264
- {name: update-flags, description: 'Update SQL instance flags', args: [update_flags]}
@@ -71,6 +73,7 @@ scenarios:
7173
state:
7274
state: RUNNABLE
7375
region: europe-west1
76+
users: []
7477
settings: {locationPreference: {zone: europe-west1-a}, tier: db-1, maintenanceWindow: {day: 2, hour: 18}, dataDiskSizeGb: '15', dataDiskType: PD_SSD, databaseFlags: [{name: bool-flag, value: 'off'}], ipConfiguration: {requireSsl: true, authorizedNetworks: []}, storageAutoResize: true, storageAutoResizeLimit: 150}
7578
- description: int_flag_value_not_numeric
7679
resource:
@@ -111,6 +114,7 @@ scenarios:
111114
staleState:
112115
state: RUNNABLE
113116
region: europe-west1
117+
users: []
114118
settings: {locationPreference: {zone: europe-west1-a}, tier: db-1, maintenanceWindow: {day: 2, hour: 18}, dataDiskSizeGb: '15', dataDiskType: PD_SSD, databaseFlags: [{name: int-flag, value: '10'}], ipConfiguration: {requireSsl: true, authorizedNetworks: []}, storageAutoResize: true, storageAutoResizeLimit: 150}
115119
actions:
116120
- {name: update-flags, description: 'Update SQL instance flags', args: [update_flags]}
@@ -125,6 +129,7 @@ scenarios:
125129
state:
126130
state: RUNNABLE
127131
region: europe-west1
132+
users: []
128133
settings: {locationPreference: {zone: europe-west1-a}, tier: db-1, maintenanceWindow: {day: 2, hour: 18}, dataDiskSizeGb: '15', dataDiskType: PD_SSD, databaseFlags: [{name: int-flag, value: '10'}], ipConfiguration: {requireSsl: true, authorizedNetworks: []}, storageAutoResize: true, storageAutoResizeLimit: 150}
129134
- description: none_flag_must_not_have_value
130135
resource:
@@ -142,6 +147,7 @@ scenarios:
142147
staleState:
143148
state: RUNNABLE
144149
region: europe-west1
150+
users: []
145151
settings: {locationPreference: {zone: europe-west1-a}, tier: db-1, maintenanceWindow: {day: 2, hour: 18}, dataDiskSizeGb: '15', dataDiskType: PD_SSD, ipConfiguration: {requireSsl: true, authorizedNetworks: []}, storageAutoResize: true, storageAutoResizeLimit: 150}
146152
actions:
147153
- {name: update-flags, description: 'Update SQL instance flags', args: [update_flags]}
@@ -156,6 +162,7 @@ scenarios:
156162
state:
157163
state: RUNNABLE
158164
region: europe-west1
165+
users: []
159166
settings: {locationPreference: {zone: europe-west1-a}, tier: db-1, maintenanceWindow: {day: 2, hour: 18}, dataDiskSizeGb: '15', dataDiskType: PD_SSD, ipConfiguration: {requireSsl: true, authorizedNetworks: []}, databaseFlags: [{name: none-flag}], storageAutoResize: true, storageAutoResizeLimit: 150}
160167
- description: str_flag_requires_value
161168
resource:
@@ -189,6 +196,7 @@ scenarios:
189196
state:
190197
state: RUNNABLE
191198
region: europe-west1
199+
users: []
192200
settings: {locationPreference: {zone: europe-west1-a}, tier: db-1, maintenanceWindow: {day: 2, hour: 18}, dataDiskSizeGb: '15', dataDiskType: PD_SSD, databaseFlags: [{name: str-enum-flag, value: v2}], ipConfiguration: {requireSsl: true, authorizedNetworks: []}, storageAutoResize: true, storageAutoResizeLimit: 150}
193201
- description: str_enum_flag_updates_value
194202
mock:
@@ -201,6 +209,7 @@ scenarios:
201209
staleState:
202210
state: RUNNABLE
203211
region: europe-west1
212+
users: []
204213
settings: {locationPreference: {zone: europe-west1-a}, tier: db-1, maintenanceWindow: {day: 2, hour: 18}, dataDiskSizeGb: '15', dataDiskType: PD_SSD, databaseFlags: [{name: str-enum-flag, value: v2}], ipConfiguration: {requireSsl: true, authorizedNetworks: []}, storageAutoResize: true, storageAutoResizeLimit: 150}
205214
actions:
206215
- {name: update-flags, description: 'Update SQL instance flags', args: [update_flags]}
@@ -222,6 +231,7 @@ scenarios:
222231
staleState:
223232
state: RUNNABLE
224233
region: europe-west1
234+
users: []
225235
settings: {locationPreference: {zone: europe-west1-a}, tier: db-1, maintenanceWindow: {day: 2, hour: 18}, dataDiskSizeGb: '15', dataDiskType: PD_SSD, databaseFlags: [{name: str-flag, value: v2}], ipConfiguration: {requireSsl: true, authorizedNetworks: []}, storageAutoResize: true, storageAutoResizeLimit: 150}
226236
actions:
227237
- {name: update-flags, description: 'Update SQL instance flags', args: [update_flags]}
@@ -236,6 +246,7 @@ scenarios:
236246
state:
237247
state: RUNNABLE
238248
region: europe-west1
249+
users: []
239250
settings: {locationPreference: {zone: europe-west1-a}, tier: db-1, maintenanceWindow: {day: 2, hour: 18}, dataDiskSizeGb: '15', dataDiskType: PD_SSD, databaseFlags: [{name: str-flag, value: v2}], ipConfiguration: {requireSsl: true, authorizedNetworks: []}, storageAutoResize: true, storageAutoResizeLimit: 150}
240251
- description: unsupported_flag_rejected
241252
resource:

0 commit comments

Comments
 (0)