fix: increase auth callback server shutdown timeout (#370)

ory · Aug 2, 2024 · ee938b2 · ee938b2
1 parent 579796c
commit ee938b2
Show file tree

Hide file tree

Showing 5 changed files with 314 additions and 318 deletions.
diff --git a/cmd/cloudx/client/auth.go b/cmd/cloudx/client/auth.go
@@ -259,7 +259,7 @@ func (h *CommandHelper) oAuth2DanceWithServer(ctx context.Context, client *oauth
  case token = <-serverToken:
  case err = <-serverErr:
  }
- ctx, cancel := context.WithDeadline(context.WithoutCancel(ctx), time.Now().Add(2*time.Second))
+ ctx, cancel := context.WithDeadline(context.WithoutCancel(ctx), time.Now().Add(20*time.Second))
  defer cancel()
  return stderrors.Join(err, srv.Shutdown(ctx))
  })

diff --git a/cmd/cloudx/client/project.go b/cmd/cloudx/client/project.go
@@ -11,8 +11,8 @@ import (
  "net/http"
  "strings"
 
+ "dario.cat/mergo"
  "github.com/gofrs/uuid"
- "github.com/imdario/mergo"
  "github.com/pkg/errors"
 
  "github.com/ory/client-go"

diff --git a/cmd/dev/openapi/migrate.go b/cmd/dev/openapi/migrate.go
@@ -55,7 +55,7 @@ Example:
 `,
  Args: cobra.ExactArgs(2),
  RunE: func(cmd *cobra.Command, args []string) error {
- var oas2 openapi2.Swagger
+ var oas2 openapi2.T
 
  in, err := os.ReadFile(args[0])
  if err != nil {
@@ -66,7 +66,7 @@ Example:
  return errors.WithStack(err)
  }
 
- oas3, err := openapi2conv.ToV3Swagger(&oas2)
+ oas3, err := openapi2conv.ToV3(&oas2)
  if err != nil {
  return errors.WithStack(err)
  }