chore: add java package to protos

This option must be defined at the proto level in order to have an import path that is reasonably usable Signed-off-by: Eddie Zaneski <eddiezane@gmail.com> Signed-off-by: Andrey Smirnov <andrey.smirnov@siderolabs.com>
siderolabs · Aug 26, 2024 · 5ba1df4 · 5ba1df4
1 parent 8234808
commit 5ba1df4
Show file tree

Hide file tree

Showing 58 changed files with 261 additions and 160 deletions.
diff --git a/api/cluster/cluster.proto b/api/cluster/cluster.proto
@@ -3,6 +3,7 @@ syntax = "proto3";
 package cluster;
 
 option go_package = "github.com/siderolabs/talos/pkg/machinery/api/cluster";
+option java_package = "dev.talos.api.cluster";
 
 import "common/common.proto";
 import "google/protobuf/duration.proto";

diff --git a/api/common/common.proto b/api/common/common.proto
@@ -3,6 +3,7 @@ syntax = "proto3";
 package common;
 
 option go_package = "github.com/siderolabs/talos/pkg/machinery/api/common";
+option java_package = "dev.talos.api.common";
 
 import "google/protobuf/any.proto";
 import "google/protobuf/descriptor.proto";

diff --git a/api/inspect/inspect.proto b/api/inspect/inspect.proto
@@ -3,6 +3,7 @@ syntax = "proto3";
 package inspect;
 
 option go_package = "github.com/siderolabs/talos/pkg/machinery/api/inspect";
+option java_package = "dev.talos.api.inspect";
 
 import "common/common.proto";
 import "google/protobuf/empty.proto";

diff --git a/api/machine/machine.proto b/api/machine/machine.proto
@@ -3,6 +3,7 @@ syntax = "proto3";
 package machine;
 
 option go_package = "github.com/siderolabs/talos/pkg/machinery/api/machine";
+option java_package = "dev.talos.api.machine";
 
 import "common/common.proto";
 import "google/protobuf/any.proto";

diff --git a/api/resource/config/config.proto b/api/resource/config/config.proto
@@ -3,6 +3,7 @@ syntax = "proto3";
 package resource.config;
 
 option go_package = "github.com/siderolabs/talos/pkg/machinery/api/resource/config";
