Skip to content

resource/alicloud_esa_site: Added the field paused. #9106

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

resource/alicloud_esa_site: Added the field paused. #9106

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
47 changes: 23 additions & 24 deletions alicloud/resource_alicloud_esa_site.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,12 +23,12 @@ func resourceAliCloudEsaSite() *schema.Resource {
Timeouts: &schema.ResourceTimeout{
Create: schema.DefaultTimeout(5 * time.Minute),
Update: schema.DefaultTimeout(5 * time.Minute),
Delete: schema.DefaultTimeout(5 * time.Minute),
Delete: schema.DefaultTimeout(15 * time.Minute),
},
Schema: map[string]*schema.Schema{
"access_type": {
Type: schema.TypeString,
Optional: true,
Required: true,
ForceNew: true,
},
"add_client_geolocation_header": {
Expand Down Expand Up @@ -91,6 +91,10 @@ func resourceAliCloudEsaSite() *schema.Resource {
Optional: true,
Computed: true,
},
"paused": {
Type: schema.TypeBool,
Optional: true,
},
"resource_group_id": {
Type: schema.TypeString,
Optional: true,
Expand Down Expand Up @@ -141,7 +145,6 @@ func resourceAliCloudEsaSiteCreate(d *schema.ResourceData, meta interface{}) err
query := make(map[string]interface{})
var err error
request = make(map[string]interface{})
request["RegionId"] = client.RegionId

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

esaServiceV2 := EsaServiceV2{client}
objectRaw, _ := esaServiceV2.DescribeEsaSite(d.Id())

if d.HasChange("version_management") {
var err error
esaServiceV2 := EsaServiceV2{client}
object, err := esaServiceV2.DescribeEsaSite(d.Id())
if err != nil {
return WrapError(err)
}

target := d.Get("version_management").(bool)
if object["VersionManagement"].(bool) != target {
if objectRaw["VersionManagement"].(bool) != target {
if target == true {
action := "ActivateVersionManagement"
request = make(map[string]interface{})
query = make(map[string]interface{})
request["SiteId"] = d.Id()
request["RegionId"] = client.RegionId

wait := incrementalWait(3*time.Second, 5*time.Second)
err = resource.Retry(d.Timeout(schema.TimeoutUpdate), func() *resource.RetryError {
response, err = client.RpcPost("ESA", "2024-09-10", action, query, request, true)
Expand All @@ -343,7 +343,7 @@ func resourceAliCloudEsaSiteUpdate(d *schema.ResourceData, meta interface{}) err
request = make(map[string]interface{})
query = make(map[string]interface{})
request["SiteId"] = d.Id()
request["RegionId"] = client.RegionId

wait := incrementalWait(3*time.Second, 5*time.Second)
err = resource.Retry(d.Timeout(schema.TimeoutUpdate), func() *resource.RetryError {
response, err = client.RpcPost("ESA", "2024-09-10", action, query, request, true)
Expand All @@ -370,7 +370,7 @@ func resourceAliCloudEsaSiteUpdate(d *schema.ResourceData, meta interface{}) err
request = make(map[string]interface{})
query = make(map[string]interface{})
request["SiteId"] = d.Id()
request["RegionId"] = client.RegionId

if !d.IsNewResource() && d.HasChange("coverage") {
update = true
}
Expand Down Expand Up @@ -436,7 +436,7 @@ func resourceAliCloudEsaSiteUpdate(d *schema.ResourceData, meta interface{}) err
request = make(map[string]interface{})
query = make(map[string]interface{})
request["SiteId"] = d.Id()
request["RegionId"] = client.RegionId

if d.HasChange("cache_architecture_mode") {
update = true
}
Expand Down Expand Up @@ -464,7 +464,7 @@ func resourceAliCloudEsaSiteUpdate(d *schema.ResourceData, meta interface{}) err
request = make(map[string]interface{})
query = make(map[string]interface{})
request["SiteId"] = d.Id()
request["RegionId"] = client.RegionId

if d.HasChange("add_real_client_ip_header") {
update = true
request["AddRealClientIpHeader"] = d.Get("add_real_client_ip_header")
Expand Down Expand Up @@ -503,7 +503,7 @@ func resourceAliCloudEsaSiteUpdate(d *schema.ResourceData, meta interface{}) err
request = make(map[string]interface{})
query = make(map[string]interface{})
request["SiteId"] = d.Id()
request["RegionId"] = client.RegionId

if d.HasChange("cross_border_optimization") {
update = true
}
Expand Down Expand Up @@ -531,7 +531,7 @@ func resourceAliCloudEsaSiteUpdate(d *schema.ResourceData, meta interface{}) err
request = make(map[string]interface{})
query = make(map[string]interface{})
request["SiteId"] = d.Id()
request["RegionId"] = client.RegionId

if d.HasChange("site_name_exclusive") {
update = true
}
Expand Down Expand Up @@ -559,7 +559,7 @@ func resourceAliCloudEsaSiteUpdate(d *schema.ResourceData, meta interface{}) err
request = make(map[string]interface{})
query = make(map[string]interface{})
request["SiteId"] = d.Id()
request["RegionId"] = client.RegionId

if d.HasChange("flatten_mode") {
update = true
}
Expand Down Expand Up @@ -587,7 +587,7 @@ func resourceAliCloudEsaSiteUpdate(d *schema.ResourceData, meta interface{}) err
request = make(map[string]interface{})
query = make(map[string]interface{})
request["SiteId"] = d.Id()
request["RegionId"] = client.RegionId

if d.HasChange("seo_bypass") {
update = true
}
Expand Down Expand Up @@ -615,7 +615,7 @@ func resourceAliCloudEsaSiteUpdate(d *schema.ResourceData, meta interface{}) err
request = make(map[string]interface{})
query = make(map[string]interface{})
request["SiteId"] = d.Id()
request["RegionId"] = client.RegionId

if d.HasChange("case_insensitive") {
update = true
request["CaseInsensitive"] = d.Get("case_insensitive")
Expand Down Expand Up @@ -654,7 +654,7 @@ func resourceAliCloudEsaSiteUpdate(d *schema.ResourceData, meta interface{}) err
request = make(map[string]interface{})
query = make(map[string]interface{})
request["SiteId"] = d.Id()
request["RegionId"] = client.RegionId

if d.HasChange("development_mode") {
update = true
}
Expand Down Expand Up @@ -682,7 +682,7 @@ func resourceAliCloudEsaSiteUpdate(d *schema.ResourceData, meta interface{}) err
request = make(map[string]interface{})
query = make(map[string]interface{})
request["SiteId"] = d.Id()
request["RegionId"] = client.RegionId

if d.HasChange("paused") {
update = true
}
Expand Down Expand Up @@ -710,7 +710,7 @@ func resourceAliCloudEsaSiteUpdate(d *schema.ResourceData, meta interface{}) err
request = make(map[string]interface{})
query = make(map[string]interface{})
request["SiteId"] = d.Id()
request["RegionId"] = client.RegionId

if d.HasChange("cache_reserve_instance_id") {
update = true
request["CacheReserveInstanceId"] = d.Get("cache_reserve_instance_id")
Expand Down Expand Up @@ -764,7 +764,6 @@ func resourceAliCloudEsaSiteDelete(d *schema.ResourceData, meta interface{}) err
wait := incrementalWait(3*time.Second, 5*time.Second)
err = resource.Retry(d.Timeout(schema.TimeoutDelete), func() *resource.RetryError {
response, err = client.RpcPost("ESA", "2024-09-10", action, query, request, true)

if err != nil {
if IsExpectedErrors(err, []string{"Site.ServiceBusy"}) || NeedRetry(err) {
wait()
Expand Down
40 changes: 22 additions & 18 deletions alicloud/resource_alicloud_esa_site_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ func TestAccAliCloudEsaSite_basic8490(t *testing.T) {
rac := resourceAttrCheckInit(rc, ra)
testAccCheck := rac.resourceAttrMapUpdateSet()
rand := acctest.RandIntRange(10000, 99999)
name := fmt.Sprintf("bcd%d.com", rand)
name := fmt.Sprintf("bcd%d.queniuwk.cn", rand)
testAccConfig := resourceTestAccConfigFunc(resourceId, name, AlicloudEsaSiteBasicDependence8490)
resource.Test(t, resource.TestCase{
PreCheck: func() {
Expand Down Expand Up @@ -50,13 +50,11 @@ func TestAccAliCloudEsaSite_basic8490(t *testing.T) {
},
{
Config: testAccConfig(map[string]interface{}{
"coverage": "global",
"resource_group_id": "${data.alicloud_resource_manager_resource_groups.default.ids.1}",
"coverage": "global",
}),
Check: resource.ComposeTestCheckFunc(
testAccCheck(map[string]string{
"coverage": "global",
"resource_group_id": CHECKSET,
"coverage": "global",
}),
),
},
Expand Down Expand Up @@ -151,7 +149,7 @@ func TestAccAliCloudEsaSite_basic8484(t *testing.T) {
rac := resourceAttrCheckInit(rc, ra)
testAccCheck := rac.resourceAttrMapUpdateSet()
rand := acctest.RandIntRange(10000, 99999)
name := fmt.Sprintf("bcd%d.com", rand)
name := fmt.Sprintf("bcd%d.queniuwk.cn", rand)
testAccConfig := resourceTestAccConfigFunc(resourceId, name, AlicloudEsaSiteBasicDependence8484)
resource.Test(t, resource.TestCase{
PreCheck: func() {
Expand Down Expand Up @@ -182,13 +180,21 @@ func TestAccAliCloudEsaSite_basic8484(t *testing.T) {
},
{
Config: testAccConfig(map[string]interface{}{
"coverage": "global",
"resource_group_id": "${data.alicloud_resource_manager_resource_groups.default.ids.1}",
"coverage": "global",
}),
Check: resource.ComposeTestCheckFunc(
testAccCheck(map[string]string{
"coverage": "global",
"resource_group_id": CHECKSET,
"coverage": "global",
}),
),
},
{
Config: testAccConfig(map[string]interface{}{
"paused": "false",
}),
Check: resource.ComposeTestCheckFunc(
testAccCheck(map[string]string{
"paused": "false",
}),
),
},
Expand Down Expand Up @@ -284,7 +290,7 @@ func TestAccAliCloudEsaSite_basic8288(t *testing.T) {
rac := resourceAttrCheckInit(rc, ra)
testAccCheck := rac.resourceAttrMapUpdateSet()
rand := acctest.RandIntRange(10000, 99999)
name := fmt.Sprintf("bcd%d.com", rand)
name := fmt.Sprintf("bcd%d.queniuwk.cn", rand)
testAccConfig := resourceTestAccConfigFunc(resourceId, name, AlicloudEsaSiteBasicDependence8288)
resource.Test(t, resource.TestCase{
PreCheck: func() {
Expand Down Expand Up @@ -315,13 +321,11 @@ func TestAccAliCloudEsaSite_basic8288(t *testing.T) {
},
{
Config: testAccConfig(map[string]interface{}{
"coverage": "global",
"resource_group_id": "${data.alicloud_resource_manager_resource_groups.default.ids.1}",
"coverage": "global",
}),
Check: resource.ComposeTestCheckFunc(
testAccCheck(map[string]string{
"coverage": "global",
"resource_group_id": CHECKSET,
"coverage": "global",
}),
),
},
Expand Down Expand Up @@ -417,7 +421,7 @@ func TestAccAliCloudEsaSite_basic8106(t *testing.T) {
rac := resourceAttrCheckInit(rc, ra)
testAccCheck := rac.resourceAttrMapUpdateSet()
rand := acctest.RandIntRange(10000, 99999)
name := fmt.Sprintf("bcd%d.com", rand)
name := fmt.Sprintf("bcd%d.queniuwk.cn", rand)
testAccConfig := resourceTestAccConfigFunc(resourceId, name, AlicloudEsaSiteBasicDependence8106)
resource.Test(t, resource.TestCase{
PreCheck: func() {
Expand Down Expand Up @@ -550,7 +554,7 @@ func TestAccAliCloudEsaSite_basic9798(t *testing.T) {
rac := resourceAttrCheckInit(rc, ra)
testAccCheck := rac.resourceAttrMapUpdateSet()
rand := acctest.RandIntRange(10000, 99999)
name := fmt.Sprintf("bcd%d.com", rand)
name := fmt.Sprintf("bcd%d.queniuwk.cn", rand)
testAccConfig := resourceTestAccConfigFunc(resourceId, name, AlicloudEsaSiteBasicDependence9798)
resource.Test(t, resource.TestCase{
PreCheck: func() {
Expand Down Expand Up @@ -678,7 +682,7 @@ func TestAccAliCloudEsaSite_basic10677(t *testing.T) {
rac := resourceAttrCheckInit(rc, ra)
testAccCheck := rac.resourceAttrMapUpdateSet()
rand := acctest.RandIntRange(10000, 99999)
name := fmt.Sprintf("bcd%d.com", rand)
name := fmt.Sprintf("bcd%d.queniuwk.cn", rand)
testAccConfig := resourceTestAccConfigFunc(resourceId, name, AlicloudEsaSiteBasicDependence10677)
resource.Test(t, resource.TestCase{
PreCheck: func() {
Expand Down
Loading
Loading