Add google.protobuf.Duration well-known type (#64)

* feat: add well known type duration Signed-off-by: Grant Timmerman <timmerman+devrel@google.com> * ci: remove unrelated files Signed-off-by: Grant Timmerman <timmerman+devrel@google.com>
chrusty · Jul 11, 2021 · 0f15c52 · 0f15c52
1 parent dc9f108
commit 0f15c52
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 0 deletions.
diff --git a/internal/converter/testdata/proto/WellKnown.proto b/internal/converter/testdata/proto/WellKnown.proto
@@ -1,11 +1,13 @@
 syntax = "proto3";
 package samples;
+import "google/protobuf/duration.proto";
 import "google/protobuf/wrappers.proto";
 
 message WellKnown {
     google.protobuf.StringValue string_value = 1;
     map<int32, google.protobuf.Int32Value> map_of_integers = 2;
     map<int32, int32> map_of_scalar_integers = 3;
     repeated google.protobuf.Int32Value list_of_integers = 4;
+    google.protobuf.Duration duration = 5;
 }
 
diff --git a/internal/converter/testdata/wellknown.go b/internal/converter/testdata/wellknown.go
@@ -25,6 +25,10 @@ const WellKnown = `{
                 "type": "integer"
             },
             "type": "array"
+        },
+        "duration": {
+            "additionalProperties": true,
+            "type": "string"
         }
     },
     "additionalProperties": true,

diff --git a/internal/converter/types.go b/internal/converter/types.go
@@ -26,6 +26,7 @@ var (
 		"StringValue": true,
 		"BytesValue":  true,
 		"Value":       true,
+		"Duration":    true,
 	}
 )
 
@@ -435,6 +436,8 @@ func (c *Converter) recursiveConvertMessageType(curPkg *ProtoPackage, msg *descr
 				{Type: gojsonschema.TYPE_OBJECT},
 				{Type: gojsonschema.TYPE_STRING},
 			}
+		case "Duration":
+			wellKnownSchema.Type = gojsonschema.TYPE_STRING
 		}
 
 		// If we're allowing nulls then prepare a OneOf:

diff --git a/jsonschemas/WellKnown.jsonschema b/jsonschemas/WellKnown.jsonschema
@@ -23,6 +23,10 @@
                 "type": "integer"
             },
             "type": "array"
+        },
+        "duration": {
+            "additionalProperties": true,
+            "type": "string"
         }
     },
     "additionalProperties": true,