Fix runtime config API compile and test issues

Author: slyt3

pkg/api/v1/workload_service.go

@@ -451,7 +451,7 @@ func runtimeConfigForImageBuild(req *createRequest, runtimeConfigOverride *templ
 		return nil, err
 	}
 
-	baseConfig := runner.GetBaseRuntimeConfig(transportType)
+	baseConfig := getBaseRuntimeConfig(transportType)
 	merged := &templates.RuntimeConfig{
 		BuilderImage:       baseConfig.BuilderImage,
 		AdditionalPackages: append([]string{}, baseConfig.AdditionalPackages...),
@@ -466,6 +466,22 @@ func runtimeConfigForImageBuild(req *createRequest, runtimeConfigOverride *templ
 	return merged, nil
 }
 
+func getBaseRuntimeConfig(transportType templates.TransportType) *templates.RuntimeConfig {
+	provider := config.NewProvider()
+	if userConfig, err := provider.GetRuntimeConfig(string(transportType)); err == nil && userConfig != nil {
+		return &templates.RuntimeConfig{
+			BuilderImage:       userConfig.BuilderImage,
+			AdditionalPackages: append([]string{}, userConfig.AdditionalPackages...),
+		}
+	}
+
+	defaultConfig := templates.GetDefaultRuntimeConfig(transportType)
+	return &templates.RuntimeConfig{
+		BuilderImage:       defaultConfig.BuilderImage,
+		AdditionalPackages: append([]string{}, defaultConfig.AdditionalPackages...),
+	}
+}
+
 // GetWorkloadNamesFromRequest gets workload names from either the names field or group
 func (s *WorkloadService) GetWorkloadNamesFromRequest(ctx context.Context, req bulkOperationRequest) ([]string, error) {
 	if len(req.Names) > 0 {

pkg/api/v1/workload_service_test.go

@@ -15,7 +15,6 @@ import (
 	"github.com/stacklok/toolhive/pkg/config"
 	"github.com/stacklok/toolhive/pkg/container/templates"
 	groupsmocks "github.com/stacklok/toolhive/pkg/groups/mocks"
-	"github.com/stacklok/toolhive/pkg/runner"
 	workloadsmocks "github.com/stacklok/toolhive/pkg/workloads/mocks"
 )
 
@@ -326,7 +325,7 @@ func TestRuntimeConfigForImageBuild(t *testing.T) {
 		require.NotNil(t, result)
 		assert.Equal(t, "golang:1.24-alpine", result.BuilderImage)
 
-		base := runner.GetBaseRuntimeConfig(templates.TransportTypeGO)
+		base := getBaseRuntimeConfig(templates.TransportTypeGO)
 		expectedPackages := append([]string{}, base.AdditionalPackages...)
 		expectedPackages = append(expectedPackages, "curl")
 		assert.Equal(t, expectedPackages, result.AdditionalPackages)

pkg/api/v1/workloads_test.go

@@ -149,7 +149,7 @@ func TestCreateWorkload(t *testing.T) {
 					})
 			},
 			expectedRuntimeConfig: func() *templates.RuntimeConfig {
-				base := runner.GetBaseRuntimeConfig(templates.TransportTypeGO)
+				base := getBaseRuntimeConfig(templates.TransportTypeGO)
 				return &templates.RuntimeConfig{
 					BuilderImage:       "golang:1.24-alpine",
 					AdditionalPackages: append(append([]string{}, base.AdditionalPackages...), "ca-certificates"),

pkg/runner/protocol_test.go

@@ -563,36 +563,49 @@ func TestCreateTemplateData(t *testing.T) {
 func TestLoadRuntimeConfig_UsesBaseConfigWhenOverrideNil(t *testing.T) {
 	t.Parallel()
 
-	base := loadRuntimeConfig(templates.TransportTypeGO, nil)
+	base, err := loadRuntimeConfig(templates.TransportTypeGO, nil)
+	require.NoError(t, err)
 	require.NotNil(t, base)
 	assert.NotEmpty(t, base.BuilderImage)
 }
 
-func TestLoadRuntimeConfig_ReplacesBaseConfigWithOverride(t *testing.T) {
+func TestLoadRuntimeConfig_MergesBaseConfigWithOverride(t *testing.T) {
 	t.Parallel()
 
+	base, err := loadRuntimeConfig(templates.TransportTypeGO, nil)
+	require.NoError(t, err)
+	require.NotNil(t, base)
+
 	override := &templates.RuntimeConfig{
 		BuilderImage:       "golang:1.24-alpine",
 		AdditionalPackages: []string{"curl"},
 	}
-	got := loadRuntimeConfig(templates.TransportTypeGO, override)
+	got, err := loadRuntimeConfig(templates.TransportTypeGO, override)
+	require.NoError(t, err)
 	require.NotNil(t, got)
 	assert.Equal(t, override.BuilderImage, got.BuilderImage)
-	assert.Equal(t, override.AdditionalPackages, got.AdditionalPackages)
+	expectedPackages := append([]string{}, base.AdditionalPackages...)
+	expectedPackages = append(expectedPackages, "curl")
+	assert.Equal(t, expectedPackages, got.AdditionalPackages)
 
 	// Ensure the returned config is detached from input slices.
 	override.AdditionalPackages[0] = "git"
-	assert.Equal(t, []string{"curl"}, got.AdditionalPackages)
+	assert.Equal(t, expectedPackages, got.AdditionalPackages)
 }
 
 func TestLoadRuntimeConfig_UsesOverrideBuilderImage(t *testing.T) {
 	t.Parallel()
 
+	base, err := loadRuntimeConfig(templates.TransportTypeGO, nil)
+	require.NoError(t, err)
+	require.NotNil(t, base)
+
 	customImage := "golang:1.24-alpine"
-	got := loadRuntimeConfig(templates.TransportTypeGO, &templates.RuntimeConfig{
+	got, err := loadRuntimeConfig(templates.TransportTypeGO, &templates.RuntimeConfig{
 		BuilderImage: customImage,
 	})
+	require.NoError(t, err)
 	require.NotNil(t, got)
 	assert.Equal(t, customImage, got.BuilderImage)
-	assert.Empty(t, got.AdditionalPackages)
+	assert.Equal(t, base.AdditionalPackages, got.AdditionalPackages)
 }