opensource/mattermost
3
0
Fork 0
mirror of https://github.com/mattermost/mattermost.git synced 2026-09-24 16:05:00 +08:00
Code Issues Packages Projects Releases Wiki Activity

[MM-56078] mmctl: assume local mode when no credentials found (#26215)

Browse Source 
* assume local mode when no credentials found

* Use variable

---------

Co-authored-by: Mattermost Build <build@mattermost.com>
Co-authored-by: Ben Schumacher <ben.schumacher@mattermost.com>
This commit is contained in:
Julien Tant
2025-03-26 13:21:21 +01:00
committed by GitHub
co-authored by Mattermost Build Ben Schumacher
parent 79e1c182ce
commit 48ea65aa5f
2 changed files with 18 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
server/cmd/mmctl/commands/completion.go
+1 -1
View File
@@ -218,7 +218,7 @@ func validateArgsWithClient(fn validateArgsFn) func(cmd *cobra.Command, args []s
ctx, cancel := context.WithTimeout(context.Background(), shellCompleteTimeout)
defer cancel()
c, _, _, err := getClient(ctx)
c, _, _, err := getClient(ctx, cmd)
if err != nil {
return nil, cobra.ShellCompDirectiveError
}
server/cmd/mmctl/commands/init.go
+17 -3
View File
@@ -68,8 +68,22 @@ func CheckVersionMatch(version, serverVersion string) (bool, error) {
return true, nil
}
func getClient(ctx context.Context) (*model.Client4, string, bool, error) {
if viper.GetBool("local") {
func getClient(ctx context.Context, cmd *cobra.Command) (*model.Client4, string, bool, error) {
useLocal := viper.GetBool("local")
if !useLocal {
// Assume local mode if no server address is provided
credentials, err := GetCurrentCredentials()
if err != nil {
cmd.PrintErrln("Warning: Unable to retrieve credentials, assuming --local mode")
useLocal = true
} else if credentials == nil {
cmd.PrintErrln("Warning: No credentials found, assuming --local mode")
useLocal = true
}
}
if useLocal {
c, err := InitUnixClient(viper.GetString("local-socket-path"))
if err != nil {
return nil, "", true, err
@@ -90,7 +104,7 @@ func getClient(ctx context.Context) (*model.Client4, string, bool, error) {
func withClient(fn func(c client.Client, cmd *cobra.Command, args []string) error) func(cmd *cobra.Command, args []string) error {
return func(cmd *cobra.Command, args []string) error {
ctx := context.TODO()
c, serverVersion, local, err := getClient(ctx)
c, serverVersion, local, err := getClient(ctx, cmd)
if err != nil {
return fmt.Errorf("failed to create client: %w", err)
}