[19/X] DXCDT-441: Reintroduce support for zendesk client addon

docs/data-sources/client.md

@@ -93,6 +93,7 @@ Read-Only:
 - `slack` (List of Object) (see [below for nested schema](#nestedobjatt--addons--slack))
 - `springcm` (List of Object) (see [below for nested schema](#nestedobjatt--addons--springcm))
 - `wams` (List of Object) (see [below for nested schema](#nestedobjatt--addons--wams))
+- `zendesk` (List of Object) (see [below for nested schema](#nestedobjatt--addons--zendesk))
 
 <a id="nestedobjatt--addons--aws"></a>
 ### Nested Schema for `addons.aws`
@@ -294,6 +295,14 @@ Read-Only:
 - `master_key` (String)
 
 
+<a id="nestedobjatt--addons--zendesk"></a>
+### Nested Schema for `addons.zendesk`
+
+Read-Only:
+
+- `account_name` (String)
+
+
 
 <a id="nestedatt--jwt_configuration"></a>
 ### Nested Schema for `jwt_configuration`

docs/data-sources/global_client.md

@@ -82,6 +82,7 @@ Read-Only:
 - `slack` (List of Object) (see [below for nested schema](#nestedobjatt--addons--slack))
 - `springcm` (List of Object) (see [below for nested schema](#nestedobjatt--addons--springcm))
 - `wams` (List of Object) (see [below for nested schema](#nestedobjatt--addons--wams))
+- `zendesk` (List of Object) (see [below for nested schema](#nestedobjatt--addons--zendesk))
 
 <a id="nestedobjatt--addons--aws"></a>
 ### Nested Schema for `addons.aws`
@@ -283,6 +284,14 @@ Read-Only:
 - `master_key` (String)
 
 
+<a id="nestedobjatt--addons--zendesk"></a>
+### Nested Schema for `addons.zendesk`
+
+Read-Only:
+
+- `account_name` (String)
+
+
 
 <a id="nestedatt--jwt_configuration"></a>
 ### Nested Schema for `jwt_configuration`

docs/resources/client.md

@@ -155,6 +155,7 @@ Optional:
 - `slack` (Block List, Max: 1) Slack team or workspace name usually first segment in your Slack URL, for example `https://acme-org.slack.com` would be `acme-org`. (see [below for nested schema](#nestedblock--addons--slack))
 - `springcm` (Block List, Max: 1) SpringCM SSO configuration. (see [below for nested schema](#nestedblock--addons--springcm))
 - `wams` (Block List, Max: 1) Windows Azure Mobile Services addon configuration. (see [below for nested schema](#nestedblock--addons--wams))
+- `zendesk` (Block List, Max: 1) Zendesk SSO configuration. (see [below for nested schema](#nestedblock--addons--zendesk))
 
 <a id="nestedblock--addons--aws"></a>
 ### Nested Schema for `addons.aws`
@@ -359,6 +360,14 @@ Optional:
 - `master_key` (String, Sensitive) Your master key for Windows Azure Mobile Services.
 
 
+<a id="nestedblock--addons--zendesk"></a>
+### Nested Schema for `addons.zendesk`
+
+Optional:
+
+- `account_name` (String) Zendesk account name. Usually the first segment in your Zendesk URL, for example `https://acme-org.zendesk.com` would be `acme-org`.
+
+
 
 <a id="nestedblock--jwt_configuration"></a>
 ### Nested Schema for `jwt_configuration`

docs/resources/global_client.md

@@ -98,6 +98,7 @@ Optional:
 - `slack` (Block List, Max: 1) Slack team or workspace name usually first segment in your Slack URL, for example `https://acme-org.slack.com` would be `acme-org`. (see [below for nested schema](#nestedblock--addons--slack))
 - `springcm` (Block List, Max: 1) SpringCM SSO configuration. (see [below for nested schema](#nestedblock--addons--springcm))
 - `wams` (Block List, Max: 1) Windows Azure Mobile Services addon configuration. (see [below for nested schema](#nestedblock--addons--wams))
+- `zendesk` (Block List, Max: 1) Zendesk SSO configuration. (see [below for nested schema](#nestedblock--addons--zendesk))
 
 <a id="nestedblock--addons--aws"></a>
 ### Nested Schema for `addons.aws`
@@ -302,6 +303,14 @@ Optional:
 - `master_key` (String, Sensitive) Your master key for Windows Azure Mobile Services.
 
 
+<a id="nestedblock--addons--zendesk"></a>
+### Nested Schema for `addons.zendesk`
+
+Optional:
+
+- `account_name` (String) Zendesk account name. Usually the first segment in your Zendesk URL, for example `https://acme-org.zendesk.com` would be `acme-org`.
+
+
 
 <a id="nestedblock--jwt_configuration"></a>
 ### Nested Schema for `jwt_configuration`

internal/auth0/client/expand.go

@@ -264,6 +264,7 @@ func expandClientAddons(d *schema.ResourceData) *management.ClientAddons {
 		addons.SharePoint = expandClientAddonSharepoint(addonsCfg.GetAttr("sharepoint"))
 		addons.SpringCM = expandClientAddonSpringCM(addonsCfg.GetAttr("springcm"))
 		addons.WAMS = expandClientAddonWAMS(addonsCfg.GetAttr("wams"))
+		addons.Zendesk = expandClientAddonZendesk(addonsCfg.GetAttr("zendesk"))
 		return stop
 	})
 
@@ -610,6 +611,20 @@ func expandClientAddonWAMS(wamsCfg cty.Value) *management.WAMSClientAddon {
 	return &wamsAddon
 }
 
+func expandClientAddonZendesk(zendeskCfg cty.Value) *management.ZendeskClientAddon {
+	var zendeskAddon management.ZendeskClientAddon
+
+	zendeskCfg.ForEachElement(func(_ cty.Value, zendeskCfg cty.Value) (stop bool) {
+		zendeskAddon = management.ZendeskClientAddon{
+			AccountName: value.String(zendeskCfg.GetAttr("account_name")),
+		}
+
+		return stop
+	})
+
+	return &zendeskAddon
+}
+
 func clientHasChange(c *management.Client) bool {
 	return c.String() != "{}"
 }

internal/auth0/client/flatten.go

@@ -114,6 +114,7 @@ func flattenClientAddons(addons *management.ClientAddons) []interface{} {
 		"sharepoint":             nil,
 		"springcm":               nil,
 		"wams":                   nil,
+		"zendesk":                nil,
 	}
 
 	if addons.GetAWS() != nil {
@@ -316,5 +317,13 @@ func flattenClientAddons(addons *management.ClientAddons) []interface{} {
 		}
 	}
 
+	if addons.GetZendesk() != nil {
+		m["zendesk"] = []interface{}{
+			map[string]interface{}{
+				"account_name": addons.GetZendesk().GetAccountName(),
+			},
+		}
+	}
+
 	return []interface{}{m}
 }

internal/auth0/client/resource.go

@@ -1068,6 +1068,23 @@ func NewResource() *schema.Resource {
 								},
 							},
 						},
+						"zendesk": {
+							Type:        schema.TypeList,
+							Optional:    true,
+							Computed:    true,
+							MaxItems:    1,
+							Description: "Zendesk SSO configuration.",
+							Elem: &schema.Resource{
+								Schema: map[string]*schema.Schema{
+									"account_name": {
+										Description: "Zendesk account name. Usually the first segment in your Zendesk URL, " +
+											"for example `https://acme-org.zendesk.com` would be `acme-org`.",
+										Type:     schema.TypeString,
+										Optional: true,
+									},
+								},
+							},
+						},
 					},
 				},
 			},

internal/auth0/client/resource_test.go

@@ -1020,6 +1020,19 @@ resource "auth0_client" "my_client" {
 }
 `
 
+const testAccUpdateClientWithAddonsZendesk = `
+resource "auth0_client" "my_client" {
+	name = "Acceptance Test - SSO Integration - {{.testName}}"
+	app_type = "sso_integration"
+
+	addons {
+		zendesk {
+			account_name = "acmeorg"
+		}
+	}
+}
+`
+
 func TestAccClientAddons(t *testing.T) {
 	acctest.Test(t, resource.TestCase{
 		Steps: []resource.TestStep{
@@ -1228,6 +1241,15 @@ func TestAccClientAddons(t *testing.T) {
 					resource.TestCheckResourceAttr("auth0_client.my_client", "addons.0.wams.0.master_key", "master-key"),
 				),
 			},
+			{
+				Config: acctest.ParseTestName(testAccUpdateClientWithAddonsZendesk, t.Name()),
+				Check: resource.ComposeTestCheckFunc(
+					resource.TestCheckResourceAttr("auth0_client.my_client", "name", fmt.Sprintf("Acceptance Test - SSO Integration - %s", t.Name())),
+					resource.TestCheckResourceAttr("auth0_client.my_client", "app_type", "sso_integration"),
+					resource.TestCheckResourceAttr("auth0_client.my_client", "addons.#", "1"),
+					resource.TestCheckResourceAttr("auth0_client.my_client", "addons.0.zendesk.0.account_name", "acmeorg"),
+				),
+			},
 		},
 	})
 }