chore: review

Signed-off-by: Niccolò Fei <[email protected]>

Author: NiccoloFei

dagger/maintenance/main.go

@@ -15,15 +15,15 @@ import (
 
 type Maintenance struct{}
 
-// Updates the OS dependencies in the system-libs directory for the specified extension(s)
+// UpdateOSLibs updates the OS dependencies in the system-libs directory for the specified extension(s)
 func (m *Maintenance) UpdateOSLibs(
 	ctx context.Context,
-// The source directory containing the extension folders. Defaults to the current directory
-// +ignore=["dagger", ".github"]
-// +defaultPath="/"
+	// The source directory containing the extension folders. Defaults to the current directory
+	// +ignore=["dagger", ".github"]
+	// +defaultPath="/"
 	source *dagger.Directory,
-// The target extension to update OS libs for. Defaults to "all".
-// +default="all"
+	// The target extension to update OS libs for. Defaults to "all".
+	// +default="all"
 	target string,
 ) (*dagger.Directory, error) {
 	extDir := source
@@ -50,7 +50,7 @@ func (m *Maintenance) UpdateOSLibs(
 			return nil, err
 		}
 
-		files := make([]*dagger.File, 0, len(matrix.Distributions)+len(matrix.MajorVersions))
+		files := make([]*dagger.File, 0, len(matrix.Distributions)*len(matrix.MajorVersions))
 		for _, distribution := range matrix.Distributions {
 			for _, majorVersion := range matrix.MajorVersions {
 				file, err := updateOSLibsOnTarget(
@@ -73,12 +73,12 @@ func (m *Maintenance) UpdateOSLibs(
 	}), nil
 }
 
-// Return a list in JSON format of the extensions requiring OS libs updates
+// UpdateOSLibsTargets return a list in JSON format of the extensions requiring OS libs updates
 func (m *Maintenance) UpdateOSLibsTargets(
 	ctx context.Context,
-// The source directory containing the extension folders. Defaults to the current directory
-// +ignore=["dagger", ".github"]
-// +defaultPath="/"
+	// The source directory containing the extension folders. Defaults to the current directory
+	// +ignore=["dagger", ".github"]
+	// +defaultPath="/"
 	source *dagger.Directory,
 ) (string, error) {
 	targetExtensions, err := extensionsWithOSLibs(ctx, source)

dagger/maintenance/parse.go

@@ -29,13 +29,11 @@ const (
 )
 
 func parseBuildMatrix(ctx context.Context, source *dagger.Directory, target string) (*buildMatrix, error) {
-	bakeData, err := source.File(
-		bakeFileName).Contents(ctx)
+	bakeData, err := source.File(bakeFileName).Contents(ctx)
 	if err != nil {
 		return nil, err
 	}
-	metadata, err := source.File(
-		path.Join(target, metadataFile)).Contents(ctx)
+	metadata, err := source.File(path.Join(target, metadataFile)).Contents(ctx)
 	if err != nil {
 		return nil, err
 	}
@@ -54,7 +52,6 @@ func parseBuildMatrix(ctx context.Context, source *dagger.Directory, target stri
 	}
 
 	var matrix buildMatrix
-
 	for _, variable := range p.AllVariables {
 		switch variable.Name {
 		case "distributions":
@@ -79,27 +76,22 @@ func parseBuildMatrix(ctx context.Context, source *dagger.Directory, target stri
 	return &matrix, nil
 }
 
-func parseExtensionMetadata(ctx context.Context, source *dagger.Directory) (*extensionMetadata, error) {
+func parseExtensionMetadata(ctx context.Context, extensionDirectory *dagger.Directory) (*extensionMetadata, error) {
 	type Config struct {
 		Metadata extensionMetadata `hcl:"metadata"`
 		Remain   hcl.Body          `hcl:",remain"`
 	}
 
-	data, err := source.File(
-		metadataFile).Contents(ctx)
+	data, err := extensionDirectory.File(metadataFile).Contents(ctx)
 	if err != nil {
 		return nil, err
 	}
 
 	var rootMeta Config
-	err = hclsimple.Decode(
-		metadataFile,
-		[]byte(data),
-		nil,
-		&rootMeta,
-	)
+	err = hclsimple.Decode(metadataFile, []byte(data), nil, &rootMeta)
 	if err != nil {
 		return nil, err
 	}
+
 	return &rootMeta.Metadata, nil
 }

dagger/maintenance/updatelibs.go

@@ -15,9 +15,7 @@ func updateOSLibsOnTarget(
 	distribution string,
 	majorVersion string,
 ) (*dagger.File, error) {
-	postgresBaseImage := fmt.Sprintf("ghcr.io/cloudnative-pg/postgresql:%s-minimal-%s",
-		majorVersion,
-		distribution)
+	postgresBaseImage := fmt.Sprintf("ghcr.io/cloudnative-pg/postgresql:%s-minimal-%s", majorVersion, distribution)
 	packageName := fmt.Sprintf("postgresql-%s-%s", majorVersion, target)
 	out, err := dag.Container().
 		From(postgresBaseImage).
@@ -39,6 +37,7 @@ func updateOSLibsOnTarget(
 		}
 	}
 	file := dag.File(fmt.Sprintf("%s-%s-os-libs.txt", majorVersion, distribution), result)
+
 	return file, nil
 }
 
@@ -51,7 +50,7 @@ func extensionsWithOSLibs(
 		return nil, err
 	}
 
-	extensions := make(map[string]string, 0)
+	extensions := make(map[string]string)
 	for _, dir := range dirs {
 		metadata, err := parseExtensionMetadata(ctx, dir)
 		if err != nil {