Merge branch 'lxc:main' into main

Author: shama7g

.devcontainer/Dockerfile

@@ -95,6 +95,7 @@ RUN go install -v github.com/google/go-licenses@latest && \
     GOTOOLCHAIN="" go install -v golang.org/x/tools/gopls@latest && \
     go install -v github.com/go-delve/delve/cmd/dlv@latest && \
     go install -v golang.org/x/tools/cmd/goimports@latest && \
+    go install -v golang.org/x/vuln/cmd/govulncheck@latest && \
     curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(go env GOPATH)/bin
 
 # Make dependencies

Makefile

@@ -297,6 +297,9 @@ static-analysis:
 ifeq ($(shell command -v go-licenses),)
 	(cd / ; $(GO) install -v -x github.com/google/go-licenses@latest)
 endif
+ifeq ($(shell command -v govulncheck),)
+	go install golang.org/x/vuln/cmd/govulncheck@latest
+endif
 ifeq ($(shell command -v golangci-lint),)
 	curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $$($(GO) env GOPATH)/bin
 endif

client/incus_certificates.go

@@ -36,6 +36,23 @@ func (r *ProtocolIncus) GetCertificates() ([]api.Certificate, error) {
 	return certificates, nil
 }
 
+// GetCertificatesWithFilter returns a filtered list of certificates.
+func (r *ProtocolIncus) GetCertificatesWithFilter(filters []string) ([]api.Certificate, error) {
+	certificates := []api.Certificate{}
+
+	v := url.Values{}
+	v.Set("recursion", "1")
+	v.Set("filter", parseFilters(filters))
+
+	// Fetch the raw value
+	_, err := r.queryStruct("GET", fmt.Sprintf("/certificates?%s", v.Encode()), nil, "", &certificates)
+	if err != nil {
+		return nil, err
+	}
+
+	return certificates, nil
+}
+
 // GetCertificate returns the certificate entry for the provided fingerprint.
 func (r *ProtocolIncus) GetCertificate(fingerprint string) (*api.Certificate, string, error) {
 	certificate := api.Certificate{}

client/incus_images.go

@@ -279,7 +279,7 @@ func incusDownloadImage(fingerprint string, uri string, userAgent string, do fun
 	}
 
 	// Hashing
-	hashSHA256 := sha256.New()
+	hash256 := sha256.New()
 
 	// Deal with split images
 	if ctype == "multipart/form-data" {
@@ -300,7 +300,7 @@ func incusDownloadImage(fingerprint string, uri string, userAgent string, do fun
 			return nil, fmt.Errorf("Invalid multipart image")
 		}
 
-		size, err := io.Copy(io.MultiWriter(req.MetaFile, hashSHA256), part)
+		size, err := io.Copy(io.MultiWriter(req.MetaFile, hash256), part)
 		if err != nil {
 			return nil, err
 		}
@@ -318,7 +318,7 @@ func incusDownloadImage(fingerprint string, uri string, userAgent string, do fun
 			return nil, fmt.Errorf("Invalid multipart image")
 		}
 
-		size, err = io.Copy(io.MultiWriter(req.RootfsFile, hashSHA256), part)
+		size, err = io.Copy(io.MultiWriter(req.RootfsFile, hash256), part)
 		if err != nil {
 			return nil, err
 		}
@@ -327,7 +327,7 @@ func incusDownloadImage(fingerprint string, uri string, userAgent string, do fun
 		resp.RootfsName = part.FileName()
 
 		// Check the hash
-		hash := fmt.Sprintf("%x", hashSHA256.Sum(nil))
+		hash := fmt.Sprintf("%x", hash256.Sum(nil))
 		if imageType != "oci" && !strings.HasPrefix(hash, fingerprint) {
 			return nil, fmt.Errorf("Image fingerprint doesn't match. Got %s expected %s", hash, fingerprint)
 		}
@@ -346,7 +346,7 @@ func incusDownloadImage(fingerprint string, uri string, userAgent string, do fun
 		return nil, fmt.Errorf("No filename in Content-Disposition header")
 	}
 
-	size, err := io.Copy(io.MultiWriter(req.MetaFile, hashSHA256), body)
+	size, err := io.Copy(io.MultiWriter(req.MetaFile, hash256), body)
 	if err != nil {
 		return nil, err
 	}
@@ -355,7 +355,7 @@ func incusDownloadImage(fingerprint string, uri string, userAgent string, do fun
 	resp.MetaName = filename
 
 	// Check the hash
-	hash := fmt.Sprintf("%x", hashSHA256.Sum(nil))
+	hash := fmt.Sprintf("%x", hash256.Sum(nil))
 	if imageType != "oci" && !strings.HasPrefix(hash, fingerprint) {
 		return nil, fmt.Errorf("Image fingerprint doesn't match. Got %s expected %s", hash, fingerprint)
 	}

client/interfaces.go

@@ -89,6 +89,7 @@ type InstanceServer interface {
 	// Certificate functions
 	GetCertificateFingerprints() (fingerprints []string, err error)
 	GetCertificates() (certificates []api.Certificate, err error)
+	GetCertificatesWithFilter(filters []string) ([]api.Certificate, error)
 	GetCertificate(fingerprint string) (certificate *api.Certificate, ETag string, err error)
 	CreateCertificate(certificate api.CertificatesPost) (err error)
 	UpdateCertificate(fingerprint string, certificate api.CertificatePut, ETag string) (err error)

cmd/generate-config/incus_doc.go

@@ -75,7 +75,7 @@ func getSortedKeysFromMap[K string, V IterableAny](m map[K]V) []K {
 
 func parse(path string, outputJSONPath string, excludedPaths []string) (*doc, error) {
 	jsonDoc := &doc{}
-	docKeys := make(map[string]struct{}, 0)
+	docKeys := make(map[string]struct{})
 	projectEntries := make(map[string]any)
 	err := filepath.Walk(path, func(path string, info os.FileInfo, err error) error {
 		if err != nil {

cmd/generate-database/db/parse.go

@@ -175,7 +175,7 @@ func Parse(localPath string, pkgs []*types.Package, name string, kind string) (*
 		m.Package = pkg.Name()
 		m.Name = name
 		m.Fields = fields
-		m.Type = tableType(pkgs, name, fields)
+		m.Type = tableType(pkgs, fields)
 		m.Filterable = true
 
 		oldStructHasTags := false
@@ -303,19 +303,33 @@ func ParseStmt(name string, defs map[*ast.Ident]types.Object, registeredSQLStmts
 }
 
 // tableType determines the TableType for the given struct fields.
-func tableType(pkgs []*types.Package, name string, fields []*Field) TableType {
+func tableType(pkgs []*types.Package, fields []*Field) TableType {
 	fieldNames := FieldNames(fields)
-	entities := strings.Split(lex.SnakeCase(name), "_")
-	if len(entities) == 2 {
+	idFields := []string{}
+	for _, field := range fields {
+		if field.Name == "ID" {
+			idFields = nil
+			break
+		}
+
+		if strings.HasSuffix(lex.SnakeCase(field.Name), "_id") {
+			structName, ok := strings.CutSuffix(field.Name, "ID")
+			if ok {
+				idFields = append(idFields, structName)
+			}
+		}
+	}
+
+	if len(idFields) == 2 {
 		var struct1 *types.Struct
 		var struct2 *types.Struct
 		for _, pkg := range pkgs {
 			if struct1 == nil {
-				struct1 = findStruct(pkg.Scope(), lex.PascalCase(lex.Singular(entities[0])))
+				struct1 = findStruct(pkg.Scope(), lex.PascalCase(lex.Singular(idFields[0])))
 			}
 
 			if struct2 == nil {
-				struct2 = findStruct(pkg.Scope(), lex.PascalCase(lex.Singular(entities[1])))
+				struct2 = findStruct(pkg.Scope(), lex.PascalCase(lex.Singular(idFields[1])))
 			}
 		}
 

cmd/generate-database/db/stmt.go

@@ -6,6 +6,7 @@ import (
 	"fmt"
 	"go/ast"
 	"go/types"
+	"slices"
 	"strings"
 
 	"golang.org/x/tools/go/packages"
@@ -141,7 +142,9 @@ func (s *Stmt) objects(buf *file.Buffer) error {
 			return err
 		}
 
-		joins = append(joins, join)
+		if !slices.Contains(joins, join) {
+			joins = append(joins, join)
+		}
 	}
 
 	table += strings.Join(joins, "")
@@ -310,7 +313,10 @@ func (s *Stmt) namesBy(buf *file.Buffer) error {
 				return err
 			}
 
-			joins = append(joins, join)
+			if !slices.Contains(joins, join) {
+				joins = append(joins, join)
+			}
+
 			column = field.joinConfig()
 		} else {
 			column = mapping.FieldColumnName(field.Name, tableName)
@@ -406,7 +412,10 @@ func (s *Stmt) id(buf *file.Buffer) error {
 			column = field.joinConfig()
 
 			join, err := field.JoinClause(mapping, table)
-			joins = append(joins, join)
+			if !slices.Contains(joins, join) {
+				joins = append(joins, join)
+			}
+
 			if err != nil {
 				return err
 			}

cmd/generate-database/lex/form.go

@@ -16,6 +16,10 @@ func Plural(s string) string {
 		return s + "es"
 	}
 
+	if strings.HasSuffix(s, "y") {
+		return s[:len(s)-1] + "ies"
+	}
+
 	if s[len(s)-1] != 's' {
 		return s + "s"
 	}
@@ -26,7 +30,12 @@ func Plural(s string) string {
 // Singular converts to singular form ("foos" -> "foo").
 func Singular(s string) string {
 	// TODO: smarter algorithm? :)
-	before, ok := strings.CutSuffix(s, "es")
+	before, ok := strings.CutSuffix(s, "ies")
+	if ok {
+		return before + "y"
+	}
+
+	before, ok = strings.CutSuffix(s, "es")
 	if ok && (strings.HasSuffix(before, "ch") || strings.HasSuffix(before, "sh") || strings.HasSuffix(before, "ss")) {
 		return before
 	}

cmd/incus-agent/dev_incus.go

@@ -251,14 +251,14 @@ func hoistReq(f func(*Daemon, http.ResponseWriter, *http.Request) *devIncusRespo
 }
 
 func devIncusAPI(d *Daemon) http.Handler {
-	m := mux.NewRouter()
-	m.UseEncodedPath() // Allow encoded values in path segments.
+	router := mux.NewRouter()
+	router.UseEncodedPath() // Allow encoded values in path segments.
 
 	for _, handler := range handlers {
-		m.HandleFunc(handler.path, hoistReq(handler.f, d))
+		router.HandleFunc(handler.path, hoistReq(handler.f, d))
 	}
 
-	return m
+	return router
 }
 
 // Create a new net.Listener bound to the unix socket of the DevIncus endpoint.