From f35a6327fbdf8cc2d17c4b0a9ee8f4a6d7b8e03c Mon Sep 17 00:00:00 2001 From: Sameena Shaffeeullah Date: Fri, 12 Aug 2022 07:03:38 -0700 Subject: [PATCH] refactor: retryStrategyTestData.json (#2028) --- .../test-data/retryStrategyTestData.json | 253 ++++-------------- 1 file changed, 45 insertions(+), 208 deletions(-) diff --git a/conformance-test/test-data/retryStrategyTestData.json b/conformance-test/test-data/retryStrategyTestData.json index 7a5c7999c..c8460d6b3 100644 --- a/conformance-test/test-data/retryStrategyTestData.json +++ b/conformance-test/test-data/retryStrategyTestData.json @@ -2,235 +2,72 @@ "retryStrategyTests": [ { "id": 1, - "description": "always idempotent", + "description": "always_idempotent", "cases": [ { - "instructions": [ - "return-503", - "return-503" - ] - } - ], - "methods": [ - { - "name": "storage.bucket_acl.get", - "resources": [ - "BUCKET" - ] - }, - { - "name": "storage.bucket_acl.list", - "resources": [ - "BUCKET" - ] - }, - { - "name": "storage.buckets.delete", - "resources": [ - "BUCKET", - "OBJECT" - ] - }, - { - "name": "storage.buckets.get", - "resources": [ - "BUCKET" - ] - }, - { - "name": "storage.buckets.getIamPolicy", - "resources": [ - "BUCKET" - ] - }, - { - "name": "storage.buckets.insert", - "resources": [] - }, - { - "name": "storage.buckets.list", - "resources": [ - "BUCKET" - ] - }, - { - "name": "storage.buckets.lockRetentionPolicy", - "resources": [ - "BUCKET" - ] - }, - { - "name": "storage.buckets.testIamPermissions", - "resources": [ - "BUCKET" - ] - }, - { - "name": "storage.default_object_acl.get", - "resources": [ - "BUCKET", - "OBJECT" - ] - }, - { - "name": "storage.default_object_acl.list", - "resources": [ - "BUCKET", - "OBJECT" - ] - }, - { - "name": "storage.hmacKey.delete", - "resources": [] + "instructions": ["return-503", "return-503"] }, { - "name": "storage.hmacKey.get", - "resources": [] + "instructions": ["return-reset-connection", "return-reset-connection"] }, { - "name": "storage.hmacKey.list", - "resources": [] - }, - { - "name": "storage.notifications.delete", - "resources": [ - "BUCKET", - "NOTIFICATION" - ] - }, - { - "name": "storage.notifications.get", - "resources": [ - "BUCKET", - "NOTIFICATION" - ] - }, - { - "name": "storage.notifications.list", - "resources": [ - "BUCKET", - "NOTIFICATION" - ] - }, - { - "name": "storage.object_acl.get", - "resources": [ - "BUCKET", - "OBJECT" - ] - }, - { - "name": "storage.object_acl.list", - "resources": [ - "BUCKET", - "OBJECT" - ] - }, - { - "name": "storage.objects.get", - "resources": [ - "BUCKET", - "OBJECT" - ] - }, - { - "name": "storage.objects.list", - "resources": [ - "BUCKET", - "OBJECT" - ] - }, - { - "name": "storage.serviceaccount.get", - "resources": [] + "instructions": ["return-reset-connection", "return-503"] } ], + "methods": [ + {"name": "storage.bucket_acl.get", "resources": ["BUCKET"]}, + {"name": "storage.bucket_acl.list", "resources": ["BUCKET"]}, + {"name": "storage.buckets.delete", "resources": ["BUCKET"]}, + {"name": "storage.buckets.get", "resources": ["BUCKET"]}, + {"name": "storage.buckets.getIamPolicy", "resources": ["BUCKET"]}, + {"name": "storage.buckets.insert", "resources": []}, + {"name": "storage.buckets.list", "resources": ["BUCKET"]}, + {"name": "storage.buckets.lockRetentionPolicy", "resources": ["BUCKET"]}, + {"name": "storage.buckets.testIamPermissions", "resources": ["BUCKET"]}, + {"name": "storage.default_object_acl.get", "resources": ["BUCKET"]}, + {"name": "storage.default_object_acl.list", "resources": ["BUCKET"]}, + {"name": "storage.hmacKey.delete", "resources": ["HMAC_KEY"]}, + {"name": "storage.hmacKey.get", "resources": ["HMAC_KEY"]}, + {"name": "storage.hmacKey.list", "resources": ["HMAC_KEY"]}, + {"name": "storage.notifications.delete", "resources": ["BUCKET", "NOTIFICATION"]}, + {"name": "storage.notifications.get", "resources": ["BUCKET", "NOTIFICATION"]}, + {"name": "storage.notifications.list", "resources": ["BUCKET", "NOTIFICATION"]}, + {"name": "storage.object_acl.get", "resources": ["BUCKET", "OBJECT"]}, + {"name": "storage.object_acl.list", "resources": ["BUCKET", "OBJECT"]}, + {"name": "storage.objects.get", "resources": ["BUCKET", "OBJECT"]}, + {"name": "storage.objects.list", "resources": ["BUCKET", "OBJECT"]}, + {"name": "storage.serviceaccount.get", "resources": []} + ], "preconditionProvided": false, "expectSuccess": true }, { "id": 2, - "description": "conditionally idempotent retries when precondition is present", + "description": "conditionally_idempotent_retries_when_precondition_is_present", "cases": [ { - "instructions": [ - "return-503", - "return-503" - ] - } - ], - "methods": [ - { - "name": "storage.buckets.patch", - "resources": [ - "BUCKET" - ] - }, - { - "name": "storage.buckets.setIamPolicy", - "resources": [ - "BUCKET" - ] - }, - { - "name": "storage.buckets.update", - "resources": [ - "BUCKET" - ] - }, - { - "name": "storage.hmacKey.update", - "resources": [] - }, - { - "name": "storage.objects.compose", - "resources": [ - "BUCKET", - "OBJECT" - ] - }, - { - "name": "storage.objects.copy", - "resources": [ - "BUCKET", - "OBJECT" - ] - }, - { - "name": "storage.objects.delete", - "resources": [ - "BUCKET", - "OBJECT" - ] + "instructions": ["return-503", "return-503"] }, { - "name": "storage.objects.insert", - "resources": [ - "BUCKET" - ] + "instructions": ["return-reset-connection", "return-reset-connection"] }, { - "name": "storage.objects.patch", - "resources": [ - "BUCKET", - "OBJECT" - ] - }, - { - "name": "storage.objects.rewrite", - "resources": [ - "BUCKET", - "OBJECT" - ] - }, - { - "name": "storage.objects.update", - "resources": [ - "BUCKET", - "OBJECT" - ] + "instructions": ["return-reset-connection", "return-503"] } ], + "methods": [ + {"name": "storage.buckets.patch", "resources": ["BUCKET"]}, + {"name": "storage.buckets.setIamPolicy", "resources": ["BUCKET"]}, + {"name": "storage.buckets.update", "resources": ["BUCKET"]}, + {"name": "storage.hmacKey.update", "resources": ["HMAC_KEY"]}, + {"name": "storage.objects.compose", "resources": ["BUCKET", "OBJECT"]}, + {"name": "storage.objects.copy", "resources": ["BUCKET", "OBJECT"]}, + {"name": "storage.objects.delete", "resources": ["BUCKET", "OBJECT"]}, + {"name": "storage.objects.insert", "resources": ["BUCKET"]}, + {"name": "storage.objects.patch", "resources": ["BUCKET", "OBJECT"]}, + {"name": "storage.objects.rewrite", "resources": ["BUCKET", "OBJECT"]}, + {"name": "storage.objects.update", "resources": ["BUCKET", "OBJECT"]} + ], "preconditionProvided": true, "expectSuccess": true },