k-space/dex
Archived
11
0
Fork 0
Code Issues Pull Requests Packages Projects Activity

chore: update ent

Browse Source 
Signed-off-by: m.nabokikh <maksim.nabokikh@flant.com>
This commit is contained in:
m.nabokikh
2021-03-24 10:37:51 +04:00
parent 2e61860d5a
commit 24fa4def5b
94 changed files with 311 additions and 261 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
storage/ent/db/keys.go
View File

@@ -8,9 +8,9 @@ import (
"strings"
"time"
"entgo.io/ent/dialect/sql"
"github.com/dexidp/dex/storage"
"github.com/dexidp/dex/storage/ent/db/keys"
"github.com/facebook/ent/dialect/sql"
"gopkg.in/square/go-jose.v2"
)
@@ -67,7 +67,7 @@ func (k *Keys) assignValues(columns []string, values []interface{}) error {
return fmt.Errorf("unexpected type %T for field verification_keys", values[i])
} else if value != nil && len(*value) > 0 {
if err := json.Unmarshal(*value, &k.VerificationKeys); err != nil {
return fmt.Errorf("unmarshal field verification_keys: %v", err)
return fmt.Errorf("unmarshal field verification_keys: %w", err)
}
}
case keys.FieldSigningKey:
@@ -76,7 +76,7 @@ func (k *Keys) assignValues(columns []string, values []interface{}) error {
return fmt.Errorf("unexpected type %T for field signing_key", values[i])
} else if value != nil && len(*value) > 0 {
if err := json.Unmarshal(*value, &k.SigningKey); err != nil {
return fmt.Errorf("unmarshal field signing_key: %v", err)
return fmt.Errorf("unmarshal field signing_key: %w", err)
}
}
case keys.FieldSigningKeyPub:
@@ -85,7 +85,7 @@ func (k *Keys) assignValues(columns []string, values []interface{}) error {
return fmt.Errorf("unexpected type %T for field signing_key_pub", values[i])
} else if value != nil && len(*value) > 0 {
if err := json.Unmarshal(*value, &k.SigningKeyPub); err != nil {
return fmt.Errorf("unmarshal field signing_key_pub: %v", err)
return fmt.Errorf("unmarshal field signing_key_pub: %w", err)
}
}
case keys.FieldNextRotation: