Merge pull request crossplane#6429 from negz/tooooools

negz · web-flow · commit 23f3c2a379ab · 2025-05-06T11:09:47.000-07:00
Update to latest buf and buf-action
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -428,29 +428,10 @@ jobs:
       - name: Checkout
         uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
 
-      - name: Setup Buf
-        uses: bufbuild/buf-setup-action@76ddbd1bcb9da6da11cb7c41bd97e47f81c39a39 # v1.37.0
-        with:
-          github_token: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Lint Protocol Buffers
-        uses: bufbuild/buf-lint-action@06f9dd823d873146471cfaaf108a993fe00e5325 # v1.1.1
+      - name: Lint and Push Protocol Buffers
+        uses: bufbuild/buf-action@v1
         with:
+          token: ${{ secrets.BUF_TOKEN }}
+          pr_comment: false
           input: apis
 
-      # buf-breaking-action doesn't support branches
-      # https://github.com/bufbuild/buf-push-action/issues/34
-      - name: Detect Breaking Changes in Protocol Buffers
-        uses: bufbuild/buf-breaking-action@a074e988ee34efcd4927079e79c611f428354c01 # v1
-        # We want to run this for the main branch, and PRs against main.
-        if: ${{ github.ref == 'refs/heads/main' || github.base_ref == 'main' }}
-        with:
-          input: apis
-          against: "https://github.com/${GITHUB_REPOSITORY}.git#branch=main,subdir=apis"
-
-      - name: Push Protocol Buffers to Buf Schema Registry
-        if: ${{ github.repository == 'crossplane/crossplane' && github.ref == 'refs/heads/main' }}
-        uses: bufbuild/buf-push-action@a654ff18effe4641ebea4a4ce242c49800728459 # v1.2.0
-        with:
-          input: apis
-          buf_token: ${{ secrets.BUF_TOKEN }}
diff --git a/apis/apiextensions/fn/proto/v1/run_function.pb.go b/apis/apiextensions/fn/proto/v1/run_function.pb.go
diff --git a/apis/apiextensions/fn/proto/v1/run_function.proto b/apis/apiextensions/fn/proto/v1/run_function.proto
@@ -1,26 +1,27 @@
 /*
-Copyright 2022 The Crossplane Authors.
+   Copyright 2022 The Crossplane Authors.
 
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
 
-    http://www.apache.org/licenses/LICENSE-2.0
+       http://www.apache.org/licenses/LICENSE-2.0
 
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 */
 
 syntax = "proto3";
 
-import "google/protobuf/struct.proto";
-import "google/protobuf/duration.proto";
-
+//buf:lint:ignore PACKAGE_DIRECTORY_MATCH // Too late to fix this now.
 package apiextensions.fn.proto.v1;
 
+import "google/protobuf/duration.proto";
+import "google/protobuf/struct.proto";
+
 option go_package = "github.com/crossplane/crossplane/apis/apiextensions/fn/proto/v1";
 
 // A FunctionRunnerService is a Composition Function.
@@ -71,7 +72,7 @@ message RunFunctionRequest {
 
   // Optional credentials that this Function may use to communicate with an
   // external system.
-  map <string, Credentials> credentials = 7;
+  map<string, Credentials> credentials = 7;
 }
 
 // Credentials that a Function may use to communicate with an external system.
