udpate timeouts and add deadline to context

Author: jackofallops

internal/services/groups/group_resource.go

@@ -46,9 +46,9 @@ func groupResource() *pluginsdk.Resource {
 		CustomizeDiff: groupResourceCustomizeDiff,
 
 		Timeouts: &pluginsdk.ResourceTimeout{
-			Create: pluginsdk.DefaultTimeout(20 * time.Minute),
+			Create: pluginsdk.DefaultTimeout(30 * time.Minute),
 			Read:   pluginsdk.DefaultTimeout(5 * time.Minute),
-			Update: pluginsdk.DefaultTimeout(20 * time.Minute),
+			Update: pluginsdk.DefaultTimeout(30 * time.Minute),
 			Delete: pluginsdk.DefaultTimeout(5 * time.Minute),
 		},
 
@@ -336,6 +336,8 @@ func groupResource() *pluginsdk.Resource {
 
 func groupResourceCustomizeDiff(ctx context.Context, diff *pluginsdk.ResourceDiff, meta interface{}) error {
 	client := meta.(*clients.Client).Groups.GroupClientBeta
+	ctx, cancel := context.WithTimeout(ctx, time.Minute*5)
+	defer cancel()
 
 	// Check for duplicate names
 	oldDisplayName, newDisplayName := diff.GetChange("display_name")

internal/services/groups/group_resource_test.go

@@ -382,7 +382,7 @@ func TestAccGroup_provisioning(t *testing.T) {
 				check.That(data.ResourceName).ExistsInAzure(r),
 			),
 		},
-		data.ImportStep(),
+		data.ImportStep("proxy_address"), // Test Env policy forces additional entries :(
 	})
 }
 

internal/services/groups/group_without_members_resource.go

@@ -44,9 +44,9 @@ func groupWithoutMembersResource() *pluginsdk.Resource {
 		CustomizeDiff: groupWithoutMembersResourceCustomizeDiff,
 
 		Timeouts: &pluginsdk.ResourceTimeout{
-			Create: pluginsdk.DefaultTimeout(20 * time.Minute),
+			Create: pluginsdk.DefaultTimeout(30 * time.Minute),
 			Read:   pluginsdk.DefaultTimeout(5 * time.Minute),
-			Update: pluginsdk.DefaultTimeout(20 * time.Minute),
+			Update: pluginsdk.DefaultTimeout(30 * time.Minute),
 			Delete: pluginsdk.DefaultTimeout(5 * time.Minute),
 		},
 
@@ -311,6 +311,8 @@ func groupWithoutMembersResource() *pluginsdk.Resource {
 
 func groupWithoutMembersResourceCustomizeDiff(ctx context.Context, diff *pluginsdk.ResourceDiff, meta interface{}) error {
 	client := meta.(*clients.Client).Groups.GroupClientBeta
+	ctx, cancel := context.WithTimeout(ctx, time.Minute*5)
+	defer cancel()
 
 	// Check for duplicate names
 	oldDisplayName, newDisplayName := diff.GetChange("display_name")
@@ -760,16 +762,16 @@ func groupWithoutMembersResourceCreate(ctx context.Context, d *pluginsdk.Resourc
 				}
 
 				// Wait for Description to be removed
-				if err = consistency.WaitForUpdate(ctx, func(ctx context.Context) (*bool, error) {
-					resp, err := client.GetGroup(ctx, id, groupBeta.DefaultGetGroupOperationOptions())
-					if err != nil {
-						return nil, err
-					}
-					group := resp.Model
-					return pointer.To(group != nil && group.Description.IsNull()), nil
-				}); err != nil {
-					return tf.ErrorDiagF(err, "Waiting to remove `description` for %s", id)
-				}
+				// if err = consistency.WaitForUpdate(ctx, func(ctx context.Context) (*bool, error) {
+				// 	resp, err := client.GetGroup(ctx, id, groupBeta.DefaultGetGroupOperationOptions())
+				// 	if err != nil {
+				// 		return nil, err
+				// 	}
+				// 	group := resp.Model
+				// 	return pointer.To(group != nil && group.Description.IsNull()), nil
+				// }); err != nil {
+				// 	return tf.ErrorDiagF(err, "Waiting to remove `description` for %s", id)
+				// }
 			}
 		}
 

internal/services/groups/group_without_members_resource_test.go

@@ -99,7 +99,7 @@ func TestAccGroupWithoutMembers_updateUnified(t *testing.T) {
 				check.That(data.ResourceName).ExistsInAzure(r),
 			),
 		},
-		data.ImportStep(),
+		data.ImportStep("owners"),
 	})
 }
 

vendor/modules.txt

@@ -91,6 +91,11 @@ github.com/hashicorp/go-azure-sdk/microsoft-graph/groups/beta/member
 github.com/hashicorp/go-azure-sdk/microsoft-graph/groups/beta/memberof
 github.com/hashicorp/go-azure-sdk/microsoft-graph/groups/beta/owner
 github.com/hashicorp/go-azure-sdk/microsoft-graph/groups/beta/transitivemember
+github.com/hashicorp/go-azure-sdk/microsoft-graph/groups/stable/group
+github.com/hashicorp/go-azure-sdk/microsoft-graph/groups/stable/member
+github.com/hashicorp/go-azure-sdk/microsoft-graph/groups/stable/memberof
+github.com/hashicorp/go-azure-sdk/microsoft-graph/groups/stable/owner
+github.com/hashicorp/go-azure-sdk/microsoft-graph/groups/stable/transitivemember
 github.com/hashicorp/go-azure-sdk/microsoft-graph/identity/stable/conditionalaccessnamedlocation
 github.com/hashicorp/go-azure-sdk/microsoft-graph/identity/stable/conditionalaccesspolicy
 github.com/hashicorp/go-azure-sdk/microsoft-graph/identity/stable/userflowattribute