Merge branch 'main' into pkw/relax-v1-buf-yaml-required

bufbuild · Feb 27, 2024 · 35f527a · 35f527a
2 parents f5109e7 + 6c23fe6
commit 35f527a
Show file tree

Hide file tree

Showing 10 changed files with 17 additions and 14 deletions.
diff --git a/buf.lock b/buf.lock
@@ -4,5 +4,5 @@ deps:
   - remote: buf.build
     owner: bufbuild
     repository: protovalidate
-    commit: e097f827e65240ac9fd4b1158849a8fc
-    digest: shake256:f19252436fd9ded945631e2ffaaed28247a92c9015ccf55ae99db9fb3d9600c4fdb00fd2d3bd7701026ec2fd4715c5129e6ae517c25a59ba690020cfe80bf8ad
+    commit: f05a6f4403ce4327bae4f50f281c3ed0
+    digest: shake256:668a0661b8df44d41839194896329330965fc215f3d2f88057fd60eeb759c2daf6cc6edfdd13b2a653d49fe2896ebedcb1a33c4c5b2dd10919f03ffb7fc52ae6
diff --git a/buf/registry/legacy/federation/v1beta1/upload_service.proto b/buf/registry/legacy/federation/v1beta1/upload_service.proto
@@ -84,7 +84,7 @@ message UploadRequest {
     string source_control_url = 5 [
       (buf.validate.field).string.uri = true,
       (buf.validate.field).string.max_len = 255,
-      (buf.validate.field).ignore_empty = true
+      (buf.validate.field).ignore = IGNORE_IF_UNPOPULATED
     ];
   }
   // The Contents of all references.

diff --git a/buf/registry/module/v1beta1/commit.proto b/buf/registry/module/v1beta1/commit.proto
@@ -70,6 +70,6 @@ message Commit {
   string source_control_url = 7 [
     (buf.validate.field).string.uri = true,
     (buf.validate.field).string.max_len = 255,
-    (buf.validate.field).ignore_empty = true
+    (buf.validate.field).ignore = IGNORE_IF_UNPOPULATED
   ];
 }
diff --git a/buf/registry/module/v1beta1/module.proto b/buf/registry/module/v1beta1/module.proto
@@ -63,7 +63,7 @@ message Module {
   string url = 9 [
     (buf.validate.field).string.uri = true,
     (buf.validate.field).string.max_len = 255,
-    (buf.validate.field).ignore_empty = true
+    (buf.validate.field).ignore = IGNORE_IF_UNPOPULATED
   ];
   // The name of the default Label of the Module.
   //

diff --git a/buf/registry/module/v1beta1/module_service.proto b/buf/registry/module/v1beta1/module_service.proto
@@ -130,7 +130,7 @@ message CreateModulesRequest {
     string url = 5 [
       (buf.validate.field).string.uri = true,
       (buf.validate.field).string.max_len = 255,
-      (buf.validate.field).ignore_empty = true
+      (buf.validate.field).ignore = IGNORE_IF_UNPOPULATED
     ];
     // The name of the default Label of the Module.
     //

diff --git a/buf/registry/module/v1beta1/upload_service.proto b/buf/registry/module/v1beta1/upload_service.proto
@@ -40,9 +40,12 @@ message UploadRequest {
     ModuleRef module_ref = 1 [(buf.validate.field).required = true];
     // The commit_id of the Commit, if this is referencing a Commit that already exists.
     //
-    // If the ModuleRef refers to a Module that has associated Content, this field should *not*
-    // be set, and setting it is an error.
-    string commit_id = 2 [(buf.validate.field).string.uuid = true];
+    // If the ModuleRef refers to a Module that has associated Content, this field should be empty,
+    // and setting a value is an error.
+    string commit_id = 2 [
+      (buf.validate.field).string.uuid = true,
+      (buf.validate.field).ignore_empty = true
+    ];
   }
   // Content to upload for a given reference.
   message Content {
@@ -74,7 +77,7 @@ message UploadRequest {
     string source_control_url = 5 [
       (buf.validate.field).string.uri = true,
       (buf.validate.field).string.max_len = 255,
-      (buf.validate.field).ignore_empty = true
+      (buf.validate.field).ignore = IGNORE_IF_UNPOPULATED
     ];
   }
   // The Contents of all references.

diff --git a/buf/registry/owner/v1beta1/organization.proto b/buf/registry/owner/v1beta1/organization.proto
@@ -52,7 +52,7 @@ message Organization {
   string url = 6 [
     (buf.validate.field).string.uri = true,
     (buf.validate.field).string.max_len = 255,
-    (buf.validate.field).ignore_empty = true
+    (buf.validate.field).ignore = IGNORE_IF_UNPOPULATED
   ];
   // The verification status of the Organization.
   OrganizationVerificationStatus verification_status = 7 [

diff --git a/buf/registry/owner/v1beta1/organization_service.proto b/buf/registry/owner/v1beta1/organization_service.proto
@@ -122,7 +122,7 @@ message CreateOrganizationsRequest {
     string url = 3 [
       (buf.validate.field).string.uri = true,
       (buf.validate.field).string.max_len = 255,
-      (buf.validate.field).ignore_empty = true
+      (buf.validate.field).ignore = IGNORE_IF_UNPOPULATED
     ];
     // The verification status of the Organization.
     //

diff --git a/buf/registry/owner/v1beta1/user.proto b/buf/registry/owner/v1beta1/user.proto
@@ -62,7 +62,7 @@ message User {
   string url = 8 [
     (buf.validate.field).string.uri = true,
     (buf.validate.field).string.max_len = 255,
-    (buf.validate.field).ignore_empty = true
+    (buf.validate.field).ignore = IGNORE_IF_UNPOPULATED
   ];
   // The verification status of the User.
   UserVerificationStatus verification_status = 9 [

diff --git a/buf/registry/owner/v1beta1/user_service.proto b/buf/registry/owner/v1beta1/user_service.proto
@@ -139,7 +139,7 @@ message CreateUsersRequest {
     string url = 4 [
       (buf.validate.field).string.uri = true,
       (buf.validate.field).string.max_len = 255,
-      (buf.validate.field).ignore_empty = true
+      (buf.validate.field).ignore = IGNORE_IF_UNPOPULATED
     ];
     // The verification status of the User.
     //