Skip to content

Commit 5ba1df4

Browse files
eddiezanesmira
eddiezane
authored and
smira
committed
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 <[email protected]> Signed-off-by: Andrey Smirnov <[email protected]>
1 parent 8234808 commit 5ba1df4

File tree

58 files changed

+261
-160
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

58 files changed

+261
-160
lines changed

‎api/cluster/cluster.proto

+1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ syntax = "proto3";
33
package cluster;
44

55
option go_package = "github.com/siderolabs/talos/pkg/machinery/api/cluster";
6+
option java_package = "dev.talos.api.cluster";
67

78
import "common/common.proto";
89
import "google/protobuf/duration.proto";

‎api/common/common.proto

+1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ syntax = "proto3";
33
package common;
44

55
option go_package = "github.com/siderolabs/talos/pkg/machinery/api/common";
6+
option java_package = "dev.talos.api.common";
67

78
import "google/protobuf/any.proto";
89
import "google/protobuf/descriptor.proto";

‎api/inspect/inspect.proto

+1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ syntax = "proto3";
33
package inspect;
44

55
option go_package = "github.com/siderolabs/talos/pkg/machinery/api/inspect";
6+
option java_package = "dev.talos.api.inspect";
67

78
import "common/common.proto";
89
import "google/protobuf/empty.proto";

‎api/machine/machine.proto

+1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ syntax = "proto3";
33
package machine;
44

55
option go_package = "github.com/siderolabs/talos/pkg/machinery/api/machine";
6+
option java_package = "dev.talos.api.machine";
67

78
import "common/common.proto";
89
import "google/protobuf/any.proto";

‎api/resource/config/config.proto

+1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ syntax = "proto3";
33
package resource.config;
44

55
option go_package = "github.com/siderolabs/talos/pkg/machinery/api/resource/config";
6+
option java_package = "dev.talos.api.resource.config";
67

