Skip to content

refactor(mysql): consistent username/host parameters #205

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
Duologic merged 1 commit into from
Dec 13, 2024
+13 −17
Merged

refactor(mysql): consistent username/host parameters #205

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
30 changes: 13 additions & 17 deletions pkg/controller/mysql/grant/reconciler.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,11 +145,11 @@ func (c *external) Observe(ctx context.Context, mg resource.Managed) (managed.Ex
return managed.ExternalObservation{}, errors.New(errNotGrant)
}

username := *cr.Spec.ForProvider.User
username, host := mysql.SplitUserHost(*cr.Spec.ForProvider.User)
dbname := defaultIdentifier(cr.Spec.ForProvider.Database)
table := defaultIdentifier(cr.Spec.ForProvider.Table)

observedPrivileges, result, err := c.getPrivileges(ctx, username, dbname, table)
observedPrivileges, result, err := c.getPrivileges(ctx, username, host, dbname, table)
if err != nil {
return managed.ExternalObservation{}, err
}
Expand Down Expand Up @@ -193,9 +193,7 @@ func parseGrant(grant, dbname string, table string) (privileges []string) {
return nil
}

func (c *external) getPrivileges(ctx context.Context, username, dbname string, table string) ([]string, *managed.ExternalObservation, error) {
username, host := mysql.SplitUserHost(username)

func (c *external) getPrivileges(ctx context.Context, username, host, dbname, table string) ([]string, *managed.ExternalObservation, error) {
privileges, err := c.parseGrantRows(ctx, username, host, dbname, table)
if err != nil {
var myErr *mysqldriver.MySQLError
Expand Down Expand Up @@ -225,7 +223,7 @@ func (c *external) getPrivileges(ctx context.Context, username, dbname string, t
return ret, nil, nil
}

func (c *external) parseGrantRows(ctx context.Context, username string, host string, dbname string, table string) ([]string, error) {
func (c *external) parseGrantRows(ctx context.Context, username, host, dbname, table string) ([]string, error) {
query := fmt.Sprintf("SHOW GRANTS FOR %s@%s", mysql.QuoteValue(username), mysql.QuoteValue(host))
rows, err := c.db.Query(ctx, xsql.Query{String: query})

Expand Down Expand Up @@ -262,12 +260,12 @@ func (c *external) Create(ctx context.Context, mg resource.Managed) (managed.Ext
return managed.ExternalCreation{}, errors.New(errNotGrant)
}

username := *cr.Spec.ForProvider.User
username, host := mysql.SplitUserHost(*cr.Spec.ForProvider.User)
dbname := defaultIdentifier(cr.Spec.ForProvider.Database)
table := defaultIdentifier(cr.Spec.ForProvider.Table)

privileges, grantOption := getPrivilegesString(cr.Spec.ForProvider.Privileges.ToStringSlice())
query := createGrantQuery(privileges, dbname, username, table, grantOption)
query := createGrantQuery(privileges, dbname, username, host, table, grantOption)

if err := mysql.ExecWrapper(ctx, c.db, mysql.ExecQuery{Query: query, ErrorValue: errCreateGrant}); err != nil {
return managed.ExternalCreation{}, err
Expand All @@ -281,7 +279,7 @@ func (c *external) Update(ctx context.Context, mg resource.Managed) (managed.Ext
return managed.ExternalUpdate{}, errors.New(errNotGrant)
}

username := *cr.Spec.ForProvider.User
username, host := mysql.SplitUserHost(*cr.Spec.ForProvider.User)
dbname := defaultIdentifier(cr.Spec.ForProvider.Database)
table := defaultIdentifier(cr.Spec.ForProvider.Table)

Expand All @@ -292,7 +290,7 @@ func (c *external) Update(ctx context.Context, mg resource.Managed) (managed.Ext
if len(toRevoke) > 0 {
sort.Strings(toRevoke)
privileges, grantOption := getPrivilegesString(toRevoke)
query := createRevokeQuery(privileges, dbname, username, table, grantOption)
query := createRevokeQuery(privileges, dbname, username, host, table, grantOption)
if err := mysql.ExecWrapper(ctx, c.db,
mysql.ExecQuery{
Query: query, ErrorValue: errRevokeGrant,
Expand All @@ -304,7 +302,7 @@ func (c *external) Update(ctx context.Context, mg resource.Managed) (managed.Ext
if len(toGrant) > 0 {
sort.Strings(toGrant)
privileges, grantOption := getPrivilegesString(toGrant)
query := createGrantQuery(privileges, dbname, username, table, grantOption)
query := createGrantQuery(privileges, dbname, username, host, table, grantOption)
if err := mysql.ExecWrapper(ctx, c.db,
mysql.ExecQuery{
Query: query, ErrorValue: errCreateGrant,
Expand All @@ -330,8 +328,7 @@ func getPrivilegesString(privileges []string) (string, bool) {
return out, grantOption
}

func createRevokeQuery(privileges, dbname, username string, table string, grantOption bool) string {
username, host := mysql.SplitUserHost(username)
func createRevokeQuery(privileges, dbname, username, host, table string, grantOption bool) string {
result := fmt.Sprintf("REVOKE %s ON %s.%s FROM %s@%s",
privileges,
dbname,
Expand All @@ -347,8 +344,7 @@ func createRevokeQuery(privileges, dbname, username string, table string, grantO
return result
}

func createGrantQuery(privileges, dbname, username string, table string, grantOption bool) string {
username, host := mysql.SplitUserHost(username)
func createGrantQuery(privileges, dbname, username, host, table string, grantOption bool) string {
result := fmt.Sprintf("GRANT %s ON %s.%s TO %s@%s",
privileges,
dbname,
Expand All @@ -370,12 +366,12 @@ func (c *external) Delete(ctx context.Context, mg resource.Managed) error {
return errors.New(errNotGrant)
}

username := *cr.Spec.ForProvider.User
username, host := mysql.SplitUserHost(*cr.Spec.ForProvider.User)
dbname := defaultIdentifier(cr.Spec.ForProvider.Database)
table := defaultIdentifier(cr.Spec.ForProvider.Table)

privileges, grantOption := getPrivilegesString(cr.Spec.ForProvider.Privileges.ToStringSlice())
query := createRevokeQuery(privileges, dbname, username, table, grantOption)
query := createRevokeQuery(privileges, dbname, username, host, table, grantOption)

if err := mysql.ExecWrapper(ctx, c.db, mysql.ExecQuery{Query: query, ErrorValue: errRevokeGrant}); err != nil {
var myErr *mysqldriver.MySQLError
Expand Down