Merging dev into main for v1.47.0

.devcontainer/Dockerfile

@@ -0,0 +1,11 @@
+FROM mcr.microsoft.com/vscode/devcontainers/base:ubuntu
+
+# Install Genesys Cloud CLI
+RUN curl -s https://sdk-cdn.mypurecloud.com/external/go-cli/linux/dl/install.sh | sudo bash
+
+# Install the Archy CLI
+RUN cd ~ && \
+    mkdir archy && \ 
+    curl https://sdk-cdn.mypurecloud.com/archy/latest/archy-linux.zip > archy-linux.zip && \
+    unzip archy-linux.zip -d ~/archy && \ 
+    cd ~

.devcontainer/devcontainer.json

@@ -0,0 +1,19 @@
+{
+    "name": "Terraform and Go",
+    "build": {
+        "dockerfile": "Dockerfile"
+    },
+    "features": {
+        "ghcr.io/devcontainers/features/terraform:1":{},
+        "ghcr.io/devcontainers/features/go:1":{},
+        "ghcr.io/devcontainers/features/python": {}
+    },
+    "hostRequirements": {
+        "cpus": 4,
+        "memory": "16gb",
+        "storage": "32gb"
+    },
+    "forwardPorts": [
+        8080
+    ]
+}

GNUmakefile

@@ -54,6 +54,7 @@ clean:
 
 build:
 	mkdir -p ${DIST_DIR}
+	go mod tidy
 	go build -o ${DIST_DIR} ./...
 
 GOOS = $(shell go env GOOS)

genesyscloud/architect_emergencygroup/resource_genesyscloud_architect_emergencygroup_test.go

