From d5688dffd0aada1e1cac2f1e1577a85ab0d4183e Mon Sep 17 00:00:00 2001
From: Nick Hudson <nick.hudson@gmail.com>
Date: Mon, 9 Sep 2024 16:35:06 -0500
Subject: [PATCH] minor fixes

---
 .github/actions/argocd-update/action.yml | 10 +---------
 Cargo.toml                               |  6 +++---
 src/aws/servicequotas.rs                 |  6 ++++--
 3 files changed, 8 insertions(+), 14 deletions(-)

diff --git a/.github/actions/argocd-update/action.yml b/.github/actions/argocd-update/action.yml
index 88c0c72..c1590b0 100644
--- a/.github/actions/argocd-update/action.yml
+++ b/.github/actions/argocd-update/action.yml
@@ -45,9 +45,7 @@ runs:
       with:
         cmd: |
           yq -i '.spec.source.targetRevision= "${{ inputs.version }}"' ${{ inputs.clone_into }}/${{ inputs.subdirectory }}/tembo-metrics-use1.yaml
-          yq -i '.spec.source.targetRevision= "${{ inputs.version }}"' ${{ inputs.clone_into }}/${{ inputs.subdirectory }}/tembo-metrics-euc1.yaml
           yq -i '(.spec.source.helm.parameters.[] | select(.name == "image.tag")).value = "${{ inputs.version }}"' ${{ inputs.clone_into }}/${{ inputs.subdirectory }}/tembo-metrics-use1.yaml
-          yq -i '(.spec.source.helm.parameters.[] | select(.name == "image.tag")).value = "${{ inputs.version }}"' ${{ inputs.clone_into }}/${{ inputs.subdirectory }}/tembo-metrics-euc1.yaml
 
     - name: Update for prod deployments
       if: inputs.branch == 'prod-updates'
@@ -55,13 +53,7 @@ runs:
       with:
         cmd: |
           yq -i '.spec.source.targetRevision= "${{ inputs.version }}"' ${{ inputs.clone_into }}/${{ inputs.subdirectory }}/tembo-metrics-use1.yaml
-          yq -i '.spec.source.targetRevision= "${{ inputs.version }}"' ${{ inputs.clone_into }}/${{ inputs.subdirectory }}/tembo-metrics-euc1.yaml
-          yq -i '.spec.source.targetRevision= "${{ inputs.version }}"' ${{ inputs.clone_into }}/${{ inputs.subdirectory }}/tembo-metrics-apse1.yaml
-          yq -i '.spec.source.targetRevision= "${{ inputs.version }}"' ${{ inputs.clone_into }}/${{ inputs.subdirectory }}/tembo-metrics-usw2.yaml
           yq -i '(.spec.source.helm.parameters.[] | select(.name == "image.tag")).value = "${{ inputs.version }}"' ${{ inputs.clone_into }}/${{ inputs.subdirectory }}/tembo-metrics-use1.yaml
-          yq -i '(.spec.source.helm.parameters.[] | select(.name == "image.tag")).value = "${{ inputs.version }}"' ${{ inputs.clone_into }}/${{ inputs.subdirectory }}/tembo-metrics-euc1.yaml
-          yq -i '(.spec.source.helm.parameters.[] | select(.name == "image.tag")).value = "${{ inputs.version }}"' ${{ inputs.clone_into }}/${{ inputs.subdirectory }}/tembo-metrics-apse1.yaml
-          yq -i '(.spec.source.helm.parameters.[] | select(.name == "image.tag")).value = "${{ inputs.version }}"' ${{ inputs.clone_into }}/${{ inputs.subdirectory }}/tembo-metrics-usw2.yaml
 
     - name: Git commit and push to remote
       shell: bash
@@ -71,5 +63,5 @@ runs:
         git add --all
         # debugging
         git diff HEAD
-        git commit -m "Update from coredb-io/control-plane: ${{ inputs.version }}"
+        git commit -m "Update from tembo-io/tembo-metrics: ${{ inputs.version }}"
         git push origin ${{ inputs.branch }}
diff --git a/Cargo.toml b/Cargo.toml
index 97133ab..a29a3e9 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -6,9 +6,9 @@ edition = "2021"
 [dependencies]
 actix-web = "4.8"
 aws-config = "1.5"
-aws-sdk-servicequotas = "1.36"
-aws-sdk-cloudformation = "1.41"
-aws-sdk-iam = "1.38"
+aws-sdk-servicequotas = "1"
+aws-sdk-cloudformation = "1"
+aws-sdk-iam = "1"
 tokio = { version = "1", features = ["rt", "sync", "time", "parking_lot"] }
 serde_json = "1"
 clap = { version = "4.5", features = ["derive"] }
diff --git a/src/aws/servicequotas.rs b/src/aws/servicequotas.rs
index f926ab7..38c1a60 100644
--- a/src/aws/servicequotas.rs
+++ b/src/aws/servicequotas.rs
@@ -13,7 +13,7 @@ pub async fn get_cf_stack_quota(client: &Client) -> Result<i64, Box<dyn std::err
     let quota = resp
         .quota
         .and_then(|q| q.value)
-        .ok_or("Failed to get Cloudformation Stack quote")?;
+        .ok_or("Failed to get Cloudformation Stack quota")?;
 
     Ok(quota as i64)
 }
@@ -28,10 +28,12 @@ pub async fn get_iam_role_quota(client: &Client) -> Result<i64, Box<dyn std::err
         .send()
         .await?;
 
+    println!("resp: {:?}", resp);
+
     let quota = resp
         .quota
         .and_then(|q| q.value)
-        .ok_or("Failed to get IAM Role quote")?;
+        .ok_or("Failed to get IAM Role quota")?;
 
     Ok(quota as i64)
 }