From 63c460240c224a5bd3232662883a6b28fb9b4952 Mon Sep 17 00:00:00 2001 From: Djordje Lukic Date: Mon, 4 May 2020 11:27:31 +0200 Subject: [PATCH] Move config initialization closer to the beginning --- azure/aci.go | 2 +- compose/project.go | 11 +++++++---- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/azure/aci.go b/azure/aci.go index 1b8b8f86b..933f8a793 100644 --- a/azure/aci.go +++ b/azure/aci.go @@ -29,7 +29,7 @@ func init() { _ = os.Setenv("AZURE_KEYVAULT_RESOURCE", "https://management.azure.com") } -func createACIContainers(ctx context.Context, aciContext store.AciContext, groupDefinition containerinstance.ContainerGroup) (containerinstance.ContainerGroup, error) { +func createACIContainers(ctx context.Context, aciContext store.AciContext, groupDefinition containerinstance.ContainerGroup) (c containerinstance.ContainerGroup, err error) { containerGroupsClient, err := getContainerGroupsClient(aciContext.SubscriptionID) if err != nil { return c, fmt.Errorf("cannot get container group client: %v", err) diff --git a/compose/project.go b/compose/project.go index 7c51bbe5a..92217c510 100644 --- a/compose/project.go +++ b/compose/project.go @@ -44,15 +44,18 @@ func ProjectFromOptions(options *ProjectOptions) (*Project, error) { if err != nil { return nil, err } + + configs, err := parseConfigs(configPath) + if err != nil { + return nil, err + } + name := options.Name if name == "" { r := regexp.MustCompile(`[^a-z0-9\\-_]+`) name = r.ReplaceAllString(strings.ToLower(filepath.Base(options.WorkDir)), "") } - configs, err := parseConfigs(configPath) - if err != nil { - return nil, err - } + return newProject(types.ConfigDetails{ WorkingDir: options.WorkDir, ConfigFiles: configs,