chore: update buf (#260)

* chore: update buf * ci: remove temp ci job
hypertrace · Dec 6, 2024 · 2279700 · 2279700
1 parent 681e7e5
commit 2279700
Show file tree

Hide file tree

Showing 28 changed files with 72 additions and 181 deletions.
diff --git a/.github/workflows/pr-build.yml b/.github/workflows/pr-build.yml
@@ -47,15 +47,7 @@ jobs:
           repository: ${{github.event.pull_request.head.repo.full_name}}
           fetch-depth: 0
 
-      - name: Setup buf
-        uses: bufbuild/buf-setup-action@v1
+      - name: Run buf
+        uses: bufbuild/buf-action@v1
         with:
-          github_token: ${{ github.token }}
-
-      - name: Lint protos
-        uses: bufbuild/buf-lint-action@v1
-
-      - name: Check for breaking changes
-        uses: bufbuild/buf-breaking-action@v1
-        with:
-          against: '.git#branch=origin/main'
+          github_token: ${{ github.token }}
diff --git a/alerting-config-service-api/src/main/proto/buf.yaml b/alerting-config-service-api/src/main/proto/buf.yaml
diff --git a/...ervice-api/src/main/proto/org/hypertrace/alerting/config/service/v1/event_condition.proto b/...ervice-api/src/main/proto/org/hypertrace/alerting/config/service/v1/event_condition.proto
@@ -1,11 +1,11 @@
 syntax = "proto3";
 
-option java_multiple_files = true;
-
 package org.hypertrace.alerting.config.service.v1;
 
 import "org/hypertrace/alerting/config/service/v1/metric_anomaly_event_condition.proto";
 
+option java_multiple_files = true;
+
 message NewEventCondition {
   EventConditionMutableData event_condition_data = 1;
 }

diff --git a/...main/proto/org/hypertrace/alerting/config/service/v1/event_condition_config_service.proto b/...main/proto/org/hypertrace/alerting/config/service/v1/event_condition_config_service.proto
@@ -1,11 +1,11 @@
 syntax = "proto3";
 
-option java_multiple_files = true;
-
 package org.hypertrace.alerting.config.service.v1;
 
 import "org/hypertrace/alerting/config/service/v1/event_condition.proto";
 
+option java_multiple_files = true;
+
 service EventConditionConfigService {
   rpc CreateEventCondition(CreateEventConditionRequest) returns (CreateEventConditionResponse) {}
   rpc UpdateEventCondition(UpdateEventConditionRequest) returns (UpdateEventConditionResponse) {}

diff --git a/...main/proto/org/hypertrace/alerting/config/service/v1/metric_anomaly_event_condition.proto b/...main/proto/org/hypertrace/alerting/config/service/v1/metric_anomaly_event_condition.proto
@@ -1,9 +1,9 @@
 syntax = "proto3";
 
-option java_multiple_files = true;
-
 package org.hypertrace.alerting.config.service.v1;
 
+option java_multiple_files = true;
+
 message MetricAnomalyEventCondition {
   MetricSelection metric_selection = 1;
   repeated ViolationCondition violation_condition = 2;
@@ -61,7 +61,6 @@ message CompositeFilter {
   repeated Filter child_filters = 2;
 }
 
-
 message LhsExpression {
   oneof value {
     Attribute attribute = 1;
@@ -94,11 +93,11 @@ message StaticThresholdCondition {
 }
 
 message BaselineThresholdCondition {
-  string baseline_duration = 1;  // iso duration string
+  string baseline_duration = 1; // iso duration string
 }
 
 enum StaticThresholdOperator {
-  STATIC_THRESHOLD_OPERATOR_UNSPECIFIED  = 0;
+  STATIC_THRESHOLD_OPERATOR_UNSPECIFIED = 0;
   STATIC_THRESHOLD_OPERATOR_GT = 1;
   STATIC_THRESHOLD_OPERATOR_LT = 2;
   STATIC_THRESHOLD_OPERATOR_GTE = 3;

diff --git a/buf.work.yaml b/buf.work.yaml
diff --git a/buf.yaml b/buf.yaml
@@ -0,0 +1,20 @@
+version: v2
+modules:
+  - path: alerting-config-service-api/src/main/proto
+  - path: config-service-api/src/main/proto
+  - path: label-application-rule-config-service-api/src/main/proto
+  - path: label-application-rule-config-service-impl/src/main/proto
+  - path: labels-config-service-api/src/main/proto
+  - path: notification-channel-config-service-api/src/main/proto
+  - path: notification-rule-config-service-api/src/main/proto
+  - path: partitioner-config-service-api/src/main/proto
+  - path: spaces-config-service-api/src/main/proto
+  - path: span-processing-config-service-api/src/main/proto
+lint:
+  use:
+    - STANDARD
+  disallow_comment_ignores: true
+breaking:
+  use:
+    - PACKAGE
+    - WIRE_JSON
diff --git a/config-service-api/src/main/proto/buf.yaml b/config-service-api/src/main/proto/buf.yaml
diff --git a/config-service-api/src/main/proto/org/hypertrace/config/service/v1/config_service.proto b/config-service-api/src/main/proto/org/hypertrace/config/service/v1/config_service.proto
@@ -1,11 +1,11 @@
 syntax = "proto3";
 
-option java_multiple_files = true;
-
 package org.hypertrace.config.service.v1;
 
 import "google/protobuf/struct.proto";
 
+option java_multiple_files = true;
+
 service ConfigService {
   // Overrides the specified config with the config provided and upserts the
   // provided config into the store. Also returns the config which is upserted.

diff --git a/label-application-rule-config-service-api/src/main/proto/buf.yaml b/label-application-rule-config-service-api/src/main/proto/buf.yaml
diff --git a/...race/label/application/rule/config/service/v1/label_application_rule_config_service.proto b/...race/label/application/rule/config/service/v1/label_application_rule_config_service.proto
@@ -2,12 +2,11 @@ syntax = "proto3";
 
 package org.hypertrace.label.application.rule.config.service.v1;
 
-option java_multiple_files = true;
-
 import "org/hypertrace/label/application/rule/config/service/v1/label_application_rule.proto";
 
-service LabelApplicationRuleConfigService {
+option java_multiple_files = true;
 
+service LabelApplicationRuleConfigService {
   // create label application rule
   rpc CreateLabelApplicationRule(CreateLabelApplicationRuleRequest) returns (CreateLabelApplicationRuleResponse) {}
 
@@ -19,7 +18,6 @@ service LabelApplicationRuleConfigService {
 
   // delete label application rule by id
   rpc DeleteLabelApplicationRule(DeleteLabelApplicationRuleRequest) returns (DeleteLabelApplicationRuleResponse) {}
-
 }
 
 message CreateLabelApplicationRuleRequest {
@@ -38,8 +36,7 @@ message GetLabelApplicationRuleResponse {
   LabelApplicationRule label_application_rule = 1;
 }
 
-message GetLabelApplicationRulesRequest {
-}
+message GetLabelApplicationRulesRequest {}
 
 message GetLabelApplicationRulesResponse {
   repeated LabelApplicationRule label_application_rules = 1;
@@ -58,5 +55,4 @@ message DeleteLabelApplicationRuleRequest {
   string id = 1;
 }
 
-message DeleteLabelApplicationRuleResponse {
-}
+message DeleteLabelApplicationRuleResponse {}
diff --git a/label-application-rule-config-service-impl/src/main/proto/buf.yaml b/label-application-rule-config-service-impl/src/main/proto/buf.yaml
diff --git a/...label/application/rule/config/service/impl/v1/deleted_system_label_application_rule.proto b/...label/application/rule/config/service/impl/v1/deleted_system_label_application_rule.proto
@@ -1,4 +1,4 @@
-syntax="proto3";
+syntax = "proto3";
 
 package org.hypertrace.label.application.rule.config.service.impl.v1;
 

diff --git a/labels-config-service-api/src/main/proto/buf.yaml b/labels-config-service-api/src/main/proto/buf.yaml
diff --git a/...ice-api/src/main/proto/org/hypertrace/label/config/service/v1/labels_config_service.proto b/...ice-api/src/main/proto/org/hypertrace/label/config/service/v1/labels_config_service.proto
@@ -2,12 +2,11 @@ syntax = "proto3";
 
 package org.hypertrace.label.config.service.v1;
 
-option java_multiple_files = true;
-
 import "org/hypertrace/label/config/service/v1/label.proto";
 
-service LabelsConfigService {
+option java_multiple_files = true;
 
+service LabelsConfigService {
   // create label
   rpc CreateLabel(CreateLabelRequest) returns (CreateLabelResponse) {}
 
@@ -25,7 +24,6 @@ service LabelsConfigService {
 
   // delete label by id
   rpc DeleteLabel(DeleteLabelRequest) returns (DeleteLabelResponse) {}
-
 }
 
 message CreateLabelRequest {
@@ -58,8 +56,7 @@ message GetLabelResponse {
   Label label = 1;
 }
 
-message GetLabelsRequest {
-}
+message GetLabelsRequest {}
 
 message GetLabelsResponse {
   repeated Label labels = 1;
@@ -78,5 +75,4 @@ message DeleteLabelRequest {
   string id = 1;
 }
 
-message DeleteLabelResponse {
-}
+message DeleteLabelResponse {}
diff --git a/notification-channel-config-service-api/src/main/proto/buf.yaml b/notification-channel-config-service-api/src/main/proto/buf.yaml
diff --git a/...i/src/main/proto/org/hypertrace/notification/config/service/v1/notification_channel.proto b/...i/src/main/proto/org/hypertrace/notification/config/service/v1/notification_channel.proto
@@ -1,9 +1,9 @@
 syntax = "proto3";
 
-option java_multiple_files = true;
-
 package org.hypertrace.notification.config.service.v1;
 
+option java_multiple_files = true;
+
 message NotificationChannel {
   string id = 1;
   NotificationChannelMutableData notification_channel_mutable_data = 2;
@@ -30,7 +30,6 @@ message AwsS3BucketChannelConfig {
   }
 }
 
-
 enum WebhookFormat {
   WEBHOOK_FORMAT_UNSPECIFIED = 0;
   WEBHOOK_FORMAT_SLACK = 1;

diff --git a/...o/org/hypertrace/notification/config/service/v1/notification_channel_config_service.proto b/...o/org/hypertrace/notification/config/service/v1/notification_channel_config_service.proto
@@ -1,11 +1,11 @@
 syntax = "proto3";
 
-option java_multiple_files = true;
-
 package org.hypertrace.notification.config.service.v1;
 
 import "org/hypertrace/notification/config/service/v1/notification_channel.proto";
 
+option java_multiple_files = true;
+
 service NotificationChannelConfigService {
   rpc CreateNotificationChannel(CreateNotificationChannelRequest) returns (CreateNotificationChannelResponse) {}
   rpc UpdateNotificationChannel(UpdateNotificationChannelRequest) returns (UpdateNotificationChannelResponse) {}

diff --git a/notification-rule-config-service-api/src/main/proto/buf.yaml b/notification-rule-config-service-api/src/main/proto/buf.yaml
diff --git a/...-api/src/main/proto/org/hypertrace/notification/config/service/v1/notification_rule.proto b/...-api/src/main/proto/org/hypertrace/notification/config/service/v1/notification_rule.proto
@@ -1,9 +1,9 @@
 syntax = "proto3";
 
-option java_multiple_files = true;
-
 package org.hypertrace.notification.config.service.v1;
 
+option java_multiple_files = true;
+
 message NotificationRule {
   string id = 1;
   NotificationRuleMutableData notification_rule_mutable_data = 2;

diff --git a/...roto/org/hypertrace/notification/config/service/v1/notification_rule_config_service.proto b/...roto/org/hypertrace/notification/config/service/v1/notification_rule_config_service.proto
@@ -1,11 +1,11 @@
 syntax = "proto3";
 
-option java_multiple_files = true;
-
 package org.hypertrace.notification.config.service.v1;
 
 import "org/hypertrace/notification/config/service/v1/notification_rule.proto";
 
+option java_multiple_files = true;
+
 service NotificationRuleConfigService {
   rpc CreateNotificationRule(CreateNotificationRuleRequest) returns (CreateNotificationRuleResponse) {}
   rpc UpdateNotificationRule(UpdateNotificationRuleRequest) returns (UpdateNotificationRuleResponse) {}

diff --git a/partitioner-config-service-api/src/main/proto/buf.yaml b/partitioner-config-service-api/src/main/proto/buf.yaml
diff --git a/.../main/proto/org/hypertrace/partitioner/config/service/v1/partitioner_config_service.proto b/.../main/proto/org/hypertrace/partitioner/config/service/v1/partitioner_config_service.proto
@@ -4,17 +4,14 @@ package org.hypertrace.partitioner.config.service.v1;
 
 option java_multiple_files = true;
 
-
 service PartitionerConfigService {
-
   rpc GetPartitionerProfile(GetPartitionerProfileRequest) returns (GetPartitionerProfileResponse) {}
 
   rpc GetPartitionerProfiles(GetPartitionerProfilesRequest) returns (GetPartitionerProfilesResponse) {}
 
   rpc PutPartitionerProfiles(PutPartitionerProfilesRequest) returns (PutPartitionerProfilesResponse) {}
 
   rpc DeletePartitionerProfiles(DeletePartitionerProfilesRequest) returns (DeletePartitionerProfilesResponse) {}
-
 }
 
 message GetPartitionerProfileRequest {
@@ -29,11 +26,9 @@ message PutPartitionerProfilesRequest {
   repeated PartitionerProfile profiles = 1;
 }
 
-message PutPartitionerProfilesResponse {
-}
+message PutPartitionerProfilesResponse {}
 
-message GetPartitionerProfilesRequest {
-}
+message GetPartitionerProfilesRequest {}
 
 message GetPartitionerProfilesResponse {
   repeated PartitionerProfile profiles = 1;
@@ -43,8 +38,7 @@ message DeletePartitionerProfilesRequest {
   repeated string profile_names = 1;
 }
 
-message DeletePartitionerProfilesResponse {
-}
+message DeletePartitionerProfilesResponse {}
 
 message PartitionerProfile {
   string name = 1;

diff --git a/spaces-config-service-api/src/main/proto/buf.yaml b/spaces-config-service-api/src/main/proto/buf.yaml