Merge pull request #14 from oracle/tinglwan_fix_adb_staticcheck

removed dot imports and unused codes

Author: ting-lan-wang

commons/oci/database.go

@@ -175,7 +175,7 @@ func isAttrChanged(lastSucObj interface{}, curObj interface{}) bool {
 		if !ok {
 			return false
 		}
-		curIntPtr, ok := curObj.(*int)
+		curIntPtr := curObj.(*int)
 
 		if lastSucIntPtr != nil && curIntPtr != nil && *curIntPtr != 0 && *lastSucIntPtr != *curIntPtr {
 			return true
@@ -500,15 +500,6 @@ func getCompleteWorkRetryPolicy() common.RetryPolicy {
 	return getRetryPolicy(shouldRetry)
 }
 
-func getConflictRetryPolicy() common.RetryPolicy {
-	// retry for 409 conflict status code
-	shouldRetry := func(r common.OCIOperationResponse) bool {
-		return r.Error != nil && r.Response.HTTPResponse().StatusCode == 409
-	}
-
-	return getRetryPolicy(shouldRetry)
-}
-
 func getRetryPolicy(retryOperation func(common.OCIOperationResponse) bool) common.RetryPolicy {
 	// maximum times of retry
 	attempts := uint(10)

commons/oci/provider.go

@@ -77,8 +77,8 @@ func GetOCIProvider(kubeClient client.Client, authData APIKeyAuth) (common.Confi
 	} else if authData.ConfigMapName == nil && authData.SecretName == nil {
 		return auth.InstancePrincipalConfigurationProvider()
 	} else {
-		return nil, errors.New("You have to provide both the OCI ConfigMap and the privateKey to authorize with API signing key, " +
-			"or leave them both empty to authorize with Instance Principal. Check if the spec configuration is correct.")
+		return nil, errors.New("both the OCI ConfigMap and the privateKey are required to authorize with API signing key; " +
+			"leave them both empty to authorize with Instance Principal")
 	}
 }
 

test/e2e/autonomousdatabase_controller_bind_test.go

@@ -42,8 +42,6 @@ import (
 	"context"
 	"time"
 
-	. "github.com/onsi/ginkgo"
-	. "github.com/onsi/gomega"
 	"github.com/oracle/oci-go-sdk/v45/common"
 	"github.com/oracle/oci-go-sdk/v45/database"
 	"github.com/oracle/oci-go-sdk/v45/workrequests"
@@ -61,7 +59,6 @@ import (
 // http://onsi.github.io/ginkgo/ to learn more about Ginkgo.
 
 var _ = Describe("test ADB binding with hardLink=true", func() {
-	const bindingHardLinkTestFileName = "bind_adb_hardLink.yaml"
 	var adbLookupKey types.NamespacedName
 	const downloadedWallet = "instance-wallet-secret-1"
 	var adbID *string

test/e2e/autonomousdatabase_controller_create_test.go

@@ -42,8 +42,6 @@ import (
 	"context"
 	"time"
 
-	. "github.com/onsi/ginkgo"
-	. "github.com/onsi/gomega"
 	"github.com/oracle/oci-go-sdk/v45/common"
 	"github.com/oracle/oci-go-sdk/v45/database"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -59,11 +57,6 @@ import (
 // http://onsi.github.io/ginkgo/ to learn more about Ginkgo.
 
 var _ = Describe("test ADB provisioning", func() {
-	const (
-		changeStateTimeout  = time.Second * 300
-		changeStateInterval = time.Second * 10
-	)
-
 	AfterEach(func() {
 		// IMPORTANT: The operator might have to call reconcile multiple times to finish an operation.
 		// If we do the update immediately, the previous reconciliation will overwrite the changes.

test/e2e/behavior/shared_behaviors.go

@@ -45,8 +45,8 @@ import (
 	"reflect"
 	"time"
 
-	. "github.com/onsi/ginkgo"
-	. "github.com/onsi/gomega"
+	"github.com/onsi/ginkgo"
+	"github.com/onsi/gomega"
 	"github.com/oracle/oci-go-sdk/v45/common"
 	"github.com/oracle/oci-go-sdk/v45/database"
 	corev1 "k8s.io/api/core/v1"
@@ -65,6 +65,19 @@ import (
 * to the function, which is likely to be nil or zero value.
 **************************************************************/
 
+var (
+	Describe      = ginkgo.Describe
+	By            = ginkgo.By
+	GinkgoWriter  = ginkgo.GinkgoWriter
+	Expect        = gomega.Expect
+	BeNil         = gomega.BeNil
+	Eventually    = gomega.Eventually
+	Equal         = gomega.Equal
+	Succeed       = gomega.Succeed
+	BeNumerically = gomega.BeNumerically
+	BeTrue        = gomega.BeTrue
+)
+
 func AssertProvision(k8sClient *client.Client, adbLookupKey *types.NamespacedName) func() {
 	return func() {
 		// Set the timeout to 15 minutes. The provision operation might take up to 10 minutes

test/e2e/suite_test.go

@@ -44,8 +44,8 @@ import (
 	"testing"
 	"time"
 
-	. "github.com/onsi/ginkgo"
-	. "github.com/onsi/gomega"
+	"github.com/onsi/ginkgo"
+	"github.com/onsi/gomega"
 	"github.com/onsi/gomega/gexec"
 	"github.com/oracle/oci-go-sdk/v45/common"
 	"github.com/oracle/oci-go-sdk/v45/database"
@@ -77,6 +77,21 @@ This test suite runs the integration test which checks the following scenario
 5. Test ADB binding with hardLink=true
 **/
 
+// To avoid dot import
+var (
+	BeforeSuite  = ginkgo.BeforeSuite
+	AfterSuite   = ginkgo.AfterSuite
+	Describe     = ginkgo.Describe
+	AfterEach    = ginkgo.AfterEach
+	By           = ginkgo.By
+	It           = ginkgo.It
+	Expect       = gomega.Expect
+	Succeed      = gomega.Succeed
+	HaveOccurred = gomega.HaveOccurred
+	BeNil        = gomega.BeNil
+	Equal        = gomega.Equal
+)
+
 var cfg *rest.Config
 var k8sClient client.Client
 var configProvider common.ConfigurationProvider
@@ -100,15 +115,15 @@ const SharedAdminPassSecretName string = "adb-admin-password"
 const SharedWalletPassSecretName = "adb-wallet-password"
 
 func TestAPIs(t *testing.T) {
-	RegisterFailHandler(Fail)
+	gomega.RegisterFailHandler(ginkgo.Fail)
 
-	RunSpecsWithDefaultAndCustomReporters(t,
+	ginkgo.RunSpecsWithDefaultAndCustomReporters(t,
 		"Controller Suite",
-		[]Reporter{printer.NewlineReporter{}})
+		[]ginkgo.Reporter{printer.NewlineReporter{}})
 }
 
-var _ = BeforeSuite(func(done Done) {
-	logf.SetLogger(zap.New(zap.WriteTo(GinkgoWriter), zap.UseDevMode(true)))
+var _ = BeforeSuite(func(done ginkgo.Done) {
+	logf.SetLogger(zap.New(zap.WriteTo(ginkgo.GinkgoWriter), zap.UseDevMode(true)))
 
 	By("bootstrapping test environment")
 	testEnv = &envtest.Environment{
@@ -145,7 +160,7 @@ var _ = BeforeSuite(func(done Done) {
 	Expect(err).ToNot(HaveOccurred())
 
 	go func() {
-		defer GinkgoRecover()
+		defer ginkgo.GinkgoRecover()
 		err = k8sManager.Start(ctrl.SetupSignalHandler())
 		Expect(err).ToNot(HaveOccurred(), "failed to run manager")
 		gexec.KillAndWait(4 * time.Second)

test/e2e/util/oci_config_util.go

@@ -62,8 +62,6 @@ type configUtil struct {
 
 	//ConfigFileInfo
 	FileInfo *configFileInfo
-
-	provider common.ConfigurationProvider
 }
 
 func (p configUtil) readAndParseConfigFile() (*configFileInfo, error) {
@@ -125,17 +123,7 @@ func (p configUtil) CreateOCISecret(secretNamespace string, secretName string) (
 }
 
 func (p configUtil) GetConfigProvider() (common.ConfigurationProvider, error) {
-	if p.provider != nil {
-		return p.provider, nil
-	}
-
-	newProvider, err := common.ConfigurationProviderFromFileWithProfile(p.OCIConfigPath, p.Profile, "")
-	if err != nil {
-		return nil, nil
-	}
-
-	p.provider = newProvider
-	return newProvider, nil
+	return common.ConfigurationProviderFromFileWithProfile(p.OCIConfigPath, p.Profile, "")
 }
 
 func openConfigFile(configFilePath string) (data []byte, err error) {
@@ -193,7 +181,7 @@ func parseConfigFile(data []byte, profile string) (info *configFileInfo, err err
 
 	//Look for profile
 	for i, line := range splitContent {
-		if match := profileRegex.FindStringSubmatch(line); match != nil && len(match) > 1 && match[1] == profile {
+		if match := profileRegex.FindStringSubmatch(line); len(match) > 1 && match[1] == profile {
 			start := i + 1
 			return parseConfigAtLine(start, splitContent)
 		}

test/e2e/util/oci_db_request.go

@@ -130,30 +130,6 @@ func generateRetryPolicy(retryFunc func(r common.OCIOperationResponse) bool) com
 	return common.NewRetryPolicy(attempts, retryFunc, nextDuration)
 }
 
-func NewDisplayNameRetryPolicy(name string) common.RetryPolicy {
-	shouldRetry := func(r common.OCIOperationResponse) bool {
-		if databaseResponse, ok := r.Response.(database.GetAutonomousDatabaseResponse); ok {
-			// do the retry until lifecycle state reaches the passed terminal state
-			return databaseResponse.LifecycleState != database.AutonomousDatabaseLifecycleStateAvailable ||
-				*databaseResponse.DisplayName != name
-		}
-		return true
-	}
-	return generateRetryPolicy(shouldRetry)
-}
-
-func NewCPUCoreCountRetryPolicy(count int) common.RetryPolicy {
-	shouldRetry := func(r common.OCIOperationResponse) bool {
-		if databaseResponse, ok := r.Response.(database.GetAutonomousDatabaseResponse); ok {
-			// do the retry until lifecycle state reaches the passed terminal state
-			return databaseResponse.LifecycleState != database.AutonomousDatabaseLifecycleStateAvailable ||
-				*databaseResponse.CpuCoreCount != count
-		}
-		return true
-	}
-	return generateRetryPolicy(shouldRetry)
-}
-
 func NewLifecycleStateRetryPolicy(lifecycleState database.AutonomousDatabaseLifecycleStateEnum) common.RetryPolicy {
 	shouldRetry := func(r common.OCIOperationResponse) bool {
 		if databaseResponse, ok := r.Response.(database.GetAutonomousDatabaseResponse); ok {