revert using json_names in proto

instead provide a custom marshaller that prefers
proto field names over json_names

Signed-off-by: Humair Khan <[email protected]>

Author: HumairAK

backend/api/v1beta1/error.proto

@@ -20,8 +20,8 @@ package api;
 import "google/protobuf/any.proto";
 
 message Error {
-  string error_message = 1 [json_name = "error_message"];
-  string error_details = 2 [json_name = "error_details"];
+  string error_message = 1;
+  string error_details = 2;
 }
 
 message Status {

backend/api/v1beta1/experiment.proto

@@ -120,16 +120,16 @@ message ListExperimentsRequest {
   // A page token to request the next page of results. The token is acquried
   // from the nextPageToken field of the response from the previous
   // ListExperiment call or can be omitted when fetching the first page.
-  string page_token = 1 [json_name = "page_token"];
+  string page_token = 1;
 
   // The number of experiments to be listed per page. If there are more
   // experiments than this number, the response message will contain a
   // nextPageToken field you can use to fetch the next page.
-  int32 page_size = 2 [json_name = "page_size"];
+  int32 page_size = 2;
 
   // Can be format of "field_name", "field_name asc" or "field_name desc"
   // Ascending by default.
-  string sort_by = 3 [json_name = "sort_by"];
+  string sort_by = 3;
 
   // A url-encoded, JSON-serialized Filter protocol buffer (see
   // [filter.proto](https://github.com/kubeflow/pipelines/blob/master/backend/api/v1beta1/filter.proto)).
@@ -138,18 +138,18 @@ message ListExperimentsRequest {
   // What resource reference to filter on.
   // For Experiment, the only valid resource type is Namespace. An sample query string could be
   // resource_reference_key.type=NAMESPACE&resource_reference_key.id=ns1
-  ResourceKey resource_reference_key = 5 [json_name = "resource_reference_key"];
+  ResourceKey resource_reference_key = 5;
 }
 
 message ListExperimentsResponse {
   // A list of experiments returned.
   repeated Experiment experiments = 1;
 
   // The total number of experiments for the given query.
-  int32 total_size = 3 [json_name = "total_size"];
+  int32 total_size = 3;
 
   // The token to list the next page of experiments.
-  string next_page_token = 2 [json_name = "next_page_token"];
+  string next_page_token = 2;
 }
 
 message DeleteExperimentRequest {
@@ -168,11 +168,11 @@ message Experiment {
   string description = 3;
 
   // Output. The time that the experiment created.
-  google.protobuf.Timestamp created_at = 4 [json_name = "created_at"];
+  google.protobuf.Timestamp created_at = 4;
 
   // Optional input field. Specify which resource this run belongs to.
   // For Experiment, the only valid resource reference is a single Namespace.
-  repeated ResourceReference resource_references = 5 [json_name = "resource_references"];
+  repeated ResourceReference resource_references = 5;
 
   enum StorageState {
     STORAGESTATE_UNSPECIFIED = 0;
@@ -181,7 +181,7 @@ message Experiment {
   }
 
   // Output. Specifies whether this experiment is in archived or available state.
-  StorageState storage_state = 6 [json_name = "storage_state"];
+  StorageState storage_state = 6;
 }
 
 message ArchiveExperimentRequest {

backend/api/v1beta1/filter.proto

@@ -47,18 +47,18 @@ message Predicate {
 
   string key = 2;
   oneof value {
-    int32 int_value = 3 [json_name = "int_value"];
-    int64 long_value = 4 [json_name = "long_value"];
-    string string_value = 5 [json_name = "string_value"];
+    int32 int_value = 3;
+    int64 long_value = 4;
+    string string_value = 5;
 
     // Timestamp values will be converted to Unix time (seconds since the epoch)
     // prior to being used in a filtering operation.
-    google.protobuf.Timestamp timestamp_value = 6 [json_name = "timestamp_value"];
+    google.protobuf.Timestamp timestamp_value = 6;
 
     // Array values below are only meant to be used by the IN operator.
-    IntValues int_values = 7 [json_name = "int_values"];
-    LongValues long_values = 8 [json_name = "long_values"];
-    StringValues string_values = 9 [json_name = "string_values"];
+    IntValues int_values = 7;
+    LongValues long_values = 8;
+    StringValues string_values = 9;
   }
 }
 
@@ -125,4 +125,4 @@ message Filter {
 // encoded version of it is used.
 service DummyFilterService {
   rpc GetFilter(Filter) returns (Filter) {}
-}
+}

backend/api/v1beta1/healthz.proto

@@ -67,5 +67,5 @@ service HealthzService {
 
 message GetHealthzResponse {
   // Returns if KFP in multi-user mode
-  bool multi_user = 3 [json_name = "multi_user"];
+  bool multi_user = 3;
 }

backend/api/v1beta1/job.proto

@@ -119,21 +119,21 @@ message ListJobsRequest {
   // A page token to request the next page of results. The token is acquried
   // from the nextPageToken field of the response from the previous
   // ListJobs call or can be omitted when fetching the first page.
-  string page_token = 1 [json_name = "page_token"];
+  string page_token = 1;
 
   // The number of jobs to be listed per page. If there are more jobs than this
   // number, the response message will contain a nextPageToken field you can use
   // to fetch the next page.
-  int32 page_size = 2 [json_name = "page_size"];
+  int32 page_size = 2;
 
   // Can be format of "field_name", "field_name asc" or "field_name desc".
   // Ascending by default.
-  string sort_by = 3 [json_name = "sort_by"];
+  string sort_by = 3;
 
   // What resource reference to filter on.
   // E.g. If listing job for an experiment, the query string would be
   // resource_reference_key.type=EXPERIMENT&resource_reference_key.id=123
-  ResourceKey resource_reference_key = 4 [json_name = "resource_reference_key"];
+  ResourceKey resource_reference_key = 4;
 
   // A url-encoded, JSON-serialized Filter protocol buffer (see
   // [filter.proto](https://github.com/kubeflow/pipelines/blob/master/backend/api/v1beta1/filter.proto)).
@@ -145,10 +145,10 @@ message ListJobsResponse {
   repeated Job jobs = 1;
 
   // The total number of jobs for the given query.
-  int32 total_size = 3 [json_name = "total_size"];
+  int32 total_size = 3;
 
   // The token to list the next page of jobs.
-  string next_page_token = 2 [json_name = "next_page_token"];
+  string next_page_token = 2;
 }
 
 message DeleteJobRequest {
@@ -169,10 +169,10 @@ message DisableJobRequest {
 // CronSchedule allow scheduling the job with unix-like cron
 message CronSchedule {
   // The start time of the cron job
-  google.protobuf.Timestamp start_time = 1 [json_name = "start_time"];
+  google.protobuf.Timestamp start_time = 1;
 
   // The end time of the cron job
-  google.protobuf.Timestamp end_time = 2 [json_name = "end_time"];
+  google.protobuf.Timestamp end_time = 2;
 
   // The cron string. For details how to compose a cron, visit
   // ttps://en.wikipedia.org/wiki/Cron
@@ -182,20 +182,20 @@ message CronSchedule {
 // PeriodicSchedule allow scheduling the job periodically with certain interval
 message PeriodicSchedule {
   // The start time of the periodic job
-  google.protobuf.Timestamp start_time = 1 [json_name = "start_time"];
+  google.protobuf.Timestamp start_time = 1;
 
   // The end time of the periodic job
-  google.protobuf.Timestamp end_time = 2 [json_name = "end_time"];
+  google.protobuf.Timestamp end_time = 2;
 
   // The time interval between the starting time of consecutive jobs
-  int64 interval_second = 3 [json_name = "interval_second"];
+  int64 interval_second = 3;
 }
 
 // Trigger defines what starts a pipeline run.
 message Trigger {
   oneof trigger {
-    CronSchedule cron_schedule = 1 [json_name = "cron_schedule"];
-    PeriodicSchedule periodic_schedule = 2 [json_name = "periodic_schedule"];
+    CronSchedule cron_schedule = 1;
+    PeriodicSchedule periodic_schedule = 2;
   }
 }
 
@@ -212,17 +212,17 @@ message Job {
   // Optional input field.
   // Describing what the pipeline manifest and parameters to use
   // for the scheduled job. If unset, fetch the pipline_spec at runtime.
-  PipelineSpec pipeline_spec = 4 [json_name = "pipeline_spec"];
+  PipelineSpec pipeline_spec = 4;
 
   // Optional input field. Specify which resource this job belongs to.
-  repeated ResourceReference resource_references = 5 [json_name = "resource_references"];
+  repeated ResourceReference resource_references = 5;
 
   // Optional input field. Specify which Kubernetes service account this job uses.
-  string service_account = 18 [json_name = "service_account"];
+  string service_account = 18;
 
   // Required input field.
   // Specify how many runs can be executed concurrently. Rage [1-10]
-  int64 max_concurrency = 6 [json_name = "max_concurrency"];
+  int64 max_concurrency = 6;
 
   // Required input field.
   // Specify how a run is triggered. Support cron mode or periodic mode.
@@ -238,10 +238,10 @@ message Job {
   Mode mode = 8;
 
   // Output. The time this job is created.
-  google.protobuf.Timestamp created_at = 9 [json_name = "created_at"];
+  google.protobuf.Timestamp created_at = 9;
 
   // Output. The last time this job is updated.
-  google.protobuf.Timestamp updated_at = 10 [json_name = "updated_at"];
+  google.protobuf.Timestamp updated_at = 10;
 
   // Output. The status of the job.
   // One of [Enable, Disable, Error]
@@ -258,6 +258,6 @@ message Job {
   // Optional input field. Whether the job should catch up if behind schedule.
   // If true, the job will only schedule the latest interval if behind schedule.
   // If false, the job will catch up on each past interval.
-  bool no_catchup = 17 [json_name = "no_catchup"];
+  bool no_catchup = 17;
 }
 // Next field number of Job will be 19

backend/api/v1beta1/pipeline.proto

@@ -160,7 +160,7 @@ service PipelineService {
 
 message Url {
   // URL of the pipeline definition or the pipeline version definition.
-  string pipeline_url = 1 [json_name = "pipeline_url"];
+  string pipeline_url = 1;
 }
 
 // Create pipeline by providing an URL pointing to the pipeline file,
@@ -187,16 +187,16 @@ message ListPipelinesRequest {
   // A page token to request the next page of results. The token is acquried
   // from the nextPageToken field of the response from the previous
   // ListPipelines call.
-  string page_token = 1 [json_name = "page_token"];
+  string page_token = 1;
 
   // The number of pipelines to be listed per page. If there are more pipelines
   // than this number, the response message will contain a valid value in the
   // nextPageToken field.
-  int32 page_size = 2 [json_name = "page_size"];
+  int32 page_size = 2;
 
   // Can be format of "field_name", "field_name asc" or "field_name desc"
   // Ascending by default.
-  string sort_by = 3 [json_name = "sort_by"];
+  string sort_by = 3;
 
   // A url-encoded, JSON-serialized Filter protocol buffer (see
   // [filter.proto](https://github.com/kubeflow/pipelines/blob/master/backend/api/v1beta1/filter.proto)).
@@ -205,17 +205,17 @@ message ListPipelinesRequest {
   // What resource reference to filter on.
   // For Pipeline, the only valid resource type is Namespace. An sample query string could be
   // resource_reference_key.type=NAMESPACE&resource_reference_key.id=ns1
-  ResourceKey resource_reference_key = 5 [json_name = "resource_reference_key"];
+  ResourceKey resource_reference_key = 5;
 }
 
 message ListPipelinesResponse {
   repeated Pipeline pipelines = 1;
 
   // The total number of pipelines for the given query.
-  int32 total_size = 3 [json_name = "total_size"];
+  int32 total_size = 3;
 
   // The token to list the next page of pipelines.
-  string next_page_token = 2 [json_name = "next_page_token"];
+  string next_page_token = 2;
 }
 
 message GetPipelineByNameRequest {
@@ -262,21 +262,21 @@ message GetPipelineVersionRequest {
 
 message ListPipelineVersionsRequest {
   // ResourceKey specifies the pipeline whose versions are to be listed.
-  ResourceKey resource_key = 1 [json_name = "resource_key"];
+  ResourceKey resource_key = 1;
 
   // The number of pipeline versions to be listed per page. If there are more
   // pipeline versions than this number, the response message will contain a
   // nextPageToken field you can use to fetch the next page.
-  int32 page_size = 2 [json_name = "page_size"];
+  int32 page_size = 2;
 
   // A page token to request the next page of results. The token is acquried
   // from the nextPageToken field of the response from the previous
   // ListPipelineVersions call or can be omitted when fetching the first page.
-  string page_token = 3 [json_name = "page_token"];
+  string page_token = 3;
 
   // Can be format of "field_name", "field_name asc" or "field_name desc"
   // Ascending by default.
-  string sort_by = 4 [json_name = "sort_by"];
+  string sort_by = 4;
   // A base-64 encoded, JSON-serialized Filter protocol buffer (see
   // filter.proto).
   string filter = 5;
@@ -286,10 +286,10 @@ message ListPipelineVersionsResponse {
   repeated PipelineVersion versions = 1;
 
   // The token to list the next page of pipeline versions.
-  string next_page_token = 2 [json_name = "next_page_token"];
+  string next_page_token = 2;
 
   // The total number of pipeline versions for the given query.
-  int32 total_size = 3 [json_name = "total_size"];
+  int32 total_size = 3;
 }
 
 message DeletePipelineVersionRequest {
@@ -302,7 +302,7 @@ message Pipeline {
   string id = 1;
 
   // Output. The time this pipeline is created.
-  google.protobuf.Timestamp created_at = 2 [json_name = "created_at"];
+  google.protobuf.Timestamp created_at = 2;
 
   // Optional input field. Pipeline name provided by user. If not specified,
   // file name is used as pipeline name.
@@ -329,11 +329,11 @@ message Pipeline {
   // Output only. The default version of the pipeline. As of now, the latest
   // version is used as default. (In the future, if desired by customers, we
   // can allow them to set default version.)
-  PipelineVersion default_version = 8 [json_name = "default_version"];
+  PipelineVersion default_version = 8;
 
   // Input field. Specify which resource this pipeline belongs to.
   // For Pipeline, the only valid resource reference is a single Namespace.
-  repeated ResourceReference resource_references = 9 [json_name = "resource_references"];
+  repeated ResourceReference resource_references = 9;
 }
 
 message PipelineVersion {
@@ -344,7 +344,7 @@ message PipelineVersion {
   string name = 2;
 
   // Output. The time this pipeline version is created.
-  google.protobuf.Timestamp created_at = 3 [json_name = "created_at"];
+  google.protobuf.Timestamp created_at = 3;
 
   // Output. The input parameters for this pipeline.
   repeated Parameter parameters = 4;
@@ -353,16 +353,16 @@ message PipelineVersion {
   // The code is usually the Python definition of the pipeline and potentially
   // the related component definitions. This allows users to trace back to how
   // the pipeline YAML was created.
-  string code_source_url = 5 [json_name = "code_source_url"];
+  string code_source_url = 5;
 
   // Input. Required. The URL to the source of the pipeline version.
   // This is required when creating the pipeine version through
   // CreatePipelineVersion API.
-  Url package_url = 6 [json_name = "package_url"];
+  Url package_url = 6;
 
   // Input field. Specify which resource this pipeline version belongs to.
   // For Experiment, the only valid resource reference is a single Namespace.
-  repeated ResourceReference resource_references = 7 [json_name = "resource_references"];
+  repeated ResourceReference resource_references = 7;
 
   // Input. Optional. Description for the pipeline version.
   string description = 8;