Merge branch 'main' into add-expo-plugin

Author: CodeByZach

.github/workflows/check-flake.yml

@@ -2,7 +2,7 @@ name: Check Nix flake
 on:
   pull_request:
     paths:
-      - '**.nix'
+      - "**.nix"
       - flake.lock
   push:
     branches:
@@ -11,9 +11,11 @@ jobs:
   check-flake:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
-      - uses: DeterminateSystems/nix-installer-action@main
-      - uses: DeterminateSystems/magic-nix-cache-action@main
+      - uses: actions/checkout@v6
+      - uses: DeterminateSystems/nix-installer-action@v22
+      - uses: DeterminateSystems/magic-nix-cache-action@v13
+        with:
+          use-flakehub: false
       - name: Check Nix flake inputs
         uses: DeterminateSystems/flake-checker-action@v5
         with:

.github/workflows/test.yaml

@@ -1,27 +1,28 @@
 name: Test and Validate
 on:
   push:
+    branches: [main]
     paths-ignore:
-      - '**.md'
-      - '.github/ISSUE_TEMPLATE/**'
+      - "**.md"
+      - ".github/ISSUE_TEMPLATE/**"
   pull_request:
     paths-ignore:
-      - '**.md'
-      - '.github/ISSUE_TEMPLATE/**'
+      - "**.md"
+      - ".github/ISSUE_TEMPLATE/**"
 
 jobs:
   build:
     name: Test
     runs-on: ubuntu-latest
     steps:
+      - name: Check out code into the Go module directory
+        uses: actions/checkout@v6
+
       - name: Set up Go 1.x
-        uses: actions/setup-go@v3
+        uses: actions/setup-go@v6
         with:
           go-version: ^1.18
 
-      - name: Check out code into the Go module directory
-        uses: actions/checkout@v3
-
       - name: Test
         run: make test
 
@@ -31,17 +32,17 @@ jobs:
     name: Lint
     runs-on: ubuntu-latest
     steps:
+      - name: Check out code
+        uses: actions/checkout@v6
+
       - name: "Set up Go 1.x"
-        uses: actions/setup-go@v3
+        uses: actions/setup-go@v6
         with:
           go-version: 1.19
 
-      - name: Check out code
-        uses: actions/checkout@v3
-
-      - name: Lint with golanci-lint
-        uses: golangci/golangci-lint-action@v3
+      - name: Lint with golangci-lint
+        uses: golangci/golangci-lint-action@v9
         with:
           # version of golangci-lint to use
           # Version should stay in sync with version used for local linting (lint job in Makefile).
-          version: v1.50.1
+          version: v2.12.2

.github/workflows/update-flake-dependencies.yml

@@ -2,15 +2,17 @@
 name: Update flake dependencies
 on:
   schedule:
-    - cron: '0 16 * * 5'
+    - cron: "0 16 * * 5"
   workflow_dispatch: # for allowing manual triggers of the workflow
 jobs:
   update-dependencies:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
-      - uses: DeterminateSystems/nix-installer-action@main
-      - uses: DeterminateSystems/magic-nix-cache-action@main
+      - uses: actions/checkout@v6
+      - uses: DeterminateSystems/nix-installer-action@v22
+      - uses: DeterminateSystems/magic-nix-cache-action@v13
+        with:
+          use-flakehub: false
       - name: Update flake.lock and create signed commit with flake.lock changes
         env:
           GITHUB_TOKEN: ${{ secrets.OP_BOT_TOKEN }}
@@ -23,7 +25,7 @@ jobs:
           # if branch exists on remote already
           BRANCH_EXISTS=false
           if git checkout "$COMMIT_BRANCH" > /dev/null 2>&1; then
-            # pull changes
+            # pull changeshttps://github.com/1Password/shell-plugins/pull/595
             git pull
             BRANCH_EXISTS=true
           else
@@ -38,7 +40,7 @@ jobs:
             # commit via the GitHub API so we get automatic commit signing
             gh api --method PUT /repos/1Password/shell-plugins/contents/$FILE_TO_COMMIT \
               --field message="$COMMIT_MESSAGE" \
-              --field content=@<(base64 -i $FILE_TO_COMMIT) \
+              --field content="$(base64 -w 0 $FILE_TO_COMMIT)" \
               --field branch="$COMMIT_BRANCH" \
               --field sha="$(git rev-parse $COMMIT_BRANCH:$FILE_TO_COMMIT)"
             if [ "$BRANCH_EXISTS" = "false" ]; then

.golangci.yml

