add patch file, use comment bot, still a wip

Author: sleepyStick

.evergreen/config.yml

@@ -49,6 +49,7 @@ tasks:
       - command: subprocess.exec
         params:
           binary: bash
+          include_expansions_in_env: [AWS_ACCESS_KEY_ID, AWS_SECRET_ACCESS_KEY, AWS_SESSION_TOKEN]
           args:
             - .evergreen/scripts/resync-all-specs.sh
           working_dir: src

.evergreen/scripts/create-pr.sh

@@ -9,43 +9,54 @@ pushd $tools/.evergreen/github_app
 owner="mongodb"
 repo="mongo-python-driver"
 
-echo "bootstrapping?"
 # Bootstrap the app.
+echo "bootstrapping"
 source utils.sh
-bootstrap drivers/release-bot
+bootstrap drivers/comment-bot
 
 # Run the app.
+source ./secrets-export.sh
 
 # Get a github access token for the git checkout.
 echo "Getting github token..."
+
 token=$(bash ./get-access-token.sh $repo $owner)
 if [ -z "${token}" ]; then
     echo "Failed to get github access token!"
     popd
     exit 1
 fi
 echo "Getting github token... done."
+popd
 
 # Make the git checkout and create a new branch.
 echo "Creating the git checkout..."
 branch="spec-resync-"$(date '+%m-%d-%Y')
 
-git config user.email "167856002+mongodb-dbx-release-bot[bot]@users.noreply.github.com"
-git config user.name "mongodb-dbx-release-bot[bot]"
+#git config user.email "167856002+mongodb-dbx-release-bot[bot]@users.noreply.github.com"
+#git config user.name "mongodb-dbx-release-bot[bot]"
 git remote set-url origin https://x-access-token:${token}@github.com/$owner/$repo.git
 git checkout -b $branch "origin/master"
 git add ./test
+git apply -R .evergreen/specs.patch
+git commit -am "resyncing specs test?"
 echo "Creating the git checkout... done."
 