@@ -205,7 +206,7 @@ message Resource {
   google.protobuf.Struct resource = 1;
 
   // The resource's connection details.
-  // 
+  //
   // * Crossplane will set this field in a RunFunctionRequest to communicate the
   //   the observed connection details of a composite or composed resource.
   //
@@ -218,7 +219,7 @@ message Resource {
   map<string, bytes> connection_details = 2;
 
   // Ready indicates whether the resource should be considered ready.
-  // 
+  //
   // * Crossplane will never set this field in a RunFunctionRequest.
   //
   // * A Function should set this field to READY_TRUE in a RunFunctionResponse
diff --git a/apis/apiextensions/fn/proto/v1/run_function_grpc.pb.go b/apis/apiextensions/fn/proto/v1/run_function_grpc.pb.go
diff --git a/apis/apiextensions/fn/proto/v1beta1/zz_generated_run_function.pb.go b/apis/apiextensions/fn/proto/v1beta1/zz_generated_run_function.pb.go
diff --git a/apis/apiextensions/fn/proto/v1beta1/zz_generated_run_function.proto b/apis/apiextensions/fn/proto/v1beta1/zz_generated_run_function.proto
@@ -1,28 +1,29 @@
 /*
-Copyright 2022 The Crossplane Authors.
+   Copyright 2022 The Crossplane Authors.
 
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
 
-    http://www.apache.org/licenses/LICENSE-2.0
+       http://www.apache.org/licenses/LICENSE-2.0
 
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 */
 
-syntax = "proto3";
-
-import "google/protobuf/struct.proto";
-import "google/protobuf/duration.proto";
-
 // Generated from apiextensions/fn/proto/v1/run_function.proto by ../hack/duplicate_proto_type.sh. DO NOT EDIT.
 
+syntax = "proto3";
+
+//buf:lint:ignore PACKAGE_DIRECTORY_MATCH // Too late to fix this now.
 package apiextensions.fn.proto.v1beta1;
 
+import "google/protobuf/duration.proto";
+import "google/protobuf/struct.proto";
+
 option go_package = "github.com/crossplane/crossplane/apis/apiextensions/fn/proto/v1beta1";
 
 // A FunctionRunnerService is a Composition Function.
@@ -73,7 +74,7 @@ message RunFunctionRequest {
 
   // Optional credentials that this Function may use to communicate with an
   // external system.
-  map <string, Credentials> credentials = 7;
+  map<string, Credentials> credentials = 7;
 }
 
 // Credentials that a Function may use to communicate with an external system.
@@ -207,7 +208,7 @@ message Resource {
   google.protobuf.Struct resource = 1;
 
   // The resource's connection details.
-  // 
+  //
   // * Crossplane will set this field in a RunFunctionRequest to communicate the
   //   the observed connection details of a composite or composed resource.
   //
@@ -220,7 +221,7 @@ message Resource {
   map<string, bytes> connection_details = 2;
 
   // Ready indicates whether the resource should be considered ready.
-  // 
+  //
   // * Crossplane will never set this field in a RunFunctionRequest.
   //
   // * A Function should set this field to READY_TRUE in a RunFunctionResponse
diff --git a/apis/apiextensions/fn/proto/v1beta1/zz_generated_run_function_grpc.pb.go b/apis/apiextensions/fn/proto/v1beta1/zz_generated_run_function_grpc.pb.go
diff --git a/apis/buf.gen.yaml b/apis/buf.gen.yaml
@@ -1,10 +1,8 @@
-# This file contains configuration for the `buf generate` command.
-# See generate.go for more details.
-version: v1
+version: v2
 plugins:
-  - plugin: go
+  - local: protoc-gen-go
     out: .
     opt: paths=source_relative
-  - plugin: go-grpc
+  - local: protoc-gen-go-grpc
     out: .
-    opt: paths=source_relative
+    opt: paths=source_relative
diff --git a/apis/buf.lock b/apis/buf.lock
@@ -1,7 +1,6 @@
 # Generated by buf. DO NOT EDIT.
-version: v1
+version: v2
 deps:
-  - remote: buf.build
-    owner: protocolbuffers
-    repository: wellknowntypes
+  - name: buf.build/protocolbuffers/wellknowntypes
     commit: 44e83bc050a4497fa7b36b34d95ca156
+    digest: b5:0d4aa31a2420a509799d6287d49ef590e14dcef5048816d446d1324b7c5b4026f4a81771babb1553b8faa5b0f79e70e1069af693682941323b7a172de48f1a17
diff --git a/apis/buf.yaml b/apis/buf.yaml
@@ -1,10 +1,16 @@
-version: v1
+version: v2
 name: buf.build/crossplane/crossplane
 deps:
-- buf.build/protocolbuffers/wellknowntypes:v24.4
+  - buf.build/protocolbuffers/wellknowntypes:v24.4
+lint:
+  use:
+    - STANDARD
+  except:
+    - FIELD_NOT_REQUIRED
+    - PACKAGE_NO_IMPORT_CYCLE
 breaking:
   use:
     - FILE
-lint:
-  use:
-    - DEFAULT
+  except:
+    - EXTENSION_NO_DELETE
+    - FIELD_SAME_DEFAULT
diff --git a/apis/generate.go b/apis/generate.go
@@ -83,7 +83,7 @@ limitations under the License.
 // (or protoc) to invoke them.
 
 //go:generate go install google.golang.org/protobuf/cmd/protoc-gen-go google.golang.org/grpc/cmd/protoc-gen-go-grpc
-//go:generate go run github.com/bufbuild/buf/cmd/buf@v1.31.0 generate
+//go:generate go run github.com/bufbuild/buf/cmd/buf@v1.53.0 generate
 
 package apis
 
diff --git a/hack/duplicate_proto_type.sh b/hack/duplicate_proto_type.sh
@@ -23,7 +23,8 @@ TO_PACKAGE=$(basename ${TO_DIR})
 TO_PATH="${TO_DIR}/zz_generated_${FROM_FILE}"
 
 sed -r \
-  -e "s#^package (.+)\.${FROM_PACKAGE};\$#${DO_NOT_EDIT}\n\npackage \1.${TO_PACKAGE};#" \
+  -e "s#syntax (.+)#${DO_NOT_EDIT}\n\nsyntax \1#" \
+  -e "s#^package (.+)\.${FROM_PACKAGE};\$#package \1.${TO_PACKAGE};#" \
   -e "s#^option go_package = \"(.+)/${FROM_PACKAGE}\";\$#option go_package = \"\1/${TO_PACKAGE}\";#" \
   ${FROM_PATH} > ${TO_PATH}
 
