From 4c1d6a05d6cd61ebd8f55818e1d3d1d3dc4236c5 Mon Sep 17 00:00:00 2001
From: Bitnami Containers <containers@bitnami.com>
Date: Tue, 12 Apr 2022 13:41:29 +0200
Subject: [PATCH] Filter archived repositories with jq

Signed-off-by: Bitnami Containers <containers@bitnami.com>
---
 scripts/fetch-commits.sh | 6 +++---
 scripts/sync-repos.sh    | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/scripts/fetch-commits.sh b/scripts/fetch-commits.sh
index 69149eb77bd0..8e291c63b607 100755
--- a/scripts/fetch-commits.sh
+++ b/scripts/fetch-commits.sh
@@ -16,7 +16,7 @@ function queryRepos() {
 
     while [[ "$page" -gt -1 ]]; do
         # Query only the public repos since we won't add private containers to bitnami/containers
-        page_repos="$(curl -H 'Content-Type: application/json' -H 'Accept: application/json' "https://api.github.com/orgs/bitnami/repos?type=public&per_page=${repos_per_page}&page=${page}&archived=false")"
+        page_repos="$(curl -H 'Content-Type: application/json' -H 'Accept: application/json' "https://api.github.com/orgs/bitnami/repos?type=public&per_page=${repos_per_page}&page=${page}")"
         repos="$(jq -s 'reduce .[] as $x ([]; . + $x)' <(echo "$repos") <(echo "$page_repos"))"     
         n_repos="$(jq length <<< "$page_repos")"   
         if [[ "$n_repos" -lt "$repos_per_page" ]]; then
@@ -31,8 +31,8 @@ function queryRepos() {
 
 function getContainerRepos() {
     local -r repos="$(queryRepos)"
-    local -r container_repos="$(jq -r '[ .[] | select(.name | test("bitnami-docker-.")) ]' <<< "$repos")"
-    echo "$container_repos" > /tmp/repos
+    # Get only bitnami-docker-* not archived repos
+    local -r container_repos="$(jq -r '[ .[] | select(.name | test("bitnami-docker-.")) | select(.archived == false) ]' <<< "$repos")"
     echo "$container_repos"
 }
 
diff --git a/scripts/sync-repos.sh b/scripts/sync-repos.sh
index f7ae11b27a56..1dc823a1f370 100755
--- a/scripts/sync-repos.sh
+++ b/scripts/sync-repos.sh
@@ -14,7 +14,7 @@ function queryRepos() {
 
     while [[ "$page" -gt -1 ]]; do
         # Query only the public repos since we won't add private containers to bitnami/containers
-        page_repos="$(curl -H 'Content-Type: application/json' -H 'Accept: application/json' "https://api.github.com/orgs/bitnami/repos?type=public&per_page=${repos_per_page}&page=${page}&archived=false")"
+        page_repos="$(curl -H 'Content-Type: application/json' -H 'Accept: application/json' "https://api.github.com/orgs/bitnami/repos?type=public&per_page=${repos_per_page}&page=${page}")"
         repos="$(jq -s 'reduce .[] as $x ([]; . + $x)' <(echo "$repos") <(echo "$page_repos"))"     
         n_repos="$(jq length <<< "$page_repos")"   
         if [[ "$n_repos" -lt "$repos_per_page" ]]; then
@@ -29,7 +29,7 @@ function queryRepos() {
 
 function getContainerRepos() {
     local -r repos="$(queryRepos)"
-    local -r container_repos="$(jq -r '[ .[] | select(.name | test("bitnami-docker-.")) ]' <<< "$repos")"
+    local -r container_repos="$(jq -r '[ .[] | select(.name | test("bitnami-docker-.")) | select(.archived == false) ]' <<< "$repos")"
     echo "$container_repos" > /tmp/repos
     echo "$container_repos"
 }