From 8b930e81e9549ee65d1b3b59ad803a65d6c5101b Mon Sep 17 00:00:00 2001
From: JMboya <44696487+JeffMboya@users.noreply.github.com>
Date: Wed, 3 Apr 2024 15:40:05 +0300
Subject: [PATCH] MG-2125 - Unable to enable thing using bootstrap (#2132)

Signed-off-by: JeffMboya <jangina.mboya@gmail.com>
---
 bootstrap/service.go | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/bootstrap/service.go b/bootstrap/service.go
index 2f87d1ae57..aae7d1bf3b 100644
--- a/bootstrap/service.go
+++ b/bootstrap/service.go
@@ -325,6 +325,10 @@ func (bs bootstrapService) ChangeState(ctx context.Context, token, id string, st
 				ThingID:   cfg.ThingID,
 			}
 			if err := bs.sdk.Connect(conIDs, token); err != nil {
+				// Ignore conflict errors as they indicate the connection already exists.
+				if errors.Contains(err, svcerr.ErrConflict) {
+					continue
+				}
 				return ErrThings
 			}
 		}