adopt new loading pipeline to load compose files

Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>

Author: ndeloof

loader/compose_model.go

@@ -322,32 +322,30 @@ func LoadConfigFiles(ctx context.Context, configFiles []string, workingDir strin
 
 // LoadWithContext reads a ConfigDetails and returns a fully loaded configuration as a compose-go Project
 func LoadWithContext(ctx context.Context, configDetails types.ConfigDetails, options ...func(*Options)) (*types.Project, error) {
-	opts := ToOptions(&configDetails, options)
-	dict, err := loadModelWithContext(ctx, &configDetails, opts)
+	model, err := LoadLazyModel(ctx, configDetails, options...)
 	if err != nil {
 		return nil, err
 	}
-	return ModelToProject(dict, opts, configDetails)
+	return model.Resolve()
 }
 
 // LoadModelWithContext reads a ConfigDetails and returns a fully loaded configuration as a yaml dictionary
 func LoadModelWithContext(ctx context.Context, configDetails types.ConfigDetails, options ...func(*Options)) (map[string]any, error) {
-	opts := ToOptions(&configDetails, options)
-	return loadModelWithContext(ctx, &configDetails, opts)
-}
-
-// LoadModelWithContext reads a ConfigDetails and returns a fully loaded configuration as a yaml dictionary
-func loadModelWithContext(ctx context.Context, configDetails *types.ConfigDetails, opts *Options) (map[string]any, error) {
-	if len(configDetails.ConfigFiles) < 1 {
-		return nil, errors.New("no compose file specified")
+	project, err := LoadWithContext(ctx, configDetails, options...)
+	if err != nil {
+		return nil, err
 	}
-
-	err := projectName(configDetails, opts)
+	// Marshal the typed project back to a yaml dictionary for backward compatibility
+	b, err := yaml.Marshal(project)
 	if err != nil {
 		return nil, err
 	}
-
-	return load(ctx, *configDetails, opts, nil)
+	var dict map[string]any
+	if err := yaml.Unmarshal(b, &dict); err != nil {
+		return nil, err
+	}
+	dict["name"] = project.Name
+	return dict, nil
 }
 
 func ToOptions(configDetails *types.ConfigDetails, options []func(*Options)) *Options {

loader/loader.go

@@ -109,7 +109,7 @@ networks:
         - subnet: 172.28.0.0/16
 `
 
-var samplePortsConfig = []types.ServicePortConfig{
+var samplePortsConfig = types.ServicePorts{
 	{
 		Mode:      "ingress",
 		Target:    8080,
@@ -2281,7 +2281,7 @@ services:
         capabilities: ["directX"]
 `)
 	assert.NilError(t, err)
-	assert.DeepEqual(t, p.Services["test"].Gpus, []types.DeviceRequest{
+	assert.DeepEqual(t, p.Services["test"].Gpus, types.GpuDevices{
 		{
 			Driver: "nvidia",
 			Count:  -1,
@@ -3889,10 +3889,10 @@ models:
 		ContextSize:  1024,
 		RuntimeFlags: []string{"--some-flag"},
 	})
-	assert.DeepEqual(t, p.Services["test_array"].Models, map[string]*types.ServiceModelConfig{
+	assert.DeepEqual(t, p.Services["test_array"].Models, types.ServiceModels{
 		"foo": nil,
 	})
-	assert.DeepEqual(t, p.Services["test_mapping"].Models, map[string]*types.ServiceModelConfig{
+	assert.DeepEqual(t, p.Services["test_mapping"].Models, types.ServiceModels{
 		"foo": {
 			EndpointVariable: "MODEL_URL",
 			ModelVariable:    "MODEL",