add fix for dbVersions

Author: rcohenma

CHANGELOG.md

@@ -5,6 +5,9 @@
 - Support BGP dynamic routing and allow customer to input PSK for IPSec tunnels
 - ListInstanceConfig/Pools and ListAutoscalingConfiguration return tags
 
+### Fixed
+- Fix for dbSystem `db_version` causing unnecessary diffs on subsequent applies
+
 ## 3.25.0 (May 15, 2019)
 
 ### Added

oci/crud_helpers.go

@@ -444,7 +444,11 @@ func FilterMissingResourceError(sync ResourceVoider, err *error) {
 
 // In the Exadata case the service return the hostname provided by the service with a suffix
 func dbSystemHostnameDiffSuppress(key string, old string, new string, d *schema.ResourceData) bool {
-	return EqualIgnoreCaseSuppressDiff(key, old, new, d) || strings.HasPrefix(strings.ToLower(old), strings.ToLower(new))
+	return EqualIgnoreCaseSuppressDiff(key, old, new, d) || newIsPrefixOfOldDiffSuppress(key, old, new, d)
+}
+
+func NewIsPrefixOfOldDiffSuppress(key string, old string, new string, d *schema.ResourceData) bool {
+	return strings.HasPrefix(strings.ToLower(old), strings.ToLower(new))
 }
 
 func EqualIgnoreCaseSuppressDiff(key string, old string, new string, d *schema.ResourceData) bool {

oci/database_db_home_resource.go

@@ -185,10 +185,11 @@ func DatabaseDbHomeResource() *schema.Resource {
 				ForceNew: true,
 			},
 			"db_version": {
-				Type:     schema.TypeString,
-				Optional: true,
-				Computed: true,
-				ForceNew: true,
+				Type:             schema.TypeString,
+				Optional:         true,
+				Computed:         true,
+				ForceNew:         true,
+				DiffSuppressFunc: NewIsPrefixOfOldDiffSuppress,
 			},
 
 			// Optional

oci/database_db_system_resource.go

@@ -218,10 +218,11 @@ func DatabaseDbSystemResource() *schema.Resource {
 
 						// Optional
 						"db_version": {
-							Type:     schema.TypeString,
-							Optional: true,
-							Computed: true,
-							ForceNew: true,
+							Type:             schema.TypeString,
+							Optional:         true,
+							Computed:         true,
+							ForceNew:         true,
+							DiffSuppressFunc: NewIsPrefixOfOldDiffSuppress,
 						},
 						"display_name": {
 							Type:     schema.TypeString,