From c59c1d240811563236328d4be46fcbba21bc1af8 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 3 Aug 2023 02:04:46 +0000
Subject: [PATCH] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Bump=20github.com/microsof?=
=?UTF-8?q?tgraph/msgraph-sdk-go=20from=201.12.0=20to=201.13.0=20in=20/src?=
=?UTF-8?q?=20(#3931)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Bumps [github.com/microsoftgraph/msgraph-sdk-go](https://github.com/microsoftgraph/msgraph-sdk-go) from 1.12.0 to 1.13.0.
Changelog
Sourced from github.com/microsoftgraph/msgraph-sdk-go's changelog.
[1.13.0]- 2023-07-28
Changed
Commits
[](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores)
You can trigger a rebase of this PR by commenting `@dependabot rebase`.
[//]: # (dependabot-automerge-start)
[//]: # (dependabot-automerge-end)
---
Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR:
- `@dependabot rebase` will rebase this PR
- `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it
- `@dependabot merge` will merge this PR after your CI passes on it
- `@dependabot squash and merge` will squash and merge this PR after your CI passes on it
- `@dependabot cancel merge` will cancel a previously requested merge and block automerging
- `@dependabot reopen` will reopen this PR if it is closed
- `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually
- `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself)
- `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself)
- `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)
---
src/cmd/sanity_test/restore/onedrive.go | 6 +++---
src/go.mod | 2 +-
src/go.sum | 4 ++--
src/internal/m365/exchange/attendees.go | 4 ++--
src/internal/m365/exchange/transform.go | 6 +++---
src/internal/m365/exchange/transform_test.go | 6 +++---
src/internal/m365/graph/errors.go | 4 ++--
src/internal/m365/graph/errors_test.go | 6 +++---
src/internal/m365/helper_test.go | 2 +-
src/internal/m365/onedrive/collections.go | 4 ++--
src/internal/m365/onedrive/collections_test.go | 6 +++---
src/internal/m365/onedrive/item_collector_test.go | 2 +-
src/internal/m365/onedrive/metadata/permissions.go | 2 +-
src/internal/m365/onedrive/permission.go | 4 ++--
src/internal/m365/sharepoint/api/serialization.go | 2 +-
src/pkg/services/m365/api/events.go | 2 +-
src/pkg/services/m365/api/helper_test.go | 4 ++--
src/pkg/services/m365/api/item_pager_test.go | 2 +-
src/pkg/services/m365/m365_test.go | 14 +++++++-------
19 files changed, 41 insertions(+), 41 deletions(-)
diff --git a/src/cmd/sanity_test/restore/onedrive.go b/src/cmd/sanity_test/restore/onedrive.go
index 87ea424c3..14fa3b8cd 100644
--- a/src/cmd/sanity_test/restore/onedrive.go
+++ b/src/cmd/sanity_test/restore/onedrive.go
@@ -145,7 +145,7 @@ func PopulateDriveDetails(
fileSizes[itemName] = ptr.Val(driveItem.GetSize())
}
- if driveItem.GetFolder() == nil && driveItem.GetPackage() == nil {
+ if driveItem.GetFolder() == nil && driveItem.GetPackageEscaped() == nil {
continue
}
@@ -256,7 +256,7 @@ func getOneDriveChildFolder(
fileSizes[fullName] = ptr.Val(driveItem.GetSize())
}
- if driveItem.GetFolder() == nil && driveItem.GetPackage() == nil {
+ if driveItem.GetFolder() == nil && driveItem.GetPackageEscaped() == nil {
continue
}
@@ -304,7 +304,7 @@ func getRestoredDrive(
continue
}
- if item.GetFolder() == nil && item.GetPackage() == nil {
+ if item.GetFolder() == nil && item.GetPackageEscaped() == nil {
continue
}
diff --git a/src/go.mod b/src/go.mod
index f02ba0530..85b2b456f 100644
--- a/src/go.mod
+++ b/src/go.mod
@@ -19,7 +19,7 @@ require (
github.com/microsoft/kiota-http-go v1.0.1
github.com/microsoft/kiota-serialization-form-go v1.0.0
github.com/microsoft/kiota-serialization-json-go v1.0.4
- github.com/microsoftgraph/msgraph-sdk-go v1.12.0
+ github.com/microsoftgraph/msgraph-sdk-go v1.13.0
github.com/microsoftgraph/msgraph-sdk-go-core v1.0.0
github.com/pkg/errors v0.9.1
github.com/puzpuzpuz/xsync/v2 v2.4.1
diff --git a/src/go.sum b/src/go.sum
index 10c6ac053..5131ee583 100644
--- a/src/go.sum
+++ b/src/go.sum
@@ -283,8 +283,8 @@ github.com/microsoft/kiota-serialization-json-go v1.0.4 h1:5TaISWwd2Me8clrK7SqNA
github.com/microsoft/kiota-serialization-json-go v1.0.4/go.mod h1:rM4+FsAY+9AEpBsBzkFFis+b/LZLlNKKewuLwK9Q6Mg=
github.com/microsoft/kiota-serialization-text-go v1.0.0 h1:XOaRhAXy+g8ZVpcq7x7a0jlETWnWrEum0RhmbYrTFnA=
github.com/microsoft/kiota-serialization-text-go v1.0.0/go.mod h1:sM1/C6ecnQ7IquQOGUrUldaO5wj+9+v7G2W3sQ3fy6M=
-github.com/microsoftgraph/msgraph-sdk-go v1.12.0 h1:/jZJ1KCtVlvxStKq31VsEPOQQ5Iy26R1pgvc+RYt7XI=
-github.com/microsoftgraph/msgraph-sdk-go v1.12.0/go.mod h1:ccLv84FJFtwdSzYWM/HlTes5FLzkzzBsYh9kg93/WS8=
+github.com/microsoftgraph/msgraph-sdk-go v1.13.0 h1:k+3FJJYCSBcnIueefLrO4Ofsd4UP4NzOQ9k3La8I2oU=
+github.com/microsoftgraph/msgraph-sdk-go v1.13.0/go.mod h1:ccLv84FJFtwdSzYWM/HlTes5FLzkzzBsYh9kg93/WS8=
github.com/microsoftgraph/msgraph-sdk-go-core v1.0.0 h1:7NWTfyXvOjoizW7PmxNp3+8wCKPgpODs/D1cUZ3fkAY=
github.com/microsoftgraph/msgraph-sdk-go-core v1.0.0/go.mod h1:tQb4q3YMIj2dWhhXhQSJ4ELpol931ANKzHSYK5kX1qE=
github.com/minio/md5-simd v1.1.2 h1:Gdi1DZK69+ZVMoNHRXJyNcxrMA4dSxoYHZSQbirFg34=
diff --git a/src/internal/m365/exchange/attendees.go b/src/internal/m365/exchange/attendees.go
index 5eb638e93..835ec3f62 100644
--- a/src/internal/m365/exchange/attendees.go
+++ b/src/internal/m365/exchange/attendees.go
@@ -37,7 +37,7 @@ func FormatAttendees(event models.Eventable, isHTML bool) string {
response: entry.GetStatus().GetResponse().String(),
}
- switch ptr.Val(entry.GetType()) {
+ switch ptr.Val(entry.GetTypeEscaped()) {
case models.REQUIRED_ATTENDEETYPE:
required = append(required, temp)
@@ -81,7 +81,7 @@ func attendeeListToString(attendList []attendee, heading string, isHTML bool) st
}
func guardCheckForAttendee(attendee models.Attendeeable) bool {
- if attendee.GetType() == nil ||
+ if attendee.GetTypeEscaped() == nil ||
attendee.GetStatus() == nil {
return true
}
diff --git a/src/internal/m365/exchange/transform.go b/src/internal/m365/exchange/transform.go
index 2e740549c..5dccbe34f 100644
--- a/src/internal/m365/exchange/transform.go
+++ b/src/internal/m365/exchange/transform.go
@@ -82,9 +82,9 @@ func toEventSimplified(orig models.Eventable) models.Eventable {
// Sanitize recurrence timezone.
if orig.GetRecurrence() != nil {
- recurrenceTimezone := ptr.Val(orig.GetRecurrence().GetRange().GetRecurrenceTimeZone())
+ recurrenceTimezone := ptr.Val(orig.GetRecurrence().GetRangeEscaped().GetRecurrenceTimeZone())
if len(recurrenceTimezone) == 0 {
- orig.GetRecurrence().GetRange().SetRecurrenceTimeZone(nil)
+ orig.GetRecurrence().GetRangeEscaped().SetRecurrenceTimeZone(nil)
}
}
@@ -270,7 +270,7 @@ func sanitizeEvent(orig models.Eventable) (models.Eventable, error) {
newEvent.SetReminderMinutesBeforeStart(orig.GetReminderMinutesBeforeStart())
newEvent.SetStart(orig.GetStart())
newEvent.SetSubject(orig.GetSubject())
- newEvent.SetType(orig.GetType())
+ newEvent.SetTypeEscaped(orig.GetTypeEscaped())
// Sanitation NOTE
// isDraft and isOrganizer *bool ptr's have to be removed completely
diff --git a/src/internal/m365/exchange/transform_test.go b/src/internal/m365/exchange/transform_test.go
index 823a65f2c..1bd8070dc 100644
--- a/src/internal/m365/exchange/transform_test.go
+++ b/src/internal/m365/exchange/transform_test.go
@@ -92,7 +92,7 @@ func (suite *TransformUnitTest) TestToEventSimplified_recurrence() {
},
validateOutput: func(e models.Eventable) bool {
- return e.GetRecurrence().GetRange().GetRecurrenceTimeZone() == nil
+ return e.GetRecurrence().GetRangeEscaped().GetRecurrenceTimeZone() == nil
},
},
{
@@ -105,7 +105,7 @@ func (suite *TransformUnitTest) TestToEventSimplified_recurrence() {
},
validateOutput: func(e models.Eventable) bool {
- return e.GetRecurrence().GetRange().GetRecurrenceTimeZone() == nil
+ return e.GetRecurrence().GetRangeEscaped().GetRecurrenceTimeZone() == nil
},
},
{
@@ -118,7 +118,7 @@ func (suite *TransformUnitTest) TestToEventSimplified_recurrence() {
},
validateOutput: func(e models.Eventable) bool {
- return ptr.Val(e.GetRecurrence().GetRange().GetRecurrenceTimeZone()) == "Pacific Standard Time"
+ return ptr.Val(e.GetRecurrence().GetRangeEscaped().GetRecurrenceTimeZone()) == "Pacific Standard Time"
},
},
{
diff --git a/src/internal/m365/graph/errors.go b/src/internal/m365/graph/errors.go
index f35b91385..1f2ba98c0 100644
--- a/src/internal/m365/graph/errors.go
+++ b/src/internal/m365/graph/errors.go
@@ -240,7 +240,7 @@ func hasErrorCode(err error, codes ...errorCode) bool {
return false
}
- code, ok := ptr.ValOK(oDataError.GetError().GetCode())
+ code, ok := ptr.ValOK(oDataError.GetErrorEscaped().GetCode())
if !ok {
return false
}
@@ -349,7 +349,7 @@ func errData(err odataerrors.ODataErrorable) (string, []any, string) {
data := make([]any, 0)
// Get MainError
- mainErr := err.GetError()
+ mainErr := err.GetErrorEscaped()
mainMsg := ptr.Val(mainErr.GetMessage())
data = appendIf(data, "odataerror_code", mainErr.GetCode())
diff --git a/src/internal/m365/graph/errors_test.go b/src/internal/m365/graph/errors_test.go
index 81d9787bb..d3690f798 100644
--- a/src/internal/m365/graph/errors_test.go
+++ b/src/internal/m365/graph/errors_test.go
@@ -33,7 +33,7 @@ func odErr(code string) *odataerrors.ODataError {
odErr := odataerrors.NewODataError()
merr := odataerrors.NewMainError()
merr.SetCode(&code)
- odErr.SetError(merr)
+ odErr.SetErrorEscaped(merr)
return odErr
}
@@ -43,7 +43,7 @@ func odErrMsg(code, message string) *odataerrors.ODataError {
merr := odataerrors.NewMainError()
merr.SetCode(&code)
merr.SetMessage(&message)
- odErr.SetError(merr)
+ odErr.SetErrorEscaped(merr)
return odErr
}
@@ -290,7 +290,7 @@ func (suite *GraphErrorsUnitSuite) TestIsErrUserNotFound() {
name: "non-matching resource not found",
err: func() error {
res := odErr(string(ResourceNotFound))
- res.GetError().SetMessage(ptr.To("Calendar not found"))
+ res.GetErrorEscaped().SetMessage(ptr.To("Calendar not found"))
return res
}(),
diff --git a/src/internal/m365/helper_test.go b/src/internal/m365/helper_test.go
index a3f1d7d5e..78e9cb365 100644
--- a/src/internal/m365/helper_test.go
+++ b/src/internal/m365/helper_test.go
@@ -572,7 +572,7 @@ func checkEvent(
// Skip LastModifiedDateTime as it's tied to this specific instance of the item.
- assert.Equal(t, ptr.Val(expected.GetType()), ptr.Val(got.GetType()), "Type")
+ assert.Equal(t, ptr.Val(expected.GetTypeEscaped()), ptr.Val(got.GetTypeEscaped()), "Type")
}
func compareExchangeEmail(
diff --git a/src/internal/m365/onedrive/collections.go b/src/internal/m365/onedrive/collections.go
index b32d39282..fa91a0a11 100644
--- a/src/internal/m365/onedrive/collections.go
+++ b/src/internal/m365/onedrive/collections.go
@@ -695,7 +695,7 @@ func (c *Collections) UpdateCollections(
itemID = ptr.Val(item.GetId())
itemName = ptr.Val(item.GetName())
ictx = clues.Add(ctx, "item_id", itemID, "item_name", clues.Hide(itemName))
- isFolder = item.GetFolder() != nil || item.GetPackage() != nil
+ isFolder = item.GetFolder() != nil || item.GetPackageEscaped() != nil
)
if item.GetMalware() != nil {
@@ -778,7 +778,7 @@ func (c *Collections) UpdateCollections(
}
colScope := CollectionScopeFolder
- if item.GetPackage() != nil {
+ if item.GetPackageEscaped() != nil {
colScope = CollectionScopePackage
}
diff --git a/src/internal/m365/onedrive/collections_test.go b/src/internal/m365/onedrive/collections_test.go
index 72cdf9585..b1ca92963 100644
--- a/src/internal/m365/onedrive/collections_test.go
+++ b/src/internal/m365/onedrive/collections_test.go
@@ -2476,7 +2476,7 @@ func coreItem(
case isFolder:
item.SetFolder(models.NewFolder())
case isPackage:
- item.SetPackage(models.NewPackageEscaped())
+ item.SetPackageEscaped(models.NewPackageEscaped())
}
return item
@@ -2559,7 +2559,7 @@ func delItem(
case isFolder:
item.SetFolder(models.NewFolder())
case isPackage:
- item.SetPackage(models.NewPackageEscaped())
+ item.SetPackageEscaped(models.NewPackageEscaped())
}
return item
@@ -2571,7 +2571,7 @@ func getDeltaError() error {
me.SetCode(&syncStateNotFound)
deltaError := odataerrors.NewODataError()
- deltaError.SetError(me)
+ deltaError.SetErrorEscaped(me)
return deltaError
}
diff --git a/src/internal/m365/onedrive/item_collector_test.go b/src/internal/m365/onedrive/item_collector_test.go
index 6078517c7..eae82e7e2 100644
--- a/src/internal/m365/onedrive/item_collector_test.go
+++ b/src/internal/m365/onedrive/item_collector_test.go
@@ -46,7 +46,7 @@ func odErr(code string) *odataerrors.ODataError {
odErr := odataerrors.NewODataError()
merr := odataerrors.NewMainError()
merr.SetCode(&code)
- odErr.SetError(merr)
+ odErr.SetErrorEscaped(merr)
return odErr
}
diff --git a/src/internal/m365/onedrive/metadata/permissions.go b/src/internal/m365/onedrive/metadata/permissions.go
index 55201da39..ec0cc22f0 100644
--- a/src/internal/m365/onedrive/metadata/permissions.go
+++ b/src/internal/m365/onedrive/metadata/permissions.go
@@ -216,7 +216,7 @@ func FilterLinkShares(ctx context.Context, perms []models.Permissionable) []Link
ID: ptr.Val(p.GetId()),
Link: LinkShareLink{
Scope: ptr.Val(link.GetScope()),
- Type: ptr.Val(link.GetType()),
+ Type: ptr.Val(link.GetTypeEscaped()),
WebURL: ptr.Val(link.GetWebUrl()),
PreventsDownload: ptr.Val(link.GetPreventsDownload()),
},
diff --git a/src/internal/m365/onedrive/permission.go b/src/internal/m365/onedrive/permission.go
index 023b89bb8..539fee1c3 100644
--- a/src/internal/m365/onedrive/permission.go
+++ b/src/internal/m365/onedrive/permission.go
@@ -340,7 +340,7 @@ func UpdateLinkShares(
// "retainInheritedPermissions": false
// }
lsbody := drives.NewItemItemsItemCreateLinkPostRequestBody()
- lsbody.SetType(ptr.To(ls.Link.Type))
+ lsbody.SetTypeEscaped(ptr.To(ls.Link.Type))
lsbody.SetScope(ptr.To(ls.Link.Scope))
lsbody.SetExpirationDateTime(ls.Expiration)
@@ -375,7 +375,7 @@ func UpdateLinkShares(
// can recreate this by creating a link with no users and deleting it.
if len(lsRemoved) > 0 && len(lsAdded) == 0 {
lsbody := drives.NewItemItemsItemCreateLinkPostRequestBody()
- lsbody.SetType(ptr.To("view"))
+ lsbody.SetTypeEscaped(ptr.To("view"))
// creating a `users` link without any users ensure that even
// if we fail to delete the link there are no links lying
// around that could be used to access this
diff --git a/src/internal/m365/sharepoint/api/serialization.go b/src/internal/m365/sharepoint/api/serialization.go
index c377bd998..b3cd0f918 100644
--- a/src/internal/m365/sharepoint/api/serialization.go
+++ b/src/internal/m365/sharepoint/api/serialization.go
@@ -148,7 +148,7 @@ func cloneColumnDefinitionable(orig models.ColumnDefinitionable) models.ColumnDe
newColumn.SetTerm(orig.GetTerm())
newColumn.SetText(orig.GetText())
newColumn.SetThumbnail(orig.GetThumbnail())
- newColumn.SetType(orig.GetType())
+ newColumn.SetTypeEscaped(orig.GetTypeEscaped())
newColumn.SetValidation(orig.GetValidation())
return newColumn
diff --git a/src/pkg/services/m365/api/events.go b/src/pkg/services/m365/api/events.go
index b907199bc..43b73810f 100644
--- a/src/pkg/services/m365/api/events.go
+++ b/src/pkg/services/m365/api/events.go
@@ -724,7 +724,7 @@ func EventCollisionKey(item models.Eventable) string {
var (
subject = ptr.Val(item.GetSubject())
- oftype = ptr.Val(item.GetType()).String()
+ oftype = ptr.Val(item.GetTypeEscaped()).String()
startTime = item.GetStart()
start string
endTime = item.GetEnd()
diff --git a/src/pkg/services/m365/api/helper_test.go b/src/pkg/services/m365/api/helper_test.go
index cc97caa45..2f258ae3f 100644
--- a/src/pkg/services/m365/api/helper_test.go
+++ b/src/pkg/services/m365/api/helper_test.go
@@ -39,7 +39,7 @@ func odErr(code string) *odataerrors.ODataError {
odErr := odataerrors.NewODataError()
merr := odataerrors.NewMainError()
merr.SetCode(&code)
- odErr.SetError(merr)
+ odErr.SetErrorEscaped(merr)
return odErr
}
@@ -49,7 +49,7 @@ func odErrMsg(code, message string) *odataerrors.ODataError {
merr := odataerrors.NewMainError()
merr.SetCode(&code)
merr.SetMessage(&message)
- odErr.SetError(merr)
+ odErr.SetErrorEscaped(merr)
return odErr
}
diff --git a/src/pkg/services/m365/api/item_pager_test.go b/src/pkg/services/m365/api/item_pager_test.go
index 0ba312b51..84b28b231 100644
--- a/src/pkg/services/m365/api/item_pager_test.go
+++ b/src/pkg/services/m365/api/item_pager_test.go
@@ -111,7 +111,7 @@ func (p *testIDsPager) getPage(ctx context.Context) (DeltaPageLinker, error) {
ierr.SetCode(&p.errorCode)
err := odataerrors.NewODataError()
- err.SetError(ierr)
+ err.SetErrorEscaped(ierr)
return nil, err
}
diff --git a/src/pkg/services/m365/m365_test.go b/src/pkg/services/m365/m365_test.go
index 59812ebbd..1eafa67f2 100644
--- a/src/pkg/services/m365/m365_test.go
+++ b/src/pkg/services/m365/m365_test.go
@@ -186,7 +186,7 @@ func (suite *m365UnitSuite) TestCheckUserHasDrives() {
merr := odataerrors.NewMainError()
merr.SetCode(ptr.To("code"))
merr.SetMessage(ptr.To(string(graph.MysiteNotFound)))
- odErr.SetError(merr)
+ odErr.SetErrorEscaped(merr)
return mockDGDD{nil, graph.Stack(ctx, odErr)}
},
@@ -202,7 +202,7 @@ func (suite *m365UnitSuite) TestCheckUserHasDrives() {
merr := odataerrors.NewMainError()
merr.SetCode(ptr.To("code"))
merr.SetMessage(ptr.To(string(graph.MysiteURLNotFound)))
- odErr.SetError(merr)
+ odErr.SetErrorEscaped(merr)
return mockDGDD{nil, graph.Stack(ctx, odErr)}
},
@@ -218,7 +218,7 @@ func (suite *m365UnitSuite) TestCheckUserHasDrives() {
merr := odataerrors.NewMainError()
merr.SetCode(ptr.To("code"))
merr.SetMessage(ptr.To(string(graph.NoSPLicense)))
- odErr.SetError(merr)
+ odErr.SetErrorEscaped(merr)
return mockDGDD{nil, graph.Stack(ctx, odErr)}
},
@@ -234,7 +234,7 @@ func (suite *m365UnitSuite) TestCheckUserHasDrives() {
merr := odataerrors.NewMainError()
merr.SetCode(ptr.To(string(graph.RequestResourceNotFound)))
merr.SetMessage(ptr.To("message"))
- odErr.SetError(merr)
+ odErr.SetErrorEscaped(merr)
return mockDGDD{nil, graph.Stack(ctx, odErr)}
},
@@ -250,7 +250,7 @@ func (suite *m365UnitSuite) TestCheckUserHasDrives() {
merr := odataerrors.NewMainError()
merr.SetCode(ptr.To("code"))
merr.SetMessage(ptr.To("message"))
- odErr.SetError(merr)
+ odErr.SetErrorEscaped(merr)
return mockDGDD{nil, graph.Stack(ctx, odErr)}
},
@@ -307,7 +307,7 @@ func (suite *m365UnitSuite) TestGetAllSites() {
merr := odataerrors.NewMainError()
merr.SetCode(ptr.To("code"))
merr.SetMessage(ptr.To(string(graph.NoSPLicense)))
- odErr.SetError(merr)
+ odErr.SetErrorEscaped(merr)
return mockGAS{nil, graph.Stack(ctx, odErr)}
},
@@ -322,7 +322,7 @@ func (suite *m365UnitSuite) TestGetAllSites() {
merr := odataerrors.NewMainError()
merr.SetCode(ptr.To("code"))
merr.SetMessage(ptr.To("message"))
- odErr.SetError(merr)
+ odErr.SetErrorEscaped(merr)
return mockGAS{nil, graph.Stack(ctx, odErr)}
},