Fix Removed Grants (#245)

MaterializeInc · Jul 27, 2023 · ed01ac4 · ed01ac4
1 parent c59fcdb
commit ed01ac4
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 3 deletions.
diff --git a/pkg/resources/resource_grant.go b/pkg/resources/resource_grant.go
@@ -3,6 +3,7 @@ package resources
 import (
 	"context"
 	"fmt"
+	"log"
 	"strings"
 
 	"github.com/MaterializeInc/terraform-provider-materialize/pkg/materialize"
@@ -48,7 +49,9 @@ func grantRead(ctx context.Context, d *schema.ResourceData, meta interface{}) di
 	privilege := d.Get("privilege").(string)
 
 	if !materialize.HasPrivilege(priviledgeMap[key.roleId], privilege) {
-		return diag.Errorf("%s: object does not contain privilege: %s", i, privilege)
+		log.Printf("[DEBUG] %s: object does not contain privilege: %s", i, privilege)
+		// Remove id from state
+		d.SetId("")
 	}
 
 	return nil

diff --git a/pkg/resources/resource_grant_default_privilege.go b/pkg/resources/resource_grant_default_privilege.go
@@ -4,6 +4,7 @@ import (
 	"context"
 	"database/sql"
 	"fmt"
+	"log"
 	"strings"
 
 	"github.com/MaterializeInc/terraform-provider-materialize/pkg/materialize"
@@ -71,8 +72,9 @@ func grantDefaultPrivilegeRead(ctx context.Context, d *schema.ResourceData, meta
 	}
 
 	if !slices.Contains(mapping[mapKey], key.privilege) {
+		log.Printf("[DEBUG] %s: object does not contain privilege: %s", i, key.privilege)
+		// Remove id from state
 		d.SetId("")
-		return diag.Errorf("%s: %s default privilege does not contain privilege %s", mapping, i, key.privilege)
 	}
 
 	d.SetId(i)

diff --git a/pkg/resources/resource_grant_system_privilege.go b/pkg/resources/resource_grant_system_privilege.go
@@ -4,6 +4,7 @@ import (
 	"context"
 	"database/sql"
 	"fmt"
+	"log"
 	"strings"
 
 	"github.com/MaterializeInc/terraform-provider-materialize/pkg/materialize"
@@ -80,8 +81,9 @@ func grantSystemPrivilegeRead(ctx context.Context, d *schema.ResourceData, meta
 	mapping, _ := materialize.ParseSystemPrivileges(privileges)
 
 	if !slices.Contains(mapping[key.roleId], key.privilege) {
+		log.Printf("[DEBUG] %s: object does not contain privilege: %s", i, key.privilege)
+		// Remove id from state
 		d.SetId("")
-		return diag.Errorf("system role does contain privilege %s", key.privilege)
 	}
 
 	d.SetId(i)