From 55b5781d7a9b7e2175f164850db3f5429a84b041 Mon Sep 17 00:00:00 2001
From: Volodymyr Zotov <volodymyr.zotov@agilebits.com>
Date: Mon, 16 Jun 2025 21:04:22 -0500
Subject: [PATCH] Pass logger to print what what type of client is used Connect
 or Service Account

---
 cmd/main.go                      |  5 ++++-
 pkg/onepassword/client/client.go | 16 +++++++++++-----
 2 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/cmd/main.go b/cmd/main.go
index e096a5f..01304f4 100644
--- a/cmd/main.go
+++ b/cmd/main.go
@@ -152,7 +152,10 @@ func main() {
 	}
 
 	// Setup One Password Client
-	opClient, err := opclient.NewFromEnvironment(version.OperatorVersion)
+	opClient, err := opclient.NewFromEnvironment(opclient.Config{
+		Logger:  setupLog,
+		Version: version.OperatorVersion,
+	})
 	if err != nil {
 		setupLog.Error(err, "unable to create 1Password client")
 		os.Exit(1)
diff --git a/pkg/onepassword/client/client.go b/pkg/onepassword/client/client.go
index 52db568..a77867e 100644
--- a/pkg/onepassword/client/client.go
+++ b/pkg/onepassword/client/client.go
@@ -2,9 +2,10 @@ package client
 
 import (
 	"errors"
-	"fmt"
 	"os"
 
+	"github.com/go-logr/logr"
+
 	"github.com/1Password/onepassword-operator/pkg/onepassword/client/connect"
 	"github.com/1Password/onepassword-operator/pkg/onepassword/client/sdk"
 	"github.com/1Password/onepassword-operator/pkg/onepassword/model"
@@ -18,8 +19,13 @@ type Client interface {
 	GetVaultsByTitle(title string) ([]model.Vault, error)
 }
 
+type Config struct {
+	Logger  logr.Logger
+	Version string
+}
+
 // NewFromEnvironment creates a new 1Password client based on the provided configuration.
-func NewFromEnvironment(integrationVersion string) (Client, error) {
+func NewFromEnvironment(cfg Config) (Client, error) {
 	connectHost, _ := os.LookupEnv("OP_CONNECT_HOST")
 	connectToken, _ := os.LookupEnv("OP_CONNECT_TOKEN")
 	serviceAccountToken, _ := os.LookupEnv("OP_SERVICE_ACCOUNT_TOKEN")
@@ -29,16 +35,16 @@ func NewFromEnvironment(integrationVersion string) (Client, error) {
 	}
 
 	if serviceAccountToken != "" {
-		fmt.Printf("Using Service Account Token")
+		cfg.Logger.Info("Using Service Account Token")
 		return sdk.NewClient(sdk.Config{
 			ServiceAccountToken: serviceAccountToken,
 			IntegrationName:     "1password-operator",
-			IntegrationVersion:  integrationVersion,
+			IntegrationVersion:  cfg.Version,
 		})
 	}
 
 	if connectHost != "" && connectToken != "" {
-		fmt.Printf("Using Connect")
+		cfg.Logger.Info("Using 1Password Connect")
 		return connect.NewClient(connect.Config{
 			ConnectHost:  connectHost,
 			ConnectToken: connectToken,