refactor: replace GITHUB_TOKEN with GH_TOKEN in workflow and test files

also should refactor links if clone fails

Author: BarkinKctp

packaging_automation/citus_package.py

@@ -341,15 +341,15 @@ def build_package(
 ):
     docker_image_name = "packaging" if not is_test else "packaging-test"
     postgres_extension = "all" if postgres_version == "all" else f"pg{postgres_version}"
-    os.environ["GITHUB_TOKEN"] = github_token
+    os.environ["GH_TOKEN"] = github_token
     os.environ["CONTAINER_BUILD_RUN_ENABLED"] = "true"
     if not os.path.exists(input_output_parameters.output_dir):
         os.makedirs(input_output_parameters.output_dir)
 
     docker_command = (
         f"docker run --rm -v {input_output_parameters.output_dir}:/packages -v "
         f"{input_output_parameters.input_files_dir}:/buildfiles:ro "
-        f"-e GITHUB_TOKEN -e PACKAGE_ENCRYPTION_KEY -e UNENCRYPTED_PACKAGE -e CONTAINER_BUILD_RUN_ENABLED "
+        f"-e GH_TOKEN -e PACKAGE_ENCRYPTION_KEY -e UNENCRYPTED_PACKAGE -e CONTAINER_BUILD_RUN_ENABLED "
         f"-e MSRUSTUP_PAT -e CRATES_IO_MIRROR_FEED_TOKEN -e INSTALL_RUST -e CI "
         f"citus/{docker_image_name}:{docker_platform}-{postgres_extension} {build_type.name}"
     )

packaging_automation/common_tool_methods.py

@@ -680,7 +680,6 @@ def remove_suffix(initial_str: str, suffix: str) -> str:
 def initialize_env(exec_path: str, project_name: str, checkout_dir: str):
     remove_cloned_code(f"{exec_path}/{checkout_dir}")
     if not os.path.exists(checkout_dir):
-        GH_TOKEN = os.environ.get("GH_TOKEN", "")
         run(f"git clone https://github.com/citusdata/{project_name}.git {checkout_dir}")
 
 

packaging_automation/tests/test_common_tool_methods.py

@@ -46,7 +46,7 @@
     str_array_to_str,
 )
 
-GITHUB_TOKEN = os.getenv("GH_TOKEN")
+GH_TOKEN = os.getenv("GH_TOKEN")
 BASE_PATH = pathlib2.Path(__file__).parents[1]
 TEST_BASE_PATH = pathlib2.Path(__file__).parent.absolute()
 TEST_GPG_KEY_NAME = "Citus Data <packaging@citusdata.com>"
@@ -264,7 +264,7 @@ def test_prepend_line_in_file():
 
 def test_getprs():
     # created at is not seen on Github. Should be checked on API result
-    g = Github(GITHUB_TOKEN)
+    g = Github(GH_TOKEN)
     repository = g.get_repo("citusdata/citus")
     prs = get_prs_for_patch_release(
         repository,
@@ -277,7 +277,7 @@ def test_getprs():
 
 
 def test_getprs_with_backlog_label():
-    g = Github(GITHUB_TOKEN)
+    g = Github(GH_TOKEN)
     repository = g.get_repo("citusdata/citus")
     prs = get_prs_for_patch_release(
         repository,

packaging_automation/tests/test_prepare_release.py

@@ -40,7 +40,6 @@ def initialize_env() -> str:
     test_base_path_major = f"{BASE_PATH}/{uuid.uuid4()}"
     remove_cloned_code(test_base_path_major)
     if not os.path.exists(test_base_path_major):
-        GH_TOKEN = os.getenv("GH_TOKEN", "")
         run(f"git clone https://github.com/citusdata/citus.git {test_base_path_major}")
     return test_base_path_major
 

packaging_automation/tests/test_publish_docker.py

@@ -29,8 +29,7 @@
 
 def initialize_env():
     if not os.path.exists("docker"):
-        GH_TOKEN = os.getenv("GH_TOKEN", "")
-        run(f"git clone https://github.com/citusdata/docker.git")
+        run("git clone https://github.com/citusdata/docker.git")
 
 
 def test_decode_triggering_event_info():

packaging_automation/tests/test_update_docker.py

@@ -34,7 +34,7 @@
 
 def setup_module():
     if not os.path.exists("docker"):
-        run(f"git clone https://github.com/citusdata/docker.git")
+        run("git clone https://github.com/citusdata/docker.git")
 
 
 def teardown_module():

packaging_automation/tests/test_update_package_properties.py

@@ -25,7 +25,7 @@
 
 TEST_BASE_PATH = pathlib2.Path(__file__).parent.absolute()
 BASE_PATH = os.getenv("BASE_PATH", default=pathlib2.Path(__file__).parents[1])
-GITHUB_TOKEN = os.getenv("GH_TOKEN")
+GH_TOKEN = os.getenv("GH_TOKEN")
 PROJECT_VERSION = os.getenv("PROJECT_VERSION", default="10.2.4")
 TAG_NAME = os.getenv("TAG_NAME", default="v10.2.4")
 PROJECT_NAME = os.getenv("PROJECT_NAME", default="citus")

packaging_automation/tests/test_update_pgxn.py

@@ -19,7 +19,7 @@
 def setup_module():
     if not os.path.exists("packaging_test"):
         run(
-            f"git clone --branch pgxn-citus https://github.com/citusdata/packaging.git packaging_test"
+            "git clone --branch pgxn-citus https://github.com/citusdata/packaging.git packaging_test"
         )