mirror of
https://github.com/psviderski/uncloud.git
synced 2026-08-26 11:03:34 +00:00
fix(configs): Create non-existent parent directories automatically (#233)
This commit is contained in:
@@ -13,18 +13,27 @@ import (
|
||||
func configSpecsFromCompose(
|
||||
configs types.Configs, serviceConfigs []types.ServiceConfigObjConfig, workingDir string,
|
||||
) ([]api.ConfigSpec, []api.ConfigMount, error) {
|
||||
var configSpecs []api.ConfigSpec
|
||||
var configMounts []api.ConfigMount
|
||||
|
||||
// Temporary map to hold config specs
|
||||
configSpecsMap := make(map[string]api.ConfigSpec)
|
||||
|
||||
// We iterate over all service config objects (config mounts)
|
||||
for _, serviceConfig := range serviceConfigs {
|
||||
var spec api.ConfigSpec
|
||||
|
||||
if projectConfig, exists := configs[serviceConfig.Source]; exists {
|
||||
if projectConfig.External {
|
||||
return nil, nil, fmt.Errorf("external configs are not supported: %s",
|
||||
serviceConfig.Source)
|
||||
}
|
||||
projectConfig, exists := configs[serviceConfig.Source]
|
||||
if !exists {
|
||||
return nil, nil, fmt.Errorf("config '%s' not found in project configs", serviceConfig.Source)
|
||||
}
|
||||
|
||||
if projectConfig.External {
|
||||
return nil, nil, fmt.Errorf("external configs are not supported: %s",
|
||||
serviceConfig.Source)
|
||||
}
|
||||
|
||||
spec, exists = configSpecsMap[serviceConfig.Source]
|
||||
if !exists {
|
||||
spec = api.ConfigSpec{
|
||||
Name: serviceConfig.Source,
|
||||
Content: []byte(projectConfig.Content),
|
||||
@@ -44,11 +53,9 @@ func configSpecsFromCompose(
|
||||
}
|
||||
spec.Content = fileContent
|
||||
}
|
||||
} else {
|
||||
return nil, nil, fmt.Errorf("config '%s' not found in project configs", serviceConfig.Source)
|
||||
}
|
||||
|
||||
configSpecs = append(configSpecs, spec)
|
||||
configSpecsMap[serviceConfig.Source] = spec
|
||||
}
|
||||
|
||||
// Create config mount
|
||||
target := serviceConfig.Target
|
||||
@@ -71,5 +78,11 @@ func configSpecsFromCompose(
|
||||
configMounts = append(configMounts, mount)
|
||||
}
|
||||
|
||||
var configSpecs []api.ConfigSpec
|
||||
// Convert config spec map to slice
|
||||
for _, spec := range configSpecsMap {
|
||||
configSpecs = append(configSpecs, spec)
|
||||
}
|
||||
|
||||
return configSpecs, configMounts, nil
|
||||
}
|
||||
|
||||
@@ -77,6 +77,147 @@ func TestConfigSpecsFromCompose(t *testing.T) {
|
||||
},
|
||||
},
|
||||
},
|
||||
{
|
||||
name: "same source mounted to different targets",
|
||||
configs: types.Configs{
|
||||
"shared-config": types.ConfigObjConfig{
|
||||
File: "testdata/config1.txt",
|
||||
},
|
||||
},
|
||||
serviceConfigs: []types.ServiceConfigObjConfig{
|
||||
{
|
||||
Source: "shared-config",
|
||||
Target: "/app/config.json",
|
||||
UID: "1000",
|
||||
GID: "1000",
|
||||
},
|
||||
{
|
||||
Source: "shared-config",
|
||||
Target: "/backup/config.json",
|
||||
UID: "1001",
|
||||
GID: "1001",
|
||||
},
|
||||
},
|
||||
expectedSpecs: []api.ConfigSpec{
|
||||
{
|
||||
Name: "shared-config",
|
||||
Content: []byte("test config content\n"),
|
||||
},
|
||||
},
|
||||
expectedMounts: []api.ConfigMount{
|
||||
{
|
||||
ConfigName: "shared-config",
|
||||
ContainerPath: "/app/config.json",
|
||||
Uid: "1000",
|
||||
Gid: "1000",
|
||||
},
|
||||
{
|
||||
ConfigName: "shared-config",
|
||||
ContainerPath: "/backup/config.json",
|
||||
Uid: "1001",
|
||||
Gid: "1001",
|
||||
},
|
||||
},
|
||||
},
|
||||
{
|
||||
name: "config with default target path",
|
||||
configs: types.Configs{
|
||||
"default-config": types.ConfigObjConfig{
|
||||
Content: "inline config content",
|
||||
},
|
||||
},
|
||||
serviceConfigs: []types.ServiceConfigObjConfig{
|
||||
{
|
||||
Source: "default-config",
|
||||
// No Target specified - should use default
|
||||
},
|
||||
},
|
||||
expectedSpecs: []api.ConfigSpec{
|
||||
{
|
||||
Name: "default-config",
|
||||
Content: []byte("inline config content"),
|
||||
},
|
||||
},
|
||||
expectedMounts: []api.ConfigMount{
|
||||
{
|
||||
ConfigName: "default-config",
|
||||
ContainerPath: "/default-config",
|
||||
},
|
||||
},
|
||||
},
|
||||
{
|
||||
name: "config with inline content",
|
||||
configs: types.Configs{
|
||||
"inline-config": types.ConfigObjConfig{
|
||||
Content: "server {\n listen 80;\n}",
|
||||
},
|
||||
},
|
||||
serviceConfigs: []types.ServiceConfigObjConfig{
|
||||
{
|
||||
Source: "inline-config",
|
||||
Target: "/etc/nginx/sites-available/default",
|
||||
Mode: func() *types.FileMode { m := types.FileMode(0o755); return &m }(),
|
||||
},
|
||||
},
|
||||
expectedSpecs: []api.ConfigSpec{
|
||||
{
|
||||
Name: "inline-config",
|
||||
Content: []byte("server {\n listen 80;\n}"),
|
||||
},
|
||||
},
|
||||
expectedMounts: []api.ConfigMount{
|
||||
{
|
||||
ConfigName: "inline-config",
|
||||
ContainerPath: "/etc/nginx/sites-available/default",
|
||||
Mode: func() *os.FileMode { m := os.FileMode(0o755); return &m }(),
|
||||
},
|
||||
},
|
||||
},
|
||||
{
|
||||
name: "config not found error",
|
||||
configs: types.Configs{
|
||||
"existing-config": types.ConfigObjConfig{
|
||||
Content: "some content",
|
||||
},
|
||||
},
|
||||
serviceConfigs: []types.ServiceConfigObjConfig{
|
||||
{
|
||||
Source: "missing-config",
|
||||
Target: "/app/config.json",
|
||||
},
|
||||
},
|
||||
expectError: true,
|
||||
},
|
||||
{
|
||||
name: "external config error",
|
||||
configs: types.Configs{
|
||||
"external-config": types.ConfigObjConfig{
|
||||
External: true,
|
||||
},
|
||||
},
|
||||
serviceConfigs: []types.ServiceConfigObjConfig{
|
||||
{
|
||||
Source: "external-config",
|
||||
Target: "/app/config.json",
|
||||
},
|
||||
},
|
||||
expectError: true,
|
||||
},
|
||||
{
|
||||
name: "file not found error",
|
||||
configs: types.Configs{
|
||||
"missing-file-config": types.ConfigObjConfig{
|
||||
File: "testdata/nonexistent.txt",
|
||||
},
|
||||
},
|
||||
serviceConfigs: []types.ServiceConfigObjConfig{
|
||||
{
|
||||
Source: "missing-file-config",
|
||||
Target: "/app/config.json",
|
||||
},
|
||||
},
|
||||
expectError: true,
|
||||
},
|
||||
}
|
||||
|
||||
for _, tt := range tests {
|
||||
|
||||
Reference in New Issue
Block a user