From ba175feba82eb38a3e68216c47135c4ccdabf225 Mon Sep 17 00:00:00 2001 From: Tom Bamford Date: Wed, 27 Apr 2022 12:50:03 +0100 Subject: [PATCH 1/2] Update Hamilton to v0.46.0 --- go.mod | 2 +- go.sum | 4 ++-- .../manicminer/hamilton/environments/published.go | 1 + .../manicminer/hamilton/msgraph/valuetypes.go | 12 +++++++----- vendor/modules.txt | 2 +- 5 files changed, 12 insertions(+), 9 deletions(-) diff --git a/go.mod b/go.mod index 2a3911b6b4..33ae4494ef 100644 --- a/go.mod +++ b/go.mod @@ -4,7 +4,7 @@ require ( github.com/hashicorp/go-cty v1.4.1-0.20200414143053-d3edf31b6320 github.com/hashicorp/go-uuid v1.0.2 github.com/hashicorp/terraform-plugin-sdk/v2 v2.13.0 - github.com/manicminer/hamilton v0.45.0 + github.com/manicminer/hamilton v0.46.0 golang.org/x/text v0.3.7 ) diff --git a/go.sum b/go.sum index 1888dc58a9..db2d41e1dc 100644 --- a/go.sum +++ b/go.sum @@ -236,8 +236,8 @@ github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= github.com/kylelemons/godebug v0.0.0-20170820004349-d65d576e9348/go.mod h1:B69LEHPfb2qLo0BaaOLcbitczOKLWTsrBG9LczfCD4k= github.com/kylelemons/godebug v1.1.0 h1:RPNrshWIDI6G2gRW9EHilWtl7Z6Sb1BR0xunSBf0SNc= github.com/kylelemons/godebug v1.1.0/go.mod h1:9/0rRGxNHcop5bhtWyNeEfOS8JIWk580+fNqagV/RAw= -github.com/manicminer/hamilton v0.45.0 h1:LSbKARKc7pRVZaD1MEkyVDdm7fmgkZSnSobWn1xDYog= -github.com/manicminer/hamilton v0.45.0/go.mod h1:lbVyngC+/nCWuDp8UhC6Bw+bh7jcP/E+YwqzHTmzemk= +github.com/manicminer/hamilton v0.46.0 h1:ag0xqWnALt9uQSfrrrXuQvm6puV8y+LghJQD32lzW+M= +github.com/manicminer/hamilton v0.46.0/go.mod h1:lbVyngC+/nCWuDp8UhC6Bw+bh7jcP/E+YwqzHTmzemk= github.com/matryer/is v1.2.0/go.mod h1:2fLPjFQM9rhQ15aVEtbuwhJinnOqrmgXPNdZsdwlWXA= github.com/mattn/go-colorable v0.1.4/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE= github.com/mattn/go-colorable v0.1.9/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc= diff --git a/vendor/github.com/manicminer/hamilton/environments/published.go b/vendor/github.com/manicminer/hamilton/environments/published.go index 82904447b3..f6af732e02 100644 --- a/vendor/github.com/manicminer/hamilton/environments/published.go +++ b/vendor/github.com/manicminer/hamilton/environments/published.go @@ -35,6 +35,7 @@ var PublishedApis = map[string]ApiAppId{ "AzureMaps": "ba1ea022-5807-41d5-bbeb-292c7e1cf5f6", "AzureMediaServices": "374b2a64-3b6b-436b-934c-b820eacca870", "AzurePortal": "c44b4083-3bb0-49c1-b47d-974e53cbdf3c", + "AzureSecurityInsights": "98785600-1bb7-4fb9-b9fa-19afe2c8a360", "AzureServiceBus": "80a10ef9-8168-493d-abf9-3297c4ef6e3c", "AzureServiceDeploy": "5b306cba-9c71-49db-96c3-d17ca2379c4d", "AzureServiceManagement": "797f4846-ba00-4fd7-ba43-dac1f8f63013", diff --git a/vendor/github.com/manicminer/hamilton/msgraph/valuetypes.go b/vendor/github.com/manicminer/hamilton/msgraph/valuetypes.go index 9c70e8bfe4..cdf6cd3c10 100644 --- a/vendor/github.com/manicminer/hamilton/msgraph/valuetypes.go +++ b/vendor/github.com/manicminer/hamilton/msgraph/valuetypes.go @@ -60,7 +60,7 @@ const ( type AccessPackageResourceRequestType = string const ( - AccessPackageResourceRequestTypeAdminAdd AccessPackageResourceRequestType = "AdminAdd" + AccessPackageResourceRequestTypeAdminAdd AccessPackageResourceRequestType = "AdminAdd" AccessPackageResourceRequestTypeAdminRemove AccessPackageResourceRequestType = "AdminRemove" ) @@ -260,6 +260,7 @@ const ( ConditionalAccessDevicePlatformAll ConditionalAccessDevicePlatform = "all" ConditionalAccessDevicePlatformAndroid ConditionalAccessDevicePlatform = "android" ConditionalAccessDevicePlatformIos ConditionalAccessDevicePlatform = "iOS" + ConditionalAccessDevicePlatformLinux ConditionalAccessDevicePlatform = "linux" ConditionalAccessDevicePlatformMacOs ConditionalAccessDevicePlatform = "macOS" ConditionalAccessDevicePlatformUnknownFutureValue ConditionalAccessDevicePlatform = "unknownFutureValue" ConditionalAccessDevicePlatformWindows ConditionalAccessDevicePlatform = "windows" @@ -384,10 +385,11 @@ const ( type GroupResourceBehaviorOption = string const ( - GroupResourceBehaviorOptionAllowOnlyMembersToPost GroupResourceBehaviorOption = "AllowOnlyMembersToPost" - GroupResourceBehaviorOptionHideGroupInOutlook GroupResourceBehaviorOption = "HideGroupInOutlook" - GroupResourceBehaviorOptionSubscribeNewGroupMembers GroupResourceBehaviorOption = "SubscribeNewGroupMembers" - GroupResourceBehaviorOptionWelcomeEmailDisabled GroupResourceBehaviorOption = "WelcomeEmailDisabled" + GroupResourceBehaviorOptionAllowOnlyMembersToPost GroupResourceBehaviorOption = "AllowOnlyMembersToPost" + GroupResourceBehaviorOptionHideGroupInOutlook GroupResourceBehaviorOption = "HideGroupInOutlook" + GroupResourceBehaviorOptionSubscribeMembersToCalendarEventsDisabled GroupResourceBehaviorOption = "SubscribeMembersToCalendarEventsDisabled" + GroupResourceBehaviorOptionSubscribeNewGroupMembers GroupResourceBehaviorOption = "SubscribeNewGroupMembers" + GroupResourceBehaviorOptionWelcomeEmailDisabled GroupResourceBehaviorOption = "WelcomeEmailDisabled" ) type GroupResourceProvisioningOption = string diff --git a/vendor/modules.txt b/vendor/modules.txt index 4e24434a48..dfdc2442b8 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -145,7 +145,7 @@ github.com/hashicorp/terraform-svchost # github.com/hashicorp/yamux v0.0.0-20211028200310-0bc27b27de87 ## explicit; go 1.15 github.com/hashicorp/yamux -# github.com/manicminer/hamilton v0.45.0 +# github.com/manicminer/hamilton v0.46.0 ## explicit; go 1.16 github.com/manicminer/hamilton/auth github.com/manicminer/hamilton/environments From d01ba052f3d58fa7976fd7840c3b25df9670aef4 Mon Sep 17 00:00:00 2001 From: Tom Bamford Date: Wed, 27 Apr 2022 12:30:04 +0100 Subject: [PATCH 2/2] `azuread_group` - support the `SubscribeMembersToCalendarEventsDisabled` value in the `behaviors` property --- docs/resources/group.md | 2 +- internal/services/groups/group_resource.go | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/docs/resources/group.md b/docs/resources/group.md index 1b8defa1b1..eeedfad265 100644 --- a/docs/resources/group.md +++ b/docs/resources/group.md @@ -111,7 +111,7 @@ The following arguments are supported: ~> **Known Permissions Issue** The `auto_subscribe_new_members` property can only be set when authenticating as a Member user of the tenant and _not_ when authenticating as a Guest user or as a service principal. Please see the [Microsoft Graph Known Issues](https://docs.microsoft.com/en-us/graph/known-issues#groups) documentation. -* `behaviors` - (Optional) A set of behaviors for a Microsoft 365 group. Possible values are `AllowOnlyMembersToPost`, `HideGroupInOutlook`, `SubscribeNewGroupMembers` and `WelcomeEmailDisabled`. See [official documentation](https://docs.microsoft.com/en-us/graph/group-set-options) for more details. Changing this forces a new resource to be created. +* `behaviors` - (Optional) A set of behaviors for a Microsoft 365 group. Possible values are `AllowOnlyMembersToPost`, `HideGroupInOutlook`, `SubscribeMembersToCalendarEventsDisabled`, `SubscribeNewGroupMembers` and `WelcomeEmailDisabled`. See [official documentation](https://docs.microsoft.com/en-us/graph/group-set-options) for more details. Changing this forces a new resource to be created. * `description` - (Optional) The description for the group. * `display_name` - (Required) The display name for the group. * `dynamic_membership` - (Optional) A `dynamic_membership` block as documented below. Required when `types` contains `DynamicMembership`. Cannot be used with the `members` property. diff --git a/internal/services/groups/group_resource.go b/internal/services/groups/group_resource.go index c87ffbb61b..d3dd3020cc 100644 --- a/internal/services/groups/group_resource.go +++ b/internal/services/groups/group_resource.go @@ -80,6 +80,7 @@ func groupResource() *schema.Resource { ValidateFunc: validation.StringInSlice([]string{ msgraph.GroupResourceBehaviorOptionAllowOnlyMembersToPost, msgraph.GroupResourceBehaviorOptionHideGroupInOutlook, + msgraph.GroupResourceBehaviorOptionSubscribeMembersToCalendarEventsDisabled, msgraph.GroupResourceBehaviorOptionSubscribeNewGroupMembers, msgraph.GroupResourceBehaviorOptionWelcomeEmailDisabled, }, false),