remove new fixtures and use existing ones instead

Author: filipcirtog

controllers/om/automation_config.go

@@ -448,7 +448,7 @@ func AuthSecretName(mdbName string) string {
 // EnsurePassword makes sure that there is an Automation Agent password
 // that the agents will use to communicate with the deployments. The password
 // is returned, so it can be provided to the other agents.
-func (ac *AutomationConfig) EnsurePassword(k8sClient secret.GetUpdateCreator, ctx context.Context, mdbNamespacedName *types.NamespacedName) (string, error) {
+func (ac *AutomationConfig) EnsurePassword(ctx context.Context, k8sClient secret.GetUpdateCreator, mdbNamespacedName types.NamespacedName) (string, error) {
 	secretName := AuthSecretName(mdbNamespacedName.Name)
 	secretNamespacedName := client.ObjectKey{Name: secretName, Namespace: mdbNamespacedName.Namespace}
 	var password string

controllers/operator/appdbreplicaset_controller.go

@@ -1667,7 +1667,7 @@ func (r *ReconcileAppDbReplicaSet) tryConfigureMonitoringInOpsManager(ctx contex
 		AutoPEMKeyFilePath: agentCertPath,
 		CAFilePath:         util.CAFilePathInContainer,
 	}
-	err = authentication.Configure(r.client, ctx, &types.NamespacedName{Namespace: opsManager.Namespace, Name: opsManager.Name}, conn, opts, false, log)
+	err = authentication.Configure(r.client, ctx, types.NamespacedName{Namespace: opsManager.Namespace, Name: opsManager.Name}, conn, opts, false, log)
 	if err != nil {
 		log.Errorf("Could not set Automation Authentication options in Ops/Cloud Manager for the Application Database. "+
 			"Application Database is always configured with authentication enabled, but this will not be "+

controllers/operator/authentication/authentication.go

@@ -86,7 +86,7 @@ type UserOptions struct {
 
 // Configure will configure all the specified authentication Mechanisms. We need to ensure we wait for
 // the agents to reach ready state after each operation as prematurely updating the automation config can cause the agents to get stuck.
-func Configure(client kubernetesClient.Client, ctx context.Context, mdbNamespacedName *types.NamespacedName, conn om.Connection, opts Options, isRecovering bool, log *zap.SugaredLogger) error {
+func Configure(client kubernetesClient.Client, ctx context.Context, mdbNamespacedName types.NamespacedName, conn om.Connection, opts Options, isRecovering bool, log *zap.SugaredLogger) error {
 	log.Infow("ensuring correct deployment mechanisms", "ProcessNames", opts.ProcessNames, "Mechanisms", opts.Mechanisms)
 
 	// In case we're recovering, we can push all changes at once, because the mechanism is triggered after 20min by default.
@@ -155,7 +155,7 @@ func Configure(client kubernetesClient.Client, ctx context.Context, mdbNamespace
 
 // Disable disables all authentication mechanisms, and waits for the agents to reach goal state. It is still required to provide
 // automation agent username, password and keyfile contents to ensure a valid Automation Config.
-func Disable(client kubernetesClient.Client, ctx context.Context, mdbNamespacedName *types.NamespacedName, conn om.Connection, opts Options, deleteUsers bool, log *zap.SugaredLogger) error {
+func Disable(ctx context.Context, client kubernetesClient.Client, mdbNamespacedName types.NamespacedName, conn om.Connection, opts Options, deleteUsers bool, log *zap.SugaredLogger) error {
 	ac, err := conn.ReadAutomationConfig()
 	if err != nil {
 		return xerrors.Errorf("error reading automation config: %w", err)
@@ -185,7 +185,7 @@ func Disable(client kubernetesClient.Client, ctx context.Context, mdbNamespacedN
 		if err := ac.EnsureKeyFileContents(); err != nil {
 			return xerrors.Errorf("error ensuring keyfile contents: %w", err)
 		}
-		if _, err := ac.EnsurePassword(client, ctx, mdbNamespacedName); err != nil {
+		if _, err := ac.EnsurePassword(ctx, client, mdbNamespacedName); err != nil {
 			return xerrors.Errorf("error ensuring agent password: %w", err)
 		}
 
@@ -262,7 +262,7 @@ func removeUnsupportedAgentMechanisms(conn om.Connection, opts Options, log *zap
 
 // enableAgentAuthentication determines which agent authentication mechanism should be configured
 // and enables it in Ops Manager
-func enableAgentAuthentication(client kubernetesClient.Client, ctx context.Context, mdbNamespacedName *types.NamespacedName, conn om.Connection, opts Options, log *zap.SugaredLogger) error {
+func enableAgentAuthentication(client kubernetesClient.Client, ctx context.Context, mdbNamespacedName types.NamespacedName, conn om.Connection, opts Options, log *zap.SugaredLogger) error {
 	ac, err := conn.ReadAutomationConfig()
 	if err != nil {
 		return xerrors.Errorf("error reading automation config: %w", err)
@@ -369,14 +369,14 @@ func addOrRemoveAgentClientCertificate(conn om.Connection, opts Options, log *za
 }
 
 // ensureAgentAuthenticationIsConfigured will configure the agent authentication settings based on the desiredAgentAuthMechanism
-func ensureAgentAuthenticationIsConfigured(client kubernetesClient.Client, ctx context.Context, mdbNamespacedName *types.NamespacedName, conn om.Connection, opts Options, ac *om.AutomationConfig, mechanism Mechanism, log *zap.SugaredLogger) error {
+func ensureAgentAuthenticationIsConfigured(client kubernetesClient.Client, ctx context.Context, mdbNamespacedName types.NamespacedName, conn om.Connection, opts Options, ac *om.AutomationConfig, mechanism Mechanism, log *zap.SugaredLogger) error {
 	if mechanism.IsAgentAuthenticationConfigured(ac, opts) {
 		log.Infof("Agent authentication mechanism %s is already configured", mechanism.GetName())
 		return nil
 	}
 
 	log.Infof("Enabling %s agent authentication", mechanism.GetName())
-	return mechanism.EnableAgentAuthentication(client, ctx, mdbNamespacedName, conn, opts, log)
+	return mechanism.EnableAgentAuthentication(ctx, client, mdbNamespacedName, conn, opts, log)
 }
 
 // ensureDeploymentMechanisms configures the given AutomationConfig to allow deployments to

controllers/operator/authentication/authentication_mechanism.go

@@ -16,7 +16,7 @@ import (
 
 // Mechanism is an interface that needs to be implemented for any Ops Manager authentication mechanism
 type Mechanism interface {
-	EnableAgentAuthentication(client kubernetesClient.Client, ctx context.Context, mdbNamespacedName *types.NamespacedName, conn om.Connection, opts Options, log *zap.SugaredLogger) error
+	EnableAgentAuthentication(ctx context.Context, client kubernetesClient.Client, mdbNamespacedName types.NamespacedName, conn om.Connection, opts Options, log *zap.SugaredLogger) error
 	DisableAgentAuthentication(conn om.Connection, log *zap.SugaredLogger) error
 	EnableDeploymentAuthentication(conn om.Connection, opts Options, log *zap.SugaredLogger) error
 	DisableDeploymentAuthentication(conn om.Connection, log *zap.SugaredLogger) error

controllers/operator/authentication/configure_authentication_test.go

@@ -22,7 +22,7 @@ func init() {
 func TestConfigureScramSha256(t *testing.T) {
 	ctx := context.Background()
 	kubeClient, _ := mock.NewDefaultFakeClient()
-	mdbNamespacedName := &types.NamespacedName{Namespace: "test", Name: "test"}
+	mdbNamespacedName := types.NamespacedName{Namespace: "test", Name: "test"}
 
 	dep := om.NewDeployment()
 	conn := om.NewMockedOmConnection(dep)
@@ -50,7 +50,7 @@ func TestConfigureScramSha256(t *testing.T) {
 func TestConfigureX509(t *testing.T) {
 	ctx := context.Background()
 	kubeClient, _ := mock.NewDefaultFakeClient()
-	mdbNamespacedName := &types.NamespacedName{Namespace: "test", Name: "test"}
+	mdbNamespacedName := types.NamespacedName{Namespace: "test", Name: "test"}
 
 	dep := om.NewDeployment()
 	conn := om.NewMockedOmConnection(dep)
@@ -82,7 +82,7 @@ func TestConfigureX509(t *testing.T) {
 func TestConfigureScramSha1(t *testing.T) {
 	ctx := context.Background()
 	kubeClient, _ := mock.NewDefaultFakeClient()
-	mdbNamespacedName := &types.NamespacedName{Namespace: "test", Name: "test"}
+	mdbNamespacedName := types.NamespacedName{Namespace: "test", Name: "test"}
 
 	dep := om.NewDeployment()
 	conn := om.NewMockedOmConnection(dep)
@@ -108,7 +108,7 @@ func TestConfigureScramSha1(t *testing.T) {
 func TestConfigureMultipleAuthenticationMechanisms(t *testing.T) {
 	ctx := context.Background()
 	kubeClient, _ := mock.NewDefaultFakeClient()
-	mdbNamespacedName := &types.NamespacedName{Namespace: "test", Name: "test"}
+	mdbNamespacedName := types.NamespacedName{Namespace: "test", Name: "test"}
 
 	dep := om.NewDeployment()
 	conn := om.NewMockedOmConnection(dep)
@@ -145,7 +145,7 @@ func TestConfigureMultipleAuthenticationMechanisms(t *testing.T) {
 func TestDisableAuthentication(t *testing.T) {
 	ctx := context.Background()
 	kubeClient, _ := mock.NewDefaultFakeClient()
-	mdbNamespacedName := &types.NamespacedName{Namespace: "test", Name: "test"}
+	mdbNamespacedName := types.NamespacedName{Namespace: "test", Name: "test"}
 
 	dep := om.NewDeployment()
 	conn := om.NewMockedOmConnection(dep)
@@ -156,7 +156,7 @@ func TestDisableAuthentication(t *testing.T) {
 		return nil
 	}, zap.S())
 
-	if err := Disable(kubeClient, ctx, mdbNamespacedName, conn, Options{}, true, zap.S()); err != nil {
+	if err := Disable(ctx, kubeClient, mdbNamespacedName, conn, Options{}, true, zap.S()); err != nil {
 		t.Fatal(err)
 	}
 
@@ -237,9 +237,9 @@ func assertDeploymentMechanismsConfigured(t *testing.T, authMechanism Mechanism,
 func assertAgentAuthenticationDisabled(t *testing.T, authMechanism Mechanism, conn om.Connection, opts Options) {
 	ctx := context.Background()
 	kubeClient, _ := mock.NewDefaultFakeClient()
-	mdbNamespacedName := &types.NamespacedName{Namespace: "test", Name: "test"}
+	mdbNamespacedName := types.NamespacedName{Namespace: "test", Name: "test"}
 
-	err := authMechanism.EnableAgentAuthentication(kubeClient, ctx, mdbNamespacedName, conn, opts, zap.S())
+	err := authMechanism.EnableAgentAuthentication(ctx, kubeClient, mdbNamespacedName, conn, opts, zap.S())
 	require.NoError(t, err)
 
 	ac, err := conn.ReadAutomationConfig()

controllers/operator/authentication/ldap.go

@@ -19,7 +19,7 @@ func (l *ldapAuthMechanism) GetName() MechanismName {
 	return LDAPPlain
 }
 
-func (l *ldapAuthMechanism) EnableAgentAuthentication(client kubernetesClient.Client, ctx context.Context, mdbNamespacedName *types.NamespacedName, conn om.Connection, opts Options, log *zap.SugaredLogger) error {
+func (l *ldapAuthMechanism) EnableAgentAuthentication(ctx context.Context, client kubernetesClient.Client, mdbNamespacedName types.NamespacedName, conn om.Connection, opts Options, log *zap.SugaredLogger) error {
 	log.Info("Configuring LDAP authentication")
 	err := conn.ReadUpdateAutomationConfig(func(ac *om.AutomationConfig) error {
 		if err := ac.EnsureKeyFileContents(); err != nil {

controllers/operator/authentication/ldap_test.go

@@ -50,7 +50,7 @@ func TestLdapDeploymentMechanism(t *testing.T) {
 func TestLdapEnableAgentAuthentication(t *testing.T) {
 	ctx := context.Background()
 	kubeClient, _ := mock.NewDefaultFakeClient()
-	mdbNamespacedName := &types.NamespacedName{Namespace: "test", Name: "test"}
+	mdbNamespacedName := types.NamespacedName{Namespace: "test", Name: "test"}
 
 	conn := om.NewMockedOmConnection(om.NewDeployment())
 	opts := Options{
@@ -62,7 +62,7 @@ func TestLdapEnableAgentAuthentication(t *testing.T) {
 		AutoPwd:          "LDAPPassword.",
 	}
 
-	err := ldapPlainMechanism.EnableAgentAuthentication(kubeClient, ctx, mdbNamespacedName, conn, opts, zap.S())
+	err := ldapPlainMechanism.EnableAgentAuthentication(ctx, kubeClient, mdbNamespacedName, conn, opts, zap.S())
 	require.NoError(t, err)
 
 	ac, err := conn.ReadAutomationConfig()

controllers/operator/authentication/oidc.go

@@ -23,7 +23,7 @@ func (o *oidcAuthMechanism) GetName() MechanismName {
 	return MongoDBOIDC
 }
 
-func (o *oidcAuthMechanism) EnableAgentAuthentication(_ kubernetesClient.Client, _ context.Context, _ *types.NamespacedName, _ om.Connection, _ Options, _ *zap.SugaredLogger) error {
+func (o *oidcAuthMechanism) EnableAgentAuthentication(_ context.Context, _ kubernetesClient.Client, _ types.NamespacedName, _ om.Connection, _ Options, _ *zap.SugaredLogger) error {
 	return xerrors.Errorf("OIDC agent authentication is not supported")
 }
 

controllers/operator/authentication/oidc_test.go

@@ -82,7 +82,7 @@ func TestOIDC_EnableDeploymentAuthentication(t *testing.T) {
 func TestOIDC_EnableAgentAuthentication(t *testing.T) {
 	ctx := context.Background()
 	kubeClient, _ := mock.NewDefaultFakeClient()
-	mdbNamespacedName := &types.NamespacedName{Namespace: "test", Name: "test"}
+	mdbNamespacedName := types.NamespacedName{Namespace: "test", Name: "test"}
 
 	conn := om.NewMockedOmConnection(om.NewDeployment())
 	opts := Options{
@@ -95,7 +95,7 @@ func TestOIDC_EnableAgentAuthentication(t *testing.T) {
 	configured := mongoDBOIDCMechanism.IsAgentAuthenticationConfigured(ac, opts)
 	assert.False(t, configured)
 
-	err = mongoDBOIDCMechanism.EnableAgentAuthentication(kubeClient, ctx, mdbNamespacedName, conn, opts, zap.S())
+	err = mongoDBOIDCMechanism.EnableAgentAuthentication(ctx, kubeClient, mdbNamespacedName, conn, opts, zap.S())
 	require.Error(t, err)
 
 	err = mongoDBOIDCMechanism.DisableAgentAuthentication(conn, zap.S())

controllers/operator/authentication/scramsha.go

@@ -22,9 +22,9 @@ func (s *automationConfigScramSha) GetName() MechanismName {
 	return s.MechanismName
 }
 
-func (s *automationConfigScramSha) EnableAgentAuthentication(client kubernetesClient.Client, ctx context.Context, mdbNamespacedName *types.NamespacedName, conn om.Connection, opts Options, log *zap.SugaredLogger) error {
+func (s *automationConfigScramSha) EnableAgentAuthentication(ctx context.Context, client kubernetesClient.Client, mdbNamespacedName types.NamespacedName, conn om.Connection, opts Options, log *zap.SugaredLogger) error {
 	return conn.ReadUpdateAutomationConfig(func(ac *om.AutomationConfig) error {
-		if err := configureScramAgentUsers(client, ctx, mdbNamespacedName, ac, opts); err != nil {
+		if err := configureScramAgentUsers(ctx, client, mdbNamespacedName, ac, opts); err != nil {
 			return err
 		}
 		if err := ac.EnsureKeyFileContents(); err != nil {
@@ -95,8 +95,8 @@ func (s *automationConfigScramSha) IsDeploymentAuthenticationEnabled(ac *om.Auto
 }
 
 // configureScramAgentUsers makes sure that the given automation config always has the correct SCRAM-SHA users
-func configureScramAgentUsers(client kubernetesClient.Client, ctx context.Context, mdbNamespacedName *types.NamespacedName, ac *om.AutomationConfig, authOpts Options) error {
-	agentPassword, err := ac.EnsurePassword(client, ctx, mdbNamespacedName)
+func configureScramAgentUsers(ctx context.Context, client kubernetesClient.Client, mdbNamespacedName types.NamespacedName, ac *om.AutomationConfig, authOpts Options) error {
+	agentPassword, err := ac.EnsurePassword(ctx, client, mdbNamespacedName)
 	if err != nil {
 		return err
 	}