From 524f298da1df105481202911ea2ae115949d28aa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Blaisot?= Date: Thu, 23 Nov 2023 08:57:53 +0100 Subject: [PATCH] Avoid double admin password request on instances add --- client/admin_client.go | 2 +- cmd/instances.go | 8 +++++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/client/admin_client.go b/client/admin_client.go index 46dd5a7593d..04487d3fd35 100644 --- a/client/admin_client.go +++ b/client/admin_client.go @@ -27,7 +27,7 @@ func (ac *AdminClient) NewInstanceClient(domain string, scopes ...string) (*Clie httpClient, clientURL, err := tlsclient.NewHTTPClient(tlsclient.HTTPEndpoint{ Host: config.GetConfig().Host, Port: config.GetConfig().Port, - Timeout: 5 * time.Minute, + Timeout: 15 * time.Minute, EnvPrefix: "COZY_HOST", }) if err != nil { diff --git a/cmd/instances.go b/cmd/instances.go index 10fb0d19f4b..4a515cf499d 100644 --- a/cmd/instances.go +++ b/cmd/instances.go @@ -217,7 +217,13 @@ be used as the error message. if len(flagApps) == 0 { return nil } - apps, err := newClient(domain, consts.Apps).ListApps(consts.Apps) + c, err := ac.NewInstanceClient(domain, consts.Apps) + if err != nil { + errPrintfln("Could not generate access to domain %s", domain) + errPrintfln("%s", err) + os.Exit(1) + } + apps, err := c.ListApps(consts.Apps) if err == nil && len(flagApps) != len(apps) { for _, slug := range flagApps { found := false