fix compile issues

Azure · Apr 21, 2020 · f56f92b · f56f92b
1 parent 0f640e3
commit f56f92b
Show file tree

Hide file tree

Showing 6 changed files with 4 additions and 25 deletions.
diff --git a/controllers/azuresqlserver_controller_test.go b/controllers/azuresqlserver_controller_test.go
@@ -18,7 +18,6 @@ func TestAzureSqlServerControllerNoResourceGroup(t *testing.T) {
 	t.Parallel()
 	defer PanicRecover(t)
 	ctx := context.Background()
-	assert := assert.New(t)
 
 	sqlServerName := GenerateTestResourceNameWithRandom("sqlserver-dev", 10)
 

diff --git a/controllers/azuresqluser_controller_test.go b/controllers/azuresqluser_controller_test.go
@@ -7,25 +7,21 @@ package controllers
 
 import (
 	"context"
-	"strings"
 	"testing"
 
 	azurev1alpha1 "github.com/Azure/azure-service-operator/api/v1alpha1"
 	"github.com/Azure/azure-service-operator/pkg/errhelp"
 	"github.com/Azure/azure-service-operator/pkg/helpers"
 	"github.com/stretchr/testify/assert"
 	v1 "k8s.io/api/core/v1"
-	apierrors "k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	"k8s.io/apimachinery/pkg/types"
 )
 
 func TestAzureSQLUserControllerNoAdminSecret(t *testing.T) {
 	t.Parallel()
 	defer PanicRecover(t)
 	ctx := context.Background()
-	assert := assert.New(t)
-	var err error
+
 	var sqlServerName string
 	var sqlDatabaseName string
 	var sqlUser *azurev1alpha1.AzureSQLUser

diff --git a/controllers/azurevnetrule_controller_test.go b/controllers/azurevnetrule_controller_test.go
@@ -7,23 +7,18 @@ package controllers
 
 import (
 	"context"
-	"strings"
 	"testing"
 
 	azurev1alpha1 "github.com/Azure/azure-service-operator/api/v1alpha1"
-	"github.com/stretchr/testify/assert"
 
 	"github.com/Azure/azure-service-operator/pkg/errhelp"
-	apierrors "k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	"k8s.io/apimachinery/pkg/types"
 )
 
 func TestAzureSqlVNetRuleControllerNoResourceGroup(t *testing.T) {
 	t.Parallel()
 	defer PanicRecover(t)
 	ctx := context.Background()
-	assert := assert.New(t)
 
 	// Add any setup steps that needs to be executed before each test
 	sqlServerName := GenerateTestResourceNameWithRandom("sqlvnetrule-test-srv", 10)

diff --git a/controllers/eventhub_storageaccount_controller_test.go b/controllers/eventhub_storageaccount_controller_test.go
@@ -7,16 +7,15 @@ package controllers
 
 import (
 	"context"
-	"fmt"
 	"testing"
 
 	s "github.com/Azure/azure-sdk-for-go/services/storage/mgmt/2019-04-01/storage"
 	azurev1alpha1 "github.com/Azure/azure-service-operator/api/v1alpha1"
 
-	//"github.com/Azure/azure-service-operator/pkg/errhelp"
+	"github.com/Azure/azure-service-operator/pkg/errhelp"
 
-	//kvhelper "github.com/Azure/azure-service-operator/pkg/resourcemanager/keyvaults"
-	//kvsecrets "github.com/Azure/azure-service-operator/pkg/secrets/keyvault"
+	kvhelper "github.com/Azure/azure-service-operator/pkg/resourcemanager/keyvaults"
+	kvsecrets "github.com/Azure/azure-service-operator/pkg/secrets/keyvault"
 
 	"github.com/stretchr/testify/assert"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"

diff --git a/controllers/keyvault_controller_test.go b/controllers/keyvault_controller_test.go
@@ -8,7 +8,6 @@ package controllers
 import (
 	"context"
 	"net/http"
-	"strings"
 	"testing"
 	"time"
 
@@ -19,7 +18,6 @@ import (
 	kvsecrets "github.com/Azure/azure-service-operator/pkg/secrets/keyvault"
 
 	"github.com/stretchr/testify/assert"
-	apierrors "k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/types"
 )
@@ -236,7 +234,6 @@ func TestKeyvaultControllerInvalidName(t *testing.T) {
 	t.Parallel()
 	defer PanicRecover(t)
 	ctx := context.Background()
-	assert := assert.New(t)
 
 	keyVaultName := "k"
 
@@ -263,7 +260,6 @@ func TestKeyvaultControllerNoResourceGroup(t *testing.T) {
 	t.Parallel()
 	defer PanicRecover(t)
 	ctx := context.Background()
-	assert := assert.New(t)
 
 	keyVaultName := helpers.FillWithRandom(GenerateTestResourceName("kv"), 24)
 

diff --git a/controllers/resourcegroup_controller_test.go b/controllers/resourcegroup_controller_test.go
@@ -13,9 +13,7 @@ import (
 	azurev1alpha1 "github.com/Azure/azure-service-operator/api/v1alpha1"
 	"github.com/stretchr/testify/assert"
 
-	apierrors "k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	"k8s.io/apimachinery/pkg/types"
 )
 
 func TestResourceGroupControllerHappyPath(t *testing.T) {
@@ -26,8 +24,6 @@ func TestResourceGroupControllerHappyPath(t *testing.T) {
 
 	resourceGroupName := GenerateTestResourceNameWithRandom("rg-dev", 10)
 
-	var err error
-
 	// Create the ResourceGroup object and expect the Reconcile to be created
 	resourceGroupInstance := &azurev1alpha1.ResourceGroup{
 		ObjectMeta: metav1.ObjectMeta{
@@ -42,8 +38,6 @@ func TestResourceGroupControllerHappyPath(t *testing.T) {
 	// create rg
 	EnsureInstance(ctx, t, tc, resourceGroupInstance)
 
-	resourceGroupNamespacedName := types.NamespacedName{Name: resourceGroupName, Namespace: "default"}
-
 	// verify rg exists in azure
 	assert.Eventually(func() bool {
 		_, err := tc.resourceGroupManager.CheckExistence(ctx, resourceGroupName)