From 4ceabcb4d1754cc32e32fd74380d55a0208f3af6 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 9 Sep 2024 12:50:32 +0000
Subject: [PATCH] Bump github.com/conductorone/baton-sdk from 0.2.25 to 0.2.26

Bumps [github.com/conductorone/baton-sdk](https://github.com/conductorone/baton-sdk) from 0.2.25 to 0.2.26.
- [Release notes](https://github.com/conductorone/baton-sdk/releases)
- [Commits](https://github.com/conductorone/baton-sdk/compare/v0.2.25...v0.2.26)

---
updated-dependencies:
- dependency-name: github.com/conductorone/baton-sdk
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 go.mod                                             |  2 +-
 go.sum                                             |  4 ++--
 .../baton-sdk/pkg/connectorrunner/runner.go        | 14 +++++++++++++-
 .../conductorone/baton-sdk/pkg/sdk/version.go      |  2 +-
 vendor/modules.txt                                 |  2 +-
 5 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/go.mod b/go.mod
index fb21d46..df4e32f 100644
--- a/go.mod
+++ b/go.mod
@@ -5,7 +5,7 @@ go 1.21
 toolchain go1.22.3
 
 require (
-	github.com/conductorone/baton-sdk v0.2.25
+	github.com/conductorone/baton-sdk v0.2.26
 	github.com/go-ldap/ldap/v3 v3.4.5
 	github.com/grpc-ecosystem/go-grpc-middleware v1.4.0
 	github.com/jackc/puddle/v2 v2.2.1
diff --git a/go.sum b/go.sum
index f9ed907..399de6a 100644
--- a/go.sum
+++ b/go.sum
@@ -56,8 +56,8 @@ github.com/benbjohnson/clock v1.3.5/go.mod h1:J11/hYXuz8f4ySSvYwY0FKfm+ezbsZBKZx
 github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
 github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
 github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc=
-github.com/conductorone/baton-sdk v0.2.25 h1:G4MHVM+c4kXcRxeTbMMG0LSeIBchXHcpuuTgn/vD8oE=
-github.com/conductorone/baton-sdk v0.2.25/go.mod h1:hmd/Oz3DPIKD+9QmkusZaA18ZoiinnTDdrxh2skcdUc=
+github.com/conductorone/baton-sdk v0.2.26 h1:nU/GinAhY8OvxrWuOIFKVsQ4QkcDI0b42+bSAiHPJtw=
+github.com/conductorone/baton-sdk v0.2.26/go.mod h1:hmd/Oz3DPIKD+9QmkusZaA18ZoiinnTDdrxh2skcdUc=
 github.com/cpuguy83/go-md2man/v2 v2.0.3/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
diff --git a/vendor/github.com/conductorone/baton-sdk/pkg/connectorrunner/runner.go b/vendor/github.com/conductorone/baton-sdk/pkg/connectorrunner/runner.go
index ded338a..f57889f 100644
--- a/vendor/github.com/conductorone/baton-sdk/pkg/connectorrunner/runner.go
+++ b/vendor/github.com/conductorone/baton-sdk/pkg/connectorrunner/runner.go
@@ -7,6 +7,7 @@ import (
 	"os"
 	"os/signal"
 	"path/filepath"
+	"strings"
 	"time"
 
 	"golang.org/x/sync/semaphore"
@@ -128,8 +129,9 @@ func (c *connectorRunner) run(ctx context.Context) error {
 
 	waitDuration := time.Second * 0
 	errCount := 0
+	stopForLoop := false
 	var err error
-	for {
+	for !stopForLoop {
 		select {
 		case <-ctx.Done():
 			return c.handleContextCancel(ctx)
@@ -194,7 +196,11 @@ func (c *connectorRunner) run(ctx context.Context) error {
 				defer sem.Release(1)
 				err := c.processTask(ctx, t)
 				if err != nil {
+					if strings.Contains(err.Error(), "grpc: the client connection is closing") {
+						stopForLoop = true
+					}
 					l.Error("runner: error processing task", zap.Error(err), zap.String("task_id", t.Id), zap.String("task_type", tasks.GetType(t).String()))
+					return
 				}
 				l.Debug("runner: task processed", zap.String("task_id", t.Id), zap.String("task_type", tasks.GetType(t).String()))
 			}(nextTask)
@@ -202,6 +208,12 @@ func (c *connectorRunner) run(ctx context.Context) error {
 			l.Debug("runner: dispatched task, waiting for next task", zap.Duration("wait_duration", waitDuration))
 		}
 	}
+
+	if stopForLoop {
+		return fmt.Errorf("Unable to communicate with gRPC server")
+	}
+
+	return nil
 }
 
 func (c *connectorRunner) Close(ctx context.Context) error {
diff --git a/vendor/github.com/conductorone/baton-sdk/pkg/sdk/version.go b/vendor/github.com/conductorone/baton-sdk/pkg/sdk/version.go
index 709ed1a..ca5b436 100644
--- a/vendor/github.com/conductorone/baton-sdk/pkg/sdk/version.go
+++ b/vendor/github.com/conductorone/baton-sdk/pkg/sdk/version.go
@@ -1,3 +1,3 @@
 package sdk
 
-const Version = "v0.2.24"
+const Version = "v0.2.25"
diff --git a/vendor/modules.txt b/vendor/modules.txt
index 9aee384..9733ac8 100644
--- a/vendor/modules.txt
+++ b/vendor/modules.txt
@@ -147,7 +147,7 @@ github.com/aws/smithy-go/waiter
 # github.com/benbjohnson/clock v1.3.5
 ## explicit; go 1.15
 github.com/benbjohnson/clock
-# github.com/conductorone/baton-sdk v0.2.25
+# github.com/conductorone/baton-sdk v0.2.26
 ## explicit; go 1.21
 github.com/conductorone/baton-sdk/internal/connector
 github.com/conductorone/baton-sdk/pb/c1/c1z/v1