-git push origin $branch
-resp=$(curl -L \
-    -X POST \
-    -H "Accept: application/vnd.github+json" \
-    -H "Authorization: Bearer $token" \
-    -H "X-GitHub-Api-Version: 2022-11-28" \
-    -d "{\"title\":\"[Spec Resync] $(date '+%m-%d-%Y')\",\"body\":\"${body}\",\"head\":\"${branch}\",\"base\":\"main\"}" \
-    --url https://api.github.com/repos/$owner/$repo/pulls)
-echo $resp | jq '.html_url'
-echo "Creating the PR... done."
-
-rm -rf $dirname
+echo "THIS IS THE BODY"
+echo "$body"
+#git push origin $branch
+#resp=$(curl -L \
+#    -X POST \
+#    -H "Accept: application/vnd.github+json" \
+#    -H "Authorization: Bearer $token" \
+#    -H "X-GitHub-Api-Version: 2022-11-28" \
+#    -d "{\"title\":\"[Spec Resync] $(date '+%m-%d-%Y')\",\"body\":\"${body}\",\"head\":\"${branch}\",\"base\":\"master\"}" \
+#    --url https://api.github.com/repos/$owner/$repo/pulls)
+#echo $resp
+#echo $resp | jq '.html_url'
+#echo "Creating the PR... done."
+
+rm -rf $tools
+
+# use file names or reg-ex patterns
+# or automate which version of the spec we support (like schema version)

.evergreen/scripts/resync-all-specs.sh

@@ -1,11 +1,10 @@
 #!/usr/bin/env bash
 # Run spec syncing script and create PR
-
 SPEC_DEST="$(realpath -s "./test")"
 SRC_URL="https://github.com/mongodb/specifications.git"
 # needs to be set for resunc-specs.sh
 SPEC_SRC="$(realpath -s "../specifications")"
-SCRIPT="$(realpath -s ".evergreen/resync-specs.sh")"
+SCRIPT="$(realpath -s "./.evergreen/resync-specs.sh")"
 BRANCH_NAME="spec-resync-"$(date '+%m-%d-%Y')
 
 # List of directories to skip
@@ -27,14 +26,16 @@ fi
 
 # Set environment variable to the cloned repo for resync-specs.sh
 export MDB_SPECS="$SPEC_SRC"
-echo "$SPEC_SRC"
+
 
 # Check that resync script exists and is executable
 if [[ ! -x $SCRIPT ]]; then
   echo "Error: $SCRIPT not found or is not executable."
   exit 1
 fi
 
+git pull
+
 # List to store names of specs that were changed or errored during change
 changed_specs=()
 errored_specs=()
@@ -51,48 +52,45 @@ for item in "$SPEC_DEST"/*; do
   # Check that item is not a python file
   if [[ $item != *.py ]]; then
     echo " doing $item_name"
-#    output=$(./$SCRIPT "$item_name" 2>&1)
-    $SCRIPT "$item_name"
+    output=$($SCRIPT "$item_name" 2>&1)
     # Check if the script ran successfully
     if [[ $? -ne 0 ]]; then
       echo "an error occurred"
-      errored_specs+=("$item_name")
-    else
-      # if script had output, then changes were made
-      if [[ -n "$output" ]]; then
-        echo "success"
-        changed_specs+=("$item_name")
-      fi
+      errored_specs+=($"$item_name\n\`\`\`$output\`\`\`\n\n")
     fi
   fi
 done
 
-pr_body="Spec sync results:\n\n"
 # Output the list of changed specs
-if [[ ${#changed_specs[@]} -gt 0 ]]; then
-  pr_body+="The following specs were changed:\n"
-  for spec in "${changed_specs[@]}"; do
-    pr_body+=" - $spec\n"
-  done
-else
-  pr_body+="No changes detected in any specs.\n"
+if git diff --quiet && [[ ${#errored_specs[@]} -eq 0 ]]; then
+  # no changes made and no errors
+  exit 0
+fi
+
+pr_body=$'Spec sync results:\n\n'
+if ! git diff --quiet; then
+  pr_body+=$'The following specs were changed:\n'
+  pr_body+="$(git diff --name-only | awk -F'/' '{print $2}' | sort | uniq)"
 fi
 
 # Output the list of errored specs
 if [[ ${#errored_specs[@]} -gt 0 ]]; then
-  pr_body+="\nThe following spec syncs encountered errors:\n"
+  pr_body+=$"\n\nThe following spec syncs encountered errors:\n"
   for spec in "${errored_specs[@]}"; do
     pr_body+=" - $spec\n"
   done
 else
-  pr_body+="\nNo errors were encountered in any specs syncs.\n"
+  pr_body+=$"\nNo errors were encountered in any specs syncs.\n"
 fi
 
 # Output the PR body (optional step for verification)
-echo -e "$pr_body"
+echo "PR body"
+echo "$pr_body"
 echo "$pr_body" >> spec_sync.txt
 
+echo "BEGINNING OF DIFF"
 git diff
+echo "END OF DIFF"
 
 # call scrypt to create PR for us
 .evergreen/scripts/create-pr.sh spec_sync.txt

.evergreen/specs.patch

@@ -0,0 +1,88 @@
+diff --git a/test/load_balancer/cursors.json b/test/load_balancer/cursors.json
+index 27aaddd5..b11bf2c6 100644
+--- a/test/load_balancer/cursors.json
++++ b/test/load_balancer/cursors.json
+@@ -385,7 +385,7 @@
+       ]
+     },
+     {
+-      "description": "pinned connections are returned after an network error during getMore",
++      "description": "pinned connections are not returned after an network error during getMore",
+       "operations": [
+         {
+           "name": "failPoint",
+@@ -449,7 +449,7 @@
+           "object": "testRunner",
+           "arguments": {
+             "client": "client0",
+-            "connections": 0
++            "connections": 1
+           }
+         },
+         {
+@@ -677,7 +677,7 @@
+       ]
+     },
+     {
+-      "description": "pinned connections are returned to the pool after a non-network error on getMore",
++      "description": "pinned connections are not returned to the pool after a non-network error on getMore",
+       "operations": [
+         {
+           "name": "failPoint",
+@@ -733,7 +733,7 @@
+           "object": "testRunner",
+           "arguments": {
+             "client": "client0",
+-            "connections": 0
++            "connections": 1
+           }
+         },
+         {
+diff --git a/test/server_selection_logging/operation-id.json b/test/server_selection_logging/operation-id.json
+index ccc26231..72ebff60 100644
+--- a/test/server_selection_logging/operation-id.json
++++ b/test/server_selection_logging/operation-id.json
+@@ -197,7 +197,7 @@
+               }
+             },
+             {
+-              "level": "debug",
++              "level": "info",
+               "component": "serverSelection",
+               "data": {
+                 "message": "Waiting for suitable server to become available",
+@@ -383,7 +383,7 @@
+               }
+             },
+             {
+-              "level": "debug",
++              "level": "info",
+               "component": "serverSelection",
+               "data": {
+                 "message": "Waiting for suitable server to become available",
+diff --git a/test/server_selection_logging/replica-set.json b/test/server_selection_logging/replica-set.json
+index 830b1ea5..5eba784b 100644
+--- a/test/server_selection_logging/replica-set.json
++++ b/test/server_selection_logging/replica-set.json
+@@ -184,7 +184,7 @@
+               }
+             },
+             {
+-              "level": "debug",
++              "level": "info",
+               "component": "serverSelection",
+               "data": {
+                 "message": "Waiting for suitable server to become available",
+diff --git a/test/server_selection_logging/sharded.json b/test/server_selection_logging/sharded.json
+index 346c050f..d42fba91 100644
+--- a/test/server_selection_logging/sharded.json
++++ b/test/server_selection_logging/sharded.json
+@@ -193,7 +193,7 @@
+               }
+             },
+             {
+-              "level": "debug",
++              "level": "info",
+               "component": "serverSelection",
+               "data": {
+                 "message": "Waiting for suitable server to become available",