@@ -41,7 +41,7 @@ func TestAccResourceArchitectEmergencyGroups(t *testing.T) {
 	// Currently, the ivr resource cannot be registered for these tests because of a cyclic dependency issue.
 	ivrId := "f94e084e-40eb-470b-80d6-0f99cf22d102"
 	if v := os.Getenv("GENESYSCLOUD_REGION"); v == "tca" {
-		ivrId = "d37d14fe-1e6c-4ed6-a9bb-b6ef0dd8e9cd"
+		ivrId = "770e3998-11b7-4c96-beb8-215b83201c29"
 	}
 
 	if !ivrExists(config, ivrId) {

genesyscloud/architect_ivr/genesyscloud_architect_ivr_init_test.go

@@ -2,7 +2,7 @@ package architect_ivr
 
 import (
 	"sync"
-	gcloud "terraform-provider-genesyscloud/genesyscloud"
+	authDivision "terraform-provider-genesyscloud/genesyscloud/auth_division"
 	didPool "terraform-provider-genesyscloud/genesyscloud/telephony_providers_edges_did_pool"
 	"testing"
 
@@ -33,7 +33,7 @@ func (r *registerTestInstance) registerTestResources() {
 	defer r.resourceMapMutex.Unlock()
 
 	providerResources[resourceName] = ResourceArchitectIvrConfig()
-	providerResources["genesyscloud_auth_division"] = gcloud.ResourceAuthDivision()
+	providerResources["genesyscloud_auth_division"] = authDivision.ResourceAuthDivision()
 	providerResources["genesyscloud_telephony_providers_edges_did_pool"] = didPool.ResourceTelephonyDidPool()
 }
 

genesyscloud/architect_schedulegroups/genesyscloud_architect_schedulegroups_init_test.go

@@ -2,8 +2,8 @@ package architect_schedulegroups
 
 import (
 	"sync"
-	"terraform-provider-genesyscloud/genesyscloud"
 	architectSchedules "terraform-provider-genesyscloud/genesyscloud/architect_schedules"
+	authDivision "terraform-provider-genesyscloud/genesyscloud/auth_division"
 	"testing"
 
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
@@ -32,7 +32,7 @@ func (r *registerTestInstance) registerTestResources() {
 
 	providerResources[resourceName] = ResourceArchitectSchedulegroups()
 	providerResources["genesyscloud_architect_schedules"] = architectSchedules.ResourceArchitectSchedules()
-	providerResources["genesyscloud_auth_division"] = genesyscloud.ResourceAuthDivision()
+	providerResources["genesyscloud_auth_division"] = authDivision.ResourceAuthDivision()
 }
 
 // registerTestDataSources registers all data sources used in the tests.

genesyscloud/architect_schedulegroups/resource_genesyscloud_architect_schedulegroups_test.go

@@ -3,8 +3,8 @@ package architect_schedulegroups
 import (
 	"fmt"
 	"strings"
-	gcloud "terraform-provider-genesyscloud/genesyscloud"
 	architectSchedules "terraform-provider-genesyscloud/genesyscloud/architect_schedules"
+	authDivision "terraform-provider-genesyscloud/genesyscloud/auth_division"
 	"terraform-provider-genesyscloud/genesyscloud/provider"
 	"terraform-provider-genesyscloud/genesyscloud/util"
 	"testing"
@@ -132,7 +132,7 @@ func TestAccResourceArchitectScheduleGroups(t *testing.T) {
 			},
 			{
 				// Create with new division
-				Config: gcloud.GenerateAuthDivisionBasic(divResource, divName) + architectSchedules.GenerateArchitectSchedulesResource( // Create Open schedule
+				Config: authDivision.GenerateAuthDivisionBasic(divResource, divName) + architectSchedules.GenerateArchitectSchedulesResource( // Create Open schedule
 					schedResource4,
 					openSched2,
 					"genesyscloud_auth_division."+divResource+".id",

genesyscloud/architect_schedules/genesyscloud_architect_schedules_init_test.go

@@ -2,7 +2,7 @@ package architect_schedules
 
 import (
 	"sync"
-	gcloud "terraform-provider-genesyscloud/genesyscloud"
+	authDivision "terraform-provider-genesyscloud/genesyscloud/auth_division"
 	"testing"
 
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
@@ -30,7 +30,7 @@ func (r *registerTestInstance) registerTestResources() {
 	defer r.resourceMapMutex.Unlock()
 
 	providerResources[resourceName] = ResourceArchitectSchedules()
-	providerResources["genesyscloud_auth_division"] = gcloud.ResourceAuthDivision()
+	providerResources["genesyscloud_auth_division"] = authDivision.ResourceAuthDivision()
 }
 
 // registerTestDataSources registers all data sources used in the tests.

genesyscloud/architect_schedules/resource_genesyscloud_architect_schedules_test.go

@@ -2,7 +2,7 @@ package architect_schedules
 
 import (
 	"fmt"
-	gcloud "terraform-provider-genesyscloud/genesyscloud"
+	authDivision "terraform-provider-genesyscloud/genesyscloud/auth_division"
 	"terraform-provider-genesyscloud/genesyscloud/provider"
 	"terraform-provider-genesyscloud/genesyscloud/util"
 	"testing"
@@ -76,7 +76,7 @@ func TestAccResourceArchitectSchedules(t *testing.T) {
 			},
 			{
 				// Create with new division
-				Config: gcloud.GenerateAuthDivisionBasic(divResource, divName) + GenerateArchitectSchedulesResource(
+				Config: authDivision.GenerateAuthDivisionBasic(divResource, divName) + GenerateArchitectSchedulesResource(
 					schedResource2,
 					name2,
 					"genesyscloud_auth_division."+divResource+".id",

genesyscloud/architect_user_prompt/genesyscloud_architect_user_prompt_init_test.go

@@ -2,7 +2,7 @@ package architect_user_prompt
 
 import (
 	"sync"
-	"terraform-provider-genesyscloud/genesyscloud"
+	authDivision "terraform-provider-genesyscloud/genesyscloud/auth_division"
 	"testing"
 
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
@@ -25,7 +25,7 @@ func (r *registerTestInstance) registerTestResources() {
 	defer r.resourceMapMutex.Unlock()
 
 	providerResources[resourceName] = ResourceArchitectUserPrompt()
-	providerResources["genesyscloud_auth_division"] = genesyscloud.ResourceAuthDivision()
+	providerResources["genesyscloud_auth_division"] = authDivision.ResourceAuthDivision()
 }
 
 // registerTestDataSources registers all data sources used in the tests.

genesyscloud/architect_user_prompt/resource_architect_user_prompt_schema.go

@@ -92,7 +92,6 @@ func ResourceArchitectUserPrompt() *schema.Resource {
 				Description: "Name of the user audio prompt. Note: If the name of the user prompt is changed, this will cause the Prompt to be dropped and recreated with a new ID. This will generate a new ID for the prompt and will invalidate any Architect flows referencing it. ",
 				Type:        schema.TypeString,
 				Required:    true,
-				ForceNew:    true,
 			},
 			"description": {
 				Description: "Description of the user audio prompt.",

genesyscloud/architect_user_prompt/resource_genesyscloud_architect_user_prompt_test.go

@@ -23,6 +23,7 @@ import (
 func TestAccResourceUserPromptBasic(t *testing.T) {
 	userPromptResource1 := "test-user_prompt_1"
 	userPromptName1 := "TestUserPrompt_1" + strings.Replace(uuid.NewString(), "-", "", -1)
+	userPromptName2 := "TestUserPrompt_2" + strings.Replace(uuid.NewString(), "-", "", -1)
 	userPromptDescription1 := "Test description"
 	userPromptResourceLang1 := "en-us"
 	userPromptResourceLang2 := "ja-jp"
@@ -78,12 +79,12 @@ func TestAccResourceUserPromptBasic(t *testing.T) {
 				// Update to include TTS message prompt resource
 				Config: GenerateUserPromptResource(&UserPromptStruct{
 					userPromptResource1,
-					userPromptName1,
+					userPromptName2,
 					strconv.Quote(userPromptDescription1),
 					userPromptResources1,
 				}),
 				Check: resource.ComposeTestCheckFunc(
-					resource.TestCheckResourceAttr("genesyscloud_architect_user_prompt."+userPromptResource1, "name", userPromptName1),
+					resource.TestCheckResourceAttr("genesyscloud_architect_user_prompt."+userPromptResource1, "name", userPromptName2),
 					resource.TestCheckResourceAttr("genesyscloud_architect_user_prompt."+userPromptResource1, "description", userPromptDescription1),
 					resource.TestCheckResourceAttr("genesyscloud_architect_user_prompt."+userPromptResource1, "resources.0.language", userPromptResourceLang1),
 					resource.TestCheckResourceAttr("genesyscloud_architect_user_prompt."+userPromptResource1, "resources.0.tts_string", userPromptResourceTTS1),
@@ -93,12 +94,12 @@ func TestAccResourceUserPromptBasic(t *testing.T) {
 				// Update existing language TTS
 				Config: GenerateUserPromptResource(&UserPromptStruct{
 					userPromptResource1,
-					userPromptName1,
+					userPromptName2,
 					strconv.Quote(userPromptDescription1),
 					userPromptResources2,
 				}),
 				Check: resource.ComposeTestCheckFunc(
-					resource.TestCheckResourceAttr("genesyscloud_architect_user_prompt."+userPromptResource1, "name", userPromptName1),
+					resource.TestCheckResourceAttr("genesyscloud_architect_user_prompt."+userPromptResource1, "name", userPromptName2),
 					resource.TestCheckResourceAttr("genesyscloud_architect_user_prompt."+userPromptResource1, "description", userPromptDescription1),
 					resource.TestCheckResourceAttr("genesyscloud_architect_user_prompt."+userPromptResource1, "resources.0.language", userPromptResourceLang1),
 					resource.TestCheckResourceAttr("genesyscloud_architect_user_prompt."+userPromptResource1, "resources.0.tts_string", userPromptResourceTTS2),

genesyscloud/auth_division/data_source_genesyscloud_auth_division.go

@@ -0,0 +1,34 @@
+package auth_division
+
+import (
+	"context"
+	"fmt"
+	"terraform-provider-genesyscloud/genesyscloud/provider"
+	"terraform-provider-genesyscloud/genesyscloud/util"
+	"time"
+
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/retry"
+
+	"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
+)
+
+func dataSourceAuthDivisionRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
+	sdkConfig := m.(*provider.ProviderMeta).ClientConfig
+	proxy := getAuthDivisionProxy(sdkConfig)
+	name := d.Get("name").(string)
+
+	// Query division by name. Retry in case search has not yet indexed the division.
+	return util.WithRetries(ctx, 15*time.Second, func() *retry.RetryError {
+		divisionId, resp, retryable, getErr := proxy.getAuthDivisionIdByName(ctx, name)
+		if getErr != nil && !retryable {
+			return retry.NonRetryableError(util.BuildWithRetriesApiDiagnosticError(resourceName, fmt.Sprintf("Error requesting division %s | error: %s", name, getErr), resp))
+		}
+		if retryable {
+			return retry.RetryableError(util.BuildWithRetriesApiDiagnosticError(resourceName, fmt.Sprintf("Error requesting division %s | error: %s", name, getErr), resp))
+		}
+
+		d.SetId(divisionId)
+		return nil
+	})
+}

genesyscloud/data_source_genesyscloud_auth_division_test.go → genesyscloud/auth_division/data_source_genesyscloud_auth_division_test.go

@@ -1,4 +1,4 @@
-package genesyscloud
+package auth_division
 
 import (
 	"fmt"

genesyscloud/auth_division/genesyscloud_auth_division_init_test.go

@@ -0,0 +1,60 @@
+package auth_division
+
+import (
+	"sync"
+	"testing"
+
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
+)
+
+/*
+   The genesyscloud_auth_division_init_test.go file is used to initialize the data sources and resources
+   used in testing the auth_division resource.
+*/
+
+// providerDataSources holds a map of all registered datasources
+var providerDataSources map[string]*schema.Resource
+
+// providerResources holds a map of all registered resources
+var providerResources map[string]*schema.Resource
+
+type registerTestInstance struct {
+	resourceMapMutex   sync.RWMutex
+	datasourceMapMutex sync.RWMutex
+}
+
+// registerTestResources registers all resources used in the tests
+func (r *registerTestInstance) registerTestResources() {
+	r.resourceMapMutex.Lock()
+	defer r.resourceMapMutex.Unlock()
+
+	providerResources[resourceName] = ResourceAuthDivision()
+}
+
+// registerTestDataSources registers all data sources used in the tests.
+func (r *registerTestInstance) registerTestDataSources() {
+	r.datasourceMapMutex.Lock()
+	defer r.datasourceMapMutex.Unlock()
+
+	providerDataSources[resourceName] = DataSourceAuthDivision()
+}
+
+// initTestResources initializes all test resources and data sources.
+func initTestResources() {
+	providerDataSources = make(map[string]*schema.Resource)
+	providerResources = make(map[string]*schema.Resource)
+
+	regInstance := &registerTestInstance{}
+
+	regInstance.registerTestResources()
+	regInstance.registerTestDataSources()
+}
+
+// TestMain is a "setup" function called by the testing framework when run the test
+func TestMain(m *testing.M) {
+	// Run setup function before starting the test suite for the auth_division package
+	initTestResources()
+
+	// Run the test suite for the auth_division package
+	m.Run()
+}