GCP costs - removed bq messages (#846)

* Fixed file name * Fixed file name * Revert "Fixed file name" This reverts commit dc9c1fb. * Fixed file name * Debugging * Debugging * Debugging * Debugging * Debugging * Debugging * Fixed typo
FairwindsOps · Nov 30, 2023 · 33d166e · 33d166e
1 parent 93cf743
commit 33d166e
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 3 deletions.
diff --git a/plugins/cloud-costs/CHANGELOG.md b/plugins/cloud-costs/CHANGELOG.md
@@ -1,5 +1,8 @@
 # Changelog
 
+## 0.1.3
+* Fix cloud costs content
+
 ## 0.1.2
 * Fix cloud costs file name
 

diff --git a/plugins/cloud-costs/cloud-costs.sh b/plugins/cloud-costs/cloud-costs.sh
@@ -174,11 +174,13 @@ if [[ "$provider" == "gcp" ]]; then
   gcloud auth activate-service-account --key-file=/.config/gcp-key.json --project=$projectname
 
   sql="SELECT main.* FROM \`$table\` AS main LEFT JOIN UNNEST(labels) as labels WHERE labels.key = '$tagkey' AND labels.value = '$tagvalue' and usage_start_time >= '$initial_date_time' AND usage_start_time < '$final_date_time' order by usage_start_time desc"
-  bq --format=prettyjson query --max_rows=1000000 --nouse_legacy_sql "$sql" > /output/cloudcosts-tmp.json
+  bq --quiet --format=prettyjson query --max_rows=10000000 --nouse_legacy_sql "$sql" > /output/cloudcosts-tmp.json
   echo "Google bigquey finished......"
 
-  mv /output/cloudcosts-tmp.json /output/cloudcosts.json
+  awk '$0 == "[" {p=1} p' < /output/cloudcosts-tmp.json > /output/cloudcosts-tmp-clean.json
 
+  mv /output/cloudcosts-tmp-clean.json /output/cloudcosts.json
   echo "Saved GCP costs file in /output/cloudcosts.json"  
+
   exit 0
 fi
diff --git a/plugins/cloud-costs/version.txt b/plugins/cloud-costs/version.txt
@@ -1 +1 @@
-0.1.2
+0.1.3