fix data resource retrun err

ttomzhou · ttomzhou · commit 726e83fc2b35 · 2020-10-26T17:20:25.000+08:00
diff --git a/examples/tencentcloud-api-gateway/main.tf b/examples/tencentcloud-api-gateway/main.tf
@@ -90,7 +90,7 @@ resource "tencentcloud_api_gateway_usage_plan_attachment" "attach_service" {
 }
 
 resource "tencentcloud_api_gateway_service_release" "service" {
-  service_id       = tencentcloud_api_gateway_service.service.id
+  service_id       = tencentcloud_api_gateway_api.api.service_id
   environment_name = "release"
   release_desc     = var.release_desc
 }
@@ -151,7 +151,7 @@ data "tencentcloud_api_gateway_throttling_apis" "foo" {
 }
 
 data "tencentcloud_api_gateway_throttling_services" "id" {
-    service_id = tencentcloud_api_gateway_throttling_service.service.service_id
+    service_id = tencentcloud_api_gateway_service.service.id
 }
 
 data "tencentcloud_api_gateway_usage_plan_environments" "environment_test" {
diff --git a/tencentcloud/data_source_tc_api_gateway_api_keys.go b/tencentcloud/data_source_tc_api_gateway_api_keys.go
@@ -131,6 +131,7 @@ func dataSourceTencentCloudAPIGatewayAPIKeysRead(d *schema.ResourceData, meta in
 
 	if err := d.Set("list", list); err != nil {
 		log.Printf("[CRITAL]%s provider set list fail, reason:%s", logId, err.Error())
+		return err
 	}
 
 	d.SetId(strings.Join([]string{secretName, accessKeyId}, FILED_SP))
diff --git a/tencentcloud/data_source_tc_api_gateway_apis.go b/tencentcloud/data_source_tc_api_gateway_apis.go
@@ -405,6 +405,7 @@ func dataSourceTencentCloudAPIGatewayAPIsRead(d *schema.ResourceData, meta inter
 
 	if err = d.Set("list", list); err != nil {
 		log.Printf("[CRITAL]%s provider set list fail, reason:%s", logId, err.Error())
+		return err
 	}
 
 	d.SetId(strings.Join([]string{apiName, apiId}, FILED_SP))
diff --git a/tencentcloud/data_source_tc_api_gateway_customer_domains.go b/tencentcloud/data_source_tc_api_gateway_customer_domains.go
@@ -165,6 +165,7 @@ func dataSourceTencentCloudAPIGatewayCustomerDomainRead(d *schema.ResourceData,
 
 	if err = d.Set("list", list); err != nil {
 		log.Printf("[CRITAL]%s provider set list fail, reason:%s", logId, err.Error())
+		return err
 	}
 
 	d.SetId(serviceId)
diff --git a/tencentcloud/data_source_tc_api_gateway_ip_strategies.go b/tencentcloud/data_source_tc_api_gateway_ip_strategies.go
@@ -299,6 +299,7 @@ func dataSourceTencentCloudAPIGatewayIpStrategyRead(d *schema.ResourceData, meta
 
 	if err = d.Set("list", list); err != nil {
 		log.Printf("[CRITAL]%s provider set list fail, reason:%s", logId, err.Error())
+		return err
 	}
 
 	d.SetId(strings.Join([]string{serviceId, strategyName}, FILED_SP))
diff --git a/tencentcloud/data_source_tc_api_gateway_services.go b/tencentcloud/data_source_tc_api_gateway_services.go
@@ -281,6 +281,7 @@ func dataSourceTencentCloudAPIGatewayServicesRead(d *schema.ResourceData, meta i
 
 	if err = d.Set("list", list); err != nil {
 		log.Printf("[CRITAL]%s provider set list fail, reason:%s", logId, err.Error())
+		return err
 	}
 
 	d.SetId(strings.Join([]string{serviceName, serviceId}, FILED_SP))
diff --git a/tencentcloud/data_source_tc_api_gateway_throttling_apis.go b/tencentcloud/data_source_tc_api_gateway_throttling_apis.go
@@ -243,6 +243,7 @@ func dataSourceTencentCloudAPIGatewayThrottlingApisRead(d *schema.ResourceData,
 	d.SetId(helper.DataResourceIdsHash(ids))
 	if err = d.Set("list", resultLists); err != nil {
 		log.Printf("[CRITAL]%s provider set list fail, reason:%s", logId, err.Error())
+		return err
 	}
 
 	output, ok := d.GetOk("result_output_file")
diff --git a/tencentcloud/data_source_tc_api_gateway_throttling_services.go b/tencentcloud/data_source_tc_api_gateway_throttling_services.go
@@ -171,6 +171,7 @@ func dataSourceTencentCloudAPIGatewayThrottlingServicesRead(d *schema.ResourceDa
 	d.SetId(helper.DataResourceIdsHash(ids))
 	if err = d.Set("list", resultLists); err != nil {
 		log.Printf("[CRITAL]%s provider set list fail, reason:%s", logId, err.Error())
+		return err
 	}
 
 	output, ok := d.GetOk("result_output_file")
diff --git a/tencentcloud/data_source_tc_api_gateway_usage_plan_environments.go b/tencentcloud/data_source_tc_api_gateway_usage_plan_environments.go
@@ -165,6 +165,7 @@ func dataSourceTencentCloudUsagePlanEnvironmentRead(d *schema.ResourceData, meta
 
 	if err = d.Set("list", list); err != nil {
 		log.Printf("[CRITAL]%s provider set list fail, reason:%s", logId, err.Error())
+		return err
 	}
 
 	d.SetId(strings.Join([]string{usagePlanId, bindType}, FILED_SP))
diff --git a/tencentcloud/data_source_tc_api_gateway_usage_plans.go b/tencentcloud/data_source_tc_api_gateway_usage_plans.go
@@ -146,6 +146,7 @@ func dataSourceTencentCloudAPIGatewayUsagePlansRead(d *schema.ResourceData, meta
 
 	if err = d.Set("list", list); err != nil {
 		log.Printf("[CRITAL]%s provider set list fail, reason:%s", logId, err.Error())
+		return err
 	}
 
 	d.SetId(strings.Join([]string{usagePlanId, usagePlanName}, FILED_SP))
diff --git a/tencentcloud/resource_tc_api_gateway_ip_strategy.go b/tencentcloud/resource_tc_api_gateway_ip_strategy.go
@@ -173,12 +173,12 @@ func resourceTencentCloudAPIGatewayIPStrategyRead(d *schema.ResourceData, meta i
 		return nil
 	}
 
-	_ = d.Set("service_id", *IpStatus.ServiceId)
-	_ = d.Set("strategy_name", *IpStatus.StrategyName)
-	_ = d.Set("strategy_type", *IpStatus.StrategyType)
-	_ = d.Set("strategy_data", *IpStatus.StrategyData)
-	_ = d.Set("strategy_id", *IpStatus.StrategyId)
-	_ = d.Set("create_time", *IpStatus.CreatedTime)
+	_ = d.Set("service_id", IpStatus.ServiceId)
+	_ = d.Set("strategy_name", IpStatus.StrategyName)
+	_ = d.Set("strategy_type", IpStatus.StrategyType)
+	_ = d.Set("strategy_data", IpStatus.StrategyData)
+	_ = d.Set("strategy_id", IpStatus.StrategyId)
+	_ = d.Set("create_time", IpStatus.CreatedTime)
 
 	return nil
 }
diff --git a/tencentcloud/resource_tc_api_gateway_service_release.go b/tencentcloud/resource_tc_api_gateway_service_release.go
@@ -47,7 +47,7 @@ resource "tencentcloud_api_gateway_api" "api" {
 }
 
 resource "tencentcloud_api_gateway_service_release" "service" {
-  service_id       = tencentcloud_api_gateway_service.service.id
+  service_id       = tencentcloud_api_gateway_api.api.service.id
   environment_name = "release"
   release_desc     = "test service release"
 }
@@ -222,8 +222,8 @@ func resourceTencentCloudAPIGatewayServiceReleaseRead(d *schema.ResourceData, me
 		if *v.VersionName == envVersion {
 			_ = d.Set("service_id", serviceId)
 			_ = d.Set("environment_name", envName)
-			_ = d.Set("release_desc", *v.VersionDesc)
-			_ = d.Set("release_version", *v.VersionName)
+			_ = d.Set("release_desc", v.VersionDesc)
+			_ = d.Set("release_version", v.VersionName)
 		}
 	}
 
diff --git a/tencentcloud/resource_tc_api_gateway_service_release_test.go b/tencentcloud/resource_tc_api_gateway_service_release_test.go
@@ -136,11 +136,11 @@ func testAccCheckAPIGatewayServiceReleaseExists(n string) resource.TestCheckFunc
 
 const testAccAPIGatewayServiceRelease = `
 resource "tencentcloud_api_gateway_service" "service" {
-  service_name = "myservice"
-  protocol     = "http"
-  service_desc = "my nice service"
-  net_type     = ["INNER"]
-  ip_version   = "IPv4"
+  	service_name = "niceservice"
+  	protocol     = "http&https"
+  	service_desc = "your nice service"
+  	net_type     = ["INNER", "OUTER"]
+  	ip_version   = "IPv4"
 }
 
 resource "tencentcloud_api_gateway_api" "api" {
@@ -169,16 +169,16 @@ resource "tencentcloud_api_gateway_api" "api" {
     response_success_example = "<note>success</note>"
     response_fail_example    = "<note>fail</note>"
     response_error_codes {
-    	code           = 10
+    	code           = 20
         msg            = "system error"
        	desc           = "system error code"
        	converted_code = -10
         need_convert   = true
-    }
+	}
 }
 
 resource "tencentcloud_api_gateway_service_release" "service" {
-  service_id       = tencentcloud_api_gateway_service.service.id
+  service_id       = tencentcloud_api_gateway_api.api.service_id
   environment_name = "release"
   release_desc     = "test service release"
 }
diff --git a/website/docs/r/api_gateway_service_release.html.markdown b/website/docs/r/api_gateway_service_release.html.markdown
@@ -57,7 +57,7 @@ resource "tencentcloud_api_gateway_api" "api" {
 }
 
 resource "tencentcloud_api_gateway_service_release" "service" {
-  service_id       = tencentcloud_api_gateway_service.service.id
+  service_id       = tencentcloud_api_gateway_api.api.service.id
   environment_name = "release"
   release_desc     = "test service release"
 }
diff --git a/website/docs/r/api_gateway_throttling_api.html.markdown b/website/docs/r/api_gateway_throttling_api.html.markdown
diff --git a/website/docs/r/api_gateway_throttling_service.html.markdown b/website/docs/r/api_gateway_throttling_service.html.markdown

Original file line number	Diff line number	Diff line change
`@@ -90,7 +90,7 @@ resource "tencentcloud_api_gateway_usage_plan_attachment" "attach_service" {`
`90`	`90`	`}`
`91`	`91`
`92`	`92`	`resource "tencentcloud_api_gateway_service_release" "service" {`
`93`		`- service_id = tencentcloud_api_gateway_service.service.id`
	`93`	`+ service_id = tencentcloud_api_gateway_api.api.service_id`
`94`	`94`	`environment_name = "release"`
`95`	`95`	`release_desc = var.release_desc`
`96`	`96`	`}`
`@@ -151,7 +151,7 @@ data "tencentcloud_api_gateway_throttling_apis" "foo" {`
`151`	`151`	`}`
`152`	`152`
`153`	`153`	`data "tencentcloud_api_gateway_throttling_services" "id" {`
`154`		`- service_id = tencentcloud_api_gateway_throttling_service.service.service_id`
	`154`	`+ service_id = tencentcloud_api_gateway_service.service.id`
`155`	`155`	`}`
`156`	`156`
`157`	`157`	`data "tencentcloud_api_gateway_usage_plan_environments" "environment_test" {`
Original file line number	Diff line number	Diff line change
`@@ -131,6 +131,7 @@ func dataSourceTencentCloudAPIGatewayAPIKeysRead(d *schema.ResourceData, meta in`
`131`	`131`
`132`	`132`	`if err := d.Set("list", list); err != nil {`
`133`	`133`	`log.Printf("[CRITAL]%s provider set list fail, reason:%s", logId, err.Error())`
	`134`	`+ return err`
`134`	`135`	`}`
`135`	`136`
`136`	`137`	`d.SetId(strings.Join([]string{secretName, accessKeyId}, FILED_SP))`
Original file line number	Diff line number	Diff line change
`@@ -405,6 +405,7 @@ func dataSourceTencentCloudAPIGatewayAPIsRead(d *schema.ResourceData, meta inter`
`405`	`405`
`406`	`406`	`if err = d.Set("list", list); err != nil {`
`407`	`407`	`log.Printf("[CRITAL]%s provider set list fail, reason:%s", logId, err.Error())`
	`408`	`+ return err`
`408`	`409`	`}`
`409`	`410`
`410`	`411`	`d.SetId(strings.Join([]string{apiName, apiId}, FILED_SP))`
Original file line number	Diff line number	Diff line change
`@@ -165,6 +165,7 @@ func dataSourceTencentCloudAPIGatewayCustomerDomainRead(d *schema.ResourceData,`
`165`	`165`
`166`	`166`	`if err = d.Set("list", list); err != nil {`
`167`	`167`	`log.Printf("[CRITAL]%s provider set list fail, reason:%s", logId, err.Error())`
	`168`	`+ return err`
`168`	`169`	`}`
`169`	`170`
`170`	`171`	`d.SetId(serviceId)`
Original file line number	Diff line number	Diff line change
`@@ -299,6 +299,7 @@ func dataSourceTencentCloudAPIGatewayIpStrategyRead(d *schema.ResourceData, meta`
`299`	`299`
`300`	`300`	`if err = d.Set("list", list); err != nil {`
`301`	`301`	`log.Printf("[CRITAL]%s provider set list fail, reason:%s", logId, err.Error())`
	`302`	`+ return err`
`302`	`303`	`}`
`303`	`304`
`304`	`305`	`d.SetId(strings.Join([]string{serviceId, strategyName}, FILED_SP))`
Original file line number	Diff line number	Diff line change
`@@ -281,6 +281,7 @@ func dataSourceTencentCloudAPIGatewayServicesRead(d *schema.ResourceData, meta i`
`281`	`281`
`282`	`282`	`if err = d.Set("list", list); err != nil {`
`283`	`283`	`log.Printf("[CRITAL]%s provider set list fail, reason:%s", logId, err.Error())`
	`284`	`+ return err`
`284`	`285`	`}`
`285`	`286`
`286`	`287`	`d.SetId(strings.Join([]string{serviceName, serviceId}, FILED_SP))`
Original file line number	Diff line number	Diff line change
`@@ -243,6 +243,7 @@ func dataSourceTencentCloudAPIGatewayThrottlingApisRead(d *schema.ResourceData,`
`243`	`243`	`d.SetId(helper.DataResourceIdsHash(ids))`
`244`	`244`	`if err = d.Set("list", resultLists); err != nil {`
`245`	`245`	`log.Printf("[CRITAL]%s provider set list fail, reason:%s", logId, err.Error())`
	`246`	`+ return err`
`246`	`247`	`}`
`247`	`248`
`248`	`249`	`output, ok := d.GetOk("result_output_file")`
Original file line number	Diff line number	Diff line change
`@@ -171,6 +171,7 @@ func dataSourceTencentCloudAPIGatewayThrottlingServicesRead(d *schema.ResourceDa`
`171`	`171`	`d.SetId(helper.DataResourceIdsHash(ids))`
`172`	`172`	`if err = d.Set("list", resultLists); err != nil {`
`173`	`173`	`log.Printf("[CRITAL]%s provider set list fail, reason:%s", logId, err.Error())`
	`174`	`+ return err`
`174`	`175`	`}`
`175`	`176`
`176`	`177`	`output, ok := d.GetOk("result_output_file")`
Original file line number	Diff line number	Diff line change
`@@ -146,6 +146,7 @@ func dataSourceTencentCloudAPIGatewayUsagePlansRead(d *schema.ResourceData, meta`
`146`	`146`
`147`	`147`	`if err = d.Set("list", list); err != nil {`
`148`	`148`	`log.Printf("[CRITAL]%s provider set list fail, reason:%s", logId, err.Error())`
	`149`	`+ return err`
`149`	`150`	`}`
`150`	`151`
`151`	`152`	`d.SetId(strings.Join([]string{usagePlanId, usagePlanName}, FILED_SP))`