@@ -1,26 +1,27 @@
+version: "2"
 linters:
-  disable-all: true
+  default: none
   enable:
     # Defaults:
     - errcheck
-    - gosimple
     - govet
     - ineffassign
-    - staticcheck
-    - typecheck
     - unused
     # Extra:
     - asciicheck
     - bidichk
     - depguard
-    - goimports
-    - gofmt
+    - staticcheck
 
-linters-settings:
-  depguard:
-    list-type: blacklist
-    include-go-root: false
-    packages:
-      - math/rand
-    packages-with-error-message:
-      - math/rand: "please use the safer crypto/rand"
+  settings:
+    depguard:
+      rules:
+        main:
+          deny:
+            - pkg: math/rand
+              desc: "please use the safer crypto/rand"
+
+formatters:
+  enable:
+    - gofmt
+    - goimports

Makefile

@@ -44,7 +44,7 @@ test:
 
 lint:
 	# Version used should stay in sync with version in CI (.github/workflows/test.yaml).
-	docker run --rm -v $(pwd):/app -w /app golangci/golangci-lint:v1.50.1 golangci-lint run
+	docker run --rm -v $(pwd):/app -w /app golangci/golangci-lint:v2.12.2 golangci-lint run
 
 %/remove-local: beta-notice
 	$(eval plugin := $(firstword $(subst /, ,$@)))

README.md

@@ -22,6 +22,8 @@
 
 No more plaintext credentials in your home directory. Automatically authenticate every CLI you use with [1Password CLI](https://developer.1password.com/docs/cli/) + [Shell Plugins](https://developer.1password.com/docs/cli/shell-plugins/). Approve temporary credential usage in your terminal with biometrics.
 
+*By accessing or using 1Password Developer Tools, you agree to the [API and SDK Terms of Service](https://1password.com/legal/api-sdk-terms-of-service).*
+
 ## 🪄 See it in action!
 <p align="center">
   <picture>
@@ -63,8 +65,54 @@ Still not sure where or how to begin? We're happy to help! You can:
 - Book a free [pairing session](https://calendly.com/d/grs-x2h-pmb/1password-shell-plugins-pairing-session) with one of our developers
 - Join the [Developer Slack workspace](https://developer.1password.com/joinslack), and ask us any questions there
 
+## Advanced Configuration
+### Managing shell plugins in your own dotfiles
+
+By default, `op plugin init` writes its configuration to `~/.config/op/plugins.sh`
+and manages that file for you. If you'd rather keep your plugin configuration in
+your own dotfiles (for example, tracked in version control), you can define the
+shell functions yourself and source them in your shell's configuration file. 
+
+### Step 1: Define the plugin functions
+Shell functions for each shell should follow this pattern. In this case, 
+
+### bash / zsh
+
+```bash
+gh() {
+  op plugin run -- gh "$@"
+}
+```
+
+### fish
+
+```fish
+function gh --wraps gh --description "1Password shell plugin for GitHub CLI"
+  op plugin run -- gh $argv
+end
+```
+
+### Step 2: Tell `op` your plugins are already configured
+
+Set `OP_PLUGIN_ALIASES_SOURCED=1` so 1Password CLI knows the shell plugins have
+already been set up:
+
+### bash / zsh
+
+```bash
+export OP_PLUGIN_ALIASES_SOURCED="1"
+```
+
+### fish
+```fish
+set -x OP_PLUGIN_ALIASES_SOURCED 1
+```
+
+> **Note:** `op plugin init <plugin>` edits `~/.config/op/plugins.sh` directly and won't update your own dotfiles, so configure plugins manually as shown above.
+
+
 ## 💙 Community & Support
 
 - File an [issue](https://github.com/1Password/shell-plugins/issues/new/choose) for bugs and feature requests
 - Join the [Developer Slack workspace](https://developer.1password.com/joinslack)
-- Subscribe to the [Developer Newsletter](https://1password.com/dev-subscribe/)
+- Subscribe to the [Developer Newsletter](https://1password.com/dev-subscribe/)

flake.lock

@@ -1,4 +1,9 @@
-{ pkgs, lib, config, ... }:
+{
+  pkgs,
+  lib,
+  config,
+  ...
+}:
 import ./shell-plugins.nix {
   inherit pkgs;
   inherit lib;

nix/home-manager.nix

@@ -1,4 +1,9 @@
-{ pkgs, lib, config, ... }:
+{
+  pkgs,
+  lib,
+  config,
+  ...
+}:
 import ./shell-plugins.nix {
   inherit pkgs;
   inherit lib;