kjuulh/dagger
Archived
1
0
Fork 0
Code Issues 1 Pull Requests 1 Projects Releases Wiki Activity

stdlib/rds: fixed error management

Browse Source 
Signed-off-by: Sam Alba <sam.alba@gmail.com>
This commit is contained in:
Sam Alba 2021-04-22 09:44:18 -07:00
parent 6e16207221
commit 5be4ac1a1d
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
stdlib/aws/rds/rds.cue
View File

@ -47,6 +47,8 @@ import (
sql="CREATE DATABASE \"$(cat /inputs/name)\"" sql="CREATE DATABASE \"$(cat /inputs/name)\""
fi fi
cp /inputs/name /db_created
aws rds-data execute-statement \ aws rds-data execute-statement \
--resource-arn "$(cat /inputs/db_arn)" \ --resource-arn "$(cat /inputs/db_arn)" \
--secret-arn "$(cat /inputs/secret_arn)" \ --secret-arn "$(cat /inputs/secret_arn)" \
@ -56,11 +58,8 @@ import (
|& tee /tmp/out |& tee /tmp/out
exit_code=${PIPESTATUS[0]} exit_code=${PIPESTATUS[0]}
if [ $exit_code -ne 0 ]; then if [ $exit_code -ne 0 ]; then
cat /tmp/out grep -q "database exists\|already exists" /tmp/out || exit $exit_code
grep -q "database exists\|already exists" /tmp/out
[ $? -ne 0 ] && exit $exit_code
fi fi
cp /inputs/name /db_created
"""# """#
} }
} }
@ -113,6 +112,8 @@ import (
sql="CREATE USER \"$(cat /inputs/username)\" WITH PASSWORD '$(cat /inputs/password)'" sql="CREATE USER \"$(cat /inputs/username)\" WITH PASSWORD '$(cat /inputs/password)'"
fi fi
cp /inputs/username /username
aws rds-data execute-statement \ aws rds-data execute-statement \
--resource-arn "$(cat /inputs/db_arn)" \ --resource-arn "$(cat /inputs/db_arn)" \
--secret-arn "$(cat /inputs/secret_arn)" \ --secret-arn "$(cat /inputs/secret_arn)" \
@ -122,11 +123,8 @@ import (
|& tee tmp/out |& tee tmp/out
exit_code=${PIPESTATUS[0]} exit_code=${PIPESTATUS[0]}
if [ $exit_code -ne 0 ]; then if [ $exit_code -ne 0 ]; then
cat tmp/out grep -q "Operation CREATE USER failed for\|ERROR" tmp/out || exit $exit_code
grep -q "Operation CREATE USER failed for\|ERROR" tmp/out
[ $? -ne 0 ] && exit $exit_code
fi fi
cp /inputs/username /username
sql="SET PASSWORD FOR '$(cat /inputs/username)'@'%' = PASSWORD('$(cat /inputs/password)')" sql="SET PASSWORD FOR '$(cat /inputs/username)'@'%' = PASSWORD('$(cat /inputs/password)')"
if [ "$dbType" = postgres ]; then if [ "$dbType" = postgres ]; then