Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
9 changes: 6 additions & 3 deletions dagger/maintenance/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -202,9 +202,12 @@ func (m *Maintenance) GenerateTestingValues(
return nil, err
}

extensions := make([]*ExtensionConfiguration, len(extensionInfos))
for i, info := range extensionInfos {
extensions[i] = info.Configuration
extensions := make([]*ExtensionConfiguration, 0, len(extensionInfos))
for _, info := range extensionInfos {
if info.Configuration == nil {
continue
}
extensions = append(extensions, info.Configuration)
}

databaseConfig := generateDatabaseConfig(extensionInfos)
Expand Down
30 changes: 29 additions & 1 deletion dagger/maintenance/testingvalues.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ package main
import (
"context"
"fmt"
"strings"

"dagger/maintenance/internal/dagger"
)
Expand Down Expand Up @@ -37,6 +38,8 @@ type testingExtensionInfo struct {
CreateExtension bool
}

const baseImageDependencyPrefix = "base-image:"

type imageLocator struct {
ExtensionImage string
PgMajor int
Expand Down Expand Up @@ -64,7 +67,19 @@ func generateTestingValuesExtensions(
CreateExtension: metadata.CreateExtension,
})

for _, dep := range metadata.RequiredExtensions {
for _, requiredDependency := range metadata.RequiredExtensions {
dep, isBaseImageDependency, err := parseRequiredDependency(requiredDependency)
if err != nil {
return nil, err
}
if isBaseImageDependency {
out = append(out, &testingExtensionInfo{
SQLName: dep,
CreateExtension: true,
})
continue
}

depExists, err := source.Exists(ctx, dep)
if err != nil {
return nil, err
Expand Down Expand Up @@ -108,6 +123,19 @@ func generateTestingValuesExtensions(
return out, nil
}

func parseRequiredDependency(dependency string) (string, bool, error) {
if !strings.HasPrefix(dependency, baseImageDependencyPrefix) {
return dependency, false, nil
}

name := strings.TrimPrefix(dependency, baseImageDependencyPrefix)
if name == "" {
return "", false, fmt.Errorf("base-image dependency %q has no extension name", dependency)
}

return name, true, nil
}

func generateExtensionConfiguration(metadata *extensionMetadata, extensionImage string) (*ExtensionConfiguration, error) {
targetExtensionImage := extensionImage
if targetExtensionImage == "" {
Expand Down
6 changes: 4 additions & 2 deletions templates/metadata.hcl.tmpl
Original file line number Diff line number Diff line change
Expand Up @@ -98,8 +98,10 @@ metadata = {
auto_update_os_libs = false

# TODO: Remove this comment block after customizing the file.
# `required_extensions`: must contain the name(s) of the sibling
# folders in this repository that contain a required extension.
# `required_extensions`: names of required extensions. By default each name
# must identify a sibling folder in this repository. Prefix dependencies
# provided by the PostgreSQL base image with `base-image:` (for example,
# `base-image:pg_stat_statements`).
required_extensions = []

# TODO: Remove this comment block after customizing the file.
Expand Down