debug: ensure values use random suffix

Author: glasnt

run/django/e2e_test.py

@@ -49,22 +49,11 @@
     POSTGRES_INSTANCE_FULL = f"{GOOGLE_CLOUD_PROJECT}:{REGION}:{POSTGRES_INSTANCE}"
     POSTGRES_INSTANCE_NAME = POSTGRES_INSTANCE
 
-POSTGRES_DATABASE = f"django-database-{SUFFIX}"
-
-CLOUD_STORAGE_BUCKET = f"{GOOGLE_CLOUD_PROJECT}-media-{SUFFIX}"
-CLOUD_RUN_JOB_NAME = f"django-migrate-{SUFFIX}"
-
-POSTGRES_DATABASE = f"polls-{SUFFIX}"
-POSTGRES_USER = f"django-{SUFFIX}"
 POSTGRES_PASSWORD = uuid.uuid4().hex[:26]
 
 ADMIN_NAME = "admin"
 ADMIN_PASSWORD = uuid.uuid4().hex[:26]
 
-SECRET_SETTINGS_NAME = f"django_settings-{SUFFIX}"
-SECRET_PASSWORD_NAME = f"superuser_password-{SUFFIX}"
-
-
 @backoff.on_exception(backoff.expo, Exception, max_tries=3)
 def run_shell_cmd(args: list) -> subprocess.CompletedProcess:
     """
@@ -98,18 +87,12 @@ def run_shell_cmd(args: list) -> subprocess.CompletedProcess:
 @pytest.fixture
 def deployed_service() -> str:
     substitutions = [
+        f"_VERSION=${SUFFIX},"
         f"_SERVICE={SERVICE},"
         f"_REGION={REGION},"
-        f"_STORAGE_BUCKET={CLOUD_STORAGE_BUCKET},"
-        f"_DB_NAME={POSTGRES_DATABASE},"
-        f"_DB_USER={POSTGRES_USER},"
         f"_DB_PASS={POSTGRES_PASSWORD},"
         f"_DB_INSTANCE={POSTGRES_INSTANCE_NAME},"
-        f"_SECRET_SETTINGS_NAME={SECRET_SETTINGS_NAME},"
-        f"_SECRET_PASSWORD_NAME={SECRET_PASSWORD_NAME},"
-        f"_SECRET_PASSWORD_VALUE={ADMIN_PASSWORD},"
         f"_CLOUD_SQL_CONNECTION_NAME={POSTGRES_INSTANCE_FULL},"
-        f"_CLOUD_RUN_JOB_NAME={CLOUD_RUN_JOB_NAME}"
     ]
     if SAMPLE_VERSION:
         substitutions.append(f",_VERSION={SAMPLE_VERSION}")
@@ -133,15 +116,10 @@ def deployed_service() -> str:
     # Cleanup
 
     substitutions = [
+        f"_VERSION=${SUFFIX},"
         f"_SERVICE={SERVICE},"
         f"_REGION={REGION},"
-        f"_DB_USER={POSTGRES_USER},"
-        f"_DB_NAME={POSTGRES_DATABASE},"
         f"_DB_INSTANCE={POSTGRES_INSTANCE_NAME},"
-        f"_SECRET_SETTINGS_NAME={SECRET_SETTINGS_NAME},"
-        f"_SECRET_PASSWORD_NAME={SECRET_PASSWORD_NAME},"
-        f"_STORAGE_BUCKET={CLOUD_STORAGE_BUCKET},"
-        f"_CLOUD_RUN_JOB_NAME={CLOUD_RUN_JOB_NAME}"
     ]
     if SAMPLE_VERSION:
         substitutions.append(f"_SAMPLE_VERSION={SAMPLE_VERSION}")