add missing unit test

Author: jotruon

internal/resourcediscovery/export_resource_helpers_test.go

@@ -0,0 +1,53 @@
+// Copyright (c) 2017, 2021, Oracle and/or its affiliates. All rights reserved.
+// Licensed under the Mozilla Public License v2.0
+
+package resourcediscovery
+
+import (
+	"testing"
+)
+
+// issue-routing-tag: terraform/default
+func TestUnit_getValidDbVersion(t *testing.T) {
+	type args struct {
+		dbVersion string
+	}
+	tests := []struct {
+		name string
+		args args
+		want string
+	}{
+		{
+			"version_pre_18",
+			args{"11.2.0.4.200414"},
+			"11.2.0.4.200414",
+		},
+		{
+			"version_18_no_psu",
+			args{"18.8.0.0"},
+			"18.8.0.0",
+		},
+		{
+			"version_19_no_psu",
+			args{"19.8.0.0"},
+			"19.8.0.0",
+		},
+		{
+			"version_19_with_psu",
+			args{"19.5.0.0.200414"},
+			"19.5.0.0",
+		},
+		{
+			"version_20_with_psu",
+			args{"20.0.0.0.200414"},
+			"20.0.0.0",
+		},
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			if got := getValidDbVersion(tt.args.dbVersion); got != tt.want {
+				t.Errorf("getValidDbVersion() = %v, want %v", got, tt.want)
+			}
+		})
+	}
+}

internal/service/database/database_db_home_resource.go

@@ -7,7 +7,6 @@ import (
 	"context"
 	"fmt"
 	"log"
-	"strconv"
 	"strings"
 	"time"
 
@@ -451,7 +450,7 @@ func (s *DatabaseDbHomeResourceCrud) Create() error {
 
 	// Special override to ensure that CreateDbHome retries for the duration of the Terraform configured Create timeout
 	// The underlying db system or vm cluster may be in an updating state. So keep retrying the CreateDbHome.
-	createDbHomeRetryDurationFn := getDbHomeRetryDurationFunction(s.D.Timeout(schema.TimeoutCreate))
+	createDbHomeRetryDurationFn := tfresource.GetDbHomeRetryDurationFunction(s.D.Timeout(schema.TimeoutCreate))
 
 	request.RequestMetadata.RetryPolicy = tfresource.GetRetryPolicy(s.DisableNotFoundRetries, "database", createDbHomeRetryDurationFn)
 
@@ -616,7 +615,7 @@ func (s *DatabaseDbHomeResourceCrud) Delete() error {
 
 	// Special override to ensure that DeleteDbHome retries for the duration of the Terraform configured Create timeout
 	// The underlying db system or vm cluster may be in an updating state. So keep retrying it.
-	deleteDbHomeRetryDurationFn := getDbHomeRetryDurationFunction(s.D.Timeout(schema.TimeoutDelete))
+	deleteDbHomeRetryDurationFn := tfresource.GetDbHomeRetryDurationFunction(s.D.Timeout(schema.TimeoutDelete))
 	request.RequestMetadata.RetryPolicy = tfresource.GetRetryPolicy(s.DisableNotFoundRetries, "database", deleteDbHomeRetryDurationFn)
 
 	dbErr := s.deleteNestedDB()
@@ -1404,30 +1403,3 @@ func (s *DatabaseDbHomeResourceCrud) mapToUpdateDbBackupConfig(fieldKeyFormat st
 
 	return result, nil
 }
-
-func getDbHomeRetryDurationFunction(retryTimeout time.Duration) expectedRetryDurationFn {
-	return func(response oci_common.OCIOperationResponse, disableNotFoundRetries bool, service string, optionals ...interface{}) time.Duration {
-		defaultRetryTime := tfresource.GetDefaultExpectedRetryDuration(response, disableNotFoundRetries)
-		if response.Response == nil || response.Response.HTTPResponse() == nil {
-			return defaultRetryTime
-		}
-		e := response.Error
-		switch statusCode := response.Response.HTTPResponse().StatusCode; statusCode {
-		case 409:
-			if isDisable409Retry, _ := strconv.ParseBool(utils.GetEnvSettingWithDefault("disable_409_retry", "false")); isDisable409Retry {
-				log.Printf("[ERROR] Resource is in conflict state due to multiple update request: %v", e.Error())
-				return 0
-			}
-			if e := response.Error; e != nil {
-				if strings.Contains(e.Error(), "IncorrectState") {
-					defaultRetryTime = retryTimeout
-				} else if strings.Contains(e.Error(), "InvalidatedRetryToken") {
-					defaultRetryTime = 0
-				} else {
-					defaultRetryTime = tfresource.LongRetryTime
-				}
-			}
-		}
-		return defaultRetryTime
-	}
-}