couple regressions from merge conflict

Azure · Apr 3, 2020 · d7fdd8c · d7fdd8c
1 parent 08fc998
commit d7fdd8c
Showing 1 changed file with 2 additions and 10 deletions.
diff --git a/pkg/resourcemanager/psql/server/server.go b/pkg/resourcemanager/psql/server/server.go
@@ -160,7 +160,6 @@ func (p *PSQLServerClient) GetOrPrepareSecret(ctx context.Context, instance *azu
 	name := instance.Name
 
 	usernameLength := 8
-	passwordLength := 16
 
 	secret := map[string][]byte{}
 
@@ -169,15 +168,8 @@ func (p *PSQLServerClient) GetOrPrepareSecret(ctx context.Context, instance *azu
 		return stored, nil
 	}
 
-	randomUsername, err := helpers.GenerateRandomUsername(usernameLength, 0)
-	if err != nil {
-		return secret, err
-	}
-
-	randomPassword, err := helpers.GenerateRandomPassword(passwordLength)
-	if err != nil {
-		return secret, err
-	}
+	randomUsername := helpers.GenerateRandomUsername(usernameLength)
+	randomPassword := helpers.NewPassword()
 
 	secret["username"] = []byte(randomUsername)
 	secret["fullyQualifiedUsername"] = []byte(fmt.Sprintf("%s@%s", randomUsername, name))