Handle responses from downloadoropen() so they can be retried if 400

genesyscloud/architect_grammar_language/resource_genesyscloud_architect_grammar_language_utils.go

@@ -177,7 +177,7 @@ func (d *grammarLanguageDownloader) downloadFileData(fileType FileType) error {
 func (d *grammarLanguageDownloader) downloadLanguageFileAndUpdateConfigMap(url string) error {
 	d.fileUrl = url
 	d.setExportFileName()
-	if err := files.DownloadExportFile(d.exportFilesFolderPath, d.exportFileName, d.fileUrl); err != nil {
+	if _, err := files.DownloadExportFile(d.exportFilesFolderPath, d.exportFileName, d.fileUrl); err != nil {
 		return err
 	}
 	d.updatePathsInExportConfigMap()

genesyscloud/architect_user_prompt/resource_genesyscloud_architect_user_prompt_utils.go

@@ -199,7 +199,7 @@ func ArchitectPromptAudioResolver(promptId, exportDirectory, subDirectory string
 
 	for _, data := range audioDataList {
 		log.Printf("Downloading file '%s' from mediaUri", path.Join(fullPath, data.FileName))
-		if err := files.DownloadExportFile(fullPath, data.FileName, data.MediaUri); err != nil {
+		if _, err := files.DownloadExportFile(fullPath, data.FileName, data.MediaUri); err != nil {
 			return err
 		}
 		log.Println("Successfully downloaded file")

genesyscloud/outbound_contact_list/resource_genesyscloud_outbound_contact_list_utils.go

@@ -194,18 +194,18 @@ func ContactsExporterResolver(resourceId, exportDirectory, subDirectory string,
 	exportFileName := fmt.Sprintf("%s.csv", contactListName)
 
 	fullDirectoryPath := path.Join(exportDirectory, subDirectory)
-	if err := os.MkdirAll(fullDirectoryPath, os.ModePerm); err != nil {
+	if err := os.MkdirAll(fullDirectoryPath, 0600); err != nil {
 		return err
 	}
 
 	ctx := context.Background()
 	diagErr := util.RetryWhen(util.IsStatus400, func() (*platformclientv2.APIResponse, diag.Diagnostics) {
-		url, _, err := cp.getContactListContactsExportUrl(ctx, contactListId)
+		url, resp, err := cp.getContactListContactsExportUrl(ctx, contactListId)
 		if err != nil {
-			return nil, diag.FromErr(err)
+			return resp, diag.FromErr(err)
 		}
-		if err := files.DownloadExportFileWithAccessToken(fullDirectoryPath, exportFileName, url, sdkConfig.AccessToken); err != nil {
-			return nil, diag.FromErr(err)
+		if resp, err = files.DownloadExportFileWithAccessToken(fullDirectoryPath, exportFileName, url, sdkConfig.AccessToken); err != nil {
+			return resp, diag.FromErr(err)
 		}
 		return nil, nil
 	})
@@ -214,7 +214,9 @@ func ContactsExporterResolver(resourceId, exportDirectory, subDirectory string,
 		return fmt.Errorf(`Error retrieving exported contacts: %v`, diagErr)
 	}
 
+	// amazonq-ignore-next-line
 	fullCurrentPath := path.Join(fullDirectoryPath, exportFileName)
+	// amazonq-ignore-next-line
 	fullRelativePath := path.Join(subDirectory, exportFileName)
 	configMap["contacts_filepath"] = fullRelativePath
 	configMap["contacts_id_name"] = "inin-outbound-id"

genesyscloud/outbound_contact_list/resource_genesyscloud_outbound_contact_list_utils_test.go

@@ -585,12 +585,13 @@ func TestContactListContactsExporterResolver(t *testing.T) {
 
 		// Mock the file download function
 		origDownloadFile := files.DownloadExportFileWithAccessToken
-		files.DownloadExportFileWithAccessToken = func(directory, filename, url, accessToken string) error {
+		files.DownloadExportFileWithAccessToken = func(directory, filename, url, accessToken string) (*platformclientv2.APIResponse, error) {
 			fullPath := path.Join(directory, filename)
 			if err := os.MkdirAll(directory, os.ModePerm); err != nil {
-				return err
+				return nil, err
 			}
-			return os.WriteFile(fullPath, []byte("test content"), 0644)
+			os.WriteFile(fullPath, []byte("test content"), 0644)
+			return nil, nil
 		}
 		defer func() { files.DownloadExportFileWithAccessToken = origDownloadFile }()
 
@@ -683,8 +684,8 @@ func TestContactListContactsExporterResolver(t *testing.T) {
 		}
 
 		// Mock download failure
-		files.DownloadExportFileWithAccessToken = func(directory, filename, url, accessToken string) error {
-			return fmt.Errorf("download failed")
+		files.DownloadExportFileWithAccessToken = func(directory, filename, url, accessToken string) (*platformclientv2.APIResponse, error) {
+			return nil, fmt.Errorf("download failed")
 		}
 
 		err := ContactsExporterResolver("test-id", tempDir, subDir, configMap, mockMeta, mockResource)

genesyscloud/responsemanagement_responseasset/resource_genesyscloud_responsemanagement_responseasset_utils.go

@@ -33,7 +33,7 @@ func responsemanagementResponseassetResolver(responseAssetId, exportDirectory, s
 	fileName := fmt.Sprintf("%s-%s%s", baseName, responseAssetId, filepath.Ext(*data.Name))
 	exportFilename := path.Join(subDirectory, fileName)
 
-	if err := files.DownloadExportFile(fullPath, fileName, *data.ContentLocation); err != nil {
+	if _, err := files.DownloadExportFile(fullPath, fileName, *data.ContentLocation); err != nil {
 		return err
 	}
 	configMap["filename"] = exportFilename

genesyscloud/scripts/resource_genesyscloud_script_utils.go

@@ -28,7 +28,7 @@ func ScriptResolver(scriptId, exportDirectory, subDirectory string, configMap ma
 		return err
 	}
 
-	if err := files.DownloadExportFile(fullPath, exportFileName, url); err != nil {
+	if _, err := files.DownloadExportFile(fullPath, exportFileName, url); err != nil {
 		return err
 	}
 

genesyscloud/util/files/util_files.go

@@ -23,6 +23,7 @@ import (
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/customdiff"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/retry"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
+	"github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2"
 )
 
 type S3Uploader struct {
@@ -214,38 +215,42 @@ func DownloadOrOpenFile(path string) (io.Reader, *os.File, error) {
 // without actually downloading files.
 var DownloadExportFile = downloadExportFile
 
-func downloadExportFile(directory, fileName, uri string) error {
+func downloadExportFile(directory, fileName, uri string) (*platformclientv2.APIResponse, error) {
 	return downloadExportFileWithAccessToken(directory, fileName, uri, "")
 }
 
 var DownloadExportFileWithAccessToken = downloadExportFileWithAccessToken
 
-func downloadExportFileWithAccessToken(directory, fileName, uri, accessToken string) error {
+func downloadExportFileWithAccessToken(directory, fileName, uri, accessToken string) (*platformclientv2.APIResponse, error) {
 	client := &http.Client{}
 
 	req, err := http.NewRequest("GET", uri, nil)
 	if err != nil {
-		return err
+		return nil, err
 	}
 
 	if accessToken != "" {
 		req.Header.Set("Authorization", fmt.Sprintf("Bearer %s", accessToken))
 	}
 
 	resp, err := client.Do(req)
+	apiResp, apiErr := platformclientv2.NewAPIResponse(resp, nil)
 	if err != nil {
-		return err
+		return apiResp, err
+	}
+	if apiErr != nil {
+		return apiResp, apiErr
 	}
 	defer resp.Body.Close()
 
 	out, err := os.Create(path.Join(directory, fileName))
 	if err != nil {
-		return err
+		return apiResp, err
 	}
 	defer out.Close()
 
 	_, err = io.Copy(out, resp.Body)
-	return err
+	return apiResp, err
 }
 
 // Hash file content, used in stateFunc for "filepath" type attributes