Fix issue IBM-Cloud#1943

hkantare · Oct 7, 2020 · 066cc3b · 066cc3b
1 parent ec2d112
commit 066cc3b
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 6 deletions.
diff --git a/ibm/resource_ibm_tg_gateway.go b/ibm/resource_ibm_tg_gateway.go
@@ -347,9 +347,11 @@ func resourceIBMTransitGatewayDelete(d *schema.ResourceData, meta interface{}) e
 	}
 	response, err := client.DeleteTransitGateway(delOptions)
 
-	if err != nil && response.StatusCode != 404 {
-		log.Printf("Error deleting Transit Gateway: %s", response)
-		return err
+	if err != nil {
+		if response != nil && response.StatusCode == 404 {
+			return nil
+		}
+		return fmt.Errorf("Error deleting Transit Gateway (%s): %s\n%s", ID, err, response)
 	}
 	_, err = isWaitForTransitGatewayDeleted(client, ID, d.Timeout(schema.TimeoutDelete))
 	if err != nil {

diff --git a/ibm/resource_ibm_tg_gateway_connection.go b/ibm/resource_ibm_tg_gateway_connection.go
@@ -335,9 +335,11 @@ func resourceIBMTransitGatewayConnectionDelete(d *schema.ResourceData, meta inte
 	deleteTransitGatewayConnectionOptions.SetTransitGatewayID(gatewayId)
 	response, err := client.DeleteTransitGatewayConnection(deleteTransitGatewayConnectionOptions)
 
-	if err != nil && response.StatusCode != 404 {
-		log.Printf("Error deleting Transit Gateway Connection: %s", response)
-		return err
+	if err != nil {
+		if response != nil && response.StatusCode == 404 {
+			return nil
+		}
+		return fmt.Errorf("Error deleting Transit Gateway Connection(%s): %s\n%s", ID, err, response)
 	}
 	_, err = isWaitForTransitGatewayConnectionDeleted(client, d.Id(), d.Timeout(schema.TimeoutCreate))