Flyctl init --import unable to find internal port in config

Fixes #286
superfly · Sep 7, 2020 · a39ac47 · a39ac47
1 parent e1e516e
commit a39ac47
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 8 deletions.
diff --git a/cmd/init.go b/cmd/init.go
@@ -227,9 +227,9 @@ func runInit(commandContext *cmdctx.CmdContext) error {
 		newAppConfig.Definition = app.Config.Definition
 	}
 
-	if configPort != "" {
+	if configPort != "" { // If the config port has been set externally, set that
 		newAppConfig.SetInternalPort(internalPort)
-	} else {
+	} else if importfile == "" { // If we are not importing, get the default, ask for new setting
 		currentport, err := newAppConfig.GetInternalPort()
 		if err != nil {
 			return err

diff --git a/flyctl/app_config.go b/flyctl/app_config.go
@@ -232,14 +232,12 @@ func (ac *AppConfig) SetInternalPort(port int) bool {
 }
 
 func (ac *AppConfig) GetInternalPort() (int, error) {
-	services, ok := ac.Definition["services"].([]interface{})
+	services, ok := ac.Definition["services"].([]map[string]interface{})
 	if ok {
-		service0, ok := services[0].(map[string]interface{})
+		service0 := services[0] //.(map[string]interface{})
+		internalport, ok := service0["internal_port"].(int64)
 		if ok {
-			internalport, ok := service0["internal_port"].(float64)
-			if ok {
-				return int(internalport), nil
-			}
+			return int(internalport), nil
 		}
 	}