From 20c0668c6b9b5267d0918dc119c7a51356fdf2f9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20Pinson?= Date: Tue, 31 Jan 2017 16:57:35 +0100 Subject: [PATCH] rancher_stack: Retrieve docker_compose and rancher_compose in Read (#11550) Without this, when importing an existing stack into Terraform, the first Terraform run is non convergent as it needs to retrieve the existing values. --- builtin/providers/rancher/resource_rancher_stack.go | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/builtin/providers/rancher/resource_rancher_stack.go b/builtin/providers/rancher/resource_rancher_stack.go index f516aca79..d9d76e8ae 100644 --- a/builtin/providers/rancher/resource_rancher_stack.go +++ b/builtin/providers/rancher/resource_rancher_stack.go @@ -153,8 +153,12 @@ func resourceRancherStackRead(d *schema.ResourceData, meta interface{}) error { d.Set("description", stack.Description) d.Set("name", stack.Name) - d.Set("rendered_docker_compose", strings.Replace(config.DockerComposeConfig, "\r", "", -1)) - d.Set("rendered_rancher_compose", strings.Replace(config.RancherComposeConfig, "\r", "", -1)) + dockerCompose := strings.Replace(config.DockerComposeConfig, "\r", "", -1) + rancherCompose := strings.Replace(config.RancherComposeConfig, "\r", "", -1) + d.Set("docker_compose", dockerCompose) + d.Set("rancher_compose", rancherCompose) + d.Set("rendered_docker_compose", dockerCompose) + d.Set("rendered_rancher_compose", rancherCompose) d.Set("environment_id", stack.AccountId) d.Set("environment", stack.Environment)