From ef736065dc32af24bb11d15ea3c43861c9a86c36 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 19 Dec 2024 10:35:41 -0300 Subject: [PATCH 1/5] Bump github.com/aws/aws-sdk-go-v2/service/ec2 in the aws-sdk group (#5729) Bumps the aws-sdk group with 1 update: [github.com/aws/aws-sdk-go-v2/service/ec2](https://github.com/aws/aws-sdk-go-v2). Updates `github.com/aws/aws-sdk-go-v2/service/ec2` from 1.197.0 to 1.198.0 - [Release notes](https://github.com/aws/aws-sdk-go-v2/releases) - [Commits](https://github.com/aws/aws-sdk-go-v2/compare/service/ec2/v1.197.0...service/ec2/v1.198.0) --- updated-dependencies: - dependency-name: github.com/aws/aws-sdk-go-v2/service/ec2 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: aws-sdk ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 9e0ed6730b..d8bf681af3 100644 --- a/go.mod +++ b/go.mod @@ -25,7 +25,7 @@ require ( github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.19 github.com/aws/aws-sdk-go-v2/feature/rds/auth v1.5.1 github.com/aws/aws-sdk-go-v2/service/acmpca v1.37.0 - github.com/aws/aws-sdk-go-v2/service/ec2 v1.197.0 + github.com/aws/aws-sdk-go-v2/service/ec2 v1.198.0 github.com/aws/aws-sdk-go-v2/service/iam v1.38.1 github.com/aws/aws-sdk-go-v2/service/kms v1.37.5 github.com/aws/aws-sdk-go-v2/service/organizations v1.36.0 diff --git a/go.sum b/go.sum index 0f1eda070c..90811efc22 100644 --- a/go.sum +++ b/go.sum @@ -583,8 +583,8 @@ github.com/aws/aws-sdk-go-v2/internal/v4a v1.3.25 h1:r67ps7oHCYnflpgDy2LZU0MAQtQ github.com/aws/aws-sdk-go-v2/internal/v4a v1.3.25/go.mod h1:GrGY+Q4fIokYLtjCVB/aFfCVL6hhGUFl8inD18fDalE= github.com/aws/aws-sdk-go-v2/service/acmpca v1.37.0 h1:E4Mlk1RSHDCHKL5ezsRFfefgHSoUfdJ31o+EnmeJ/0Y= github.com/aws/aws-sdk-go-v2/service/acmpca v1.37.0/go.mod h1:3Mqoz+x3LiNshgQpHgaG9aZxbpE+ZHIPw0O24tjz0qY= -github.com/aws/aws-sdk-go-v2/service/ec2 v1.197.0 h1:Bo20e0LV3Qbkr7yZVGuOxvWbf9Vf3nqss5WyerHr6Ic= -github.com/aws/aws-sdk-go-v2/service/ec2 v1.197.0/go.mod h1:00zqVNJFK6UASrTnuvjJHJuaqUdkVz5tW8Ip+VhzuNg= +github.com/aws/aws-sdk-go-v2/service/ec2 v1.198.0 h1:ivPJXmGlzAjgy0jLO9naExUWE8IM8lLRcRKLPBEx6Q0= +github.com/aws/aws-sdk-go-v2/service/ec2 v1.198.0/go.mod h1:00zqVNJFK6UASrTnuvjJHJuaqUdkVz5tW8Ip+VhzuNg= github.com/aws/aws-sdk-go-v2/service/ecr v1.24.7 h1:3iaT/LnGV6jNtbBkvHZDlzz7Ky3wMHDJAyFtGd5GUJI= github.com/aws/aws-sdk-go-v2/service/ecr v1.24.7/go.mod h1:mtzCLxk6M+KZbkJdq3cUH9GCrudw8qCy5C3EHO+5vLc= github.com/aws/aws-sdk-go-v2/service/ecrpublic v1.21.6 h1:h+r5/diSwztgKgxUrntt6AOI5lBYY0ZJv+yzeulGZSU= From 4761b112168b9d48424cb41787016f81cb147787 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 19 Dec 2024 11:13:40 -0300 Subject: [PATCH 2/5] Bump github.com/google/go-tpm from 0.9.2 to 0.9.3 (#5733) Bumps [github.com/google/go-tpm](https://github.com/google/go-tpm) from 0.9.2 to 0.9.3. - [Release notes](https://github.com/google/go-tpm/releases) - [Commits](https://github.com/google/go-tpm/compare/v0.9.2...v0.9.3) --- updated-dependencies: - dependency-name: github.com/google/go-tpm dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index d8bf681af3..3559227ecd 100644 --- a/go.mod +++ b/go.mod @@ -47,7 +47,7 @@ require ( github.com/google/btree v1.1.3 github.com/google/go-cmp v0.6.0 github.com/google/go-containerregistry v0.20.2 - github.com/google/go-tpm v0.9.2 + github.com/google/go-tpm v0.9.3 github.com/google/go-tpm-tools v0.4.4 github.com/googleapis/gax-go/v2 v2.14.0 github.com/gorilla/handlers v1.5.2 diff --git a/go.sum b/go.sum index 90811efc22..2605a47b78 100644 --- a/go.sum +++ b/go.sum @@ -945,8 +945,8 @@ github.com/google/go-sev-guest v0.9.3 h1:GOJ+EipURdeWFl/YYdgcCxyPeMgQUWlI056iFkB github.com/google/go-sev-guest v0.9.3/go.mod h1:hc1R4R6f8+NcJwITs0L90fYWTsBpd1Ix+Gur15sqHDs= github.com/google/go-tdx-guest v0.3.1 h1:gl0KvjdsD4RrJzyLefDOvFOUH3NAJri/3qvaL5m83Iw= github.com/google/go-tdx-guest v0.3.1/go.mod h1:/rc3d7rnPykOPuY8U9saMyEps0PZDThLk/RygXm04nE= -github.com/google/go-tpm v0.9.2 h1:Gh8CMnMm06b09DmcsuY9fI3oF69188lGXCpiT/a05T4= -github.com/google/go-tpm v0.9.2/go.mod h1:h9jEsEECg7gtLis0upRBQU+GhYVH6jMjrFxI8u6bVUY= +github.com/google/go-tpm v0.9.3 h1:+yx0/anQuGzi+ssRqeD6WpXjW2L/V0dItUayO0i9sRc= +github.com/google/go-tpm v0.9.3/go.mod h1:h9jEsEECg7gtLis0upRBQU+GhYVH6jMjrFxI8u6bVUY= github.com/google/go-tpm-tools v0.4.4 h1:oiQfAIkc6xTy9Fl5NKTeTJkBTlXdHsxAofmQyxBKY98= github.com/google/go-tpm-tools v0.4.4/go.mod h1:T8jXkp2s+eltnCDIsXR84/MTcVU9Ja7bh3Mit0pa4AY= github.com/google/go-tspi v0.3.0 h1:ADtq8RKfP+jrTyIWIZDIYcKOMecRqNJFOew2IT0Inus= From 80b11f245c5bc927f815314ae96707a62aea9fee Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 19 Dec 2024 11:40:49 -0300 Subject: [PATCH 3/5] Bump github.com/docker/docker (#5732) Bumps [github.com/docker/docker](https://github.com/docker/docker) from 27.4.0+incompatible to 27.4.1+incompatible. - [Release notes](https://github.com/docker/docker/releases) - [Commits](https://github.com/docker/docker/compare/v27.4.0...v27.4.1) --- updated-dependencies: - dependency-name: github.com/docker/docker dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 3559227ecd..5ee240e4fb 100644 --- a/go.mod +++ b/go.mod @@ -36,7 +36,7 @@ require ( github.com/aws/smithy-go v1.22.1 github.com/blang/semver/v4 v4.0.0 github.com/cenkalti/backoff/v4 v4.3.0 - github.com/docker/docker v27.4.0+incompatible + github.com/docker/docker v27.4.1+incompatible github.com/envoyproxy/go-control-plane v0.13.1 github.com/fullsailor/pkcs7 v0.0.0-20190404230743-d7302db945fa github.com/go-jose/go-jose/v4 v4.0.4 diff --git a/go.sum b/go.sum index 2605a47b78..f5926e3f69 100644 --- a/go.sum +++ b/go.sum @@ -724,8 +724,8 @@ github.com/docker/cli v27.1.1+incompatible h1:goaZxOqs4QKxznZjjBWKONQci/MywhtRv2 github.com/docker/cli v27.1.1+incompatible/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8= github.com/docker/distribution v2.8.3+incompatible h1:AtKxIZ36LoNK51+Z6RpzLpddBirtxJnzDrHLEKxTAYk= github.com/docker/distribution v2.8.3+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w= -github.com/docker/docker v27.4.0+incompatible h1:I9z7sQ5qyzO0BfAb9IMOawRkAGxhYsidKiTMcm0DU+A= -github.com/docker/docker v27.4.0+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= +github.com/docker/docker v27.4.1+incompatible h1:ZJvcY7gfwHn1JF48PfbyXg7Jyt9ZCWDW+GGXOIxEwp4= +github.com/docker/docker v27.4.1+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= github.com/docker/docker-credential-helpers v0.8.0 h1:YQFtbBQb4VrpoPxhFuzEBPQ9E16qz5SpHLS+uswaCp8= github.com/docker/docker-credential-helpers v0.8.0/go.mod h1:UGFXcuoQ5TxPiB54nHOZ32AWRqQdECoh/Mg0AlEYb40= github.com/docker/go-connections v0.4.0 h1:El9xVISelRB7BuFusrZozjnkIM5YnzCViNKohAFqRJQ= From d759f55883007e9e2707591c93c85a5d67c1a374 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 19 Dec 2024 13:21:59 -0300 Subject: [PATCH 4/5] Bump google.golang.org/protobuf from 1.35.2 to 1.36.0 (#5722) * Bump google.golang.org/protobuf from 1.35.2 to 1.36.0 Bumps google.golang.org/protobuf from 1.35.2 to 1.36.0. --- updated-dependencies: - dependency-name: google.golang.org/protobuf dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] * Generate proto files Signed-off-by: Marcos Yacob --------- Signed-off-by: dependabot[bot] Signed-off-by: Marcos Yacob Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Marcos Yacob --- go.mod | 2 +- go.sum | 4 +- proto/private/server/journal/journal.pb.go | 27 ++-- proto/spire/common/common.pb.go | 152 ++++++++++----------- proto/spire/common/plugin/plugin.pb.go | 70 +++++----- 5 files changed, 117 insertions(+), 138 deletions(-) diff --git a/go.mod b/go.mod index 5ee240e4fb..d13dc6d166 100644 --- a/go.mod +++ b/go.mod @@ -87,7 +87,7 @@ require ( google.golang.org/api v0.212.0 google.golang.org/genproto/googleapis/rpc v0.0.0-20241206012308-a4fef0638583 google.golang.org/grpc v1.68.1 - google.golang.org/protobuf v1.35.2 + google.golang.org/protobuf v1.36.0 k8s.io/api v0.32.0 k8s.io/apimachinery v0.32.0 k8s.io/client-go v0.32.0 diff --git a/go.sum b/go.sum index f5926e3f69..f42f3ddd15 100644 --- a/go.sum +++ b/go.sum @@ -2148,8 +2148,8 @@ google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQ google.golang.org/protobuf v1.27.1/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= google.golang.org/protobuf v1.28.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= google.golang.org/protobuf v1.28.1/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= -google.golang.org/protobuf v1.35.2 h1:8Ar7bF+apOIoThw1EdZl0p1oWvMqTHmpA2fRTyZO8io= -google.golang.org/protobuf v1.35.2/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE= +google.golang.org/protobuf v1.36.0 h1:mjIs9gYtt56AzC4ZaffQuh88TZurBGhIJMBZGSxNerQ= +google.golang.org/protobuf v1.36.0/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE= gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= diff --git a/proto/private/server/journal/journal.pb.go b/proto/private/server/journal/journal.pb.go index d7ed16e495..66966e6f6b 100644 --- a/proto/private/server/journal/journal.pb.go +++ b/proto/private/server/journal/journal.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.35.2 +// protoc-gen-go v1.36.0 // protoc v4.24.4 // source: private/server/journal/journal.proto @@ -78,10 +78,7 @@ func (Status) EnumDescriptor() ([]byte, []int) { } type X509CAEntry struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - + state protoimpl.MessageState `protogen:"open.v1"` // Which X509 CA slot this entry occupied. SlotId string `protobuf:"bytes,1,opt,name=slot_id,json=slotId,proto3" json:"slot_id,omitempty"` // When the CA was issued (unix epoch in seconds) @@ -98,6 +95,8 @@ type X509CAEntry struct { NotAfter int64 `protobuf:"varint,7,opt,name=not_after,json=notAfter,proto3" json:"not_after,omitempty"` // The X.509 Authority Subject Key Identifier (SKID) UpstreamAuthorityId string `protobuf:"bytes,8,opt,name=upstream_authority_id,json=upstreamAuthorityId,proto3" json:"upstream_authority_id,omitempty"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache } func (x *X509CAEntry) Reset() { @@ -187,10 +186,7 @@ func (x *X509CAEntry) GetUpstreamAuthorityId() string { } type JWTKeyEntry struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - + state protoimpl.MessageState `protogen:"open.v1"` // Which JWT Key slot this entry occupied. SlotId string `protobuf:"bytes,1,opt,name=slot_id,json=slotId,proto3" json:"slot_id,omitempty"` // When the key was issued (unix epoch in seconds) @@ -204,7 +200,9 @@ type JWTKeyEntry struct { // The entry status Status Status `protobuf:"varint,6,opt,name=status,proto3,enum=Status" json:"status,omitempty"` // The JWT key ID - AuthorityId string `protobuf:"bytes,7,opt,name=authority_id,json=authorityId,proto3" json:"authority_id,omitempty"` + AuthorityId string `protobuf:"bytes,7,opt,name=authority_id,json=authorityId,proto3" json:"authority_id,omitempty"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache } func (x *JWTKeyEntry) Reset() { @@ -287,12 +285,11 @@ func (x *JWTKeyEntry) GetAuthorityId() string { } type Entries struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache + state protoimpl.MessageState `protogen:"open.v1"` + X509CAs []*X509CAEntry `protobuf:"bytes,1,rep,name=x509CAs,proto3" json:"x509CAs,omitempty"` + JwtKeys []*JWTKeyEntry `protobuf:"bytes,2,rep,name=jwtKeys,proto3" json:"jwtKeys,omitempty"` unknownFields protoimpl.UnknownFields - - X509CAs []*X509CAEntry `protobuf:"bytes,1,rep,name=x509CAs,proto3" json:"x509CAs,omitempty"` - JwtKeys []*JWTKeyEntry `protobuf:"bytes,2,rep,name=jwtKeys,proto3" json:"jwtKeys,omitempty"` + sizeCache protoimpl.SizeCache } func (x *Entries) Reset() { diff --git a/proto/spire/common/common.pb.go b/proto/spire/common/common.pb.go index 0613e436f6..d8f899f3c1 100644 --- a/proto/spire/common/common.pb.go +++ b/proto/spire/common/common.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.35.2 +// protoc-gen-go v1.36.0 // protoc v4.24.4 // source: spire/common/common.proto @@ -22,9 +22,9 @@ const ( // * Represents an empty message type Empty struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache + state protoimpl.MessageState `protogen:"open.v1"` unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache } func (x *Empty) Reset() { @@ -59,14 +59,13 @@ func (*Empty) Descriptor() ([]byte, []int) { // * A type which contains attestation data for specific platform. type AttestationData struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - + state protoimpl.MessageState `protogen:"open.v1"` // * Type of attestation to perform. Type string `protobuf:"bytes,1,opt,name=type,proto3" json:"type,omitempty"` // * The attestation data. - Data []byte `protobuf:"bytes,2,opt,name=data,proto3" json:"data,omitempty"` + Data []byte `protobuf:"bytes,2,opt,name=data,proto3" json:"data,omitempty"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache } func (x *AttestationData) Reset() { @@ -116,15 +115,14 @@ func (x *AttestationData) GetData() []byte { // * A type which describes the conditions under which a registration // entry is matched. type Selector struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - + state protoimpl.MessageState `protogen:"open.v1"` // * A selector type represents the type of attestation used in attesting // the entity (Eg: AWS, K8). Type string `protobuf:"bytes,1,opt,name=type,proto3" json:"type,omitempty"` // * The value to be attested. - Value string `protobuf:"bytes,2,opt,name=value,proto3" json:"value,omitempty"` + Value string `protobuf:"bytes,2,opt,name=value,proto3" json:"value,omitempty"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache } func (x *Selector) Reset() { @@ -173,12 +171,11 @@ func (x *Selector) GetValue() string { // * Represents a type with a list of Selector. type Selectors struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - + state protoimpl.MessageState `protogen:"open.v1"` // * A list of Selector. - Entries []*Selector `protobuf:"bytes,1,rep,name=entries,proto3" json:"entries,omitempty"` + Entries []*Selector `protobuf:"bytes,1,rep,name=entries,proto3" json:"entries,omitempty"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache } func (x *Selectors) Reset() { @@ -220,10 +217,7 @@ func (x *Selectors) GetEntries() []*Selector { // Represents an attested SPIRE agent type AttestedNode struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - + state protoimpl.MessageState `protogen:"open.v1"` // Node SPIFFE ID SpiffeId string `protobuf:"bytes,1,opt,name=spiffe_id,json=spiffeId,proto3" json:"spiffe_id,omitempty"` // Attestation data type @@ -239,7 +233,9 @@ type AttestedNode struct { // Node selectors Selectors []*Selector `protobuf:"bytes,7,rep,name=selectors,proto3" json:"selectors,omitempty"` // CanReattest field (can the attestation safely be deleted and recreated automatically) - CanReattest bool `protobuf:"varint,8,opt,name=can_reattest,json=canReattest,proto3" json:"can_reattest,omitempty"` + CanReattest bool `protobuf:"varint,8,opt,name=can_reattest,json=canReattest,proto3" json:"can_reattest,omitempty"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache } func (x *AttestedNode) Reset() { @@ -331,10 +327,7 @@ func (x *AttestedNode) GetCanReattest() bool { // * This is a curated record that the Server uses to set up and // manage the various registered nodes and workloads that are controlled by it. type RegistrationEntry struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - + state protoimpl.MessageState `protogen:"open.v1"` // * A list of selectors. Selectors []*Selector `protobuf:"bytes,1,rep,name=selectors,proto3" json:"selectors,omitempty"` // * The SPIFFE ID of an entity that is authorized to attest the validity @@ -370,7 +363,9 @@ type RegistrationEntry struct { // identity should be used by a workload when more than one SVID is returned. Hint string `protobuf:"bytes,14,opt,name=hint,proto3" json:"hint,omitempty"` // * Time of creation, in seconds from epoch - CreatedAt int64 `protobuf:"varint,15,opt,name=created_at,json=createdAt,proto3" json:"created_at,omitempty"` + CreatedAt int64 `protobuf:"varint,15,opt,name=created_at,json=createdAt,proto3" json:"created_at,omitempty"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache } func (x *RegistrationEntry) Reset() { @@ -510,23 +505,22 @@ func (x *RegistrationEntry) GetCreatedAt() int64 { // * The RegistrationEntryMask is used to update only selected fields of the RegistrationEntry type RegistrationEntryMask struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache + state protoimpl.MessageState `protogen:"open.v1"` + Selectors bool `protobuf:"varint,1,opt,name=selectors,proto3" json:"selectors,omitempty"` + ParentId bool `protobuf:"varint,2,opt,name=parent_id,json=parentId,proto3" json:"parent_id,omitempty"` + SpiffeId bool `protobuf:"varint,3,opt,name=spiffe_id,json=spiffeId,proto3" json:"spiffe_id,omitempty"` + X509SvidTtl bool `protobuf:"varint,4,opt,name=x509_svid_ttl,json=x509SvidTtl,proto3" json:"x509_svid_ttl,omitempty"` + FederatesWith bool `protobuf:"varint,5,opt,name=federates_with,json=federatesWith,proto3" json:"federates_with,omitempty"` + EntryId bool `protobuf:"varint,6,opt,name=entry_id,json=entryId,proto3" json:"entry_id,omitempty"` + Admin bool `protobuf:"varint,7,opt,name=admin,proto3" json:"admin,omitempty"` + Downstream bool `protobuf:"varint,8,opt,name=downstream,proto3" json:"downstream,omitempty"` + EntryExpiry bool `protobuf:"varint,9,opt,name=entryExpiry,proto3" json:"entryExpiry,omitempty"` + DnsNames bool `protobuf:"varint,10,opt,name=dns_names,json=dnsNames,proto3" json:"dns_names,omitempty"` + StoreSvid bool `protobuf:"varint,11,opt,name=store_svid,json=storeSvid,proto3" json:"store_svid,omitempty"` + JwtSvidTtl bool `protobuf:"varint,12,opt,name=jwt_svid_ttl,json=jwtSvidTtl,proto3" json:"jwt_svid_ttl,omitempty"` + Hint bool `protobuf:"varint,13,opt,name=hint,proto3" json:"hint,omitempty"` unknownFields protoimpl.UnknownFields - - Selectors bool `protobuf:"varint,1,opt,name=selectors,proto3" json:"selectors,omitempty"` - ParentId bool `protobuf:"varint,2,opt,name=parent_id,json=parentId,proto3" json:"parent_id,omitempty"` - SpiffeId bool `protobuf:"varint,3,opt,name=spiffe_id,json=spiffeId,proto3" json:"spiffe_id,omitempty"` - X509SvidTtl bool `protobuf:"varint,4,opt,name=x509_svid_ttl,json=x509SvidTtl,proto3" json:"x509_svid_ttl,omitempty"` - FederatesWith bool `protobuf:"varint,5,opt,name=federates_with,json=federatesWith,proto3" json:"federates_with,omitempty"` - EntryId bool `protobuf:"varint,6,opt,name=entry_id,json=entryId,proto3" json:"entry_id,omitempty"` - Admin bool `protobuf:"varint,7,opt,name=admin,proto3" json:"admin,omitempty"` - Downstream bool `protobuf:"varint,8,opt,name=downstream,proto3" json:"downstream,omitempty"` - EntryExpiry bool `protobuf:"varint,9,opt,name=entryExpiry,proto3" json:"entryExpiry,omitempty"` - DnsNames bool `protobuf:"varint,10,opt,name=dns_names,json=dnsNames,proto3" json:"dns_names,omitempty"` - StoreSvid bool `protobuf:"varint,11,opt,name=store_svid,json=storeSvid,proto3" json:"store_svid,omitempty"` - JwtSvidTtl bool `protobuf:"varint,12,opt,name=jwt_svid_ttl,json=jwtSvidTtl,proto3" json:"jwt_svid_ttl,omitempty"` - Hint bool `protobuf:"varint,13,opt,name=hint,proto3" json:"hint,omitempty"` + sizeCache protoimpl.SizeCache } func (x *RegistrationEntryMask) Reset() { @@ -652,12 +646,11 @@ func (x *RegistrationEntryMask) GetHint() bool { // * A list of registration entries. type RegistrationEntries struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - + state protoimpl.MessageState `protogen:"open.v1"` // * A list of RegistrationEntry. - Entries []*RegistrationEntry `protobuf:"bytes,1,rep,name=entries,proto3" json:"entries,omitempty"` + Entries []*RegistrationEntry `protobuf:"bytes,1,rep,name=entries,proto3" json:"entries,omitempty"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache } func (x *RegistrationEntries) Reset() { @@ -699,12 +692,11 @@ func (x *RegistrationEntries) GetEntries() []*RegistrationEntry { // * Certificate represents a ASN.1/DER encoded X509 certificate type Certificate struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache + state protoimpl.MessageState `protogen:"open.v1"` + DerBytes []byte `protobuf:"bytes,1,opt,name=der_bytes,json=derBytes,proto3" json:"der_bytes,omitempty"` + TaintedKey bool `protobuf:"varint,2,opt,name=tainted_key,json=taintedKey,proto3" json:"tainted_key,omitempty"` unknownFields protoimpl.UnknownFields - - DerBytes []byte `protobuf:"bytes,1,opt,name=der_bytes,json=derBytes,proto3" json:"der_bytes,omitempty"` - TaintedKey bool `protobuf:"varint,2,opt,name=tainted_key,json=taintedKey,proto3" json:"tainted_key,omitempty"` + sizeCache protoimpl.SizeCache } func (x *Certificate) Reset() { @@ -753,10 +745,7 @@ func (x *Certificate) GetTaintedKey() bool { // * PublicKey represents a PKIX encoded public key type PublicKey struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - + state protoimpl.MessageState `protogen:"open.v1"` // * PKIX encoded key data PkixBytes []byte `protobuf:"bytes,1,opt,name=pkix_bytes,json=pkixBytes,proto3" json:"pkix_bytes,omitempty"` // * key identifier @@ -764,7 +753,9 @@ type PublicKey struct { // * not after (seconds since unix epoch, 0 means "never expires") NotAfter int64 `protobuf:"varint,3,opt,name=not_after,json=notAfter,proto3" json:"not_after,omitempty"` // * whether the key is tainted - TaintedKey bool `protobuf:"varint,4,opt,name=tainted_key,json=taintedKey,proto3" json:"tainted_key,omitempty"` + TaintedKey bool `protobuf:"varint,4,opt,name=tainted_key,json=taintedKey,proto3" json:"tainted_key,omitempty"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache } func (x *PublicKey) Reset() { @@ -826,10 +817,7 @@ func (x *PublicKey) GetTaintedKey() bool { } type Bundle struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - + state protoimpl.MessageState `protogen:"open.v1"` // * the SPIFFE ID of the trust domain the bundle belongs to TrustDomainId string `protobuf:"bytes,1,opt,name=trust_domain_id,json=trustDomainId,proto3" json:"trust_domain_id,omitempty"` // * list of root CA certificates @@ -842,6 +830,8 @@ type Bundle struct { // * sequence number is a monotonically increasing number that is // incremented every time the bundle is updated SequenceNumber uint64 `protobuf:"varint,5,opt,name=sequence_number,json=sequenceNumber,proto3" json:"sequence_number,omitempty"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache } func (x *Bundle) Reset() { @@ -910,15 +900,14 @@ func (x *Bundle) GetSequenceNumber() uint64 { } type BundleMask struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - - RootCas bool `protobuf:"varint,1,opt,name=root_cas,json=rootCas,proto3" json:"root_cas,omitempty"` - JwtSigningKeys bool `protobuf:"varint,2,opt,name=jwt_signing_keys,json=jwtSigningKeys,proto3" json:"jwt_signing_keys,omitempty"` - RefreshHint bool `protobuf:"varint,3,opt,name=refresh_hint,json=refreshHint,proto3" json:"refresh_hint,omitempty"` - SequenceNumber bool `protobuf:"varint,4,opt,name=sequence_number,json=sequenceNumber,proto3" json:"sequence_number,omitempty"` - X509TaintedKeys bool `protobuf:"varint,5,opt,name=x509_tainted_keys,json=x509TaintedKeys,proto3" json:"x509_tainted_keys,omitempty"` + state protoimpl.MessageState `protogen:"open.v1"` + RootCas bool `protobuf:"varint,1,opt,name=root_cas,json=rootCas,proto3" json:"root_cas,omitempty"` + JwtSigningKeys bool `protobuf:"varint,2,opt,name=jwt_signing_keys,json=jwtSigningKeys,proto3" json:"jwt_signing_keys,omitempty"` + RefreshHint bool `protobuf:"varint,3,opt,name=refresh_hint,json=refreshHint,proto3" json:"refresh_hint,omitempty"` + SequenceNumber bool `protobuf:"varint,4,opt,name=sequence_number,json=sequenceNumber,proto3" json:"sequence_number,omitempty"` + X509TaintedKeys bool `protobuf:"varint,5,opt,name=x509_tainted_keys,json=x509TaintedKeys,proto3" json:"x509_tainted_keys,omitempty"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache } func (x *BundleMask) Reset() { @@ -987,16 +976,15 @@ func (x *BundleMask) GetX509TaintedKeys() bool { } type AttestedNodeMask struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - - AttestationDataType bool `protobuf:"varint,1,opt,name=attestation_data_type,json=attestationDataType,proto3" json:"attestation_data_type,omitempty"` - CertSerialNumber bool `protobuf:"varint,2,opt,name=cert_serial_number,json=certSerialNumber,proto3" json:"cert_serial_number,omitempty"` - CertNotAfter bool `protobuf:"varint,3,opt,name=cert_not_after,json=certNotAfter,proto3" json:"cert_not_after,omitempty"` - NewCertSerialNumber bool `protobuf:"varint,4,opt,name=new_cert_serial_number,json=newCertSerialNumber,proto3" json:"new_cert_serial_number,omitempty"` - NewCertNotAfter bool `protobuf:"varint,5,opt,name=new_cert_not_after,json=newCertNotAfter,proto3" json:"new_cert_not_after,omitempty"` - CanReattest bool `protobuf:"varint,6,opt,name=can_reattest,json=canReattest,proto3" json:"can_reattest,omitempty"` + state protoimpl.MessageState `protogen:"open.v1"` + AttestationDataType bool `protobuf:"varint,1,opt,name=attestation_data_type,json=attestationDataType,proto3" json:"attestation_data_type,omitempty"` + CertSerialNumber bool `protobuf:"varint,2,opt,name=cert_serial_number,json=certSerialNumber,proto3" json:"cert_serial_number,omitempty"` + CertNotAfter bool `protobuf:"varint,3,opt,name=cert_not_after,json=certNotAfter,proto3" json:"cert_not_after,omitempty"` + NewCertSerialNumber bool `protobuf:"varint,4,opt,name=new_cert_serial_number,json=newCertSerialNumber,proto3" json:"new_cert_serial_number,omitempty"` + NewCertNotAfter bool `protobuf:"varint,5,opt,name=new_cert_not_after,json=newCertNotAfter,proto3" json:"new_cert_not_after,omitempty"` + CanReattest bool `protobuf:"varint,6,opt,name=can_reattest,json=canReattest,proto3" json:"can_reattest,omitempty"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache } func (x *AttestedNodeMask) Reset() { diff --git a/proto/spire/common/plugin/plugin.pb.go b/proto/spire/common/plugin/plugin.pb.go index b150bad03c..3d4aa2b73e 100644 --- a/proto/spire/common/plugin/plugin.pb.go +++ b/proto/spire/common/plugin/plugin.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.35.2 +// protoc-gen-go v1.36.0 // protoc v4.24.4 // source: spire/common/plugin/plugin.proto @@ -22,14 +22,13 @@ const ( // * Represents the plugin-specific configuration string. type ConfigureRequest struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - + state protoimpl.MessageState `protogen:"open.v1"` // * The configuration for the plugin. Configuration string `protobuf:"bytes,1,opt,name=configuration,proto3" json:"configuration,omitempty"` // * Global configurations. - GlobalConfig *ConfigureRequest_GlobalConfig `protobuf:"bytes,2,opt,name=globalConfig,proto3" json:"globalConfig,omitempty"` + GlobalConfig *ConfigureRequest_GlobalConfig `protobuf:"bytes,2,opt,name=globalConfig,proto3" json:"globalConfig,omitempty"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache } func (x *ConfigureRequest) Reset() { @@ -79,12 +78,11 @@ func (x *ConfigureRequest) GetGlobalConfig() *ConfigureRequest_GlobalConfig { // * Represents a list of configuration problems // found in the configuration string. type ConfigureResponse struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - + state protoimpl.MessageState `protogen:"open.v1"` // * A list of errors - ErrorList []string `protobuf:"bytes,1,rep,name=errorList,proto3" json:"errorList,omitempty"` + ErrorList []string `protobuf:"bytes,1,rep,name=errorList,proto3" json:"errorList,omitempty"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache } func (x *ConfigureResponse) Reset() { @@ -126,9 +124,9 @@ func (x *ConfigureResponse) GetErrorList() []string { // * Represents an empty request. type GetPluginInfoRequest struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache + state protoimpl.MessageState `protogen:"open.v1"` unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache } func (x *GetPluginInfoRequest) Reset() { @@ -163,19 +161,18 @@ func (*GetPluginInfoRequest) Descriptor() ([]byte, []int) { // * Represents the plugin metadata. type GetPluginInfoResponse struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache + state protoimpl.MessageState `protogen:"open.v1"` + Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"` + Category string `protobuf:"bytes,2,opt,name=category,proto3" json:"category,omitempty"` + Type string `protobuf:"bytes,3,opt,name=type,proto3" json:"type,omitempty"` + Description string `protobuf:"bytes,4,opt,name=description,proto3" json:"description,omitempty"` + DateCreated string `protobuf:"bytes,5,opt,name=dateCreated,proto3" json:"dateCreated,omitempty"` + Location string `protobuf:"bytes,6,opt,name=location,proto3" json:"location,omitempty"` + Version string `protobuf:"bytes,7,opt,name=version,proto3" json:"version,omitempty"` + Author string `protobuf:"bytes,8,opt,name=author,proto3" json:"author,omitempty"` + Company string `protobuf:"bytes,9,opt,name=company,proto3" json:"company,omitempty"` unknownFields protoimpl.UnknownFields - - Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"` - Category string `protobuf:"bytes,2,opt,name=category,proto3" json:"category,omitempty"` - Type string `protobuf:"bytes,3,opt,name=type,proto3" json:"type,omitempty"` - Description string `protobuf:"bytes,4,opt,name=description,proto3" json:"description,omitempty"` - DateCreated string `protobuf:"bytes,5,opt,name=dateCreated,proto3" json:"dateCreated,omitempty"` - Location string `protobuf:"bytes,6,opt,name=location,proto3" json:"location,omitempty"` - Version string `protobuf:"bytes,7,opt,name=version,proto3" json:"version,omitempty"` - Author string `protobuf:"bytes,8,opt,name=author,proto3" json:"author,omitempty"` - Company string `protobuf:"bytes,9,opt,name=company,proto3" json:"company,omitempty"` + sizeCache protoimpl.SizeCache } func (x *GetPluginInfoResponse) Reset() { @@ -272,11 +269,10 @@ func (x *GetPluginInfoResponse) GetCompany() string { } type InitRequest struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache + state protoimpl.MessageState `protogen:"open.v1"` + HostServices []string `protobuf:"bytes,1,rep,name=host_services,json=hostServices,proto3" json:"host_services,omitempty"` unknownFields protoimpl.UnknownFields - - HostServices []string `protobuf:"bytes,1,rep,name=host_services,json=hostServices,proto3" json:"host_services,omitempty"` + sizeCache protoimpl.SizeCache } func (x *InitRequest) Reset() { @@ -317,11 +313,10 @@ func (x *InitRequest) GetHostServices() []string { } type InitResponse struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - - PluginServices []string `protobuf:"bytes,1,rep,name=plugin_services,json=pluginServices,proto3" json:"plugin_services,omitempty"` + state protoimpl.MessageState `protogen:"open.v1"` + PluginServices []string `protobuf:"bytes,1,rep,name=plugin_services,json=pluginServices,proto3" json:"plugin_services,omitempty"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache } func (x *InitResponse) Reset() { @@ -363,11 +358,10 @@ func (x *InitResponse) GetPluginServices() []string { // * Global configuration nested type. type ConfigureRequest_GlobalConfig struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache + state protoimpl.MessageState `protogen:"open.v1"` + TrustDomain string `protobuf:"bytes,1,opt,name=trustDomain,proto3" json:"trustDomain,omitempty"` unknownFields protoimpl.UnknownFields - - TrustDomain string `protobuf:"bytes,1,opt,name=trustDomain,proto3" json:"trustDomain,omitempty"` + sizeCache protoimpl.SizeCache } func (x *ConfigureRequest_GlobalConfig) Reset() { From 6928ff18338ae337492985a4acca32ec6d4703ec Mon Sep 17 00:00:00 2001 From: Carlo Teubner Date: Thu, 19 Dec 2024 17:05:55 +0000 Subject: [PATCH 5/5] doc: Fix telemetry config links (#5720) Signed-off-by: Carlo Teubner --- doc/spire_agent.md | 2 +- doc/spire_server.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/spire_agent.md b/doc/spire_agent.md index 456bc44cce..28daf48593 100644 --- a/doc/spire_agent.md +++ b/doc/spire_agent.md @@ -195,7 +195,7 @@ SPIRE Agent, upon receipt of the signal, does the following: ## Telemetry configuration -Please see the [Telemetry Configuration](./telemetry_config.md) guide for more information about configuring SPIRE Agent to emit telemetry. +Please see the [Telemetry Configuration](./telemetry/telemetry_config.md) guide for more information about configuring SPIRE Agent to emit telemetry. ## Health check configuration diff --git a/doc/spire_server.md b/doc/spire_server.md index f2651b121b..d3ea65efec 100644 --- a/doc/spire_server.md +++ b/doc/spire_server.md @@ -304,7 +304,7 @@ For more information about the different profiles defined in SPIFFE, along with ## Telemetry configuration -Please see the [Telemetry Configuration](./telemetry_config.md) guide for more information about configuring SPIRE Server to emit telemetry. +Please see the [Telemetry Configuration](./telemetry/telemetry_config.md) guide for more information about configuring SPIRE Server to emit telemetry. ## Health check configuration