Resolve merge conflict from MyPureCloud#1191 into Refactor/DEVTOOLING…

…-634 (MyPureCloud#1192)

* Refactor users package

* Updated the version field to reflect the correct value.

* removed util_common.go and refracted code to address standard practice

* add missing merge conflict code

examples/resources/genesyscloud_flow/inboundcall_flow_example.yaml

@@ -1,5 +1,5 @@
 inboundCall:
-  name: Terraform Emergency Test Flow 7fa2e8a9-b1d9-4d78-93b8-05b4465314a7
+  name: Terraform Flow Test-e678ea2e-2f37-4376-ab79-d70e7c7359b7
   defaultLanguage: en-us
   startUpRef: ./menus/menu[mainMenu]
   initialGreeting:

examples/resources/genesyscloud_flow/inboundcall_flow_example2.yaml

@@ -1,6 +1,6 @@
 inboundEmail:
-    name: Terraform Flow Test-d0c40522-88e4-4b66-aa48-f237afb819e0
-    division: New Home
+    name: Terraform Flow Test-dabfb12a-6e7e-4e8c-ab21-7f8549959c48
+    division: New Home1
     startUpRef: "/inboundEmail/states/state[Initial State_10]"
     defaultLanguage: en-us
     supportedLanguages:

examples/resources/genesyscloud_flow/inboundcall_flow_example3.yaml

@@ -1,5 +1,5 @@
 inboundCall:
-  name: Terraform Flow Test-e602c7ba-318e-4373-99bb-bdf69dcc7600
+  name: Terraform Flow Test-fa4dd927-bf74-4394-9b20-c3560a4b5f7f
   defaultLanguage: en-us
   startUpRef: ./menus/menu[mainMenu]
   initialGreeting:

genesyscloud/architect_schedules/genesyscloud_architect_schedules_proxy.go

@@ -174,10 +174,10 @@ func getArchitectSchedulesIdByNameFn(ctx context.Context, p *architectSchedulesP
 		return "", true, apiResponse, fmt.Errorf("No architect schedules found with name %s", name)
 	}
 
-	for _, schedules := range *schedules {
-		if *schedules.Name == name {
-			log.Printf("Retrieved the architect schedules id %s by name %s", *schedules.Id, name)
-			return *schedules.Id, false, apiResponse, nil
+	for _, schedule := range *schedules {
+		if *schedule.Name == name {
+			log.Printf("Retrieved the architect schedules id %s by name %s", *schedule.Id, name)
+			return *schedule.Id, false, apiResponse, nil
 		}
 	}
 

genesyscloud/group/genesyscloud_group_init_test.go

@@ -1,10 +1,11 @@
 package group
 
 import (
-	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 	"sync"
-	"terraform-provider-genesyscloud/genesyscloud"
+	"terraform-provider-genesyscloud/genesyscloud/user"
 	"testing"
+
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 )
 
 var providerDataSources map[string]*schema.Resource
@@ -23,7 +24,7 @@ func (r *registerTestInstance) registerTestResources() {
 	defer r.resourceMapMutex.Unlock()
 
 	providerResources[resourceName] = ResourceGroup()
-	providerResources["genesyscloud_user"] = genesyscloud.ResourceUser()
+	providerResources["genesyscloud_user"] = user.ResourceUser()
 
 }
 

genesyscloud/group/resource_genesyscloud_group.go

@@ -24,7 +24,7 @@ import (
 	"github.com/mypurecloud/platform-client-sdk-go/v133/platformclientv2"
 )
 
-func GetAllGroups(ctx context.Context, clientConfig *platformclientv2.Configuration) (resourceExporter.ResourceIDMetaMap, diag.Diagnostics) {
+func getAllGroups(ctx context.Context, clientConfig *platformclientv2.Configuration) (resourceExporter.ResourceIDMetaMap, diag.Diagnostics) {
 	resources := make(resourceExporter.ResourceIDMetaMap)
 	groupProxy := getGroupProxy(clientConfig)
 

genesyscloud/group/resource_genesyscloud_group_schema.go

@@ -46,7 +46,7 @@ func SetRegistrar(regInstance registrar.Registrar) {
 
 func GroupExporter() *resourceExporter.ResourceExporter {
 	return &resourceExporter.ResourceExporter{
-		GetResourcesFunc: provider.GetAllWithPooledClient(GetAllGroups),
+		GetResourcesFunc: provider.GetAllWithPooledClient(getAllGroups),
 		RefAttrs: map[string]*resourceExporter.RefAttrSettings{
 			"owner_ids":  {RefType: "genesyscloud_user"},
 			"member_ids": {RefType: "genesyscloud_user"},

genesyscloud/group_roles/genesyscloud_group_roles_init_test.go

@@ -1,12 +1,14 @@
 package group_roles
 
 import (
-	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 	"sync"
-	gcloud "terraform-provider-genesyscloud/genesyscloud"
+	"terraform-provider-genesyscloud/genesyscloud"
 	authRole "terraform-provider-genesyscloud/genesyscloud/auth_role"
 	"terraform-provider-genesyscloud/genesyscloud/group"
+	"terraform-provider-genesyscloud/genesyscloud/user"
 	"testing"
+
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 )
 
 /*
@@ -26,10 +28,10 @@ func (r *registerTestInstance) registerTestResources() {
 	defer r.resourceMapMutex.Unlock()
 
 	providerResources["genesyscloud_group_roles"] = ResourceGroupRoles()
-	providerResources["genesyscloud_user"] = gcloud.ResourceUser()
+	providerResources["genesyscloud_user"] = user.ResourceUser()
 	providerResources["genesyscloud_group"] = group.ResourceGroup()
 	providerResources["genesyscloud_auth_role"] = authRole.ResourceAuthRole()
-	providerResources["genesyscloud_auth_division"] = gcloud.ResourceAuthDivision()
+	providerResources["genesyscloud_auth_division"] = genesyscloud.ResourceAuthDivision()
 }
 
 // initTestResources initializes all test resources.

genesyscloud/integration/genesyscloud_integration_init_test.go

@@ -3,10 +3,9 @@ package integration
 import (
 	"sync"
 	"terraform-provider-genesyscloud/genesyscloud/group"
-	"testing"
-
-	gcloud "terraform-provider-genesyscloud/genesyscloud"
 	integrationCred "terraform-provider-genesyscloud/genesyscloud/integration_credential"
+	"terraform-provider-genesyscloud/genesyscloud/user"
+	"testing"
 
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 )
@@ -37,7 +36,7 @@ func (r *registerTestInstance) registerTestResources() {
 	providerResources["genesyscloud_integration"] = ResourceIntegration()
 	providerResources["genesyscloud_group"] = group.ResourceGroup()
 	providerResources["genesyscloud_integration_credential"] = integrationCred.ResourceIntegrationCredential()
-	providerResources["genesyscloud_user"] = gcloud.ResourceUser()
+	providerResources["genesyscloud_user"] = user.ResourceUser()
 }
 
 // registerTestDataSources registers all data sources used in the tests.

genesyscloud/journey_views/genesyscloud_journey_views_init_test.go

@@ -1,10 +1,11 @@
 package journey_views
 
 import (
-	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 	"sync"
-	"terraform-provider-genesyscloud/genesyscloud"
+	"terraform-provider-genesyscloud/genesyscloud/user"
 	"testing"
+
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 )
 
 //var providerDataSources map[string]*schema.Resource
@@ -22,7 +23,7 @@ func (r *registerTestInstance) registerTestResources() {
 	defer r.resourceMapMutex.Unlock()
 
 	providerResources[resourceName] = ResourceJourneyViews()
-	providerResources["genesyscloud_user"] = genesyscloud.ResourceUser()
+	providerResources["genesyscloud_user"] = user.ResourceUser()
 
 }
 

genesyscloud/orgauthorization_pairing/genesyscloud_orgauthorization_pairing_init_test.go

@@ -2,8 +2,8 @@ package orgauthorization_pairing
 
 import (
 	"sync"
-	"terraform-provider-genesyscloud/genesyscloud"
 	"terraform-provider-genesyscloud/genesyscloud/group"
+	"terraform-provider-genesyscloud/genesyscloud/user"
 	"testing"
 
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
@@ -27,7 +27,7 @@ func (r *registerTestInstance) registerTestResources() {
 	defer r.resourceMapMutex.Unlock()
 
 	providerResources[resourceName] = ResourceOrgauthorizationPairing()
-	providerResources["genesyscloud_user"] = genesyscloud.ResourceUser()
+	providerResources["genesyscloud_user"] = user.ResourceUser()
 	providerResources["genesyscloud_group"] = group.ResourceGroup()
 }
 

genesyscloud/orgauthorization_pairing/resource_genesyscloud_orgauthorization_pairing_test.go

@@ -3,8 +3,8 @@ package orgauthorization_pairing
 import (
 	"fmt"
 	"strings"
-	"terraform-provider-genesyscloud/genesyscloud"
 	"terraform-provider-genesyscloud/genesyscloud/provider"
+	"terraform-provider-genesyscloud/genesyscloud/user"
 	"terraform-provider-genesyscloud/genesyscloud/util"
 	"testing"
 	"time"
@@ -41,7 +41,7 @@ func TestAccResourceOrgAuthorizationPairing(t *testing.T) {
 				PreConfig: func() {
 					time.Sleep(45 * time.Second)
 				},
-				Config: generateUserWithCustomAttrs(testUserResource, testUserEmail, testUserName) + genesyscloud.GenerateBasicUserResource(
+				Config: generateUserWithCustomAttrs(testUserResource, testUserEmail, testUserName) + user.GenerateBasicUserResource(
 					userResource1,
 					email1,
 					userName1,
@@ -60,11 +60,11 @@ func TestAccResourceOrgAuthorizationPairing(t *testing.T) {
 			},
 			// 2 users and 2 groups
 			{
-				Config: generateUserWithCustomAttrs(testUserResource, testUserEmail, testUserName) + genesyscloud.GenerateBasicUserResource(
+				Config: generateUserWithCustomAttrs(testUserResource, testUserEmail, testUserName) + user.GenerateBasicUserResource(
 					userResource1,
 					email1,
 					userName1,
-				) + genesyscloud.GenerateBasicUserResource(
+				) + user.GenerateBasicUserResource(
 					userResource2,
 					email2,
 					userName2,
@@ -98,7 +98,7 @@ func TestAccResourceOrgAuthorizationPairing(t *testing.T) {
 			},
 			// 1 user
 			{
-				Config: genesyscloud.GenerateBasicUserResource(
+				Config: user.GenerateBasicUserResource(
 					userResource1,
 					email1,
 					userName1,
@@ -114,11 +114,11 @@ func TestAccResourceOrgAuthorizationPairing(t *testing.T) {
 			},
 			// 2 users
 			{
-				Config: genesyscloud.GenerateBasicUserResource(
+				Config: user.GenerateBasicUserResource(
 					userResource1,
 					email1,
 					userName1,
-				) + genesyscloud.GenerateBasicUserResource(
+				) + user.GenerateBasicUserResource(
 					userResource2,
 					email2,
 					userName2,

genesyscloud/recording_media_retention_policy/genesyscloud_recording_media_retention_policy_init_test.go

@@ -8,10 +8,11 @@ import (
 	authRole "terraform-provider-genesyscloud/genesyscloud/auth_role"
 	integration "terraform-provider-genesyscloud/genesyscloud/integration"
 	"terraform-provider-genesyscloud/genesyscloud/provider"
-	routingQueue "terraform-provider-genesyscloud/genesyscloud/routing_queue"
+	routingEmailDomain "terraform-provider-genesyscloud/genesyscloud/routing_email_domain"
 	routingLanguage "terraform-provider-genesyscloud/genesyscloud/routing_language"
+	routingQueue "terraform-provider-genesyscloud/genesyscloud/routing_queue"
+	"terraform-provider-genesyscloud/genesyscloud/user"
 	userRoles "terraform-provider-genesyscloud/genesyscloud/user_roles"
-	routingEmailDomain "terraform-provider-genesyscloud/genesyscloud/routing_email_domain"
 
 	"testing"
 
@@ -50,7 +51,7 @@ func (r *registerTestInstance) registerTestResources() {
 	providerResources["genesyscloud_routing_queue"] = routingQueue.ResourceRoutingQueue()
 	providerResources["genesyscloud_auth_role"] = authRole.ResourceAuthRole()
 	providerResources["genesyscloud_user_roles"] = userRoles.ResourceUserRoles()
-	providerResources["genesyscloud_user"] = gcloud.ResourceUser()
+	providerResources["genesyscloud_user"] = user.ResourceUser()
 	providerResources["genesyscloud_quality_forms_evaluation"] = gcloud.ResourceEvaluationForm()
 	providerResources["genesyscloud_quality_forms_survey"] = gcloud.ResourceSurveyForm()
 	providerResources["genesyscloud_integration"] = integration.ResourceIntegration()