TheArchive/zitadel
1
0
Fork 0
mirror of https://github.com/zitadel/zitadel.git synced 2025-03-04 07:05:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(import): import json marshal to jsonpb (#4580)

Browse Source 
* fix(import): import json marshal to jsonpb

* fix: add unmarshaloptions discard unknown

Co-authored-by: Livio Spring <livio.a@gmail.com>

* fix(import): import json marshal to jsonpb

Co-authored-by: Livio Spring <livio.a@gmail.com>
This commit is contained in:
Stefan Benz 2022-10-19 14:36:51 +01:00 committed by GitHub
parent d2eb0b0d2a
commit 2bfa51da1c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
internal/api/grpc/admin/import.go
View File

@ -3,16 +3,17 @@ package admin
import ( import (
"context" "context"
"encoding/base64" "encoding/base64"
"encoding/json"
"fmt" "fmt"
"io/ioutil" "io/ioutil"
"strconv" "strconv"
"time" "time"
"cloud.google.com/go/storage" "cloud.google.com/go/storage"
"github.com/grpc-ecosystem/grpc-gateway/v2/runtime"
"github.com/minio/minio-go/v7" "github.com/minio/minio-go/v7"
"github.com/minio/minio-go/v7/pkg/credentials" "github.com/minio/minio-go/v7/pkg/credentials"
"google.golang.org/api/option" "google.golang.org/api/option"
"google.golang.org/protobuf/encoding/protojson"
"google.golang.org/protobuf/types/known/durationpb" "google.golang.org/protobuf/types/known/durationpb"
"github.com/zitadel/logging" "github.com/zitadel/logging"
@ -229,9 +230,14 @@ func (s *Server) transportDataFromFile(ctx context.Context, v1Transformation boo
data = localData data = localData
} }
jsonpb := &runtime.JSONPb{
UnmarshalOptions: protojson.UnmarshalOptions{
DiscardUnknown: true,
},
}
if v1Transformation { if v1Transformation {
dataImportV1 := new(v1_pb.ImportDataOrg) dataImportV1 := new(v1_pb.ImportDataOrg)
if err := json.Unmarshal(data, dataImportV1); err != nil { if err := jsonpb.Unmarshal(data, dataImportV1); err != nil {
return nil, err return nil, err
} }
@ -242,7 +248,7 @@ func (s *Server) transportDataFromFile(ctx context.Context, v1Transformation boo
dataOrgs = dataImport.Orgs dataOrgs = dataImport.Orgs
} else { } else {
dataImport := new(admin_pb.ImportDataOrg) dataImport := new(admin_pb.ImportDataOrg)
if err := json.Unmarshal(data, dataImport); err != nil { if err := jsonpb.Unmarshal(data, dataImport); err != nil {
return nil, err return nil, err
} }
dataOrgs = dataImport.Orgs dataOrgs = dataImport.Orgs