Skip to content

Reduce logging #326

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.

Sign up for GitHub

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 2 commits into from
Jun 23, 2025
Merged

Reduce logging #326

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
440dd12
Reduce logging
mahlunar Jun 20, 2025
4847306
go fmt
mahlunar Jun 20, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions internal/controller/postgresqldatabase_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ func (r *PostgreSQLDatabaseReconciler) SetupWithManager(mgr ctrl.Manager) error
}

func (r *PostgreSQLDatabaseReconciler) reconcile(ctx context.Context, reqLogger logr.Logger, request reconcile.Request) (status, error) {
reqLogger.Info("Reconciling PostgreSQLDatabase")
reqLogger.V(1).Info("Reconciling PostgreSQLDatabase")
// Fetch the PostgreSQLDatabase instance
database := &postgresqlv1alpha1.PostgreSQLDatabase{}
err := r.Client.Get(ctx, request.NamespacedName, database)
Expand All @@ -92,7 +92,7 @@ func (r *PostgreSQLDatabaseReconciler) reconcile(ctx context.Context, reqLogger
"database", database.Spec.Name,
"isShared", database.Spec.IsShared,
)
reqLogger.Info("Updating PostgreSQLDatabase resource")
reqLogger.V(1).Info("Updating PostgreSQLDatabase resource")

status := status{
log: reqLogger,
Expand Down
2 changes: 1 addition & 1 deletion internal/controller/postgresqlhostcredentials_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ func (r *PostgreSQLHostCredentialsReconciler) Reconcile(ctx context.Context, req
reqLogger.Error(err, "Failed to pick a request ID. Continuing without")
}
reqLogger = reqLogger.WithValues("requestId", requestID.String())
reqLogger.Info("Reconciling PostgreSQLHostCredentials")
reqLogger.V(1).Info("Reconciling PostgreSQLHostCredentials")

result, err := r.reconcile(ctx, reqLogger, req)
if err != nil {
Expand Down
4 changes: 2 additions & 2 deletions internal/controller/postgresqluser_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ func (r *PostgreSQLUserReconciler) Reconcile(ctx context.Context, req ctrl.Reque
reqLogger.Error(err, "Failed to pick a request ID. Continuing without")
}
reqLogger = reqLogger.WithValues("requestId", requestID.String())
reqLogger.Info("Reconciling PostgreSQLUSer")
reqLogger.V(1).Info("Reconciling PostgreSQLUSer")

result, err := r.reconcile(ctx, reqLogger, req)
if err != nil {
Expand Down Expand Up @@ -120,7 +120,7 @@ func (r *PostgreSQLUserReconciler) reconcile(ctx context.Context, reqLogger logr

// User instance created or updated
reqLogger = reqLogger.WithValues("user", user.Spec.Name, "rolePrefix", r.RolePrefix)
reqLogger.Info("Reconciling found PostgreSQLUser resource", "user", user.Spec.Name)
reqLogger.V(1).Info("Reconciling found PostgreSQLUser resource", "user", user.Spec.Name)

awsConfig := &aws.Config{
Region: aws.String(r.AWSRegion),
Expand Down
2 changes: 1 addition & 1 deletion pkg/daemon/daemon.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ func (d *Daemon) Loop(stop chan struct{}) {
d.config.Sync()
syncTimer.Reset(d.config.SyncInterval)
case <-syncTimer.C:
d.config.Logger.Info("Sync timer asking for sync")
d.config.Logger.V(1).Info("Sync timer asking for sync")
// request a new sync in the sync buffer. This might be a noop if a sync
// is already running.
d.askForSync()
Expand Down
18 changes: 9 additions & 9 deletions pkg/grants/grants.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,12 +97,12 @@ func (g *Granter) groupByHosts(log logr.Logger, hosts HostAccess, namespace stri

// access it not requested to be granted yet
if !access.Start.IsZero() && g.Now().Before(access.Start.Time) {
reqLogger.Info("Skipping access spec: start time is in the future")
reqLogger.V(1).Info("Skipping access spec: start time is in the future")
continue
}
// access request has expired
if !access.Stop.IsZero() && g.Now().After(access.Stop.Time) {
reqLogger.Info("Skipping access spec: stop time is in the past")
reqLogger.V(1).Info("Skipping access spec: stop time is in the past")
continue
}
host, err := g.ResourceResolver(access.Host, namespace)
Expand All @@ -116,10 +116,10 @@ func (g *Granter) groupByHosts(log logr.Logger, hosts HostAccess, namespace stri
reqLogger = reqLogger.WithValues("host", host)
if access.AllDatabases != nil && *access.AllDatabases {
if !allDatabasesEnabled {
reqLogger.Info("Skipping access spec: allDatabases feature not enabled")
reqLogger.V(1).Info("Skipping access spec: allDatabases feature not enabled")
continue
}
reqLogger.Info("Grouping access for all databases on host")
reqLogger.V(1).Info("Grouping access for all databases on host")
err := g.groupAllDatabasesByHost(reqLogger, hosts, host, namespace, access, privilege)
if err != nil {
errs = multierr.Append(errs, fmt.Errorf("all databases: %w", &AccessError{
Expand Down Expand Up @@ -165,15 +165,15 @@ func (g *Granter) groupAllDatabasesByHost(reqLogger logr.Logger, hosts HostAcces
return fmt.Errorf("get all databases: %w", err)
}
if len(databases) == 0 {
reqLogger.WithValues("spec", access, "privilege", privilege, "host", host, "namespace", namespace).Info(fmt.Sprintf("Flag allDatabases results in no privileges granted: no PostgreSQLDatabase resources found on host '%s'", host))
reqLogger.WithValues("spec", access, "privilege", privilege, "host", host, "namespace", namespace).V(1).Info(fmt.Sprintf("Flag allDatabases results in no privileges granted: no PostgreSQLDatabase resources found on host '%s'", host))
return nil
}
reqLogger.Info(fmt.Sprintf("Found %d PostgreSQLDatabase resources in namespace '%s'", len(databases), namespace))
reqLogger.V(1).Info(fmt.Sprintf("Found %d PostgreSQLDatabase resources in namespace '%s'", len(databases), namespace))
var errs error
for _, databaseResource := range databases {
database := databaseResource.Spec.Name
if databaseResource.Status.Phase != lunarwayv1alpha1.PostgreSQLDatabasePhaseRunning {
reqLogger.Info(fmt.Sprintf("Skipping resource '%s' as it is not in phase running", database))
reqLogger.V(1).Info(fmt.Sprintf("Skipping resource '%s' as it is not in phase running", database))
continue
}
databaseHost, err := g.ResourceResolver(databaseResource.Spec.Host, namespace)
Expand All @@ -182,7 +182,7 @@ func (g *Granter) groupAllDatabasesByHost(reqLogger logr.Logger, hosts HostAcces
continue
}
if host != databaseHost {
reqLogger.Info(fmt.Sprintf("Skipping resource '%s' as it is on another host (%s)", database, databaseHost))
reqLogger.V(1).Info(fmt.Sprintf("Skipping resource '%s' as it is on another host (%s)", database, databaseHost))
continue
}
schema, err := g.ResourceResolver(databaseResource.Spec.User, namespace)
Expand All @@ -193,7 +193,7 @@ func (g *Granter) groupAllDatabasesByHost(reqLogger logr.Logger, hosts HostAcces
if schema == "" {
schema = database
}
reqLogger.Info(fmt.Sprintf("Resolved database '%s' with schema '%s'", database, schema))
reqLogger.V(1).Info(fmt.Sprintf("Resolved database '%s' with schema '%s'", database, schema))
hosts[host] = append(hosts[host], ReadWriteAccess{
Host: host,
Database: postgres.DatabaseSchema{
Expand Down
8 changes: 4 additions & 4 deletions pkg/iam/iam.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ type EnsureUserConfig struct {

func EnsureUser(client *Client, log logr.Logger, config EnsureUserConfig, userName, rolename string) error {
users := make(map[string]struct{})
log.Info("listing iam policies")
log.V(1).Info("listing iam policies")
policies, err := client.ListPolicies()
if err != nil {
return err
Expand All @@ -42,7 +42,7 @@ func EnsureUser(client *Client, log logr.Logger, config EnsureUserConfig, userNa
// Try to update the document where the user is present to ensure correct roleName.
updated := policy.Document.Update(config.Region, config.AccountID, config.RolePrefix, userName, rolename)
if updated {
log.Info("updating policies for user", "userName", userName, "roleName", rolename)
log.V(1).Info("updating policies for user", "userName", userName, "roleName", rolename)
err = updatePolicies(client, policies)
if err != nil {
return err
Expand All @@ -55,7 +55,7 @@ func EnsureUser(client *Client, log logr.Logger, config EnsureUserConfig, userNa
} else {
for _, policy := range policies {
if policy.Document.Count() < config.MaxUsersPerPolicy {
log.Info("adding user to policy document", "userName", userName, "roleName", rolename)
log.V(1).Info("adding user to policy document", "userName", userName, "roleName", rolename)
policy.Document.Add(config.Region, config.AccountID, config.RolePrefix, userName, rolename)
err = updatePolicies(client, policies)
if err != nil {
Expand All @@ -69,7 +69,7 @@ func EnsureUser(client *Client, log logr.Logger, config EnsureUserConfig, userNa

// User could not be handled in an existing policy so we create a new one instead.
if !userHandled {
log.Info("creating a new policy document because of user", "userName", userName, "roleName", rolename)
log.V(1).Info("creating a new policy document because of user", "userName", userName, "roleName", rolename)
// TODO : There is a bug where where the new name might exist. This could for instance be the case where a policy i is deleted but i+1 exists. Then len(policies) = i+1 and there is a clash.
newPolicy := &Policy{
Name: fmt.Sprintf("%s_%d", config.PolicyBaseName, len(policies)),
Expand Down
10 changes: 5 additions & 5 deletions pkg/postgres/database.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -290,7 +290,7 @@ func setDefaultPrivileges(serviceConnection *sql.DB, serviceRole, readRole, read
}

func revokeAllOnPublic(log logr.Logger, serviceConnection *sql.DB, serviceCredentials Credentials) error {
log.Info(fmt.Sprintf("Revoke ALL on role PUBLIC for database '%s'", serviceCredentials.Name))
log.V(1).Info(fmt.Sprintf("Revoke ALL on role PUBLIC for database '%s'", serviceCredentials.Name))
err := execAsf(serviceConnection, serviceCredentials.User, `
REVOKE ALL ON DATABASE %s from PUBLIC;
REVOKE ALL ON SCHEMA public from PUBLIC;
Expand All @@ -303,13 +303,13 @@ func revokeAllOnPublic(log logr.Logger, serviceConnection *sql.DB, serviceCreden

func grantConnectAndUsage(log logr.Logger, serviceConnection *sql.DB, serviceCredentials Credentials) error {
// Grant CONNECT privileges to PUBLIC again to ensure new roles are allowed to connect.
log.Info("Grant CONNECT to PUBLIC")
log.V(1).Info("Grant CONNECT to PUBLIC")
err := execAsf(serviceConnection, serviceCredentials.User, "GRANT CONNECT ON DATABASE %s TO PUBLIC", serviceCredentials.Name)
if err != nil {
return fmt.Errorf("grant connect to database '%s' to PUBLIC: %w as %s", serviceCredentials.Name, err, serviceCredentials.User)
}

log.Info(fmt.Sprintf("Grant usage on schema '%s' to PUBLIC", serviceCredentials.User))
log.V(1).Info(fmt.Sprintf("Grant usage on schema '%s' to PUBLIC", serviceCredentials.User))
err = execAsf(serviceConnection, serviceCredentials.User, "GRANT USAGE ON SCHEMA %s TO PUBLIC", serviceCredentials.User)
if err != nil {
return fmt.Errorf("grant usage on schema '%s' to PUBLIC: %w as %s", serviceCredentials.User, err, serviceCredentials.User)
Expand All @@ -331,9 +331,9 @@ func tryExec(log logr.Logger, db *sql.DB, args tryExecReq) error {
if !ok || pqError.Code.Name() != args.errorCode {
return err
}
log.Info(fmt.Sprintf("expected err '%s' occured. Ignoring for objectType '%s'", args.errorCode, args.objectType), "errorCode", pqError.Code, "errorName", pqError.Code.Name())
log.V(1).Info(fmt.Sprintf("expected err '%s' occured. Ignoring for objectType '%s'", args.errorCode, args.objectType), "errorCode", pqError.Code, "errorName", pqError.Code.Name())
} else {
log.Info(fmt.Sprintf("%s created", args.objectType))
log.V(1).Info(fmt.Sprintf("%s created", args.objectType))
}
return nil
}
Expand Down
8 changes: 4 additions & 4 deletions pkg/postgres/postgres.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,17 +97,17 @@ func (p Privilege) String() string {
}

func Role(log logr.Logger, db *sql.DB, name string, roles []string, databases []DatabaseSchema) error {
log.Info(fmt.Sprintf("Creating role %s", name))
log.V(1).Info(fmt.Sprintf("Creating role %s", name))
query := fmt.Sprintf("CREATE ROLE %s WITH LOGIN", name)
_, err := db.Exec(query)
if err != nil {
pqError, ok := err.(*pq.Error)
if !ok || pqError.Code.Name() != "duplicate_object" {
return fmt.Errorf("create role %s: %w", name, err)
}
log.Info(fmt.Sprintf("Role %s already exists", name), "errorCode", pqError.Code, "errorName", pqError.Code.Name())
log.V(1).Info(fmt.Sprintf("Role %s already exists", name), "errorCode", pqError.Code, "errorName", pqError.Code.Name())
} else {
log.Info(fmt.Sprintf("Role %s created", name))
log.V(1).Info(fmt.Sprintf("Role %s created", name))
}

// grant database access roles to created role
Expand All @@ -116,7 +116,7 @@ func Role(log logr.Logger, db *sql.DB, name string, roles []string, databases []
return fmt.Errorf("get existing roles: %w", err)
}
grantableRoles, revokeableRoles := rolesDiff(log, existingRoles, roles, databases)
log.Info(fmt.Sprintf("Found %d grantable and %d revokable roles for %s", len(grantableRoles), len(revokeableRoles), name), "grantable", grantableRoles, "revokeable", revokeableRoles)
log.V(1).Info(fmt.Sprintf("Found %d grantable and %d revokable roles for %s", len(grantableRoles), len(revokeableRoles), name), "grantable", grantableRoles, "revokeable", revokeableRoles)
if len(grantableRoles) != 0 {
joinedRoles := strings.Join(grantableRoles, ",")
_, err = db.Exec(fmt.Sprintf("GRANT %s TO %s", joinedRoles, name))
Expand Down
Loading