diff --git a/builtin/providers/rancher/resource_rancher_environment.go b/builtin/providers/rancher/resource_rancher_environment.go index 4d599b97a..6cbc7af7e 100644 --- a/builtin/providers/rancher/resource_rancher_environment.go +++ b/builtin/providers/rancher/resource_rancher_environment.go @@ -94,6 +94,12 @@ func resourceRancherEnvironmentRead(d *schema.ResourceData, meta interface{}) er return err } + if env == nil { + log.Printf("[INFO] Environment %s not found", d.Id()) + d.SetId("") + return nil + } + log.Printf("[INFO] Environment Name: %s", env.Name) d.Set("description", env.Description) diff --git a/builtin/providers/rancher/resource_rancher_registration_token.go b/builtin/providers/rancher/resource_rancher_registration_token.go index ec2cd60d8..f35b022cd 100644 --- a/builtin/providers/rancher/resource_rancher_registration_token.go +++ b/builtin/providers/rancher/resource_rancher_registration_token.go @@ -108,6 +108,12 @@ func resourceRancherRegistrationTokenRead(d *schema.ResourceData, meta interface return err } + if regT == nil { + log.Printf("[INFO] RegistrationToken %s not found", d.Id()) + d.SetId("") + return nil + } + log.Printf("[INFO] RegistrationToken Name: %s", regT.Name) d.Set("description", regT.Description) diff --git a/builtin/providers/rancher/resource_rancher_registry.go b/builtin/providers/rancher/resource_rancher_registry.go index e17decfa5..ba452917a 100644 --- a/builtin/providers/rancher/resource_rancher_registry.go +++ b/builtin/providers/rancher/resource_rancher_registry.go @@ -100,6 +100,12 @@ func resourceRancherRegistryRead(d *schema.ResourceData, meta interface{}) error return err } + if registry == nil { + log.Printf("[INFO] Registry %s not found", d.Id()) + d.SetId("") + return nil + } + log.Printf("[INFO] Registry Name: %s", registry.Name) d.Set("description", registry.Description) diff --git a/builtin/providers/rancher/resource_rancher_registry_credential.go b/builtin/providers/rancher/resource_rancher_registry_credential.go index 49c3cd257..8187246aa 100644 --- a/builtin/providers/rancher/resource_rancher_registry_credential.go +++ b/builtin/providers/rancher/resource_rancher_registry_credential.go @@ -114,6 +114,12 @@ func resourceRancherRegistryCredentialRead(d *schema.ResourceData, meta interfac return err } + if registryCred == nil { + log.Printf("[INFO] RegistryCredential %s not found", d.Id()) + d.SetId("") + return nil + } + log.Printf("[INFO] RegistryCredential Name: %s", registryCred.Name) d.Set("description", registryCred.Description) diff --git a/builtin/providers/rancher/resource_rancher_stack.go b/builtin/providers/rancher/resource_rancher_stack.go index 3bbab20e7..f516aca79 100644 --- a/builtin/providers/rancher/resource_rancher_stack.go +++ b/builtin/providers/rancher/resource_rancher_stack.go @@ -132,6 +132,12 @@ func resourceRancherStackRead(d *schema.ResourceData, meta interface{}) error { return err } + if stack == nil { + log.Printf("[INFO] Stack %s not found", d.Id()) + d.SetId("") + return nil + } + if stack.State == "removed" { log.Printf("[INFO] Stack %s was removed on %v", d.Id(), stack.Removed) d.SetId("")