mirror of
https://github.com/status-im/consul.git
synced 2025-01-10 05:45:46 +00:00
edf4610ed9
* Upgrade hcp-sdk-go to latest version v0.73 Changes: - go get github.com/hashicorp/hcp-sdk-go - go mod tidy * From upgrade: regenerate protobufs for upgrade from 1.30 to 1.31 Ran: `make proto` Slack: https://hashicorp.slack.com/archives/C0253EQ5B40/p1701105418579429 * From upgrade: fix mock interface implementation After upgrading, there is the following compile error: cannot use &mockHCPCfg{} (value of type *mockHCPCfg) as "github.com/hashicorp/hcp-sdk-go/config".HCPConfig value in return statement: *mockHCPCfg does not implement "github.com/hashicorp/hcp-sdk-go/config".HCPConfig (missing method Logout) Solution: update the mock to have the missing Logout method * From upgrade: Lint: remove usage of deprecated req.ServerState.TLS Due to upgrade, linting is erroring due to usage of a newly deprecated field 22:47:56 [consul]: make lint --> Running golangci-lint (.) agent/hcp/testing.go:157:24: SA1019: req.ServerState.TLS is deprecated: use server_tls.internal_rpc instead. (staticcheck) time.Until(time.Time(req.ServerState.TLS.CertExpiry)).Hours()/24, ^ * From upgrade: adjust oidc error message From the upgrade, this test started failing: === FAIL: internal/go-sso/oidcauth TestOIDC_ClaimsFromAuthCode/failed_code_exchange (re-run 2) (0.01s) oidc_test.go:393: unexpected error: Provider login failed: Error exchanging oidc code: oauth2: "invalid_grant" "unexpected auth code" Prior to the upgrade, the error returned was: ``` Provider login failed: Error exchanging oidc code: oauth2: cannot fetch token: 401 Unauthorized\nResponse: {\"error\":\"invalid_grant\",\"error_description\":\"unexpected auth code\"}\n ``` Now the error returned is as below and does not contain "cannot fetch token" ``` Provider login failed: Error exchanging oidc code: oauth2: "invalid_grant" "unexpected auth code" ``` * Update AgentPushServerState structs with new fields HCP-side changes for the new fields are in: https://github.com/hashicorp/cloud-global-network-manager-service/pull/1195/files * Minor refactor for hcpServerStatus to abstract tlsInfo into struct This will make it easier to set the same tls-info information to both - status.TLS (deprecated field) - status.ServerTLSMetadata (new field to use instead) * Update hcpServerStatus to parse out information for new fields Changes: - Improve error message and handling (encountered some issues and was confused) - Set new field TLSInfo.CertIssuer - Collect certificate authority metadata and set on TLSInfo.CertificateAuthorities - Set TLSInfo on both server.TLS and server.ServerTLSMetadata.InternalRPC * Update serverStatusToHCP to convert new fields to GNM rpc * Add changelog * Feedback: connect.ParseCert, caCerts * Feedback: refactor and unit test server status * Feedback: test to use expected struct * Feedback: certificate with intermediate * Feedback: catch no leaf, remove expectedErr * Feedback: update todos with jira ticket * Feedback: mock tlsConfigurator
172 lines
7.3 KiB
Go
172 lines
7.3 KiB
Go
// Copyright (c) HashiCorp, Inc.
|
|
// SPDX-License-Identifier: MPL-2.0
|
|
|
|
// Code generated by protoc-gen-go. DO NOT EDIT.
|
|
// versions:
|
|
// protoc-gen-go v1.31.0
|
|
// protoc (unknown)
|
|
// source: pbcatalog/v2beta1/protocol.proto
|
|
|
|
package catalogv2beta1
|
|
|
|
import (
|
|
protoreflect "google.golang.org/protobuf/reflect/protoreflect"
|
|
protoimpl "google.golang.org/protobuf/runtime/protoimpl"
|
|
reflect "reflect"
|
|
sync "sync"
|
|
)
|
|
|
|
const (
|
|
// Verify that this generated code is sufficiently up-to-date.
|
|
_ = protoimpl.EnforceVersion(20 - protoimpl.MinVersion)
|
|
// Verify that runtime/protoimpl is sufficiently up-to-date.
|
|
_ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20)
|
|
)
|
|
|
|
// +kubebuilder:validation:Enum=PROTOCOL_UNSPECIFIED;PROTOCOL_TCP;PROTOCOL_HTTP;PROTOCOL_HTTP2;PROTOCOL_GRPC
|
|
// +kubebuilder:validation:Type=string
|
|
type Protocol int32
|
|
|
|
const (
|
|
Protocol_PROTOCOL_UNSPECIFIED Protocol = 0
|
|
Protocol_PROTOCOL_TCP Protocol = 1
|
|
Protocol_PROTOCOL_HTTP Protocol = 2
|
|
Protocol_PROTOCOL_HTTP2 Protocol = 3
|
|
Protocol_PROTOCOL_GRPC Protocol = 4
|
|
// Protocol Mesh indicates that this port can speak Consul's mTLS based mesh protocol.
|
|
Protocol_PROTOCOL_MESH Protocol = 5
|
|
)
|
|
|
|
// Enum value maps for Protocol.
|
|
var (
|
|
Protocol_name = map[int32]string{
|
|
0: "PROTOCOL_UNSPECIFIED",
|
|
1: "PROTOCOL_TCP",
|
|
2: "PROTOCOL_HTTP",
|
|
3: "PROTOCOL_HTTP2",
|
|
4: "PROTOCOL_GRPC",
|
|
5: "PROTOCOL_MESH",
|
|
}
|
|
Protocol_value = map[string]int32{
|
|
"PROTOCOL_UNSPECIFIED": 0,
|
|
"PROTOCOL_TCP": 1,
|
|
"PROTOCOL_HTTP": 2,
|
|
"PROTOCOL_HTTP2": 3,
|
|
"PROTOCOL_GRPC": 4,
|
|
"PROTOCOL_MESH": 5,
|
|
}
|
|
)
|
|
|
|
func (x Protocol) Enum() *Protocol {
|
|
p := new(Protocol)
|
|
*p = x
|
|
return p
|
|
}
|
|
|
|
func (x Protocol) String() string {
|
|
return protoimpl.X.EnumStringOf(x.Descriptor(), protoreflect.EnumNumber(x))
|
|
}
|
|
|
|
func (Protocol) Descriptor() protoreflect.EnumDescriptor {
|
|
return file_pbcatalog_v2beta1_protocol_proto_enumTypes[0].Descriptor()
|
|
}
|
|
|
|
func (Protocol) Type() protoreflect.EnumType {
|
|
return &file_pbcatalog_v2beta1_protocol_proto_enumTypes[0]
|
|
}
|
|
|
|
func (x Protocol) Number() protoreflect.EnumNumber {
|
|
return protoreflect.EnumNumber(x)
|
|
}
|
|
|
|
// Deprecated: Use Protocol.Descriptor instead.
|
|
func (Protocol) EnumDescriptor() ([]byte, []int) {
|
|
return file_pbcatalog_v2beta1_protocol_proto_rawDescGZIP(), []int{0}
|
|
}
|
|
|
|
var File_pbcatalog_v2beta1_protocol_proto protoreflect.FileDescriptor
|
|
|
|
var file_pbcatalog_v2beta1_protocol_proto_rawDesc = []byte{
|
|
0x0a, 0x20, 0x70, 0x62, 0x63, 0x61, 0x74, 0x61, 0x6c, 0x6f, 0x67, 0x2f, 0x76, 0x32, 0x62, 0x65,
|
|
0x74, 0x61, 0x31, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x63, 0x6f, 0x6c, 0x2e, 0x70, 0x72, 0x6f,
|
|
0x74, 0x6f, 0x12, 0x20, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f,
|
|
0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x63, 0x61, 0x74, 0x61, 0x6c, 0x6f, 0x67, 0x2e, 0x76, 0x32, 0x62,
|
|
0x65, 0x74, 0x61, 0x31, 0x2a, 0x83, 0x01, 0x0a, 0x08, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x63, 0x6f,
|
|
0x6c, 0x12, 0x18, 0x0a, 0x14, 0x50, 0x52, 0x4f, 0x54, 0x4f, 0x43, 0x4f, 0x4c, 0x5f, 0x55, 0x4e,
|
|
0x53, 0x50, 0x45, 0x43, 0x49, 0x46, 0x49, 0x45, 0x44, 0x10, 0x00, 0x12, 0x10, 0x0a, 0x0c, 0x50,
|
|
0x52, 0x4f, 0x54, 0x4f, 0x43, 0x4f, 0x4c, 0x5f, 0x54, 0x43, 0x50, 0x10, 0x01, 0x12, 0x11, 0x0a,
|
|
0x0d, 0x50, 0x52, 0x4f, 0x54, 0x4f, 0x43, 0x4f, 0x4c, 0x5f, 0x48, 0x54, 0x54, 0x50, 0x10, 0x02,
|
|
0x12, 0x12, 0x0a, 0x0e, 0x50, 0x52, 0x4f, 0x54, 0x4f, 0x43, 0x4f, 0x4c, 0x5f, 0x48, 0x54, 0x54,
|
|
0x50, 0x32, 0x10, 0x03, 0x12, 0x11, 0x0a, 0x0d, 0x50, 0x52, 0x4f, 0x54, 0x4f, 0x43, 0x4f, 0x4c,
|
|
0x5f, 0x47, 0x52, 0x50, 0x43, 0x10, 0x04, 0x12, 0x11, 0x0a, 0x0d, 0x50, 0x52, 0x4f, 0x54, 0x4f,
|
|
0x43, 0x4f, 0x4c, 0x5f, 0x4d, 0x45, 0x53, 0x48, 0x10, 0x05, 0x42, 0xa3, 0x02, 0x0a, 0x24, 0x63,
|
|
0x6f, 0x6d, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e,
|
|
0x73, 0x75, 0x6c, 0x2e, 0x63, 0x61, 0x74, 0x61, 0x6c, 0x6f, 0x67, 0x2e, 0x76, 0x32, 0x62, 0x65,
|
|
0x74, 0x61, 0x31, 0x42, 0x0d, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x63, 0x6f, 0x6c, 0x50, 0x72, 0x6f,
|
|
0x74, 0x6f, 0x50, 0x01, 0x5a, 0x49, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d,
|
|
0x2f, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x75,
|
|
0x6c, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2d, 0x70, 0x75, 0x62, 0x6c, 0x69, 0x63, 0x2f, 0x70,
|
|
0x62, 0x63, 0x61, 0x74, 0x61, 0x6c, 0x6f, 0x67, 0x2f, 0x76, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31,
|
|
0x3b, 0x63, 0x61, 0x74, 0x61, 0x6c, 0x6f, 0x67, 0x76, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0xa2,
|
|
0x02, 0x03, 0x48, 0x43, 0x43, 0xaa, 0x02, 0x20, 0x48, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72,
|
|
0x70, 0x2e, 0x43, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x43, 0x61, 0x74, 0x61, 0x6c, 0x6f, 0x67,
|
|
0x2e, 0x56, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0xca, 0x02, 0x20, 0x48, 0x61, 0x73, 0x68, 0x69,
|
|
0x63, 0x6f, 0x72, 0x70, 0x5c, 0x43, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x5c, 0x43, 0x61, 0x74, 0x61,
|
|
0x6c, 0x6f, 0x67, 0x5c, 0x56, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0xe2, 0x02, 0x2c, 0x48, 0x61,
|
|
0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x5c, 0x43, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x5c, 0x43,
|
|
0x61, 0x74, 0x61, 0x6c, 0x6f, 0x67, 0x5c, 0x56, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0x5c, 0x47,
|
|
0x50, 0x42, 0x4d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0xea, 0x02, 0x23, 0x48, 0x61, 0x73,
|
|
0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x3a, 0x3a, 0x43, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x3a, 0x3a,
|
|
0x43, 0x61, 0x74, 0x61, 0x6c, 0x6f, 0x67, 0x3a, 0x3a, 0x56, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31,
|
|
0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
|
|
}
|
|
|
|
var (
|
|
file_pbcatalog_v2beta1_protocol_proto_rawDescOnce sync.Once
|
|
file_pbcatalog_v2beta1_protocol_proto_rawDescData = file_pbcatalog_v2beta1_protocol_proto_rawDesc
|
|
)
|
|
|
|
func file_pbcatalog_v2beta1_protocol_proto_rawDescGZIP() []byte {
|
|
file_pbcatalog_v2beta1_protocol_proto_rawDescOnce.Do(func() {
|
|
file_pbcatalog_v2beta1_protocol_proto_rawDescData = protoimpl.X.CompressGZIP(file_pbcatalog_v2beta1_protocol_proto_rawDescData)
|
|
})
|
|
return file_pbcatalog_v2beta1_protocol_proto_rawDescData
|
|
}
|
|
|
|
var file_pbcatalog_v2beta1_protocol_proto_enumTypes = make([]protoimpl.EnumInfo, 1)
|
|
var file_pbcatalog_v2beta1_protocol_proto_goTypes = []interface{}{
|
|
(Protocol)(0), // 0: hashicorp.consul.catalog.v2beta1.Protocol
|
|
}
|
|
var file_pbcatalog_v2beta1_protocol_proto_depIdxs = []int32{
|
|
0, // [0:0] is the sub-list for method output_type
|
|
0, // [0:0] is the sub-list for method input_type
|
|
0, // [0:0] is the sub-list for extension type_name
|
|
0, // [0:0] is the sub-list for extension extendee
|
|
0, // [0:0] is the sub-list for field type_name
|
|
}
|
|
|
|
func init() { file_pbcatalog_v2beta1_protocol_proto_init() }
|
|
func file_pbcatalog_v2beta1_protocol_proto_init() {
|
|
if File_pbcatalog_v2beta1_protocol_proto != nil {
|
|
return
|
|
}
|
|
type x struct{}
|
|
out := protoimpl.TypeBuilder{
|
|
File: protoimpl.DescBuilder{
|
|
GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
|
|
RawDescriptor: file_pbcatalog_v2beta1_protocol_proto_rawDesc,
|
|
NumEnums: 1,
|
|
NumMessages: 0,
|
|
NumExtensions: 0,
|
|
NumServices: 0,
|
|
},
|
|
GoTypes: file_pbcatalog_v2beta1_protocol_proto_goTypes,
|
|
DependencyIndexes: file_pbcatalog_v2beta1_protocol_proto_depIdxs,
|
|
EnumInfos: file_pbcatalog_v2beta1_protocol_proto_enumTypes,
|
|
}.Build()
|
|
File_pbcatalog_v2beta1_protocol_proto = out.File
|
|
file_pbcatalog_v2beta1_protocol_proto_rawDesc = nil
|
|
file_pbcatalog_v2beta1_protocol_proto_goTypes = nil
|
|
file_pbcatalog_v2beta1_protocol_proto_depIdxs = nil
|
|
}
|