Merge branch 'main' into create-ops-team

Author: cunla

.github/ISSUE_TEMPLATE/new-admin.yml

@@ -9,7 +9,7 @@ body:
       value: |
         Thanks for expressing interest in being an administrator for Django Commons!
         > [!NOTE]
-        > We are currently not accepting new admins. We will be revisiting our admin team around April of 2025. Please send your application though and we will reach out when we re-assess things.
+        > We revisit our admin team on an annual basis and do not accept new admins on an ad-hoc basis. Please submit this application so that we can reach out when we revisit our admin team. Thank you for your understanding!
   - type: checkboxes
     id: dsf-member
     attributes:

.github/ISSUE_TEMPLATE/new-member.yml

@@ -16,12 +16,6 @@ body:
       placeholder: Keep it to 2-4 sentences.
     validations:
       required: true
-  - type: textarea
-    id: which-projects
-    attributes:
-      label: Which project(s) are you looking to contribute to?
-    validations:
-      required: false
   - type: checkboxes
     id: general
     attributes:

.github/ISSUE_TEMPLATE/transfer-project-in.yml

@@ -50,6 +50,14 @@ body:
       options:
         - label: Does the project have a test.pypi.org project?
         - label: Would you like to test your deployments with uploads to test.pypi.org (you'll need to create the project first)?
+  - type: input
+    id: javascript-package-url
+    attributes:
+      label: If the project has a JavaScript component published separately to a registry like NPM, what's the URL to that package?
+      description: Most projects bundle their JavaScript together with the Python package on PyPI -- so this question likely does not apply to you in -- but some projects have a separate JavaScript package that is published to npm. If your project does this, please provide the URL. If not, you can leave this blank.
+      placeholder: "https://www.npmjs.com/package/your-package-name"
+    validations:
+      required: false
   - type: markdown
     attributes:
       value: |

.github/workflows/add_member.yml

@@ -18,6 +18,7 @@ jobs:
       issues: write
     env:
       ISSUE_NUMBER: ${{ github.event.issue.number }}
+      ISSUE_USER: ${{ github.event.issue.user.login }}
       BRANCH_NAME: "add-user/${{ github.event.issue.number }}"
 
     steps:
@@ -28,35 +29,38 @@ jobs:
 
       - name: Checkout code
         uses: actions/checkout@v5
+        with:
+          persist-credentials: false
 
       - name: Get username to add
         id: get_username
         run:
-          python -c "print('USERNAME='+'${{ github.event.issue.title }}'.split(' - ')[1].strip().lstrip('@'))" >> $GITHUB_ENV
+          python -c "print('USERNAME='+'${GITHUB_EVENT_ISSUE_TITLE}'.split(' - ')[1].strip().lstrip('@'))" >> $GITHUB_ENV
+        env:
+          GITHUB_EVENT_ISSUE_TITLE: ${{ github.event.issue.title }}
 
       - name: Validate add user request
         env:
           GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          ISSUE_USER: ${{ github.event.issue.user.login }}
         run: |
           # Check whether the user exists
           set +e
-          gh api /users/${{ env.USERNAME }} > /dev/null
+          gh api /users/${USERNAME} > /dev/null
           if [ $? -ne 0 ]; then
-              gh issue comment ${{ env.ISSUE_NUMBER }} --body "User ${{ env.USERNAME }} does not exist."
+              gh issue comment ${ISSUE_NUMBER} --body "User ${USERNAME} does not exist."
               exit 1
           fi
 
           # Check if the username is in the title is the same as the user who opened the issue
-          if [ "${{ env.USERNAME }}" != "${{ env.ISSUE_USER }}" ]; then
-              gh issue comment ${{ env.ISSUE_NUMBER }} --body "If you want to add a different user, please create a PR for it"
+          if [ "${USERNAME}" != "${ISSUE_USER}" ]; then
+              gh issue comment ${ISSUE_NUMBER} --body "If you want to add a different user, please create a PR for it"
               exit 1
           fi
           
           # Check if the user is already a member of the org
-          gh api /orgs/django-commons/members/${{ env.USERNAME }} > /dev/null
+          gh api /orgs/django-commons/members/${USERNAME} > /dev/null
           if [ $? -eq 0 ]; then
-              gh issue comment ${{ env.ISSUE_NUMBER }} --body "User ${{ env.USERNAME }} is already a member of django-commons."
+              gh issue comment ${ISSUE_NUMBER} --body "User ${USERNAME} is already a member of django-commons."
               exit 1
           fi
 
@@ -66,38 +70,38 @@ jobs:
           git config user.email noreply@github.com
 
       - name: Create branch
-        run: git checkout -b ${{ env.BRANCH_NAME }}
+        run: git checkout -b ${BRANCH_NAME}
 
       - name: Check if user wants to become a designer
         id: check_designer
         continue-on-error: true
         env:
           GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: |
-          ADD_TO_DESIGNERS=$(gh issue view ${{ env.ISSUE_NUMBER }} --json body | jq -e '.body | contains("[x] Do you wish to join the designers team?")')
+          ADD_TO_DESIGNERS=$(gh issue view ${ISSUE_NUMBER} --json body | jq -e '.body | contains("[x] Do you wish to join the designers team?")')
           if [ "$ADD_TO_DESIGNERS" = "true" ]; then
-            python scripts/add_member.py ${{ env.USERNAME }} designers
+            python scripts/add_member.py ${USERNAME} designers
           else
             echo "User does not want to join the designers team."
           fi
 
       - name: Add user to the list
         run: |
-          python scripts/add_member.py ${{ env.USERNAME }} members
+          python scripts/add_member.py ${USERNAME} members
 
       - name: Commit changes
         run: |
           git add terraform/production/org.tfvars
-          git commit -m "Add ${{ env.USERNAME }} to django-commons"
-          git push origin ${{ env.BRANCH_NAME }}
+          git commit -m "Add ${USERNAME} to django-commons"
+          git push origin ${BRANCH_NAME}
 
       - name: Create pull request
         run: |
           gh pr create \
-            --title "Add ${{ env.USERNAME }} to django-commons" \
-            --body "Fix #${{ env.ISSUE_NUMBER }}" \
+            --title "Add ${USERNAME} to django-commons" \
+            --body "Fix #${ISSUE_NUMBER}\n[New Member Playbook](https://github.com/django-commons/controls?tab=readme-ov-file#new-member-playbook)" \
             --base main \
-            --head ${{ env.BRANCH_NAME }} \
+            --head ${BRANCH_NAME} \
             --label "New member"
         env:
           GITHUB_TOKEN: ${{ secrets.TERRAFORM_MANAGEMENT_GITHUB_TOKEN }}

.github/workflows/apply.yml

@@ -22,6 +22,8 @@ jobs:
     steps:
       - name: Checkout code
         uses: actions/checkout@v4
+        with:
+          persist-credentials: false
 
       - name: terraform apply
         # v1.44.0
@@ -40,7 +42,8 @@ jobs:
 
       - name: Commit changes
         if: ${{ always() }}
-        uses: devops-infra/action-commit-push@v0.10.0
+        # v0.10.0
+        uses: devops-infra/action-commit-push@b8c990ac36bac67f71133ad7ec3da1d7abf4d57e
         with:
           github_token: "${{ secrets.TERRAFORM_MANAGEMENT_GITHUB_TOKEN }}"
           commit_prefix: "[AUTO]"

.github/workflows/member-verification.yml

@@ -13,6 +13,8 @@ jobs:
     steps:
       - name: Checkout code
         uses: actions/checkout@v4
+        with:
+          persist-credentials: false
 
       - name: Check PR title format
         id: check-title
@@ -85,4 +87,4 @@ jobs:
               repo: context.repo.repo,
               issue_number: context.issue.number,
               labels: ['verification-needed']
-            });
+            });

