From 8cd9ffbbd3c0e02cf561ec97df1c4ee3009e7c77 Mon Sep 17 00:00:00 2001
From: Steven Emelander <emelande@amazon.com>
Date: Wed, 31 Jul 2024 17:35:01 -0400
Subject: [PATCH] Minor fixes to agent installation

* Updated both the install script and the systemd service to use the executable name that is built (aws_secretsmanager_agent) instead of the previous aws-secrets-manager-agent.
* Due to install script running as root, files in bin directory are not owned by the agentuser.  This is necessary for systemd run processes and so I added an additional chown to recursively set the owner to AWSAGENT within AGENTDIR.
---
 aws_secretsmanager_agent/configuration/awssmastartup.service | 2 +-
 aws_secretsmanager_agent/configuration/install               | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/aws_secretsmanager_agent/configuration/awssmastartup.service b/aws_secretsmanager_agent/configuration/awssmastartup.service
index 66f2673..272bc9a 100644
--- a/aws_secretsmanager_agent/configuration/awssmastartup.service
+++ b/aws_secretsmanager_agent/configuration/awssmastartup.service
@@ -13,7 +13,7 @@ Environment="AWS_TOKEN=file:///var/run/awssmatoken"
 Type=exec
 Restart=always
 TimeoutSec=1min
-ExecStart=/opt/aws/secretsmanageragent/bin/aws-secrets-manager-agent
+ExecStart=/opt/aws/secretsmanageragent/bin/aws_secretsmanager_agent
 
 [Install]
 WantedBy=multi-user.target
diff --git a/aws_secretsmanager_agent/configuration/install b/aws_secretsmanager_agent/configuration/install
index d8a2fbe..9b14f04 100755
--- a/aws_secretsmanager_agent/configuration/install
+++ b/aws_secretsmanager_agent/configuration/install
@@ -3,7 +3,7 @@
 PATH=/bin:/usr/bin:/sbin:/usr/sbin # Use a safe path
 
 AGENTDIR=/opt/aws/secretsmanageragent
-AGENTBIN=aws-secrets-manager-agent
+AGENTBIN=aws_secretsmanager_agent
 TOKENGROUP=awssmatokenreader
 AGENTUSER=awssmauser
 TOKENSCRIPT=awssmaseedtoken
@@ -27,11 +27,12 @@ if [ ! -r ${AGENTBIN} ]; then
 fi
 
 groupadd -f ${TOKENGROUP}
-useradd -r -m -g ${TOKENGROUP} -d ${AGENTDIR} ${AGENTUSER}
+useradd -r -m -g ${TOKENGROUP} -d ${AGENTDIR} ${AGENTUSER} || true
 chmod 755 ${AGENTDIR}
 
 install -D -T -m 755 ${AGENTBIN} ${AGENTDIR}/bin/${AGENTBIN}
 install -D -T -m 755 ${TOKENSCRIPT} ${AGENTDIR}/bin/${TOKENSCRIPT}
+chown -R ${AGENTUSER} ${AGENTDIR}
 install -T -m 755 ${TOKENSCRIPT}.service ${SYSTEMDFILES}/${TOKENSCRIPT}.service 
 install -T -m 755 ${AGENTSCRIPT}.service ${SYSTEMDFILES}/${AGENTSCRIPT}.service