feat: Git committer should use username/email from plural creds (#582)

* git committer should use the username and email from the given plural creds

* update mock client

* dont use author flag

* git committer set in cloneRepo now

* swallow error

Author: JohnBlackwell

go.mod

@@ -37,7 +37,7 @@ require (
 	github.com/openshift/api v0.0.0-20250908150922-8634aa495a26
 	github.com/orcaman/concurrent-map/v2 v2.0.1
 	github.com/pkg/errors v0.9.1
-	github.com/pluralsh/console/go/client v1.54.2
+	github.com/pluralsh/console/go/client v1.54.3
 	github.com/pluralsh/controller-reconcile-helper v0.1.0
 	github.com/pluralsh/gophoenix v0.1.3-0.20231201014135-dff1b4309e34
 	github.com/pluralsh/polly v0.3.3

go.sum

@@ -879,8 +879,8 @@ github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
 github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/planetscale/vtprotobuf v0.6.1-0.20240319094008-0393e58bdf10 h1:GFCKgmp0tecUJ0sJuv4pzYCqS9+RGSn52M3FUwPs+uo=
 github.com/planetscale/vtprotobuf v0.6.1-0.20240319094008-0393e58bdf10/go.mod h1:t/avpk3KcrXxUnYOhZhMXJlSEyie6gQbtLq5NM3loB8=
-github.com/pluralsh/console/go/client v1.54.2 h1:fmu/xfs58YzY7gBloE+vlOeolTdi6EfQ5pOrgSOY/bQ=
-github.com/pluralsh/console/go/client v1.54.2/go.mod h1:EwMrcI23s61oLY3etCVc3NE5RYxgfoiokvU0O7KDOQg=
+github.com/pluralsh/console/go/client v1.54.3 h1:J/GDYuHFAUaTlsRv1tiUPfXrq5RElFTJKwqAvkn5+88=
+github.com/pluralsh/console/go/client v1.54.3/go.mod h1:EwMrcI23s61oLY3etCVc3NE5RYxgfoiokvU0O7KDOQg=
 github.com/pluralsh/controller-reconcile-helper v0.1.0 h1:BV3dYZFH5rn8ZvZjtpkACSv/GmLEtRftNQj/Y4ddHEo=
 github.com/pluralsh/controller-reconcile-helper v0.1.0/go.mod h1:RxAbvSB4/jkvx616krCdNQXPbpGJXW3J1L3rASxeFOA=
 github.com/pluralsh/gophoenix v0.1.3-0.20231201014135-dff1b4309e34 h1:ab2PN+6if/Aq3/sJM0AVdy1SYuMAnq4g20VaKhTm/Bw=

pkg/agentrun-harness/controller/controller.go

@@ -8,6 +8,8 @@ import (
 	gqlclient "github.com/pluralsh/console/go/client"
 	"k8s.io/klog/v2"
 
+	"github.com/pluralsh/deployment-operator/pkg/client"
+
 	agentrunv1 "github.com/pluralsh/deployment-operator/pkg/agentrun-harness/agentrun/v1"
 	"github.com/pluralsh/deployment-operator/pkg/agentrun-harness/environment"
 	"github.com/pluralsh/deployment-operator/pkg/agentrun-harness/tool"
@@ -81,9 +83,11 @@ func (in *agentRunController) Start(ctx context.Context) (retErr error) {
 
 // prepare sets up the agent run environment and AI credentials
 func (in *agentRunController) prepare() error {
+	consoleTokenClient := client.New(fmt.Sprintf("%s/gql", in.consoleUrl), *in.agentRun.PluralCreds.Token)
 	env := environment.New(
 		environment.WithAgentRun(in.agentRun),
 		environment.WithWorkingDir(in.dir),
+		environment.WithConsoleTokenClient(consoleTokenClient),
 	)
 
 	if err := env.Setup(); err != nil {

pkg/agentrun-harness/environment/environment.go

@@ -62,16 +62,32 @@ func (in *environment) cloneRepository() error {
 		return err
 	}
 
+	var userName, userEmail string
+	if in.consoleTokenClient != nil {
+		user, _ := in.consoleTokenClient.Me()
+		if user != nil && user.Name != "" && user.Email != "" {
+			userName = user.Name
+			userEmail = user.Email
+		}
+	}
+
+	if userName == "" && in.agentRun.ScmCreds != nil {
+		userName = in.agentRun.ScmCreds.Username
+	}
+	if userEmail == "" {
+		userEmail = "[email protected]" // fallback
+	}
+
 	repoDirPath := path.Join(in.dir, repoDir)
 	if err := exec.NewExecutable("git",
-		exec.WithArgs([]string{"config", "user.name", in.agentRun.ScmCreds.Username}),
+		exec.WithArgs([]string{"config", "user.name", userName}),
 		exec.WithDir(repoDirPath),
 	).Run(context.Background()); err != nil {
 		return err
 	}
 
 	if err := exec.NewExecutable("git",
-		exec.WithArgs([]string{"config", "user.email", "[email protected]"}),
+		exec.WithArgs([]string{"config", "user.email", userEmail}),
 		exec.WithDir(repoDirPath),
 	).Run(context.Background()); err != nil {
 		return err

pkg/agentrun-harness/environment/environment_options.go

@@ -2,6 +2,7 @@ package environment
 
 import (
 	v1 "github.com/pluralsh/deployment-operator/pkg/agentrun-harness/agentrun/v1"
+	console "github.com/pluralsh/deployment-operator/pkg/client"
 )
 
 // WithWorkingDir allows changing the default working directory of the Environment.
@@ -18,3 +19,9 @@ func WithAgentRun(agentRun *v1.AgentRun) Option {
 		e.agentRun = agentRun
 	}
 }
+
+func WithConsoleTokenClient(client console.Client) Option {
+	return func(e *environment) {
+		e.consoleTokenClient = client
+	}
+}

pkg/agentrun-harness/environment/environment_types.go

@@ -2,6 +2,7 @@ package environment
 
 import (
 	v1 "github.com/pluralsh/deployment-operator/pkg/agentrun-harness/agentrun/v1"
+	console "github.com/pluralsh/deployment-operator/pkg/client"
 )
 
 // environment implements Environment interface.
@@ -13,6 +14,8 @@ type environment struct {
 	agentRun *v1.AgentRun
 	// dir is the working directory where the repository will be cloned.
 	dir string
+	// console is the Plural Console Client
+	consoleTokenClient console.Client // Console token client for Me()
 }
 
 // Option allows modifying Environment behavior.

pkg/client/common.go

@@ -1,6 +1,8 @@
 package client
 
 import (
+	"fmt"
+
 	console "github.com/pluralsh/console/go/client"
 )
 
@@ -21,3 +23,15 @@ func (c *client) GetGroup(name string) (*console.GroupFragment, error) {
 
 	return getGroup.Group, nil
 }
+
+func (c *client) Me() (*console.Me_Me, error) {
+	response, err := c.consoleClient.Me(c.ctx)
+	if err != nil {
+		return nil, err
+	}
+	if response == nil || response.Me == nil {
+		return nil, fmt.Errorf("me query returned nil")
+	}
+
+	return response.Me, nil
+}

pkg/client/console.go

@@ -97,4 +97,5 @@ type Client interface {
 	ListClusterSentinelRunJobs(after *string, first *int64) (*console.ListClusterSentinelRunJobs_ClusterSentinelRunJobs, error)
 	UpdateSentinelRunJobStatus(id string, attr *console.SentinelRunJobUpdateAttributes) error
 	CreateAgentMessage(ctx context.Context, runID string, attrs console.AgentMessageAttributes) (*console.CreateAgentMessage_CreateAgentMessage, error)
+	Me() (*console.Me_Me, error)
 }