vault cleanup

Author: AndrewRayCode

.bashrc

@@ -688,9 +688,6 @@ function dvcs_commit_all {
     fi
 }
 
-# This code was auto generated by with these options:
-#  - file:///Users/aray/bash-prompt-builder/index.html#git=true&git-prefix=false&git-ahead=true&git-modified=true&git-conflicted=true&git-revno=false&git-bisect=true&hg=true&hg-prefix=false&hg-modified=true&hg-conflicted=true&hg-revno=false&hg-bisect=true&hg-patches=true&svn=true&svn-modified=true&svn-revno=true&comments=false&modified-char=%E2%9C%8E&conflict-char=%E2%98%A2&max-conflicted-files=2&no-branch-text=no%20branch!&bisecting-text=%CF%9F
-#
 # Requirements (other than git, svn and hg):
 #   hg-prompt: https://bitbucket.org/sjl/hg-prompt/src
 #   svnversion (you probably have it if you have svn)
@@ -903,7 +900,6 @@ dvcs_function="
     fi
 
     echo -e \$prompt"
-# End code auto generated by http://andrewray.me/bash-prompt-builder/index.html
 
 function error_test() {
     if [[ $? = "0" ]]; then
@@ -930,7 +926,7 @@ function ding() {
 }
 
 # Python development, requires pyenv from homebrew
-# Needs to go before GR stuff to 
+# Needs to go before GR stuff
 if [[ $(command -v pyenv) ]]; then
     export PYENV_ROOT="$HOME/.pyenv"
 
@@ -955,27 +951,8 @@ function gr_locked_gpg() {
     fi
 }
 
-sleep_rand() {
-    rand=${RANDOM:0:1} # 0 - 9 https://stackoverflow.com/questions/1194882/how-to-generate-random-number-in-bash
-    sleep "0.${rand}"
-}
 
 if [ -d "$GR_HOME" ]; then
-
-    sleep_rand
-    locked=$(gr_locked_gpg)
-    if [ "$locked" == "1" ]; then
-        echo 'Someone else is using the gpg agent, waitng...'
-        bail=0
-
-        while [ "$locked" == "1" ] && [ $bail != 100 ]
-        do
-            sleep_rand
-            locked=$(gr_locked_gpg)
-            let bail+=1
-        done
-    fi
-
     for file in ${GR_HOME}/engineering/bash/*.sh; do
         source "$file"
     done
@@ -1056,117 +1033,9 @@ function releaseCommits() {
     echo "    https://github.com/ConsultingMD/jarvis/compare/${lastReleaseBranchWithoutRemote}...${currentReleaseBranchWithoutRemote}"
 }
 
-#function pvault() {
-    #production && \
-    #echo '🌐 Opening SSH tunnel named "my-vault-tunnel" in background...' && \
-    #HOST=$(ec2-find -l stone-worker 2> /dev/null | tail -1 | awk '{print $1}') && \
-    #ssh -M -S my-vault-tunnel -fnNT -L "1234:vault.grandrounds.com:443" "$GR_USERNAME@$HOST" && \
-    #ssh -S my-vault-tunnel -O check "$GR_USERNAME@$HOST" && \
-    #sleep 5 && \
-    #echo '🔐 Use this token to log in:' && \
-    #(aws-environment infra-production developer && \
-        #VAULT_ADDR=https://localhost:1234 vault login -tls-skip-verify -token-only -method=aws role=developer) && \
-    #open 'https://localhost:1234/ui/vault/auth?with=token' && \
-    #echo '✅ Run kvault this command to close the tunnel'
-#}
-
-function vault-tunnel() {
-    if [[ -z "$1" ]]; then
-        echo 'Usage: vault_tunnel ENVIRONMENT_NAME'
-        return 1
-    fi
-
-    # Check for an existing tunnel (this may be mac specific?)
-    local already_bound
-    already_bound=$(lsof -n -i4TCP:1234 | grep LISTEN)
-    if [[ -n "$already_bound" ]]; then
-        local pid
-        pid=$(echo "$already_bound" | awk '{print $2}')
-        echo '❌ There is already something bound to port 1234! Here it is:'
-        echo "    $already_bound"
-        echo '💀 You can try running kvault, or manually kill the process by running:'
-        echo "    kill ${pid}"
-        return 1
-    fi
-
-    # Create the bind port and host, note production has snowflake hostname
-    local tunnel_bind="1234:vault.${1}.grandrounds.com:443"
-    if [[ "$1" == "production" ]]; then
-        tunnel_bind="1234:vault.grandrounds.com:443"
-    fi
-    local tunnel_host="$GR_USERNAME@$HOST"
-
-    echo '🌐 Opening SSH tunnel named "my-vault-tunnel" in background...'
-
-    # Chain all functions with && \ so that if one errors the rest don't execute
-    aws-environment "$1" && \
-    HOST=$(ec2-find -l stone-worker 2> /dev/null | tail -1 | awk '{print $1}') && \
-    ssh -M -S my-vault-tunnel -fnNT -L "$tunnel_bind" "$tunnel_host" && \
-    ssh -S my-vault-tunnel -O check "$tunnel_host" && \
-    # Trying to run vault commands too quickly after tunnel starts fail
-    sleep 5 && \
-    echo '✅ Tunnel running. Run kill_vault_tunnel close the tunnel'
-}
-
-function vault-login() {
-    if [[ -z "$1" ]]; then
-        echo 'Usage: vault_login ENVIRONMENT_NAME'
-        return 1
-    fi
-
-    local account
-    case $1 in
-      integration3) account='platform-dev'     ;;
-      uat)          account='infra-uat'        ;;
-      production)   account='infra-production' ;;
-      *)     echo "I don't know how to log in to Vault for environment '$1'" ;;
-    esac
-
-    vault_tunnel "$1" && \
-    echo -e '🔐 Use this token to log in:\n' && \
-    (aws-environment ${account} developer && \
-        VAULT_ADDR=https://localhost:1234 vault login -tls-skip-verify -token-only -method=aws role=developer) && \
-    echo -e '\n💻 Opening a browser to https://localhost:1234/ui/vault/auth?with=token ...' && \
-    echo 'You may need to sign out and re-authenticate with your new token' && \
-    open 'https://localhost:1234/ui/vault/auth?with=token'
-}
-
-#function i3vault() {
-    #aws-environment integration3 && \
-    #echo '🌐 Opening SSH tunnel named "my-vault-tunnel" in background...' && \
-    #HOST=$(ec2-find -l stone-worker 2> /dev/null | tail -1 | awk '{print $1}') && \
-    #ssh -M -S my-vault-tunnel -fnNT -L "1234:vault.$(aws-environment).grandrounds.com:443" "$GR_USERNAME@$HOST" && \
-    #ssh -S my-vault-tunnel -O check "$GR_USERNAME@$HOST" && \
-    #sleep 5 && \
-    #echo '🔐 Use this token to log in:' && \
-    #(aws-environment platform-dev developer && \
-        #VAULT_ADDR=https://localhost:1234 vault login -tls-skip-verify -token-only -method=aws role=developer) && \
-    #open 'https://localhost:1234/ui/vault/auth?with=token' && \
-    #echo '✅ Run kvault this command to close the tunnel'
-#}
-
-#function uvault() {
-    #uat && \
-    #echo '🌐 Opening SSH tunnel named "my-vault-tunnel" in background...' && \
-    #HOST=$(ec2-find -l stone-worker 2> /dev/null | tail -1 | awk '{print $1}') && \
-    #ssh -M -S my-vault-tunnel -fnNT -L "1234:vault.$(aws-environment).grandrounds.com:443" "$GR_USERNAME@$HOST" && \
-    #ssh -S my-vault-tunnel -O check "$GR_USERNAME@$HOST" && \
-    #sleep 5 && \
-    #echo '🔐 Use this token to log in:' && \
-    #(aws-environment infra-uat developer && \
-        #VAULT_ADDR=https://localhost:1234 vault login -tls-skip-verify -token-only -method=aws role=developer) && \
-    #open 'https://localhost:1234/ui/vault/auth?with=token' && \
-    #echo '✅ Run kvault this command to close the tunnel'
-#}
-
-function kvault() {
-    echo "💀 Killing my-vault-tunnel tunnel at $GR_USERNAME@$HOST"
-    ssh -S my-vault-tunnel -O exit "$GR_USERNAME@$HOST"
-}
-
 function jgrep() {
     #bundle exec rake routes > ~/dev/rake-routes
-    cat ~/dev/rake-routes | grep "$1"
+    cat ~/dev/rake-routes | grep -i "$1"
 }
 
 if type "bat" > /dev/null 2>&1; then

.vimrc

@@ -145,7 +145,7 @@ set guioptions=mer
 " Use spaces always
 set expandtab
 
-" Copy indent from current line when starting a new line 
+" Copy indent from current line when starting a new line
 set autoindent
 
 " Break at specific characters when wrapping long lines (:set breakat?)
@@ -370,6 +370,9 @@ nnoremap <Leader>ff ?^func\\|^[a-zA-Z].*func<CR>,/
 nnoremap <C-l> gt
 nnoremap <C-h> gT
 
+" Todo fix b
+nnoremap <Leader>cp dd?✅<cr>p0ls✅<esc><c-o>
+
 " experimental - enter to go into command mode (otherwise useless shortcut).
 " See clickable_maps for preventing vim clickable from messing this up. Also
 " see :h <cr> which is duplicated by BOTH ctrl-m AND + lol

code/settings.json

@@ -1,6 +1,5 @@
 // Place your settings in this file to overwrite the default settings
 {
-  "workbench.colorTheme": "Visual Studio Light",
   "eslint.enable": true,
   "javascript.validate.enable": false,
   "editor.rulers": [80],
@@ -18,25 +17,17 @@
   "workbench.editor.enablePreview": true,
   "workbench.editor.enablePreviewFromQuickOpen": false,
   "workbench.colorTheme": "rainbow",
-  "indentRainbow.error_color": "",
-
   "editor.renderWhitespace": "none",
-  "workbench.panel.location": "right",
-  "gitlens.advanced.messages": {
-    "suppressShowKeyBindingsNotice": true
-  },
-  "cSpell.userWords": ["kase", "kases", "mixpanel"],
   "window.title": "${activeEditorMedium}${separator}${rootName}",
   "javascript.updateImportsOnFileMove.enabled": "always",
   "typescript.updateImportsOnFileMove.enabled": "always",
-  "workbench.panel.location": "bottom",
   "breadcrumbs.enabled": true,
   "[javascript]": {
     "editor.formatOnSave": true,
     "editor.defaultFormatter": "esbenp.prettier-vscode"
   },
   "editor.tabSize": 2,
-  "editor.tabCompletion": true,
+  "editor.tabCompletion": "on",
   "editor.snippetSuggestions": "top",
   "terminal.integrated.rendererType": "dom",
   "editor.tokenColorCustomizations": {
@@ -49,7 +40,6 @@
     }
   },
   "workbench.sideBar.location": "left",
-  // "workbench.settings.editor": "json",
   "files.autoSave": "off",
   "breadcrumbs.symbolPath": "off"
 }