Skip to content

Commit 75125c3

Browse files
ChenHanZhangChenHanZhang
committed
resource/alicloud_esa_site: Added the field paused.
1 parent a4049c7 commit 75125c3

File tree

5 files changed

+70
-67
lines changed

5 files changed

+70
-67
lines changed

‎alicloud/resource_alicloud_esa_site.go‎

Lines changed: 23 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,12 @@ func resourceAliCloudEsaSite() *schema.Resource {
2323
Timeouts: &schema.ResourceTimeout{
2424
Create: schema.DefaultTimeout(5 * time.Minute),
2525
Update: schema.DefaultTimeout(5 * time.Minute),
26-
Delete: schema.DefaultTimeout(5 * time.Minute),
26+
Delete: schema.DefaultTimeout(15 * time.Minute),
2727
},
2828
Schema: map[string]*schema.Schema{
2929
"access_type": {
3030
Type: schema.TypeString,
31-
Optional: true,
31+
Required: true,
3232
ForceNew: true,
3333
},
3434
"add_client_geolocation_header": {
@@ -91,6 +91,10 @@ func resourceAliCloudEsaSite() *schema.Resource {
9191
Optional: true,
9292
Computed: true,
9393
},
94+
"paused": {
95+
Type: schema.TypeBool,
96+
Optional: true,
97+
},
9498
"resource_group_id": {
9599
Type: schema.TypeString,
96100
Optional: true,
@@ -141,7 +145,6 @@ func resourceAliCloudEsaSiteCreate(d *schema.ResourceData, meta interface{}) err
141145
query := make(map[string]interface{})
142146
var err error
143147
request = make(map[string]interface{})
144-
request["RegionId"] = client.RegionId
145148

146149
request["Coverage"] = d.Get("coverage")
147150
if v, ok := d.GetOk("resource_group_id"); ok {
@@ -304,22 +307,19 @@ func resourceAliCloudEsaSiteUpdate(d *schema.ResourceData, meta interface{}) err
304307
update := false
305308
d.Partial(true)
306309

310+
esaServiceV2 := EsaServiceV2{client}
311+
objectRaw, _ := esaServiceV2.DescribeEsaSite(d.Id())
312+
307313
if d.HasChange("version_management") {
308314
var err error
309-
esaServiceV2 := EsaServiceV2{client}
310-
object, err := esaServiceV2.DescribeEsaSite(d.Id())
311-
if err != nil {
312-
return WrapError(err)
313-
}
314-
315315
target := d.Get("version_management").(bool)
316-
if object["VersionManagement"].(bool) != target {
316+
if objectRaw["VersionManagement"].(bool) != target {
317317
if target == true {
318318
action := "ActivateVersionManagement"
319319
request = make(map[string]interface{})
320320
query = make(map[string]interface{})
321321
request["SiteId"] = d.Id()
322-
request["RegionId"] = client.RegionId
322+
323323
wait := incrementalWait(3*time.Second, 5*time.Second)
324324
err = resource.Retry(d.Timeout(schema.TimeoutUpdate), func() *resource.RetryError {
325325
response, err = client.RpcPost("ESA", "2024-09-10", action, query, request, true)
@@ -343,7 +343,7 @@ func resourceAliCloudEsaSiteUpdate(d *schema.ResourceData, meta interface{}) err
343343
request = make(map[string]interface{})
344344
query = make(map[string]interface{})
345345
request["SiteId"] = d.Id()
346-
request["RegionId"] = client.RegionId
346+
347347
wait := incrementalWait(3*time.Second, 5*time.Second)
348348
err = resource.Retry(d.Timeout(schema.TimeoutUpdate), func() *resource.RetryError {
349349
response, err = client.RpcPost("ESA", "2024-09-10", action, query, request, true)
@@ -370,7 +370,7 @@ func resourceAliCloudEsaSiteUpdate(d *schema.ResourceData, meta interface{}) err
370370
request = make(map[string]interface{})
371371
query = make(map[string]interface{})
372372
request["SiteId"] = d.Id()
373-
request["RegionId"] = client.RegionId
373+
374374
if !d.IsNewResource() && d.HasChange("coverage") {
375375
update = true
376376
}
@@ -436,7 +436,7 @@ func resourceAliCloudEsaSiteUpdate(d *schema.ResourceData, meta interface{}) err
436436
request = make(map[string]interface{})
437437
query = make(map[string]interface{})
438438
request["SiteId"] = d.Id()
439-
request["RegionId"] = client.RegionId
439+
440440
if d.HasChange("cache_architecture_mode") {
441441
update = true
442442
}
@@ -464,7 +464,7 @@ func resourceAliCloudEsaSiteUpdate(d *schema.ResourceData, meta interface{}) err
464464
request = make(map[string]interface{})
465465
query = make(map[string]interface{})
466466
request["SiteId"] = d.Id()
467-
request["RegionId"] = client.RegionId
467+
468468
if d.HasChange("add_real_client_ip_header") {
469469
update = true
470470
request["AddRealClientIpHeader"] = d.Get("add_real_client_ip_header")
@@ -503,7 +503,7 @@ func resourceAliCloudEsaSiteUpdate(d *schema.ResourceData, meta interface{}) err
503503
request = make(map[string]interface{})
504504
query = make(map[string]interface{})
505505
request["SiteId"] = d.Id()
506-
request["RegionId"] = client.RegionId
506+
507507
if d.HasChange("cross_border_optimization") {
508508
update = true
509509
}
@@ -531,7 +531,7 @@ func resourceAliCloudEsaSiteUpdate(d *schema.ResourceData, meta interface{}) err
531531
request = make(map[string]interface{})
532532
query = make(map[string]interface{})
533533
request["SiteId"] = d.Id()
534-
request["RegionId"] = client.RegionId
534+
535535
if d.HasChange("site_name_exclusive") {
536536
update = true
537537
}
@@ -559,7 +559,7 @@ func resourceAliCloudEsaSiteUpdate(d *schema.ResourceData, meta interface{}) err
559559
request = make(map[string]interface{})
560560
query = make(map[string]interface{})
561561
request["SiteId"] = d.Id()
562-
request["RegionId"] = client.RegionId
562+
563563
if d.HasChange("flatten_mode") {
564564
update = true
565565
}
@@ -587,7 +587,7 @@ func resourceAliCloudEsaSiteUpdate(d *schema.ResourceData, meta interface{}) err
587587
request = make(map[string]interface{})
588588
query = make(map[string]interface{})
589589
request["SiteId"] = d.Id()
590-
request["RegionId"] = client.RegionId
590+
591591
if d.HasChange("seo_bypass") {
592592
update = true
593593
}
@@ -615,7 +615,7 @@ func resourceAliCloudEsaSiteUpdate(d *schema.ResourceData, meta interface{}) err
615615
request = make(map[string]interface{})
616616
query = make(map[string]interface{})
617617
request["SiteId"] = d.Id()
618-
request["RegionId"] = client.RegionId
618+
619619
if d.HasChange("case_insensitive") {
620620
update = true
621621
request["CaseInsensitive"] = d.Get("case_insensitive")
@@ -654,7 +654,7 @@ func resourceAliCloudEsaSiteUpdate(d *schema.ResourceData, meta interface{}) err
654654
request = make(map[string]interface{})
655655
query = make(map[string]interface{})
656656
request["SiteId"] = d.Id()
657-
request["RegionId"] = client.RegionId
657+
658658
if d.HasChange("development_mode") {
659659
update = true
660660
}
@@ -682,7 +682,7 @@ func resourceAliCloudEsaSiteUpdate(d *schema.ResourceData, meta interface{}) err
682682
request = make(map[string]interface{})
683683
query = make(map[string]interface{})
684684
request["SiteId"] = d.Id()
685-
request["RegionId"] = client.RegionId
685+
686686
if d.HasChange("paused") {
687687
update = true
688688
}
@@ -710,7 +710,7 @@ func resourceAliCloudEsaSiteUpdate(d *schema.ResourceData, meta interface{}) err
710710
request = make(map[string]interface{})
711711
query = make(map[string]interface{})
712712
request["SiteId"] = d.Id()
713-
request["RegionId"] = client.RegionId
713+
714714
if d.HasChange("cache_reserve_instance_id") {
715715
update = true
716716
request["CacheReserveInstanceId"] = d.Get("cache_reserve_instance_id")
@@ -764,7 +764,6 @@ func resourceAliCloudEsaSiteDelete(d *schema.ResourceData, meta interface{}) err
764764
wait := incrementalWait(3*time.Second, 5*time.Second)
765765
err = resource.Retry(d.Timeout(schema.TimeoutDelete), func() *resource.RetryError {
766766
response, err = client.RpcPost("ESA", "2024-09-10", action, query, request, true)
767-
768767
if err != nil {
769768
if IsExpectedErrors(err, []string{"Site.ServiceBusy"}) || NeedRetry(err) {
770769
wait()

‎alicloud/resource_alicloud_esa_site_test.go‎

Lines changed: 22 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ func TestAccAliCloudEsaSite_basic8490(t *testing.T) {
1919
rac := resourceAttrCheckInit(rc, ra)
2020
testAccCheck := rac.resourceAttrMapUpdateSet()
2121
rand := acctest.RandIntRange(10000, 99999)
22-
name := fmt.Sprintf("bcd%d.com", rand)
22+
name := fmt.Sprintf("bcd%d.queniuwk.cn", rand)
2323
testAccConfig := resourceTestAccConfigFunc(resourceId, name, AlicloudEsaSiteBasicDependence8490)
2424
resource.Test(t, resource.TestCase{
2525
PreCheck: func() {
@@ -50,13 +50,11 @@ func TestAccAliCloudEsaSite_basic8490(t *testing.T) {
5050
},
5151
{
5252
Config: testAccConfig(map[string]interface{}{
53-
"coverage": "global",
54-
"resource_group_id": "${data.alicloud_resource_manager_resource_groups.default.ids.1}",
53+
"coverage": "global",
5554
}),
5655
Check: resource.ComposeTestCheckFunc(
5756
testAccCheck(map[string]string{
58-
"coverage": "global",
59-
"resource_group_id": CHECKSET,
57+
"coverage": "global",
6058
}),
6159
),
6260
},
@@ -151,7 +149,7 @@ func TestAccAliCloudEsaSite_basic8484(t *testing.T) {
151149
rac := resourceAttrCheckInit(rc, ra)
152150
testAccCheck := rac.resourceAttrMapUpdateSet()
153151
rand := acctest.RandIntRange(10000, 99999)
154-
name := fmt.Sprintf("bcd%d.com", rand)
152+
name := fmt.Sprintf("bcd%d.queniuwk.cn", rand)
155153
testAccConfig := resourceTestAccConfigFunc(resourceId, name, AlicloudEsaSiteBasicDependence8484)
156154
resource.Test(t, resource.TestCase{
157155
PreCheck: func() {
@@ -182,13 +180,21 @@ func TestAccAliCloudEsaSite_basic8484(t *testing.T) {
182180
},
183181
{
184182
Config: testAccConfig(map[string]interface{}{
185-
"coverage": "global",
186-
"resource_group_id": "${data.alicloud_resource_manager_resource_groups.default.ids.1}",
183+
"coverage": "global",
187184
}),
188185
Check: resource.ComposeTestCheckFunc(
189186
testAccCheck(map[string]string{
190-
"coverage": "global",
191-
"resource_group_id": CHECKSET,
187+
"coverage": "global",
188+
}),
189+
),
190+
},
191+
{
192+
Config: testAccConfig(map[string]interface{}{
193+
"paused": "false",
194+
}),
195+
Check: resource.ComposeTestCheckFunc(
196+
testAccCheck(map[string]string{
197+
"paused": "false",
192198
}),
193199
),
194200
},
@@ -284,7 +290,7 @@ func TestAccAliCloudEsaSite_basic8288(t *testing.T) {
284290
rac := resourceAttrCheckInit(rc, ra)
285291
testAccCheck := rac.resourceAttrMapUpdateSet()
286292
rand := acctest.RandIntRange(10000, 99999)
287-
name := fmt.Sprintf("bcd%d.com", rand)
293+
name := fmt.Sprintf("bcd%d.queniuwk.cn", rand)
288294
testAccConfig := resourceTestAccConfigFunc(resourceId, name, AlicloudEsaSiteBasicDependence8288)
289295
resource.Test(t, resource.TestCase{
290296
PreCheck: func() {
@@ -315,13 +321,11 @@ func TestAccAliCloudEsaSite_basic8288(t *testing.T) {
315321
},
316322
{
317323
Config: testAccConfig(map[string]interface{}{
318-
"coverage": "global",
319-
"resource_group_id": "${data.alicloud_resource_manager_resource_groups.default.ids.1}",
324+
"coverage": "global",
320325
}),
321326
Check: resource.ComposeTestCheckFunc(
322327
testAccCheck(map[string]string{
323-
"coverage": "global",
324-
"resource_group_id": CHECKSET,
328+
"coverage": "global",
325329
}),
326330
),
327331
},
@@ -417,7 +421,7 @@ func TestAccAliCloudEsaSite_basic8106(t *testing.T) {
417421
rac := resourceAttrCheckInit(rc, ra)
418422
testAccCheck := rac.resourceAttrMapUpdateSet()
419423
rand := acctest.RandIntRange(10000, 99999)
420-
name := fmt.Sprintf("bcd%d.com", rand)
424+
name := fmt.Sprintf("bcd%d.queniuwk.cn", rand)
421425
testAccConfig := resourceTestAccConfigFunc(resourceId, name, AlicloudEsaSiteBasicDependence8106)
422426
resource.Test(t, resource.TestCase{
423427
PreCheck: func() {
@@ -550,7 +554,7 @@ func TestAccAliCloudEsaSite_basic9798(t *testing.T) {
550554
rac := resourceAttrCheckInit(rc, ra)
551555
testAccCheck := rac.resourceAttrMapUpdateSet()
552556
rand := acctest.RandIntRange(10000, 99999)
553-
name := fmt.Sprintf("bcd%d.com", rand)
557+
name := fmt.Sprintf("bcd%d.queniuwk.cn", rand)
554558
testAccConfig := resourceTestAccConfigFunc(resourceId, name, AlicloudEsaSiteBasicDependence9798)
555559
resource.Test(t, resource.TestCase{
556560
PreCheck: func() {
@@ -678,7 +682,7 @@ func TestAccAliCloudEsaSite_basic10677(t *testing.T) {
678682
rac := resourceAttrCheckInit(rc, ra)
679683
testAccCheck := rac.resourceAttrMapUpdateSet()
680684
rand := acctest.RandIntRange(10000, 99999)
681-
name := fmt.Sprintf("bcd%d.com", rand)
685+
name := fmt.Sprintf("bcd%d.queniuwk.cn", rand)
682686
testAccConfig := resourceTestAccConfigFunc(resourceId, name, AlicloudEsaSiteBasicDependence10677)
683687
resource.Test(t, resource.TestCase{
684688
PreCheck: func() {

0 commit comments

Comments
 (0)