handling seq privilege

Author: pramodh-ayyappan

controllers/postgresql/grant_controller.go

@@ -27,6 +27,8 @@ import (
 	"strings"
 	"time"
 
+	"golang.org/x/exp/slices"
+
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime"
@@ -224,7 +226,7 @@ func (r *GrantReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctrl
 								return ctrl.Result{}, nil
 							}
 						} else if currentGrantType == common.GRANTTABLE {
-							if check_all.MatchString(*existingGrant.Spec.Table) && existingGrant.Spec.Schema != grant.Spec.Schema {
+							if check_all.MatchString(*existingGrant.Spec.Table) && existingGrant.Spec.Schema == grant.Spec.Schema {
 								reason := fmt.Sprintf(
 									"Already a grant `%s/%s` created with ALL tables permission for role `%s/%s`. So delete this grant `%s/%s`",
 									existingGrant.Namespace,
@@ -237,7 +239,7 @@ func (r *GrantReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctrl
 								r.appendGrantStatusCondition(ctx, grant, common.FAIL, metav1.ConditionFalse, GRANTDUPLICATED, reason)
 								grantLogger.Error(err, reason)
 								return ctrl.Result{}, nil
-							} else if existingGrant.Spec.Table == grant.Spec.Table && existingGrant.Spec.Schema != grant.Spec.Schema {
+							} else if existingGrant.Spec.Table == grant.Spec.Table && existingGrant.Spec.Schema == grant.Spec.Schema {
 								reason := fmt.Sprintf(
 									"Already a grant `%s/%s` created with `%s` table permission for role `%s/%s`. So delete this grant `%s/%s`",
 									existingGrant.Namespace,
@@ -572,7 +574,7 @@ func (r *GrantReconciler) ObserveGrantState(ctx context.Context, grant *postgres
 
 	case common.GRANTTABLE:
 		if check_all.MatchString(privileges[0]) {
-			privileges = []string{"INSERT", "SELECT", "UPDATE", "DELETE", "TRUNCATE", "REFERENCES", "TRIGGER"}
+			privileges = []string{"INSERT", "SELECT", "UPDATE", "DELETE", "TRUNCATE", "REFERENCES", "TRIGGER", "USAGE"}
 		}
 
 		if check_all.MatchString(table) {
@@ -603,6 +605,8 @@ func (r *GrantReconciler) ObserveGrantState(ctx context.Context, grant *postgres
 			}
 			sort.Sort(sort.StringSlice(privileges))
 			sort.Sort(sort.StringSlice(futureTablesResults))
+			privileges = slices.Compact(privileges)
+			futureTablesResults = slices.Compact(futureTablesResults)
 			if cmp.Equal(privileges, futureTablesResults) {
 				isGrantStateNotChanged = true
 			} else {

go.mod

@@ -3,9 +3,11 @@ module github.com/Facets-cloud/postgresql-operator
 go 1.19
 
 require (
+	github.com/google/go-cmp v0.5.9
 	github.com/lib/pq v1.10.8
 	github.com/onsi/ginkgo/v2 v2.6.0
 	github.com/onsi/gomega v1.24.1
+	golang.org/x/exp v0.0.0-20231127185646-65229373498e
 	k8s.io/api v0.26.0
 	k8s.io/apimachinery v0.26.0
 	k8s.io/client-go v0.26.0
@@ -28,7 +30,6 @@ require (
 	github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
 	github.com/golang/protobuf v1.5.2 // indirect
 	github.com/google/gnostic v0.5.7-v3refs // indirect
-	github.com/google/go-cmp v0.5.9 // indirect
 	github.com/google/gofuzz v1.1.0 // indirect
 	github.com/google/uuid v1.1.2 // indirect
 	github.com/imdario/mergo v0.3.6 // indirect

go.sum

@@ -298,6 +298,8 @@ golang.org/x/exp v0.0.0-20191227195350-da58074b4299/go.mod h1:2RIsYlXP63K8oxa1u0
 golang.org/x/exp v0.0.0-20200119233911-0405dc783f0a/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4=
 golang.org/x/exp v0.0.0-20200207192155-f17229e696bd/go.mod h1:J/WKrq2StrnmMY6+EHIKF9dgMWnmCNThgcyBT1FY9mM=
 golang.org/x/exp v0.0.0-20200224162631-6cc2880d07d6/go.mod h1:3jZMyOhIsHpP37uCMkUooju7aAi5cS1Q23tOzKc+0MU=
+golang.org/x/exp v0.0.0-20231127185646-65229373498e h1:Gvh4YaCaXNs6dKTlfgismwWZKyjVZXwOPfIyUaqU3No=
+golang.org/x/exp v0.0.0-20231127185646-65229373498e/go.mod h1:iRJReGqOEeBhDZGkGbynYwcHlctCvnjTYIamk7uXpHI=
 golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js=
 golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0=
 golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=