remove IncludeBuildEnv and fix addon deletion

cli/cmd/apply.go

@@ -182,6 +182,7 @@ type ApplicationConfig struct {
 		Image      string
 		Builder    string
 		Buildpacks []string
+		Env        map[string]string
 	}
 
 	EnvGroups []types.EnvGroupMeta `mapstructure:"env_groups"`
@@ -513,6 +514,8 @@ func (d *Driver) createApplication(resource *models.Resource, client *api.Client
 func (d *Driver) updateApplication(resource *models.Resource, client *api.Client, sharedOpts *deploy.SharedOpts, appConf *ApplicationConfig) (*models.Resource, error) {
 	color.New(color.FgGreen).Println("Updating existing release:", resource.Name)
 
+	sharedOpts.AdditionalEnv = appConf.Build.Env
+
 	updateAgent, err := deploy.NewDeployAgent(client, resource.Name, &deploy.DeployOpts{
 		SharedOpts: sharedOpts,
 		Local:      appConf.Build.Method != "registry",
@@ -525,9 +528,8 @@ func (d *Driver) updateApplication(resource *models.Resource, client *api.Client
 	// if the build method is registry, we do not trigger a build
 	if appConf.Build.Method != "registry" {
 		buildEnv, err := updateAgent.GetBuildEnv(&deploy.GetBuildEnvOpts{
-			UseNewConfig:    true,
-			NewConfig:       appConf.Values,
-			IncludeBuildEnv: true,
+			UseNewConfig: true,
+			NewConfig:    appConf.Values,
 		})
 
 		if err != nil {
@@ -564,21 +566,6 @@ func (d *Driver) updateApplication(resource *models.Resource, client *api.Client
 		}
 	}
 
-	buildEnv, err := updateAgent.GetBuildEnv(&deploy.GetBuildEnvOpts{
-		UseNewConfig: true,
-		NewConfig:    appConf.Values,
-	})
-
-	if err != nil {
-		return nil, err
-	}
-
-	err = updateAgent.SetBuildEnv(buildEnv)
-
-	if err != nil {
-		return nil, err
-	}
-
 	err = updateAgent.UpdateImageAndValues(appConf.Values)
 
 	if err != nil {

cli/cmd/delete.go

@@ -220,7 +220,7 @@ func deleteAddon(_ *types.GetAuthenticatedUserResponse, client *api.Client, args
 
 	rel := *resp
 
-	if rel.Chart.Name() != "web" && rel.Chart.Name() != "worker" && rel.Chart.Name() != "job" {
+	if rel.Chart.Name() == "web" || rel.Chart.Name() == "worker" || rel.Chart.Name() == "job" {
 		return fmt.Errorf("no addon found with name: %s", name)
 	}
 

cli/cmd/deploy.go

@@ -501,9 +501,8 @@ func updateBuildWithAgent(updateAgent *deploy.DeployAgent) error {
 	}
 
 	buildEnv, err := updateAgent.GetBuildEnv(&deploy.GetBuildEnvOpts{
-		UseNewConfig:    true,
-		NewConfig:       valuesObj,
-		IncludeBuildEnv: true,
+		UseNewConfig: true,
+		NewConfig:    valuesObj,
 	})
 
 	if err != nil {

cli/cmd/deploy/deploy.go

@@ -146,9 +146,8 @@ func NewDeployAgent(client *client.Client, app string, opts *DeployOpts) (*Deplo
 }
 
 type GetBuildEnvOpts struct {
-	UseNewConfig    bool
-	NewConfig       map[string]interface{}
-	IncludeBuildEnv bool
+	UseNewConfig bool
+	NewConfig    map[string]interface{}
 }
 
 // GetBuildEnv retrieves the build env from the release config and returns it.