fix(privateca.tests): Adding a random amount of seconds to backoff timer (GoogleCloudPlatform#9293)

m-strzelczyk · web-flow · commit 2e2ca5cf41f7 · 2023-03-29T14:01:59.000+02:00
* fix(privateca.tests): Adding a random amount of seconds to backoff timer

* Fixing the None value case

* Pick a random region for this tests, to avoid Quota

* Making the random region actually work

* linting

* Changing number of tries

* Added missing continue
diff --git a/privateca/snippets/conftest.py b/privateca/snippets/conftest.py
@@ -12,6 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+import random
 import uuid
 
 import backoff
@@ -29,7 +30,7 @@
 from delete_certificate_template import delete_certificate_template
 
 PROJECT = google.auth.default()[1]
-LOCATION = "us-central1"
+LOCATION = random.choice(("us-central1", "europe-north1", "europe-central2", "europe-west2", "us-east4"))
 COMMON_NAME = "COMMON_NAME"
 ORGANIZATION = "ORGANIZATION"
 CA_DURATION = 1000000
diff --git a/privateca/snippets/test_ca_pools.py b/privateca/snippets/test_ca_pools.py
@@ -18,15 +18,14 @@
 
 import google.auth
 
-from conftest import delete_stale_resources
+from conftest import delete_stale_resources, LOCATION
 
 from create_ca_pool import create_ca_pool
 from delete_ca_pool import delete_ca_pool
 from list_ca_pools import list_ca_pools
 from update_ca_pool_issuance_policy import update_ca_pool_issuance_policy
 
 PROJECT = google.auth.default()[1]
-LOCATION = "us-central1"
 
 delete_stale_resources()
 
diff --git a/privateca/snippets/test_certificate_authorities.py b/privateca/snippets/test_certificate_authorities.py
@@ -11,14 +11,15 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-
+import random
 import re
 import typing
 import uuid
 
 import backoff
 import google.auth
 
+from conftest import LOCATION
 from create_ca_pool import create_ca_pool
 from create_certificate_authority import create_certificate_authority
 from delete_ca_pool import delete_ca_pool
@@ -30,7 +31,6 @@
 from update_certificate_authority import update_ca_label
 
 PROJECT = google.auth.default()[1]
-LOCATION = "us-central1"
 COMMON_NAME = "COMMON_NAME"
 ORGANIZATION = "ORGANIZATION"
 CA_DURATION = 1000000
@@ -43,8 +43,15 @@ def generate_name() -> str:
 # We are hitting 5 CAs per minute limit which can't be changed
 # We set the backoff function to use 4 as base - this way the 3rd try
 # should wait for 64 seconds and avoid per minute quota
+# Adding some random amount of time to the backoff timer, so that we
+# don't try to call the API at the same time in different tests running
+# simultaneously.
 def backoff_expo_wrapper():
-    return backoff.expo(base=4)
+    for exp in backoff.expo(base=4):
+        if exp is None:
+            yield None
+            continue
+        yield exp * (1 + random.random())
 
 
 @backoff.on_exception(backoff_expo_wrapper, Exception, max_tries=3)
diff --git a/privateca/snippets/test_certificates.py b/privateca/snippets/test_certificates.py
@@ -23,14 +23,14 @@
 from cryptography.hazmat.primitives.serialization import Encoding, PublicFormat
 import google.auth
 
+from conftest import LOCATION
 from create_certificate import create_certificate
 from disable_certificate_authority import disable_certificate_authority
 from enable_certificate_authority import enable_certificate_authority
 from filter_certificates import filter_certificates
 from revoke_certificate import revoke_certificate
 
 PROJECT = google.auth.default()[1]
-LOCATION = "us-central1"
 COMMON_NAME = "COMMON_NAME"
 ORGANIZATION = "ORGANIZATION"
 CERTIFICATE_LIFETIME = 1000000
diff --git a/privateca/snippets/test_crud_certificate_templates.py b/privateca/snippets/test_crud_certificate_templates.py
@@ -18,13 +18,13 @@
 
 import google.auth
 
+from conftest import LOCATION
 from create_certificate_template import create_certificate_template
 from delete_certificate_template import delete_certificate_template
 from list_certificate_templates import list_certificate_templates
 from update_certificate_template import update_certificate_template
 
 PROJECT = google.auth.default()[1]
-LOCATION = "us-central1"
 COMMON_NAME = "COMMON_NAME"
 ORGANIZATION = "ORGANIZATION"
 CA_DURATION = 1000000
diff --git a/privateca/snippets/test_subordinate_ca.py b/privateca/snippets/test_subordinate_ca.py
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-
+import random
 import re
 import typing
 import uuid
@@ -22,12 +22,12 @@
 import google.cloud.security.privateca_v1 as privateca_v1
 
 from activate_subordinate_ca import activate_subordinate_ca
+from conftest import LOCATION
 from create_certificate_csr import create_certificate_csr
 from create_subordinate_ca import create_subordinate_ca
 from revoke_certificate import revoke_certificate
 
 PROJECT = google.auth.default()[1]
-LOCATION = "us-central1"
 COMMON_NAME = "COMMON_NAME"
 ORGANIZATION = "ORGANIZATION"
 CA_DURATION = CERTIFICATE_LIFETIME = 1000000
@@ -41,8 +41,15 @@ def generate_name() -> str:
 # We are hitting 5 CAs per minute limit which can't be changed
 # We set the backoff function to use 4 as base - this way the 3rd try
 # should wait for 64 seconds and avoid per minute quota
+# Adding some random amount of time to the backoff timer, so that we
+# don't try to call the API at the same time in different tests running
+# simultaneously.
 def backoff_expo_wrapper():
-    return backoff.expo(base=4)
+    for exp in backoff.expo(base=4):
+        if exp is None:
+            yield None
+            continue
+        yield exp * (1 + random.random())
 
 
 @backoff.on_exception(backoff_expo_wrapper, Exception, max_tries=3)
