looking for other codeowners locations in repo

Author: joshjohanning

scripts/add-codeowners-file-to-repositories.sh

@@ -24,7 +24,7 @@ if [ ! -f "$1" ]; then
 fi
 
 if [ ! -f "$2" ]; then
-    echo "Codeowners file $2 does not exist"
+    echo "CODEOWNERS file $2 does not exist"
     exit 1
 fi
 
@@ -41,13 +41,31 @@ do
 
     echo "Checking $org/$repo ..."
 
-    # check if it exists first
-    # TO DO : check for all valid spots for CODEOWNERS file (docs, root, .github), right now just checks root
+    # check if it exists first - CODEOWNERS file can be in the root, .github, or docs folder
     if file=$(gh api /repos/$org/$repo/contents/CODEOWNERS 2>&1); then
+        exists=1
+        path="CODEOWNERS"
+        message="Updating CODEOWNERS file"
+    elif file=$(gh api /repos/$org/$repo/contents/.github/CODEOWNERS 2>&1); then
+        exists=1
+        path=".github/CODEOWNERS"
+        message="Updating CODEOWNERS file"
+    elif file=$(gh api /repos/$org/$repo/contents/docs/CODEOWNERS 2>&1); then
+        exists=1
+        path="docs/CODEOWNERS"
+        message="Updating CODEOWNERS file"
+    else
+        exists=0
+        path=CODEOWNERS
+        message="Adding CODEOWNERS file"
+    fi
+
+    if [ $exists=1 ]; then
         sha=$(echo $file | jq -r '.sha')
         echo " ... CODEOWNERS file already exists"
         # if $overwrite is true, then delete the CODEOWNERS file
         if [ "$overwrite" != true ] ; then
+            echo " ... replacing CODEOWNERS file"
             content=$(echo $file | jq -r '.content' | base64 -d)
             # create temp CODEOWNERS file and add existing to top
             echo "$content" | cat - $codeownersfile > ./CODEOWNERS.tmp
@@ -60,8 +78,16 @@ do
     fi
 
     # Commit the CODEOWNERS file
-    echo "comitting CODEOWNERS file to $org/$repo"
-    gh api /repos/$org/$repo/contents/CODEOWNERS -f message="Add CODEOWNERS file" -f content="$(base64 -i $codeownersfile)" -f sha=$sha -X PUT
+    echo " ... comitting $path file to $org/$repo"
+    if response=$(gh api -X PUT /repos/$org/$repo/contents/$path -f message="$message" -f content="$(base64 -i $codeownersfile)" -f sha=$sha 2>/dev/null); then
+        path=$(echo $response | jq -r '.content.path')
+        sha=$(echo $response | jq -r '.content.sha')
+        date=$(echo $response | jq -r '.commit.committer.date')
+        echo " ... committed $path with sha $sha on $date"
+    else
+        error=$(echo $response | jq -r ".message")
+        echo " ... failed to commit $path; $error"
+    fi
 
     # Delete the temp CODEOWNERS file if it exists
     if [ -f "./CODEOWNERS.tmp" ]; then

scripts/add-gitignore-file-to-repositories.sh

@@ -10,11 +10,11 @@
 #
 # Overwrite or append: 
 # - Defaults to append
-# - If you want to overwrite the gitignore file, pass true as the 3rd argument, otherwise, it will append to the existing file
+# - If you want to overwrite the .gitignore file, pass true as the 3rd argument, otherwise, it will append to the existing file
 #
 
 if [ $# -lt "2" ]; then
-    echo "Usage: $0 <reposfilename> <gitignore-file> [overwrite: true|false]"
+    echo "Usage: $0 <reposfilename> <.gitignore-file> [overwrite: true|false]"
     exit 1
 fi
 
@@ -24,7 +24,7 @@ if [ ! -f "$1" ]; then
 fi
 
 if [ ! -f "$2" ]; then
-    echo "gitignore file $2 does not exist"
+    echo ".gitignore file $2 does not exist"
     exit 1
 fi
 
@@ -44,23 +44,23 @@ do
     # check if it exists first
     if file=$(gh api /repos/$org/$repo/contents/.gitignore 2>&1); then
         sha=$(echo $file | jq -r '.sha')
-        echo " ... gitignore file already exists"
+        echo " ... .gitignore file already exists"
         # if $overwrite is true, then delete the gitignore file
         if [ "$overwrite" != true ] ; then
             content=$(echo $file | jq -r '.content' | base64 -d)
-            # create temp gitignore file and add existing to top
+            # create temp .gitignore file and add existing to top
             echo "$content" | cat - $gitignorefile > ./.gitignore.tmp
             gitignorefile=./.gitignore.tmp
         fi
     else
-        echo " ... gitignore file doesn't exist"
+        echo " ... .gitignore file doesn't exist"
         sha=""
         gitignorefile=$gitignorefile
     fi
 
-    # Commit the gitignore file
+    # Commit the .gitignore file
     echo " ... comitting .gitignore file to $org/$repo"
-    gh api /repos/$org/$repo/contents/.gitignore -f message="Add gitignore file" -f content="$(base64 -i $gitignorefile)" -f sha=$sha -X PUT
+    gh api -X PUT /repos/$org/$repo/contents/.gitignore -f message="Adding .gitignore file" -f content="$(base64 -i $gitignorefile)" -f sha=$sha
 
     # Delete the temp gitignore file if it exists
     if [ -f "./.gitignore.tmp" ]; then