Skip to content

Commit ee347b0

Browse files
committed
added import support for all resources except plugin
1 parent f2257e0 commit ee347b0

10 files changed

+110
-2
lines changed

kong/resource_kong_api.go

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,9 @@ func resourceKongApi() *schema.Resource {
1212
Read: resourceKongApiRead,
1313
Delete: resourceKongApiDelete,
1414
Update: resourceKongApiUpdate,
15+
Importer: &schema.ResourceImporter{
16+
State: schema.ImportStatePassthrough,
17+
},
1518

1619
Schema: map[string]*schema.Schema{
1720
"name": &schema.Schema{

kong/resource_kong_api_test.go

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,25 @@ func TestAccKongApi(t *testing.T) {
5757
})
5858
}
5959

60+
func TestAccKongApiImport(t *testing.T) {
61+
62+
resource.Test(t, resource.TestCase{
63+
Providers: testAccProviders,
64+
CheckDestroy: testAccCheckKongApiDestroy,
65+
Steps: []resource.TestStep{
66+
resource.TestStep{
67+
Config: testCreateApiConfig,
68+
},
69+
70+
resource.TestStep{
71+
ResourceName: "kong_api.api",
72+
ImportState: true,
73+
ImportStateVerify: true,
74+
},
75+
},
76+
})
77+
}
78+
6079
func testAccCheckKongApiDestroy(state *terraform.State) error {
6180

6281
client := testAccProvider.Meta().(*gokong.KongAdminClient)

kong/resource_kong_certificate.go

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,9 @@ func resourceKongCertificate() *schema.Resource {
1212
Read: resourceKongCertificateRead,
1313
Delete: resourceKongCertificateDelete,
1414
Update: resourceKongCertificateUpdate,
15+
Importer: &schema.ResourceImporter{
16+
State: schema.ImportStatePassthrough,
17+
},
1518

1619
Schema: map[string]*schema.Schema{
1720
"certificate": &schema.Schema{

kong/resource_kong_certificate_test.go

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,25 @@ func TestAccKongCertificate(t *testing.T) {
3434
})
3535
}
3636

37+
func TestAccKongCertificateImport(t *testing.T) {
38+
39+
resource.Test(t, resource.TestCase{
40+
Providers: testAccProviders,
41+
CheckDestroy: testAccCheckKongCertificateDestroy,
42+
Steps: []resource.TestStep{
43+
resource.TestStep{
44+
Config: testCreateCertificateConfig,
45+
},
46+
47+
resource.TestStep{
48+
ResourceName: "kong_certificate.certificate",
49+
ImportState: true,
50+
ImportStateVerify: true,
51+
},
52+
},
53+
})
54+
}
55+
3756
func testAccCheckKongCertificateDestroy(state *terraform.State) error {
3857

3958
client := testAccProvider.Meta().(*gokong.KongAdminClient)

kong/resource_kong_consumer.go

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,9 @@ func resourceKongConsumer() *schema.Resource {
1212
Read: resourceKongConsumerRead,
1313
Delete: resourceKongConsumerDelete,
1414
Update: resourceKongConsumerUpdate,
15+
Importer: &schema.ResourceImporter{
16+
State: schema.ImportStatePassthrough,
17+
},
1518

1619
Schema: map[string]*schema.Schema{
1720
"username": &schema.Schema{

kong/resource_kong_consumer_test.go

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,25 @@ func TestAccKongConsumer(t *testing.T) {
3434
})
3535
}
3636

37+
func TestAccKongConsumerImport(t *testing.T) {
38+
39+
resource.Test(t, resource.TestCase{
40+
Providers: testAccProviders,
41+
CheckDestroy: testAccCheckKongConsumerDestroy,
42+
Steps: []resource.TestStep{
43+
resource.TestStep{
44+
Config: testCreateConsumerConfig,
45+
},
46+
47+
resource.TestStep{
48+
ResourceName: "kong_consumer.consumer",
49+
ImportState: true,
50+
ImportStateVerify: true,
51+
},
52+
},
53+
})
54+
}
55+
3756
func testAccCheckKongConsumerDestroy(state *terraform.State) error {
3857

3958
client := testAccProvider.Meta().(*gokong.KongAdminClient)

kong/resource_kong_sni.go

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,9 @@ func resourceKongSni() *schema.Resource {
1111
Create: resourceKongSniCreate,
1212
Read: resourceKongSniRead,
1313
Delete: resourceKongSniDelete,
14+
Importer: &schema.ResourceImporter{
15+
State: schema.ImportStatePassthrough,
16+
},
1417

1518
Schema: map[string]*schema.Schema{
1619
"name": &schema.Schema{

kong/resource_kong_sni_test.go

Lines changed: 19 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,22 +18,39 @@ func TestAccKongSni(t *testing.T) {
1818
Config: testCreateSniConfig,
1919
Check: resource.ComposeTestCheckFunc(
2020
testAccCheckKongSniExists("kong_sni.sni"),
21-
//testAccCheckForChildIdCorrect("kong_certificate.certificate1", "kong_sni.sni", "certificate_id"),
2221
resource.TestCheckResourceAttr("kong_sni.sni", "name", "www.example.com"),
2322
),
2423
},
2524
{
2625
Config: testUpdateSniConfig,
2726
Check: resource.ComposeTestCheckFunc(
2827
testAccCheckKongSniExists("kong_sni.sni"),
29-
//testAccCheckForChildIdCorrect("kong_certificate.certificate2", "kong_sni.sni", "certificate_id"),
3028
resource.TestCheckResourceAttr("kong_sni.sni", "name", "www.example.com"),
3129
),
3230
},
3331
},
3432
})
3533
}
3634

35+
func TestAccKongSniImport(t *testing.T) {
36+
37+
resource.Test(t, resource.TestCase{
38+
Providers: testAccProviders,
39+
CheckDestroy: testAccCheckKongSniDestroy,
40+
Steps: []resource.TestStep{
41+
resource.TestStep{
42+
Config: testCreateSniConfig,
43+
},
44+
45+
resource.TestStep{
46+
ResourceName: "kong_sni.sni",
47+
ImportState: true,
48+
ImportStateVerify: true,
49+
},
50+
},
51+
})
52+
}
53+
3754
func testAccCheckKongSniDestroy(state *terraform.State) error {
3855

3956
client := testAccProvider.Meta().(*gokong.KongAdminClient)

kong/resource_kong_upstream.go

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,9 @@ func resourceKongUpstream() *schema.Resource {
1111
Create: resourceKongUpstreamCreate,
1212
Read: resourceKongUpstreamRead,
1313
Delete: resourceKongUpstreamDelete,
14+
Importer: &schema.ResourceImporter{
15+
State: schema.ImportStatePassthrough,
16+
},
1417

1518
Schema: map[string]*schema.Schema{
1619
"name": &schema.Schema{

kong/resource_kong_upstream_test.go

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,25 @@ func TestAccKongUpstreamWithOrderList(t *testing.T) {
8080
})
8181
}
8282

83+
func TestAccKongUpstreamImport(t *testing.T) {
84+
85+
resource.Test(t, resource.TestCase{
86+
Providers: testAccProviders,
87+
CheckDestroy: testAccCheckKongUpstreamDestroy,
88+
Steps: []resource.TestStep{
89+
resource.TestStep{
90+
Config: testCreateUpstreamConfig,
91+
},
92+
93+
resource.TestStep{
94+
ResourceName: "kong_upstream.upstream",
95+
ImportState: true,
96+
ImportStateVerify: true,
97+
},
98+
},
99+
})
100+
}
101+
83102
func testAccCheckKongUpstreamDestroy(state *terraform.State) error {
84103

85104
client := testAccProvider.Meta().(*gokong.KongAdminClient)

0 commit comments

Comments
 (0)