Break out compare function

hashicorp · Jul 16, 2021 · 07b8f72 · 07b8f72
1 parent dc34460
commit 07b8f72
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/aws/resource_aws_rds_cluster.go b/aws/resource_aws_rds_cluster.go
@@ -1506,6 +1506,10 @@ func waitForRDSClusterDeletion(conn *rds.RDS, id string, timeout time.Duration)
 func rdsClusterSetResourceDataEngineVersionFromCluster(d *schema.ResourceData, c *rds.DBCluster) {
 	oldVersion := d.Get("engine_version").(string)
 	newVersion := aws.StringValue(c.EngineVersion)
+	compareActualEngineVersion(d, oldVersion, newVersion)
+}
+
+func compareActualEngineVersion(d *schema.ResourceData, oldVersion string, newVersion string) {
 	if oldVersion != newVersion && string(append([]byte(oldVersion), []byte(".")...)) != string([]byte(newVersion)[0:len(oldVersion)+1]) {
 		d.Set("engine_version", newVersion)
 	}

diff --git a/aws/resource_aws_rds_cluster_instance.go b/aws/resource_aws_rds_cluster_instance.go
@@ -668,8 +668,5 @@ var resourceAwsRdsClusterInstanceDeletePendingStates = []string{
 func rdsClusterSetResourceDataEngineVersionFromClusterInstance(d *schema.ResourceData, c *rds.DBInstance) {
 	oldVersion := d.Get("engine_version").(string)
 	newVersion := aws.StringValue(c.EngineVersion)
-	if oldVersion != newVersion && string(append([]byte(oldVersion), []byte(".")...)) != string([]byte(newVersion)[0:len(oldVersion)+1]) {
-		d.Set("engine_version", newVersion)
-	}
-	d.Set("engine_version_actual", newVersion)
+	compareActualEngineVersion(d, oldVersion, newVersion)
 }