Manage User Environment Variables (#58)

* Add provider parameter skip_envs_managed_by_tsuru

* Bump version to add skip_envs_managed_by_tsuru option

* Fix style

* Change parameter name to full_management_of_user_environment_variables

* Improve filter logic to read ManagedBy terraform or empty

* Simplify full management envs mode logic

* ManagedBy logic

Co-authored-by: Wilson Júnior <wilsonpjunior@gmail.com>

* Rename parameter Env

---------

Co-authored-by: Wilson Júnior <wilsonpjunior@gmail.com>

Author: jbragagnolo

GNUmakefile

@@ -2,7 +2,7 @@ HOSTNAME=registry.terraform.io
 NAMESPACE=tsuru
 NAME=tsuru
 BINARY=terraform-provider-${NAME}
-VERSION=2.12.0
+VERSION=2.13.0
 
 UNAME_S := $(shell uname -s)
 UNAME_P := $(shell uname -p)

docs/index.md

@@ -17,6 +17,7 @@ description: |-
 
 ### Optional
 
+- `full_management_of_user_environment_variables` (Boolean) Use `true` to manage all user environment variables. (Default: false)
 - `host` (String) Target to tsuru API
 - `skip_cert_verification` (Boolean) Disable certificate verification
 - `token` (String) Token to authenticate on tsuru API (optional)

internal/provider/provider.go

@@ -44,6 +44,13 @@ func Provider() *schema.Provider {
 				Optional:    true,
 				DefaultFunc: schema.EnvDefaultFunc("TSURU_SKIP_CERT_VERIFICATION", nil),
 			},
+			"full_management_of_user_environment_variables": {
+				Type:        schema.TypeBool,
+				Description: "Use `true` to manage all user environment variables. (Default: false)",
+				Default:     false,
+				Optional:    true,
+				DefaultFunc: schema.EnvDefaultFunc("TSURU_FULL_MANAGEMENT_OF_USER_ENVIRONMENT_VARIABLES", nil),
+			},
 		},
 		ResourcesMap: map[string]*schema.Resource{
 			"tsuru_service_instance_bind":  resourceTsuruServiceInstanceBind(),
@@ -85,9 +92,10 @@ func Provider() *schema.Provider {
 }
 
 type tsuruProvider struct {
-	Host        string
-	Token       string
-	TsuruClient *tsuru.APIClient
+	Host               string
+	Token              string
+	TsuruClient        *tsuru.APIClient
+	FullManagementEnvs bool
 }
 
 func providerConfigure(ctx context.Context, d *schema.ResourceData, terraformVersion string) (interface{}, diag.Diagnostics) {
@@ -134,10 +142,13 @@ func providerConfigure(ctx context.Context, d *schema.ResourceData, terraformVer
 		return nil, diag.FromErr(err)
 	}
 
+	fullManagementEnvs := d.Get("full_management_of_user_environment_variables").(bool)
+
 	return &tsuruProvider{
-		Host:        host,
-		Token:       token,
-		TsuruClient: client,
+		Host:               host,
+		Token:              token,
+		TsuruClient:        client,
+		FullManagementEnvs: fullManagementEnvs,
 	}, nil
 }
 

internal/provider/resource_tsuru_app_env.go

@@ -125,8 +125,8 @@ func resourceTsuruApplicationEnvironmentRead(ctx context.Context, d *schema.Reso
 		}
 		return diag.Errorf("unable to read envs for app %s: %v", app, err)
 	}
-
-	envs = filterUnmanagedTerraformEnvs(envs)
+	
+	envs = filterUnmanagedTerraformEnvs(envs, provider.FullManagementEnvs)
 
 	envVars := map[string]string{}
 	sensitiveEnvVars := map[string]string{}
@@ -237,18 +237,19 @@ func envsFromResource(envvars interface{}, private bool) []tsuru_client.Env {
 	return envs
 }
 
-func filterUnmanagedTerraformEnvs(envs []tsuru.EnvVar) []tsuru.EnvVar {
+func filterUnmanagedTerraformEnvs(envs []tsuru.EnvVar, fullManagementEnvs bool) []tsuru.EnvVar {
 	n := 0
 	for _, env := range envs {
-		if isReservedEnv(env.Name) {
-			continue
-		}
-		if env.ManagedBy != "terraform" {
+		if isReservedEnv(env.Name) { //reserved Envs, skip
 			continue
 		}
-		envs[n] = env
-		n++
+
+		if env.ManagedBy == "terraform" || (fullManagementEnvs && env.ManagedBy == "") {
+			envs[n] = env
+			n++
+		} 
 	}
+
 	envs = envs[:n]
 	return envs
 }

internal/provider/resource_tsuru_job_env.go

@@ -109,7 +109,7 @@ func resourceTsuruJobEnvironmentRead(ctx context.Context, d *schema.ResourceData
 		return diag.Errorf("unable to read envs for job %s: %v", job, err)
 	}
 
-	envs = filterUnmanagedTerraformEnvs(envs)
+	envs = filterUnmanagedTerraformEnvs(envs, provider.FullManagementEnvs)
 
 	envVars := map[string]string{}
 	sensitiveEnvVars := map[string]string{}