Merge branch 'main' into amanda/cratedb

Author: scottisloud

.github/ISSUE_TEMPLATE/config.yml

@@ -1,7 +1,7 @@
 blank_issues_enabled: true
 contact_links:
   - name: "💬 Chat with us on Slack"
-    url: https://join.slack.com/t/1password-devs/shared_invite/zt-1halo11ps-6o9pEv96xZ3LtX_VE0fJQA
+    url: https://developer.1password.com/joinslack
     about: Chat with us about shell plugins in our Developer Slack workspace.
   - name: "❓ General 1Password questions"
     url: https://1password.community

.github/workflows/check-flake.yml

@@ -0,0 +1,23 @@
+name: Check Nix flake
+on:
+  pull_request:
+    paths:
+      - "**.nix"
+      - flake.lock
+  push:
+    branches:
+      - main
+jobs:
+  check-flake:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v6
+      - uses: DeterminateSystems/nix-installer-action@v22
+      - uses: DeterminateSystems/magic-nix-cache-action@v13
+      - name: Check Nix flake inputs
+        uses: DeterminateSystems/flake-checker-action@v5
+        with:
+          fail-mode: true
+          send-statistics: false
+      - name: Run nix flake check
+        run: nix flake check

.github/workflows/pr-check-signed-commits.yml

@@ -9,8 +9,5 @@ jobs:
       pull-requests: write
     runs-on: ubuntu-latest
     steps:
-      - name: Check out code
-        uses: actions/checkout@v3
-
       - name: Check signed commits in PR
-        uses: 1Password/check-signed-commits-action@v1
+        uses: 1Password/check-signed-commits-action@main

.github/workflows/test.yaml

@@ -2,26 +2,26 @@ name: Test and Validate
 on:
   push:
     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,16 +31,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: v1.50.1
+          # Version should stay in sync with version used for local linting (lint job in Makefile).
+          version: v2.12.2

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

@@ -0,0 +1,53 @@
+# CI job to periodically (once a week) update flake.lock
+name: Update flake dependencies
+on:
+  schedule:
+    - cron: "0 16 * * 5"
+  workflow_dispatch: # for allowing manual triggers of the workflow
+jobs:
+  update-dependencies:
+    runs-on: ubuntu-latest
+    steps:
+      - 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 }}
+          FILE_TO_COMMIT: flake.lock
+          COMMIT_BRANCH: automation/update-flake-dependencies
+          COMMIT_MESSAGE: "chore(nix): Update Flake dependencies"
+        run: |
+          # fetch remote state
+          git fetch
+          # if branch exists on remote already
+          BRANCH_EXISTS=false
+          if git checkout "$COMMIT_BRANCH" > /dev/null 2>&1; then
+            # pull changeshttps://github.com/1Password/shell-plugins/pull/595
+            git pull
+            BRANCH_EXISTS=true
+          else
+            # otherwise, create the branch and push it to remote
+            git checkout -b "$COMMIT_BRANCH"
+            git push -u origin "$COMMIT_BRANCH"
+          fi
+          # update flake.lock
+          nix flake update
+          # make sure something actually changed first, if not, no updates required
+          if [[ `git status --porcelain` ]]; then
+            # 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 -w 0 $FILE_TO_COMMIT)" \
+              --field branch="$COMMIT_BRANCH" \
+              --field sha="$(git rev-parse $COMMIT_BRANCH:$FILE_TO_COMMIT)"
+            if [ "$BRANCH_EXISTS" = "false" ]; then
+              gh pr create --title "[automation]: Update Flake dependencies" \
+                --body "This is an automated PR to update \`flake.lock\`" \
+                --label "flake.lock automation" \
+                --reviewer mrjones2014 \
+                --base main --head $COMMIT_BRANCH
+            fi
+          fi

.gitignore

@@ -1,6 +1,9 @@
 # Auto-generated with `make registry`
 plugins/plugins.go
 
+# Auto-generated with `make registry.json`
+plugins/registry.json
+
 # GoLand
 .idea
 
@@ -16,3 +19,7 @@ plugins/plugins.go
 
 # 1Password
 .op
+
+# direnv
+.direnv
+.envrc

.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

CONTRIBUTING.md

@@ -100,7 +100,7 @@ No documentation work is required on your end. If your plugin is accepted, a tec
 If you need help, found a bug, or have an idea for an awesome plugin that you'd like to discuss with us first, you can reach out to us here:
 
 * Create an [issue](https://github.com/1Password/shell-plugins/issues) in this repo.
-* Join the [Developer Slack workspace](https://join.slack.com/t/1password-devs/shared_invite/zt-1halo11ps-6o9pEv96xZ3LtX_VE0fJQA).
+* Join the [Developer Slack workspace](https://developer.1password.com/joinslack).
 
 ## 📣 Contributions Beta Notice
 

Makefile

@@ -25,6 +25,9 @@ registry:
 validate: registry
 	go run cmd/contrib/main.go $@
 
+registry.json: registry
+	go run cmd/contrib/main.go $@
+
 $(plugins_dir):
 	mkdir -p $(plugins_dir)
 	chmod 700 $(plugins_dir)
@@ -39,6 +42,10 @@ $(plugins_dir):
 test:
 	go 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:v2.12.2 golangci-lint run
+
 %/remove-local: beta-notice
 	$(eval plugin := $(firstword $(subst /, ,$@)))
 	rm -f ~/.op/plugins/local/$(plugin)

README.md

@@ -61,10 +61,10 @@ make new-plugin
 
 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://join.slack.com/t/1password-devs/shared_invite/zt-1halo11ps-6o9pEv96xZ3LtX_VE0fJQA), and ask us any questions there
+- Join the [Developer Slack workspace](https://developer.1password.com/joinslack), and ask us any questions there
 
 ## 💙 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://join.slack.com/t/1password-devs/shared_invite/zt-1halo11ps-6o9pEv96xZ3LtX_VE0fJQA)
+- Join the [Developer Slack workspace](https://developer.1password.com/joinslack)
 - Subscribe to the [Developer Newsletter](https://1password.com/dev-subscribe/)