Skip to content

Commit

Permalink
fix some bug
Browse files Browse the repository at this point in the history
  • Loading branch information
xuyaming0800 committed Oct 15, 2021
1 parent 623c6b1 commit 02347f8
Show file tree
Hide file tree
Showing 9 changed files with 635 additions and 14 deletions.
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"ksyun": "468918538a249f8210278f142f5b942a17f6911a1e81fb27ed3a06d29a2297f6"
}
1 change: 0 additions & 1 deletion example/dataAvailibilityZones/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,5 @@ provider "ksyun" {
# Get availability zones
data "ksyun_availability_zones" "default" {
output_file=""
ids=[]
}

39 changes: 39 additions & 0 deletions example/dataAvailibilityZones/terraform.tfstate
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
{
"version": 4,
"terraform_version": "0.12.32",
"serial": 1,
"lineage": "867ccddb-33ab-ec77-2e20-a58a5665657a",
"outputs": {},
"resources": [
{
"mode": "data",
"type": "ksyun_availability_zones",
"name": "default",
"provider": "provider.ksyun",
"instances": [
{
"schema_version": 0,
"attributes": {
"availability_zones": [
{
"availability_zone_name": "cn-beijing-6a"
},
{
"availability_zone_name": "cn-beijing-6b"
},
{
"availability_zone_name": "cn-beijing-6c"
},
{
"availability_zone_name": "cn-beijing-6d"
}
],
"id": "2068427743",
"output_file": null,
"total_count": 4
}
}
]
}
]
}
3 changes: 1 addition & 2 deletions ksyun/resource_ksyun_rabbitmq_security_rule.go
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,6 @@ func resourceRabbitmqSecurityRuleDelete(d *schema.ResourceData, meta interface{}
var (
err error
del string
resp *map[string]interface{}
)
if checkMultipleExist("cidrs", d) {
del = d.Get("cidrs").(string)
Expand All @@ -113,7 +112,7 @@ func resourceRabbitmqSecurityRuleDelete(d *schema.ResourceData, meta interface{}
}

return resource.Retry(25*time.Minute, func() *resource.RetryError {
resp, err = deleteRabbitmqRules(d, meta, d.Get("instance_id").(string), del)
_, err = deleteRabbitmqRules(d, meta, d.Get("instance_id").(string), del)
if err == nil {
return nil
}
Expand Down
5 changes: 1 addition & 4 deletions ksyun/service_ksyun_instance.go
Original file line number Diff line number Diff line change
Expand Up @@ -871,17 +871,14 @@ func (s *KecService) startKecInstance(d *schema.ResourceData) (callback ApiCall,
}

func (s *KecService) removeKecInstance(d *schema.ResourceData, meta interface{}) (err error) {
var (
resp *map[string]interface{}
)
conn := meta.(*KsyunClient).kecconn
req := make(map[string]interface{})
req["InstanceId.1"] = d.Id()
req["ForceDelete"] = true
return resource.Retry(15*time.Minute, func() *resource.RetryError {
action := "TerminateInstances"
logger.Debug(logger.ReqFormat, action, req)
resp, err = conn.TerminateInstances(&req)
_, err = conn.TerminateInstances(&req)
if err == nil {
return nil
}
Expand Down
7 changes: 2 additions & 5 deletions ksyun/service_ksyun_krds.go
Original file line number Diff line number Diff line change
Expand Up @@ -800,22 +800,19 @@ func removeKrdsInstance(d *schema.ResourceData, meta interface{}) (err error) {
}

func removeKrdsDbInstance(d *schema.ResourceData, meta interface{}) (err error) {
var (
resp *map[string]interface{}
)
conn := meta.(*KsyunClient).krdsconn
req := make(map[string]interface{})
req["DBInstanceIdentifier"] = d.Id()
return resource.Retry(15*time.Minute, func() *resource.RetryError {
action := "DeleteDBInstance"
logger.Debug(logger.ReqFormat, action, req)
resp, err = conn.DeleteDBInstance(&req)
_, err = conn.DeleteDBInstance(&req)
if err == nil {
return nil
}
action = "DescribeInstances"
logger.Debug(logger.ReqFormat, action, req)
resp, err = conn.DescribeDBInstances(&req)
_, err = conn.DescribeDBInstances(&req)
if err != nil {
if notFoundError(err) {
return nil
Expand Down
4 changes: 2 additions & 2 deletions make.sh
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#bin/sh
go build
rm ~/Work/Go/project/bin/terraform-provider-ksyun
cp ~/Work/Go/project/src/github.com/kingsoftcloud/terraform-provider-ksyun/terraform-provider-ksyun ~/Work/Go/project/bin/
rm $GOPATH/bin/terraform-provider-ksyun
cp $GOPATH/src/github.com/kingsoftcloud/terraform-provider-ksyun/terraform-provider-ksyun $GOPATH/bin/
Loading

0 comments on commit 02347f8

Please sign in to comment.