From ddfd7fd455ba8f7abf1cdff50ac7e999743c0feb Mon Sep 17 00:00:00 2001 From: Aaron Steinfeld Date: Fri, 6 Dec 2024 12:53:05 -0500 Subject: [PATCH 1/2] chore: update buf --- .github/workflows/pr-build.yml | 14 +++-------- .github/workflows/pr-test.yml | 17 ++++++++++++- .../src/main/proto/buf.yaml | 8 ------- .../config/service/v1/event_condition.proto | 4 ++-- .../v1/event_condition_config_service.proto | 4 ++-- .../v1/metric_anomaly_event_condition.proto | 9 ++++--- buf.work.yaml | 12 ---------- buf.yaml | 20 ++++++++++++++++ config-service-api/src/main/proto/buf.yaml | 8 ------- .../config/service/v1/config_service.proto | 4 ++-- .../src/main/proto/buf.yaml | 8 ------- ...abel_application_rule_config_service.proto | 12 ++++------ .../src/main/proto/buf.yaml | 8 ------- ...eleted_system_label_application_rule.proto | 2 +- .../src/main/proto/buf.yaml | 8 ------- .../service/v1/labels_config_service.proto | 12 ++++------ .../src/main/proto/buf.yaml | 8 ------- .../service/v1/notification_channel.proto | 5 ++-- .../notification_channel_config_service.proto | 4 ++-- .../src/main/proto/buf.yaml | 8 ------- .../config/service/v1/notification_rule.proto | 4 ++-- .../v1/notification_rule_config_service.proto | 4 ++-- .../src/main/proto/buf.yaml | 8 ------- .../v1/partitioner_config_service.proto | 12 +++------- .../src/main/proto/buf.yaml | 8 ------- .../config/service/v1/space_config_rule.proto | 4 ++-- .../service/v1/spaces_config_service.proto | 23 +++++++----------- .../src/main/proto/buf.yaml | 8 ------- .../v1/span_processing_config_service.proto | 24 +++++++------------ 29 files changed, 88 insertions(+), 182 deletions(-) delete mode 100644 alerting-config-service-api/src/main/proto/buf.yaml delete mode 100644 buf.work.yaml create mode 100644 buf.yaml delete mode 100644 config-service-api/src/main/proto/buf.yaml delete mode 100644 label-application-rule-config-service-api/src/main/proto/buf.yaml delete mode 100644 label-application-rule-config-service-impl/src/main/proto/buf.yaml delete mode 100644 labels-config-service-api/src/main/proto/buf.yaml delete mode 100644 notification-channel-config-service-api/src/main/proto/buf.yaml delete mode 100644 notification-rule-config-service-api/src/main/proto/buf.yaml delete mode 100644 partitioner-config-service-api/src/main/proto/buf.yaml delete mode 100644 spaces-config-service-api/src/main/proto/buf.yaml delete mode 100644 span-processing-config-service-api/src/main/proto/buf.yaml diff --git a/.github/workflows/pr-build.yml b/.github/workflows/pr-build.yml index f8a87b92..6e89ba7b 100644 --- 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' \ No newline at end of file + github_token: ${{ github.token }} \ No newline at end of file diff --git a/.github/workflows/pr-test.yml b/.github/workflows/pr-test.yml index 3ba9a304..a84f5e22 100644 --- a/.github/workflows/pr-test.yml +++ b/.github/workflows/pr-test.yml @@ -61,4 +61,19 @@ jobs: runs-on: ubuntu-22.04 steps: - name: Dependency Check - uses: hypertrace/github-actions/dependency-check@main \ No newline at end of file + uses: hypertrace/github-actions/dependency-check@main + validate-protos-temp: + runs-on: ubuntu-22.04 + # Set fetch-depth: 0 to fetch commit history and tags for use in version calculation + steps: + - name: Check out code + uses: actions/checkout@v4 + with: + ref: ${{github.event.pull_request.head.ref}} + repository: ${{github.event.pull_request.head.repo.full_name}} + fetch-depth: 0 + + - name: Run buf + uses: bufbuild/buf-action@v1 + with: + github_token: ${{ github.token }} \ No newline at end of file diff --git a/alerting-config-service-api/src/main/proto/buf.yaml b/alerting-config-service-api/src/main/proto/buf.yaml deleted file mode 100644 index d2e630f9..00000000 --- a/alerting-config-service-api/src/main/proto/buf.yaml +++ /dev/null @@ -1,8 +0,0 @@ -version: v1 -breaking: - use: - - PACKAGE - - WIRE_JSON -lint: - use: - - DEFAULT diff --git a/alerting-config-service-api/src/main/proto/org/hypertrace/alerting/config/service/v1/event_condition.proto b/alerting-config-service-api/src/main/proto/org/hypertrace/alerting/config/service/v1/event_condition.proto index e1f4242c..d4c74447 100644 --- a/alerting-config-service-api/src/main/proto/org/hypertrace/alerting/config/service/v1/event_condition.proto +++ b/alerting-config-service-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/alerting-config-service-api/src/main/proto/org/hypertrace/alerting/config/service/v1/event_condition_config_service.proto b/alerting-config-service-api/src/main/proto/org/hypertrace/alerting/config/service/v1/event_condition_config_service.proto index b00cf520..70582a71 100644 --- a/alerting-config-service-api/src/main/proto/org/hypertrace/alerting/config/service/v1/event_condition_config_service.proto +++ b/alerting-config-service-api/src/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/alerting-config-service-api/src/main/proto/org/hypertrace/alerting/config/service/v1/metric_anomaly_event_condition.proto b/alerting-config-service-api/src/main/proto/org/hypertrace/alerting/config/service/v1/metric_anomaly_event_condition.proto index 0972de45..72e6f7a5 100644 --- a/alerting-config-service-api/src/main/proto/org/hypertrace/alerting/config/service/v1/metric_anomaly_event_condition.proto +++ b/alerting-config-service-api/src/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 deleted file mode 100644 index 2039b590..00000000 --- a/buf.work.yaml +++ /dev/null @@ -1,12 +0,0 @@ -version: v1 -directories: - - alerting-config-service-api/src/main/proto - - config-service-api/src/main/proto - - label-application-rule-config-service-api/src/main/proto - - label-application-rule-config-service-impl/src/main/proto - - labels-config-service-api/src/main/proto - - notification-channel-config-service-api/src/main/proto - - notification-rule-config-service-api/src/main/proto - - spaces-config-service-api/src/main/proto - - span-processing-config-service-api/src/main/proto - - partitioner-config-service-api/src/main/proto diff --git a/buf.yaml b/buf.yaml new file mode 100644 index 00000000..f9fbaa8d --- /dev/null +++ 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 deleted file mode 100644 index d2e630f9..00000000 --- a/config-service-api/src/main/proto/buf.yaml +++ /dev/null @@ -1,8 +0,0 @@ -version: v1 -breaking: - use: - - PACKAGE - - WIRE_JSON -lint: - use: - - DEFAULT 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 index 0cfb9c92..24c43262 100644 --- 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 deleted file mode 100644 index d2e630f9..00000000 --- a/label-application-rule-config-service-api/src/main/proto/buf.yaml +++ /dev/null @@ -1,8 +0,0 @@ -version: v1 -breaking: - use: - - PACKAGE - - WIRE_JSON -lint: - use: - - DEFAULT diff --git a/label-application-rule-config-service-api/src/main/proto/org/hypertrace/label/application/rule/config/service/v1/label_application_rule_config_service.proto b/label-application-rule-config-service-api/src/main/proto/org/hypertrace/label/application/rule/config/service/v1/label_application_rule_config_service.proto index 25360551..d8bb01b6 100644 --- a/label-application-rule-config-service-api/src/main/proto/org/hypertrace/label/application/rule/config/service/v1/label_application_rule_config_service.proto +++ b/label-application-rule-config-service-api/src/main/proto/org/hypertrace/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 deleted file mode 100644 index d2e630f9..00000000 --- a/label-application-rule-config-service-impl/src/main/proto/buf.yaml +++ /dev/null @@ -1,8 +0,0 @@ -version: v1 -breaking: - use: - - PACKAGE - - WIRE_JSON -lint: - use: - - DEFAULT diff --git a/label-application-rule-config-service-impl/src/main/proto/org/hypertrace/label/application/rule/config/service/impl/v1/deleted_system_label_application_rule.proto b/label-application-rule-config-service-impl/src/main/proto/org/hypertrace/label/application/rule/config/service/impl/v1/deleted_system_label_application_rule.proto index f037164a..fddd5baa 100644 --- a/label-application-rule-config-service-impl/src/main/proto/org/hypertrace/label/application/rule/config/service/impl/v1/deleted_system_label_application_rule.proto +++ b/label-application-rule-config-service-impl/src/main/proto/org/hypertrace/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 deleted file mode 100644 index d2e630f9..00000000 --- a/labels-config-service-api/src/main/proto/buf.yaml +++ /dev/null @@ -1,8 +0,0 @@ -version: v1 -breaking: - use: - - PACKAGE - - WIRE_JSON -lint: - use: - - DEFAULT diff --git a/labels-config-service-api/src/main/proto/org/hypertrace/label/config/service/v1/labels_config_service.proto b/labels-config-service-api/src/main/proto/org/hypertrace/label/config/service/v1/labels_config_service.proto index 9fad2811..dc0af3f7 100644 --- a/labels-config-service-api/src/main/proto/org/hypertrace/label/config/service/v1/labels_config_service.proto +++ b/labels-config-service-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 deleted file mode 100644 index d2e630f9..00000000 --- a/notification-channel-config-service-api/src/main/proto/buf.yaml +++ /dev/null @@ -1,8 +0,0 @@ -version: v1 -breaking: - use: - - PACKAGE - - WIRE_JSON -lint: - use: - - DEFAULT diff --git a/notification-channel-config-service-api/src/main/proto/org/hypertrace/notification/config/service/v1/notification_channel.proto b/notification-channel-config-service-api/src/main/proto/org/hypertrace/notification/config/service/v1/notification_channel.proto index e8e54974..d8483ada 100644 --- a/notification-channel-config-service-api/src/main/proto/org/hypertrace/notification/config/service/v1/notification_channel.proto +++ b/notification-channel-config-service-api/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/notification-channel-config-service-api/src/main/proto/org/hypertrace/notification/config/service/v1/notification_channel_config_service.proto b/notification-channel-config-service-api/src/main/proto/org/hypertrace/notification/config/service/v1/notification_channel_config_service.proto index 23b3e7fa..86a480ed 100644 --- a/notification-channel-config-service-api/src/main/proto/org/hypertrace/notification/config/service/v1/notification_channel_config_service.proto +++ b/notification-channel-config-service-api/src/main/proto/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 deleted file mode 100644 index d2e630f9..00000000 --- a/notification-rule-config-service-api/src/main/proto/buf.yaml +++ /dev/null @@ -1,8 +0,0 @@ -version: v1 -breaking: - use: - - PACKAGE - - WIRE_JSON -lint: - use: - - DEFAULT diff --git a/notification-rule-config-service-api/src/main/proto/org/hypertrace/notification/config/service/v1/notification_rule.proto b/notification-rule-config-service-api/src/main/proto/org/hypertrace/notification/config/service/v1/notification_rule.proto index 534d7988..db0a439a 100644 --- a/notification-rule-config-service-api/src/main/proto/org/hypertrace/notification/config/service/v1/notification_rule.proto +++ b/notification-rule-config-service-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/notification-rule-config-service-api/src/main/proto/org/hypertrace/notification/config/service/v1/notification_rule_config_service.proto b/notification-rule-config-service-api/src/main/proto/org/hypertrace/notification/config/service/v1/notification_rule_config_service.proto index ffccc87d..ec01c9b4 100644 --- a/notification-rule-config-service-api/src/main/proto/org/hypertrace/notification/config/service/v1/notification_rule_config_service.proto +++ b/notification-rule-config-service-api/src/main/proto/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 deleted file mode 100644 index d2e630f9..00000000 --- a/partitioner-config-service-api/src/main/proto/buf.yaml +++ /dev/null @@ -1,8 +0,0 @@ -version: v1 -breaking: - use: - - PACKAGE - - WIRE_JSON -lint: - use: - - DEFAULT diff --git a/partitioner-config-service-api/src/main/proto/org/hypertrace/partitioner/config/service/v1/partitioner_config_service.proto b/partitioner-config-service-api/src/main/proto/org/hypertrace/partitioner/config/service/v1/partitioner_config_service.proto index 9d86662c..54ef1192 100644 --- a/partitioner-config-service-api/src/main/proto/org/hypertrace/partitioner/config/service/v1/partitioner_config_service.proto +++ b/partitioner-config-service-api/src/main/proto/org/hypertrace/partitioner/config/service/v1/partitioner_config_service.proto @@ -4,9 +4,7 @@ package org.hypertrace.partitioner.config.service.v1; option java_multiple_files = true; - service PartitionerConfigService { - rpc GetPartitionerProfile(GetPartitionerProfileRequest) returns (GetPartitionerProfileResponse) {} rpc GetPartitionerProfiles(GetPartitionerProfilesRequest) returns (GetPartitionerProfilesResponse) {} @@ -14,7 +12,6 @@ service PartitionerConfigService { 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 deleted file mode 100644 index d2e630f9..00000000 --- a/spaces-config-service-api/src/main/proto/buf.yaml +++ /dev/null @@ -1,8 +0,0 @@ -version: v1 -breaking: - use: - - PACKAGE - - WIRE_JSON -lint: - use: - - DEFAULT diff --git a/spaces-config-service-api/src/main/proto/org/hypertrace/spaces/config/service/v1/space_config_rule.proto b/spaces-config-service-api/src/main/proto/org/hypertrace/spaces/config/service/v1/space_config_rule.proto index efeda144..b3cd0c1c 100644 --- a/spaces-config-service-api/src/main/proto/org/hypertrace/spaces/config/service/v1/space_config_rule.proto +++ b/spaces-config-service-api/src/main/proto/org/hypertrace/spaces/config/service/v1/space_config_rule.proto @@ -1,9 +1,9 @@ syntax = "proto3"; -option java_multiple_files = true; - package org.hypertrace.spaces.config.service.v1; +option java_multiple_files = true; + message SpaceConfigRule { string id = 1; oneof rule_data { diff --git a/spaces-config-service-api/src/main/proto/org/hypertrace/spaces/config/service/v1/spaces_config_service.proto b/spaces-config-service-api/src/main/proto/org/hypertrace/spaces/config/service/v1/spaces_config_service.proto index 951d3e67..ec21f1c7 100644 --- a/spaces-config-service-api/src/main/proto/org/hypertrace/spaces/config/service/v1/spaces_config_service.proto +++ b/spaces-config-service-api/src/main/proto/org/hypertrace/spaces/config/service/v1/spaces_config_service.proto @@ -1,21 +1,16 @@ syntax = "proto3"; -option java_multiple_files = true; - package org.hypertrace.spaces.config.service.v1; import "org/hypertrace/spaces/config/service/v1/space_config_rule.proto"; -service SpacesConfigService { +option java_multiple_files = true; - rpc CreateRule (CreateRuleRequest) returns (CreateRuleResponse) { - } - rpc GetRules (GetRulesRequest) returns (GetRulesResponse) { - } - rpc UpdateRule (UpdateRuleRequest) returns (UpdateRuleResponse) { - } - rpc DeleteRule (DeleteRuleRequest) returns (DeleteRuleResponse) { - } +service SpacesConfigService { + rpc CreateRule(CreateRuleRequest) returns (CreateRuleResponse) {} + rpc GetRules(GetRulesRequest) returns (GetRulesResponse) {} + rpc UpdateRule(UpdateRuleRequest) returns (UpdateRuleResponse) {} + rpc DeleteRule(DeleteRuleRequest) returns (DeleteRuleResponse) {} } message CreateRuleRequest { @@ -28,8 +23,7 @@ message CreateRuleResponse { SpaceConfigRule rule = 1; } -message GetRulesRequest { -} +message GetRulesRequest {} message GetRulesResponse { repeated SpaceConfigRule rules = 1; @@ -47,5 +41,4 @@ message DeleteRuleRequest { string id = 1; } -message DeleteRuleResponse { -} +message DeleteRuleResponse {} diff --git a/span-processing-config-service-api/src/main/proto/buf.yaml b/span-processing-config-service-api/src/main/proto/buf.yaml deleted file mode 100644 index d2e630f9..00000000 --- a/span-processing-config-service-api/src/main/proto/buf.yaml +++ /dev/null @@ -1,8 +0,0 @@ -version: v1 -breaking: - use: - - PACKAGE - - WIRE_JSON -lint: - use: - - DEFAULT diff --git a/span-processing-config-service-api/src/main/proto/org/hypertrace/span/processing/config/service/v1/span_processing_config_service.proto b/span-processing-config-service-api/src/main/proto/org/hypertrace/span/processing/config/service/v1/span_processing_config_service.proto index d40da4ab..f98ca1d8 100644 --- a/span-processing-config-service-api/src/main/proto/org/hypertrace/span/processing/config/service/v1/span_processing_config_service.proto +++ b/span-processing-config-service-api/src/main/proto/org/hypertrace/span/processing/config/service/v1/span_processing_config_service.proto @@ -2,23 +2,19 @@ syntax = "proto3"; package org.hypertrace.span.processing.config.service.v1; -option java_multiple_files = true; - -import "org/hypertrace/span/processing/config/service/v1/span_filter.proto"; import "google/protobuf/timestamp.proto"; +import "org/hypertrace/span/processing/config/service/v1/span_filter.proto"; + +option java_multiple_files = true; service SpanProcessingConfigService { - rpc CreateExcludeSpanRule (CreateExcludeSpanRuleRequest) returns (CreateExcludeSpanRuleResponse) { - } + rpc CreateExcludeSpanRule(CreateExcludeSpanRuleRequest) returns (CreateExcludeSpanRuleResponse) {} - rpc UpdateExcludeSpanRule (UpdateExcludeSpanRuleRequest) returns (UpdateExcludeSpanRuleResponse) { - } + rpc UpdateExcludeSpanRule(UpdateExcludeSpanRuleRequest) returns (UpdateExcludeSpanRuleResponse) {} - rpc GetAllExcludeSpanRules (GetAllExcludeSpanRulesRequest) returns (GetAllExcludeSpanRulesResponse) { - } + rpc GetAllExcludeSpanRules(GetAllExcludeSpanRulesRequest) returns (GetAllExcludeSpanRulesResponse) {} - rpc DeleteExcludeSpanRule (DeleteExcludeSpanRuleRequest) returns (DeleteExcludeSpanRuleResponse) { - } + rpc DeleteExcludeSpanRule(DeleteExcludeSpanRuleRequest) returns (DeleteExcludeSpanRuleResponse) {} } message CreateExcludeSpanRuleRequest { @@ -29,8 +25,7 @@ message CreateExcludeSpanRuleResponse { ExcludeSpanRuleDetails rule_details = 1; } -message GetAllExcludeSpanRulesRequest { -} +message GetAllExcludeSpanRulesRequest {} message GetAllExcludeSpanRulesResponse { repeated ExcludeSpanRuleDetails rule_details = 1; @@ -48,8 +43,7 @@ message DeleteExcludeSpanRuleRequest { string id = 1; } -message DeleteExcludeSpanRuleResponse { -} +message DeleteExcludeSpanRuleResponse {} message ExcludeSpanRule { string id = 1; From 8ca45b467da760161513f7627300324f11fbd3c7 Mon Sep 17 00:00:00 2001 From: Aaron Steinfeld Date: Fri, 6 Dec 2024 12:54:32 -0500 Subject: [PATCH 2/2] ci: remove temp ci job --- .github/workflows/pr-test.yml | 17 +---------------- 1 file changed, 1 insertion(+), 16 deletions(-) diff --git a/.github/workflows/pr-test.yml b/.github/workflows/pr-test.yml index a84f5e22..3ba9a304 100644 --- a/.github/workflows/pr-test.yml +++ b/.github/workflows/pr-test.yml @@ -61,19 +61,4 @@ jobs: runs-on: ubuntu-22.04 steps: - name: Dependency Check - uses: hypertrace/github-actions/dependency-check@main - validate-protos-temp: - runs-on: ubuntu-22.04 - # Set fetch-depth: 0 to fetch commit history and tags for use in version calculation - steps: - - name: Check out code - uses: actions/checkout@v4 - with: - ref: ${{github.event.pull_request.head.ref}} - repository: ${{github.event.pull_request.head.repo.full_name}} - fetch-depth: 0 - - - name: Run buf - uses: bufbuild/buf-action@v1 - with: - github_token: ${{ github.token }} \ No newline at end of file + uses: hypertrace/github-actions/dependency-check@main \ No newline at end of file