Merge pull request #153 from alexkappa/add-client-secret-roatation

Add support for client secret rotation

Author: alexkappa

auth0/resource_auth0_client.go

@@ -38,6 +38,10 @@ func newClient() *schema.Resource {
 				Computed:  true,
 				Sensitive: true,
 			},
+			"client_secret_rotation_trigger": {
+				Type:     schema.TypeMap,
+				Optional: true,
+			},
 			"app_type": {
 				Type:     schema.TypeString,
 				Optional: true,
@@ -509,10 +513,18 @@ func readClient(d *schema.ResourceData, m interface{}) error {
 func updateClient(d *schema.ResourceData, m interface{}) error {
 	c := buildClient(d)
 	api := m.(*management.Management)
-	err := api.Client.Update(d.Id(), c)
+	if clientHasChange(c) {
+		err := api.Client.Update(d.Id(), c)
+		if err != nil {
+			return err
+		}
+	}
+	d.Partial(true)
+	err := rotateClientSecret(d, m)
 	if err != nil {
 		return err
 	}
+	d.Partial(false)
 	return readClient(d, m)
 }
 
@@ -642,3 +654,20 @@ func buildClientAddon(d map[string]interface{}) map[string]interface{} {
 	}
 	return addon
 }
+
+func rotateClientSecret(d *schema.ResourceData, m interface{}) error {
+	if d.HasChange("client_secret_rotation_trigger") {
+		api := m.(*management.Management)
+		c, err := api.Client.RotateSecret(d.Id())
+		if err != nil {
+			return err
+		}
+		d.Set("client_secret", c.ClientSecret)
+	}
+	d.SetPartial("client_secret_rotation_trigger")
+	return nil
+}
+
+func clientHasChange(c *management.Client) bool {
+	return c.String() != "{}"
+}

auth0/resource_auth0_client_test.go

@@ -100,20 +100,20 @@ func TestAccClientZeroValueCheck(t *testing.T) {
 		},
 		Steps: []resource.TestStep{
 			{
-				Config: testAccClientConfig_create,
+				Config: testAccClientConfigCreate,
 				Check: resource.ComposeTestCheckFunc(
 					resource.TestCheckResourceAttr("auth0_client.my_client", "name", "Application - Acceptance Test - Zero Value Check"),
 					resource.TestCheckResourceAttr("auth0_client.my_client", "is_first_party", "false"),
 				),
 			},
 			{
-				Config: testAccClientConfig_update,
+				Config: testAccClientConfigUpdate,
 				Check: resource.ComposeTestCheckFunc(
 					resource.TestCheckResourceAttr("auth0_client.my_client", "is_first_party", "true"),
 				),
 			},
 			{
-				Config: testAccClientConfig_update_again,
+				Config: testAccClientConfigUpdateAgain,
 				Check: resource.ComposeTestCheckFunc(
 					resource.TestCheckResourceAttr("auth0_client.my_client", "is_first_party", "false"),
 				),
@@ -122,23 +122,63 @@ func TestAccClientZeroValueCheck(t *testing.T) {
 	})
 }
 
-const testAccClientConfig_create = `
+const testAccClientConfigCreate = `
 resource "auth0_client" "my_client" {
   name = "Application - Acceptance Test - Zero Value Check"
   is_first_party = false
 }
 `
 
-const testAccClientConfig_update = `
+const testAccClientConfigUpdate = `
 resource "auth0_client" "my_client" {
   name = "Application - Acceptance Test - Zero Value Check"
   is_first_party = true
 }
 `
 
-const testAccClientConfig_update_again = `
+const testAccClientConfigUpdateAgain = `
 resource "auth0_client" "my_client" {
   name = "Application - Acceptance Test - Zero Value Check"
   is_first_party = false
 }
 `
+
+func TestAccClientRotateSecret(t *testing.T) {
+
+	resource.Test(t, resource.TestCase{
+		Providers: map[string]terraform.ResourceProvider{
+			"auth0": Provider(),
+		},
+		Steps: []resource.TestStep{
+			{
+				Config: testAccClientConfigRotateSecret,
+				Check: resource.ComposeTestCheckFunc(
+					resource.TestCheckResourceAttr("auth0_client.my_client", "name", "Application - Acceptance Test - Rotate Secret"),
+				),
+			},
+			{
+				Config: testAccClientConfigRotateSecretUpdate,
+				Check: resource.ComposeTestCheckFunc(
+					resource.TestCheckResourceAttr("auth0_client.my_client", "client_secret_rotation_trigger.triggered_at", "2018-01-02T23:12:01Z"),
+					resource.TestCheckResourceAttr("auth0_client.my_client", "client_secret_rotation_trigger.triggered_by", "alex"),
+				),
+			},
+		},
+	})
+}
+
+const testAccClientConfigRotateSecret = `
+resource "auth0_client" "my_client" {
+  name = "Application - Acceptance Test - Rotate Secret"
+}
+`
+
+const testAccClientConfigRotateSecretUpdate = `
+resource "auth0_client" "my_client" {
+  name = "Application - Acceptance Test - Rotate Secret"
+  client_secret_rotation_trigger = {
+    triggered_at = "2018-01-02T23:12:01Z"
+    triggered_by = "alex"
+  }
+}
+`