From cfb69058a0338401f100bc96ef4ed1bb0a789f38 Mon Sep 17 00:00:00 2001 From: Adar Nimrod <nimrod@shore.co.il> Date: Tue, 1 Mar 2022 10:18:37 +0200 Subject: [PATCH] Remove Smile configs. --- .aws/config | 6 -- .aws/credentials.j2 | 4 -- .bash_completion.d/smile-exec | 19 ------ .bashrc | 1 - .bundle/config.j2 | 1 - .config/gem/gemrc.j2 | 1 - .netrc.j2 | 8 --- .ssh/config.d/19_scalegrid | 6 -- .ssh/config.d/20_smile | 10 ---- Documents/bin/smile-exec | 108 ---------------------------------- Makefile | 4 -- 11 files changed, 168 deletions(-) delete mode 100644 .bash_completion.d/smile-exec delete mode 100644 .ssh/config.d/19_scalegrid delete mode 100644 .ssh/config.d/20_smile delete mode 100755 Documents/bin/smile-exec diff --git a/.aws/config b/.aws/config index 6f2ec3b..386f4ea 100644 --- a/.aws/config +++ b/.aws/config @@ -1,8 +1,2 @@ [profile shore] region = us-east-1 - -[profile smile] -region = us-east-1 - -# For aws-vault -[profile smile-security] diff --git a/.aws/credentials.j2 b/.aws/credentials.j2 index 76c3be8..c5ce38b 100644 --- a/.aws/credentials.j2 +++ b/.aws/credentials.j2 @@ -2,7 +2,3 @@ [shore] aws_access_key_id = {{ run(["ph", "show", "--field", "UserName", "shore.co.il/AWS CLI"])["stdout"] }} aws_secret_access_key = {{ run(["ph", "show", "--field", "Password", "shore.co.il/AWS CLI"])["stdout"] }} - -[smile] -aws_access_key_id = {{ run(["ph", "show", "--field", "UserName", "Smile/AWS CLI"])["stdout"] }} -aws_secret_access_key = {{ run(["ph", "show", "--field", "Password", "Smile/AWS CLI"])["stdout"] }} diff --git a/.bash_completion.d/smile-exec b/.bash_completion.d/smile-exec deleted file mode 100644 index 750f9d5..0000000 --- a/.bash_completion.d/smile-exec +++ /dev/null @@ -1,19 +0,0 @@ -# vim: ft=bash -# shellcheck shell=bash - -_smile_exec() { - local cur prev words cword opts - _init_completion || return - opts='-e --env -h --help -l --list' - if [[ $prev == -e ]] || [[ $prev == --env ]] - then - COMPREPLY=($(compgen -W "$(smile-exec -l)" -- "$cur")) - elif [[ $cur == -* ]] - then - COMPREPLY=($(compgen -W "$opts" -- "$cur")) - else - COMPREPLY=($(compgen -c -- "$cur")) - fi -} - -complete -F _smile_exec smile-exec diff --git a/.bashrc b/.bashrc index 8d7fe36..09a8b45 100644 --- a/.bashrc +++ b/.bashrc @@ -377,7 +377,6 @@ then export CDPATH="$CDPATH:$HOME/Repositories/Shore" export CDPATH="$CDPATH:$HOME/Repositories/nehesr" export CDPATH="$CDPATH:$HOME/Repositories/GitHub" - export CDPATH="$CDPATH:$HOME/Repositories/Smile" export CDPATH="$CDPATH:$HOME/Repositories" # shellcheck disable=SC2016 export PROMPT_COMMAND='__prompt' diff --git a/.bundle/config.j2 b/.bundle/config.j2 index 5444b3d..7a0b67e 100644 --- a/.bundle/config.j2 +++ b/.bundle/config.j2 @@ -1,3 +1,2 @@ # vim:ft=yaml --- -BUNDLE_HTTPS://RUBYGEMS__PKG__GITHUB__COM/SMILE___IO/: '{{ run(["ph", "show", "--field", "UserName", "Web Sites/GitHub"])["stdout"] }}:{{ run(["ph", "show", "--field", "Smile gem token", "Web Sites/GitHub"])["stdout"] }}' diff --git a/.config/gem/gemrc.j2 b/.config/gem/gemrc.j2 index d75d87b..7fea046 100644 --- a/.config/gem/gemrc.j2 +++ b/.config/gem/gemrc.j2 @@ -4,7 +4,6 @@ :bulk_threshold: 1000 :sources: - https://rubygems.org/ -- https://{{ run(["ph", "show", "--field", "UserName", "Web Sites/GitHub"])["stdout"] }}:{{ run(["ph", "show", "--field", "Smile gem token", "Web Sites/GitHub"])["stdout"] }}@rubygems.pkg.github.com/smile-io/ :update_sources: true :verbose: true :concurrent_downloads: 8 diff --git a/.netrc.j2 b/.netrc.j2 index d444847..e69de29 100644 --- a/.netrc.j2 +++ b/.netrc.j2 @@ -1,8 +0,0 @@ - -machine api.heroku.com - login {{ run(["ph", "show", "--field", "UserName", "Smile/Heroku"])["stdout"] }} - password {{ run(["ph", "show", "--field", "netrc", "Smile/Heroku"])["stdout"] }} - -machine git.heroku.com - login {{ run(["ph", "show", "--field", "UserName", "Smile/Heroku"])["stdout"] }} - password {{ run(["ph", "show", "--field", "netrc", "Smile/Heroku"])["stdout"] }} diff --git a/.ssh/config.d/19_scalegrid b/.ssh/config.d/19_scalegrid deleted file mode 100644 index 399debe..0000000 --- a/.ssh/config.d/19_scalegrid +++ /dev/null @@ -1,6 +0,0 @@ - -# vim:ft=sshconfig -# Scalegrid instances -Host *.servers.mongodirector.com -IdentityFile ~/.ssh/smile_scalegrid_rsa -User ec2-user diff --git a/.ssh/config.d/20_smile b/.ssh/config.d/20_smile deleted file mode 100644 index 152f552..0000000 --- a/.ssh/config.d/20_smile +++ /dev/null @@ -1,10 +0,0 @@ - -# vim:ft=sshconfig -# Smile infrastructure - -Host *.smile.io 10.0.*.* 10.2.*.* 10.10.*.* -IdentityFile ~/.ssh/smile_ed25519 -IdentityFile ~/.ssh/smile_rsa -IdentityFile ~/.ssh/smile_scalegrid_rsa -IdentityFile ~/.ssh/smile_sre_shared_rsa -User nimrodadar diff --git a/Documents/bin/smile-exec b/Documents/bin/smile-exec deleted file mode 100755 index 647a1c6..0000000 --- a/Documents/bin/smile-exec +++ /dev/null @@ -1,108 +0,0 @@ -#!/bin/sh -set -eu - -envs='dev prod sandbox-1 security shared-services stage' - -usage() { - echo "$0: [-h|--help] [-e|--env SMILE_ENV ] [-l|--list] COMMAND [PARAMETER1 [PARAMETER2 ...]]" - echo "You can either set the environment with -e or --env switch or set the SMILE_ENV environment variable." - echo "Valid environments are: $envs" -} - -vault_addr() { - case "$1" in - stage) echo "https://vault.smile-staging.aws";; - prod) echo "https://vault.smile-production.aws";; - security) return;; - shared-services) return;; - *) echo "https://vault.smile.aws";; - esac -} - -aws_account() { - case "$1" in - sandbox-1) echo "696774765305";; - dev) echo "307739032832";; - security) echo "777170570448";; - shared-services) echo "877068819435";; - stage) echo "389299793054";; - prod) echo "964498696771";; - esac -} - -aws_profile() { - case "$1" in - security) echo "smile-security";; - *) echo "smile-$1-admin";; - esac -} - -if [ "$#" -eq 0 ] -then - usage - exit 1 -fi - -if [ "$1" = -h ] || [ "$1" = --help ] -then - usage - exit 0 -fi - -if [ "$1" = -l ] || [ "$1" = --list ] -then - echo "$envs" - exit 0 -fi - -if [ "$1" = "-e" ] || [ "$1" = "--env" ] -then - SMILE_ENV="$2" - shift 2 -elif [ -z "${SMILE_ENV:-}" ] -then - usage - exit 1 -fi - -if ! echo "$envs" | grep --quiet --fixed-strings --word-regex "$SMILE_ENV" -then - echo "Environment $SMILE_ENV is not a valid one." >&2 - echo "Valid environments are: $envs" >&2 - exit 1 -fi - -export AWS_CONFIG_FILE="$HOME/.smile/aws/config" -# shellcheck disable=SC2155 -export AWS_PROFILE="$(aws_profile "$SMILE_ENV")" -export AWS_DEFAULT_PROFILE="$AWS_PROFILE" -export AWS_DEFAULT_REGION=us-east-1 -export HELM_HOME="$HOME/.smile/helm/$SMILE_ENV-sre" -export HELM_CONFIG_HOME="$HELM_HOME" -export HELM_DATA_HOME="$HELM_HOME" -export HELM_REPOSITORY_HOME="$HELM_HOME/repository" -export HELM_TLS_ENABLE="true" -export HELM_TLS_VERIFY="true" -export KUBECONFIG="$HOME/.smile/kube/$SMILE_ENV/config" -export TILLER_NAMESPACE="applications-tiller" -# shellcheck disable=SC2155 -export VAULT_ADDR="$(vault_addr "$SMILE_ENV")" -VAULT_CAPATH="$(BUNDLE_GEMFILE="$HOME/Repositories/Smile/Gemfile" bundle show smile-cli)/lib/vault_ca" -export VAULT_CAPATH - -connected_vpn="$(dig env.smile.config TXT | xargs)" -if [ -n "$connected_vpn" ] -then - if [ "$connected_vpn" != "$SMILE_ENV" ] - then - echo 'Connected to a different VPN than the requested environment.' >&2 - exit 1 - fi - if [ -n "$VAULT_ADDR" ] - then - aws-vault exec "$AWS_PROFILE" -- \ - vault login -method aws -no-print role=smile-ops - fi -fi - -eval exec aws-vault exec "$AWS_PROFILE" -- "$@" diff --git a/Makefile b/Makefile index 81b4e11..f6f330f 100644 --- a/Makefile +++ b/Makefile @@ -15,10 +15,6 @@ ssh-keys: .ssh/github_ed25519 ssh-keys: .ssh/shore_ecdsa ssh-keys: .ssh/shore_ed25519 ssh-keys: .ssh/shore_rsa -ssh-keys: .ssh/smile_ed25519 -ssh-keys: .ssh/smile_rsa -ssh-keys: .ssh/smile_scalegrid_rsa -ssh-keys: .ssh/smile_sre_shared_rsa .ssh/%_rsa: Documents/Database.kdbx $(mkd) -- GitLab