fix gomodule export path, update to Go 1.16

.golangci.yml

@@ -37,4 +37,4 @@ linters-settings:
   misspell:
     locale: UK
   goimports:
-    local-prefixes: github.com/terraform-providers/terraform-provider-azuread/azuread
+    local-prefixes: github.com/hashicorp/terraform-provider-azuread/azuread

.teamcity/components/vcs_root.kt

@@ -2,7 +2,7 @@ import jetbrains.buildServer.configs.kotlin.v2019_2.vcs.GitVcsRoot
 
 object providerRepository : GitVcsRoot({
     name = "terraform-provider-azuread"
-    url = "https://github.com/terraform-providers/terraform-provider-azuread.git"
+    url = "https://github.com/hashicorp/terraform-provider-azuread.git"
     agentCleanPolicy = AgentCleanPolicy.ALWAYS
     agentCleanFilesPolicy = AgentCleanFilesPolicy.ALL_UNTRACKED
     branchSpec = "+:*"

GNUmakefile

@@ -39,7 +39,7 @@ fmtcheck:
 
 goimports:
 	@echo "==> Fixing imports code with goimports..."
-	goimports -local "github.com/terraform-providers/terraform-provider-azuread" -w $(PKG_NAME)/
+	goimports -local "github.com/hashicorp/terraform-provider-azuread" -w $(PKG_NAME)/
 
 lint:
 	@echo "==> Checking source code against linters..."
@@ -78,10 +78,10 @@ test: fmtcheck
 		xargs -t -n4 go test $(TESTARGS) -timeout=30s -parallel=10
 
 testacc: fmtcheck
-	TF_ACC=1 go test $(TEST) -v $(TESTARGS) -timeout 180m -ldflags="-X=github.com/terraform-providers/terraform-provider-azuread/version.ProviderVersion=acc"
+	TF_ACC=1 go test $(TEST) -v $(TESTARGS) -timeout 180m -ldflags="-X=github.com/hashicorp/terraform-provider-azuread/version.ProviderVersion=acc"
 
 acctests: fmtcheck
-	TF_ACC=1 go test -v ./internal/services/$(SERVICE)/tests/ $(TESTARGS) -timeout $(TESTTIMEOUT) -ldflags="-X=github.com/terraform-providers/terraform-provider-azuread/version.ProviderVersion=acc"
+	TF_ACC=1 go test -v ./internal/services/$(SERVICE)/tests/ $(TESTARGS) -timeout $(TESTTIMEOUT) -ldflags="-X=github.com/hashicorp/terraform-provider-azuread/version.ProviderVersion=acc"
 
 debugacc: fmtcheck
 	TF_ACC=1 dlv test $(TEST) --headless --listen=:2345 --api-version=2 -- -test.v $(TESTARGS)

README.md

@@ -4,7 +4,7 @@
 
 - [Terraform Website](https://www.terraform.io)
 - [AzureAD Provider Documentation](https://terraform.io/docs/providers/azuread/)
-- [AzureAD Provider Usage Examples](https://github.com/terraform-providers/terraform-provider-azuread/tree/main/examples)
+- [AzureAD Provider Usage Examples](https://github.com/hashicorp/terraform-provider-azuread/tree/main/examples)
 - [Slack Workspace for Contributors](https://terraform-azure.slack.com) ([Request Invite](https://join.slack.com/t/terraform-azure/shared_invite/enQtNDMzNjQ5NzcxMDc3LWNiY2ZhNThhNDgzNmY0MTM0N2MwZjE4ZGU0MjcxYjUyMzRmN2E5NjZhZmQ0ZTA1OTExMGNjYzA4ZDkwZDYxNDE))
 
 
@@ -68,11 +68,11 @@ For *Git Bash for Windows*, at the step of "Adjusting your PATH environment", pl
 
 If you wish to work on the provider, you'll first need [Go](http://www.golang.org) installed on your machine (version 1.16+ is *required*). You'll also need to correctly setup a [GOPATH](http://golang.org/doc/code.html#GOPATH), as well as adding `$GOPATH/bin` to your `$PATH`.
 
-Clone the repository to: `$GOPATH/src/github.com/terraform-providers/terraform-provider-azuread`
+Clone the repository to: `$GOPATH/src/github.com/hashicorp/terraform-provider-azuread`
 
 ```sh
 $ mkdir -p $GOPATH/src/github.com/terraform-providers; cd $GOPATH/src/github.com/terraform-providers
-$ git clone github.com/terraform-providers/terraform-provider-azuread
+$ git clone github.com/hashicorp/terraform-provider-azuread
 ```
 
 Change to the clone directory and run `make tools` to install the dependent tooling needed to test and build the provider.

docs/index.md

@@ -2,7 +2,7 @@
 
 The Azure Provider can be used to configure infrastructure in [Azure Active Directory](https://azure.microsoft.com/en-us/services/active-directory/) using the Azure Resource Manager API's. Documentation regarding the [Data Sources](/docs/configuration/data-sources.html) and [Resources](/docs/configuration/resources.html) supported by the Azure Active Directory Provider can be found in the navigation to the left.
 
-Interested in the provider's latest features, or want to make sure you're up to date? Check out the [changelog](https://github.com/terraform-providers/terraform-provider-azuread/blob/main/CHANGELOG.md) for version information and release notes.
+Interested in the provider's latest features, or want to make sure you're up to date? Check out the [changelog](https://github.com/hashicorp/terraform-provider-azuread/blob/main/CHANGELOG.md) for version information and release notes.
 
 ## Authenticating to Azure Active Directory
 
@@ -38,7 +38,7 @@ resource "azuread_service_principal" "example" {
 
 ## Features and Bug Requests
 
-The Azure Active Directory provider's bugs and feature requests can be found in the [GitHub repo issues](https://github.com/terraform-providers/terraform-provider-azuread/issues).
+The Azure Active Directory provider's bugs and feature requests can be found in the [GitHub repo issues](https://github.com/hashicorp/terraform-provider-azuread/issues).
 Please avoid "me too" or "+1" comments. Instead, use a thumbs up [reaction](https://blog.github.com/2016-03-10-add-reactions-to-pull-requests-issues-and-comments/)
 on enhancement requests. Provider maintainers will often prioritise work based on the number of thumbs on an issue.
 
@@ -48,9 +48,9 @@ experience for you using the Azure Active Directory provider.
 
 If you have a bug or feature request without an existing issue
 
-* if an existing resource or field is working in an unexpected way, [file a bug](https://github.com/terraform-providers/terraform-provider-azuread/issues/new?template=bug.md).
+* if an existing resource or field is working in an unexpected way, [file a bug](https://github.com/hashicorp/terraform-provider-azuread/issues/new?template=bug.md).
 
-* if you'd like the provider to support a new resource or field, [file an enhancement/feature request](https://github.com/terraform-providers/terraform-provider-azuread/issues/new?template=enhancement.md).
+* if you'd like the provider to support a new resource or field, [file an enhancement/feature request](https://github.com/hashicorp/terraform-provider-azuread/issues/new?template=enhancement.md).
 
 The provider maintainers will often use the assignee field on an issue to mark
 who is working on it.

go.mod

@@ -1,4 +1,4 @@
-module github.com/terraform-providers/terraform-provider-azuread
+module github.com/hashicorp/terraform-provider-azuread
 
 require (
 	github.com/Azure/azure-sdk-for-go v47.1.0+incompatible
@@ -11,4 +11,4 @@ require (
 	github.com/hashicorp/terraform-plugin-sdk/v2 v2.3.0
 )
 
-go 1.14
+go 1.16

go.sum

@@ -292,6 +292,8 @@ github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXf
 github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
 github.com/stretchr/testify v1.4.0 h1:2E4SXV/wtOkTonXsotYi4li6zVWxYlZuYNCXe9XRJyk=
 github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
+github.com/hashicorp/terraform-provider-azuread v1.4.0 h1:znGLegISaZ1nCtl5qBoZbWz1PP1hQ6AJakbD95TJ5n8=
+github.com/hashicorp/terraform-provider-azuread v1.4.0/go.mod h1:d1LNrgnJ25DXzPYXL74mgunQ5+05m/f2pbddG8K5hr4=
 github.com/ulikunitz/xz v0.5.5/go.mod h1:2bypXElzHzzJZwzH67Y6wb67pO62Rzfn7BSiF4ABRW8=
 github.com/ulikunitz/xz v0.5.8 h1:ERv8V6GKqVi23rgu5cj9pVfVzJbOqAY2Ntl88O6c2nQ=
 github.com/ulikunitz/xz v0.5.8/go.mod h1:nbz6k7qbPmH4IRqmfOplQw/tblSgqTqBwxkY0oWt/14=

internal/acceptance/acceptance.go

@@ -12,7 +12,7 @@ import (
 	"github.com/hashicorp/go-azure-helpers/authentication"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 
-	"github.com/terraform-providers/terraform-provider-azuread/internal/provider"
+	"github.com/hashicorp/terraform-provider-azuread/internal/provider"
 )
 
 var AzureADProvider *schema.Provider

internal/acceptance/check/that.go

@@ -6,10 +6,10 @@ import (
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/terraform"
 
-	"github.com/terraform-providers/terraform-provider-azuread/internal/acceptance"
-	"github.com/terraform-providers/terraform-provider-azuread/internal/acceptance/helpers"
-	"github.com/terraform-providers/terraform-provider-azuread/internal/acceptance/types"
-	"github.com/terraform-providers/terraform-provider-azuread/internal/clients"
+	"github.com/hashicorp/terraform-provider-azuread/internal/acceptance"
+	"github.com/hashicorp/terraform-provider-azuread/internal/acceptance/helpers"
+	"github.com/hashicorp/terraform-provider-azuread/internal/acceptance/types"
+	"github.com/hashicorp/terraform-provider-azuread/internal/clients"
 )
 
 type thatType struct {

internal/acceptance/data.go

@@ -11,7 +11,7 @@ import (
 	"github.com/google/uuid"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/acctest"
 
-	"github.com/terraform-providers/terraform-provider-azuread/internal/tf"
+	"github.com/hashicorp/terraform-provider-azuread/internal/tf"
 )
 
 type TestData struct {

internal/acceptance/helpers/check_destroyed.go

@@ -5,8 +5,8 @@ import (
 
 	"github.com/hashicorp/terraform-plugin-sdk/v2/terraform"
 
-	"github.com/terraform-providers/terraform-provider-azuread/internal/acceptance/types"
-	"github.com/terraform-providers/terraform-provider-azuread/internal/clients"
+	"github.com/hashicorp/terraform-provider-azuread/internal/acceptance/types"
+	"github.com/hashicorp/terraform-provider-azuread/internal/clients"
 )
 
 // CheckDestroyedFunc returns a TestCheckFunc which validates the resource no longer exists

internal/acceptance/helpers/delete.go

@@ -5,8 +5,8 @@ import (
 
 	"github.com/hashicorp/terraform-plugin-sdk/v2/terraform"
 
-	"github.com/terraform-providers/terraform-provider-azuread/internal/acceptance/types"
-	"github.com/terraform-providers/terraform-provider-azuread/internal/clients"
+	"github.com/hashicorp/terraform-provider-azuread/internal/acceptance/types"
+	"github.com/hashicorp/terraform-provider-azuread/internal/clients"
 )
 
 // DeleteResourceFunc returns a TestCheckFunc which deletes the resource within Azure

internal/acceptance/helpers/exists.go

@@ -6,8 +6,8 @@ import (
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/terraform"
 
-	"github.com/terraform-providers/terraform-provider-azuread/internal/acceptance/types"
-	"github.com/terraform-providers/terraform-provider-azuread/internal/clients"
+	"github.com/hashicorp/terraform-provider-azuread/internal/acceptance/types"
+	"github.com/hashicorp/terraform-provider-azuread/internal/clients"
 )
 
 func ExistsInAzure(client *clients.Client, testResource types.TestResource, resourceName string) resource.TestCheckFunc {

internal/acceptance/testcase.go

@@ -8,9 +8,9 @@ import (
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/terraform"
 
-	"github.com/terraform-providers/terraform-provider-azuread/internal/acceptance/helpers"
-	"github.com/terraform-providers/terraform-provider-azuread/internal/acceptance/types"
-	"github.com/terraform-providers/terraform-provider-azuread/internal/clients"
+	"github.com/hashicorp/terraform-provider-azuread/internal/acceptance/helpers"
+	"github.com/hashicorp/terraform-provider-azuread/internal/acceptance/types"
+	"github.com/hashicorp/terraform-provider-azuread/internal/clients"
 )
 
 func (td TestData) DataSourceTest(t *testing.T, steps []resource.TestStep) {

internal/acceptance/types/resource.go

@@ -5,7 +5,7 @@ import (
 
 	"github.com/hashicorp/terraform-plugin-sdk/v2/terraform"
 
-	"github.com/terraform-providers/terraform-provider-azuread/internal/clients"
+	"github.com/hashicorp/terraform-provider-azuread/internal/clients"
 )
 
 type TestResource interface {

internal/clients/builder.go

@@ -7,7 +7,7 @@ import (
 	"github.com/hashicorp/go-azure-helpers/authentication"
 	"github.com/hashicorp/go-azure-helpers/sender"
 
-	"github.com/terraform-providers/terraform-provider-azuread/internal/common"
+	"github.com/hashicorp/terraform-provider-azuread/internal/common"
 )
 
 type ClientBuilder struct {

internal/clients/client.go

@@ -6,12 +6,12 @@ import (
 	"github.com/Azure/go-autorest/autorest"
 	"github.com/Azure/go-autorest/autorest/azure"
 
-	"github.com/terraform-providers/terraform-provider-azuread/internal/common"
-	applications "github.com/terraform-providers/terraform-provider-azuread/internal/services/applications/client"
-	domains "github.com/terraform-providers/terraform-provider-azuread/internal/services/domains/client"
-	groups "github.com/terraform-providers/terraform-provider-azuread/internal/services/groups/client"
-	serviceprincipals "github.com/terraform-providers/terraform-provider-azuread/internal/services/serviceprincipals/client"
-	users "github.com/terraform-providers/terraform-provider-azuread/internal/services/users/client"
+	"github.com/hashicorp/terraform-provider-azuread/internal/common"
+	applications "github.com/hashicorp/terraform-provider-azuread/internal/services/applications/client"
+	domains "github.com/hashicorp/terraform-provider-azuread/internal/services/domains/client"
+	groups "github.com/hashicorp/terraform-provider-azuread/internal/services/groups/client"
+	serviceprincipals "github.com/hashicorp/terraform-provider-azuread/internal/services/serviceprincipals/client"
+	users "github.com/hashicorp/terraform-provider-azuread/internal/services/users/client"
 )
 
 // Client contains the handles to all the specific Azure AD resource classes' respective clients

internal/common/client_options.go

@@ -11,7 +11,7 @@ import (
 	"github.com/hashicorp/go-azure-helpers/sender"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/meta"
 
-	"github.com/terraform-providers/terraform-provider-azuread/version"
+	"github.com/hashicorp/terraform-provider-azuread/version"
 )
 
 type ClientOptions struct {

internal/helpers/aadgraph/application.go

@@ -9,7 +9,8 @@ import (
 	"strings"
 
 	"github.com/Azure/azure-sdk-for-go/services/graphrbac/1.6/graphrbac"
-	"github.com/terraform-providers/terraform-provider-azuread/internal/utils"
+
+	"github.com/hashicorp/terraform-provider-azuread/internal/utils"
 )
 
 func FlattenAppRoles(in *[]graphrbac.AppRole) []map[string]interface{} {

internal/helpers/aadgraph/credentials.go

@@ -17,8 +17,8 @@ import (
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/validation"
 
-	"github.com/terraform-providers/terraform-provider-azuread/internal/utils"
-	"github.com/terraform-providers/terraform-provider-azuread/internal/validate"
+	"github.com/hashicorp/terraform-provider-azuread/internal/utils"
+	"github.com/hashicorp/terraform-provider-azuread/internal/validate"
 )
 
 // valid types are `application` and `service_principal`

internal/helpers/aadgraph/group.go

@@ -10,7 +10,7 @@ import (
 	"github.com/Azure/azure-sdk-for-go/services/graphrbac/1.6/graphrbac"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
 
-	"github.com/terraform-providers/terraform-provider-azuread/internal/utils"
+	"github.com/hashicorp/terraform-provider-azuread/internal/utils"
 )
 
 func GroupGetByDisplayName(ctx context.Context, client *graphrbac.GroupsClient, displayName string, mailEnabled *bool, securityEnabled *bool) (*graphrbac.ADGroup, error) {

internal/helpers/aadgraph/replication.go

@@ -8,7 +8,7 @@ import (
 	"github.com/Azure/go-autorest/autorest"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
 
-	"github.com/terraform-providers/terraform-provider-azuread/internal/utils"
+	"github.com/hashicorp/terraform-provider-azuread/internal/utils"
 )
 
 func WaitForCreationReplication(ctx context.Context, timeout time.Duration, f func() (interface{}, error)) (interface{}, error) {

internal/helpers/aadgraph/user.go

@@ -6,7 +6,7 @@ import (
 
 	"github.com/Azure/azure-sdk-for-go/services/graphrbac/1.6/graphrbac"
 
-	"github.com/terraform-providers/terraform-provider-azuread/internal/utils"
+	"github.com/hashicorp/terraform-provider-azuread/internal/utils"
 )
 
 func UserGetByObjectId(ctx context.Context, client *graphrbac.UsersClient, objectId string) (*graphrbac.User, error) {

internal/provider/provider.go

@@ -11,8 +11,8 @@ import (
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/validation"
 
-	"github.com/terraform-providers/terraform-provider-azuread/internal/clients"
-	"github.com/terraform-providers/terraform-provider-azuread/internal/tf"
+	"github.com/hashicorp/terraform-provider-azuread/internal/clients"
+	"github.com/hashicorp/terraform-provider-azuread/internal/tf"
 )
 
 // Microsoft’s Terraform Partner ID is this specific GUID

internal/provider/services.go

@@ -1,11 +1,11 @@
 package provider
 
 import (
-	"github.com/terraform-providers/terraform-provider-azuread/internal/services/applications"
-	"github.com/terraform-providers/terraform-provider-azuread/internal/services/domains"
-	"github.com/terraform-providers/terraform-provider-azuread/internal/services/groups"
-	"github.com/terraform-providers/terraform-provider-azuread/internal/services/serviceprincipals"
-	"github.com/terraform-providers/terraform-provider-azuread/internal/services/users"
+	"github.com/hashicorp/terraform-provider-azuread/internal/services/applications"
+	"github.com/hashicorp/terraform-provider-azuread/internal/services/domains"
+	"github.com/hashicorp/terraform-provider-azuread/internal/services/groups"
+	"github.com/hashicorp/terraform-provider-azuread/internal/services/serviceprincipals"
+	"github.com/hashicorp/terraform-provider-azuread/internal/services/users"
 )
 
 func SupportedServices() []ServiceRegistration {

internal/services/applications/application_app_role_resource.go

@@ -10,12 +10,12 @@ import (
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/validation"
 
-	"github.com/terraform-providers/terraform-provider-azuread/internal/clients"
-	"github.com/terraform-providers/terraform-provider-azuread/internal/helpers/aadgraph"
-	"github.com/terraform-providers/terraform-provider-azuread/internal/services/applications/parse"
-	"github.com/terraform-providers/terraform-provider-azuread/internal/tf"
-	"github.com/terraform-providers/terraform-provider-azuread/internal/utils"
-	"github.com/terraform-providers/terraform-provider-azuread/internal/validate"
+	"github.com/hashicorp/terraform-provider-azuread/internal/clients"
+	"github.com/hashicorp/terraform-provider-azuread/internal/helpers/aadgraph"
+	"github.com/hashicorp/terraform-provider-azuread/internal/services/applications/parse"
+	"github.com/hashicorp/terraform-provider-azuread/internal/tf"
+	"github.com/hashicorp/terraform-provider-azuread/internal/utils"
+	"github.com/hashicorp/terraform-provider-azuread/internal/validate"
 )
 
 func applicationAppRoleResource() *schema.Resource {

internal/services/applications/application_app_role_resource_test.go

@@ -8,12 +8,12 @@ import (
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/terraform"
 
-	"github.com/terraform-providers/terraform-provider-azuread/internal/acceptance"
-	"github.com/terraform-providers/terraform-provider-azuread/internal/acceptance/check"
-	"github.com/terraform-providers/terraform-provider-azuread/internal/clients"
-	"github.com/terraform-providers/terraform-provider-azuread/internal/helpers/aadgraph"
-	"github.com/terraform-providers/terraform-provider-azuread/internal/services/applications/parse"
-	"github.com/terraform-providers/terraform-provider-azuread/internal/utils"
+	"github.com/hashicorp/terraform-provider-azuread/internal/acceptance"
+	"github.com/hashicorp/terraform-provider-azuread/internal/acceptance/check"
+	"github.com/hashicorp/terraform-provider-azuread/internal/clients"
+	"github.com/hashicorp/terraform-provider-azuread/internal/helpers/aadgraph"
+	"github.com/hashicorp/terraform-provider-azuread/internal/services/applications/parse"
+	"github.com/hashicorp/terraform-provider-azuread/internal/utils"
 )
 
 type ApplicationAppRoleResource struct{}

internal/services/applications/application_certificate_resource.go

@@ -9,11 +9,11 @@ import (
 	"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 
-	"github.com/terraform-providers/terraform-provider-azuread/internal/clients"
-	"github.com/terraform-providers/terraform-provider-azuread/internal/helpers/aadgraph"
-	"github.com/terraform-providers/terraform-provider-azuread/internal/services/applications/parse"
-	"github.com/terraform-providers/terraform-provider-azuread/internal/tf"
-	"github.com/terraform-providers/terraform-provider-azuread/internal/utils"
+	"github.com/hashicorp/terraform-provider-azuread/internal/clients"
+	"github.com/hashicorp/terraform-provider-azuread/internal/helpers/aadgraph"
+	"github.com/hashicorp/terraform-provider-azuread/internal/services/applications/parse"
+	"github.com/hashicorp/terraform-provider-azuread/internal/tf"
+	"github.com/hashicorp/terraform-provider-azuread/internal/utils"
 )
 
 func applicationCertificateResource() *schema.Resource {