From 7c1d436b1ad140cfbf8dd1e9baa0e9b78d501a88 Mon Sep 17 00:00:00 2001 From: HemanthDogiparthi12 <127493303+HemanthDogiparthi12@users.noreply.github.com> Date: Fri, 10 Jan 2025 19:50:34 +0000 Subject: [PATCH] Merging dev into main for v1.56.0 (#1466) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Fix failed acceptance testcases (#1162) * Modify order of testcase * fix division deletion * Fix testcases * Fix testcases * Fix outbound campaign * Fix ExternralTrunkBaseSettingsInboundSite testcase * Fix skipped testcases * Fix skipped testcases * Fix skipped testcases * Fix failing tests * Fix failing tests * Fix testcases * Fix testcases * Fixing test & report * fix testcases * fix testcases * fix testcases * fix tests * Fix testcase * Fix testcase * Fix tests * Fix tests * Fix tests * Fix tests * Fix tests * Fix tests * Fix tests * Fix tests * fix tests * fix tests * Resolve comments --------- Co-authored-by: Monisha Padmavathi Ragavan * Feat/devtooling 655: conversations_messaging_settings resource (#1150) * Created Resource * Created Resource & added tests * Added examples * Update tf_exporter_resource_test.go * Datasoruce tfstate (#1170) * Fixes DEVTOOLING-675 (#1169) * Fixes DEVTOOLING-675 by updating the logic for returning user addresses. This is kept behind the feature flag USE_NEW_USER_ADDRESS_LOGIC env variable to prevent backwards compatibility issues. This commit also refactors a few things for unit testing * FormatAsE164Number for location and group address numbers too * Update example docs to add info about the feature toggle * added expand field to export line properties (#1174) * Devtooling 625: Adding the id fields to question_groups, questions, answer_options as READ-ONLY (#1167) * Adding missing fields to forms_evaluatation resource (fixes #1066) * removed field from answer options * go generate * Making the ID fields nested within forms_eval resource read only * Made ID fields read-only by removing Optional attr * go fmt ./genesyscloud * Adding nested id fields to ExcludeAttributes array for forms_evaluation exporter * Devtooling 625: fix export test (#1177) * Adding readonly answer_options.id field to survey resource/exporter * Implementing the ID field for question_groups & questions in survey resource * Bug/devtooling 648 (#1173) * Datasoruce tfstate * Update Test cases for Data Source * remove unecessary function * NO-JIRA: Removed the test workflows as these items have been moved to Jenkins (#1176) * refactor/Devtooling-189: refactor routing skill group (#1171) * Refactoring create and update: tests passed * split create and update functions * removed unnecessary functions * PR * test case no longer calls api direct * Fixed user test and schema for routing skill group * No jira: unit tests workflow (#1181) * Adding unit tests workflow * inconsequential change to trigger new workflow * minor change * Removed comment * changing workflow trigger * Fixing syntax error in yml file * Fixed unit test * Fixing other unit tests * Refactor/devtooling-188: Routing Skill (#1183) * Added Routing Skill Package * refactored routing skill * Fixing merge conflicts * feat/Devtooling 712 resource for supported content (#1159) * resource and test cases added for supported content * updated resource testcase and added datasource testcase * updated docs * added example folder * added example folder * updated docs * updated testcase for datasource * resolved comments * updated docs * changed resource name * changed resource file names * changed resource file names * comments resolved * updatd docs * cache added for data source * resolved merge conflict * comments resolved * updated docs * comments resolved * Bug/devtooling 707 - Worktype status independent resource (#1164) * Refactored code * Removed statuses from worktype resource * Finished worktype status resource * Added reponse assets stuff back * Fixed workitems tests * Updated docs * Updated docs * Made requested changes * Added caching * Inspired by DEVTOOLING-741 - Hardening E.164 handling (#1178) * Closes E.164 number formatting inconsistencies that could theoretically occur by ensuring all instances that we validate for an E.164 formatted number from user config (which are applied on create/update) are also returned (via read) as an E.164 formatted number to maintain consistency in number handling. This likely means we could remove the custom validate export handling for E164 that was inconsistently applied and used custom logic. * Add unit test cases for Format E164 * Fixes for acceptance test updates * Fix PR comments * Update the E.164 utilities to be able to pass in the organization's Default Country Code so it handles parsing and appending the correct international phone code to phone numbers. For example, if the default country code is JP, the default prefix is +81 instead of +1 for US. * Increased workflow timeout * Revert "Inspired by DEVTOOLING-741 - Hardening E.164 handling (#1178)" (#1184) This reverts commit 9ceb1ad20f31286cf3202a278e92546a1c37ddbb. * Refactor users package (#1129) * Refactor users package * Updated the version field to reflect the correct value. * removed util_common.go and refracted code to address standard practice * Revert "Refactor users package (#1129)" (#1191) This reverts commit ceaeeb1abd297f9be090ac93492812f61b935438. * Deploy back to dev (#1193) * Fix debugging issue and add docs on how to setup debugging (#1190) * Fix debugging issue and add docs on how to setup debugging * Fix spelling error * Resolve merge conflict from #1191 into Refactor/DEVTOOLING-634 (#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 * Refactor/DEVTOOLING-191 and DEVTOOLING-646 (#1152) * refactor/DEVTOOLING-191 and added division ID into wrapup code * updated proxy file for standard coding practice * registry updated in the main.go * Reverted registry changes in main.go * Feat/devtooling 652 Integration Facebook resource (#1168) * implementation of facebook resource * updated docs * unit tests for facebook resource * minor fixes * comments resolved * added cache * updated docs * added references to supported_content and messaging_setting * added conditions for attributes * modified data source test cases * resolved comments * bug fixe * Devtooling-730: Added enable_audio_monitoring to Routing Queue Resource (#1188) * Added enable_audio_monitoring property * Added example and updated doc * Bug/devtooling 749 added webrtc for fields property (#1194) * initial commit * added back export of user * OV-2078 Added Dynamic Line Balancing Settings (#1195) * Feat/devtooling-714: Conversations Messaging Settings Default Resource (#1187) * Created Resource and Test * Removed unnecessary file * Added Example Resource and updated Docs * Tidy * Fixed file names and made requested changes * Bump golang.org/x/net from 0.27.0 to 0.28.0 (#1199) Bumps [golang.org/x/net](https://github.com/golang/net) from 0.27.0 to 0.28.0. - [Commits](https://github.com/golang/net/compare/v0.27.0...v0.28.0) --- updated-dependencies: - dependency-name: golang.org/x/net dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Fixed test (#1186) * Fixing test (#1201) * No jira: Fixing a few test failures (#1200) * Fixed bug in wrapupcode resource * Fixed nil pointer in executeUpdateUser function * Fixed go checks workflow * Fixed bug when exporting wrapupcodes * Deleting user from cache + small change to one test * Fixed bug in dnclist package * removed feature toggle (#1197) * bug/DEVTOOLING-735: Fix bug in architect_user_prompt resource (#1198) * Fixed bug in prompts resource + refactor * Fixed prompts exporter by providing correct query params in getAll func * Cleaned up docs and feature toggles package (#1205) * Fix DEVTOOLING-780 (#1204) * Fix acceptance testcases (#1206) * fix tests * fix tests * fix tests * DEVTOOLING-769: Remove flow outcome & trunk tests as required API for testcase are not present * Fix testcases * Fix tests * Fix tests * resolve comments --------- Co-authored-by: Monisha Padmavathi Ragavan * changed optional value (#1203) * No jira: user prompt export test bug (#1210) * Fixing user prompt export test * go generate * Minor refactor * Re-opens #1178 Harden e164 (#1207) * Closes E.164 number formatting inconsistencies that could theoretically occur by ensuring all instances that we validate for an E.164 formatted number from user config (which are applied on create/update) are also returned (via read) as an E.164 formatted number to maintain consistency in number handling. This likely means we could remove the custom validate export handling for E164 that was inconsistently applied and used custom logic. * Add unit test cases for Format E164 * Fixes for acceptance test updates * Fix PR comments * Update the E.164 utilities to be able to pass in the organization's Default Country Code so it handles parsing and appending the correct international phone code to phone numbers. For example, if the default country code is JP, the default prefix is +81 instead of +1 for US. * Fix up after user refactor * Adds extra Export RefAttrs that could exist and reference flows on genesyscloud_outbound_callanalaysisresponseset (#1214) * Updating dnis numbers to fix unit tests (#1217) * Fixes DEVTOOLING-786 and DEVTOOLING-740 as well as other resources that could be impacted (#1212) * Fixes DEVTOOLING-786 as well as other resources that could be impacted * Fix issue with routing_settings and contact center/transaction * Bump hashicorp/setup-terraform from 3.1.1 to 3.1.2 (#1220) Bumps [hashicorp/setup-terraform](https://github.com/hashicorp/setup-terraform) from 3.1.1 to 3.1.2. - [Release notes](https://github.com/hashicorp/setup-terraform/releases) - [Changelog](https://github.com/hashicorp/setup-terraform/blob/main/CHANGELOG.md) - [Commits](https://github.com/hashicorp/setup-terraform/compare/v3.1.1...v3.1.2) --- updated-dependencies: - dependency-name: hashicorp/setup-terraform dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Ruleset and Skill Resource (#1218) * Update fix * No jira: Added `go fmt` to Go Checks workflow (#1222) * Added fmt workflow step to Go Checks * go fmt * DEVTOOLING-774: Checking uploadStatus before downloading prompt file during export (#1221) * Checking uploadStatus as well as mediaUri before downloading file during export * Cleaning up filename where no audio data was downloaded * Fixes DEVTOOLING-791 by passing in the error message so it can be picked up when checking to log errors (#1225) * bug/Devtooling 723 - exports filenames with spaces (#1223) * added regex to allow whitespaces * updated docs * Removing ConflictsWith attrs from email_route resource schema definition (#1226) * Bug/devtooling 615 - Consistency checker (#1219) * Changed tests * Fixed test * Changed mutex * Continued work * wrote unit tests * Made changes * Done thing * Rebased * Rewriting test * Continued work * Finshed work * Moving log * Fixed test * Devtooling-175: refactored location (#1224) * Refactored * Made requested changes * Fixed naming conventions * Feat/devtooling 654 Integration Instagram (#1202) * added files for instagram resource * added test cases for instagram * test cases and examples added * updated docs * updated docs * changed the schema descriptions * comments resolved * updated docs * removed forcenew flag * updated docs * added skip test case * commented the update test case * added only creation test case * added skip test case * added skip test case in data source * refactor/Devtooling-186: Routing Queue (#1213) * Moved Build and Flatten Functions to util file * Good Bit Done * vet fixes * 778 - required attributes to optional * Fixing test * generate * Made requested changes * Changes Made * Added unit test * updated docs * go mod tidy * Revert "Bug/devtooling 615 - Consistency checker (#1219)" (#1232) This reverts commit 63479ee92be11e044093c4b1ca5913490b0dbd49. * Bump github.com/hashicorp/hcl/v2 from 2.21.0 to 2.22.0 (#1231) Bumps [github.com/hashicorp/hcl/v2](https://github.com/hashicorp/hcl) from 2.21.0 to 2.22.0. - [Release notes](https://github.com/hashicorp/hcl/releases) - [Changelog](https://github.com/hashicorp/hcl/blob/main/CHANGELOG.md) - [Commits](https://github.com/hashicorp/hcl/compare/v2.21.0...v2.22.0) --- updated-dependencies: - dependency-name: github.com/hashicorp/hcl/v2 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Charlie Conneely * Fix docs issue with genesyscloud_routing_queue_outbound_email_address (#1230) * Revert "refactor/Devtooling-186: Routing Queue (#1213)" (#1234) This reverts commit a520fd9004ae3923e07b006b48796333a8de87bd. * Fix Standalone Line Numbers (#1233) * Bug/devtooling 751: Queue resource overwriting CGR and Outbound email address (#1241) * Started work * Fixed * Fixed routing email route test (#1239) * Bug/devtooling 804 (#1235) * added nil checks * reverted null check * DEVTOOLING-647 (#1228) * DEVTOOLING-743 (#1227) * refactor/DEVTOOLING-150 [auth_division] (#1237) * refactored * go fmt * requested changes * Bug/devtooling 642 (#1208) * Fix Export stuck issue with routing skills * Update Resource * Fix Pause Criteria (#1240) * No jira devcontainers (#1244) * NO-JIRA: Adding a new code space * NO-JIRA: Adding proper version * NO-JIRA: Adding proper version * NO-JIRA: Adding proper version * NO-JIRA: trying to set install terraform via feature * NO-JIRA: Adding the genesyscloud CLI * NO-JIRA: Adding the genesyscloud CLI * NO-JIRA: Adding archy * NO-JIRA: Adding archy * NO-JIRA: Adding a python script to generate environment * NO-JIRA: Adding new python code to generate shell * NO-JIRA: Removing unnecessary code * NO -JIRA: Adding in the generate_env.py * NO-JIRA: Refactored script locations * NO-JIRA: Refactored script locations * NO-JIRA: Removed the generative script * NO-JIRA: Finalizing changes * Bump golang.org/x/net from 0.28.0 to 0.29.0 (#1245) Bumps [golang.org/x/net](https://github.com/golang/net) from 0.28.0 to 0.29.0. - [Commits](https://github.com/golang/net/compare/v0.28.0...v0.29.0) --- updated-dependencies: - dependency-name: golang.org/x/net dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Fix acceptance tests (#1249) * fix tests * fix tests * fix tests * DEVTOOLING-769: Remove flow outcome & trunk tests as required API for testcase are not present * Fix testcases * Fix tests * Fix tests * resolve comments * fix architect testcase * Fix tests * fix testcase * Fix testcases --------- Co-authored-by: Monisha Padmavathi Ragavan * Bug/devtooling 752 Integration Credential Fix (#1242) * fix oath client issues * Remove unwanted proxy fns * review fixes * Deleting auth divisions from cache (#1252) * Fixing conditional group routing test (#1254) * division ref export (#1253) * Using : instead of = inside exported jsonencode objects (#1256) * added nil check (#1260) * DEVTOOLING-737 (#1251) * DEVTOOLING-737 * Code review comment addressed * Fixes DEVTOOLING-842 (#1259) * refactor/Devtooling-186: routing queue (#1238) * Moved Build and Flatten Functions to util file * Good Bit Done * vet fixes * 778 - required attributes to optional * Fixing test * generate * Made requested changes * Changes Made * Added unit test * updated docs * go mod tidy * undid breaking change * docs * resolved conflict * fmt * fixed conflicts * Fixed Tests * outbound email address failing test * Bug/devtooling 784 (#1262) * added delete functionality * initial changes * added proxy file * updated functions * added proxy functions * adding knowledge base entities * added util files * refactoring knowledge package * refactored addtl. resource to avoid cyclic dependency * registering knowledge packages * removed redundant comment * Add required permissions to PR Labeler (see https://github.com/TimonVS/pr-labeler-action?tab=readme-ov-file#usage ) (#1264) * Fixes devtooling-777 (#1258) * Fix docs issue with genesyscloud_routing_queue_outbound_email_address * Fix issue with exporting published scripts, and with cleaning up after attempting to publish an invalid script * Fix for go fmt * Comment tweak * Update Docs for dependency res (#1265) * Feature/devtooling 822 (#1266) * Update Docs for dependency res * Update export def * Updating CODEOWNERS (#1268) * Feat/devtooling 713 - genesyscloud_conversations_messaging_supportedcontent_default (#1263) * added supported content default resource * added exporter * comments resolved * Feat/devtooling 734 Outbound Digital RuleSet (#1250) * added files for outbound ruleset * fixes for imports * added test cases * added utility methods * added test functions * changes made for doNoSend Settings * changes in Utils * added test cases * updated docs * code cleanup and error messages updated * error message updated for data source * resolved comments * updated docs * Minor refactoring of auth division data source (#1270) * Fixes DEVTOOLING-851 and DEVTOOLING-848 for genesyscloud_telephony_providers_edges_site_outbound_route (#1261) * Adds a data resource for genesyscloud_telephony_providers_edges_site_outbound_route and unit tests * Add required permissions to PR Labeler (see https://github.com/TimonVS/pr-labeler-action?tab=readme-ov-file#usage ) * Refactor the telephony_providers_edges_site_outbound_route resource to require individual instances of the resource per route. Adds a data resource too. Updates the docs * Add handling for including site_id attribute on data resource * Feature toggle check recommendation as per PR comment * Fix caching issue * Fix issue from PR comment: remove item from cache after deleting * Fixed nil pointer error in contact_list_contact package (#1275) * Devtooling 839 (#1272) * Verify instancestate * Update genesyscloud * No jira: Implementing cache for auth divisions data source & removing Deprecation warnings (#1274) * Implemented cache for auth division data source * Removing deprecation warnings in queue docs * Fix linting errors in routing_queue package * Fix DEVTOOLING-855 - option for exporting computed values (#1273) * Add provider attribute to determine whether to export computed attributes or not * Set default to true to match existing behavior, with a note in the description * Make docs * HOT_FIX/Devtooling-862: Add ed a bypass on the inactive users once they reach 10K users (#1276) * Bug/devtooling 831 (#1269) * introduced contactListId and contactId for kv pair * added complex contact ID * removed redundant assignment * Bug/devtooling 615 - Consistency checker (#1246) * Changed tests * Fixed test * Changed mutex * Continued work * wrote unit tests * Made changes * Done thing * Rebased * Rewriting test * Continued work * Finshed work * Moving log * Fixed test * Updated consistency checker * Ignore length of computed nested blocks * Fixed consistency checkers ability to handle sets * Updated file output * fixed site tests * Ignoring consistency checker on exporter * Bump golang.org/x/net from 0.29.0 to 0.30.0 (#1280) Bumps [golang.org/x/net](https://github.com/golang/net) from 0.29.0 to 0.30.0. - [Commits](https://github.com/golang/net/compare/v0.29.0...v0.30.0) --- updated-dependencies: - dependency-name: golang.org/x/net dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * DEVTOOLING-868: Removing the V1 knowledge artifacts (#1278) * DEVTOOLING-868: Removing the V1 knowledge artifacts * DEVTOOLING-868: Removing the V1 knowledge artifacts * No jira: Improving the efficiency of a few data sources (#1281) * Fixed bugs in queues data source * Remove sleep * Using name and type filters in flows data source * make docs * Updated flows data source test * Small changes to routing skill data source * Small change to architect_flows proxy method * Revert "Bug/devtooling 615 - Consistency checker (#1246)" (#1282) This reverts commit 5ecf26e418ccca430845f9a3ad1d03bc367023d1. * DEVTOOLING-872: Added some nil pointer checks around user groups (#1284) * DEVTOOLING-860-Clean: Removed the reference to Id here. If there is no create because of an ID, the object will be Nil. (#1287) * No jira: ditching singleton pattern in a few packages to speed up execution of terraform commands (#1288) * Stopped using queues proxy singleton * Stopped using skill and skill groups proxy singleton * No longer using singleton proxy in datatable_rows * No more singleton in groups package * NO-JIRA: Modified the core HTTP provider to capture data in a JSON fo… (#1293) * NO=JIRA: Modified the core HTTP provider to capture data in a JSON format to make it easier to parse and do analysis on * NO-JIRA: Fixed code from Charlies feedback * Bump github.com/nyaruka/phonenumbers from 1.4.0 to 1.4.1 (#1298) Bumps [github.com/nyaruka/phonenumbers](https://github.com/nyaruka/phonenumbers) from 1.4.0 to 1.4.1. - [Release notes](https://github.com/nyaruka/phonenumbers/releases) - [Changelog](https://github.com/nyaruka/phonenumbers/blob/main/CHANGELOG.md) - [Commits](https://github.com/nyaruka/phonenumbers/compare/v1.4.0...v1.4.1) --- updated-dependencies: - dependency-name: github.com/nyaruka/phonenumbers dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Devtooling 843 remove log.fatalf (#1294) * NO=JIRA: Modified the core HTTP provider to capture data in a JSON format to make it easier to parse and do analysis on * DEVTOOLING-843: Cleaned up several places where we should not be using log.Fatal. This crashes the provider and does not allow for a clean shutdown of the provider * DEVTOOLING-843: Moved fmt.Printf to log.Printf * DEVTOOLING-843: Added charlie's code review comments * DEVTOOLING-883: Report to UTR (#1299) * fix tests * fix tests * fix tests * DEVTOOLING-769: Remove flow outcome & trunk tests as required API for testcase are not present * Fix testcases * Fix tests * Fix tests * resolve comments * fix architect testcase * Fix tests * fix testcase * Fix testcases * send results to UTR * add testResultToKnex to report to UTR * add testResultToKnex to report to UTR * testJobResultToTaneleer to UTR * add UTR for reporting --------- Co-authored-by: Monisha Padmavathi Ragavan * DEVTOOLING-859: Removed the country code validator from the address.country code field. The API does not enforce an 3.164 country code format (#1300) * Bug/devtooling 615 - Consistency Checker (#1292) * Changed tests * Fixed test * Changed mutex * Continued work * wrote unit tests * Made changes * Done thing * Rebased * Rewriting test * Continued work * Finshed work * Moving log * Fixed test * Updated consistency checker * Ignore length of computed nested blocks * Fixed consistency checkers ability to handle sets * Updated file output * fixed site tests * Ignoring consistency checker on exporter * Updated consistency checker * Fix/devtooling 840 (#1291) * Fix DEVTOOLING-840 * Docs * Cleanup unused function * PR requests * Updated platform SDK version v143 (#1304) * Devtooling 867 (#1297) * add hash attributes to export instance state * test case addition * update refactored code * modified the logic with a different approach * resolve the actual hash content * Revert "Bug/devtooling 615 - Consistency Checker (#1292)" (#1306) This reverts commit fc7b42ef6eab4f0035a3a0ba8dd87783a0a233c0. * Bug/devtooling 870 IDP_ADFS bug on data lookup (#1303) * issue fix for slo_binding attribute * added validation for slo_binding * Removed Validate Func --------- Co-authored-by: BrianMoyles * Removing description for idp_adfs.slo_binding (#1307) * Fixes #1301 (#1310) * Fix DEVTOOLING-894 (#1308) * [DEVTOOLING-854] - Added name and type to flow Export (#1302) * Added name and type to flow Export * go checks * Made Requested Changes * Fixed retention_media_policy test case (#1311) * DEVTOOLING-882: Put a check to make sure we dont get a nil pointer ex… (#1309) * DEVTOOLING-882: Put a check to make sure we dont get a nil pointer exception * DEVTOOLING-882-Fixed-Charlies-bug * code fix for DEVTOOLING-762 (#1305) * code fix for DEVTOOLING-762 * update test case to work on windows * document generated for new attribute addition * Fix DEVTOOLING-895 (#1313) * Update oauth_client's authorized_grant_type attribute to accept both SAML2BEARER and SAML2-BEARER values (the API allows both versions, but outputs as SAML2-BEARER in the API and export. It's important that the export be able to be reapplied right away, so this fix handles that). (#1315) * merge back from main to dev (#1318) * Fixed small bugs in outbound_contactlist_contact resource (#1317) * Fixed small bugs in ob_contacts resource * Making phone_number_status computed as well * NOJIRA - Fixes an issue where some data resources return more than just the name, and these can have dynamic references. The biggest offender of this is the genesyscloud_telephony_providers_edges_site_outbound_route data resource, which can have multiple routes named Default with different site ids (#1321) * UTR "teams" tag in double quotes (#1323) * fix tests * fix tests * fix tests * DEVTOOLING-769: Remove flow outcome & trunk tests as required API for testcase are not present * Fix testcases * Fix tests * Fix tests * resolve comments * fix architect testcase * Fix tests * fix testcase * Fix testcases * send results to UTR * add testResultToKnex to report to UTR * add testResultToKnex to report to UTR * testJobResultToTaneleer to UTR * add UTR for reporting * Modify to use double quotes --------- Co-authored-by: Monisha Padmavathi Ragavan * Devtooling 826 added the site id field (#1319) * DEVTOOLING-826: Added site * DEVTOOLING-826: Refactored code to fix test cases * DEVTOOLING-826: Refactoreed code * DEVTOOLING-826: Refactored and cleaned up the code * DEVTOOLING-826: Refactored and cleaned up the code * DEVTOOLING-826: Fixed the following code * DEVTOOLING-826: Fixed code based on Charlies comments * DEVTOOLING-826: Added new docs * Fixing incorrect resource name in knowledge_label example (#1326) * bug/DEVTOOLING-898 fix for media_types conversion (#1328) * fix for media_types conversion * comments resolved * Fixing IDP tests + adding missing fields to salesforce schema (#1332) * Fixing edgegroup test failures + minor refactoring (#1333) * No JIRA: Fixing obroute test cases (#1335) * Fixes #1337 (#1340) * Update SDK to v146 (#1331) * Updated SDK version * Go Checks * No jira: Updating to Go 1.23 (#1339) * Updating to go 1.23 * Updating go version in workflows * Updating a dependency * Bump golang.org/x/net from 0.30.0 to 0.31.0 (#1347) Bumps [golang.org/x/net](https://github.com/golang/net) from 0.30.0 to 0.31.0. - [Commits](https://github.com/golang/net/compare/v0.30.0...v0.31.0) --- updated-dependencies: - dependency-name: golang.org/x/net dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * DEVTOOLING-869: Added missing export config (#1342) * added 0 check for extension (#1346) * Fixes #1296 (#1343) * Update flow type schema def (#1348) * Fixes DEVTOOLING-906 (#1324) * Use go version 1.23 in test jobs (#1350) * fix tests * fix tests * fix tests * DEVTOOLING-769: Remove flow outcome & trunk tests as required API for testcase are not present * Fix testcases * Fix tests * Fix tests * resolve comments * fix architect testcase * Fix tests * fix testcase * Fix testcases * send results to UTR * add testResultToKnex to report to UTR * add testResultToKnex to report to UTR * testJobResultToTaneleer to UTR * add UTR for reporting * Modify to use double quotes * use go 1.23 --------- Co-authored-by: Monisha Padmavathi Ragavan * [DEVTOOLING-660] Gateway Configuration (#1344) * Added Gateway Config * Path_params * Go Checks * fmt * Fix DEVTOOLING-914 (#1336) * Fixes big O performance issue with resource name sanitizer function by wrapping it in an environmental feature flag due to change with hashing function * A couple of tweaks * Pull env var checks into feature toggles as per PR * Add transliteration for languages like Japan * Add tests for sanitizer * PR updates * Removing old package reference (#1349) * Fix DEVTOOLING-914 (#1336) * Fixes big O performance issue with resource name sanitizer function by wrapping it in an environmental feature flag due to change with hashing function * A couple of tweaks * Pull env var checks into feature toggles as per PR * Add transliteration for languages like Japan * Add tests for sanitizer * PR updates * Fix few issues and add logs for export (#1352) * DEVTOOLING-732: messagingcampaign - Making sms_config Optional and adding missing fields to schema (#1353) * Deleted leftover file * Adding dynamicContactQueueingSettings to messagingcampaign schema * Adding rule_set_ids to messagingcampaign resource * Fixed minor linting error * make docs * Defined utils and schema file for outbound package * Added emailConfig to messaging campaign schema * Added logic to parse all error details from failed messCampaign POST & PUT * Minor changes related to emailConfig block * Fixed mistake in resourcedata.go * Added unit tests for emailConfig build/flatten funcs * minor change * Bump github.com/nyaruka/phonenumbers from 1.4.1 to 1.4.2 (#1358) Bumps [github.com/nyaruka/phonenumbers](https://github.com/nyaruka/phonenumbers) from 1.4.1 to 1.4.2. - [Release notes](https://github.com/nyaruka/phonenumbers/releases) - [Changelog](https://github.com/nyaruka/phonenumbers/blob/main/CHANGELOG.md) - [Commits](https://github.com/nyaruka/phonenumbers/compare/v1.4.1...v1.4.2) --- updated-dependencies: - dependency-name: github.com/nyaruka/phonenumbers dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump github.com/hashicorp/hcl/v2 from 2.22.0 to 2.23.0 (#1359) Bumps [github.com/hashicorp/hcl/v2](https://github.com/hashicorp/hcl) from 2.22.0 to 2.23.0. - [Release notes](https://github.com/hashicorp/hcl/releases) - [Changelog](https://github.com/hashicorp/hcl/blob/main/CHANGELOG.md) - [Commits](https://github.com/hashicorp/hcl/compare/v2.22.0...v2.23.0) --- updated-dependencies: - dependency-name: github.com/hashicorp/hcl/v2 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * DEVTOOLING-750: Improving export speed for contact_lists and contact_lists_contacts resources (#1330) * Abandoning singleton pattern and increasing pageSize on contacts search * Implementing caching for contactlists & fixed linting errors * DEVTOOLING-927: Changing `conditional_group_routing_rules.groups` to TypeSet (#1361) * Fixed small linting error * Updating cgrr.groups to TypeSet * Updating devcontainer go version to 1.23 (#1362) * Fixed bugs in pagination logic across a few packages (#1329) * Parsing id for worktype status resource references (#1369) * Refactor variable names referring to resource/data labels for consistency (#1354) * Refactor the Exporter fields to more consistently use resourceLabel, resourceType, and BlockLabels * More renaming of variables for consistency sake * Correct resourceType references in exporter filter functions * Correct resourceType references in exporter filter functions * Correct a few other references * JM-1465 - add JourneyViews exporter and datasource (#1355) * JM-1465 * Test * Fix datasource * fix exporter * JM-1465 fix ds test * JM-1465 fix naming * JM-1465 fix tests * JM-1465 fix tests * JM-1465 fix ds tests * remove unwanted changes * Fix journeyview cache * rollback unwanted changes * get journey check cache * fix PR comments * fix retryable error * fix printf --------- Co-authored-by: Nicolas Bertrand * Updating devcontainer go version to 1.23 (#1362) * Fixed bugs in pagination logic across a few packages (#1329) * Refactor the Exporter fields to more consistently use resourceLabel, resourceType, and BlockLabels * More renaming of variables for consistency sake * Correct resourceType references in exporter filter functions * Correct resourceType references in exporter filter functions * Correct a few other references --------- Co-authored-by: llegouez <60443674+llegouez@users.noreply.github.com> Co-authored-by: Nicolas Bertrand Co-authored-by: Charlie Conneely Co-authored-by: Charlie Conneely <87772562+charliecon@users.noreply.github.com> * Fixed vet errors and ran go generate (#1372) * remove DELETED intended_state from integration_schema (#1363) * remove DELETED from intended_state * adjust format * adjust format * adjust format * go fmt (#1375) * Bug/devtooling 877 Airbnb - groupmembers division more than 50 with "*" issue (#1374) * removed maxitem limit from skillgroup * reverted the maxItems50 change * airbnb issue for skillgroup * added ValidateFunc for member_division_ids * removed commented code * fixed go vet errors (#1381) * [DEVTOOLING-849] API Limitation on Prompt Export (#1351) * Added Export Name Filter * Improved Export Name Filtering * Test Case * test * Requested Changes * Added Page Count Check * Made Requested Changes * Fixed Error * Add documentation regarding shared domain dictionary (#1376) * Feat/devtooling 651 - Integration Messaging Open (#1364) * added resource data files for integration open * updated docs * updated docs * updated pagesize for getall in proxy * comments resolved * comments resolved * updated docs * Feature/devtooling 836 (#1368) * pushing changes * changes made * renamed to keep uniformity * pushing changes * added names to caching and addressed other PR comments * pushing datasource changes * updated examples & documents * finalized changes * changing to optional * changing twitter attr back to required * changing to blocklabel * Bump github.com/stretchr/testify from 1.9.0 to 1.10.0 (#1387) Bumps [github.com/stretchr/testify](https://github.com/stretchr/testify) from 1.9.0 to 1.10.0. - [Release notes](https://github.com/stretchr/testify/releases) - [Commits](https://github.com/stretchr/testify/compare/v1.9.0...v1.10.0) --- updated-dependencies: - dependency-name: github.com/stretchr/testify dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * DEVTOOLING-924 pt2 - Refactor/exporter resource types (#1373) * Refactor the Exporter fields to more consistently use resourceLabel, resourceType, and BlockLabels * More renaming of variables for consistency sake * Correct resourceType references in exporter filter functions * Correct resourceType references in exporter filter functions * Correct a few other references * Fix BlockLabel for authentication_settings * Refactor resourceName to resourceType * Use 'resourcePath' instead of 'fullResourceName' for consistency with domain dictionary * Fix instances that reverted to previous usages * Fix failures * Fix inadvertent change to the name of the genesyscloud_outbound_attempt_limit resource * Bump github.com/hashicorp/terraform-plugin-docs from 0.19.4 to 0.20.1 (#1393) Bumps [github.com/hashicorp/terraform-plugin-docs](https://github.com/hashicorp/terraform-plugin-docs) from 0.19.4 to 0.20.1. - [Release notes](https://github.com/hashicorp/terraform-plugin-docs/releases) - [Changelog](https://github.com/hashicorp/terraform-plugin-docs/blob/main/CHANGELOG.md) - [Commits](https://github.com/hashicorp/terraform-plugin-docs/compare/v0.19.4...v0.20.1) --- updated-dependencies: - dependency-name: github.com/hashicorp/terraform-plugin-docs dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump github.com/zclconf/go-cty from 1.15.0 to 1.15.1 (#1394) Bumps [github.com/zclconf/go-cty](https://github.com/zclconf/go-cty) from 1.15.0 to 1.15.1. - [Release notes](https://github.com/zclconf/go-cty/releases) - [Changelog](https://github.com/zclconf/go-cty/blob/main/CHANGELOG.md) - [Commits](https://github.com/zclconf/go-cty/compare/v1.15.0...v1.15.1) --- updated-dependencies: - dependency-name: github.com/zclconf/go-cty dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * make docs (#1395) * Feat/devtooling 651 Issue fix for data_source failure (#1392) * added resource data files for integration open * updated docs * updated docs * updated pagesize for getall in proxy * comments resolved * comments resolved * updated docs * issue fix for datasource failure * Small update to schedulegroups example resource (#1396) * No jira: Adding missing field to dnc list resource (#1389) * Adding missing field to dncList resource * Fixed issue #1384 * Data source Race condition (#1390) * Fixing go vet error (#1397) * Bump github.com/nyaruka/phonenumbers from 1.4.2 to 1.4.3 (#1401) Bumps [github.com/nyaruka/phonenumbers](https://github.com/nyaruka/phonenumbers) from 1.4.2 to 1.4.3. - [Release notes](https://github.com/nyaruka/phonenumbers/releases) - [Changelog](https://github.com/nyaruka/phonenumbers/blob/main/CHANGELOG.md) - [Commits](https://github.com/nyaruka/phonenumbers/compare/v1.4.2...v1.4.3) --- updated-dependencies: - dependency-name: github.com/nyaruka/phonenumbers dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Charlie Conneely * feature/DEVTOOLING-163 (#1400) * feature/DEVTOOLING-163 * review comments addressed * the tf_export file update * Feature/devtooling 165 (#1408) * feature/DEVTOOLING-163 * review comments addressed * the tf_export file update * feature/DEVTOOLING-165 * Adding journey_action_template resource to provider in main.go (#1411) * cron schedule (#1406) * cron schedule * jenkins description during run * jenkins description during run * jenkins description during run * Bump golang.org/x/net from 0.31.0 to 0.32.0 (#1409) Bumps [golang.org/x/net](https://github.com/golang/net) from 0.31.0 to 0.32.0. - [Commits](https://github.com/golang/net/compare/v0.31.0...v0.32.0) --- updated-dependencies: - dependency-name: golang.org/x/net dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Charlie Conneely * Add Caching to resolve slow running exports for knowledge bases (#1402) * Add Caching to resolve slow running exports for knowledge bases * No-JIRA: Allow user to set number of times consistency checker runs (#1404) * Allow user to set number of times consistency checker runs * Added logs and updating README * Fixing errors * Refactor/devtooling 168 (#1403) * refactoring kbc * initial refactoring * updated proxy file * changed main.go * finished proxy * added getName func * added proxy to data source * pushing pr comments addressed * renamed consistency checker * Fix testcase (#1412) * Fixing dnc_list test (#1414) * Minor refactoring in externalcontacts_organization package (#1415) * No jira: fix attempt limit test (#1413) * Fixed incorrect ResourceType value + refactoring * Fixed linting errors * Fixing a few different test cases (#1416) * Fixing export test case (#1418) * Excluding external contacts organization resource from exporter (#1419) * Update go.mod (#1407) changed go 1.23 to 1.23.0 so make docs work on ubuntu 24 * Modify cron (#1421) * cron schedule * jenkins description during run * jenkins description during run * jenkins description during run * cron modify * Avoiding nil pointer dereference in exporter (#1423) * asking adam to test (#1427) * Enhance replaceDatasource setup (#1422) * Enhance replaceDatasource setup * Add Test Cases * OBR-135 Add business categories to wrap up code mappings (#1405) * Feature/devtooling 963 (#1424) * initial commit * changes for PR * updated docs * Fix default outbound routes by enabling updating the default outbound route during terraform create (#1426) * DEVTOOLING-852 added logs (#1429) * return nil on empty response (#1435) * Feat/cobrowse 2635 add enable draw to cobrowse (#1434) * Merging dev into main for v1.54.0 (#1417) * Merge unit tests & fix failing testcases (#1116) * run unit tests * run unit tests * add unit test * Fix failing tests * fix failed tests * Fix failing tests * Fix webdeployment testcases * Fix webdeployment testcases * Run remaining unit tests * Revert export changes * Fix export tests * Fix widget tests * Modify to delete list of didpool --------- Co-authored-by: Monisha Padmavathi Ragavan * onholdprompt attribute added along with test case (#1114) * refactor/Devtooling-190 [routing_utilization] + Devtooling-400 [routing_utilization_label] (#1105) * Refactored but waiting for cyclic dependency removal * refactor routing utilization label * Tidy up * Updated docs * fixing naming convention in tf_export * fixing user test * Requested changes * fixing merge conflicts * Refactored but waiting for cyclic dependency removal * refactor routing utilization label * Tidy up * Updated docs * fixing naming convention in tf_export * fixing user test * fixing merge * fixing docs * Made requested changes * changes * fixing tests * refactor/DEVTOOLING-158 idp_gsuite (#1099) * refactored idp_gsuite * removed references of data source * deleted unrefactored files * changed references * resolved comments * added name, slo_uri, slo_binding to idp_gsuite * Refactor/devtooling 160 idp_ping (#1102) * refactored idp_ping * updated docs * deleted unrefactored files * comments resolved * resolved conflicts * added name, slo_uri and slo_binding * Refactor/devtooling 157 - idp_generic (#1095) * refactoring of idp_generic * deleted original files * removed references of datasource * resolved comments * comments resolved * added slo_uri and slo_binding to idp_generic --------- Co-authored-by: dginty4 <108797778+dginty4@users.noreply.github.com> * Cleanup/Remove utilization label availability check / mentions of feature not being available (#1117) * Bug/devtooling 681 - New attributes for IDP (#1122) * Merge Dev to Main for Release v1.41.0 (#1118) * Bump golang.org/x/net from 0.22.0 to 0.23.0 (#951) Bumps [golang.org/x/net](https://github.com/golang/net) from 0.22.0 to 0.23.0. - [Commits](https://github.com/golang/net/compare/v0.22.0...v0.23.0) --- updated-dependencies: - dependency-name: golang.org/x/net dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Add team to custom resolver (#950) * Devtooling 432: Refactor Conditional Group Routing Rules into its own resource (#921) * Added routing_queue_conditional_group_routing resource * Rebased * Fixed routing queue tests * Removed accidental commits * Rebased and fixed errors * Made some requested changes * Added evaluated_queue_id * Added warning * Fixed some things * Fixed test * Fixing exporter * Fixed type * Changing target branch of dependabot PRs to dev (#956) * Fix User Resource Panics (#949) * moving changes (#964) * Reverting conditional group routing resoure (#965) * Remove use_supported_content_profile (#962) * bug/ DEVTOOLING-516: Allow Multiple inputs for BYMONTHDAY and BYMONTH (#953) * Allow Multiple inputs for BYMONTHDAY and BYMONTH * Update go.mod * Added Error Message to Validator * Bug/devtooling-530: Fixing panic during export caused by MemberGroupsResolver (#957) * Changing groups.owner_ids to optional and computed * Preventing panic inside MemberGroupsResolver with some refactoring * DEVTOOLING-417: Removed the go:generate git restore docs/index.md tag… (#946) * DEVTOOLING-417: Removed the go:generate git restore docs/index.md tag. This is pulling the index.md out of git hub and overriding what ever is being generated. * DEVTOOLING-417: Fixed a mispelling in a package alias * DEVTOOLING-417 Accidently added cache code * avoiding infinite loop in flow data source read (#966) * feat/Devtooling-448 oauth cred cache (#945) * DEVTOOLING-448: Initial commit of code * DEVTOOLING-448: Added caching while creating a Genesys Cloud OAuth Client specific so we dont have to force the user embed a secret * DEVTOOLING-448: Refactored retrieveCachedOauthClientSecret code * DEVTOOLING-448: Committing interm work * DEVTOOLING-448: Reworked how we handle the addition of roles for user credentials * DEVTOOLING-448: Removed the ToPtrStr function * Fixing go.mod and running go generate (#967) * feat/Devtooling-459: Added BuildAPIDiagnosticError function calls (#959) * added buildDiag function p1 * Adding call to BuildApiDiag * BuildAPIDiag functions added * Added util.BuildAPIDiag function to refactored resources * Added call to BuildAPIDiag in resources * Update go.mod * Fixed tests * Update go.mod * Added err * Added err * Update go.mod * Requested Changes * Fix for BotFlows dependencies (#961) * feat/Devtooling-531: Add proxy and cache to routing queue (#958) * Added cache to routing queue * Added proxy and caching to routing queue * Removed log * Add consistency checker back * Fix group cache * Fix Export cyclic deps (#968) * Added refactor label to pr-labeler-config * Feat/devtooling-499: Added getAll Functionality to ResponseManagement_ResponseAsset (#969) * adding getALl functionality * adding exporter * adding export * Added getAll functionality * Update go.mod * Added Caching * Added file_content_hash * Feat/devtooling-177: Refactored orgAuthorization_pairing (#975) * refactored orgauthorization_pairing * Added exporter for response management response asset * Added refactor label to pr-labeler-config * Feat/devtooling-499: Added getAll Functionality to ResponseManagement_ResponseAsset (#969) * adding getALl functionality * adding exporter * adding export * Added getAll functionality * Update go.mod * Added Caching * Added file_content_hash * Fixed test * using resource mutexes in init_test files & linting errors (#973) * Feature/devtooling 63 (#974) * Introduce new Elements * Update Attribs * Introduce scoring Method * Upgrade ssdk * remove unwanted logs * Feature/devtooling 63 (#978) * Fix exports * Feat/add flow log level resource (#948) * add code changes * add flow log level changes * testing commit * getting there, have a create test together * still trying to get a passing test * tests have passed! but getting the plan was not empty errors now * flow log level test * finally got tests passing * remove debug logging * rerun go generate * rerun go generate * apply suggestions from PR review * address PR review * remove characteristics * address PR comments * return total flow log levels when no more are found --------- Co-authored-by: dginty4 <108797778+dginty4@users.noreply.github.com> * NO-JIRA: Small Change to flow log level (#984) * Small Change to flow log level * Fixing typo * Merge hotfix changes on main into dev (#983) * moving changes (#960) * Revert "moving changes (#960)" (#963) This reverts commit 70d8a8036c52ae2f91aee081fe0d1c4c5451a58f. * Release Merge to Main (#977) * Bump golang.org/x/net from 0.22.0 to 0.23.0 (#951) Bumps [golang.org/x/net](https://github.com/golang/net) from 0.22.0 to 0.23.0. - [Commits](https://github.com/golang/net/compare/v0.22.0...v0.23.0) --- updated-dependencies: - dependency-name: golang.org/x/net dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Add team to custom resolver (#950) * Devtooling 432: Refactor Conditional Group Routing Rules into its own resource (#921) * Added routing_queue_conditional_group_routing resource * Rebased * Fixed routing queue tests * Removed accidental commits * Rebased and fixed errors * Made some requested changes * Added evaluated_queue_id * Added warning * Fixed some things * Fixed test * Fixing exporter * Fixed type * Changing target branch of dependabot PRs to dev (#956) * Fix User Resource Panics (#949) * moving changes (#964) * Reverting conditional group routing resoure (#965) * Remove use_supported_content_profile (#962) * bug/ DEVTOOLING-516: Allow Multiple inputs for BYMONTHDAY and BYMONTH (#953) * Allow Multiple inputs for BYMONTHDAY and BYMONTH * Update go.mod * Added Error Message to Validator * Bug/devtooling-530: Fixing panic during export caused by MemberGroupsResolver (#957) * Changing groups.owner_ids to optional and computed * Preventing panic inside MemberGroupsResolver with some refactoring * DEVTOOLING-417: Removed the go:generate git restore docs/index.md tag… (#946) * DEVTOOLING-417: Removed the go:generate git restore docs/index.md tag. This is pulling the index.md out of git hub and overriding what ever is being generated. * DEVTOOLING-417: Fixed a mispelling in a package alias * DEVTOOLING-417 Accidently added cache code * avoiding infinite loop in flow data source read (#966) * feat/Devtooling-448 oauth cred cache (#945) * DEVTOOLING-448: Initial commit of code * DEVTOOLING-448: Added caching while creating a Genesys Cloud OAuth Client specific so we dont have to force the user embed a secret * DEVTOOLING-448: Refactored retrieveCachedOauthClientSecret code * DEVTOOLING-448: Committing interm work * DEVTOOLING-448: Reworked how we handle the addition of roles for user credentials * DEVTOOLING-448: Removed the ToPtrStr function * Fixing go.mod and running go generate (#967) * feat/Devtooling-459: Added BuildAPIDiagnosticError function calls (#959) * added buildDiag function p1 * Adding call to BuildApiDiag * BuildAPIDiag functions added * Added util.BuildAPIDiag function to refactored resources * Added call to BuildAPIDiag in resources * Update go.mod * Fixed tests * Update go.mod * Added err * Added err * Update go.mod * Requested Changes * Fix for BotFlows dependencies (#961) * feat/Devtooling-531: Add proxy and cache to routing queue (#958) * Added cache to routing queue * Added proxy and caching to routing queue * Removed log * Add consistency checker back * Fix group cache * Fix Export cyclic deps (#968) * Added refactor label to pr-labeler-config * Feat/devtooling-499: Added getAll Functionality to ResponseManagement_ResponseAsset (#969) * adding getALl functionality * adding exporter * adding export * Added getAll functionality * Update go.mod * Added Caching * Added file_content_hash * Feat/devtooling-177: Refactored orgAuthorization_pairing (#975) * refactored orgauthorization_pairing * Added exporter for response management response asset * Added refactor label to pr-labeler-config * Feat/devtooling-499: Added getAll Functionality to ResponseManagement_ResponseAsset (#969) * adding getALl functionality * adding exporter * adding export * Added getAll functionality * Update go.mod * Added Caching * Added file_content_hash * Fixed test * using resource mutexes in init_test files & linting errors (#973) * Feature/devtooling 63 (#974) * Introduce new Elements * Update Attribs * Introduce scoring Method * Upgrade ssdk * remove unwanted logs * Feature/devtooling 63 (#978) * Fix exports --------- Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: dginty4 <108797778+dginty4@users.noreply.github.com> Co-authored-by: Charlie Conneely <87772562+charliecon@users.noreply.github.com> Co-authored-by: kavinbalagen <150852268+kavinbalagen@users.noreply.github.com> Co-authored-by: Brian Moyles <157126600+BrianMoyles@users.noreply.github.com> Co-authored-by: carnellj-genesys <109529583+carnellj-genesys@users.noreply.github.com> Co-authored-by: BrianMoyles * Fix Exporter for non-flow resources (#982) * Fix Exporter for non-flow resources * Added check (#981) --------- Signed-off-by: dependabot[bot] Co-authored-by: kavinbalagen <150852268+kavinbalagen@users.noreply.github.com> Co-authored-by: HemanthDogiparthi12 <127493303+HemanthDogiparthi12@users.noreply.github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: dginty4 <108797778+dginty4@users.noreply.github.com> Co-authored-by: Brian Moyles <157126600+BrianMoyles@users.noreply.github.com> Co-authored-by: carnellj-genesys <109529583+carnellj-genesys@users.noreply.github.com> Co-authored-by: BrianMoyles * Bump github.com/hashicorp/terraform-plugin-docs from 0.18.0 to 0.19.1 (#992) * Bump github.com/hashicorp/terraform-plugin-docs from 0.18.0 to 0.19.1 Bumps [github.com/hashicorp/terraform-plugin-docs](https://github.com/hashicorp/terraform-plugin-docs) from 0.18.0 to 0.19.1. - [Release notes](https://github.com/hashicorp/terraform-plugin-docs/releases) - [Changelog](https://github.com/hashicorp/terraform-plugin-docs/blob/main/CHANGELOG.md) - [Commits](https://github.com/hashicorp/terraform-plugin-docs/compare/v0.18.0...v0.19.1) --- updated-dependencies: - dependency-name: github.com/hashicorp/terraform-plugin-docs dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] * rerunning go generate after tf-docs package upgrade --------- Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Charlie Conneely * Devtooling 432: Conditonal Group Routing (#970) * Added routing_queue_conditional_group_routing resource * Rebased * Removed accidental commits * Rebased and fixed errors * Made some requested changes * Added evaluated_queue_id * Added warning * Fixed some things * Fixed test * Fixing exporter * Added CGR and toggle * Fixed some errors * Added queue proxy to CGR * Added toggle to get all * Made some changes * Added CGR toggle package * Moved CGR toggle package * Ran linter * Checking queue id in tests * Small change * bug/Devtooling-458: media retention policy creation failing with error on time interval (#980) * added checks * Checks for time interval attributes * Fixing TimeInterval * Added BuildFunc for timeInterval * Added returned errors for invalid time Interval * Fixed buildFunctions * Generate Docs * Fixed exporter * Getting rid of go vet warning about copying a lock value to a variable (#991) * No jira: util function for getting cursor value from next uri (#990) * moving changes (#960) * Revert "moving changes (#960)" (#963) This reverts commit 70d8a8036c52ae2f91aee081fe0d1c4c5451a58f. * Release Merge to Main (#977) * Bump golang.org/x/net from 0.22.0 to 0.23.0 (#951) Bumps [golang.org/x/net](https://github.com/golang/net) from 0.22.0 to 0.23.0. - [Commits](https://github.com/golang/net/compare/v0.22.0...v0.23.0) --- updated-dependencies: - dependency-name: golang.org/x/net dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Add team to custom resolver (#950) * Devtooling 432: Refactor Conditional Group Routing Rules into its own resource (#921) * Added routing_queue_conditional_group_routing resource * Rebased * Fixed routing queue tests * Removed accidental commits * Rebased and fixed errors * Made some requested changes * Added evaluated_queue_id * Added warning * Fixed some things * Fixed test * Fixing exporter * Fixed type * Changing target branch of dependabot PRs to dev (#956) * Fix User Resource Panics (#949) * moving changes (#964) * Reverting conditional group routing resoure (#965) * Remove use_supported_content_profile (#962) * bug/ DEVTOOLING-516: Allow Multiple inputs for BYMONTHDAY and BYMONTH (#953) * Allow Multiple inputs for BYMONTHDAY and BYMONTH * Update go.mod * Added Error Message to Validator * Bug/devtooling-530: Fixing panic during export caused by MemberGroupsResolver (#957) * Changing groups.owner_ids to optional and computed * Preventing panic inside MemberGroupsResolver with some refactoring * DEVTOOLING-417: Removed the go:generate git restore docs/index.md tag… (#946) * DEVTOOLING-417: Removed the go:generate git restore docs/index.md tag. This is pulling the index.md out of git hub and overriding what ever is being generated. * DEVTOOLING-417: Fixed a mispelling in a package alias * DEVTOOLING-417 Accidently added cache code * avoiding infinite loop in flow data source read (#966) * feat/Devtooling-448 oauth cred cache (#945) * DEVTOOLING-448: Initial commit of code * DEVTOOLING-448: Added caching while creating a Genesys Cloud OAuth Client specific so we dont have to force the user embed a secret * DEVTOOLING-448: Refactored retrieveCachedOauthClientSecret code * DEVTOOLING-448: Committing interm work * DEVTOOLING-448: Reworked how we handle the addition of roles for user credentials * DEVTOOLING-448: Removed the ToPtrStr function * Fixing go.mod and running go generate (#967) * feat/Devtooling-459: Added BuildAPIDiagnosticError function calls (#959) * added buildDiag function p1 * Adding call to BuildApiDiag * BuildAPIDiag functions added * Added util.BuildAPIDiag function to refactored resources * Added call to BuildAPIDiag in resources * Update go.mod * Fixed tests * Update go.mod * Added err * Added err * Update go.mod * Requested Changes * Fix for BotFlows dependencies (#961) * feat/Devtooling-531: Add proxy and cache to routing queue (#958) * Added cache to routing queue * Added proxy and caching to routing queue * Removed log * Add consistency checker back * Fix group cache * Fix Export cyclic deps (#968) * Added refactor label to pr-labeler-config * Feat/devtooling-499: Added getAll Functionality to ResponseManagement_ResponseAsset (#969) * adding getALl functionality * adding exporter * adding export * Added getAll functionality * Update go.mod * Added Caching * Added file_content_hash * Feat/devtooling-177: Refactored orgAuthorization_pairing (#975) * refactored orgauthorization_pairing * Added exporter for response management response asset * Added refactor label to pr-labeler-config * Feat/devtooling-499: Added getAll Functionality to ResponseManagement_ResponseAsset (#969) * adding getALl functionality * adding exporter * adding export * Added getAll functionality * Update go.mod * Added Caching * Added file_content_hash * Fixed test * using resource mutexes in init_test files & linting errors (#973) * Feature/devtooling 63 (#974) * Introduce new Elements * Update Attribs * Introduce scoring Method * Upgrade ssdk * remove unwanted logs * Feature/devtooling 63 (#978) * Fix exports --------- Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: dginty4 <108797778+dginty4@users.noreply.github.com> Co-authored-by: Charlie Conneely <87772562+charliecon@users.noreply.github.com> Co-authored-by: kavinbalagen <150852268+kavinbalagen@users.noreply.github.com> Co-authored-by: Brian Moyles <157126600+BrianMoyles@users.noreply.github.com> Co-authored-by: carnellj-genesys <109529583+carnellj-genesys@users.noreply.github.com> Co-authored-by: BrianMoyles * Fix Exporter for non-flow resources (#982) * Fix Exporter for non-flow resources * Added check (#981) * Made function for parsing cursor from next uri --------- Signed-off-by: dependabot[bot] Co-authored-by: kavinbalagen <150852268+kavinbalagen@users.noreply.github.com> Co-authored-by: HemanthDogiparthi12 <127493303+HemanthDogiparthi12@users.noreply.github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: dginty4 <108797778+dginty4@users.noreply.github.com> Co-authored-by: Brian Moyles <157126600+BrianMoyles@users.noreply.github.com> Co-authored-by: carnellj-genesys <109529583+carnellj-genesys@users.noreply.github.com> Co-authored-by: BrianMoyles * Fix acceptance tests (#979) * fix acceptance test fix test fix test fix test fix test fix tests fix tests fix tests fix tests fix tests fix test fix tests fix tests fix tests fix tests fix tests fix tests fix tests fix tests fix tests fix tests fix tests fix tests fix tests fix tests fix tests fix tests fix tests fix tests fix tests fix tests fix tests fix tests fix tests fix tests fix tests fix tests fix tests fix tests fix tests fix tests fix tests fix tests fix tests fix tests fix tests fix tests fix tests fix tests fix tests fix tests fix tests fix tests fix tests fix tests fix tests fix tests fix tests fix tests fix tests fix tests fix tests fix tests fix tests fix tests fix tests fix tests fix tests fix tests fix tests fix tests fix tests fix tests fix tests fix tests fix tests fix tests fix tests fix tests fix tests fix routing test fix routing test fix routing test fix routing test fix routing test fix routing test fix routing test fix routing test fix tests fix tests restore files fix team test * fix comments * fix tests fix tests fix tests fix tests fix tests fix tests * fix tests fix tests fix tests fix tests fix tests fix tests fix tests fix tests fix tests fix tests fix tests fix tests fix tests fix tests fix tests fix tests fix tests fix tests * fix tests fix tests fix tests * fix tests * fix conditional routing test fix conditional routing test --------- Co-authored-by: Monisha Padmavathi Ragavan * Bump hashicorp/setup-terraform from 3.0.0 to 3.1.0 (#995) Bumps [hashicorp/setup-terraform](https://github.com/hashicorp/setup-terraform) from 3.0.0 to 3.1.0. - [Release notes](https://github.com/hashicorp/setup-terraform/releases) - [Changelog](https://github.com/hashicorp/setup-terraform/blob/main/CHANGELOG.md) - [Commits](https://github.com/hashicorp/setup-terraform/compare/v3.0.0...v3.1.0) --- updated-dependencies: - dependency-name: hashicorp/setup-terraform dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Improvise exclude attributes to Regex (#988) * Fix Media call back Read Attributes (#987) * DEVTOOLING-445: User Roles not returning duplicate roles (#989) * NO-JIRA-Upgrading-Go-SDK * Fixed errors * Fixed conditional group routing * Fixed some tests * feat/Devtooling 496: Routing queue Outbound email address independent resource (#954) * Added routing_queue_conditional_group_routing resource * Rebased * Removed accidental commits * Rebased and fixed errors * Added evaluated_queue_id * Fixed some things * Added CGR and toggle * Made some changes * Added CGR toggle package * Moved CGR toggle package * Feature/devtooling 63 (#974) * Introduce new Elements * Update Attribs * Introduce scoring Method * Upgrade ssdk * remove unwanted logs * Routing queue outbound email address package * Made changes * Added tests * Added more to test * Fixed test * Finished resource * Finished resource * Made some requested changes * Added feature toggle stuff * Added feature toggle * Made changes * Fixing change in queue exporter --------- Co-authored-by: HemanthDogiparthi12 <127493303+HemanthDogiparthi12@users.noreply.github.com> * bug/devtooling-498: [CX as Code] genesyscloud_outbound_settings export contains only null data (#996) * Fixing null export * Fixing Test * Added check for export * Added attribute and fixed test * Removed Computed attribute * Added check for reschedule_time_zone_skipped_contacts in test * Update Export Guide (#971) * update export uide * update tf_export.md and resource.tf * cross check resource.tf and schema, add missing attributes * update * update export.md.tmp * Removed duplicate paragraph and ran go generate --------- Co-authored-by: Charlie Conneely * NO-JIRA: Fixing dev (#1000) * Fixing dev * Fixes some errors * Fixing flow outcome description (#998) * Devtooling 561 - Members not being added correctly to teams (#1001) * Fixed bug * Fixed problem deleting members * Removed print * Fix Version Problem in WebDeployments (#997) * Fix Version Problem in WebDeployments * Add test cases * Fix review comments * no jira: Fixing merge conflicts on dev branch (#1009) * moving changes (#960) * Revert "moving changes (#960)" (#963) This reverts commit 70d8a8036c52ae2f91aee081fe0d1c4c5451a58f. * Release Merge to Main (#977) * Bump golang.org/x/net from 0.22.0 to 0.23.0 (#951) Bumps [golang.org/x/net](https://github.com/golang/net) from 0.22.0 to 0.23.0. - [Commits](https://github.com/golang/net/compare/v0.22.0...v0.23.0) --- updated-dependencies: - dependency-name: golang.org/x/net dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Add team to custom resolver (#950) * Devtooling 432: Refactor Conditional Group Routing Rules into its own resource (#921) * Added routing_queue_conditional_group_routing resource * Rebased * Fixed routing queue tests * Removed accidental commits * Rebased and fixed errors * Made some requested changes * Added evaluated_queue_id * Added warning * Fixed some things * Fixed test * Fixing exporter * Fixed type * Changing target branch of dependabot PRs to dev (#956) * Fix User Resource Panics (#949) * moving changes (#964) * Reverting conditional group routing resoure (#965) * Remove use_supported_content_profile (#962) * bug/ DEVTOOLING-516: Allow Multiple inputs for BYMONTHDAY and BYMONTH (#953) * Allow Multiple inputs for BYMONTHDAY and BYMONTH * Update go.mod * Added Error Message to Validator * Bug/devtooling-530: Fixing panic during export caused by MemberGroupsResolver (#957) * Changing groups.owner_ids to optional and computed * Preventing panic inside MemberGroupsResolver with some refactoring * DEVTOOLING-417: Removed the go:generate git restore docs/index.md tag… (#946) * DEVTOOLING-417: Removed the go:generate git restore docs/index.md tag. This is pulling the index.md out of git hub and overriding what ever is being generated. * DEVTOOLING-417: Fixed a mispelling in a package alias * DEVTOOLING-417 Accidently added cache code * avoiding infinite loop in flow data source read (#966) * feat/Devtooling-448 oauth cred cache (#945) * DEVTOOLING-448: Initial commit of code * DEVTOOLING-448: Added caching while creating a Genesys Cloud OAuth Client specific so we dont have to force the user embed a secret * DEVTOOLING-448: Refactored retrieveCachedOauthClientSecret code * DEVTOOLING-448: Committing interm work * DEVTOOLING-448: Reworked how we handle the addition of roles for user credentials * DEVTOOLING-448: Removed the ToPtrStr function * Fixing go.mod and running go generate (#967) * feat/Devtooling-459: Added BuildAPIDiagnosticError function calls (#959) * added buildDiag function p1 * Adding call to BuildApiDiag * BuildAPIDiag functions added * Added util.BuildAPIDiag function to refactored resources * Added call to BuildAPIDiag in resources * Update go.mod * Fixed tests * Update go.mod * Added err * Added err * Update go.mod * Requested Changes * Fix for BotFlows dependencies (#961) * feat/Devtooling-531: Add proxy and cache to routing queue (#958) * Added cache to routing queue * Added proxy and caching to routing queue * Removed log * Add consistency checker back * Fix group cache * Fix Export cyclic deps (#968) * Added refactor label to pr-labeler-config * Feat/devtooling-499: Added getAll Functionality to ResponseManagement_ResponseAsset (#969) * adding getALl functionality * adding exporter * adding export * Added getAll functionality * Update go.mod * Added Caching * Added file_content_hash * Feat/devtooling-177: Refactored orgAuthorization_pairing (#975) * refactored orgauthorization_pairing * Added exporter for response management response asset * Added refactor label to pr-labeler-config * Feat/devtooling-499: Added getAll Functionality to ResponseManagement_ResponseAsset (#969) * adding getALl functionality * adding exporter * adding export * Added getAll functionality * Update go.mod * Added Caching * Added file_content_hash * Fixed test * using resource mutexes in init_test files & linting errors (#973) * Feature/devtooling 63 (#974) * Introduce new Elements * Update Attribs * Introduce scoring Method * Upgrade ssdk * remove unwanted logs * Feature/devtooling 63 (#978) * Fix exports --------- Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: dginty4 <108797778+dginty4@users.noreply.github.com> Co-authored-by: Charlie Conneely <87772562+charliecon@users.noreply.github.com> Co-authored-by: kavinbalagen <150852268+kavinbalagen@users.noreply.github.com> Co-authored-by: Brian Moyles <157126600+BrianMoyles@users.noreply.github.com> Co-authored-by: carnellj-genesys <109529583+carnellj-genesys@users.noreply.github.com> Co-authored-by: BrianMoyles * Fix Exporter for non-flow resources (#982) * Fix Exporter for non-flow resources * Added check (#981) --------- Signed-off-by: dependabot[bot] Co-authored-by: kavinbalagen <150852268+kavinbalagen@users.noreply.github.com> Co-authored-by: HemanthDogiparthi12 <127493303+HemanthDogiparthi12@users.noreply.github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: dginty4 <108797778+dginty4@users.noreply.github.com> Co-authored-by: Brian Moyles <157126600+BrianMoyles@users.noreply.github.com> Co-authored-by: carnellj-genesys <109529583+carnellj-genesys@users.noreply.github.com> Co-authored-by: BrianMoyles * Bump github.com/hashicorp/terraform-plugin-docs from 0.19.1 to 0.19.2 (#1008) * Bump github.com/hashicorp/terraform-plugin-docs from 0.19.1 to 0.19.2 Bumps [github.com/hashicorp/terraform-plugin-docs](https://github.com/hashicorp/terraform-plugin-docs) from 0.19.1 to 0.19.2. - [Release notes](https://github.com/hashicorp/terraform-plugin-docs/releases) - [Changelog](https://github.com/hashicorp/terraform-plugin-docs/blob/main/CHANGELOG.md) - [Commits](https://github.com/hashicorp/terraform-plugin-docs/compare/v0.19.1...v0.19.2) --- updated-dependencies: - dependency-name: github.com/hashicorp/terraform-plugin-docs dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] * ran go generate --------- Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Charlie Conneely * DEVTOOLING-352 - provider oauth credential rate limit exceeded (#1004) * Testing something * Adding retry * Fixed retry * Moved functionality to retries package * Fixed inport cycle * Extending sleep * Added retry to AuthorizeSdk * Using with retries * Remving old function * Feat/devtooling 461 - WithRetries errors include improved logging (#1012) * calling diag func * Changed retryable functions to call Diagnostic function * Converted all withRetries errors to have improved wrapper * Made requested Changes * fixing unit test * Bump golang.org/x/net from 0.23.0 to 0.25.0 (#1017) Bumps [golang.org/x/net](https://github.com/golang/net) from 0.23.0 to 0.25.0. - [Commits](https://github.com/golang/net/compare/v0.23.0...v0.25.0) --- updated-dependencies: - dependency-name: golang.org/x/net dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Fix for issue 993 : Changed message_column to optional and add verification logic (#1013) * Changed message_column to optional and add verification logic * applied safer nil value handling * go generate (#1018) * bug/devtooling 560 - Nil error in telephony_providers_edges_phone (#1015) * Removed Print Statement that throws Nil error and added random id to test to prevent failing * golint changes made * Revert "bug/devtooling 560 - Nil error in telephony_providers_edges_phone (#1…" (#1019) This reverts commit 3ff66d472071905b18b4f66f6ee4b3d3725600e7. * bug/devtooling 560 - CX as Code crash when creating phones (#1020) * Removed Print Statement that throws Nil error and added random id to test to prevent failing * golint changes made * Made requested Change * feat/devtooling 579 - Improved Logging for Non-API errors (#1021) * Adding improved non-api diag errors * Pulling Merged PR * Added improved error * Added more logging * Ran go vet * Updated docs * Bump hashicorp/setup-terraform from 3.1.0 to 3.1.1 (#1024) Bumps [hashicorp/setup-terraform](https://github.com/hashicorp/setup-terraform) from 3.1.0 to 3.1.1. - [Release notes](https://github.com/hashicorp/setup-terraform/releases) - [Changelog](https://github.com/hashicorp/setup-terraform/blob/main/CHANGELOG.md) - [Commits](https://github.com/hashicorp/setup-terraform/compare/v3.1.0...v3.1.1) --- updated-dependencies: - dependency-name: hashicorp/setup-terraform dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * bug/devtooling 362 - Evaluation forms incorrectly assigning published attribute (#1022) * Correctly sets published feature * Added functionality to set published field correctly * Fixed docs * Bug/devtooling 444: Custom resolver function for outbound campaign script_id (#1014) * Resolving campaign script_id to default outbound script data source when appropriate * Created constants package * editing scripts proxy so that the datasource catches Default scripts * Finished writing tests for new campaign field custom resolver * Fixed linting errors in campaigns package * implemented caching for campaigns exporter * minor changes to a comment * Add deleteCacheItem func + some refactoring work * Refactoring call to resolveToDataSource function and added unit test * Fixing script data source test * Bump github.com/nyaruka/phonenumbers from 1.3.4 to 1.3.5 (#1026) Bumps [github.com/nyaruka/phonenumbers](https://github.com/nyaruka/phonenumbers) from 1.3.4 to 1.3.5. - [Release notes](https://github.com/nyaruka/phonenumbers/releases) - [Changelog](https://github.com/nyaruka/phonenumbers/blob/main/CHANGELOG.md) - [Commits](https://github.com/nyaruka/phonenumbers/compare/v1.3.4...v1.3.5) --- updated-dependencies: - dependency-name: github.com/nyaruka/phonenumbers dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Devtooling-162: Refactored idp salesforce (#999) * Refactored idp salesforce * Fixing docs * Changed function name * Removed original file * Changed Build Function Call to fix type difference (#1029) * fixing test for published attribute (#1030) * No jira: fixing up a few acceptance tests (#1031) * fixed journey segment update * Adding check to journey segment tests to validate is feature is supported * preventing panic in export helper function * Adding sleep to milestone data source test * Cleaning up fmt.Print statements appearing in export tests * undoing changes to segment resource file * Fix routing queue (#1028) * README update (#1025) * Pre-verify if the tfState is in sync with the exporter (#1027) * Add state comapartors * Upddate review comments * Devtooling-591: Consistency Checker Refactor (#1032) * Moved where consistency checker is created in resources * Cleaned up consitency checker file * Added resource name to message * Conditionally adding name * Made requested changes * Feature/devtooling 589 1 (#1035) * update doc * fix reviews * Fix acceptance tests - TCA and Prod (#1033) * Fix edge,export,script test,Jenkin to run tca&prod * Fix export & integration tests * Fix auth tests Fix auth tests * fix tests * resolve conflicts * move assignregion func, remove commented function modify to return empty string - assignregion func return default region --------- Co-authored-by: Monisha Padmavathi Ragavan * Bug/devtooling 597 - Routing email route test failing (#1039) * Added call to cleanup function * linter * adding hotfix to pr labeler config file (#1042) * bug/DEVTOOLING-436 - Added cleanup function for webdeployments resources (#1038) * Added cleanup function for webdeployments resources * fixing conflict * Made requested changes * Made requested changes * Bump github.com/hashicorp/terraform-plugin-sdk/v2 from 2.33.0 to 2.34.0 (#1047) Bumps [github.com/hashicorp/terraform-plugin-sdk/v2](https://github.com/hashicorp/terraform-plugin-sdk) from 2.33.0 to 2.34.0. - [Release notes](https://github.com/hashicorp/terraform-plugin-sdk/releases) - [Changelog](https://github.com/hashicorp/terraform-plugin-sdk/blob/main/CHANGELOG.md) - [Commits](https://github.com/hashicorp/terraform-plugin-sdk/compare/v2.33.0...v2.34.0) --- updated-dependencies: - dependency-name: github.com/hashicorp/terraform-plugin-sdk/v2 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bug/devtooling 287 temp disable cchecker (#1037) * removed consistency checker * changed DID number * phoneUpdated * Merging dev to main for v1.38.0 (#1036) * Bump golang.org/x/net from 0.22.0 to 0.23.0 (#951) Bumps [golang.org/x/net](https://github.com/golang/net) from 0.22.0 to 0.23.0. - [Commits](https://github.com/golang/net/compare/v0.22.0...v0.23.0) --- updated-dependencies: - dependency-name: golang.org/x/net dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Add team to custom resolver (#950) * Devtooling 432: Refactor Conditional Group Routing Rules into its own resource (#921) * Added routing_queue_conditional_group_routing resource * Rebased * Fixed routing queue tests * Removed accidental commits * Rebased and fixed errors * Made some requested changes * Added evaluated_queue_id * Added warning * Fixed some things * Fixed test * Fixing exporter * Fixed type * Changing target branch of dependabot PRs to dev (#956) * Fix User Resource Panics (#949) * moving changes (#964) * Reverting conditional group routing resoure (#965) * Remove use_supported_content_profile (#962) * bug/ DEVTOOLING-516: Allow Multiple inputs for BYMONTHDAY and BYMONTH (#953) * Allow Multiple inputs for BYMONTHDAY and BYMONTH * Update go.mod * Added Error Message to Validator * Bug/devtooling-530: Fixing panic during export caused by MemberGroupsResolver (#957) * Changing groups.owner_ids to optional and computed * Preventing panic inside MemberGroupsResolver with some refactoring * DEVTOOLING-417: Removed the go:generate git restore docs/index.md tag… (#946) * DEVTOOLING-417: Removed the go:generate git restore docs/index.md tag. This is pulling the index.md out of git hub and overriding what ever is being generated. * DEVTOOLING-417: Fixed a mispelling in a package alias * DEVTOOLING-417 Accidently added cache code * avoiding infinite loop in flow data source read (#966) * feat/Devtooling-448 oauth cred cache (#945) * DEVTOOLING-448: Initial commit of code * DEVTOOLING-448: Added caching while creating a Genesys Cloud OAuth Client specific so we dont have to force the user embed a secret * DEVTOOLING-448: Refactored retrieveCachedOauthClientSecret code * DEVTOOLING-448: Committing interm work * DEVTOOLING-448: Reworked how we handle the addition of roles for user credentials * DEVTOOLING-448: Removed the ToPtrStr function * Fixing go.mod and running go generate (#967) * feat/Devtooling-459: Added BuildAPIDiagnosticError function calls (#959) * added buildDiag function p1 * Adding call to BuildApiDiag * BuildAPIDiag functions added * Added util.BuildAPIDiag function to refactored resources * Added call to BuildAPIDiag in resources * Update go.mod * Fixed tests * Update go.mod * Added err * Added err * Update go.mod * Requested Changes * Fix for BotFlows dependencies (#961) * feat/Devtooling-531: Add proxy and cache to routing queue (#958) * Added cache to routing queue * Added proxy and caching to routing queue * Removed log * Add consistency checker back * Fix group cache * Fix Export cyclic deps (#968) * Added refactor label to pr-labeler-config * Feat/devtooling-499: Added getAll Functionality to ResponseManagement_ResponseAsset (#969) * adding getALl functionality * adding exporter * adding export * Added getAll functionality * Update go.mod * Added Caching * Added file_content_hash * Feat/devtooling-177: Refactored orgAuthorization_pairing (#975) * refactored orgauthorization_pairing * Added exporter for response management response asset * Added refactor label to pr-labeler-config * Feat/devtooling-499: Added getAll Functionality to ResponseManagement_ResponseAsset (#969) * adding getALl functionality * adding exporter * adding export * Added getAll functionality * Update go.mod * Added Caching * Added file_content_hash * Fixed test * using resource mutexes in init_test files & linting errors (#973) * Feature/devtooling 63 (#974) * Introduce new Elements * Update Attribs * Introduce scoring Method * Upgrade ssdk * remove unwanted logs * Feature/devtooling 63 (#978) * Fix exports * Feat/add flow log level resource (#948) * add code changes * add flow log level changes * testing commit * getting there, have a create test together * still trying to get a passing test * tests have passed! but getting the plan was not empty errors now * flow log level test * finally got tests passing * remove debug logging * rerun go generate * rerun go generate * apply suggestions from PR review * address PR review * remove characteristics * address PR comments * return total flow log levels when no more are found --------- Co-authored-by: dginty4 <108797778+dginty4@users.noreply.github.com> * NO-JIRA: Small Change to flow log level (#984) * Small Change to flow log level * Fixing typo * Merge hotfix changes on main into dev (#983) * moving changes (#960) * Revert "moving changes (#960)" (#963) This reverts commit 70d8a8036c52ae2f91aee081fe0d1c4c5451a58f. * Release Merge to Main (#977) * Bump golang.org/x/net from 0.22.0 to 0.23.0 (#951) Bumps [golang.org/x/net](https://github.com/golang/net) from 0.22.0 to 0.23.0. - [Commits](https://github.com/golang/net/compare/v0.22.0...v0.23.0) --- updated-dependencies: - dependency-name: golang.org/x/net dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Add team to custom resolver (#950) * Devtooling 432: Refactor Conditional Group Routing Rules into its own resource (#921) * Added routing_queue_conditional_group_routing resource * Rebased * Fixed routing queue tests * Removed accidental commits * Rebased and fixed errors * Made some requested changes * Added evaluated_queue_id * Added warning * Fixed some things * Fixed test * Fixing exporter * Fixed type * Changing target branch of dependabot PRs to dev (#956) * Fix User Resource Panics (#949) * moving changes (#964) * Reverting conditional group routing resoure (#965) * Remove use_supported_content_profile (#962) * bug/ DEVTOOLING-516: Allow Multiple inputs for BYMONTHDAY and BYMONTH (#953) * Allow Multiple inputs for BYMONTHDAY and BYMONTH * Update go.mod * Added Error Message to Validator * Bug/devtooling-530: Fixing panic during export caused by MemberGroupsResolver (#957) * Changing groups.owner_ids to optional and computed * Preventing panic inside MemberGroupsResolver with some refactoring * DEVTOOLING-417: Removed the go:generate git restore docs/index.md tag… (#946) * DEVTOOLING-417: Removed the go:generate git restore docs/index.md tag. This is pulling the index.md out of git hub and overriding what ever is being generated. * DEVTOOLING-417: Fixed a mispelling in a package alias * DEVTOOLING-417 Accidently added cache code * avoiding infinite loop in flow data source read (#966) * feat/Devtooling-448 oauth cred cache (#945) * DEVTOOLING-448: Initial commit of code * DEVTOOLING-448: Added caching while creating a Genesys Cloud OAuth Client specific so we dont have to force the user embed a secret * DEVTOOLING-448: Refactored retrieveCachedOauthClientSecret code * DEVTOOLING-448: Committing interm work * DEVTOOLING-448: Reworked how we handle the addition of roles for user credentials * DEVTOOLING-448: Removed the ToPtrStr function * Fixing go.mod and running go generate (#967) * feat/Devtooling-459: Added BuildAPIDiagnosticError function calls (#959) * added buildDiag function p1 * Adding call to BuildApiDiag * BuildAPIDiag functions added * Added util.BuildAPIDiag function to refactored resources * Added call to BuildAPIDiag in resources * Update go.mod * Fixed tests * Update go.mod * Added err * Added err * Update go.mod * Requested Changes * Fix for BotFlows dependencies (#961) * feat/Devtooling-531: Add proxy and cache to routing queue (#958) * Added cache to routing queue * Added proxy and caching to routing queue * Removed log * Add consistency checker back * Fix group cache * Fix Export cyclic deps (#968) * Added refactor label to pr-labeler-config * Feat/devtooling-499: Added getAll Functionality to ResponseManagement_ResponseAsset (#969) * adding getALl functionality * adding exporter * adding export * Added getAll functionality * Update go.mod * Added Caching * Added file_content_hash * Feat/devtooling-177: Refactored orgAuthorization_pairing (#975) * refactored orgauthorization_pairing * Added exporter for response management response asset * Added refactor label to pr-labeler-config * Feat/devtooling-499: Added getAll Functionality to ResponseManagement_ResponseAsset (#969) * adding getALl functionality * adding exporter * adding export * Added getAll functionality * Update go.mod * Added Caching * Added file_content_hash * Fixed test * using resource mutexes in init_test files & linting errors (#973) * Feature/devtooling 63 (#974) * Introduce new Elements * Update Attribs * Introduce scoring Method * Upgrade ssdk * remove unwanted logs * Feature/devtooling 63 (#978) * Fix exports --------- Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: dginty4 <108797778+dginty4@users.noreply.github.com> Co-authored-by: Charlie Conneely <87772562+charliecon@users.noreply.github.com> Co-authored-by: kavinbalagen <150852268+kavinbalagen@users.noreply.github.com> Co-authored-by: Brian Moyles <157126600+BrianMoyles@users.noreply.github.com> Co-authored-by: carnellj-genesys <109529583+carnellj-genesys@users.noreply.github.com> Co-authored-by: BrianMoyles * Fix Exporter for non-flow resources (#982) * Fix Exporter for non-flow resources * Added check (#981) --------- Signed-off-by: dependabot[bot] Co-authored-by: kavinbalagen <150852268+kavinbalagen@users.noreply.github.com> Co-authored-by: HemanthDogiparthi12 <127493303+HemanthDogiparthi12@users.noreply.github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: dginty4 <108797778+dginty4@users.noreply.github.com> Co-authored-by: Brian Moyles <157126600+BrianMoyles@users.noreply.github.com> Co-authored-by: carnellj-genesys <109529583+carnellj-genesys@users.noreply.github.com> Co-authored-by: BrianMoyles * Bump github.com/hashicorp/terraform-plugin-docs from 0.18.0 to 0.19.1 (#992) * Bump github.com/hashicorp/terraform-plugin-docs from 0.18.0 to 0.19.1 Bumps [github.com/hashicorp/terraform-plugin-docs](https://github.com/hashicorp/terraform-plugin-docs) from 0.18.0 to 0.19.1. - [Release notes](https://github.com/hashicorp/terraform-plugin-docs/releases) - [Changelog](https://github.com/hashicorp/terraform-plugin-docs/blob/main/CHANGELOG.md) - [Commits](https://github.com/hashicorp/terraform-plugin-docs/compare/v0.18.0...v0.19.1) --- updated-dependencies: - dependency-name: github.com/hashicorp/terraform-plugin-docs dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] * rerunning go generate after tf-docs package upgrade --------- Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Charlie Conneely * Devtooling 432: Conditonal Group Routing (#970) * Added routing_queue_conditional_group_routing resource * Rebased * Removed accidental commits * Rebased and fixed errors * Made some requested changes * Added evaluated_queue_id * Added warning * Fixed some things * Fixed test * Fixing exporter * Added CGR and toggle * Fixed some errors * Added queue proxy to CGR * Added toggle to get all * Made some changes * Added CGR toggle package * Moved CGR toggle package * Ran linter * Checking queue id in tests * Small change * bug/Devtooling-458: media retention policy creation failing with error on time interval (#980) * added checks * Checks for time interval attributes * Fixing TimeInterval * Added BuildFunc for timeInterval * Added returned errors for invalid time Interval * Fixed buildFunctions * Generate Docs * Fixed exporter * Getting rid of go vet warning about copying a lock value to a variable (#991) * No jira: util function for getting cursor value from next uri (#990) * moving changes (#960) * Revert "moving changes (#960)" (#963) This reverts commit 70d8a8036c52ae2f91aee081fe0d1c4c5451a58f. * Release Merge to Main (#977) * Bump golang.org/x/net from 0.22.0 to 0.23.0 (#951) Bumps [golang.org/x/net](https://github.com/golang/net) from 0.22.0 to 0.23.0. - [Commits](https://github.com/golang/net/compare/v0.22.0...v0.23.0) --- updated-dependencies: - dependency-name: golang.org/x/net dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Add team to custom resolver (#950) * Devtooling 432: Refactor Conditional Group Routing Rules into its own resource (#921) * Added routing_queue_conditional_group_routing resource * Rebased * Fixed routing queue tests * Removed accidental commits * Rebased and fixed errors * Made some requested changes * Added evaluated_queue_id * Added warning * Fixed some things * Fixed test * Fixing exporter * Fixed type * Changing target branch of dependabot PRs to dev (#956) * Fix User Resource Panics (#949) * moving changes (#964) * Reverting conditional group routing resoure (#965) * Remove use_supported_content_profile (#962) * bug/ DEVTOOLING-516: Allow Multiple inputs for BYMONTHDAY and BYMONTH (#953) * Allow Multiple inputs for BYMONTHDAY and BYMONTH * Update go.mod * Added Error Message to Validator * Bug/devtooling-530: Fixing panic during export caused by MemberGroupsResolver (#957) * Changing groups.owner_ids to optional and computed * Preventing panic inside MemberGroupsResolver with some refactoring * DEVTOOLING-417: Removed the go:generate git restore docs/index.md tag… (#946) * DEVTOOLING-417: Removed the go:generate git restore docs/index.md tag. This is pulling the index.md out of git hub and overriding what ever is being generated. * DEVTOOLING-417: Fixed a mispelling in a package alias * DEVTOOLING-417 Accidently added cache code * avoiding infinite loop in flow data source read (#966) * feat/Devtooling-448 oauth cred cache (#945) * DEVTOOLING-448: Initial commit of code * DEVTOOLING-448: Added caching while creating a Genesys Cloud OAuth Client specific so we dont have to force the user embed a secret * DEVTOOLING-448: Refactored retrieveCachedOauthClientSecret code * DEVTOOLING-448: Committing interm work * DEVTOOLING-448: Reworked how we handle the addition of roles for user credentials * DEVTOOLING-448: Removed the ToPtrStr function * Fixing go.mod and running go generate (#967) * feat/Devtooling-459: Added BuildAPIDiagnosticError function calls (#959) * added buildDiag function p1 * Adding call to BuildApiDiag * BuildAPIDiag functions added * Added util.BuildAPIDiag function to refactored resources * Added call to BuildAPIDiag in resources * Update go.mod * Fixed tests * Update go.mod * Added err * Added err * Update go.mod * Requested Changes * Fix for BotFlows dependencies (#961) * feat/Devtooling-531: Add proxy and cache to routing queue (#958) * Added cache to routing queue * Added proxy and caching to routing queue * Removed log * Add consistency checker back * Fix group cache * Fix Export cyclic deps (#968) * Added refactor label to pr-labeler-config * Feat/devtooling-499: Added getAll Functionality to ResponseManagement_ResponseAsset (#969) * adding getALl functionality * adding exporter * adding export * Added getAll functionality * Update go.mod * Added Caching * Added file_content_hash * Feat/devtooling-177: Refactored orgAuthorization_pairing (#975) * refactored orgauthorization_pairing * Added exporter for response management response asset * Added refactor label to pr-labeler-config * Feat/devtooling-499: Added getAll Functionality to ResponseManagement_ResponseAsset (#969) * adding getALl functionality * adding exporter * adding export * Added getAll functionality * Update go.mod * Added Caching * Added file_content_hash * Fixed test * using resource mutexes in init_test files & linting errors (#973) * Feature/devtooling 63 (#974) * Introduce new Elements * Update Attribs * Introduce scoring Method * Upgrade ssdk * remove unwanted logs * Feature/devtooling 63 (#978) * Fix exports --------- Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: dginty4 <108797778+dginty4@users.noreply.github.com> Co-authored-by: Charlie Conneely <87772562+charliecon@users.noreply.github.com> Co-authored-by: kavinbalagen <150852268+kavinbalagen@users.noreply.github.com> Co-authored-by: Brian Moyles <157126600+BrianMoyles@users.noreply.github.com> Co-authored-by: carnellj-genesys <109529583+carnellj-genesys@users.noreply.github.com> Co-authored-by: BrianMoyles * Fix Exporter for non-flow resources (#982) * Fix Exporter for non-flow resources * Added check (#981) * Made function for parsing cursor from next uri --------- Signed-off-by: dependabot[bot] Co-authored-by: kavinbalagen <150852268+kavinbalagen@users.noreply.github.com> Co-authored-by: HemanthDogiparthi12 <127493303+HemanthDogiparthi12@users.noreply.github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: dginty4 <108797778+dginty4@users.noreply.github.com> Co-authored-by: Brian Moyles <157126600+BrianMoyles@users.noreply.github.com> Co-authored-by: carnellj-genesys <109529583+carnellj-genesys@users.noreply.github.com> Co-authored-by: BrianMoyles * Fix acceptance tests (#979) * fix acceptance test fix test fix test fix test fix test fix tests fix tests fix tests fix tests fix tests fix test fix tests fix tests fix tests fix tests fix tests fix tests fix tests fix tests fix tests fix tests fix tests fix tests fix tests fix tests fix tests fix tests fix tests fix tests fix tests fix tests fix tests fix tests fix tests fix tests fix tests fix tests fix tests fix tests fix tests fix tests fix tests fix tests fix tests fix tests fix tests fix tests fix tests fix tests fix tests fix tests fix tests fix tests fix tests fix tests fix tests fix tests fix tests fix tests fix tests fix tests fix tests fix tests fix tests fix tests fix tests fix tests fix tests fix tests fix tests fix tests fix tests fix tests fix tests fix tests fix tests fix tests fix tests fix tests fix tests fix routing test fix routing test fix routing test fix routing test fix routing test fix routing test fix routing test fix routing test fix tests fix tests restore files fix team test * fix comments * fix tests fix tests fix tests fix tests fix tests fix tests * fix tests fix tests fix tests fix tests fix tests fix tests fix tests fix tests fix tests fix tests fix tests fix tests fix tests fix tests fix tests fix tests fix tests fix tests * fix tests fix tests fix tests * fix tests * fix conditional routing test fix conditional routing test --------- Co-authored-by: Monisha Padmavathi Ragavan * Bump hashicorp/setup-terraform from 3.0.0 to 3.1.0 (#995) Bumps [hashicorp/setup-terraform](https://github.com/hashicorp/setup-terraform) from 3.0.0 to 3.1.0. - [Release notes](https://github.com/hashicorp/setup-terraform/releases) - [Changelog](https://github.com/hashicorp/setup-terraform/blob/main/CHANGELOG.md) - [Commits](https://github.com/hashicorp/setup-terraform/compare/v3.0.0...v3.1.0) --- updated-dependencies: - dependency-name: hashicorp/setup-terraform dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Improvise exclude attributes to Regex (#988) * Fix Media call back Read Attributes (#987) * DEVTOOLING-445: User Roles not returning duplicate roles (#989) * NO-JIRA-Upgrading-Go-SDK * Fixed errors * Fixed conditional group routing * Fixed some tests * feat/Devtooling 496: Routing queue Outbound email address independent resource (#954) * Added routing_queue_conditional_group_routing resource * Rebased * Removed accidental commits * Rebased and fixed errors * Added evaluated_queue_id * Fixed some things * Added CGR and toggle * Made some changes * Added CGR toggle package * Moved CGR toggle package * Feature/devtooling 63 (#974) * Introduce new Elements * Update Attribs * Introduce scoring Method * Upgrade ssdk * remove unwanted logs * Routing queue outbound email address package * Made changes * Added tests * Added more to test * Fixed test * Finished resource * Finished resource * Made some requested changes * Added feature toggle stuff * Added feature toggle * Made changes * Fixing change in queue exporter --------- Co-authored-by: HemanthDogiparthi12 <127493303+HemanthDogiparthi12@users.noreply.github.com> * bug/devtooling-498: [CX as Code] genesyscloud_outbound_settings export contains only null data (#996) * Fixing null export * Fixing Test * Added check for export * Added attribute and fixed test * Removed Computed attribute * Added check for reschedule_time_zone_skipped_contacts in test * Update Export Guide (#971) * update export uide * update tf_export.md and resource.tf * cross check resource.tf and schema, add missing attributes * update * update export.md.tmp * Removed duplicate paragraph and ran go generate --------- Co-authored-by: Charlie Conneely * NO-JIRA: Fixing dev (#1000) * Fixing dev * Fixes some errors * Fixing flow outcome description (#998) * Devtooling 561 - Members not being added correctly to teams (#1001) * Fixed bug * Fixed problem deleting members * Removed print * Fix Version Problem in WebDeployments (#997) * Fix Version Problem in WebDeployments * Add test cases * Fix review comments * no jira: Fixing merge conflicts on dev branch (#1009) * moving changes (#960) * Revert "moving changes (#960)" (#963) This reverts commit 70d8a8036c52ae2f91aee081fe0d1c4c5451a58f. * Release Merge to Main (#977) * Bump golang.org/x/net from 0.22.0 to 0.23.0 (#951) Bumps [golang.org/x/net](https://github.com/golang/net) from 0.22.0 to 0.23.0. - [Commits](https://github.com/golang/net/compare/v0.22.0...v0.23.0) --- updated-dependencies: - dependency-name: golang.org/x/net dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Add team to custom resolver (#950) * Devtooling 432: Refactor Conditional Group Routing Rules into its own resource (#921) * Added routing_queue_conditional_group_routing resource * Rebased * Fixed routing queue tests * Removed accidental commits * Rebased and fixed errors * Made some requested changes * Added evaluated_queue_id * Added warning * Fixed some things * Fixe… * Removed duplicate import * returning response so IsVersionMismatch function can work (#1436) * Update outbound campaign (#1431) * line properties added (#1433) * line properties added * updated docs * updated unit test * optional and required set to false to address PR comment. * changed line meta base to read only * changing back to optional * undo read only * addressed PR comments * Bump golang.org/x/net from 0.32.0 to 0.33.0 (#1440) Bumps [golang.org/x/net](https://github.com/golang/net) from 0.32.0 to 0.33.0. - [Commits](https://github.com/golang/net/compare/v0.32.0...v0.33.0) --- updated-dependencies: - dependency-name: golang.org/x/net dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Fix language code (#1437) * cron schedule * jenkins description during run * jenkins description during run * jenkins description during run * cron modify * interval between jobs * modify time * fix language code * Fixes DEVTOOLING-981 (#1428) * Fixes DEVTOOLING-981 by ensuring that the grammar name is included in the block label * Enhances block labels for other resources that are essentially children of other parent resources, and so best practice is to retain the parent name in the label * Fix block label naming logic * Update BlockLabel logic for specific resources to ensure that unique labels are constructed using parent names * Bump github.com/nyaruka/phonenumbers from 1.4.3 to 1.4.4 (#1443) Bumps [github.com/nyaruka/phonenumbers](https://github.com/nyaruka/phonenumbers) from 1.4.3 to 1.4.4. - [Release notes](https://github.com/nyaruka/phonenumbers/releases) - [Changelog](https://github.com/nyaruka/phonenumbers/blob/main/CHANGELOG.md) - [Commits](https://github.com/nyaruka/phonenumbers/compare/v1.4.3...v1.4.4) --- updated-dependencies: - dependency-name: github.com/nyaruka/phonenumbers dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * DEVTOOLING-966: Validating that the schedule start date matches the rrule (#1430) * Verifying schedule start date is a weekday * make docs * Verifying that schedule start date matches rrule * Moving map outside function * Fix for DEVTOOLING-967 (#1420) * Attempt a fix for DEVTOOLING-967 * Fix null pointer and set default logic * Fix default Emergency number plan config * Revert these fixes in favor of fixing in the PR #1432 * Avoiding nil pointer dereference (#1445) * No jira: Fixed a few linting errors (#1444) * Fixed all architect package linting errors * fixed linting errors as far as genesyscloud/conversations_* * Only update the Default Outbound Route if it's a Cloud based site (since the GC only auto creates the default outbound route for a cloud based site) (#1442) * WORKITEMS-3995 update platform SDK to v150.0 (#1447) * converting from TypeList to TypeSet (#1446) * Fixes DEVTOOLING-988 (#1439) * Addresses an issue where the state for duplicated resources was not getting updated due to the separate handling of HCL and JSON maps, when we really should just handle the resource/data maps as one object that the HCL/JSON exporter iterates over and exports in the proper format. Also, as an added bonus, I added sorting of the output to make things more consistent on outputs. I have seen this as a request from both internal and customers * Fix unit tests * Fix/devtooling 936 (#1432) * Fix default outbound routes by enabling updating the default outbound route during terraform create * add email route (#1448) * add email route * doc generate * No jira fix acceptance tests (#1458) * Fix test cases * doc update * Interim fix for phone-user disassociation (#1456) * Fix test cases (#1462) * Bump github.com/zclconf/go-cty from 1.15.1 to 1.16.0 (#1449) Bumps [github.com/zclconf/go-cty](https://github.com/zclconf/go-cty) from 1.15.1 to 1.16.0. - [Release notes](https://github.com/zclconf/go-cty/releases) - [Changelog](https://github.com/zclconf/go-cty/blob/main/CHANGELOG.md) - [Commits](https://github.com/zclconf/go-cty/compare/v1.15.1...v1.16.0) --- updated-dependencies: - dependency-name: github.com/zclconf/go-cty dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump golang.org/x/net from 0.33.0 to 0.34.0 (#1452) Bumps [golang.org/x/net](https://github.com/golang/net) from 0.33.0 to 0.34.0. - [Commits](https://github.com/golang/net/compare/v0.33.0...v0.34.0) --- updated-dependencies: - dependency-name: golang.org/x/net dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Read retry before assigning user (#1454) * Read retry before assigning user * Update resource_genesyscloud_telephony_providers_edges_phone.go * Update genesyscloud_telephony_providers_edges_phonebasesettings_schema.go --------- Signed-off-by: dependabot[bot] Co-authored-by: monishapadmavathi <31921259+monishapadmavathi@users.noreply.github.com> Co-authored-by: Monisha Padmavathi Ragavan Co-authored-by: Brian Moyles <157126600+BrianMoyles@users.noreply.github.com> Co-authored-by: Brian Goad Co-authored-by: kavinbalagen <150852268+kavinbalagen@users.noreply.github.com> Co-authored-by: Charlie Conneely <87772562+charliecon@users.noreply.github.com> Co-authored-by: Charlie Conneely Co-authored-by: carnellj-genesys <109529583+carnellj-genesys@users.noreply.github.com> Co-authored-by: shrutisuryawanshigenesys Co-authored-by: dginty4 <108797778+dginty4@users.noreply.github.com> Co-authored-by: sureshperiyappan <61573777+sureshperiyappan@users.noreply.github.com> Co-authored-by: danilkulakov <118930532+danilkulakov@users.noreply.github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: BrianMoyles Co-authored-by: llegouez <60443674+llegouez@users.noreply.github.com> Co-authored-by: Nicolas Bertrand Co-authored-by: jyu1166 Co-authored-by: kavinbalagen Co-authored-by: Alexander Bejarano Co-authored-by: Mateusz Kikmunter <38324997+MateuszKikmunter@users.noreply.github.com> Co-authored-by: tsantos-genesys <154342374+tsantos-genesys@users.noreply.github.com> Co-authored-by: ben-howarth-genesys <164904178+ben-howarth-genesys@users.noreply.github.com> Co-authored-by: jenissabarrera <50225452+jenissabarrera@users.noreply.github.com> Co-authored-by: Taisuk Choi <131831426+TaisukChoi@users.noreply.github.com> Co-authored-by: willjeuniaux-genesys <153622483+willjeuniaux-genesys@users.noreply.github.com> Co-authored-by: Will <37446330+williamjeuniaux@users.noreply.github.com> Co-authored-by: Ivan Mikhalchenko Co-authored-by: ivan Co-authored-by: Majharul Islam Rafat Co-authored-by: Mohammed Islam Co-authored-by: michalk-genesys Co-authored-by: maikow-genesys --- docs/resources/architect_schedules.md | 2 +- docs/resources/outbound_campaign.md | 2 +- docs/resources/outbound_messagingcampaign.md | 2 +- docs/resources/routing_email_route.md | 2 + .../telephony_providers_edges_site.md | 35 +- ...ony_providers_edges_site_outbound_route.md | 12 + ...phony_providers_edges_trunkbasesettings.md | 33 +- docs/resources/tf_export.md | 2 +- .../apis.md | 34 +- .../apis.md | 12 + .../apis.md | 32 +- ...source_genesyscloud_architect_datatable.go | 2 +- ...source_genesyscloud_architect_datatable.go | 2 +- ..._genesyscloud_architect_datatable_proxy.go | 2 +- ...e_genesyscloud_architect_datatable_test.go | 2 +- ...esyscloud_architect_datatable_row_utils.go | 6 +- ...ce_genesyscloud_architect_datatable_row.go | 8 +- ...esyscloud_architect_datatable_row_proxy.go | 2 +- ...nesyscloud_architect_datatable_row_test.go | 2 +- ...syscloud_architect_emergencygroup_proxy.go | 2 +- ...e_genesyscloud_architect_emergencygroup.go | 2 +- ...esyscloud_architect_emergencygroup_test.go | 2 +- ...syscloud_architect_emergencygroup_utils.go | 2 +- .../data_source_genesyscloud_flow.go | 2 +- ...ource_genesyscloud_architect_flow_proxy.go | 2 +- .../resource_genesyscloud_flow.go | 2 +- .../resource_genesyscloud_flow_test.go | 2 +- .../genesyscloud_architect_grammar_proxy.go | 2 +- ...resource_genesyscloud_architect_grammar.go | 2 +- ...rce_genesyscloud_architect_grammar_test.go | 2 +- ...scloud_architect_grammar_language_proxy.go | 33 +- ...genesyscloud_architect_grammar_language.go | 26 +- ...yscloud_architect_grammar_language_test.go | 4 +- ...scloud_architect_grammar_language_utils.go | 18 +- ..._source_genesyscloud_architect_ivr_test.go | 2 +- .../genesyscloud_architect_ivr_proxy.go | 4 +- ...esyscloud_architect_ivr_proxy_unit_test.go | 2 +- .../resource_genesyscloud_architect_ivr.go | 10 +- ...esource_genesyscloud_architect_ivr_test.go | 2 +- ...ce_genesyscloud_architect_ivr_unit_test.go | 2 +- ...source_genesyscloud_architect_ivr_utils.go | 2 +- ...syscloud_architect_schedulegroups_proxy.go | 14 +- ...e_genesyscloud_architect_schedulegroups.go | 30 +- ...esyscloud_architect_schedulegroups_test.go | 2 +- ...e_genesyscloud_architect_schedules_test.go | 17 +- .../genesyscloud_architect_schedules_proxy.go | 2 +- ...source_genesyscloud_architect_schedules.go | 41 +- ...genesyscloud_architect_schedules_schema.go | 2 +- ...e_genesyscloud_architect_schedules_test.go | 155 +++++-- ...esyscloud_architect_schedules_unit_test.go | 106 +++++ ..._genesyscloud_architect_schedules_utils.go | 77 ++++ ...enesyscloud_architect_user_prompt_proxy.go | 2 +- ...urce_genesyscloud_architect_user_prompt.go | 2 +- ...genesyscloud_architect_user_prompt_test.go | 2 +- ...enesyscloud_architect_user_prompt_utils.go | 2 +- .../genesyscloud_auth_division_proxy.go | 2 +- .../resource_genesyscloud_auth_division.go | 2 +- ...esource_genesyscloud_auth_division_test.go | 2 +- .../data_source_genesyscloud_auth_role.go | 46 +- .../auth_role/genesyscloud_auth_role_proxy.go | 24 +- .../resource_genesyscloud_auth_role.go | 12 +- .../resource_genesyscloud_auth_role_test.go | 26 +- .../resource_genesyscloud_auth_role_utils.go | 2 +- ...genesyscloud_authorization_product_test.go | 2 +- ...enesyscloud_authorization_product_proxy.go | 2 +- .../consistency_checker.go | 15 - ..._messaging_integrations_instagram_proxy.go | 2 +- ...ations_messaging_integrations_instagram.go | 2 +- ...s_messaging_integrations_instagram_test.go | 2 +- ...saging_integrations_instagram_unit_test.go | 2 +- ..._messaging_integrations_instagram_utils.go | 2 +- ...tions_messaging_integrations_open_proxy.go | 17 +- ...nversations_messaging_integrations_open.go | 2 +- ...ations_messaging_integrations_open_test.go | 2 +- ...tions_messaging_integrations_open_utils.go | 2 +- ..._conversations_messaging_settings_proxy.go | 2 +- ...scloud_conversations_messaging_settings.go | 2 +- ...d_conversations_messaging_settings_test.go | 2 +- ..._conversations_messaging_settings_utils.go | 2 +- ...ations_messaging_settings_default_proxy.go | 2 +- ...onversations_messaging_settings_default.go | 2 +- ...ations_messaging_supportedcontent_proxy.go | 2 +- ...onversations_messaging_supportedcontent.go | 2 +- ...sations_messaging_supportedcontent_test.go | 2 +- ...ations_messaging_supportedcontent_utils.go | 2 +- ...ging_supportedcontent_default_init_test.go | 7 +- ...essaging_supportedcontent_default_proxy.go | 2 +- ...ions_messaging_supportedcontent_default.go | 2 +- ...ssaging_supportedcontent_default_schema.go | 1 + ..._source_genesyscloud_auth_division_home.go | 2 +- ...ata_source_genesyscloud_journey_outcome.go | 2 +- ...ata_source_genesyscloud_journey_segment.go | 2 +- ...ce_genesyscloud_knowledge_knowledgebase.go | 2 +- ...ta_source_genesyscloud_organizations_me.go | 2 +- ...e_genesyscloud_quality_forms_evaluation.go | 2 +- ...ource_genesyscloud_quality_forms_survey.go | 2 +- ...a_source_genesyscloud_widget_deployment.go | 2 +- .../genesyscloud_dependent_consumer_proxy.go | 2 +- ...mance_externalmetrics_definitions_proxy.go | 2 +- ...performance_externalmetrics_definitions.go | 2 +- ...rmance_externalmetrics_definitions_test.go | 2 +- ...syscloud_externalcontacts_contact_proxy.go | 2 +- ...e_genesyscloud_externalcontacts_contact.go | 2 +- ...esyscloud_externalcontacts_contact_test.go | 2 +- ...syscloud_externalcontacts_contact_utils.go | 2 +- ...oud_externalcontacts_organization_proxy.go | 2 +- ...esyscloud_externalcontacts_organization.go | 2 +- ...loud_externalcontacts_organization_test.go | 2 +- ...oud_externalcontacts_organization_utils.go | 2 +- .../genesyscloud_flow_loglevel_proxy.go | 2 +- .../resource_genesyscloud_flow_loglevel.go | 2 +- ...esource_genesyscloud_flow_loglevel_test.go | 2 +- .../genesyscloud_flow_milestone_proxy.go | 2 +- .../resource_genesyscloud_flow_milestone.go | 2 +- ...source_genesyscloud_flow_milestone_test.go | 2 +- ...ource_genesyscloud_flow_milestone_utils.go | 2 +- .../genesyscloud_flow_outcome_proxy.go | 2 +- .../resource_genesyscloud_flow_outcome.go | 2 +- ...esource_genesyscloud_flow_outcome_utils.go | 2 +- .../data_source_genesyscloud_group_test.go | 2 +- .../group/genesyscloud_group_proxy.go | 2 +- .../group/resource_genesyscloud_group.go | 2 +- .../group/resource_genesyscloud_group_test.go | 2 +- .../resource_genesyscloud_group_utils.go | 2 +- .../genesyscloud_group_roles_proxy.go | 2 +- ...esource_genesyscloud_group_roles_schema.go | 2 +- .../resource_genesyscloud_group_roles_test.go | 2 +- ...resource_genesyscloud_group_roles_utils.go | 2 +- .../idp_adfs/genesyscloud_idp_adfs_proxy.go | 2 +- .../resource_genesyscloud_idp_adfs.go | 2 +- .../resource_genesyscloud_idp_adfs_test.go | 2 +- .../genesyscloud_idp_generic_proxy.go | 2 +- .../resource_genesyscloud_idp_generic.go | 2 +- .../resource_genesyscloud_idp_generic_test.go | 2 +- .../genesyscloud_idp_gsuite_proxy.go | 2 +- .../resource_genesyscloud_idp_gsuite.go | 2 +- .../resource_genesyscloud_idp_gsuite_test.go | 2 +- .../idp_okta/genesyscloud_idp_okta_proxy.go | 2 +- .../resource_genesyscloud_idp_okta.go | 2 +- .../resource_genesyscloud_idp_okta_test.go | 2 +- .../genesyscloud_idp_onelogin_proxy.go | 2 +- .../resource_genesyscloud_idp_onelogin.go | 2 +- ...resource_genesyscloud_idp_onelogin_test.go | 2 +- .../idp_ping/genesyscloud_idp_ping_proxy.go | 2 +- .../resource_genesyscloud_idp_ping.go | 2 +- .../resource_genesyscloud_idp_ping_test.go | 2 +- .../genesyscloud_idp_salesforce_proxy.go | 2 +- .../resource_genesyscloud_idp_salesforce.go | 2 +- ...source_genesyscloud_idp_salesforce_test.go | 2 +- .../genesyscloud_integration_proxy.go | 2 +- .../resource_genesyscloud_integration.go | 2 +- .../resource_genesyscloud_integration_test.go | 2 +- ...resource_genesyscloud_integration_utils.go | 2 +- .../genesyscloud_integration_action_proxy.go | 2 +- ...esource_genesyscloud_integration_action.go | 2 +- ...ce_genesyscloud_integration_action_test.go | 2 +- ...e_genesyscloud_integration_action_utils.go | 2 +- ...nesyscloud_integration_credential_proxy.go | 2 +- ...rce_genesyscloud_integration_credential.go | 7 +- ...enesyscloud_integration_credential_test.go | 2 +- ...ud_integration_custom_auth_action_proxy.go | 2 +- ...syscloud_integration_custom_auth_action.go | 2 +- ...oud_integration_custom_auth_action_test.go | 2 +- ...ud_integration_custom_auth_action_utils.go | 2 +- ...genesyscloud_integration_facebook_proxy.go | 2 +- ...ource_genesyscloud_integration_facebook.go | 2 +- ..._genesyscloud_integration_facebook_test.go | 2 +- ...syscloud_integration_facebook_unit_test.go | 2 +- ...genesyscloud_integration_facebook_utils.go | 2 +- ..._source_genesyscloud_journey_action_map.go | 2 +- ...nesyscloud_journey_action_map_init_test.go | 2 +- .../genesyscloud_journey_action_map_proxy.go | 2 +- ...esource_genesyscloud_journey_action_map.go | 2 +- ...ce_genesyscloud_journey_action_map_test.go | 2 +- ...e_genesyscloud_journey_action_map_utils.go | 16 +- ...ce_genesyscloud_journey_action_template.go | 2 +- ...cloud_journey_action_template_init_test.go | 2 +- ...esyscloud_journey_action_template_proxy.go | 2 +- ...ce_genesyscloud_journey_action_template.go | 2 +- ...nesyscloud_journey_action_template_test.go | 2 +- ...esyscloud_journey_action_template_utils.go | 2 +- ...yscloud_journey_outcome_predictor_proxy.go | 2 +- ..._genesyscloud_journey_outcome_predictor.go | 2 +- ...syscloud_journey_outcome_predictor_test.go | 2 +- .../genesyscloud_journey_views_proxy.go | 2 +- .../resource_genesyscloud_journey_views.go | 2 +- ...esource_genesyscloud_journey_views_test.go | 2 +- ...source_genesyscloud_journey_views_utils.go | 2 +- ...nesyscloud_knowledge_document_variation.go | 11 +- ...cloud_knowledge_document_variation_test.go | 2 +- .../genesyscloud_knowledge_category_proxy.go | 2 +- ...esource_genesyscloud_knowledge_category.go | 13 +- ...ce_genesyscloud_knowledge_category_test.go | 2 +- ...e_genesyscloud_knowledge_category_utils.go | 2 +- .../genesyscloud_knowledge_document_proxy.go | 5 +- ...esource_genesyscloud_knowledge_document.go | 12 +- ...ce_genesyscloud_knowledge_document_test.go | 2 +- ...e_genesyscloud_knowledge_document_utils.go | 2 +- ...ata_source_genesyscloud_knowledge_label.go | 2 +- .../genesyscloud_knowledge_label_proxy.go | 2 +- .../resource_genesyscloud_knowledge_label.go | 4 +- ...ource_genesyscloud_knowledge_label_test.go | 2 +- ...urce_genesyscloud_knowledge_label_utils.go | 2 +- .../data_source_genesyscloud_location.go | 2 +- .../location/genesyscloud_location_proxy.go | 2 +- .../resource_genesyscloud_location.go | 15 +- .../resource_genesyscloud_location_test.go | 2 +- .../resource_genesyscloud_location_utils.go | 2 +- .../resource_genesyscloud_oauth_client.go | 2 +- ...esource_genesyscloud_oauth_client_proxy.go | 2 +- ...esource_genesyscloud_oauth_client_utils.go | 2 +- ...ce_genesyscloude_oauth_client_unit_test.go | 2 +- ...anization_authentication_settings_proxy.go | 2 +- ...ud_organization_authentication_settings.go | 2 +- ...ation_authentication_settings_unit_test.go | 2 +- ...anization_authentication_settings_utils.go | 2 +- ...syscloud_orgauthorization_pairing_proxy.go | 2 +- ...e_genesyscloud_orgauthorization_pairing.go | 2 +- ...genesyscloud_outbound_messagingcampaign.go | 2 +- ...yscloud_outbound_messagingcampaign_test.go | 2 +- ...cloud_outbound_messagingcampaign_schema.go | 2 +- ...ud_outbound_messagingcampaign_unit_test.go | 2 +- ...scloud_outbound_messagingcampaign_utils.go | 2 +- ...genesyscloud_outbound_messagingcampaign.go | 4 +- ...yscloud_outbound_messagingcampaign_test.go | 2 +- ...rce_genesyscloud_outbound_attempt_limit.go | 2 +- ...rce_genesyscloud_outbound_attempt_limit.go | 2 +- ...enesyscloud_outbound_attempt_limit_test.go | 2 +- ...syscloud_outbound_callabletimeset_proxy.go | 2 +- ...e_genesyscloud_outbound_callabletimeset.go | 2 +- ...esyscloud_outbound_callabletimeset_test.go | 2 +- ...syscloud_outbound_callabletimeset_utils.go | 2 +- ..._outbound_callanalysisresponseset_proxy.go | 2 +- ...scloud_outbound_callanalysisresponseset.go | 2 +- ...d_outbound_callanalysisresponseset_test.go | 2 +- ..._outbound_callanalysisresponseset_utils.go | 2 +- ...enesyscloud_outbound_campaign_init_test.go | 2 +- .../genesyscloud_outbound_campaign_proxy.go | 2 +- ...resource_genesyscloud_outbound_campaign.go | 4 +- ...e_genesyscloud_outbound_campaign_schema.go | 3 +- ...rce_genesyscloud_outbound_campaign_test.go | 396 +++++++++--------- ...ce_genesyscloud_outbound_campaign_utils.go | 2 +- ...urce_genesyscloud_outbound_campaignrule.go | 2 +- ...enesyscloud_outbound_campaignrule_proxy.go | 2 +- ...urce_genesyscloud_outbound_campaignrule.go | 2 +- ...genesyscloud_outbound_campaignrule_test.go | 2 +- ...yscloud_outbound_campaignrule_unit_test.go | 2 +- ...enesyscloud_outbound_campaignrule_utils.go | 2 +- ...enesyscloud_outbound_contact_list_proxy.go | 2 +- ...urce_genesyscloud_outbound_contact_list.go | 2 +- ...genesyscloud_outbound_contact_list_test.go | 2 +- ...enesyscloud_outbound_contact_list_utils.go | 2 +- ...oud_outbound_contact_list_contact_proxy.go | 49 ++- ...esyscloud_outbound_contact_list_contact.go | 23 +- ...oud_outbound_contact_list_contact_utils.go | 18 +- ...ud_outbound_contact_list_template_proxy.go | 2 +- ...syscloud_outbound_contact_list_template.go | 2 +- ...oud_outbound_contact_list_template_test.go | 2 +- ...ud_outbound_contact_list_template_utils.go | 2 +- ...scloud_outbound_contactlistfilter_proxy.go | 2 +- ...genesyscloud_outbound_contactlistfilter.go | 2 +- ...yscloud_outbound_contactlistfilter_test.go | 2 +- ...scloud_outbound_contactlistfilter_utils.go | 2 +- ...esyscloud_outbound_digitalruleset_proxy.go | 2 +- ...ce_genesyscloud_outbound_digitalruleset.go | 2 +- ...nesyscloud_outbound_digitalruleset_test.go | 2 +- ...esyscloud_outbound_digitalruleset_utils.go | 2 +- .../genesyscloud_outbound_dnclist_proxy.go | 2 +- .../resource_genesyscloud_outbound_dnclist.go | 2 +- ...urce_genesyscloud_outbound_dnclist_test.go | 2 +- ...utbound_filespecificationtemplate_proxy.go | 2 +- ...loud_outbound_filespecificationtemplate.go | 2 +- ...outbound_filespecificationtemplate_test.go | 2 +- ...utbound_filespecificationtemplate_utils.go | 2 +- .../genesyscloud_outbound_ruleset_proxy.go | 2 +- .../resource_genesyscloud_outbound_ruleset.go | 2 +- ...urce_genesyscloud_outbound_ruleset_test.go | 2 +- ...genesyscloud_outbound_ruleset_unit_test.go | 2 +- ...rce_genesyscloud_outbound_ruleset_utils.go | 2 +- ...enesyscloud_outbound_sequence_init_test.go | 2 +- .../genesyscloud_outbound_sequence_proxy.go | 2 +- ...resource_genesyscloud_outbound_sequence.go | 2 +- ...rce_genesyscloud_outbound_sequence_test.go | 2 +- ...ce_genesyscloud_outbound_sequence_utils.go | 2 +- .../genesyscloud_outbound_settings_proxy.go | 2 +- ...resource_genesyscloud_outbound_settings.go | 2 +- ...ce_genesyscloud_outbound_settings_utils.go | 2 +- .../genesyscloud_wrapupcode_mappings_proxy.go | 2 +- ...cloud_outbound_wrapupcode_mappings_test.go | 11 + ...loud_outbound_wrapupcode_mappings_utils.go | 2 +- ...enesyscloud_outbound_wrapupcodemappings.go | 2 +- ..._genesyscloud_processautomation_trigger.go | 2 +- .../process_automation_triggers_proxy.go | 2 +- .../process_automations_triggers_struct.go | 2 +- ..._genesyscloud_processautomation_trigger.go | 2 +- ...syscloud_processautomation_trigger_test.go | 2 +- genesyscloud/provider/division.go | 2 +- genesyscloud/provider/provider.go | 2 +- genesyscloud/provider/sdk_client_pool.go | 2 +- ...ording_media_retention_policy_init_test.go | 2 +- ..._recording_media_retention_policy_proxy.go | 2 +- ...scloud_recording_media_retention_policy.go | 2 +- ...d_recording_media_retention_policy_test.go | 2 +- ..._recording_media_retention_policy_utils.go | 2 +- .../resource_cache/datasource_cache.go | 2 +- .../resource_exporter/resource_exporter.go | 24 +- .../resource_exporter_custom.go | 2 +- .../resource_name_sanitizer.go | 4 +- .../resource_genesyscloud_init_test.go | 2 +- .../resource_genesyscloud_journey_outcome.go | 2 +- ...ource_genesyscloud_journey_outcome_test.go | 2 +- .../resource_genesyscloud_journey_segment.go | 2 +- ...ource_genesyscloud_journey_segment_test.go | 2 +- ...ce_genesyscloud_knowledge_knowledgebase.go | 2 +- ...nesyscloud_knowledge_knowledgebase_test.go | 2 +- ...e_genesyscloud_quality_forms_evaluation.go | 2 +- ...esyscloud_quality_forms_evaluation_test.go | 2 +- ...ource_genesyscloud_quality_forms_survey.go | 2 +- ..._genesyscloud_quality_forms_survey_test.go | 2 +- ...resource_genesyscloud_widget_deployment.go | 2 +- ...rce_genesyscloud_widget_deployment_test.go | 2 +- ...scloud_responsemanagement_library_proxy.go | 2 +- ...genesyscloud_responsemanagement_library.go | 2 +- ...yscloud_responsemanagement_library_test.go | 2 +- ...cloud_responsemanagement_response_proxy.go | 2 +- ...enesyscloud_responsemanagement_response.go | 2 +- ...scloud_responsemanagement_response_test.go | 2 +- ...cloud_responsemanagement_response_utils.go | 2 +- ..._responsemanagement_responseasset_proxy.go | 2 +- ...scloud_responsemanagement_responseasset.go | 2 +- ...d_responsemanagement_responseasset_test.go | 2 +- ..._genesyscloud_routing_email_domain_test.go | 2 +- ...genesyscloud_routing_email_domain_proxy.go | 2 +- ...ource_genesyscloud_routing_email_domain.go | 2 +- ..._genesyscloud_routing_email_domain_test.go | 2 +- .../genesyscloud_routing_email_route_proxy.go | 2 +- ...source_genesyscloud_routing_email_route.go | 4 +- ...genesyscloud_routing_email_route_schema.go | 13 + ...e_genesyscloud_routing_email_route_test.go | 48 ++- ..._genesyscloud_routing_email_route_utils.go | 17 +- .../genesyscloud_routing_language_proxy.go | 2 +- .../resource_genesyscloud_routing_language.go | 2 +- ...urce_genesyscloud_routing_language_test.go | 2 +- .../genesyscloud_routing_queue_proxy.go | 2 +- .../resource_genesyscloud_routing_queue.go | 2 +- ...urce_genesyscloud_routing_queue_members.go | 2 +- ...esource_genesyscloud_routing_queue_test.go | 2 +- ...ce_genesyscloud_routing_queue_unit_test.go | 2 +- ...source_genesyscloud_routing_queue_utils.go | 2 +- ...g_queue_conditional_group_routing_proxy.go | 2 +- ...routing_queue_conditional_group_routing.go | 2 +- ...ng_queue_conditional_group_routing_test.go | 2 +- ...eue_conditional_group_routing_unit_test.go | 2 +- ...ting_queue_outbound_email_address_proxy.go | 2 +- ...ud_routing_queue_outbound_email_address.go | 2 +- ...uting_queue_outbound_email_address_test.go | 2 +- ..._queue_outbound_email_address_unit_test.go | 2 +- ...ting_queue_outbound_email_address_utils.go | 2 +- ..._outbound_email_address_utils_unit_test.go | 2 +- .../genesyscloud_routing_settings_proxy.go | 2 +- .../resource_genesyscloud_routing_settings.go | 2 +- .../genesyscloud_routing_skill_proxy.go | 2 +- .../resource_genesyscloud_routing_skill.go | 2 +- ...esource_genesyscloud_routing_skill_test.go | 2 +- .../genesyscloud_routing_skill_group_proxy.go | 2 +- ...source_genesyscloud_routing_skill_group.go | 2 +- ...e_genesyscloud_routing_skill_group_test.go | 2 +- ...enesyscloud_routing_sms_addresses_proxy.go | 2 +- ...urce_genesyscloud_routing_sms_addresses.go | 2 +- ...genesyscloud_routing_sms_addresses_test.go | 2 +- .../genesyscloud_routing_utilization_proxy.go | 2 +- ...source_genesyscloud_routing_utilization.go | 2 +- ...e_genesyscloud_routing_utilization_test.go | 2 +- .../resource_routing_utilization_utils.go | 2 +- ...syscloud_routing_utilization_label_test.go | 2 +- ...oud_routing_utilization_label_init_test.go | 2 +- ...yscloud_routing_utilization_label_proxy.go | 2 +- ..._genesyscloud_routing_utilization_label.go | 2 +- ...syscloud_routing_utilization_label_test.go | 2 +- .../genesyscloud_routing_wrapupcode_proxy.go | 2 +- ...esource_genesyscloud_routing_wrapupcode.go | 2 +- ...ce_genesyscloud_routing_wrapupcode_test.go | 2 +- .../scripts/genesyscloud_scripts_proxy.go | 2 +- .../scripts/resource_genesyscloud_script.go | 2 +- .../resource_genesyscloud_script_test.go | 2 +- .../station/genesyscloud_station_init_test.go | 2 +- .../station/genesyscloud_station_proxy.go | 2 +- ...esyscloud_task_management_workbin_proxy.go | 2 +- ...ce_genesyscloud_task_management_workbin.go | 2 +- ...nesyscloud_task_management_workbin_test.go | 2 +- ...syscloud_task_management_workitem_proxy.go | 2 +- ...e_genesyscloud_task_management_workitem.go | 2 +- ...esyscloud_task_management_workitem_test.go | 2 +- ...loud_task_management_workitem_unit_test.go | 2 +- ...syscloud_task_management_workitem_utils.go | 2 +- ...d_task_management_workitem_schema_proxy.go | 2 +- ...yscloud_task_management_workitem_schema.go | 2 +- ...ud_task_management_workitem_schema_test.go | 2 +- ...sk_management_workitem_schema_unit_test.go | 2 +- ...d_task_management_workitem_schema_utils.go | 2 +- ...syscloud_task_management_worktype_proxy.go | 2 +- ...e_genesyscloud_task_management_worktype.go | 2 +- ...esyscloud_task_management_worktype_test.go | 2 +- ...loud_task_management_worktype_unit_test.go | 2 +- ...syscloud_task_management_worktype_utils.go | 2 +- ...d_task_management_worktype_status_proxy.go | 2 +- ...yscloud_task_management_worktype_status.go | 4 +- ...ud_task_management_worktype_status_test.go | 2 +- ...ud_task_management_worktype_status_util.go | 2 +- genesyscloud/team/genesyscloud_team_proxy.go | 2 +- .../team/resource_genesyscloud_team.go | 2 +- .../team/resource_genesyscloud_team_test.go | 2 +- .../resource_genesyscloud_team_unit_test.go | 2 +- .../team/resource_genesyscloud_team_utils.go | 2 +- ...phony_providers_trunkbasesettings_proxy.go | 2 +- ...hony_providers_trunkbasesettings_schema.go | 1 + ...phony_providers_edges_trunkbasesettings.go | 22 +- ..._providers_edges_trunkbasesettings_test.go | 2 +- ...oud_telephony_providers_edges_did_proxy.go | 2 +- ...elephony_providers_edges_did_pool_proxy.go | 2 +- ...loud_telephony_providers_edges_did_pool.go | 2 +- ...telephony_providers_edges_did_pool_test.go | 2 +- ...elephony_providers_edges_did_pool_utils.go | 2 +- ...ephony_providers_edges_edge_group_proxy.go | 2 +- ...ud_telephony_providers_edges_edge_group.go | 2 +- ...lephony_providers_edges_edge_group_test.go | 2 +- ...ephony_providers_edges_edge_group_utils.go | 2 +- ...ny_providers_edges_extension_pool_proxy.go | 2 +- ...elephony_providers_edges_extension_pool.go | 2 +- ...ony_providers_edges_extension_pool_test.go | 2 +- ...ny_providers_edges_extension_pool_utils.go | 2 +- ...ephony_providers_edges_linebasesettings.go | 2 +- ...lephony_providers_edges_phone_init_test.go | 2 +- ...d_telephony_providers_edges_phone_proxy.go | 2 +- ...yscloud_telephony_providers_edges_phone.go | 2 +- ...ud_telephony_providers_edges_phone_test.go | 2 +- ...d_telephony_providers_edges_phone_utils.go | 3 +- ...phony_providers_edges_phonebasesettings.go | 2 +- ...providers_edges_phonebasesettings_proxy.go | 2 +- ...phony_providers_edges_phonebasesettings.go | 2 +- ..._providers_edges_phonebasesettings_test.go | 2 +- ...iders_edges_phonebasesettings_unit_test.go | 2 +- ...providers_edges_phonebasesettings_utils.go | 2 +- ...oud_telephony_providers_edges_site_test.go | 2 +- ...ud_telephony_providers_edges_site_proxy.go | 4 +- ...syscloud_telephony_providers_edges_site.go | 16 +- ...d_telephony_providers_edges_site_schema.go | 13 +- ...oud_telephony_providers_edges_site_test.go | 2 +- ...ud_telephony_providers_edges_site_utils.go | 101 ++++- ...roviders_edges_site_outbound_route_test.go | 2 +- ...ers_edges_site_outbound_route_init_test.go | 2 +- ...oviders_edges_site_outbound_route_proxy.go | 2 +- ...ony_providers_edges_site_outbound_route.go | 22 +- ...viders_edges_site_outbound_route_schema.go | 1 + ...oviders_edges_site_outbound_route_utils.go | 21 +- ...yscloud_telephony_providers_edges_trunk.go | 2 +- ...d_telephony_providers_edges_trunk_proxy.go | 2 +- ...yscloud_telephony_providers_edges_trunk.go | 2 +- genesyscloud/tfexporter/export_common.go | 24 ++ .../genesyscloud_resource_exporter.go | 126 +++--- .../genesyscloud_resource_exporter_test.go | 207 ++++++++- genesyscloud/tfexporter/hcl_exporter.go | 92 +++- genesyscloud/tfexporter/json_exporter.go | 3 +- .../resource_genesyscloud_tf_export.go | 2 +- .../resource_genesyscloud_tf_export_test.go | 2 +- .../tfexporter/tf_exporter_resource_test.go | 5 +- genesyscloud/tfexporter/tfstate_exporter.go | 2 +- .../user/data_source_genesyscloud_user.go | 2 +- genesyscloud/user/genesyscloud_user_proxy.go | 2 +- .../user/resource_genesyscloud_user.go | 2 +- .../user/resource_genesyscloud_user_test.go | 2 +- .../user/resource_genesyscloud_user_utils.go | 2 +- .../genesyscloud_user_roles_proxy.go | 2 +- .../resource_genesyscloud_user_roles_utils.go | 2 +- genesyscloud/util/lists/util_lists.go | 25 +- .../util/resourcedata/resourcedata.go | 2 +- .../util/util_basesetting_properties.go | 2 +- .../util/util_diagnostic_unit_test.go | 2 +- genesyscloud/util/util_diagnostics.go | 2 +- genesyscloud/util/util_divisions.go | 2 +- genesyscloud/util/util_domainentities.go | 2 +- genesyscloud/util/util_retries.go | 2 +- ...loud_webdeployments_configuration_proxy.go | 2 +- ...nesyscloud_webdeployments_configuration.go | 2 +- ...cloud_webdeployments_configuration_test.go | 2 +- ...ud_webdeployments_configuration_journey.go | 2 +- ..._webdeployments_configuration_messenger.go | 2 +- ...eployments_configuration_support_center.go | 2 +- ...loud_webdeployments_configuration_utils.go | 2 +- ...yscloud_webdeployments_deployment_proxy.go | 2 +- ..._genesyscloud_webdeployments_deployment.go | 2 +- ...syscloud_webdeployments_deployment_test.go | 2 +- ...yscloud_webdeployments_deployment_utils.go | 2 +- go.mod | 12 +- go.sum | 24 +- 495 files changed, 1993 insertions(+), 1137 deletions(-) create mode 100644 genesyscloud/architect_schedules/resource_genesyscloud_architect_schedules_unit_test.go create mode 100644 genesyscloud/architect_schedules/resource_genesyscloud_architect_schedules_utils.go diff --git a/docs/resources/architect_schedules.md b/docs/resources/architect_schedules.md index ceff88b1e..9f53f5d1a 100644 --- a/docs/resources/architect_schedules.md +++ b/docs/resources/architect_schedules.md @@ -36,7 +36,7 @@ resource "genesyscloud_architect_schedules" "sample_schedule" { - `end` (String) Date time is represented as an ISO-8601 string without a timezone. For example: 2006-01-02T15:04:05.000000. - `name` (String) Name of the schedule. -- `start` (String) Date time is represented as an ISO-8601 string without a timezone. For example: 2006-01-02T15:04:05.000000. +- `start` (String) Date time is represented as an ISO-8601 string without a timezone. For example: 2006-01-02T15:04:05.000000. The start date should be applicable to the schedule's recurrence rule. ### Optional diff --git a/docs/resources/outbound_campaign.md b/docs/resources/outbound_campaign.md index 523b6baf4..880744d19 100644 --- a/docs/resources/outbound_campaign.md +++ b/docs/resources/outbound_campaign.md @@ -63,7 +63,7 @@ resource "genesyscloud_outbound_campaign" "campaign" { - `contact_list_filter_ids` (List of String) Filter to apply to the contact list before dialing. Currently a campaign can only have one filter applied. - `contact_sorts` (Block List) The order in which to sort contacts for dialing, based on up to four columns. (see [below for nested schema](#nestedblock--contact_sorts)) - `division_id` (String) The division this campaign belongs to. -- `dnc_list_ids` (List of String) DncLists for this Campaign to check before placing a call. +- `dnc_list_ids` (Set of String) DncLists for this Campaign to check before placing a call. - `dynamic_contact_queueing_settings` (Block List, Max: 1) Settings for dynamic queueing of contacts. (see [below for nested schema](#nestedblock--dynamic_contact_queueing_settings)) - `dynamic_line_balancing_settings` (Block List, Max: 1) Dynamic line balancing settings. (see [below for nested schema](#nestedblock--dynamic_line_balancing_settings)) - `edge_group_id` (String) The EdgeGroup that will place the calls. Required for all dialing modes except preview. diff --git a/docs/resources/outbound_messagingcampaign.md b/docs/resources/outbound_messagingcampaign.md index 1d29db769..cb8733d30 100644 --- a/docs/resources/outbound_messagingcampaign.md +++ b/docs/resources/outbound_messagingcampaign.md @@ -63,7 +63,7 @@ resource "genesyscloud_outbound_messagingcampaign" "example_outbound_messagingca - `contact_list_filter_ids` (List of String) The contact list filter to check before sending a message for this messaging campaign. - `contact_sorts` (Block List) The order in which to sort contacts for dialing, based on up to four columns. (see [below for nested schema](#nestedblock--contact_sorts)) - `division_id` (String) The division this entity belongs to. -- `dnc_list_ids` (List of String) The dnc lists to check before sending a message for this messaging campaign. +- `dnc_list_ids` (Set of String) The dnc lists to check before sending a message for this messaging campaign. - `dynamic_contact_queueing_settings` (Block List, Max: 1) Indicates (when true) that the campaign supports dynamic queueing of the contact list at the time of a request for contacts. **Warning**: Updating this field will cause the campaign to be destroyed and re-created. (see [below for nested schema](#nestedblock--dynamic_contact_queueing_settings)) - `email_config` (Block List, Max: 1) Configuration for this messaging campaign to send Email messages. (see [below for nested schema](#nestedblock--email_config)) diff --git a/docs/resources/routing_email_route.md b/docs/resources/routing_email_route.md index 3ed8f126a..2739eabda 100644 --- a/docs/resources/routing_email_route.md +++ b/docs/resources/routing_email_route.md @@ -53,9 +53,11 @@ resource "genesyscloud_routing_email_route" "support-route" { ### Optional +- `allow_multiple_actions` (Boolean) Control if multiple actions are allowed on this route. When true the disconnect has to be done manually. When false a conversation will be disconnected by the system after every action. - `auto_bcc` (Block Set) The recipients that should be automatically blind copied on outbound emails associated with this route. This should not be set if reply_email_address is specified. (see [below for nested schema](#nestedblock--auto_bcc)) - `flow_id` (String) The flow to use for processing the email. This should not be set if a queue_id is specified. - `from_email` (String) The sender email to use for outgoing replies. This should not be set if reply_email_address is specified. +- `history_inclusion` (String) The configuration to indicate how the history of a conversation has to be included in a draft. Defaults to `Optional`. - `language_id` (String) The language to use for routing. - `priority` (Number) The priority to use for routing. - `queue_id` (String) The queue to route the emails to. This should not be set if a flow_id is specified. diff --git a/docs/resources/telephony_providers_edges_site.md b/docs/resources/telephony_providers_edges_site.md index af143894b..b41504ac7 100644 --- a/docs/resources/telephony_providers_edges_site.md +++ b/docs/resources/telephony_providers_edges_site.md @@ -11,17 +11,29 @@ Genesys Cloud Site ## API Usage The following Genesys Cloud APIs are used by this resource. Ensure your OAuth Client has been granted the necessary scopes and permissions to perform these operations: -* [GET /api/v2/telephony/providers/edges/sites](https://developer.genesys.cloud/api/rest/v2/telephonyprovidersedge/#get-api-v2-telephony-providers-edges-sites) -* [POST /api/v2/telephony/providers/edges/sites](https://developer.genesys.cloud/api/rest/v2/telephonyprovidersedge/#post-api-v2-telephony-providers-edges-sites) -* [DELETE /api/v2/telephony/providers/edges/sites/{siteId}](https://developer.genesys.cloud/api/rest/v2/telephonyprovidersedge/#delete-api-v2-telephony-providers-edges-sites--siteId-) -* [GET /api/v2/telephony/providers/edges/sites/{siteId}](https://developer.genesys.cloud/api/rest/v2/telephonyprovidersedge/#get-api-v2-telephony-providers-edges-sites--siteId-) -* [PUT /api/v2/telephony/providers/edges/sites/{siteId}](https://developer.genesys.cloud/api/rest/v2/telephonyprovidersedge/#put-api-v2-telephony-providers-edges-sites--siteId-) -* [GET /api/v2/telephony/providers/edges/sites/{siteId}/numberplans](https://developer.genesys.cloud/api/rest/v2/telephonyprovidersedge/#get-api-v2-telephony-providers-edges-sites--siteId--numberplans) -* [PUT /api/v2/telephony/providers/edges/sites/{siteId}/numberplans](https://developer.genesys.cloud/api/rest/v2/telephonyprovidersedge/#put-api-v2-telephony-providers-edges-sites--siteId--numberplans) -* [GET /api/v2/telephony/providers/edges/sites/{siteId}/outboundroutes](https://developer.genesys.cloud/api/rest/v2/telephonyprovidersedge/#get-api-v2-telephony-providers-edges-sites--siteId--outboundroutes) -* [POST /api/v2/telephony/providers/edges/sites/{siteId}/outboundroutes](https://developer.genesys.cloud/api/rest/v2/telephonyprovidersedge/#post-api-v2-telephony-providers-edges-sites--siteId--outboundroutes) -* [DELETE /api/v2/telephony/providers/edges/sites/{siteId}/outboundroutes/{outboundRouteId}](https://developer.genesys.cloud/api/rest/v2/telephonyprovidersedge/#delete-api-v2-telephony-providers-edges-sites--siteId--outboundroutes--outboundRouteId-) -* [PUT /api/v2/telephony/providers/edges/sites/{siteId}/outboundroutes/{outboundRouteId}](https://developer.genesys.cloud/api/rest/v2/telephonyprovidersedge/#put-api-v2-telephony-providers-edges-sites--siteId--outboundroutes--outboundRouteId-) +- [GET /api/v2/telephony/providers/edges/sites](https://developer.genesys.cloud/api/rest/v2/telephonyprovidersedge/#get-api-v2-telephony-providers-edges-sites) +- [POST /api/v2/telephony/providers/edges/sites](https://developer.genesys.cloud/api/rest/v2/telephonyprovidersedge/#post-api-v2-telephony-providers-edges-sites) +- [DELETE /api/v2/telephony/providers/edges/sites/{siteId}](https://developer.genesys.cloud/api/rest/v2/telephonyprovidersedge/#delete-api-v2-telephony-providers-edges-sites--siteId-) +- [GET /api/v2/telephony/providers/edges/sites/{siteId}](https://developer.genesys.cloud/api/rest/v2/telephonyprovidersedge/#get-api-v2-telephony-providers-edges-sites--siteId-) +- [PUT /api/v2/telephony/providers/edges/sites/{siteId}](https://developer.genesys.cloud/api/rest/v2/telephonyprovidersedge/#put-api-v2-telephony-providers-edges-sites--siteId-) +- [GET /api/v2/telephony/providers/edges/sites/{siteId}/numberplans](https://developer.genesys.cloud/api/rest/v2/telephonyprovidersedge/#get-api-v2-telephony-providers-edges-sites--siteId--numberplans) +- [PUT /api/v2/telephony/providers/edges/sites/{siteId}/numberplans](https://developer.genesys.cloud/api/rest/v2/telephonyprovidersedge/#put-api-v2-telephony-providers-edges-sites--siteId--numberplans) +- [GET /api/v2/telephony/providers/edges/sites/{siteId}/outboundroutes](https://developer.genesys.cloud/api/rest/v2/telephonyprovidersedge/#get-api-v2-telephony-providers-edges-sites--siteId--outboundroutes) +- [POST /api/v2/telephony/providers/edges/sites/{siteId}/outboundroutes](https://developer.genesys.cloud/api/rest/v2/telephonyprovidersedge/#post-api-v2-telephony-providers-edges-sites--siteId--outboundroutes) +- [DELETE /api/v2/telephony/providers/edges/sites/{siteId}/outboundroutes/{outboundRouteId}](https://developer.genesys.cloud/api/rest/v2/telephonyprovidersedge/#delete-api-v2-telephony-providers-edges-sites--siteId--outboundroutes--outboundRouteId-) +- [PUT /api/v2/telephony/providers/edges/sites/{siteId}/outboundroutes/{outboundRouteId}](https://developer.genesys.cloud/api/rest/v2/telephonyprovidersedge/#put-api-v2-telephony-providers-edges-sites--siteId--outboundroutes--outboundRouteId-) + +## Export Behavior + +When exporting this resource, please be aware of the following behavior: + +If the Genesys Cloud Telephony Site is configured as a `managed` resource: + +- This resource will be exported as a data resource +- Updates and modifications to this resource and its child dependencies will not be allowed through through this provider or the Genesys Cloud API +- This limitation is enforced by the Genesys Cloud API itself + +This behavior ensures consistency with Genesys Cloud's management policies for managed telephony sites. ## Example Usage @@ -103,6 +115,7 @@ resource "genesyscloud_telephony_providers_edges_site" "site" { ### Read-Only - `id` (String) The ID of this resource. +- `managed` (Boolean) Is this site managed by Genesys Cloud ### Nested Schema for `edge_auto_update_config` diff --git a/docs/resources/telephony_providers_edges_site_outbound_route.md b/docs/resources/telephony_providers_edges_site_outbound_route.md index 8c8c06b90..d185e9d8b 100644 --- a/docs/resources/telephony_providers_edges_site_outbound_route.md +++ b/docs/resources/telephony_providers_edges_site_outbound_route.md @@ -25,6 +25,18 @@ These changes are currently controlled by a feature flag and are not yet the def If you're upgrading from an earlier version, please be aware of these structural changes and consult these examples on how to migrate your configuration. +## Export Behavior + +When exporting this resource, please be aware of the following behavior: + +If the associated Genesys Cloud Telephony Site is configured as a `managed` resource: + +- This resource will be exported as a data object +- Updates and modifications to this resource and its child dependencies will not be allowed through through this provider or the Genesys Cloud API +- This limitation is enforced by the Genesys Cloud API itself + +This behavior ensures consistency with Genesys Cloud's management policies for managed telephony sites. + ## Example Usage diff --git a/docs/resources/telephony_providers_edges_trunkbasesettings.md b/docs/resources/telephony_providers_edges_trunkbasesettings.md index dd1c0e4d4..ebf41a1e1 100644 --- a/docs/resources/telephony_providers_edges_trunkbasesettings.md +++ b/docs/resources/telephony_providers_edges_trunkbasesettings.md @@ -11,11 +11,34 @@ Genesys Cloud Trunk Base Settings ## API Usage The following Genesys Cloud APIs are used by this resource. Ensure your OAuth Client has been granted the necessary scopes and permissions to perform these operations: -* [GET /api/v2/telephony/providers/edges/trunkbasesettings](https://developer.genesys.cloud/api/rest/v2/telephonyprovidersedge/#get-api-v2-telephony-providers-edges-trunkbasesettings) -* [POST /api/v2/telephony/providers/edges/trunkbasesettings](https://developer.genesys.cloud/api/rest/v2/telephonyprovidersedge/#post-api-v2-telephony-providers-edges-trunkbasesettings) -* [GET /api/v2/telephony/providers/edges/trunkbasesettings/{trunkBaseSettingsId}](https://developer.genesys.cloud/api/rest/v2/telephonyprovidersedge/#get-api-v2-telephony-providers-edges-trunkbasesettings--trunkBaseSettingsId-) -* [DELETE /api/v2/telephony/providers/edges/trunkbasesettings/{trunkBaseSettingsId}](https://developer.genesys.cloud/api/rest/v2/telephonyprovidersedge/#delete-api-v2-telephony-providers-edges-trunkbasesettings--trunkBaseSettingsId-) -* [PUT /api/v2/telephony/providers/edges/trunkbasesettings/{trunkBaseSettingsId}](https://developer.genesys.cloud/api/rest/v2/telephonyprovidersedge/#put-api-v2-telephony-providers-edges-trunkbasesettings--trunkBaseSettingsId-) +- [GET /api/v2/telephony/providers/edges/trunkbasesettings](https://developer.genesys.cloud/api/rest/v2/telephonyprovidersedge/#get-api-v2-telephony-providers-edges-trunkbasesettings) +- [POST /api/v2/telephony/providers/edges/trunkbasesettings](https://developer.genesys.cloud/api/rest/v2/telephonyprovidersedge/#post-api-v2-telephony-providers-edges-trunkbasesettings) +- [GET /api/v2/telephony/providers/edges/trunkbasesettings/{trunkBaseSettingsId}](https://developer.genesys.cloud/api/rest/v2/telephonyprovidersedge/#get-api-v2-telephony-providers-edges-trunkbasesettings--trunkBaseSettingsId-) +- [DELETE /api/v2/telephony/providers/edges/trunkbasesettings/{trunkBaseSettingsId}](https://developer.genesys.cloud/api/rest/v2/telephonyprovidersedge/#delete-api-v2-telephony-providers-edges-trunkbasesettings--trunkBaseSettingsId-) +- [PUT /api/v2/telephony/providers/edges/trunkbasesettings/{trunkBaseSettingsId}](https://developer.genesys.cloud/api/rest/v2/telephonyprovidersedge/#put-api-v2-telephony-providers-edges-trunkbasesettings--trunkBaseSettingsId-) + +## Export Behavior + +### Managed Trunk Base Settings + +The following Trunk Base Settings are managed directly by Genesys Cloud and will be exported as data objects: + +- Cloud Proxy Tie TrunkBase for EdgeGroup +- Direct Tie TrunkBase for EdgeGroup +- Genesys Cloud - CDM SIP Phone Trunk +- Genesys Cloud - CDM WebRTC Phone Trunk +- Indirect Tie TrunkBase for EdgeGroup +- PureCloud Voice - AWS +- Tie TrunkBase for EdgeGroup + +### Important Notes + +- These resources will be exported as a data resource +- Updates and modifications to this resource and its child dependencies will not be allowed through through this provider or the Genesys Cloud API +- This limitation is enforced by the Genesys Cloud API itself + +This behavior ensures consistency with Genesys Cloud's management policies for managed telephony sites. + ## Example Usage diff --git a/docs/resources/tf_export.md b/docs/resources/tf_export.md index f50fe5ff1..547765dab 100644 --- a/docs/resources/tf_export.md +++ b/docs/resources/tf_export.md @@ -66,7 +66,7 @@ resource "genesyscloud_tf_export" "export" { - `exclude_attributes` (List of String) Attributes to exclude from the config when exporting resources. Each value should be of the form {resource_type}.{attribute}, e.g. 'genesyscloud_user.skills'. Excluded attributes must be optional. - `exclude_filter_resources` (List of String) Exclude resources that match either a resource type or a resource type::regular expression. See export guide for additional information. - `export_as_hcl` (Boolean) Export the config as HCL. Defaults to `false`. -- `export_computed` (Boolean) Export attributes that are marked as being Computed. Defaults to true to match existing functionality. This attribute's default value will likely switch to false in a future release. Defaults to `true`. +- `export_computed` (Boolean) Export attributes that are marked as being Computed and Optional. Does not attempt to export attributes that are explicitly marked as read-only by the provider. Defaults to true to match existing functionality. This attribute's default value will likely switch to false in a future release. Defaults to `true`. - `ignore_cyclic_deps` (Boolean) Ignore Cyclic Dependencies when building the flows and do not throw an error. Defaults to `true`. - `include_filter_resources` (List of String) Include only resources that match either a resource type or a resource type::regular expression. See export guide for additional information. - `include_state_file` (Boolean) Export a 'terraform.tfstate' file along with the config file. This can be used for orgs to begin managing existing resources with terraform. When `false`, GUID fields will be omitted from the config file unless a resource reference can be supplied. In this case, the resource type will need to be included in the `resource_types` array. Defaults to `false`. diff --git a/examples/resources/genesyscloud_telephony_providers_edges_site/apis.md b/examples/resources/genesyscloud_telephony_providers_edges_site/apis.md index be186a87b..d02fbf72d 100644 --- a/examples/resources/genesyscloud_telephony_providers_edges_site/apis.md +++ b/examples/resources/genesyscloud_telephony_providers_edges_site/apis.md @@ -1,11 +1,23 @@ -* [GET /api/v2/telephony/providers/edges/sites](https://developer.genesys.cloud/api/rest/v2/telephonyprovidersedge/#get-api-v2-telephony-providers-edges-sites) -* [POST /api/v2/telephony/providers/edges/sites](https://developer.genesys.cloud/api/rest/v2/telephonyprovidersedge/#post-api-v2-telephony-providers-edges-sites) -* [DELETE /api/v2/telephony/providers/edges/sites/{siteId}](https://developer.genesys.cloud/api/rest/v2/telephonyprovidersedge/#delete-api-v2-telephony-providers-edges-sites--siteId-) -* [GET /api/v2/telephony/providers/edges/sites/{siteId}](https://developer.genesys.cloud/api/rest/v2/telephonyprovidersedge/#get-api-v2-telephony-providers-edges-sites--siteId-) -* [PUT /api/v2/telephony/providers/edges/sites/{siteId}](https://developer.genesys.cloud/api/rest/v2/telephonyprovidersedge/#put-api-v2-telephony-providers-edges-sites--siteId-) -* [GET /api/v2/telephony/providers/edges/sites/{siteId}/numberplans](https://developer.genesys.cloud/api/rest/v2/telephonyprovidersedge/#get-api-v2-telephony-providers-edges-sites--siteId--numberplans) -* [PUT /api/v2/telephony/providers/edges/sites/{siteId}/numberplans](https://developer.genesys.cloud/api/rest/v2/telephonyprovidersedge/#put-api-v2-telephony-providers-edges-sites--siteId--numberplans) -* [GET /api/v2/telephony/providers/edges/sites/{siteId}/outboundroutes](https://developer.genesys.cloud/api/rest/v2/telephonyprovidersedge/#get-api-v2-telephony-providers-edges-sites--siteId--outboundroutes) -* [POST /api/v2/telephony/providers/edges/sites/{siteId}/outboundroutes](https://developer.genesys.cloud/api/rest/v2/telephonyprovidersedge/#post-api-v2-telephony-providers-edges-sites--siteId--outboundroutes) -* [DELETE /api/v2/telephony/providers/edges/sites/{siteId}/outboundroutes/{outboundRouteId}](https://developer.genesys.cloud/api/rest/v2/telephonyprovidersedge/#delete-api-v2-telephony-providers-edges-sites--siteId--outboundroutes--outboundRouteId-) -* [PUT /api/v2/telephony/providers/edges/sites/{siteId}/outboundroutes/{outboundRouteId}](https://developer.genesys.cloud/api/rest/v2/telephonyprovidersedge/#put-api-v2-telephony-providers-edges-sites--siteId--outboundroutes--outboundRouteId-) +- [GET /api/v2/telephony/providers/edges/sites](https://developer.genesys.cloud/api/rest/v2/telephonyprovidersedge/#get-api-v2-telephony-providers-edges-sites) +- [POST /api/v2/telephony/providers/edges/sites](https://developer.genesys.cloud/api/rest/v2/telephonyprovidersedge/#post-api-v2-telephony-providers-edges-sites) +- [DELETE /api/v2/telephony/providers/edges/sites/{siteId}](https://developer.genesys.cloud/api/rest/v2/telephonyprovidersedge/#delete-api-v2-telephony-providers-edges-sites--siteId-) +- [GET /api/v2/telephony/providers/edges/sites/{siteId}](https://developer.genesys.cloud/api/rest/v2/telephonyprovidersedge/#get-api-v2-telephony-providers-edges-sites--siteId-) +- [PUT /api/v2/telephony/providers/edges/sites/{siteId}](https://developer.genesys.cloud/api/rest/v2/telephonyprovidersedge/#put-api-v2-telephony-providers-edges-sites--siteId-) +- [GET /api/v2/telephony/providers/edges/sites/{siteId}/numberplans](https://developer.genesys.cloud/api/rest/v2/telephonyprovidersedge/#get-api-v2-telephony-providers-edges-sites--siteId--numberplans) +- [PUT /api/v2/telephony/providers/edges/sites/{siteId}/numberplans](https://developer.genesys.cloud/api/rest/v2/telephonyprovidersedge/#put-api-v2-telephony-providers-edges-sites--siteId--numberplans) +- [GET /api/v2/telephony/providers/edges/sites/{siteId}/outboundroutes](https://developer.genesys.cloud/api/rest/v2/telephonyprovidersedge/#get-api-v2-telephony-providers-edges-sites--siteId--outboundroutes) +- [POST /api/v2/telephony/providers/edges/sites/{siteId}/outboundroutes](https://developer.genesys.cloud/api/rest/v2/telephonyprovidersedge/#post-api-v2-telephony-providers-edges-sites--siteId--outboundroutes) +- [DELETE /api/v2/telephony/providers/edges/sites/{siteId}/outboundroutes/{outboundRouteId}](https://developer.genesys.cloud/api/rest/v2/telephonyprovidersedge/#delete-api-v2-telephony-providers-edges-sites--siteId--outboundroutes--outboundRouteId-) +- [PUT /api/v2/telephony/providers/edges/sites/{siteId}/outboundroutes/{outboundRouteId}](https://developer.genesys.cloud/api/rest/v2/telephonyprovidersedge/#put-api-v2-telephony-providers-edges-sites--siteId--outboundroutes--outboundRouteId-) + +## Export Behavior + +When exporting this resource, please be aware of the following behavior: + +If the Genesys Cloud Telephony Site is configured as a `managed` resource: + +- This resource will be exported as a data resource +- Updates and modifications to this resource and its child dependencies will not be allowed through through this provider or the Genesys Cloud API +- This limitation is enforced by the Genesys Cloud API itself + +This behavior ensures consistency with Genesys Cloud's management policies for managed telephony sites. diff --git a/examples/resources/genesyscloud_telephony_providers_edges_site_outbound_route/apis.md b/examples/resources/genesyscloud_telephony_providers_edges_site_outbound_route/apis.md index 965989717..c44f9db77 100644 --- a/examples/resources/genesyscloud_telephony_providers_edges_site_outbound_route/apis.md +++ b/examples/resources/genesyscloud_telephony_providers_edges_site_outbound_route/apis.md @@ -11,3 +11,15 @@ In versions 1.39.0 to 1.48.0 of the provider, this resource was constructed with These changes are currently controlled by a feature flag and are not yet the default behavior. This allows for a phased implementation and thorough testing of this resource before full release. If you're upgrading from an earlier version, please be aware of these structural changes and consult these examples on how to migrate your configuration. + +## Export Behavior + +When exporting this resource, please be aware of the following behavior: + +If the associated Genesys Cloud Telephony Site is configured as a `managed` resource: + +- This resource will be exported as a data object +- Updates and modifications to this resource and its child dependencies will not be allowed through through this provider or the Genesys Cloud API +- This limitation is enforced by the Genesys Cloud API itself + +This behavior ensures consistency with Genesys Cloud's management policies for managed telephony sites. diff --git a/examples/resources/genesyscloud_telephony_providers_edges_trunkbasesettings/apis.md b/examples/resources/genesyscloud_telephony_providers_edges_trunkbasesettings/apis.md index 92dc1d0fc..ef4eb42e4 100644 --- a/examples/resources/genesyscloud_telephony_providers_edges_trunkbasesettings/apis.md +++ b/examples/resources/genesyscloud_telephony_providers_edges_trunkbasesettings/apis.md @@ -1,5 +1,27 @@ -* [GET /api/v2/telephony/providers/edges/trunkbasesettings](https://developer.genesys.cloud/api/rest/v2/telephonyprovidersedge/#get-api-v2-telephony-providers-edges-trunkbasesettings) -* [POST /api/v2/telephony/providers/edges/trunkbasesettings](https://developer.genesys.cloud/api/rest/v2/telephonyprovidersedge/#post-api-v2-telephony-providers-edges-trunkbasesettings) -* [GET /api/v2/telephony/providers/edges/trunkbasesettings/{trunkBaseSettingsId}](https://developer.genesys.cloud/api/rest/v2/telephonyprovidersedge/#get-api-v2-telephony-providers-edges-trunkbasesettings--trunkBaseSettingsId-) -* [DELETE /api/v2/telephony/providers/edges/trunkbasesettings/{trunkBaseSettingsId}](https://developer.genesys.cloud/api/rest/v2/telephonyprovidersedge/#delete-api-v2-telephony-providers-edges-trunkbasesettings--trunkBaseSettingsId-) -* [PUT /api/v2/telephony/providers/edges/trunkbasesettings/{trunkBaseSettingsId}](https://developer.genesys.cloud/api/rest/v2/telephonyprovidersedge/#put-api-v2-telephony-providers-edges-trunkbasesettings--trunkBaseSettingsId-) \ No newline at end of file +- [GET /api/v2/telephony/providers/edges/trunkbasesettings](https://developer.genesys.cloud/api/rest/v2/telephonyprovidersedge/#get-api-v2-telephony-providers-edges-trunkbasesettings) +- [POST /api/v2/telephony/providers/edges/trunkbasesettings](https://developer.genesys.cloud/api/rest/v2/telephonyprovidersedge/#post-api-v2-telephony-providers-edges-trunkbasesettings) +- [GET /api/v2/telephony/providers/edges/trunkbasesettings/{trunkBaseSettingsId}](https://developer.genesys.cloud/api/rest/v2/telephonyprovidersedge/#get-api-v2-telephony-providers-edges-trunkbasesettings--trunkBaseSettingsId-) +- [DELETE /api/v2/telephony/providers/edges/trunkbasesettings/{trunkBaseSettingsId}](https://developer.genesys.cloud/api/rest/v2/telephonyprovidersedge/#delete-api-v2-telephony-providers-edges-trunkbasesettings--trunkBaseSettingsId-) +- [PUT /api/v2/telephony/providers/edges/trunkbasesettings/{trunkBaseSettingsId}](https://developer.genesys.cloud/api/rest/v2/telephonyprovidersedge/#put-api-v2-telephony-providers-edges-trunkbasesettings--trunkBaseSettingsId-) + +## Export Behavior + +### Managed Trunk Base Settings + +The following Trunk Base Settings are managed directly by Genesys Cloud and will be exported as data objects: + +- Cloud Proxy Tie TrunkBase for EdgeGroup +- Direct Tie TrunkBase for EdgeGroup +- Genesys Cloud - CDM SIP Phone Trunk +- Genesys Cloud - CDM WebRTC Phone Trunk +- Indirect Tie TrunkBase for EdgeGroup +- PureCloud Voice - AWS +- Tie TrunkBase for EdgeGroup + +### Important Notes + +- These resources will be exported as a data resource +- Updates and modifications to this resource and its child dependencies will not be allowed through through this provider or the Genesys Cloud API +- This limitation is enforced by the Genesys Cloud API itself + +This behavior ensures consistency with Genesys Cloud's management policies for managed telephony sites. diff --git a/genesyscloud/architect_datatable/data_source_genesyscloud_architect_datatable.go b/genesyscloud/architect_datatable/data_source_genesyscloud_architect_datatable.go index 694996ccb..6b0e703de 100644 --- a/genesyscloud/architect_datatable/data_source_genesyscloud_architect_datatable.go +++ b/genesyscloud/architect_datatable/data_source_genesyscloud_architect_datatable.go @@ -11,7 +11,7 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" ) func DataSourceArchitectDatatableRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { diff --git a/genesyscloud/architect_datatable/resource_genesyscloud_architect_datatable.go b/genesyscloud/architect_datatable/resource_genesyscloud_architect_datatable.go index f33a6d255..dbe4203cc 100644 --- a/genesyscloud/architect_datatable/resource_genesyscloud_architect_datatable.go +++ b/genesyscloud/architect_datatable/resource_genesyscloud_architect_datatable.go @@ -17,7 +17,7 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" ) type Datatableproperty struct { diff --git a/genesyscloud/architect_datatable/resource_genesyscloud_architect_datatable_proxy.go b/genesyscloud/architect_datatable/resource_genesyscloud_architect_datatable_proxy.go index d2e1e53c0..61a441eac 100644 --- a/genesyscloud/architect_datatable/resource_genesyscloud_architect_datatable_proxy.go +++ b/genesyscloud/architect_datatable/resource_genesyscloud_architect_datatable_proxy.go @@ -6,7 +6,7 @@ import ( "errors" "net/http" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" ) // internalProxy holds a proxy instance that can be used throughout the package diff --git a/genesyscloud/architect_datatable/resource_genesyscloud_architect_datatable_test.go b/genesyscloud/architect_datatable/resource_genesyscloud_architect_datatable_test.go index 28d186f1b..788f1c6a4 100644 --- a/genesyscloud/architect_datatable/resource_genesyscloud_architect_datatable_test.go +++ b/genesyscloud/architect_datatable/resource_genesyscloud_architect_datatable_test.go @@ -14,7 +14,7 @@ import ( "github.com/google/uuid" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" ) func TestAccResourceArchitectDatatable(t *testing.T) { diff --git a/genesyscloud/architect_datatable_row/genesyscloud_architect_datatable_row_utils.go b/genesyscloud/architect_datatable_row/genesyscloud_architect_datatable_row_utils.go index fda07abce..7b22bc947 100644 --- a/genesyscloud/architect_datatable_row/genesyscloud_architect_datatable_row_utils.go +++ b/genesyscloud/architect_datatable_row/genesyscloud_architect_datatable_row_utils.go @@ -11,7 +11,7 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" ) // Row IDs structured as {table-id}/{key-value} @@ -51,7 +51,7 @@ func customizeDatatableRowDiff(ctx context.Context, diff *schema.ResourceDiff, m if !diff.NewValueKnown("datatable_id") { // datatable_id not yet in final state, but properties_json is marked as known. // There may be computed defaults to set on properties_json that we do not know yet. - diff.SetNewComputed("properties_json") + _ = diff.SetNewComputed("properties_json") return nil } @@ -109,7 +109,7 @@ func customizeDatatableRowDiff(ctx context.Context, diff *schema.ResourceDiff, m return fmt.Errorf("Failure to marshal properties for %s: %s", id, err) } - diff.SetNew("properties_json", string(result)) + _ = diff.SetNew("properties_json", string(result)) return nil } diff --git a/genesyscloud/architect_datatable_row/resource_genesyscloud_architect_datatable_row.go b/genesyscloud/architect_datatable_row/resource_genesyscloud_architect_datatable_row.go index 027322db2..c3fb854f1 100644 --- a/genesyscloud/architect_datatable_row/resource_genesyscloud_architect_datatable_row.go +++ b/genesyscloud/architect_datatable_row/resource_genesyscloud_architect_datatable_row.go @@ -18,7 +18,7 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" ) type Datatableproperty struct { @@ -121,8 +121,8 @@ func readArchitectDatatableRow(ctx context.Context, d *schema.ResourceData, meta return retry.NonRetryableError(util.BuildWithRetriesApiDiagnosticError(ResourceType, fmt.Sprintf("Failed to read Datatable Row %s | error: %s", d.Id(), getErr), resp)) } - d.Set("datatable_id", tableId) - d.Set("key_value", keyStr) + _ = d.Set("datatable_id", tableId) + _ = d.Set("key_value", keyStr) // The key value is exposed through a separate attribute, so it should be removed from the value map delete(*row, "key") @@ -131,7 +131,7 @@ func readArchitectDatatableRow(ctx context.Context, d *schema.ResourceData, meta if err != nil { return retry.NonRetryableError(fmt.Errorf("Failed to marshal row map %v: %v", *row, err)) } - d.Set("properties_json", string(valueBytes)) + _ = d.Set("properties_json", string(valueBytes)) log.Printf("Read Datatable Row %s", d.Id()) return cc.CheckState(d) diff --git a/genesyscloud/architect_datatable_row/resource_genesyscloud_architect_datatable_row_proxy.go b/genesyscloud/architect_datatable_row/resource_genesyscloud_architect_datatable_row_proxy.go index dcbce6e3d..27b939fa6 100644 --- a/genesyscloud/architect_datatable_row/resource_genesyscloud_architect_datatable_row_proxy.go +++ b/genesyscloud/architect_datatable_row/resource_genesyscloud_architect_datatable_row_proxy.go @@ -9,7 +9,7 @@ import ( rc "terraform-provider-genesyscloud/genesyscloud/resource_cache" "github.com/mitchellh/mapstructure" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" ) // Type definitions for each func on our proxy so we can easily mock them out later diff --git a/genesyscloud/architect_datatable_row/resource_genesyscloud_architect_datatable_row_test.go b/genesyscloud/architect_datatable_row/resource_genesyscloud_architect_datatable_row_test.go index ef42d590f..0d7dd0bd5 100644 --- a/genesyscloud/architect_datatable_row/resource_genesyscloud_architect_datatable_row_test.go +++ b/genesyscloud/architect_datatable_row/resource_genesyscloud_architect_datatable_row_test.go @@ -11,7 +11,7 @@ import ( "github.com/google/uuid" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" ) func TestAccResourceArchitectDatatableRow(t *testing.T) { diff --git a/genesyscloud/architect_emergencygroup/genesyscloud_architect_emergencygroup_proxy.go b/genesyscloud/architect_emergencygroup/genesyscloud_architect_emergencygroup_proxy.go index 48087d76d..68a78eb30 100644 --- a/genesyscloud/architect_emergencygroup/genesyscloud_architect_emergencygroup_proxy.go +++ b/genesyscloud/architect_emergencygroup/genesyscloud_architect_emergencygroup_proxy.go @@ -4,7 +4,7 @@ import ( "context" "fmt" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" ) var internalProxy *architectEmergencyGroupProxy diff --git a/genesyscloud/architect_emergencygroup/resource_genesyscloud_architect_emergencygroup.go b/genesyscloud/architect_emergencygroup/resource_genesyscloud_architect_emergencygroup.go index 7e65a1b74..219ff6e5d 100644 --- a/genesyscloud/architect_emergencygroup/resource_genesyscloud_architect_emergencygroup.go +++ b/genesyscloud/architect_emergencygroup/resource_genesyscloud_architect_emergencygroup.go @@ -18,7 +18,7 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" ) func getAllEmergencyGroups(ctx context.Context, clientConfig *platformclientv2.Configuration) (resourceExporter.ResourceIDMetaMap, diag.Diagnostics) { diff --git a/genesyscloud/architect_emergencygroup/resource_genesyscloud_architect_emergencygroup_test.go b/genesyscloud/architect_emergencygroup/resource_genesyscloud_architect_emergencygroup_test.go index ba3cda1a5..257efe85b 100644 --- a/genesyscloud/architect_emergencygroup/resource_genesyscloud_architect_emergencygroup_test.go +++ b/genesyscloud/architect_emergencygroup/resource_genesyscloud_architect_emergencygroup_test.go @@ -13,7 +13,7 @@ import ( "github.com/google/uuid" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" ) func TestAccResourceArchitectEmergencyGroups(t *testing.T) { diff --git a/genesyscloud/architect_emergencygroup/resource_genesyscloud_architect_emergencygroup_utils.go b/genesyscloud/architect_emergencygroup/resource_genesyscloud_architect_emergencygroup_utils.go index d9853f342..5090be0df 100644 --- a/genesyscloud/architect_emergencygroup/resource_genesyscloud_architect_emergencygroup_utils.go +++ b/genesyscloud/architect_emergencygroup/resource_genesyscloud_architect_emergencygroup_utils.go @@ -2,7 +2,7 @@ package architect_emergencygroup import ( "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" ) func buildSdkEmergencyGroupCallFlows(d *schema.ResourceData) *[]platformclientv2.Emergencycallflow { diff --git a/genesyscloud/architect_flow/data_source_genesyscloud_flow.go b/genesyscloud/architect_flow/data_source_genesyscloud_flow.go index 3f3e977b1..d6c43c1fa 100644 --- a/genesyscloud/architect_flow/data_source_genesyscloud_flow.go +++ b/genesyscloud/architect_flow/data_source_genesyscloud_flow.go @@ -9,7 +9,7 @@ import ( "time" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/retry" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" diff --git a/genesyscloud/architect_flow/resource_genesyscloud_architect_flow_proxy.go b/genesyscloud/architect_flow/resource_genesyscloud_architect_flow_proxy.go index 760c76ee8..d8bfe4a7f 100644 --- a/genesyscloud/architect_flow/resource_genesyscloud_architect_flow_proxy.go +++ b/genesyscloud/architect_flow/resource_genesyscloud_architect_flow_proxy.go @@ -6,7 +6,7 @@ import ( "log" rc "terraform-provider-genesyscloud/genesyscloud/resource_cache" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" ) var internalProxy *architectFlowProxy diff --git a/genesyscloud/architect_flow/resource_genesyscloud_flow.go b/genesyscloud/architect_flow/resource_genesyscloud_flow.go index 0aee30cbe..f593f7523 100644 --- a/genesyscloud/architect_flow/resource_genesyscloud_flow.go +++ b/genesyscloud/architect_flow/resource_genesyscloud_flow.go @@ -19,7 +19,7 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" ) func getAllFlows(ctx context.Context, clientConfig *platformclientv2.Configuration) (resourceExporter.ResourceIDMetaMap, diag.Diagnostics) { diff --git a/genesyscloud/architect_flow/resource_genesyscloud_flow_test.go b/genesyscloud/architect_flow/resource_genesyscloud_flow_test.go index d5e8b7596..83a68868c 100644 --- a/genesyscloud/architect_flow/resource_genesyscloud_flow_test.go +++ b/genesyscloud/architect_flow/resource_genesyscloud_flow_test.go @@ -17,7 +17,7 @@ import ( "github.com/google/uuid" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" ) // lockFlow will search for a specific flow and then lock it. This is to specifically test the force_unlock flag where I want to create a flow, simulate some one locking it and then attempt to diff --git a/genesyscloud/architect_grammar/genesyscloud_architect_grammar_proxy.go b/genesyscloud/architect_grammar/genesyscloud_architect_grammar_proxy.go index 8fd47bce6..1e7ebffff 100644 --- a/genesyscloud/architect_grammar/genesyscloud_architect_grammar_proxy.go +++ b/genesyscloud/architect_grammar/genesyscloud_architect_grammar_proxy.go @@ -6,7 +6,7 @@ import ( "log" rc "terraform-provider-genesyscloud/genesyscloud/resource_cache" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" ) /* diff --git a/genesyscloud/architect_grammar/resource_genesyscloud_architect_grammar.go b/genesyscloud/architect_grammar/resource_genesyscloud_architect_grammar.go index 591b1fcc8..cad2acdfb 100644 --- a/genesyscloud/architect_grammar/resource_genesyscloud_architect_grammar.go +++ b/genesyscloud/architect_grammar/resource_genesyscloud_architect_grammar.go @@ -15,7 +15,7 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "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/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" ) /* diff --git a/genesyscloud/architect_grammar/resource_genesyscloud_architect_grammar_test.go b/genesyscloud/architect_grammar/resource_genesyscloud_architect_grammar_test.go index e286fa8b6..9c9c03a25 100644 --- a/genesyscloud/architect_grammar/resource_genesyscloud_architect_grammar_test.go +++ b/genesyscloud/architect_grammar/resource_genesyscloud_architect_grammar_test.go @@ -9,7 +9,7 @@ import ( "github.com/google/uuid" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" ) func TestAccResourceArchitectGrammar(t *testing.T) { diff --git a/genesyscloud/architect_grammar_language/genesyscloud_architect_grammar_language_proxy.go b/genesyscloud/architect_grammar_language/genesyscloud_architect_grammar_language_proxy.go index ffdc7f258..5bb096916 100644 --- a/genesyscloud/architect_grammar_language/genesyscloud_architect_grammar_language_proxy.go +++ b/genesyscloud/architect_grammar_language/genesyscloud_architect_grammar_language_proxy.go @@ -8,7 +8,7 @@ import ( "terraform-provider-genesyscloud/genesyscloud/util/files" "time" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" ) type FileType int @@ -28,11 +28,15 @@ out during testing. var internalProxy *architectGrammarLanguageProxy // Type definitions for each func on our proxy so that we can easily mock them out later +type GrammarLanguageEntry struct { + Grammar *platformclientv2.Grammar + GrammarLanguage *platformclientv2.Grammarlanguage +} type createArchitectGrammarLanguageFunc func(ctx context.Context, p *architectGrammarLanguageProxy, language *platformclientv2.Grammarlanguage) (*platformclientv2.Grammarlanguage, *platformclientv2.APIResponse, error) type getArchitectGrammarLanguageByIdFunc func(ctx context.Context, p *architectGrammarLanguageProxy, grammarId string, languageCode string) (*platformclientv2.Grammarlanguage, *platformclientv2.APIResponse, error) type updateArchitectGrammarLanguageFunc func(ctx context.Context, p *architectGrammarLanguageProxy, grammarId string, languageCode string, language *platformclientv2.Grammarlanguage) (*platformclientv2.Grammarlanguage, *platformclientv2.APIResponse, error) type deleteArchitectGrammarLanguageFunc func(ctx context.Context, p *architectGrammarLanguageProxy, grammarId string, languageCode string) (*platformclientv2.APIResponse, error) -type getAllArchitectGrammarLanguageFunc func(ctx context.Context, p *architectGrammarLanguageProxy) (*[]platformclientv2.Grammarlanguage, *platformclientv2.APIResponse, error) +type getAllArchitectGrammarLanguageFunc func(ctx context.Context, p *architectGrammarLanguageProxy) (*[]GrammarLanguageEntry, *platformclientv2.APIResponse, error) // architectGrammarLanguageProxy contains all the methods that call genesys cloud APIs. type architectGrammarLanguageProxy struct { @@ -93,7 +97,7 @@ func (p *architectGrammarLanguageProxy) deleteArchitectGrammarLanguage(ctx conte } // getAllArchitectGrammarLanguage retrieves all Genesys Cloud Architect Grammar Languages -func (p *architectGrammarLanguageProxy) getAllArchitectGrammarLanguage(ctx context.Context) (*[]platformclientv2.Grammarlanguage, *platformclientv2.APIResponse, error) { +func (p *architectGrammarLanguageProxy) getAllArchitectGrammarLanguage(ctx context.Context) (*[]GrammarLanguageEntry, *platformclientv2.APIResponse, error) { return p.getAllArchitectGrammarLanguageAttr(ctx, p) } @@ -123,7 +127,7 @@ func createArchitectGrammarLanguageFn(_ context.Context, p *architectGrammarLang // getArchitectGrammarLanguageByIdFn is an implementation of the function to get a Genesys Cloud Architect Grammar Language by ID func getArchitectGrammarLanguageByIdFn(_ context.Context, p *architectGrammarLanguageProxy, grammarId string, languageCode string) (*platformclientv2.Grammarlanguage, *platformclientv2.APIResponse, error) { - language := rc.GetCacheItem(p.grammarLanguageCache, fmt.Sprintf("%s:%s", grammarId, languageCode)) + language := rc.GetCacheItem(p.grammarLanguageCache, buildGrammarLanguageId(grammarId, languageCode)) if language != nil { return language, nil, nil } @@ -202,8 +206,9 @@ func uploadGrammarLanguageFile(p *architectGrammarLanguageProxy, language *platf } // getAllArchitectGrammarLanguageFn is the implementation for retrieving all Architect Grammars in Genesys Cloud -func getAllArchitectGrammarLanguageFn(_ context.Context, p *architectGrammarLanguageProxy) (*[]platformclientv2.Grammarlanguage, *platformclientv2.APIResponse, error) { - var allLanguages []platformclientv2.Grammarlanguage +func getAllArchitectGrammarLanguageFn(_ context.Context, p *architectGrammarLanguageProxy) (*[]GrammarLanguageEntry, *platformclientv2.APIResponse, error) { + + var allLanguages []GrammarLanguageEntry grammars, resp, err := p.architectApi.GetArchitectGrammars(1, 100, "", "", []string{}, "", "", "", true) if err != nil { @@ -215,7 +220,12 @@ func getAllArchitectGrammarLanguageFn(_ context.Context, p *architectGrammarLang for _, grammar := range *grammars.Entities { if grammar.Languages != nil { - allLanguages = append(allLanguages, *grammar.Languages...) + for _, language := range *grammar.Languages { + allLanguages = append(allLanguages, GrammarLanguageEntry{ + Grammar: &grammar, + GrammarLanguage: &language, + }) + } } } @@ -233,13 +243,18 @@ func getAllArchitectGrammarLanguageFn(_ context.Context, p *architectGrammarLang for _, grammar := range *grammars.Entities { if grammar.Languages != nil { - allLanguages = append(allLanguages, *grammar.Languages...) + for _, language := range *grammar.Languages { + allLanguages = append(allLanguages, GrammarLanguageEntry{ + Grammar: &grammar, + GrammarLanguage: &language, + }) + } } } } for _, language := range allLanguages { - rc.SetCache(p.grammarLanguageCache, fmt.Sprintf("%s:%s", *language.GrammarId, *language.Language), language) + rc.SetCache(p.grammarLanguageCache, buildGrammarLanguageId(*language.Grammar.Id, *language.GrammarLanguage.Language), *language.GrammarLanguage) } return &allLanguages, resp, nil diff --git a/genesyscloud/architect_grammar_language/resource_genesyscloud_architect_grammar_language.go b/genesyscloud/architect_grammar_language/resource_genesyscloud_architect_grammar_language.go index 5940341cd..54717e73e 100644 --- a/genesyscloud/architect_grammar_language/resource_genesyscloud_architect_grammar_language.go +++ b/genesyscloud/architect_grammar_language/resource_genesyscloud_architect_grammar_language.go @@ -4,7 +4,6 @@ import ( "context" "fmt" "log" - "strings" "terraform-provider-genesyscloud/genesyscloud/consistency_checker" "terraform-provider-genesyscloud/genesyscloud/provider" resourceExporter "terraform-provider-genesyscloud/genesyscloud/resource_exporter" @@ -16,7 +15,7 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "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/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" ) /* @@ -34,8 +33,9 @@ func getAllAuthArchitectGrammarLanguage(ctx context.Context, clientConfig *platf } for _, language := range *languages { - languageId := *language.GrammarId + ":" + *language.Language - resources[languageId] = &resourceExporter.ResourceMeta{BlockLabel: *language.Language} + languageId := buildGrammarLanguageId(*language.Grammar.Id, *language.GrammarLanguage.Language) + + resources[languageId] = &resourceExporter.ResourceMeta{BlockLabel: *language.Grammar.Name + "_" + *language.GrammarLanguage.Language} } return resources, nil @@ -54,8 +54,7 @@ func createArchitectGrammarLanguage(ctx context.Context, d *schema.ResourceData, return util.BuildAPIDiagnosticError(ResourceType, fmt.Sprintf("Failed to create grammar language: %s error %s", d.Id(), err), resp) } - // Language id is always in format : - languageId := fmt.Sprintf("%s:%s", *language.GrammarId, *language.Language) + languageId := buildGrammarLanguageId(*language.GrammarId, *language.Language) d.SetId(languageId) log.Printf("Created Architect Grammar Language %s", languageId) return readArchitectGrammarLanguage(ctx, d, meta) @@ -70,7 +69,7 @@ func readArchitectGrammarLanguage(ctx context.Context, d *schema.ResourceData, m log.Printf("Reading Architect Grammar Language %s", d.Id()) return util.WithRetriesForRead(ctx, d, func() *retry.RetryError { - grammarId, languageCode := splitLanguageId(d.Id()) + grammarId, languageCode := splitGrammarLanguageId(d.Id()) language, resp, getErr := proxy.getArchitectGrammarLanguageById(ctx, grammarId, languageCode) if getErr != nil { @@ -94,14 +93,6 @@ func readArchitectGrammarLanguage(ctx context.Context, d *schema.ResourceData, m }) } -func splitLanguageId(languageId string) (string, string) { - split := strings.SplitN(languageId, ":", 2) - if len(split) == 2 { - return split[0], split[1] - } - return "", "" -} - // updateArchitectGrammarLanguage is used by the architect_grammar_language resource to update an architect grammar language in Genesys Cloud func updateArchitectGrammarLanguage(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { sdkConfig := meta.(*provider.ProviderMeta).ClientConfig @@ -110,7 +101,8 @@ func updateArchitectGrammarLanguage(ctx context.Context, d *schema.ResourceData, architectGrammarLanguage := getArchitectGrammarLanguageFromResourceData(d) log.Printf("Updating Architect Grammar Language %s", d.Id()) - _, resp, err := proxy.updateArchitectGrammarLanguage(ctx, *architectGrammarLanguage.GrammarId, *architectGrammarLanguage.Language, &architectGrammarLanguage) + grammarId, languageCode := splitGrammarLanguageId(d.Id()) + _, resp, err := proxy.updateArchitectGrammarLanguage(ctx, grammarId, languageCode, &architectGrammarLanguage) if err != nil { return util.BuildAPIDiagnosticError(ResourceType, fmt.Sprintf("Failed to update grammar language: %s error: %s", d.Id(), err), resp) } @@ -124,7 +116,7 @@ func deleteArchitectGrammarLanguage(ctx context.Context, d *schema.ResourceData, sdkConfig := meta.(*provider.ProviderMeta).ClientConfig proxy := getArchitectGrammarLanguageProxy(sdkConfig) - grammarId, languageCode := splitLanguageId(d.Id()) + grammarId, languageCode := splitGrammarLanguageId(d.Id()) resp, err := proxy.deleteArchitectGrammarLanguage(ctx, grammarId, languageCode) if err != nil { return util.BuildAPIDiagnosticError(ResourceType, fmt.Sprintf("Failed to delete grammar language %s: %s", d.Id(), err), resp) diff --git a/genesyscloud/architect_grammar_language/resource_genesyscloud_architect_grammar_language_test.go b/genesyscloud/architect_grammar_language/resource_genesyscloud_architect_grammar_language_test.go index ff65a453e..a84d31f25 100644 --- a/genesyscloud/architect_grammar_language/resource_genesyscloud_architect_grammar_language_test.go +++ b/genesyscloud/architect_grammar_language/resource_genesyscloud_architect_grammar_language_test.go @@ -15,7 +15,7 @@ import ( "github.com/google/uuid" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" ) func TestAccResourceArchitectGrammarLanguage(t *testing.T) { @@ -260,7 +260,7 @@ func testVerifyGrammarLanguageDestroyed(state *terraform.State) error { if rs.Type != "genesyscloud_architect_grammar_language" { continue } - grammarId, languageCode := splitLanguageId(rs.Primary.ID) + grammarId, languageCode := splitGrammarLanguageId(rs.Primary.ID) grammar, resp, err := architectAPI.GetArchitectGrammarLanguage(grammarId, languageCode) if grammar != nil { return fmt.Errorf("Language (%s) still exists", rs.Primary.ID) diff --git a/genesyscloud/architect_grammar_language/resource_genesyscloud_architect_grammar_language_utils.go b/genesyscloud/architect_grammar_language/resource_genesyscloud_architect_grammar_language_utils.go index 466ab29b5..69f808027 100644 --- a/genesyscloud/architect_grammar_language/resource_genesyscloud_architect_grammar_language_utils.go +++ b/genesyscloud/architect_grammar_language/resource_genesyscloud_architect_grammar_language_utils.go @@ -14,7 +14,7 @@ import ( "time" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" ) /* @@ -120,7 +120,7 @@ func ArchitectGrammarLanguageResolver(languageId, exportDirectory, subDirectory return err } - grammarId, languageCode := splitLanguageId(languageId) + grammarId, languageCode := splitGrammarLanguageId(languageId) language, _, err := proxy.getArchitectGrammarLanguageById(context.Background(), grammarId, languageCode) if err != nil { return err @@ -244,3 +244,17 @@ func (d *grammarLanguageDownloader) updatePathsInExportConfigMap() { } } } + +// Language id is always in format : +func buildGrammarLanguageId(grammarId string, languageCode string) (grammarLanguageId string) { + return fmt.Sprintf("%s:%s", grammarId, languageCode) +} + +// Language id is always in format : +func splitGrammarLanguageId(languageId string) (grammarId string, languageCode string) { + split := strings.SplitN(languageId, ":", 2) + if len(split) == 2 { + return split[0], split[1] + } + return "", "" +} diff --git a/genesyscloud/architect_ivr/data_source_genesyscloud_architect_ivr_test.go b/genesyscloud/architect_ivr/data_source_genesyscloud_architect_ivr_test.go index 013c1b820..0bd78a90e 100644 --- a/genesyscloud/architect_ivr/data_source_genesyscloud_architect_ivr_test.go +++ b/genesyscloud/architect_ivr/data_source_genesyscloud_architect_ivr_test.go @@ -6,7 +6,7 @@ import ( "testing" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" "github.com/stretchr/testify/assert" "github.com/google/uuid" diff --git a/genesyscloud/architect_ivr/genesyscloud_architect_ivr_proxy.go b/genesyscloud/architect_ivr/genesyscloud_architect_ivr_proxy.go index 878d388c1..d12085a07 100644 --- a/genesyscloud/architect_ivr/genesyscloud_architect_ivr_proxy.go +++ b/genesyscloud/architect_ivr/genesyscloud_architect_ivr_proxy.go @@ -7,7 +7,7 @@ import ( utillists "terraform-provider-genesyscloud/genesyscloud/util/lists" "time" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" ) /* @@ -235,7 +235,7 @@ func (a *architectIvrProxy) uploadArchitectIvrWithChunkingLogic(ctx context.Cont if !post { // Get copy of ivr before this update log.Printf("Reading IVR %s to save copy of the configuration before attempting an update", id) - ivrBeforeUpdate, resp, err = a.getArchitectIvr(ctx, id) + ivrBeforeUpdate, _, err = a.getArchitectIvr(ctx, id) if err != nil { log.Printf("Failed to save a copy of IVR %s before starting chunking logic: %v", id, err) } diff --git a/genesyscloud/architect_ivr/genesyscloud_architect_ivr_proxy_unit_test.go b/genesyscloud/architect_ivr/genesyscloud_architect_ivr_proxy_unit_test.go index ccb3ca18b..813c197eb 100644 --- a/genesyscloud/architect_ivr/genesyscloud_architect_ivr_proxy_unit_test.go +++ b/genesyscloud/architect_ivr/genesyscloud_architect_ivr_proxy_unit_test.go @@ -11,7 +11,7 @@ import ( "testing" "github.com/google/uuid" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" ) func TestUnitUploadIvrDnisChunksSuccess(t *testing.T) { diff --git a/genesyscloud/architect_ivr/resource_genesyscloud_architect_ivr.go b/genesyscloud/architect_ivr/resource_genesyscloud_architect_ivr.go index a075736ff..c934e5e2b 100644 --- a/genesyscloud/architect_ivr/resource_genesyscloud_architect_ivr.go +++ b/genesyscloud/architect_ivr/resource_genesyscloud_architect_ivr.go @@ -18,7 +18,7 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" ) // getAllIvrConfigs retrieves all architect IVRs and is used for the exporter @@ -32,7 +32,13 @@ func getAllIvrConfigs(ctx context.Context, clientConfig *platformclientv2.Config } for _, entity := range *allIvrs { - resources[*entity.Id] = &resourceExporter.ResourceMeta{BlockLabel: *entity.Name} + var blockLabel string + if entity.OpenHoursFlow != nil && entity.OpenHoursFlow.Name != nil { + blockLabel = *entity.OpenHoursFlow.Name + "_" + *entity.Name + } else { + blockLabel = *entity.Name + } + resources[*entity.Id] = &resourceExporter.ResourceMeta{BlockLabel: blockLabel} } return resources, nil } diff --git a/genesyscloud/architect_ivr/resource_genesyscloud_architect_ivr_test.go b/genesyscloud/architect_ivr/resource_genesyscloud_architect_ivr_test.go index 8a01c0824..41fa3f4fe 100644 --- a/genesyscloud/architect_ivr/resource_genesyscloud_architect_ivr_test.go +++ b/genesyscloud/architect_ivr/resource_genesyscloud_architect_ivr_test.go @@ -14,7 +14,7 @@ import ( "github.com/google/uuid" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" ) func TestAccResourceIvrConfigBasic(t *testing.T) { diff --git a/genesyscloud/architect_ivr/resource_genesyscloud_architect_ivr_unit_test.go b/genesyscloud/architect_ivr/resource_genesyscloud_architect_ivr_unit_test.go index 7e897dd63..3c071ff01 100644 --- a/genesyscloud/architect_ivr/resource_genesyscloud_architect_ivr_unit_test.go +++ b/genesyscloud/architect_ivr/resource_genesyscloud_architect_ivr_unit_test.go @@ -11,7 +11,7 @@ import ( "github.com/google/uuid" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" "github.com/stretchr/testify/assert" ) diff --git a/genesyscloud/architect_ivr/resource_genesyscloud_architect_ivr_utils.go b/genesyscloud/architect_ivr/resource_genesyscloud_architect_ivr_utils.go index 82a0d03ce..062881861 100644 --- a/genesyscloud/architect_ivr/resource_genesyscloud_architect_ivr_utils.go +++ b/genesyscloud/architect_ivr/resource_genesyscloud_architect_ivr_utils.go @@ -8,7 +8,7 @@ import ( "terraform-provider-genesyscloud/genesyscloud/util/lists" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" ) type IvrConfigStruct struct { diff --git a/genesyscloud/architect_schedulegroups/genesyscloud_architect_schedulegroups_proxy.go b/genesyscloud/architect_schedulegroups/genesyscloud_architect_schedulegroups_proxy.go index 757aed0f1..21b7d789d 100644 --- a/genesyscloud/architect_schedulegroups/genesyscloud_architect_schedulegroups_proxy.go +++ b/genesyscloud/architect_schedulegroups/genesyscloud_architect_schedulegroups_proxy.go @@ -5,7 +5,7 @@ import ( "fmt" "log" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" ) /* @@ -107,28 +107,24 @@ func getAllArchitectSchedulegroupsFn(ctx context.Context, p *architectSchedulegr scheduleGroups, apiResponse, err := p.architectApi.GetArchitectSchedulegroups(1, pageSize, "", "", "", "", nil) if err != nil { - return nil, apiResponse, fmt.Errorf("Failed to get schedule group: %v", err) + return nil, apiResponse, fmt.Errorf("failed to get schedule group: %v", err) } if scheduleGroups.Entities == nil || len(*scheduleGroups.Entities) == 0 { return &allScheduleGroups, apiResponse, nil } - for _, scheduleGroup := range *scheduleGroups.Entities { - allScheduleGroups = append(allScheduleGroups, scheduleGroup) - } + allScheduleGroups = append(allScheduleGroups, *scheduleGroups.Entities...) for pageNum := 2; pageNum <= *scheduleGroups.PageCount; pageNum++ { scheduleGroups, apiResponse, err := p.architectApi.GetArchitectSchedulegroups(pageNum, pageSize, "", "", "", "", nil) if err != nil { - return nil, apiResponse, fmt.Errorf("Failed to get schedule group: %v", err) + return nil, apiResponse, fmt.Errorf("failed to get schedule group: %v", err) } if scheduleGroups.Entities == nil || len(*scheduleGroups.Entities) == 0 { break } - for _, scheduleGroup := range *scheduleGroups.Entities { - allScheduleGroups = append(allScheduleGroups, scheduleGroup) - } + allScheduleGroups = append(allScheduleGroups, *scheduleGroups.Entities...) } return &allScheduleGroups, apiResponse, nil } diff --git a/genesyscloud/architect_schedulegroups/resource_genesyscloud_architect_schedulegroups.go b/genesyscloud/architect_schedulegroups/resource_genesyscloud_architect_schedulegroups.go index a79c9e8c4..e61ff4555 100644 --- a/genesyscloud/architect_schedulegroups/resource_genesyscloud_architect_schedulegroups.go +++ b/genesyscloud/architect_schedulegroups/resource_genesyscloud_architect_schedulegroups.go @@ -10,12 +10,13 @@ import ( resourceExporter "terraform-provider-genesyscloud/genesyscloud/resource_exporter" "terraform-provider-genesyscloud/genesyscloud/util" "terraform-provider-genesyscloud/genesyscloud/util/constants" + "terraform-provider-genesyscloud/genesyscloud/util/resourcedata" "time" "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "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/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" ) /* @@ -79,34 +80,27 @@ func readArchitectSchedulegroups(ctx context.Context, d *schema.ResourceData, me return retry.NonRetryableError(util.BuildWithRetriesApiDiagnosticError(ResourceType, fmt.Sprintf("Failed to read schedule group %s | error: %s", d.Id(), getErr), proxyResponse)) } - d.Set("name", *scheduleGroup.Name) - d.Set("division_id", *scheduleGroup.Division.Id) - d.Set("description", nil) - if scheduleGroup.Description != nil { - d.Set("description", *scheduleGroup.Description) - } - - d.Set("time_zone", nil) - if scheduleGroup.TimeZone != nil { - d.Set("time_zone", *scheduleGroup.TimeZone) - } + resourcedata.SetNillableValue(d, "name", scheduleGroup.Name) + resourcedata.SetNillableValue(d, "description", scheduleGroup.Description) + resourcedata.SetNillableReferenceWritableDivision(d, "division_id", scheduleGroup.Division) + resourcedata.SetNillableValue(d, "time_zone", scheduleGroup.TimeZone) if scheduleGroup.OpenSchedules != nil { - d.Set("open_schedules_id", util.SdkDomainEntityRefArrToSet(*scheduleGroup.OpenSchedules)) + _ = d.Set("open_schedules_id", util.SdkDomainEntityRefArrToSet(*scheduleGroup.OpenSchedules)) } else { - d.Set("open_schedules_id", nil) + _ = d.Set("open_schedules_id", nil) } if scheduleGroup.ClosedSchedules != nil { - d.Set("closed_schedules_id", util.SdkDomainEntityRefArrToSet(*scheduleGroup.ClosedSchedules)) + _ = d.Set("closed_schedules_id", util.SdkDomainEntityRefArrToSet(*scheduleGroup.ClosedSchedules)) } else { - d.Set("closed_schedules_id", nil) + _ = d.Set("closed_schedules_id", nil) } if scheduleGroup.HolidaySchedules != nil { - d.Set("holiday_schedules_id", util.SdkDomainEntityRefArrToSet(*scheduleGroup.HolidaySchedules)) + _ = d.Set("holiday_schedules_id", util.SdkDomainEntityRefArrToSet(*scheduleGroup.HolidaySchedules)) } else { - d.Set("holiday_schedules_id", nil) + _ = d.Set("holiday_schedules_id", nil) } log.Printf("Read schedule group %s %s", d.Id(), *scheduleGroup.Name) diff --git a/genesyscloud/architect_schedulegroups/resource_genesyscloud_architect_schedulegroups_test.go b/genesyscloud/architect_schedulegroups/resource_genesyscloud_architect_schedulegroups_test.go index c4e14cb93..0aa6bd627 100644 --- a/genesyscloud/architect_schedulegroups/resource_genesyscloud_architect_schedulegroups_test.go +++ b/genesyscloud/architect_schedulegroups/resource_genesyscloud_architect_schedulegroups_test.go @@ -12,7 +12,7 @@ import ( "github.com/google/uuid" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" ) func TestAccResourceArchitectScheduleGroups(t *testing.T) { diff --git a/genesyscloud/architect_schedules/data_source_genesyscloud_architect_schedules_test.go b/genesyscloud/architect_schedules/data_source_genesyscloud_architect_schedules_test.go index 34db601d7..8e1e28555 100644 --- a/genesyscloud/architect_schedules/data_source_genesyscloud_architect_schedules_test.go +++ b/genesyscloud/architect_schedules/data_source_genesyscloud_architect_schedules_test.go @@ -19,6 +19,9 @@ func TestAccDataSourceArchitectSchedule(t *testing.T) { start = "2021-08-04T08:00:00.000000" end = "2021-08-04T17:00:00.000000" rrule = "FREQ=DAILY;INTERVAL=1" + + resourcePath = ResourceType + "." + schedResourceLabel + dataResourcePath = "data." + ResourceType + "." + schedDataLabel ) resource.Test(t, resource.TestCase{ @@ -37,9 +40,9 @@ func TestAccDataSourceArchitectSchedule(t *testing.T) { ) + generateScheduleDataSource( schedDataLabel, name, - "genesyscloud_architect_schedules."+schedResourceLabel), + resourcePath), Check: resource.ComposeTestCheckFunc( - resource.TestCheckResourceAttrPair("data.genesyscloud_architect_schedules."+schedDataLabel, "id", "genesyscloud_architect_schedules."+schedResourceLabel, "id"), + resource.TestCheckResourceAttrPair(dataResourcePath, "id", resourcePath, "id"), ), }, }, @@ -47,14 +50,12 @@ func TestAccDataSourceArchitectSchedule(t *testing.T) { } func generateScheduleDataSource( - resourceLabel string, - name string, - // Must explicitly use depends_on in terraform v0.13 when a data source references a resource - // Fixed in v0.14 https://github.com/hashicorp/terraform/pull/26284 + resourceLabel, + name, dependsOnResource string) string { - return fmt.Sprintf(`data "genesyscloud_architect_schedules" "%s" { + return fmt.Sprintf(`data "%s" "%s" { name = "%s" depends_on=[%s] } - `, resourceLabel, name, dependsOnResource) + `, ResourceType, resourceLabel, name, dependsOnResource) } diff --git a/genesyscloud/architect_schedules/genesyscloud_architect_schedules_proxy.go b/genesyscloud/architect_schedules/genesyscloud_architect_schedules_proxy.go index 7994f2bca..4ec91bd56 100644 --- a/genesyscloud/architect_schedules/genesyscloud_architect_schedules_proxy.go +++ b/genesyscloud/architect_schedules/genesyscloud_architect_schedules_proxy.go @@ -6,7 +6,7 @@ import ( "log" rc "terraform-provider-genesyscloud/genesyscloud/resource_cache" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" ) /* diff --git a/genesyscloud/architect_schedules/resource_genesyscloud_architect_schedules.go b/genesyscloud/architect_schedules/resource_genesyscloud_architect_schedules.go index ed558773e..b0d2f2be5 100644 --- a/genesyscloud/architect_schedules/resource_genesyscloud_architect_schedules.go +++ b/genesyscloud/architect_schedules/resource_genesyscloud_architect_schedules.go @@ -19,11 +19,9 @@ import ( "terraform-provider-genesyscloud/genesyscloud/util/constants" "terraform-provider-genesyscloud/genesyscloud/util/resourcedata" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" ) -const timeFormat = "2006-01-02T15:04:05.000000" - func getAllArchitectSchedules(ctx context.Context, clientConfig *platformclientv2.Configuration) (resourceExporter.ResourceIDMetaMap, diag.Diagnostics) { proxy := getArchitectSchedulesProxy(clientConfig) resources := make(resourceExporter.ResourceIDMetaMap) @@ -51,7 +49,7 @@ func createArchitectSchedules(ctx context.Context, d *schema.ResourceData, meta description := d.Get("description").(string) start := d.Get("start").(string) end := d.Get("end").(string) - rrule := d.Get("rrule").(string) + rrule, _ := d.Get("rrule").(string) //The first parameter of the Parse() method specifies the date and time format/layout that should be used to interpret the second parameter. schedStart, err := time.Parse(timeFormat, start) @@ -59,6 +57,12 @@ func createArchitectSchedules(ctx context.Context, d *schema.ResourceData, meta return util.BuildDiagnosticError(ResourceType, fmt.Sprintf("Failed to parse date %s", start), err) } + if rrule != "" { + if err := verifyStartDateConformsToRRule(schedStart, rrule, name); err != nil { + return util.BuildDiagnosticError(ResourceType, err.Error(), err) + } + } + schedEnd, err := time.Parse(timeFormat, end) if err != nil { return util.BuildDiagnosticError(ResourceType, fmt.Sprintf("Failed to parse date %s", end), err) @@ -116,7 +120,6 @@ func readArchitectSchedules(ctx context.Context, d *schema.ResourceData, meta in start := new(string) if scheduleResponse.Start != nil { *start = timeutil.Strftime(scheduleResponse.Start, "%Y-%m-%dT%H:%M:%S.%f") - } else { start = nil } @@ -124,7 +127,6 @@ func readArchitectSchedules(ctx context.Context, d *schema.ResourceData, meta in end := new(string) if scheduleResponse.End != nil { *end = timeutil.Strftime(scheduleResponse.End, "%Y-%m-%dT%H:%M:%S.%f") - } else { end = nil } @@ -151,7 +153,7 @@ func updateArchitectSchedules(ctx context.Context, d *schema.ResourceData, meta description := d.Get("description").(string) start := d.Get("start").(string) end := d.Get("end").(string) - rrule := d.Get("rrule").(string) + rrule, _ := d.Get("rrule").(string) //The first parameter of the Parse() method specifies the date and time format/layout that should be used to interpret the second parameter. schedStart, err := time.Parse(timeFormat, start) @@ -159,6 +161,12 @@ func updateArchitectSchedules(ctx context.Context, d *schema.ResourceData, meta return diag.Errorf("Failed to parse date %s: %s", start, err) } + if rrule != "" { + if err := verifyStartDateConformsToRRule(schedStart, rrule, name); err != nil { + return util.BuildDiagnosticError(ResourceType, err.Error(), err) + } + } + schedEnd, err := time.Parse(timeFormat, end) if err != nil { return diag.Errorf("Failed to parse date %s: %s", end, err) @@ -239,22 +247,3 @@ func deleteArchitectSchedules(ctx context.Context, d *schema.ResourceData, meta return retry.RetryableError(util.BuildWithRetriesApiDiagnosticError(ResourceType, fmt.Sprintf("Schedule %s still exists", d.Id()), proxyGetResponse)) }) } - -func GenerateArchitectSchedulesResource( - schedResourceLabel string, - name string, - divisionId string, - description string, - start string, - end string, - rrule string) string { - return fmt.Sprintf(`resource "genesyscloud_architect_schedules" "%s" { - name = "%s" - division_id = %s - description = "%s" - start = "%s" - end = "%s" - rrule = "%s" - } - `, schedResourceLabel, name, divisionId, description, start, end, rrule) -} diff --git a/genesyscloud/architect_schedules/resource_genesyscloud_architect_schedules_schema.go b/genesyscloud/architect_schedules/resource_genesyscloud_architect_schedules_schema.go index 7291da6be..6c8df2e5c 100644 --- a/genesyscloud/architect_schedules/resource_genesyscloud_architect_schedules_schema.go +++ b/genesyscloud/architect_schedules/resource_genesyscloud_architect_schedules_schema.go @@ -49,7 +49,7 @@ func ResourceArchitectSchedules() *schema.Resource { Optional: true, }, "start": { - Description: "Date time is represented as an ISO-8601 string without a timezone. For example: 2006-01-02T15:04:05.000000.", + Description: "Date time is represented as an ISO-8601 string without a timezone. For example: 2006-01-02T15:04:05.000000. The start date should be applicable to the schedule's recurrence rule.", Type: schema.TypeString, Required: true, ValidateDiagFunc: validators.ValidateLocalDateTimes, diff --git a/genesyscloud/architect_schedules/resource_genesyscloud_architect_schedules_test.go b/genesyscloud/architect_schedules/resource_genesyscloud_architect_schedules_test.go index f2301f788..b59cbb955 100644 --- a/genesyscloud/architect_schedules/resource_genesyscloud_architect_schedules_test.go +++ b/genesyscloud/architect_schedules/resource_genesyscloud_architect_schedules_test.go @@ -2,6 +2,7 @@ package architect_schedules import ( "fmt" + "regexp" authDivision "terraform-provider-genesyscloud/genesyscloud/auth_division" "terraform-provider-genesyscloud/genesyscloud/provider" "terraform-provider-genesyscloud/genesyscloud/util" @@ -10,9 +11,11 @@ import ( "github.com/google/uuid" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" ) +const errorMessageToMatch = "invalid start date." + func TestAccResourceArchitectSchedules(t *testing.T) { var ( schedResourceLabel1 = "arch-sched1" @@ -28,6 +31,9 @@ func TestAccResourceArchitectSchedules(t *testing.T) { divResourceLabel = "test-division" divName = "terraform-" + uuid.NewString() + + resourcePath1 = ResourceType + "." + schedResourceLabel1 + resourcePath2 = ResourceType + "." + schedResourceLabel2 ) resource.Test(t, resource.TestCase{ @@ -46,12 +52,12 @@ func TestAccResourceArchitectSchedules(t *testing.T) { rrule, ), Check: resource.ComposeTestCheckFunc( - resource.TestCheckResourceAttr("genesyscloud_architect_schedules."+schedResourceLabel1, "name", name), - resource.TestCheckResourceAttr("genesyscloud_architect_schedules."+schedResourceLabel1, "description", description), - resource.TestCheckResourceAttr("genesyscloud_architect_schedules."+schedResourceLabel1, "start", start), - resource.TestCheckResourceAttr("genesyscloud_architect_schedules."+schedResourceLabel1, "end", end), - resource.TestCheckResourceAttr("genesyscloud_architect_schedules."+schedResourceLabel1, "rrule", rrule), - provider.TestDefaultHomeDivision("genesyscloud_architect_schedules."+schedResourceLabel1), + resource.TestCheckResourceAttr(resourcePath1, "name", name), + resource.TestCheckResourceAttr(resourcePath1, "description", description), + resource.TestCheckResourceAttr(resourcePath1, "start", start), + resource.TestCheckResourceAttr(resourcePath1, "end", end), + resource.TestCheckResourceAttr(resourcePath1, "rrule", rrule), + provider.TestDefaultHomeDivision(resourcePath1), ), }, { @@ -66,12 +72,12 @@ func TestAccResourceArchitectSchedules(t *testing.T) { rrule, ), Check: resource.ComposeTestCheckFunc( - resource.TestCheckResourceAttr("genesyscloud_architect_schedules."+schedResourceLabel1, "name", name), - resource.TestCheckResourceAttr("genesyscloud_architect_schedules."+schedResourceLabel1, "description", description), - resource.TestCheckResourceAttr("genesyscloud_architect_schedules."+schedResourceLabel1, "start", start2), - resource.TestCheckResourceAttr("genesyscloud_architect_schedules."+schedResourceLabel1, "end", end), - resource.TestCheckResourceAttr("genesyscloud_architect_schedules."+schedResourceLabel1, "rrule", rrule), - provider.TestDefaultHomeDivision("genesyscloud_architect_schedules."+schedResourceLabel1), + resource.TestCheckResourceAttr(resourcePath1, "name", name), + resource.TestCheckResourceAttr(resourcePath1, "description", description), + resource.TestCheckResourceAttr(resourcePath1, "start", start2), + resource.TestCheckResourceAttr(resourcePath1, "end", end), + resource.TestCheckResourceAttr(resourcePath1, "rrule", rrule), + provider.TestDefaultHomeDivision(resourcePath1), ), }, { @@ -86,17 +92,17 @@ func TestAccResourceArchitectSchedules(t *testing.T) { rrule, ), Check: resource.ComposeTestCheckFunc( - resource.TestCheckResourceAttr("genesyscloud_architect_schedules."+schedResourceLabel2, "name", name2), - resource.TestCheckResourceAttr("genesyscloud_architect_schedules."+schedResourceLabel2, "description", description), - resource.TestCheckResourceAttr("genesyscloud_architect_schedules."+schedResourceLabel2, "start", start), - resource.TestCheckResourceAttr("genesyscloud_architect_schedules."+schedResourceLabel2, "end", end), - resource.TestCheckResourceAttr("genesyscloud_architect_schedules."+schedResourceLabel2, "rrule", rrule), - resource.TestCheckResourceAttrPair("genesyscloud_architect_schedules."+schedResourceLabel2, "division_id", "genesyscloud_auth_division."+divResourceLabel, "id"), + resource.TestCheckResourceAttr(resourcePath2, "name", name2), + resource.TestCheckResourceAttr(resourcePath2, "description", description), + resource.TestCheckResourceAttr(resourcePath2, "start", start), + resource.TestCheckResourceAttr(resourcePath2, "end", end), + resource.TestCheckResourceAttr(resourcePath2, "rrule", rrule), + resource.TestCheckResourceAttrPair(resourcePath2, "division_id", "genesyscloud_auth_division."+divResourceLabel, "id"), ), }, { // Import/Read - ResourceName: "genesyscloud_architect_schedules." + schedResourceLabel2, + ResourceName: resourcePath2, ImportState: true, ImportStateVerify: true, }, @@ -105,23 +111,112 @@ func TestAccResourceArchitectSchedules(t *testing.T) { }) } +func TestAccResourceArchitectSchedulesCreateFailsWhenStartDateNotInRRule(t *testing.T) { + var ( + schedResourceLabel = "schedule" + name = "CX as Code Schedule " + uuid.NewString() + description = "Sample Schedule by CX as Code" + start = "2021-08-07T22:00:00.000000" // Saturday + end = "2021-08-08T23:00:00.000000" + rrule = "FREQ=DAILY;INTERVAL=1;BYDAY=MO,TU,WE,THU,FR,SU" + ) + + resource.Test(t, resource.TestCase{ + PreCheck: func() { util.TestAccPreCheck(t) }, + ProviderFactories: provider.GetProviderFactories(providerResources, providerDataSources), + Steps: []resource.TestStep{ + { + // Create + Config: GenerateArchitectSchedulesResource( + schedResourceLabel, + name, + util.NullValue, + description, + start, + end, + rrule, + ), + ExpectError: regexp.MustCompile(errorMessageToMatch), + }, + }, + CheckDestroy: testVerifySchedulesDestroyed, + }) +} + +func TestAccResourceArchitectSchedulesUpdateFailsWhenStartDateNotInRRule(t *testing.T) { + var ( + schedResourceLabel = "schedule" + name = "CX as Code Schedule " + uuid.NewString() + description = "Sample Schedule by CX as Code" + rrule = "FREQ=DAILY;INTERVAL=1;BYDAY=MO,TU,WE,TH,FR" + + validStart = "2021-08-06T22:00:00.000000" // Friday + validEnd = "2021-08-06T23:00:00.000000" + + startUpdate = "2021-08-08T22:00:00.000000" // Sunday + endUpdate = "2021-08-09T22:00:00.000000" + + resourcePath = ResourceType + "." + schedResourceLabel + ) + + resource.Test(t, resource.TestCase{ + PreCheck: func() { util.TestAccPreCheck(t) }, + ProviderFactories: provider.GetProviderFactories(providerResources, providerDataSources), + Steps: []resource.TestStep{ + { + // Create + Config: GenerateArchitectSchedulesResource( + schedResourceLabel, + name, + util.NullValue, + description, + validStart, + validEnd, + rrule, + ), + Check: resource.ComposeTestCheckFunc( + resource.TestCheckResourceAttr(resourcePath, "name", name), + resource.TestCheckResourceAttr(resourcePath, "description", description), + resource.TestCheckResourceAttr(resourcePath, "start", validStart), + resource.TestCheckResourceAttr(resourcePath, "end", validEnd), + resource.TestCheckResourceAttr(resourcePath, "rrule", rrule), + provider.TestDefaultHomeDivision(resourcePath), + ), + }, + { + // Update + Config: GenerateArchitectSchedulesResource( + schedResourceLabel, + name, + util.NullValue, + description, + startUpdate, + endUpdate, + rrule, + ), + ExpectError: regexp.MustCompile(errorMessageToMatch), + }, + }, + CheckDestroy: testVerifySchedulesDestroyed, + }) +} + func testVerifySchedulesDestroyed(state *terraform.State) error { archAPI := platformclientv2.NewArchitectApi() for _, rs := range state.RootModule().Resources { - if rs.Type != "genesyscloud_architect_schedules" { + if rs.Type != ResourceType { continue } - sched, resp, err := archAPI.GetArchitectSchedule(rs.Primary.ID) - if sched != nil { - return fmt.Errorf("Schedule (%s) still exists", rs.Primary.ID) - } else if util.IsStatus404(resp) { - // Schedule not found as expected - continue - } else { - // Unexpected error - return fmt.Errorf("Unexpected error: %s", err) + _, resp, err := archAPI.GetArchitectSchedule(rs.Primary.ID) + if err != nil { + if util.IsStatus404(resp) { + // Schedule not found as expected + continue + } + return fmt.Errorf("unexpected error: %s", err) } + return fmt.Errorf("schedule (%s) still exists", rs.Primary.ID) } // Success. All schedules destroyed return nil diff --git a/genesyscloud/architect_schedules/resource_genesyscloud_architect_schedules_unit_test.go b/genesyscloud/architect_schedules/resource_genesyscloud_architect_schedules_unit_test.go new file mode 100644 index 000000000..94709501f --- /dev/null +++ b/genesyscloud/architect_schedules/resource_genesyscloud_architect_schedules_unit_test.go @@ -0,0 +1,106 @@ +package architect_schedules + +import ( + "terraform-provider-genesyscloud/genesyscloud/util/lists" + "testing" + "time" +) + +func TestUnitGetByDaysFromRRule(t *testing.T) { + type inputAndResults struct { + input string + expectedOutput []string + } + + testCases := []inputAndResults{ + { + input: "", + expectedOutput: []string{}, + }, + { + input: "FREQ=WEEKLY;INTERVAL=1;BYDAY=MO", + expectedOutput: []string{time.Monday.String()}, + }, + { + input: "FREQ=MONTHLY;INTERVAL=1;BYMONTHDAY=12;BYDAY=TH,FR", + expectedOutput: []string{time.Thursday.String(), time.Friday.String()}, + }, + { + input: "FREQ=YEARLY;COUNT=3;INTERVAL=1;BYMONTH=11;BYMONTHDAY=1", + expectedOutput: []string{}, + }, + { + input: "FREQ=WEEKLY;INTERVAL=1;BYDAY=MO,TU,WE,TH,FR,SA,SU", + expectedOutput: []string{ + time.Monday.String(), + time.Tuesday.String(), + time.Wednesday.String(), + time.Thursday.String(), + time.Friday.String(), + time.Saturday.String(), + time.Sunday.String(), + }, + }, + { + input: "FREQ=MONTHLY;BYDAY=MO,FR;INTERVAL=1;BYMONTHDAY=12;", + expectedOutput: []string{time.Monday.String(), time.Friday.String()}, + }, + } + + for _, testCase := range testCases { + result := getDaysFromRRule(testCase.input) + if len(result) != len(testCase.expectedOutput) { + t.Errorf("getDaysFromRRule(%q) returned %d results, expected %d", testCase.input, len(result), len(testCase.expectedOutput)) + } + if !lists.AreEquivalent(result, testCase.expectedOutput) { + t.Errorf("lists are not equivalent, expected %v, got %v", testCase.expectedOutput, result) + } + } +} + +func TestUnitVerifyStartDateConformsToRRule(t *testing.T) { + const scheduleName = "example schedule" + + type inputAndResults struct { + dateTime string + rrule string + expectError bool + } + + testCases := []inputAndResults{ + { + dateTime: "2018-05-07T09:00:00.000000", // Monday + rrule: "FREQ=WEEKLY;INTERVAL=1;BYDAY=MO", + expectError: false, + }, + { + dateTime: "2018-11-16T09:43:00.000000", // Friday + rrule: "FREQ=WEEKLY;INTERVAL=1;BYDAY=MO,TU,WE,TH,FR,SA,SU", + expectError: false, + }, + { + dateTime: "2016-03-31T10:00:00.000000", // Thursday + rrule: "FREQ=WEEKLY;INTERVAL=1;BYDAY=MO", + expectError: true, + }, + { + dateTime: "2020-11-16T07:31:00.000000", // Monday + rrule: "FREQ=YEARLY;COUNT=3;INTERVAL=1;BYMONTH=11;BYMONTHDAY=1", + expectError: false, + }, + } + + for i, testCase := range testCases { + dt, err := time.Parse(timeFormat, testCase.dateTime) + if err != nil { + t.Errorf("failed to parse date time %q: %s", testCase.dateTime, err) + } + err = verifyStartDateConformsToRRule(dt, testCase.rrule, scheduleName) + if err != nil && !testCase.expectError { + t.Errorf("verifyStartDateConformsToRRule returned unexpected error on test case #%d: %s", i+1, err.Error()) + } + if err == nil && testCase.expectError { + t.Errorf("Expected verifyStartDateConformsToRRule to return an error for test case #%d, got nil", i+1) + } + } +} diff --git a/genesyscloud/architect_schedules/resource_genesyscloud_architect_schedules_utils.go b/genesyscloud/architect_schedules/resource_genesyscloud_architect_schedules_utils.go new file mode 100644 index 000000000..decac24c3 --- /dev/null +++ b/genesyscloud/architect_schedules/resource_genesyscloud_architect_schedules_utils.go @@ -0,0 +1,77 @@ +package architect_schedules + +import ( + "fmt" + "regexp" + "strings" + "terraform-provider-genesyscloud/genesyscloud/util/lists" + "time" +) + +const timeFormat = "2006-01-02T15:04:05.000000" + +// Mapping rrule day abbreviations to full day names +var rruleDayMap = map[string]string{ + "MO": time.Monday.String(), + "TU": time.Tuesday.String(), + "WE": time.Wednesday.String(), + "TH": time.Thursday.String(), + "FR": time.Friday.String(), + "SA": time.Saturday.String(), + "SU": time.Sunday.String(), +} + +func verifyStartDateConformsToRRule(dateTime time.Time, rrule string, scheduleName string) error { + scheduleDays := getDaysFromRRule(rrule) + if len(scheduleDays) == 0 { + return nil + } + if !lists.SubStringInSlice(dateTime.Weekday().String(), scheduleDays) { + return fmt.Errorf("invalid start date. %s is not specified in the rrule for schedule '%s'", dateTime.Weekday().String(), scheduleName) + } + return nil +} + +// getDaysFromRRule parses the rrule to establish which weekdays are specified, if any. +func getDaysFromRRule(rrule string) []string { + // Match BYDAY= followed by uppercase letters and commas + re := regexp.MustCompile(`BYDAY=([A-Z,]+)(?:;|$)`) + + matches := re.FindStringSubmatch(rrule) + if len(matches) < 2 { + // No BYDAY parameter found + return []string{} + } + + // Split the matched days on commas + days := strings.Split(matches[1], ",") + + // Convert abbreviations to full day names + fullDays := make([]string, 0, len(days)) + for _, day := range days { + if fullDay, ok := rruleDayMap[day]; ok { + fullDays = append(fullDays, fullDay) + } + } + + return fullDays +} + +func GenerateArchitectSchedulesResource( + schedResourceLabel, + name, + divisionId, + description, + start, + end, + rrule string) string { + return fmt.Sprintf(`resource "%s" "%s" { + name = "%s" + division_id = %s + description = "%s" + start = "%s" + end = "%s" + rrule = "%s" + } + `, ResourceType, schedResourceLabel, name, divisionId, description, start, end, rrule) +} diff --git a/genesyscloud/architect_user_prompt/genesyscloud_architect_user_prompt_proxy.go b/genesyscloud/architect_user_prompt/genesyscloud_architect_user_prompt_proxy.go index d22843aef..d3f36bf3f 100644 --- a/genesyscloud/architect_user_prompt/genesyscloud_architect_user_prompt_proxy.go +++ b/genesyscloud/architect_user_prompt/genesyscloud_architect_user_prompt_proxy.go @@ -15,7 +15,7 @@ import ( "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/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" ) // internalProxy holds a proxy instance that can be used throughout the package diff --git a/genesyscloud/architect_user_prompt/resource_genesyscloud_architect_user_prompt.go b/genesyscloud/architect_user_prompt/resource_genesyscloud_architect_user_prompt.go index 26de0742d..835578fd2 100644 --- a/genesyscloud/architect_user_prompt/resource_genesyscloud_architect_user_prompt.go +++ b/genesyscloud/architect_user_prompt/resource_genesyscloud_architect_user_prompt.go @@ -18,7 +18,7 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" ) func getAllUserPrompts(ctx context.Context, clientConfig *platformclientv2.Configuration) (resourceExporter.ResourceIDMetaMap, diag.Diagnostics) { diff --git a/genesyscloud/architect_user_prompt/resource_genesyscloud_architect_user_prompt_test.go b/genesyscloud/architect_user_prompt/resource_genesyscloud_architect_user_prompt_test.go index d9911f6d5..f1669f9b2 100644 --- a/genesyscloud/architect_user_prompt/resource_genesyscloud_architect_user_prompt_test.go +++ b/genesyscloud/architect_user_prompt/resource_genesyscloud_architect_user_prompt_test.go @@ -17,7 +17,7 @@ import ( "github.com/google/uuid" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" ) func TestAccResourceUserPromptBasic(t *testing.T) { diff --git a/genesyscloud/architect_user_prompt/resource_genesyscloud_architect_user_prompt_utils.go b/genesyscloud/architect_user_prompt/resource_genesyscloud_architect_user_prompt_utils.go index 4ccb59de1..aea738c23 100644 --- a/genesyscloud/architect_user_prompt/resource_genesyscloud_architect_user_prompt_utils.go +++ b/genesyscloud/architect_user_prompt/resource_genesyscloud_architect_user_prompt_utils.go @@ -15,7 +15,7 @@ import ( "terraform-provider-genesyscloud/genesyscloud/util/testrunner" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" ) type PromptAudioData struct { diff --git a/genesyscloud/auth_division/genesyscloud_auth_division_proxy.go b/genesyscloud/auth_division/genesyscloud_auth_division_proxy.go index bcbc5e3b4..7ad956c25 100644 --- a/genesyscloud/auth_division/genesyscloud_auth_division_proxy.go +++ b/genesyscloud/auth_division/genesyscloud_auth_division_proxy.go @@ -6,7 +6,7 @@ import ( "log" rc "terraform-provider-genesyscloud/genesyscloud/resource_cache" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" ) var internalProxy *authDivisionProxy diff --git a/genesyscloud/auth_division/resource_genesyscloud_auth_division.go b/genesyscloud/auth_division/resource_genesyscloud_auth_division.go index e4acd1699..96adcdb1a 100644 --- a/genesyscloud/auth_division/resource_genesyscloud_auth_division.go +++ b/genesyscloud/auth_division/resource_genesyscloud_auth_division.go @@ -18,7 +18,7 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" ) func getAllAuthDivisions(ctx context.Context, clientConfig *platformclientv2.Configuration) (resourceExporter.ResourceIDMetaMap, diag.Diagnostics) { diff --git a/genesyscloud/auth_division/resource_genesyscloud_auth_division_test.go b/genesyscloud/auth_division/resource_genesyscloud_auth_division_test.go index a2e86dc1b..d807f67e6 100644 --- a/genesyscloud/auth_division/resource_genesyscloud_auth_division_test.go +++ b/genesyscloud/auth_division/resource_genesyscloud_auth_division_test.go @@ -14,7 +14,7 @@ import ( "github.com/google/uuid" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" ) var ( diff --git a/genesyscloud/auth_role/data_source_genesyscloud_auth_role.go b/genesyscloud/auth_role/data_source_genesyscloud_auth_role.go index 56e75806f..26a645e4f 100644 --- a/genesyscloud/auth_role/data_source_genesyscloud_auth_role.go +++ b/genesyscloud/auth_role/data_source_genesyscloud_auth_role.go @@ -10,7 +10,7 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "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/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" ) /* @@ -18,27 +18,35 @@ import ( for the resource. */ -// dataSourceAuthRoleRead retrieves by name the id in question +// DataSourceAuthRoleRead retrieves by name the id in question func DataSourceAuthRoleRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { - sdkConfig := m.(*provider.ProviderMeta).ClientConfig - authAPI := platformclientv2.NewAuthorizationApiWithConfig(sdkConfig) - - name := d.Get("name").(string) - - // Query role by name. Retry in case search has not yet indexed the role. - return util.WithRetries(ctx, 15*time.Second, func() *retry.RetryError { - const pageSize = 100 - const pageNum = 1 - roles, proxyResponse, getErr := authAPI.GetAuthorizationRoles(pageSize, pageNum, "", nil, "", "", name, nil, nil, false, nil) - if getErr != nil { - return retry.NonRetryableError(util.BuildWithRetriesApiDiagnosticError(ResourceType, fmt.Sprintf("Error requesting role %s | error: %s", name, getErr), proxyResponse)) - } + var ( + sdkConfig = m.(*provider.ProviderMeta).ClientConfig + proxy = getAuthRoleProxy(sdkConfig) + + name = d.Get("name").(string) + + response *platformclientv2.APIResponse + id string + ) - if roles.Entities == nil || len(*roles.Entities) == 0 { - return retry.RetryableError(util.BuildWithRetriesApiDiagnosticError(ResourceType, fmt.Sprintf("No authorization roles found with name %s", name), proxyResponse)) + diagErr := util.WithRetries(ctx, 15*time.Second, func() *retry.RetryError { + roleId, retryable, resp, err := proxy.getAuthRoleIdByName(ctx, name) + if err != nil { + response = resp + if retryable { + return retry.RetryableError(err) + } + return retry.NonRetryableError(err) } - role := (*roles.Entities)[0] - d.SetId(*role.Id) + id = roleId return nil }) + + if diagErr != nil { + return util.BuildAPIDiagnosticError(ResourceType, fmt.Sprintf("%v", diagErr), response) + } + + d.SetId(id) + return nil } diff --git a/genesyscloud/auth_role/genesyscloud_auth_role_proxy.go b/genesyscloud/auth_role/genesyscloud_auth_role_proxy.go index 325bc7b8c..a33274c93 100644 --- a/genesyscloud/auth_role/genesyscloud_auth_role_proxy.go +++ b/genesyscloud/auth_role/genesyscloud_auth_role_proxy.go @@ -3,10 +3,9 @@ package auth_role import ( "context" "fmt" - rc "terraform-provider-genesyscloud/genesyscloud/resource_cache" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" ) /* @@ -169,8 +168,25 @@ func getAllAuthRoleFn(ctx context.Context, p *authRoleProxy) (*[]platformclientv } // getAuthRoleIdByNameFn is an implementation of the function to get a Genesys Cloud auth role by name -func getAuthRoleIdByNameFn(ctx context.Context, p *authRoleProxy, name string) (id string, retryable bool, response *platformclientv2.APIResponse, err error) { - return "", false, nil, nil +func getAuthRoleIdByNameFn(_ context.Context, p *authRoleProxy, name string) (id string, retryable bool, response *platformclientv2.APIResponse, err error) { + const pageSize = 100 + const pageNum = 1 + roles, resp, getErr := p.authorizationApi.GetAuthorizationRoles(pageSize, pageNum, "", nil, "", "", name, nil, nil, false, nil) + if getErr != nil { + return "", false, resp, getErr + } + + if roles.Entities == nil || len(*roles.Entities) == 0 { + return "", true, resp, fmt.Errorf("no authorization roles found with name %s", name) + } + + for _, role := range *roles.Entities { + if *role.Name == name { + return *role.Id, false, resp, nil + } + } + + return "", true, resp, fmt.Errorf("no authorization roles found with name %s", name) } // getAuthRoleByIdFn is an implementation of the function to get a Genesys Cloud auth role by Id diff --git a/genesyscloud/auth_role/resource_genesyscloud_auth_role.go b/genesyscloud/auth_role/resource_genesyscloud_auth_role.go index 30dbf3dbd..7415b010e 100644 --- a/genesyscloud/auth_role/resource_genesyscloud_auth_role.go +++ b/genesyscloud/auth_role/resource_genesyscloud_auth_role.go @@ -16,7 +16,7 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "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/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" ) /* @@ -107,20 +107,20 @@ func readAuthRole(ctx context.Context, d *schema.ResourceData, meta interface{}) return retry.NonRetryableError(util.BuildWithRetriesApiDiagnosticError(ResourceType, fmt.Sprintf("Failed to read role %s | error: %s", d.Id(), getErr), proxyResponse)) } - d.Set("name", *role.Name) + _ = d.Set("name", *role.Name) resourcedata.SetNillableValue(d, "description", role.Description) resourcedata.SetNillableValue(d, "default_role_id", role.DefaultRoleId) if role.Permissions != nil { - d.Set("permissions", lists.StringListToSet(*role.Permissions)) + _ = d.Set("permissions", lists.StringListToSet(*role.Permissions)) } else { - d.Set("permissions", nil) + _ = d.Set("permissions", nil) } if role.PermissionPolicies != nil { - d.Set("permission_policies", flattenRolePermissionPolicies(*role.PermissionPolicies)) + _ = d.Set("permission_policies", flattenRolePermissionPolicies(*role.PermissionPolicies)) } else { - d.Set("permission_policies", nil) + _ = d.Set("permission_policies", nil) } log.Printf("Read role %s %s", d.Id(), *role.Name) diff --git a/genesyscloud/auth_role/resource_genesyscloud_auth_role_test.go b/genesyscloud/auth_role/resource_genesyscloud_auth_role_test.go index 907b783fc..4f290e781 100644 --- a/genesyscloud/auth_role/resource_genesyscloud_auth_role_test.go +++ b/genesyscloud/auth_role/resource_genesyscloud_auth_role_test.go @@ -14,7 +14,7 @@ import ( "github.com/google/uuid" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" ) func TestAccResourceAuthRoleDefault(t *testing.T) { @@ -270,11 +270,9 @@ func TestAccResourceAuthRoleConditions(t *testing.T) { generateRolePermPolicyCondTerm( varNameQueue, opEq, - fmt.Sprintf(` - operands { + `operands { type = "USER" - } - `), + }`, ), ), ), @@ -304,11 +302,9 @@ func TestAccResourceAuthRoleConditions(t *testing.T) { generateRolePermPolicyCondTerm( varNameQueue, opEq, - fmt.Sprintf(` - operands { + `operands { type = "VARIABLE" - } - `), + }`, ), ), ), @@ -398,10 +394,10 @@ func validateRolePermissions(roleResourcePath string, permissions ...string) res return func(state *terraform.State) error { roleResource, ok := state.RootModule().Resources[roleResourcePath] if !ok { - return fmt.Errorf("Failed to find role %s in state", roleResourcePath) + return fmt.Errorf("failed to find role %s in state", roleResourcePath) } - numPermsAttr, _ := roleResource.Primary.Attributes["permissions.#"] + numPermsAttr := roleResource.Primary.Attributes["permissions.#"] numPerms, _ := strconv.Atoi(numPermsAttr) configPerms := make([]string, numPerms) for i := 0; i < numPerms; i++ { @@ -431,13 +427,13 @@ func validatePermissionPolicyTest(roleResourcePath string, domain string, entity } roleAttrs := roleResource.Primary.Attributes - numPermsAttr, _ := roleAttrs["permission_policies.#"] + numPermsAttr := roleAttrs["permission_policies.#"] numPerms, _ := strconv.Atoi(numPermsAttr) for i := 0; i < numPerms; i++ { if roleAttrs["permission_policies."+strconv.Itoa(i)+".domain"] == domain && roleAttrs["permission_policies."+strconv.Itoa(i)+".entity_name"] == entityName { - numActionsAttr, _ := roleAttrs["permission_policies."+strconv.Itoa(i)+".action_set.#"] + numActionsAttr := roleAttrs["permission_policies."+strconv.Itoa(i)+".action_set.#"] numActions, _ := strconv.Atoi(numActionsAttr) stateActions := make([]string, numActions) for j := 0; j < numActions; j++ { @@ -479,7 +475,7 @@ func validatePermPolicyCondition( } roleAttrs := roleResource.Primary.Attributes - numPermsAttr, _ := roleAttrs["permission_policies.#"] + numPermsAttr := roleAttrs["permission_policies.#"] numPerms, _ := strconv.Atoi(numPermsAttr) for i := 0; i < numPerms; i++ { strNum := strconv.Itoa(i) @@ -487,7 +483,7 @@ func validatePermPolicyCondition( roleAttrs["permission_policies."+strNum+".entity_name"] == entityName { // Check condition exists and matches - numCondAttr, _ := roleAttrs["permission_policies."+strNum+".conditions.#"] + numCondAttr := roleAttrs["permission_policies."+strNum+".conditions.#"] numCond, _ := strconv.Atoi(numCondAttr) if numCond == 0 { diff --git a/genesyscloud/auth_role/resource_genesyscloud_auth_role_utils.go b/genesyscloud/auth_role/resource_genesyscloud_auth_role_utils.go index e8a593e49..05a19b7b6 100644 --- a/genesyscloud/auth_role/resource_genesyscloud_auth_role_utils.go +++ b/genesyscloud/auth_role/resource_genesyscloud_auth_role_utils.go @@ -6,7 +6,7 @@ import ( "terraform-provider-genesyscloud/genesyscloud/util/lists" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" ) func validatePermissionPolicy(proxy *authRoleProxy, policy platformclientv2.Domainpermissionpolicy) (*platformclientv2.APIResponse, error) { diff --git a/genesyscloud/authorization_product/data_source_genesyscloud_authorization_product_test.go b/genesyscloud/authorization_product/data_source_genesyscloud_authorization_product_test.go index 90f984d27..95c7cc4c3 100644 --- a/genesyscloud/authorization_product/data_source_genesyscloud_authorization_product_test.go +++ b/genesyscloud/authorization_product/data_source_genesyscloud_authorization_product_test.go @@ -7,7 +7,7 @@ import ( "github.com/google/uuid" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" "github.com/stretchr/testify/assert" "golang.org/x/net/context" diff --git a/genesyscloud/authorization_product/genesyscloud_authorization_product_proxy.go b/genesyscloud/authorization_product/genesyscloud_authorization_product_proxy.go index 1512fa618..3ab7a8ce0 100644 --- a/genesyscloud/authorization_product/genesyscloud_authorization_product_proxy.go +++ b/genesyscloud/authorization_product/genesyscloud_authorization_product_proxy.go @@ -4,7 +4,7 @@ import ( "context" "fmt" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" ) /* diff --git a/genesyscloud/consistency_checker/consistency_checker.go b/genesyscloud/consistency_checker/consistency_checker.go index d04d15f27..51790f176 100644 --- a/genesyscloud/consistency_checker/consistency_checker.go +++ b/genesyscloud/consistency_checker/consistency_checker.go @@ -201,21 +201,6 @@ func compareValues(oldValue, newValue interface{}, slice1Index, slice2Index int, } } -func (c *ConsistencyCheck) isComputed(d *schema.ResourceData, key string) bool { - schemaInterface := getUnexportedField(reflect.ValueOf(d).Elem().FieldByName("schema")) - resourceSchema := schemaInterface.(map[string]*schema.Schema) - - k := key - if strings.Contains(key, ".") { - k = strings.Split(key, ".")[0] - } - if resourceSchema[k] == nil { - return false - } - - return resourceSchema[k].Computed -} - func (c *ConsistencyCheck) CheckState(currentState *schema.ResourceData) *retry.RetryError { if c.isEmptyState == nil { panic("consistencyCheck must be initialized with NewConsistencyCheck") diff --git a/genesyscloud/conversations_messaging_integrations_instagram/genesyscloud_conversations_messaging_integrations_instagram_proxy.go b/genesyscloud/conversations_messaging_integrations_instagram/genesyscloud_conversations_messaging_integrations_instagram_proxy.go index 3c8647514..aabb17cda 100644 --- a/genesyscloud/conversations_messaging_integrations_instagram/genesyscloud_conversations_messaging_integrations_instagram_proxy.go +++ b/genesyscloud/conversations_messaging_integrations_instagram/genesyscloud_conversations_messaging_integrations_instagram_proxy.go @@ -5,7 +5,7 @@ import ( "fmt" "log" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" ) /* diff --git a/genesyscloud/conversations_messaging_integrations_instagram/resource_genesyscloud_conversations_messaging_integrations_instagram.go b/genesyscloud/conversations_messaging_integrations_instagram/resource_genesyscloud_conversations_messaging_integrations_instagram.go index 74a8be980..cd48fd29d 100644 --- a/genesyscloud/conversations_messaging_integrations_instagram/resource_genesyscloud_conversations_messaging_integrations_instagram.go +++ b/genesyscloud/conversations_messaging_integrations_instagram/resource_genesyscloud_conversations_messaging_integrations_instagram.go @@ -11,7 +11,7 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" "terraform-provider-genesyscloud/genesyscloud/consistency_checker" diff --git a/genesyscloud/conversations_messaging_integrations_instagram/resource_genesyscloud_conversations_messaging_integrations_instagram_test.go b/genesyscloud/conversations_messaging_integrations_instagram/resource_genesyscloud_conversations_messaging_integrations_instagram_test.go index 0ec6060cc..692905bb9 100644 --- a/genesyscloud/conversations_messaging_integrations_instagram/resource_genesyscloud_conversations_messaging_integrations_instagram_test.go +++ b/genesyscloud/conversations_messaging_integrations_instagram/resource_genesyscloud_conversations_messaging_integrations_instagram_test.go @@ -8,7 +8,7 @@ import ( "github.com/google/uuid" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" "terraform-provider-genesyscloud/genesyscloud/provider" "terraform-provider-genesyscloud/genesyscloud/util" diff --git a/genesyscloud/conversations_messaging_integrations_instagram/resource_genesyscloud_conversations_messaging_integrations_instagram_unit_test.go b/genesyscloud/conversations_messaging_integrations_instagram/resource_genesyscloud_conversations_messaging_integrations_instagram_unit_test.go index 972f188c0..294185dc1 100644 --- a/genesyscloud/conversations_messaging_integrations_instagram/resource_genesyscloud_conversations_messaging_integrations_instagram_unit_test.go +++ b/genesyscloud/conversations_messaging_integrations_instagram/resource_genesyscloud_conversations_messaging_integrations_instagram_unit_test.go @@ -9,7 +9,7 @@ import ( "github.com/google/uuid" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" "github.com/stretchr/testify/assert" ) diff --git a/genesyscloud/conversations_messaging_integrations_instagram/resource_genesyscloud_conversations_messaging_integrations_instagram_utils.go b/genesyscloud/conversations_messaging_integrations_instagram/resource_genesyscloud_conversations_messaging_integrations_instagram_utils.go index 508188aa2..2ffce7d8f 100644 --- a/genesyscloud/conversations_messaging_integrations_instagram/resource_genesyscloud_conversations_messaging_integrations_instagram_utils.go +++ b/genesyscloud/conversations_messaging_integrations_instagram/resource_genesyscloud_conversations_messaging_integrations_instagram_utils.go @@ -4,7 +4,7 @@ import ( "fmt" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" ) /* diff --git a/genesyscloud/conversations_messaging_integrations_open/genesyscloud_conversations_messaging_integrations_open_proxy.go b/genesyscloud/conversations_messaging_integrations_open/genesyscloud_conversations_messaging_integrations_open_proxy.go index 3d757533b..2327166fe 100644 --- a/genesyscloud/conversations_messaging_integrations_open/genesyscloud_conversations_messaging_integrations_open_proxy.go +++ b/genesyscloud/conversations_messaging_integrations_open/genesyscloud_conversations_messaging_integrations_open_proxy.go @@ -5,7 +5,7 @@ import ( "fmt" "log" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" ) /* @@ -98,34 +98,31 @@ func createConversationsMessagingIntegrationsOpenFn(ctx context.Context, p *conv } // getAllConversationsMessagingIntegrationsOpenFn is the implementation for retrieving all conversations messaging integrations open in Genesys Cloud -func getAllConversationsMessagingIntegrationsOpenFn(ctx context.Context, p *conversationsMessagingIntegrationsOpenProxy) (*[]platformclientv2.Openintegration, *platformclientv2.APIResponse, error) { +func getAllConversationsMessagingIntegrationsOpenFn(_ context.Context, p *conversationsMessagingIntegrationsOpenProxy) (*[]platformclientv2.Openintegration, *platformclientv2.APIResponse, error) { var allOpenIntegrationRequests []platformclientv2.Openintegration const pageSize = 100 openIntegrationRequests, resp, err := p.conversationsApi.GetConversationsMessagingIntegrationsOpen(pageSize, 1, "", "", "") if err != nil { - return nil, resp, fmt.Errorf("Failed to get open integration request: %v", err) + return nil, resp, fmt.Errorf("failed to get open integration request: %v", err) } if openIntegrationRequests.Entities == nil || len(*openIntegrationRequests.Entities) == 0 { return &allOpenIntegrationRequests, resp, nil } - for _, openIntegrationRequest := range *openIntegrationRequests.Entities { - allOpenIntegrationRequests = append(allOpenIntegrationRequests, openIntegrationRequest) - } + + allOpenIntegrationRequests = append(allOpenIntegrationRequests, *openIntegrationRequests.Entities...) for pageNum := 2; pageNum <= *openIntegrationRequests.PageCount; pageNum++ { openIntegrationRequests, resp, err := p.conversationsApi.GetConversationsMessagingIntegrationsOpen(pageSize, pageNum, "", "", "") if err != nil { - return nil, resp, fmt.Errorf("Failed to get open integration request: %v", err) + return nil, resp, fmt.Errorf("failed to get open integration request: %v", err) } if openIntegrationRequests.Entities == nil || len(*openIntegrationRequests.Entities) == 0 { break } - for _, openIntegrationRequest := range *openIntegrationRequests.Entities { - allOpenIntegrationRequests = append(allOpenIntegrationRequests, openIntegrationRequest) - } + allOpenIntegrationRequests = append(allOpenIntegrationRequests, *openIntegrationRequests.Entities...) } return &allOpenIntegrationRequests, resp, nil diff --git a/genesyscloud/conversations_messaging_integrations_open/resource_genesyscloud_conversations_messaging_integrations_open.go b/genesyscloud/conversations_messaging_integrations_open/resource_genesyscloud_conversations_messaging_integrations_open.go index 8209b35c6..6960ed711 100644 --- a/genesyscloud/conversations_messaging_integrations_open/resource_genesyscloud_conversations_messaging_integrations_open.go +++ b/genesyscloud/conversations_messaging_integrations_open/resource_genesyscloud_conversations_messaging_integrations_open.go @@ -12,7 +12,7 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" "terraform-provider-genesyscloud/genesyscloud/consistency_checker" diff --git a/genesyscloud/conversations_messaging_integrations_open/resource_genesyscloud_conversations_messaging_integrations_open_test.go b/genesyscloud/conversations_messaging_integrations_open/resource_genesyscloud_conversations_messaging_integrations_open_test.go index fadc6d759..ae486bea1 100644 --- a/genesyscloud/conversations_messaging_integrations_open/resource_genesyscloud_conversations_messaging_integrations_open_test.go +++ b/genesyscloud/conversations_messaging_integrations_open/resource_genesyscloud_conversations_messaging_integrations_open_test.go @@ -6,7 +6,7 @@ import ( "github.com/google/uuid" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" "terraform-provider-genesyscloud/genesyscloud/provider" "terraform-provider-genesyscloud/genesyscloud/util" diff --git a/genesyscloud/conversations_messaging_integrations_open/resource_genesyscloud_conversations_messaging_integrations_open_utils.go b/genesyscloud/conversations_messaging_integrations_open/resource_genesyscloud_conversations_messaging_integrations_open_utils.go index 2ea7f5178..ad38d2b08 100644 --- a/genesyscloud/conversations_messaging_integrations_open/resource_genesyscloud_conversations_messaging_integrations_open_utils.go +++ b/genesyscloud/conversations_messaging_integrations_open/resource_genesyscloud_conversations_messaging_integrations_open_utils.go @@ -8,7 +8,7 @@ import ( "terraform-provider-genesyscloud/genesyscloud/util" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" ) /* diff --git a/genesyscloud/conversations_messaging_settings/genesyscloud_conversations_messaging_settings_proxy.go b/genesyscloud/conversations_messaging_settings/genesyscloud_conversations_messaging_settings_proxy.go index 922bab73b..d56fdd8e9 100644 --- a/genesyscloud/conversations_messaging_settings/genesyscloud_conversations_messaging_settings_proxy.go +++ b/genesyscloud/conversations_messaging_settings/genesyscloud_conversations_messaging_settings_proxy.go @@ -6,7 +6,7 @@ import ( "log" rc "terraform-provider-genesyscloud/genesyscloud/resource_cache" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" ) var internalProxy *conversationsMessagingSettingsProxy diff --git a/genesyscloud/conversations_messaging_settings/resource_genesyscloud_conversations_messaging_settings.go b/genesyscloud/conversations_messaging_settings/resource_genesyscloud_conversations_messaging_settings.go index 363c2252d..c3f2c1089 100644 --- a/genesyscloud/conversations_messaging_settings/resource_genesyscloud_conversations_messaging_settings.go +++ b/genesyscloud/conversations_messaging_settings/resource_genesyscloud_conversations_messaging_settings.go @@ -15,7 +15,7 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "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/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" ) func getAllAuthConversationsMessagingSettings(ctx context.Context, clientConfig *platformclientv2.Configuration) (resourceExporter.ResourceIDMetaMap, diag.Diagnostics) { diff --git a/genesyscloud/conversations_messaging_settings/resource_genesyscloud_conversations_messaging_settings_test.go b/genesyscloud/conversations_messaging_settings/resource_genesyscloud_conversations_messaging_settings_test.go index acd08e9a8..29b414d85 100644 --- a/genesyscloud/conversations_messaging_settings/resource_genesyscloud_conversations_messaging_settings_test.go +++ b/genesyscloud/conversations_messaging_settings/resource_genesyscloud_conversations_messaging_settings_test.go @@ -6,7 +6,7 @@ import ( "terraform-provider-genesyscloud/genesyscloud/util" "testing" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" diff --git a/genesyscloud/conversations_messaging_settings/resource_genesyscloud_conversations_messaging_settings_utils.go b/genesyscloud/conversations_messaging_settings/resource_genesyscloud_conversations_messaging_settings_utils.go index 23818f412..1620b3662 100644 --- a/genesyscloud/conversations_messaging_settings/resource_genesyscloud_conversations_messaging_settings_utils.go +++ b/genesyscloud/conversations_messaging_settings/resource_genesyscloud_conversations_messaging_settings_utils.go @@ -6,7 +6,7 @@ import ( "terraform-provider-genesyscloud/genesyscloud/util/resourcedata" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" ) func getConversationsMessagingSettingsFromResourceData(d *schema.ResourceData) platformclientv2.Messagingsettingrequest { diff --git a/genesyscloud/conversations_messaging_settings_default/genesyscloud_conversations_messaging_settings_default_proxy.go b/genesyscloud/conversations_messaging_settings_default/genesyscloud_conversations_messaging_settings_default_proxy.go index 2186a5012..21c136022 100644 --- a/genesyscloud/conversations_messaging_settings_default/genesyscloud_conversations_messaging_settings_default_proxy.go +++ b/genesyscloud/conversations_messaging_settings_default/genesyscloud_conversations_messaging_settings_default_proxy.go @@ -3,7 +3,7 @@ package conversations_messaging_settings_default import ( "context" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" ) /* diff --git a/genesyscloud/conversations_messaging_settings_default/resource_genesyscloud_conversations_messaging_settings_default.go b/genesyscloud/conversations_messaging_settings_default/resource_genesyscloud_conversations_messaging_settings_default.go index 28357a70d..def5c531c 100644 --- a/genesyscloud/conversations_messaging_settings_default/resource_genesyscloud_conversations_messaging_settings_default.go +++ b/genesyscloud/conversations_messaging_settings_default/resource_genesyscloud_conversations_messaging_settings_default.go @@ -14,7 +14,7 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "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/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" ) func createConversationsMessagingSettingsDefault(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { diff --git a/genesyscloud/conversations_messaging_supportedcontent/genesyscloud_conversations_messaging_supportedcontent_proxy.go b/genesyscloud/conversations_messaging_supportedcontent/genesyscloud_conversations_messaging_supportedcontent_proxy.go index 9ccc72c33..f536cfdf1 100644 --- a/genesyscloud/conversations_messaging_supportedcontent/genesyscloud_conversations_messaging_supportedcontent_proxy.go +++ b/genesyscloud/conversations_messaging_supportedcontent/genesyscloud_conversations_messaging_supportedcontent_proxy.go @@ -6,7 +6,7 @@ import ( "log" rc "terraform-provider-genesyscloud/genesyscloud/resource_cache" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" ) /* diff --git a/genesyscloud/conversations_messaging_supportedcontent/resource_genesyscloud_conversations_messaging_supportedcontent.go b/genesyscloud/conversations_messaging_supportedcontent/resource_genesyscloud_conversations_messaging_supportedcontent.go index 20260622e..8cfe5476d 100644 --- a/genesyscloud/conversations_messaging_supportedcontent/resource_genesyscloud_conversations_messaging_supportedcontent.go +++ b/genesyscloud/conversations_messaging_supportedcontent/resource_genesyscloud_conversations_messaging_supportedcontent.go @@ -11,7 +11,7 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" "terraform-provider-genesyscloud/genesyscloud/consistency_checker" diff --git a/genesyscloud/conversations_messaging_supportedcontent/resource_genesyscloud_conversations_messaging_supportedcontent_test.go b/genesyscloud/conversations_messaging_supportedcontent/resource_genesyscloud_conversations_messaging_supportedcontent_test.go index 0d1db88c5..df7db26fd 100644 --- a/genesyscloud/conversations_messaging_supportedcontent/resource_genesyscloud_conversations_messaging_supportedcontent_test.go +++ b/genesyscloud/conversations_messaging_supportedcontent/resource_genesyscloud_conversations_messaging_supportedcontent_test.go @@ -6,7 +6,7 @@ import ( "github.com/google/uuid" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" "terraform-provider-genesyscloud/genesyscloud/provider" "terraform-provider-genesyscloud/genesyscloud/util" diff --git a/genesyscloud/conversations_messaging_supportedcontent/resource_genesyscloud_conversations_messaging_supportedcontent_utils.go b/genesyscloud/conversations_messaging_supportedcontent/resource_genesyscloud_conversations_messaging_supportedcontent_utils.go index 3ab62bc1b..e932a5b55 100644 --- a/genesyscloud/conversations_messaging_supportedcontent/resource_genesyscloud_conversations_messaging_supportedcontent_utils.go +++ b/genesyscloud/conversations_messaging_supportedcontent/resource_genesyscloud_conversations_messaging_supportedcontent_utils.go @@ -6,7 +6,7 @@ import ( "terraform-provider-genesyscloud/genesyscloud/util/resourcedata" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" ) /* diff --git a/genesyscloud/conversations_messaging_supportedcontent_default/genesyscloud_conversations_messaging_supportedcontent_default_init_test.go b/genesyscloud/conversations_messaging_supportedcontent_default/genesyscloud_conversations_messaging_supportedcontent_default_init_test.go index a33e96403..9f7aaaad3 100644 --- a/genesyscloud/conversations_messaging_supportedcontent_default/genesyscloud_conversations_messaging_supportedcontent_default_init_test.go +++ b/genesyscloud/conversations_messaging_supportedcontent_default/genesyscloud_conversations_messaging_supportedcontent_default_init_test.go @@ -14,15 +14,11 @@ import ( used in testing the conversations_messaging_supportedcontent_default 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 + resourceMapMutex sync.RWMutex } // registerTestResources registers all resources used in the tests @@ -36,7 +32,6 @@ func (r *registerTestInstance) registerTestResources() { // initTestResources initializes all test resources and data sources. func initTestResources() { - providerDataSources = make(map[string]*schema.Resource) providerResources = make(map[string]*schema.Resource) regInstance := ®isterTestInstance{} diff --git a/genesyscloud/conversations_messaging_supportedcontent_default/genesyscloud_conversations_messaging_supportedcontent_default_proxy.go b/genesyscloud/conversations_messaging_supportedcontent_default/genesyscloud_conversations_messaging_supportedcontent_default_proxy.go index 480cf56ce..d06b2d553 100644 --- a/genesyscloud/conversations_messaging_supportedcontent_default/genesyscloud_conversations_messaging_supportedcontent_default_proxy.go +++ b/genesyscloud/conversations_messaging_supportedcontent_default/genesyscloud_conversations_messaging_supportedcontent_default_proxy.go @@ -3,7 +3,7 @@ package conversations_messaging_supportedcontent_default import ( "context" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" ) /* diff --git a/genesyscloud/conversations_messaging_supportedcontent_default/resource_genesyscloud_conversations_messaging_supportedcontent_default.go b/genesyscloud/conversations_messaging_supportedcontent_default/resource_genesyscloud_conversations_messaging_supportedcontent_default.go index 257e722b0..f73aa8a7f 100644 --- a/genesyscloud/conversations_messaging_supportedcontent_default/resource_genesyscloud_conversations_messaging_supportedcontent_default.go +++ b/genesyscloud/conversations_messaging_supportedcontent_default/resource_genesyscloud_conversations_messaging_supportedcontent_default.go @@ -15,7 +15,7 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "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/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" ) /* diff --git a/genesyscloud/conversations_messaging_supportedcontent_default/resource_genesyscloud_conversations_messaging_supportedcontent_default_schema.go b/genesyscloud/conversations_messaging_supportedcontent_default/resource_genesyscloud_conversations_messaging_supportedcontent_default_schema.go index 4f4287643..17410565e 100644 --- a/genesyscloud/conversations_messaging_supportedcontent_default/resource_genesyscloud_conversations_messaging_supportedcontent_default_schema.go +++ b/genesyscloud/conversations_messaging_supportedcontent_default/resource_genesyscloud_conversations_messaging_supportedcontent_default_schema.go @@ -16,6 +16,7 @@ resource_genesycloud_conversations_messaging_supportedcontent_default_schema.go 3. The datasource schema definitions for the conversations_messaging_supportedcontent_default datasource. 4. The resource exporter configuration for the conversations_messaging_supportedcontent_default exporter. */ + const ResourceType = "genesyscloud_conversations_messaging_supportedcontent_default" // SetRegistrar registers all of the resources, datasources and exporters in the package diff --git a/genesyscloud/data_source_genesyscloud_auth_division_home.go b/genesyscloud/data_source_genesyscloud_auth_division_home.go index 8a75a9eb0..fadaeb6b5 100644 --- a/genesyscloud/data_source_genesyscloud_auth_division_home.go +++ b/genesyscloud/data_source_genesyscloud_auth_division_home.go @@ -11,7 +11,7 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" ) func DataSourceAuthDivisionHome() *schema.Resource { diff --git a/genesyscloud/data_source_genesyscloud_journey_outcome.go b/genesyscloud/data_source_genesyscloud_journey_outcome.go index 224e87c54..f5a94dc5b 100644 --- a/genesyscloud/data_source_genesyscloud_journey_outcome.go +++ b/genesyscloud/data_source_genesyscloud_journey_outcome.go @@ -11,7 +11,7 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" ) func dataSourceJourneyOutcome() *schema.Resource { diff --git a/genesyscloud/data_source_genesyscloud_journey_segment.go b/genesyscloud/data_source_genesyscloud_journey_segment.go index f888a516e..a6702bd29 100644 --- a/genesyscloud/data_source_genesyscloud_journey_segment.go +++ b/genesyscloud/data_source_genesyscloud_journey_segment.go @@ -11,7 +11,7 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" ) func dataSourceJourneySegment() *schema.Resource { diff --git a/genesyscloud/data_source_genesyscloud_knowledge_knowledgebase.go b/genesyscloud/data_source_genesyscloud_knowledge_knowledgebase.go index 6e709073d..aed097d9e 100644 --- a/genesyscloud/data_source_genesyscloud_knowledge_knowledgebase.go +++ b/genesyscloud/data_source_genesyscloud_knowledge_knowledgebase.go @@ -12,7 +12,7 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" ) func dataSourceKnowledgeKnowledgebase() *schema.Resource { diff --git a/genesyscloud/data_source_genesyscloud_organizations_me.go b/genesyscloud/data_source_genesyscloud_organizations_me.go index c0f93899b..283fa37fb 100644 --- a/genesyscloud/data_source_genesyscloud_organizations_me.go +++ b/genesyscloud/data_source_genesyscloud_organizations_me.go @@ -8,7 +8,7 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" ) func DataSourceOrganizationsMe() *schema.Resource { diff --git a/genesyscloud/data_source_genesyscloud_quality_forms_evaluation.go b/genesyscloud/data_source_genesyscloud_quality_forms_evaluation.go index 1e67c6004..1961ed669 100644 --- a/genesyscloud/data_source_genesyscloud_quality_forms_evaluation.go +++ b/genesyscloud/data_source_genesyscloud_quality_forms_evaluation.go @@ -11,7 +11,7 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" ) type EvaluationFormQuestionGroupStruct struct { diff --git a/genesyscloud/data_source_genesyscloud_quality_forms_survey.go b/genesyscloud/data_source_genesyscloud_quality_forms_survey.go index 682b732e7..a538d2a9a 100644 --- a/genesyscloud/data_source_genesyscloud_quality_forms_survey.go +++ b/genesyscloud/data_source_genesyscloud_quality_forms_survey.go @@ -11,7 +11,7 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" ) func dataSourceQualityFormsSurvey() *schema.Resource { diff --git a/genesyscloud/data_source_genesyscloud_widget_deployment.go b/genesyscloud/data_source_genesyscloud_widget_deployment.go index 49b718747..d260025fa 100644 --- a/genesyscloud/data_source_genesyscloud_widget_deployment.go +++ b/genesyscloud/data_source_genesyscloud_widget_deployment.go @@ -11,7 +11,7 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" ) func dataSourceWidgetDeployments() *schema.Resource { diff --git a/genesyscloud/dependent_consumers/genesyscloud_dependent_consumer_proxy.go b/genesyscloud/dependent_consumers/genesyscloud_dependent_consumer_proxy.go index 01c0af8bf..3d6d69151 100644 --- a/genesyscloud/dependent_consumers/genesyscloud_dependent_consumer_proxy.go +++ b/genesyscloud/dependent_consumers/genesyscloud_dependent_consumer_proxy.go @@ -11,7 +11,7 @@ import ( "terraform-provider-genesyscloud/genesyscloud/util/stringmap" "github.com/hashicorp/terraform-plugin-sdk/v2/diag" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" ) type DependentConsumerProxy struct { diff --git a/genesyscloud/employeeperformance_externalmetrics_definitions/genesyscloud_employeeperformance_externalmetrics_definitions_proxy.go b/genesyscloud/employeeperformance_externalmetrics_definitions/genesyscloud_employeeperformance_externalmetrics_definitions_proxy.go index 5e9f8955b..d7893b24c 100644 --- a/genesyscloud/employeeperformance_externalmetrics_definitions/genesyscloud_employeeperformance_externalmetrics_definitions_proxy.go +++ b/genesyscloud/employeeperformance_externalmetrics_definitions/genesyscloud_employeeperformance_externalmetrics_definitions_proxy.go @@ -5,7 +5,7 @@ import ( "fmt" "log" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" ) /* diff --git a/genesyscloud/employeeperformance_externalmetrics_definitions/resource_genesyscloud_employeeperformance_externalmetrics_definitions.go b/genesyscloud/employeeperformance_externalmetrics_definitions/resource_genesyscloud_employeeperformance_externalmetrics_definitions.go index e101a1b12..11159e145 100644 --- a/genesyscloud/employeeperformance_externalmetrics_definitions/resource_genesyscloud_employeeperformance_externalmetrics_definitions.go +++ b/genesyscloud/employeeperformance_externalmetrics_definitions/resource_genesyscloud_employeeperformance_externalmetrics_definitions.go @@ -13,7 +13,7 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" "terraform-provider-genesyscloud/genesyscloud/util/resourcedata" diff --git a/genesyscloud/employeeperformance_externalmetrics_definitions/resource_genesyscloud_employeeperformance_externalmetrics_definitions_test.go b/genesyscloud/employeeperformance_externalmetrics_definitions/resource_genesyscloud_employeeperformance_externalmetrics_definitions_test.go index 80eb6cac4..ce87d7df0 100644 --- a/genesyscloud/employeeperformance_externalmetrics_definitions/resource_genesyscloud_employeeperformance_externalmetrics_definitions_test.go +++ b/genesyscloud/employeeperformance_externalmetrics_definitions/resource_genesyscloud_employeeperformance_externalmetrics_definitions_test.go @@ -10,7 +10,7 @@ import ( "github.com/google/uuid" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" ) func TestAccResourceEmployeePerformanceExternalMetricsDefintions(t *testing.T) { diff --git a/genesyscloud/external_contacts/genesyscloud_externalcontacts_contact_proxy.go b/genesyscloud/external_contacts/genesyscloud_externalcontacts_contact_proxy.go index f44fdc4c5..313e06308 100644 --- a/genesyscloud/external_contacts/genesyscloud_externalcontacts_contact_proxy.go +++ b/genesyscloud/external_contacts/genesyscloud_externalcontacts_contact_proxy.go @@ -7,7 +7,7 @@ import ( rc "terraform-provider-genesyscloud/genesyscloud/resource_cache" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" ) /* diff --git a/genesyscloud/external_contacts/resource_genesyscloud_externalcontacts_contact.go b/genesyscloud/external_contacts/resource_genesyscloud_externalcontacts_contact.go index ba5413470..a6ee18863 100644 --- a/genesyscloud/external_contacts/resource_genesyscloud_externalcontacts_contact.go +++ b/genesyscloud/external_contacts/resource_genesyscloud_externalcontacts_contact.go @@ -18,7 +18,7 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" ) /* diff --git a/genesyscloud/external_contacts/resource_genesyscloud_externalcontacts_contact_test.go b/genesyscloud/external_contacts/resource_genesyscloud_externalcontacts_contact_test.go index e0df3ed84..cd8621e7a 100644 --- a/genesyscloud/external_contacts/resource_genesyscloud_externalcontacts_contact_test.go +++ b/genesyscloud/external_contacts/resource_genesyscloud_externalcontacts_contact_test.go @@ -8,7 +8,7 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" ) /* diff --git a/genesyscloud/external_contacts/resource_genesyscloud_externalcontacts_contact_utils.go b/genesyscloud/external_contacts/resource_genesyscloud_externalcontacts_contact_utils.go index a3a270fcf..ec27cfa7a 100644 --- a/genesyscloud/external_contacts/resource_genesyscloud_externalcontacts_contact_utils.go +++ b/genesyscloud/external_contacts/resource_genesyscloud_externalcontacts_contact_utils.go @@ -6,7 +6,7 @@ import ( "terraform-provider-genesyscloud/genesyscloud/util/resourcedata" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" "github.com/nyaruka/phonenumbers" ) diff --git a/genesyscloud/external_contacts_organization/genesyscloud_externalcontacts_organization_proxy.go b/genesyscloud/external_contacts_organization/genesyscloud_externalcontacts_organization_proxy.go index 68b9abbe2..9cae487e0 100644 --- a/genesyscloud/external_contacts_organization/genesyscloud_externalcontacts_organization_proxy.go +++ b/genesyscloud/external_contacts_organization/genesyscloud_externalcontacts_organization_proxy.go @@ -6,7 +6,7 @@ import ( "log" rc "terraform-provider-genesyscloud/genesyscloud/resource_cache" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" ) /* diff --git a/genesyscloud/external_contacts_organization/resource_genesyscloud_externalcontacts_organization.go b/genesyscloud/external_contacts_organization/resource_genesyscloud_externalcontacts_organization.go index 9600c5636..ded13591e 100644 --- a/genesyscloud/external_contacts_organization/resource_genesyscloud_externalcontacts_organization.go +++ b/genesyscloud/external_contacts_organization/resource_genesyscloud_externalcontacts_organization.go @@ -11,7 +11,7 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" "terraform-provider-genesyscloud/genesyscloud/consistency_checker" diff --git a/genesyscloud/external_contacts_organization/resource_genesyscloud_externalcontacts_organization_test.go b/genesyscloud/external_contacts_organization/resource_genesyscloud_externalcontacts_organization_test.go index 1207a2341..03c6268b5 100644 --- a/genesyscloud/external_contacts_organization/resource_genesyscloud_externalcontacts_organization_test.go +++ b/genesyscloud/external_contacts_organization/resource_genesyscloud_externalcontacts_organization_test.go @@ -11,7 +11,7 @@ import ( "github.com/google/uuid" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" ) func TestAccResourceExternalContacts(t *testing.T) { diff --git a/genesyscloud/external_contacts_organization/resource_genesyscloud_externalcontacts_organization_utils.go b/genesyscloud/external_contacts_organization/resource_genesyscloud_externalcontacts_organization_utils.go index bb421f298..326cbcb61 100644 --- a/genesyscloud/external_contacts_organization/resource_genesyscloud_externalcontacts_organization_utils.go +++ b/genesyscloud/external_contacts_organization/resource_genesyscloud_externalcontacts_organization_utils.go @@ -8,7 +8,7 @@ import ( "terraform-provider-genesyscloud/genesyscloud/util/resourcedata" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" "github.com/nyaruka/phonenumbers" ) diff --git a/genesyscloud/flow_loglevel/genesyscloud_flow_loglevel_proxy.go b/genesyscloud/flow_loglevel/genesyscloud_flow_loglevel_proxy.go index 5ffb78b7d..475107e31 100644 --- a/genesyscloud/flow_loglevel/genesyscloud_flow_loglevel_proxy.go +++ b/genesyscloud/flow_loglevel/genesyscloud_flow_loglevel_proxy.go @@ -4,7 +4,7 @@ import ( "context" "fmt" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" ) /* diff --git a/genesyscloud/flow_loglevel/resource_genesyscloud_flow_loglevel.go b/genesyscloud/flow_loglevel/resource_genesyscloud_flow_loglevel.go index ee3409464..8660916de 100644 --- a/genesyscloud/flow_loglevel/resource_genesyscloud_flow_loglevel.go +++ b/genesyscloud/flow_loglevel/resource_genesyscloud_flow_loglevel.go @@ -18,7 +18,7 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" ) /* diff --git a/genesyscloud/flow_loglevel/resource_genesyscloud_flow_loglevel_test.go b/genesyscloud/flow_loglevel/resource_genesyscloud_flow_loglevel_test.go index 4fc09c844..12b183eb5 100644 --- a/genesyscloud/flow_loglevel/resource_genesyscloud_flow_loglevel_test.go +++ b/genesyscloud/flow_loglevel/resource_genesyscloud_flow_loglevel_test.go @@ -10,7 +10,7 @@ import ( "github.com/google/uuid" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" ) func TestAccResourceFlowLogLevel(t *testing.T) { diff --git a/genesyscloud/flow_milestone/genesyscloud_flow_milestone_proxy.go b/genesyscloud/flow_milestone/genesyscloud_flow_milestone_proxy.go index d8b9ed9c2..dd24c9fcb 100644 --- a/genesyscloud/flow_milestone/genesyscloud_flow_milestone_proxy.go +++ b/genesyscloud/flow_milestone/genesyscloud_flow_milestone_proxy.go @@ -5,7 +5,7 @@ import ( "fmt" "log" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" ) /* diff --git a/genesyscloud/flow_milestone/resource_genesyscloud_flow_milestone.go b/genesyscloud/flow_milestone/resource_genesyscloud_flow_milestone.go index 98fa5ec48..f496d387e 100644 --- a/genesyscloud/flow_milestone/resource_genesyscloud_flow_milestone.go +++ b/genesyscloud/flow_milestone/resource_genesyscloud_flow_milestone.go @@ -12,7 +12,7 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" "terraform-provider-genesyscloud/genesyscloud/consistency_checker" diff --git a/genesyscloud/flow_milestone/resource_genesyscloud_flow_milestone_test.go b/genesyscloud/flow_milestone/resource_genesyscloud_flow_milestone_test.go index 11a93bfeb..738a403b3 100644 --- a/genesyscloud/flow_milestone/resource_genesyscloud_flow_milestone_test.go +++ b/genesyscloud/flow_milestone/resource_genesyscloud_flow_milestone_test.go @@ -10,7 +10,7 @@ import ( "github.com/google/uuid" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" ) func TestAccResourceFlowMilestone(t *testing.T) { diff --git a/genesyscloud/flow_milestone/resource_genesyscloud_flow_milestone_utils.go b/genesyscloud/flow_milestone/resource_genesyscloud_flow_milestone_utils.go index c69dadf60..341755a16 100644 --- a/genesyscloud/flow_milestone/resource_genesyscloud_flow_milestone_utils.go +++ b/genesyscloud/flow_milestone/resource_genesyscloud_flow_milestone_utils.go @@ -2,7 +2,7 @@ package flow_milestone import ( "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" ) /* diff --git a/genesyscloud/flow_outcome/genesyscloud_flow_outcome_proxy.go b/genesyscloud/flow_outcome/genesyscloud_flow_outcome_proxy.go index 253e88769..032979440 100644 --- a/genesyscloud/flow_outcome/genesyscloud_flow_outcome_proxy.go +++ b/genesyscloud/flow_outcome/genesyscloud_flow_outcome_proxy.go @@ -5,7 +5,7 @@ import ( "fmt" "log" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" ) /* diff --git a/genesyscloud/flow_outcome/resource_genesyscloud_flow_outcome.go b/genesyscloud/flow_outcome/resource_genesyscloud_flow_outcome.go index 8309a5d23..35764442f 100644 --- a/genesyscloud/flow_outcome/resource_genesyscloud_flow_outcome.go +++ b/genesyscloud/flow_outcome/resource_genesyscloud_flow_outcome.go @@ -11,7 +11,7 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" "terraform-provider-genesyscloud/genesyscloud/consistency_checker" diff --git a/genesyscloud/flow_outcome/resource_genesyscloud_flow_outcome_utils.go b/genesyscloud/flow_outcome/resource_genesyscloud_flow_outcome_utils.go index 55445d518..d7896d606 100644 --- a/genesyscloud/flow_outcome/resource_genesyscloud_flow_outcome_utils.go +++ b/genesyscloud/flow_outcome/resource_genesyscloud_flow_outcome_utils.go @@ -2,7 +2,7 @@ package flow_outcome import ( "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" ) /* diff --git a/genesyscloud/group/data_source_genesyscloud_group_test.go b/genesyscloud/group/data_source_genesyscloud_group_test.go index 85646ed5e..ddd0c4814 100644 --- a/genesyscloud/group/data_source_genesyscloud_group_test.go +++ b/genesyscloud/group/data_source_genesyscloud_group_test.go @@ -11,7 +11,7 @@ import ( "time" "github.com/google/uuid" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/retry" diff --git a/genesyscloud/group/genesyscloud_group_proxy.go b/genesyscloud/group/genesyscloud_group_proxy.go index 8768cad06..deef070d5 100644 --- a/genesyscloud/group/genesyscloud_group_proxy.go +++ b/genesyscloud/group/genesyscloud_group_proxy.go @@ -5,7 +5,7 @@ import ( "fmt" rc "terraform-provider-genesyscloud/genesyscloud/resource_cache" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" ) type createGroupFunc func(ctx context.Context, p *groupProxy, group *platformclientv2.Groupcreate) (*platformclientv2.Group, *platformclientv2.APIResponse, error) diff --git a/genesyscloud/group/resource_genesyscloud_group.go b/genesyscloud/group/resource_genesyscloud_group.go index 17263ebee..44d9e6393 100644 --- a/genesyscloud/group/resource_genesyscloud_group.go +++ b/genesyscloud/group/resource_genesyscloud_group.go @@ -21,7 +21,7 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" ) func getAllGroups(ctx context.Context, clientConfig *platformclientv2.Configuration) (resourceExporter.ResourceIDMetaMap, diag.Diagnostics) { diff --git a/genesyscloud/group/resource_genesyscloud_group_test.go b/genesyscloud/group/resource_genesyscloud_group_test.go index 90f7fa349..95c59f344 100644 --- a/genesyscloud/group/resource_genesyscloud_group_test.go +++ b/genesyscloud/group/resource_genesyscloud_group_test.go @@ -13,7 +13,7 @@ import ( "github.com/google/uuid" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" ) func TestAccResourceGroupBasic(t *testing.T) { diff --git a/genesyscloud/group/resource_genesyscloud_group_utils.go b/genesyscloud/group/resource_genesyscloud_group_utils.go index 645d5c349..523ba4fd2 100644 --- a/genesyscloud/group/resource_genesyscloud_group_utils.go +++ b/genesyscloud/group/resource_genesyscloud_group_utils.go @@ -8,7 +8,7 @@ import ( "terraform-provider-genesyscloud/genesyscloud/util/resourcedata" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" ) // 'number' and 'extension' conflict with eachother. However, one must be set. diff --git a/genesyscloud/group_roles/genesyscloud_group_roles_proxy.go b/genesyscloud/group_roles/genesyscloud_group_roles_proxy.go index e1cf9656d..f1f9b3180 100644 --- a/genesyscloud/group_roles/genesyscloud_group_roles_proxy.go +++ b/genesyscloud/group_roles/genesyscloud_group_roles_proxy.go @@ -8,7 +8,7 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" ) var internalProxy *groupRolesProxy diff --git a/genesyscloud/group_roles/resource_genesyscloud_group_roles_schema.go b/genesyscloud/group_roles/resource_genesyscloud_group_roles_schema.go index bb798e0ca..cfbdcd1d2 100644 --- a/genesyscloud/group_roles/resource_genesyscloud_group_roles_schema.go +++ b/genesyscloud/group_roles/resource_genesyscloud_group_roles_schema.go @@ -7,7 +7,7 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" "terraform-provider-genesyscloud/genesyscloud/provider" resourceExporter "terraform-provider-genesyscloud/genesyscloud/resource_exporter" diff --git a/genesyscloud/group_roles/resource_genesyscloud_group_roles_test.go b/genesyscloud/group_roles/resource_genesyscloud_group_roles_test.go index fabdcb063..452a6488b 100644 --- a/genesyscloud/group_roles/resource_genesyscloud_group_roles_test.go +++ b/genesyscloud/group_roles/resource_genesyscloud_group_roles_test.go @@ -14,7 +14,7 @@ import ( "time" "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" authDivision "terraform-provider-genesyscloud/genesyscloud/auth_division" authRole "terraform-provider-genesyscloud/genesyscloud/auth_role" diff --git a/genesyscloud/group_roles/resource_genesyscloud_group_roles_utils.go b/genesyscloud/group_roles/resource_genesyscloud_group_roles_utils.go index 80156ed75..1858649d1 100644 --- a/genesyscloud/group_roles/resource_genesyscloud_group_roles_utils.go +++ b/genesyscloud/group_roles/resource_genesyscloud_group_roles_utils.go @@ -7,7 +7,7 @@ import ( "terraform-provider-genesyscloud/genesyscloud/util/lists" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" ) func flattenSubjectRoles(d *schema.ResourceData, p *groupRolesProxy) (*schema.Set, *platformclientv2.APIResponse, error) { diff --git a/genesyscloud/idp_adfs/genesyscloud_idp_adfs_proxy.go b/genesyscloud/idp_adfs/genesyscloud_idp_adfs_proxy.go index 424f18041..fec778720 100644 --- a/genesyscloud/idp_adfs/genesyscloud_idp_adfs_proxy.go +++ b/genesyscloud/idp_adfs/genesyscloud_idp_adfs_proxy.go @@ -3,7 +3,7 @@ package idp_adfs import ( "context" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" ) /* diff --git a/genesyscloud/idp_adfs/resource_genesyscloud_idp_adfs.go b/genesyscloud/idp_adfs/resource_genesyscloud_idp_adfs.go index 3754ba9e8..0edc107fc 100644 --- a/genesyscloud/idp_adfs/resource_genesyscloud_idp_adfs.go +++ b/genesyscloud/idp_adfs/resource_genesyscloud_idp_adfs.go @@ -11,7 +11,7 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" "terraform-provider-genesyscloud/genesyscloud/consistency_checker" diff --git a/genesyscloud/idp_adfs/resource_genesyscloud_idp_adfs_test.go b/genesyscloud/idp_adfs/resource_genesyscloud_idp_adfs_test.go index b907c2230..413b3d1a0 100644 --- a/genesyscloud/idp_adfs/resource_genesyscloud_idp_adfs_test.go +++ b/genesyscloud/idp_adfs/resource_genesyscloud_idp_adfs_test.go @@ -10,7 +10,7 @@ import ( "github.com/google/uuid" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" ) func TestAccResourceIdpAdfs(t *testing.T) { diff --git a/genesyscloud/idp_generic/genesyscloud_idp_generic_proxy.go b/genesyscloud/idp_generic/genesyscloud_idp_generic_proxy.go index a53048627..a2b3c8c07 100644 --- a/genesyscloud/idp_generic/genesyscloud_idp_generic_proxy.go +++ b/genesyscloud/idp_generic/genesyscloud_idp_generic_proxy.go @@ -3,7 +3,7 @@ package idp_generic import ( "context" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" ) /* diff --git a/genesyscloud/idp_generic/resource_genesyscloud_idp_generic.go b/genesyscloud/idp_generic/resource_genesyscloud_idp_generic.go index c6ccee626..45d418b36 100644 --- a/genesyscloud/idp_generic/resource_genesyscloud_idp_generic.go +++ b/genesyscloud/idp_generic/resource_genesyscloud_idp_generic.go @@ -11,7 +11,7 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" "terraform-provider-genesyscloud/genesyscloud/consistency_checker" diff --git a/genesyscloud/idp_generic/resource_genesyscloud_idp_generic_test.go b/genesyscloud/idp_generic/resource_genesyscloud_idp_generic_test.go index 348a0dec3..8f3333701 100644 --- a/genesyscloud/idp_generic/resource_genesyscloud_idp_generic_test.go +++ b/genesyscloud/idp_generic/resource_genesyscloud_idp_generic_test.go @@ -9,7 +9,7 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" ) func TestAccResourceIdpGeneric(t *testing.T) { diff --git a/genesyscloud/idp_gsuite/genesyscloud_idp_gsuite_proxy.go b/genesyscloud/idp_gsuite/genesyscloud_idp_gsuite_proxy.go index f581a8689..5866cc026 100644 --- a/genesyscloud/idp_gsuite/genesyscloud_idp_gsuite_proxy.go +++ b/genesyscloud/idp_gsuite/genesyscloud_idp_gsuite_proxy.go @@ -4,7 +4,7 @@ import ( "context" "fmt" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" ) /* diff --git a/genesyscloud/idp_gsuite/resource_genesyscloud_idp_gsuite.go b/genesyscloud/idp_gsuite/resource_genesyscloud_idp_gsuite.go index d83d6a835..22be8b390 100644 --- a/genesyscloud/idp_gsuite/resource_genesyscloud_idp_gsuite.go +++ b/genesyscloud/idp_gsuite/resource_genesyscloud_idp_gsuite.go @@ -11,7 +11,7 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" "terraform-provider-genesyscloud/genesyscloud/consistency_checker" diff --git a/genesyscloud/idp_gsuite/resource_genesyscloud_idp_gsuite_test.go b/genesyscloud/idp_gsuite/resource_genesyscloud_idp_gsuite_test.go index f48fc7b7b..daf1f35e1 100644 --- a/genesyscloud/idp_gsuite/resource_genesyscloud_idp_gsuite_test.go +++ b/genesyscloud/idp_gsuite/resource_genesyscloud_idp_gsuite_test.go @@ -10,7 +10,7 @@ import ( "github.com/google/uuid" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" ) func TestAccResourceIdpGsuite(t *testing.T) { diff --git a/genesyscloud/idp_okta/genesyscloud_idp_okta_proxy.go b/genesyscloud/idp_okta/genesyscloud_idp_okta_proxy.go index b1172f8a3..5614cac53 100644 --- a/genesyscloud/idp_okta/genesyscloud_idp_okta_proxy.go +++ b/genesyscloud/idp_okta/genesyscloud_idp_okta_proxy.go @@ -4,7 +4,7 @@ import ( "context" "fmt" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" ) /* diff --git a/genesyscloud/idp_okta/resource_genesyscloud_idp_okta.go b/genesyscloud/idp_okta/resource_genesyscloud_idp_okta.go index 76b0889ce..ab61f935a 100644 --- a/genesyscloud/idp_okta/resource_genesyscloud_idp_okta.go +++ b/genesyscloud/idp_okta/resource_genesyscloud_idp_okta.go @@ -13,7 +13,7 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" "terraform-provider-genesyscloud/genesyscloud/util/constants" "terraform-provider-genesyscloud/genesyscloud/util/lists" diff --git a/genesyscloud/idp_okta/resource_genesyscloud_idp_okta_test.go b/genesyscloud/idp_okta/resource_genesyscloud_idp_okta_test.go index 9d6ec410f..2d70973be 100644 --- a/genesyscloud/idp_okta/resource_genesyscloud_idp_okta_test.go +++ b/genesyscloud/idp_okta/resource_genesyscloud_idp_okta_test.go @@ -10,7 +10,7 @@ import ( "github.com/google/uuid" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" ) func TestAccResourceIdpOkta(t *testing.T) { diff --git a/genesyscloud/idp_onelogin/genesyscloud_idp_onelogin_proxy.go b/genesyscloud/idp_onelogin/genesyscloud_idp_onelogin_proxy.go index 1c64c37ff..b45c09221 100644 --- a/genesyscloud/idp_onelogin/genesyscloud_idp_onelogin_proxy.go +++ b/genesyscloud/idp_onelogin/genesyscloud_idp_onelogin_proxy.go @@ -4,7 +4,7 @@ import ( "context" "fmt" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" ) /* diff --git a/genesyscloud/idp_onelogin/resource_genesyscloud_idp_onelogin.go b/genesyscloud/idp_onelogin/resource_genesyscloud_idp_onelogin.go index 4904d823a..35f294e18 100644 --- a/genesyscloud/idp_onelogin/resource_genesyscloud_idp_onelogin.go +++ b/genesyscloud/idp_onelogin/resource_genesyscloud_idp_onelogin.go @@ -11,7 +11,7 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" "terraform-provider-genesyscloud/genesyscloud/consistency_checker" diff --git a/genesyscloud/idp_onelogin/resource_genesyscloud_idp_onelogin_test.go b/genesyscloud/idp_onelogin/resource_genesyscloud_idp_onelogin_test.go index ffc09cc1b..68b1b6d69 100644 --- a/genesyscloud/idp_onelogin/resource_genesyscloud_idp_onelogin_test.go +++ b/genesyscloud/idp_onelogin/resource_genesyscloud_idp_onelogin_test.go @@ -10,7 +10,7 @@ import ( "github.com/google/uuid" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" ) func TestAccResourceIdpOnelogin(t *testing.T) { diff --git a/genesyscloud/idp_ping/genesyscloud_idp_ping_proxy.go b/genesyscloud/idp_ping/genesyscloud_idp_ping_proxy.go index c254444fa..a8d863d5e 100644 --- a/genesyscloud/idp_ping/genesyscloud_idp_ping_proxy.go +++ b/genesyscloud/idp_ping/genesyscloud_idp_ping_proxy.go @@ -4,7 +4,7 @@ import ( "context" "fmt" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" ) /* diff --git a/genesyscloud/idp_ping/resource_genesyscloud_idp_ping.go b/genesyscloud/idp_ping/resource_genesyscloud_idp_ping.go index 8eb677c6e..681147ba3 100644 --- a/genesyscloud/idp_ping/resource_genesyscloud_idp_ping.go +++ b/genesyscloud/idp_ping/resource_genesyscloud_idp_ping.go @@ -11,7 +11,7 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" "terraform-provider-genesyscloud/genesyscloud/consistency_checker" diff --git a/genesyscloud/idp_ping/resource_genesyscloud_idp_ping_test.go b/genesyscloud/idp_ping/resource_genesyscloud_idp_ping_test.go index 09f5cf513..a285d31ce 100644 --- a/genesyscloud/idp_ping/resource_genesyscloud_idp_ping_test.go +++ b/genesyscloud/idp_ping/resource_genesyscloud_idp_ping_test.go @@ -10,7 +10,7 @@ import ( "github.com/google/uuid" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" ) func TestAccResourceIdpPing(t *testing.T) { diff --git a/genesyscloud/idp_salesforce/genesyscloud_idp_salesforce_proxy.go b/genesyscloud/idp_salesforce/genesyscloud_idp_salesforce_proxy.go index c3ddc553a..682fbeb6a 100644 --- a/genesyscloud/idp_salesforce/genesyscloud_idp_salesforce_proxy.go +++ b/genesyscloud/idp_salesforce/genesyscloud_idp_salesforce_proxy.go @@ -3,7 +3,7 @@ package idp_salesforce import ( "context" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" ) /* diff --git a/genesyscloud/idp_salesforce/resource_genesyscloud_idp_salesforce.go b/genesyscloud/idp_salesforce/resource_genesyscloud_idp_salesforce.go index f04c00dbc..ef2bb3b87 100644 --- a/genesyscloud/idp_salesforce/resource_genesyscloud_idp_salesforce.go +++ b/genesyscloud/idp_salesforce/resource_genesyscloud_idp_salesforce.go @@ -16,7 +16,7 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "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/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" ) /* diff --git a/genesyscloud/idp_salesforce/resource_genesyscloud_idp_salesforce_test.go b/genesyscloud/idp_salesforce/resource_genesyscloud_idp_salesforce_test.go index 116ed2f63..f33e56588 100644 --- a/genesyscloud/idp_salesforce/resource_genesyscloud_idp_salesforce_test.go +++ b/genesyscloud/idp_salesforce/resource_genesyscloud_idp_salesforce_test.go @@ -10,7 +10,7 @@ import ( "github.com/google/uuid" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" ) func TestAccResourceIdpSalesforce(t *testing.T) { diff --git a/genesyscloud/integration/genesyscloud_integration_proxy.go b/genesyscloud/integration/genesyscloud_integration_proxy.go index e935dc511..52b1222a4 100644 --- a/genesyscloud/integration/genesyscloud_integration_proxy.go +++ b/genesyscloud/integration/genesyscloud_integration_proxy.go @@ -4,7 +4,7 @@ import ( "context" "fmt" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" ) /* diff --git a/genesyscloud/integration/resource_genesyscloud_integration.go b/genesyscloud/integration/resource_genesyscloud_integration.go index 2ba6217e3..f3d6ddb8a 100644 --- a/genesyscloud/integration/resource_genesyscloud_integration.go +++ b/genesyscloud/integration/resource_genesyscloud_integration.go @@ -16,7 +16,7 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" ) /* diff --git a/genesyscloud/integration/resource_genesyscloud_integration_test.go b/genesyscloud/integration/resource_genesyscloud_integration_test.go index d19d2e844..c6c5afd24 100644 --- a/genesyscloud/integration/resource_genesyscloud_integration_test.go +++ b/genesyscloud/integration/resource_genesyscloud_integration_test.go @@ -16,7 +16,7 @@ import ( "github.com/google/uuid" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" ) var ( diff --git a/genesyscloud/integration/resource_genesyscloud_integration_utils.go b/genesyscloud/integration/resource_genesyscloud_integration_utils.go index c65b815a0..3edcfb11c 100644 --- a/genesyscloud/integration/resource_genesyscloud_integration_utils.go +++ b/genesyscloud/integration/resource_genesyscloud_integration_utils.go @@ -10,7 +10,7 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" ) /* diff --git a/genesyscloud/integration_action/genesyscloud_integration_action_proxy.go b/genesyscloud/integration_action/genesyscloud_integration_action_proxy.go index 6a3d51328..ba98e96e8 100644 --- a/genesyscloud/integration_action/genesyscloud_integration_action_proxy.go +++ b/genesyscloud/integration_action/genesyscloud_integration_action_proxy.go @@ -6,7 +6,7 @@ import ( "errors" "net/http" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" ) /* diff --git a/genesyscloud/integration_action/resource_genesyscloud_integration_action.go b/genesyscloud/integration_action/resource_genesyscloud_integration_action.go index c4839efde..b379dd1f7 100644 --- a/genesyscloud/integration_action/resource_genesyscloud_integration_action.go +++ b/genesyscloud/integration_action/resource_genesyscloud_integration_action.go @@ -19,7 +19,7 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" ) /* diff --git a/genesyscloud/integration_action/resource_genesyscloud_integration_action_test.go b/genesyscloud/integration_action/resource_genesyscloud_integration_action_test.go index ec6eae9f8..1a6f2b957 100644 --- a/genesyscloud/integration_action/resource_genesyscloud_integration_action_test.go +++ b/genesyscloud/integration_action/resource_genesyscloud_integration_action_test.go @@ -13,7 +13,7 @@ import ( "github.com/google/uuid" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" ) /* diff --git a/genesyscloud/integration_action/resource_genesyscloud_integration_action_utils.go b/genesyscloud/integration_action/resource_genesyscloud_integration_action_utils.go index b9f6945d2..1805e6a50 100644 --- a/genesyscloud/integration_action/resource_genesyscloud_integration_action_utils.go +++ b/genesyscloud/integration_action/resource_genesyscloud_integration_action_utils.go @@ -7,7 +7,7 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" "terraform-provider-genesyscloud/genesyscloud/util/resourcedata" ) diff --git a/genesyscloud/integration_credential/genesyscloud_integration_credential_proxy.go b/genesyscloud/integration_credential/genesyscloud_integration_credential_proxy.go index 330added5..26cfd14c9 100644 --- a/genesyscloud/integration_credential/genesyscloud_integration_credential_proxy.go +++ b/genesyscloud/integration_credential/genesyscloud_integration_credential_proxy.go @@ -4,7 +4,7 @@ import ( "context" "fmt" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" ) /* diff --git a/genesyscloud/integration_credential/resource_genesyscloud_integration_credential.go b/genesyscloud/integration_credential/resource_genesyscloud_integration_credential.go index ae1fdb77d..b4be75fd6 100644 --- a/genesyscloud/integration_credential/resource_genesyscloud_integration_credential.go +++ b/genesyscloud/integration_credential/resource_genesyscloud_integration_credential.go @@ -20,7 +20,7 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" ) /* @@ -65,7 +65,7 @@ func getAllCredentials(ctx context.Context, clientConfig *platformclientv2.Confi } // Verify that the integration entity itself exist before exporting the integration credentials associated to it: DEVTOOLING-282 integrationId := strings.Split(*cred.Name, "Integration-")[1] - _, resp, err := ip.getIntegrationById(ctx, integrationId) + integration, resp, err := ip.getIntegrationById(ctx, integrationId) if err != nil { if util.IsStatus404(resp) { log.Printf("Integration id %s no longer exist, we are therefore not exporting the associated integration credential id %s", integrationId, *cred.Id) @@ -74,7 +74,8 @@ func getAllCredentials(ctx context.Context, clientConfig *platformclientv2.Confi log.Printf("Integration id %s exists but we got an unexpected error retrieving it: %v", integrationId, err) } } - resources[*cred.Id] = &resourceExporter.ResourceMeta{BlockLabel: *cred.Name} + blockLabel := fmt.Sprintf("%s_%s", *integration.Name, *cred.Name) + resources[*cred.Id] = &resourceExporter.ResourceMeta{BlockLabel: blockLabel} } } return resources, nil diff --git a/genesyscloud/integration_credential/resource_genesyscloud_integration_credential_test.go b/genesyscloud/integration_credential/resource_genesyscloud_integration_credential_test.go index 3c55b87ca..dd24e9c5c 100644 --- a/genesyscloud/integration_credential/resource_genesyscloud_integration_credential_test.go +++ b/genesyscloud/integration_credential/resource_genesyscloud_integration_credential_test.go @@ -10,7 +10,7 @@ import ( "github.com/google/uuid" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" ) /* diff --git a/genesyscloud/integration_custom_auth_action/genesyscloud_integration_custom_auth_action_proxy.go b/genesyscloud/integration_custom_auth_action/genesyscloud_integration_custom_auth_action_proxy.go index b92900fbe..90455a93e 100644 --- a/genesyscloud/integration_custom_auth_action/genesyscloud_integration_custom_auth_action_proxy.go +++ b/genesyscloud/integration_custom_auth_action/genesyscloud_integration_custom_auth_action_proxy.go @@ -5,7 +5,7 @@ import ( "fmt" "strings" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" ) /* diff --git a/genesyscloud/integration_custom_auth_action/resource_genesyscloud_integration_custom_auth_action.go b/genesyscloud/integration_custom_auth_action/resource_genesyscloud_integration_custom_auth_action.go index bdcc7274b..c94814486 100644 --- a/genesyscloud/integration_custom_auth_action/resource_genesyscloud_integration_custom_auth_action.go +++ b/genesyscloud/integration_custom_auth_action/resource_genesyscloud_integration_custom_auth_action.go @@ -19,7 +19,7 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" ) /* diff --git a/genesyscloud/integration_custom_auth_action/resource_genesyscloud_integration_custom_auth_action_test.go b/genesyscloud/integration_custom_auth_action/resource_genesyscloud_integration_custom_auth_action_test.go index c53bac524..097451557 100644 --- a/genesyscloud/integration_custom_auth_action/resource_genesyscloud_integration_custom_auth_action_test.go +++ b/genesyscloud/integration_custom_auth_action/resource_genesyscloud_integration_custom_auth_action_test.go @@ -15,7 +15,7 @@ import ( "github.com/google/uuid" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" ) type customAuthActionResource struct { diff --git a/genesyscloud/integration_custom_auth_action/resource_genesyscloud_integration_custom_auth_action_utils.go b/genesyscloud/integration_custom_auth_action/resource_genesyscloud_integration_custom_auth_action_utils.go index ae2275621..63de6b68d 100644 --- a/genesyscloud/integration_custom_auth_action/resource_genesyscloud_integration_custom_auth_action_utils.go +++ b/genesyscloud/integration_custom_auth_action/resource_genesyscloud_integration_custom_auth_action_utils.go @@ -6,7 +6,7 @@ import ( integrationAction "terraform-provider-genesyscloud/genesyscloud/integration_action" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" ) /* diff --git a/genesyscloud/integration_facebook/genesyscloud_integration_facebook_proxy.go b/genesyscloud/integration_facebook/genesyscloud_integration_facebook_proxy.go index 21f659b43..1ad537d0f 100644 --- a/genesyscloud/integration_facebook/genesyscloud_integration_facebook_proxy.go +++ b/genesyscloud/integration_facebook/genesyscloud_integration_facebook_proxy.go @@ -6,7 +6,7 @@ import ( "log" rc "terraform-provider-genesyscloud/genesyscloud/resource_cache" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" ) /* diff --git a/genesyscloud/integration_facebook/resource_genesyscloud_integration_facebook.go b/genesyscloud/integration_facebook/resource_genesyscloud_integration_facebook.go index 8d33e772e..a964bc9ee 100644 --- a/genesyscloud/integration_facebook/resource_genesyscloud_integration_facebook.go +++ b/genesyscloud/integration_facebook/resource_genesyscloud_integration_facebook.go @@ -12,7 +12,7 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" "terraform-provider-genesyscloud/genesyscloud/consistency_checker" diff --git a/genesyscloud/integration_facebook/resource_genesyscloud_integration_facebook_test.go b/genesyscloud/integration_facebook/resource_genesyscloud_integration_facebook_test.go index 8ee2c841c..69f55a800 100644 --- a/genesyscloud/integration_facebook/resource_genesyscloud_integration_facebook_test.go +++ b/genesyscloud/integration_facebook/resource_genesyscloud_integration_facebook_test.go @@ -12,7 +12,7 @@ import ( "github.com/google/uuid" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" ) /* diff --git a/genesyscloud/integration_facebook/resource_genesyscloud_integration_facebook_unit_test.go b/genesyscloud/integration_facebook/resource_genesyscloud_integration_facebook_unit_test.go index e059bcaee..8f6cf5ba1 100644 --- a/genesyscloud/integration_facebook/resource_genesyscloud_integration_facebook_unit_test.go +++ b/genesyscloud/integration_facebook/resource_genesyscloud_integration_facebook_unit_test.go @@ -10,7 +10,7 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" "github.com/google/uuid" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" "github.com/stretchr/testify/assert" ) diff --git a/genesyscloud/integration_facebook/resource_genesyscloud_integration_facebook_utils.go b/genesyscloud/integration_facebook/resource_genesyscloud_integration_facebook_utils.go index 2a610d8f9..420675d14 100644 --- a/genesyscloud/integration_facebook/resource_genesyscloud_integration_facebook_utils.go +++ b/genesyscloud/integration_facebook/resource_genesyscloud_integration_facebook_utils.go @@ -4,7 +4,7 @@ import ( "fmt" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" ) /* diff --git a/genesyscloud/journey_action_map/data_source_genesyscloud_journey_action_map.go b/genesyscloud/journey_action_map/data_source_genesyscloud_journey_action_map.go index 433eb7e8a..20550e5a0 100644 --- a/genesyscloud/journey_action_map/data_source_genesyscloud_journey_action_map.go +++ b/genesyscloud/journey_action_map/data_source_genesyscloud_journey_action_map.go @@ -11,7 +11,7 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" ) func dataSourceJourneyActionMapRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { diff --git a/genesyscloud/journey_action_map/genesyscloud_journey_action_map_init_test.go b/genesyscloud/journey_action_map/genesyscloud_journey_action_map_init_test.go index 5751685c2..b7941f65f 100644 --- a/genesyscloud/journey_action_map/genesyscloud_journey_action_map_init_test.go +++ b/genesyscloud/journey_action_map/genesyscloud_journey_action_map_init_test.go @@ -12,7 +12,7 @@ import ( "testing" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" ) var ( diff --git a/genesyscloud/journey_action_map/genesyscloud_journey_action_map_proxy.go b/genesyscloud/journey_action_map/genesyscloud_journey_action_map_proxy.go index a2ad02dd3..745664564 100644 --- a/genesyscloud/journey_action_map/genesyscloud_journey_action_map_proxy.go +++ b/genesyscloud/journey_action_map/genesyscloud_journey_action_map_proxy.go @@ -6,7 +6,7 @@ import ( "log" rc "terraform-provider-genesyscloud/genesyscloud/resource_cache" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" ) /* diff --git a/genesyscloud/journey_action_map/resource_genesyscloud_journey_action_map.go b/genesyscloud/journey_action_map/resource_genesyscloud_journey_action_map.go index af1af3156..4cc7f6b6b 100644 --- a/genesyscloud/journey_action_map/resource_genesyscloud_journey_action_map.go +++ b/genesyscloud/journey_action_map/resource_genesyscloud_journey_action_map.go @@ -17,7 +17,7 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" ) func getAllJourneyActionMaps(ctx context.Context, clientConfig *platformclientv2.Configuration) (resourceExporter.ResourceIDMetaMap, diag.Diagnostics) { diff --git a/genesyscloud/journey_action_map/resource_genesyscloud_journey_action_map_test.go b/genesyscloud/journey_action_map/resource_genesyscloud_journey_action_map_test.go index e8727c917..4ad84642a 100644 --- a/genesyscloud/journey_action_map/resource_genesyscloud_journey_action_map_test.go +++ b/genesyscloud/journey_action_map/resource_genesyscloud_journey_action_map_test.go @@ -13,7 +13,7 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" ) func TestAccResourceJourneyActionMapActionMediaTypes(t *testing.T) { diff --git a/genesyscloud/journey_action_map/resource_genesyscloud_journey_action_map_utils.go b/genesyscloud/journey_action_map/resource_genesyscloud_journey_action_map_utils.go index a327ee07f..bb505df26 100644 --- a/genesyscloud/journey_action_map/resource_genesyscloud_journey_action_map_utils.go +++ b/genesyscloud/journey_action_map/resource_genesyscloud_journey_action_map_utils.go @@ -14,7 +14,7 @@ import ( "testing" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" ) func flattenActionMap(d *schema.ResourceData, actionMap *platformclientv2.Actionmap) { @@ -454,7 +454,9 @@ func SetupJourneyActionMap(t *testing.T, testCaseName string, sdkConfig *platfor testCasePrefix := testrunner.TestObjectIdPrefix + testCaseName cleanupJourneySegments(testCasePrefix, sdkConfig) cleanupArchitectScheduleGroups(testCasePrefix) - cleanupArchitectSchedules(testCasePrefix) + if err := cleanupArchitectSchedules(testCasePrefix); err != nil { + t.Log(err) + } cleanupFlows(testCasePrefix, sdkConfig) cleanupJourneyActionMaps(testCasePrefix, sdkConfig) } @@ -513,14 +515,14 @@ func cleanupArchitectScheduleGroups(idPrefix string) { } } -func cleanupArchitectSchedules(idPrefix string) { +func cleanupArchitectSchedules(idPrefix string) error { architectApi := platformclientv2.NewArchitectApi() for pageNum := 1; ; pageNum++ { const pageSize = 100 architectSchedules, _, getErr := architectApi.GetArchitectSchedules(pageNum, pageSize, "", "", "", nil) if getErr != nil { - return + return getErr } if architectSchedules.Entities == nil || len(*architectSchedules.Entities) == 0 { @@ -529,15 +531,15 @@ func cleanupArchitectSchedules(idPrefix string) { for _, schedule := range *architectSchedules.Entities { if schedule.Name != nil && strings.HasPrefix(*schedule.Name, idPrefix) { - resp, delErr := architectApi.DeleteArchitectSchedule(*schedule.Id) + _, delErr := architectApi.DeleteArchitectSchedule(*schedule.Id) if delErr != nil { - util.BuildAPIDiagnosticError("genesyscloud_architect_schedules", fmt.Sprintf("failed to delete architect schedule %s (%s): %s", *schedule.Id, *schedule.Name, delErr), resp) - return + return fmt.Errorf("failed to delete architect schedule %s (%s): %s", *schedule.Id, *schedule.Name, delErr) } log.Printf("Deleted architect schedule %s (%s)", *schedule.Id, *schedule.Name) } } } + return nil } func cleanupJourneySegments(idPrefix string, sdkConfig *platformclientv2.Configuration) { diff --git a/genesyscloud/journey_action_template/data_source_genesyscloud_journey_action_template.go b/genesyscloud/journey_action_template/data_source_genesyscloud_journey_action_template.go index ae48ec6e9..b76e46f6d 100644 --- a/genesyscloud/journey_action_template/data_source_genesyscloud_journey_action_template.go +++ b/genesyscloud/journey_action_template/data_source_genesyscloud_journey_action_template.go @@ -11,7 +11,7 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" ) func dataSourceJourneyActionTemplateRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { diff --git a/genesyscloud/journey_action_template/genesyscloud_journey_action_template_init_test.go b/genesyscloud/journey_action_template/genesyscloud_journey_action_template_init_test.go index 722b21c37..1d9ca258e 100644 --- a/genesyscloud/journey_action_template/genesyscloud_journey_action_template_init_test.go +++ b/genesyscloud/journey_action_template/genesyscloud_journey_action_template_init_test.go @@ -9,7 +9,7 @@ import ( "testing" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" ) var ( diff --git a/genesyscloud/journey_action_template/genesyscloud_journey_action_template_proxy.go b/genesyscloud/journey_action_template/genesyscloud_journey_action_template_proxy.go index c44328633..f50924f94 100644 --- a/genesyscloud/journey_action_template/genesyscloud_journey_action_template_proxy.go +++ b/genesyscloud/journey_action_template/genesyscloud_journey_action_template_proxy.go @@ -5,7 +5,7 @@ import ( "fmt" rc "terraform-provider-genesyscloud/genesyscloud/resource_cache" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" ) /* diff --git a/genesyscloud/journey_action_template/resource_genesyscloud_journey_action_template.go b/genesyscloud/journey_action_template/resource_genesyscloud_journey_action_template.go index f0c461d2f..ed124c05c 100644 --- a/genesyscloud/journey_action_template/resource_genesyscloud_journey_action_template.go +++ b/genesyscloud/journey_action_template/resource_genesyscloud_journey_action_template.go @@ -16,7 +16,7 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" ) func getAllJourneyActionTemplates(_ context.Context, clientConfig *platformclientv2.Configuration) (resourceExporter.ResourceIDMetaMap, diag.Diagnostics) { diff --git a/genesyscloud/journey_action_template/resource_genesyscloud_journey_action_template_test.go b/genesyscloud/journey_action_template/resource_genesyscloud_journey_action_template_test.go index 16b833e9d..b4ffa48e1 100644 --- a/genesyscloud/journey_action_template/resource_genesyscloud_journey_action_template_test.go +++ b/genesyscloud/journey_action_template/resource_genesyscloud_journey_action_template_test.go @@ -12,7 +12,7 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" ) func TestAccResourceJourneyActionTemplate(t *testing.T) { diff --git a/genesyscloud/journey_action_template/resource_genesyscloud_journey_action_template_utils.go b/genesyscloud/journey_action_template/resource_genesyscloud_journey_action_template_utils.go index 773b806e6..2c75e121d 100644 --- a/genesyscloud/journey_action_template/resource_genesyscloud_journey_action_template_utils.go +++ b/genesyscloud/journey_action_template/resource_genesyscloud_journey_action_template_utils.go @@ -7,7 +7,7 @@ import ( "terraform-provider-genesyscloud/genesyscloud/util/typeconv" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" ) // All buildSdkPatch* functions are helper method which maps Create operation of journeyApi's Actiontemplates diff --git a/genesyscloud/journey_outcome_predictor/genesyscloud_journey_outcome_predictor_proxy.go b/genesyscloud/journey_outcome_predictor/genesyscloud_journey_outcome_predictor_proxy.go index 2115344a6..8a7cef9e7 100644 --- a/genesyscloud/journey_outcome_predictor/genesyscloud_journey_outcome_predictor_proxy.go +++ b/genesyscloud/journey_outcome_predictor/genesyscloud_journey_outcome_predictor_proxy.go @@ -3,7 +3,7 @@ package journey_outcome_predictor import ( "context" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" ) /* diff --git a/genesyscloud/journey_outcome_predictor/resource_genesyscloud_journey_outcome_predictor.go b/genesyscloud/journey_outcome_predictor/resource_genesyscloud_journey_outcome_predictor.go index 13e72fb24..dd10d98bf 100644 --- a/genesyscloud/journey_outcome_predictor/resource_genesyscloud_journey_outcome_predictor.go +++ b/genesyscloud/journey_outcome_predictor/resource_genesyscloud_journey_outcome_predictor.go @@ -17,7 +17,7 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" ) /* diff --git a/genesyscloud/journey_outcome_predictor/resource_genesyscloud_journey_outcome_predictor_test.go b/genesyscloud/journey_outcome_predictor/resource_genesyscloud_journey_outcome_predictor_test.go index 19baf826b..fc2eaa8e8 100644 --- a/genesyscloud/journey_outcome_predictor/resource_genesyscloud_journey_outcome_predictor_test.go +++ b/genesyscloud/journey_outcome_predictor/resource_genesyscloud_journey_outcome_predictor_test.go @@ -9,7 +9,7 @@ import ( "github.com/google/uuid" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" ) func TestAccResourceJourneyOutcomePredictor(t *testing.T) { diff --git a/genesyscloud/journey_views/genesyscloud_journey_views_proxy.go b/genesyscloud/journey_views/genesyscloud_journey_views_proxy.go index 5d4dee556..c52b9bcec 100644 --- a/genesyscloud/journey_views/genesyscloud_journey_views_proxy.go +++ b/genesyscloud/journey_views/genesyscloud_journey_views_proxy.go @@ -7,7 +7,7 @@ import ( "strconv" rc "terraform-provider-genesyscloud/genesyscloud/resource_cache" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" ) var internalProxy *journeyViewsProxy diff --git a/genesyscloud/journey_views/resource_genesyscloud_journey_views.go b/genesyscloud/journey_views/resource_genesyscloud_journey_views.go index 6d2d29999..fe7292e03 100644 --- a/genesyscloud/journey_views/resource_genesyscloud_journey_views.go +++ b/genesyscloud/journey_views/resource_genesyscloud_journey_views.go @@ -15,7 +15,7 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "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/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" ) func getAllJourneyViews(ctx context.Context, clientConfig *platformclientv2.Configuration) (resourceExporter.ResourceIDMetaMap, diag.Diagnostics) { diff --git a/genesyscloud/journey_views/resource_genesyscloud_journey_views_test.go b/genesyscloud/journey_views/resource_genesyscloud_journey_views_test.go index e01251551..b89042e1e 100644 --- a/genesyscloud/journey_views/resource_genesyscloud_journey_views_test.go +++ b/genesyscloud/journey_views/resource_genesyscloud_journey_views_test.go @@ -9,7 +9,7 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" ) func TestAccResourceJourneyViewsBasic(t *testing.T) { diff --git a/genesyscloud/journey_views/resource_genesyscloud_journey_views_utils.go b/genesyscloud/journey_views/resource_genesyscloud_journey_views_utils.go index c7ec8da2d..251c6acd5 100644 --- a/genesyscloud/journey_views/resource_genesyscloud_journey_views_utils.go +++ b/genesyscloud/journey_views/resource_genesyscloud_journey_views_utils.go @@ -5,7 +5,7 @@ import ( "terraform-provider-genesyscloud/genesyscloud/util/resourcedata" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" ) func buildElements(d *schema.ResourceData) (*[]platformclientv2.Journeyviewelement, error) { diff --git a/genesyscloud/knowledge/resource_genesyscloud_knowledge_document_variation.go b/genesyscloud/knowledge/resource_genesyscloud_knowledge_document_variation.go index 28ae4a381..0daad1a8b 100644 --- a/genesyscloud/knowledge/resource_genesyscloud_knowledge_document_variation.go +++ b/genesyscloud/knowledge/resource_genesyscloud_knowledge_document_variation.go @@ -15,7 +15,6 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/v2/helper/retry" - "github.com/google/uuid" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/validation" resourceExporter "terraform-provider-genesyscloud/genesyscloud/resource_exporter" @@ -23,7 +22,7 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" ) var ( @@ -268,7 +267,13 @@ func getAllKnowledgeDocumentVariations(ctx context.Context, clientConfig *platfo for _, knowledgeDocumentVariation := range *knowledgeDocumentVariations.Entities { id := fmt.Sprintf("%s %s %s", *knowledgeDocumentVariation.Id, *knowledgeDocument.KnowledgeBase.Id, *knowledgeDocument.Id) - resources[id] = &resourceExporter.ResourceMeta{BlockLabel: "variation " + uuid.NewString()} + blockLabel := *knowledgeBase.Name + "_" + *knowledgeDocument.Title + if knowledgeDocumentVariation.Name != nil && *knowledgeDocumentVariation.Name != "" { + blockLabel = blockLabel + "_" + *knowledgeDocumentVariation.Name + } else { + blockLabel = blockLabel + "_" + *knowledgeDocumentVariation.Id + } + resources[id] = &resourceExporter.ResourceMeta{BlockLabel: blockLabel} } } } diff --git a/genesyscloud/knowledge/resource_genesyscloud_knowledge_document_variation_test.go b/genesyscloud/knowledge/resource_genesyscloud_knowledge_document_variation_test.go index 8c9c7f5e3..89380ca99 100644 --- a/genesyscloud/knowledge/resource_genesyscloud_knowledge_document_variation_test.go +++ b/genesyscloud/knowledge/resource_genesyscloud_knowledge_document_variation_test.go @@ -11,7 +11,7 @@ import ( "github.com/google/uuid" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" ) func TestAccResourceKnowledgeDocumentVariationBasic(t *testing.T) { diff --git a/genesyscloud/knowledge_category/genesyscloud_knowledge_category_proxy.go b/genesyscloud/knowledge_category/genesyscloud_knowledge_category_proxy.go index e2ae5e568..979701234 100644 --- a/genesyscloud/knowledge_category/genesyscloud_knowledge_category_proxy.go +++ b/genesyscloud/knowledge_category/genesyscloud_knowledge_category_proxy.go @@ -6,7 +6,7 @@ import ( rc "terraform-provider-genesyscloud/genesyscloud/resource_cache" "terraform-provider-genesyscloud/genesyscloud/util" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" ) var internalProxy *knowledgeCategoryProxy diff --git a/genesyscloud/knowledge_category/resource_genesyscloud_knowledge_category.go b/genesyscloud/knowledge_category/resource_genesyscloud_knowledge_category.go index 9d8cff2aa..0538ffac3 100644 --- a/genesyscloud/knowledge_category/resource_genesyscloud_knowledge_category.go +++ b/genesyscloud/knowledge_category/resource_genesyscloud_knowledge_category.go @@ -18,12 +18,11 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" ) func getAllKnowledgeCategories(ctx context.Context, clientConfig *platformclientv2.Configuration) (resourceExporter.ResourceIDMetaMap, diag.Diagnostics) { knowledgeBaseList := make([]platformclientv2.Knowledgebase, 0) - categoryEntities := make([]platformclientv2.Categoryresponse, 0) resources := make(resourceExporter.ResourceIDMetaMap) proxy := GetKnowledgeCategoryProxy(clientConfig) @@ -47,12 +46,10 @@ func getAllKnowledgeCategories(ctx context.Context, clientConfig *platformclient if err != nil { return nil, util.BuildAPIDiagnosticError("genesyscloud_knowledge_categories", fmt.Sprintf("failed to get all knowledgebase categories: %s", err), resp) } - categoryEntities = append(categoryEntities, *partialEntities...) - } - - for _, knowledgeCategory := range categoryEntities { - id := fmt.Sprintf("%s,%s", *knowledgeCategory.Id, *knowledgeCategory.KnowledgeBase.Id) - resources[id] = &resourceExporter.ResourceMeta{BlockLabel: *knowledgeCategory.Name} + for _, knowledgeCategory := range *partialEntities { + id := fmt.Sprintf("%s,%s", *knowledgeCategory.Id, *knowledgeCategory.KnowledgeBase.Id) + resources[id] = &resourceExporter.ResourceMeta{BlockLabel: *knowledgeBase.Name + "_" + *knowledgeCategory.Name} + } } return resources, nil diff --git a/genesyscloud/knowledge_category/resource_genesyscloud_knowledge_category_test.go b/genesyscloud/knowledge_category/resource_genesyscloud_knowledge_category_test.go index e201fa261..bb92cec7e 100644 --- a/genesyscloud/knowledge_category/resource_genesyscloud_knowledge_category_test.go +++ b/genesyscloud/knowledge_category/resource_genesyscloud_knowledge_category_test.go @@ -11,7 +11,7 @@ import ( "github.com/google/uuid" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" ) func TestAccResourceKnowledgeCategoryBasic(t *testing.T) { diff --git a/genesyscloud/knowledge_category/resource_genesyscloud_knowledge_category_utils.go b/genesyscloud/knowledge_category/resource_genesyscloud_knowledge_category_utils.go index 46eac5e37..b104bd887 100644 --- a/genesyscloud/knowledge_category/resource_genesyscloud_knowledge_category_utils.go +++ b/genesyscloud/knowledge_category/resource_genesyscloud_knowledge_category_utils.go @@ -3,7 +3,7 @@ package knowledge_category import ( "strings" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" ) func buildKnowledgeCategoryUpdate(categoryIn map[string]interface{}) *platformclientv2.Categoryupdaterequest { diff --git a/genesyscloud/knowledge_document/genesyscloud_knowledge_document_proxy.go b/genesyscloud/knowledge_document/genesyscloud_knowledge_document_proxy.go index 4f05d5be8..db288d645 100644 --- a/genesyscloud/knowledge_document/genesyscloud_knowledge_document_proxy.go +++ b/genesyscloud/knowledge_document/genesyscloud_knowledge_document_proxy.go @@ -4,13 +4,14 @@ import ( "context" "encoding/json" "fmt" - "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "net/url" rc "terraform-provider-genesyscloud/genesyscloud/resource_cache" resourceExporter "terraform-provider-genesyscloud/genesyscloud/resource_exporter" "terraform-provider-genesyscloud/genesyscloud/util" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/hashicorp/terraform-plugin-sdk/v2/diag" + + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" ) var internalProxy *knowledgeDocumentProxy diff --git a/genesyscloud/knowledge_document/resource_genesyscloud_knowledge_document.go b/genesyscloud/knowledge_document/resource_genesyscloud_knowledge_document.go index 1989af81a..a70c08f5c 100644 --- a/genesyscloud/knowledge_document/resource_genesyscloud_knowledge_document.go +++ b/genesyscloud/knowledge_document/resource_genesyscloud_knowledge_document.go @@ -17,12 +17,11 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" ) func getAllKnowledgeDocuments(ctx context.Context, clientConfig *platformclientv2.Configuration) (resourceExporter.ResourceIDMetaMap, diag.Diagnostics) { knowledgeBaseList := make([]platformclientv2.Knowledgebase, 0) - documentEntities := make([]platformclientv2.Knowledgedocumentresponse, 0) resources := make(resourceExporter.ResourceIDMetaMap) proxy := GetKnowledgeDocumentProxy(clientConfig) //knowledgeAPI := platformclientv2.NewKnowledgeApiWithConfig(clientConfig) @@ -47,12 +46,11 @@ func getAllKnowledgeDocuments(ctx context.Context, clientConfig *platformclientv if err != nil { return nil, util.BuildAPIDiagnosticError("genesyscloud_knowledge_knowledgebase", fmt.Sprintf("%s", err), response) } - documentEntities = append(documentEntities, *partialEntities...) - } + for _, knowledgeDocument := range *partialEntities { + id := fmt.Sprintf("%s,%s", *knowledgeDocument.Id, *knowledgeDocument.KnowledgeBase.Id) + resources[id] = &resourceExporter.ResourceMeta{BlockLabel: *knowledgeBase.Name + "_" + *knowledgeDocument.Title} + } - for _, knowledgeDocument := range documentEntities { - id := fmt.Sprintf("%s,%s", *knowledgeDocument.Id, *knowledgeDocument.KnowledgeBase.Id) - resources[id] = &resourceExporter.ResourceMeta{BlockLabel: *knowledgeDocument.Title} } return resources, nil diff --git a/genesyscloud/knowledge_document/resource_genesyscloud_knowledge_document_test.go b/genesyscloud/knowledge_document/resource_genesyscloud_knowledge_document_test.go index f032f5023..7c02cca89 100644 --- a/genesyscloud/knowledge_document/resource_genesyscloud_knowledge_document_test.go +++ b/genesyscloud/knowledge_document/resource_genesyscloud_knowledge_document_test.go @@ -10,7 +10,7 @@ import ( "github.com/google/uuid" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" ) func TestAccResourceKnowledgeDocumentBasic(t *testing.T) { diff --git a/genesyscloud/knowledge_document/resource_genesyscloud_knowledge_document_utils.go b/genesyscloud/knowledge_document/resource_genesyscloud_knowledge_document_utils.go index 5b2190413..aff27929a 100644 --- a/genesyscloud/knowledge_document/resource_genesyscloud_knowledge_document_utils.go +++ b/genesyscloud/knowledge_document/resource_genesyscloud_knowledge_document_utils.go @@ -8,7 +8,7 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" ) func buildDocumentAlternatives(requestIn map[string]interface{}) *[]platformclientv2.Knowledgedocumentalternative { diff --git a/genesyscloud/knowledge_label/data_source_genesyscloud_knowledge_label.go b/genesyscloud/knowledge_label/data_source_genesyscloud_knowledge_label.go index 0616d97d7..3759e4946 100644 --- a/genesyscloud/knowledge_label/data_source_genesyscloud_knowledge_label.go +++ b/genesyscloud/knowledge_label/data_source_genesyscloud_knowledge_label.go @@ -11,7 +11,7 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" ) func dataSourceKnowledgeLabelRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { diff --git a/genesyscloud/knowledge_label/genesyscloud_knowledge_label_proxy.go b/genesyscloud/knowledge_label/genesyscloud_knowledge_label_proxy.go index f44cfe84d..43db9d613 100644 --- a/genesyscloud/knowledge_label/genesyscloud_knowledge_label_proxy.go +++ b/genesyscloud/knowledge_label/genesyscloud_knowledge_label_proxy.go @@ -6,7 +6,7 @@ import ( rc "terraform-provider-genesyscloud/genesyscloud/resource_cache" "terraform-provider-genesyscloud/genesyscloud/util" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" ) var internalProxy *knowledgeLabelProxy diff --git a/genesyscloud/knowledge_label/resource_genesyscloud_knowledge_label.go b/genesyscloud/knowledge_label/resource_genesyscloud_knowledge_label.go index 45094bc0c..6ed6ff88b 100644 --- a/genesyscloud/knowledge_label/resource_genesyscloud_knowledge_label.go +++ b/genesyscloud/knowledge_label/resource_genesyscloud_knowledge_label.go @@ -18,7 +18,7 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" ) func getAllKnowledgeLabels(ctx context.Context, clientConfig *platformclientv2.Configuration) (resourceExporter.ResourceIDMetaMap, diag.Diagnostics) { @@ -52,7 +52,7 @@ func getAllKnowledgeLabels(ctx context.Context, clientConfig *platformclientv2.C for _, knowledgeLabel := range *partialEntities { id := fmt.Sprintf("%s,%s", *knowledgeLabel.Id, *knowledgeBase.Id) - resources[id] = &resourceExporter.ResourceMeta{BlockLabel: *knowledgeLabel.Name} + resources[id] = &resourceExporter.ResourceMeta{BlockLabel: *knowledgeBase.Name + "_" + *knowledgeLabel.Name} } } diff --git a/genesyscloud/knowledge_label/resource_genesyscloud_knowledge_label_test.go b/genesyscloud/knowledge_label/resource_genesyscloud_knowledge_label_test.go index a96e4fa85..9cceafd00 100644 --- a/genesyscloud/knowledge_label/resource_genesyscloud_knowledge_label_test.go +++ b/genesyscloud/knowledge_label/resource_genesyscloud_knowledge_label_test.go @@ -10,7 +10,7 @@ import ( "github.com/google/uuid" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" ) func TestAccResourceKnowledgeLabelBasic(t *testing.T) { diff --git a/genesyscloud/knowledge_label/resource_genesyscloud_knowledge_label_utils.go b/genesyscloud/knowledge_label/resource_genesyscloud_knowledge_label_utils.go index f528c8f78..8cf3b0675 100644 --- a/genesyscloud/knowledge_label/resource_genesyscloud_knowledge_label_utils.go +++ b/genesyscloud/knowledge_label/resource_genesyscloud_knowledge_label_utils.go @@ -1,7 +1,7 @@ package knowledge_label import ( - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" ) func buildKnowledgeLabel(labelIn map[string]interface{}) platformclientv2.Labelcreaterequest { diff --git a/genesyscloud/location/data_source_genesyscloud_location.go b/genesyscloud/location/data_source_genesyscloud_location.go index 24402a942..d8007a5e2 100644 --- a/genesyscloud/location/data_source_genesyscloud_location.go +++ b/genesyscloud/location/data_source_genesyscloud_location.go @@ -12,7 +12,7 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" ) func dataSourceLocationRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { diff --git a/genesyscloud/location/genesyscloud_location_proxy.go b/genesyscloud/location/genesyscloud_location_proxy.go index 371647f76..9dd25f67a 100644 --- a/genesyscloud/location/genesyscloud_location_proxy.go +++ b/genesyscloud/location/genesyscloud_location_proxy.go @@ -5,7 +5,7 @@ import ( "fmt" rc "terraform-provider-genesyscloud/genesyscloud/resource_cache" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" ) var internalProxy *locationProxy diff --git a/genesyscloud/location/resource_genesyscloud_location.go b/genesyscloud/location/resource_genesyscloud_location.go index b479a1e0a..59c8ef06a 100644 --- a/genesyscloud/location/resource_genesyscloud_location.go +++ b/genesyscloud/location/resource_genesyscloud_location.go @@ -18,7 +18,7 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" ) func getAllLocations(ctx context.Context, clientConfig *platformclientv2.Configuration) (resourceExporter.ResourceIDMetaMap, diag.Diagnostics) { @@ -31,7 +31,18 @@ func getAllLocations(ctx context.Context, clientConfig *platformclientv2.Configu } for _, location := range *locations { - resources[*location.Id] = &resourceExporter.ResourceMeta{BlockLabel: *location.Name} + blockLabel := *location.Name + if location.Path != nil && len(*location.Path) > 0 { + // Get parent location to render distinct block label + parentLocation, resp, err := proxy.getLocationById(ctx, (*location.Path)[0], nil) + if err != nil { + return nil, util.BuildAPIDiagnosticError(ResourceType, fmt.Sprintf("Failed to get parent location %s error: %s", (*location.Path)[0], err), resp) + } + if parentLocation != nil { + blockLabel = *parentLocation.Name + "_" + blockLabel + } + } + resources[*location.Id] = &resourceExporter.ResourceMeta{BlockLabel: blockLabel} } return resources, nil diff --git a/genesyscloud/location/resource_genesyscloud_location_test.go b/genesyscloud/location/resource_genesyscloud_location_test.go index 00b206c9a..55428c7e3 100644 --- a/genesyscloud/location/resource_genesyscloud_location_test.go +++ b/genesyscloud/location/resource_genesyscloud_location_test.go @@ -10,7 +10,7 @@ import ( "github.com/google/uuid" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" ) func TestAccResourceLocationBasic(t *testing.T) { diff --git a/genesyscloud/location/resource_genesyscloud_location_utils.go b/genesyscloud/location/resource_genesyscloud_location_utils.go index cd5e99e46..f8cd40a01 100644 --- a/genesyscloud/location/resource_genesyscloud_location_utils.go +++ b/genesyscloud/location/resource_genesyscloud_location_utils.go @@ -7,7 +7,7 @@ import ( lists "terraform-provider-genesyscloud/genesyscloud/util/lists" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" "github.com/nyaruka/phonenumbers" ) diff --git a/genesyscloud/oauth_client/resource_genesyscloud_oauth_client.go b/genesyscloud/oauth_client/resource_genesyscloud_oauth_client.go index 969b46aeb..9a3746f60 100644 --- a/genesyscloud/oauth_client/resource_genesyscloud_oauth_client.go +++ b/genesyscloud/oauth_client/resource_genesyscloud_oauth_client.go @@ -19,7 +19,7 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" ) func getAllOAuthClients(ctx context.Context, clientConfig *platformclientv2.Configuration) (resourceExporter.ResourceIDMetaMap, diag.Diagnostics) { diff --git a/genesyscloud/oauth_client/resource_genesyscloud_oauth_client_proxy.go b/genesyscloud/oauth_client/resource_genesyscloud_oauth_client_proxy.go index 0a5c7ca8b..56cd2e0c0 100644 --- a/genesyscloud/oauth_client/resource_genesyscloud_oauth_client_proxy.go +++ b/genesyscloud/oauth_client/resource_genesyscloud_oauth_client_proxy.go @@ -5,7 +5,7 @@ import ( "log" "sync" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" ) var internalProxy *oauthClientProxy diff --git a/genesyscloud/oauth_client/resource_genesyscloud_oauth_client_utils.go b/genesyscloud/oauth_client/resource_genesyscloud_oauth_client_utils.go index 2103df074..58d7ef10a 100644 --- a/genesyscloud/oauth_client/resource_genesyscloud_oauth_client_utils.go +++ b/genesyscloud/oauth_client/resource_genesyscloud_oauth_client_utils.go @@ -6,7 +6,7 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" ) func buildOAuthRedirectURIs(d *schema.ResourceData) *[]string { diff --git a/genesyscloud/oauth_client/resource_genesyscloude_oauth_client_unit_test.go b/genesyscloud/oauth_client/resource_genesyscloude_oauth_client_unit_test.go index ab49e0eaf..f2aefc95c 100644 --- a/genesyscloud/oauth_client/resource_genesyscloude_oauth_client_unit_test.go +++ b/genesyscloud/oauth_client/resource_genesyscloude_oauth_client_unit_test.go @@ -9,7 +9,7 @@ import ( "github.com/google/uuid" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" "github.com/stretchr/testify/assert" ) diff --git a/genesyscloud/organization_authentication_settings/genesyscloud_organization_authentication_settings_proxy.go b/genesyscloud/organization_authentication_settings/genesyscloud_organization_authentication_settings_proxy.go index ae5c6fe06..26472801c 100644 --- a/genesyscloud/organization_authentication_settings/genesyscloud_organization_authentication_settings_proxy.go +++ b/genesyscloud/organization_authentication_settings/genesyscloud_organization_authentication_settings_proxy.go @@ -4,7 +4,7 @@ import ( "context" "fmt" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" ) /* diff --git a/genesyscloud/organization_authentication_settings/resource_genesyscloud_organization_authentication_settings.go b/genesyscloud/organization_authentication_settings/resource_genesyscloud_organization_authentication_settings.go index af1544301..c2be94515 100644 --- a/genesyscloud/organization_authentication_settings/resource_genesyscloud_organization_authentication_settings.go +++ b/genesyscloud/organization_authentication_settings/resource_genesyscloud_organization_authentication_settings.go @@ -12,7 +12,7 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" "terraform-provider-genesyscloud/genesyscloud/util/resourcedata" diff --git a/genesyscloud/organization_authentication_settings/resource_genesyscloud_organization_authentication_settings_unit_test.go b/genesyscloud/organization_authentication_settings/resource_genesyscloud_organization_authentication_settings_unit_test.go index 85421607b..243297698 100644 --- a/genesyscloud/organization_authentication_settings/resource_genesyscloud_organization_authentication_settings_unit_test.go +++ b/genesyscloud/organization_authentication_settings/resource_genesyscloud_organization_authentication_settings_unit_test.go @@ -9,7 +9,7 @@ import ( "github.com/google/go-cmp/cmp" "github.com/google/uuid" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" "github.com/stretchr/testify/assert" ) diff --git a/genesyscloud/organization_authentication_settings/resource_genesyscloud_organization_authentication_settings_utils.go b/genesyscloud/organization_authentication_settings/resource_genesyscloud_organization_authentication_settings_utils.go index b93c75e63..41d5fa0ed 100644 --- a/genesyscloud/organization_authentication_settings/resource_genesyscloud_organization_authentication_settings_utils.go +++ b/genesyscloud/organization_authentication_settings/resource_genesyscloud_organization_authentication_settings_utils.go @@ -5,7 +5,7 @@ import ( "terraform-provider-genesyscloud/genesyscloud/util/resourcedata" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" ) /* diff --git a/genesyscloud/orgauthorization_pairing/genesyscloud_orgauthorization_pairing_proxy.go b/genesyscloud/orgauthorization_pairing/genesyscloud_orgauthorization_pairing_proxy.go index d8e6acfa6..e2b453d18 100644 --- a/genesyscloud/orgauthorization_pairing/genesyscloud_orgauthorization_pairing_proxy.go +++ b/genesyscloud/orgauthorization_pairing/genesyscloud_orgauthorization_pairing_proxy.go @@ -4,7 +4,7 @@ import ( "context" "fmt" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" ) var internalProxy *orgauthorizationPairingProxy diff --git a/genesyscloud/orgauthorization_pairing/resource_genesyscloud_orgauthorization_pairing.go b/genesyscloud/orgauthorization_pairing/resource_genesyscloud_orgauthorization_pairing.go index 56ce88e7e..1dcf11045 100644 --- a/genesyscloud/orgauthorization_pairing/resource_genesyscloud_orgauthorization_pairing.go +++ b/genesyscloud/orgauthorization_pairing/resource_genesyscloud_orgauthorization_pairing.go @@ -15,7 +15,7 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" ) func createOrgauthorizationPairing(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { diff --git a/genesyscloud/outbound/data_source_genesyscloud_outbound_messagingcampaign.go b/genesyscloud/outbound/data_source_genesyscloud_outbound_messagingcampaign.go index 91fa1ce20..83bb2aa0e 100644 --- a/genesyscloud/outbound/data_source_genesyscloud_outbound_messagingcampaign.go +++ b/genesyscloud/outbound/data_source_genesyscloud_outbound_messagingcampaign.go @@ -11,7 +11,7 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" ) func dataSourceOutboundMessagingcampaignRead(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { diff --git a/genesyscloud/outbound/data_source_genesyscloud_outbound_messagingcampaign_test.go b/genesyscloud/outbound/data_source_genesyscloud_outbound_messagingcampaign_test.go index 673522bdd..b2b7a97f0 100644 --- a/genesyscloud/outbound/data_source_genesyscloud_outbound_messagingcampaign_test.go +++ b/genesyscloud/outbound/data_source_genesyscloud_outbound_messagingcampaign_test.go @@ -14,7 +14,7 @@ import ( "github.com/google/uuid" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" ) /* diff --git a/genesyscloud/outbound/genesyscloud_outbound_messagingcampaign_schema.go b/genesyscloud/outbound/genesyscloud_outbound_messagingcampaign_schema.go index 761a9cdd3..cc5834afe 100644 --- a/genesyscloud/outbound/genesyscloud_outbound_messagingcampaign_schema.go +++ b/genesyscloud/outbound/genesyscloud_outbound_messagingcampaign_schema.go @@ -175,7 +175,7 @@ func ResourceOutboundMessagingCampaign() *schema.Resource { `dnc_list_ids`: { Description: `The dnc lists to check before sending a message for this messaging campaign.`, Optional: true, - Type: schema.TypeList, + Type: schema.TypeSet, Elem: &schema.Schema{Type: schema.TypeString}, }, `campaign_status`: { diff --git a/genesyscloud/outbound/genesyscloud_outbound_messagingcampaign_unit_test.go b/genesyscloud/outbound/genesyscloud_outbound_messagingcampaign_unit_test.go index d9f14b65d..a174e0008 100644 --- a/genesyscloud/outbound/genesyscloud_outbound_messagingcampaign_unit_test.go +++ b/genesyscloud/outbound/genesyscloud_outbound_messagingcampaign_unit_test.go @@ -6,7 +6,7 @@ import ( "testing" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" "github.com/stretchr/testify/assert" ) diff --git a/genesyscloud/outbound/genesyscloud_outbound_messagingcampaign_utils.go b/genesyscloud/outbound/genesyscloud_outbound_messagingcampaign_utils.go index b3f72d292..31337cd65 100644 --- a/genesyscloud/outbound/genesyscloud_outbound_messagingcampaign_utils.go +++ b/genesyscloud/outbound/genesyscloud_outbound_messagingcampaign_utils.go @@ -8,7 +8,7 @@ import ( "terraform-provider-genesyscloud/genesyscloud/util/resourcedata" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" ) func gatherExtraErrorMessagesFromResponseBody(resp *platformclientv2.APIResponse) (string, error) { diff --git a/genesyscloud/outbound/resource_genesyscloud_outbound_messagingcampaign.go b/genesyscloud/outbound/resource_genesyscloud_outbound_messagingcampaign.go index f516767e2..0d8f055db 100644 --- a/genesyscloud/outbound/resource_genesyscloud_outbound_messagingcampaign.go +++ b/genesyscloud/outbound/resource_genesyscloud_outbound_messagingcampaign.go @@ -16,7 +16,7 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" ) func getAllOutboundMessagingcampaign(_ context.Context, clientConfig *platformclientv2.Configuration) (resourceExporter.ResourceIDMetaMap, diag.Diagnostics) { @@ -231,7 +231,7 @@ func readOutboundMessagingcampaign(ctx context.Context, d *schema.ResourceData, } if sdkMessagingCampaign.DncLists != nil { - _ = d.Set("dnc_list_ids", util.SdkDomainEntityRefArrToList(*sdkMessagingCampaign.DncLists)) + _ = d.Set("dnc_list_ids", util.SdkDomainEntityRefArrToSet(*sdkMessagingCampaign.DncLists)) } log.Printf("Read Outbound Messaging Campaign %s", d.Id()) diff --git a/genesyscloud/outbound/resource_genesyscloud_outbound_messagingcampaign_test.go b/genesyscloud/outbound/resource_genesyscloud_outbound_messagingcampaign_test.go index 3ec245d8b..8d50fa286 100644 --- a/genesyscloud/outbound/resource_genesyscloud_outbound_messagingcampaign_test.go +++ b/genesyscloud/outbound/resource_genesyscloud_outbound_messagingcampaign_test.go @@ -16,7 +16,7 @@ import ( "github.com/google/uuid" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" obCallableTimeset "terraform-provider-genesyscloud/genesyscloud/outbound_callabletimeset" obContactList "terraform-provider-genesyscloud/genesyscloud/outbound_contact_list" diff --git a/genesyscloud/outbound_attempt_limit/data_source_genesyscloud_outbound_attempt_limit.go b/genesyscloud/outbound_attempt_limit/data_source_genesyscloud_outbound_attempt_limit.go index 41ce0da22..25365a3af 100644 --- a/genesyscloud/outbound_attempt_limit/data_source_genesyscloud_outbound_attempt_limit.go +++ b/genesyscloud/outbound_attempt_limit/data_source_genesyscloud_outbound_attempt_limit.go @@ -11,7 +11,7 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" ) func DataSourceOutboundAttemptLimit() *schema.Resource { diff --git a/genesyscloud/outbound_attempt_limit/resource_genesyscloud_outbound_attempt_limit.go b/genesyscloud/outbound_attempt_limit/resource_genesyscloud_outbound_attempt_limit.go index ef351f3fd..48e8f53cc 100644 --- a/genesyscloud/outbound_attempt_limit/resource_genesyscloud_outbound_attempt_limit.go +++ b/genesyscloud/outbound_attempt_limit/resource_genesyscloud_outbound_attempt_limit.go @@ -19,7 +19,7 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/validation" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" ) const ( diff --git a/genesyscloud/outbound_attempt_limit/resource_genesyscloud_outbound_attempt_limit_test.go b/genesyscloud/outbound_attempt_limit/resource_genesyscloud_outbound_attempt_limit_test.go index ae2a9fec6..65d40ff54 100644 --- a/genesyscloud/outbound_attempt_limit/resource_genesyscloud_outbound_attempt_limit_test.go +++ b/genesyscloud/outbound_attempt_limit/resource_genesyscloud_outbound_attempt_limit_test.go @@ -11,7 +11,7 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" ) // func init() { diff --git a/genesyscloud/outbound_callabletimeset/genesyscloud_outbound_callabletimeset_proxy.go b/genesyscloud/outbound_callabletimeset/genesyscloud_outbound_callabletimeset_proxy.go index 2ef7368fd..5b721bfa7 100644 --- a/genesyscloud/outbound_callabletimeset/genesyscloud_outbound_callabletimeset_proxy.go +++ b/genesyscloud/outbound_callabletimeset/genesyscloud_outbound_callabletimeset_proxy.go @@ -6,7 +6,7 @@ import ( "log" "strings" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" ) /* diff --git a/genesyscloud/outbound_callabletimeset/resource_genesyscloud_outbound_callabletimeset.go b/genesyscloud/outbound_callabletimeset/resource_genesyscloud_outbound_callabletimeset.go index 7972e89a5..fa18c68af 100644 --- a/genesyscloud/outbound_callabletimeset/resource_genesyscloud_outbound_callabletimeset.go +++ b/genesyscloud/outbound_callabletimeset/resource_genesyscloud_outbound_callabletimeset.go @@ -18,7 +18,7 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" ) /* diff --git a/genesyscloud/outbound_callabletimeset/resource_genesyscloud_outbound_callabletimeset_test.go b/genesyscloud/outbound_callabletimeset/resource_genesyscloud_outbound_callabletimeset_test.go index 4d79465cd..07d164bb4 100644 --- a/genesyscloud/outbound_callabletimeset/resource_genesyscloud_outbound_callabletimeset_test.go +++ b/genesyscloud/outbound_callabletimeset/resource_genesyscloud_outbound_callabletimeset_test.go @@ -9,7 +9,7 @@ import ( "github.com/google/uuid" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" ) func TestAccResourceOutboundCallabletimeset(t *testing.T) { diff --git a/genesyscloud/outbound_callabletimeset/resource_genesyscloud_outbound_callabletimeset_utils.go b/genesyscloud/outbound_callabletimeset/resource_genesyscloud_outbound_callabletimeset_utils.go index dd52891e3..c4bb15e61 100644 --- a/genesyscloud/outbound_callabletimeset/resource_genesyscloud_outbound_callabletimeset_utils.go +++ b/genesyscloud/outbound_callabletimeset/resource_genesyscloud_outbound_callabletimeset_utils.go @@ -5,7 +5,7 @@ import ( "strings" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" ) /* diff --git a/genesyscloud/outbound_callanalysisresponseset/genesyscloud_outbound_callanalysisresponseset_proxy.go b/genesyscloud/outbound_callanalysisresponseset/genesyscloud_outbound_callanalysisresponseset_proxy.go index e3bb9a180..042a39db0 100644 --- a/genesyscloud/outbound_callanalysisresponseset/genesyscloud_outbound_callanalysisresponseset_proxy.go +++ b/genesyscloud/outbound_callanalysisresponseset/genesyscloud_outbound_callanalysisresponseset_proxy.go @@ -5,7 +5,7 @@ import ( "fmt" "log" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" ) /* diff --git a/genesyscloud/outbound_callanalysisresponseset/resource_genesyscloud_outbound_callanalysisresponseset.go b/genesyscloud/outbound_callanalysisresponseset/resource_genesyscloud_outbound_callanalysisresponseset.go index cf5379a4b..d16ae7173 100644 --- a/genesyscloud/outbound_callanalysisresponseset/resource_genesyscloud_outbound_callanalysisresponseset.go +++ b/genesyscloud/outbound_callanalysisresponseset/resource_genesyscloud_outbound_callanalysisresponseset.go @@ -15,7 +15,7 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "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/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" ) /* diff --git a/genesyscloud/outbound_callanalysisresponseset/resource_genesyscloud_outbound_callanalysisresponseset_test.go b/genesyscloud/outbound_callanalysisresponseset/resource_genesyscloud_outbound_callanalysisresponseset_test.go index 8fcdcd43d..e8745745f 100644 --- a/genesyscloud/outbound_callanalysisresponseset/resource_genesyscloud_outbound_callanalysisresponseset_test.go +++ b/genesyscloud/outbound_callanalysisresponseset/resource_genesyscloud_outbound_callanalysisresponseset_test.go @@ -14,7 +14,7 @@ import ( "github.com/google/uuid" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" ) func TestAccResourceOutboundCallAnalysisResponseSet(t *testing.T) { diff --git a/genesyscloud/outbound_callanalysisresponseset/resource_genesyscloud_outbound_callanalysisresponseset_utils.go b/genesyscloud/outbound_callanalysisresponseset/resource_genesyscloud_outbound_callanalysisresponseset_utils.go index 2ba5e72c2..a760cc3bc 100644 --- a/genesyscloud/outbound_callanalysisresponseset/resource_genesyscloud_outbound_callanalysisresponseset_utils.go +++ b/genesyscloud/outbound_callanalysisresponseset/resource_genesyscloud_outbound_callanalysisresponseset_utils.go @@ -6,7 +6,7 @@ import ( "terraform-provider-genesyscloud/genesyscloud/util/resourcedata" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" ) func getResponseSetFromResourceData(d *schema.ResourceData) platformclientv2.Responseset { diff --git a/genesyscloud/outbound_campaign/genesyscloud_outbound_campaign_init_test.go b/genesyscloud/outbound_campaign/genesyscloud_outbound_campaign_init_test.go index e7d697741..966353aa1 100644 --- a/genesyscloud/outbound_campaign/genesyscloud_outbound_campaign_init_test.go +++ b/genesyscloud/outbound_campaign/genesyscloud_outbound_campaign_init_test.go @@ -19,7 +19,7 @@ import ( telephonyProvidersEdgesSite "terraform-provider-genesyscloud/genesyscloud/telephony_providers_edges_site" "testing" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" ) diff --git a/genesyscloud/outbound_campaign/genesyscloud_outbound_campaign_proxy.go b/genesyscloud/outbound_campaign/genesyscloud_outbound_campaign_proxy.go index 7ad5971e9..06cfd7380 100644 --- a/genesyscloud/outbound_campaign/genesyscloud_outbound_campaign_proxy.go +++ b/genesyscloud/outbound_campaign/genesyscloud_outbound_campaign_proxy.go @@ -11,7 +11,7 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/retry" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" ) /* diff --git a/genesyscloud/outbound_campaign/resource_genesyscloud_outbound_campaign.go b/genesyscloud/outbound_campaign/resource_genesyscloud_outbound_campaign.go index 448be41ad..eed364c2f 100644 --- a/genesyscloud/outbound_campaign/resource_genesyscloud_outbound_campaign.go +++ b/genesyscloud/outbound_campaign/resource_genesyscloud_outbound_campaign.go @@ -15,7 +15,7 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "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/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" ) /* @@ -126,7 +126,7 @@ func readOutboundCampaign(ctx context.Context, d *schema.ResourceData, meta inte resourcedata.SetNillableValue(d, "abandon_rate", campaign.AbandonRate) resourcedata.SetNillableValue(d, "max_calls_per_agent", campaign.MaxCallsPerAgent) if campaign.DncLists != nil { - _ = d.Set("dnc_list_ids", util.SdkDomainEntityRefArrToList(*campaign.DncLists)) + _ = d.Set("dnc_list_ids", util.SdkDomainEntityRefArrToSet(*campaign.DncLists)) } resourcedata.SetNillableReference(d, "callable_time_set_id", campaign.CallableTimeSet) resourcedata.SetNillableReference(d, "call_analysis_response_set_id", campaign.CallAnalysisResponseSet) diff --git a/genesyscloud/outbound_campaign/resource_genesyscloud_outbound_campaign_schema.go b/genesyscloud/outbound_campaign/resource_genesyscloud_outbound_campaign_schema.go index 3fc1dbf9a..9162ad44b 100644 --- a/genesyscloud/outbound_campaign/resource_genesyscloud_outbound_campaign_schema.go +++ b/genesyscloud/outbound_campaign/resource_genesyscloud_outbound_campaign_schema.go @@ -18,6 +18,7 @@ resource_genesycloud_outbound_campaign_schema.go holds four functions within it: 3. The datasource schema definitions for the outbound_campaign datasource. 4. The resource exporter configuration for the outbound_campaign exporter. */ + const ResourceType = "genesyscloud_outbound_campaign" // SetRegistrar registers all of the resources, datasources and exporters in the package @@ -117,7 +118,7 @@ func ResourceOutboundCampaign() *schema.Resource { `dnc_list_ids`: { Description: `DncLists for this Campaign to check before placing a call.`, Optional: true, - Type: schema.TypeList, + Type: schema.TypeSet, Elem: &schema.Schema{Type: schema.TypeString}, }, `callable_time_set_id`: { diff --git a/genesyscloud/outbound_campaign/resource_genesyscloud_outbound_campaign_test.go b/genesyscloud/outbound_campaign/resource_genesyscloud_outbound_campaign_test.go index 0f2d4d612..4dc97c981 100644 --- a/genesyscloud/outbound_campaign/resource_genesyscloud_outbound_campaign_test.go +++ b/genesyscloud/outbound_campaign/resource_genesyscloud_outbound_campaign_test.go @@ -6,7 +6,7 @@ import ( "strconv" "strings" "terraform-provider-genesyscloud/genesyscloud/architect_flow" - location "terraform-provider-genesyscloud/genesyscloud/location" + "terraform-provider-genesyscloud/genesyscloud/location" "terraform-provider-genesyscloud/genesyscloud/outbound" obDnclist "terraform-provider-genesyscloud/genesyscloud/outbound_dnclist" "terraform-provider-genesyscloud/genesyscloud/provider" @@ -25,7 +25,7 @@ import ( "github.com/google/uuid" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" ) // Add a special generator DEVENGAGE-1646. Basically, the API makes it look like you need a full phone_columns field here. However, the API ignores the type because the devs reused the phone_columns object. However, @@ -67,6 +67,8 @@ func TestAccResourceOutboundCampaignBasic(t *testing.T) { callerAddressUpdated = "+353371112111" divResourceLabel = "test-division" divName = "terraform-" + uuid.NewString() + + resourcePath = ResourceType + "." + resourceLabel ) emergencyNumber := "+13178793428" @@ -220,8 +222,8 @@ func TestAccResourceOutboundCampaignBasic(t *testing.T) { []string{"genesyscloud_outbound_dnclist." + dncListResourceLabel + ".id"}, []string{"genesyscloud_outbound_ruleset." + ruleSetResourceLabel + ".id"}, []string{"genesyscloud_outbound_contactlistfilter." + clfResourceLabel + ".id"}, - []string{""}, - strconv.Quote("false"), + nil, + util.FalseValue, // auto_answer generatePhoneColumnNoTypeBlock("Cell"), outbound.GenerateOutboundMessagingCampaignContactSort( contactSortFieldName, @@ -231,37 +233,37 @@ func TestAccResourceOutboundCampaignBasic(t *testing.T) { generateDynamicContactQueueingSettingsBlock(util.TrueValue), ), Check: resource.ComposeTestCheckFunc( - resource.TestCheckResourceAttr("genesyscloud_outbound_campaign."+resourceLabel, "name", name), - resource.TestCheckResourceAttr("genesyscloud_outbound_campaign."+resourceLabel, "dialing_mode", dialingMode), - resource.TestCheckResourceAttr("genesyscloud_outbound_campaign."+resourceLabel, "caller_name", callerName), - resource.TestCheckResourceAttr("genesyscloud_outbound_campaign."+resourceLabel, "caller_address", callerAddress), - resource.TestCheckResourceAttr("genesyscloud_outbound_campaign."+resourceLabel, "outbound_line_count", "1"), - resource.TestCheckResourceAttr("genesyscloud_outbound_campaign."+resourceLabel, "campaign_status", "off"), - resource.TestCheckResourceAttr("genesyscloud_outbound_campaign."+resourceLabel, "abandon_rate", "1"), - resource.TestCheckResourceAttr("genesyscloud_outbound_campaign."+resourceLabel, "preview_time_out_seconds", "0"), - resource.TestCheckResourceAttr("genesyscloud_outbound_campaign."+resourceLabel, "always_running", util.FalseValue), - resource.TestCheckResourceAttr("genesyscloud_outbound_campaign."+resourceLabel, "no_answer_timeout", "40"), - resource.TestCheckResourceAttr("genesyscloud_outbound_campaign."+resourceLabel, "priority", "4"), - resource.TestCheckResourceAttr("genesyscloud_outbound_campaign."+resourceLabel, "phone_columns.0.column_name", "Cell"), - resource.TestCheckResourceAttr("genesyscloud_outbound_campaign."+resourceLabel, "contact_sorts.0.field_name", contactSortFieldName), - resource.TestCheckResourceAttr("genesyscloud_outbound_campaign."+resourceLabel, "contact_sorts.0.direction", contactSortDirection), - resource.TestCheckResourceAttr("genesyscloud_outbound_campaign."+resourceLabel, "contact_sorts.0.numeric", contactSortNumeric), - resource.TestCheckResourceAttr("genesyscloud_outbound_campaign."+resourceLabel, "dynamic_contact_queueing_settings.0.sort", util.TrueValue), - resource.TestCheckResourceAttrPair("genesyscloud_outbound_campaign."+resourceLabel, "contact_list_id", + resource.TestCheckResourceAttr(resourcePath, "name", name), + resource.TestCheckResourceAttr(resourcePath, "dialing_mode", dialingMode), + resource.TestCheckResourceAttr(resourcePath, "caller_name", callerName), + resource.TestCheckResourceAttr(resourcePath, "caller_address", callerAddress), + resource.TestCheckResourceAttr(resourcePath, "outbound_line_count", "1"), + resource.TestCheckResourceAttr(resourcePath, "campaign_status", "off"), + resource.TestCheckResourceAttr(resourcePath, "abandon_rate", "1"), + resource.TestCheckResourceAttr(resourcePath, "preview_time_out_seconds", "0"), + resource.TestCheckResourceAttr(resourcePath, "always_running", util.FalseValue), + resource.TestCheckResourceAttr(resourcePath, "no_answer_timeout", "40"), + resource.TestCheckResourceAttr(resourcePath, "priority", "4"), + resource.TestCheckResourceAttr(resourcePath, "phone_columns.0.column_name", "Cell"), + resource.TestCheckResourceAttr(resourcePath, "contact_sorts.0.field_name", contactSortFieldName), + resource.TestCheckResourceAttr(resourcePath, "contact_sorts.0.direction", contactSortDirection), + resource.TestCheckResourceAttr(resourcePath, "contact_sorts.0.numeric", contactSortNumeric), + resource.TestCheckResourceAttr(resourcePath, "dynamic_contact_queueing_settings.0.sort", util.TrueValue), + resource.TestCheckResourceAttrPair(resourcePath, "contact_list_id", "genesyscloud_outbound_contact_list."+contactListResourceLabel, "id"), - resource.TestCheckResourceAttrPair("genesyscloud_outbound_campaign."+resourceLabel, "callable_time_set_id", + resource.TestCheckResourceAttrPair(resourcePath, "callable_time_set_id", "genesyscloud_outbound_callabletimeset."+callableTimeSetId, "id"), - resource.TestCheckResourceAttrPair("genesyscloud_outbound_campaign."+resourceLabel, "contact_list_filter_ids.0", + resource.TestCheckResourceAttrPair(resourcePath, "contact_list_filter_ids.0", "genesyscloud_outbound_contactlistfilter."+clfResourceLabel, "id"), - resource.TestCheckResourceAttrPair("genesyscloud_outbound_campaign."+resourceLabel, "dnc_list_ids.0", + resource.TestCheckResourceAttrPair(resourcePath, "dnc_list_ids.0", "genesyscloud_outbound_dnclist."+dncListResourceLabel, "id"), - resource.TestCheckResourceAttrPair("genesyscloud_outbound_campaign."+resourceLabel, "rule_set_ids.0", + resource.TestCheckResourceAttrPair(resourcePath, "rule_set_ids.0", "genesyscloud_outbound_ruleset."+ruleSetResourceLabel, "id"), - resource.TestCheckResourceAttrPair("genesyscloud_outbound_campaign."+resourceLabel, "site_id", + resource.TestCheckResourceAttrPair(resourcePath, "site_id", "genesyscloud_telephony_providers_edges_site."+siteId, "id"), - resource.TestCheckResourceAttrPair("genesyscloud_outbound_campaign."+resourceLabel, "call_analysis_response_set_id", + resource.TestCheckResourceAttrPair(resourcePath, "call_analysis_response_set_id", "genesyscloud_outbound_callanalysisresponseset."+carResourceLabel, "id"), - provider.TestDefaultHomeDivision("genesyscloud_outbound_campaign."+resourceLabel), + provider.TestDefaultHomeDivision(resourcePath), ), }, { @@ -291,8 +293,8 @@ func TestAccResourceOutboundCampaignBasic(t *testing.T) { []string{"genesyscloud_outbound_dnclist." + dncListResourceLabel + ".id"}, []string{"genesyscloud_outbound_ruleset." + ruleSetResourceLabel + ".id"}, []string{"genesyscloud_outbound_contactlistfilter." + clfResourceLabel + ".id"}, - []string{"en-us"}, - strconv.Quote("false"), + []string{strconv.Quote("en-us")}, + util.FalseValue, // auto_answer generatePhoneColumnNoTypeBlock("Cell"), outbound.GenerateOutboundMessagingCampaignContactSort( contactSortFieldName, @@ -302,37 +304,37 @@ func TestAccResourceOutboundCampaignBasic(t *testing.T) { generateDynamicContactQueueingSettingsBlock(util.FalseValue), ), Check: resource.ComposeTestCheckFunc( - resource.TestCheckResourceAttr("genesyscloud_outbound_campaign."+resourceLabel, "name", name), - resource.TestCheckResourceAttr("genesyscloud_outbound_campaign."+resourceLabel, "dialing_mode", dialingMode), - resource.TestCheckResourceAttr("genesyscloud_outbound_campaign."+resourceLabel, "caller_name", callerName), - resource.TestCheckResourceAttr("genesyscloud_outbound_campaign."+resourceLabel, "caller_address", callerAddress), - resource.TestCheckResourceAttr("genesyscloud_outbound_campaign."+resourceLabel, "outbound_line_count", "1"), - resource.TestCheckResourceAttr("genesyscloud_outbound_campaign."+resourceLabel, "campaign_status", "off"), - resource.TestCheckResourceAttr("genesyscloud_outbound_campaign."+resourceLabel, "abandon_rate", "1"), - resource.TestCheckResourceAttr("genesyscloud_outbound_campaign."+resourceLabel, "preview_time_out_seconds", "0"), - resource.TestCheckResourceAttr("genesyscloud_outbound_campaign."+resourceLabel, "always_running", util.FalseValue), - resource.TestCheckResourceAttr("genesyscloud_outbound_campaign."+resourceLabel, "no_answer_timeout", "40"), - resource.TestCheckResourceAttr("genesyscloud_outbound_campaign."+resourceLabel, "priority", "4"), - resource.TestCheckResourceAttr("genesyscloud_outbound_campaign."+resourceLabel, "phone_columns.0.column_name", "Cell"), - resource.TestCheckResourceAttr("genesyscloud_outbound_campaign."+resourceLabel, "contact_sorts.0.field_name", contactSortFieldName), - resource.TestCheckResourceAttr("genesyscloud_outbound_campaign."+resourceLabel, "contact_sorts.0.direction", contactSortDirection), - resource.TestCheckResourceAttr("genesyscloud_outbound_campaign."+resourceLabel, "contact_sorts.0.numeric", contactSortNumeric), - resource.TestCheckResourceAttr("genesyscloud_outbound_campaign."+resourceLabel, "dynamic_contact_queueing_settings.0.sort", util.FalseValue), - resource.TestCheckResourceAttrPair("genesyscloud_outbound_campaign."+resourceLabel, "contact_list_id", + resource.TestCheckResourceAttr(resourcePath, "name", name), + resource.TestCheckResourceAttr(resourcePath, "dialing_mode", dialingMode), + resource.TestCheckResourceAttr(resourcePath, "caller_name", callerName), + resource.TestCheckResourceAttr(resourcePath, "caller_address", callerAddress), + resource.TestCheckResourceAttr(resourcePath, "outbound_line_count", "1"), + resource.TestCheckResourceAttr(resourcePath, "campaign_status", "off"), + resource.TestCheckResourceAttr(resourcePath, "abandon_rate", "1"), + resource.TestCheckResourceAttr(resourcePath, "preview_time_out_seconds", "0"), + resource.TestCheckResourceAttr(resourcePath, "always_running", util.FalseValue), + resource.TestCheckResourceAttr(resourcePath, "no_answer_timeout", "40"), + resource.TestCheckResourceAttr(resourcePath, "priority", "4"), + resource.TestCheckResourceAttr(resourcePath, "phone_columns.0.column_name", "Cell"), + resource.TestCheckResourceAttr(resourcePath, "contact_sorts.0.field_name", contactSortFieldName), + resource.TestCheckResourceAttr(resourcePath, "contact_sorts.0.direction", contactSortDirection), + resource.TestCheckResourceAttr(resourcePath, "contact_sorts.0.numeric", contactSortNumeric), + resource.TestCheckResourceAttr(resourcePath, "dynamic_contact_queueing_settings.0.sort", util.FalseValue), + resource.TestCheckResourceAttrPair(resourcePath, "contact_list_id", "genesyscloud_outbound_contact_list."+contactListResourceLabel, "id"), - resource.TestCheckResourceAttrPair("genesyscloud_outbound_campaign."+resourceLabel, "callable_time_set_id", + resource.TestCheckResourceAttrPair(resourcePath, "callable_time_set_id", "genesyscloud_outbound_callabletimeset."+callableTimeSetId, "id"), - resource.TestCheckResourceAttrPair("genesyscloud_outbound_campaign."+resourceLabel, "contact_list_filter_ids.0", + resource.TestCheckResourceAttrPair(resourcePath, "contact_list_filter_ids.0", "genesyscloud_outbound_contactlistfilter."+clfResourceLabel, "id"), - resource.TestCheckResourceAttrPair("genesyscloud_outbound_campaign."+resourceLabel, "dnc_list_ids.0", + resource.TestCheckResourceAttrPair(resourcePath, "dnc_list_ids.0", "genesyscloud_outbound_dnclist."+dncListResourceLabel, "id"), - resource.TestCheckResourceAttrPair("genesyscloud_outbound_campaign."+resourceLabel, "rule_set_ids.0", + resource.TestCheckResourceAttrPair(resourcePath, "rule_set_ids.0", "genesyscloud_outbound_ruleset."+ruleSetResourceLabel, "id"), - resource.TestCheckResourceAttrPair("genesyscloud_outbound_campaign."+resourceLabel, "site_id", + resource.TestCheckResourceAttrPair(resourcePath, "site_id", "genesyscloud_telephony_providers_edges_site."+siteId, "id"), - resource.TestCheckResourceAttrPair("genesyscloud_outbound_campaign."+resourceLabel, "call_analysis_response_set_id", + resource.TestCheckResourceAttrPair(resourcePath, "call_analysis_response_set_id", "genesyscloud_outbound_callanalysisresponseset."+carResourceLabel, "id"), - provider.TestDefaultHomeDivision("genesyscloud_outbound_campaign."+resourceLabel), + provider.TestDefaultHomeDivision(resourcePath), ), }, { @@ -362,8 +364,8 @@ func TestAccResourceOutboundCampaignBasic(t *testing.T) { []string{"genesyscloud_outbound_dnclist." + dncListResourceLabel + ".id"}, []string{"genesyscloud_outbound_ruleset." + ruleSetResourceLabel + ".id"}, []string{"genesyscloud_outbound_contactlistfilter." + clfResourceLabel + ".id"}, - []string{}, - strconv.Quote("false"), + nil, + util.FalseValue, // auto_answer generatePhoneColumnNoTypeBlock("Cell"), outbound.GenerateOutboundMessagingCampaignContactSort( contactSortFieldName, @@ -373,41 +375,41 @@ func TestAccResourceOutboundCampaignBasic(t *testing.T) { generateDynamicContactQueueingSettingsBlock(util.FalseValue), ), Check: resource.ComposeTestCheckFunc( - resource.TestCheckResourceAttr("genesyscloud_outbound_campaign."+resourceLabel, "name", nameUpdated), - resource.TestCheckResourceAttr("genesyscloud_outbound_campaign."+resourceLabel, "dialing_mode", dialingMode), - resource.TestCheckResourceAttr("genesyscloud_outbound_campaign."+resourceLabel, "caller_name", callerNameUpdated), - resource.TestCheckResourceAttr("genesyscloud_outbound_campaign."+resourceLabel, "caller_address", callerAddressUpdated), - resource.TestCheckResourceAttr("genesyscloud_outbound_campaign."+resourceLabel, "outbound_line_count", "2"), - resource.TestCheckResourceAttr("genesyscloud_outbound_campaign."+resourceLabel, "abandon_rate", "2"), - resource.TestCheckResourceAttr("genesyscloud_outbound_campaign."+resourceLabel, "preview_time_out_seconds", "1"), - resource.TestCheckResourceAttr("genesyscloud_outbound_campaign."+resourceLabel, "always_running", util.TrueValue), - resource.TestCheckResourceAttr("genesyscloud_outbound_campaign."+resourceLabel, "no_answer_timeout", "30"), - resource.TestCheckResourceAttr("genesyscloud_outbound_campaign."+resourceLabel, "priority", "3"), - resource.TestCheckResourceAttr("genesyscloud_outbound_campaign."+resourceLabel, "phone_columns.0.column_name", "Cell"), - resource.TestCheckResourceAttr("genesyscloud_outbound_campaign."+resourceLabel, "contact_sorts.0.field_name", contactSortFieldName), - resource.TestCheckResourceAttr("genesyscloud_outbound_campaign."+resourceLabel, "contact_sorts.0.direction", contactSortDirection), - resource.TestCheckResourceAttr("genesyscloud_outbound_campaign."+resourceLabel, "contact_sorts.0.numeric", contactSortNumeric), - resource.TestCheckResourceAttr("genesyscloud_outbound_campaign."+resourceLabel, "dynamic_contact_queueing_settings.0.sort", "false"), - resource.TestCheckResourceAttrPair("genesyscloud_outbound_campaign."+resourceLabel, "contact_list_id", + resource.TestCheckResourceAttr(resourcePath, "name", nameUpdated), + resource.TestCheckResourceAttr(resourcePath, "dialing_mode", dialingMode), + resource.TestCheckResourceAttr(resourcePath, "caller_name", callerNameUpdated), + resource.TestCheckResourceAttr(resourcePath, "caller_address", callerAddressUpdated), + resource.TestCheckResourceAttr(resourcePath, "outbound_line_count", "2"), + resource.TestCheckResourceAttr(resourcePath, "abandon_rate", "2"), + resource.TestCheckResourceAttr(resourcePath, "preview_time_out_seconds", "1"), + resource.TestCheckResourceAttr(resourcePath, "always_running", util.TrueValue), + resource.TestCheckResourceAttr(resourcePath, "no_answer_timeout", "30"), + resource.TestCheckResourceAttr(resourcePath, "priority", "3"), + resource.TestCheckResourceAttr(resourcePath, "phone_columns.0.column_name", "Cell"), + resource.TestCheckResourceAttr(resourcePath, "contact_sorts.0.field_name", contactSortFieldName), + resource.TestCheckResourceAttr(resourcePath, "contact_sorts.0.direction", contactSortDirection), + resource.TestCheckResourceAttr(resourcePath, "contact_sorts.0.numeric", contactSortNumeric), + resource.TestCheckResourceAttr(resourcePath, "dynamic_contact_queueing_settings.0.sort", "false"), + resource.TestCheckResourceAttrPair(resourcePath, "contact_list_id", "genesyscloud_outbound_contact_list."+contactListResourceLabel, "id"), - resource.TestCheckResourceAttrPair("genesyscloud_outbound_campaign."+resourceLabel, "callable_time_set_id", + resource.TestCheckResourceAttrPair(resourcePath, "callable_time_set_id", "genesyscloud_outbound_callabletimeset."+callableTimeSetId, "id"), - resource.TestCheckResourceAttrPair("genesyscloud_outbound_campaign."+resourceLabel, "contact_list_filter_ids.0", + resource.TestCheckResourceAttrPair(resourcePath, "contact_list_filter_ids.0", "genesyscloud_outbound_contactlistfilter."+clfResourceLabel, "id"), - resource.TestCheckResourceAttrPair("genesyscloud_outbound_campaign."+resourceLabel, "dnc_list_ids.0", + resource.TestCheckResourceAttrPair(resourcePath, "dnc_list_ids.0", "genesyscloud_outbound_dnclist."+dncListResourceLabel, "id"), - resource.TestCheckResourceAttrPair("genesyscloud_outbound_campaign."+resourceLabel, "rule_set_ids.0", + resource.TestCheckResourceAttrPair(resourcePath, "rule_set_ids.0", "genesyscloud_outbound_ruleset."+ruleSetResourceLabel, "id"), - resource.TestCheckResourceAttrPair("genesyscloud_outbound_campaign."+resourceLabel, "site_id", + resource.TestCheckResourceAttrPair(resourcePath, "site_id", "genesyscloud_telephony_providers_edges_site."+siteId, "id"), - resource.TestCheckResourceAttrPair("genesyscloud_outbound_campaign."+resourceLabel, "call_analysis_response_set_id", + resource.TestCheckResourceAttrPair(resourcePath, "call_analysis_response_set_id", "genesyscloud_outbound_callanalysisresponseset."+carResourceLabel, "id"), - provider.TestDefaultHomeDivision("genesyscloud_outbound_campaign."+resourceLabel), + provider.TestDefaultHomeDivision(resourcePath), ), }, { // Import/Read - ResourceName: "genesyscloud_outbound_campaign." + resourceLabel, + ResourceName: resourcePath, ImportState: true, ImportStateVerify: true, ImportStateVerifyIgnore: []string{"queue_id"}, @@ -433,6 +435,8 @@ func TestAccResourceOutboundCampaignCampaignStatus(t *testing.T) { locationResourceLabel = "location" divResourceLabel = "test-division" divName = "terraform-" + uuid.NewString() + + resourcePath = ResourceType + "." + resourceLabel ) emergencyNumber := "+13178793429" @@ -522,7 +526,7 @@ func TestAccResourceOutboundCampaignCampaignStatus(t *testing.T) { Steps: []resource.TestStep{ { Config: referencedResources + fmt.Sprintf(` - resource "genesyscloud_outbound_campaign" "%s" { + resource "%s" "%s" { name = "%s" dialing_mode = "agentless" caller_name = "Test Name" @@ -536,15 +540,15 @@ func TestAccResourceOutboundCampaignCampaignStatus(t *testing.T) { column_name = "Cell" } } - `, resourceLabel, name, contactListResourceLabel, siteId, carResourceLabel), + `, ResourceType, resourceLabel, name, contactListResourceLabel, siteId, carResourceLabel), Check: resource.ComposeTestCheckFunc( - resource.TestCheckResourceAttr("genesyscloud_outbound_campaign."+resourceLabel, "name", name), - resource.TestCheckResourceAttr("genesyscloud_outbound_campaign."+resourceLabel, "campaign_status", "off"), - resource.TestCheckResourceAttrPair("genesyscloud_outbound_campaign."+resourceLabel, "contact_list_id", + resource.TestCheckResourceAttr(resourcePath, "name", name), + resource.TestCheckResourceAttr(resourcePath, "campaign_status", "off"), + resource.TestCheckResourceAttrPair(resourcePath, "contact_list_id", "genesyscloud_outbound_contact_list."+contactListResourceLabel, "id"), - resource.TestCheckResourceAttrPair("genesyscloud_outbound_campaign."+resourceLabel, "site_id", + resource.TestCheckResourceAttrPair(resourcePath, "site_id", "genesyscloud_telephony_providers_edges_site."+siteId, "id"), - resource.TestCheckResourceAttrPair("genesyscloud_outbound_campaign."+resourceLabel, "call_analysis_response_set_id", + resource.TestCheckResourceAttrPair(resourcePath, "call_analysis_response_set_id", "genesyscloud_outbound_callanalysisresponseset."+carResourceLabel, "id"), // Add contacts to the contact list (because we have access to the state and can pull out the contactlist ID to pass to the API) addContactsToContactList, @@ -552,7 +556,7 @@ func TestAccResourceOutboundCampaignCampaignStatus(t *testing.T) { }, { Config: referencedResources + fmt.Sprintf(` - resource "genesyscloud_outbound_campaign" "%s" { + resource "%s" "%s" { name = "%s" dialing_mode = "agentless" caller_name = "Test Name" @@ -566,21 +570,21 @@ func TestAccResourceOutboundCampaignCampaignStatus(t *testing.T) { column_name = "Cell" } } - `, resourceLabel, name, contactListResourceLabel, siteId, carResourceLabel), + `, ResourceType, resourceLabel, name, contactListResourceLabel, siteId, carResourceLabel), Check: resource.ComposeTestCheckFunc( - resource.TestCheckResourceAttr("genesyscloud_outbound_campaign."+resourceLabel, "name", name), - resource.TestCheckResourceAttrPair("genesyscloud_outbound_campaign."+resourceLabel, "contact_list_id", + resource.TestCheckResourceAttr(resourcePath, "name", name), + resource.TestCheckResourceAttrPair(resourcePath, "contact_list_id", "genesyscloud_outbound_contact_list."+contactListResourceLabel, "id"), - resource.TestCheckResourceAttrPair("genesyscloud_outbound_campaign."+resourceLabel, "site_id", + resource.TestCheckResourceAttrPair(resourcePath, "site_id", "genesyscloud_telephony_providers_edges_site."+siteId, "id"), - resource.TestCheckResourceAttrPair("genesyscloud_outbound_campaign."+resourceLabel, "call_analysis_response_set_id", + resource.TestCheckResourceAttrPair(resourcePath, "call_analysis_response_set_id", "genesyscloud_outbound_callanalysisresponseset."+carResourceLabel, "id"), - util.VerifyAttributeInArrayOfPotentialValues("genesyscloud_outbound_campaign."+resourceLabel, "campaign_status", []string{"on", "complete"}), + util.VerifyAttributeInArrayOfPotentialValues(resourcePath, "campaign_status", []string{"on", "complete"}), ), }, { Config: referencedResources + fmt.Sprintf(` - resource "genesyscloud_outbound_campaign" "%s" { + resource "%s" "%s" { name = "%s" dialing_mode = "agentless" caller_name = "Test Name" @@ -594,21 +598,21 @@ func TestAccResourceOutboundCampaignCampaignStatus(t *testing.T) { column_name = "Cell" } } - `, resourceLabel, name, contactListResourceLabel, siteId, carResourceLabel), + `, ResourceType, resourceLabel, name, contactListResourceLabel, siteId, carResourceLabel), Check: resource.ComposeTestCheckFunc( - resource.TestCheckResourceAttr("genesyscloud_outbound_campaign."+resourceLabel, "name", name), - util.VerifyAttributeInArrayOfPotentialValues("genesyscloud_outbound_campaign."+resourceLabel, "campaign_status", []string{"off", "complete"}), - resource.TestCheckResourceAttrPair("genesyscloud_outbound_campaign."+resourceLabel, "contact_list_id", + resource.TestCheckResourceAttr(resourcePath, "name", name), + util.VerifyAttributeInArrayOfPotentialValues(resourcePath, "campaign_status", []string{"off", "complete"}), + resource.TestCheckResourceAttrPair(resourcePath, "contact_list_id", "genesyscloud_outbound_contact_list."+contactListResourceLabel, "id"), - resource.TestCheckResourceAttrPair("genesyscloud_outbound_campaign."+resourceLabel, "site_id", + resource.TestCheckResourceAttrPair(resourcePath, "site_id", "genesyscloud_telephony_providers_edges_site."+siteId, "id"), - resource.TestCheckResourceAttrPair("genesyscloud_outbound_campaign."+resourceLabel, "call_analysis_response_set_id", + resource.TestCheckResourceAttrPair(resourcePath, "call_analysis_response_set_id", "genesyscloud_outbound_callanalysisresponseset."+carResourceLabel, "id"), ), }, { // Import/Read - ResourceName: "genesyscloud_outbound_campaign." + resourceLabel, + ResourceName: resourcePath, ImportState: true, ImportStateVerify: true, ImportStateVerifyIgnore: []string{"campaign_status"}, @@ -633,6 +637,8 @@ func TestAccResourceOutboundCampaignStatusOn(t *testing.T) { locationResourceLabel = "location" divResourceLabel = "test-outbound-campaign-division" divName = "terraform-" + uuid.NewString() + + resourcePath = ResourceType + "." + resourceLabel ) emergencyNumber := "+13178793430" @@ -692,14 +698,14 @@ func TestAccResourceOutboundCampaignStatusOn(t *testing.T) { divResourceLabel, ), Check: resource.ComposeTestCheckFunc( - resource.TestCheckResourceAttr("genesyscloud_outbound_campaign."+resourceLabel, "name", name), - resource.TestCheckResourceAttrPair("genesyscloud_outbound_campaign."+resourceLabel, "contact_list_id", + resource.TestCheckResourceAttr(resourcePath, "name", name), + resource.TestCheckResourceAttrPair(resourcePath, "contact_list_id", "genesyscloud_outbound_contact_list."+contactListResourceLabel, "id"), - resource.TestCheckResourceAttrPair("genesyscloud_outbound_campaign."+resourceLabel, "site_id", + resource.TestCheckResourceAttrPair(resourcePath, "site_id", "genesyscloud_telephony_providers_edges_site."+siteId, "id"), - resource.TestCheckResourceAttrPair("genesyscloud_outbound_campaign."+resourceLabel, "call_analysis_response_set_id", + resource.TestCheckResourceAttrPair(resourcePath, "call_analysis_response_set_id", "genesyscloud_outbound_callanalysisresponseset."+carResourceLabel, "id"), - util.VerifyAttributeInArrayOfPotentialValues("genesyscloud_outbound_campaign."+resourceLabel, "campaign_status", []string{"on", "complete"}), + util.VerifyAttributeInArrayOfPotentialValues(resourcePath, "campaign_status", []string{"on", "complete"}), func(s *terraform.State) error { time.Sleep(300 * time.Second) // Takes approx. 300 seconds for campaign to be completed / stopped return nil @@ -708,7 +714,7 @@ func TestAccResourceOutboundCampaignStatusOn(t *testing.T) { }, { // Import/Read - ResourceName: "genesyscloud_outbound_campaign." + resourceLabel, + ResourceName: resourcePath, ImportState: true, ImportStateVerify: true, ImportStateVerifyIgnore: []string{"campaign_status"}, @@ -737,6 +743,8 @@ func TestAccResourceOutboundCampaignWithScriptId(t *testing.T) { contactSortFieldName = "zipcode" contactSortDirection = "ASC" contactSortNumeric = util.FalseValue + + resourcePath = ResourceType + "." + resourceLabel ) scriptId, err := getPublishedScriptId() @@ -814,19 +822,19 @@ func TestAccResourceOutboundCampaignWithScriptId(t *testing.T) { []string{}, []string{}, []string{}, - strconv.Quote("false"), + util.FalseValue, generatePhoneColumnNoTypeBlock("Cell"), ), Check: resource.ComposeTestCheckFunc( - resource.TestCheckResourceAttr("genesyscloud_outbound_campaign."+resourceLabel, "name", name), - resource.TestCheckResourceAttr("genesyscloud_outbound_campaign."+resourceLabel, "dialing_mode", dialingMode), - resource.TestCheckResourceAttr("genesyscloud_outbound_campaign."+resourceLabel, "caller_name", callerName), - resource.TestCheckResourceAttr("genesyscloud_outbound_campaign."+resourceLabel, "caller_address", callerAddress), - resource.TestCheckResourceAttr("genesyscloud_outbound_campaign."+resourceLabel, "phone_columns.0.column_name", "Cell"), - resource.TestCheckResourceAttr("genesyscloud_outbound_campaign."+resourceLabel, "script_id", scriptId), - resource.TestCheckResourceAttrPair("genesyscloud_outbound_campaign."+resourceLabel, "contact_list_id", + resource.TestCheckResourceAttr(resourcePath, "name", name), + resource.TestCheckResourceAttr(resourcePath, "dialing_mode", dialingMode), + resource.TestCheckResourceAttr(resourcePath, "caller_name", callerName), + resource.TestCheckResourceAttr(resourcePath, "caller_address", callerAddress), + resource.TestCheckResourceAttr(resourcePath, "phone_columns.0.column_name", "Cell"), + resource.TestCheckResourceAttr(resourcePath, "script_id", scriptId), + resource.TestCheckResourceAttrPair(resourcePath, "contact_list_id", "genesyscloud_outbound_contact_list."+contactListResourceLabel, "id"), - resource.TestCheckResourceAttrPair("genesyscloud_outbound_campaign."+resourceLabel, "queue_id", + resource.TestCheckResourceAttrPair(resourcePath, "queue_id", "genesyscloud_routing_queue."+queueResourceLabel, "id"), ), }, @@ -859,7 +867,7 @@ func TestAccResourceOutboundCampaignWithScriptId(t *testing.T) { []string{"genesyscloud_outbound_ruleset." + ruleSetResourceLabel + ".id"}, []string{"genesyscloud_outbound_contactlistfilter." + clfResourceLabel + ".id"}, []string{strconv.Quote("language")}, - strconv.Quote("false"), + util.FalseValue, // auto_answer generatePhoneColumnNoTypeBlock("Cell"), outbound.GenerateOutboundMessagingCampaignContactSort( contactSortFieldName, @@ -868,44 +876,44 @@ func TestAccResourceOutboundCampaignWithScriptId(t *testing.T) { ), ), Check: resource.ComposeTestCheckFunc( - resource.TestCheckResourceAttr("genesyscloud_outbound_campaign."+resourceLabel, "name", name), - resource.TestCheckResourceAttr("genesyscloud_outbound_campaign."+resourceLabel, "dialing_mode", dialingMode), - resource.TestCheckResourceAttr("genesyscloud_outbound_campaign."+resourceLabel, "caller_name", callerName), - resource.TestCheckResourceAttr("genesyscloud_outbound_campaign."+resourceLabel, "caller_address", callerAddress), - resource.TestCheckResourceAttr("genesyscloud_outbound_campaign."+resourceLabel, "phone_columns.0.column_name", "Cell"), - resource.TestCheckResourceAttr("genesyscloud_outbound_campaign."+resourceLabel, "abandon_rate", "1"), - resource.TestCheckResourceAttr("genesyscloud_outbound_campaign."+resourceLabel, "outbound_line_count", "1"), - resource.TestCheckResourceAttr("genesyscloud_outbound_campaign."+resourceLabel, "skip_preview_disabled", util.FalseValue), - resource.TestCheckResourceAttr("genesyscloud_outbound_campaign."+resourceLabel, "preview_time_out_seconds", "1"), - resource.TestCheckResourceAttr("genesyscloud_outbound_campaign."+resourceLabel, "always_running", util.FalseValue), - resource.TestCheckResourceAttr("genesyscloud_outbound_campaign."+resourceLabel, "contact_sorts.0.field_name", contactSortFieldName), - resource.TestCheckResourceAttr("genesyscloud_outbound_campaign."+resourceLabel, "contact_sorts.0.direction", contactSortDirection), - resource.TestCheckResourceAttr("genesyscloud_outbound_campaign."+resourceLabel, "contact_sorts.0.numeric", contactSortNumeric), - resource.TestCheckResourceAttr("genesyscloud_outbound_campaign."+resourceLabel, "no_answer_timeout", "3"), - resource.TestCheckResourceAttr("genesyscloud_outbound_campaign."+resourceLabel, "priority", "2"), - resource.TestCheckResourceAttr("genesyscloud_outbound_campaign."+resourceLabel, "script_id", scriptId), - resource.TestCheckResourceAttr("genesyscloud_outbound_campaign."+resourceLabel, "skill_columns.0", "language"), - resource.TestCheckResourceAttr("genesyscloud_outbound_campaign."+resourceLabel, "auto_answer", "false"), - resource.TestCheckResourceAttrPair("genesyscloud_outbound_campaign."+resourceLabel, "contact_list_filter_ids.0", + resource.TestCheckResourceAttr(resourcePath, "name", name), + resource.TestCheckResourceAttr(resourcePath, "dialing_mode", dialingMode), + resource.TestCheckResourceAttr(resourcePath, "caller_name", callerName), + resource.TestCheckResourceAttr(resourcePath, "caller_address", callerAddress), + resource.TestCheckResourceAttr(resourcePath, "phone_columns.0.column_name", "Cell"), + resource.TestCheckResourceAttr(resourcePath, "abandon_rate", "1"), + resource.TestCheckResourceAttr(resourcePath, "outbound_line_count", "1"), + resource.TestCheckResourceAttr(resourcePath, "skip_preview_disabled", util.FalseValue), + resource.TestCheckResourceAttr(resourcePath, "preview_time_out_seconds", "1"), + resource.TestCheckResourceAttr(resourcePath, "always_running", util.FalseValue), + resource.TestCheckResourceAttr(resourcePath, "contact_sorts.0.field_name", contactSortFieldName), + resource.TestCheckResourceAttr(resourcePath, "contact_sorts.0.direction", contactSortDirection), + resource.TestCheckResourceAttr(resourcePath, "contact_sorts.0.numeric", contactSortNumeric), + resource.TestCheckResourceAttr(resourcePath, "no_answer_timeout", "3"), + resource.TestCheckResourceAttr(resourcePath, "priority", "2"), + resource.TestCheckResourceAttr(resourcePath, "script_id", scriptId), + resource.TestCheckResourceAttr(resourcePath, "skill_columns.0", "language"), + resource.TestCheckResourceAttr(resourcePath, "auto_answer", "false"), + resource.TestCheckResourceAttrPair(resourcePath, "contact_list_filter_ids.0", "genesyscloud_outbound_contactlistfilter."+clfResourceLabel, "id"), - resource.TestCheckResourceAttrPair("genesyscloud_outbound_campaign."+resourceLabel, "dnc_list_ids.0", + resource.TestCheckResourceAttrPair(resourcePath, "dnc_list_ids.0", "genesyscloud_outbound_dnclist."+dncListResourceLabel, "id"), - resource.TestCheckResourceAttrPair("genesyscloud_outbound_campaign."+resourceLabel, "contact_list_id", + resource.TestCheckResourceAttrPair(resourcePath, "contact_list_id", "genesyscloud_outbound_contact_list."+contactListResourceLabel, "id"), - resource.TestCheckResourceAttrPair("genesyscloud_outbound_campaign."+resourceLabel, "queue_id", + resource.TestCheckResourceAttrPair(resourcePath, "queue_id", "genesyscloud_routing_queue."+queueResourceLabel, "id"), - resource.TestCheckResourceAttrPair("genesyscloud_outbound_campaign."+resourceLabel, "call_analysis_response_set_id", + resource.TestCheckResourceAttrPair(resourcePath, "call_analysis_response_set_id", "genesyscloud_outbound_callanalysisresponseset."+carResourceLabel, "id"), - resource.TestCheckResourceAttrPair("genesyscloud_outbound_campaign."+resourceLabel, "rule_set_ids.0", + resource.TestCheckResourceAttrPair(resourcePath, "rule_set_ids.0", "genesyscloud_outbound_ruleset."+ruleSetResourceLabel, "id"), - resource.TestCheckResourceAttrPair("genesyscloud_outbound_campaign."+resourceLabel, "callable_time_set_id", + resource.TestCheckResourceAttrPair(resourcePath, "callable_time_set_id", "genesyscloud_outbound_callabletimeset."+callableTimeSetResourceLabel, "id"), - provider.TestDefaultHomeDivision("genesyscloud_outbound_campaign."+resourceLabel), + provider.TestDefaultHomeDivision(resourcePath), ), }, { // Import/Read - ResourceName: "genesyscloud_outbound_campaign." + resourceLabel, + ResourceName: resourcePath, ImportState: true, ImportStateVerify: true, }, @@ -927,6 +935,8 @@ func TestAccResourceOutboundCampaignPower(t *testing.T) { locationResourceLabel = "location" siteId = "site" carResourceLabel = "car" + + resourcePath = ResourceType + "." + resourceLabel ) emergencyNumber := "+13178793431" @@ -995,20 +1005,20 @@ func TestAccResourceOutboundCampaignPower(t *testing.T) { generateDynamicLineBalancingSettingsBlock(util.FalseValue, "0"), ), Check: resource.ComposeTestCheckFunc( - resource.TestCheckResourceAttr("genesyscloud_outbound_campaign."+resourceLabel, "name", name), - resource.TestCheckResourceAttr("genesyscloud_outbound_campaign."+resourceLabel, "dialing_mode", dialingMode), - resource.TestCheckResourceAttr("genesyscloud_outbound_campaign."+resourceLabel, "caller_name", callerName), - resource.TestCheckResourceAttr("genesyscloud_outbound_campaign."+resourceLabel, "caller_address", callerAddress), - resource.TestCheckResourceAttr("genesyscloud_outbound_campaign."+resourceLabel, "max_calls_per_agent", "1"), - resource.TestCheckResourceAttr("genesyscloud_outbound_campaign."+resourceLabel, "phone_columns.0.column_name", "Cell"), - resource.TestCheckResourceAttr("genesyscloud_outbound_campaign."+resourceLabel, "outbound_line_count", "1"), - resource.TestCheckResourceAttrPair("genesyscloud_outbound_campaign."+resourceLabel, "contact_list_id", + resource.TestCheckResourceAttr(resourcePath, "name", name), + resource.TestCheckResourceAttr(resourcePath, "dialing_mode", dialingMode), + resource.TestCheckResourceAttr(resourcePath, "caller_name", callerName), + resource.TestCheckResourceAttr(resourcePath, "caller_address", callerAddress), + resource.TestCheckResourceAttr(resourcePath, "max_calls_per_agent", "1"), + resource.TestCheckResourceAttr(resourcePath, "phone_columns.0.column_name", "Cell"), + resource.TestCheckResourceAttr(resourcePath, "outbound_line_count", "1"), + resource.TestCheckResourceAttrPair(resourcePath, "contact_list_id", "genesyscloud_outbound_contact_list."+contactListResourceLabel, "id"), - resource.TestCheckResourceAttrPair("genesyscloud_outbound_campaign."+resourceLabel, "queue_id", + resource.TestCheckResourceAttrPair(resourcePath, "queue_id", "genesyscloud_routing_queue."+queueResourceLabel, "id"), - resource.TestCheckResourceAttr("genesyscloud_outbound_campaign."+resourceLabel, + resource.TestCheckResourceAttr(resourcePath, "dynamic_line_balancing_settings.0.enabled", "false"), - resource.TestCheckResourceAttr("genesyscloud_outbound_campaign."+resourceLabel, + resource.TestCheckResourceAttr(resourcePath, "dynamic_line_balancing_settings.0.relative_weight", "0"), ), }, @@ -1046,27 +1056,27 @@ func TestAccResourceOutboundCampaignPower(t *testing.T) { generateDynamicLineBalancingSettingsBlock(util.TrueValue, "15"), ), Check: resource.ComposeTestCheckFunc( - resource.TestCheckResourceAttr("genesyscloud_outbound_campaign."+resourceLabel, "name", name), - resource.TestCheckResourceAttr("genesyscloud_outbound_campaign."+resourceLabel, "dialing_mode", dialingMode), - resource.TestCheckResourceAttr("genesyscloud_outbound_campaign."+resourceLabel, "caller_name", callerName), - resource.TestCheckResourceAttr("genesyscloud_outbound_campaign."+resourceLabel, "caller_address", callerAddress), - resource.TestCheckResourceAttr("genesyscloud_outbound_campaign."+resourceLabel, "max_calls_per_agent", "2"), - resource.TestCheckResourceAttr("genesyscloud_outbound_campaign."+resourceLabel, "phone_columns.0.column_name", "Cell"), - resource.TestCheckResourceAttrPair("genesyscloud_outbound_campaign."+resourceLabel, "contact_list_id", + resource.TestCheckResourceAttr(resourcePath, "name", name), + resource.TestCheckResourceAttr(resourcePath, "dialing_mode", dialingMode), + resource.TestCheckResourceAttr(resourcePath, "caller_name", callerName), + resource.TestCheckResourceAttr(resourcePath, "caller_address", callerAddress), + resource.TestCheckResourceAttr(resourcePath, "max_calls_per_agent", "2"), + resource.TestCheckResourceAttr(resourcePath, "phone_columns.0.column_name", "Cell"), + resource.TestCheckResourceAttrPair(resourcePath, "contact_list_id", "genesyscloud_outbound_contact_list."+contactListResourceLabel, "id"), - resource.TestCheckResourceAttrPair("genesyscloud_outbound_campaign."+resourceLabel, "queue_id", + resource.TestCheckResourceAttrPair(resourcePath, "queue_id", "genesyscloud_routing_queue."+queueResourceLabel, "id"), - resource.TestCheckResourceAttrPair("genesyscloud_outbound_campaign."+resourceLabel, "queue_id", + resource.TestCheckResourceAttrPair(resourcePath, "queue_id", "genesyscloud_routing_queue."+queueResourceLabel, "id"), - resource.TestCheckResourceAttr("genesyscloud_outbound_campaign."+resourceLabel, + resource.TestCheckResourceAttr(resourcePath, "dynamic_line_balancing_settings.0.enabled", "true"), - resource.TestCheckResourceAttr("genesyscloud_outbound_campaign."+resourceLabel, + resource.TestCheckResourceAttr(resourcePath, "dynamic_line_balancing_settings.0.relative_weight", "15"), ), }, { // Import/Read - ResourceName: "genesyscloud_outbound_campaign." + resourceLabel, + ResourceName: resourcePath, ImportState: true, ImportStateVerify: true, }, @@ -1132,30 +1142,30 @@ func addContactsToContactList(state *terraform.State) error { } func generateOutboundCampaign( - resourceLabel string, - name string, - dialingMode string, // required - callerName string, // required - callerAddress string, // required - contactListId string, // required - campaignStatus string, - divisionId string, - scriptId string, - queueId string, - siteId string, - abandonRate string, - maxCallsPerAgent string, - callableTimeSetId string, - callAnalysisResponseSetId string, - outboundLineCount string, - skipPreviewDisabled string, - previewTimeOutSeconds string, - alwaysRunning string, - noAnswerTimeout string, + resourceLabel, + name, + dialingMode, // required + callerName, // required + callerAddress, // required + contactListId, // required + campaignStatus, + divisionId, + scriptId, + queueId, + siteId, + abandonRate, + maxCallsPerAgent, + callableTimeSetId, + callAnalysisResponseSetId, + outboundLineCount, + skipPreviewDisabled, + previewTimeOutSeconds, + alwaysRunning, + noAnswerTimeout, priority string, - dncListIds []string, - ruleSetIds []string, - contactListFilterIds []string, + dncListIds, + ruleSetIds, + contactListFilterIds, skillColumns []string, autoAnswer string, nestedBlocks ...string, @@ -1203,7 +1213,7 @@ func generateDynamicContactQueueingSettingsBlock(sort string) string { `, sort) } -func generateDynamicLineBalancingSettingsBlock(enabled string, weight string) string { +func generateDynamicLineBalancingSettingsBlock(enabled, weight string) string { return fmt.Sprintf(` dynamic_line_balancing_settings { enabled = %s @@ -1226,7 +1236,7 @@ func getPublishedScriptId() (string, error) { func testVerifyOutboundCampaignDestroyed(state *terraform.State) error { outboundAPI := platformclientv2.NewOutboundApi() for _, rs := range state.RootModule().Resources { - if rs.Type != "genesyscloud_outbound_campaign" { + if rs.Type != ResourceType { continue } campaign, resp, err := outboundAPI.GetOutboundCampaign(rs.Primary.ID) diff --git a/genesyscloud/outbound_campaign/resource_genesyscloud_outbound_campaign_utils.go b/genesyscloud/outbound_campaign/resource_genesyscloud_outbound_campaign_utils.go index 7d246288d..0ebc4f42e 100644 --- a/genesyscloud/outbound_campaign/resource_genesyscloud_outbound_campaign_utils.go +++ b/genesyscloud/outbound_campaign/resource_genesyscloud_outbound_campaign_utils.go @@ -19,7 +19,7 @@ import ( "github.com/google/uuid" "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" ) /* diff --git a/genesyscloud/outbound_campaignrule/data_source_genesyscloud_outbound_campaignrule.go b/genesyscloud/outbound_campaignrule/data_source_genesyscloud_outbound_campaignrule.go index a07e47cfd..9e4a76745 100644 --- a/genesyscloud/outbound_campaignrule/data_source_genesyscloud_outbound_campaignrule.go +++ b/genesyscloud/outbound_campaignrule/data_source_genesyscloud_outbound_campaignrule.go @@ -11,7 +11,7 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" ) func dataSourceOutboundCampaignruleRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { diff --git a/genesyscloud/outbound_campaignrule/genesyscloud_outbound_campaignrule_proxy.go b/genesyscloud/outbound_campaignrule/genesyscloud_outbound_campaignrule_proxy.go index 8d658b529..8fcfbb4d9 100644 --- a/genesyscloud/outbound_campaignrule/genesyscloud_outbound_campaignrule_proxy.go +++ b/genesyscloud/outbound_campaignrule/genesyscloud_outbound_campaignrule_proxy.go @@ -5,7 +5,7 @@ import ( "fmt" "log" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" ) /* diff --git a/genesyscloud/outbound_campaignrule/resource_genesyscloud_outbound_campaignrule.go b/genesyscloud/outbound_campaignrule/resource_genesyscloud_outbound_campaignrule.go index 7d4cb331d..e7f42c3fe 100644 --- a/genesyscloud/outbound_campaignrule/resource_genesyscloud_outbound_campaignrule.go +++ b/genesyscloud/outbound_campaignrule/resource_genesyscloud_outbound_campaignrule.go @@ -18,7 +18,7 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" ) func getAllAuthCampaignRules(ctx context.Context, clientConfig *platformclientv2.Configuration) (resourceExporter.ResourceIDMetaMap, diag.Diagnostics) { diff --git a/genesyscloud/outbound_campaignrule/resource_genesyscloud_outbound_campaignrule_test.go b/genesyscloud/outbound_campaignrule/resource_genesyscloud_outbound_campaignrule_test.go index adbd08f39..0c42bc3e2 100644 --- a/genesyscloud/outbound_campaignrule/resource_genesyscloud_outbound_campaignrule_test.go +++ b/genesyscloud/outbound_campaignrule/resource_genesyscloud_outbound_campaignrule_test.go @@ -13,7 +13,7 @@ import ( "github.com/google/uuid" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" ) func TestAccResourceOutboundCampaignRuleBasic(t *testing.T) { diff --git a/genesyscloud/outbound_campaignrule/resource_genesyscloud_outbound_campaignrule_unit_test.go b/genesyscloud/outbound_campaignrule/resource_genesyscloud_outbound_campaignrule_unit_test.go index f22722988..fb5c04267 100644 --- a/genesyscloud/outbound_campaignrule/resource_genesyscloud_outbound_campaignrule_unit_test.go +++ b/genesyscloud/outbound_campaignrule/resource_genesyscloud_outbound_campaignrule_unit_test.go @@ -10,7 +10,7 @@ import ( "github.com/google/go-cmp/cmp" "github.com/google/uuid" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" "github.com/stretchr/testify/assert" ) diff --git a/genesyscloud/outbound_campaignrule/resource_genesyscloud_outbound_campaignrule_utils.go b/genesyscloud/outbound_campaignrule/resource_genesyscloud_outbound_campaignrule_utils.go index 9ba9daccc..720452889 100644 --- a/genesyscloud/outbound_campaignrule/resource_genesyscloud_outbound_campaignrule_utils.go +++ b/genesyscloud/outbound_campaignrule/resource_genesyscloud_outbound_campaignrule_utils.go @@ -5,7 +5,7 @@ import ( "terraform-provider-genesyscloud/genesyscloud/util/resourcedata" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" ) func getCampaignruleFromResourceData(d *schema.ResourceData) platformclientv2.Campaignrule { diff --git a/genesyscloud/outbound_contact_list/genesyscloud_outbound_contact_list_proxy.go b/genesyscloud/outbound_contact_list/genesyscloud_outbound_contact_list_proxy.go index 4fdd489ae..98417888f 100644 --- a/genesyscloud/outbound_contact_list/genesyscloud_outbound_contact_list_proxy.go +++ b/genesyscloud/outbound_contact_list/genesyscloud_outbound_contact_list_proxy.go @@ -7,7 +7,7 @@ import ( rc "terraform-provider-genesyscloud/genesyscloud/resource_cache" "terraform-provider-genesyscloud/genesyscloud/tfexporter_state" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" ) /* diff --git a/genesyscloud/outbound_contact_list/resource_genesyscloud_outbound_contact_list.go b/genesyscloud/outbound_contact_list/resource_genesyscloud_outbound_contact_list.go index 590b7a8e5..142259ccb 100644 --- a/genesyscloud/outbound_contact_list/resource_genesyscloud_outbound_contact_list.go +++ b/genesyscloud/outbound_contact_list/resource_genesyscloud_outbound_contact_list.go @@ -18,7 +18,7 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" ) func getAllOutboundContactLists(ctx context.Context, clientConfig *platformclientv2.Configuration) (resourceExporter.ResourceIDMetaMap, diag.Diagnostics) { diff --git a/genesyscloud/outbound_contact_list/resource_genesyscloud_outbound_contact_list_test.go b/genesyscloud/outbound_contact_list/resource_genesyscloud_outbound_contact_list_test.go index a80dbe373..61580b150 100644 --- a/genesyscloud/outbound_contact_list/resource_genesyscloud_outbound_contact_list_test.go +++ b/genesyscloud/outbound_contact_list/resource_genesyscloud_outbound_contact_list_test.go @@ -12,7 +12,7 @@ import ( "github.com/google/uuid" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" ) func TestAccResourceOutboundContactListBasic(t *testing.T) { diff --git a/genesyscloud/outbound_contact_list/resource_genesyscloud_outbound_contact_list_utils.go b/genesyscloud/outbound_contact_list/resource_genesyscloud_outbound_contact_list_utils.go index 522c9d69b..495d05378 100644 --- a/genesyscloud/outbound_contact_list/resource_genesyscloud_outbound_contact_list_utils.go +++ b/genesyscloud/outbound_contact_list/resource_genesyscloud_outbound_contact_list_utils.go @@ -5,7 +5,7 @@ import ( "strings" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" ) func buildSdkOutboundContactListContactPhoneNumberColumnSlice(contactPhoneNumberColumn *schema.Set) *[]platformclientv2.Contactphonenumbercolumn { diff --git a/genesyscloud/outbound_contact_list_contact/genesyscloud_outbound_contact_list_contact_proxy.go b/genesyscloud/outbound_contact_list_contact/genesyscloud_outbound_contact_list_contact_proxy.go index 38278dcf2..17da974bc 100644 --- a/genesyscloud/outbound_contact_list_contact/genesyscloud_outbound_contact_list_contact_proxy.go +++ b/genesyscloud/outbound_contact_list_contact/genesyscloud_outbound_contact_list_contact_proxy.go @@ -6,16 +6,20 @@ import ( rc "terraform-provider-genesyscloud/genesyscloud/resource_cache" "terraform-provider-genesyscloud/genesyscloud/tfexporter_state" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" ) var contactCache = rc.NewResourceCache[platformclientv2.Dialercontact]() +type ContactEntry struct { + ContactList *platformclientv2.Contactlist + Contact *[]platformclientv2.Dialercontact +} type createContactFunc func(ctx context.Context, p *contactProxy, contactListId string, contact platformclientv2.Writabledialercontact, priority, clearSystemData, doNotQueue bool) ([]platformclientv2.Dialercontact, *platformclientv2.APIResponse, error) type readContactByIdFunc func(ctx context.Context, p *contactProxy, contactListId, contactId string) (*platformclientv2.Dialercontact, *platformclientv2.APIResponse, error) type updateContactFunc func(ctx context.Context, p *contactProxy, contactListId string, contactId string, contact platformclientv2.Dialercontact) (*platformclientv2.Dialercontact, *platformclientv2.APIResponse, error) type deleteContactFunc func(ctx context.Context, p *contactProxy, contactListId, contactId string) (*platformclientv2.APIResponse, error) -type getAllContactsFunc func(ctx context.Context, p *contactProxy) ([]platformclientv2.Dialercontact, *platformclientv2.APIResponse, error) +type getAllContactsFunc func(ctx context.Context, p *contactProxy) ([]ContactEntry, *platformclientv2.APIResponse, error) type contactProxy struct { clientConfig *platformclientv2.Configuration @@ -62,7 +66,7 @@ func (p *contactProxy) deleteContact(ctx context.Context, contactListId, contact return p.deleteContactAttr(ctx, p, contactListId, contactId) } -func (p *contactProxy) getAllContacts(ctx context.Context) ([]platformclientv2.Dialercontact, *platformclientv2.APIResponse, error) { +func (p *contactProxy) getAllContacts(ctx context.Context) ([]ContactEntry, *platformclientv2.APIResponse, error) { return p.getAllContactsAttr(ctx, p) } @@ -71,7 +75,7 @@ func createContactFn(_ context.Context, p *contactProxy, contactListId string, c } func readContactByIdFn(_ context.Context, p *contactProxy, contactListId, contactId string) (*platformclientv2.Dialercontact, *platformclientv2.APIResponse, error) { - if contact := rc.GetCacheItem(p.contactCache, createComplexContact(contactListId, contactId)); contact != nil { + if contact := rc.GetCacheItem(p.contactCache, buildComplexContactId(contactListId, contactId)); contact != nil { return contact, nil, nil } if tfexporter_state.IsExporterActive() { @@ -89,31 +93,30 @@ func deleteContactFn(_ context.Context, p *contactProxy, contactListId, contactI if err != nil { return resp, err } - rc.DeleteCacheItem(p.contactCache, createComplexContact(contactListId, contactId)) + rc.DeleteCacheItem(p.contactCache, buildComplexContactId(contactListId, contactId)) return resp, nil } -func getAllContactsFn(ctx context.Context, p *contactProxy) ([]platformclientv2.Dialercontact, *platformclientv2.APIResponse, error) { - var allContacts []platformclientv2.Dialercontact - contactMatrix := make(map[string][]platformclientv2.Dialercontact) +func getAllContactsFn(ctx context.Context, p *contactProxy) ([]ContactEntry, *platformclientv2.APIResponse, error) { + var allContacts []ContactEntry - contactListIds, resp, err := p.getAllContactListIds(ctx) + contactLists, resp, err := p.getAllContactLists(ctx) if err != nil { return allContacts, resp, err } - for _, contactListId := range contactListIds { - contacts, resp, err := p.getContactsByContactListId(ctx, contactListId) + for _, contactList := range contactLists { + contacts, resp, err := p.getContactsByContactListId(ctx, *contactList.Id) if err != nil { return nil, resp, err } - allContacts = append(allContacts, contacts...) - contactMatrix[contactListId] = contacts - } - - for contactListId, contactListContacts := range contactMatrix { - for _, contact := range contactListContacts { - rc.SetCache(p.contactCache, createComplexContact(contactListId, *contact.Id), contact) + contactEntry := ContactEntry{ + ContactList: &contactList, + Contact: &contacts, + } + allContacts = append(allContacts, contactEntry) + for _, contact := range contacts { + rc.SetCache(p.contactCache, buildComplexContactId(*contactList.Id, *contact.Id), contact) } } @@ -160,10 +163,10 @@ func (p *contactProxy) getContactsByContactListId(_ context.Context, contactList return allContacts, nil, nil } -func (p *contactProxy) getAllContactListIds(_ context.Context) ([]string, *platformclientv2.APIResponse, error) { +func (p *contactProxy) getAllContactLists(_ context.Context) ([]platformclientv2.Contactlist, *platformclientv2.APIResponse, error) { const pageSize = 100 var pageNum = 1 - var allContactListIds []string + var allContactLists []platformclientv2.Contactlist contactListConfigs, resp, getErr := p.outboundApi.GetOutboundContactlists(false, false, pageSize, pageNum, true, "", "", []string{}, []string{}, "", "") if getErr != nil { @@ -173,7 +176,7 @@ func (p *contactProxy) getAllContactListIds(_ context.Context) ([]string, *platf return nil, nil, nil } for _, cl := range *contactListConfigs.Entities { - allContactListIds = append(allContactListIds, *cl.Id) + allContactLists = append(allContactLists, cl) } for pageNum := 2; pageNum <= *contactListConfigs.PageCount; pageNum++ { @@ -185,9 +188,9 @@ func (p *contactProxy) getAllContactListIds(_ context.Context) ([]string, *platf break } for _, cl := range *contactListConfigs.Entities { - allContactListIds = append(allContactListIds, *cl.Id) + allContactLists = append(allContactLists, cl) } } - return allContactListIds, nil, nil + return allContactLists, nil, nil } diff --git a/genesyscloud/outbound_contact_list_contact/resource_genesyscloud_outbound_contact_list_contact.go b/genesyscloud/outbound_contact_list_contact/resource_genesyscloud_outbound_contact_list_contact.go index 7df624e6f..c063accf4 100644 --- a/genesyscloud/outbound_contact_list_contact/resource_genesyscloud_outbound_contact_list_contact.go +++ b/genesyscloud/outbound_contact_list_contact/resource_genesyscloud_outbound_contact_list_contact.go @@ -15,14 +15,14 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "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/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" ) func getAllContacts(ctx context.Context, clientConfig *platformclientv2.Configuration) (resourceExporter.ResourceIDMetaMap, diag.Diagnostics) { resources := make(resourceExporter.ResourceIDMetaMap) cp := getContactProxy(clientConfig) - contacts, resp, err := cp.getAllContacts(ctx) + contactEntries, resp, err := cp.getAllContacts(ctx) if err != nil { msg := fmt.Sprintf("Failed to read all contact list contacts. Error: %v", err) if resp != nil { @@ -31,11 +31,12 @@ func getAllContacts(ctx context.Context, clientConfig *platformclientv2.Configur return nil, util.BuildDiagnosticError(ResourceType, msg, err) } - for _, contact := range contacts { - id := createComplexContact(*contact.ContactListId, *contact.Id) - // We construct this to adhere to Terraform's Block Label requirements - name := "_" + createComplexContactWithDelimiter(*contact.ContactListId, *contact.Id, "_") - resources[id] = &resourceExporter.ResourceMeta{BlockLabel: name} + for _, contactEntry := range contactEntries { + for _, contact := range *contactEntry.Contact { + id := buildComplexContactId(*contactEntry.ContactList.Id, *contact.Id) + name := *contactEntry.ContactList.Name + "_" + *contact.Id + resources[id] = &resourceExporter.ResourceMeta{BlockLabel: name} + } } return resources, nil @@ -64,7 +65,7 @@ func createOutboundContactListContact(ctx context.Context, d *schema.ResourceDat } contactId := *contactResponseBody[0].Id _ = d.Set("contact_id", contactId) - id := createComplexContact(contactListId, contactId) + id := buildComplexContactId(contactListId, contactId) d.SetId(id) log.Printf("Finished creating contact '%s' in contact list '%s'", contactId, contactListId) return readOutboundContactListContact(ctx, d, meta) @@ -79,7 +80,7 @@ func readOutboundContactListContact(ctx context.Context, d *schema.ResourceData, cp = getContactProxy(sdkConfig) ) - contactListId, contactId := splitComplexContact(d.Id()) + contactListId, contactId := splitComplexContactId(d.Id()) if contactListId == "" { contactListId = d.Get("contact_list_id").(string) } @@ -122,7 +123,7 @@ func updateOutboundContactListContact(ctx context.Context, d *schema.ResourceDat cp := getContactProxy(sdkConfig) contactRequestBody := buildDialerContactFromResourceData(d) - contactListId, contactId := splitComplexContact(d.Id()) + contactListId, contactId := splitComplexContactId(d.Id()) if contactListId == "" { contactListId = d.Get("contact_list_id").(string) } @@ -145,7 +146,7 @@ func deleteOutboundContactListContact(ctx context.Context, d *schema.ResourceDat sdkConfig := meta.(*provider.ProviderMeta).ClientConfig cp := getContactProxy(sdkConfig) - contactListId, contactId := splitComplexContact(d.Id()) + contactListId, contactId := splitComplexContactId(d.Id()) if contactListId == "" { contactListId = d.Get("contact_list_id").(string) } diff --git a/genesyscloud/outbound_contact_list_contact/resource_genesyscloud_outbound_contact_list_contact_utils.go b/genesyscloud/outbound_contact_list_contact/resource_genesyscloud_outbound_contact_list_contact_utils.go index 7b368a4c3..0e1cb923b 100644 --- a/genesyscloud/outbound_contact_list_contact/resource_genesyscloud_outbound_contact_list_contact_utils.go +++ b/genesyscloud/outbound_contact_list_contact/resource_genesyscloud_outbound_contact_list_contact_utils.go @@ -7,7 +7,7 @@ import ( "terraform-provider-genesyscloud/genesyscloud/util/resourcedata" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" ) // buildWritableContactFromResourceData used to build the request body for contact creation @@ -197,18 +197,14 @@ func GenerateColumnStatus(column, contactable string) string { }`, column, contactable) } -func createComplexContact(contactListId string, contactId string) string { - return createComplexContactWithDelimiter(contactListId, contactId, ":") +func buildComplexContactId(contactListId string, contactId string) string { + return fmt.Sprintf("%s:%s", contactListId, contactId) } -func createComplexContactWithDelimiter(contactListId string, contactId string, delimiter string) string { - return fmt.Sprintf("%s%s%s", contactListId, delimiter, contactId) -} - -func splitComplexContact(complexContact string) (string, string) { - if strings.Contains(complexContact, ":") { - split := strings.SplitN(complexContact, ":", 2) +func splitComplexContactId(complexContactId string) (string, string) { + if strings.Contains(complexContactId, ":") { + split := strings.SplitN(complexContactId, ":", 2) return split[0], split[1] } - return "", complexContact + return "", complexContactId } diff --git a/genesyscloud/outbound_contact_list_template/genesyscloud_outbound_contact_list_template_proxy.go b/genesyscloud/outbound_contact_list_template/genesyscloud_outbound_contact_list_template_proxy.go index cd8d482c1..5964f327d 100644 --- a/genesyscloud/outbound_contact_list_template/genesyscloud_outbound_contact_list_template_proxy.go +++ b/genesyscloud/outbound_contact_list_template/genesyscloud_outbound_contact_list_template_proxy.go @@ -5,7 +5,7 @@ import ( "fmt" "log" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" ) /* diff --git a/genesyscloud/outbound_contact_list_template/resource_genesyscloud_outbound_contact_list_template.go b/genesyscloud/outbound_contact_list_template/resource_genesyscloud_outbound_contact_list_template.go index 916037b53..35918b514 100644 --- a/genesyscloud/outbound_contact_list_template/resource_genesyscloud_outbound_contact_list_template.go +++ b/genesyscloud/outbound_contact_list_template/resource_genesyscloud_outbound_contact_list_template.go @@ -18,7 +18,7 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" ) func getAllOutboundContactListTemplates(ctx context.Context, clientConfig *platformclientv2.Configuration) (resourceExporter.ResourceIDMetaMap, diag.Diagnostics) { diff --git a/genesyscloud/outbound_contact_list_template/resource_genesyscloud_outbound_contact_list_template_test.go b/genesyscloud/outbound_contact_list_template/resource_genesyscloud_outbound_contact_list_template_test.go index f75d91003..401a27b25 100644 --- a/genesyscloud/outbound_contact_list_template/resource_genesyscloud_outbound_contact_list_template_test.go +++ b/genesyscloud/outbound_contact_list_template/resource_genesyscloud_outbound_contact_list_template_test.go @@ -12,7 +12,7 @@ import ( "github.com/google/uuid" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" ) func TestAccResourceOutboundContactListTemplateBasic(t *testing.T) { diff --git a/genesyscloud/outbound_contact_list_template/resource_genesyscloud_outbound_contact_list_template_utils.go b/genesyscloud/outbound_contact_list_template/resource_genesyscloud_outbound_contact_list_template_utils.go index 8fd048076..1bfee086e 100644 --- a/genesyscloud/outbound_contact_list_template/resource_genesyscloud_outbound_contact_list_template_utils.go +++ b/genesyscloud/outbound_contact_list_template/resource_genesyscloud_outbound_contact_list_template_utils.go @@ -5,7 +5,7 @@ import ( "strings" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" ) func buildSdkOutboundContactListTemplateContactPhoneNumberColumnSlice(contactPhoneNumberColumn *schema.Set) *[]platformclientv2.Contactphonenumbercolumn { diff --git a/genesyscloud/outbound_contactlistfilter/genesyscloud_outbound_contactlistfilter_proxy.go b/genesyscloud/outbound_contactlistfilter/genesyscloud_outbound_contactlistfilter_proxy.go index 49e786394..61bdbd7df 100644 --- a/genesyscloud/outbound_contactlistfilter/genesyscloud_outbound_contactlistfilter_proxy.go +++ b/genesyscloud/outbound_contactlistfilter/genesyscloud_outbound_contactlistfilter_proxy.go @@ -5,7 +5,7 @@ import ( "fmt" "log" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" ) /* diff --git a/genesyscloud/outbound_contactlistfilter/resource_genesyscloud_outbound_contactlistfilter.go b/genesyscloud/outbound_contactlistfilter/resource_genesyscloud_outbound_contactlistfilter.go index f05ad9e53..b504d1f1f 100644 --- a/genesyscloud/outbound_contactlistfilter/resource_genesyscloud_outbound_contactlistfilter.go +++ b/genesyscloud/outbound_contactlistfilter/resource_genesyscloud_outbound_contactlistfilter.go @@ -15,7 +15,7 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "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/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" ) /* diff --git a/genesyscloud/outbound_contactlistfilter/resource_genesyscloud_outbound_contactlistfilter_test.go b/genesyscloud/outbound_contactlistfilter/resource_genesyscloud_outbound_contactlistfilter_test.go index 313386e23..237621af3 100644 --- a/genesyscloud/outbound_contactlistfilter/resource_genesyscloud_outbound_contactlistfilter_test.go +++ b/genesyscloud/outbound_contactlistfilter/resource_genesyscloud_outbound_contactlistfilter_test.go @@ -13,7 +13,7 @@ import ( "github.com/google/uuid" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" ) func TestAccResourceOutboundContactListFilter(t *testing.T) { diff --git a/genesyscloud/outbound_contactlistfilter/resource_genesyscloud_outbound_contactlistfilter_utils.go b/genesyscloud/outbound_contactlistfilter/resource_genesyscloud_outbound_contactlistfilter_utils.go index 9b1b4f1f2..f060ea3a8 100644 --- a/genesyscloud/outbound_contactlistfilter/resource_genesyscloud_outbound_contactlistfilter_utils.go +++ b/genesyscloud/outbound_contactlistfilter/resource_genesyscloud_outbound_contactlistfilter_utils.go @@ -7,7 +7,7 @@ import ( "terraform-provider-genesyscloud/genesyscloud/util/resourcedata" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" ) func getContactlistfilterFromResourceData(d *schema.ResourceData) platformclientv2.Contactlistfilter { diff --git a/genesyscloud/outbound_digitalruleset/genesyscloud_outbound_digitalruleset_proxy.go b/genesyscloud/outbound_digitalruleset/genesyscloud_outbound_digitalruleset_proxy.go index 1dc18dbba..9b23bcea4 100644 --- a/genesyscloud/outbound_digitalruleset/genesyscloud_outbound_digitalruleset_proxy.go +++ b/genesyscloud/outbound_digitalruleset/genesyscloud_outbound_digitalruleset_proxy.go @@ -5,7 +5,7 @@ import ( "fmt" "log" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" ) /* diff --git a/genesyscloud/outbound_digitalruleset/resource_genesyscloud_outbound_digitalruleset.go b/genesyscloud/outbound_digitalruleset/resource_genesyscloud_outbound_digitalruleset.go index a4b1c6e24..efed78283 100644 --- a/genesyscloud/outbound_digitalruleset/resource_genesyscloud_outbound_digitalruleset.go +++ b/genesyscloud/outbound_digitalruleset/resource_genesyscloud_outbound_digitalruleset.go @@ -11,7 +11,7 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" "terraform-provider-genesyscloud/genesyscloud/consistency_checker" diff --git a/genesyscloud/outbound_digitalruleset/resource_genesyscloud_outbound_digitalruleset_test.go b/genesyscloud/outbound_digitalruleset/resource_genesyscloud_outbound_digitalruleset_test.go index 8f9aff9fe..804899b67 100644 --- a/genesyscloud/outbound_digitalruleset/resource_genesyscloud_outbound_digitalruleset_test.go +++ b/genesyscloud/outbound_digitalruleset/resource_genesyscloud_outbound_digitalruleset_test.go @@ -8,7 +8,7 @@ import ( "github.com/google/uuid" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" "terraform-provider-genesyscloud/genesyscloud/provider" "terraform-provider-genesyscloud/genesyscloud/util" diff --git a/genesyscloud/outbound_digitalruleset/resource_genesyscloud_outbound_digitalruleset_utils.go b/genesyscloud/outbound_digitalruleset/resource_genesyscloud_outbound_digitalruleset_utils.go index e13172528..6ee384e90 100644 --- a/genesyscloud/outbound_digitalruleset/resource_genesyscloud_outbound_digitalruleset_utils.go +++ b/genesyscloud/outbound_digitalruleset/resource_genesyscloud_outbound_digitalruleset_utils.go @@ -10,7 +10,7 @@ import ( "terraform-provider-genesyscloud/genesyscloud/util/resourcedata" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" ) /* diff --git a/genesyscloud/outbound_dnclist/genesyscloud_outbound_dnclist_proxy.go b/genesyscloud/outbound_dnclist/genesyscloud_outbound_dnclist_proxy.go index eb1914580..3700816a2 100644 --- a/genesyscloud/outbound_dnclist/genesyscloud_outbound_dnclist_proxy.go +++ b/genesyscloud/outbound_dnclist/genesyscloud_outbound_dnclist_proxy.go @@ -7,7 +7,7 @@ import ( "terraform-provider-genesyscloud/genesyscloud/util" "github.com/hashicorp/terraform-plugin-sdk/v2/diag" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" ) var internalProxy *outboundDnclistProxy diff --git a/genesyscloud/outbound_dnclist/resource_genesyscloud_outbound_dnclist.go b/genesyscloud/outbound_dnclist/resource_genesyscloud_outbound_dnclist.go index de59a06c7..95e9861ae 100644 --- a/genesyscloud/outbound_dnclist/resource_genesyscloud_outbound_dnclist.go +++ b/genesyscloud/outbound_dnclist/resource_genesyscloud_outbound_dnclist.go @@ -19,7 +19,7 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" ) func getAllOutboundDncLists(ctx context.Context, clientConfig *platformclientv2.Configuration) (resourceExporter.ResourceIDMetaMap, diag.Diagnostics) { diff --git a/genesyscloud/outbound_dnclist/resource_genesyscloud_outbound_dnclist_test.go b/genesyscloud/outbound_dnclist/resource_genesyscloud_outbound_dnclist_test.go index f401be385..3c510e2a5 100644 --- a/genesyscloud/outbound_dnclist/resource_genesyscloud_outbound_dnclist_test.go +++ b/genesyscloud/outbound_dnclist/resource_genesyscloud_outbound_dnclist_test.go @@ -12,7 +12,7 @@ import ( "github.com/google/uuid" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" ) func TestAccResourceOutboundDncListRdsListType(t *testing.T) { diff --git a/genesyscloud/outbound_filespecificationtemplate/genesyscloud_outbound_filespecificationtemplate_proxy.go b/genesyscloud/outbound_filespecificationtemplate/genesyscloud_outbound_filespecificationtemplate_proxy.go index 5bb0f3519..6116c8549 100644 --- a/genesyscloud/outbound_filespecificationtemplate/genesyscloud_outbound_filespecificationtemplate_proxy.go +++ b/genesyscloud/outbound_filespecificationtemplate/genesyscloud_outbound_filespecificationtemplate_proxy.go @@ -5,7 +5,7 @@ import ( "fmt" "log" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" ) /* diff --git a/genesyscloud/outbound_filespecificationtemplate/resource_genesyscloud_outbound_filespecificationtemplate.go b/genesyscloud/outbound_filespecificationtemplate/resource_genesyscloud_outbound_filespecificationtemplate.go index f0f067ade..5cc61e830 100644 --- a/genesyscloud/outbound_filespecificationtemplate/resource_genesyscloud_outbound_filespecificationtemplate.go +++ b/genesyscloud/outbound_filespecificationtemplate/resource_genesyscloud_outbound_filespecificationtemplate.go @@ -18,7 +18,7 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" ) func getAllFileSpecificationTemplates(ctx context.Context, clientConfig *platformclientv2.Configuration) (resourceExporter.ResourceIDMetaMap, diag.Diagnostics) { diff --git a/genesyscloud/outbound_filespecificationtemplate/resource_genesyscloud_outbound_filespecificationtemplate_test.go b/genesyscloud/outbound_filespecificationtemplate/resource_genesyscloud_outbound_filespecificationtemplate_test.go index 9213095a6..d1f134197 100644 --- a/genesyscloud/outbound_filespecificationtemplate/resource_genesyscloud_outbound_filespecificationtemplate_test.go +++ b/genesyscloud/outbound_filespecificationtemplate/resource_genesyscloud_outbound_filespecificationtemplate_test.go @@ -12,7 +12,7 @@ import ( "github.com/google/uuid" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" ) func TestAccResourceOutboundFileSpecificationTemplate(t *testing.T) { diff --git a/genesyscloud/outbound_filespecificationtemplate/resource_genesyscloud_outbound_filespecificationtemplate_utils.go b/genesyscloud/outbound_filespecificationtemplate/resource_genesyscloud_outbound_filespecificationtemplate_utils.go index 6a4ef63dc..874ba9e54 100644 --- a/genesyscloud/outbound_filespecificationtemplate/resource_genesyscloud_outbound_filespecificationtemplate_utils.go +++ b/genesyscloud/outbound_filespecificationtemplate/resource_genesyscloud_outbound_filespecificationtemplate_utils.go @@ -4,7 +4,7 @@ import ( "terraform-provider-genesyscloud/genesyscloud/util/resourcedata" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" ) func getFilespecificationtemplateFromResourceData(d *schema.ResourceData) platformclientv2.Filespecificationtemplate { diff --git a/genesyscloud/outbound_ruleset/genesyscloud_outbound_ruleset_proxy.go b/genesyscloud/outbound_ruleset/genesyscloud_outbound_ruleset_proxy.go index d4f22bcd9..cc859539c 100644 --- a/genesyscloud/outbound_ruleset/genesyscloud_outbound_ruleset_proxy.go +++ b/genesyscloud/outbound_ruleset/genesyscloud_outbound_ruleset_proxy.go @@ -6,7 +6,7 @@ import ( "log" "strings" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" ) /* diff --git a/genesyscloud/outbound_ruleset/resource_genesyscloud_outbound_ruleset.go b/genesyscloud/outbound_ruleset/resource_genesyscloud_outbound_ruleset.go index 43b3d576b..707b3dd6e 100644 --- a/genesyscloud/outbound_ruleset/resource_genesyscloud_outbound_ruleset.go +++ b/genesyscloud/outbound_ruleset/resource_genesyscloud_outbound_ruleset.go @@ -19,7 +19,7 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" ) /* diff --git a/genesyscloud/outbound_ruleset/resource_genesyscloud_outbound_ruleset_test.go b/genesyscloud/outbound_ruleset/resource_genesyscloud_outbound_ruleset_test.go index 05e0f9cba..0ed9c1dbc 100644 --- a/genesyscloud/outbound_ruleset/resource_genesyscloud_outbound_ruleset_test.go +++ b/genesyscloud/outbound_ruleset/resource_genesyscloud_outbound_ruleset_test.go @@ -12,7 +12,7 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" obContactList "terraform-provider-genesyscloud/genesyscloud/outbound_contact_list" ) diff --git a/genesyscloud/outbound_ruleset/resource_genesyscloud_outbound_ruleset_unit_test.go b/genesyscloud/outbound_ruleset/resource_genesyscloud_outbound_ruleset_unit_test.go index d14c0dc67..57fd26e18 100644 --- a/genesyscloud/outbound_ruleset/resource_genesyscloud_outbound_ruleset_unit_test.go +++ b/genesyscloud/outbound_ruleset/resource_genesyscloud_outbound_ruleset_unit_test.go @@ -7,7 +7,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" ) func TestUnitDoesRuleConditionsRefDeletedSkill(t *testing.T) { diff --git a/genesyscloud/outbound_ruleset/resource_genesyscloud_outbound_ruleset_utils.go b/genesyscloud/outbound_ruleset/resource_genesyscloud_outbound_ruleset_utils.go index 78892b0b4..ad4ca5103 100644 --- a/genesyscloud/outbound_ruleset/resource_genesyscloud_outbound_ruleset_utils.go +++ b/genesyscloud/outbound_ruleset/resource_genesyscloud_outbound_ruleset_utils.go @@ -10,7 +10,7 @@ import ( "terraform-provider-genesyscloud/genesyscloud/util/resourcedata" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" ) /* diff --git a/genesyscloud/outbound_sequence/genesyscloud_outbound_sequence_init_test.go b/genesyscloud/outbound_sequence/genesyscloud_outbound_sequence_init_test.go index fb3f5176d..9a1ef8030 100644 --- a/genesyscloud/outbound_sequence/genesyscloud_outbound_sequence_init_test.go +++ b/genesyscloud/outbound_sequence/genesyscloud_outbound_sequence_init_test.go @@ -16,7 +16,7 @@ import ( authDivision "terraform-provider-genesyscloud/genesyscloud/auth_division" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" ) diff --git a/genesyscloud/outbound_sequence/genesyscloud_outbound_sequence_proxy.go b/genesyscloud/outbound_sequence/genesyscloud_outbound_sequence_proxy.go index cf42b38ae..54318b018 100644 --- a/genesyscloud/outbound_sequence/genesyscloud_outbound_sequence_proxy.go +++ b/genesyscloud/outbound_sequence/genesyscloud_outbound_sequence_proxy.go @@ -5,7 +5,7 @@ import ( "fmt" "log" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" ) /* diff --git a/genesyscloud/outbound_sequence/resource_genesyscloud_outbound_sequence.go b/genesyscloud/outbound_sequence/resource_genesyscloud_outbound_sequence.go index 5f3a9c388..2745a798c 100644 --- a/genesyscloud/outbound_sequence/resource_genesyscloud_outbound_sequence.go +++ b/genesyscloud/outbound_sequence/resource_genesyscloud_outbound_sequence.go @@ -12,7 +12,7 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" "terraform-provider-genesyscloud/genesyscloud/consistency_checker" diff --git a/genesyscloud/outbound_sequence/resource_genesyscloud_outbound_sequence_test.go b/genesyscloud/outbound_sequence/resource_genesyscloud_outbound_sequence_test.go index 4f57a751b..a59447c42 100644 --- a/genesyscloud/outbound_sequence/resource_genesyscloud_outbound_sequence_test.go +++ b/genesyscloud/outbound_sequence/resource_genesyscloud_outbound_sequence_test.go @@ -14,7 +14,7 @@ import ( "github.com/google/uuid" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" ) func TestAccResourceOutboundSequence(t *testing.T) { diff --git a/genesyscloud/outbound_sequence/resource_genesyscloud_outbound_sequence_utils.go b/genesyscloud/outbound_sequence/resource_genesyscloud_outbound_sequence_utils.go index 4a081e3ad..941388f96 100644 --- a/genesyscloud/outbound_sequence/resource_genesyscloud_outbound_sequence_utils.go +++ b/genesyscloud/outbound_sequence/resource_genesyscloud_outbound_sequence_utils.go @@ -6,7 +6,7 @@ import ( "terraform-provider-genesyscloud/genesyscloud/util" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" ) /* diff --git a/genesyscloud/outbound_settings/genesyscloud_outbound_settings_proxy.go b/genesyscloud/outbound_settings/genesyscloud_outbound_settings_proxy.go index e1f16cb8c..840ed7ce4 100644 --- a/genesyscloud/outbound_settings/genesyscloud_outbound_settings_proxy.go +++ b/genesyscloud/outbound_settings/genesyscloud_outbound_settings_proxy.go @@ -4,7 +4,7 @@ import ( "context" "fmt" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" ) /* diff --git a/genesyscloud/outbound_settings/resource_genesyscloud_outbound_settings.go b/genesyscloud/outbound_settings/resource_genesyscloud_outbound_settings.go index 4ba5a8f4d..7cb0f20dc 100644 --- a/genesyscloud/outbound_settings/resource_genesyscloud_outbound_settings.go +++ b/genesyscloud/outbound_settings/resource_genesyscloud_outbound_settings.go @@ -15,7 +15,7 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "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/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" ) /* diff --git a/genesyscloud/outbound_settings/resource_genesyscloud_outbound_settings_utils.go b/genesyscloud/outbound_settings/resource_genesyscloud_outbound_settings_utils.go index 92a2041e7..4f3ee414f 100644 --- a/genesyscloud/outbound_settings/resource_genesyscloud_outbound_settings_utils.go +++ b/genesyscloud/outbound_settings/resource_genesyscloud_outbound_settings_utils.go @@ -6,7 +6,7 @@ import ( "terraform-provider-genesyscloud/genesyscloud/util/resourcedata" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" ) func buildOutboundSettingsAutomaticTimeZoneMapping(d *schema.ResourceData) *platformclientv2.Automatictimezonemappingsettings { diff --git a/genesyscloud/outbound_wrapupcode_mappings/genesyscloud_wrapupcode_mappings_proxy.go b/genesyscloud/outbound_wrapupcode_mappings/genesyscloud_wrapupcode_mappings_proxy.go index 9ff374472..7ab491932 100644 --- a/genesyscloud/outbound_wrapupcode_mappings/genesyscloud_wrapupcode_mappings_proxy.go +++ b/genesyscloud/outbound_wrapupcode_mappings/genesyscloud_wrapupcode_mappings_proxy.go @@ -4,7 +4,7 @@ import ( "context" "fmt" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" ) var internalProxy *outboundWrapupCodeMappingsProxy diff --git a/genesyscloud/outbound_wrapupcode_mappings/resource_genesyscloud_outbound_wrapupcode_mappings_test.go b/genesyscloud/outbound_wrapupcode_mappings/resource_genesyscloud_outbound_wrapupcode_mappings_test.go index af279f462..e01b8c82c 100644 --- a/genesyscloud/outbound_wrapupcode_mappings/resource_genesyscloud_outbound_wrapupcode_mappings_test.go +++ b/genesyscloud/outbound_wrapupcode_mappings/resource_genesyscloud_outbound_wrapupcode_mappings_test.go @@ -84,6 +84,10 @@ resource "genesyscloud_outbound_wrapupcodemappings" "%s" { } `, resourceLabel, wrapupCode1ResourceLabel, wrapupCode2ResourceLabel), Check: resource.ComposeTestCheckFunc( + func(s *terraform.State) error { + time.Sleep(45 * time.Second) // Wait for 45 seconds to get proper response + return nil + }, util.ValidateStringInArray("genesyscloud_outbound_wrapupcodemappings."+resourceLabel, "default_set", "Contact_UnCallable"), util.ValidateStringInArray("genesyscloud_outbound_wrapupcodemappings."+resourceLabel, "default_set", "Right_Party_Contact"), util.ValidateStringInArray("genesyscloud_outbound_wrapupcodemappings."+resourceLabel, "default_set", "Business_Success"), @@ -95,6 +99,9 @@ resource "genesyscloud_outbound_wrapupcodemappings" "%s" { }, // Update { + PreConfig: func() { + time.Sleep(30 * time.Second) + }, Config: authDivision.GenerateAuthDivisionBasic(divResourceLabel, divName) + routingWrapupcode.GenerateRoutingWrapupcodeResource(wrapupCode1ResourceLabel, wrapupCode1Name, "genesyscloud_auth_division."+divResourceLabel+".id") + routingWrapupcode.GenerateRoutingWrapupcodeResource(wrapupCode2ResourceLabel, wrapupCode2Name, "genesyscloud_auth_division."+divResourceLabel+".id") + @@ -117,6 +124,10 @@ resource "genesyscloud_outbound_wrapupcodemappings" "%s" { } `, resourceLabel, wrapupCode1ResourceLabel, wrapupCode2ResourceLabel, wrapupCode3ResourceLabel), Check: resource.ComposeTestCheckFunc( + func(s *terraform.State) error { + time.Sleep(45 * time.Second) // Wait for 45 seconds to get proper response + return nil + }, util.ValidateStringInArray("genesyscloud_outbound_wrapupcodemappings."+resourceLabel, "default_set", "Contact_UnCallable"), util.ValidateStringInArray("genesyscloud_outbound_wrapupcodemappings."+resourceLabel, "default_set", "Number_UnCallable"), util.ValidateStringInArray("genesyscloud_outbound_wrapupcodemappings."+resourceLabel, "default_set", "Right_Party_Contact"), diff --git a/genesyscloud/outbound_wrapupcode_mappings/resource_genesyscloud_outbound_wrapupcode_mappings_utils.go b/genesyscloud/outbound_wrapupcode_mappings/resource_genesyscloud_outbound_wrapupcode_mappings_utils.go index 62e6a27e3..f98f4c589 100644 --- a/genesyscloud/outbound_wrapupcode_mappings/resource_genesyscloud_outbound_wrapupcode_mappings_utils.go +++ b/genesyscloud/outbound_wrapupcode_mappings/resource_genesyscloud_outbound_wrapupcode_mappings_utils.go @@ -4,7 +4,7 @@ import ( lists "terraform-provider-genesyscloud/genesyscloud/util/lists" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" ) // flattenOutboundWrapupCodeMappings maps a Genesys Cloud Wrapupcodemapping to a schema.Set diff --git a/genesyscloud/outbound_wrapupcode_mappings/resource_genesyscloud_outbound_wrapupcodemappings.go b/genesyscloud/outbound_wrapupcode_mappings/resource_genesyscloud_outbound_wrapupcodemappings.go index a4d1dacd8..f05a6c9b5 100644 --- a/genesyscloud/outbound_wrapupcode_mappings/resource_genesyscloud_outbound_wrapupcodemappings.go +++ b/genesyscloud/outbound_wrapupcode_mappings/resource_genesyscloud_outbound_wrapupcodemappings.go @@ -19,7 +19,7 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" ) // getOutboundWrapupCodeMappings is used by the exporter to return all wrapupcode mappings diff --git a/genesyscloud/process_automation_trigger/data_source_genesyscloud_processautomation_trigger.go b/genesyscloud/process_automation_trigger/data_source_genesyscloud_processautomation_trigger.go index 5c5ad8255..992eb8dd5 100644 --- a/genesyscloud/process_automation_trigger/data_source_genesyscloud_processautomation_trigger.go +++ b/genesyscloud/process_automation_trigger/data_source_genesyscloud_processautomation_trigger.go @@ -14,7 +14,7 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" ) type ProcessAutomationTriggers struct { diff --git a/genesyscloud/process_automation_trigger/process_automation_triggers_proxy.go b/genesyscloud/process_automation_trigger/process_automation_triggers_proxy.go index 9162ac3bf..73c5dae81 100644 --- a/genesyscloud/process_automation_trigger/process_automation_triggers_proxy.go +++ b/genesyscloud/process_automation_trigger/process_automation_triggers_proxy.go @@ -11,7 +11,7 @@ import ( "terraform-provider-genesyscloud/genesyscloud/util" "github.com/hashicorp/terraform-plugin-sdk/v2/diag" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" ) func postProcessAutomationTrigger(pat *ProcessAutomationTrigger, api *platformclientv2.IntegrationsApi) (*ProcessAutomationTrigger, *platformclientv2.APIResponse, error) { diff --git a/genesyscloud/process_automation_trigger/process_automations_triggers_struct.go b/genesyscloud/process_automation_trigger/process_automations_triggers_struct.go index f13978bd7..1bf25320c 100644 --- a/genesyscloud/process_automation_trigger/process_automations_triggers_struct.go +++ b/genesyscloud/process_automation_trigger/process_automations_triggers_struct.go @@ -3,7 +3,7 @@ package process_automation_trigger import ( "encoding/json" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" ) type ProcessAutomationTrigger struct { diff --git a/genesyscloud/process_automation_trigger/resource_genesyscloud_processautomation_trigger.go b/genesyscloud/process_automation_trigger/resource_genesyscloud_processautomation_trigger.go index 3f0ee1e5d..95f4f04b8 100644 --- a/genesyscloud/process_automation_trigger/resource_genesyscloud_processautomation_trigger.go +++ b/genesyscloud/process_automation_trigger/resource_genesyscloud_processautomation_trigger.go @@ -13,7 +13,7 @@ import ( "time" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" "terraform-provider-genesyscloud/genesyscloud/consistency_checker" diff --git a/genesyscloud/process_automation_trigger/resource_genesyscloud_processautomation_trigger_test.go b/genesyscloud/process_automation_trigger/resource_genesyscloud_processautomation_trigger_test.go index b5ef400e4..a4e64490b 100644 --- a/genesyscloud/process_automation_trigger/resource_genesyscloud_processautomation_trigger_test.go +++ b/genesyscloud/process_automation_trigger/resource_genesyscloud_processautomation_trigger_test.go @@ -13,7 +13,7 @@ import ( "github.com/google/uuid" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" ) func TestAccResourceProcessAutomationTrigger(t *testing.T) { diff --git a/genesyscloud/provider/division.go b/genesyscloud/provider/division.go index 2f3d90540..8abbb3ea9 100644 --- a/genesyscloud/provider/division.go +++ b/genesyscloud/provider/division.go @@ -4,7 +4,7 @@ import ( "sync" "github.com/hashicorp/terraform-plugin-sdk/v2/diag" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" ) type JsonMap map[string]interface{} diff --git a/genesyscloud/provider/provider.go b/genesyscloud/provider/provider.go index 5ffd611ce..128b6c693 100644 --- a/genesyscloud/provider/provider.go +++ b/genesyscloud/provider/provider.go @@ -16,7 +16,7 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/validation" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" ) var orgDefaultCountryCode string diff --git a/genesyscloud/provider/sdk_client_pool.go b/genesyscloud/provider/sdk_client_pool.go index b53eab4e4..1afe71bdf 100644 --- a/genesyscloud/provider/sdk_client_pool.go +++ b/genesyscloud/provider/sdk_client_pool.go @@ -8,7 +8,7 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" ) // SDKClientPool holds a Pool of client configs for the Genesys Cloud SDK. One should be diff --git a/genesyscloud/recording_media_retention_policy/genesyscloud_recording_media_retention_policy_init_test.go b/genesyscloud/recording_media_retention_policy/genesyscloud_recording_media_retention_policy_init_test.go index 26bd71456..651f4753a 100644 --- a/genesyscloud/recording_media_retention_policy/genesyscloud_recording_media_retention_policy_init_test.go +++ b/genesyscloud/recording_media_retention_policy/genesyscloud_recording_media_retention_policy_init_test.go @@ -19,7 +19,7 @@ import ( "testing" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" ) /* diff --git a/genesyscloud/recording_media_retention_policy/genesyscloud_recording_media_retention_policy_proxy.go b/genesyscloud/recording_media_retention_policy/genesyscloud_recording_media_retention_policy_proxy.go index de9fdfe5c..68d59e39f 100644 --- a/genesyscloud/recording_media_retention_policy/genesyscloud_recording_media_retention_policy_proxy.go +++ b/genesyscloud/recording_media_retention_policy/genesyscloud_recording_media_retention_policy_proxy.go @@ -7,7 +7,7 @@ import ( "net/http" "net/url" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" ) /* diff --git a/genesyscloud/recording_media_retention_policy/resource_genesyscloud_recording_media_retention_policy.go b/genesyscloud/recording_media_retention_policy/resource_genesyscloud_recording_media_retention_policy.go index 6d014d308..dd143d80d 100644 --- a/genesyscloud/recording_media_retention_policy/resource_genesyscloud_recording_media_retention_policy.go +++ b/genesyscloud/recording_media_retention_policy/resource_genesyscloud_recording_media_retention_policy.go @@ -19,7 +19,7 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" ) /* diff --git a/genesyscloud/recording_media_retention_policy/resource_genesyscloud_recording_media_retention_policy_test.go b/genesyscloud/recording_media_retention_policy/resource_genesyscloud_recording_media_retention_policy_test.go index 270fda1bf..677b70675 100644 --- a/genesyscloud/recording_media_retention_policy/resource_genesyscloud_recording_media_retention_policy_test.go +++ b/genesyscloud/recording_media_retention_policy/resource_genesyscloud_recording_media_retention_policy_test.go @@ -26,7 +26,7 @@ import ( "github.com/google/uuid" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" ) /* diff --git a/genesyscloud/recording_media_retention_policy/resource_genesyscloud_recording_media_retention_policy_utils.go b/genesyscloud/recording_media_retention_policy/resource_genesyscloud_recording_media_retention_policy_utils.go index d701175f5..2b385e7f3 100644 --- a/genesyscloud/recording_media_retention_policy/resource_genesyscloud_recording_media_retention_policy_utils.go +++ b/genesyscloud/recording_media_retention_policy/resource_genesyscloud_recording_media_retention_policy_utils.go @@ -10,7 +10,7 @@ import ( "terraform-provider-genesyscloud/genesyscloud/util/resourcedata" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" ) /* diff --git a/genesyscloud/resource_cache/datasource_cache.go b/genesyscloud/resource_cache/datasource_cache.go index 88668cebe..3fd9fbe9f 100644 --- a/genesyscloud/resource_cache/datasource_cache.go +++ b/genesyscloud/resource_cache/datasource_cache.go @@ -8,7 +8,7 @@ import ( "terraform-provider-genesyscloud/genesyscloud/util" "github.com/hashicorp/terraform-plugin-sdk/v2/diag" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" ) // Cache for Data Sources diff --git a/genesyscloud/resource_exporter/resource_exporter.go b/genesyscloud/resource_exporter/resource_exporter.go index 9e765f21d..db5ea5bed 100644 --- a/genesyscloud/resource_exporter/resource_exporter.go +++ b/genesyscloud/resource_exporter/resource_exporter.go @@ -9,7 +9,7 @@ import ( "github.com/hashicorp/go-cty/cty" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" lists "terraform-provider-genesyscloud/genesyscloud/util/lists" @@ -53,7 +53,7 @@ type ResourceInfo struct { OriginalLabel string Type string CtyType cty.Type - ResourceType string + BlockType string } // DataSourceResolver allows the definition of a custom resolver for an exporter. @@ -159,6 +159,7 @@ type ResourceExporter struct { CustomFlowResolver map[string]*CustomFlowResolver + ExportAsDataFunc func(context.Context, *platformclientv2.Configuration, map[string]string) (bool, error) DataSourceResolver map[*DataAttr]*ResourceAttr //This a placeholder filter out specific resources from a filter. @@ -348,22 +349,3 @@ func SetRegisterExporter(resources map[string]*ResourceExporter) { defer resourceExporterMapMutex.Unlock() resourceExporters = resources } - -var ( - ExportAsData []string - dsMutex sync.Mutex - resourceLabelSanitizer = NewSanitizerProvider() -) - -// The AddDataSourceItems function adds resources to the ExportAsData []string and are formatted correctly -// The ExportAsData will be checked in the genesyscloud_resource_exporter to determine resources to be exported as data source -func AddDataSourceItems(resourceType, itemLabel string) { - exportLabel := resourceType + "::" + resourceLabelSanitizer.S.SanitizeResourceBlockLabel(itemLabel) - addDataSourceItemstoExport(exportLabel) -} - -func addDataSourceItemstoExport(label string) { - dsMutex.Lock() - defer dsMutex.Unlock() - ExportAsData = append(ExportAsData, label) -} diff --git a/genesyscloud/resource_exporter/resource_exporter_custom.go b/genesyscloud/resource_exporter/resource_exporter_custom.go index f6a8ad773..f446d562c 100644 --- a/genesyscloud/resource_exporter/resource_exporter_custom.go +++ b/genesyscloud/resource_exporter/resource_exporter_custom.go @@ -8,7 +8,7 @@ import ( "strings" "terraform-provider-genesyscloud/genesyscloud/util/constants" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" ) /* diff --git a/genesyscloud/resource_exporter/resource_name_sanitizer.go b/genesyscloud/resource_exporter/resource_name_sanitizer.go index 41ed125a8..4c40c5c6e 100644 --- a/genesyscloud/resource_exporter/resource_name_sanitizer.go +++ b/genesyscloud/resource_exporter/resource_name_sanitizer.go @@ -7,7 +7,7 @@ import ( "log" "strconv" "strings" - feature_toggles "terraform-provider-genesyscloud/genesyscloud/util/feature_toggles" + featureToggles "terraform-provider-genesyscloud/genesyscloud/util/feature_toggles" unidecode "github.com/mozillazg/go-unidecode" ) @@ -29,7 +29,7 @@ type sanitizerOptimized struct{} func NewSanitizerProvider() *SanitizerProvider { // Check if the environment variable is set - optimizedExists := feature_toggles.ExporterSanitizerOptimizedToggleExists() + optimizedExists := featureToggles.ExporterSanitizerOptimizedToggleExists() //If the GENESYS_SANITIZER_TIME_OPTIMIZED is set use the updated time optimized sanitizer if optimizedExists { diff --git a/genesyscloud/resource_genesyscloud_init_test.go b/genesyscloud/resource_genesyscloud_init_test.go index 4512238b9..dce791ab2 100644 --- a/genesyscloud/resource_genesyscloud_init_test.go +++ b/genesyscloud/resource_genesyscloud_init_test.go @@ -25,7 +25,7 @@ import ( "testing" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" ) var ( diff --git a/genesyscloud/resource_genesyscloud_journey_outcome.go b/genesyscloud/resource_genesyscloud_journey_outcome.go index 2eaade9ab..c5456fab3 100644 --- a/genesyscloud/resource_genesyscloud_journey_outcome.go +++ b/genesyscloud/resource_genesyscloud_journey_outcome.go @@ -22,7 +22,7 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/validation" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" ) var ( diff --git a/genesyscloud/resource_genesyscloud_journey_outcome_test.go b/genesyscloud/resource_genesyscloud_journey_outcome_test.go index 1011a6f27..fab0f756a 100644 --- a/genesyscloud/resource_genesyscloud_journey_outcome_test.go +++ b/genesyscloud/resource_genesyscloud_journey_outcome_test.go @@ -12,7 +12,7 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" ) func TestAccResourceJourneyOutcome(t *testing.T) { diff --git a/genesyscloud/resource_genesyscloud_journey_segment.go b/genesyscloud/resource_genesyscloud_journey_segment.go index 261bec889..d0cd80795 100644 --- a/genesyscloud/resource_genesyscloud_journey_segment.go +++ b/genesyscloud/resource_genesyscloud_journey_segment.go @@ -22,7 +22,7 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/validation" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" ) var ( diff --git a/genesyscloud/resource_genesyscloud_journey_segment_test.go b/genesyscloud/resource_genesyscloud_journey_segment_test.go index 8f9a30043..a586cf9bc 100644 --- a/genesyscloud/resource_genesyscloud_journey_segment_test.go +++ b/genesyscloud/resource_genesyscloud_journey_segment_test.go @@ -12,7 +12,7 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" ) func TestAccResourceJourneySegment(t *testing.T) { diff --git a/genesyscloud/resource_genesyscloud_knowledge_knowledgebase.go b/genesyscloud/resource_genesyscloud_knowledge_knowledgebase.go index 0a39955c6..2d2cca260 100644 --- a/genesyscloud/resource_genesyscloud_knowledge_knowledgebase.go +++ b/genesyscloud/resource_genesyscloud_knowledge_knowledgebase.go @@ -18,7 +18,7 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" ) func getAllKnowledgeKnowledgebases(_ context.Context, clientConfig *platformclientv2.Configuration) (resourceExporter.ResourceIDMetaMap, diag.Diagnostics) { diff --git a/genesyscloud/resource_genesyscloud_knowledge_knowledgebase_test.go b/genesyscloud/resource_genesyscloud_knowledge_knowledgebase_test.go index dffce7b74..47e7e7f1f 100644 --- a/genesyscloud/resource_genesyscloud_knowledge_knowledgebase_test.go +++ b/genesyscloud/resource_genesyscloud_knowledge_knowledgebase_test.go @@ -9,7 +9,7 @@ import ( "github.com/google/uuid" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" ) func TestAccResourceKnowledgeKnowledgebaseBasic(t *testing.T) { diff --git a/genesyscloud/resource_genesyscloud_quality_forms_evaluation.go b/genesyscloud/resource_genesyscloud_quality_forms_evaluation.go index 2acd907ad..3e7a33bf4 100644 --- a/genesyscloud/resource_genesyscloud_quality_forms_evaluation.go +++ b/genesyscloud/resource_genesyscloud_quality_forms_evaluation.go @@ -21,7 +21,7 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/validation" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" ) var ( diff --git a/genesyscloud/resource_genesyscloud_quality_forms_evaluation_test.go b/genesyscloud/resource_genesyscloud_quality_forms_evaluation_test.go index 84de7024a..eb886c3a6 100644 --- a/genesyscloud/resource_genesyscloud_quality_forms_evaluation_test.go +++ b/genesyscloud/resource_genesyscloud_quality_forms_evaluation_test.go @@ -10,7 +10,7 @@ import ( "github.com/google/uuid" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" ) func TestAccResourceEvaluationFormBasic(t *testing.T) { diff --git a/genesyscloud/resource_genesyscloud_quality_forms_survey.go b/genesyscloud/resource_genesyscloud_quality_forms_survey.go index e0932f2f0..8da7846e2 100644 --- a/genesyscloud/resource_genesyscloud_quality_forms_survey.go +++ b/genesyscloud/resource_genesyscloud_quality_forms_survey.go @@ -18,7 +18,7 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/validation" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" ) type SurveyFormStruct struct { diff --git a/genesyscloud/resource_genesyscloud_quality_forms_survey_test.go b/genesyscloud/resource_genesyscloud_quality_forms_survey_test.go index ef4d19670..1f845e646 100644 --- a/genesyscloud/resource_genesyscloud_quality_forms_survey_test.go +++ b/genesyscloud/resource_genesyscloud_quality_forms_survey_test.go @@ -10,7 +10,7 @@ import ( "github.com/google/uuid" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" ) func TestAccResourceSurveyFormBasic(t *testing.T) { diff --git a/genesyscloud/resource_genesyscloud_widget_deployment.go b/genesyscloud/resource_genesyscloud_widget_deployment.go index 2405d7586..2d7ec6e45 100644 --- a/genesyscloud/resource_genesyscloud_widget_deployment.go +++ b/genesyscloud/resource_genesyscloud_widget_deployment.go @@ -21,7 +21,7 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/validation" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" ) const ( diff --git a/genesyscloud/resource_genesyscloud_widget_deployment_test.go b/genesyscloud/resource_genesyscloud_widget_deployment_test.go index 8d84eaab8..c95f77e95 100644 --- a/genesyscloud/resource_genesyscloud_widget_deployment_test.go +++ b/genesyscloud/resource_genesyscloud_widget_deployment_test.go @@ -11,7 +11,7 @@ import ( "github.com/google/uuid" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" ) type widgetDeploymentConfig struct { diff --git a/genesyscloud/responsemanagement_library/genesyscloud_responsemanagement_library_proxy.go b/genesyscloud/responsemanagement_library/genesyscloud_responsemanagement_library_proxy.go index f87fadb2e..84c6d3e9e 100644 --- a/genesyscloud/responsemanagement_library/genesyscloud_responsemanagement_library_proxy.go +++ b/genesyscloud/responsemanagement_library/genesyscloud_responsemanagement_library_proxy.go @@ -5,7 +5,7 @@ import ( "fmt" "log" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" ) /* diff --git a/genesyscloud/responsemanagement_library/resource_genesyscloud_responsemanagement_library.go b/genesyscloud/responsemanagement_library/resource_genesyscloud_responsemanagement_library.go index ae2311ac1..b6a3a6c59 100644 --- a/genesyscloud/responsemanagement_library/resource_genesyscloud_responsemanagement_library.go +++ b/genesyscloud/responsemanagement_library/resource_genesyscloud_responsemanagement_library.go @@ -12,7 +12,7 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" "terraform-provider-genesyscloud/genesyscloud/consistency_checker" diff --git a/genesyscloud/responsemanagement_library/resource_genesyscloud_responsemanagement_library_test.go b/genesyscloud/responsemanagement_library/resource_genesyscloud_responsemanagement_library_test.go index 556bc8a42..ff2b62ebd 100644 --- a/genesyscloud/responsemanagement_library/resource_genesyscloud_responsemanagement_library_test.go +++ b/genesyscloud/responsemanagement_library/resource_genesyscloud_responsemanagement_library_test.go @@ -13,7 +13,7 @@ import ( "github.com/google/uuid" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" ) func TestAccResourceResponseManagementLibrary(t *testing.T) { diff --git a/genesyscloud/responsemanagement_response/genesyscloud_responsemanagement_response_proxy.go b/genesyscloud/responsemanagement_response/genesyscloud_responsemanagement_response_proxy.go index 2c2028b82..0ca30b5df 100644 --- a/genesyscloud/responsemanagement_response/genesyscloud_responsemanagement_response_proxy.go +++ b/genesyscloud/responsemanagement_response/genesyscloud_responsemanagement_response_proxy.go @@ -5,7 +5,7 @@ import ( "fmt" "log" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" ) /* diff --git a/genesyscloud/responsemanagement_response/resource_genesyscloud_responsemanagement_response.go b/genesyscloud/responsemanagement_response/resource_genesyscloud_responsemanagement_response.go index d6a2a0865..746cba58a 100644 --- a/genesyscloud/responsemanagement_response/resource_genesyscloud_responsemanagement_response.go +++ b/genesyscloud/responsemanagement_response/resource_genesyscloud_responsemanagement_response.go @@ -15,7 +15,7 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "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/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" ) /* diff --git a/genesyscloud/responsemanagement_response/resource_genesyscloud_responsemanagement_response_test.go b/genesyscloud/responsemanagement_response/resource_genesyscloud_responsemanagement_response_test.go index 78a7334fe..805a3a48d 100644 --- a/genesyscloud/responsemanagement_response/resource_genesyscloud_responsemanagement_response_test.go +++ b/genesyscloud/responsemanagement_response/resource_genesyscloud_responsemanagement_response_test.go @@ -16,7 +16,7 @@ import ( "github.com/google/uuid" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" ) func TestAccResourceResponseManagementResponseFooterField(t *testing.T) { diff --git a/genesyscloud/responsemanagement_response/resource_genesyscloud_responsemanagement_response_utils.go b/genesyscloud/responsemanagement_response/resource_genesyscloud_responsemanagement_response_utils.go index c8d54b076..6926f35c3 100644 --- a/genesyscloud/responsemanagement_response/resource_genesyscloud_responsemanagement_response_utils.go +++ b/genesyscloud/responsemanagement_response/resource_genesyscloud_responsemanagement_response_utils.go @@ -6,7 +6,7 @@ import ( "terraform-provider-genesyscloud/genesyscloud/util/resourcedata" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" ) func getResponseFromResourceData(d *schema.ResourceData) platformclientv2.Response { diff --git a/genesyscloud/responsemanagement_responseasset/genesyscloud_responsemanagement_responseasset_proxy.go b/genesyscloud/responsemanagement_responseasset/genesyscloud_responsemanagement_responseasset_proxy.go index 4457a72fa..0a0c6c040 100644 --- a/genesyscloud/responsemanagement_responseasset/genesyscloud_responsemanagement_responseasset_proxy.go +++ b/genesyscloud/responsemanagement_responseasset/genesyscloud_responsemanagement_responseasset_proxy.go @@ -6,7 +6,7 @@ import ( "log" rc "terraform-provider-genesyscloud/genesyscloud/resource_cache" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" ) /* diff --git a/genesyscloud/responsemanagement_responseasset/resource_genesyscloud_responsemanagement_responseasset.go b/genesyscloud/responsemanagement_responseasset/resource_genesyscloud_responsemanagement_responseasset.go index 0832e0280..09da9a497 100644 --- a/genesyscloud/responsemanagement_responseasset/resource_genesyscloud_responsemanagement_responseasset.go +++ b/genesyscloud/responsemanagement_responseasset/resource_genesyscloud_responsemanagement_responseasset.go @@ -15,7 +15,7 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "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/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" ) /* diff --git a/genesyscloud/responsemanagement_responseasset/resource_genesyscloud_responsemanagement_responseasset_test.go b/genesyscloud/responsemanagement_responseasset/resource_genesyscloud_responsemanagement_responseasset_test.go index abfbc5ad4..30a838030 100644 --- a/genesyscloud/responsemanagement_responseasset/resource_genesyscloud_responsemanagement_responseasset_test.go +++ b/genesyscloud/responsemanagement_responseasset/resource_genesyscloud_responsemanagement_responseasset_test.go @@ -13,7 +13,7 @@ import ( "github.com/google/uuid" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" ) func TestAccResourceResponseManagementResponseAsset(t *testing.T) { diff --git a/genesyscloud/routing_email_domain/data_source_genesyscloud_routing_email_domain_test.go b/genesyscloud/routing_email_domain/data_source_genesyscloud_routing_email_domain_test.go index 53feeb898..ebbc2e421 100644 --- a/genesyscloud/routing_email_domain/data_source_genesyscloud_routing_email_domain_test.go +++ b/genesyscloud/routing_email_domain/data_source_genesyscloud_routing_email_domain_test.go @@ -12,7 +12,7 @@ import ( "github.com/google/uuid" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" ) func TestAccDataSourceRoutingEmailDomain(t *testing.T) { diff --git a/genesyscloud/routing_email_domain/genesyscloud_routing_email_domain_proxy.go b/genesyscloud/routing_email_domain/genesyscloud_routing_email_domain_proxy.go index 2b1be39b0..5687ea9cb 100644 --- a/genesyscloud/routing_email_domain/genesyscloud_routing_email_domain_proxy.go +++ b/genesyscloud/routing_email_domain/genesyscloud_routing_email_domain_proxy.go @@ -6,7 +6,7 @@ import ( "log" rc "terraform-provider-genesyscloud/genesyscloud/resource_cache" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" ) var internalProxy *routingEmailDomainProxy diff --git a/genesyscloud/routing_email_domain/resource_genesyscloud_routing_email_domain.go b/genesyscloud/routing_email_domain/resource_genesyscloud_routing_email_domain.go index 312a49bee..6cfbcb63c 100644 --- a/genesyscloud/routing_email_domain/resource_genesyscloud_routing_email_domain.go +++ b/genesyscloud/routing_email_domain/resource_genesyscloud_routing_email_domain.go @@ -16,7 +16,7 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "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/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" ) func getAllRoutingEmailDomains(ctx context.Context, clientConfig *platformclientv2.Configuration) (resourceExporter.ResourceIDMetaMap, diag.Diagnostics) { diff --git a/genesyscloud/routing_email_domain/resource_genesyscloud_routing_email_domain_test.go b/genesyscloud/routing_email_domain/resource_genesyscloud_routing_email_domain_test.go index daae8a436..8c3ebb11d 100644 --- a/genesyscloud/routing_email_domain/resource_genesyscloud_routing_email_domain_test.go +++ b/genesyscloud/routing_email_domain/resource_genesyscloud_routing_email_domain_test.go @@ -16,7 +16,7 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" ) func TestAccResourceRoutingEmailDomainSub(t *testing.T) { diff --git a/genesyscloud/routing_email_route/genesyscloud_routing_email_route_proxy.go b/genesyscloud/routing_email_route/genesyscloud_routing_email_route_proxy.go index bf6697f83..6ba1d4554 100644 --- a/genesyscloud/routing_email_route/genesyscloud_routing_email_route_proxy.go +++ b/genesyscloud/routing_email_route/genesyscloud_routing_email_route_proxy.go @@ -5,7 +5,7 @@ import ( "fmt" "log" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" ) /* diff --git a/genesyscloud/routing_email_route/resource_genesyscloud_routing_email_route.go b/genesyscloud/routing_email_route/resource_genesyscloud_routing_email_route.go index 2b7615def..bf4e08a91 100644 --- a/genesyscloud/routing_email_route/resource_genesyscloud_routing_email_route.go +++ b/genesyscloud/routing_email_route/resource_genesyscloud_routing_email_route.go @@ -12,7 +12,7 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" "terraform-provider-genesyscloud/genesyscloud/consistency_checker" @@ -127,12 +127,14 @@ func readRoutingEmailRoute(ctx context.Context, d *schema.ResourceData, meta int resourcedata.SetNillableValue(d, "pattern", route.Pattern) resourcedata.SetNillableReference(d, "queue_id", route.Queue) resourcedata.SetNillableValue(d, "priority", route.Priority) + resourcedata.SetNillableValue(d, "history_inclusion", route.HistoryInclusion) resourcedata.SetNillableReference(d, "language_id", route.Language) resourcedata.SetNillableValue(d, "from_name", route.FromName) resourcedata.SetNillableValue(d, "from_email", route.FromEmail) resourcedata.SetNillableReference(d, "flow_id", route.Flow) resourcedata.SetNillableValueWithInterfaceArrayWithFunc(d, "auto_bcc", route.AutoBcc, flattenAutoBccEmailAddress) resourcedata.SetNillableReference(d, "spam_flow_id", route.SpamFlow) + resourcedata.SetNillableValue(d, "allow_multiple_actions", route.AllowMultipleActions) if route.Skills != nil { _ = d.Set("skill_ids", util.SdkDomainEntityRefArrToSet(*route.Skills)) diff --git a/genesyscloud/routing_email_route/resource_genesyscloud_routing_email_route_schema.go b/genesyscloud/routing_email_route/resource_genesyscloud_routing_email_route_schema.go index 3440646a0..62a9f4cfc 100644 --- a/genesyscloud/routing_email_route/resource_genesyscloud_routing_email_route_schema.go +++ b/genesyscloud/routing_email_route/resource_genesyscloud_routing_email_route_schema.go @@ -1,6 +1,7 @@ package routing_email_route import ( + "github.com/hashicorp/terraform-plugin-sdk/v2/helper/validation" "terraform-provider-genesyscloud/genesyscloud/provider" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" @@ -103,6 +104,18 @@ func ResourceRoutingEmailRoute() *schema.Resource { Type: schema.TypeString, Optional: true, }, + "history_inclusion": { + Description: "The configuration to indicate how the history of a conversation has to be included in a draft.", + Type: schema.TypeString, + Optional: true, + Default: "Optional", + ValidateFunc: validation.StringInSlice([]string{"Include", "Exclude", "Optional"}, true), + }, + "allow_multiple_actions": { + Description: "Control if multiple actions are allowed on this route. When true the disconnect has to be done manually. When false a conversation will be disconnected by the system after every action.", + Type: schema.TypeBool, + Optional: true, + }, "reply_email_address": { Description: "The route to use for email replies. This should not be set if from_email or auto_bcc are specified.", Type: schema.TypeList, diff --git a/genesyscloud/routing_email_route/resource_genesyscloud_routing_email_route_test.go b/genesyscloud/routing_email_route/resource_genesyscloud_routing_email_route_test.go index aded63f2d..6cf824d9b 100644 --- a/genesyscloud/routing_email_route/resource_genesyscloud_routing_email_route_test.go +++ b/genesyscloud/routing_email_route/resource_genesyscloud_routing_email_route_test.go @@ -18,31 +18,33 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" ) func TestAccResourceRoutingEmailRoute(t *testing.T) { var ( - domainResourceLabel = "routing-domain1" - domainId = fmt.Sprintf("terraformroutes.%s.com", strings.Replace(uuid.NewString(), "-", "", -1)) - queueResourceLabel = "email-queue" - queueName = "Terraform Email Queue-" + uuid.NewString() - langResourceLabel = "email-lang" - langName = "tflang" + uuid.NewString() - skillResourceLabel = "test-skill1" - skillName = "Terraform Skill" + uuid.NewString() - routeResourceLabel1 = "email-route1" - routeResourceLabel2 = "email-route2" - routePattern1 = "terraform1" - routePattern2 = "terraform2" - routePattern3 = "terraform3" - fromEmail1 = "terraform1@test.com" - fromEmail2 = "terraform2@test.com" - fromName1 = "John Terraform" - fromName2 = "Jane Terraform" - priority1 = "1" - bccEmail1 = "test1@" + domainId - bccEmail2 = "test2@" + domainId + domainResourceLabel = "routing-domain1" + domainId = fmt.Sprintf("terraformroutes.%s.com", strings.Replace(uuid.NewString(), "-", "", -1)) + queueResourceLabel = "email-queue" + queueName = "Terraform Email Queue-" + uuid.NewString() + langResourceLabel = "email-lang" + langName = "tflang" + uuid.NewString() + skillResourceLabel = "test-skill1" + skillName = "Terraform Skill" + uuid.NewString() + routeResourceLabel1 = "email-route1" + routeResourceLabel2 = "email-route2" + routePattern1 = "terraform1" + routePattern2 = "terraform2" + routePattern3 = "terraform3" + fromEmail1 = "terraform1@test.com" + fromEmail2 = "terraform2@test.com" + fromName1 = "John Terraform" + fromName2 = "Jane Terraform" + priority1 = "1" + bccEmail1 = "test1@" + domainId + bccEmail2 = "test2@" + domainId + allowMultipleActions = "true" + historyInclusion = "Include" ) CleanupRoutingEmailDomains() @@ -65,6 +67,8 @@ func TestAccResourceRoutingEmailRoute(t *testing.T) { routePattern1, fromName1, fmt.Sprintf("from_email = \"%s\"", fromEmail1), + fmt.Sprintf("allow_multiple_actions = \"%s\"", allowMultipleActions), + fmt.Sprintf("history_inclusion = \"%s\"", historyInclusion), generateRoutingAutoBcc(fromName1, bccEmail1), ), Check: resource.ComposeTestCheckFunc( @@ -74,6 +78,8 @@ func TestAccResourceRoutingEmailRoute(t *testing.T) { resource.TestCheckResourceAttr("genesyscloud_routing_email_route."+routeResourceLabel1, "from_email", fromEmail1), resource.TestCheckResourceAttr("genesyscloud_routing_email_route."+routeResourceLabel1, "auto_bcc.0.name", fromName1), resource.TestCheckResourceAttr("genesyscloud_routing_email_route."+routeResourceLabel1, "auto_bcc.0.email", bccEmail1), + resource.TestCheckResourceAttr("genesyscloud_routing_email_route."+routeResourceLabel1, "allow_multiple_actions", allowMultipleActions), + resource.TestCheckResourceAttr("genesyscloud_routing_email_route."+routeResourceLabel1, "history_inclusion", historyInclusion), ), }, { diff --git a/genesyscloud/routing_email_route/resource_genesyscloud_routing_email_route_utils.go b/genesyscloud/routing_email_route/resource_genesyscloud_routing_email_route_utils.go index ea44ff546..29f4a8b12 100644 --- a/genesyscloud/routing_email_route/resource_genesyscloud_routing_email_route_utils.go +++ b/genesyscloud/routing_email_route/resource_genesyscloud_routing_email_route_utils.go @@ -8,7 +8,7 @@ import ( "terraform-provider-genesyscloud/genesyscloud/util/resourcedata" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" ) /* @@ -19,7 +19,7 @@ and unmarshal data into formats consumable by Terraform and/or Genesys Cloud. // getRoutingEmailRouteFromResourceData maps data from schema ResourceData object to a platformclientv2.Inboundroute func getRoutingEmailRouteFromResourceData(d *schema.ResourceData) platformclientv2.Inboundroute { id := d.Id() - return platformclientv2.Inboundroute{ + inboundRoute := platformclientv2.Inboundroute{ Id: &id, Pattern: platformclientv2.String(d.Get("pattern").(string)), Queue: util.BuildSdkDomainEntityRef(d, "queue_id"), @@ -32,6 +32,14 @@ func getRoutingEmailRouteFromResourceData(d *schema.ResourceData) platformclient AutoBcc: buildAutoBccEmailAddresses(d), SpamFlow: util.BuildSdkDomainEntityRef(d, "spam_flow_id"), } + + if d.Get("history_inclusion") != "" { + inboundRoute.HistoryInclusion = platformclientv2.String(d.Get("history_inclusion").(string)) + } + if d.Get("allow_multiple_actions") != "" { + inboundRoute.AllowMultipleActions = platformclientv2.Bool(d.Get("allow_multiple_actions").(bool)) + } + return inboundRoute } // Build Functions @@ -166,11 +174,14 @@ func GenerateRoutingEmailRouteResource( pattern string, fromName string, otherAttrs ...string) string { - return fmt.Sprintf(`resource "genesyscloud_routing_email_route" "%s" { + hh := fmt.Sprintf(`resource "genesyscloud_routing_email_route" "%s" { domain_id = %s pattern = "%s" from_name = "%s" %s } `, resourceLabel, domainID, pattern, fromName, strings.Join(otherAttrs, "\n")) + + fmt.Println(hh) + return hh } diff --git a/genesyscloud/routing_language/genesyscloud_routing_language_proxy.go b/genesyscloud/routing_language/genesyscloud_routing_language_proxy.go index 0f5f2c72b..4cbe29730 100644 --- a/genesyscloud/routing_language/genesyscloud_routing_language_proxy.go +++ b/genesyscloud/routing_language/genesyscloud_routing_language_proxy.go @@ -6,7 +6,7 @@ import ( "log" rc "terraform-provider-genesyscloud/genesyscloud/resource_cache" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" ) var internalProxy *routingLanguageProxy diff --git a/genesyscloud/routing_language/resource_genesyscloud_routing_language.go b/genesyscloud/routing_language/resource_genesyscloud_routing_language.go index 47bf27cad..c0ac36f0c 100644 --- a/genesyscloud/routing_language/resource_genesyscloud_routing_language.go +++ b/genesyscloud/routing_language/resource_genesyscloud_routing_language.go @@ -17,7 +17,7 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" ) func getAllRoutingLanguages(ctx context.Context, clientConfig *platformclientv2.Configuration) (resourceExporter.ResourceIDMetaMap, diag.Diagnostics) { diff --git a/genesyscloud/routing_language/resource_genesyscloud_routing_language_test.go b/genesyscloud/routing_language/resource_genesyscloud_routing_language_test.go index 9d25edd48..954eb5e58 100644 --- a/genesyscloud/routing_language/resource_genesyscloud_routing_language_test.go +++ b/genesyscloud/routing_language/resource_genesyscloud_routing_language_test.go @@ -9,7 +9,7 @@ import ( "github.com/google/uuid" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" ) func TestAccResourceRoutingLanguageBasic(t *testing.T) { diff --git a/genesyscloud/routing_queue/genesyscloud_routing_queue_proxy.go b/genesyscloud/routing_queue/genesyscloud_routing_queue_proxy.go index 698cae48e..97e4baf41 100644 --- a/genesyscloud/routing_queue/genesyscloud_routing_queue_proxy.go +++ b/genesyscloud/routing_queue/genesyscloud_routing_queue_proxy.go @@ -6,7 +6,7 @@ import ( "log" rc "terraform-provider-genesyscloud/genesyscloud/resource_cache" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" ) /* diff --git a/genesyscloud/routing_queue/resource_genesyscloud_routing_queue.go b/genesyscloud/routing_queue/resource_genesyscloud_routing_queue.go index 72daca9be..f55472dcb 100644 --- a/genesyscloud/routing_queue/resource_genesyscloud_routing_queue.go +++ b/genesyscloud/routing_queue/resource_genesyscloud_routing_queue.go @@ -22,7 +22,7 @@ import ( "github.com/hashicorp/go-cty/cty" "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" ) var bullseyeExpansionTypeTimeout = "TIMEOUT_SECONDS" diff --git a/genesyscloud/routing_queue/resource_genesyscloud_routing_queue_members.go b/genesyscloud/routing_queue/resource_genesyscloud_routing_queue_members.go index 7ee7fadc6..14e6004e5 100644 --- a/genesyscloud/routing_queue/resource_genesyscloud_routing_queue_members.go +++ b/genesyscloud/routing_queue/resource_genesyscloud_routing_queue_members.go @@ -16,7 +16,7 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" ) var ctx = context.Background() diff --git a/genesyscloud/routing_queue/resource_genesyscloud_routing_queue_test.go b/genesyscloud/routing_queue/resource_genesyscloud_routing_queue_test.go index ee2ddb2d3..5cd9d1257 100644 --- a/genesyscloud/routing_queue/resource_genesyscloud_routing_queue_test.go +++ b/genesyscloud/routing_queue/resource_genesyscloud_routing_queue_test.go @@ -24,7 +24,7 @@ import ( "github.com/google/uuid" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" ) var ( diff --git a/genesyscloud/routing_queue/resource_genesyscloud_routing_queue_unit_test.go b/genesyscloud/routing_queue/resource_genesyscloud_routing_queue_unit_test.go index 9e60d6931..5cf16723f 100644 --- a/genesyscloud/routing_queue/resource_genesyscloud_routing_queue_unit_test.go +++ b/genesyscloud/routing_queue/resource_genesyscloud_routing_queue_unit_test.go @@ -9,7 +9,7 @@ import ( "github.com/google/uuid" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" "github.com/stretchr/testify/assert" ) diff --git a/genesyscloud/routing_queue/resource_genesyscloud_routing_queue_utils.go b/genesyscloud/routing_queue/resource_genesyscloud_routing_queue_utils.go index ec8276963..d4a61e8ba 100644 --- a/genesyscloud/routing_queue/resource_genesyscloud_routing_queue_utils.go +++ b/genesyscloud/routing_queue/resource_genesyscloud_routing_queue_utils.go @@ -11,7 +11,7 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" ) // Build Functions diff --git a/genesyscloud/routing_queue_conditional_group_routing/genesyscloud_routing_queue_conditional_group_routing_proxy.go b/genesyscloud/routing_queue_conditional_group_routing/genesyscloud_routing_queue_conditional_group_routing_proxy.go index 1cc18779c..9dd5f06b5 100644 --- a/genesyscloud/routing_queue_conditional_group_routing/genesyscloud_routing_queue_conditional_group_routing_proxy.go +++ b/genesyscloud/routing_queue_conditional_group_routing/genesyscloud_routing_queue_conditional_group_routing_proxy.go @@ -6,7 +6,7 @@ import ( rc "terraform-provider-genesyscloud/genesyscloud/resource_cache" routingQueue "terraform-provider-genesyscloud/genesyscloud/routing_queue" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" ) // internalProxy holds a proxy instance that can be used throughout the package diff --git a/genesyscloud/routing_queue_conditional_group_routing/resource_genesyscloud_routing_queue_conditional_group_routing.go b/genesyscloud/routing_queue_conditional_group_routing/resource_genesyscloud_routing_queue_conditional_group_routing.go index be9dada87..3d6cd3aa1 100644 --- a/genesyscloud/routing_queue_conditional_group_routing/resource_genesyscloud_routing_queue_conditional_group_routing.go +++ b/genesyscloud/routing_queue_conditional_group_routing/resource_genesyscloud_routing_queue_conditional_group_routing.go @@ -16,7 +16,7 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "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/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" ) /* diff --git a/genesyscloud/routing_queue_conditional_group_routing/resource_genesyscloud_routing_queue_conditional_group_routing_test.go b/genesyscloud/routing_queue_conditional_group_routing/resource_genesyscloud_routing_queue_conditional_group_routing_test.go index 14e760ca6..694f743ef 100644 --- a/genesyscloud/routing_queue_conditional_group_routing/resource_genesyscloud_routing_queue_conditional_group_routing_test.go +++ b/genesyscloud/routing_queue_conditional_group_routing/resource_genesyscloud_routing_queue_conditional_group_routing_test.go @@ -18,7 +18,7 @@ import ( "github.com/google/uuid" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" ) var ( diff --git a/genesyscloud/routing_queue_conditional_group_routing/resource_genesyscloud_routing_queue_conditional_group_routing_unit_test.go b/genesyscloud/routing_queue_conditional_group_routing/resource_genesyscloud_routing_queue_conditional_group_routing_unit_test.go index 4f91d7d44..dcb574d6b 100644 --- a/genesyscloud/routing_queue_conditional_group_routing/resource_genesyscloud_routing_queue_conditional_group_routing_unit_test.go +++ b/genesyscloud/routing_queue_conditional_group_routing/resource_genesyscloud_routing_queue_conditional_group_routing_unit_test.go @@ -10,7 +10,7 @@ import ( "github.com/google/go-cmp/cmp" "github.com/google/uuid" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" "github.com/stretchr/testify/assert" ) diff --git a/genesyscloud/routing_queue_outbound_email_address/genesyscloud_routing_queue_outbound_email_address_proxy.go b/genesyscloud/routing_queue_outbound_email_address/genesyscloud_routing_queue_outbound_email_address_proxy.go index 522a4607c..4c048daf7 100644 --- a/genesyscloud/routing_queue_outbound_email_address/genesyscloud_routing_queue_outbound_email_address_proxy.go +++ b/genesyscloud/routing_queue_outbound_email_address/genesyscloud_routing_queue_outbound_email_address_proxy.go @@ -6,7 +6,7 @@ import ( rc "terraform-provider-genesyscloud/genesyscloud/resource_cache" routingQueue "terraform-provider-genesyscloud/genesyscloud/routing_queue" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" ) // internalProxy holds a proxy instance that can be used throughout the package diff --git a/genesyscloud/routing_queue_outbound_email_address/resource_genesyscloud_routing_queue_outbound_email_address.go b/genesyscloud/routing_queue_outbound_email_address/resource_genesyscloud_routing_queue_outbound_email_address.go index 01700b1a5..fd39b460c 100644 --- a/genesyscloud/routing_queue_outbound_email_address/resource_genesyscloud_routing_queue_outbound_email_address.go +++ b/genesyscloud/routing_queue_outbound_email_address/resource_genesyscloud_routing_queue_outbound_email_address.go @@ -16,7 +16,7 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "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/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" ) /* diff --git a/genesyscloud/routing_queue_outbound_email_address/resource_genesyscloud_routing_queue_outbound_email_address_test.go b/genesyscloud/routing_queue_outbound_email_address/resource_genesyscloud_routing_queue_outbound_email_address_test.go index a1348b6e8..d375ab6e9 100644 --- a/genesyscloud/routing_queue_outbound_email_address/resource_genesyscloud_routing_queue_outbound_email_address_test.go +++ b/genesyscloud/routing_queue_outbound_email_address/resource_genesyscloud_routing_queue_outbound_email_address_test.go @@ -17,7 +17,7 @@ import ( "github.com/google/uuid" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" ) func TestAccResourceRoutingQueueOutboundEmailAddress(t *testing.T) { diff --git a/genesyscloud/routing_queue_outbound_email_address/resource_genesyscloud_routing_queue_outbound_email_address_unit_test.go b/genesyscloud/routing_queue_outbound_email_address/resource_genesyscloud_routing_queue_outbound_email_address_unit_test.go index 604bc6576..95a115084 100644 --- a/genesyscloud/routing_queue_outbound_email_address/resource_genesyscloud_routing_queue_outbound_email_address_unit_test.go +++ b/genesyscloud/routing_queue_outbound_email_address/resource_genesyscloud_routing_queue_outbound_email_address_unit_test.go @@ -9,7 +9,7 @@ import ( "github.com/google/uuid" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" "github.com/stretchr/testify/assert" ) diff --git a/genesyscloud/routing_queue_outbound_email_address/resource_genesyscloud_routing_queue_outbound_email_address_utils.go b/genesyscloud/routing_queue_outbound_email_address/resource_genesyscloud_routing_queue_outbound_email_address_utils.go index fabc468df..19bcfd2c5 100644 --- a/genesyscloud/routing_queue_outbound_email_address/resource_genesyscloud_routing_queue_outbound_email_address_utils.go +++ b/genesyscloud/routing_queue_outbound_email_address/resource_genesyscloud_routing_queue_outbound_email_address_utils.go @@ -1,6 +1,6 @@ package routing_queue_outbound_email_address -import "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" +import "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" func isQueueEmailAddressEmpty(qea *platformclientv2.Queueemailaddress) bool { if qea == nil { diff --git a/genesyscloud/routing_queue_outbound_email_address/resource_genesyscloud_routing_queue_outbound_email_address_utils_unit_test.go b/genesyscloud/routing_queue_outbound_email_address/resource_genesyscloud_routing_queue_outbound_email_address_utils_unit_test.go index e9a4c262a..2815417f3 100644 --- a/genesyscloud/routing_queue_outbound_email_address/resource_genesyscloud_routing_queue_outbound_email_address_utils_unit_test.go +++ b/genesyscloud/routing_queue_outbound_email_address/resource_genesyscloud_routing_queue_outbound_email_address_utils_unit_test.go @@ -4,7 +4,7 @@ import ( "testing" "github.com/google/uuid" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" "github.com/stretchr/testify/assert" ) diff --git a/genesyscloud/routing_settings/genesyscloud_routing_settings_proxy.go b/genesyscloud/routing_settings/genesyscloud_routing_settings_proxy.go index 15cdf8ce2..37ac4134a 100644 --- a/genesyscloud/routing_settings/genesyscloud_routing_settings_proxy.go +++ b/genesyscloud/routing_settings/genesyscloud_routing_settings_proxy.go @@ -3,7 +3,7 @@ package routing_settings import ( "context" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" ) var internalProxy *routingSettingsProxy diff --git a/genesyscloud/routing_settings/resource_genesyscloud_routing_settings.go b/genesyscloud/routing_settings/resource_genesyscloud_routing_settings.go index 293f68e5e..09245854a 100644 --- a/genesyscloud/routing_settings/resource_genesyscloud_routing_settings.go +++ b/genesyscloud/routing_settings/resource_genesyscloud_routing_settings.go @@ -18,7 +18,7 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" ) func getAllRoutingSettings(ctx context.Context, clientConfig *platformclientv2.Configuration) (resourceExporter.ResourceIDMetaMap, diag.Diagnostics) { diff --git a/genesyscloud/routing_skill/genesyscloud_routing_skill_proxy.go b/genesyscloud/routing_skill/genesyscloud_routing_skill_proxy.go index 5ff74455f..834064773 100644 --- a/genesyscloud/routing_skill/genesyscloud_routing_skill_proxy.go +++ b/genesyscloud/routing_skill/genesyscloud_routing_skill_proxy.go @@ -6,7 +6,7 @@ import ( "log" rc "terraform-provider-genesyscloud/genesyscloud/resource_cache" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" ) type getAllRoutingSkillsFunc func(ctx context.Context, p *routingSkillProxy, name string) (*[]platformclientv2.Routingskill, *platformclientv2.APIResponse, error) diff --git a/genesyscloud/routing_skill/resource_genesyscloud_routing_skill.go b/genesyscloud/routing_skill/resource_genesyscloud_routing_skill.go index c43227fad..38a83f826 100644 --- a/genesyscloud/routing_skill/resource_genesyscloud_routing_skill.go +++ b/genesyscloud/routing_skill/resource_genesyscloud_routing_skill.go @@ -17,7 +17,7 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" ) func GetAllRoutingSkills(ctx context.Context, clientConfig *platformclientv2.Configuration) (resourceExporter.ResourceIDMetaMap, diag.Diagnostics) { diff --git a/genesyscloud/routing_skill/resource_genesyscloud_routing_skill_test.go b/genesyscloud/routing_skill/resource_genesyscloud_routing_skill_test.go index 24e1aba0a..a0c2a8126 100644 --- a/genesyscloud/routing_skill/resource_genesyscloud_routing_skill_test.go +++ b/genesyscloud/routing_skill/resource_genesyscloud_routing_skill_test.go @@ -9,7 +9,7 @@ import ( "github.com/google/uuid" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" ) func TestAccResourceRoutingSkillBasic(t *testing.T) { diff --git a/genesyscloud/routing_skill_group/genesyscloud_routing_skill_group_proxy.go b/genesyscloud/routing_skill_group/genesyscloud_routing_skill_group_proxy.go index e8ae7b360..06b04f429 100644 --- a/genesyscloud/routing_skill_group/genesyscloud_routing_skill_group_proxy.go +++ b/genesyscloud/routing_skill_group/genesyscloud_routing_skill_group_proxy.go @@ -6,7 +6,7 @@ import ( "log" "terraform-provider-genesyscloud/genesyscloud/util" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" ) var internalProxy *routingSkillGroupsProxy diff --git a/genesyscloud/routing_skill_group/resource_genesyscloud_routing_skill_group.go b/genesyscloud/routing_skill_group/resource_genesyscloud_routing_skill_group.go index 3004d86eb..38f47e559 100644 --- a/genesyscloud/routing_skill_group/resource_genesyscloud_routing_skill_group.go +++ b/genesyscloud/routing_skill_group/resource_genesyscloud_routing_skill_group.go @@ -20,7 +20,7 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" ) func getAllRoutingSkillGroups(ctx context.Context, clientConfig *platformclientv2.Configuration) (resourceExporter.ResourceIDMetaMap, diag.Diagnostics) { diff --git a/genesyscloud/routing_skill_group/resource_genesyscloud_routing_skill_group_test.go b/genesyscloud/routing_skill_group/resource_genesyscloud_routing_skill_group_test.go index 058bb1415..51bd4aa51 100644 --- a/genesyscloud/routing_skill_group/resource_genesyscloud_routing_skill_group_test.go +++ b/genesyscloud/routing_skill_group/resource_genesyscloud_routing_skill_group_test.go @@ -19,7 +19,7 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" ) func testAccCheckSkillConditions(resourcePath string, targetSkillConditionJson string) resource.TestCheckFunc { diff --git a/genesyscloud/routing_sms_addresses/genesyscloud_routing_sms_addresses_proxy.go b/genesyscloud/routing_sms_addresses/genesyscloud_routing_sms_addresses_proxy.go index e0655bb6c..61e37b208 100644 --- a/genesyscloud/routing_sms_addresses/genesyscloud_routing_sms_addresses_proxy.go +++ b/genesyscloud/routing_sms_addresses/genesyscloud_routing_sms_addresses_proxy.go @@ -4,7 +4,7 @@ import ( "context" "fmt" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" ) // Type definitions for each func on our proxy so we can easily mock them out later diff --git a/genesyscloud/routing_sms_addresses/resource_genesyscloud_routing_sms_addresses.go b/genesyscloud/routing_sms_addresses/resource_genesyscloud_routing_sms_addresses.go index b8b6fcb33..3ae9eb228 100644 --- a/genesyscloud/routing_sms_addresses/resource_genesyscloud_routing_sms_addresses.go +++ b/genesyscloud/routing_sms_addresses/resource_genesyscloud_routing_sms_addresses.go @@ -18,7 +18,7 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" ) const ResourceType = "genesyscloud_routing_sms_address" diff --git a/genesyscloud/routing_sms_addresses/resource_genesyscloud_routing_sms_addresses_test.go b/genesyscloud/routing_sms_addresses/resource_genesyscloud_routing_sms_addresses_test.go index 20140b48f..74ff67b9f 100644 --- a/genesyscloud/routing_sms_addresses/resource_genesyscloud_routing_sms_addresses_test.go +++ b/genesyscloud/routing_sms_addresses/resource_genesyscloud_routing_sms_addresses_test.go @@ -9,7 +9,7 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" ) func TestAccResourceRoutingSmsAddresses(t *testing.T) { diff --git a/genesyscloud/routing_utilization/genesyscloud_routing_utilization_proxy.go b/genesyscloud/routing_utilization/genesyscloud_routing_utilization_proxy.go index 90456eb0c..09c69e418 100644 --- a/genesyscloud/routing_utilization/genesyscloud_routing_utilization_proxy.go +++ b/genesyscloud/routing_utilization/genesyscloud_routing_utilization_proxy.go @@ -3,7 +3,7 @@ package routing_utilization import ( "context" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" ) var internalProxy *routingUtilizationProxy diff --git a/genesyscloud/routing_utilization/resource_genesyscloud_routing_utilization.go b/genesyscloud/routing_utilization/resource_genesyscloud_routing_utilization.go index afdc3f4c2..852697e1f 100644 --- a/genesyscloud/routing_utilization/resource_genesyscloud_routing_utilization.go +++ b/genesyscloud/routing_utilization/resource_genesyscloud_routing_utilization.go @@ -16,7 +16,7 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" ) func getAllRoutingUtilization(ctx context.Context, clientConfig *platformclientv2.Configuration) (resourceExporter.ResourceIDMetaMap, diag.Diagnostics) { diff --git a/genesyscloud/routing_utilization/resource_genesyscloud_routing_utilization_test.go b/genesyscloud/routing_utilization/resource_genesyscloud_routing_utilization_test.go index c90e6377e..965ff8524 100644 --- a/genesyscloud/routing_utilization/resource_genesyscloud_routing_utilization_test.go +++ b/genesyscloud/routing_utilization/resource_genesyscloud_routing_utilization_test.go @@ -14,7 +14,7 @@ import ( "github.com/google/uuid" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" ) func TestAccResourceRoutingUtilizationBasic(t *testing.T) { diff --git a/genesyscloud/routing_utilization/resource_routing_utilization_utils.go b/genesyscloud/routing_utilization/resource_routing_utilization_utils.go index 9494ec9f6..73de279b4 100644 --- a/genesyscloud/routing_utilization/resource_routing_utilization_utils.go +++ b/genesyscloud/routing_utilization/resource_routing_utilization_utils.go @@ -7,7 +7,7 @@ import ( "terraform-provider-genesyscloud/genesyscloud/util/lists" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" ) func BuildSdkMediaUtilizations(d *schema.ResourceData) *map[string]platformclientv2.Mediautilization { diff --git a/genesyscloud/routing_utilization_label/data_source_genesyscloud_routing_utilization_label_test.go b/genesyscloud/routing_utilization_label/data_source_genesyscloud_routing_utilization_label_test.go index c088e2aae..92cb03e15 100644 --- a/genesyscloud/routing_utilization_label/data_source_genesyscloud_routing_utilization_label_test.go +++ b/genesyscloud/routing_utilization_label/data_source_genesyscloud_routing_utilization_label_test.go @@ -8,7 +8,7 @@ import ( "github.com/google/uuid" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" ) func TestAccDataSourceRoutingUtilizationLabel(t *testing.T) { diff --git a/genesyscloud/routing_utilization_label/genesyscloud_routing_utilization_label_init_test.go b/genesyscloud/routing_utilization_label/genesyscloud_routing_utilization_label_init_test.go index 0d3874e9a..4a5b59476 100644 --- a/genesyscloud/routing_utilization_label/genesyscloud_routing_utilization_label_init_test.go +++ b/genesyscloud/routing_utilization_label/genesyscloud_routing_utilization_label_init_test.go @@ -7,7 +7,7 @@ import ( "testing" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" ) var ( diff --git a/genesyscloud/routing_utilization_label/genesyscloud_routing_utilization_label_proxy.go b/genesyscloud/routing_utilization_label/genesyscloud_routing_utilization_label_proxy.go index d8bfe6d71..fc0cd7c04 100644 --- a/genesyscloud/routing_utilization_label/genesyscloud_routing_utilization_label_proxy.go +++ b/genesyscloud/routing_utilization_label/genesyscloud_routing_utilization_label_proxy.go @@ -6,7 +6,7 @@ import ( "log" rc "terraform-provider-genesyscloud/genesyscloud/resource_cache" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" ) var internalProxy *routingUtilizationLabelProxy diff --git a/genesyscloud/routing_utilization_label/resource_genesyscloud_routing_utilization_label.go b/genesyscloud/routing_utilization_label/resource_genesyscloud_routing_utilization_label.go index 2e157f33f..22a8d739a 100644 --- a/genesyscloud/routing_utilization_label/resource_genesyscloud_routing_utilization_label.go +++ b/genesyscloud/routing_utilization_label/resource_genesyscloud_routing_utilization_label.go @@ -17,7 +17,7 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" ) func getAllRoutingUtilizationLabels(ctx context.Context, clientConfig *platformclientv2.Configuration) (resourceExporter.ResourceIDMetaMap, diag.Diagnostics) { diff --git a/genesyscloud/routing_utilization_label/resource_genesyscloud_routing_utilization_label_test.go b/genesyscloud/routing_utilization_label/resource_genesyscloud_routing_utilization_label_test.go index 0b3e5d6b7..40c68a24f 100644 --- a/genesyscloud/routing_utilization_label/resource_genesyscloud_routing_utilization_label_test.go +++ b/genesyscloud/routing_utilization_label/resource_genesyscloud_routing_utilization_label_test.go @@ -10,7 +10,7 @@ import ( "github.com/google/uuid" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" ) func TestAccResourceRoutingUtilizationLabelBasic(t *testing.T) { diff --git a/genesyscloud/routing_wrapupcode/genesyscloud_routing_wrapupcode_proxy.go b/genesyscloud/routing_wrapupcode/genesyscloud_routing_wrapupcode_proxy.go index 7d05d4c94..ee42458fd 100644 --- a/genesyscloud/routing_wrapupcode/genesyscloud_routing_wrapupcode_proxy.go +++ b/genesyscloud/routing_wrapupcode/genesyscloud_routing_wrapupcode_proxy.go @@ -6,7 +6,7 @@ import ( "log" rc "terraform-provider-genesyscloud/genesyscloud/resource_cache" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" ) /* diff --git a/genesyscloud/routing_wrapupcode/resource_genesyscloud_routing_wrapupcode.go b/genesyscloud/routing_wrapupcode/resource_genesyscloud_routing_wrapupcode.go index ebe781ab9..df6229267 100644 --- a/genesyscloud/routing_wrapupcode/resource_genesyscloud_routing_wrapupcode.go +++ b/genesyscloud/routing_wrapupcode/resource_genesyscloud_routing_wrapupcode.go @@ -17,7 +17,7 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" ) func getAllRoutingWrapupCodes(ctx context.Context, clientConfig *platformclientv2.Configuration) (resourceExporter.ResourceIDMetaMap, diag.Diagnostics) { diff --git a/genesyscloud/routing_wrapupcode/resource_genesyscloud_routing_wrapupcode_test.go b/genesyscloud/routing_wrapupcode/resource_genesyscloud_routing_wrapupcode_test.go index 9be1a356e..cbae95393 100644 --- a/genesyscloud/routing_wrapupcode/resource_genesyscloud_routing_wrapupcode_test.go +++ b/genesyscloud/routing_wrapupcode/resource_genesyscloud_routing_wrapupcode_test.go @@ -10,7 +10,7 @@ import ( "github.com/google/uuid" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" ) func TestAccResourceRoutingWrapupcode(t *testing.T) { diff --git a/genesyscloud/scripts/genesyscloud_scripts_proxy.go b/genesyscloud/scripts/genesyscloud_scripts_proxy.go index a36335c66..1caff52e3 100644 --- a/genesyscloud/scripts/genesyscloud_scripts_proxy.go +++ b/genesyscloud/scripts/genesyscloud_scripts_proxy.go @@ -14,7 +14,7 @@ import ( "terraform-provider-genesyscloud/genesyscloud/util/files" "time" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" ) /* diff --git a/genesyscloud/scripts/resource_genesyscloud_script.go b/genesyscloud/scripts/resource_genesyscloud_script.go index e34c88d49..69d72f637 100644 --- a/genesyscloud/scripts/resource_genesyscloud_script.go +++ b/genesyscloud/scripts/resource_genesyscloud_script.go @@ -12,7 +12,7 @@ import ( "terraform-provider-genesyscloud/genesyscloud/util/constants" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/retry" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" diff --git a/genesyscloud/scripts/resource_genesyscloud_script_test.go b/genesyscloud/scripts/resource_genesyscloud_script_test.go index 258d0f61f..c7548e6d6 100644 --- a/genesyscloud/scripts/resource_genesyscloud_script_test.go +++ b/genesyscloud/scripts/resource_genesyscloud_script_test.go @@ -13,7 +13,7 @@ import ( "github.com/google/uuid" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" ) /* diff --git a/genesyscloud/station/genesyscloud_station_init_test.go b/genesyscloud/station/genesyscloud_station_init_test.go index cf0341220..dfdb1b027 100644 --- a/genesyscloud/station/genesyscloud_station_init_test.go +++ b/genesyscloud/station/genesyscloud_station_init_test.go @@ -6,7 +6,7 @@ import ( "terraform-provider-genesyscloud/genesyscloud/provider" "testing" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" gcloud "terraform-provider-genesyscloud/genesyscloud" edgePhone "terraform-provider-genesyscloud/genesyscloud/telephony_providers_edges_phone" diff --git a/genesyscloud/station/genesyscloud_station_proxy.go b/genesyscloud/station/genesyscloud_station_proxy.go index fb630481a..b03b60861 100644 --- a/genesyscloud/station/genesyscloud_station_proxy.go +++ b/genesyscloud/station/genesyscloud_station_proxy.go @@ -4,7 +4,7 @@ import ( "context" "fmt" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" ) // internalProxy holds a proxy instance that can be used throughout the package diff --git a/genesyscloud/task_management_workbin/genesyscloud_task_management_workbin_proxy.go b/genesyscloud/task_management_workbin/genesyscloud_task_management_workbin_proxy.go index 796bc0758..b7ae5bb04 100644 --- a/genesyscloud/task_management_workbin/genesyscloud_task_management_workbin_proxy.go +++ b/genesyscloud/task_management_workbin/genesyscloud_task_management_workbin_proxy.go @@ -6,7 +6,7 @@ import ( rc "terraform-provider-genesyscloud/genesyscloud/resource_cache" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" ) /* diff --git a/genesyscloud/task_management_workbin/resource_genesyscloud_task_management_workbin.go b/genesyscloud/task_management_workbin/resource_genesyscloud_task_management_workbin.go index d34976725..72d8f1a67 100644 --- a/genesyscloud/task_management_workbin/resource_genesyscloud_task_management_workbin.go +++ b/genesyscloud/task_management_workbin/resource_genesyscloud_task_management_workbin.go @@ -12,7 +12,7 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" "terraform-provider-genesyscloud/genesyscloud/consistency_checker" diff --git a/genesyscloud/task_management_workbin/resource_genesyscloud_task_management_workbin_test.go b/genesyscloud/task_management_workbin/resource_genesyscloud_task_management_workbin_test.go index 39648645e..de29ce01f 100644 --- a/genesyscloud/task_management_workbin/resource_genesyscloud_task_management_workbin_test.go +++ b/genesyscloud/task_management_workbin/resource_genesyscloud_task_management_workbin_test.go @@ -12,7 +12,7 @@ import ( authDivision "terraform-provider-genesyscloud/genesyscloud/auth_division" "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" ) /* diff --git a/genesyscloud/task_management_workitem/genesyscloud_task_management_workitem_proxy.go b/genesyscloud/task_management_workitem/genesyscloud_task_management_workitem_proxy.go index 2aebea4a3..7aa30a308 100644 --- a/genesyscloud/task_management_workitem/genesyscloud_task_management_workitem_proxy.go +++ b/genesyscloud/task_management_workitem/genesyscloud_task_management_workitem_proxy.go @@ -7,7 +7,7 @@ import ( rc "terraform-provider-genesyscloud/genesyscloud/resource_cache" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" ) /* diff --git a/genesyscloud/task_management_workitem/resource_genesyscloud_task_management_workitem.go b/genesyscloud/task_management_workitem/resource_genesyscloud_task_management_workitem.go index b961adc0f..e97cb3209 100644 --- a/genesyscloud/task_management_workitem/resource_genesyscloud_task_management_workitem.go +++ b/genesyscloud/task_management_workitem/resource_genesyscloud_task_management_workitem.go @@ -12,7 +12,7 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" "terraform-provider-genesyscloud/genesyscloud/consistency_checker" diff --git a/genesyscloud/task_management_workitem/resource_genesyscloud_task_management_workitem_test.go b/genesyscloud/task_management_workitem/resource_genesyscloud_task_management_workitem_test.go index 56eb3ad00..243f8841b 100644 --- a/genesyscloud/task_management_workitem/resource_genesyscloud_task_management_workitem_test.go +++ b/genesyscloud/task_management_workitem/resource_genesyscloud_task_management_workitem_test.go @@ -29,7 +29,7 @@ import ( "terraform-provider-genesyscloud/genesyscloud/util/resourcedata" "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" ) /* diff --git a/genesyscloud/task_management_workitem/resource_genesyscloud_task_management_workitem_unit_test.go b/genesyscloud/task_management_workitem/resource_genesyscloud_task_management_workitem_unit_test.go index 8a06a818c..45ba9ec51 100644 --- a/genesyscloud/task_management_workitem/resource_genesyscloud_task_management_workitem_unit_test.go +++ b/genesyscloud/task_management_workitem/resource_genesyscloud_task_management_workitem_unit_test.go @@ -16,7 +16,7 @@ import ( lists "terraform-provider-genesyscloud/genesyscloud/util/lists" "terraform-provider-genesyscloud/genesyscloud/util/resourcedata" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" ) var ( diff --git a/genesyscloud/task_management_workitem/resource_genesyscloud_task_management_workitem_utils.go b/genesyscloud/task_management_workitem/resource_genesyscloud_task_management_workitem_utils.go index c7fe94ed1..af4fc53d0 100644 --- a/genesyscloud/task_management_workitem/resource_genesyscloud_task_management_workitem_utils.go +++ b/genesyscloud/task_management_workitem/resource_genesyscloud_task_management_workitem_utils.go @@ -11,7 +11,7 @@ import ( lists "terraform-provider-genesyscloud/genesyscloud/util/lists" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" ) /* diff --git a/genesyscloud/task_management_workitem_schema/genesyscloud_task_management_workitem_schema_proxy.go b/genesyscloud/task_management_workitem_schema/genesyscloud_task_management_workitem_schema_proxy.go index e58c366f8..f895b18a0 100644 --- a/genesyscloud/task_management_workitem_schema/genesyscloud_task_management_workitem_schema_proxy.go +++ b/genesyscloud/task_management_workitem_schema/genesyscloud_task_management_workitem_schema_proxy.go @@ -10,7 +10,7 @@ import ( rc "terraform-provider-genesyscloud/genesyscloud/resource_cache" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" ) /* diff --git a/genesyscloud/task_management_workitem_schema/resource_genesyscloud_task_management_workitem_schema.go b/genesyscloud/task_management_workitem_schema/resource_genesyscloud_task_management_workitem_schema.go index 77e2670aa..ffc3d82ba 100644 --- a/genesyscloud/task_management_workitem_schema/resource_genesyscloud_task_management_workitem_schema.go +++ b/genesyscloud/task_management_workitem_schema/resource_genesyscloud_task_management_workitem_schema.go @@ -13,7 +13,7 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" "terraform-provider-genesyscloud/genesyscloud/consistency_checker" diff --git a/genesyscloud/task_management_workitem_schema/resource_genesyscloud_task_management_workitem_schema_test.go b/genesyscloud/task_management_workitem_schema/resource_genesyscloud_task_management_workitem_schema_test.go index fa3f9049f..de34d79e8 100644 --- a/genesyscloud/task_management_workitem_schema/resource_genesyscloud_task_management_workitem_schema_test.go +++ b/genesyscloud/task_management_workitem_schema/resource_genesyscloud_task_management_workitem_schema_test.go @@ -15,7 +15,7 @@ import ( lists "terraform-provider-genesyscloud/genesyscloud/util/lists" "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" ) /* diff --git a/genesyscloud/task_management_workitem_schema/resource_genesyscloud_task_management_workitem_schema_unit_test.go b/genesyscloud/task_management_workitem_schema/resource_genesyscloud_task_management_workitem_schema_unit_test.go index e2cc6717d..7fd0dd209 100644 --- a/genesyscloud/task_management_workitem_schema/resource_genesyscloud_task_management_workitem_schema_unit_test.go +++ b/genesyscloud/task_management_workitem_schema/resource_genesyscloud_task_management_workitem_schema_unit_test.go @@ -12,7 +12,7 @@ import ( "github.com/google/uuid" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" "github.com/stretchr/testify/assert" ) diff --git a/genesyscloud/task_management_workitem_schema/resource_genesyscloud_task_management_workitem_schema_utils.go b/genesyscloud/task_management_workitem_schema/resource_genesyscloud_task_management_workitem_schema_utils.go index f8644fbfb..4e83c3c9d 100644 --- a/genesyscloud/task_management_workitem_schema/resource_genesyscloud_task_management_workitem_schema_utils.go +++ b/genesyscloud/task_management_workitem_schema/resource_genesyscloud_task_management_workitem_schema_utils.go @@ -5,7 +5,7 @@ import ( "fmt" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" ) const ( diff --git a/genesyscloud/task_management_worktype/genesyscloud_task_management_worktype_proxy.go b/genesyscloud/task_management_worktype/genesyscloud_task_management_worktype_proxy.go index 16badb94b..9182a301a 100644 --- a/genesyscloud/task_management_worktype/genesyscloud_task_management_worktype_proxy.go +++ b/genesyscloud/task_management_worktype/genesyscloud_task_management_worktype_proxy.go @@ -6,7 +6,7 @@ import ( "log" rc "terraform-provider-genesyscloud/genesyscloud/resource_cache" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" ) /* diff --git a/genesyscloud/task_management_worktype/resource_genesyscloud_task_management_worktype.go b/genesyscloud/task_management_worktype/resource_genesyscloud_task_management_worktype.go index fff25ac6b..bc12d272e 100644 --- a/genesyscloud/task_management_worktype/resource_genesyscloud_task_management_worktype.go +++ b/genesyscloud/task_management_worktype/resource_genesyscloud_task_management_worktype.go @@ -12,7 +12,7 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" "terraform-provider-genesyscloud/genesyscloud/consistency_checker" diff --git a/genesyscloud/task_management_worktype/resource_genesyscloud_task_management_worktype_test.go b/genesyscloud/task_management_worktype/resource_genesyscloud_task_management_worktype_test.go index 7515a2357..ab3b45e37 100644 --- a/genesyscloud/task_management_worktype/resource_genesyscloud_task_management_worktype_test.go +++ b/genesyscloud/task_management_worktype/resource_genesyscloud_task_management_worktype_test.go @@ -17,7 +17,7 @@ import ( workitemSchema "terraform-provider-genesyscloud/genesyscloud/task_management_workitem_schema" "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" ) /* diff --git a/genesyscloud/task_management_worktype/resource_genesyscloud_task_management_worktype_unit_test.go b/genesyscloud/task_management_worktype/resource_genesyscloud_task_management_worktype_unit_test.go index 5386f6852..42ec6f3b3 100644 --- a/genesyscloud/task_management_worktype/resource_genesyscloud_task_management_worktype_unit_test.go +++ b/genesyscloud/task_management_worktype/resource_genesyscloud_task_management_worktype_unit_test.go @@ -11,7 +11,7 @@ import ( "github.com/google/uuid" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" "github.com/stretchr/testify/assert" ) diff --git a/genesyscloud/task_management_worktype/resource_genesyscloud_task_management_worktype_utils.go b/genesyscloud/task_management_worktype/resource_genesyscloud_task_management_worktype_utils.go index b69ef657e..d0f6d4782 100644 --- a/genesyscloud/task_management_worktype/resource_genesyscloud_task_management_worktype_utils.go +++ b/genesyscloud/task_management_worktype/resource_genesyscloud_task_management_worktype_utils.go @@ -6,7 +6,7 @@ import ( "terraform-provider-genesyscloud/genesyscloud/util/resourcedata" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" ) /* diff --git a/genesyscloud/task_management_worktype_status/genesyscloud_task_management_worktype_status_proxy.go b/genesyscloud/task_management_worktype_status/genesyscloud_task_management_worktype_status_proxy.go index 7692f2fb7..2465fbfc3 100644 --- a/genesyscloud/task_management_worktype_status/genesyscloud_task_management_worktype_status_proxy.go +++ b/genesyscloud/task_management_worktype_status/genesyscloud_task_management_worktype_status_proxy.go @@ -5,7 +5,7 @@ import ( "fmt" taskManagementWorktype "terraform-provider-genesyscloud/genesyscloud/task_management_worktype" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" ) /* diff --git a/genesyscloud/task_management_worktype_status/resource_genesyscloud_task_management_worktype_status.go b/genesyscloud/task_management_worktype_status/resource_genesyscloud_task_management_worktype_status.go index 71483b503..605d2e796 100644 --- a/genesyscloud/task_management_worktype_status/resource_genesyscloud_task_management_worktype_status.go +++ b/genesyscloud/task_management_worktype_status/resource_genesyscloud_task_management_worktype_status.go @@ -13,7 +13,7 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" "terraform-provider-genesyscloud/genesyscloud/provider" "terraform-provider-genesyscloud/genesyscloud/util" @@ -49,7 +49,7 @@ func getAllAuthTaskManagementWorktypeStatuss(ctx context.Context, clientConfig * } for _, status := range *worktypeStatuses { - resources[*worktype.Id+"/"+*status.Id] = &resourceExporter.ResourceMeta{BlockLabel: *status.Name} + resources[*worktype.Id+"/"+*status.Id] = &resourceExporter.ResourceMeta{BlockLabel: *worktype.Name + "_" + *status.Name} } } diff --git a/genesyscloud/task_management_worktype_status/resource_genesyscloud_task_management_worktype_status_test.go b/genesyscloud/task_management_worktype_status/resource_genesyscloud_task_management_worktype_status_test.go index e103a1b75..44c31725c 100644 --- a/genesyscloud/task_management_worktype_status/resource_genesyscloud_task_management_worktype_status_test.go +++ b/genesyscloud/task_management_worktype_status/resource_genesyscloud_task_management_worktype_status_test.go @@ -11,7 +11,7 @@ import ( "testing" "github.com/google/uuid" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" diff --git a/genesyscloud/task_management_worktype_status/resource_genesyscloud_task_management_worktype_status_util.go b/genesyscloud/task_management_worktype_status/resource_genesyscloud_task_management_worktype_status_util.go index e7b9d364d..5638c4dc0 100644 --- a/genesyscloud/task_management_worktype_status/resource_genesyscloud_task_management_worktype_status_util.go +++ b/genesyscloud/task_management_worktype_status/resource_genesyscloud_task_management_worktype_status_util.go @@ -10,7 +10,7 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" ) // ModifyStatusIdStateValue will change the statusId before it is saved in the state file. diff --git a/genesyscloud/team/genesyscloud_team_proxy.go b/genesyscloud/team/genesyscloud_team_proxy.go index b1b5c5133..5ef8652e5 100644 --- a/genesyscloud/team/genesyscloud_team_proxy.go +++ b/genesyscloud/team/genesyscloud_team_proxy.go @@ -6,7 +6,7 @@ import ( "log" "terraform-provider-genesyscloud/genesyscloud/util" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" ) /* diff --git a/genesyscloud/team/resource_genesyscloud_team.go b/genesyscloud/team/resource_genesyscloud_team.go index 76c7318b3..27e9849d0 100644 --- a/genesyscloud/team/resource_genesyscloud_team.go +++ b/genesyscloud/team/resource_genesyscloud_team.go @@ -13,7 +13,7 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" "terraform-provider-genesyscloud/genesyscloud/util/resourcedata" diff --git a/genesyscloud/team/resource_genesyscloud_team_test.go b/genesyscloud/team/resource_genesyscloud_team_test.go index 363598aeb..79dafcc5b 100644 --- a/genesyscloud/team/resource_genesyscloud_team_test.go +++ b/genesyscloud/team/resource_genesyscloud_team_test.go @@ -10,7 +10,7 @@ import ( "github.com/google/uuid" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" authDivision "terraform-provider-genesyscloud/genesyscloud/auth_division" diff --git a/genesyscloud/team/resource_genesyscloud_team_unit_test.go b/genesyscloud/team/resource_genesyscloud_team_unit_test.go index 03ec437b3..856a4ae47 100644 --- a/genesyscloud/team/resource_genesyscloud_team_unit_test.go +++ b/genesyscloud/team/resource_genesyscloud_team_unit_test.go @@ -11,7 +11,7 @@ import ( "github.com/google/uuid" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" "github.com/stretchr/testify/assert" ) diff --git a/genesyscloud/team/resource_genesyscloud_team_utils.go b/genesyscloud/team/resource_genesyscloud_team_utils.go index 3091b6f34..cdfb4823a 100644 --- a/genesyscloud/team/resource_genesyscloud_team_utils.go +++ b/genesyscloud/team/resource_genesyscloud_team_utils.go @@ -12,7 +12,7 @@ import ( "terraform-provider-genesyscloud/genesyscloud/util/chunks" "terraform-provider-genesyscloud/genesyscloud/util/lists" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" ) // getTeamFromResourceData maps data from schema ResourceData object to a platformclientv2.Team diff --git a/genesyscloud/telephony_provider_edges_trunkbasesettings/genesyscloud_telephony_providers_trunkbasesettings_proxy.go b/genesyscloud/telephony_provider_edges_trunkbasesettings/genesyscloud_telephony_providers_trunkbasesettings_proxy.go index 90d042e9f..688aed1af 100644 --- a/genesyscloud/telephony_provider_edges_trunkbasesettings/genesyscloud_telephony_providers_trunkbasesettings_proxy.go +++ b/genesyscloud/telephony_provider_edges_trunkbasesettings/genesyscloud_telephony_providers_trunkbasesettings_proxy.go @@ -12,7 +12,7 @@ import ( rc "terraform-provider-genesyscloud/genesyscloud/resource_cache" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/retry" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" ) var internalProxy *trunkbaseSettingProxy diff --git a/genesyscloud/telephony_provider_edges_trunkbasesettings/genesyscloud_telephony_providers_trunkbasesettings_schema.go b/genesyscloud/telephony_provider_edges_trunkbasesettings/genesyscloud_telephony_providers_trunkbasesettings_schema.go index 7f88b9ae7..0fa3536fe 100644 --- a/genesyscloud/telephony_provider_edges_trunkbasesettings/genesyscloud_telephony_providers_trunkbasesettings_schema.go +++ b/genesyscloud/telephony_provider_edges_trunkbasesettings/genesyscloud_telephony_providers_trunkbasesettings_schema.go @@ -111,5 +111,6 @@ func TrunkBaseSettingsExporter() *resourceExporter.ResourceExporter { //"inbound_site_id": {RefType: "genesyscloud_telephony_providers_edges_site"}, TODO: decide how/if this will be included after DEVTOOLING-676 is resolved }, JsonEncodeAttributes: []string{"properties"}, + ExportAsDataFunc: shouldExportTrunkBaseSettingsAsDataSource, } } diff --git a/genesyscloud/telephony_provider_edges_trunkbasesettings/resource_genesyscloud_telephony_providers_edges_trunkbasesettings.go b/genesyscloud/telephony_provider_edges_trunkbasesettings/resource_genesyscloud_telephony_providers_edges_trunkbasesettings.go index c2a8d740b..8a09539db 100644 --- a/genesyscloud/telephony_provider_edges_trunkbasesettings/resource_genesyscloud_telephony_providers_edges_trunkbasesettings.go +++ b/genesyscloud/telephony_provider_edges_trunkbasesettings/resource_genesyscloud_telephony_providers_edges_trunkbasesettings.go @@ -9,6 +9,7 @@ import ( "terraform-provider-genesyscloud/genesyscloud/provider" "terraform-provider-genesyscloud/genesyscloud/util" "terraform-provider-genesyscloud/genesyscloud/util/constants" + "terraform-provider-genesyscloud/genesyscloud/util/lists" "time" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/retry" @@ -19,7 +20,7 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" ) func createTrunkBaseSettings(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { @@ -321,3 +322,22 @@ func GenerateTrunkBaseSettingsResourceWithCustomAttrs( `, trunkBaseSettingsResourceLabel, name, description, trunkMetaBaseId, trunkType, managed, strings.Join(otherAttrs, "\n")) return resource } + +func shouldExportTrunkBaseSettingsAsDataSource(ctx context.Context, sdkConfig *platformclientv2.Configuration, configMap map[string]string) (exportAsData bool, err error) { + defaultTbsNames := []string{ + "Cloud Proxy Tie TrunkBase for EdgeGroup", + "Direct Tie TrunkBase for EdgeGroup", + "Genesys Cloud - CDM SIP Phone Trunk", + "Genesys Cloud - CDM WebRTC Phone Trunk", + "Indirect Tie TrunkBase for EdgeGroup", + "PureCloud Voice - AWS", + "Tie TrunkBase for EdgeGroup", + } + tbsName, ok := configMap["name"] + if ok { + if lists.ContainsAnySubStringSlice(tbsName, defaultTbsNames) { + return true, nil + } + } + return false, nil +} diff --git a/genesyscloud/telephony_provider_edges_trunkbasesettings/resource_genesyscloud_telephony_providers_edges_trunkbasesettings_test.go b/genesyscloud/telephony_provider_edges_trunkbasesettings/resource_genesyscloud_telephony_providers_edges_trunkbasesettings_test.go index e8543a942..792b51ce5 100644 --- a/genesyscloud/telephony_provider_edges_trunkbasesettings/resource_genesyscloud_telephony_providers_edges_trunkbasesettings_test.go +++ b/genesyscloud/telephony_provider_edges_trunkbasesettings/resource_genesyscloud_telephony_providers_edges_trunkbasesettings_test.go @@ -13,7 +13,7 @@ import ( "github.com/google/uuid" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" ) func TestAccResourceTrunkBaseSettings(t *testing.T) { diff --git a/genesyscloud/telephony_providers_edges_did/genesyscloud_telephony_providers_edges_did_proxy.go b/genesyscloud/telephony_providers_edges_did/genesyscloud_telephony_providers_edges_did_proxy.go index fd3a67565..f58d1734a 100644 --- a/genesyscloud/telephony_providers_edges_did/genesyscloud_telephony_providers_edges_did_proxy.go +++ b/genesyscloud/telephony_providers_edges_did/genesyscloud_telephony_providers_edges_did_proxy.go @@ -5,7 +5,7 @@ import ( "fmt" "terraform-provider-genesyscloud/genesyscloud/util" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" ) /* diff --git a/genesyscloud/telephony_providers_edges_did_pool/genesyscloud_telephony_providers_edges_did_pool_proxy.go b/genesyscloud/telephony_providers_edges_did_pool/genesyscloud_telephony_providers_edges_did_pool_proxy.go index cfa6d03c5..e85ee6e1f 100644 --- a/genesyscloud/telephony_providers_edges_did_pool/genesyscloud_telephony_providers_edges_did_pool_proxy.go +++ b/genesyscloud/telephony_providers_edges_did_pool/genesyscloud_telephony_providers_edges_did_pool_proxy.go @@ -5,7 +5,7 @@ import ( "fmt" "terraform-provider-genesyscloud/genesyscloud/util" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" ) /* diff --git a/genesyscloud/telephony_providers_edges_did_pool/resource_genesyscloud_telephony_providers_edges_did_pool.go b/genesyscloud/telephony_providers_edges_did_pool/resource_genesyscloud_telephony_providers_edges_did_pool.go index a6606ff9d..82c90af8f 100644 --- a/genesyscloud/telephony_providers_edges_did_pool/resource_genesyscloud_telephony_providers_edges_did_pool.go +++ b/genesyscloud/telephony_providers_edges_did_pool/resource_genesyscloud_telephony_providers_edges_did_pool.go @@ -18,7 +18,7 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" ) // getAllDidPools retrieves all DID pools and is used for the exporter diff --git a/genesyscloud/telephony_providers_edges_did_pool/resource_genesyscloud_telephony_providers_edges_did_pool_test.go b/genesyscloud/telephony_providers_edges_did_pool/resource_genesyscloud_telephony_providers_edges_did_pool_test.go index c76354fe0..ae7e6d60e 100644 --- a/genesyscloud/telephony_providers_edges_did_pool/resource_genesyscloud_telephony_providers_edges_did_pool_test.go +++ b/genesyscloud/telephony_providers_edges_did_pool/resource_genesyscloud_telephony_providers_edges_did_pool_test.go @@ -10,7 +10,7 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" ) func TestAccResourceDidPoolBasic(t *testing.T) { diff --git a/genesyscloud/telephony_providers_edges_did_pool/resource_genesyscloud_telephony_providers_edges_did_pool_utils.go b/genesyscloud/telephony_providers_edges_did_pool/resource_genesyscloud_telephony_providers_edges_did_pool_utils.go index fed47cd21..7dd50ddd4 100644 --- a/genesyscloud/telephony_providers_edges_did_pool/resource_genesyscloud_telephony_providers_edges_did_pool_utils.go +++ b/genesyscloud/telephony_providers_edges_did_pool/resource_genesyscloud_telephony_providers_edges_did_pool_utils.go @@ -4,7 +4,7 @@ import ( "context" "fmt" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" ) type DidPoolStruct struct { diff --git a/genesyscloud/telephony_providers_edges_edge_group/genesyscloud_telephony_providers_edges_edge_group_proxy.go b/genesyscloud/telephony_providers_edges_edge_group/genesyscloud_telephony_providers_edges_edge_group_proxy.go index 7e3812f83..643923441 100644 --- a/genesyscloud/telephony_providers_edges_edge_group/genesyscloud_telephony_providers_edges_edge_group_proxy.go +++ b/genesyscloud/telephony_providers_edges_edge_group/genesyscloud_telephony_providers_edges_edge_group_proxy.go @@ -5,7 +5,7 @@ import ( "fmt" "log" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" ) var internalProxy *edgeGroupProxy diff --git a/genesyscloud/telephony_providers_edges_edge_group/resource_genesyscloud_telephony_providers_edges_edge_group.go b/genesyscloud/telephony_providers_edges_edge_group/resource_genesyscloud_telephony_providers_edges_edge_group.go index b1bd1e067..8e1557862 100644 --- a/genesyscloud/telephony_providers_edges_edge_group/resource_genesyscloud_telephony_providers_edges_edge_group.go +++ b/genesyscloud/telephony_providers_edges_edge_group/resource_genesyscloud_telephony_providers_edges_edge_group.go @@ -17,7 +17,7 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" ) func createEdgeGroup(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { diff --git a/genesyscloud/telephony_providers_edges_edge_group/resource_genesyscloud_telephony_providers_edges_edge_group_test.go b/genesyscloud/telephony_providers_edges_edge_group/resource_genesyscloud_telephony_providers_edges_edge_group_test.go index 13bfe1d2f..1173d1e15 100644 --- a/genesyscloud/telephony_providers_edges_edge_group/resource_genesyscloud_telephony_providers_edges_edge_group_test.go +++ b/genesyscloud/telephony_providers_edges_edge_group/resource_genesyscloud_telephony_providers_edges_edge_group_test.go @@ -10,7 +10,7 @@ import ( "github.com/google/uuid" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" ) func TestAccResourceEdgeGroup(t *testing.T) { diff --git a/genesyscloud/telephony_providers_edges_edge_group/resource_genesyscloud_telephony_providers_edges_edge_group_utils.go b/genesyscloud/telephony_providers_edges_edge_group/resource_genesyscloud_telephony_providers_edges_edge_group_utils.go index 0bd8403fd..3d4a786b0 100644 --- a/genesyscloud/telephony_providers_edges_edge_group/resource_genesyscloud_telephony_providers_edges_edge_group_utils.go +++ b/genesyscloud/telephony_providers_edges_edge_group/resource_genesyscloud_telephony_providers_edges_edge_group_utils.go @@ -6,7 +6,7 @@ import ( lists "terraform-provider-genesyscloud/genesyscloud/util/lists" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" ) func buildSdkTrunkBases(d *schema.ResourceData) *[]platformclientv2.Trunkbase { diff --git a/genesyscloud/telephony_providers_edges_extension_pool/genesyscloud_telephony_providers_edges_extension_pool_proxy.go b/genesyscloud/telephony_providers_edges_extension_pool/genesyscloud_telephony_providers_edges_extension_pool_proxy.go index 1b4cb213b..53e1d5892 100644 --- a/genesyscloud/telephony_providers_edges_extension_pool/genesyscloud_telephony_providers_edges_extension_pool_proxy.go +++ b/genesyscloud/telephony_providers_edges_extension_pool/genesyscloud_telephony_providers_edges_extension_pool_proxy.go @@ -3,7 +3,7 @@ package telephony_providers_edges_extension_pool import ( "context" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" ) var internalProxy *extensionPoolProxy diff --git a/genesyscloud/telephony_providers_edges_extension_pool/resource_genesyscloud_telephony_providers_edges_extension_pool.go b/genesyscloud/telephony_providers_edges_extension_pool/resource_genesyscloud_telephony_providers_edges_extension_pool.go index 9d295383b..87c83b14c 100644 --- a/genesyscloud/telephony_providers_edges_extension_pool/resource_genesyscloud_telephony_providers_edges_extension_pool.go +++ b/genesyscloud/telephony_providers_edges_extension_pool/resource_genesyscloud_telephony_providers_edges_extension_pool.go @@ -17,7 +17,7 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" ) func getAllExtensionPools(ctx context.Context, clientConfig *platformclientv2.Configuration) (resourceExporter.ResourceIDMetaMap, diag.Diagnostics) { diff --git a/genesyscloud/telephony_providers_edges_extension_pool/resource_genesyscloud_telephony_providers_edges_extension_pool_test.go b/genesyscloud/telephony_providers_edges_extension_pool/resource_genesyscloud_telephony_providers_edges_extension_pool_test.go index 0bd3abbda..3b7ce6b53 100644 --- a/genesyscloud/telephony_providers_edges_extension_pool/resource_genesyscloud_telephony_providers_edges_extension_pool_test.go +++ b/genesyscloud/telephony_providers_edges_extension_pool/resource_genesyscloud_telephony_providers_edges_extension_pool_test.go @@ -9,7 +9,7 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" ) func TestAccResourceExtensionPoolBasic(t *testing.T) { diff --git a/genesyscloud/telephony_providers_edges_extension_pool/resource_genesyscloud_telephony_providers_edges_extension_pool_utils.go b/genesyscloud/telephony_providers_edges_extension_pool/resource_genesyscloud_telephony_providers_edges_extension_pool_utils.go index cbcdebdc3..d565bddc1 100644 --- a/genesyscloud/telephony_providers_edges_extension_pool/resource_genesyscloud_telephony_providers_edges_extension_pool_utils.go +++ b/genesyscloud/telephony_providers_edges_extension_pool/resource_genesyscloud_telephony_providers_edges_extension_pool_utils.go @@ -5,7 +5,7 @@ import ( "terraform-provider-genesyscloud/genesyscloud/provider" "time" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" ) type ExtensionPoolStruct struct { diff --git a/genesyscloud/telephony_providers_edges_linebasesettings/data_source_genesyscloud_telephony_providers_edges_linebasesettings.go b/genesyscloud/telephony_providers_edges_linebasesettings/data_source_genesyscloud_telephony_providers_edges_linebasesettings.go index 9fe720543..93b4862e8 100644 --- a/genesyscloud/telephony_providers_edges_linebasesettings/data_source_genesyscloud_telephony_providers_edges_linebasesettings.go +++ b/genesyscloud/telephony_providers_edges_linebasesettings/data_source_genesyscloud_telephony_providers_edges_linebasesettings.go @@ -11,7 +11,7 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" ) func dataSourceLineBaseSettingsRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { diff --git a/genesyscloud/telephony_providers_edges_phone/genesyscloud_telephony_providers_edges_phone_init_test.go b/genesyscloud/telephony_providers_edges_phone/genesyscloud_telephony_providers_edges_phone_init_test.go index b65df5960..4bc643895 100644 --- a/genesyscloud/telephony_providers_edges_phone/genesyscloud_telephony_providers_edges_phone_init_test.go +++ b/genesyscloud/telephony_providers_edges_phone/genesyscloud_telephony_providers_edges_phone_init_test.go @@ -12,7 +12,7 @@ import ( "terraform-provider-genesyscloud/genesyscloud/user" "testing" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" ) diff --git a/genesyscloud/telephony_providers_edges_phone/genesyscloud_telephony_providers_edges_phone_proxy.go b/genesyscloud/telephony_providers_edges_phone/genesyscloud_telephony_providers_edges_phone_proxy.go index 2005c8488..594ee8839 100644 --- a/genesyscloud/telephony_providers_edges_phone/genesyscloud_telephony_providers_edges_phone_proxy.go +++ b/genesyscloud/telephony_providers_edges_phone/genesyscloud_telephony_providers_edges_phone_proxy.go @@ -8,7 +8,7 @@ import ( rc "terraform-provider-genesyscloud/genesyscloud/resource_cache" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" ) /* diff --git a/genesyscloud/telephony_providers_edges_phone/resource_genesyscloud_telephony_providers_edges_phone.go b/genesyscloud/telephony_providers_edges_phone/resource_genesyscloud_telephony_providers_edges_phone.go index 0c0a10d65..1e1f09bb4 100644 --- a/genesyscloud/telephony_providers_edges_phone/resource_genesyscloud_telephony_providers_edges_phone.go +++ b/genesyscloud/telephony_providers_edges_phone/resource_genesyscloud_telephony_providers_edges_phone.go @@ -17,7 +17,7 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" ) func getAllPhones(ctx context.Context, sdkConfig *platformclientv2.Configuration) (resourceExporter.ResourceIDMetaMap, diag.Diagnostics) { diff --git a/genesyscloud/telephony_providers_edges_phone/resource_genesyscloud_telephony_providers_edges_phone_test.go b/genesyscloud/telephony_providers_edges_phone/resource_genesyscloud_telephony_providers_edges_phone_test.go index 625437604..36ae8daae 100644 --- a/genesyscloud/telephony_providers_edges_phone/resource_genesyscloud_telephony_providers_edges_phone_test.go +++ b/genesyscloud/telephony_providers_edges_phone/resource_genesyscloud_telephony_providers_edges_phone_test.go @@ -19,7 +19,7 @@ import ( "github.com/google/uuid" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" ) func TestAccResourcePhoneBasic(t *testing.T) { diff --git a/genesyscloud/telephony_providers_edges_phone/resource_genesyscloud_telephony_providers_edges_phone_utils.go b/genesyscloud/telephony_providers_edges_phone/resource_genesyscloud_telephony_providers_edges_phone_utils.go index ff1ac192f..1d3d621be 100644 --- a/genesyscloud/telephony_providers_edges_phone/resource_genesyscloud_telephony_providers_edges_phone_utils.go +++ b/genesyscloud/telephony_providers_edges_phone/resource_genesyscloud_telephony_providers_edges_phone_utils.go @@ -18,7 +18,7 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" ) type PhoneConfig struct { @@ -115,6 +115,7 @@ func assignUserToWebRtcPhone(ctx context.Context, pp *phoneProxy, userId string, } return nil }) + if retryErr != nil { return retryErr } diff --git a/genesyscloud/telephony_providers_edges_phonebasesettings/data_source_genesyscloud_telephony_providers_edges_phonebasesettings.go b/genesyscloud/telephony_providers_edges_phonebasesettings/data_source_genesyscloud_telephony_providers_edges_phonebasesettings.go index dbb947eea..8e30b67ba 100644 --- a/genesyscloud/telephony_providers_edges_phonebasesettings/data_source_genesyscloud_telephony_providers_edges_phonebasesettings.go +++ b/genesyscloud/telephony_providers_edges_phonebasesettings/data_source_genesyscloud_telephony_providers_edges_phonebasesettings.go @@ -11,7 +11,7 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" ) func dataSourcePhoneBaseSettingsRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { diff --git a/genesyscloud/telephony_providers_edges_phonebasesettings/genesyscloud_telephony_providers_edges_phonebasesettings_proxy.go b/genesyscloud/telephony_providers_edges_phonebasesettings/genesyscloud_telephony_providers_edges_phonebasesettings_proxy.go index 3ba8bf7c5..e531d6b7f 100644 --- a/genesyscloud/telephony_providers_edges_phonebasesettings/genesyscloud_telephony_providers_edges_phonebasesettings_proxy.go +++ b/genesyscloud/telephony_providers_edges_phonebasesettings/genesyscloud_telephony_providers_edges_phonebasesettings_proxy.go @@ -3,7 +3,7 @@ package telephony_providers_edges_phonebasesettings import ( "context" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" ) var internalProxy *phoneBaseProxy diff --git a/genesyscloud/telephony_providers_edges_phonebasesettings/resource_genesyscloud_telephony_providers_edges_phonebasesettings.go b/genesyscloud/telephony_providers_edges_phonebasesettings/resource_genesyscloud_telephony_providers_edges_phonebasesettings.go index 62c7e8e54..a7a62a605 100644 --- a/genesyscloud/telephony_providers_edges_phonebasesettings/resource_genesyscloud_telephony_providers_edges_phonebasesettings.go +++ b/genesyscloud/telephony_providers_edges_phonebasesettings/resource_genesyscloud_telephony_providers_edges_phonebasesettings.go @@ -18,7 +18,7 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" ) func createPhoneBaseSettings(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { diff --git a/genesyscloud/telephony_providers_edges_phonebasesettings/resource_genesyscloud_telephony_providers_edges_phonebasesettings_test.go b/genesyscloud/telephony_providers_edges_phonebasesettings/resource_genesyscloud_telephony_providers_edges_phonebasesettings_test.go index d36b47df1..209e9f931 100644 --- a/genesyscloud/telephony_providers_edges_phonebasesettings/resource_genesyscloud_telephony_providers_edges_phonebasesettings_test.go +++ b/genesyscloud/telephony_providers_edges_phonebasesettings/resource_genesyscloud_telephony_providers_edges_phonebasesettings_test.go @@ -11,7 +11,7 @@ import ( "github.com/google/uuid" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" ) func TestAccResourcePhoneBaseSettings(t *testing.T) { diff --git a/genesyscloud/telephony_providers_edges_phonebasesettings/resource_genesyscloud_telephony_providers_edges_phonebasesettings_unit_test.go b/genesyscloud/telephony_providers_edges_phonebasesettings/resource_genesyscloud_telephony_providers_edges_phonebasesettings_unit_test.go index 0ec97c0d6..a142eea74 100644 --- a/genesyscloud/telephony_providers_edges_phonebasesettings/resource_genesyscloud_telephony_providers_edges_phonebasesettings_unit_test.go +++ b/genesyscloud/telephony_providers_edges_phonebasesettings/resource_genesyscloud_telephony_providers_edges_phonebasesettings_unit_test.go @@ -8,7 +8,7 @@ import ( "github.com/google/uuid" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" "github.com/stretchr/testify/assert" ) diff --git a/genesyscloud/telephony_providers_edges_phonebasesettings/resource_genesyscloud_telephony_providers_edges_phonebasesettings_utils.go b/genesyscloud/telephony_providers_edges_phonebasesettings/resource_genesyscloud_telephony_providers_edges_phonebasesettings_utils.go index 8a6d44c17..a90888192 100644 --- a/genesyscloud/telephony_providers_edges_phonebasesettings/resource_genesyscloud_telephony_providers_edges_phonebasesettings_utils.go +++ b/genesyscloud/telephony_providers_edges_phonebasesettings/resource_genesyscloud_telephony_providers_edges_phonebasesettings_utils.go @@ -9,7 +9,7 @@ import ( "terraform-provider-genesyscloud/genesyscloud/util/resourcedata" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" ) func generatePhoneBaseSettingsDataSource( diff --git a/genesyscloud/telephony_providers_edges_site/data_source_genesyscloud_telephony_providers_edges_site_test.go b/genesyscloud/telephony_providers_edges_site/data_source_genesyscloud_telephony_providers_edges_site_test.go index 4f3706231..a79c946c2 100644 --- a/genesyscloud/telephony_providers_edges_site/data_source_genesyscloud_telephony_providers_edges_site_test.go +++ b/genesyscloud/telephony_providers_edges_site/data_source_genesyscloud_telephony_providers_edges_site_test.go @@ -8,7 +8,7 @@ import ( "terraform-provider-genesyscloud/genesyscloud/util" "testing" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" "github.com/google/uuid" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" diff --git a/genesyscloud/telephony_providers_edges_site/genesyscloud_telephony_providers_edges_site_proxy.go b/genesyscloud/telephony_providers_edges_site/genesyscloud_telephony_providers_edges_site_proxy.go index b09bb7cea..c3301c9e0 100644 --- a/genesyscloud/telephony_providers_edges_site/genesyscloud_telephony_providers_edges_site_proxy.go +++ b/genesyscloud/telephony_providers_edges_site/genesyscloud_telephony_providers_edges_site_proxy.go @@ -5,7 +5,7 @@ import ( "fmt" rc "terraform-provider-genesyscloud/genesyscloud/resource_cache" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" ) /* @@ -152,7 +152,7 @@ func (p *SiteProxy) deleteSite(ctx context.Context, siteId string) (*platformcli } // getSiteByIdFunc returns a single Genesys Cloud Site by Id -func (p *SiteProxy) getSiteById(ctx context.Context, siteId string) (site *platformclientv2.Site, resp *platformclientv2.APIResponse, err error) { +func (p *SiteProxy) GetSiteById(ctx context.Context, siteId string) (site *platformclientv2.Site, resp *platformclientv2.APIResponse, err error) { return p.getSiteByIdAttr(ctx, p, siteId) } diff --git a/genesyscloud/telephony_providers_edges_site/resource_genesyscloud_telephony_providers_edges_site.go b/genesyscloud/telephony_providers_edges_site/resource_genesyscloud_telephony_providers_edges_site.go index 96252701a..d5fdf8852 100644 --- a/genesyscloud/telephony_providers_edges_site/resource_genesyscloud_telephony_providers_edges_site.go +++ b/genesyscloud/telephony_providers_edges_site/resource_genesyscloud_telephony_providers_edges_site.go @@ -5,7 +5,6 @@ import ( "fmt" "log" "terraform-provider-genesyscloud/genesyscloud/provider" - "terraform-provider-genesyscloud/genesyscloud/tfexporter_state" "terraform-provider-genesyscloud/genesyscloud/util" "terraform-provider-genesyscloud/genesyscloud/util/constants" featureToggles "terraform-provider-genesyscloud/genesyscloud/util/feature_toggles" @@ -21,7 +20,7 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" ) func getAllSites(ctx context.Context, sdkConfig *platformclientv2.Configuration) (resourceExporter.ResourceIDMetaMap, diag.Diagnostics) { @@ -44,11 +43,6 @@ func getAllSites(ctx context.Context, sdkConfig *platformclientv2.Configuration) } for _, managedSite := range *managedSites { resources[*managedSite.Id] = &resourceExporter.ResourceMeta{BlockLabel: *managedSite.Name} - // When exporting managed sites, they must automatically be exported as data source - // Managed sites are added to the ExportAsData []string in resource_exporter - if tfexporter_state.IsExporterActive() { - resourceExporter.AddDataSourceItems(ResourceType, *managedSite.Name) - } } return resources, nil } @@ -153,7 +147,7 @@ func readSite(ctx context.Context, d *schema.ResourceData, meta interface{}) dia log.Printf("Reading site %s", d.Id()) return util.WithRetriesForRead(ctx, d, func() *retry.RetryError { - currentSite, resp, err := sp.getSiteById(ctx, d.Id()) + currentSite, resp, err := sp.GetSiteById(ctx, d.Id()) if err != nil { if util.IsStatus404(resp) { return retry.RetryableError(util.BuildWithRetriesApiDiagnosticError(ResourceType, fmt.Sprintf("failed to read site %s | error: %s", d.Id(), err), resp)) @@ -187,6 +181,8 @@ func readSite(ctx context.Context, d *schema.ResourceData, meta interface{}) dia _ = d.Set("secondary_sites", util.SdkDomainEntityRefArrToList(*currentSite.SecondarySites)) } + resourcedata.SetNillableValue(d, "managed", currentSite.Managed) + if retryErr := readSiteNumberPlans(ctx, sp, d); retryErr != nil { return retryErr } @@ -266,7 +262,7 @@ func updateSite(ctx context.Context, d *schema.ResourceData, meta interface{}) d diagErr := util.RetryWhen(util.IsVersionMismatch, func() (*platformclientv2.APIResponse, diag.Diagnostics) { // Get current site version - currentSite, resp, err := sp.getSiteById(ctx, d.Id()) + currentSite, resp, err := sp.GetSiteById(ctx, d.Id()) if err != nil { return resp, util.BuildAPIDiagnosticError(ResourceType, fmt.Sprintf("Failed to read site %s error: %s", d.Id(), err), resp) } @@ -335,7 +331,7 @@ func deleteSite(ctx context.Context, d *schema.ResourceData, meta interface{}) d } return util.WithRetries(ctx, 30*time.Second, func() *retry.RetryError { - site, resp, err := sp.getSiteById(ctx, d.Id()) + site, resp, err := sp.GetSiteById(ctx, d.Id()) if err != nil { if util.IsStatus404(resp) { // Site deleted diff --git a/genesyscloud/telephony_providers_edges_site/resource_genesyscloud_telephony_providers_edges_site_schema.go b/genesyscloud/telephony_providers_edges_site/resource_genesyscloud_telephony_providers_edges_site_schema.go index 32a18c226..aeced84d5 100644 --- a/genesyscloud/telephony_providers_edges_site/resource_genesyscloud_telephony_providers_edges_site_schema.go +++ b/genesyscloud/telephony_providers_edges_site/resource_genesyscloud_telephony_providers_edges_site_schema.go @@ -9,7 +9,7 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/validation" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" ) /* @@ -272,6 +272,13 @@ func ResourceSite() *schema.Resource { Default: false, Type: schema.TypeBool, }, + "managed": { + Description: "Is this site managed by Genesys Cloud", + Type: schema.TypeBool, + Optional: false, + Required: false, + Computed: true, + }, }, CustomizeDiff: customizeSiteDiff, } @@ -290,6 +297,10 @@ func SiteExporter() *resourceExporter.ResourceExporter { CustomValidateExports: map[string][]string{ "rrule": {"edge_auto_update_config.rrule"}, }, + ExportAsDataFunc: shouldExportManagedSitesAsData, + CustomAttributeResolver: map[string]*resourceExporter.RefAttrCustomResolver{ + "number_plans": {ResolverFunc: siteNumberPlansExporterResolver}, + }, } } diff --git a/genesyscloud/telephony_providers_edges_site/resource_genesyscloud_telephony_providers_edges_site_test.go b/genesyscloud/telephony_providers_edges_site/resource_genesyscloud_telephony_providers_edges_site_test.go index 95b30e4cb..5776b6476 100644 --- a/genesyscloud/telephony_providers_edges_site/resource_genesyscloud_telephony_providers_edges_site_test.go +++ b/genesyscloud/telephony_providers_edges_site/resource_genesyscloud_telephony_providers_edges_site_test.go @@ -19,7 +19,7 @@ import ( "github.com/google/uuid" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" ) func TestAccResourceSite(t *testing.T) { diff --git a/genesyscloud/telephony_providers_edges_site/resource_genesyscloud_telephony_providers_edges_site_utils.go b/genesyscloud/telephony_providers_edges_site/resource_genesyscloud_telephony_providers_edges_site_utils.go index ee953a9b9..524b2a78e 100644 --- a/genesyscloud/telephony_providers_edges_site/resource_genesyscloud_telephony_providers_edges_site_utils.go +++ b/genesyscloud/telephony_providers_edges_site/resource_genesyscloud_telephony_providers_edges_site_utils.go @@ -4,8 +4,10 @@ import ( "context" "fmt" "log" + "strconv" "strings" "terraform-provider-genesyscloud/genesyscloud/provider" + "terraform-provider-genesyscloud/genesyscloud/resource_exporter" "terraform-provider-genesyscloud/genesyscloud/util" "time" @@ -17,7 +19,7 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" "github.com/leekchan/timeutil" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" ) var ( @@ -108,7 +110,7 @@ func updatePrimarySecondarySites(ctx context.Context, sp *SiteProxy, d *schema.R primarySites := lists.InterfaceListToStrings(d.Get("primary_sites").([]interface{})) secondarySites := lists.InterfaceListToStrings(d.Get("secondary_sites").([]interface{})) - site, resp, err := sp.getSiteById(ctx, siteId) + site, resp, err := sp.GetSiteById(ctx, siteId) if resp.StatusCode != 200 { return util.BuildAPIDiagnosticError(ResourceType, fmt.Sprintf("Unable to retrieve site record after site %s was created, but unable to update the primary or secondary site error: %s", siteId, err), resp) } @@ -202,7 +204,7 @@ func updateSiteNumberPlans(ctx context.Context, sp *SiteProxy, d *schema.Resourc } updatedNumberPlans := make([]platformclientv2.Numberplan, 0) - namesOfOverridenDefaults := []string{} + namesOfOverriddenDefaults := []string{} for _, numberPlanFromTf := range numberPlansFromTf { if plan, ok := nameInPlans(*numberPlanFromTf.Name, *numberPlansFromAPI); ok { @@ -214,7 +216,7 @@ func updateSiteNumberPlans(ctx context.Context, sp *SiteProxy, d *schema.Resourc plan.MatchType = numberPlanFromTf.MatchType plan.NormalizedFormat = numberPlanFromTf.NormalizedFormat - namesOfOverridenDefaults = append(namesOfOverridenDefaults, *numberPlanFromTf.Name) + namesOfOverriddenDefaults = append(namesOfOverriddenDefaults, *numberPlanFromTf.Name) updatedNumberPlans = append(updatedNumberPlans, *plan) } else { // Add the plan @@ -224,7 +226,7 @@ func updateSiteNumberPlans(ctx context.Context, sp *SiteProxy, d *schema.Resourc for _, numberPlanFromAPI := range *numberPlansFromAPI { // Keep the default plans which are not overriden. - if isDefaultPlan(*numberPlanFromAPI.Name) && !lists.ItemInSlice(*numberPlanFromAPI.Name, namesOfOverridenDefaults) { + if isDefaultPlan(*numberPlanFromAPI.Name) && !lists.ItemInSlice(*numberPlanFromAPI.Name, namesOfOverriddenDefaults) { updatedNumberPlans = append(updatedNumberPlans, numberPlanFromAPI) } } @@ -510,6 +512,82 @@ func buildSdkEdgeAutoUpdateConfig(d *schema.ResourceData) (*platformclientv2.Edg return nil, nil } +func siteNumberPlansExporterResolver(configMap map[string]interface{}, exporter map[string]*resource_exporter.ResourceExporter, _ string) error { + + if numberPlans, ok := configMap["number_plans"].([]interface{}); ok { + + defaultNumberPlans := []*platformclientv2.Numberplan{ + { + Name: platformclientv2.String("Suicide Prevention"), + MatchType: platformclientv2.String("regex"), + Match: platformclientv2.String("^988$"), + NormalizedFormat: platformclientv2.String("+18002738255"), + Classification: platformclientv2.String("Suicide Prevention"), + }, + { + Name: platformclientv2.String("National"), + MatchType: platformclientv2.String("intraCountryCode"), + Classification: platformclientv2.String("National"), + }, + { + Name: platformclientv2.String("Emergency"), + MatchType: platformclientv2.String("numberList"), + Numbers: &[]platformclientv2.Number{ + { + Start: platformclientv2.String("112"), + }, + }, + Classification: platformclientv2.String("Emergency"), + }, + { + Name: platformclientv2.String("Network"), + MatchType: platformclientv2.String("regex"), + Match: platformclientv2.String("^([^@\\:]+@)([^@ ]+)?$"), + NormalizedFormat: platformclientv2.String("sip:$1$2"), + Classification: platformclientv2.String("Network"), + }, + } + + // Check to ensure all of the default classification types are exported + for _, numberPlan := range numberPlans { + numberPlanMap := numberPlan.(map[string]interface{}) + classificationType := numberPlanMap["classification"].(string) + for _, defaultNumberPlan := range defaultNumberPlans { + if *defaultNumberPlan.Classification == classificationType { + defaultNumberPlans = lists.Remove(defaultNumberPlans, defaultNumberPlan) + } + } + } + + // If not, we need to add them to the list of number plans, otherwise reapplying to a brand new org + // can cause issues due to the Default Outbound Route's ClassificationTypes config that is created + // with every new Site resource. + // This is a hacky way to do this, but it works for now. + if len(defaultNumberPlans) > 0 { + for _, defaultNumberPlan := range defaultNumberPlans { + for _, numberPlan := range numberPlans { + numberPlanMap := numberPlan.(map[string]interface{}) + if numberPlanMap["name"] == *defaultNumberPlan.Name { + // Account for an edge case where the number plan has the same name as the + // one of the default number plans, but the classification type is different. + // This is to ensure that the configured number plans are not overwritten, but + // the default number plans are always available, we will rename the default number plan + if numberPlanMap["classification"] != *defaultNumberPlan.Classification { + newDefaultName := fmt.Sprintf("%s (Default)", *defaultNumberPlan.Name) + log.Printf("Renaming default number plan %s to %s", *defaultNumberPlan.Name, newDefaultName) + *defaultNumberPlan.Name = newDefaultName + } + } + } + numberPlans = append(numberPlans, flattenNumberPlan(defaultNumberPlan)) + } + } + + configMap["number_plans"] = numberPlans + } + return nil +} + func GenerateSiteResourceWithCustomAttrs( siteResourceLabel, name, @@ -673,3 +751,16 @@ func GetOrganizationDefaultSiteId(config *platformclientv2.Configuration) (siteI return *org.DefaultSiteId, nil } + +func shouldExportManagedSitesAsData(ctx context.Context, sdkConfig *platformclientv2.Configuration, configMap map[string]string) (exportAsData bool, err error) { + managedValue, ok := configMap["managed"] + if !ok { + return false, fmt.Errorf("'managed' key not found in configMap") + } + managed, err := strconv.ParseBool(managedValue) + if err != nil { + return false, fmt.Errorf("failed to parse 'managed' value as boolean: %v", err) + } + + return managed, nil +} diff --git a/genesyscloud/telephony_providers_edges_site_outbound_route/data_source_genesyscloud_telephony_providers_edges_site_outbound_route_test.go b/genesyscloud/telephony_providers_edges_site_outbound_route/data_source_genesyscloud_telephony_providers_edges_site_outbound_route_test.go index 267f2a00e..cb4ad2d40 100644 --- a/genesyscloud/telephony_providers_edges_site_outbound_route/data_source_genesyscloud_telephony_providers_edges_site_outbound_route_test.go +++ b/genesyscloud/telephony_providers_edges_site_outbound_route/data_source_genesyscloud_telephony_providers_edges_site_outbound_route_test.go @@ -10,7 +10,7 @@ import ( "terraform-provider-genesyscloud/genesyscloud/util" "testing" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" "github.com/google/uuid" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" diff --git a/genesyscloud/telephony_providers_edges_site_outbound_route/genesyscloud_telephony_providers_edges_site_outbound_route_init_test.go b/genesyscloud/telephony_providers_edges_site_outbound_route/genesyscloud_telephony_providers_edges_site_outbound_route_init_test.go index 3249d5954..63b1d8479 100644 --- a/genesyscloud/telephony_providers_edges_site_outbound_route/genesyscloud_telephony_providers_edges_site_outbound_route_init_test.go +++ b/genesyscloud/telephony_providers_edges_site_outbound_route/genesyscloud_telephony_providers_edges_site_outbound_route_init_test.go @@ -12,7 +12,7 @@ import ( gcloud "terraform-provider-genesyscloud/genesyscloud" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" ) /* diff --git a/genesyscloud/telephony_providers_edges_site_outbound_route/genesyscloud_telephony_providers_edges_site_outbound_route_proxy.go b/genesyscloud/telephony_providers_edges_site_outbound_route/genesyscloud_telephony_providers_edges_site_outbound_route_proxy.go index e01c839be..a6900bc1d 100644 --- a/genesyscloud/telephony_providers_edges_site_outbound_route/genesyscloud_telephony_providers_edges_site_outbound_route_proxy.go +++ b/genesyscloud/telephony_providers_edges_site_outbound_route/genesyscloud_telephony_providers_edges_site_outbound_route_proxy.go @@ -6,7 +6,7 @@ import ( rc "terraform-provider-genesyscloud/genesyscloud/resource_cache" telephonyProvidersEdgesSite "terraform-provider-genesyscloud/genesyscloud/telephony_providers_edges_site" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" ) /* diff --git a/genesyscloud/telephony_providers_edges_site_outbound_route/resource_genesyscloud_telephony_providers_edges_site_outbound_route.go b/genesyscloud/telephony_providers_edges_site_outbound_route/resource_genesyscloud_telephony_providers_edges_site_outbound_route.go index 821cdd06e..231ac7f27 100644 --- a/genesyscloud/telephony_providers_edges_site_outbound_route/resource_genesyscloud_telephony_providers_edges_site_outbound_route.go +++ b/genesyscloud/telephony_providers_edges_site_outbound_route/resource_genesyscloud_telephony_providers_edges_site_outbound_route.go @@ -19,7 +19,7 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "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/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" ) func getAllSitesAndOutboundRoutes(ctx context.Context, sdkConfig *platformclientv2.Configuration) (resourceExporter.ResourceIDMetaMap, diag.Diagnostics) { @@ -53,7 +53,7 @@ func getAllSitesAndOutboundRoutes(ctx context.Context, sdkConfig *platformclient if routes != nil && len(*routes) > 0 { for _, route := range *routes { outboundRouteId := buildSiteAndOutboundRouteId(*site.Id, *route.Id) - resources[outboundRouteId] = &resourceExporter.ResourceMeta{BlockLabel: *route.Name} + resources[outboundRouteId] = &resourceExporter.ResourceMeta{BlockLabel: *site.Name + "_" + *route.Name} } } } @@ -70,16 +70,22 @@ func createSiteOutboundRoute(ctx context.Context, d *schema.ResourceData, meta i siteId := d.Get("site_id").(string) - // Default Outbound Routes are created automatically when a site resource is created, so instead of trying to create - // a new outbound route, we will just update the existing one if outboundRouteName, ok := d.GetOk("name"); ok { if outboundRouteName.(string) == "Default Outbound Route" { - siteId, outboundRouteId, _, _, err := proxy.getSiteOutboundRouteByName(ctx, siteId, "Default Outbound Route") + site, resp, err := proxy.siteProxy.GetSiteById(ctx, siteId) if err != nil { - return util.BuildAPIDiagnosticError(ResourceType, fmt.Sprintf("failed to get outbound route %s for site %s: %s", outboundRouteName, siteId, err), nil) + return util.BuildAPIDiagnosticError(ResourceType, fmt.Sprintf("failed to get site %s: %s", siteId, err), resp) + } + // Default Outbound Routes are created automatically when a Cloud based site resource is created, + // so instead of trying to create a new outbound route, we will just update the existing one + if *site.MediaModel == "Cloud" { + siteId, outboundRouteId, _, _, err := proxy.getSiteOutboundRouteByName(ctx, siteId, "Default Outbound Route") + if err != nil { + return util.BuildAPIDiagnosticError(ResourceType, fmt.Sprintf("failed to get outbound route %s for site %s: %s", outboundRouteName, siteId, err), nil) + } + d.SetId(buildSiteAndOutboundRouteId(siteId, outboundRouteId)) + return updateSiteOutboundRoute(ctx, d, meta) } - d.SetId(buildSiteAndOutboundRouteId(siteId, outboundRouteId)) - return updateSiteOutboundRoute(ctx, d, meta) } } diff --git a/genesyscloud/telephony_providers_edges_site_outbound_route/resource_genesyscloud_telephony_providers_edges_site_outbound_route_schema.go b/genesyscloud/telephony_providers_edges_site_outbound_route/resource_genesyscloud_telephony_providers_edges_site_outbound_route_schema.go index 6c6c976d8..ede7c1762 100644 --- a/genesyscloud/telephony_providers_edges_site_outbound_route/resource_genesyscloud_telephony_providers_edges_site_outbound_route_schema.go +++ b/genesyscloud/telephony_providers_edges_site_outbound_route/resource_genesyscloud_telephony_providers_edges_site_outbound_route_schema.go @@ -98,6 +98,7 @@ func SiteExporterOutboundRoute() *resourceExporter.ResourceExporter { "site_id": {RefType: "genesyscloud_telephony_providers_edges_site"}, "external_trunk_base_ids": {RefType: "genesyscloud_telephony_providers_edges_trunkbasesettings"}, }, + ExportAsDataFunc: shouldExportRoutesWithManagedSitesAsData, } } diff --git a/genesyscloud/telephony_providers_edges_site_outbound_route/resource_genesyscloud_telephony_providers_edges_site_outbound_route_utils.go b/genesyscloud/telephony_providers_edges_site_outbound_route/resource_genesyscloud_telephony_providers_edges_site_outbound_route_utils.go index 4a8471ee3..c89269fbb 100644 --- a/genesyscloud/telephony_providers_edges_site_outbound_route/resource_genesyscloud_telephony_providers_edges_site_outbound_route_utils.go +++ b/genesyscloud/telephony_providers_edges_site_outbound_route/resource_genesyscloud_telephony_providers_edges_site_outbound_route_utils.go @@ -1,11 +1,12 @@ package telephony_providers_edges_site_outbound_route import ( + "context" "fmt" "strings" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" ) func buildOutboundRoutes(d *schema.ResourceData) *platformclientv2.Outboundroutebase { @@ -55,3 +56,21 @@ func splitSiteAndOutboundRoute(dId string) (string, string) { } return "", "" } + +// Any routes that are associated with managed site resources should be exported as data +func shouldExportRoutesWithManagedSitesAsData(ctx context.Context, sdkConfig *platformclientv2.Configuration, configMap map[string]string) (exportAsData bool, err error) { + + // Check if the site exists + siteId := configMap["site_id"] + if siteId == "" { + return false, fmt.Errorf("site_id is not set") + } + + proxy := getSiteOutboundRouteProxy(sdkConfig) + site, _, err := proxy.siteProxy.GetSiteById(ctx, siteId) + if err != nil { + return false, err + } + + return *site.Managed, nil +} diff --git a/genesyscloud/telephony_providers_edges_trunk/data_source_genesyscloud_telephony_providers_edges_trunk.go b/genesyscloud/telephony_providers_edges_trunk/data_source_genesyscloud_telephony_providers_edges_trunk.go index 98ae248b2..e0c73b232 100644 --- a/genesyscloud/telephony_providers_edges_trunk/data_source_genesyscloud_telephony_providers_edges_trunk.go +++ b/genesyscloud/telephony_providers_edges_trunk/data_source_genesyscloud_telephony_providers_edges_trunk.go @@ -11,7 +11,7 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" ) func dataSourceTrunkRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics { diff --git a/genesyscloud/telephony_providers_edges_trunk/genesyscloud_telephony_providers_edges_trunk_proxy.go b/genesyscloud/telephony_providers_edges_trunk/genesyscloud_telephony_providers_edges_trunk_proxy.go index a0fdecdb6..541c9b78e 100644 --- a/genesyscloud/telephony_providers_edges_trunk/genesyscloud_telephony_providers_edges_trunk_proxy.go +++ b/genesyscloud/telephony_providers_edges_trunk/genesyscloud_telephony_providers_edges_trunk_proxy.go @@ -3,7 +3,7 @@ package telephony_providers_edges_trunk import ( "context" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" ) //generate a proxy for telephony_providers_edges_trunk diff --git a/genesyscloud/telephony_providers_edges_trunk/resource_genesyscloud_telephony_providers_edges_trunk.go b/genesyscloud/telephony_providers_edges_trunk/resource_genesyscloud_telephony_providers_edges_trunk.go index 3b60a6e8f..0e4bd5712 100644 --- a/genesyscloud/telephony_providers_edges_trunk/resource_genesyscloud_telephony_providers_edges_trunk.go +++ b/genesyscloud/telephony_providers_edges_trunk/resource_genesyscloud_telephony_providers_edges_trunk.go @@ -17,7 +17,7 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" ) func createTrunk(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { diff --git a/genesyscloud/tfexporter/export_common.go b/genesyscloud/tfexporter/export_common.go index 2ef6ac099..87bfd1156 100644 --- a/genesyscloud/tfexporter/export_common.go +++ b/genesyscloud/tfexporter/export_common.go @@ -6,6 +6,7 @@ import ( "os" "path/filepath" "regexp" + "sort" "strconv" "strings" @@ -323,3 +324,26 @@ func isDirEmpty(path string) (bool, diag.Diagnostics) { func createUnresolvedAttrKey(attr unresolvableAttributeInfo) string { return fmt.Sprintf("%s_%s_%s", attr.ResourceType, attr.ResourceLabel, attr.Name) } + +func sortJSONMap(m map[string]interface{}) map[string]interface{} { + // Create new map to store sorted data + orderedMap := make(map[string]interface{}) + + // Get and sort the keys + keys := make([]string, 0, len(m)) + for k := range m { + keys = append(keys, k) + } + sort.Strings(keys) + + // Add keys in sorted order and recursively sort nested maps + for _, k := range keys { + if nestedMap, isMap := m[k].(map[string]interface{}); isMap { + orderedMap[k] = sortJSONMap(nestedMap) + } else { + orderedMap[k] = m[k] + } + } + + return orderedMap +} diff --git a/genesyscloud/tfexporter/genesyscloud_resource_exporter.go b/genesyscloud/tfexporter/genesyscloud_resource_exporter.go index a97831e30..d6f9b9242 100644 --- a/genesyscloud/tfexporter/genesyscloud_resource_exporter.go +++ b/genesyscloud/tfexporter/genesyscloud_resource_exporter.go @@ -33,7 +33,7 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" "github.com/mohae/deepcopy" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" ) /* @@ -64,36 +64,35 @@ type unresolvableAttributeInfo struct { } type GenesysCloudResourceExporter struct { - configExporter Exporter - filterType ExporterFilterType - resourceTypeFilter ExporterResourceTypeFilter - resourceFilter ExporterResourceFilter - filterList *[]string - exportAsHCL bool - splitFilesByResource bool - logPermissionErrors bool - addDependsOn bool - replaceWithDatasource []string - includeStateFile bool - version string - provider *schema.Provider - exportDirPath string - exporters *map[string]*resourceExporter.ResourceExporter - resources []resourceExporter.ResourceInfo - resourceTypesHCLBlocks map[string]resourceHCLBlock - resourceTypesMaps map[string]resourceJSONMaps - dataSourceTypesMaps map[string]resourceJSONMaps - unresolvedAttrs []unresolvableAttributeInfo - d *schema.ResourceData - ctx context.Context - meta interface{} - dependsList map[string][]string - buildSecondDeps map[string][]string - exMutex sync.RWMutex - cyclicDependsList []string - ignoreCyclicDeps bool - flowResourcesList []string - exportComputed bool + configExporter Exporter + filterType ExporterFilterType + resourceTypeFilter ExporterResourceTypeFilter + resourceFilter ExporterResourceFilter + filterList *[]string + exportAsHCL bool + splitFilesByResource bool + logPermissionErrors bool + addDependsOn bool + replaceWithDatasource []string + includeStateFile bool + version string + provider *schema.Provider + exportDirPath string + exporters *map[string]*resourceExporter.ResourceExporter + resources []resourceExporter.ResourceInfo + resourceTypesMaps map[string]resourceJSONMaps + dataSourceTypesMaps map[string]resourceJSONMaps + unresolvedAttrs []unresolvableAttributeInfo + d *schema.ResourceData + ctx context.Context + meta interface{} + dependsList map[string][]string + buildSecondDeps map[string][]string + exMutex sync.RWMutex + cyclicDependsList []string + ignoreCyclicDeps bool + flowResourcesList []string + exportComputed bool } func configureExporterType(ctx context.Context, d *schema.ResourceData, gre *GenesysCloudResourceExporter, filterType ExporterFilterType) { @@ -368,7 +367,6 @@ func (g *GenesysCloudResourceExporter) buildResourceConfigMap() diag.Diagnostics log.Printf("Build Genesys Cloud Resources Map") g.resourceTypesMaps = make(map[string]resourceJSONMaps) g.dataSourceTypesMaps = make(map[string]resourceJSONMaps) - g.resourceTypesHCLBlocks = make(map[string]resourceHCLBlock, 0) g.unresolvedAttrs = make([]unresolvableAttributeInfo, 0) for _, resource := range g.resources { @@ -397,13 +395,6 @@ func (g *GenesysCloudResourceExporter) buildResourceConfigMap() diag.Diagnostics g.customWriteAttributes(jsonResult, resource) - if g.exportAsHCL { - if _, ok := g.resourceTypesHCLBlocks[resource.Type]; !ok { - g.resourceTypesHCLBlocks[resource.Type] = make(resourceHCLBlock, 0) - } - g.resourceTypesHCLBlocks[resource.Type] = append(g.resourceTypesHCLBlocks[resource.Type], instanceStateToHCLBlock(resource.Type, resource.BlockLabel, jsonResult, isDataSource)) - } - if isDataSource { if g.dataSourceTypesMaps[resource.Type] == nil { g.dataSourceTypesMaps[resource.Type] = make(resourceJSONMaps) @@ -481,7 +472,7 @@ func (g *GenesysCloudResourceExporter) generateOutputFiles() diag.Diagnostics { var err diag.Diagnostics if g.exportAsHCL { - hclExporter := NewHClExporter(g.resourceTypesHCLBlocks, g.unresolvedAttrs, providerSource, g.version, g.exportDirPath, g.splitFilesByResource) + hclExporter := NewHClExporter(g.resourceTypesMaps, g.dataSourceTypesMaps, g.unresolvedAttrs, providerSource, g.version, g.exportDirPath, g.splitFilesByResource) err = hclExporter.exportHCLConfig() } else { jsonExporter := NewJsonExporter(g.resourceTypesMaps, g.dataSourceTypesMaps, g.unresolvedAttrs, providerSource, g.version, g.exportDirPath, g.splitFilesByResource) @@ -1010,13 +1001,13 @@ func addLogAttrInfoToErrorSummary(err diag.Diagnostics) diag.Diagnostics { return err } -func (g *GenesysCloudResourceExporter) getResourcesForType(resType string, provider *schema.Provider, exporter *resourceExporter.ResourceExporter, meta interface{}) ([]resourceExporter.ResourceInfo, diag.Diagnostics) { +func (g *GenesysCloudResourceExporter) getResourcesForType(resType string, schemaProvider *schema.Provider, exporter *resourceExporter.ResourceExporter, meta interface{}) ([]resourceExporter.ResourceInfo, diag.Diagnostics) { lenResources := len(exporter.SanitizedResourceMap) errorChan := make(chan diag.Diagnostics, lenResources) resourceChan := make(chan resourceExporter.ResourceInfo, lenResources) removeChan := make(chan string, lenResources) - res := provider.ResourcesMap[resType] + res := schemaProvider.ResourcesMap[resType] if res == nil { return nil, diag.Errorf("Resource type %v not defined", resType) @@ -1049,12 +1040,25 @@ func (g *GenesysCloudResourceExporter) getResourcesForType(resType string, provi return nil } - resourceType := "" + // Export the resource as a data resource + if exporter.ExportAsDataFunc != nil { + sdkConfig := g.meta.(*provider.ProviderMeta).ClientConfig + exportAsData, err := exporter.ExportAsDataFunc(g.ctx, sdkConfig, instanceState.Attributes) + if err != nil { + return fmt.Errorf("An error has occurred while trying to export as a data resource block for %s::%s : %v", resType, resMeta.BlockLabel, err) + } else { + if exportAsData { + g.replaceWithDatasource = append(g.replaceWithDatasource, resType+"::"+resMeta.BlockLabel) + } + } + } + + blockType := "" if g.isDataSource(resType, resMeta.BlockLabel, resMeta.OriginalLabel) { attributes := make(map[string]string) g.exMutex.Lock() - resData := provider.DataSourcesMap[resType] + resData := schemaProvider.DataSourcesMap[resType] g.exMutex.Unlock() if resData == nil { @@ -1067,7 +1071,21 @@ func (g *GenesysCloudResourceExporter) getResourcesForType(resType string, provi attributes[key] = val } instanceState.Attributes = attributes - resourceType = "data." + blockType = "data." + } + + for resAttribute, resSchema := range res.Schema { + // Remove any computed attributes if export computed exporter config not set + if resSchema.Computed == true && !exportComputed { + delete(instanceState.Attributes, resAttribute) + continue + } + // Remove any computed read-only attributes from being exported regardless of exporter config + // because they cannot be set by a user when reapplying the configuration in a different org + if resSchema.Computed == true && resSchema.Optional == false { + delete(instanceState.Attributes, resAttribute) + continue + } } resourceChan <- resourceExporter.ResourceInfo{ @@ -1075,7 +1093,7 @@ func (g *GenesysCloudResourceExporter) getResourcesForType(resType string, provi BlockLabel: resMeta.BlockLabel, Type: resType, CtyType: ctyType, - ResourceType: resourceType, + BlockType: blockType, OriginalLabel: resMeta.OriginalLabel, } @@ -1155,14 +1173,6 @@ func getResourceState(ctx context.Context, resource *schema.Resource, resID stri return nil, nil } - if !exportComputed { - // Remove any computed attributes from being exported - for resType, resSchema := range resource.Schema { - if resSchema.Computed { - delete(state.Attributes, resType) - } - } - } return state, nil } @@ -1430,12 +1440,6 @@ func (g *GenesysCloudResourceExporter) resolveValueToDataSource(exporter *resour return } g.dataSourceTypesMaps[dataSourceType][dataSourceLabel] = dataSourceConfig - if g.exportAsHCL { - if _, ok := g.resourceTypesHCLBlocks[dataSourceType]; !ok { - g.resourceTypesHCLBlocks[dataSourceType] = make(resourceHCLBlock, 0) - } - g.resourceTypesHCLBlocks[dataSourceType] = append(g.resourceTypesHCLBlocks[dataSourceType], instanceStateToHCLBlock(dataSourceType, dataSourceLabel, dataSourceConfig, true)) - } } func attrInUnResolvableAttrs(a string, myMap map[string]*schema.Schema) (*schema.Schema, bool) { @@ -1639,7 +1643,7 @@ func (g *GenesysCloudResourceExporter) resourceIdExists(refID string, existingRe } func (g *GenesysCloudResourceExporter) isDataSource(resType string, resLabel, originalLabel string) bool { - return g.containsElement(resourceExporter.ExportAsData, resType, resLabel, originalLabel) || g.containsElement(g.replaceWithDatasource, resType, resLabel, originalLabel) + return g.containsElement(g.replaceWithDatasource, resType, resLabel, originalLabel) } func (g *GenesysCloudResourceExporter) containsElement(elements []string, resType, resLabel, originalLabel string) bool { diff --git a/genesyscloud/tfexporter/genesyscloud_resource_exporter_test.go b/genesyscloud/tfexporter/genesyscloud_resource_exporter_test.go index b7f6e0ca1..1f07eed20 100644 --- a/genesyscloud/tfexporter/genesyscloud_resource_exporter_test.go +++ b/genesyscloud/tfexporter/genesyscloud_resource_exporter_test.go @@ -9,7 +9,7 @@ import ( "terraform-provider-genesyscloud/genesyscloud/util" "github.com/hashicorp/terraform-plugin-sdk/v2/diag" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" @@ -550,20 +550,11 @@ func TestUnitResolveValueToDataSource(t *testing.T) { t.Errorf("expected data source name to be '%s', got '%s'", defaultOutboundScriptName, nameInDataSource) } - hclBlocks, ok := g.resourceTypesHCLBlocks[scriptResourceType] - if !ok { - t.Errorf("expected resourceTypesHCLBlocks to contain key '%s'", scriptResourceType) - } - if len(hclBlocks) == 0 { - t.Errorf("expected length of resourceTypesHCLBlocks to not be zero") - } - // set up resolverFunc = func(configMap map[string]any, value any, sdkConfig *platformclientv2.Configuration) (string, string, map[string]any, bool) { return "", "", nil, false } g.dataSourceTypesMaps = make(map[string]resourceJSONMaps) - g.resourceTypesHCLBlocks = make(map[string]resourceHCLBlock) attrCustomResolver["script_id"] = &resourceExporter.RefAttrCustomResolver{ResolveToDataSourceFunc: resolverFunc} exporter = &resourceExporter.ResourceExporter{ CustomAttributeResolver: attrCustomResolver, @@ -575,10 +566,6 @@ func TestUnitResolveValueToDataSource(t *testing.T) { if _, ok := g.dataSourceTypesMaps[scriptResourceType]; ok { t.Errorf("expected key '%s' to not exist in dataSourceTypesMaps", scriptResourceType) } - - if _, ok := g.resourceTypesHCLBlocks[scriptResourceType]; ok { - t.Errorf("expected key '%s' to not exist in resourceTypesHCLBlocks map", scriptResourceType) - } } func setupGenesysCloudResourceExporter(t *testing.T) *GenesysCloudResourceExporter { @@ -601,7 +588,6 @@ func setupGenesysCloudResourceExporter(t *testing.T) *GenesysCloudResourceExport t.Errorf("%v", diagErr) } g.dataSourceTypesMaps = make(map[string]resourceJSONMaps) - g.resourceTypesHCLBlocks = make(map[string]resourceHCLBlock) g.exportAsHCL = true return g } @@ -668,3 +654,194 @@ func TestContainsElement(t *testing.T) { }) } } + +func TestGetResourceStateRemovesComputedAttributes(t *testing.T) { + + testCases := []struct { + name string + resourceId string + schema map[string]*schema.Schema + resourceMetaMap resourceExporter.ResourceIDMetaMap + initialState map[string]string + exportComputed bool + expectedState map[string]string + expectError bool + }{ + { + name: "Basic resource state with computed attributes disabled", + resourceId: "test-resource-1", + schema: map[string]*schema.Schema{ + "computed_attr": { + Type: schema.TypeString, + Computed: true, + }, + "normal_attr": { + Type: schema.TypeString, + Required: true, + }, + }, + resourceMetaMap: resourceExporter.ResourceIDMetaMap{ + "test-resource-1": &resourceExporter.ResourceMeta{ + BlockLabel: "test-resource-1", + }, + }, + initialState: map[string]string{ + "computed_attr": "computed_value", + "normal_attr": "normal_value", + }, + exportComputed: false, + expectedState: map[string]string{ + "normal_attr": "normal_value", + "id": "test-resource-1", + }, + expectError: false, + }, + { + name: "Resource state with computed attributes enabled", + resourceId: "test-resource-2", + schema: map[string]*schema.Schema{ + "computed_attr": { + Type: schema.TypeString, + Computed: true, + Optional: true, + }, + "normal_attr": { + Type: schema.TypeString, + Required: true, + }, + }, + resourceMetaMap: resourceExporter.ResourceIDMetaMap{ + "test-resource-2": &resourceExporter.ResourceMeta{ + BlockLabel: "test-resource-2", + }, + }, + initialState: map[string]string{ + "computed_attr": "computed_value", + "normal_attr": "normal_value", + }, + exportComputed: true, + expectedState: map[string]string{ + "computed_attr": "computed_value", + "normal_attr": "normal_value", + "id": "test-resource-2", + }, + expectError: false, + }, + { + name: "Always remove read-only computed attributes", + resourceId: "test-resource-3", + schema: map[string]*schema.Schema{ + "readonly_computed": { + Type: schema.TypeString, + Computed: true, + Optional: false, + Required: false, + }, + "normal_attr": { + Type: schema.TypeString, + Required: true, + }, + }, + resourceMetaMap: resourceExporter.ResourceIDMetaMap{ + "test-resource-3": &resourceExporter.ResourceMeta{ + BlockLabel: "test-resource-3", + }, + }, + initialState: map[string]string{ + "readonly_computed": "computed_value", + "normal_attr": "normal_value", + }, + exportComputed: true, + expectedState: map[string]string{ + "normal_attr": "normal_value", + "id": "test-resource-3", + }, + }, + } + + for _, tc := range testCases { + t.Run(tc.name, func(t *testing.T) { + + mockResourceType := "test_resource" + + // Create a mock mockResource + mockResource := &schema.Resource{ + Schema: tc.schema, + // Mock the refresh functionality + Read: func(d *schema.ResourceData, m interface{}) error { + // Simulate reading the resource by setting the test case's initial state + for k, v := range tc.initialState { + d.Set(k, v) + } + d.SetId(tc.resourceId) + return nil + }, + } + + // Create mock provider + mockProvider := &schema.Provider{ + ResourcesMap: map[string]*schema.Resource{ + mockResourceType: mockResource, + }, + } + + // Create mock exporter + mockExporter := &resourceExporter.ResourceExporter{ + SanitizedResourceMap: tc.resourceMetaMap, + } + + // Create provider meta + providerMeta := &provider.ProviderMeta{ + ClientConfig: &platformclientv2.Configuration{}, + } + + // Create GenesysCloudResourceExporter instance + exporter := &GenesysCloudResourceExporter{ + exportComputed: tc.exportComputed, + meta: providerMeta, + ctx: context.Background(), + } + + // Call the function being tested + resources, diags := exporter.getResourcesForType( + mockResourceType, + mockProvider, + mockExporter, + providerMeta, + ) + + // Check for expected errors + if tc.expectError { + if diags == nil { + t.Error("Expected error but got none") + } + return + } + + if diags != nil { + t.Errorf("Unexpected error: %v", diags) + return + } + + if resources == nil { + t.Fatal("Expected resources but got nil") + } + + // Verify the state attributes + for key, expectedValue := range tc.expectedState { + if actualValue, ok := resources[0].State.Attributes[key]; !ok { + t.Errorf("Expected attribute %s not found in state", key) + } else if actualValue != expectedValue { + t.Errorf("Attribute %s: expected %s, got %s", key, expectedValue, actualValue) + } + } + + // Verify no unexpected attributes exist + for key := range resources[0].State.Attributes { + if _, ok := tc.expectedState[key]; !ok { + t.Errorf("Unexpected attribute %s found in state", key) + } + } + }) + } +} diff --git a/genesyscloud/tfexporter/hcl_exporter.go b/genesyscloud/tfexporter/hcl_exporter.go index 6bc1c9ee2..900b5540b 100644 --- a/genesyscloud/tfexporter/hcl_exporter.go +++ b/genesyscloud/tfexporter/hcl_exporter.go @@ -4,6 +4,7 @@ import ( "fmt" "os" "path/filepath" + "sort" "strings" "terraform-provider-genesyscloud/genesyscloud/util" @@ -18,25 +19,25 @@ import ( const resourceHCLFileExt = "tf" -type resourceHCLBlock [][]byte - type HCLExporter struct { - resourceTypesHCLBlocks map[string]resourceHCLBlock - unresolvedAttrs []unresolvableAttributeInfo - providerSource string - version string - dirPath string - splitFilesByResource bool + resourceTypesJSONMaps map[string]resourceJSONMaps + dataSourceTypesMaps map[string]resourceJSONMaps + unresolvedAttrs []unresolvableAttributeInfo + providerSource string + version string + dirPath string + splitFilesByResource bool } -func NewHClExporter(resourceTypesHCLBlocks map[string]resourceHCLBlock, unresolvedAttrs []unresolvableAttributeInfo, providerSource string, version string, dirPath string, splitFilesByResource bool) *HCLExporter { +func NewHClExporter(resourceTypesJSONMaps map[string]resourceJSONMaps, dataSourceTypesMaps map[string]resourceJSONMaps, unresolvedAttrs []unresolvableAttributeInfo, providerSource string, version string, dirPath string, splitFilesByResource bool) *HCLExporter { hclExporter := &HCLExporter{ - resourceTypesHCLBlocks: resourceTypesHCLBlocks, - unresolvedAttrs: unresolvedAttrs, - providerSource: providerSource, - version: version, - dirPath: dirPath, - splitFilesByResource: splitFilesByResource, + resourceTypesJSONMaps: resourceTypesJSONMaps, + dataSourceTypesMaps: dataSourceTypesMaps, + unresolvedAttrs: unresolvedAttrs, + providerSource: providerSource, + version: version, + dirPath: dirPath, + splitFilesByResource: splitFilesByResource, } return hclExporter } @@ -45,6 +46,40 @@ func (h *HCLExporter) exportHCLConfig() diag.Diagnostics { providerBlock := createHCLProviderBlock(h.providerSource, h.version) variablesBlock := createHCLVariablesBlock(h.unresolvedAttrs) + hclBlocks := make(map[string][][]byte, 0) + + // Data resources + for resDataType, dataJSONMap := range h.dataSourceTypesMaps { + + // Output the data resources in a sorted fashion + blockLabels := make([]string, 0) + for resDataLabel, _ := range dataJSONMap { + blockLabels = append(blockLabels, resDataLabel) + } + sort.Strings(blockLabels) + for _, blockLabel := range blockLabels { + resDataJson := dataJSONMap[blockLabel] + hclBlock := instanceStateToHCLBlock(resDataType, blockLabel, resDataJson, true) + hclBlocks[resDataType] = append(hclBlocks[resDataType], hclBlock) + } + } + + // Resources + for resType, resJSONMap := range h.resourceTypesJSONMaps { + + // Output the resources in a sorted fashion + blockLabels := make([]string, 0) + for resLabel, _ := range resJSONMap { + blockLabels = append(blockLabels, resLabel) + } + sort.Strings(blockLabels) + for _, resLabel := range blockLabels { + resJson := resJSONMap[resLabel] + hclBlock := instanceStateToHCLBlock(resType, resLabel, resJson, false) + hclBlocks[resType] = append(hclBlocks[resType], hclBlock) + } + } + if h.splitFilesByResource { // Provider file providerHCLFilePath := filepath.Join(h.dirPath, defaultTfHCLProviderFile) @@ -64,24 +99,33 @@ func (h *HCLExporter) exportHCLConfig() diag.Diagnostics { return diagErr } - // Resource files - for resType, resBlock := range h.resourceTypesHCLBlocks { + // Resources files + for resType, hclContent := range hclBlocks { resourceHCLFilePath := filepath.Join(h.dirPath, fmt.Sprintf("%s.%s", resType, resourceHCLFileExt)) if resourceHCLFilePath == "" { return diag.Errorf("Failed to create file path %s", resourceHCLFilePath) } - if diagErr := writeHCLToFile(resBlock, resourceHCLFilePath); diagErr != nil { + if diagErr := writeHCLToFile(hclContent, resourceHCLFilePath); diagErr != nil { return diagErr } } + } else { // Single file export allBlockSlice := make([][]byte, 0) allBlockSlice = append(allBlockSlice, providerBlock) - for _, resBlock := range h.resourceTypesHCLBlocks { - allBlockSlice = append(allBlockSlice, resBlock...) + // Sort resource types + resourceTypes := make([]string, 0) + for resType, _ := range hclBlocks { + resourceTypes = append(resourceTypes, resType) + } + sort.Strings(resourceTypes) + for _, resType := range resourceTypes { + hclContent := hclBlocks[resType] + allBlockSlice = append(allBlockSlice, hclContent...) } + allBlockSlice = append(allBlockSlice, variablesBlock) hclFilePath := filepath.Join(h.dirPath, defaultTfHCLFile) @@ -140,6 +184,11 @@ func createHCLProviderBlock(providerSource string, version string) []byte { func createHCLVariablesBlock(unresolvedAttrs []unresolvableAttributeInfo) []byte { mFile := hclwrite.NewEmptyFile() keys := make(map[string]string) + sort.Slice(unresolvedAttrs, func(i, j int) bool { + return unresolvedAttrs[i].ResourceType < unresolvedAttrs[j].ResourceType || + (unresolvedAttrs[i].ResourceType == unresolvedAttrs[j].ResourceType && + unresolvedAttrs[i].ResourceLabel < unresolvedAttrs[j].ResourceLabel) + }) for _, attr := range unresolvedAttrs { mBody := mFile.Body() key := createUnresolvedAttrKey(attr) @@ -211,7 +260,8 @@ func instanceStateToHCLBlock(resType, resLabel string, json util.JsonMap, isData body := block.Body() - addBody(body, json) + sortedJson := sortJSONMap(json) + addBody(body, sortedJson) newCopy := strings.Replace(string(f.Bytes()), "$${", "${", -1) return []byte(newCopy) diff --git a/genesyscloud/tfexporter/json_exporter.go b/genesyscloud/tfexporter/json_exporter.go index 2a914029e..0d11835d2 100644 --- a/genesyscloud/tfexporter/json_exporter.go +++ b/genesyscloud/tfexporter/json_exporter.go @@ -277,7 +277,8 @@ func determineVarType(s *schema.Schema) string { } func writeConfig(jsonMap map[string]interface{}, path string) diag.Diagnostics { - dataJSONBytes, err := json.MarshalIndent(jsonMap, "", " ") + sortedJsonMap := sortJSONMap(jsonMap) + dataJSONBytes, err := json.MarshalIndent(sortedJsonMap, "", " ") if err != nil { return diag.FromErr(err) } diff --git a/genesyscloud/tfexporter/resource_genesyscloud_tf_export.go b/genesyscloud/tfexporter/resource_genesyscloud_tf_export.go index d8c94ef8d..e2ecad984 100644 --- a/genesyscloud/tfexporter/resource_genesyscloud_tf_export.go +++ b/genesyscloud/tfexporter/resource_genesyscloud_tf_export.go @@ -148,7 +148,7 @@ func ResourceTfExport() *schema.Resource { ForceNew: true, }, "export_computed": { - Description: "Export attributes that are marked as being Computed. Defaults to true to match existing functionality. This attribute's default value will likely switch to false in a future release.", + Description: "Export attributes that are marked as being Computed and Optional. Does not attempt to export attributes that are explicitly marked as read-only by the provider. Defaults to true to match existing functionality. This attribute's default value will likely switch to false in a future release.", Default: true, Type: schema.TypeBool, Optional: true, diff --git a/genesyscloud/tfexporter/resource_genesyscloud_tf_export_test.go b/genesyscloud/tfexporter/resource_genesyscloud_tf_export_test.go index e43085f9a..75f0b5aca 100644 --- a/genesyscloud/tfexporter/resource_genesyscloud_tf_export_test.go +++ b/genesyscloud/tfexporter/resource_genesyscloud_tf_export_test.go @@ -29,7 +29,7 @@ import ( "testing" "time" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" "terraform-provider-genesyscloud/genesyscloud/util/testrunner" diff --git a/genesyscloud/tfexporter/tf_exporter_resource_test.go b/genesyscloud/tfexporter/tf_exporter_resource_test.go index 33f6551cc..0af51e73e 100644 --- a/genesyscloud/tfexporter/tf_exporter_resource_test.go +++ b/genesyscloud/tfexporter/tf_exporter_resource_test.go @@ -244,7 +244,7 @@ func (r *registerTestInstance) registerTestExporters() { RegisterExporter("genesyscloud_architect_datatable_row", architect_datatable_row.ArchitectDatatableRowExporter()) RegisterExporter("genesyscloud_architect_emergencygroup", emergencyGroup.ArchitectEmergencyGroupExporter()) RegisterExporter("genesyscloud_architect_ivr", archIvr.ArchitectIvrExporter()) - RegisterExporter("genesyscloud_architect_schedules", architectSchedules.ArchitectSchedulesExporter()) + RegisterExporter(architectSchedules.ResourceType, architectSchedules.ArchitectSchedulesExporter()) RegisterExporter("genesyscloud_architect_schedulegroups", architectSchedulegroups.ArchitectSchedulegroupsExporter()) RegisterExporter("genesyscloud_architect_user_prompt", userPrompt.ArchitectUserPromptExporter()) RegisterExporter("genesyscloud_auth_division", authDivision.AuthDivisionExporter()) @@ -352,6 +352,9 @@ func (r *registerTestInstance) registerTestDataSources() { providerDataSources[scripts.ResourceType] = scripts.DataSourceScript() providerDataSources[edgeSite.ResourceType] = edgeSite.DataSourceSite() providerDataSources[cMessagingSettings.ResourceType] = cMessagingSettings.DataSourceConversationsMessagingSettings() + providerDataSources[tbs.ResourceType] = tbs.DataSourceTrunkBaseSettings() + providerDataSources[routingWrapupcode.ResourceType] = routingWrapupcode.DataSourceRoutingWrapupCode() + providerDataSources[outboundRoute.ResourceType] = outboundRoute.DataSourceSiteOutboundRoute() } func RegisterExporter(exporterResourceType string, resourceExporter *resourceExporter.ResourceExporter) { diff --git a/genesyscloud/tfexporter/tfstate_exporter.go b/genesyscloud/tfexporter/tfstate_exporter.go index 0226fa14a..df1f772fb 100644 --- a/genesyscloud/tfexporter/tfstate_exporter.go +++ b/genesyscloud/tfexporter/tfstate_exporter.go @@ -52,7 +52,7 @@ func (t *TFStateFileWriter) writeTfState() diag.Diagnostics { Primary: resource.State, Provider: "provider.genesyscloud", } - tfstate.RootModule().Resources[resource.ResourceType+resource.Type+"."+resource.BlockLabel] = resourceState + tfstate.RootModule().Resources[resource.BlockType+resource.Type+"."+resource.BlockLabel] = resourceState } data, err := json.MarshalIndent(tfstate, "", " ") diff --git a/genesyscloud/user/data_source_genesyscloud_user.go b/genesyscloud/user/data_source_genesyscloud_user.go index ad3021a48..4795d094a 100644 --- a/genesyscloud/user/data_source_genesyscloud_user.go +++ b/genesyscloud/user/data_source_genesyscloud_user.go @@ -13,7 +13,7 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" ) var ( diff --git a/genesyscloud/user/genesyscloud_user_proxy.go b/genesyscloud/user/genesyscloud_user_proxy.go index d8a234956..2d300c17d 100644 --- a/genesyscloud/user/genesyscloud_user_proxy.go +++ b/genesyscloud/user/genesyscloud_user_proxy.go @@ -8,7 +8,7 @@ import ( rc "terraform-provider-genesyscloud/genesyscloud/resource_cache" "time" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" ) /* diff --git a/genesyscloud/user/resource_genesyscloud_user.go b/genesyscloud/user/resource_genesyscloud_user.go index d0a8a5f5f..e95040cdc 100644 --- a/genesyscloud/user/resource_genesyscloud_user.go +++ b/genesyscloud/user/resource_genesyscloud_user.go @@ -18,7 +18,7 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" ) type agentUtilizationWithLabels struct { diff --git a/genesyscloud/user/resource_genesyscloud_user_test.go b/genesyscloud/user/resource_genesyscloud_user_test.go index 3ba9cb9ec..9f3087a84 100644 --- a/genesyscloud/user/resource_genesyscloud_user_test.go +++ b/genesyscloud/user/resource_genesyscloud_user_test.go @@ -22,7 +22,7 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/retry" "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" ) func TestAccResourceUserBasic(t *testing.T) { diff --git a/genesyscloud/user/resource_genesyscloud_user_utils.go b/genesyscloud/user/resource_genesyscloud_user_utils.go index 2683fdaea..909055de0 100644 --- a/genesyscloud/user/resource_genesyscloud_user_utils.go +++ b/genesyscloud/user/resource_genesyscloud_user_utils.go @@ -14,7 +14,7 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" "github.com/nyaruka/phonenumbers" ) diff --git a/genesyscloud/user_roles/genesyscloud_user_roles_proxy.go b/genesyscloud/user_roles/genesyscloud_user_roles_proxy.go index ce498de02..137d255f3 100644 --- a/genesyscloud/user_roles/genesyscloud_user_roles_proxy.go +++ b/genesyscloud/user_roles/genesyscloud_user_roles_proxy.go @@ -8,7 +8,7 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" ) var internalProxy *userRolesProxy diff --git a/genesyscloud/user_roles/resource_genesyscloud_user_roles_utils.go b/genesyscloud/user_roles/resource_genesyscloud_user_roles_utils.go index 88b1e2e77..2b0e86b00 100644 --- a/genesyscloud/user_roles/resource_genesyscloud_user_roles_utils.go +++ b/genesyscloud/user_roles/resource_genesyscloud_user_roles_utils.go @@ -7,7 +7,7 @@ import ( "terraform-provider-genesyscloud/genesyscloud/util/lists" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" ) func flattenSubjectRoles(d *schema.ResourceData, p *userRolesProxy) (*schema.Set, *platformclientv2.APIResponse, error) { diff --git a/genesyscloud/util/lists/util_lists.go b/genesyscloud/util/lists/util_lists.go index 21b2462fe..281a3539a 100644 --- a/genesyscloud/util/lists/util_lists.go +++ b/genesyscloud/util/lists/util_lists.go @@ -26,8 +26,14 @@ func RemoveStringFromSlice(value string, slice []string) []string { return s } -func SubStringInSlice(a string, list []string) bool { - for _, b := range list { +// SubStringInSlice checks if any string in the provided slice contains +// the target string 'a' as a substring. +// For example: +// +// list = ["hello", "world"], a = "ell" returns true +// list = ["hello", "world"], a = "xyz" returns false +func SubStringInSlice(a string, slice []string) bool { + for _, b := range slice { if strings.Contains(b, a) { return true } @@ -35,6 +41,21 @@ func SubStringInSlice(a string, list []string) bool { return false } +// ContainsAnySubStringSlice checks if the target string 'a' contains +// any of the strings in the provided list as substrings. +// For example: +// +// list = ["ell", "wor"], a = "hello" returns true +// list = ["xyz", "abc"], a = "hello" returns false +func ContainsAnySubStringSlice(a string, slice []string) bool { + for _, b := range slice { + if strings.Contains(a, b) { + return true + } + } + return false +} + // SliceDifference returns the elements in a that aren't in b func SliceDifference(a, b []string) []string { var diff []string diff --git a/genesyscloud/util/resourcedata/resourcedata.go b/genesyscloud/util/resourcedata/resourcedata.go index 36df429d5..bbaa7691f 100644 --- a/genesyscloud/util/resourcedata/resourcedata.go +++ b/genesyscloud/util/resourcedata/resourcedata.go @@ -6,7 +6,7 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" "github.com/leekchan/timeutil" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" ) const ( diff --git a/genesyscloud/util/util_basesetting_properties.go b/genesyscloud/util/util_basesetting_properties.go index 4fc9bff21..68e53a297 100644 --- a/genesyscloud/util/util_basesetting_properties.go +++ b/genesyscloud/util/util_basesetting_properties.go @@ -8,7 +8,7 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" ) func BuildTelephonyProperties(d *schema.ResourceData) *map[string]interface{} { diff --git a/genesyscloud/util/util_diagnostic_unit_test.go b/genesyscloud/util/util_diagnostic_unit_test.go index 202600037..303f36fcb 100644 --- a/genesyscloud/util/util_diagnostic_unit_test.go +++ b/genesyscloud/util/util_diagnostic_unit_test.go @@ -7,7 +7,7 @@ import ( "strings" "testing" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" "github.com/stretchr/testify/assert" ) diff --git a/genesyscloud/util/util_diagnostics.go b/genesyscloud/util/util_diagnostics.go index 8be7a85b1..5ef9c2be9 100644 --- a/genesyscloud/util/util_diagnostics.go +++ b/genesyscloud/util/util_diagnostics.go @@ -6,7 +6,7 @@ import ( "fmt" "github.com/hashicorp/terraform-plugin-sdk/v2/diag" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" ) type detailedDiagnosticInfo struct { diff --git a/genesyscloud/util/util_divisions.go b/genesyscloud/util/util_divisions.go index df2171ce9..5df351fbc 100644 --- a/genesyscloud/util/util_divisions.go +++ b/genesyscloud/util/util_divisions.go @@ -9,7 +9,7 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" ) type JsonMap map[string]interface{} diff --git a/genesyscloud/util/util_domainentities.go b/genesyscloud/util/util_domainentities.go index 4af7bc3f1..8f4da33f9 100644 --- a/genesyscloud/util/util_domainentities.go +++ b/genesyscloud/util/util_domainentities.go @@ -4,7 +4,7 @@ import ( lists "terraform-provider-genesyscloud/genesyscloud/util/lists" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" ) func BuildSdkDomainEntityRef(d *schema.ResourceData, idAttr string) *platformclientv2.Domainentityref { diff --git a/genesyscloud/util/util_retries.go b/genesyscloud/util/util_retries.go index 336b83f02..2d5d85b80 100644 --- a/genesyscloud/util/util_retries.go +++ b/genesyscloud/util/util_retries.go @@ -14,7 +14,7 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" "github.com/hashicorp/terraform-plugin-sdk/v2/diag" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" ) func WithRetries(ctx context.Context, timeout time.Duration, method func() *retry.RetryError) diag.Diagnostics { diff --git a/genesyscloud/webdeployments_configuration/genesyscloud_webdeployments_configuration_proxy.go b/genesyscloud/webdeployments_configuration/genesyscloud_webdeployments_configuration_proxy.go index bb77a20bd..96133b95c 100644 --- a/genesyscloud/webdeployments_configuration/genesyscloud_webdeployments_configuration_proxy.go +++ b/genesyscloud/webdeployments_configuration/genesyscloud_webdeployments_configuration_proxy.go @@ -9,7 +9,7 @@ import ( "time" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/retry" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" ) var internalProxy *webDeploymentsConfigurationProxy diff --git a/genesyscloud/webdeployments_configuration/resource_genesyscloud_webdeployments_configuration.go b/genesyscloud/webdeployments_configuration/resource_genesyscloud_webdeployments_configuration.go index 7eba44972..85d9e5ed2 100644 --- a/genesyscloud/webdeployments_configuration/resource_genesyscloud_webdeployments_configuration.go +++ b/genesyscloud/webdeployments_configuration/resource_genesyscloud_webdeployments_configuration.go @@ -19,7 +19,7 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" ) func getAllWebDeploymentConfigurations(ctx context.Context, clientConfig *platformclientv2.Configuration) (resourceExporter.ResourceIDMetaMap, diag.Diagnostics) { diff --git a/genesyscloud/webdeployments_configuration/resource_genesyscloud_webdeployments_configuration_test.go b/genesyscloud/webdeployments_configuration/resource_genesyscloud_webdeployments_configuration_test.go index 3269fe340..b95ab924d 100644 --- a/genesyscloud/webdeployments_configuration/resource_genesyscloud_webdeployments_configuration_test.go +++ b/genesyscloud/webdeployments_configuration/resource_genesyscloud_webdeployments_configuration_test.go @@ -14,7 +14,7 @@ import ( "github.com/google/uuid" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" ) type scCustomMessageConfig struct { diff --git a/genesyscloud/webdeployments_configuration/utils/resource_genesyscloud_webdeployments_configuration_journey.go b/genesyscloud/webdeployments_configuration/utils/resource_genesyscloud_webdeployments_configuration_journey.go index eecbea24d..50de773df 100644 --- a/genesyscloud/webdeployments_configuration/utils/resource_genesyscloud_webdeployments_configuration_journey.go +++ b/genesyscloud/webdeployments_configuration/utils/resource_genesyscloud_webdeployments_configuration_journey.go @@ -4,7 +4,7 @@ import ( "terraform-provider-genesyscloud/genesyscloud/util/lists" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" ) func buildSelectorEventTriggers(triggers []interface{}) *[]platformclientv2.Selectoreventtrigger { diff --git a/genesyscloud/webdeployments_configuration/utils/resource_genesyscloud_webdeployments_configuration_messenger.go b/genesyscloud/webdeployments_configuration/utils/resource_genesyscloud_webdeployments_configuration_messenger.go index 3cf09a53b..2489526ec 100644 --- a/genesyscloud/webdeployments_configuration/utils/resource_genesyscloud_webdeployments_configuration_messenger.go +++ b/genesyscloud/webdeployments_configuration/utils/resource_genesyscloud_webdeployments_configuration_messenger.go @@ -4,7 +4,7 @@ import ( "terraform-provider-genesyscloud/genesyscloud/util/lists" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" ) func buildAppConversations(conversations []interface{}) *platformclientv2.Conversationappsettings { diff --git a/genesyscloud/webdeployments_configuration/utils/resource_genesyscloud_webdeployments_configuration_support_center.go b/genesyscloud/webdeployments_configuration/utils/resource_genesyscloud_webdeployments_configuration_support_center.go index 5a36dee1f..0fd00e580 100644 --- a/genesyscloud/webdeployments_configuration/utils/resource_genesyscloud_webdeployments_configuration_support_center.go +++ b/genesyscloud/webdeployments_configuration/utils/resource_genesyscloud_webdeployments_configuration_support_center.go @@ -4,7 +4,7 @@ import ( "terraform-provider-genesyscloud/genesyscloud/util/resourcedata" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" ) func buildSupportCenterHeroStyle(styles []interface{}) *platformclientv2.Supportcenterherostyle { diff --git a/genesyscloud/webdeployments_configuration/utils/resource_genesyscloud_webdeployments_configuration_utils.go b/genesyscloud/webdeployments_configuration/utils/resource_genesyscloud_webdeployments_configuration_utils.go index 951b45818..2bdbb5ea7 100644 --- a/genesyscloud/webdeployments_configuration/utils/resource_genesyscloud_webdeployments_configuration_utils.go +++ b/genesyscloud/webdeployments_configuration/utils/resource_genesyscloud_webdeployments_configuration_utils.go @@ -7,7 +7,7 @@ import ( "terraform-provider-genesyscloud/genesyscloud/util/resourcedata" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" ) func buildCobrowseSettings(d *schema.ResourceData) *platformclientv2.Cobrowsesettings { diff --git a/genesyscloud/webdeployments_deployment/genesyscloud_webdeployments_deployment_proxy.go b/genesyscloud/webdeployments_deployment/genesyscloud_webdeployments_deployment_proxy.go index 426e04afb..dcb966be9 100644 --- a/genesyscloud/webdeployments_deployment/genesyscloud_webdeployments_deployment_proxy.go +++ b/genesyscloud/webdeployments_deployment/genesyscloud_webdeployments_deployment_proxy.go @@ -11,7 +11,7 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/retry" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" ) var internalProxy *webDeploymentsProxy diff --git a/genesyscloud/webdeployments_deployment/resource_genesyscloud_webdeployments_deployment.go b/genesyscloud/webdeployments_deployment/resource_genesyscloud_webdeployments_deployment.go index 45f3d3ed9..0d2e526ea 100644 --- a/genesyscloud/webdeployments_deployment/resource_genesyscloud_webdeployments_deployment.go +++ b/genesyscloud/webdeployments_deployment/resource_genesyscloud_webdeployments_deployment.go @@ -18,7 +18,7 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" ) func getAllWebDeployments(ctx context.Context, clientConfig *platformclientv2.Configuration) (resourceExporter.ResourceIDMetaMap, diag.Diagnostics) { diff --git a/genesyscloud/webdeployments_deployment/resource_genesyscloud_webdeployments_deployment_test.go b/genesyscloud/webdeployments_deployment/resource_genesyscloud_webdeployments_deployment_test.go index 060c7dcd3..ddc9e532e 100644 --- a/genesyscloud/webdeployments_deployment/resource_genesyscloud_webdeployments_deployment_test.go +++ b/genesyscloud/webdeployments_deployment/resource_genesyscloud_webdeployments_deployment_test.go @@ -13,7 +13,7 @@ import ( "github.com/google/uuid" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" ) func TestAccResourceWebDeploymentsDeployment(t *testing.T) { diff --git a/genesyscloud/webdeployments_deployment/resource_genesyscloud_webdeployments_deployment_utils.go b/genesyscloud/webdeployments_deployment/resource_genesyscloud_webdeployments_deployment_utils.go index 0d46eac72..f2375d3e9 100644 --- a/genesyscloud/webdeployments_deployment/resource_genesyscloud_webdeployments_deployment_utils.go +++ b/genesyscloud/webdeployments_deployment/resource_genesyscloud_webdeployments_deployment_utils.go @@ -4,7 +4,7 @@ import ( "errors" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" - "github.com/mypurecloud/platform-client-sdk-go/v149/platformclientv2" + "github.com/mypurecloud/platform-client-sdk-go/v150/platformclientv2" ) func alwaysDifferent(k, old, new string, d *schema.ResourceData) bool { diff --git a/go.mod b/go.mod index a63a4ba06..9567bb73a 100644 --- a/go.mod +++ b/go.mod @@ -12,10 +12,10 @@ require ( github.com/leekchan/timeutil v0.0.0-20150802142658-28917288c48d github.com/mohae/deepcopy v0.0.0-20170929034955-c48cc78d4826 github.com/mozillazg/go-unidecode v0.2.0 - github.com/mypurecloud/platform-client-sdk-go/v149 v149.0.0 - github.com/nyaruka/phonenumbers v1.4.3 + github.com/mypurecloud/platform-client-sdk-go/v150 v150.0.0 + github.com/nyaruka/phonenumbers v1.4.4 github.com/rjNemo/underscore v0.7.0 - github.com/zclconf/go-cty v1.15.1 + github.com/zclconf/go-cty v1.16.0 gonum.org/v1/gonum v0.15.0 ) @@ -98,10 +98,10 @@ require ( github.com/subosito/gotenv v1.6.0 // indirect github.com/tidwall/pretty v1.2.1 // indirect github.com/vmihailenco/msgpack v4.0.4+incompatible // indirect - golang.org/x/crypto v0.31.0 // indirect + golang.org/x/crypto v0.32.0 // indirect golang.org/x/mod v0.21.0 // indirect - golang.org/x/net v0.33.0 - golang.org/x/sys v0.28.0 // indirect + golang.org/x/net v0.34.0 + golang.org/x/sys v0.29.0 // indirect golang.org/x/text v0.21.0 // indirect google.golang.org/appengine v1.6.8 // indirect google.golang.org/grpc v1.68.0 // indirect diff --git a/go.sum b/go.sum index a6ef6c2d2..59b1d7f9b 100644 --- a/go.sum +++ b/go.sum @@ -276,10 +276,10 @@ github.com/mohae/deepcopy v0.0.0-20170929034955-c48cc78d4826/go.mod h1:TaXosZuwd github.com/mozillazg/go-unidecode v0.2.0 h1:vFGEzAH9KSwyWmXCOblazEWDh7fOkpmy/Z4ArmamSUc= github.com/mozillazg/go-unidecode v0.2.0/go.mod h1:zB48+/Z5toiRolOZy9ksLryJ976VIwmDmpQ2quyt1aA= github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U= -github.com/mypurecloud/platform-client-sdk-go/v149 v149.0.0 h1:df413CVT6G4gnSbeAuqLo4DWXZndsADdXzIaw6LB5/4= -github.com/mypurecloud/platform-client-sdk-go/v149 v149.0.0/go.mod h1:afV1nQPB7luHoRCoLTh0b92Qvep0K0+zBA1IljTtwJ4= -github.com/nyaruka/phonenumbers v1.4.3 h1:tR71UJ+DZu7TSkxoG8JI8HzHJkPD/m4KNiUX34Fvmlo= -github.com/nyaruka/phonenumbers v1.4.3/go.mod h1:gv+CtldaFz+G3vHHnasBSirAi3O2XLqZzVWz4V1pl2E= +github.com/mypurecloud/platform-client-sdk-go/v150 v150.0.0 h1:KQChgHKvh3njkyscE7qBbjg4jxvR9055r6vjjiMO6x8= +github.com/mypurecloud/platform-client-sdk-go/v150 v150.0.0/go.mod h1:MQ2dqMSmyug3a51RlHQU+WtGhSh9MuOntAUqY+IU3pU= +github.com/nyaruka/phonenumbers v1.4.4 h1:9yo9jLvXD7J4exe7GJATApgTlB+05snF0joMDL1p7nQ= +github.com/nyaruka/phonenumbers v1.4.4/go.mod h1:gv+CtldaFz+G3vHHnasBSirAi3O2XLqZzVWz4V1pl2E= github.com/oklog/run v1.1.0 h1:GEenZ1cK0+q0+wsJew9qUg/DyD8k3JzYsZAi5gYi2mA= github.com/oklog/run v1.1.0/go.mod h1:sVPdnTZT1zYwAJeCMu2Th4T21pA3FPOQRfWjQlk7DVU= github.com/oklog/ulid v1.3.1/go.mod h1:CirwcVhetQ6Lv90oh/F+FBtV6XMibvdAFo93nm5qn4U= @@ -377,8 +377,8 @@ github.com/yuin/goldmark v1.7.7 h1:5m9rrB1sW3JUMToKFQfb+FGt1U7r57IHu5GrYrG2nqU= github.com/yuin/goldmark v1.7.7/go.mod h1:uzxRWxtg69N339t3louHJ7+O03ezfj6PlliRlaOzY1E= github.com/yuin/goldmark-meta v1.1.0 h1:pWw+JLHGZe8Rk0EGsMVssiNb/AaPMHfSRszZeUeiOUc= github.com/yuin/goldmark-meta v1.1.0/go.mod h1:U4spWENafuA7Zyg+Lj5RqK/MF+ovMYtBvXi1lBb2VP0= -github.com/zclconf/go-cty v1.15.1 h1:RgQYm4j2EvoBRXOPxhUvxPzRrGDo1eCOhHXuGfrj5S0= -github.com/zclconf/go-cty v1.15.1/go.mod h1:VvMs5i0vgZdhYawQNq5kePSpLAoz8u1xvZgrPIxfnZE= +github.com/zclconf/go-cty v1.16.0 h1:xPKEhst+BW5D0wxebMZkxgapvOE/dw7bFTlgSc9nD6w= +github.com/zclconf/go-cty v1.16.0/go.mod h1:VvMs5i0vgZdhYawQNq5kePSpLAoz8u1xvZgrPIxfnZE= github.com/zclconf/go-cty-debug v0.0.0-20240509010212-0d6042c53940 h1:4r45xpDWB6ZMSMNJFMOjqrGHynW3DIBuR2H9j0ug+Mo= github.com/zclconf/go-cty-debug v0.0.0-20240509010212-0d6042c53940/go.mod h1:CmBdvvj3nqzfzJ6nTCIwDTPZ56aVGvDrmztiO5g3qrM= go.abhg.dev/goldmark/frontmatter v0.2.0 h1:P8kPG0YkL12+aYk2yU3xHv4tcXzeVnN+gU0tJ5JnxRw= @@ -398,8 +398,8 @@ golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8U golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= golang.org/x/crypto v0.3.0/go.mod h1:hebNnKkNXi2UzZN1eVRvBB7co0a+JxK6XbPiWVs/3J4= -golang.org/x/crypto v0.31.0 h1:ihbySMvVjLAeSH1IbfcRTkD/iNscyz8rGzjF/E5hV6U= -golang.org/x/crypto v0.31.0/go.mod h1:kDsLvtWBEx7MV9tJOj9bnXsPbxwJQ6csT/x4KIN4Ssk= +golang.org/x/crypto v0.32.0 h1:euUpcYgM8WcP71gNpTqQCn6rC2t6ULUPiOzfWaXVVfc= +golang.org/x/crypto v0.32.0/go.mod h1:ZnnJkOaASj8g0AjIduWNlq2NRxL0PlBrbKVyZ6V/Ugc= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8= @@ -440,8 +440,8 @@ golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLL golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= golang.org/x/net v0.2.0/go.mod h1:KqCZLdyyvdV855qA2rE3GC2aiw5xGR5TEjj8smXukLY= -golang.org/x/net v0.33.0 h1:74SYHlV8BIgHIFC/LrYkOGIwL19eTYXQ5wc6TBuO36I= -golang.org/x/net v0.33.0/go.mod h1:HXLR5J+9DxmrqMwG9qjGCxZ+zKXxBru04zlTvWlWuN4= +golang.org/x/net v0.34.0 h1:Mb7Mrk043xzHgnRM88suvJFwzVrRfHEHJEl5/71CKw0= +golang.org/x/net v0.34.0/go.mod h1:di0qlW3YNM5oh6GqDGQr92MyTozJPmybPK4Ev/Gm31k= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= @@ -478,8 +478,8 @@ golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.2.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.28.0 h1:Fksou7UEQUWlKvIdsqzJmUmCX3cZuD2+P3XyyzwMhlA= -golang.org/x/sys v0.28.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.29.0 h1:TPYlXGxvx1MGTn2GiZDhnjPA9wZzZeGKHHmKhHYvgaU= +golang.org/x/sys v0.29.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= golang.org/x/term v0.2.0/go.mod h1:TVmDHMZPmdnySmBfhjOoOdhjzdE1h4u1VwSiw2l1Nuc=