Add git alias for Gitlab code reviews

pkissling · Oct 26, 2023 · c86ea64 · c86ea64
1 parent 717f2bd
commit c86ea64
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 6 deletions.
diff --git a/git/.gitconfig b/git/.gitconfig
@@ -47,6 +47,7 @@
   fuzzy-checkout-ticket = !bash -c 'source $HOME/.git/bin && git-fuzzy-checkout-ticket'
   fuzzy-rebase = !bash -c 'source $HOME/.git/bin && git-fuzzy-rebase'
   fuzzy-diff = !bash -c 'source $HOME/.git/bin && git-fuzzy-diff'
+  gitlab-review = !bash -c 'source $HOME/.git/bin && git-gitlab-code-review \"$1\"'
 
 [core]
   pager = delta --dark

diff --git a/git/bin b/git/bin
@@ -56,3 +56,9 @@ git-fuzzy-checkout-ticket() {
     git cob dev/"${ticket_id}"_"${slug}"
     git psu
 }
+
+git-gitlab-code-review() {
+    git fetch origin refs/merge-requests/"${0}"/head
+    git switch --detach FETCH_HEAD
+    git reset "$(git merge-base HEAD "$(git remote show origin | grep HEAD | sed 's/.* //')")"
+}
diff --git a/gpg/install.sh b/gpg/install.sh
@@ -15,9 +15,10 @@ gpg --import ~/dotfiles/gpg/work.asc
 # add private gpg key from 1password, if not exist
 if [ -z "$(gpg --list-secret-keys)" ]; then
   if [ "${USAGE}" = "work" ]; then
-    ONE_PASSWORD_DOCUMENT_ID="qoudpafw75h5i3lw7nyt67ewmq"
+    ONE_PASSWORD_VAULT="Azena"
   else
-    ONE_PASSWORD_DOCUMENT_ID="n5zwvjshndohrik5k7jrjktfxe"
+    ONE_PASSWORD_VAULT="Personal"
   fi
+  ONE_PASSWORD_DOCUMENT_ID=$(op item get 'GPG Private Key' --vault "${ONE_PASSWORD_VAULT}" --format json | jq -r .id)
   gpg --import <(op document get "${ONE_PASSWORD_DOCUMENT_ID}")
 fi
diff --git a/ssh/install.sh b/ssh/install.sh
@@ -17,14 +17,15 @@ ln -sfv "${HOME}"/.ssh/"${USAGE}".priv "${HOME}"/.ssh/id_rsa
 ln -sfv "${HOME}"/dotfiles/ssh/config "${HOME}"/.ssh
 
 # add private ssh key from 1password, if not exist
+# shellcheck disable=SC2140
 if [ ! -f "${HOME}"/.ssh/"${USAGE}.priv" ]; then
   if [ "${USAGE}" = "work" ]; then
     ONE_PASSWORD_VAULT="Azena"
-    ONE_PASSWORD_KEY_ID="2vgwjhx6xauti4mpxiltsalzyy"
   else
     ONE_PASSWORD_VAULT="Personal"
-    ONE_PASSWORD_KEY_ID="2uc6ialn2lqxqlpitlil4howha"
   fi
-  op read op://"${ONE_PASSWORD_VAULT}"/"${ONE_PASSWORD_KEY_ID}"/'private key' > "${HOME}"/.ssh/"${USAGE}.priv"
-  chmod 600 ~/.ssh/id_rsa
+  ONE_PASSWORD_DOCUMENT_ID=$(op item get 'SSH Private Key' --vault "${ONE_PASSWORD_VAULT}" --format json | jq -r .id)
+  # shellcheck disable=SC2140
+  op read op://"${ONE_PASSWORD_VAULT}"/"${ONE_PASSWORD_DOCUMENT_ID}"/'private key' > "${HOME}"/.ssh/"${USAGE}.priv"
+  chmod 600 "${HOME}"/.ssh/"${USAGE}.priv"
 fi