add secret as parameter for update_aws_variables workflow (#99)

Author: abikouo

.github/actions/commit_to_pullrequest/action.yml

@@ -4,6 +4,9 @@ description: |
   The action expects a python script to be executed
 
 inputs:
+  token:
+    description: The Github token to use to perform commit.
+    required: true
   python_libs:
     description: |
       Required libraries to execute the python script
@@ -25,9 +28,6 @@ outputs:
   changes_detected:
     description: Value is "true", if the repository was dirty and file changes have been detected. Value is "false", if no changes have been detected.
     value: ${{ steps.commit.outputs.changes_detected }}
-  commit_hash:
-    description: Full hash of the created commit. Only present if the "changes_detected" output is "true".
-    value: ${{ steps.commit.outputs.commit_hash }}
 
 runs:
   using: composite
@@ -58,9 +58,21 @@ runs:
         python /tmp/update_repository.py
       shell: bash
 
-    - name: commit and push changes
+    - name: Commit and push changes
       id: commit
-      uses: stefanzweifel/git-auto-commit-action@v4
-      with:
-        commit_message: ${{ inputs.commit_message }}
-        file_pattern: ${{ inputs.file_pattern }}
+      run: |
+        if [[ -n $(git status -s) ]]; then
+          echo -e "changes detected\n$(git status -s)"
+          git add -A ${{ inputs.file_pattern }}
+          git -c user.name="$GIT_USER_NAME" -c user.email="$GIT_USER_EMAIL" commit -m "${{ inputs.commit_message }}" --author="$GIT_AUTHOR"
+          git push origin ${{ github.head_ref }}
+          echo "changes_detected=true" >> $GITHUB_OUTPUT
+        else
+          echo "changes_detected=false" >> $GITHUB_OUTPUT
+        fi
+      shell: bash
+      env:
+        GITHUB_TOKEN: ${{ inputs.token }}
+        GIT_USER_NAME: "github-actions[bot]"
+        GIT_USER_EMAIL: "41898282+github-actions[bot]@users.noreply.github.com"
+        GIT_AUTHOR: "${{ github.actor }} <${{ github.actor }}@users.noreply.github.com>"

.github/workflows/release-branch.yml

@@ -7,6 +7,10 @@ on:
         description: The release version to create.
         required: true
         type: string
+    secrets:
+      GH_TOKEN:
+        description: The Github token to use
+        required: true
 
 jobs:
   release:
@@ -40,7 +44,7 @@ jobs:
           git checkout -b $R_BRANCH && git push origin $R_BRANCH || git checkout $R_BRANCH
         shell: bash
         env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          GITHUB_TOKEN: ${{ secrets.GH_TOKEN }}
           RELEASE_VERSION: ${{ inputs.version }}
 
       - name: setup python
@@ -75,15 +79,15 @@ jobs:
         shell: bash
         env:
           RELEASE_VERSION: ${{ inputs.version }}
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          GITHUB_TOKEN: ${{ secrets.GH_TOKEN }}
           GIT_USER_NAME: "github-actions[bot]"
           GIT_USER_EMAIL: "41898282+github-actions[bot]@users.noreply.github.com"
           GIT_AUTHOR: "${{ github.actor }} <${{ github.actor }}@users.noreply.github.com>"
 
       - name: Create Pull Request
-        uses: abikouo/github_actions/.github/actions/create_pullrequest@release_v4
+        uses: ansible-network/github_actions/.github/actions/create_pullrequest@main
         with:
-          token: ${{ secrets.GITHUB_TOKEN }}
+          token: ${{ secrets.GH_TOKEN }}
           repository: ${{ github.repository }}
           base_branch: ${{ steps.create-branch.outputs.release_branch }}
           head_branch: ${{ steps.push-changes.outputs.created_branch }}

.github/workflows/release-tag.yml

@@ -67,7 +67,7 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.gh_token }}
 
       - name: Create Pull Request from Release branch to default branch
-        uses: abikouo/github_actions/.github/actions/create_pullrequest@release_v4
+        uses: ansible-network/github_actions/.github/actions/create_pullrequest@main
         with:
           token: ${{ secrets.gh_token }}
           repository: ${{ github.repository }}

.github/workflows/update_aws_variables.yml

@@ -1,6 +1,10 @@
 name: aws-variables
 on:
   workflow_call:
+    secrets:
+      GH_TOKEN:
+        description: The Github token to use.
+        required: false
 
 jobs:
   user-agent:
@@ -16,6 +20,7 @@ jobs:
           python_libs: "pyyaml"
           python_executable_url: "https://raw.githubusercontent.com/ansible-network/github_actions/main/scripts/update_aws_user_agent.py"
           file_pattern: "plugins/*.py"
+          token: ${{ secrets.GH_TOKEN || secrets.GITHUB_TOKEN }}
 
   boto-constraints:
     runs-on: ubuntu-latest
@@ -28,3 +33,4 @@ jobs:
         with:
           commit_message: "update botocore and boto3 tests constraints"
           python_executable_url: "https://raw.githubusercontent.com/ansible-network/github_actions/main/scripts/update_aws_boto_constraints.py"
+          token: ${{ secrets.GH_TOKEN || secrets.GITHUB_TOKEN }}

scripts/update_aws_boto_constraints.py

@@ -57,7 +57,8 @@ def update_tests_constraints(boto3_version: str, botocore_version: str) -> None:
     """
     boto_values = {"boto3": boto3_version, "botocore": botocore_version}
     for file in ("tests/unit/constraints.txt", "tests/integration/constraints.txt"):
-        update_single_file(file, boto_values)
+        if PosixPath(file).exists():
+            update_single_file(file, boto_values)
 
     min_boto_values = {
         "MINIMUM_BOTO3_VERSION": boto3_version,

scripts/update_aws_user_agent.py

@@ -26,7 +26,7 @@ def update_user_agent(src: PosixPath, var_name: str, galaxy_version: str) -> boo
     variable_regex = rf"^{var_name} = [\"|'](.*)[\"|']"
     new_content = []
     updated = False
-    logger.info("********** Parsing file => %s *************", src.stem)
+    logger.info("********** Parsing file => %s *************", src)
     with src.open() as file_handler:
         for line in file_handler.read().split("\n"):
             match = re.match(variable_regex, line)