Merge pull request #26 from mnottale/disable-init-service-query

Disable init request for service list.

Author: chris-crone

packager/init.go

@@ -42,14 +42,7 @@ func Init(name string, composeFiles []string) error {
 
 func initFromScratch(name string) error {
 	log.Println("init from scratch")
-	fmt.Println(`
-Please indicate a list of services that will be used by your application, one per line.
-Examples of possible values: java, mysql, redis, ruby, postgres, rabbitmq...`)
-	services, err := utils.ReadNewlineSeparatedList(os.Stdin)
-	if err != nil {
-		return err
-	}
-	composeData, err := composeFileFromScratch(services)
+	composeData, err := composeFileFromScratch()
 	if err != nil {
 		return err
 	}
@@ -75,15 +68,8 @@ func initFromComposeFiles(name string, composeFiles []string, merger ComposeConf
 	return utils.CreateFileWithData(path.Join(dirName, "settings.yml"), []byte{'\n'})
 }
 
-func composeFileFromScratch(services []string) ([]byte, error) {
+func composeFileFromScratch() ([]byte, error) {
 	fileStruct := types.NewInitialComposeFile()
-	serviceMap := *fileStruct.Services
-	for _, svc := range services {
-		svcData := utils.MatchService(svc)
-		serviceMap[svcData.ServiceName] = types.InitialService{
-			Image: svcData.ServiceImage,
-		}
-	}
 	return yaml.Marshal(fileStruct)
 }
 

packager/init_test.go

@@ -10,7 +10,6 @@ import (
 	"github.com/gotestyourself/gotestyourself/assert"
 	"github.com/gotestyourself/gotestyourself/fs"
 
-	"github.com/docker/lunchbox/types"
 	"github.com/docker/lunchbox/utils"
 	yaml "gopkg.in/yaml.v2"
 )
@@ -45,25 +44,6 @@ func (m *DummyConfigMerger) MergeComposeConfig(composeFiles []string) ([]byte, e
 	return []byte(dummyComposeData), nil
 }
 
-func TestComposeFileFromScratch(t *testing.T) {
-	services := []string{
-		"redis", "mysql", "python",
-	}
-
-	result, err := composeFileFromScratch(services)
-	assert.NilError(t, err)
-
-	expected := types.NewInitialComposeFile()
-	expected.Services = &map[string]types.InitialService{
-		"redis":  {Image: "redis"},
-		"mysql":  {Image: "mysql"},
-		"python": {Image: "python"},
-	}
-	expectedBytes, err := yaml.Marshal(expected)
-	assert.NilError(t, err)
-	assert.DeepEqual(t, result, expectedBytes)
-}
-
 func TestInitFromComposeFiles(t *testing.T) {
 	testAppName := randomName("app_")
 	merger := NewDummyConfigMerger()