Merge pull request #2004 from The127/unify-receiver-types

Unify receiver types

Author: stgraber

cmd/generate-database/db/mapping.go

@@ -295,7 +295,7 @@ func (f *Field) Stmt() string {
 
 // IsScalar returns true if the field is a scalar column value from a joined table.
 func (f *Field) IsScalar() bool {
-	return f.JoinConfig() != ""
+	return f.joinConfig() != ""
 }
 
 // IsIndirect returns true if the field is a scalar column value from a joined
@@ -318,7 +318,7 @@ func (f *Field) Column() string {
 
 	column := lex.SnakeCase(f.Name)
 
-	join := f.JoinConfig()
+	join := f.joinConfig()
 	if join != "" {
 		column = fmt.Sprintf("%s AS %s", join, column)
 	}
@@ -353,7 +353,7 @@ func (f *Field) SelectColumn(mapping *Mapping, primaryTable string) (string, err
 	}
 
 	var column string
-	join := f.JoinConfig()
+	join := f.joinConfig()
 	if join != "" {
 		column = join
 	} else {
@@ -419,7 +419,7 @@ func (f *Field) JoinClause(mapping *Mapping, table string) (string, error) {
 		return "", fmt.Errorf("Cannot join and leftjoin at the same time for field %q of struct %q", f.Name, mapping.Name)
 	}
 
-	join := f.JoinConfig()
+	join := f.joinConfig()
 	if f.Config.Get("leftjoin") != "" {
 		joinTemplate = strings.ReplaceAll(joinTemplate, "JOIN", "LEFT JOIN")
 	}
@@ -484,7 +484,7 @@ func (f *Field) InsertColumn(mapping *Mapping, primaryTable string, defs map[*as
 			}
 		}
 
-		table, _, ok := strings.Cut(f.JoinConfig(), ".")
+		table, _, ok := strings.Cut(f.joinConfig(), ".")
 		if !ok {
 			return "", "", fmt.Errorf("'join' tag of field %q of struct %q must be of form <table>.<column>", f.Name, mapping.Name)
 		}
@@ -523,7 +523,7 @@ func (f *Field) InsertColumn(mapping *Mapping, primaryTable string, defs map[*as
 	return column, value, nil
 }
 
-func (f Field) JoinConfig() string {
+func (f *Field) joinConfig() string {
 	join := f.Config.Get("join")
 	if join == "" {
 		join = f.Config.Get("leftjoin")
@@ -533,7 +533,7 @@ func (f Field) JoinConfig() string {
 }
 
 // SQLConfig returns the table and column specified by the 'sql' config key, if present.
-func (f Field) SQLConfig() (string, string, error) {
+func (f *Field) SQLConfig() (string, string, error) {
 	where := f.Config.Get("sql")
 
 	if where == "" {
@@ -549,8 +549,8 @@ func (f Field) SQLConfig() (string, string, error) {
 }
 
 // ScalarTableColumn gets the table and column from the join configuration.
-func (f Field) ScalarTableColumn() (string, string, error) {
-	join := f.JoinConfig()
+func (f *Field) ScalarTableColumn() (string, string, error) {
+	join := f.joinConfig()
 
 	if join == "" {
 		return "", "", fmt.Errorf("Missing join config for field %q", f.Name)

cmd/generate-database/db/stmt.go

@@ -311,7 +311,7 @@ func (s *Stmt) namesBy(buf *file.Buffer) error {
 			}
 
 			joins = append(joins, join)
-			column = field.JoinConfig()
+			column = field.joinConfig()
 		} else {
 			column = mapping.FieldColumnName(field.Name, tableName)
 		}
@@ -403,7 +403,7 @@ func (s *Stmt) id(buf *file.Buffer) error {
 
 		var column string
 		if field.IsScalar() {
-			column = field.JoinConfig()
+			column = field.joinConfig()
 
 			join, err := field.JoinClause(mapping, table)
 			joins = append(joins, join)

internal/server/dns/handler.go

@@ -91,7 +91,7 @@ func (d dnsHandler) ServeDNS(w dns.ResponseWriter, r *dns.Msg) {
 	}
 
 	// Check access.
-	if !d.isAllowed(zone.Info, ip, r.IsTsig(), w.TsigStatus() == nil) {
+	if !isAllowed(zone.Info, ip, r.IsTsig(), w.TsigStatus() == nil) {
 		// On auth failure, return NXDOMAIN to avoid information leaks.
 		m := &dns.Msg{}
 		m.SetRcode(r, dns.RcodeNameError)
@@ -138,7 +138,7 @@ func (d dnsHandler) ServeDNS(w dns.ResponseWriter, r *dns.Msg) {
 	}
 }
 
-func (d *dnsHandler) isAllowed(zone api.NetworkZone, ip string, tsig *dns.TSIG, tsigStatus bool) bool {
+func isAllowed(zone api.NetworkZone, ip string, tsig *dns.TSIG, tsigStatus bool) bool {
 	type peer struct {
 		address string
 		key     string

internal/server/storage/drivers/driver_zfs.go

@@ -161,7 +161,7 @@ func (d *zfs) Info() Info {
 // ensureInitialDatasets creates missing initial datasets or configures existing ones with current policy.
 // Accepts warnOnExistingPolicyApplyError argument, if true will warn rather than fail if applying current policy
 // to an existing dataset fails.
-func (d zfs) ensureInitialDatasets(warnOnExistingPolicyApplyError bool) error {
+func (d *zfs) ensureInitialDatasets(warnOnExistingPolicyApplyError bool) error {
 	// Build the list of datasets to query.
 	datasets := []string{d.config["zfs.pool_name"]}
 	for _, entry := range d.initialDatasets() {

shared/api/instance.go

@@ -276,7 +276,7 @@ func (c *Instance) Writable() InstancePut {
 // IsActive checks whether the instance state indicates the instance is active.
 //
 // API extension: instances.
-func (c Instance) IsActive() bool {
+func (c *Instance) IsActive() bool {
 	switch c.StatusCode {
 	case Stopped:
 		return false