Merge 4e3fed007a into ddec79ad43

Bumps [actions/checkout](https://github.com/actions/checkout) from 6.0.0 to 6.0.1.
- [Release notes](https://github.com/actions/checkout/releases)
- [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md)
- [Commits](1af3b93b68...8e8c483db8)

---
updated-dependencies:
- dependency-name: actions/checkout
  dependency-version: 6.0.1
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

.github/workflows/dependencies.yml

@@ -13,17 +13,17 @@ jobs:
       contents: write # this is needed to push commits and branches
     steps:
       - name: Harden the runner (Audit all outbound calls)
-        uses: step-security/harden-runner@95d9a5deda9de15063e7595e9719c11c38c90ae2 # v2.13.2
+        uses: step-security/harden-runner@df199fb7be9f65074067a9eb93f12bb4c5547cf2 # v2.13.3
         with:
           egress-policy: audit
 
       - name: Checkout
-        uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
+        uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
         with:
           fetch-depth: 0
       - name: Authenticate as @ohmyzsh
         id: generate-token
-        uses: actions/create-github-app-token@7e473efe3cb98aa54f8d4bac15400b15fad77d94 # v2.2.0
+        uses: actions/create-github-app-token@29824e69f54612133e76f7eaac726eef6c875baf # v2.2.1
         with:
           app-id: ${{ secrets.OHMYZSH_APP_ID }}
           private-key: ${{ secrets.OHMYZSH_APP_PRIVATE_KEY }}

.github/workflows/dependencies/requirements.txt

@@ -4,4 +4,4 @@ idna==3.11
 PyYAML==6.0.3
 requests==2.32.5
 semver==3.0.4
-urllib3==2.5.0
+urllib3==2.6.0

.github/workflows/installer.yml

@@ -26,12 +26,12 @@ jobs:
           - macos-latest
     steps:
       - name: Harden the runner (Audit all outbound calls)
-        uses: step-security/harden-runner@95d9a5deda9de15063e7595e9719c11c38c90ae2 # v2.13.2
+        uses: step-security/harden-runner@df199fb7be9f65074067a9eb93f12bb4c5547cf2 # v2.13.3
         with:
           egress-policy: audit
 
       - name: Set up git repository
-        uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
+        uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
       - name: Install zsh
         if: runner.os == 'Linux'
         run: sudo apt-get update; sudo apt-get install zsh
@@ -47,12 +47,12 @@ jobs:
       - test
     steps:
       - name: Harden the runner (Audit all outbound calls)
-        uses: step-security/harden-runner@95d9a5deda9de15063e7595e9719c11c38c90ae2 # v2.13.2
+        uses: step-security/harden-runner@df199fb7be9f65074067a9eb93f12bb4c5547cf2 # v2.13.3
         with:
           egress-policy: audit
 
       - name: Checkout
-        uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
+        uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
       - name: Install Vercel CLI
         run: npm install -g vercel
       - name: Setup project and deploy

.github/workflows/main.yml

@@ -24,12 +24,12 @@ jobs:
     if: github.repository == 'ohmyzsh/ohmyzsh'
     steps:
       - name: Harden the runner (Audit all outbound calls)
-        uses: step-security/harden-runner@95d9a5deda9de15063e7595e9719c11c38c90ae2 # v2.13.2
+        uses: step-security/harden-runner@df199fb7be9f65074067a9eb93f12bb4c5547cf2 # v2.13.3
         with:
           egress-policy: audit
 
       - name: Set up git repository
-        uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
+        uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
       - name: Install zsh
         run: sudo apt-get update; sudo apt-get install zsh
       - name: Check syntax

.github/workflows/project.yml

@@ -17,12 +17,12 @@ jobs:
     if: github.repository == 'ohmyzsh/ohmyzsh'
     steps:
       - name: Harden the runner (Audit all outbound calls)
-        uses: step-security/harden-runner@95d9a5deda9de15063e7595e9719c11c38c90ae2 # v2.13.2
+        uses: step-security/harden-runner@df199fb7be9f65074067a9eb93f12bb4c5547cf2 # v2.13.3
         with:
           egress-policy: audit
       - name: Authenticate as @ohmyzsh
         id: generate-token
-        uses: actions/create-github-app-token@7e473efe3cb98aa54f8d4bac15400b15fad77d94 # v2.2.0
+        uses: actions/create-github-app-token@29824e69f54612133e76f7eaac726eef6c875baf # v2.2.1
         with:
           app-id: ${{ secrets.OHMYZSH_APP_ID }}
           private-key: ${{ secrets.OHMYZSH_APP_PRIVATE_KEY }}

.github/workflows/scorecard.yml

@@ -36,12 +36,12 @@ jobs:
 
     steps:
       - name: Harden the runner (Audit all outbound calls)
-        uses: step-security/harden-runner@95d9a5deda9de15063e7595e9719c11c38c90ae2 # v2.13.2
+        uses: step-security/harden-runner@df199fb7be9f65074067a9eb93f12bb4c5547cf2 # v2.13.3
         with:
           egress-policy: audit
 
       - name: "Checkout code"
-        uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
+        uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
         with:
           persist-credentials: false
 
@@ -60,6 +60,6 @@ jobs:
           retention-days: 5
 
       - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@fdbfb4d2750291e159f0156def62b853c2798ca2 # v4.31.5
+        uses: github/codeql-action/upload-sarif@cf1bb45a277cb3c205638b2cd5c984db1c46a412 # v4.31.7
         with:
           sarif_file: results.sarif

plugins/jj/README.md

@@ -12,6 +12,16 @@ plugins=(... jj)
 
 | Alias  | Command                       |
 | ------ | ----------------------------- |
+| jjb    | `jj bookmark`                 |
+| jjbc   | `jj bookmark create`          |
+| jjbd   | `jj bookmark delete`          |
+| jjbf   | `jj bookmark forget`          |
+| jjbl   | `jj bookmark list`            |
+| jjbm   | `jj bookmark move`            |
+| jjbr   | `jj bookmark rename`          |
+| jjbs   | `jj bookmark set`             |
+| jjbt   | `jj bookmark track`           |
+| jjbu   | `jj bookmark untrack`         |
 | jjc    | `jj commit`                   |
 | jjcmsg | `jj commit --message`         |
 | jjd    | `jj diff`                     |
@@ -22,14 +32,20 @@ plugins=(... jj)
 | jjgf   | `jj git fetch`                |
 | jjgfa  | `jj git fetch --all-remotes`  |
 | jjgp   | `jj git push`                 |
+| jjgpa  | `jj git push --all`           |
+| jjgpd  | `jj git push --deleted`       |
+| jjgpt  | `jj git push --tracked`       |
 | jjl    | `jj log`                      |
 | jjla   | `jj log -r "all()"`           |
 | jjn    | `jj new`                      |
+| jjnt   | `jj new "trunk()"`            |
 | jjrb   | `jj rebase`                   |
+| jjrbm  | `jj rebase -d "trunk()"`      |
 | jjrs   | `jj restore`                  |
 | jjrt   | `cd "$(jj root \|\| echo .)"` |
 | jjsp   | `jj split`                    |
 | jjsq   | `jj squash`                   |
+| jjst   | `jj status`                   |
 
 ## Prompt usage
 
@@ -88,3 +104,4 @@ that.
 ## Contributors
 
 - [nasso](https://github.com/nasso) - Plugin Author
+- [imp](https://github.com/imp) - Occasional Alias Contributor

plugins/jj/jj.plugin.zsh

@@ -34,6 +34,16 @@ function jj_prompt_template() {
 }
 
 # Aliases (sorted alphabetically)
+alias jjb='jj bookmark'
+alias jjbc='jj bookmark create'
+alias jjbd='jj bookmark delete'
+alias jjbf='jj bookmark forget'
+alias jjbl='jj bookmark list'
+alias jjbm='jj bookmark move'
+alias jjbr='jj bookmark rename'
+alias jjbs='jj bookmark set'
+alias jjbt='jj bookmark track'
+alias jjbu='jj bookmark untrack'
 alias jjc='jj commit'
 alias jjcmsg='jj commit --message'
 alias jjd='jj diff'
@@ -44,11 +54,17 @@ alias jjgcl='jj git clone'
 alias jjgf='jj git fetch'
 alias jjgfa='jj git fetch --all-remotes'
 alias jjgp='jj git push'
+alias jjgpa='jj git push --all'
+alias jjgpd='jj git push --deleted'
+alias jjgpt='jj git push --tracked'
 alias jjl='jj log'
 alias jjla='jj log -r "all()"'
 alias jjn='jj new'
+alias jjnt='jj new "trunk()"'
 alias jjrb='jj rebase'
+alias jjrbm='jj rebase -d "trunk()"'
 alias jjrs='jj restore'
 alias jjrt='cd "$(jj root || echo .)"'
 alias jjsp='jj split'
 alias jjsq='jj squash'
+alias jjst='jj status'

plugins/rke/README.md

@@ -0,0 +1,9 @@
+# RKE plugin
+
+This plugin adds auto-completion for [rke](https://rancher.com/products/rke/).
+
+To use it add `rke` to the plugins array in your zshrc file.
+
+```zsh
+plugins=(... rke)
+```

plugins/rke/_rke

@@ -0,0 +1,169 @@
+#compdef rke
+
+typeset -A opt_args
+
+_arguments -C \
+  '1:cmd:->cmds' \
+  '2:subcmd:->subcmds' \
+  '*:: :->args' \
+  && ret=0
+
+case "$state" in
+  (cmds)
+    local commands; commands=(
+      'up:Bring the cluster up'
+      'remove:Teardown the cluster and clean cluster nodes'
+      'version:Show cluster Kubernetes version'
+      'config:Setup cluster configuration'
+      'etcd:etcd snapshot save/restore operations in k8s cluster'
+      'cert:Certificates management for RKE cluster'
+      'encrypt:Manage cluster encryption provider keys'
+      'help:Shows a list of commands or help for one command'
+    )
+    _describe -t commands 'command' commands && ret=0
+  ;;
+  (subcmds)
+    case $line[1] in
+      (up)
+        local ups; ups=(
+          '--config:Specify an alternate cluster YAML file (default: "cluster.yml") $RKE_CONFIG'
+          '--local:Deploy Kubernetes cluster locally'
+          '--dind:Deploy Kubernetes cluster in docker containers (experimental)'
+          '--dind-storage-driver:Storage driver for the docker in docker containers (experimental)'
+          '--dind-dns-server:DNS resolver to be used by docker in docker container. Useful if host is running systemd-resovld (default: "8.8.8.8")'
+          '--update-only:Skip idempotent deployment of control and etcd plane'
+          '--disable-port-check:Disable port check validation between nodes'
+          '--init:Initiate RKE cluster'
+          '--cert-dir:Specify a certificate dir path'
+          '--custom-certs:Use custom certificates from a cert dir'
+          '--ssh-agent-auth:Use SSH Agent Auth defined by SSH_AUTH_SOCK'
+          '--ignore-docker-version:Disable Docker version check'
+        )
+        _describe -t ups 'up' ups && ret=0
+      ;;
+      (remove)
+        local removes; removes=(
+          '--config:Specify an alternate cluster YAML file (default: "cluster.yml") $RKE_CONFIG'
+          '--force:Force removal of the cluster'
+          '--local:Remove Kubernetes cluster locally'
+          '--dind:Remove Kubernetes cluster deplozed in dind mode'
+          '--ssh-agent-auth:Use SSH Agent Auth defined by SSH_AUTH_SOCK'
+          '--ignore-docker-version:Disable Docker version check'
+        )
+        _describe -t removes 'remove' removes && ret=0
+      ;;
+      (version)
+        local versions; versions=(
+          '--config:Specify an alternate cluster YAML file (default: "cluster.yml") $RKE_CONFIG'
+        )
+        _describe -t versions 'version' versions && ret=0
+      ;;
+      (config)
+        local configs; configs=(
+          '--name:Name of the configuration file (default: "cluster.yml")'
+          '-n:Name of the configuration file (default: "cluster.yml")'
+          '--empty:Generate Empty configuration file'
+          '-e:Generate Empty configuration file'
+          '--print:Print configuration'
+          '-p:Print configuration'
+          '--system-images:Generate the default system images'
+          '-s:Generate the default system images'
+          '--list-version:List the default kubernetes version'
+          '-l:List the default kubernetes version'
+          '--all:Used with -s and -l, get all available versions'
+          '-a:Used with -s and -l, get all available versions'
+          '--version:Generate the default system images for specific k8s versions'
+        )
+        _describe -t configs 'config' configs && ret=0
+      ;;
+      (etcd)
+        local etcds; etcds=(
+          'snapshot-save:Take snapshot on all etcd hosts'
+          'snapshot-restore:Restore existing snapshot'
+        )
+        _describe -t etcds 'etcd' etcds && ret=0
+      ;;
+      (cert)
+        local certs; certs=(
+          'rotate:Rotate RKE cluster certificates'
+          'generate-csr:Generate certificate sign requests for k8s components'
+        )
+        _describe -t certs 'cert' certs && ret=0
+      ;;
+      (encrypt)
+        local encrypts; encrypts=(
+          'rotate-key:Rotate cluster encryption provider key'
+        )
+        _describe -t encrypts "encrypts" encrypts && ret=0
+      ;;
+    esac
+  ;;
+  (args)
+    case $line[2] in
+      (snapshot-save)
+        local saveopts; saveopts=(
+          '--name:Specify snapshot name'
+          '--config:Specify an alternate cluster YAML file (default: "cluster.yml") $RKE_CONFIG'
+          '--s3:Enabled backup to s3'
+          '--s3-endpoint:Specify s3 endpoint url (default: "s3.amazonaws.com")'
+          '--s3-endpoint-ca:Specify a custom CA cert to connect to S3 endpoint'
+          '--access-key:Specify s3 accessKey'
+          '--secret-key:Specify s3 secretKey'
+          '--bucket-name:Specify s3 bucket name'
+          '--region:Specify the s3 bucket location (optional)'
+          '--folder:Specify s3 folder name'
+          '--ssh-agent-auth:Use SSH Agent Auth defined by SSH_AUTH_SOCK'
+          '--ignore-docker-version:Disable Docker version check'
+        )
+        _describe -t saveopts 'snapshot-save' saveopts && ret=0
+      ;;
+      (snapshot-restore)
+        local restoreopts; restoreopts=(
+          '--name:Specify snapshot name'
+          '--config:Specify an alternate cluster YAML file (default: "cluster.yml") $RKE_CONFIG'
+          '--s3:Enabled backup to s3'
+          '--s3-endpoint:Specify s3 endpoint url (default: "s3.amazonaws.com")'
+          '--s3-endpoint-ca:Specify a custom CA cert to connect to S3 endpoint'
+          '--access-key:Specify s3 accessKey'
+          '--secret-key:Specify s3 secretKey'
+          '--bucket-name:Specify s3 bucket name'
+          '--region:Specify the s3 bucket location (optional)'
+          '--folder:Specify s3 folder name'
+          '--cert-dir value:Specify a certificate dir path'
+          '--custom-certs:Use custom certificates from a cert dir'
+          '--use-local-state:Use local state file (do not check or use snapshot archive for state file)'
+          '--ssh-agent-auth:Use SSH Agent Auth defined by SSH_AUTH_SOCK'
+          '--ignore-docker-version:Disable Docker version check'
+        )
+        _describe -t restoreopts 'snapshot-restore' restoreopts && ret=0
+      ;;
+      (rotate)
+        local rotateopts; rotateopts=(
+          '--config:Specify an alternate cluster YAML file (default: "cluster.yml") $RKE_CONFIG'
+          '--service:Specify a k8s service to rotate certs, (allowed values: kube-apiserver, kube-controller-manager, kube-scheduler, kubelet, kube-proxy, etcd)'
+          '--rotate-ca:Rotate all certificates including CA certs'
+          '--ssh-agent-auth:Use SSH Agent Auth defined by SSH_AUTH_SOCK'
+          '--ignore-docker-version:Disable Docker version check'
+        )
+        _describe -t rotateopts 'rotate' rotateopts && ret=0
+      ;;
+      (generate-csr)
+        local generatecsropts; generatecsropts=(
+          '--config:Specify an alternate cluster YAML file (default: "cluster.yml") $RKE_CONFIG'
+          '--cert-dir: Specify a certificate dir path'
+        )
+        _describe -t generatecsropts 'generate-csr' generatecsropts && ret=0
+      ;;
+      (rotate-key)
+        local rotatekeyopts; rotatekeyopts=(
+          '--config:Specify an alternate cluster YAML file (default: "cluster.yml") $RKE_CONFIG'
+          '--ssh-agent-auth:Use SSH Agent Auth defined by SSH_AUTH_SOCK'
+          '--ignore-docker-version:Disable Docker version check'
+        )
+        _describe -t rotatekeyopts 'rotate-key' rotatekeyopts && ret=0
+      ;;
+    esac
+  ;;
+esac
+
+return ret