PMM-13129 Changes.

percona · Jun 26, 2024 · f35ad67 · f35ad67
1 parent 8c9d21a
commit f35ad67
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 51 deletions.
diff --git a/managed/models/agent_helpers.go b/managed/models/agent_helpers.go
@@ -593,21 +593,10 @@ func createPMMAgentWithID(q *reform.Querier, id, runsOnNodeID string, customLabe
 	// TODO https://jira.percona.com/browse/PMM-4496
 	// Check that Node is not remote.
 
-	encryptedUsername, err := encryption.Encrypt("")
-	if err != nil {
-		logrus.Warningf("Encryption: %v", err)
-	}
-	encryptedPassword, err := encryption.Encrypt("")
-	if err != nil {
-		logrus.Warningf("Encryption: %v", err)
-	}
-
 	agent := &Agent{
 		AgentID:      id,
 		AgentType:    PMMAgentType,
 		RunsOnNodeID: &runsOnNodeID,
-		Username:     &encryptedUsername,
-		Password:     &encryptedPassword,
 	}
 	if err := agent.SetCustomLabels(customLabels); err != nil {
 		return nil, err
@@ -654,22 +643,11 @@ func CreateNodeExporter(q *reform.Querier,
 			" it doesn't support it, minimum supported version=%q", pointer.GetString(pmmAgent.Version), PMMAgentWithPushMetricsSupport.String())
 	}
 
-	encryptedUsername, err := encryption.Encrypt("")
-	if err != nil {
-		logrus.Warningf("Encryption: %v", err)
-	}
-	encryptedPassword, err := encryption.Encrypt("")
-	if err != nil {
-		logrus.Warningf("Encryption: %v", err)
-	}
-
 	row := &Agent{
 		AgentID:            id,
 		AgentType:          NodeExporterType,
 		PMMAgentID:         &pmmAgentID,
 		NodeID:             pmmAgent.RunsOnNodeID,
-		Username:           &encryptedUsername,
-		Password:           &encryptedPassword,
 		PushMetrics:        pushMetrics,
 		DisabledCollectors: disableCollectors,
 		AgentPassword:      agentPassword,
@@ -750,23 +728,12 @@ func CreateExternalExporter(q *reform.Querier, params *CreateExternalExporterPar
 		metricsPath = "/metrics"
 	}
 
-	encryptedUsername, err := encryption.Encrypt(params.Username)
-	if err != nil {
-		logrus.Warningf("Encryption: %v", err)
-	}
-	encryptedPassword, err := encryption.Encrypt(params.Password)
-	if err != nil {
-		logrus.Warningf("Encryption: %v", err)
-	}
-
 	row := &Agent{
 		PMMAgentID:    pmmAgentID,
 		AgentID:       id,
 		AgentType:     ExternalExporterType,
 		RunsOnNodeID:  runsOnNodeID,
 		ServiceID:     pointer.ToStringOrNil(params.ServiceID),
-		Username:      &encryptedUsername,
-		Password:      &encryptedPassword,
 		MetricsScheme: &scheme,
 		MetricsPath:   &metricsPath,
 		ListenPort:    pointer.ToUint16(uint16(params.ListenPort)),

diff --git a/managed/models/agent_helpers_test.go b/managed/models/agent_helpers_test.go
@@ -474,8 +474,6 @@ func TestAgentHelpers(t *testing.T) {
 				RunsOnNodeID:  pointer.ToString("N1"),
 				ServiceID:     pointer.ToString("S1"),
 				ListenPort:    pointer.ToUint16(9104),
-				Username:      agent.Username,
-				Password:      agent.Password,
 				MetricsPath:   pointer.ToString("/metrics"),
 				MetricsScheme: pointer.ToString("http"),
 				CreatedAt:     now,

diff --git a/managed/utils/encryption/encryption.go b/managed/utils/encryption/encryption.go
@@ -121,20 +121,13 @@ func (e *Encryption) EncryptDB(ctx context.Context, c *DatabaseConnection) error
 
 		for k, v := range res.SetValues {
 			for i, val := range v {
-				var value string
-				if v, ok := val.(*sql.NullString); ok {
-					value = v.String
-				}
-
-				if value != "" {
-					_, err := base64.StdEncoding.DecodeString(value)
-					if err == nil {
-						res.SetValues[k][i] = value
-						continue
-					}
+				value := val.(*sql.NullString)
+				if !value.Valid {
+					res.SetValues[k][i] = sql.NullString{}
+					continue
 				}
 
-				encrypted, err := e.Encrypt(value)
+				encrypted, err := e.Encrypt(value.String)
 				if err != nil {
 					return err
 				}
@@ -226,10 +219,6 @@ func (e *Encryption) DecryptDB(ctx context.Context, c *DatabaseConnection) error
 				if err != nil {
 					return err
 				}
-				if decrypted == "" {
-					res.SetValues[k][i] = sql.NullString{}
-					continue
-				}
 				res.SetValues[k][i] = decrypted
 			}
 			data := slices.Concat([]any{}, v)