Revert changes

Author: BarkinKctp

.github/workflows/citus-package-all-platforms-test.yml

@@ -45,6 +45,7 @@ jobs:
       - name: Set GH_TOKEN for all steps
         run: |
           echo "GH_TOKEN=${{ steps.app.outputs.token }}" >> $GITHUB_ENV
+          echo "GITHUB_TOKEN=${{ steps.app.outputs.token }}" >> $GITHUB_ENV
 
       - name: Setup git authentication for GitHub App
         run: |

.github/workflows/package-tests.yml

@@ -19,24 +19,9 @@ jobs:
       citus_version: ${{ steps.get-citus-version.outputs.citus_version }}
     steps:
 
-      - name: Create GitHub App token
-        id: app
-        uses: actions/create-github-app-token@v2
-        with:
-          app-id: ${{ vars.GH_APP_ID }}
-          private-key: ${{ secrets.GH_APP_KEY }}
-          owner: ${{ github.repository_owner }}
-
-      - name: Set GH_TOKEN for all steps
-        run: echo "GH_TOKEN=${{ steps.app.outputs.token }}" >> $GITHUB_ENV
-
-      - name: Configure git with x-access-token
-        run: git config --global url."https://x-access-token:${{ steps.app.outputs.token }}@github.com/".insteadOf "https://github.com/"
-
       - name: Checkout
         uses: actions/checkout@v3
         with:
-          token: ${{ steps.app.outputs.token }}
           fetch-depth: 2
 
       - name: Package version

.github/workflows/publish-docker-image-tests.yml

@@ -12,24 +12,8 @@ jobs:
     runs-on: ubuntu-latest
     steps:
 
-      - name: Create GitHub App token
-        id: app
-        uses: actions/create-github-app-token@v1
-        with:
-          app-id: ${{ vars.GH_APP_ID }}
-          private-key: ${{ secrets.GH_APP_KEY }}
-          owner: ${{ github.repository_owner }}
-
-      - name: Set GH_TOKEN for all steps
-        run: echo "GH_TOKEN=${{ steps.app.outputs.token }}" >> $GITHUB_ENV
-
-      - name: Configure git with x-access-token
-        run: git config --global url."https://x-access-token:${{ steps.app.outputs.token }}@github.com/".insteadOf "https://github.com/"
-
       - name: Checkout repository
         uses: actions/checkout@v3
-        with:
-          token: ${{steps.app.outputs.token}}
 
       - name: Install package dependencies
         run: sudo apt-get update && sudo apt-get install libcurl4-openssl-dev libssl-dev python3-testresources

packaging_automation/citus_package.py

@@ -341,7 +341,6 @@ 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["GH_TOKEN"] = github_token
     os.environ["GITHUB_TOKEN"] = github_token
     os.environ["CONTAINER_BUILD_RUN_ENABLED"] = "true"
     if not os.path.exists(input_output_parameters.output_dir):
@@ -350,7 +349,7 @@ def build_package(
     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 GH_TOKEN -e GITHUB_TOKEN -e PACKAGE_ENCRYPTION_KEY -e UNENCRYPTED_PACKAGE -e CONTAINER_BUILD_RUN_ENABLED "
+        f"-e GITHUB_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

@@ -677,11 +677,10 @@ def remove_suffix(initial_str: str, suffix: str) -> str:
     return result_str
 
 
-def initialize_env(exec_path: str, project_name: str, checkout_dir: str):
+def initialize_env(exec_path: str, project_name: str, checkout_dir: str, gh_token: str = None):
+    if gh_token is None: 
+        print("GITHUB_TOKEN not found") # Needed for cloning - may fail
     remove_cloned_code(f"{exec_path}/{checkout_dir}")
-    gh_token = os.getenv("GH_TOKEN")
-    if not gh_token:
-        raise ValueError("GH_TOKEN environment variable is required")
     if not os.path.exists(checkout_dir):
         run(f"git clone https://x-access-token:{gh_token}@github.com/citusdata/{project_name}.git {checkout_dir}")
 

packaging_automation/tests/test_citus_package.py

@@ -61,8 +61,6 @@
 TEST_GPG_KEY_NAME = "Citus Data <[email protected]>"
 TEST_GPG_KEY_PASSPHRASE = os.getenv("PACKAGING_PASSPHRASE")
 GH_TOKEN = os.getenv("GH_TOKEN")
-if not GH_TOKEN:
-    raise ValueError("GH_TOKEN environment variable is required for tests to run")
 PACKAGE_CLOUD_API_TOKEN = os.getenv("PACKAGE_CLOUD_API_TOKEN")
 REPO_CLIENT_SECRET = os.getenv("REPO_CLIENT_SECRET")
 PLATFORM = get_build_platform(

packaging_automation/tests/test_citus_package_utils.py

@@ -34,7 +34,6 @@
 TEST_GPG_KEY_NAME = "Citus Data <[email protected]>"
 TEST_GPG_KEY_PASSPHRASE = "Citus123"
 GH_TOKEN = os.getenv("GH_TOKEN")
-
 PACKAGING_SOURCE_FOLDER = "packaging_test"
 PACKAGING_EXEC_FOLDER = f"{TEST_BASE_PATH}/{PACKAGING_SOURCE_FOLDER}"
 OUTPUT_FOLDER = f"{PACKAGING_EXEC_FOLDER}/packages"

packaging_automation/tests/test_common_tool_methods.py

@@ -46,7 +46,7 @@
     str_array_to_str,
 )
 
-GH_TOKEN = os.getenv("GH_TOKEN")
+GITHUB_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 <[email protected]>"
@@ -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(GH_TOKEN)
+    g = Github(GITHUB_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(GH_TOKEN)
+    g = Github(GITHUB_TOKEN)
     repository = g.get_repo("citusdata/citus")
     prs = get_prs_for_patch_release(
         repository,

packaging_automation/tests/test_prepare_release.py

@@ -40,7 +40,7 @@ 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):
-        run(f"git clone https://x-access-token:{GH_TOKEN}@github.com/citusdata/citus.git {test_base_path_major}")
+        run(f"git clone https://x-access-token:{github_token}@github.com/citusdata/citus.git {test_base_path_major}")
     return test_base_path_major
 
 

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])
-GH_TOKEN = os.getenv("GH_TOKEN")
+GITHUB_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")