Merge pull request #422 from mattoddie/feature/google-apps-connection-strategy

Add support for google-apps connection strategy options

Author: sergiught

auth0/resource_auth0_connection_test.go

@@ -820,6 +820,55 @@ resource "auth0_connection" "google_oauth2" {
 }
 `
 
+func TestAccConnectionGoogleApps(t *testing.T) {
+
+	rand := random.String(6)
+
+	resource.Test(t, resource.TestCase{
+		Providers: map[string]terraform.ResourceProvider{
+			"auth0": Provider(),
+		},
+		Steps: []resource.TestStep{
+			{
+				Config: random.Template(testAccConnectionGoogleApps, rand),
+				Check: resource.ComposeTestCheckFunc(
+					random.TestCheckResourceAttr("auth0_connection.google_apps", "name", "Acceptance-Test-Google-Apps-{{.random}}", rand),
+					resource.TestCheckResourceAttr("auth0_connection.google_apps", "strategy", "google-apps"),
+					resource.TestCheckResourceAttr("auth0_connection.google_apps", "options.0.client_id", ""),
+					resource.TestCheckResourceAttr("auth0_connection.google_apps", "options.0.client_secret", ""),
+					resource.TestCheckResourceAttr("auth0_connection.google_apps", "options.0.domain", "example.com"),
+					resource.TestCheckResourceAttr("auth0_connection.google_apps", "options.0.tenant_domain", "example.com"),
+					resource.TestCheckResourceAttr("auth0_connection.google_apps", "options.0.domain_aliases.#", "2"),
+					resource.TestCheckResourceAttr("auth0_connection.google_apps", "options.0.domain_aliases.3506632655", "example.com"),
+					resource.TestCheckResourceAttr("auth0_connection.google_apps", "options.0.domain_aliases.3154807651", "api.example.com"),
+					resource.TestCheckResourceAttr("auth0_connection.google_apps", "options.0.api_enable_users", "true"),
+					resource.TestCheckResourceAttr("auth0_connection.google_apps", "options.0.scopes.#", "2"),
+					resource.TestCheckResourceAttr("auth0_connection.google_apps", "options.0.scopes.1268340351", "ext_profile"),
+					resource.TestCheckResourceAttr("auth0_connection.google_apps", "options.0.scopes.541325467", "ext_groups"),
+				),
+			},
+		},
+	})
+}
+
+const testAccConnectionGoogleApps = `
+
+resource "auth0_connection" "google_apps" {
+	name = "Acceptance-Test-Google-Apps-{{.random}}"
+	is_domain_connection = false
+	strategy = "google-apps"
+	options {
+		client_id = ""
+		client_secret = ""
+		domain = "example.com"
+		tenant_domain = "example.com"
+		domain_aliases = [ "example.com", "api.example.com" ]
+		api_enable_users = true
+		scopes = [ "ext_profile", "ext_groups" ]
+	}
+}
+`
+
 func TestAccConnectionFacebook(t *testing.T) {
 
 	rand := random.String(6)

auth0/structure_auth0_connection.go

@@ -16,6 +16,8 @@ func flattenConnectionOptions(d ResourceData, options interface{}) []interface{}
 		m = flattenConnectionOptionsAuth0(d, o)
 	case *management.ConnectionOptionsGoogleOAuth2:
 		m = flattenConnectionOptionsGoogleOAuth2(o)
+	case *management.ConnectionOptionsGoogleApps:
+		m = flattenConnectionOptionsGoogleApps(o)
 	case *management.ConnectionOptionsOAuth2:
 		m = flattenConnectionOptionsOAuth2(o)
 	case *management.ConnectionOptionsFacebook:
@@ -101,6 +103,21 @@ func flattenConnectionOptionsGoogleOAuth2(o *management.ConnectionOptionsGoogleO
 	}
 }
 
+func flattenConnectionOptionsGoogleApps(o *management.ConnectionOptionsGoogleApps) interface{} {
+	return map[string]interface{}{
+		"client_id":                o.GetClientID(),
+		"client_secret":            o.GetClientSecret(),
+		"domain":                   o.GetDomain(),
+		"tenant_domain":            o.GetTenantDomain(),
+		"api_enable_users":         o.GetEnableUsersAPI(),
+		"scopes":                   o.Scopes(),
+		"set_user_root_attributes": o.GetSetUserAttributes(),
+		"non_persistent_attrs":     o.GetNonPersistentAttrs(),
+		"domain_aliases":           o.DomainAliases,
+		"icon_url":                 o.GetLogoURL(),
+	}
+}
+
 func flattenConnectionOptionsOAuth2(o *management.ConnectionOptionsOAuth2) interface{} {
 	return map[string]interface{}{
 		"client_id":                o.GetClientID(),
@@ -319,6 +336,8 @@ func expandConnection(d ResourceData) *management.Connection {
 			c.Options = expandConnectionOptionsAuth0(d)
 		case management.ConnectionStrategyGoogleOAuth2:
 			c.Options = expandConnectionOptionsGoogleOAuth2(d)
+		case management.ConnectionStrategyGoogleApps:
+			c.Options = expandConnectionOptionsGoogleApps(d)
 		case management.ConnectionStrategyOAuth2:
 			c.Options = expandConnectionOptionsOAuth2(d)
 		case management.ConnectionStrategyFacebook:
@@ -443,6 +462,26 @@ func expandConnectionOptionsGoogleOAuth2(d ResourceData) *management.ConnectionO
 
 	return o
 }
+
+func expandConnectionOptionsGoogleApps(d ResourceData) *management.ConnectionOptionsGoogleApps {
+
+	o := &management.ConnectionOptionsGoogleApps{
+		ClientID:           String(d, "client_id"),
+		ClientSecret:       String(d, "client_secret"),
+		Domain:             String(d, "domain"),
+		TenantDomain:       String(d, "tenant_domain"),
+		EnableUsersAPI:     Bool(d, "api_enable_users"),
+		SetUserAttributes:  String(d, "set_user_root_attributes"),
+		NonPersistentAttrs: castToListOfStrings(Set(d, "non_persistent_attrs").List()),
+		DomainAliases:      Set(d, "domain_aliases").List(),
+		LogoURL:            String(d, "icon_url"),
+	}
+
+	expandConnectionOptionsScopes(d, o)
+
+	return o
+}
+
 func expandConnectionOptionsOAuth2(d ResourceData) *management.ConnectionOptionsOAuth2 {
 
 	o := &management.ConnectionOptionsOAuth2{