diff --git a/.github/trigger_files/beam_PostCommit_Python.json b/.github/trigger_files/beam_PostCommit_Python.json index 42a6e88b8a29..ed56f65ef50f 100644 --- a/.github/trigger_files/beam_PostCommit_Python.json +++ b/.github/trigger_files/beam_PostCommit_Python.json @@ -1,5 +1,5 @@ { "comment": "Modify this file in a trivial way to cause this test suite to run.", - "modification": 31 + "modification": 32 } diff --git a/sdks/python/apache_beam/transforms/core_it_test.py b/sdks/python/apache_beam/transforms/core_it_test.py index 50744e28c674..4e084afe78a2 100644 --- a/sdks/python/apache_beam/transforms/core_it_test.py +++ b/sdks/python/apache_beam/transforms/core_it_test.py @@ -19,9 +19,9 @@ # pytype: skip-file -import random -import string +import sys import unittest +from datetime import datetime import pytest @@ -43,8 +43,9 @@ class GbekIT(unittest.TestCase): def setUp(self): if secretmanager is not None: self.project_id = 'apache-beam-testing' - secret_postfix = ''.join(random.choice(string.digits) for _ in range(6)) - self.secret_id = 'gbek_secret_tests_' + secret_postfix + py_version = f'_py{sys.version_info.major}{sys.version_info.minor}' + secret_postfix = datetime.now().strftime('%m%d_%H%M%S') + py_version + self.secret_id = 'gbekit_secret_tests_' + secret_postfix self.client = secretmanager.SecretManagerServiceClient() self.project_path = f'projects/{self.project_id}' self.secret_path = f'{self.project_path}/secrets/{self.secret_id}' diff --git a/sdks/python/apache_beam/transforms/util_test.py b/sdks/python/apache_beam/transforms/util_test.py index 921bd716572b..764c790064e3 100644 --- a/sdks/python/apache_beam/transforms/util_test.py +++ b/sdks/python/apache_beam/transforms/util_test.py @@ -28,7 +28,7 @@ import math import random import re -import string +import sys import time import unittest import warnings @@ -319,8 +319,9 @@ class GroupByEncryptedKeyTest(unittest.TestCase): def setUp(self): if secretmanager is not None: self.project_id = 'apache-beam-testing' - secret_postfix = ''.join(random.choice(string.digits) for _ in range(6)) - self.secret_id = 'gbek_secret_tests_' + secret_postfix + py_version = f'_py{sys.version_info.major}{sys.version_info.minor}' + secret_postfix = datetime.now().strftime('%m%d_%H%M%S') + py_version + self.secret_id = 'gbek_util_secret_tests_' + secret_postfix self.client = secretmanager.SecretManagerServiceClient() self.project_path = f'projects/{self.project_id}' self.secret_path = f'{self.project_path}/secrets/{self.secret_id}' diff --git a/sdks/python/apache_beam/transforms/validate_runner_xlang_test.py b/sdks/python/apache_beam/transforms/validate_runner_xlang_test.py index c68fea650705..f94547977638 100644 --- a/sdks/python/apache_beam/transforms/validate_runner_xlang_test.py +++ b/sdks/python/apache_beam/transforms/validate_runner_xlang_test.py @@ -52,10 +52,10 @@ import logging import os -import random -import string +import sys import typing import unittest +from datetime import datetime import pytest @@ -334,8 +334,9 @@ class ValidateRunnerGBEKTest(unittest.TestCase): def setUp(self): if secretmanager is not None: self.project_id = 'apache-beam-testing' - secret_postfix = ''.join(random.choice(string.digits) for _ in range(6)) - self.secret_id = 'gbek_secret_tests_' + secret_postfix + py_version = f'_py{sys.version_info.major}{sys.version_info.minor}' + secret_postfix = datetime.now().strftime('%m%d_%H%M%S') + py_version + self.secret_id = 'gbek_validaterunner_secret_tests_' + secret_postfix self.client = secretmanager.SecretManagerServiceClient() self.project_path = f'projects/{self.project_id}' self.secret_path = f'{self.project_path}/secrets/{self.secret_id}'