.github/workflows/plan.yml

@@ -21,6 +21,7 @@ jobs:
         uses: actions/checkout@v4
         with:
           ref: "${{ github.event.pull_request.head.ref }}"
+          persist-credentials: false
 
 
       - name: terraform fmt
@@ -29,7 +30,8 @@ jobs:
           path: "terraform"
 
       - name: Commit changes
-        uses: devops-infra/action-commit-push@v0.9.2
+        # v0.9.2
+        uses: devops-infra/action-commit-push@be5ba37125c79eb0016cbd8cc385f0aa160538c5
         with:
           github_token: "${{ secrets.GITHUB_TOKEN }}"
           commit_prefix: "[AUTO]"
@@ -48,6 +50,8 @@ jobs:
     steps:
       - name: Checkout code
         uses: actions/checkout@v4
+        with:
+          persist-credentials: false
 
       - name: terraform plan
         # v1.44.0

README.md

@@ -101,4 +101,4 @@ Any package is welcome to join Django Commons so long as it has tangible benefit
 
 ### Logo
 
-Vectors and icons by [Raisul Hadi](https://dribbble.com/Broc_Simp?ref=svgrepo.com) in CC Attribution License via [SVG Repo](https://www.svgrepo.com/).
+Logo was designed by [Violette Naa Adoley Allotey](https://www.linkedin.com/in/violette-naa-adoley-allotey/)