chore: Remove support for 1Password CLI version one

doytsujin · Nov 9, 2023 · bdca3a1 · bdca3a1
1 parent 1f4f1d4
commit bdca3a1
Show file tree

Hide file tree

Showing 9 changed files with 41 additions and 370 deletions.
diff --git a/assets/chezmoi.io/docs/reference/templates/1password-functions/index.md b/assets/chezmoi.io/docs/reference/templates/1password-functions/index.md
@@ -6,10 +6,10 @@ CLI](https://developer.1password.com/docs/cli) (`op`).
 
 !!! warning
 
-    When using 1Password CLI v2 with biometric authentication, account shorthand
-    names are not available. In order to assist with this, chezmoi supports
-    multiple derived values from `op account list` that can be changed into the
-    appropriate 1Password *account-uuid*.
+    When using the 1Password CLI with biometric authentication, account
+    shorthand names are not available. In order to assist with this, chezmoi
+    supports multiple derived values from `op account list` that can be changed
+    into the appropriate 1Password *account-uuid*.
 
     ### Example
 

diff --git a/assets/chezmoi.io/docs/reference/templates/1password-functions/onepassword.md b/assets/chezmoi.io/docs/reference/templates/1password-functions/onepassword.md
@@ -48,19 +48,3 @@ config variable.
         {{ (onepassword "$UUID" "$VAULT_UUID" "$ACCOUNT_NAME").details.password }}
         {{ (onepassword "$UUID" "" "$ACCOUNT_NAME").details.password }}
         ```
-
-!!! warning
-
-    When using [1Password CLI 2.0](https://developer.1password.com/), note that
-    the structure of the data returned by the `onepassword` template function
-    is different and your templates will need updating.
-
-    You may wish to use `onepasswordDetailsFields` or `onepasswordItemFields`
-    instead of this function, as `onepassword` returns fields as a list of
-    objects. However, this function may return values that are inaccessible from
-    the other functions. Testing the output of this function is recommended:
-
-    ```console
-    $ chezmoi execute-template "{{ onepassword \"$UUID\" | toJson }}" | jq .
-    ```
-
diff --git a/...moi.io/docs/reference/templates/1password-functions/onepasswordDetailsFields.md b/...moi.io/docs/reference/templates/1password-functions/onepasswordDetailsFields.md
@@ -10,10 +10,6 @@ elements of `details.fields` are returned as a map indexed by each field's `id`
 If there is no valid session in the environment, by default you will be
 interactively prompted to sign in.
 
-!!! info
-
-    For 1Password CLI 1.x, the map is indexed by each field's `designation`.
-
 The output from `op` is cached so calling `onepasswordDetailsFields` multiple
 times with the same *uuid* will only invoke `op` once. If the optional
 *vault-uuid* is supplied, it will be passed along to the `op get` call, which
@@ -75,18 +71,3 @@ accounts).
         }
     }
     ```
-
-!!! warning
-
-    When using [1Password CLI 2.0](https://developer.1password.com/docs/cli),
-    note that the structure of the data returned by the
-    `onepasswordDetailsFields` template function is different and your templates
-    will need updating.
-
-    You may wish to use `onepassword`, `onepasswordItemFields`, or
-    `onepasswordRead` instead of this function, as it may not return expected
-    values. Testing the output of this function is recommended:
-
-    ```console
-    $ chezmoi execute-template "{{ onepasswordDetailsFields \"$UUID\" | toJson }}" | jq .
-    ```
diff --git a/...hezmoi.io/docs/reference/templates/1password-functions/onepasswordItemFields.md b/...hezmoi.io/docs/reference/templates/1password-functions/onepasswordItemFields.md
@@ -26,20 +26,6 @@ interactively prompted to sign in.
     $ op item get abcdefghijklmnopqrstuvwxyz --fields exampleLabel
     ```
 
-    !!! info
-
-        For 1Password CLI 1.x.
-
-        ```
-        {{ (onepasswordItemFields "abcdefghijklmnopqrstuvwxyz").exampleLabel.v }}
-        ```
-
-        is equivalent to calling
-
-        ```console
-        $ op item get abcdefghijklmnopqrstuvwxyz --fields exampleLabel
-        ```
-
 !!! example
 
     Given the output from `op`:
@@ -128,17 +114,3 @@ interactively prompted to sign in.
             }
         }
         ```
-
-!!! warning
-
-    When using [1Password CLI 2.0](https://developer.1password.com/docs/cli),
-    note that the structure of the data returned by the `onepasswordItemFields`
-    template function is different and your templates will need updating.
-
-    You may wish to use `onepassword`, `onepasswordDetailsFields`, or
-    `onepasswordRead` instead of this function, as it may not return expected
-    values. Testing the output of this function is recommended:
-
-    ```console
-    $ chezmoi execute-template "{{ onepasswordItemFields \"$UUID\" | toJson }}" | jq .
-    ```
diff --git a/assets/chezmoi.io/docs/user-guide/password-managers/1password.md b/assets/chezmoi.io/docs/user-guide/password-managers/1password.md
@@ -4,12 +4,6 @@ chezmoi includes support for [1Password](https://1password.com/) using the
 [1Password CLI](https://support.1password.com/command-line-getting-started/) to
 expose data as a template function.
 
-!!! note
-
-    The [1Password CLI 2.0](https://developer.1password.com/) has been released.
-    Examples will be shown using the changed details for this version and
-    examples for 1Password CLI 1.x will follow.
-
 Log in and get a session using:
 
 ```console
@@ -19,14 +13,6 @@ $ eval $(op signin --account $SUBDOMAIN)
 
 This is not necessary if you are using biometric authentication.
 
-!!! info
-
-    For 1Password CLI 1.x, use:
-
-    ```console
-    $ eval $(op signin $SUBDOMAIN.1password.com $EMAIL)
-    ```
-
 The output of `op read $URL` is available as the `onepasswordRead` template
 function, for example:
 

diff --git a/internal/cmd/doctorcmd.go b/internal/cmd/doctorcmd.go
@@ -296,6 +296,7 @@ func (c *Config) runDoctorCmd(cmd *cobra.Command, args []string) error {
 			ifNotExist:  checkResultInfo,
 			versionArgs: []string{"--version"},
 			versionRx:   onepasswordVersionRx,
+			minVersion:  &onepasswordMinVersion,
 		},
 		&binaryCheck{
 			name:        "bitwarden-command",