fix: resolve potential fsnotify leaks

ory · Feb 10, 2021 · 3159c0a · 3159c0a
1 parent 0a72f96
commit 3159c0a
Show file tree

Hide file tree

Showing 134 changed files with 1,171 additions and 3,400 deletions.
diff --git a/.schema/api.swagger.json b/.schema/api.swagger.json
diff --git a/cmd/identities/definitions.go b/cmd/identities/definitions.go
@@ -21,7 +21,7 @@ func (_ *outputIdentity) Header() []string {
 
 func (i *outputIdentity) Columns() []string {
  data := [5]string{
- string(*i.ID),
+ string(i.ID),
  cmdx.None,
  cmdx.None,
  cmdx.None,
@@ -67,7 +67,7 @@ func (c *outputIdentityCollection) Table() [][]string {
  rows := make([][]string, len(c.identities))
  for i, ident := range c.identities {
  data := [5]string{
- string(*ident.ID),
+ string(ident.ID),
  cmdx.None,
  cmdx.None,
  cmdx.None,

diff --git a/cmd/identities/get.go b/cmd/identities/get.go
@@ -44,7 +44,7 @@ var GetCmd = &cobra.Command{
 
  if len(identities) == 1 {
  cmdx.PrintRow(cmd, (*outputIdentity)(identities[0]))
- } else {
+ } else if len(identities) > 1 {
  cmdx.PrintTable(cmd, &outputIdentityCollection{identities})
  }
  cmdx.PrintErrors(cmd, failed)

diff --git a/cmd/identities/get_test.go b/cmd/identities/get_test.go
@@ -43,6 +43,6 @@ func TestGetCmd(t *testing.T) {
  t.Run("case=fails with unknown ID", func(t *testing.T) {
  stdErr := execErr(t, GetCmd, x.NewUUID().String())
 
- assert.Contains(t, stdErr, "status 404", stdErr)
+ assert.Contains(t, stdErr, "getIdentityNotFound", stdErr)
  })
 }
diff --git a/go.mod b/go.mod
@@ -67,7 +67,7 @@ require (
  github.com/ory/kratos/corp v0.0.0-00010101000000-000000000000
  github.com/ory/mail/v3 v3.0.0
  github.com/ory/nosurf v1.2.4
- github.com/ory/x v0.0.179
+ github.com/ory/x v0.0.181
  github.com/phayes/freeport v0.0.0-20180830031419-95f893ade6f2
  github.com/pkg/errors v0.9.1
  github.com/prometheus/client_golang v1.4.0

diff --git a/go.sum b/go.sum
@@ -1163,6 +1163,8 @@ github.com/ory/x v0.0.127/go.mod h1:FwUujfFuCj5d+xgLn4fGMYPnzriR5bdAIulFXMtnK0M=
 github.com/ory/x v0.0.166/go.mod h1:gT/3K0mSFaPllJgoFrvKYIBYI5W1Nz5RxQTJCGrIwDY=
 github.com/ory/x v0.0.179 h1:ewzGC1n2uWEmGRDVzYYzHsbdHrxNtkCwGjbkpZeeNKI=
 github.com/ory/x v0.0.179/go.mod h1:SGETCUk1DgQC30bb7y4hjhkKGQ1x0YOsldrmGmy6MNc=
+github.com/ory/x v0.0.181 h1:IWvv41/uAOO0gmZm4QL6NJEWTOH1GnVyaE9s8OPQPO8=
+github.com/ory/x v0.0.181/go.mod h1:SGETCUk1DgQC30bb7y4hjhkKGQ1x0YOsldrmGmy6MNc=
 github.com/parnurzeal/gorequest v0.2.15/go.mod h1:3Kh2QUMJoqw3icWAecsyzkpY7UzRfDhbRdTjtNwNiUE=
 github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c h1:Lgl0gzECD8GnQ5QCWA8o6BtfL6mDH5rQgM4/fX3avOs=
 github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc=

diff --git a/identity/handler.go b/identity/handler.go
@@ -150,6 +150,7 @@ type getIdentityParameters struct {
 // Responses:
 // 200: identityResponse
 // 400: genericError
+// 404: genericError
 // 500: genericError
 func (h *Handler) get(w http.ResponseWriter, r *http.Request, ps httprouter.Params) {
  i, err := h.r.IdentityPool().GetIdentity(r.Context(), x.ParseUUID(ps.ByName("id")))

diff --git a/identity/pool.go b/identity/pool.go
@@ -147,7 +147,7 @@ func TestPool(ctx context.Context, conf *config.Config, p interface {
 
  count, err := p.CountIdentities(ctx)
  require.NoError(t, err)
- assert.EqualValues(t, 1, count)
+ assert.EqualValues(t, int64(1), count)
  })
 
  t.Run("case=create with default values", func(t *testing.T) {

diff --git a/internal/httpclient/client/admin/create_identity_parameters.go b/internal/httpclient/client/admin/create_identity_parameters.go
diff --git a/internal/httpclient/client/admin/create_identity_responses.go b/internal/httpclient/client/admin/create_identity_responses.go
diff --git a/internal/httpclient/client/admin/create_recovery_link_parameters.go b/internal/httpclient/client/admin/create_recovery_link_parameters.go