Skip to content

Commit

Permalink
Merge pull request #1100 from hashicorp/dependencies/go-azure-sdk
Browse files Browse the repository at this point in the history
dependencies: updating to `v0.20230511.1094507` of `github.com/hashicorp/go-azure-sdk`
  • Loading branch information
manicminer authored May 12, 2023
2 parents 16659df + 23b1b89 commit 1a8ce9f
Show file tree
Hide file tree
Showing 394 changed files with 10,564 additions and 5,028 deletions.
39 changes: 19 additions & 20 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,39 +1,37 @@
module github.com/hashicorp/terraform-provider-azuread

require (
github.com/hashicorp/go-azure-sdk v0.20230331.1143618
github.com/hashicorp/go-azure-sdk v0.20230511.1094507
github.com/hashicorp/go-cty v1.4.1-0.20200414143053-d3edf31b6320
github.com/hashicorp/go-uuid v1.0.3
github.com/hashicorp/terraform-plugin-sdk/v2 v2.24.1
github.com/hashicorp/terraform-plugin-sdk/v2 v2.26.1
github.com/manicminer/hamilton v0.61.0
golang.org/x/text v0.7.0
golang.org/x/text v0.9.0
)

require (
github.com/agext/levenshtein v1.2.3 // indirect
github.com/apparentlymart/go-cidr v1.1.0 // indirect
github.com/apparentlymart/go-textseg/v13 v13.0.0 // indirect
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/fatih/color v1.13.0 // indirect
github.com/golang/protobuf v1.5.2 // indirect
github.com/google/go-cmp v0.5.9 // indirect
github.com/hashicorp/errwrap v1.1.0 // indirect
github.com/hashicorp/go-azure-helpers v0.55.0 // indirect
github.com/hashicorp/go-azure-helpers v0.56.0 // indirect
github.com/hashicorp/go-checkpoint v0.5.0 // indirect
github.com/hashicorp/go-cleanhttp v0.5.2 // indirect
github.com/hashicorp/go-hclog v1.2.1 // indirect
github.com/hashicorp/go-hclog v1.4.0 // indirect
github.com/hashicorp/go-multierror v1.1.1 // indirect
github.com/hashicorp/go-plugin v1.4.6 // indirect
github.com/hashicorp/go-plugin v1.4.8 // indirect
github.com/hashicorp/go-retryablehttp v0.7.2 // indirect
github.com/hashicorp/go-version v1.6.0 // indirect
github.com/hashicorp/hc-install v0.4.0 // indirect
github.com/hashicorp/hcl/v2 v2.15.0 // indirect
github.com/hashicorp/hc-install v0.5.0 // indirect
github.com/hashicorp/hcl/v2 v2.16.2 // indirect
github.com/hashicorp/logutils v1.0.0 // indirect
github.com/hashicorp/terraform-exec v0.17.3 // indirect
github.com/hashicorp/terraform-json v0.14.0 // indirect
github.com/hashicorp/terraform-plugin-go v0.14.1 // indirect
github.com/hashicorp/terraform-plugin-log v0.7.0 // indirect
github.com/hashicorp/terraform-registry-address v0.0.0-20220623143253-7d51757b572c // indirect
github.com/hashicorp/terraform-exec v0.18.1 // indirect
github.com/hashicorp/terraform-json v0.16.0 // indirect
github.com/hashicorp/terraform-plugin-go v0.14.3 // indirect
github.com/hashicorp/terraform-plugin-log v0.8.0 // indirect
github.com/hashicorp/terraform-registry-address v0.1.0 // indirect
github.com/hashicorp/terraform-svchost v0.0.0-20200729002733-f050f53b9734 // indirect
github.com/hashicorp/yamux v0.0.0-20211028200310-0bc27b27de87 // indirect
github.com/mattn/go-colorable v0.1.12 // indirect
Expand All @@ -47,14 +45,15 @@ require (
github.com/vmihailenco/msgpack v4.0.4+incompatible // indirect
github.com/vmihailenco/msgpack/v4 v4.3.12 // indirect
github.com/vmihailenco/tagparser v0.1.2 // indirect
github.com/zclconf/go-cty v1.12.1 // indirect
golang.org/x/crypto v0.5.0 // indirect
golang.org/x/net v0.7.0 // indirect
github.com/zclconf/go-cty v1.13.1 // indirect
golang.org/x/crypto v0.9.0 // indirect
golang.org/x/mod v0.8.0 // indirect
golang.org/x/net v0.10.0 // indirect
golang.org/x/oauth2 v0.4.0 // indirect
golang.org/x/sys v0.5.0 // indirect
golang.org/x/sys v0.8.0 // indirect
google.golang.org/appengine v1.6.7 // indirect
google.golang.org/genproto v0.0.0-20220407144326-9054f6ed7bac // indirect
google.golang.org/grpc v1.50.1 // indirect
google.golang.org/grpc v1.51.0 // indirect
google.golang.org/protobuf v1.28.1 // indirect
software.sslmate.com/src/go-pkcs12 v0.2.0 // indirect
)
Expand Down
84 changes: 62 additions & 22 deletions go.sum

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions internal/helpers/consistency.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ func WaitForDeletion(ctx context.Context, f ChangeFunc) error {
}

timeout := time.Until(deadline)
_, err := (&resource.StateChangeConf{
_, err := (&resource.StateChangeConf{ //nolint:staticcheck
Pending: []string{"Waiting"},
Target: []string{"Deleted"},
Timeout: timeout,
Expand Down Expand Up @@ -53,7 +53,7 @@ func WaitForUpdate(ctx context.Context, f ChangeFunc) error {
}

func WaitForUpdateWithTimeout(ctx context.Context, timeout time.Duration, f ChangeFunc) (bool, error) {
res, err := (&resource.StateChangeConf{
res, err := (&resource.StateChangeConf{ //nolint:staticcheck
Pending: []string{"Waiting"},
Target: []string{"Done"},
Timeout: timeout,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ func administrativeUnitMemberResourceCreate(ctx context.Context, d *schema.Resou
return tf.ErrorDiagF(errors.New("context has no deadline"), "Waiting for member %q to reflect for administrative unit %q", id.MemberId, id.AdministrativeUnitId)
}
timeout := time.Until(deadline)
_, err = (&resource.StateChangeConf{
_, err = (&resource.StateChangeConf{ //nolint:staticcheck
Pending: []string{"Waiting"},
Target: []string{"Done"},
Timeout: timeout,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -175,7 +175,7 @@ func applicationCertificateResourceCreate(ctx context.Context, d *schema.Resourc

// Wait for the credential to appear in the application manifest, this can take several minutes
timeout, _ := ctx.Deadline()
polledForCredential, err := (&resource.StateChangeConf{
polledForCredential, err := (&resource.StateChangeConf{ //nolint:staticcheck
Pending: []string{"Waiting"},
Target: []string{"Done"},
Timeout: time.Until(timeout),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@ func applicationFederatedIdentityCredentialResourceCreate(ctx context.Context, d

// Wait for the credential to replicate
timeout, _ := ctx.Deadline()
polledForCredential, err := (&resource.StateChangeConf{
polledForCredential, err := (&resource.StateChangeConf{ //nolint:staticcheck
Pending: []string{"Waiting"},
Target: []string{"Done"},
Timeout: time.Until(timeout),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,7 @@ func applicationPasswordResourceCreate(ctx context.Context, d *schema.ResourceDa

// Wait for the credential to appear in the application manifest, this can take several minutes
timeout, _ := ctx.Deadline()
polledForCredential, err := (&resource.StateChangeConf{
polledForCredential, err := (&resource.StateChangeConf{ //nolint:staticcheck
Pending: []string{"Waiting"},
Target: []string{"Done"},
Timeout: time.Until(timeout),
Expand Down
4 changes: 2 additions & 2 deletions internal/services/applications/applications.go
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ func applicationDisableAppRoles(ctx context.Context, client *msgraph.Application
return fmt.Errorf("context has no deadline")
}
timeout := time.Until(deadline)
_, err = (&resource.StateChangeConf{
_, err = (&resource.StateChangeConf{ //nolint:staticcheck
Pending: []string{"Waiting"},
Target: []string{"Disabled"},
Timeout: timeout,
Expand Down Expand Up @@ -238,7 +238,7 @@ func applicationDisableOauth2PermissionScopes(ctx context.Context, client *msgra
return fmt.Errorf("context has no deadline")
}
timeout := time.Until(deadline)
_, err = (&resource.StateChangeConf{
_, err = (&resource.StateChangeConf{ //nolint:staticcheck
Pending: []string{"Waiting"},
Target: []string{"Disabled"},
Timeout: timeout,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -525,7 +525,7 @@ func conditionalAccessPolicyResourceUpdate(ctx context.Context, d *schema.Resour
// in a timeout loop, instead we're hoping that this allows enough time/activity for the update to be reflected.
log.Printf("[DEBUG] Waiting for conditional access policy %q to be updated", d.Id())
timeout, _ := ctx.Deadline()
stateConf := &resource.StateChangeConf{
stateConf := &resource.StateChangeConf{ //nolint:staticcheck
Pending: []string{"Pending"},
Target: []string{"Done"},
Timeout: time.Until(timeout),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,7 @@ func namedLocationResourceUpdate(ctx context.Context, d *schema.ResourceData, me
base.DisplayName = &displayName
}

var updateRefreshFunc resource.StateRefreshFunc
var updateRefreshFunc resource.StateRefreshFunc //nolint:staticcheck

if v, ok := d.GetOk("ip"); ok {
properties := expandIPNamedLocation(v.([]interface{}))
Expand Down Expand Up @@ -218,7 +218,7 @@ func namedLocationResourceUpdate(ctx context.Context, d *schema.ResourceData, me

log.Printf("[DEBUG] Waiting for named location %q to be updated", d.Id())
timeout, _ := ctx.Deadline()
stateConf := &resource.StateChangeConf{
stateConf := &resource.StateChangeConf{ //nolint:staticcheck
Pending: []string{"Pending"},
Target: []string{"Updated"},
Timeout: time.Until(timeout),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,7 @@ func directoryRoleAssignmentResourceCreate(ctx context.Context, d *schema.Resour
return tf.ErrorDiagF(errors.New("context has no deadline"), "Waiting for directory role %q assignment to principal %q to take effect", roleId, principalId)
}
timeout := time.Until(deadline)
_, err = (&resource.StateChangeConf{
_, err = (&resource.StateChangeConf{ //nolint:staticcheck
Pending: []string{"Waiting"},
Target: []string{"Done"},
Timeout: timeout,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ func directoryRoleMemberResourceCreate(ctx context.Context, d *schema.ResourceDa
return tf.ErrorDiagF(errors.New("context has no deadline"), "Waiting for role member %q to reflect for directory role %q", id.MemberId, id.DirectoryRoleId)
}
timeout := time.Until(deadline)
_, err = (&resource.StateChangeConf{
_, err = (&resource.StateChangeConf{ //nolint:staticcheck
Pending: []string{"Waiting"},
Target: []string{"Done"},
Timeout: timeout,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -175,7 +175,7 @@ func servicePrincipalCertificateResourceCreate(ctx context.Context, d *schema.Re

// Wait for the credential to appear in the service principal manifest, this can take several minutes
timeout, _ := ctx.Deadline()
polledForCredential, err := (&resource.StateChangeConf{
polledForCredential, err := (&resource.StateChangeConf{ //nolint:staticcheck
Pending: []string{"Waiting"},
Target: []string{"Done"},
Timeout: time.Until(timeout),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,7 @@ func servicePrincipalPasswordResourceCreate(ctx context.Context, d *schema.Resou

// Wait for the credential to appear in the service principal manifest, this can take several minutes
timeout, _ := ctx.Deadline()
polledForCredential, err := (&resource.StateChangeConf{
polledForCredential, err := (&resource.StateChangeConf{ //nolint:staticcheck
Pending: []string{"Waiting"},
Target: []string{"Done"},
Timeout: time.Until(timeout),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ func servicePrincipalTokenSigningCertificateResourceCreate(ctx context.Context,

// Wait for the credential to appear in the service principal manifest, this can take several minutes
timeout, _ := ctx.Deadline()
polledForCredential, err := (&resource.StateChangeConf{
polledForCredential, err := (&resource.StateChangeConf{ //nolint:staticcheck
Pending: []string{"Waiting"},
Target: []string{"Done"},
Timeout: time.Until(timeout),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ func synchronizationJobResourceCreate(ctx context.Context, d *schema.ResourceDat

// Wait for the job to appear, this can take several moments
timeout, _ := ctx.Deadline()
_, err = (&resource.StateChangeConf{
_, err = (&resource.StateChangeConf{ //nolint:staticcheck
Pending: []string{"Waiting"},
Target: []string{"Done"},
Timeout: time.Until(timeout),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ func synchronizationSecretResourceCreate(ctx context.Context, d *schema.Resource

// Wait for the secret to appear
timeout, _ := ctx.Deadline()
_, err = (&resource.StateChangeConf{
_, err = (&resource.StateChangeConf{ //nolint:staticcheck
Pending: []string{"Waiting"},
Target: []string{"Done"},
Timeout: time.Until(timeout),
Expand Down
19 changes: 0 additions & 19 deletions vendor/github.com/apparentlymart/go-cidr/LICENSE

This file was deleted.

Loading

0 comments on commit 1a8ce9f

Please sign in to comment.