|
36 | 36 | from iam_grant_access import iam_grant_access |
37 | 37 | from iam_revoke_access import iam_revoke_access |
38 | 38 | from list_secret_versions import list_secret_versions |
| 39 | +from list_secret_versions_with_filter import list_secret_versions_with_filter |
39 | 40 | from list_secrets import list_secrets |
| 41 | +from list_secrets_with_filter import list_secrets_with_filter |
40 | 42 | from quickstart import quickstart |
41 | 43 | from update_secret import update_secret |
42 | 44 | from update_secret_with_etag import update_secret_with_etag |
@@ -219,21 +221,54 @@ def test_iam_revoke_access(client, secret, iam_user): |
219 | 221 |
|
220 | 222 | def test_list_secret_versions(capsys, secret_version, another_secret_version): |
221 | 223 | project_id, secret_id, version_id, _ = secret_version |
| 224 | + version_1 = get_secret_version(project_id, secret_id, version_id) |
222 | 225 | _, _, another_version_id, _ = another_secret_version |
| 226 | + version_2 = get_secret_version(project_id, secret_id, another_version_id) |
223 | 227 | list_secret_versions(project_id, secret_id) |
224 | 228 |
|
225 | 229 | out, _ = capsys.readouterr() |
226 | 230 | assert secret_id in out |
227 | | - assert version_id in out |
228 | | - assert another_version_id in out |
| 231 | + assert "Found secret version: {}".format(version_1.name) in out |
| 232 | + assert "Found secret version: {}".format(version_2.name) in out |
| 233 | + |
| 234 | + |
| 235 | +def test_list_secret_versions_with_filter(capsys, secret_version, another_secret_version): |
| 236 | + project_id, secret_id, version_id, _ = secret_version |
| 237 | + enabled = get_secret_version(project_id, secret_id, version_id) |
| 238 | + _, _, another_version_id, _ = another_secret_version |
| 239 | + disabled = disable_secret_version(project_id, secret_id, another_version_id) |
| 240 | + assert disabled.state == secretmanager.SecretVersion.State.DISABLED |
| 241 | + list_secret_versions_with_filter(project_id, secret_id, "state:ENABLED") |
| 242 | + |
| 243 | + out, _ = capsys.readouterr() |
| 244 | + assert secret_id in out |
| 245 | + assert "Found secret version: {}".format(enabled.name) in out |
| 246 | + assert "Found secret version: {}".format(disabled.name) not in out |
229 | 247 |
|
230 | 248 |
|
231 | 249 | def test_list_secrets(capsys, secret): |
232 | 250 | project_id, secret_id, _ = secret |
| 251 | + secret = get_secret(project_id, secret_id) |
233 | 252 | list_secrets(project_id) |
234 | 253 |
|
235 | 254 | out, _ = capsys.readouterr() |
236 | | - assert secret_id in out |
| 255 | + assert "Found secret: {}".format(secret.name) in out |
| 256 | + |
| 257 | + |
| 258 | +def test_list_secrets_with_filter(capsys, secret): |
| 259 | + project_id, secret_id, _ = secret |
| 260 | + unlabeled = get_secret(project_id, secret_id) |
| 261 | + list_secrets_with_filter(project_id, "labels.secretmanager:rocks") |
| 262 | + |
| 263 | + out, _ = capsys.readouterr() |
| 264 | + assert "Found secret: {}".format(unlabeled.name) not in out |
| 265 | + |
| 266 | + labeled = update_secret(project_id, secret_id) |
| 267 | + assert labeled.labels["secretmanager"] == "rocks" |
| 268 | + list_secrets_with_filter(project_id, "labels.secretmanager:rocks") |
| 269 | + |
| 270 | + out, _ = capsys.readouterr() |
| 271 | + assert "Found secret: {}".format(labeled.name) in out |
237 | 272 |
|
238 | 273 |
|
239 | 274 | def test_update_secret(secret): |
|
0 commit comments