Skip to content

Commit 94ceffa

Browse files
jonathan-eljonathan-el
authored
Fix resource_site_cache_configuration tests (#525)
* add resources * add resources * add resources * add resources * fix typo * Add defaults to new resource * review fixes * review fixes * rename docs * rename docs * fix attributes * Fix resource_site_cache_configuration tests
1 parent fc40de8 commit 94ceffa

File tree

2 files changed

+26
-24
lines changed

2 files changed

+26
-24
lines changed

‎incapsula/resource_site_cache_configuration.go‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ import (
44
"fmt"
55
"log"
66
"strconv"
7+
"time"
78

89
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
910
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/validation"
@@ -205,7 +206,7 @@ func resourceApplicationPerformanceUpdate(d *schema.ResourceData, m interface{})
205206
log.Printf("[ERROR] Could not update Incapsula performance settings for site_id: %s %s\n", d.Id(), err)
206207
return err
207208
}
208-
209+
time.Sleep(1 * time.Second)
209210
return resourceApplicationPerformanceRead(d, m)
210211
}
211212

‎incapsula/resource_site_cache_configuration_test.go‎

Lines changed: 24 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -248,15 +248,16 @@ func TestAccIncapsulaApplicationPerformance_basic(t *testing.T) {
248248

249249
func testCheckApplicationPerformanceExists(name string) resource.TestCheckFunc {
250250
return func(state *terraform.State) error {
251-
_, ok := state.RootModule().Resources[name]
251+
res, ok := state.RootModule().Resources[name]
252252
if !ok {
253253
return fmt.Errorf("Incapsula Site Cache Configuration resource not found: %s", name)
254254
}
255+
siteId := res.Primary.ID
255256

256257
client := testAccProvider.Meta().(*Client)
257258
_, err2 := client.GetPerformanceSettings(siteId)
258259
if err2 != nil {
259-
fmt.Errorf("Incapsula Site Cache Configuration doesn't exist")
260+
return fmt.Errorf("Incapsula Site Cache Configuration doesn't exist")
260261
}
261262

262263
return nil
@@ -280,10 +281,10 @@ func testAccStateApplicationPerformanceID(s *terraform.State) (string, error) {
280281
}
281282

282283
func testDisabledCaching(domainName string) string {
283-
return /*testCheckIncapsulaSiteV3ConfigBasic(domainName, "CLOUD_WAF") +*/ fmt.Sprintf(`
284+
return testCheckIncapsulaSiteV3ConfigBasic(domainName, "CLOUD_WAF") + fmt.Sprintf(`
284285
resource "%s" "%s" {
285-
site_id = 2365924 #incapsula_site_v3.test-terraform-site-v3.id
286-
#depends_on = ["incapsula_site_v3.test-terraform-site-v3"]
286+
site_id = incapsula_site_v3.test-terraform-site-v3.id
287+
depends_on = ["incapsula_site_v3.test-terraform-site-v3"]
287288
client_comply_no_cache = false
288289
client_enable_client_side_caching = false
289290
client_send_age_header = false
@@ -306,10 +307,10 @@ resource "%s" "%s" {
306307
}
307308

308309
func testCustomCaching(domainName string) string {
309-
return /*testCheckIncapsulaSiteV3ConfigBasic(domainName, "CLOUD_WAF") +*/ fmt.Sprintf(`
310+
return testCheckIncapsulaSiteV3ConfigBasic(domainName, "CLOUD_WAF") + fmt.Sprintf(`
310311
resource "%s" "%s" {
311-
site_id = 2365924 #incapsula_site_v3.test-terraform-site-v3.id
312-
#depends_on = ["incapsula_site_v3.test-terraform-site-v3"]
312+
site_id = incapsula_site_v3.test-terraform-site-v3.id
313+
depends_on = ["incapsula_site_v3.test-terraform-site-v3"]
313314
client_comply_no_cache = false
314315
key_comply_vary = false
315316
key_unite_naked_full_cache = false
@@ -326,10 +327,10 @@ resource "%s" "%s" {
326327
}
327328

328329
func testStandardCaching(domainName string) string {
329-
return /*testCheckIncapsulaSiteV3ConfigBasic(domainName, "CLOUD_WAF") +*/ fmt.Sprintf(`
330+
return testCheckIncapsulaSiteV3ConfigBasic(domainName, "CLOUD_WAF") + fmt.Sprintf(`
330331
resource "%s" "%s" {
331-
site_id = 2365924 #incapsula_site_v3.test-terraform-site-v3.id
332-
#depends_on = ["incapsula_site_v3.test-terraform-site-v3"]
332+
site_id = incapsula_site_v3.test-terraform-site-v3.id
333+
depends_on = ["incapsula_site_v3.test-terraform-site-v3"]
333334
client_comply_no_cache = true
334335
client_enable_client_side_caching = true
335336
client_send_age_header = true
@@ -350,10 +351,10 @@ resource "%s" "%s" {
350351
}
351352

352353
func testSmartCaching(domainName string) string {
353-
return /*testCheckIncapsulaSiteV3ConfigBasic(domainName, "CLOUD_WAF") +*/ fmt.Sprintf(`
354+
return testCheckIncapsulaSiteV3ConfigBasic(domainName, "CLOUD_WAF") + fmt.Sprintf(`
354355
resource "%s" "%s" {
355-
site_id = 2365924 #incapsula_site_v3.test-terraform-site-v3.id
356-
#depends_on = ["incapsula_site_v3.test-terraform-site-v3"]
356+
site_id = incapsula_site_v3.test-terraform-site-v3.id
357+
depends_on = ["incapsula_site_v3.test-terraform-site-v3"]
357358
client_comply_no_cache = true
358359
client_enable_client_side_caching = true
359360
client_send_age_header = true
@@ -380,10 +381,10 @@ resource "%s" "%s" {
380381
}
381382

382383
func testAllResourceCaching(domainName string) string {
383-
return /*testCheckIncapsulaSiteV3ConfigBasic(domainName, "CLOUD_WAF") +*/ fmt.Sprintf(`
384+
return testCheckIncapsulaSiteV3ConfigBasic(domainName, "CLOUD_WAF") + fmt.Sprintf(`
384385
resource "%s" "%s" {
385-
site_id = 2365924 #incapsula_site_v3.test-terraform-site-v3.id
386-
#depends_on = ["incapsula_site_v3.test-terraform-site-v3"]
386+
site_id = incapsula_site_v3.test-terraform-site-v3.id
387+
depends_on = ["incapsula_site_v3.test-terraform-site-v3"]
387388
client_comply_no_cache = true
388389
client_enable_client_side_caching = true
389390
client_send_age_header = true
@@ -408,10 +409,10 @@ resource "%s" "%s" {
408409
}
409410

410411
func testMultipleResponseHeaders(domainName string) string {
411-
return /*testCheckIncapsulaSiteV3ConfigBasic(domainName, "CLOUD_WAF") +*/ fmt.Sprintf(`
412+
return testCheckIncapsulaSiteV3ConfigBasic(domainName, "CLOUD_WAF") + fmt.Sprintf(`
412413
resource "%s" "%s" {
413-
site_id = 2365924 #incapsula_site_v3.test-terraform-site-v3.id
414-
#depends_on = ["incapsula_site_v3.test-terraform-site-v3"]
414+
site_id = incapsula_site_v3.test-terraform-site-v3.id
415+
depends_on = ["incapsula_site_v3.test-terraform-site-v3"]
415416
client_comply_no_cache = true
416417
client_enable_client_side_caching = true
417418
client_send_age_header = true
@@ -438,10 +439,10 @@ resource "%s" "%s" {
438439
}
439440

440441
func testDisabledCachingWithoutParameters(domainName string) string {
441-
return /*testCheckIncapsulaSiteV3ConfigBasic(domainName, "CLOUD_WAF") +*/ fmt.Sprintf(`
442+
return testCheckIncapsulaSiteV3ConfigBasic(domainName, "CLOUD_WAF") + fmt.Sprintf(`
442443
resource "%s" "%s" {
443-
site_id = 2365924 #incapsula_site_v3.test-terraform-site-v3.id
444-
#depends_on = ["incapsula_site_v3.test-terraform-site-v3"]
444+
site_id = incapsula_site_v3.test-terraform-site-v3.id
445+
depends_on = ["incapsula_site_v3.test-terraform-site-v3"]
445446
mode_level = "disabled"
446447
}`,
447448
applicationPerformanceResourceName, applicationPerformanceName,

0 commit comments

Comments
 (0)