Add support for protbuf enums

GoogleCloudPlatform · Oct 29, 2023 · c683a8c · c683a8c
1 parent c6d21f4
commit c683a8c
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 0 deletions.
diff --git a/tools/mc2bq/pkg/schema/schema.go b/tools/mc2bq/pkg/schema/schema.go
@@ -28,6 +28,8 @@ import (
 	"time"
 
 	"cloud.google.com/go/bigquery"
+	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
+	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
 	"google.golang.org/protobuf/types/known/timestamppb"
 
 	"github.com/GoogleCloudPlatform/migrationcenter-utils/tools/mc2bq/pkg/messages"
@@ -230,6 +232,8 @@ func normalizeToSchema(obj any, schema *bigquery.FieldSchema) (any, error) {
 		switch obj := objValue.Interface().(type) {
 		case string:
 			return obj, nil
+		case protoreflect.Enum:
+			return protoimpl.X.EnumStringOf(obj.Descriptor(), protoreflect.EnumNumber(obj.Number())), nil
 		default:
 			return nil, wrapWithSerializeError(schema.Name, fmt.Errorf("convert field of type %q to string", reflect.TypeOf(obj).String()))
 		}

diff --git a/tools/mc2bq/pkg/schema/schema_test.go b/tools/mc2bq/pkg/schema/schema_test.go
@@ -21,6 +21,7 @@ import (
 	"time"
 
 	"cloud.google.com/go/bigquery"
+	"cloud.google.com/go/migrationcenter/apiv1/migrationcenterpb"
 	"github.com/google/go-cmp/cmp"
 	"google.golang.org/protobuf/types/known/timestamppb"
 
@@ -55,6 +56,7 @@ func TestObjectSerializer(t *testing.T) {
 		RecordArray     []*TestInnerStruct
 		RecordMap       map[string]*TestInnerStruct
 		DeprecatedField string
+		Enum            migrationcenterpb.CommitmentPlan
 	}
 	schema := bigquery.Schema{
 		{Name: "int_scalar", Type: bigquery.IntegerFieldType},
@@ -76,6 +78,7 @@ func TestObjectSerializer(t *testing.T) {
 			{Name: "key", Type: bigquery.StringFieldType},
 			{Name: "value", Type: bigquery.RecordFieldType, Schema: innerStructSchema},
 		}},
+		{Name: "enum", Type: bigquery.StringFieldType},
 		// DeprecatedField doesn't appear in the schema as it has been deprecated
 	}
 	// This ensures that we are testing all the field types that exist in the schema
@@ -97,6 +100,7 @@ func TestObjectSerializer(t *testing.T) {
 		RecordArray:     []*TestInnerStruct{{FieldA: "1", FieldB: 1}, {FieldA: "2", FieldB: 2}},
 		RecordMap:       map[string]*TestInnerStruct{"key": {FieldA: "value"}},
 		DeprecatedField: "I should not be in the result JSON",
+		Enum:            1,
 	}
 
 	got, err := SerializeObjectToBigQuery(obj, "object", schema)

diff --git a/tools/mc2bq/pkg/schema/testdata/exporter.json.golden b/tools/mc2bq/pkg/schema/testdata/exporter.json.golden
@@ -10,6 +10,7 @@
       "value": "bar"
     }
   ],
+  "enum": "COMMITMENT_PLAN_NONE",
   "float32_scalar": 0.32,
   "float64_scalar": 0.64,
   "int_array": [