78
// MessageConfigSpec is the spec for the config.MachineConfig resource.
89
message MachineConfigSpec {

‎api/resource/definitions/block/block.proto

+1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ syntax = "proto3";
33
package talos.resource.definitions.block;
44

55
option go_package = "github.com/siderolabs/talos/pkg/machinery/api/resource/definitions/block";
6+
option java_package = "dev.talos.api.resource.definitions.block";
67

78
// DeviceSpec is the spec for devices status.
89
message DeviceSpec {

‎api/resource/definitions/cluster/cluster.proto

+1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ syntax = "proto3";
33
package talos.resource.definitions.cluster;
44

55
option go_package = "github.com/siderolabs/talos/pkg/machinery/api/resource/definitions/cluster";
6+
option java_package = "dev.talos.api.resource.definitions.cluster";
67

78
import "common/common.proto";
89
import "resource/definitions/enums/enums.proto";

‎api/resource/definitions/cri/cri.proto

+1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ syntax = "proto3";
33
package talos.resource.definitions.cri;
44

55
option go_package = "github.com/siderolabs/talos/pkg/machinery/api/resource/definitions/cri";
6+
option java_package = "dev.talos.api.resource.definitions.cri";
67

78
import "google/protobuf/struct.proto";
89

‎api/resource/definitions/enums/enums.proto

+1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ syntax = "proto3";
33
package talos.resource.definitions.enums;
44

55
option go_package = "github.com/siderolabs/talos/pkg/machinery/api/resource/definitions/enums";
6+
option java_package = "dev.talos.api.resource.definitions.enums";
67

78
// MachineType represents a machine type.
89
enum MachineType {

‎api/resource/definitions/etcd/etcd.proto

+1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ syntax = "proto3";
33
package talos.resource.definitions.etcd;
44

55
option go_package = "github.com/siderolabs/talos/pkg/machinery/api/resource/definitions/etcd";
6+
option java_package = "dev.talos.api.resource.definitions.etcd";
67

78
import "common/common.proto";
89

‎api/resource/definitions/extensions/extensions.proto

+1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ syntax = "proto3";
33
package talos.resource.definitions.extensions;
44

55
option go_package = "github.com/siderolabs/talos/pkg/machinery/api/resource/definitions/extensions";
6+
option java_package = "dev.talos.api.resource.definitions.extensions";
67

78
// Compatibility describes extension compatibility.
89
message Compatibility {

‎api/resource/definitions/files/files.proto

+1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ syntax = "proto3";
33
package talos.resource.definitions.files;
44

55
option go_package = "github.com/siderolabs/talos/pkg/machinery/api/resource/definitions/files";
6+
option java_package = "dev.talos.api.resource.definitions.files";
67

78
// EtcFileSpecSpec describes status of rendered secrets.
89
message EtcFileSpecSpec {

‎api/resource/definitions/hardware/hardware.proto

+1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ syntax = "proto3";
33
package talos.resource.definitions.hardware;
44

55
option go_package = "github.com/siderolabs/talos/pkg/machinery/api/resource/definitions/hardware";
6+
option java_package = "dev.talos.api.resource.definitions.hardware";
67

78
// MemoryModuleSpec represents a single Memory.
89
message MemoryModuleSpec {

‎api/resource/definitions/k8s/k8s.proto

+1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ syntax = "proto3";
33
package talos.resource.definitions.k8s;
44

55
option go_package = "github.com/siderolabs/talos/pkg/machinery/api/resource/definitions/k8s";
6+
option java_package = "dev.talos.api.resource.definitions.k8s";
67

78
import "common/common.proto";
89
import "google/protobuf/struct.proto";

‎api/resource/definitions/kubeaccess/kubeaccess.proto

+1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ syntax = "proto3";
33
package talos.resource.definitions.kubeaccess;
44

55
option go_package = "github.com/siderolabs/talos/pkg/machinery/api/resource/definitions/kubeaccess";
6+
option java_package = "dev.talos.api.resource.definitions.kubeaccess";
67

78
// ConfigSpec describes KubeSpan configuration..
89
message ConfigSpec {

‎api/resource/definitions/kubespan/kubespan.proto

+1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ syntax = "proto3";
33
package talos.resource.definitions.kubespan;
44

55
option go_package = "github.com/siderolabs/talos/pkg/machinery/api/resource/definitions/kubespan";
6+
option java_package = "dev.talos.api.resource.definitions.kubespan";
67

78
import "common/common.proto";
89
import "google/protobuf/timestamp.proto";

‎api/resource/definitions/network/network.proto

+1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ syntax = "proto3";
33
package talos.resource.definitions.network;
44

55
option go_package = "github.com/siderolabs/talos/pkg/machinery/api/resource/definitions/network";
6+
option java_package = "dev.talos.api.resource.definitions.network";
67

78
import "common/common.proto";
89
import "google/protobuf/duration.proto";

‎api/resource/definitions/perf/perf.proto

+1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ syntax = "proto3";
33
package talos.resource.definitions.perf;
44

55
option go_package = "github.com/siderolabs/talos/pkg/machinery/api/resource/definitions/perf";
6+
option java_package = "dev.talos.api.resource.definitions.perf";
67

78
// CPUSpec represents the last CPU stats snapshot.
89
message CPUSpec {

‎api/resource/definitions/proto/proto.proto

+1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ syntax = "proto3";
33
package talos.resource.definitions.proto;
44

55
option go_package = "github.com/siderolabs/talos/pkg/machinery/api/resource/definitions/proto";
6+
option java_package = "dev.talos.api.resource.definitions.proto";
67

78
// LinuxIDMapping specifies UID/GID mappings.
89
message LinuxIDMapping {

‎api/resource/definitions/runtime/runtime.proto

+1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ syntax = "proto3";
33
package talos.resource.definitions.runtime;
44

55
option go_package = "github.com/siderolabs/talos/pkg/machinery/api/resource/definitions/runtime";
6+
option java_package = "dev.talos.api.resource.definitions.runtime";
67

78
import "common/common.proto";
89
import "google/protobuf/duration.proto";

‎api/resource/definitions/secrets/secrets.proto

+1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ syntax = "proto3";
33
package talos.resource.definitions.secrets;
44

55
option go_package = "github.com/siderolabs/talos/pkg/machinery/api/resource/definitions/secrets";
6+
option java_package = "dev.talos.api.resource.definitions.secrets";
67

78
import "common/common.proto";
89

‎api/resource/definitions/siderolink/siderolink.proto

+1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ syntax = "proto3";
33
package talos.resource.definitions.siderolink;
44

55
option go_package = "github.com/siderolabs/talos/pkg/machinery/api/resource/definitions/siderolink";
6+
option java_package = "dev.talos.api.resource.definitions.siderolink";
67

78
import "common/common.proto";
89

‎api/resource/definitions/time/time.proto

+1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ syntax = "proto3";
33
package talos.resource.definitions.time;
44

55
option go_package = "github.com/siderolabs/talos/pkg/machinery/api/resource/definitions/time";
6+
option java_package = "dev.talos.api.resource.definitions.time";
67

78
import "google/protobuf/duration.proto";
89

‎api/resource/definitions/v1alpha1/v1alpha1.proto

+1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ syntax = "proto3";
33
package talos.resource.definitions.v1alpha1;
44

55
option go_package = "github.com/siderolabs/talos/pkg/machinery/api/resource/definitions/v1alpha1";
6+
option java_package = "dev.talos.api.resource.definitions.v1alpha1";
67

78
// ServiceSpec describe service state.
89
message ServiceSpec {

‎api/resource/network/device_config.proto

+1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ syntax = "proto3";
33
package resource.network;
44

55
option go_package = "github.com/siderolabs/talos/pkg/machinery/api/resource/network";
6+
option java_package = "dev.talos.api.resource.network";
67

78
// DeviceConfigSpecSpec is the spec for the network.DeviceConfigSpec resource.
89
message DeviceConfigSpecSpec {

‎api/security/security.proto

+1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ syntax = "proto3";
33
package securityapi;
44

55
option go_package = "github.com/siderolabs/talos/pkg/machinery/api/security";
6+
option java_package = "dev.talos.api.security";
67

78
// The security service definition.
89
service SecurityService {

‎api/storage/storage.proto

+1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ syntax = "proto3";
33
package storage;
44

55
option go_package = "github.com/siderolabs/talos/pkg/machinery/api/storage";
6+
option java_package = "dev.talos.api.storage";
67

78
import "common/common.proto";
89
import "google/protobuf/empty.proto";

‎api/time/time.proto

+1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ syntax = "proto3";
33
package time;
44

55
option go_package = "github.com/siderolabs/talos/pkg/machinery/api/time";
6+
option java_package = "dev.talos.api.time";
67

78
import "common/common.proto";
89
import "google/protobuf/empty.proto";

‎hack/structprotogen/consts/consts.go

+2-1
Original file line numberDiff line numberDiff line change
@@ -229,7 +229,8 @@ type ConstBlocks []ConstBlock
229229
func (b *ConstBlocks) FormatProtoFile(w io.Writer) error {
230230
fmt.Fprint(w, "syntax = \"proto3\";\n\n")
231231
fmt.Fprint(w, "package talos.resource.definitions.enums;\n\n")
232-
fmt.Fprint(w, `option go_package = "github.com/siderolabs/talos/pkg/machinery/api/resource/definitions/enums";`+"\n\n")
232+
fmt.Fprint(w, `option go_package = "github.com/siderolabs/talos/pkg/machinery/api/resource/definitions/enums";`+"\n")
233+
fmt.Fprint(w, `option java_package = "dev.talos.api.resource.definitions.enums";`+"\n\n")
233234

234235
for _, block := range *b {
235236
for _, comment := range block.CommentLines {

‎hack/structprotogen/proto/proto.go

+4-2
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,8 @@ func (p *Pkg) WriteDebug(w io.Writer) {
6161

6262
fmt.Fprint(w, "syntax = \"proto3\";\n\n")
6363
fmt.Fprintf(w, "package talos.resource.definitions.%s; // %s\n\n", p.Name, p.GoPkg)
64-
fmt.Fprintf(w, "option go_package = \"github.com/siderolabs/talos/pkg/machinery/api/resource/definitions/%s\";\n\n", pkgName) // TODO: insert proper path
64+
fmt.Fprintf(w, "option go_package = \"github.com/siderolabs/talos/pkg/machinery/api/resource/definitions/%s\";\n", pkgName) // TODO: insert proper path
65+
fmt.Fprintf(w, "option java_package = \"dev.talos.api.resource.definitions.%s\";\n\n", pkgName)
6566

6667
if p.imports.Len() > 0 {
6768
for i := 0; i < p.imports.Len(); i++ {
@@ -88,7 +89,8 @@ func (p *Pkg) Format(w io.Writer) {
8889

8990
fmt.Fprint(w, "syntax = \"proto3\";\n\n")
9091
fmt.Fprintf(w, "package talos.resource.definitions.%s;\n\n", p.Name)
91-
fmt.Fprintf(w, "option go_package = \"github.com/siderolabs/talos/pkg/machinery/api/resource/definitions/%s\";\n\n", pkgName) // TODO: insert proper path
92+
fmt.Fprintf(w, "option go_package = \"github.com/siderolabs/talos/pkg/machinery/api/resource/definitions/%s\";\n", pkgName) // TODO: insert proper path
93+
fmt.Fprintf(w, "option java_package = \"dev.talos.api.resource.definitions.%s\";\n\n", pkgName)
9294

9395
if p.imports.Len() > 0 {
9496
for i := 0; i < p.imports.Len(); i++ {

‎pkg/machinery/api/cluster/cluster.pb.go

+7-5
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎pkg/machinery/api/common/common.pb.go

+6-5
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎pkg/machinery/api/inspect/inspect.pb.go

+7-5
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎pkg/machinery/api/machine/machine.pb.go

+7-5
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎pkg/machinery/api/resource/config/config.pb.go

+7-5
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎pkg/machinery/api/resource/definitions/block/block.pb.go

+9-6
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)