format proto files

Azure · Nov 20, 2024 · ad75eef · ad75eef
1 parent 1c2da6c
commit ad75eef
Show file tree

Hide file tree

Showing 18 changed files with 25 additions and 15 deletions.
diff --git a/aks-node-controller/Makefile b/aks-node-controller/Makefile
@@ -1,13 +1,15 @@
-.PHONY: proto-generate lint-proto-files
+# Run buf in docker, mounting the full repo into the container
+# Emulate running "buf" in the current directory
+BUF = docker run --volume "$(CURDIR)/../:$(CURDIR)/../" --workdir $(CURDIR) bufbuild/buf:1.47.2
+
+.PHONY: proto-generate
 proto-generate:
+	@($(BUF) format -w)
 	docker build --platform $(shell uname -m) -t protoc-docker - < protoc.Dockerfile
 	docker run --rm -v $(shell pwd):/$(shell pwd) --workdir=$(shell pwd) protoc-docker protoc --go_opt=module=github.com/Azure/agentbaker/aks-node-controller --go_out=./  --proto_path=proto  $(shell find proto/aksnodeconfig/v1 -name '*.proto')
 	$(MAKE) proto-lint
 
-# Run buf in docker, mounting the full repo into the container
-# Emulate running "buf" in the current directory
-BUF = docker run --volume "$(CURDIR)/../:$(CURDIR)/../" --workdir $(CURDIR) bufbuild/buf:1.47.2
-
+.PHONY: proto-lint
 proto-lint:
 	@($(BUF) lint)
 	@($(BUF) breaking --against '../.git#branch=dev,subdir=aks-node-controller') # TODO: change to master
diff --git a/aks-node-controller/proto/aksnodeconfig/v1/api_server_config.proto b/aks-node-controller/proto/aksnodeconfig/v1/api_server_config.proto
@@ -1,7 +1,7 @@
 syntax = "proto3";
 package aksnodeconfig.v1;
-option go_package = "github.com/Azure/agentbaker/aks-node-controller/pkg/gen/aksnodeconfig/v1;aksnodeconfigv1";
 
