Browse Source

Move config initialization closer to the beginning

Djordje Lukic 5 năm trước cách đây
mục cha
commit
63c460240c
2 tập tin đã thay đổi với 8 bổ sung5 xóa
  1. 1 1
      azure/aci.go
  2. 7 4
      compose/project.go

+ 1 - 1
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)

+ 7 - 4
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,