diff --git a/.aws/cli/alias b/.aws/cli/alias index a8aad3d37f07574edf56964cc12e1705d7d9433f..73962e31c3f8854a3208994f2e1190c129537bfb 100644 --- a/.aws/cli/alias +++ b/.aws/cli/alias @@ -1,3 +1,11 @@ [toplevel] whoami = sts get-caller-identity +region = configure get region +ecr-login = !$(aws ecr get-login --no-include-email) +metadata-region = !python3 << EOF + from urllib.request import urlopen + import json + response = urlopen('http://169.254.169.254/latest/dynamic/instance-identity/document') + print(json.loads(response.read().decode('utf-8'))['region']) + EOF diff --git a/.bashrc b/.bashrc index 223441aa0e6504bcb4d58b0da2b821b2a7d16364..ecf4a7ff66825ab70eb253ca2ae0b632deb969ec 100644 --- a/.bashrc +++ b/.bashrc @@ -67,7 +67,6 @@ alias ansible-local='ansible localhost -c local -i localhost,' alias ansible-local-playbook='ansible-playbook -i localhost, -c local' alias concat="perl -pe 's/\\n/\\\\n/g'" alias deconcat="perl -pe 's/\\\\n/\\n/g'" -alias ecr-login='eval $(aws ecr get-login --no-include-email)' alias hostlocal='docker run --rm --privileged --net=host gliderlabs/hostlocal' alias cadvisor='docker run --rm --volume=/:/rootfs:ro --volume=/var/run:/var/run:rw --volume=/sys:/sys:ro --volume=/var/lib/docker/:/var/lib/docker:ro --volume=/dev/disk/:/dev/disk:ro --publish=8080:8080 --detach=true --name=cadvisor google/cadvisor:latest' alias apt-daily="monitor __apt-daily" @@ -173,18 +172,6 @@ cyan () { printf '\e[0m' || true } -deduce_aws_region () { - AWS_DEFAULT_REGION="$(python3 << EOF -from urllib.request import urlopen -import json -response = urlopen('http://169.254.169.254/latest/dynamic/instance-identity/document') -print(json.loads(response.read().decode('utf-8'))['region']) -EOF - )" - export AWS_DEFAULT_REGION - echo "$AWS_DEFAULT_REGION" -} - ssh_keyscan_add () { ssh-keyscan "$@" >> "$HOME/.ssh/known_hosts" sort -uo "$HOME/.ssh/known_hosts" "$HOME/.ssh/known_hosts"