Remove IGA-* triggers

Added explicit check for handling missing env variables for login (auth0#1065)

* Added explicit check for handling missing env variables for login

* Minor changes

* Minor update to test

* Updated test case

* Updated test case

Added support for Custom Email Provider (auth0#1064)

* Added support for custom email provider

* bump

* bump

* Dummy

README.md

@@ -95,3 +95,4 @@ This project is licensed under the MPL-2.0 license. See the [LICENSE](LICENSE) f
 report.
 
 </div>
+

docs/resources/email_provider.md

@@ -51,7 +51,7 @@ resource "auth0_email_provider" "sendgrid_email_provider" {
 
 
 # This is an example on how to set up the email provider with Azure CS.
-resource "auth0_email_provider" "smtp_email_provider" {
+resource "auth0_email_provider" "azure_cs_email_provider" {
   name                 = "azure_cs"
   enabled              = true
   default_from_address = "[email protected]"
@@ -63,7 +63,7 @@ resource "auth0_email_provider" "smtp_email_provider" {
 
 
 # This is an example on how to set up the email provider with MS365.
-resource "auth0_email_provider" "smtp_email_provider" {
+resource "auth0_email_provider" "ms365_email_provider" {
   name                 = "ms365"
   enabled              = true
   default_from_address = "[email protected]"
@@ -74,6 +74,15 @@ resource "auth0_email_provider" "smtp_email_provider" {
     ms365_client_secret = "ms365_client_secret"
   }
 }
+
+# This is an example on how to set up the email provider with a custom action.
+# Make sure a corresponding action exists with custom-email-provider as supported triggers
+resource "auth0_email_provider" "custom_email_provider" {
+  name                 = "custom"
+  enabled              = true
+  default_from_address = "[email protected]"
+  credentials {}
+}
 ```
 
 <!-- schema generated by tfplugindocs -->
@@ -83,7 +92,7 @@ resource "auth0_email_provider" "smtp_email_provider" {
 
 - `credentials` (Block List, Min: 1, Max: 1) Configuration settings for the credentials for the email provider. (see [below for nested schema](#nestedblock--credentials))
 - `default_from_address` (String) Email address to use as the sender when no other "from" address is specified.
-- `name` (String) Name of the email provider. Options include `azure_cs`, `mailgun`, `mandrill`, `ms365`, `sendgrid`, `ses`, `smtp` and `sparkpost`.
+- `name` (String) Name of the email provider. Options include `azure_cs`, `custom`, `mailgun`, `mandrill`, `ms365`, `sendgrid`, `ses`, `smtp` and `sparkpost`.
 
 ### Optional
 

docs/resources/trigger_action.md

@@ -45,7 +45,7 @@ resource "auth0_trigger_action" "post_login_alert_action" {
 ### Required
 
 - `action_id` (String) The ID of the action to bind to the trigger.
-- `trigger` (String) The ID of the trigger to bind with. Available options: `post-login`, `credentials-exchange`, `pre-user-registration`, `post-user-registration`, `post-change-password`, `send-phone-message`, `password-reset-post-challenge`, `iga-approval`, `iga-certification`, `iga-fulfillment-assignment`, `iga-fulfillment-execution`.
+- `trigger` (String) The ID of the trigger to bind with. Available options: `post-login`, `credentials-exchange`, `pre-user-registration`, `post-user-registration`, `post-change-password`, `send-phone-message`, `password-reset-post-challenge`.
 
 ### Optional
 

docs/resources/trigger_actions.md

@@ -66,7 +66,7 @@ resource "auth0_trigger_actions" "login_flow" {
 ### Required
 
 - `actions` (Block List, Min: 1) The list of actions bound to this trigger. (see [below for nested schema](#nestedblock--actions))
-- `trigger` (String) The ID of the trigger to bind with. Options include: `post-login`, `credentials-exchange`, `pre-user-registration`, `post-user-registration`, `post-change-password`, `send-phone-message`, `password-reset-post-challenge`, `iga-approval` , `iga-certification` , `iga-fulfillment-assignment`, `iga-fulfillment-execution`.
+- `trigger` (String) The ID of the trigger to bind with. Options include: `post-login`, `credentials-exchange`, `pre-user-registration`, `post-user-registration`, `post-change-password`, `send-phone-message`, `password-reset-post-challenge`.
 
 ### Read-Only
 

examples/resources/auth0_email_provider/resource.tf

@@ -38,7 +38,7 @@ resource "auth0_email_provider" "sendgrid_email_provider" {
 
 
 # This is an example on how to set up the email provider with Azure CS.
-resource "auth0_email_provider" "smtp_email_provider" {
+resource "auth0_email_provider" "azure_cs_email_provider" {
   name                 = "azure_cs"
   enabled              = true
   default_from_address = "[email protected]"
@@ -50,7 +50,7 @@ resource "auth0_email_provider" "smtp_email_provider" {
 
 
 # This is an example on how to set up the email provider with MS365.
-resource "auth0_email_provider" "smtp_email_provider" {
+resource "auth0_email_provider" "ms365_email_provider" {
   name                 = "ms365"
   enabled              = true
   default_from_address = "[email protected]"
@@ -61,3 +61,12 @@ resource "auth0_email_provider" "smtp_email_provider" {
     ms365_client_secret = "ms365_client_secret"
   }
 }
+
+# This is an example on how to set up the email provider with a custom action.
+# Make sure a corresponding action exists with custom-email-provider as supported triggers
+resource "auth0_email_provider" "custom_email_provider" {
+  name                 = "custom"
+  enabled              = true
+  default_from_address = "[email protected]"
+  credentials {}
+}

internal/auth0/action/resource_trigger_action.go

@@ -38,12 +38,8 @@ func NewTriggerActionResource() *schema.Resource {
 					"post-change-password",
 					"send-phone-message",
 					"password-reset-post-challenge",
-					"iga-approval",
-					"iga-certification",
-					"iga-fulfillment-assignment",
-					"iga-fulfillment-execution",
 				}, false),
-				Description: "The ID of the trigger to bind with. Available options: `post-login`, `credentials-exchange`, `pre-user-registration`, `post-user-registration`, `post-change-password`, `send-phone-message`, `password-reset-post-challenge`, `iga-approval`, `iga-certification`, `iga-fulfillment-assignment`, `iga-fulfillment-execution`.",
+				Description: "The ID of the trigger to bind with. Available options: `post-login`, `credentials-exchange`, `pre-user-registration`, `post-user-registration`, `post-change-password`, `send-phone-message`, `password-reset-post-challenge`.",
 			},
 			"action_id": {
 				Type:        schema.TypeString,

internal/auth0/action/resource_trigger_actions.go

@@ -39,15 +39,10 @@ func NewTriggerActionsResource() *schema.Resource {
 					"post-change-password",
 					"send-phone-message",
 					"password-reset-post-challenge",
-					"iga-approval",
-					"iga-certification",
-					"iga-fulfillment-assignment",
-					"iga-fulfillment-execution",
 				}, false),
 				Description: "The ID of the trigger to bind with. Options include: `post-login`, `credentials-exchange`, " +
 					"`pre-user-registration`, `post-user-registration`, `post-change-password`, `send-phone-message`, " +
-					"`password-reset-post-challenge`, `iga-approval` , `iga-certification` , `iga-fulfillment-assignment`, " +
-					"`iga-fulfillment-execution`.",
+					"`password-reset-post-challenge`.",
 			},
 			"actions": {
 				Type:     schema.TypeList,

internal/auth0/email/expand.go

@@ -31,6 +31,8 @@ func expandEmailProvider(config cty.Value) *management.EmailProvider {
 		expandEmailProviderAzureCS(config, emailProvider)
 	case management.EmailProviderMS365:
 		expandEmailProviderMS365(config, emailProvider)
+	case management.EmailProviderCustom:
+		emailProvider.Credentials = &management.EmailProviderCredentialsCustom{}
 	}
 
 	return emailProvider

internal/auth0/email/flatten.go

@@ -67,6 +67,8 @@ func flattenEmailProviderCredentials(data *schema.ResourceData, emailProvider *m
 			"ms365_client_id":     data.Get("credentials.0.ms365_client_id").(string),
 			"ms365_client_secret": data.Get("credentials.0.ms365_client_secret").(string),
 		}
+	case *management.EmailProviderCredentialsCustom:
+		credentials = map[string]interface{}{}
 	}
 
 	return []interface{}{credentials}

internal/auth0/email/resource.go

@@ -33,11 +33,11 @@ func NewResource() *schema.Resource {
 				Type:     schema.TypeString,
 				Required: true,
 				ValidateFunc: validation.StringInSlice(
-					[]string{"azure_cs", "mailgun", "mandrill", "ms365", "sendgrid", "ses", "smtp", "sparkpost"},
+					[]string{"azure_cs", "custom", "mailgun", "mandrill", "ms365", "sendgrid", "ses", "smtp", "sparkpost"},
 					false,
 				),
 				Description: "Name of the email provider. " +
-					"Options include `azure_cs`, `mailgun`, `mandrill`, `ms365`, `sendgrid`, `ses`, `smtp` and `sparkpost`.",
+					"Options include `azure_cs`, `custom`, `mailgun`, `mandrill`, `ms365`, `sendgrid`, `ses`, `smtp` and `sparkpost`.",
 			},
 			"enabled": {
 				Type:        schema.TypeBool,

internal/auth0/email/resource_test.go

@@ -174,6 +174,24 @@ resource "auth0_email_provider" "my_email_provider" {
 }
 `
 
+const testAccCreateCustomEmailProvider = `
+resource "auth0_email_provider" "my_email_provider" {
+	name = "custom"
+	enabled = true
+	credentials {}
+    default_from_address = "[email protected]"
+}
+`
+
+const testAccUpdateCustomEmailProvider = `
+resource "auth0_email_provider" "my_email_provider" {
+	name = "custom"
+	enabled = false
+	default_from_address = "[email protected]"
+	credentials {}
+}
+`
+
 const testAccAlreadyConfiguredEmailProviderWillNotConflict = `
 resource "auth0_email_provider" "my_email_provider" {
 	name = "mailgun"
@@ -343,6 +361,22 @@ func TestAccEmail(t *testing.T) {
 					resource.TestCheckResourceAttr("auth0_email_provider.my_email_provider", "credentials.0.ms365_client_secret", "ms365_updated_client_secret"),
 				),
 			},
+			{
+				Config: testAccCreateCustomEmailProvider,
+				Check: resource.ComposeTestCheckFunc(
+					resource.TestCheckResourceAttr("auth0_email_provider.my_email_provider", "name", "custom"),
+					resource.TestCheckResourceAttr("auth0_email_provider.my_email_provider", "enabled", "true"),
+					resource.TestCheckResourceAttr("auth0_email_provider.my_email_provider", "default_from_address", "[email protected]"),
+				),
+			},
+			{
+				Config: testAccUpdateCustomEmailProvider,
+				Check: resource.ComposeTestCheckFunc(
+					resource.TestCheckResourceAttr("auth0_email_provider.my_email_provider", "name", "custom"),
+					resource.TestCheckResourceAttr("auth0_email_provider.my_email_provider", "enabled", "false"),
+					resource.TestCheckResourceAttr("auth0_email_provider.my_email_provider", "default_from_address", "[email protected]"),
+				),
+			},
 			{
 				Config: testAccAlreadyConfiguredEmailProviderWillNotConflict,
 				Check: resource.ComposeTestCheckFunc(

internal/config/config.go

@@ -62,6 +62,17 @@ func ConfigureProvider(terraformVersion *string) schema.ConfigureContextFunc {
 		audience := data.Get("audience").(string)
 		debug := data.Get("debug").(bool)
 
+		if apiToken == "" && (clientID == "" || clientSecret == "" || domain == "") {
+			return nil, diag.Diagnostics{
+				{
+					Severity: diag.Error,
+					Summary:  "Missing environment variables",
+					Detail: fmt.Sprintf("Either AUTH0_API_TOKEN or AUTH0_DOMAIN:AUTH0_CLIENT_ID:AUTH0_CLIENT_SECRET must be configured. " +
+						"Ref: https://registry.terraform.io/providers/auth0/auth0/latest/docs"),
+				},
+			}
+		}
+
 		apiClient, err := management.New(domain,
 			authenticationOption(clientID, clientSecret, apiToken, audience),
 			management.WithDebug(debug),

internal/config/config_test.go

@@ -25,7 +25,7 @@ func TestConfigureProvider(t *testing.T) {
 			name: "it can configure a provider with client credentials",
 			givenTerraformConfig: map[string]interface{}{
 				"domain":        "example.auth0.com",
-				"clientID":      "1234567",
+				"client_id":     "1234567",
 				"client_secret": "secret",
 			},
 			expectedDiagnostics: nil,
@@ -34,7 +34,7 @@ func TestConfigureProvider(t *testing.T) {
 			name: "it can configure a provider with client credentials and audience",
 			givenTerraformConfig: map[string]interface{}{
 				"domain":        "example.auth0.com",
-				"clientID":      "1234567",
+				"client_id":     "1234567",
 				"client_secret": "secret",
 				"audience":      "myaudience",
 			},
@@ -56,7 +56,8 @@ func TestConfigureProvider(t *testing.T) {
 			expectedDiagnostics: diag.Diagnostics{
 				diag.Diagnostic{
 					Severity: diag.Error,
-					Summary:  "parse \"https://example.com:path\": invalid port \":path\" after host",
+					Summary:  "Missing environment variables",
+					Detail:   "Either AUTH0_API_TOKEN or AUTH0_DOMAIN:AUTH0_CLIENT_ID:AUTH0_CLIENT_SECRET must be configured. Ref: https://registry.terraform.io/providers/auth0/auth0/latest/docs",
 				},
 			},
 		},

internal/provider/provider.go

@@ -1,12 +1,8 @@
 package provider
 
 import (
-	"context"
-	"fmt"
 	"os"
 
-	"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
-
 	"github.com/auth0/terraform-provider-auth0/internal/auth0/flow"
 
 	"github.com/auth0/terraform-provider-auth0/internal/auth0/form"
@@ -176,29 +172,7 @@ func New() *schema.Provider {
 		},
 	}
 
-	provider.ConfigureContextFunc = func(ctx context.Context, d *schema.ResourceData) (interface{}, diag.Diagnostics) {
-		var diags diag.Diagnostics
-
-		// Check required environment variables.
-		requiredEnvVars := []string{"AUTH0_DOMAIN", "AUTH0_CLIENT_ID", "AUTH0_CLIENT_SECRET"}
-		for _, varName := range requiredEnvVars {
-			value, exists := os.LookupEnv(varName)
-			if !exists || value == "" {
-				diags = append(diags, diag.Diagnostic{
-					Severity: diag.Error,
-					Summary:  fmt.Sprintf("Missing environment variable: %s", varName),
-					Detail:   fmt.Sprintf("The environment variable %s must be set and cannot be empty.", varName),
-				})
-			}
-		}
-
-		if len(diags) > 0 {
-			return nil, diags
-		}
-
-		// Call the original configuration function if no errors.
-		return config.ConfigureProvider(&provider.TerraformVersion)(ctx, d)
-	}
+	provider.ConfigureContextFunc = config.ConfigureProvider(&provider.TerraformVersion)
 
 	return provider
 }