| // Copyright 2021 Google LLC |
| // |
| // Licensed under the Apache License, Version 2.0 (the "License"); |
| // you may not use this file except in compliance with the License. |
| // You may obtain a copy of the License at |
| // |
| // https://www.apache.org/licenses/LICENSE-2.0 |
| // |
| // Unless required by applicable law or agreed to in writing, software |
| // distributed under the License is distributed on an "AS IS" BASIS, |
| // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. |
| // See the License for the specific language governing permissions and |
| // limitations under the License. |
| |
| package adapt |
| |
| import ( |
| "encoding/json" |
| "reflect" |
| "testing" |
| |
| "cloud.google.com/go/bigquery/storage/apiv1/storagepb" |
| "cloud.google.com/go/bigquery/storage/managedwriter/testdata" |
| "github.com/google/go-cmp/cmp" |
| "google.golang.org/protobuf/encoding/protojson" |
| "google.golang.org/protobuf/proto" |
| "google.golang.org/protobuf/reflect/protodesc" |
| "google.golang.org/protobuf/reflect/protoreflect" |
| "google.golang.org/protobuf/testing/protocmp" |
| "google.golang.org/protobuf/types/descriptorpb" |
| "google.golang.org/protobuf/types/dynamicpb" |
| ) |
| |
| // TestSchemaToProtoConversion validates behavior around converting table schemas to |
| // a descriptor. The challenges here are that we use dynamic proto registries to |
| // do this work, which means that we're unable to do things like proto.Equal comparisons |
| // between MessageDescriptors directly. |
| // |
| // Instead, we compare to two forms of the message in DescriptorProto form: In the first, |
| // we ensure the structure of the outer message is as expected. In the second, we compare |
| // to the normalized form of the DescriptorProto as that encapsulates all the dependencies |
| // within the NestedTypes definition. |
| func TestSchemaToProtoConversion(t *testing.T) { |
| testCases := []struct { |
| description string |
| bq *storagepb.TableSchema |
| // The un-normalized descriptor (sans dependencies) |
| wantProto2 *descriptorpb.DescriptorProto |
| // Normalized descriptor (all dependencies nested) |
| wantProto2Normalized *descriptorpb.DescriptorProto |
| |
| // The un-normalized descriptor (sans dependencies) |
| wantProto3 *descriptorpb.DescriptorProto |
| // Normalized descriptor |
| wantProto3Normalized *descriptorpb.DescriptorProto |
| }{ |
| { |
| description: "basic", |
| bq: &storagepb.TableSchema{ |
| Fields: []*storagepb.TableFieldSchema{ |
| {Name: "foo", Type: storagepb.TableFieldSchema_STRING, Mode: storagepb.TableFieldSchema_NULLABLE}, |
| {Name: "bar", Type: storagepb.TableFieldSchema_INT64, Mode: storagepb.TableFieldSchema_REQUIRED}, |
| {Name: "baz", Type: storagepb.TableFieldSchema_BYTES, Mode: storagepb.TableFieldSchema_REPEATED}, |
| }}, |
| wantProto2: &descriptorpb.DescriptorProto{ |
| Name: proto.String("root"), |
| Field: []*descriptorpb.FieldDescriptorProto{ |
| { |
| Name: proto.String("foo"), |
| Number: proto.Int32(1), |
| Type: descriptorpb.FieldDescriptorProto_TYPE_STRING.Enum(), |
| Label: descriptorpb.FieldDescriptorProto_LABEL_OPTIONAL.Enum()}, |
| {Name: proto.String("bar"), Number: proto.Int32(2), Type: descriptorpb.FieldDescriptorProto_TYPE_INT64.Enum(), Label: descriptorpb.FieldDescriptorProto_LABEL_REQUIRED.Enum()}, |
| {Name: proto.String("baz"), Number: proto.Int32(3), Type: descriptorpb.FieldDescriptorProto_TYPE_BYTES.Enum(), Label: descriptorpb.FieldDescriptorProto_LABEL_REPEATED.Enum()}, |
| }, |
| }, |
| wantProto2Normalized: &descriptorpb.DescriptorProto{ |
| Name: proto.String("root"), |
| Field: []*descriptorpb.FieldDescriptorProto{ |
| { |
| Name: proto.String("foo"), |
| Number: proto.Int32(1), |
| Type: descriptorpb.FieldDescriptorProto_TYPE_STRING.Enum(), |
| Label: descriptorpb.FieldDescriptorProto_LABEL_OPTIONAL.Enum()}, |
| {Name: proto.String("bar"), Number: proto.Int32(2), Type: descriptorpb.FieldDescriptorProto_TYPE_INT64.Enum(), Label: descriptorpb.FieldDescriptorProto_LABEL_REQUIRED.Enum()}, |
| {Name: proto.String("baz"), Number: proto.Int32(3), Type: descriptorpb.FieldDescriptorProto_TYPE_BYTES.Enum(), Label: descriptorpb.FieldDescriptorProto_LABEL_REPEATED.Enum()}, |
| }, |
| }, |
| wantProto3: &descriptorpb.DescriptorProto{ |
| Name: proto.String("root"), |
| Field: []*descriptorpb.FieldDescriptorProto{ |
| { |
| Name: proto.String("foo"), |
| Number: proto.Int32(1), |
| Type: descriptorpb.FieldDescriptorProto_TYPE_MESSAGE.Enum(), |
| TypeName: proto.String(".google.protobuf.StringValue"), |
| Label: descriptorpb.FieldDescriptorProto_LABEL_OPTIONAL.Enum()}, |
| {Name: proto.String("bar"), Number: proto.Int32(2), Type: descriptorpb.FieldDescriptorProto_TYPE_INT64.Enum(), Label: descriptorpb.FieldDescriptorProto_LABEL_OPTIONAL.Enum()}, |
| {Name: proto.String("baz"), Number: proto.Int32(3), Type: descriptorpb.FieldDescriptorProto_TYPE_BYTES.Enum(), Label: descriptorpb.FieldDescriptorProto_LABEL_REPEATED.Enum()}, |
| }, |
| }, |
| }, |
| { |
| // exercise construct of a submessage |
| description: "nested", |
| bq: &storagepb.TableSchema{ |
| Fields: []*storagepb.TableFieldSchema{ |
| {Name: "curdate", Type: storagepb.TableFieldSchema_DATE, Mode: storagepb.TableFieldSchema_NULLABLE}, |
| { |
| Name: "rec", |
| Type: storagepb.TableFieldSchema_STRUCT, |
| Mode: storagepb.TableFieldSchema_NULLABLE, |
| Fields: []*storagepb.TableFieldSchema{ |
| {Name: "userid", Type: storagepb.TableFieldSchema_STRING, Mode: storagepb.TableFieldSchema_REQUIRED}, |
| {Name: "location", Type: storagepb.TableFieldSchema_GEOGRAPHY, Mode: storagepb.TableFieldSchema_NULLABLE}, |
| }, |
| }, |
| }, |
| }, |
| wantProto2: &descriptorpb.DescriptorProto{ |
| Name: proto.String("root"), |
| Field: []*descriptorpb.FieldDescriptorProto{ |
| { |
| Name: proto.String("curdate"), |
| Number: proto.Int32(1), |
| Type: descriptorpb.FieldDescriptorProto_TYPE_INT32.Enum(), |
| Label: descriptorpb.FieldDescriptorProto_LABEL_OPTIONAL.Enum(), |
| }, |
| { |
| Name: proto.String("rec"), |
| Number: proto.Int32(2), |
| Type: descriptorpb.FieldDescriptorProto_TYPE_MESSAGE.Enum(), |
| TypeName: proto.String(".root__rec"), |
| Label: descriptorpb.FieldDescriptorProto_LABEL_OPTIONAL.Enum(), |
| }, |
| }, |
| }, |
| wantProto2Normalized: &descriptorpb.DescriptorProto{ |
| Name: proto.String("root"), |
| Field: []*descriptorpb.FieldDescriptorProto{ |
| { |
| Name: proto.String("curdate"), |
| Number: proto.Int32(1), |
| Type: descriptorpb.FieldDescriptorProto_TYPE_INT32.Enum(), |
| Label: descriptorpb.FieldDescriptorProto_LABEL_OPTIONAL.Enum(), |
| }, |
| { |
| Name: proto.String("rec"), |
| Number: proto.Int32(2), |
| Type: descriptorpb.FieldDescriptorProto_TYPE_MESSAGE.Enum(), |
| TypeName: proto.String("root__rec"), |
| Label: descriptorpb.FieldDescriptorProto_LABEL_OPTIONAL.Enum(), |
| }, |
| }, |
| NestedType: []*descriptorpb.DescriptorProto{ |
| { |
| Name: proto.String("root__rec"), |
| Field: []*descriptorpb.FieldDescriptorProto{ |
| { |
| Name: proto.String("userid"), |
| Number: proto.Int32(1), |
| Type: descriptorpb.FieldDescriptorProto_TYPE_STRING.Enum(), |
| Label: descriptorpb.FieldDescriptorProto_LABEL_REQUIRED.Enum(), |
| }, |
| { |
| Name: proto.String("location"), |
| Number: proto.Int32(2), |
| Type: descriptorpb.FieldDescriptorProto_TYPE_STRING.Enum(), |
| Label: descriptorpb.FieldDescriptorProto_LABEL_OPTIONAL.Enum(), |
| }, |
| }, |
| }, |
| }, |
| }, |
| wantProto3: &descriptorpb.DescriptorProto{ |
| Name: proto.String("root"), |
| Field: []*descriptorpb.FieldDescriptorProto{ |
| { |
| Name: proto.String("curdate"), |
| Number: proto.Int32(1), |
| Type: descriptorpb.FieldDescriptorProto_TYPE_MESSAGE.Enum(), |
| TypeName: proto.String(".google.protobuf.Int32Value"), |
| Label: descriptorpb.FieldDescriptorProto_LABEL_OPTIONAL.Enum(), |
| }, |
| { |
| Name: proto.String("rec"), |
| Number: proto.Int32(2), |
| Type: descriptorpb.FieldDescriptorProto_TYPE_MESSAGE.Enum(), |
| TypeName: proto.String(".root__rec"), |
| Label: descriptorpb.FieldDescriptorProto_LABEL_OPTIONAL.Enum(), |
| }, |
| }, |
| }, |
| }, |
| { |
| // exercise construct of a submessage |
| description: "range types", |
| bq: &storagepb.TableSchema{ |
| Fields: []*storagepb.TableFieldSchema{ |
| { |
| Name: "rangedate", |
| Type: storagepb.TableFieldSchema_RANGE, |
| Mode: storagepb.TableFieldSchema_NULLABLE, |
| RangeElementType: &storagepb.TableFieldSchema_FieldElementType{Type: storagepb.TableFieldSchema_DATE}, |
| }, |
| { |
| Name: "rangedatetime", |
| Type: storagepb.TableFieldSchema_RANGE, |
| Mode: storagepb.TableFieldSchema_NULLABLE, |
| RangeElementType: &storagepb.TableFieldSchema_FieldElementType{Type: storagepb.TableFieldSchema_DATETIME}, |
| }, |
| { |
| Name: "rangetimestamp", |
| Type: storagepb.TableFieldSchema_RANGE, |
| Mode: storagepb.TableFieldSchema_NULLABLE, |
| RangeElementType: &storagepb.TableFieldSchema_FieldElementType{Type: storagepb.TableFieldSchema_TIMESTAMP}, |
| }, |
| { |
| Name: "duplicate_rangedate", |
| Type: storagepb.TableFieldSchema_RANGE, |
| Mode: storagepb.TableFieldSchema_NULLABLE, |
| RangeElementType: &storagepb.TableFieldSchema_FieldElementType{Type: storagepb.TableFieldSchema_DATE}, |
| }, |
| }, |
| }, |
| wantProto2: &descriptorpb.DescriptorProto{ |
| Name: proto.String("root"), |
| Field: []*descriptorpb.FieldDescriptorProto{ |
| { |
| Name: proto.String("rangedate"), |
| Number: proto.Int32(1), |
| Type: descriptorpb.FieldDescriptorProto_TYPE_MESSAGE.Enum(), |
| TypeName: proto.String(".rangemessage_range_date"), |
| Label: descriptorpb.FieldDescriptorProto_LABEL_OPTIONAL.Enum(), |
| }, |
| { |
| Name: proto.String("rangedatetime"), |
| Number: proto.Int32(2), |
| Type: descriptorpb.FieldDescriptorProto_TYPE_MESSAGE.Enum(), |
| TypeName: proto.String(".rangemessage_range_datetime"), |
| Label: descriptorpb.FieldDescriptorProto_LABEL_OPTIONAL.Enum(), |
| }, |
| { |
| Name: proto.String("rangetimestamp"), |
| Number: proto.Int32(3), |
| Type: descriptorpb.FieldDescriptorProto_TYPE_MESSAGE.Enum(), |
| TypeName: proto.String(".rangemessage_range_timestamp"), |
| Label: descriptorpb.FieldDescriptorProto_LABEL_OPTIONAL.Enum(), |
| }, |
| { |
| Name: proto.String("duplicate_rangedate"), |
| Number: proto.Int32(4), |
| Type: descriptorpb.FieldDescriptorProto_TYPE_MESSAGE.Enum(), |
| TypeName: proto.String(".rangemessage_range_date"), |
| Label: descriptorpb.FieldDescriptorProto_LABEL_OPTIONAL.Enum(), |
| }, |
| }, |
| }, |
| wantProto2Normalized: &descriptorpb.DescriptorProto{ |
| Name: proto.String("root"), |
| Field: []*descriptorpb.FieldDescriptorProto{ |
| { |
| Name: proto.String("rangedate"), |
| Number: proto.Int32(1), |
| Type: descriptorpb.FieldDescriptorProto_TYPE_MESSAGE.Enum(), |
| TypeName: proto.String("rangemessage_range_date"), |
| Label: descriptorpb.FieldDescriptorProto_LABEL_OPTIONAL.Enum(), |
| }, |
| { |
| Name: proto.String("rangedatetime"), |
| Number: proto.Int32(2), |
| Type: descriptorpb.FieldDescriptorProto_TYPE_MESSAGE.Enum(), |
| TypeName: proto.String("rangemessage_range_datetime"), |
| Label: descriptorpb.FieldDescriptorProto_LABEL_OPTIONAL.Enum(), |
| }, |
| { |
| Name: proto.String("rangetimestamp"), |
| Number: proto.Int32(3), |
| Type: descriptorpb.FieldDescriptorProto_TYPE_MESSAGE.Enum(), |
| TypeName: proto.String("rangemessage_range_timestamp"), |
| Label: descriptorpb.FieldDescriptorProto_LABEL_OPTIONAL.Enum(), |
| }, |
| { |
| Name: proto.String("duplicate_rangedate"), |
| Number: proto.Int32(4), |
| Type: descriptorpb.FieldDescriptorProto_TYPE_MESSAGE.Enum(), |
| TypeName: proto.String("rangemessage_range_date"), |
| Label: descriptorpb.FieldDescriptorProto_LABEL_OPTIONAL.Enum(), |
| }, |
| }, |
| NestedType: []*descriptorpb.DescriptorProto{ |
| { |
| Name: proto.String("rangemessage_range_date"), |
| Field: []*descriptorpb.FieldDescriptorProto{ |
| { |
| Name: proto.String("start"), |
| Number: proto.Int32(1), |
| Type: descriptorpb.FieldDescriptorProto_TYPE_INT32.Enum(), |
| Label: descriptorpb.FieldDescriptorProto_LABEL_OPTIONAL.Enum(), |
| }, |
| { |
| Name: proto.String("end"), |
| Number: proto.Int32(2), |
| Type: descriptorpb.FieldDescriptorProto_TYPE_INT32.Enum(), |
| Label: descriptorpb.FieldDescriptorProto_LABEL_OPTIONAL.Enum(), |
| }, |
| }, |
| }, |
| { |
| Name: proto.String("rangemessage_range_datetime"), |
| Field: []*descriptorpb.FieldDescriptorProto{ |
| { |
| Name: proto.String("start"), |
| Number: proto.Int32(1), |
| Type: descriptorpb.FieldDescriptorProto_TYPE_INT64.Enum(), |
| Label: descriptorpb.FieldDescriptorProto_LABEL_OPTIONAL.Enum(), |
| }, |
| { |
| Name: proto.String("end"), |
| Number: proto.Int32(2), |
| Type: descriptorpb.FieldDescriptorProto_TYPE_INT64.Enum(), |
| Label: descriptorpb.FieldDescriptorProto_LABEL_OPTIONAL.Enum(), |
| }, |
| }, |
| }, |
| { |
| Name: proto.String("rangemessage_range_timestamp"), |
| Field: []*descriptorpb.FieldDescriptorProto{ |
| { |
| Name: proto.String("start"), |
| Number: proto.Int32(1), |
| Type: descriptorpb.FieldDescriptorProto_TYPE_INT64.Enum(), |
| Label: descriptorpb.FieldDescriptorProto_LABEL_OPTIONAL.Enum(), |
| }, |
| { |
| Name: proto.String("end"), |
| Number: proto.Int32(2), |
| Type: descriptorpb.FieldDescriptorProto_TYPE_INT64.Enum(), |
| Label: descriptorpb.FieldDescriptorProto_LABEL_OPTIONAL.Enum(), |
| }, |
| }, |
| }, |
| }, |
| }, |
| wantProto3: &descriptorpb.DescriptorProto{ |
| Name: proto.String("root"), |
| Field: []*descriptorpb.FieldDescriptorProto{ |
| { |
| Name: proto.String("rangedate"), |
| Number: proto.Int32(1), |
| Type: descriptorpb.FieldDescriptorProto_TYPE_MESSAGE.Enum(), |
| TypeName: proto.String(".rangemessage_range_date"), |
| Label: descriptorpb.FieldDescriptorProto_LABEL_OPTIONAL.Enum(), |
| }, |
| { |
| Name: proto.String("rangedatetime"), |
| Number: proto.Int32(2), |
| Type: descriptorpb.FieldDescriptorProto_TYPE_MESSAGE.Enum(), |
| TypeName: proto.String(".rangemessage_range_datetime"), |
| Label: descriptorpb.FieldDescriptorProto_LABEL_OPTIONAL.Enum(), |
| }, |
| { |
| Name: proto.String("rangetimestamp"), |
| Number: proto.Int32(3), |
| Type: descriptorpb.FieldDescriptorProto_TYPE_MESSAGE.Enum(), |
| TypeName: proto.String(".rangemessage_range_timestamp"), |
| Label: descriptorpb.FieldDescriptorProto_LABEL_OPTIONAL.Enum(), |
| }, |
| { |
| Name: proto.String("duplicate_rangedate"), |
| Number: proto.Int32(4), |
| Type: descriptorpb.FieldDescriptorProto_TYPE_MESSAGE.Enum(), |
| TypeName: proto.String(".rangemessage_range_date"), |
| Label: descriptorpb.FieldDescriptorProto_LABEL_OPTIONAL.Enum(), |
| }, |
| }, |
| }, |
| }, |
| { |
| description: "nested-uppercase", |
| bq: &storagepb.TableSchema{ |
| Fields: []*storagepb.TableFieldSchema{ |
| {Name: "recordID", Type: storagepb.TableFieldSchema_INT64, Mode: storagepb.TableFieldSchema_REQUIRED}, |
| { |
| Name: "recordDetails", |
| Type: storagepb.TableFieldSchema_STRUCT, |
| Mode: storagepb.TableFieldSchema_REPEATED, |
| Fields: []*storagepb.TableFieldSchema{ |
| {Name: "key", Type: storagepb.TableFieldSchema_STRING, Mode: storagepb.TableFieldSchema_REQUIRED}, |
| {Name: "value", Type: storagepb.TableFieldSchema_BYTES, Mode: storagepb.TableFieldSchema_NULLABLE}, |
| }, |
| }, |
| }, |
| }, |
| wantProto2: &descriptorpb.DescriptorProto{ |
| Name: proto.String("root"), |
| Field: []*descriptorpb.FieldDescriptorProto{ |
| { |
| Name: proto.String("recordID"), |
| Number: proto.Int32(1), |
| Type: descriptorpb.FieldDescriptorProto_TYPE_INT64.Enum(), |
| Label: descriptorpb.FieldDescriptorProto_LABEL_REQUIRED.Enum(), |
| }, |
| { |
| Name: proto.String("recordDetails"), |
| Number: proto.Int32(2), |
| Type: descriptorpb.FieldDescriptorProto_TYPE_MESSAGE.Enum(), |
| TypeName: proto.String(".root__recordDetails"), |
| Label: descriptorpb.FieldDescriptorProto_LABEL_REPEATED.Enum(), |
| }, |
| }, |
| }, |
| wantProto2Normalized: &descriptorpb.DescriptorProto{ |
| Name: proto.String("root"), |
| Field: []*descriptorpb.FieldDescriptorProto{ |
| { |
| Name: proto.String("recordID"), |
| Number: proto.Int32(1), |
| Type: descriptorpb.FieldDescriptorProto_TYPE_INT64.Enum(), |
| Label: descriptorpb.FieldDescriptorProto_LABEL_REQUIRED.Enum(), |
| }, |
| { |
| Name: proto.String("recordDetails"), |
| Number: proto.Int32(2), |
| Type: descriptorpb.FieldDescriptorProto_TYPE_MESSAGE.Enum(), |
| TypeName: proto.String("root__recordDetails"), |
| Label: descriptorpb.FieldDescriptorProto_LABEL_REPEATED.Enum(), |
| }, |
| }, |
| NestedType: []*descriptorpb.DescriptorProto{ |
| { |
| Name: proto.String("root__recordDetails"), |
| Field: []*descriptorpb.FieldDescriptorProto{ |
| { |
| Name: proto.String("key"), |
| Number: proto.Int32(1), |
| Type: descriptorpb.FieldDescriptorProto_TYPE_STRING.Enum(), |
| Label: descriptorpb.FieldDescriptorProto_LABEL_REQUIRED.Enum(), |
| }, |
| { |
| Name: proto.String("value"), |
| Number: proto.Int32(2), |
| Type: descriptorpb.FieldDescriptorProto_TYPE_BYTES.Enum(), |
| Label: descriptorpb.FieldDescriptorProto_LABEL_OPTIONAL.Enum(), |
| }, |
| }, |
| }, |
| }, |
| }, |
| wantProto3: &descriptorpb.DescriptorProto{ |
| Name: proto.String("root"), |
| Field: []*descriptorpb.FieldDescriptorProto{ |
| { |
| Name: proto.String("recordID"), |
| Number: proto.Int32(1), |
| Type: descriptorpb.FieldDescriptorProto_TYPE_INT64.Enum(), |
| Label: descriptorpb.FieldDescriptorProto_LABEL_OPTIONAL.Enum(), |
| }, |
| { |
| Name: proto.String("recordDetails"), |
| Number: proto.Int32(2), |
| Type: descriptorpb.FieldDescriptorProto_TYPE_MESSAGE.Enum(), |
| TypeName: proto.String(".root__recordDetails"), |
| Label: descriptorpb.FieldDescriptorProto_LABEL_REPEATED.Enum(), |
| }, |
| }, |
| }, |
| }, |
| { |
| // We expect to re-use the submessage twice, as the schema contains two identical structs. |
| description: "nested with duplicate submessage", |
| bq: &storagepb.TableSchema{ |
| Fields: []*storagepb.TableFieldSchema{ |
| {Name: "curdate", Type: storagepb.TableFieldSchema_DATE, Mode: storagepb.TableFieldSchema_NULLABLE}, |
| { |
| Name: "rec1", |
| Type: storagepb.TableFieldSchema_STRUCT, |
| Mode: storagepb.TableFieldSchema_NULLABLE, |
| Fields: []*storagepb.TableFieldSchema{ |
| {Name: "userid", Type: storagepb.TableFieldSchema_STRING, Mode: storagepb.TableFieldSchema_REQUIRED}, |
| {Name: "location", Type: storagepb.TableFieldSchema_GEOGRAPHY, Mode: storagepb.TableFieldSchema_NULLABLE}, |
| }, |
| }, |
| { |
| Name: "rec2", |
| Type: storagepb.TableFieldSchema_STRUCT, |
| Mode: storagepb.TableFieldSchema_NULLABLE, |
| Fields: []*storagepb.TableFieldSchema{ |
| {Name: "userid", Type: storagepb.TableFieldSchema_STRING, Mode: storagepb.TableFieldSchema_REQUIRED}, |
| {Name: "location", Type: storagepb.TableFieldSchema_GEOGRAPHY, Mode: storagepb.TableFieldSchema_NULLABLE}, |
| }, |
| }, |
| }, |
| }, |
| wantProto2: &descriptorpb.DescriptorProto{ |
| Name: proto.String("root"), |
| Field: []*descriptorpb.FieldDescriptorProto{ |
| { |
| Name: proto.String("curdate"), |
| Number: proto.Int32(1), |
| Type: descriptorpb.FieldDescriptorProto_TYPE_INT32.Enum(), |
| Label: descriptorpb.FieldDescriptorProto_LABEL_OPTIONAL.Enum(), |
| }, |
| { |
| Name: proto.String("rec1"), |
| Number: proto.Int32(2), |
| Type: descriptorpb.FieldDescriptorProto_TYPE_MESSAGE.Enum(), |
| TypeName: proto.String(".root__rec1"), |
| Label: descriptorpb.FieldDescriptorProto_LABEL_OPTIONAL.Enum(), |
| }, |
| { |
| Name: proto.String("rec2"), |
| Number: proto.Int32(3), |
| Type: descriptorpb.FieldDescriptorProto_TYPE_MESSAGE.Enum(), |
| TypeName: proto.String(".root__rec1"), |
| Label: descriptorpb.FieldDescriptorProto_LABEL_OPTIONAL.Enum(), |
| }, |
| }, |
| }, |
| wantProto3: &descriptorpb.DescriptorProto{ |
| Name: proto.String("root"), |
| Field: []*descriptorpb.FieldDescriptorProto{ |
| { |
| Name: proto.String("curdate"), |
| Number: proto.Int32(1), |
| Type: descriptorpb.FieldDescriptorProto_TYPE_MESSAGE.Enum(), |
| TypeName: proto.String(".google.protobuf.Int32Value"), |
| Label: descriptorpb.FieldDescriptorProto_LABEL_OPTIONAL.Enum(), |
| }, |
| { |
| Name: proto.String("rec1"), |
| Number: proto.Int32(2), |
| Type: descriptorpb.FieldDescriptorProto_TYPE_MESSAGE.Enum(), |
| TypeName: proto.String(".root__rec1"), |
| Label: descriptorpb.FieldDescriptorProto_LABEL_OPTIONAL.Enum(), |
| }, |
| { |
| Name: proto.String("rec2"), |
| Number: proto.Int32(3), |
| Type: descriptorpb.FieldDescriptorProto_TYPE_MESSAGE.Enum(), |
| TypeName: proto.String(".root__rec1"), |
| Label: descriptorpb.FieldDescriptorProto_LABEL_OPTIONAL.Enum(), |
| }, |
| }, |
| }, |
| }, |
| { |
| description: "nested with reused submessage in different levels", |
| bq: &storagepb.TableSchema{ |
| Fields: []*storagepb.TableFieldSchema{ |
| { |
| Name: "reused_inner_struct", |
| Type: storagepb.TableFieldSchema_STRUCT, |
| Mode: storagepb.TableFieldSchema_REQUIRED, |
| Fields: []*storagepb.TableFieldSchema{ |
| { |
| Name: "leaf", |
| Type: storagepb.TableFieldSchema_STRING, |
| Mode: storagepb.TableFieldSchema_REQUIRED, |
| }, |
| }, |
| }, |
| { |
| Name: "outer_struct", |
| Type: storagepb.TableFieldSchema_STRUCT, |
| Mode: storagepb.TableFieldSchema_REQUIRED, |
| Fields: []*storagepb.TableFieldSchema{ |
| { |
| Name: "another_inner_struct", |
| Type: storagepb.TableFieldSchema_STRUCT, |
| Mode: storagepb.TableFieldSchema_REQUIRED, |
| Fields: []*storagepb.TableFieldSchema{ |
| { |
| Name: "another_leaf", |
| Type: storagepb.TableFieldSchema_STRING, |
| Mode: storagepb.TableFieldSchema_REQUIRED, |
| }, |
| }, |
| }, |
| { |
| Name: "reused_inner_struct_one", |
| Type: storagepb.TableFieldSchema_STRUCT, |
| Mode: storagepb.TableFieldSchema_REQUIRED, |
| Fields: []*storagepb.TableFieldSchema{ |
| { |
| Name: "leaf", |
| Type: storagepb.TableFieldSchema_STRING, |
| Mode: storagepb.TableFieldSchema_REQUIRED, |
| }, |
| }, |
| }, |
| { |
| Name: "reused_inner_struct_two", |
| Type: storagepb.TableFieldSchema_STRUCT, |
| Mode: storagepb.TableFieldSchema_REQUIRED, |
| Fields: []*storagepb.TableFieldSchema{ |
| { |
| Name: "leaf", |
| Type: storagepb.TableFieldSchema_STRING, |
| Mode: storagepb.TableFieldSchema_REQUIRED, |
| }, |
| }, |
| }, |
| }, |
| }, |
| }, |
| }, |
| wantProto2: &descriptorpb.DescriptorProto{ |
| Name: proto.String("root"), |
| Field: []*descriptorpb.FieldDescriptorProto{ |
| { |
| Name: proto.String("reused_inner_struct"), |
| Number: proto.Int32(1), |
| Type: descriptorpb.FieldDescriptorProto_TYPE_MESSAGE.Enum(), |
| TypeName: proto.String(".root__reused_inner_struct"), |
| Label: descriptorpb.FieldDescriptorProto_LABEL_REQUIRED.Enum(), |
| }, |
| { |
| Name: proto.String("outer_struct"), |
| Number: proto.Int32(2), |
| Type: descriptorpb.FieldDescriptorProto_TYPE_MESSAGE.Enum(), |
| TypeName: proto.String(".root__outer_struct"), |
| Label: descriptorpb.FieldDescriptorProto_LABEL_REQUIRED.Enum(), |
| }, |
| }, |
| }, |
| wantProto2Normalized: &descriptorpb.DescriptorProto{ |
| Name: proto.String("root"), |
| Field: []*descriptorpb.FieldDescriptorProto{ |
| { |
| Name: proto.String("reused_inner_struct"), |
| Number: proto.Int32(1), |
| Type: descriptorpb.FieldDescriptorProto_TYPE_MESSAGE.Enum(), |
| TypeName: proto.String("root__reused_inner_struct"), |
| Label: descriptorpb.FieldDescriptorProto_LABEL_REQUIRED.Enum(), |
| }, |
| { |
| Name: proto.String("outer_struct"), |
| Number: proto.Int32(2), |
| Type: descriptorpb.FieldDescriptorProto_TYPE_MESSAGE.Enum(), |
| TypeName: proto.String("root__outer_struct"), |
| Label: descriptorpb.FieldDescriptorProto_LABEL_REQUIRED.Enum(), |
| }, |
| }, |
| NestedType: []*descriptorpb.DescriptorProto{ |
| { |
| Name: proto.String("root__outer_struct"), |
| Field: []*descriptorpb.FieldDescriptorProto{ |
| { |
| Name: proto.String("another_inner_struct"), |
| Number: proto.Int32(1), |
| Type: descriptorpb.FieldDescriptorProto_TYPE_MESSAGE.Enum(), |
| TypeName: proto.String("root__outer_struct__another_inner_struct"), |
| Label: descriptorpb.FieldDescriptorProto_LABEL_REQUIRED.Enum(), |
| }, |
| { |
| Name: proto.String("reused_inner_struct_one"), |
| Number: proto.Int32(2), |
| Type: descriptorpb.FieldDescriptorProto_TYPE_MESSAGE.Enum(), |
| TypeName: proto.String("root__reused_inner_struct"), |
| Label: descriptorpb.FieldDescriptorProto_LABEL_REQUIRED.Enum(), |
| }, |
| { |
| Name: proto.String("reused_inner_struct_two"), |
| Number: proto.Int32(3), |
| Type: descriptorpb.FieldDescriptorProto_TYPE_MESSAGE.Enum(), |
| TypeName: proto.String("root__reused_inner_struct"), |
| Label: descriptorpb.FieldDescriptorProto_LABEL_REQUIRED.Enum(), |
| }, |
| }, |
| }, |
| { |
| Name: proto.String("root__outer_struct__another_inner_struct"), |
| Field: []*descriptorpb.FieldDescriptorProto{ |
| { |
| Name: proto.String("another_leaf"), |
| Number: proto.Int32(1), |
| Type: descriptorpb.FieldDescriptorProto_TYPE_STRING.Enum(), |
| Label: descriptorpb.FieldDescriptorProto_LABEL_REQUIRED.Enum(), |
| }, |
| }, |
| }, |
| { |
| Name: proto.String("root__reused_inner_struct"), |
| Field: []*descriptorpb.FieldDescriptorProto{ |
| { |
| Name: proto.String("leaf"), |
| Number: proto.Int32(1), |
| Type: descriptorpb.FieldDescriptorProto_TYPE_STRING.Enum(), |
| Label: descriptorpb.FieldDescriptorProto_LABEL_REQUIRED.Enum(), |
| }, |
| }, |
| }, |
| }, |
| }, |
| wantProto3: &descriptorpb.DescriptorProto{ |
| Name: proto.String("root"), |
| Field: []*descriptorpb.FieldDescriptorProto{ |
| { |
| Name: proto.String("reused_inner_struct"), |
| Number: proto.Int32(1), |
| Type: descriptorpb.FieldDescriptorProto_TYPE_MESSAGE.Enum(), |
| TypeName: proto.String(".root__reused_inner_struct"), |
| Label: descriptorpb.FieldDescriptorProto_LABEL_OPTIONAL.Enum(), |
| }, |
| { |
| Name: proto.String("outer_struct"), |
| Number: proto.Int32(2), |
| Type: descriptorpb.FieldDescriptorProto_TYPE_MESSAGE.Enum(), |
| TypeName: proto.String(".root__outer_struct"), |
| Label: descriptorpb.FieldDescriptorProto_LABEL_OPTIONAL.Enum(), |
| }, |
| }, |
| }, |
| }, |
| { |
| description: "multiple nesting levels", |
| bq: &storagepb.TableSchema{ |
| Fields: []*storagepb.TableFieldSchema{ |
| { |
| Name: "outer_struct", |
| Type: storagepb.TableFieldSchema_STRUCT, |
| Mode: storagepb.TableFieldSchema_NULLABLE, |
| Fields: []*storagepb.TableFieldSchema{ |
| { |
| Name: "inner_struct", |
| Type: storagepb.TableFieldSchema_STRUCT, |
| Mode: storagepb.TableFieldSchema_NULLABLE, |
| Fields: []*storagepb.TableFieldSchema{ |
| {Name: "leaf_one", Type: storagepb.TableFieldSchema_INT64, Mode: storagepb.TableFieldSchema_NULLABLE}, |
| {Name: "leaf_two", Type: storagepb.TableFieldSchema_INT64, Mode: storagepb.TableFieldSchema_NULLABLE}, |
| }, |
| }, |
| }, |
| }, |
| { |
| Name: "other_field", |
| Type: storagepb.TableFieldSchema_INT64, |
| Mode: storagepb.TableFieldSchema_NULLABLE, |
| }, |
| }, |
| }, |
| wantProto2: &descriptorpb.DescriptorProto{ |
| Name: proto.String("root"), |
| Field: []*descriptorpb.FieldDescriptorProto{ |
| { |
| Name: proto.String("outer_struct"), |
| Number: proto.Int32(1), |
| Type: descriptorpb.FieldDescriptorProto_TYPE_MESSAGE.Enum(), |
| TypeName: proto.String(".root__outer_struct"), |
| Label: descriptorpb.FieldDescriptorProto_LABEL_OPTIONAL.Enum(), |
| }, |
| { |
| Name: proto.String("other_field"), |
| Number: proto.Int32(2), |
| Type: descriptorpb.FieldDescriptorProto_TYPE_INT64.Enum(), |
| Label: descriptorpb.FieldDescriptorProto_LABEL_OPTIONAL.Enum(), |
| }, |
| }, |
| }, |
| wantProto2Normalized: &descriptorpb.DescriptorProto{ |
| Name: proto.String("root"), |
| Field: []*descriptorpb.FieldDescriptorProto{ |
| { |
| Name: proto.String("outer_struct"), |
| Number: proto.Int32(1), |
| Type: descriptorpb.FieldDescriptorProto_TYPE_MESSAGE.Enum(), |
| TypeName: proto.String("root__outer_struct"), |
| Label: descriptorpb.FieldDescriptorProto_LABEL_OPTIONAL.Enum(), |
| }, |
| { |
| Name: proto.String("other_field"), |
| Number: proto.Int32(2), |
| Type: descriptorpb.FieldDescriptorProto_TYPE_INT64.Enum(), |
| Label: descriptorpb.FieldDescriptorProto_LABEL_OPTIONAL.Enum(), |
| }, |
| }, |
| NestedType: []*descriptorpb.DescriptorProto{ |
| { |
| Name: proto.String("root__outer_struct"), |
| Field: []*descriptorpb.FieldDescriptorProto{ |
| { |
| Name: proto.String("inner_struct"), |
| Number: proto.Int32(1), |
| Type: descriptorpb.FieldDescriptorProto_TYPE_MESSAGE.Enum(), |
| TypeName: proto.String("root__outer_struct__inner_struct"), |
| Label: descriptorpb.FieldDescriptorProto_LABEL_OPTIONAL.Enum(), |
| }, |
| }, |
| }, |
| { |
| Name: proto.String("root__outer_struct__inner_struct"), |
| Field: []*descriptorpb.FieldDescriptorProto{ |
| { |
| Name: proto.String("leaf_one"), |
| Number: proto.Int32(1), |
| Type: descriptorpb.FieldDescriptorProto_TYPE_INT64.Enum(), |
| Label: descriptorpb.FieldDescriptorProto_LABEL_OPTIONAL.Enum(), |
| }, |
| { |
| Name: proto.String("leaf_two"), |
| Number: proto.Int32(2), |
| Type: descriptorpb.FieldDescriptorProto_TYPE_INT64.Enum(), |
| Label: descriptorpb.FieldDescriptorProto_LABEL_OPTIONAL.Enum(), |
| }, |
| }, |
| }, |
| }, |
| }, |
| wantProto3: &descriptorpb.DescriptorProto{ |
| Name: proto.String("root"), |
| Field: []*descriptorpb.FieldDescriptorProto{ |
| { |
| Name: proto.String("outer_struct"), |
| Number: proto.Int32(1), |
| Type: descriptorpb.FieldDescriptorProto_TYPE_MESSAGE.Enum(), |
| TypeName: proto.String(".root__outer_struct"), |
| Label: descriptorpb.FieldDescriptorProto_LABEL_OPTIONAL.Enum(), |
| }, |
| { |
| Name: proto.String("other_field"), |
| Number: proto.Int32(2), |
| Type: descriptorpb.FieldDescriptorProto_TYPE_MESSAGE.Enum(), |
| TypeName: proto.String(".google.protobuf.Int64Value"), |
| Label: descriptorpb.FieldDescriptorProto_LABEL_OPTIONAL.Enum(), |
| }, |
| }, |
| }, |
| }, |
| { |
| description: "repeated with packed", |
| bq: &storagepb.TableSchema{ |
| Fields: []*storagepb.TableFieldSchema{ |
| {Name: "name", Type: storagepb.TableFieldSchema_STRING, Mode: storagepb.TableFieldSchema_NULLABLE}, |
| {Name: "some_lengths", Type: storagepb.TableFieldSchema_INT64, Mode: storagepb.TableFieldSchema_REPEATED}, |
| {Name: "nicknames", Type: storagepb.TableFieldSchema_STRING, Mode: storagepb.TableFieldSchema_REPEATED}, |
| }}, |
| wantProto2: &descriptorpb.DescriptorProto{ |
| Name: proto.String("root"), |
| Field: []*descriptorpb.FieldDescriptorProto{ |
| { |
| Name: proto.String("name"), |
| Number: proto.Int32(1), |
| Type: descriptorpb.FieldDescriptorProto_TYPE_STRING.Enum(), |
| Label: descriptorpb.FieldDescriptorProto_LABEL_OPTIONAL.Enum()}, |
| { |
| Name: proto.String("some_lengths"), |
| Number: proto.Int32(2), |
| Type: descriptorpb.FieldDescriptorProto_TYPE_INT64.Enum(), |
| Label: descriptorpb.FieldDescriptorProto_LABEL_REPEATED.Enum(), |
| Options: &descriptorpb.FieldOptions{ |
| Packed: proto.Bool(true), |
| }, |
| }, |
| {Name: proto.String("nicknames"), Number: proto.Int32(3), Type: descriptorpb.FieldDescriptorProto_TYPE_STRING.Enum(), Label: descriptorpb.FieldDescriptorProto_LABEL_REPEATED.Enum()}, |
| }, |
| }, |
| }, |
| { |
| description: "indirect names", |
| bq: &storagepb.TableSchema{ |
| Fields: []*storagepb.TableFieldSchema{ |
| {Name: "foo", Type: storagepb.TableFieldSchema_STRING, Mode: storagepb.TableFieldSchema_NULLABLE}, |
| {Name: "火", Type: storagepb.TableFieldSchema_INT64, Mode: storagepb.TableFieldSchema_REQUIRED}, |
| {Name: "水_addict", Type: storagepb.TableFieldSchema_BYTES, Mode: storagepb.TableFieldSchema_REPEATED}, |
| {Name: "0col", Type: storagepb.TableFieldSchema_INT64, Mode: storagepb.TableFieldSchema_NULLABLE}, |
| {Name: "funny-name", Type: storagepb.TableFieldSchema_INT64, Mode: storagepb.TableFieldSchema_NULLABLE}, |
| }}, |
| wantProto2: func() *descriptorpb.DescriptorProto { |
| dp := &descriptorpb.DescriptorProto{ |
| Name: proto.String("root"), |
| Field: []*descriptorpb.FieldDescriptorProto{ |
| { |
| Name: proto.String("foo"), |
| Number: proto.Int32(1), |
| Type: descriptorpb.FieldDescriptorProto_TYPE_STRING.Enum(), |
| Label: descriptorpb.FieldDescriptorProto_LABEL_OPTIONAL.Enum()}, |
| { |
| Name: proto.String("col_54Gr"), |
| Number: proto.Int32(2), |
| Type: descriptorpb.FieldDescriptorProto_TYPE_INT64.Enum(), |
| Options: &descriptorpb.FieldOptions{}, |
| Label: descriptorpb.FieldDescriptorProto_LABEL_REQUIRED.Enum()}, |
| { |
| Name: proto.String("col_5rC0X2FkZGljdA"), |
| Number: proto.Int32(3), |
| Type: descriptorpb.FieldDescriptorProto_TYPE_BYTES.Enum(), |
| Options: &descriptorpb.FieldOptions{}, |
| Label: descriptorpb.FieldDescriptorProto_LABEL_REPEATED.Enum(), |
| }, |
| { |
| Name: proto.String("col_MGNvbA"), |
| Number: proto.Int32(4), |
| Type: descriptorpb.FieldDescriptorProto_TYPE_INT64.Enum(), |
| Options: &descriptorpb.FieldOptions{}, |
| Label: descriptorpb.FieldDescriptorProto_LABEL_OPTIONAL.Enum()}, |
| { |
| Name: proto.String("col_ZnVubnktbmFtZQ"), |
| Number: proto.Int32(5), |
| Type: descriptorpb.FieldDescriptorProto_TYPE_INT64.Enum(), |
| Options: &descriptorpb.FieldOptions{}, |
| Label: descriptorpb.FieldDescriptorProto_LABEL_OPTIONAL.Enum()}, |
| }, |
| } |
| proto.SetExtension(dp.Field[1].Options, storagepb.E_ColumnName, "火") |
| proto.SetExtension(dp.Field[2].Options, storagepb.E_ColumnName, "水_addict") |
| proto.SetExtension(dp.Field[3].Options, storagepb.E_ColumnName, "0col") |
| proto.SetExtension(dp.Field[4].Options, storagepb.E_ColumnName, "funny-name") |
| return dp |
| }(), |
| }, |
| } |
| for _, tc := range testCases { |
| t.Run(tc.description, func(T *testing.T) { |
| // Proto2 |
| p2d, err := StorageSchemaToProto2Descriptor(tc.bq, "root") |
| if err != nil { |
| t.Fatalf("failed proto2 conversion: %v", err) |
| } |
| |
| // Convert to MessageDescriptor. |
| mDesc, ok := p2d.(protoreflect.MessageDescriptor) |
| if !ok { |
| t.Error("couldn't convert proto2 to messagedescriptor") |
| } |
| // Check the non-normalized case. |
| if tc.wantProto2 != nil { |
| gotDP := protodesc.ToDescriptorProto(mDesc) |
| if diff := cmp.Diff(gotDP, tc.wantProto2, protocmp.Transform()); diff != "" { |
| t.Errorf("proto2: -got, +want:\n%s", diff) |
| } |
| } |
| // Check the normalized case. |
| if tc.wantProto2Normalized != nil { |
| gotDP, err := NormalizeDescriptor(mDesc) |
| if err != nil { |
| t.Errorf("failed to normalize: %v", err) |
| } |
| if diff := cmp.Diff(gotDP, tc.wantProto2Normalized, protocmp.Transform()); diff != "" { |
| t.Errorf("proto2normalized: -got, +want:\n%s", diff) |
| } |
| } |
| |
| p3d, err := StorageSchemaToProto3Descriptor(tc.bq, "root") |
| if err != nil { |
| t.Fatalf("failed proto3 conversion: %v", err) |
| } |
| // Convert to MessageDescriptor. |
| mDesc, ok = p3d.(protoreflect.MessageDescriptor) |
| if !ok { |
| t.Error("couldn't convert proto3 to messagedescriptor") |
| } |
| // Check the non-normalized case. |
| if tc.wantProto3 != nil { |
| gotDP := protodesc.ToDescriptorProto(mDesc) |
| if diff := cmp.Diff(gotDP, tc.wantProto3, protocmp.Transform()); diff != "" { |
| t.Errorf("proto3: -got, +want:\n%s", diff) |
| } |
| } |
| // Check the normalized case. |
| if tc.wantProto3Normalized != nil { |
| gotDP, err := NormalizeDescriptor(mDesc) |
| if err != nil { |
| t.Errorf("failed to normalize: %v", err) |
| } |
| if diff := cmp.Diff(gotDP, tc.wantProto3Normalized, protocmp.Transform()); diff != "" { |
| t.Errorf("proto3normalized: -got, +want:\n%s", diff) |
| } |
| } |
| }) |
| } |
| } |
| |
| func TestProtoJSONSerialization(t *testing.T) { |
| |
| sourceSchema := &storagepb.TableSchema{ |
| Fields: []*storagepb.TableFieldSchema{ |
| {Name: "record_id", Type: storagepb.TableFieldSchema_INT64, Mode: storagepb.TableFieldSchema_NULLABLE}, |
| { |
| Name: "details", |
| Type: storagepb.TableFieldSchema_STRUCT, |
| Mode: storagepb.TableFieldSchema_REPEATED, |
| Fields: []*storagepb.TableFieldSchema{ |
| {Name: "key", Type: storagepb.TableFieldSchema_STRING, Mode: storagepb.TableFieldSchema_REQUIRED}, |
| {Name: "value", Type: storagepb.TableFieldSchema_STRING, Mode: storagepb.TableFieldSchema_NULLABLE}, |
| }, |
| }, |
| }, |
| } |
| |
| descriptor, err := StorageSchemaToProto2Descriptor(sourceSchema, "root") |
| if err != nil { |
| t.Fatalf("failed to construct descriptor") |
| } |
| |
| sampleRecord := []byte(`{"record_id":"12345","details":[{"key":"name","value":"jimmy"},{"key":"title","value":"clown"}]}`) |
| |
| messageDescriptor, ok := descriptor.(protoreflect.MessageDescriptor) |
| if !ok { |
| t.Fatalf("StorageSchemaToDescriptor didn't yield a valid message descriptor, got %T", descriptor) |
| } |
| |
| // First, ensure we got the expected descriptors. Check both outer and inner messages. |
| gotOuterDP := protodesc.ToDescriptorProto(messageDescriptor) |
| |
| innerField := messageDescriptor.Fields().ByName("details") |
| if innerField == nil { |
| t.Fatalf("couldn't get inner descriptor for details") |
| } |
| gotInnerDP := protodesc.ToDescriptorProto(innerField.Message()) |
| |
| wantOuterDP := &descriptorpb.DescriptorProto{ |
| Name: proto.String("root"), |
| Field: []*descriptorpb.FieldDescriptorProto{ |
| { |
| Name: proto.String("record_id"), |
| Number: proto.Int32(1), |
| Type: descriptorpb.FieldDescriptorProto_TYPE_INT64.Enum(), |
| Label: descriptorpb.FieldDescriptorProto_LABEL_OPTIONAL.Enum(), |
| }, |
| { |
| Name: proto.String("details"), |
| Number: proto.Int32(2), |
| Type: descriptorpb.FieldDescriptorProto_TYPE_MESSAGE.Enum(), |
| TypeName: proto.String(".root__details"), |
| Label: descriptorpb.FieldDescriptorProto_LABEL_REPEATED.Enum(), |
| }, |
| }, |
| } |
| |
| wantInnerDP := &descriptorpb.DescriptorProto{ |
| Name: proto.String("root__details"), |
| Field: []*descriptorpb.FieldDescriptorProto{ |
| { |
| Name: proto.String("key"), |
| Number: proto.Int32(1), |
| Type: descriptorpb.FieldDescriptorProto_TYPE_STRING.Enum(), |
| Label: descriptorpb.FieldDescriptorProto_LABEL_REQUIRED.Enum(), |
| }, |
| { |
| Name: proto.String("value"), |
| Number: proto.Int32(2), |
| Type: descriptorpb.FieldDescriptorProto_TYPE_STRING.Enum(), |
| Label: descriptorpb.FieldDescriptorProto_LABEL_OPTIONAL.Enum(), |
| }, |
| }, |
| } |
| |
| if outerDiff := cmp.Diff(gotOuterDP, wantOuterDP, protocmp.Transform()); outerDiff != "" { |
| t.Fatalf("DescriptorProto for outer message differs.\n-got, +want:\n%s", outerDiff) |
| } |
| if innerDiff := cmp.Diff(gotInnerDP, wantInnerDP, protocmp.Transform()); innerDiff != "" { |
| t.Fatalf("DescriptorProto for inner message differs.\n-got, +want:\n%s", innerDiff) |
| } |
| |
| message := dynamicpb.NewMessage(messageDescriptor) |
| |
| // Attempt to serialize json record into proto message. |
| err = protojson.Unmarshal(sampleRecord, message) |
| if err != nil { |
| t.Fatalf("failed to Unmarshal json message: %v", err) |
| } |
| |
| // Serialize message back to json bytes. We must use options for idempotency, otherwise |
| // we'll serialize using the Go name rather than the proto name (recordId vs record_id). |
| options := protojson.MarshalOptions{ |
| UseProtoNames: true, |
| } |
| gotBytes, err := options.Marshal(message) |
| if err != nil { |
| t.Fatalf("failed to marshal message: %v", err) |
| } |
| |
| var got, want interface{} |
| if err := json.Unmarshal(gotBytes, &got); err != nil { |
| t.Fatalf("couldn't marshal gotBytes: %v", err) |
| } |
| if err := json.Unmarshal(sampleRecord, &want); err != nil { |
| t.Fatalf("couldn't marshal sampleRecord: %v", err) |
| } |
| if !reflect.DeepEqual(got, want) { |
| t.Fatalf("mismatched json: got\n%q\nwant\n%q", gotBytes, sampleRecord) |
| } |
| |
| } |
| |
| func TestNormalizeDescriptor(t *testing.T) { |
| testCases := []struct { |
| description string |
| in protoreflect.MessageDescriptor |
| wantErr bool |
| want *descriptorpb.DescriptorProto |
| }{ |
| { |
| description: "nil", |
| in: nil, |
| wantErr: true, |
| }, |
| { |
| description: "AllSupportedTypes", |
| in: (&testdata.AllSupportedTypes{}).ProtoReflect().Descriptor(), |
| want: &descriptorpb.DescriptorProto{ |
| Name: proto.String("testdata_AllSupportedTypes"), |
| Field: []*descriptorpb.FieldDescriptorProto{ |
| { |
| Name: proto.String("int32_value"), |
| JsonName: proto.String("int32Value"), |
| Number: proto.Int32(1), |
| Type: descriptorpb.FieldDescriptorProto_TYPE_INT32.Enum(), |
| Label: descriptorpb.FieldDescriptorProto_LABEL_OPTIONAL.Enum(), |
| }, |
| { |
| Name: proto.String("int64_value"), |
| JsonName: proto.String("int64Value"), |
| Number: proto.Int32(2), |
| Type: descriptorpb.FieldDescriptorProto_TYPE_INT64.Enum(), |
| Label: descriptorpb.FieldDescriptorProto_LABEL_OPTIONAL.Enum(), |
| }, |
| { |
| Name: proto.String("uint32_value"), |
| JsonName: proto.String("uint32Value"), |
| Number: proto.Int32(3), |
| Type: descriptorpb.FieldDescriptorProto_TYPE_UINT32.Enum(), |
| Label: descriptorpb.FieldDescriptorProto_LABEL_OPTIONAL.Enum(), |
| }, |
| { |
| Name: proto.String("uint64_value"), |
| JsonName: proto.String("uint64Value"), |
| Number: proto.Int32(4), |
| Type: descriptorpb.FieldDescriptorProto_TYPE_UINT64.Enum(), |
| Label: descriptorpb.FieldDescriptorProto_LABEL_OPTIONAL.Enum(), |
| }, |
| { |
| Name: proto.String("float_value"), |
| JsonName: proto.String("floatValue"), |
| Number: proto.Int32(5), |
| Type: descriptorpb.FieldDescriptorProto_TYPE_FLOAT.Enum(), |
| Label: descriptorpb.FieldDescriptorProto_LABEL_OPTIONAL.Enum(), |
| }, |
| { |
| Name: proto.String("double_value"), |
| JsonName: proto.String("doubleValue"), |
| Number: proto.Int32(6), |
| Type: descriptorpb.FieldDescriptorProto_TYPE_DOUBLE.Enum(), |
| Label: descriptorpb.FieldDescriptorProto_LABEL_OPTIONAL.Enum(), |
| }, |
| { |
| Name: proto.String("bool_value"), |
| JsonName: proto.String("boolValue"), |
| Number: proto.Int32(7), |
| Type: descriptorpb.FieldDescriptorProto_TYPE_BOOL.Enum(), |
| Label: descriptorpb.FieldDescriptorProto_LABEL_OPTIONAL.Enum(), |
| }, |
| { |
| Name: proto.String("enum_value"), |
| JsonName: proto.String("enumValue"), |
| TypeName: proto.String("testdata_TestEnum_E.TestEnum"), |
| Number: proto.Int32(8), |
| Type: descriptorpb.FieldDescriptorProto_TYPE_ENUM.Enum(), |
| Label: descriptorpb.FieldDescriptorProto_LABEL_OPTIONAL.Enum(), |
| }, |
| { |
| Name: proto.String("string_value"), |
| JsonName: proto.String("stringValue"), |
| Number: proto.Int32(9), |
| Type: descriptorpb.FieldDescriptorProto_TYPE_STRING.Enum(), |
| Label: descriptorpb.FieldDescriptorProto_LABEL_REQUIRED.Enum(), |
| }, |
| { |
| Name: proto.String("fixed64_value"), |
| JsonName: proto.String("fixed64Value"), |
| Number: proto.Int32(10), |
| Type: descriptorpb.FieldDescriptorProto_TYPE_FIXED64.Enum(), |
| Label: descriptorpb.FieldDescriptorProto_LABEL_OPTIONAL.Enum(), |
| }, |
| }, |
| NestedType: []*descriptorpb.DescriptorProto{ |
| { |
| Name: proto.String("testdata_TestEnum_E"), |
| EnumType: []*descriptorpb.EnumDescriptorProto{ |
| { |
| Name: proto.String("TestEnum"), |
| Value: []*descriptorpb.EnumValueDescriptorProto{ |
| { |
| Name: proto.String("TestEnum0"), |
| Number: proto.Int32(0), |
| }, |
| { |
| Name: proto.String("TestEnum1"), |
| Number: proto.Int32(1), |
| }, |
| }, |
| }, |
| }, |
| }, |
| }, |
| }, |
| }, |
| { |
| description: "ContainsRecursive", |
| in: (&testdata.ContainsRecursive{}).ProtoReflect().Descriptor(), |
| wantErr: true, |
| }, |
| { |
| description: "RecursiveTypeTopMessage", |
| in: (&testdata.RecursiveTypeTopMessage{}).ProtoReflect().Descriptor(), |
| wantErr: true, |
| }, |
| { |
| description: "ComplexType", |
| in: (&testdata.ComplexType{}).ProtoReflect().Descriptor(), |
| want: &descriptorpb.DescriptorProto{ |
| Name: proto.String("testdata_ComplexType"), |
| Field: []*descriptorpb.FieldDescriptorProto{ |
| { |
| Name: proto.String("nested_repeated_type"), |
| JsonName: proto.String("nestedRepeatedType"), |
| Number: proto.Int32(1), |
| TypeName: proto.String("testdata_NestedType"), |
| Type: descriptorpb.FieldDescriptorProto_TYPE_MESSAGE.Enum(), |
| Label: descriptorpb.FieldDescriptorProto_LABEL_REPEATED.Enum(), |
| }, |
| { |
| Name: proto.String("inner_type"), |
| JsonName: proto.String("innerType"), |
| Number: proto.Int32(2), |
| TypeName: proto.String("testdata_InnerType"), |
| Type: descriptorpb.FieldDescriptorProto_TYPE_MESSAGE.Enum(), |
| Label: descriptorpb.FieldDescriptorProto_LABEL_OPTIONAL.Enum(), |
| }, |
| { |
| Name: proto.String("range_type"), |
| JsonName: proto.String("rangeType"), |
| Number: proto.Int32(3), |
| TypeName: proto.String("testdata_RangeTypeTimestamp"), |
| Type: descriptorpb.FieldDescriptorProto_TYPE_MESSAGE.Enum(), |
| Label: descriptorpb.FieldDescriptorProto_LABEL_OPTIONAL.Enum(), |
| }, |
| }, |
| NestedType: []*descriptorpb.DescriptorProto{ |
| { |
| Name: proto.String("testdata_InnerType"), |
| Field: []*descriptorpb.FieldDescriptorProto{ |
| { |
| Name: proto.String("value"), |
| JsonName: proto.String("value"), |
| Number: proto.Int32(1), |
| Type: descriptorpb.FieldDescriptorProto_TYPE_STRING.Enum(), |
| Label: descriptorpb.FieldDescriptorProto_LABEL_REPEATED.Enum(), |
| }, |
| }, |
| }, |
| { |
| Name: proto.String("testdata_NestedType"), |
| Field: []*descriptorpb.FieldDescriptorProto{ |
| { |
| Name: proto.String("inner_type"), |
| JsonName: proto.String("innerType"), |
| Number: proto.Int32(1), |
| TypeName: proto.String("testdata_InnerType"), |
| Type: descriptorpb.FieldDescriptorProto_TYPE_MESSAGE.Enum(), |
| Label: descriptorpb.FieldDescriptorProto_LABEL_REPEATED.Enum(), |
| }, |
| }, |
| }, |
| { |
| Name: proto.String("testdata_RangeTypeTimestamp"), |
| Field: []*descriptorpb.FieldDescriptorProto{ |
| { |
| Name: proto.String("start"), |
| JsonName: proto.String("start"), |
| Number: proto.Int32(1), |
| Type: descriptorpb.FieldDescriptorProto_TYPE_INT64.Enum(), |
| Label: descriptorpb.FieldDescriptorProto_LABEL_OPTIONAL.Enum(), |
| }, |
| { |
| Name: proto.String("end"), |
| JsonName: proto.String("end"), |
| Number: proto.Int32(2), |
| Type: descriptorpb.FieldDescriptorProto_TYPE_INT64.Enum(), |
| Label: descriptorpb.FieldDescriptorProto_LABEL_OPTIONAL.Enum(), |
| }, |
| }, |
| }, |
| }, |
| }, |
| }, |
| { |
| description: "WithWellKnownTypes", |
| in: (&testdata.WithWellKnownTypes{}).ProtoReflect().Descriptor(), |
| want: &descriptorpb.DescriptorProto{ |
| Name: proto.String("testdata_WithWellKnownTypes"), |
| Field: []*descriptorpb.FieldDescriptorProto{ |
| { |
| Name: proto.String("int64_value"), |
| JsonName: proto.String("int64Value"), |
| Number: proto.Int32(1), |
| Type: descriptorpb.FieldDescriptorProto_TYPE_INT64.Enum(), |
| Label: descriptorpb.FieldDescriptorProto_LABEL_OPTIONAL.Enum(), |
| }, |
| { |
| Name: proto.String("wrapped_int64"), |
| JsonName: proto.String("wrappedInt64"), |
| Number: proto.Int32(2), |
| Type: descriptorpb.FieldDescriptorProto_TYPE_MESSAGE.Enum(), |
| TypeName: proto.String("google_protobuf_Int64Value"), |
| Label: descriptorpb.FieldDescriptorProto_LABEL_OPTIONAL.Enum(), |
| }, |
| { |
| Name: proto.String("string_value"), |
| JsonName: proto.String("stringValue"), |
| Number: proto.Int32(3), |
| Type: descriptorpb.FieldDescriptorProto_TYPE_STRING.Enum(), |
| Label: descriptorpb.FieldDescriptorProto_LABEL_REPEATED.Enum(), |
| }, |
| { |
| Name: proto.String("wrapped_string"), |
| JsonName: proto.String("wrappedString"), |
| Number: proto.Int32(4), |
| Type: descriptorpb.FieldDescriptorProto_TYPE_MESSAGE.Enum(), |
| TypeName: proto.String("google_protobuf_StringValue"), |
| Label: descriptorpb.FieldDescriptorProto_LABEL_REPEATED.Enum(), |
| }, |
| }, |
| NestedType: []*descriptorpb.DescriptorProto{ |
| { |
| Name: proto.String("google_protobuf_Int64Value"), |
| Field: []*descriptorpb.FieldDescriptorProto{ |
| { |
| Name: proto.String("value"), |
| JsonName: proto.String("value"), |
| Number: proto.Int32(1), |
| DefaultValue: proto.String("0"), |
| Type: descriptorpb.FieldDescriptorProto_TYPE_INT64.Enum(), |
| Label: descriptorpb.FieldDescriptorProto_LABEL_OPTIONAL.Enum(), |
| }, |
| }, |
| }, |
| { |
| Name: proto.String("google_protobuf_StringValue"), |
| Field: []*descriptorpb.FieldDescriptorProto{ |
| { |
| Name: proto.String("value"), |
| JsonName: proto.String("value"), |
| Number: proto.Int32(1), |
| DefaultValue: proto.String(""), |
| Type: descriptorpb.FieldDescriptorProto_TYPE_STRING.Enum(), |
| Label: descriptorpb.FieldDescriptorProto_LABEL_OPTIONAL.Enum(), |
| }, |
| }, |
| }, |
| }, |
| }, |
| }, |
| { |
| description: "WithOneOf", |
| in: (&testdata.WithOneOf{}).ProtoReflect().Descriptor(), |
| want: &descriptorpb.DescriptorProto{ |
| Name: proto.String("testdata_WithOneOf"), |
| Field: []*descriptorpb.FieldDescriptorProto{ |
| { |
| Name: proto.String("int32_value"), |
| JsonName: proto.String("int32Value"), |
| Number: proto.Int32(1), |
| Type: descriptorpb.FieldDescriptorProto_TYPE_INT32.Enum(), |
| Label: descriptorpb.FieldDescriptorProto_LABEL_OPTIONAL.Enum(), |
| }, |
| { |
| Name: proto.String("string_value"), |
| JsonName: proto.String("stringValue"), |
| Number: proto.Int32(2), |
| Type: descriptorpb.FieldDescriptorProto_TYPE_STRING.Enum(), |
| Label: descriptorpb.FieldDescriptorProto_LABEL_OPTIONAL.Enum(), |
| }, |
| { |
| Name: proto.String("double_value"), |
| JsonName: proto.String("doubleValue"), |
| Number: proto.Int32(3), |
| Type: descriptorpb.FieldDescriptorProto_TYPE_DOUBLE.Enum(), |
| Label: descriptorpb.FieldDescriptorProto_LABEL_OPTIONAL.Enum(), |
| }, |
| }, |
| }, |
| }, |
| { |
| description: "WithProto3Optional", |
| in: (&testdata.SimpleMessageProto3WithOptional{}).ProtoReflect().Descriptor(), |
| want: &descriptorpb.DescriptorProto{ |
| Name: proto.String("testdata_SimpleMessageProto3WithOptional"), |
| Field: []*descriptorpb.FieldDescriptorProto{ |
| { |
| Name: proto.String("name"), |
| JsonName: proto.String("name"), |
| Number: proto.Int32(1), |
| DefaultValue: proto.String(""), |
| Type: descriptorpb.FieldDescriptorProto_TYPE_STRING.Enum(), |
| Label: descriptorpb.FieldDescriptorProto_LABEL_OPTIONAL.Enum(), |
| }, |
| { |
| Name: proto.String("value"), |
| JsonName: proto.String("value"), |
| Number: proto.Int32(2), |
| Type: descriptorpb.FieldDescriptorProto_TYPE_INT64.Enum(), |
| Label: descriptorpb.FieldDescriptorProto_LABEL_OPTIONAL.Enum(), |
| }, |
| }, |
| }, |
| }, |
| { |
| description: "WithProto3Defaults", |
| in: (&testdata.ValidationP3Defaults{}).ProtoReflect().Descriptor(), |
| want: &descriptorpb.DescriptorProto{ |
| Name: proto.String("testdata_ValidationP3Defaults"), |
| Field: []*descriptorpb.FieldDescriptorProto{ |
| { |
| Name: proto.String("double_field"), |
| JsonName: proto.String("doubleField"), |
| Number: proto.Int32(1), |
| Type: descriptorpb.FieldDescriptorProto_TYPE_DOUBLE.Enum(), |
| Label: descriptorpb.FieldDescriptorProto_LABEL_OPTIONAL.Enum(), |
| DefaultValue: proto.String("0"), |
| }, |
| { |
| Name: proto.String("float_field"), |
| JsonName: proto.String("floatField"), |
| Number: proto.Int32(2), |
| Type: descriptorpb.FieldDescriptorProto_TYPE_FLOAT.Enum(), |
| Label: descriptorpb.FieldDescriptorProto_LABEL_OPTIONAL.Enum(), |
| DefaultValue: proto.String("0"), |
| }, |
| { |
| Name: proto.String("int32_field"), |
| JsonName: proto.String("int32Field"), |
| Number: proto.Int32(3), |
| Type: descriptorpb.FieldDescriptorProto_TYPE_INT32.Enum(), |
| Label: descriptorpb.FieldDescriptorProto_LABEL_OPTIONAL.Enum(), |
| DefaultValue: proto.String("0"), |
| }, |
| { |
| Name: proto.String("int64_field"), |
| JsonName: proto.String("int64Field"), |
| Number: proto.Int32(4), |
| Type: descriptorpb.FieldDescriptorProto_TYPE_INT64.Enum(), |
| Label: descriptorpb.FieldDescriptorProto_LABEL_OPTIONAL.Enum(), |
| DefaultValue: proto.String("0"), |
| }, |
| { |
| Name: proto.String("uint32_field"), |
| JsonName: proto.String("uint32Field"), |
| Number: proto.Int32(5), |
| Type: descriptorpb.FieldDescriptorProto_TYPE_UINT32.Enum(), |
| Label: descriptorpb.FieldDescriptorProto_LABEL_OPTIONAL.Enum(), |
| DefaultValue: proto.String("0"), |
| }, |
| { |
| Name: proto.String("sint32_field"), |
| JsonName: proto.String("sint32Field"), |
| Number: proto.Int32(7), |
| Type: descriptorpb.FieldDescriptorProto_TYPE_SINT32.Enum(), |
| Label: descriptorpb.FieldDescriptorProto_LABEL_OPTIONAL.Enum(), |
| DefaultValue: proto.String("0"), |
| }, |
| { |
| Name: proto.String("sint64_field"), |
| JsonName: proto.String("sint64Field"), |
| Number: proto.Int32(8), |
| Type: descriptorpb.FieldDescriptorProto_TYPE_SINT64.Enum(), |
| Label: descriptorpb.FieldDescriptorProto_LABEL_OPTIONAL.Enum(), |
| DefaultValue: proto.String("0"), |
| }, |
| { |
| Name: proto.String("fixed32_field"), |
| JsonName: proto.String("fixed32Field"), |
| Number: proto.Int32(9), |
| Type: descriptorpb.FieldDescriptorProto_TYPE_FIXED32.Enum(), |
| Label: descriptorpb.FieldDescriptorProto_LABEL_OPTIONAL.Enum(), |
| DefaultValue: proto.String("0"), |
| }, |
| { |
| Name: proto.String("sfixed32_field"), |
| JsonName: proto.String("sfixed32Field"), |
| Number: proto.Int32(11), |
| Type: descriptorpb.FieldDescriptorProto_TYPE_SFIXED32.Enum(), |
| Label: descriptorpb.FieldDescriptorProto_LABEL_OPTIONAL.Enum(), |
| DefaultValue: proto.String("0"), |
| }, |
| { |
| Name: proto.String("sfixed64_field"), |
| JsonName: proto.String("sfixed64Field"), |
| Number: proto.Int32(12), |
| Type: descriptorpb.FieldDescriptorProto_TYPE_SFIXED64.Enum(), |
| Label: descriptorpb.FieldDescriptorProto_LABEL_OPTIONAL.Enum(), |
| DefaultValue: proto.String("0"), |
| }, |
| { |
| Name: proto.String("bool_field"), |
| JsonName: proto.String("boolField"), |
| Number: proto.Int32(13), |
| Type: descriptorpb.FieldDescriptorProto_TYPE_BOOL.Enum(), |
| Label: descriptorpb.FieldDescriptorProto_LABEL_OPTIONAL.Enum(), |
| DefaultValue: proto.String("false"), |
| }, |
| { |
| Name: proto.String("string_field"), |
| JsonName: proto.String("stringField"), |
| Number: proto.Int32(14), |
| Type: descriptorpb.FieldDescriptorProto_TYPE_STRING.Enum(), |
| Label: descriptorpb.FieldDescriptorProto_LABEL_OPTIONAL.Enum(), |
| DefaultValue: proto.String(""), |
| }, |
| { |
| Name: proto.String("bytes_field"), |
| JsonName: proto.String("bytesField"), |
| Number: proto.Int32(15), |
| Type: descriptorpb.FieldDescriptorProto_TYPE_BYTES.Enum(), |
| Label: descriptorpb.FieldDescriptorProto_LABEL_OPTIONAL.Enum(), |
| DefaultValue: proto.String(""), |
| }, |
| { |
| Name: proto.String("enum_field"), |
| JsonName: proto.String("enumField"), |
| Number: proto.Int32(16), |
| Type: descriptorpb.FieldDescriptorProto_TYPE_ENUM.Enum(), |
| TypeName: proto.String("testdata_Proto3ExampleEnum_E.Proto3ExampleEnum"), |
| Label: descriptorpb.FieldDescriptorProto_LABEL_OPTIONAL.Enum(), |
| DefaultValue: proto.String("P3_UNDEFINED"), |
| }, |
| }, |
| NestedType: []*descriptorpb.DescriptorProto{ |
| { |
| Name: proto.String("testdata_Proto3ExampleEnum_E"), |
| EnumType: []*descriptorpb.EnumDescriptorProto{ |
| { |
| Name: proto.String("Proto3ExampleEnum"), |
| Value: []*descriptorpb.EnumValueDescriptorProto{ |
| { |
| Name: proto.String("P3_UNDEFINED"), |
| Number: proto.Int32(0), |
| }, |
| { |
| Name: proto.String("P3_THING"), |
| Number: proto.Int32(1), |
| }, |
| { |
| Name: proto.String("P3_OTHER_THING"), |
| Number: proto.Int32(2), |
| }, |
| { |
| Name: proto.String("P3_THIRD_THING"), |
| Number: proto.Int32(3), |
| }, |
| }, |
| }, |
| }, |
| }, |
| }, |
| }, |
| }, |
| { |
| description: "WithExternalEnum", |
| in: (&testdata.ExternalEnumMessage{}).ProtoReflect().Descriptor(), |
| want: &descriptorpb.DescriptorProto{ |
| Name: proto.String("testdata_ExternalEnumMessage"), |
| Field: []*descriptorpb.FieldDescriptorProto{ |
| { |
| Name: proto.String("msg_a"), |
| JsonName: proto.String("msgA"), |
| Number: proto.Int32(1), |
| TypeName: proto.String("testdata_EnumMsgA"), |
| Type: descriptorpb.FieldDescriptorProto_TYPE_MESSAGE.Enum(), |
| Label: descriptorpb.FieldDescriptorProto_LABEL_OPTIONAL.Enum(), |
| }, |
| { |
| Name: proto.String("msg_b"), |
| JsonName: proto.String("msgB"), |
| Number: proto.Int32(2), |
| TypeName: proto.String("testdata_EnumMsgB"), |
| Type: descriptorpb.FieldDescriptorProto_TYPE_MESSAGE.Enum(), |
| Label: descriptorpb.FieldDescriptorProto_LABEL_OPTIONAL.Enum(), |
| }, |
| }, |
| NestedType: []*descriptorpb.DescriptorProto{ |
| { |
| Name: proto.String("testdata_EnumMsgA"), |
| Field: []*descriptorpb.FieldDescriptorProto{ |
| { |
| Name: proto.String("foo"), |
| JsonName: proto.String("foo"), |
| Number: proto.Int32(1), |
| Type: descriptorpb.FieldDescriptorProto_TYPE_STRING.Enum(), |
| Label: descriptorpb.FieldDescriptorProto_LABEL_OPTIONAL.Enum(), |
| }, |
| { |
| Name: proto.String("bar"), |
| JsonName: proto.String("bar"), |
| Number: proto.Int32(2), |
| Type: descriptorpb.FieldDescriptorProto_TYPE_ENUM.Enum(), |
| TypeName: proto.String("testdata_ExtEnum_E.ExtEnum"), |
| Label: descriptorpb.FieldDescriptorProto_LABEL_OPTIONAL.Enum(), |
| }, |
| }, |
| }, |
| { |
| Name: proto.String("testdata_EnumMsgB"), |
| Field: []*descriptorpb.FieldDescriptorProto{ |
| { |
| Name: proto.String("baz"), |
| JsonName: proto.String("baz"), |
| Number: proto.Int32(1), |
| Type: descriptorpb.FieldDescriptorProto_TYPE_ENUM.Enum(), |
| TypeName: proto.String("testdata_ExtEnum_E.ExtEnum"), |
| Label: descriptorpb.FieldDescriptorProto_LABEL_OPTIONAL.Enum(), |
| }, |
| }, |
| }, |
| { |
| Name: proto.String("testdata_ExtEnum_E"), |
| EnumType: []*descriptorpb.EnumDescriptorProto{ |
| { |
| Name: proto.String("ExtEnum"), |
| Value: []*descriptorpb.EnumValueDescriptorProto{ |
| { |
| Name: proto.String("UNDEFINED"), |
| Number: proto.Int32(0), |
| }, |
| { |
| Name: proto.String("THING"), |
| Number: proto.Int32(1), |
| }, |
| { |
| Name: proto.String("OTHER_THING"), |
| Number: proto.Int32(2), |
| }, |
| }, |
| }, |
| }, |
| }, |
| }, |
| }, |
| }, |
| { |
| description: "OutOfOrderDefinitionProto2", |
| in: (&testdata.OutOfOrderDefinitionProto2{}).ProtoReflect().Descriptor(), |
| want: &descriptorpb.DescriptorProto{ |
| Name: proto.String("testdata_OutOfOrderDefinitionProto2"), |
| Field: []*descriptorpb.FieldDescriptorProto{ |
| { |
| Name: proto.String("s1"), |
| JsonName: proto.String("s1"), |
| Number: proto.Int32(1), |
| Type: descriptorpb.FieldDescriptorProto_TYPE_STRING.Enum(), |
| Label: descriptorpb.FieldDescriptorProto_LABEL_OPTIONAL.Enum(), |
| }, |
| { |
| Name: proto.String("s2"), |
| JsonName: proto.String("s2"), |
| Number: proto.Int32(2), |
| Type: descriptorpb.FieldDescriptorProto_TYPE_STRING.Enum(), |
| Label: descriptorpb.FieldDescriptorProto_LABEL_OPTIONAL.Enum(), |
| }, |
| { |
| Name: proto.String("s3"), |
| JsonName: proto.String("s3"), |
| Number: proto.Int32(3), |
| Type: descriptorpb.FieldDescriptorProto_TYPE_STRING.Enum(), |
| Label: descriptorpb.FieldDescriptorProto_LABEL_OPTIONAL.Enum(), |
| }, |
| { |
| Name: proto.String("enum1"), |
| JsonName: proto.String("enum1"), |
| Number: proto.Int32(4), |
| Type: descriptorpb.FieldDescriptorProto_TYPE_ENUM.Enum(), |
| Label: descriptorpb.FieldDescriptorProto_LABEL_OPTIONAL.Enum(), |
| TypeName: proto.String("testdata_OutOfOrderDefinitionProto2_OutOfOrderEnum_E.OutOfOrderEnum"), |
| }, |
| { |
| Name: proto.String("enum2"), |
| JsonName: proto.String("enum2"), |
| Number: proto.Int32(5), |
| Type: descriptorpb.FieldDescriptorProto_TYPE_ENUM.Enum(), |
| Label: descriptorpb.FieldDescriptorProto_LABEL_OPTIONAL.Enum(), |
| TypeName: proto.String("testdata_OutOfOrderDefinitionProto2_OutOfOrderEnum_E.OutOfOrderEnum"), |
| }, |
| { |
| Name: proto.String("msg6"), |
| JsonName: proto.String("msg6"), |
| Number: proto.Int32(6), |
| Type: descriptorpb.FieldDescriptorProto_TYPE_MESSAGE.Enum(), |
| Label: descriptorpb.FieldDescriptorProto_LABEL_OPTIONAL.Enum(), |
| TypeName: proto.String("testdata_SimpleMessageProto2"), |
| }, |
| { |
| Name: proto.String("msg7"), |
| JsonName: proto.String("msg7"), |
| Number: proto.Int32(7), |
| Type: descriptorpb.FieldDescriptorProto_TYPE_MESSAGE.Enum(), |
| Label: descriptorpb.FieldDescriptorProto_LABEL_OPTIONAL.Enum(), |
| TypeName: proto.String("testdata_SimpleMessageProto2"), |
| }, |
| }, |
| NestedType: []*descriptorpb.DescriptorProto{ |
| { |
| Name: proto.String("testdata_OutOfOrderDefinitionProto2_OutOfOrderEnum_E"), |
| EnumType: []*descriptorpb.EnumDescriptorProto{ |
| { |
| Name: proto.String("OutOfOrderEnum"), |
| Value: []*descriptorpb.EnumValueDescriptorProto{ |
| { |
| Name: proto.String("E1"), |
| Number: proto.Int32(1), |
| }, |
| { |
| Name: proto.String("E2"), |
| Number: proto.Int32(2), |
| }, |
| { |
| Name: proto.String("E3"), |
| Number: proto.Int32(3), |
| }, |
| }, |
| }, |
| }, |
| }, |
| { |
| Name: proto.String("testdata_SimpleMessageProto2"), |
| Field: []*descriptorpb.FieldDescriptorProto{ |
| { |
| Name: proto.String("name"), |
| JsonName: proto.String("name"), |
| Number: proto.Int32(1), |
| Type: descriptorpb.FieldDescriptorProto_TYPE_STRING.Enum(), |
| Label: descriptorpb.FieldDescriptorProto_LABEL_OPTIONAL.Enum(), |
| }, |
| { |
| Name: proto.String("value"), |
| JsonName: proto.String("value"), |
| Number: proto.Int32(2), |
| Type: descriptorpb.FieldDescriptorProto_TYPE_INT64.Enum(), |
| Label: descriptorpb.FieldDescriptorProto_LABEL_OPTIONAL.Enum(), |
| }, |
| }, |
| }, |
| }, |
| }, |
| }, |
| { |
| description: "ValidationP3PackedRepeated", |
| in: (&testdata.ValidationP3PackedRepeated{}).ProtoReflect().Descriptor(), |
| want: &descriptorpb.DescriptorProto{ |
| Name: proto.String("testdata_ValidationP3PackedRepeated"), |
| Field: []*descriptorpb.FieldDescriptorProto{ |
| { |
| Name: proto.String("id"), |
| JsonName: proto.String("id"), |
| Number: proto.Int32(1), |
| Type: descriptorpb.FieldDescriptorProto_TYPE_INT64.Enum(), |
| Label: descriptorpb.FieldDescriptorProto_LABEL_OPTIONAL.Enum(), |
| }, |
| { |
| Name: proto.String("double_repeated"), |
| JsonName: proto.String("doubleRepeated"), |
| Number: proto.Int32(2), |
| Type: descriptorpb.FieldDescriptorProto_TYPE_DOUBLE.Enum(), |
| Label: descriptorpb.FieldDescriptorProto_LABEL_REPEATED.Enum(), |
| }, |
| { |
| Name: proto.String("float_repeated"), |
| JsonName: proto.String("floatRepeated"), |
| Number: proto.Int32(3), |
| Type: descriptorpb.FieldDescriptorProto_TYPE_FLOAT.Enum(), |
| Label: descriptorpb.FieldDescriptorProto_LABEL_REPEATED.Enum(), |
| }, |
| { |
| Name: proto.String("int32_repeated"), |
| JsonName: proto.String("int32Repeated"), |
| Number: proto.Int32(4), |
| Type: descriptorpb.FieldDescriptorProto_TYPE_INT32.Enum(), |
| Label: descriptorpb.FieldDescriptorProto_LABEL_REPEATED.Enum(), |
| }, |
| { |
| Name: proto.String("int64_repeated"), |
| JsonName: proto.String("int64Repeated"), |
| Number: proto.Int32(5), |
| Type: descriptorpb.FieldDescriptorProto_TYPE_INT64.Enum(), |
| Label: descriptorpb.FieldDescriptorProto_LABEL_REPEATED.Enum(), |
| }, |
| { |
| Name: proto.String("uint32_repeated"), |
| JsonName: proto.String("uint32Repeated"), |
| Number: proto.Int32(6), |
| Type: descriptorpb.FieldDescriptorProto_TYPE_UINT32.Enum(), |
| Label: descriptorpb.FieldDescriptorProto_LABEL_REPEATED.Enum(), |
| }, |
| { |
| Name: proto.String("sint32_repeated"), |
| JsonName: proto.String("sint32Repeated"), |
| Number: proto.Int32(7), |
| Type: descriptorpb.FieldDescriptorProto_TYPE_SINT32.Enum(), |
| Label: descriptorpb.FieldDescriptorProto_LABEL_REPEATED.Enum(), |
| }, |
| { |
| Name: proto.String("sint64_repeated"), |
| JsonName: proto.String("sint64Repeated"), |
| Number: proto.Int32(8), |
| Type: descriptorpb.FieldDescriptorProto_TYPE_SINT64.Enum(), |
| Label: descriptorpb.FieldDescriptorProto_LABEL_REPEATED.Enum(), |
| }, |
| { |
| Name: proto.String("fixed32_repeated"), |
| JsonName: proto.String("fixed32Repeated"), |
| Number: proto.Int32(9), |
| Type: descriptorpb.FieldDescriptorProto_TYPE_FIXED32.Enum(), |
| Label: descriptorpb.FieldDescriptorProto_LABEL_REPEATED.Enum(), |
| }, |
| { |
| Name: proto.String("sfixed32_repeated"), |
| JsonName: proto.String("sfixed32Repeated"), |
| Number: proto.Int32(10), |
| Type: descriptorpb.FieldDescriptorProto_TYPE_SFIXED32.Enum(), |
| Label: descriptorpb.FieldDescriptorProto_LABEL_REPEATED.Enum(), |
| }, |
| { |
| Name: proto.String("sfixed64_repeated"), |
| JsonName: proto.String("sfixed64Repeated"), |
| Number: proto.Int32(11), |
| Type: descriptorpb.FieldDescriptorProto_TYPE_SFIXED64.Enum(), |
| Label: descriptorpb.FieldDescriptorProto_LABEL_REPEATED.Enum(), |
| }, |
| |
| { |
| Name: proto.String("bool_repeated"), |
| JsonName: proto.String("boolRepeated"), |
| Number: proto.Int32(12), |
| Type: descriptorpb.FieldDescriptorProto_TYPE_BOOL.Enum(), |
| Label: descriptorpb.FieldDescriptorProto_LABEL_REPEATED.Enum(), |
| }, |
| { |
| Name: proto.String("enum_repeated"), |
| JsonName: proto.String("enumRepeated"), |
| Number: proto.Int32(13), |
| Type: descriptorpb.FieldDescriptorProto_TYPE_ENUM.Enum(), |
| TypeName: proto.String("testdata_Proto3ExampleEnum_E.Proto3ExampleEnum"), |
| Label: descriptorpb.FieldDescriptorProto_LABEL_REPEATED.Enum(), |
| }, |
| }, |
| NestedType: []*descriptorpb.DescriptorProto{ |
| { |
| Name: proto.String("testdata_Proto3ExampleEnum_E"), |
| EnumType: []*descriptorpb.EnumDescriptorProto{ |
| { |
| Name: proto.String("Proto3ExampleEnum"), |
| Value: []*descriptorpb.EnumValueDescriptorProto{ |
| { |
| Name: proto.String("P3_UNDEFINED"), |
| Number: proto.Int32(0), |
| }, |
| { |
| Name: proto.String("P3_THING"), |
| Number: proto.Int32(1), |
| }, |
| { |
| Name: proto.String("P3_OTHER_THING"), |
| Number: proto.Int32(2), |
| }, |
| { |
| Name: proto.String("P3_THIRD_THING"), |
| Number: proto.Int32(3), |
| }, |
| }, |
| }, |
| }, |
| }, |
| }, |
| }, |
| }, |
| } |
| |
| for _, tc := range testCases { |
| gotDP, err := NormalizeDescriptor(tc.in) |
| |
| if tc.wantErr && err == nil { |
| t.Errorf("%s: wanted err but got success", tc.description) |
| continue |
| } |
| if !tc.wantErr && err != nil { |
| t.Errorf("%s: wanted success, got err: %v", tc.description, err) |
| continue |
| } |
| if diff := cmp.Diff(gotDP, tc.want, protocmp.Transform()); diff != "" { |
| t.Errorf("%s: -got, +want:\n%s", tc.description, diff) |
| } |
| } |
| } |
