Skip to content

Commit d2a5e28

Browse files
RobCannonmorgante
RobCannon
and
morgante
committed
fix: Removed dependency on jq from wait-for-cluster.sh script (#402)
* Removed need for jq in wait-for-cluster.sh script * Updated all wait-for-cluster.sh scripts * Fixing SC2086 warning Co-authored-by: Morgante Pell <[email protected]>
1 parent 65071ef commit d2a5e28

File tree

7 files changed

+28
-42
lines changed

7 files changed

+28
-42
lines changed

‎autogen/main/scripts/wait-for-cluster.sh‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,17 +22,15 @@ fi
2222

2323
PROJECT=$1
2424
CLUSTER_NAME=$2
25-
gcloud_command="gcloud container clusters list --project=$PROJECT --format=json"
26-
jq_query=".[] | select(.name==\"$CLUSTER_NAME\") | .status"
2725

28-
echo "Waiting for cluster $2 in project $1 to reconcile..."
26+
echo "Waiting for cluster $CLUSTER_NAME in project $PROJECT to reconcile..."
2927

30-
current_status=$($gcloud_command | jq -r "$jq_query")
28+
current_status=$(gcloud container clusters list --project="$PROJECT" --filter=name:"$CLUSTER_NAME" --format="value(status)")
3129

32-
while [[ "${current_status}" == "RECONCILING" ]]; do
30+
while [[ "$current_status" == "RECONCILING" ]]; do
3331
printf "."
3432
sleep 5
35-
current_status=$($gcloud_command | jq -r "$jq_query")
33+
current_status=$(gcloud container clusters list --project="$PROJECT" --filter=name:"$CLUSTER_NAME" --format="value(status)")
3634
done
3735

3836
echo "Cluster is ready!"

‎modules/beta-private-cluster-update-variant/scripts/wait-for-cluster.sh‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,17 +22,15 @@ fi
2222

2323
PROJECT=$1
2424
CLUSTER_NAME=$2
25-
gcloud_command="gcloud container clusters list --project=$PROJECT --format=json"
26-
jq_query=".[] | select(.name==\"$CLUSTER_NAME\") | .status"
2725

28-
echo "Waiting for cluster $2 in project $1 to reconcile..."
26+
echo "Waiting for cluster $CLUSTER_NAME in project $PROJECT to reconcile..."
2927

30-
current_status=$($gcloud_command | jq -r "$jq_query")
28+
current_status=$(gcloud container clusters list --project="$PROJECT" --filter=name:"$CLUSTER_NAME" --format="value(status)")
3129

32-
while [[ "${current_status}" == "RECONCILING" ]]; do
30+
while [[ "$current_status" == "RECONCILING" ]]; do
3331
printf "."
3432
sleep 5
35-
current_status=$($gcloud_command | jq -r "$jq_query")
33+
current_status=$(gcloud container clusters list --project="$PROJECT" --filter=name:"$CLUSTER_NAME" --format="value(status)")
3634
done
3735

3836
echo "Cluster is ready!"

‎modules/beta-private-cluster/scripts/wait-for-cluster.sh‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,17 +22,15 @@ fi
2222

2323
PROJECT=$1
2424
CLUSTER_NAME=$2
25-
gcloud_command="gcloud container clusters list --project=$PROJECT --format=json"
26-
jq_query=".[] | select(.name==\"$CLUSTER_NAME\") | .status"
2725

28-
echo "Waiting for cluster $2 in project $1 to reconcile..."
26+
echo "Waiting for cluster $CLUSTER_NAME in project $PROJECT to reconcile..."
2927

30-
current_status=$($gcloud_command | jq -r "$jq_query")
28+
current_status=$(gcloud container clusters list --project="$PROJECT" --filter=name:"$CLUSTER_NAME" --format="value(status)")
3129

32-
while [[ "${current_status}" == "RECONCILING" ]]; do
30+
while [[ "$current_status" == "RECONCILING" ]]; do
3331
printf "."
3432
sleep 5
35-
current_status=$($gcloud_command | jq -r "$jq_query")
33+
current_status=$(gcloud container clusters list --project="$PROJECT" --filter=name:"$CLUSTER_NAME" --format="value(status)")
3634
done
3735

3836
echo "Cluster is ready!"

‎modules/beta-public-cluster/scripts/wait-for-cluster.sh‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,17 +22,15 @@ fi
2222

2323
PROJECT=$1
2424
CLUSTER_NAME=$2
25-
gcloud_command="gcloud container clusters list --project=$PROJECT --format=json"
26-
jq_query=".[] | select(.name==\"$CLUSTER_NAME\") | .status"
2725

28-
echo "Waiting for cluster $2 in project $1 to reconcile..."
26+
echo "Waiting for cluster $CLUSTER_NAME in project $PROJECT to reconcile..."
2927

30-
current_status=$($gcloud_command | jq -r "$jq_query")
28+
current_status=$(gcloud container clusters list --project="$PROJECT" --filter=name:"$CLUSTER_NAME" --format="value(status)")
3129

32-
while [[ "${current_status}" == "RECONCILING" ]]; do
30+
while [[ "$current_status" == "RECONCILING" ]]; do
3331
printf "."
3432
sleep 5
35-
current_status=$($gcloud_command | jq -r "$jq_query")
33+
current_status=$(gcloud container clusters list --project="$PROJECT" --filter=name:"$CLUSTER_NAME" --format="value(status)")
3634
done
3735

3836
echo "Cluster is ready!"

‎modules/private-cluster-update-variant/scripts/wait-for-cluster.sh‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,17 +22,15 @@ fi
2222

2323
PROJECT=$1
2424
CLUSTER_NAME=$2
25-
gcloud_command="gcloud container clusters list --project=$PROJECT --format=json"
26-
jq_query=".[] | select(.name==\"$CLUSTER_NAME\") | .status"
2725

28-
echo "Waiting for cluster $2 in project $1 to reconcile..."
26+
echo "Waiting for cluster $CLUSTER_NAME in project $PROJECT to reconcile..."
2927

30-
current_status=$($gcloud_command | jq -r "$jq_query")
28+
current_status=$(gcloud container clusters list --project="$PROJECT" --filter=name:"$CLUSTER_NAME" --format="value(status)")
3129

32-
while [[ "${current_status}" == "RECONCILING" ]]; do
30+
while [[ "$current_status" == "RECONCILING" ]]; do
3331
printf "."
3432
sleep 5
35-
current_status=$($gcloud_command | jq -r "$jq_query")
33+
current_status=$(gcloud container clusters list --project="$PROJECT" --filter=name:"$CLUSTER_NAME" --format="value(status)")
3634
done
3735

3836
echo "Cluster is ready!"

‎modules/private-cluster/scripts/wait-for-cluster.sh‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,17 +22,15 @@ fi
2222

2323
PROJECT=$1
2424
CLUSTER_NAME=$2
25-
gcloud_command="gcloud container clusters list --project=$PROJECT --format=json"
26-
jq_query=".[] | select(.name==\"$CLUSTER_NAME\") | .status"
2725

28-
echo "Waiting for cluster $2 in project $1 to reconcile..."
26+
echo "Waiting for cluster $CLUSTER_NAME in project $PROJECT to reconcile..."
2927

30-
current_status=$($gcloud_command | jq -r "$jq_query")
28+
current_status=$(gcloud container clusters list --project="$PROJECT" --filter=name:"$CLUSTER_NAME" --format="value(status)")
3129

32-
while [[ "${current_status}" == "RECONCILING" ]]; do
30+
while [[ "$current_status" == "RECONCILING" ]]; do
3331
printf "."
3432
sleep 5
35-
current_status=$($gcloud_command | jq -r "$jq_query")
33+
current_status=$(gcloud container clusters list --project="$PROJECT" --filter=name:"$CLUSTER_NAME" --format="value(status)")
3634
done
3735

3836
echo "Cluster is ready!"

‎scripts/wait-for-cluster.sh‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,17 +22,15 @@ fi
2222

2323
PROJECT=$1
2424
CLUSTER_NAME=$2
25-
gcloud_command="gcloud container clusters list --project=$PROJECT --format=json"
26-
jq_query=".[] | select(.name==\"$CLUSTER_NAME\") | .status"
2725

28-
echo "Waiting for cluster $2 in project $1 to reconcile..."
26+
echo "Waiting for cluster $CLUSTER_NAME in project $PROJECT to reconcile..."
2927

30-
current_status=$($gcloud_command | jq -r "$jq_query")
28+
current_status=$(gcloud container clusters list --project="$PROJECT" --filter=name:"$CLUSTER_NAME" --format="value(status)")
3129

32-
while [[ "${current_status}" == "RECONCILING" ]]; do
30+
while [[ "$current_status" == "RECONCILING" ]]; do
3331
printf "."
3432
sleep 5
35-
current_status=$($gcloud_command | jq -r "$jq_query")
33+
current_status=$(gcloud container clusters list --project="$PROJECT" --filter=name:"$CLUSTER_NAME" --format="value(status)")
3634
done
3735

3836
echo "Cluster is ready!"

0 commit comments

Comments
 (0)