Skip to content

Commit 7bc2642

Browse files
committed
add by default public
1 parent f8a5cbe commit 7bc2642

File tree

3 files changed

+8
-8
lines changed

3 files changed

+8
-8
lines changed

Diff for: .github/workflows/docker.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ name: Publish Container Image
33
on:
44
push:
55
branches:
6-
- 'main'
6+
- '*'
77
tags:
88
- '*'
99
workflow_dispatch:

Diff for: pkg/controller/postgres/postgres_controller.go

+5-5
Original file line numberDiff line numberDiff line change
@@ -206,7 +206,7 @@ func (r *ReconcilePostgres) Reconcile(request reconcile.Request) (_ reconcile.Re
206206
readerPrivs = "SELECT"
207207
writerPrivs = "SELECT,INSERT,DELETE,UPDATE"
208208
)
209-
for _, schema := range instance.Spec.Schemas {
209+
for _, schema := range append(instance.Spec.Schemas, "public") {
210210
// Schema was previously created
211211
if utils.ListContains(instance.Status.Schemas, schema) {
212212
continue
@@ -226,17 +226,17 @@ func (r *ReconcilePostgres) Reconcile(request reconcile.Request) (_ reconcile.Re
226226
reqLogger.Error(err, fmt.Sprintf("Could not give %s permissions \"%s\"", reader, readerPrivs))
227227
continue
228228
}
229-
reqLogger.Info("about to give writer %s permissions", writer)
230-
schemaPrivilegesWriter := postgres.PostgresSchemaPrivileges{database, owner, writer, schema, writerPrivs, true}
229+
reqLogger.Info(fmt.Sprintf("about to give writer %s permissions", writer))
230+
schemaPrivilegesWriter := postgres.PostgresSchemaPrivileges{database, owner, writer, schema, writerPrivs, false}
231231
err = r.pg.SetSchemaPrivileges(schemaPrivilegesWriter, reqLogger)
232232
if err != nil {
233233
reqLogger.Error(err, fmt.Sprintf("Could not give %s permissions \"%s\"", writer, writerPrivs))
234234
continue
235235
}
236-
sequncesPrivilegesWriter := postgres.PostgresSequncesPrivileges{database, owner, writer, schema, writerPrivs}
236+
sequncesPrivilegesWriter := postgres.PostgresSequncesPrivileges{database, owner, writer, schema, "USAGE"}
237237
err = r.pg.SetSequncesPrivileges(sequncesPrivilegesWriter, reqLogger)
238238
if err != nil {
239-
reqLogger.Error(err, fmt.Sprintf("Could not give %s permissions for sequnces \"%s\"", writer, writerPrivs))
239+
reqLogger.Error(err, fmt.Sprintf("Could not give %s permissions for sequnces \"%s\"", writer, "USAGE"))
240240
continue
241241
}
242242
schemaPrivilegesOwner := postgres.PostgresSchemaPrivileges{database, owner, owner, schema, readerPrivs, true}

Diff for: pkg/postgres/database.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -109,13 +109,13 @@ func (c *pg) SetSchemaPrivileges(schemaPrivileges PostgresSchemaPrivileges, logg
109109
if err != nil {
110110
return err
111111
}
112-
logger.Info("about to give permissions of %s to %s", schemaPrivileges.Privs, schemaPrivileges.Role)
112+
logger.Info(fmt.Sprintf("about to give permissions of %s to %s", schemaPrivileges.Privs, schemaPrivileges.Role)
113113
// Grant role privs on existing tables in schema
114114
_, err = tmpDb.Exec(fmt.Sprintf(GRANT_ALL_TABLES, schemaPrivileges.Privs, schemaPrivileges.Schema, schemaPrivileges.Role))
115115
if err != nil {
116116
return err
117117
}
118-
logger.Info("about to give default permissions of %s to %s", schemaPrivileges.Privs, schemaPrivileges.Role)
118+
logger.Info(fmt.Sprintf("about to give default permissions of %s to %s", schemaPrivileges.Privs, schemaPrivileges.Role))
119119
// Grant role privs on future tables in schema
120120
_, err = tmpDb.Exec(fmt.Sprintf(DEFAULT_PRIVS_SCHEMA, schemaPrivileges.Creator, schemaPrivileges.Schema, schemaPrivileges.Privs, schemaPrivileges.Role))
121121
if err != nil {

0 commit comments

Comments
 (0)