Fix issue with organization.metadata field not getting set to empty

auth0 · Jul 18, 2022 · 36398e8 · 36398e8
1 parent 9ecabef
commit 36398e8
Show file tree

Hide file tree

Showing 3 changed files with 242 additions and 221 deletions.
diff --git a/auth0/resource_auth0_organization.go b/auth0/resource_auth0_organization.go
@@ -145,12 +145,11 @@ func updateOrganization(ctx context.Context, d *schema.ResourceData, m interface
 func deleteOrganization(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
 	api := m.(*management.Management)
 	if err := api.Organization.Delete(d.Id()); err != nil {
-		if mErr, ok := err.(management.Error); ok {
-			if mErr.Status() == http.StatusNotFound {
-				d.SetId("")
-				return nil
-			}
+		if err, ok := err.(management.Error); ok && err.Status() == http.StatusNotFound {
+			d.SetId("")
+			return nil
 		}
+		return diag.FromErr(err)
 	}
 
 	return nil
@@ -208,10 +207,12 @@ func updateOrganizationConnections(d *schema.ResourceData, api *management.Manag
 }
 
 func expandOrganization(d *schema.ResourceData) *management.Organization {
+	metadata := Map(d, "metadata")
+
 	organization := &management.Organization{
 		Name:        String(d, "name"),
 		DisplayName: String(d, "display_name"),
-		Metadata:    Map(d, "metadata"),
+		Metadata:    &metadata,
 	}
 
 	List(d, "branding").Elem(func(d ResourceData) {

diff --git a/auth0/resource_auth0_organization_test.go b/auth0/resource_auth0_organization_test.go
@@ -71,6 +71,10 @@ resource auth0_organization acme {
 	name = "test-{{.testName}}"
 	display_name = "Acme Inc. {{.testName}}"
 
+	metadata = {
+		some_key = "some_value"
+	}
+
 	connections {
 		connection_id = auth0_connection.acme.id
 	}
@@ -81,17 +85,25 @@ const testAccOrganizationUpdate = testAccOrganizationGiven2Connections + `
 resource auth0_organization acme {
 	name = "test-{{.testName}}"
 	display_name = "Acme Inc. {{.testName}}"
+
+	metadata = {
+		some_key = "some_value"
+		another_key = "another_value"
+	}
+
 	branding {
 		logo_url = "https://acme.com/logo.svg"
 		colors = {
 			primary = "#e3e2f0"
 			page_background = "#e3e2ff"
 		}
 	}
+
 	connections {
 		connection_id = auth0_connection.acme.id
 		assign_membership_on_login = false
 	}
+
 	connections {
 		connection_id = auth0_connection.acmeinc.id
 		assign_membership_on_login = true
@@ -104,6 +116,10 @@ resource auth0_organization acme {
 	name = "test-{{.testName}}"
 	display_name = "Acme Inc. {{.testName}}"
 
+	metadata = {
+		some_key = "some_value"
+	}
+
 	branding {
 		logo_url = "https://acme.com/logo.svg"
 		colors = {
@@ -158,7 +174,8 @@ func TestAccOrganization(t *testing.T) {
 					resource.TestCheckResourceAttr("auth0_organization.acme", "name", fmt.Sprintf("test-%s", strings.ToLower(t.Name()))),
 					resource.TestCheckResourceAttr("auth0_organization.acme", "display_name", fmt.Sprintf("Acme Inc. %s", strings.ToLower(t.Name()))),
 					resource.TestCheckResourceAttr("auth0_organization.acme", "branding.#", "0"),
-					resource.TestCheckResourceAttr("auth0_organization.acme", "metadata.%", "0"),
+					resource.TestCheckResourceAttr("auth0_organization.acme", "metadata.%", "1"),
+					resource.TestCheckResourceAttr("auth0_organization.acme", "metadata.some_key", "some_value"),
 					resource.TestCheckResourceAttr("auth0_organization.acme", "connections.#", "1"),
 					resource.TestCheckResourceAttrSet("auth0_organization.acme", "connections.0.connection_id"),
 					resource.TestCheckResourceAttr("auth0_organization.acme", "connections.0.assign_membership_on_login", "false"),
@@ -174,7 +191,9 @@ func TestAccOrganization(t *testing.T) {
 					resource.TestCheckResourceAttr("auth0_organization.acme", "branding.0.colors.%", "2"),
 					resource.TestCheckResourceAttr("auth0_organization.acme", "branding.0.colors.primary", "#e3e2f0"),
 					resource.TestCheckResourceAttr("auth0_organization.acme", "branding.0.colors.page_background", "#e3e2ff"),
-					resource.TestCheckResourceAttr("auth0_organization.acme", "metadata.%", "0"),
+					resource.TestCheckResourceAttr("auth0_organization.acme", "metadata.%", "2"),
+					resource.TestCheckResourceAttr("auth0_organization.acme", "metadata.some_key", "some_value"),
+					resource.TestCheckResourceAttr("auth0_organization.acme", "metadata.another_key", "another_value"),
 					resource.TestCheckResourceAttr("auth0_organization.acme", "connections.#", "2"),
 					resource.TestCheckResourceAttrSet("auth0_organization.acme", "connections.0.connection_id"),
 					resource.TestCheckResourceAttrSet("auth0_organization.acme", "connections.1.connection_id"),
@@ -192,7 +211,8 @@ func TestAccOrganization(t *testing.T) {
 					resource.TestCheckResourceAttr("auth0_organization.acme", "branding.0.colors.%", "2"),
 					resource.TestCheckResourceAttr("auth0_organization.acme", "branding.0.colors.primary", "#e3e2f0"),
 					resource.TestCheckResourceAttr("auth0_organization.acme", "branding.0.colors.page_background", "#e3e2ff"),
-					resource.TestCheckResourceAttr("auth0_organization.acme", "metadata.%", "0"),
+					resource.TestCheckResourceAttr("auth0_organization.acme", "metadata.%", "1"),
+					resource.TestCheckResourceAttr("auth0_organization.acme", "metadata.some_key", "some_value"),
 					resource.TestCheckResourceAttr("auth0_organization.acme", "connections.#", "1"),
 					resource.TestCheckResourceAttrSet("auth0_organization.acme", "connections.0.connection_id"),
 					resource.TestCheckResourceAttr("auth0_organization.acme", "connections.0.assign_membership_on_login", "false"),