From cc54d934dce454b6e0035023ce77ce93437c7719 Mon Sep 17 00:00:00 2001 From: Dillon Nys Date: Wed, 11 Sep 2024 11:43:38 -0700 Subject: [PATCH] chore(proto): Publish to buf.build Publishes Cedar protos to https://buf.build/celest-dev/cedar --- buf.gen.yaml | 13 -------- buf.yaml | 4 +-- .../dart_options.pb.dart | 2 +- .../dart_options.pbenum.dart | 2 +- .../dart_options.pbjson.dart | 2 +- .../dart_options.pbserver.dart | 2 +- .../google/protobuf/compiler/plugin.pb.dart | 30 +++++++++---------- proto/cedar/v3/expr.proto | 2 +- proto/cedar/v3/policy.proto | 2 +- .../dart_options}/dart_options.proto | 0 10 files changed, 23 insertions(+), 36 deletions(-) rename packages/cedar/lib/src/proto/{dart => dart_options}/dart_options.pb.dart (99%) rename packages/cedar/lib/src/proto/{dart => dart_options}/dart_options.pbenum.dart (88%) rename packages/cedar/lib/src/proto/{dart => dart_options}/dart_options.pbjson.dart (97%) rename packages/cedar/lib/src/proto/{dart => dart_options}/dart_options.pbserver.dart (90%) rename {third_party/dart => proto/dart_options}/dart_options.proto (100%) diff --git a/buf.gen.yaml b/buf.gen.yaml index 3f31388..ac35229 100644 --- a/buf.gen.yaml +++ b/buf.gen.yaml @@ -1,19 +1,6 @@ version: v2 -managed: - enabled: true - override: - - file_option: go_package - value: github.com/celest-dev/corks/go/proto/dart;dartoptionspb - path: dart/dart_options.proto - - file_option: go_package_prefix - value: github.com/celest-dev/corks/go/proto - disable: - - path: google inputs: - directory: proto - - directory: third_party - paths: - - third_party/dart/dart_options.proto plugins: - remote: buf.build/protocolbuffers/dart:v21.1.2 include_imports: true diff --git a/buf.yaml b/buf.yaml index b933446..f16d726 100644 --- a/buf.yaml +++ b/buf.yaml @@ -1,7 +1,7 @@ version: v2 modules: - path: proto - - path: third_party + name: buf.build/celest-dev/cedar breaking: use: - PACKAGE @@ -9,5 +9,5 @@ lint: use: - MINIMAL ignore: - - third_party + - proto/dart_options disallow_comment_ignores: true diff --git a/packages/cedar/lib/src/proto/dart/dart_options.pb.dart b/packages/cedar/lib/src/proto/dart_options/dart_options.pb.dart similarity index 99% rename from packages/cedar/lib/src/proto/dart/dart_options.pb.dart rename to packages/cedar/lib/src/proto/dart_options/dart_options.pb.dart index d0e5ee5..603b7f9 100644 --- a/packages/cedar/lib/src/proto/dart/dart_options.pb.dart +++ b/packages/cedar/lib/src/proto/dart_options/dart_options.pb.dart @@ -1,6 +1,6 @@ // // Generated code. Do not modify. -// source: dart/dart_options.proto +// source: dart_options/dart_options.proto // // @dart = 2.12 diff --git a/packages/cedar/lib/src/proto/dart/dart_options.pbenum.dart b/packages/cedar/lib/src/proto/dart_options/dart_options.pbenum.dart similarity index 88% rename from packages/cedar/lib/src/proto/dart/dart_options.pbenum.dart rename to packages/cedar/lib/src/proto/dart_options/dart_options.pbenum.dart index f57b19f..3a18727 100644 --- a/packages/cedar/lib/src/proto/dart/dart_options.pbenum.dart +++ b/packages/cedar/lib/src/proto/dart_options/dart_options.pbenum.dart @@ -1,6 +1,6 @@ // // Generated code. Do not modify. -// source: dart/dart_options.proto +// source: dart_options/dart_options.proto // // @dart = 2.12 diff --git a/packages/cedar/lib/src/proto/dart/dart_options.pbjson.dart b/packages/cedar/lib/src/proto/dart_options/dart_options.pbjson.dart similarity index 97% rename from packages/cedar/lib/src/proto/dart/dart_options.pbjson.dart rename to packages/cedar/lib/src/proto/dart_options/dart_options.pbjson.dart index d3d001b..75730b8 100644 --- a/packages/cedar/lib/src/proto/dart/dart_options.pbjson.dart +++ b/packages/cedar/lib/src/proto/dart_options/dart_options.pbjson.dart @@ -1,6 +1,6 @@ // // Generated code. Do not modify. -// source: dart/dart_options.proto +// source: dart_options/dart_options.proto // // @dart = 2.12 diff --git a/packages/cedar/lib/src/proto/dart/dart_options.pbserver.dart b/packages/cedar/lib/src/proto/dart_options/dart_options.pbserver.dart similarity index 90% rename from packages/cedar/lib/src/proto/dart/dart_options.pbserver.dart rename to packages/cedar/lib/src/proto/dart_options/dart_options.pbserver.dart index 74b3416..7f51230 100644 --- a/packages/cedar/lib/src/proto/dart/dart_options.pbserver.dart +++ b/packages/cedar/lib/src/proto/dart_options/dart_options.pbserver.dart @@ -1,6 +1,6 @@ // // Generated code. Do not modify. -// source: dart/dart_options.proto +// source: dart_options/dart_options.proto // // @dart = 2.12 diff --git a/packages/cedar/lib/src/proto/google/protobuf/compiler/plugin.pb.dart b/packages/cedar/lib/src/proto/google/protobuf/compiler/plugin.pb.dart index 51acdde..694dab3 100644 --- a/packages/cedar/lib/src/proto/google/protobuf/compiler/plugin.pb.dart +++ b/packages/cedar/lib/src/proto/google/protobuf/compiler/plugin.pb.dart @@ -14,7 +14,7 @@ import 'dart:core' as $core; import 'package:fixnum/fixnum.dart' as $fixnum; import 'package:protobuf/protobuf.dart' as $pb; -import '../descriptor.pb.dart' as $0; +import '../descriptor.pb.dart' as $3; export 'plugin.pbenum.dart'; @@ -138,8 +138,8 @@ class CodeGeneratorRequest extends $pb.GeneratedMessage { $core.Iterable<$core.String>? fileToGenerate, $core.String? parameter, Version? compilerVersion, - $core.Iterable<$0.FileDescriptorProto>? protoFile, - $core.Iterable<$0.FileDescriptorProto>? sourceFileDescriptors, + $core.Iterable<$3.FileDescriptorProto>? protoFile, + $core.Iterable<$3.FileDescriptorProto>? sourceFileDescriptors, }) { final $result = create(); if (fileToGenerate != null) { @@ -176,12 +176,12 @@ class CodeGeneratorRequest extends $pb.GeneratedMessage { ..aOS(2, _omitFieldNames ? '' : 'parameter') ..aOM(3, _omitFieldNames ? '' : 'compilerVersion', subBuilder: Version.create) - ..pc<$0.FileDescriptorProto>( + ..pc<$3.FileDescriptorProto>( 15, _omitFieldNames ? '' : 'protoFile', $pb.PbFieldType.PM, - subBuilder: $0.FileDescriptorProto.create) - ..pc<$0.FileDescriptorProto>( + subBuilder: $3.FileDescriptorProto.create) + ..pc<$3.FileDescriptorProto>( 17, _omitFieldNames ? '' : 'sourceFileDescriptors', $pb.PbFieldType.PM, - subBuilder: $0.FileDescriptorProto.create); + subBuilder: $3.FileDescriptorProto.create); @$core.Deprecated('Using this can add significant overhead to your binary. ' 'Use [GeneratedMessageGenericExtensions.deepCopy] instead. ' @@ -261,13 +261,13 @@ class CodeGeneratorRequest extends $pb.GeneratedMessage { /// Type names of fields and extensions in the FileDescriptorProto are always /// fully qualified. @$pb.TagNumber(15) - $core.List<$0.FileDescriptorProto> get protoFile => $_getList(3); + $core.List<$3.FileDescriptorProto> get protoFile => $_getList(3); /// File descriptors with all options, including source-retention options. /// These descriptors are only provided for the files listed in /// files_to_generate. @$pb.TagNumber(17) - $core.List<$0.FileDescriptorProto> get sourceFileDescriptors => $_getList(4); + $core.List<$3.FileDescriptorProto> get sourceFileDescriptors => $_getList(4); } /// Represents a single generated file. @@ -276,7 +276,7 @@ class CodeGeneratorResponse_File extends $pb.GeneratedMessage { $core.String? name, $core.String? insertionPoint, $core.String? content, - $0.GeneratedCodeInfo? generatedCodeInfo, + $3.GeneratedCodeInfo? generatedCodeInfo, }) { final $result = create(); if (name != null) { @@ -309,8 +309,8 @@ class CodeGeneratorResponse_File extends $pb.GeneratedMessage { ..aOS(1, _omitFieldNames ? '' : 'name') ..aOS(2, _omitFieldNames ? '' : 'insertionPoint') ..aOS(15, _omitFieldNames ? '' : 'content') - ..aOM<$0.GeneratedCodeInfo>(16, _omitFieldNames ? '' : 'generatedCodeInfo', - subBuilder: $0.GeneratedCodeInfo.create) + ..aOM<$3.GeneratedCodeInfo>(16, _omitFieldNames ? '' : 'generatedCodeInfo', + subBuilder: $3.GeneratedCodeInfo.create) ..hasRequiredFields = false; @$core.Deprecated('Using this can add significant overhead to your binary. ' @@ -428,9 +428,9 @@ class CodeGeneratorResponse_File extends $pb.GeneratedMessage { /// point is used, this information will be appropriately offset and inserted /// into the code generation metadata for the generated files. @$pb.TagNumber(16) - $0.GeneratedCodeInfo get generatedCodeInfo => $_getN(3); + $3.GeneratedCodeInfo get generatedCodeInfo => $_getN(3); @$pb.TagNumber(16) - set generatedCodeInfo($0.GeneratedCodeInfo v) { + set generatedCodeInfo($3.GeneratedCodeInfo v) { setField(16, v); } @@ -439,7 +439,7 @@ class CodeGeneratorResponse_File extends $pb.GeneratedMessage { @$pb.TagNumber(16) void clearGeneratedCodeInfo() => clearField(16); @$pb.TagNumber(16) - $0.GeneratedCodeInfo ensureGeneratedCodeInfo() => $_ensure(3); + $3.GeneratedCodeInfo ensureGeneratedCodeInfo() => $_ensure(3); } /// The plugin writes an encoded CodeGeneratorResponse to stdout. diff --git a/proto/cedar/v3/expr.proto b/proto/cedar/v3/expr.proto index 1bbac27..8d4dd75 100644 --- a/proto/cedar/v3/expr.proto +++ b/proto/cedar/v3/expr.proto @@ -3,7 +3,7 @@ syntax = "proto3"; package cedar.v3; import "cedar/v3/value.proto"; -import "dart/dart_options.proto"; +import "dart_options/dart_options.proto"; option go_package = "cedar/v3;cedarpb"; diff --git a/proto/cedar/v3/policy.proto b/proto/cedar/v3/policy.proto index 012b5ec..f860acd 100644 --- a/proto/cedar/v3/policy.proto +++ b/proto/cedar/v3/policy.proto @@ -4,7 +4,7 @@ package cedar.v3; import "cedar/v3/entity_uid.proto"; import "cedar/v3/expr.proto"; -import "dart/dart_options.proto"; +import "dart_options/dart_options.proto"; option go_package = "cedar/v3;cedarpb"; diff --git a/third_party/dart/dart_options.proto b/proto/dart_options/dart_options.proto similarity index 100% rename from third_party/dart/dart_options.proto rename to proto/dart_options/dart_options.proto