Merged in TER-248_enable-imports-for-ghost-apps (pull request #5)

TER-248 enable imports for ghost apps Approved-by: Patrick Decat <[email protected]> Approved-by: Jordan Caussat <[email protected]> Approved-by: Jérôme Respaut <[email protected]>
jorcau · Mar 30, 2018 · 80fc4a7 · 80fc4a7
2 parents d7bb31a + b6c64b1
commit 80fc4a7
Show file tree

Hide file tree

Showing 2 changed files with 41 additions and 0 deletions.
diff --git a/ghost/import_ghost_app_test.go b/ghost/import_ghost_app_test.go
@@ -0,0 +1,29 @@
+package ghost
+
+import (
+	"fmt"
+	"testing"
+
+	"github.com/hashicorp/terraform/helper/acctest"
+	"github.com/hashicorp/terraform/helper/resource"
+)
+
+func TestAccGhostAppImportBasic(t *testing.T) {
+	envName := fmt.Sprintf("import_ghost_app_acc_env_basic_%s", acctest.RandString(10))
+
+	resource.Test(t, resource.TestCase{
+		PreCheck:  func() { testAccPreCheck(t) },
+		Providers: testAccProviders,
+		Steps: []resource.TestStep{
+			resource.TestStep{
+				Config: testAccGhostAppConfig(envName),
+			},
+
+			resource.TestStep{
+				ResourceName:      "ghost_app.test",
+				ImportState:       true,
+				ImportStateVerify: true,
+			},
+		},
+	})
+}
diff --git a/ghost/resource_ghost_app.go b/ghost/resource_ghost_app.go
@@ -4,6 +4,7 @@ import (
 	"encoding/json"
 	"fmt"
 	"log"
+	"time"
 
 	"cloud-deploy.io/go-st"
 	"github.com/hashicorp/terraform/helper/schema"
@@ -17,6 +18,17 @@ func resourceGhostApp() *schema.Resource {
 		Update: resourceGhostAppUpdate,
 		Delete: resourceGhostAppDelete,
 
+		Timeouts: &schema.ResourceTimeout{
+			Create: schema.DefaultTimeout(1 * time.Minute),
+			Read:   schema.DefaultTimeout(1 * time.Minute),
+			Update: schema.DefaultTimeout(1 * time.Minute),
+			Delete: schema.DefaultTimeout(1 * time.Minute),
+		},
+
+		Importer: &schema.ResourceImporter{
+			State: schema.ImportStatePassthrough,
+		},
+
 		Schema: map[string]*schema.Schema{
 			"name": {
 				Type:         schema.TypeString,