From 927c0ebdbe8132505d3ded38bd8f7e9ad271afc6 Mon Sep 17 00:00:00 2001
From: Keepers <ryanfkeepers@gmail.com>
Date: Wed, 28 Dec 2022 11:00:32 -0700
Subject: [PATCH] catch odata errSyncFolderNotFound (#1977)

## Description

Adds thte odata error code SyncFolderNot-
Found to the ErrDeletedInFlight matcher set.
This further protects backups from failing out
if an item was deleted while the backup was
in process.

## Does this PR need a docs update or release note?

- [x] :no_entry: No

## Type of change

- [x] :bug: Bugfix

## Issue(s)

* #1957

## Test Plan

- [x] :green_heart: E2E
---
 src/internal/connector/graph/errors.go | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/src/internal/connector/graph/errors.go b/src/internal/connector/graph/errors.go
index 3c949df04..cf2df3556 100644
--- a/src/internal/connector/graph/errors.go
+++ b/src/internal/connector/graph/errors.go
@@ -1,11 +1,11 @@
 package graph
 
 import (
-	"fmt"
 	"net/url"
 
 	"github.com/microsoftgraph/msgraph-sdk-go/models/odataerrors"
 	"github.com/pkg/errors"
+	"golang.org/x/exp/slices"
 
 	"github.com/alcionai/corso/src/internal/common"
 )
@@ -18,6 +18,7 @@ const (
 	errCodeItemNotFound        = "ErrorItemNotFound"
 	errCodeEmailFolderNotFound = "ErrorSyncFolderNotFound"
 	errCodeResyncRequired      = "ResyncRequired"
+	errCodeSyncFolderNotFound  = "ErrorSyncFolderNotFound"
 	errCodeSyncStateNotFound   = "SyncStateNotFound"
 )
 
@@ -32,7 +33,7 @@ func IsErrDeletedInFlight(err error) error {
 		return err
 	}
 
-	if hasErrorCode(err, errCodeItemNotFound) {
+	if hasErrorCode(err, errCodeItemNotFound, errCodeSyncFolderNotFound) {
 		return ErrDeletedInFlight{*common.EncapsulateError(err)}
 	}
 
@@ -56,8 +57,7 @@ func IsErrInvalidDelta(err error) error {
 		return err
 	}
 
-	if hasErrorCode(err, errCodeSyncStateNotFound) ||
-		hasErrorCode(err, errCodeResyncRequired) {
+	if hasErrorCode(err, errCodeSyncStateNotFound, errCodeResyncRequired) {
 		return ErrInvalidDelta{*common.EncapsulateError(err)}
 	}
 
@@ -98,9 +98,8 @@ func asTimeout(err error) bool {
 // error parsers
 // ---------------------------------------------------------------------------
 
-func hasErrorCode(err error, code string) bool {
+func hasErrorCode(err error, codes ...string) bool {
 	if err == nil {
-		fmt.Println("nil")
 		return false
 	}
 
@@ -109,8 +108,11 @@ func hasErrorCode(err error, code string) bool {
 		return false
 	}
 
-	return oDataError.GetError().GetCode() != nil &&
-		*oDataError.GetError().GetCode() == code
+	if oDataError.GetError().GetCode() == nil {
+		return false
+	}
+
+	return slices.Contains(codes, *oDataError.GetError().GetCode())
 }
 
 // isTimeoutErr is used to determine if the Graph error returned is