-
Notifications
You must be signed in to change notification settings - Fork 2
Create the management role in the database controller #368
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from all commits
Commits
Show all changes
4 commits
Select commit
Hold shift + click to select a range
7659b91
Add preflight checks at the start of each reconciliation loop
tmablunar fab4b85
Create the management role in the database controller
tmablunar daefeec
Quote SQL identifier in EnsureManagerRole to prevent syntax errors an…
tmablunar 57c5152
Resolve merge conflict: keep prepareHost (preflight + manager role) o…
tmablunar File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,23 @@ | ||
| package postgres | ||
|
|
||
| import ( | ||
| "database/sql" | ||
| "fmt" | ||
|
|
||
| "github.com/go-logr/logr" | ||
| "github.com/lib/pq" | ||
| ) | ||
|
|
||
| // EnsureManagerRole creates the management role on db if it does not | ||
| // already exist. The connecting user must have privileges to create roles. | ||
| // Idempotent: a duplicate_object error is treated as a no-op. | ||
| func EnsureManagerRole(log logr.Logger, db *sql.DB, role string) error { | ||
| if role == "" { | ||
| return fmt.Errorf("ensure manager role: role name is empty") | ||
| } | ||
| return tryExec(log, db, tryExecReq{ | ||
| objectType: "management role", | ||
| errorCode: "duplicate_object", | ||
| query: fmt.Sprintf("CREATE ROLE %s", pq.QuoteIdentifier(role)), | ||
| }) | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,40 @@ | ||
| package postgres_test | ||
|
|
||
| import ( | ||
| "fmt" | ||
| "testing" | ||
| "time" | ||
|
|
||
| "github.com/stretchr/testify/assert" | ||
| "github.com/stretchr/testify/require" | ||
| "go.lunarway.com/postgresql-controller/pkg/postgres" | ||
| "go.lunarway.com/postgresql-controller/test" | ||
| ) | ||
|
|
||
| func TestEnsureManagerRole_createsAndIsIdempotent(t *testing.T) { | ||
| host := test.Integration(t) | ||
| log := test.SetLogger(t) | ||
|
|
||
| db := preflightAdminConn(t, host) | ||
| defer db.Close() | ||
|
|
||
| role := fmt.Sprintf("ensure_manager_%d", time.Now().UnixNano()) | ||
| defer func() { | ||
| _, _ = db.Exec(fmt.Sprintf("DROP ROLE %s", role)) | ||
| }() | ||
|
|
||
| require.NoError(t, postgres.EnsureManagerRole(log, db, role), "first call should create the role") | ||
|
|
||
| var exists bool | ||
| require.NoError(t, db.QueryRow(`SELECT EXISTS(SELECT 1 FROM pg_roles WHERE rolname = $1)`, role).Scan(&exists)) | ||
| assert.True(t, exists, "role should exist after EnsureManagerRole") | ||
|
|
||
| assert.NoError(t, postgres.EnsureManagerRole(log, db, role), "second call should be a no-op") | ||
| } | ||
|
|
||
| func TestEnsureManagerRole_emptyName(t *testing.T) { | ||
| log := test.SetLogger(t) | ||
| err := postgres.EnsureManagerRole(log, nil, "") | ||
| require.Error(t, err) | ||
| assert.Contains(t, err.Error(), "role name is empty") | ||
| } |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.