Fix route ressource id and test

outscale · Dec 8, 2022 · 9d27ae7 · 9d27ae7
1 parent 58e899a
commit 9d27ae7
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/outscale/resource_outscale_route.go b/outscale/resource_outscale_route.go
@@ -175,14 +175,15 @@ func resourceOutscaleOAPIRouteCreate(d *schema.ResourceData, meta interface{}) e
 		}
 	}
 
-	d.SetId(d.Get("route_table_id").(string))
+	d.SetId(d.Get("route_table_id").(string) + "_" + d.Get("destination_ip_range").(string))
+
 	resourceOutscaleOAPIRouteSetResourceData(d, route, requestID)
 	return nil
 }
 
 func resourceOutscaleOAPIRouteRead(d *schema.ResourceData, meta interface{}) error {
 	conn := meta.(*OutscaleClient).OSCAPI
-	routeTableID := d.Id()
+	routeTableID := d.Get("route_table_id").(string)
 
 	destinationIPRange := d.Get("destination_ip_range").(string)
 	var requestID string
@@ -499,7 +500,7 @@ func resourceOutscaleOAPIRouteImportState(d *schema.ResourceData, meta interface
 		return nil, fmt.Errorf("error setting `%s` for Outscale Route(%s): %s", "destination_ip_range", destinationIPRange, err)
 	}
 
-	d.SetId(routeTableID)
+	d.SetId(d.Get("route_table_id").(string) + "_" + d.Get("destination_ip_range").(string))
 
 	return []*schema.ResourceData{d}, nil
 }
diff --git a/outscale/resource_outscale_route_test.go b/outscale/resource_outscale_route_test.go
@@ -210,7 +210,7 @@ func testAccCheckOutscaleOAPIRouteImportStateIDFunc(resourceName string) resourc
 		if !ok {
 			return "", fmt.Errorf("Not found: %s", resourceName)
 		}
-		return fmt.Sprintf("%s_%s", rs.Primary.ID, rs.Primary.Attributes["destination_ip_range"]), nil
+		return rs.Primary.ID, nil
 	}
 }