Merge pull request #846 from buhongw7583c/task#800#RmLoggerKeyvault

#task800#RemoveLoggerFromKeyVault
Azure · Mar 31, 2020 · b9abb35 · b9abb35
2 parents 33d6416 + 06a25ea
commit b9abb35
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 7 deletions.
diff --git a/controllers/suite_test.go b/controllers/suite_test.go
@@ -153,7 +153,7 @@ func setup() error {
 	storageManagers = resourcemanagerstorages.AzureStorageManagers
 	storageAccountManager := resourcemanagerstorageaccount.New()
 	blobContainerManager := resourcemanagerblobcontainer.New()
-	keyVaultManager := resourcemanagerkeyvaults.NewAzureKeyVaultManager(ctrl.Log.WithName("controllers").WithName("KeyVault"), k8sManager.GetScheme())
+	keyVaultManager := resourcemanagerkeyvaults.NewAzureKeyVaultManager(k8sManager.GetScheme())
 	keyVaultKeyManager := &resourcemanagerkeyvaults.KeyvaultKeyClient{
 		KeyvaultClient: keyVaultManager,
 	}

diff --git a/main.go b/main.go
@@ -123,7 +123,7 @@ func main() {
 	eventhubNamespaceClient := resourcemanagereventhub.NewEventHubNamespaceClient()
 	consumerGroupClient := resourcemanagereventhub.NewConsumerGroupClient()
 	storageManagers := resourcemanagerstorage.AzureStorageManagers
-	keyVaultManager := resourcemanagerkeyvault.NewAzureKeyVaultManager(ctrl.Log.WithName("keyvaultmanager").WithName("KeyVault"), mgr.GetScheme())
+	keyVaultManager := resourcemanagerkeyvault.NewAzureKeyVaultManager(mgr.GetScheme())
 	keyVaultKeyManager := &resourcemanagerkeyvault.KeyvaultKeyClient{
 		KeyvaultClient: keyVaultManager,
 	}

diff --git a/pkg/resourcemanager/keyvaults/keyvault.go b/pkg/resourcemanager/keyvaults/keyvault.go
@@ -19,20 +19,17 @@ import (
 	"github.com/Azure/azure-service-operator/pkg/resourcemanager/iam"
 	"github.com/Azure/go-autorest/autorest"
 	"github.com/Azure/go-autorest/autorest/to"
-	"github.com/go-logr/logr"
 	uuid "github.com/satori/go.uuid"
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/types"
 )
 
 type azureKeyVaultManager struct {
-	Log    logr.Logger
 	Scheme *runtime.Scheme
 }
 
-func NewAzureKeyVaultManager(log logr.Logger, scheme *runtime.Scheme) *azureKeyVaultManager {
+func NewAzureKeyVaultManager(scheme *runtime.Scheme) *azureKeyVaultManager {
 	return &azureKeyVaultManager{
-		Log:    log,
 		Scheme: scheme,
 	}
 }

diff --git a/pkg/resourcemanager/keyvaults/suite_test.go b/pkg/resourcemanager/keyvaults/suite_test.go
@@ -69,7 +69,6 @@ var _ = BeforeSuite(func() {
 		ResourceGroupName:     resourceGroupName,
 		ResourceGroupLocation: resourceGroupLocation,
 		keyvaultManager: &azureKeyVaultManager{
-			Log:    zaplogger,
 			Scheme: scheme.Scheme,
 		},
 		ResourceGroupManager: resourceGroupManager,