Merge pull request #1615 from oracle/v.4.80.1-hotfix

reverted changes to core route table that crashed the provider

Author: ravinitp

CHANGELOG.md

@@ -1,3 +1,7 @@
+## 4.80.1 (June 16, 2022)
+### Bug Fix
+- Fixed terraform crash for oci_core_route_table resource
+
 ## 4.80.0 (June 15, 2022)
 
 ### Added
@@ -9,8 +13,6 @@
 - ADBD time zone for database service
 ### Bug Fix
 - Mysql - Add return body to UpdateBackup api call
-### Notes
-- Current customers need to update to latest provider if they are seeing the diff in terraform plan for route-rules without making any change.
 
 ## 4.79.0 (June 08, 2022)
 

examples/networking/route_table/route_table.tf

@@ -56,3 +56,4 @@ resource "oci_core_route_table" "example_route_table" {
     network_entity_id = oci_core_internet_gateway.example_ig.id
   }
 }
+

internal/globalvar/version.go

@@ -7,7 +7,7 @@ import (
 	"log"
 )
 
-const Version = "4.80.0"
+const Version = "4.80.1"
 const ReleaseDate = "2022-06-16"
 
 func PrintVersion() {

internal/service/core/core_route_table_resource.go

@@ -345,14 +345,9 @@ func (s *CoreRouteTableResourceCrud) SetData() error {
 	s.D.Set("freeform_tags", s.Res.FreeformTags)
 
 	routeRules := []interface{}{}
-	readOnlyRule := "Local VCN Route created by OCI"
 	for _, item := range s.Res.RouteRules {
-		if *item.Description == readOnlyRule {
-			continue
-		}
-		routeRules = append(routeRules, CustomRouteRuleMap(item))
+		routeRules = append(routeRules, RouteRuleToMap(item))
 	}
-
 	s.D.Set("route_rules", schema.NewSet(routeRulesHashCodeForSets, routeRules))
 
 	s.D.Set("state", s.Res.LifecycleState)
@@ -419,33 +414,28 @@ func (s *CoreRouteTableResourceCrud) mapToRouteRule(fieldKeyFormat string) (oci_
 	return result, nil
 }
 
-func CustomRouteRuleMap(obj oci_core.RouteRule) map[string]interface{} {
+func RouteRuleToMap(obj oci_core.RouteRule) map[string]interface{} {
 	result := map[string]interface{}{}
-	readOnlyRule := "Local VCN Route created by OCI"
-
-	if *obj.Description != readOnlyRule {
 
-		if obj.CidrBlock != nil {
-			result["cidr_block"] = string(*obj.CidrBlock)
-		}
+	if obj.CidrBlock != nil {
+		result["cidr_block"] = string(*obj.CidrBlock)
+	}
 
-		if obj.Description != nil {
-			result["description"] = string(*obj.Description)
-		}
+	if obj.Description != nil {
+		result["description"] = string(*obj.Description)
+	}
 
-		if obj.Destination != nil {
-			result["destination"] = string(*obj.Destination)
-		}
+	if obj.Destination != nil {
+		result["destination"] = string(*obj.Destination)
+	}
 
-		result["destination_type"] = string(obj.DestinationType)
+	result["destination_type"] = string(obj.DestinationType)
 
-		if obj.NetworkEntityId != nil {
-			result["network_entity_id"] = string(*obj.NetworkEntityId)
-		}
-		return result
+	if obj.NetworkEntityId != nil {
+		result["network_entity_id"] = string(*obj.NetworkEntityId)
 	}
 
-	return nil
+	return result
 }
 
 func routeRulesHashCodeForSets(v interface{}) int {
@@ -482,7 +472,6 @@ func routeRulesHashCodeForSets(v interface{}) int {
 	}
 	return utils.GetStringHashcode(buf.String())
 }
-
 func (s *CoreRouteTableResourceCrud) updateCompartment(compartment interface{}) error {
 	changeCompartmentRequest := oci_core.ChangeRouteTableCompartmentRequest{}
 

internal/service/core/core_route_tables_data_source.go

@@ -134,14 +134,9 @@ func (s *CoreRouteTablesDataSourceCrud) SetData() error {
 		}
 
 		routeRules := []interface{}{}
-		readOnlyRule := "Local VCN Route created by OCI"
 		for _, item := range r.RouteRules {
-			if *item.Description == readOnlyRule {
-				continue
-			}
-			routeRules = append(routeRules, CustomRouteRuleMap(item))
+			routeRules = append(routeRules, RouteRuleToMap(item))
 		}
-
 		routeTable["route_rules"] = routeRules
 
 		routeTable["state"] = r.LifecycleState

website/docs/r/core_route_table.html.markdown

@@ -28,8 +28,6 @@ It does not have to be unique, and you can change it. Avoid entering confidentia
 
 For more information on configuring a VCN's default route table, see [Managing Default VCN Resources](/docs/providers/oci/guides/managing_default_resources.html)
 
-**Note:** Current customers need to update to latest provider if they are seeing the diff in terraform plan for route-rules without making any change.
-
 ## Example Usage
 
 ```hcl