+option java_package = "dev.talos.api.resource.config";
 
 // MessageConfigSpec is the spec for the config.MachineConfig resource.
 message MachineConfigSpec {

diff --git a/api/resource/definitions/block/block.proto b/api/resource/definitions/block/block.proto
@@ -3,6 +3,7 @@ syntax = "proto3";
 package talos.resource.definitions.block;
 
 option go_package = "github.com/siderolabs/talos/pkg/machinery/api/resource/definitions/block";
+option java_package = "dev.talos.api.resource.definitions.block";
 
 // DeviceSpec is the spec for devices status.
 message DeviceSpec {

diff --git a/api/resource/definitions/cluster/cluster.proto b/api/resource/definitions/cluster/cluster.proto
@@ -3,6 +3,7 @@ syntax = "proto3";
 package talos.resource.definitions.cluster;
 
 option go_package = "github.com/siderolabs/talos/pkg/machinery/api/resource/definitions/cluster";
+option java_package = "dev.talos.api.resource.definitions.cluster";
 
 import "common/common.proto";
 import "resource/definitions/enums/enums.proto";

diff --git a/api/resource/definitions/cri/cri.proto b/api/resource/definitions/cri/cri.proto
@@ -3,6 +3,7 @@ syntax = "proto3";
 package talos.resource.definitions.cri;
 
 option go_package = "github.com/siderolabs/talos/pkg/machinery/api/resource/definitions/cri";
+option java_package = "dev.talos.api.resource.definitions.cri";
 
 import "google/protobuf/struct.proto";
 

diff --git a/api/resource/definitions/enums/enums.proto b/api/resource/definitions/enums/enums.proto
@@ -3,6 +3,7 @@ syntax = "proto3";
 package talos.resource.definitions.enums;
 
 option go_package = "github.com/siderolabs/talos/pkg/machinery/api/resource/definitions/enums";
+option java_package = "dev.talos.api.resource.definitions.enums";
 
 // MachineType represents a machine type.
 enum MachineType {

diff --git a/api/resource/definitions/etcd/etcd.proto b/api/resource/definitions/etcd/etcd.proto
@@ -3,6 +3,7 @@ syntax = "proto3";
 package talos.resource.definitions.etcd;
 
 option go_package = "github.com/siderolabs/talos/pkg/machinery/api/resource/definitions/etcd";
+option java_package = "dev.talos.api.resource.definitions.etcd";
 
 import "common/common.proto";
 

diff --git a/api/resource/definitions/extensions/extensions.proto b/api/resource/definitions/extensions/extensions.proto
@@ -3,6 +3,7 @@ syntax = "proto3";
 package talos.resource.definitions.extensions;
 
 option go_package = "github.com/siderolabs/talos/pkg/machinery/api/resource/definitions/extensions";
+option java_package = "dev.talos.api.resource.definitions.extensions";
 
 // Compatibility describes extension compatibility.
 message Compatibility {

diff --git a/api/resource/definitions/files/files.proto b/api/resource/definitions/files/files.proto
@@ -3,6 +3,7 @@ syntax = "proto3";
 package talos.resource.definitions.files;
 
 option go_package = "github.com/siderolabs/talos/pkg/machinery/api/resource/definitions/files";
+option java_package = "dev.talos.api.resource.definitions.files";
 
 // EtcFileSpecSpec describes status of rendered secrets.
 message EtcFileSpecSpec {

diff --git a/api/resource/definitions/hardware/hardware.proto b/api/resource/definitions/hardware/hardware.proto
@@ -3,6 +3,7 @@ syntax = "proto3";
 package talos.resource.definitions.hardware;
 
 option go_package = "github.com/siderolabs/talos/pkg/machinery/api/resource/definitions/hardware";
+option java_package = "dev.talos.api.resource.definitions.hardware";
 
 // MemoryModuleSpec represents a single Memory.
 message MemoryModuleSpec {

diff --git a/api/resource/definitions/k8s/k8s.proto b/api/resource/definitions/k8s/k8s.proto
@@ -3,6 +3,7 @@ syntax = "proto3";
 package talos.resource.definitions.k8s;
 
 option go_package = "github.com/siderolabs/talos/pkg/machinery/api/resource/definitions/k8s";
+option java_package = "dev.talos.api.resource.definitions.k8s";
 
 import "common/common.proto";
 import "google/protobuf/struct.proto";

diff --git a/api/resource/definitions/kubeaccess/kubeaccess.proto b/api/resource/definitions/kubeaccess/kubeaccess.proto
@@ -3,6 +3,7 @@ syntax = "proto3";
 package talos.resource.definitions.kubeaccess;
 
 option go_package = "github.com/siderolabs/talos/pkg/machinery/api/resource/definitions/kubeaccess";
+option java_package = "dev.talos.api.resource.definitions.kubeaccess";
 
 // ConfigSpec describes KubeSpan configuration..
 message ConfigSpec {

diff --git a/api/resource/definitions/kubespan/kubespan.proto b/api/resource/definitions/kubespan/kubespan.proto
@@ -3,6 +3,7 @@ syntax = "proto3";
 package talos.resource.definitions.kubespan;
 
 option go_package = "github.com/siderolabs/talos/pkg/machinery/api/resource/definitions/kubespan";
+option java_package = "dev.talos.api.resource.definitions.kubespan";
 
 import "common/common.proto";
 import "google/protobuf/timestamp.proto";

diff --git a/api/resource/definitions/network/network.proto b/api/resource/definitions/network/network.proto
@@ -3,6 +3,7 @@ syntax = "proto3";
 package talos.resource.definitions.network;
 
 option go_package = "github.com/siderolabs/talos/pkg/machinery/api/resource/definitions/network";
+option java_package = "dev.talos.api.resource.definitions.network";
 
 import "common/common.proto";
 import "google/protobuf/duration.proto";

diff --git a/api/resource/definitions/perf/perf.proto b/api/resource/definitions/perf/perf.proto
@@ -3,6 +3,7 @@ syntax = "proto3";
 package talos.resource.definitions.perf;
 
 option go_package = "github.com/siderolabs/talos/pkg/machinery/api/resource/definitions/perf";
+option java_package = "dev.talos.api.resource.definitions.perf";
 
 // CPUSpec represents the last CPU stats snapshot.
 message CPUSpec {

diff --git a/api/resource/definitions/proto/proto.proto b/api/resource/definitions/proto/proto.proto
@@ -3,6 +3,7 @@ syntax = "proto3";
 package talos.resource.definitions.proto;
 
 option go_package = "github.com/siderolabs/talos/pkg/machinery/api/resource/definitions/proto";
+option java_package = "dev.talos.api.resource.definitions.proto";
 
 // LinuxIDMapping specifies UID/GID mappings.
 message LinuxIDMapping {

diff --git a/api/resource/definitions/runtime/runtime.proto b/api/resource/definitions/runtime/runtime.proto
@@ -3,6 +3,7 @@ syntax = "proto3";
 package talos.resource.definitions.runtime;
 
 option go_package = "github.com/siderolabs/talos/pkg/machinery/api/resource/definitions/runtime";
+option java_package = "dev.talos.api.resource.definitions.runtime";
 
 import "common/common.proto";
 import "google/protobuf/duration.proto";

diff --git a/api/resource/definitions/secrets/secrets.proto b/api/resource/definitions/secrets/secrets.proto
@@ -3,6 +3,7 @@ syntax = "proto3";
 package talos.resource.definitions.secrets;
 
 option go_package = "github.com/siderolabs/talos/pkg/machinery/api/resource/definitions/secrets";
+option java_package = "dev.talos.api.resource.definitions.secrets";
 
 import "common/common.proto";
 

diff --git a/api/resource/definitions/siderolink/siderolink.proto b/api/resource/definitions/siderolink/siderolink.proto
@@ -3,6 +3,7 @@ syntax = "proto3";
 package talos.resource.definitions.siderolink;
 
 option go_package = "github.com/siderolabs/talos/pkg/machinery/api/resource/definitions/siderolink";
+option java_package = "dev.talos.api.resource.definitions.siderolink";
 
 import "common/common.proto";
 

diff --git a/api/resource/definitions/time/time.proto b/api/resource/definitions/time/time.proto
@@ -3,6 +3,7 @@ syntax = "proto3";
 package talos.resource.definitions.time;
 
 option go_package = "github.com/siderolabs/talos/pkg/machinery/api/resource/definitions/time";
+option java_package = "dev.talos.api.resource.definitions.time";
 
 import "google/protobuf/duration.proto";
 

diff --git a/api/resource/definitions/v1alpha1/v1alpha1.proto b/api/resource/definitions/v1alpha1/v1alpha1.proto
@@ -3,6 +3,7 @@ syntax = "proto3";
 package talos.resource.definitions.v1alpha1;
 
 option go_package = "github.com/siderolabs/talos/pkg/machinery/api/resource/definitions/v1alpha1";
+option java_package = "dev.talos.api.resource.definitions.v1alpha1";
 
 // ServiceSpec describe service state.
 message ServiceSpec {

diff --git a/api/resource/network/device_config.proto b/api/resource/network/device_config.proto
@@ -3,6 +3,7 @@ syntax = "proto3";
 package resource.network;
 
 option go_package = "github.com/siderolabs/talos/pkg/machinery/api/resource/network";
+option java_package = "dev.talos.api.resource.network";
 
 // DeviceConfigSpecSpec is the spec for the network.DeviceConfigSpec resource.
 message DeviceConfigSpecSpec {

diff --git a/api/security/security.proto b/api/security/security.proto
@@ -3,6 +3,7 @@ syntax = "proto3";
 package securityapi;
 
 option go_package = "github.com/siderolabs/talos/pkg/machinery/api/security";
+option java_package = "dev.talos.api.security";
 
 // The security service definition.
 service SecurityService {

diff --git a/api/storage/storage.proto b/api/storage/storage.proto
@@ -3,6 +3,7 @@ syntax = "proto3";
 package storage;
 
 option go_package = "github.com/siderolabs/talos/pkg/machinery/api/storage";
+option java_package = "dev.talos.api.storage";
 
 import "common/common.proto";
 import "google/protobuf/empty.proto";

diff --git a/api/time/time.proto b/api/time/time.proto
@@ -3,6 +3,7 @@ syntax = "proto3";
 package time;
 
 option go_package = "github.com/siderolabs/talos/pkg/machinery/api/time";
+option java_package = "dev.talos.api.time";
 
 import "common/common.proto";
 import "google/protobuf/empty.proto";

diff --git a/hack/structprotogen/consts/consts.go b/hack/structprotogen/consts/consts.go
@@ -229,7 +229,8 @@ type ConstBlocks []ConstBlock
 func (b *ConstBlocks) FormatProtoFile(w io.Writer) error {
 	fmt.Fprint(w, "syntax = \"proto3\";\n\n")
 	fmt.Fprint(w, "package talos.resource.definitions.enums;\n\n")
-	fmt.Fprint(w, `option go_package = "github.com/siderolabs/talos/pkg/machinery/api/resource/definitions/enums";`+"\n\n")
+	fmt.Fprint(w, `option go_package = "github.com/siderolabs/talos/pkg/machinery/api/resource/definitions/enums";`+"\n")
+	fmt.Fprint(w, `option java_package = "dev.talos.api.resource.definitions.enums";`+"\n\n")
 
 	for _, block := range *b {
 		for _, comment := range block.CommentLines {

diff --git a/hack/structprotogen/proto/proto.go b/hack/structprotogen/proto/proto.go
@@ -61,7 +61,8 @@ func (p *Pkg) WriteDebug(w io.Writer) {
 
 	fmt.Fprint(w, "syntax = \"proto3\";\n\n")
 	fmt.Fprintf(w, "package talos.resource.definitions.%s; // %s\n\n", p.Name, p.GoPkg)
-	fmt.Fprintf(w, "option go_package = \"github.com/siderolabs/talos/pkg/machinery/api/resource/definitions/%s\";\n\n", pkgName) // TODO: insert proper path
+	fmt.Fprintf(w, "option go_package = \"github.com/siderolabs/talos/pkg/machinery/api/resource/definitions/%s\";\n", pkgName) // TODO: insert proper path
+	fmt.Fprintf(w, "option java_package = \"dev.talos.api.resource.definitions.%s\";\n\n", pkgName)
 
 	if p.imports.Len() > 0 {
 		for i := 0; i < p.imports.Len(); i++ {
@@ -88,7 +89,8 @@ func (p *Pkg) Format(w io.Writer) {
 
 	fmt.Fprint(w, "syntax = \"proto3\";\n\n")
 	fmt.Fprintf(w, "package talos.resource.definitions.%s;\n\n", p.Name)
-	fmt.Fprintf(w, "option go_package = \"github.com/siderolabs/talos/pkg/machinery/api/resource/definitions/%s\";\n\n", pkgName) // TODO: insert proper path
+	fmt.Fprintf(w, "option go_package = \"github.com/siderolabs/talos/pkg/machinery/api/resource/definitions/%s\";\n", pkgName) // TODO: insert proper path
+	fmt.Fprintf(w, "option java_package = \"dev.talos.api.resource.definitions.%s\";\n\n", pkgName)
 
 	if p.imports.Len() > 0 {
 		for i := 0; i < p.imports.Len(); i++ {

diff --git a/pkg/machinery/api/cluster/cluster.pb.go b/pkg/machinery/api/cluster/cluster.pb.go
diff --git a/pkg/machinery/api/common/common.pb.go b/pkg/machinery/api/common/common.pb.go
diff --git a/pkg/machinery/api/inspect/inspect.pb.go b/pkg/machinery/api/inspect/inspect.pb.go
diff --git a/pkg/machinery/api/machine/machine.pb.go b/pkg/machinery/api/machine/machine.pb.go
diff --git a/pkg/machinery/api/resource/config/config.pb.go b/pkg/machinery/api/resource/config/config.pb.go
diff --git a/pkg/machinery/api/resource/definitions/block/block.pb.go b/pkg/machinery/api/resource/definitions/block/block.pb.go