From 5566882556ae259e9c74fbdc74b946c5c94336f1 Mon Sep 17 00:00:00 2001
From: sabiurr <sabiur.rahman@datadoghq.com>
Date: Tue, 12 Sep 2023 12:34:05 -0400
Subject: [PATCH] Update aws-vault roles

---
 aws/logs_monitoring/release.sh                              | 6 +++---
 aws/logs_monitoring/tools/installation_test.sh              | 6 +++---
 .../tools/integration_tests/integration_tests.sh            | 4 ++--
 aws/logs_monitoring/tools/publish_prod.sh                   | 4 ++--
 aws/logs_monitoring/tools/publish_sandbox.sh                | 2 +-
 5 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/aws/logs_monitoring/release.sh b/aws/logs_monitoring/release.sh
index 3f1b903fe..1aeb5fad6 100755
--- a/aws/logs_monitoring/release.sh
+++ b/aws/logs_monitoring/release.sh
@@ -49,12 +49,12 @@ function aws-login() {
     cfg=( "$@" )
     shift
     if [ "$ACCOUNT" = "prod" ] ; then
-        aws-vault exec prod-engineering --  ${cfg[@]}
+        aws-vault exec sso-prod-engineering --  ${cfg[@]}
     else
         if [ "$DEPLOY_TO_SERVERLESS_SANDBOX" = "true" ] ; then
-            aws-vault exec serverless-sandbox-account-admin --  ${cfg[@]}
+            aws-vault exec sso-serverless-sandbox-account-admin --  ${cfg[@]}
         else
-            aws-vault exec sandbox-account-admin --  ${cfg[@]}
+            aws-vault exec sso-sandbox-account-admin --  ${cfg[@]}
         fi
     fi
 }
diff --git a/aws/logs_monitoring/tools/installation_test.sh b/aws/logs_monitoring/tools/installation_test.sh
index da8ecd241..8a66ee2ec 100755
--- a/aws/logs_monitoring/tools/installation_test.sh
+++ b/aws/logs_monitoring/tools/installation_test.sh
@@ -37,12 +37,12 @@ function aws-login() {
     cfg=( "$@" )
     shift
     if [ "$ACCOUNT" = "prod" ] ; then
-        aws-vault exec prod-engineering --  ${cfg[@]}
+        aws-vault exec sso-prod-engineering --  ${cfg[@]}
     else
         if [ "$DEPLOY_TO_SERVERLESS_SANDBOX" = "true" ] ; then
-            aws-vault exec serverless-sandbox-account-admin --  ${cfg[@]}
+            aws-vault exec sso-serverless-sandbox-account-admin --  ${cfg[@]}
         else
-            aws-vault exec sandbox-account-admin --  ${cfg[@]}
+            aws-vault exec sso-sandbox-account-admin --  ${cfg[@]}
         fi
     fi
 }
diff --git a/aws/logs_monitoring/tools/integration_tests/integration_tests.sh b/aws/logs_monitoring/tools/integration_tests/integration_tests.sh
index 9051d6b39..3ca568d2d 100755
--- a/aws/logs_monitoring/tools/integration_tests/integration_tests.sh
+++ b/aws/logs_monitoring/tools/integration_tests/integration_tests.sh
@@ -63,7 +63,7 @@ do
 		# Run additionalLambda tests
 
 		# Requires AWS credentials
-		# Use aws-vault exec sandbox-account-admin -- ./integration_tests.sh
+		# Use aws-vault exec sso-sandbox-account-admin -- ./integration_tests.sh
 		-a|--additional-lambda)
 		ADDITIONAL_LAMBDA=true
 		shift
@@ -249,4 +249,4 @@ if [ $CACHE_TEST == true ]; then
 	aws s3api delete-bucket --bucket $DD_S3_BUCKET_NAME
 
 	rm policy.json
-fi
\ No newline at end of file
+fi
diff --git a/aws/logs_monitoring/tools/publish_prod.sh b/aws/logs_monitoring/tools/publish_prod.sh
index c26bd29ef..5011797b0 100755
--- a/aws/logs_monitoring/tools/publish_prod.sh
+++ b/aws/logs_monitoring/tools/publish_prod.sh
@@ -39,7 +39,7 @@ fi
 # Ensure AWS access before proceeding
 SAML2AWS_IDP_PROVIDER=Browser ddsaml2aws login -a govcloud-us1-fed-human-engineering
 AWS_PROFILE=govcloud-us1-fed-human-engineering aws sts get-caller-identity
-aws-vault exec prod-engineering -- aws sts get-caller-identity
+aws-vault exec sso-prod-engineering -- aws sts get-caller-identity
 
 echo "Publishing layers to GovCloud AWS regions"
 SAML2AWS_IDP_PROVIDER=Browser ddsaml2aws login -a govcloud-us1-fed-human-engineering
@@ -47,4 +47,4 @@ LAYER_VERSION=$LAYER_VERSION FORWARDER_VERSION=$FORWARDER_VERSION AWS_PROFILE=go
 
 echo
 echo "Publishing layers to commercial AWS regions"
-LAYER_VERSION=$LAYER_VERSION FORWARDER_VERSION=$FORWARDER_VERSION aws-vault exec prod-engineering -- ./tools/publish_layers.sh
\ No newline at end of file
+LAYER_VERSION=$LAYER_VERSION FORWARDER_VERSION=$FORWARDER_VERSION aws-vault exec sso-prod-engineering -- ./tools/publish_layers.sh
diff --git a/aws/logs_monitoring/tools/publish_sandbox.sh b/aws/logs_monitoring/tools/publish_sandbox.sh
index ad6e9a39d..4e0fcfdd4 100755
--- a/aws/logs_monitoring/tools/publish_sandbox.sh
+++ b/aws/logs_monitoring/tools/publish_sandbox.sh
@@ -18,4 +18,4 @@ fi
 
 echo "FORWARDER_VERSION=$FORWARDER_VERSION"
 
-LAYER_VERSION=$LAYER_VERSION FORWARDER_VERSION=$FORWARDER_VERSION aws-vault exec sandbox-account-admin -- ./tools/publish_layers.sh
+LAYER_VERSION=$LAYER_VERSION FORWARDER_VERSION=$FORWARDER_VERSION aws-vault exec sso-sandbox-account-admin -- ./tools/publish_layers.sh