Simplify code and add check for version 1

Author: edif2008

internals/onepassword/cli_v1.go

@@ -6,13 +6,10 @@ import (
 	"fmt"
 )
 
-type OPV1CLI struct {
-	version string
-	isV2    bool
-}
+type OPV1CLI struct{}
 
 func (op *OPV1CLI) IsV2() bool {
-	return op.isV2
+	return false
 }
 
 func (op *OPV1CLI) CreateVault(name string) error {

internals/onepassword/cli_v2.go

@@ -7,13 +7,10 @@ import (
 	"os"
 )
 
-type OPV2CLI struct {
-	version string
-	isV2    bool
-}
+type OPV2CLI struct{}
 
 func (op *OPV2CLI) IsV2() bool {
-	return op.isV2
+	return true
 }
 
 func (op *OPV2CLI) CreateVault(name string) error {

internals/onepassword/onepassword.go

@@ -32,15 +32,11 @@ func GetOPClient() (OPCLI, error) {
 	version := strings.TrimSpace(string(out))
 
 	if strings.HasPrefix(version, "2.") {
-		return &OPV2CLI{
-			version: version,
-			isV2:    true,
-		}, nil
-	}
-	return &OPV1CLI{
-		version: version,
-		isV2:    false,
-	}, nil
+		return &OPV2CLI{}, nil
+	} else if strings.HasPrefix(version, "1.") {
+		return &OPV1CLI{}, nil
+	}
+	return nil, fmt.Errorf("1password: op version not recognized")
 }
 
 func NewItemTemplate() *ItemTemplate {