+option go_package = "github.com/Azure/agentbaker/aks-node-controller/pkg/gen/aksnodeconfig/v1;aksnodeconfigv1";
 
 message ApiServerConfig {
   // The certificate public key of the API server.

diff --git a/aks-node-controller/proto/aksnodeconfig/v1/auth_config.proto b/aks-node-controller/proto/aksnodeconfig/v1/auth_config.proto
@@ -1,5 +1,6 @@
 syntax = "proto3";
 package aksnodeconfig.v1;
+
 option go_package = "github.com/Azure/agentbaker/aks-node-controller/pkg/gen/aksnodeconfig/v1;aksnodeconfigv1";
 
 // Auth Config fields stored in azure.json used by cloud-provider-azure

diff --git a/aks-node-controller/proto/aksnodeconfig/v1/bootstrapping_config.proto b/aks-node-controller/proto/aksnodeconfig/v1/bootstrapping_config.proto
@@ -1,5 +1,6 @@
 syntax = "proto3";
 package aksnodeconfig.v1;
+
 option go_package = "github.com/Azure/agentbaker/aks-node-controller/pkg/gen/aksnodeconfig/v1;aksnodeconfigv1";
 
 enum BootstrappingAuthMethod {

diff --git a/aks-node-controller/proto/aksnodeconfig/v1/cluster_config.proto b/aks-node-controller/proto/aksnodeconfig/v1/cluster_config.proto
@@ -1,7 +1,7 @@
 syntax = "proto3";
 package aksnodeconfig.v1;
-option go_package = "github.com/Azure/agentbaker/aks-node-controller/pkg/gen/aksnodeconfig/v1;aksnodeconfigv1";
 
+option go_package = "github.com/Azure/agentbaker/aks-node-controller/pkg/gen/aksnodeconfig/v1;aksnodeconfigv1";
 
 // Cluster Config fields stored in azure.json used by cloud-provider-azure
 message ClusterConfig {

diff --git a/aks-node-controller/proto/aksnodeconfig/v1/config.proto b/aks-node-controller/proto/aksnodeconfig/v1/config.proto
@@ -1,8 +1,6 @@
 syntax = "proto3";
 
 package aksnodeconfig.v1;
-option go_package = "github.com/Azure/agentbaker/aks-node-controller/pkg/gen/aksnodeconfig/v1;aksnodeconfigv1";
-
 
 import "aksnodeconfig/v1/api_server_config.proto";
 import "aksnodeconfig/v1/auth_config.proto";
@@ -21,6 +19,8 @@ import "aksnodeconfig/v1/network_config.proto";
 import "aksnodeconfig/v1/runc_config.proto";
 import "aksnodeconfig/v1/teleport_config.proto";
 
+option go_package = "github.com/Azure/agentbaker/aks-node-controller/pkg/gen/aksnodeconfig/v1;aksnodeconfigv1";
+
 enum WorkloadRuntime {
   WORKLOAD_RUNTIME_UNSPECIFIED = 0;
   WORKLOAD_RUNTIME_OCI_CONTAINER = 1;

diff --git a/aks-node-controller/proto/aksnodeconfig/v1/containerd_config.proto b/aks-node-controller/proto/aksnodeconfig/v1/containerd_config.proto
@@ -1,7 +1,7 @@
 syntax = "proto3";
 package aksnodeconfig.v1;
-option go_package = "github.com/Azure/agentbaker/aks-node-controller/pkg/gen/aksnodeconfig/v1;aksnodeconfigv1";
 
+option go_package = "github.com/Azure/agentbaker/aks-node-controller/pkg/gen/aksnodeconfig/v1;aksnodeconfigv1";
 
 message ContainerdConfig {
   // The base URL for downloading containerd.

diff --git a/aks-node-controller/proto/aksnodeconfig/v1/custom_cloud_config.proto b/aks-node-controller/proto/aksnodeconfig/v1/custom_cloud_config.proto
@@ -1,7 +1,7 @@
 syntax = "proto3";
 package aksnodeconfig.v1;
-option go_package = "github.com/Azure/agentbaker/aks-node-controller/pkg/gen/aksnodeconfig/v1;aksnodeconfigv1";
 
+option go_package = "github.com/Azure/agentbaker/aks-node-controller/pkg/gen/aksnodeconfig/v1;aksnodeconfigv1";
 
 message CustomCloudConfig {
   // Name of custom cloud

diff --git a/aks-node-controller/proto/aksnodeconfig/v1/custom_linux_os_config.proto b/aks-node-controller/proto/aksnodeconfig/v1/custom_linux_os_config.proto
@@ -1,7 +1,7 @@
 syntax = "proto3";
 package aksnodeconfig.v1;
-option go_package = "github.com/Azure/agentbaker/aks-node-controller/pkg/gen/aksnodeconfig/v1;aksnodeconfigv1";
 
+option go_package = "github.com/Azure/agentbaker/aks-node-controller/pkg/gen/aksnodeconfig/v1;aksnodeconfigv1";
 
 // Custom Linux Node OS Config
 message CustomLinuxOsConfig {

diff --git a/aks-node-controller/proto/aksnodeconfig/v1/custom_search_domain_config.proto b/aks-node-controller/proto/aksnodeconfig/v1/custom_search_domain_config.proto
@@ -1,7 +1,7 @@
 syntax = "proto3";
 package aksnodeconfig.v1;
-option go_package = "github.com/Azure/agentbaker/aks-node-controller/pkg/gen/aksnodeconfig/v1;aksnodeconfigv1";
 
+option go_package = "github.com/Azure/agentbaker/aks-node-controller/pkg/gen/aksnodeconfig/v1;aksnodeconfigv1";
 
 message CustomSearchDomainConfig {
   // The name of the custom search domain.

diff --git a/aks-node-controller/proto/aksnodeconfig/v1/gpu_config.proto b/aks-node-controller/proto/aksnodeconfig/v1/gpu_config.proto
@@ -1,7 +1,7 @@
 syntax = "proto3";
 package aksnodeconfig.v1;
-option go_package = "github.com/Azure/agentbaker/aks-node-controller/pkg/gen/aksnodeconfig/v1;aksnodeconfigv1";
 
+option go_package = "github.com/Azure/agentbaker/aks-node-controller/pkg/gen/aksnodeconfig/v1;aksnodeconfigv1";
 
 message GpuConfig {
   // Specifies whether any nvidia configurations should be applied for GPU nodes. False when vm size is not a GPU node or driver install is skipped and no GPU configuration is needed.

diff --git a/aks-node-controller/proto/aksnodeconfig/v1/http_proxy_config.proto b/aks-node-controller/proto/aksnodeconfig/v1/http_proxy_config.proto
@@ -1,7 +1,7 @@
 syntax = "proto3";
 package aksnodeconfig.v1;
-option go_package = "github.com/Azure/agentbaker/aks-node-controller/pkg/gen/aksnodeconfig/v1;aksnodeconfigv1";
 
+option go_package = "github.com/Azure/agentbaker/aks-node-controller/pkg/gen/aksnodeconfig/v1;aksnodeconfigv1";
 
 message HttpProxyConfig {
   // Proxy endpoint/URL using HTTP through which the traffic should be routed for making HTTP connections outside the cluster

diff --git a/aks-node-controller/proto/aksnodeconfig/v1/imds_restriction_config.proto b/aks-node-controller/proto/aksnodeconfig/v1/imds_restriction_config.proto
@@ -1,5 +1,6 @@
 syntax = "proto3";
 package aksnodeconfig.v1;
+
 option go_package = "github.com/Azure/agentbaker/aks-node-controller/pkg/gen/aksnodeconfig/v1;aksnodeconfigv1";
 
 message ImdsRestrictionConfig {

diff --git a/aks-node-controller/proto/aksnodeconfig/v1/kube_binary_config.proto b/aks-node-controller/proto/aksnodeconfig/v1/kube_binary_config.proto
@@ -1,5 +1,6 @@
 syntax = "proto3";
 package aksnodeconfig.v1;
+
 option go_package = "github.com/Azure/agentbaker/aks-node-controller/pkg/gen/aksnodeconfig/v1;aksnodeconfigv1";
 
 // Kube Binary Config

diff --git a/aks-node-controller/proto/aksnodeconfig/v1/kubelet_config.proto b/aks-node-controller/proto/aksnodeconfig/v1/kubelet_config.proto
@@ -1,5 +1,6 @@
 syntax = "proto3";
 package aksnodeconfig.v1;
+
 option go_package = "github.com/Azure/agentbaker/aks-node-controller/pkg/gen/aksnodeconfig/v1;aksnodeconfigv1";
 
 message KubeletConfig {

diff --git a/aks-node-controller/proto/aksnodeconfig/v1/network_config.proto b/aks-node-controller/proto/aksnodeconfig/v1/network_config.proto
@@ -1,5 +1,6 @@
 syntax = "proto3";
 package aksnodeconfig.v1;
+
 option go_package = "github.com/Azure/agentbaker/aks-node-controller/pkg/gen/aksnodeconfig/v1;aksnodeconfigv1";
 
 message NetworkConfig {

diff --git a/aks-node-controller/proto/aksnodeconfig/v1/runc_config.proto b/aks-node-controller/proto/aksnodeconfig/v1/runc_config.proto
@@ -1,5 +1,6 @@
 syntax = "proto3";
 package aksnodeconfig.v1;
+
 option go_package = "github.com/Azure/agentbaker/aks-node-controller/pkg/gen/aksnodeconfig/v1;aksnodeconfigv1";
 
 message RuncConfig {

diff --git a/aks-node-controller/proto/aksnodeconfig/v1/teleport_config.proto b/aks-node-controller/proto/aksnodeconfig/v1/teleport_config.proto
@@ -1,5 +1,6 @@
 syntax = "proto3";
 package aksnodeconfig.v1;
+
 option go_package = "github.com/Azure/agentbaker/aks-node-controller/pkg/gen/aksnodeconfig/v1;aksnodeconfigv1";
 
 message TeleportConfig {