Skip to content

Commit

Permalink
Merge branch 'MyPureCloud:dev' into dev
Browse files Browse the repository at this point in the history
  • Loading branch information
willjeuniaux-genesys authored Nov 19, 2024
2 parents c34b094 + 12d922d commit 727265a
Show file tree
Hide file tree
Showing 469 changed files with 2,832 additions and 1,460 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/go-checks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
- name: Set up Go
uses: actions/setup-go@v5
with:
go-version: '1.20'
go-version: '1.23'
id: go

- name: Setup Terraform CLI
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/unit-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
- name: Set up Go
uses: actions/setup-go@v5
with:
go-version: '1.20'
go-version: '1.23'
id: go

- name: Check out code into the Go module directory
Expand Down
31 changes: 31 additions & 0 deletions docs/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ provider "genesyscloud" {

- `access_token` (String) A string that the OAuth client uses to make requests. Can be set with the `GENESYSCLOUD_ACCESS_TOKEN` environment variable.
- `aws_region` (String) AWS region where org exists. e.g. us-east-1. Can be set with the `GENESYSCLOUD_REGION` environment variable.
- `gateway` (Block Set) (see [below for nested schema](#nestedblock--gateway))
- `oauthclient_id` (String) OAuthClient ID found on the OAuth page of Admin UI. Can be set with the `GENESYSCLOUD_OAUTHCLIENT_ID` environment variable.
- `oauthclient_secret` (String, Sensitive) OAuthClient secret found on the OAuth page of Admin UI. Can be set with the `GENESYSCLOUD_OAUTHCLIENT_SECRET` environment variable.
- `proxy` (Block Set, Max: 1) (see [below for nested schema](#nestedblock--proxy))
Expand All @@ -34,6 +35,36 @@ provider "genesyscloud" {
- `sdk_debug_format` (String) Specifies the data format of the 'sdk_debug.log'. Only applicable if sdk_debug is true. Can be set with the `GENESYSCLOUD_SDK_DEBUG_FORMAT` environment variable. Default value is Text.
- `token_pool_size` (Number) Max number of OAuth tokens in the token pool. Can be set with the `GENESYSCLOUD_TOKEN_POOL_SIZE` environment variable.

<a id="nestedblock--gateway"></a>
### Nested Schema for `gateway`

Optional:

- `auth` (Block Set, Max: 1) (see [below for nested schema](#nestedblock--gateway--auth))
- `host` (String) Host for the gateway can be set with the `GENESYSCLOUD_GATEWAY_HOST` environment variable.
- `path_params` (Block Set) (see [below for nested schema](#nestedblock--gateway--path_params))
- `port` (String) Port for the gateway can be set with the `GENESYSCLOUD_GATEWAY_PORT` environment variable.
- `protocol` (String) Protocol for the gateway can be set with the `GENESYSCLOUD_GATEWAY_PROTOCOL` environment variable.

<a id="nestedblock--gateway--auth"></a>
### Nested Schema for `gateway.auth`

Optional:

- `password` (String) Password for the Auth can be set with the `GENESYSCLOUD_PROXY_AUTH_PASSWORD` environment variable.
- `username` (String) UserName for the Auth can be set with the `GENESYSCLOUD_PROXY_AUTH_USERNAME` environment variable.


<a id="nestedblock--gateway--path_params"></a>
### Nested Schema for `gateway.path_params`

Required:

- `path_name` (String) Path name for Gateway Path Params can be set with the `GENESYSCLOUD_GATEWAY_PATH_NAME` environment variable.
- `path_value` (String) Path value for Gateway Path Params can be set with the `GENESYSCLOUD_GATEWAY_PATH_VALUE` environment variable.



<a id="nestedblock--proxy"></a>
### Nested Schema for `proxy`

Expand Down
67 changes: 55 additions & 12 deletions docs/resources/outbound_messagingcampaign.md
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,6 @@ resource "genesyscloud_outbound_messagingcampaign" "example_outbound_messagingca
- `contact_list_id` (String) The contact list that this messaging campaign will send messages for.
- `messages_per_minute` (Number) How many messages this messaging campaign will send per minute.
- `name` (String) The campaign name.
- `sms_config` (Block Set, Min: 1, Max: 1) Configuration for this messaging campaign to send SMS messages. (see [below for nested schema](#nestedblock--sms_config))

### Optional

Expand All @@ -65,34 +64,78 @@ resource "genesyscloud_outbound_messagingcampaign" "example_outbound_messagingca
- `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.
- `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))
- `rule_set_ids` (List of String) Rule Sets to be applied while this campaign is sending messages
- `sms_config` (Block Set, Max: 1) Configuration for this messaging campaign to send SMS messages. (see [below for nested schema](#nestedblock--sms_config))

### Read-Only

- `id` (String) The ID of this resource.

<a id="nestedblock--sms_config"></a>
### Nested Schema for `sms_config`
<a id="nestedblock--contact_sorts"></a>
### Nested Schema for `contact_sorts`

Required:

- `phone_column` (String) The Contact List column specifying the phone number to send a message to.
- `sender_sms_phone_number` (String) A phone number provisioned for SMS communications in E.164 format. E.g. +13175555555 or +34234234234
- `field_name` (String) The field name by which to sort contacts.

Optional:

- `content_template_id` (String) The content template used to formulate the message to send to the contact. Either message_column or content_template_id is required.
- `message_column` (String) The Contact List column specifying the message to send to the contact. Either message_column or content_template_id is required.
- `direction` (String) The direction in which to sort contacts. Defaults to `ASC`.
- `numeric` (Boolean) Whether or not the column contains numeric data. Defaults to `false`.


<a id="nestedblock--contact_sorts"></a>
### Nested Schema for `contact_sorts`
<a id="nestedblock--dynamic_contact_queueing_settings"></a>
### Nested Schema for `dynamic_contact_queueing_settings`

Optional:

- `filter` (Boolean) Whether to filter contacts dynamically.
- `sort` (Boolean) Whether to sort contacts dynamically.


<a id="nestedblock--email_config"></a>
### Nested Schema for `email_config`

Optional:

- `content_template_id` (String) The content template used to formulate the email to send to the contact.
- `email_columns` (Set of String) The contact list columns specifying the email address(es) of the contact.
- `from_address` (Block List, Max: 1) The email address that will be used as the sender of the email. (see [below for nested schema](#nestedblock--email_config--from_address))
- `reply_to_address` (Block List, Max: 1) The email address from which any reply will be sent. (see [below for nested schema](#nestedblock--email_config--reply_to_address))

<a id="nestedblock--email_config--from_address"></a>
### Nested Schema for `email_config.from_address`

Optional:

- `domain_id` (String) The OutboundDomain used for the email address.
- `friendly_name` (String) The friendly name of the email address.
- `local_part` (String) The local part of the email address.


<a id="nestedblock--email_config--reply_to_address"></a>
### Nested Schema for `email_config.reply_to_address`

Optional:

- `domain_id` (String) The InboundDomain used for the email address.
- `route_id` (String) The InboundRoute used for the email address.



<a id="nestedblock--sms_config"></a>
### Nested Schema for `sms_config`

Required:

- `field_name` (String) The field name by which to sort contacts.
- `phone_column` (String) The Contact List column specifying the phone number to send a message to.
- `sender_sms_phone_number` (String) A phone number provisioned for SMS communications in E.164 format. E.g. +13175555555 or +34234234234

Optional:

- `direction` (String) The direction in which to sort contacts. Defaults to `ASC`.
- `numeric` (Boolean) Whether or not the column contains numeric data. Defaults to `false`.
- `content_template_id` (String) The content template used to formulate the message to send to the contact. Either message_column or content_template_id is required.
- `message_column` (String) The Contact List column specifying the message to send to the contact. Either message_column or content_template_id is required.

2 changes: 1 addition & 1 deletion docs/resources/routing_queue.md
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,7 @@ Required:

Required:

- `groups` (Block List, Min: 1) The group(s) to activate if the rule evaluates as true. (see [below for nested schema](#nestedblock--conditional_group_routing_rules--groups))
- `groups` (Block Set, Min: 1) The group(s) to activate if the rule evaluates as true. (see [below for nested schema](#nestedblock--conditional_group_routing_rules--groups))

Optional:

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
inboundCall:
name: Terraform Flow Test-b066d719-c330-41c3-8c0f-9f880f6cdfb5
name: Terraform Flow Test-258fa494-f633-4c8a-b5da-5f9bfca357aa
defaultLanguage: en-us
startUpRef: ./menus/menu[mainMenu]
initialGreeting:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
inboundEmail:
name: Terraform Flow Test-88aecd38-8ab8-45cf-bf74-7f9fa01da2ac
name: Terraform Flow Test-21646f1d-8db9-4a82-8210-f12bb51200dc
division: New Home
startUpRef: "/inboundEmail/states/state[Initial State_10]"
defaultLanguage: en-us
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
inboundCall:
name: Terraform Flow Test-bbe3c4a2-faa9-48c7-a54d-6117ae2eabc1
name: Terraform Flow Test-5ea58562-d2c0-4987-bda1-63f032047956
defaultLanguage: en-us
startUpRef: ./menus/menu[mainMenu]
initialGreeting:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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/v143/platformclientv2"
"github.com/mypurecloud/platform-client-sdk-go/v146/platformclientv2"
)

func DataSourceArchitectDatatableRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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/v143/platformclientv2"
"github.com/mypurecloud/platform-client-sdk-go/v146/platformclientv2"
)

type Datatableproperty struct {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"errors"
"net/http"

"github.com/mypurecloud/platform-client-sdk-go/v143/platformclientv2"
"github.com/mypurecloud/platform-client-sdk-go/v146/platformclientv2"
)

// internalProxy holds a proxy instance that can be used throughout the package
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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/v143/platformclientv2"
"github.com/mypurecloud/platform-client-sdk-go/v146/platformclientv2"
)

func TestAccResourceArchitectDatatable(t *testing.T) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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/v143/platformclientv2"
"github.com/mypurecloud/platform-client-sdk-go/v146/platformclientv2"
)

// Row IDs structured as {table-id}/{key-value}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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/v143/platformclientv2"
"github.com/mypurecloud/platform-client-sdk-go/v146/platformclientv2"
)

type Datatableproperty struct {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (
rc "terraform-provider-genesyscloud/genesyscloud/resource_cache"

"github.com/mitchellh/mapstructure"
"github.com/mypurecloud/platform-client-sdk-go/v143/platformclientv2"
"github.com/mypurecloud/platform-client-sdk-go/v146/platformclientv2"
)

// Type definitions for each func on our proxy so we can easily mock them out later
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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/v143/platformclientv2"
"github.com/mypurecloud/platform-client-sdk-go/v146/platformclientv2"
)

func TestAccResourceArchitectDatatableRow(t *testing.T) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"context"
"fmt"

"github.com/mypurecloud/platform-client-sdk-go/v143/platformclientv2"
"github.com/mypurecloud/platform-client-sdk-go/v146/platformclientv2"
)

var internalProxy *architectEmergencyGroupProxy
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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/v143/platformclientv2"
"github.com/mypurecloud/platform-client-sdk-go/v146/platformclientv2"
)

func getAllEmergencyGroups(ctx context.Context, clientConfig *platformclientv2.Configuration) (resourceExporter.ResourceIDMetaMap, diag.Diagnostics) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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/v143/platformclientv2"
"github.com/mypurecloud/platform-client-sdk-go/v146/platformclientv2"
)

func TestAccResourceArchitectEmergencyGroups(t *testing.T) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ package architect_emergencygroup

import (
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
"github.com/mypurecloud/platform-client-sdk-go/v143/platformclientv2"
"github.com/mypurecloud/platform-client-sdk-go/v146/platformclientv2"
)

func buildSdkEmergencyGroupCallFlows(d *schema.ResourceData) *[]platformclientv2.Emergencycallflow {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (
"time"

"github.com/hashicorp/terraform-plugin-sdk/v2/helper/retry"
"github.com/mypurecloud/platform-client-sdk-go/v143/platformclientv2"
"github.com/mypurecloud/platform-client-sdk-go/v146/platformclientv2"

"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"log"
rc "terraform-provider-genesyscloud/genesyscloud/resource_cache"

"github.com/mypurecloud/platform-client-sdk-go/v143/platformclientv2"
"github.com/mypurecloud/platform-client-sdk-go/v146/platformclientv2"
)

var internalProxy *architectFlowProxy
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ func DataSourceArchitectFlow() *schema.Resource {
Description: "Flow type. Valid options: " + strings.Join(validFlowTypes, ", "),
Type: schema.TypeString,
Optional: true,
ValidateFunc: validation.StringInSlice(validFlowTypes, false),
ValidateFunc: validation.StringInSlice(validFlowTypes, true),
},
},
}
Expand Down
2 changes: 1 addition & 1 deletion genesyscloud/architect_flow/resource_genesyscloud_flow.go
Original file line number Diff line number Diff line change
Expand Up @@ -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/v143/platformclientv2"
"github.com/mypurecloud/platform-client-sdk-go/v146/platformclientv2"
)

func getAllFlows(ctx context.Context, clientConfig *platformclientv2.Configuration) (resourceExporter.ResourceIDMetaMap, diag.Diagnostics) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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/v143/platformclientv2"
"github.com/mypurecloud/platform-client-sdk-go/v146/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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"log"
rc "terraform-provider-genesyscloud/genesyscloud/resource_cache"

"github.com/mypurecloud/platform-client-sdk-go/v143/platformclientv2"
"github.com/mypurecloud/platform-client-sdk-go/v146/platformclientv2"
)

/*
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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/v143/platformclientv2"
"github.com/mypurecloud/platform-client-sdk-go/v146/platformclientv2"
)

/*
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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/v143/platformclientv2"
"github.com/mypurecloud/platform-client-sdk-go/v146/platformclientv2"
)

func TestAccResourceArchitectGrammar(t *testing.T) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (
"terraform-provider-genesyscloud/genesyscloud/util/files"
"time"

"github.com/mypurecloud/platform-client-sdk-go/v143/platformclientv2"
"github.com/mypurecloud/platform-client-sdk-go/v146/platformclientv2"
)

type FileType int
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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/v143/platformclientv2"
"github.com/mypurecloud/platform-client-sdk-go/v146/platformclientv2"
)

/*
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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/v143/platformclientv2"
"github.com/mypurecloud/platform-client-sdk-go/v146/platformclientv2"
)

func TestAccResourceArchitectGrammarLanguage(t *testing.T) {
Expand Down
Loading

0 comments on commit 727265a

Please sign in to comment.