include files needed for deployment - env files

Author: fabriciojs

commands/cloud_deploy.go

@@ -233,14 +233,17 @@ func (d *KoolDeploy) createReleaseFile() (filename string, err error) {
 		allFiles = append(allFiles, filepath.Join(d.env.Get("PWD"), "docker-compose.yml"))
 	}
 
+	// we need to include the .env files as well
+	allFiles = append(allFiles, d.cloudConfig.GetEnvFiles()...)
+
 	d.shell.Println("Compressing files:")
 	for _, file := range allFiles {
 		d.shell.Println("  -", file)
 	}
 
 	tarball.SourceDir(d.env.Get("PWD"))
 
-	filename, err = tarball.CompressFiles(d.handleDeployEnv(allFiles))
+	filename, err = tarball.CompressFiles(allFiles)
 
 	if err == nil {
 		d.shell.Println("Files compression done.")
@@ -249,32 +252,6 @@ func (d *KoolDeploy) createReleaseFile() (filename string, err error) {
 	return
 }
 
-// handleDeployEnv tackles a special case on kool.deploy.env file.
-// This file can or cannot be versioned (good practice not to, since
-// it may include sensitive data). In the case of it being ignored
-// from GIT, we still are required to send it - it is required for
-// the Deploy API.
-func (d *KoolDeploy) handleDeployEnv(files []string) []string {
-	path := filepath.Join(d.env.Get("PWD"), koolDeployEnv)
-	if _, envErr := os.Stat(path); os.IsNotExist(envErr) {
-		return files
-	}
-
-	var isAlreadyIncluded bool = false
-	for _, file := range files {
-		if file == koolDeployEnv {
-			isAlreadyIncluded = true
-			break
-		}
-	}
-
-	if !isAlreadyIncluded {
-		files = append(files, koolDeployEnv)
-	}
-
-	return files
-}
-
 func (d *KoolDeploy) loadAndValidateConfig() (err error) {
 	if d.cloudConfig, err = cloud.ParseCloudConfig(d.env.Get("PWD"), setup.KoolDeployFile); err != nil {
 		return

services/cloud/deploy_validator.go

@@ -19,6 +19,34 @@ type DeployConfig struct {
 	Cloud *CloudConfig
 }
 
+func (c *DeployConfig) GetEnvFiles() []string {
+	files := make(map[string]bool)
+
+	for _, srv := range c.Cloud.Services {
+		if srv.Env != nil {
+			if env, ok := srv.Env.(map[string]interface{}); ok {
+				if envFile, okSrc := env["source"].(string); okSrc {
+					files[envFile] = true
+				}
+			}
+		}
+
+		if srv.Environment != nil {
+			if envFile, ok := srv.Environment.(string); ok {
+				files[envFile] = true
+			}
+		}
+	}
+
+	envs := make([]string, len(files))
+
+	for envFile := range files {
+		envs = append(envs, filepath.Join(c.Meta.WorkingDir, envFile))
+	}
+
+	return envs
+}
+
 // CloudConfig is the configuration for a deploy parsed from kool.cloud.yml
 type CloudConfig struct {
 	// version of the Kool.dev Cloud config file
@@ -36,6 +64,7 @@ type DeployConfigService struct {
 
 	Public      interface{} `yaml:"public,omitempty"`
 	Environment interface{} `yaml:"environment"`
+	Env         interface{} `yaml:"env"`
 }
 
 // DeployConfigBuild is the configuration for a service to be built