From 05e93f7569bd0ab6753f8698f8d799e7f429c4a5 Mon Sep 17 00:00:00 2001 From: Dan Stough Date: Tue, 1 Nov 2022 15:03:23 -0400 Subject: [PATCH] test: refactor testcontainers and add peering integ tests (#15084) --- .circleci/config.yml | 2 +- agent/config/config.go | 402 ++++++++--------- test/integration/consul-container/go.mod | 150 ++++++- test/integration/consul-container/go.sum | 420 ++++++++++++++++- .../consul-container/libs/agent/agent.go | 29 ++ .../consul-container/libs/agent/builder.go | 266 +++++++++++ .../consul-container/libs/agent/container.go | 421 ++++++++++++++++++ .../consul-container/libs/agent/encryption.go | 58 +++ .../libs/{node => agent}/log.go | 8 +- .../consul-container/libs/assert/common.go | 10 + .../consul-container/libs/assert/peering.go | 44 ++ .../consul-container/libs/assert/service.go | 62 +++ .../consul-container/libs/cluster/cluster.go | 218 ++++++--- .../consul-container/libs/cluster/network.go | 23 + .../libs/node/consul-container.go | 295 ------------ .../libs/node/consul-container_oss.go | 4 - .../consul-container/libs/node/node.go | 24 - .../service/assets/Dockerfile-consul-envoy | 7 + .../consul-container/libs/service/common.go | 57 +++ .../consul-container/libs/service/connect.go | 144 ++++++ .../consul-container/libs/service/examples.go | 113 +++++ .../consul-container/libs/service/gateway.go | 128 ++++++ .../consul-container/libs/service/helpers.go | 144 ++++++ .../consul-container/libs/service/log.go | 23 + .../consul-container/libs/service/service.go | 10 + .../consul-container/libs/utils/helpers.go | 17 + .../consul-container/libs/utils/utils.go | 53 ++- .../test/basic/connect_service_test.go | 88 ++++ .../{ => test}/metrics/leader_test.go | 49 +- .../rotate_server_and_ca_then_fail_test.go | 372 ++++++++++++++++ .../{ => test}/upgrade/README.md | 0 .../{ => test}/upgrade/healthcheck_test.go | 138 +++--- 32 files changed, 3046 insertions(+), 733 deletions(-) create mode 100644 test/integration/consul-container/libs/agent/agent.go create mode 100644 test/integration/consul-container/libs/agent/builder.go create mode 100644 test/integration/consul-container/libs/agent/container.go create mode 100644 test/integration/consul-container/libs/agent/encryption.go rename test/integration/consul-container/libs/{node => agent}/log.go (62%) create mode 100644 test/integration/consul-container/libs/assert/common.go create mode 100644 test/integration/consul-container/libs/assert/peering.go create mode 100644 test/integration/consul-container/libs/assert/service.go create mode 100644 test/integration/consul-container/libs/cluster/network.go delete mode 100644 test/integration/consul-container/libs/node/consul-container.go delete mode 100644 test/integration/consul-container/libs/node/consul-container_oss.go delete mode 100644 test/integration/consul-container/libs/node/node.go create mode 100644 test/integration/consul-container/libs/service/assets/Dockerfile-consul-envoy create mode 100644 test/integration/consul-container/libs/service/common.go create mode 100644 test/integration/consul-container/libs/service/connect.go create mode 100644 test/integration/consul-container/libs/service/examples.go create mode 100644 test/integration/consul-container/libs/service/gateway.go create mode 100644 test/integration/consul-container/libs/service/helpers.go create mode 100644 test/integration/consul-container/libs/service/log.go create mode 100644 test/integration/consul-container/libs/service/service.go create mode 100644 test/integration/consul-container/libs/utils/helpers.go create mode 100644 test/integration/consul-container/test/basic/connect_service_test.go rename test/integration/consul-container/{ => test}/metrics/leader_test.go (69%) create mode 100644 test/integration/consul-container/test/peering/rotate_server_and_ca_then_fail_test.go rename test/integration/consul-container/{ => test}/upgrade/README.md (100%) rename test/integration/consul-container/{ => test}/upgrade/healthcheck_test.go (71%) diff --git a/.circleci/config.yml b/.circleci/config.yml index 38dce4495c..7e3e5ea465 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -869,7 +869,7 @@ jobs: # tput complains if this isn't set to something. TERM: ansi - store_artifacts: - path: ./test/integration/consul-container/upgrade/workdir/logs + path: ./test/integration/consul-container/test/upgrade/workdir/logs destination: container-logs - store_test_results: path: *TEST_RESULTS_DIR diff --git a/agent/config/config.go b/agent/config/config.go index 9aabab82b7..a82f83916e 100644 --- a/agent/config/config.go +++ b/agent/config/config.go @@ -133,168 +133,168 @@ type Cache struct { // configuration it should be treated as an external API which cannot be // changed and refactored at will since this will break existing setups. type Config struct { - ACL ACL `mapstructure:"acl"` - Addresses Addresses `mapstructure:"addresses"` - AdvertiseAddrLAN *string `mapstructure:"advertise_addr"` - AdvertiseAddrLANIPv4 *string `mapstructure:"advertise_addr_ipv4"` - AdvertiseAddrLANIPv6 *string `mapstructure:"advertise_addr_ipv6"` - AdvertiseAddrWAN *string `mapstructure:"advertise_addr_wan"` - AdvertiseAddrWANIPv4 *string `mapstructure:"advertise_addr_wan_ipv4"` - AdvertiseAddrWANIPv6 *string `mapstructure:"advertise_addr_wan_ipv6"` - AdvertiseReconnectTimeout *string `mapstructure:"advertise_reconnect_timeout"` - AutoConfig AutoConfigRaw `mapstructure:"auto_config"` - Autopilot Autopilot `mapstructure:"autopilot"` - BindAddr *string `mapstructure:"bind_addr"` - Bootstrap *bool `mapstructure:"bootstrap"` - BootstrapExpect *int `mapstructure:"bootstrap_expect"` - Cache Cache `mapstructure:"cache"` - Check *CheckDefinition `mapstructure:"check"` // needs to be a pointer to avoid partial merges - CheckOutputMaxSize *int `mapstructure:"check_output_max_size"` - CheckUpdateInterval *string `mapstructure:"check_update_interval"` - Checks []CheckDefinition `mapstructure:"checks"` - ClientAddr *string `mapstructure:"client_addr"` - Cloud *CloudConfigRaw `mapstructure:"cloud"` - ConfigEntries ConfigEntries `mapstructure:"config_entries"` - AutoEncrypt AutoEncrypt `mapstructure:"auto_encrypt"` - Connect Connect `mapstructure:"connect"` - DNS DNS `mapstructure:"dns_config"` - DNSDomain *string `mapstructure:"domain"` - DNSAltDomain *string `mapstructure:"alt_domain"` - DNSRecursors []string `mapstructure:"recursors"` - DataDir *string `mapstructure:"data_dir"` - Datacenter *string `mapstructure:"datacenter"` - DefaultQueryTime *string `mapstructure:"default_query_time"` - DisableAnonymousSignature *bool `mapstructure:"disable_anonymous_signature"` - DisableCoordinates *bool `mapstructure:"disable_coordinates"` - DisableHostNodeID *bool `mapstructure:"disable_host_node_id"` - DisableHTTPUnprintableCharFilter *bool `mapstructure:"disable_http_unprintable_char_filter"` - DisableKeyringFile *bool `mapstructure:"disable_keyring_file"` - DisableRemoteExec *bool `mapstructure:"disable_remote_exec"` - DisableUpdateCheck *bool `mapstructure:"disable_update_check"` - DiscardCheckOutput *bool `mapstructure:"discard_check_output"` - DiscoveryMaxStale *string `mapstructure:"discovery_max_stale"` - EnableAgentTLSForChecks *bool `mapstructure:"enable_agent_tls_for_checks"` - EnableCentralServiceConfig *bool `mapstructure:"enable_central_service_config"` - EnableDebug *bool `mapstructure:"enable_debug"` - EnableScriptChecks *bool `mapstructure:"enable_script_checks"` - EnableLocalScriptChecks *bool `mapstructure:"enable_local_script_checks"` - EnableSyslog *bool `mapstructure:"enable_syslog"` - EncryptKey *string `mapstructure:"encrypt"` - EncryptVerifyIncoming *bool `mapstructure:"encrypt_verify_incoming"` - EncryptVerifyOutgoing *bool `mapstructure:"encrypt_verify_outgoing"` - GossipLAN GossipLANConfig `mapstructure:"gossip_lan"` - GossipWAN GossipWANConfig `mapstructure:"gossip_wan"` - HTTPConfig HTTPConfig `mapstructure:"http_config"` - LeaveOnTerm *bool `mapstructure:"leave_on_terminate"` - LicensePath *string `mapstructure:"license_path"` - Limits Limits `mapstructure:"limits"` - LogLevel *string `mapstructure:"log_level"` - LogJSON *bool `mapstructure:"log_json"` - LogFile *string `mapstructure:"log_file"` - LogRotateDuration *string `mapstructure:"log_rotate_duration"` - LogRotateBytes *int `mapstructure:"log_rotate_bytes"` - LogRotateMaxFiles *int `mapstructure:"log_rotate_max_files"` - MaxQueryTime *string `mapstructure:"max_query_time"` - NodeID *string `mapstructure:"node_id"` - NodeMeta map[string]string `mapstructure:"node_meta"` - NodeName *string `mapstructure:"node_name"` - Peering Peering `mapstructure:"peering"` - Performance Performance `mapstructure:"performance"` - PidFile *string `mapstructure:"pid_file"` - Ports Ports `mapstructure:"ports"` - PrimaryDatacenter *string `mapstructure:"primary_datacenter"` - PrimaryGateways []string `mapstructure:"primary_gateways"` - PrimaryGatewaysInterval *string `mapstructure:"primary_gateways_interval"` - RPCProtocol *int `mapstructure:"protocol"` - RaftProtocol *int `mapstructure:"raft_protocol"` - RaftSnapshotThreshold *int `mapstructure:"raft_snapshot_threshold"` - RaftSnapshotInterval *string `mapstructure:"raft_snapshot_interval"` - RaftTrailingLogs *int `mapstructure:"raft_trailing_logs"` - ReconnectTimeoutLAN *string `mapstructure:"reconnect_timeout"` - ReconnectTimeoutWAN *string `mapstructure:"reconnect_timeout_wan"` - RejoinAfterLeave *bool `mapstructure:"rejoin_after_leave"` - AutoReloadConfig *bool `mapstructure:"auto_reload_config"` - RetryJoinIntervalLAN *string `mapstructure:"retry_interval"` - RetryJoinIntervalWAN *string `mapstructure:"retry_interval_wan"` - RetryJoinLAN []string `mapstructure:"retry_join"` - RetryJoinMaxAttemptsLAN *int `mapstructure:"retry_max"` - RetryJoinMaxAttemptsWAN *int `mapstructure:"retry_max_wan"` - RetryJoinWAN []string `mapstructure:"retry_join_wan"` - SerfAllowedCIDRsLAN []string `mapstructure:"serf_lan_allowed_cidrs"` - SerfAllowedCIDRsWAN []string `mapstructure:"serf_wan_allowed_cidrs"` - SerfBindAddrLAN *string `mapstructure:"serf_lan"` - SerfBindAddrWAN *string `mapstructure:"serf_wan"` - ServerMode *bool `mapstructure:"server"` - ServerName *string `mapstructure:"server_name"` - Service *ServiceDefinition `mapstructure:"service"` - Services []ServiceDefinition `mapstructure:"services"` - SessionTTLMin *string `mapstructure:"session_ttl_min"` - SkipLeaveOnInt *bool `mapstructure:"skip_leave_on_interrupt"` - StartJoinAddrsLAN []string `mapstructure:"start_join"` - StartJoinAddrsWAN []string `mapstructure:"start_join_wan"` - SyslogFacility *string `mapstructure:"syslog_facility"` - TLS TLS `mapstructure:"tls"` - TaggedAddresses map[string]string `mapstructure:"tagged_addresses"` - Telemetry Telemetry `mapstructure:"telemetry"` - TranslateWANAddrs *bool `mapstructure:"translate_wan_addrs"` - XDS XDS `mapstructure:"xds"` + ACL ACL `mapstructure:"acl" json:"-"` + Addresses Addresses `mapstructure:"addresses" json:"-"` + AdvertiseAddrLAN *string `mapstructure:"advertise_addr" json:"advertise_addr,omitempty"` + AdvertiseAddrLANIPv4 *string `mapstructure:"advertise_addr_ipv4" json:"advertise_addr_ipv4,omitempty"` + AdvertiseAddrLANIPv6 *string `mapstructure:"advertise_addr_ipv6" json:"advertise_addr_ipv6,omitempty"` + AdvertiseAddrWAN *string `mapstructure:"advertise_addr_wan" json:"advertise_addr_wan,omitempty"` + AdvertiseAddrWANIPv4 *string `mapstructure:"advertise_addr_wan_ipv4" json:"advertise_addr_wan_ipv4,omitempty"` + AdvertiseAddrWANIPv6 *string `mapstructure:"advertise_addr_wan_ipv6" json:"advertise_addr_wan_ipv6,omitempty"` + AdvertiseReconnectTimeout *string `mapstructure:"advertise_reconnect_timeout" json:"-"` + AutoConfig AutoConfigRaw `mapstructure:"auto_config" json:"-"` + Autopilot Autopilot `mapstructure:"autopilot" json:"-"` + BindAddr *string `mapstructure:"bind_addr" json:"bind_addr,omitempty"` + Bootstrap *bool `mapstructure:"bootstrap" json:"bootstrap,omitempty"` + BootstrapExpect *int `mapstructure:"bootstrap_expect" json:"bootstrap_expect,omitempty"` + Cache Cache `mapstructure:"cache" json:"-"` + Check *CheckDefinition `mapstructure:"check" json:"-"` // needs to be a pointer to avoid partial merges + CheckOutputMaxSize *int `mapstructure:"check_output_max_size" json:"check_output_max_size,omitempty"` + CheckUpdateInterval *string `mapstructure:"check_update_interval" json:"check_update_interval,omitempty"` + Checks []CheckDefinition `mapstructure:"checks" json:"-"` + ClientAddr *string `mapstructure:"client_addr" json:"client_addr,omitempty"` + Cloud *CloudConfigRaw `mapstructure:"cloud" json:"-"` + ConfigEntries ConfigEntries `mapstructure:"config_entries" json:"-"` + AutoEncrypt AutoEncrypt `mapstructure:"auto_encrypt" json:"auto_encrypt,omitempty"` + Connect Connect `mapstructure:"connect" json:"connect,omitempty"` + DNS DNS `mapstructure:"dns_config" json:"-"` + DNSDomain *string `mapstructure:"domain" json:"domain,omitempty"` + DNSAltDomain *string `mapstructure:"alt_domain" json:"alt_domain,omitempty"` + DNSRecursors []string `mapstructure:"recursors" json:"recursors,omitempty"` + DataDir *string `mapstructure:"data_dir" json:"data_dir,omitempty"` + Datacenter *string `mapstructure:"datacenter" json:"datacenter,omitempty"` + DefaultQueryTime *string `mapstructure:"default_query_time" json:"default_query_time,omitempty"` + DisableAnonymousSignature *bool `mapstructure:"disable_anonymous_signature" json:"disable_anonymous_signature,omitempty"` + DisableCoordinates *bool `mapstructure:"disable_coordinates" json:"disable_coordinates,omitempty"` + DisableHostNodeID *bool `mapstructure:"disable_host_node_id" json:"disable_host_node_id,omitempty"` + DisableHTTPUnprintableCharFilter *bool `mapstructure:"disable_http_unprintable_char_filter" json:"disable_http_unprintable_char_filter,omitempty"` + DisableKeyringFile *bool `mapstructure:"disable_keyring_file" json:"disable_keyring_file,omitempty"` + DisableRemoteExec *bool `mapstructure:"disable_remote_exec" json:"disable_remote_exec,omitempty"` + DisableUpdateCheck *bool `mapstructure:"disable_update_check" json:"disable_update_check,omitempty"` + DiscardCheckOutput *bool `mapstructure:"discard_check_output" json:"discard_check_output,omitempty"` + DiscoveryMaxStale *string `mapstructure:"discovery_max_stale" json:"discovery_max_stale,omitempty"` + EnableAgentTLSForChecks *bool `mapstructure:"enable_agent_tls_for_checks" json:"enable_agent_tls_for_checks,omitempty"` + EnableCentralServiceConfig *bool `mapstructure:"enable_central_service_config" json:"enable_central_service_config,omitempty"` + EnableDebug *bool `mapstructure:"enable_debug" json:"enable_debug,omitempty"` + EnableScriptChecks *bool `mapstructure:"enable_script_checks" json:"enable_script_checks,omitempty"` + EnableLocalScriptChecks *bool `mapstructure:"enable_local_script_checks" json:"enable_local_script_checks,omitempty"` + EnableSyslog *bool `mapstructure:"enable_syslog" json:"enable_syslog,omitempty"` + EncryptKey *string `mapstructure:"encrypt" json:"encrypt,omitempty"` + EncryptVerifyIncoming *bool `mapstructure:"encrypt_verify_incoming" json:"encrypt_verify_incoming,omitempty"` + EncryptVerifyOutgoing *bool `mapstructure:"encrypt_verify_outgoing" json:"encrypt_verify_outgoing,omitempty"` + GossipLAN GossipLANConfig `mapstructure:"gossip_lan" json:"-"` + GossipWAN GossipWANConfig `mapstructure:"gossip_wan" json:"-"` + HTTPConfig HTTPConfig `mapstructure:"http_config" json:"-"` + LeaveOnTerm *bool `mapstructure:"leave_on_terminate" json:"leave_on_terminate,omitempty"` + LicensePath *string `mapstructure:"license_path" json:"license_path,omitempty"` + Limits Limits `mapstructure:"limits" json:"-"` + LogLevel *string `mapstructure:"log_level" json:"log_level,omitempty"` + LogJSON *bool `mapstructure:"log_json" json:"log_json,omitempty"` + LogFile *string `mapstructure:"log_file" json:"log_file,omitempty"` + LogRotateDuration *string `mapstructure:"log_rotate_duration" json:"log_rotate_duration,omitempty"` + LogRotateBytes *int `mapstructure:"log_rotate_bytes" json:"log_rotate_bytes,omitempty"` + LogRotateMaxFiles *int `mapstructure:"log_rotate_max_files" json:"log_rotate_max_files,omitempty"` + MaxQueryTime *string `mapstructure:"max_query_time" json:"max_query_time,omitempty"` + NodeID *string `mapstructure:"node_id" json:"node_id,omitempty"` + NodeMeta map[string]string `mapstructure:"node_meta" json:"node_meta,omitempty"` + NodeName *string `mapstructure:"node_name" json:"node_name,omitempty"` + Peering Peering `mapstructure:"peering" json:"peering,omitempty"` + Performance Performance `mapstructure:"performance" json:"-"` + PidFile *string `mapstructure:"pid_file" json:"pid_file,omitempty"` + Ports Ports `mapstructure:"ports" json:"ports,omitempty"` + PrimaryDatacenter *string `mapstructure:"primary_datacenter" json:"primary_datacenter,omitempty"` + PrimaryGateways []string `mapstructure:"primary_gateways" json:"primary_gateways,omitempty"` + PrimaryGatewaysInterval *string `mapstructure:"primary_gateways_interval" json:"primary_gateways_interval,omitempty"` + RPCProtocol *int `mapstructure:"protocol" json:"protocol,omitempty"` + RaftProtocol *int `mapstructure:"raft_protocol" json:"raft_protocol,omitempty"` + RaftSnapshotThreshold *int `mapstructure:"raft_snapshot_threshold" json:"raft_snapshot_threshold,omitempty"` + RaftSnapshotInterval *string `mapstructure:"raft_snapshot_interval" json:"raft_snapshot_interval,omitempty"` + RaftTrailingLogs *int `mapstructure:"raft_trailing_logs" json:"raft_trailing_logs,omitempty"` + ReconnectTimeoutLAN *string `mapstructure:"reconnect_timeout" json:"reconnect_timeout,omitempty"` + ReconnectTimeoutWAN *string `mapstructure:"reconnect_timeout_wan" json:"reconnect_timeout_wan,omitempty"` + RejoinAfterLeave *bool `mapstructure:"rejoin_after_leave" json:"rejoin_after_leave,omitempty"` + AutoReloadConfig *bool `mapstructure:"auto_reload_config" json:"auto_reload_config,omitempty"` + RetryJoinIntervalLAN *string `mapstructure:"retry_interval" json:"retry_interval,omitempty"` + RetryJoinIntervalWAN *string `mapstructure:"retry_interval_wan" json:"retry_interval_wan,omitempty"` + RetryJoinLAN []string `mapstructure:"retry_join" json:"retry_join,omitempty"` + RetryJoinMaxAttemptsLAN *int `mapstructure:"retry_max" json:"retry_max,omitempty"` + RetryJoinMaxAttemptsWAN *int `mapstructure:"retry_max_wan" json:"retry_max_wan,omitempty"` + RetryJoinWAN []string `mapstructure:"retry_join_wan" json:"retry_join_wan,omitempty"` + SerfAllowedCIDRsLAN []string `mapstructure:"serf_lan_allowed_cidrs" json:"serf_lan_allowed_cidrs,omitempty"` + SerfAllowedCIDRsWAN []string `mapstructure:"serf_wan_allowed_cidrs" json:"serf_wan_allowed_cidrs,omitempty"` + SerfBindAddrLAN *string `mapstructure:"serf_lan" json:"serf_lan,omitempty"` + SerfBindAddrWAN *string `mapstructure:"serf_wan" json:"serf_wan,omitempty"` + ServerMode *bool `mapstructure:"server" json:"server,omitempty"` + ServerName *string `mapstructure:"server_name" json:"server_name,omitempty"` + Service *ServiceDefinition `mapstructure:"service" json:"-"` + Services []ServiceDefinition `mapstructure:"services" json:"-"` + SessionTTLMin *string `mapstructure:"session_ttl_min" json:"session_ttl_min,omitempty"` + SkipLeaveOnInt *bool `mapstructure:"skip_leave_on_interrupt" json:"skip_leave_on_interrupt,omitempty"` + StartJoinAddrsLAN []string `mapstructure:"start_join" json:"start_join,omitempty"` + StartJoinAddrsWAN []string `mapstructure:"start_join_wan" json:"start_join_wan,omitempty"` + SyslogFacility *string `mapstructure:"syslog_facility" json:"syslog_facility,omitempty"` + TLS TLS `mapstructure:"tls" json:"tls,omitempty"` + TaggedAddresses map[string]string `mapstructure:"tagged_addresses" json:"tagged_addresses,omitempty"` + Telemetry Telemetry `mapstructure:"telemetry" json:"telemetry,omitempty"` + TranslateWANAddrs *bool `mapstructure:"translate_wan_addrs" json:"translate_wan_addrs,omitempty"` + XDS XDS `mapstructure:"xds" json:"-"` // DEPRECATED (ui-config) - moved to the ui_config stanza - UI *bool `mapstructure:"ui"` + UI *bool `mapstructure:"ui" json:"-"` // DEPRECATED (ui-config) - moved to the ui_config stanza - UIContentPath *string `mapstructure:"ui_content_path"` + UIContentPath *string `mapstructure:"ui_content_path" json:"-"` // DEPRECATED (ui-config) - moved to the ui_config stanza - UIDir *string `mapstructure:"ui_dir"` - UIConfig RawUIConfig `mapstructure:"ui_config"` + UIDir *string `mapstructure:"ui_dir" json:"-"` + UIConfig RawUIConfig `mapstructure:"ui_config" json:"-"` - UnixSocket UnixSocket `mapstructure:"unix_sockets"` - Watches []map[string]interface{} `mapstructure:"watches"` + UnixSocket UnixSocket `mapstructure:"unix_sockets" json:"-"` + Watches []map[string]interface{} `mapstructure:"watches" json:"-"` - RPC RPC `mapstructure:"rpc"` + RPC RPC `mapstructure:"rpc" json:"-"` - RaftBoltDBConfig *consul.RaftBoltDBConfig `mapstructure:"raft_boltdb"` + RaftBoltDBConfig *consul.RaftBoltDBConfig `mapstructure:"raft_boltdb" json:"-"` // UseStreamingBackend instead of blocking queries for service health and // any other endpoints which support streaming. - UseStreamingBackend *bool `mapstructure:"use_streaming_backend"` + UseStreamingBackend *bool `mapstructure:"use_streaming_backend" json:"-"` // This isn't used by Consul but we've documented a feature where users // can deploy their snapshot agent configs alongside their Consul configs // so we have a placeholder here so it can be parsed but this doesn't // manifest itself in any way inside the runtime config. - SnapshotAgent map[string]interface{} `mapstructure:"snapshot_agent"` + SnapshotAgent map[string]interface{} `mapstructure:"snapshot_agent" json:"-"` // non-user configurable values - AEInterval *string `mapstructure:"ae_interval"` - CheckDeregisterIntervalMin *string `mapstructure:"check_deregister_interval_min"` - CheckReapInterval *string `mapstructure:"check_reap_interval"` - Consul Consul `mapstructure:"consul"` - Revision *string `mapstructure:"revision"` - SegmentLimit *int `mapstructure:"segment_limit"` - SegmentNameLimit *int `mapstructure:"segment_name_limit"` - SyncCoordinateIntervalMin *string `mapstructure:"sync_coordinate_interval_min"` - SyncCoordinateRateTarget *float64 `mapstructure:"sync_coordinate_rate_target"` - Version *string `mapstructure:"version"` - VersionPrerelease *string `mapstructure:"version_prerelease"` - VersionMetadata *string `mapstructure:"version_metadata"` - BuildDate *time.Time `mapstructure:"build_date"` + AEInterval *string `mapstructure:"ae_interval" json:"-"` + CheckDeregisterIntervalMin *string `mapstructure:"check_deregister_interval_min" json:"-"` + CheckReapInterval *string `mapstructure:"check_reap_interval" json:"-"` + Consul Consul `mapstructure:"consul" json:"-"` + Revision *string `mapstructure:"revision" json:"-"` + SegmentLimit *int `mapstructure:"segment_limit" json:"-"` + SegmentNameLimit *int `mapstructure:"segment_name_limit" json:"-"` + SyncCoordinateIntervalMin *string `mapstructure:"sync_coordinate_interval_min" json:"-"` + SyncCoordinateRateTarget *float64 `mapstructure:"sync_coordinate_rate_target" json:"-"` + Version *string `mapstructure:"version" json:"-"` + VersionPrerelease *string `mapstructure:"version_prerelease" json:"-"` + VersionMetadata *string `mapstructure:"version_metadata" json:"-"` + BuildDate *time.Time `mapstructure:"build_date" json:"-"` // Enterprise Only - Audit Audit `mapstructure:"audit"` + Audit Audit `mapstructure:"audit" json:"-"` // Enterprise Only - ReadReplica *bool `mapstructure:"read_replica" alias:"non_voting_server"` + ReadReplica *bool `mapstructure:"read_replica" alias:"non_voting_server" json:"-"` // Enterprise Only - SegmentName *string `mapstructure:"segment"` + SegmentName *string `mapstructure:"segment" json:"-"` // Enterprise Only - Segments []Segment `mapstructure:"segments"` + Segments []Segment `mapstructure:"segments" json:"-"` // Enterprise Only - Partition *string `mapstructure:"partition"` + Partition *string `mapstructure:"partition" json:"-"` // Enterprise Only - not user configurable - LicensePollBaseTime *string `mapstructure:"license_poll_base_time"` - LicensePollMaxTime *string `mapstructure:"license_poll_max_time"` - LicenseUpdateBaseTime *string `mapstructure:"license_update_base_time"` - LicenseUpdateMaxTime *string `mapstructure:"license_update_max_time"` + LicensePollBaseTime *string `mapstructure:"license_poll_base_time" json:"-"` + LicensePollMaxTime *string `mapstructure:"license_poll_max_time" json:"-"` + LicenseUpdateBaseTime *string `mapstructure:"license_update_base_time" json:"-"` + LicenseUpdateMaxTime *string `mapstructure:"license_update_max_time" json:"-"` } type GossipLANConfig struct { @@ -592,33 +592,33 @@ type ExposePath struct { // AutoEncrypt is the agent-global auto_encrypt configuration. type AutoEncrypt struct { // TLS enables receiving certificates for clients from servers - TLS *bool `mapstructure:"tls"` + TLS *bool `mapstructure:"tls" json:"tls,omitempty"` // Additional DNS SAN entries that clients request for their certificates. - DNSSAN []string `mapstructure:"dns_san"` + DNSSAN []string `mapstructure:"dns_san" json:"dns_san,omitempty"` // Additional IP SAN entries that clients request for their certificates. - IPSAN []string `mapstructure:"ip_san"` + IPSAN []string `mapstructure:"ip_san" json:"ip_san,omitempty"` // AllowTLS enables the RPC endpoint on the server to answer // AutoEncrypt.Sign requests. - AllowTLS *bool `mapstructure:"allow_tls"` + AllowTLS *bool `mapstructure:"allow_tls" json:"allow_tls,omitempty"` } // Connect is the agent-global connect configuration. type Connect struct { // Enabled opts the agent into connect. It should be set on all clients and // servers in a cluster for correct connect operation. - Enabled *bool `mapstructure:"enabled"` - CAProvider *string `mapstructure:"ca_provider"` - CAConfig map[string]interface{} `mapstructure:"ca_config"` - MeshGatewayWANFederationEnabled *bool `mapstructure:"enable_mesh_gateway_wan_federation"` - EnableServerlessPlugin *bool `mapstructure:"enable_serverless_plugin"` + Enabled *bool `mapstructure:"enabled" json:"enabled,omitempty"` + CAProvider *string `mapstructure:"ca_provider" json:"ca_provider,omitempty"` + CAConfig map[string]interface{} `mapstructure:"ca_config" json:"ca_config,omitempty"` + MeshGatewayWANFederationEnabled *bool `mapstructure:"enable_mesh_gateway_wan_federation" json:"enable_mesh_gateway_wan_federation,omitempty"` + EnableServerlessPlugin *bool `mapstructure:"enable_serverless_plugin" json:"enable_serverless_plugin,omitempty"` // TestCALeafRootChangeSpread controls how long after a CA roots change before new leaf certs will be generated. // This is only tuned in tests, generally set to 1ns to make tests deterministic with when to expect updated leaf // certs by. This configuration is not exposed to users (not documented, and agent/config/default.go will override it) - TestCALeafRootChangeSpread *string `mapstructure:"test_ca_leaf_root_change_spread"` + TestCALeafRootChangeSpread *string `mapstructure:"test_ca_leaf_root_change_spread" json:"test_ca_leaf_root_change_spread,omitempty"` } // SOA is the configuration of SOA for DNS @@ -665,46 +665,46 @@ type Performance struct { } type Telemetry struct { - CirconusAPIApp *string `mapstructure:"circonus_api_app"` - CirconusAPIToken *string `mapstructure:"circonus_api_token"` - CirconusAPIURL *string `mapstructure:"circonus_api_url"` - CirconusBrokerID *string `mapstructure:"circonus_broker_id"` - CirconusBrokerSelectTag *string `mapstructure:"circonus_broker_select_tag"` - CirconusCheckDisplayName *string `mapstructure:"circonus_check_display_name"` - CirconusCheckForceMetricActivation *string `mapstructure:"circonus_check_force_metric_activation"` - CirconusCheckID *string `mapstructure:"circonus_check_id"` - CirconusCheckInstanceID *string `mapstructure:"circonus_check_instance_id"` - CirconusCheckSearchTag *string `mapstructure:"circonus_check_search_tag"` - CirconusCheckTags *string `mapstructure:"circonus_check_tags"` - CirconusSubmissionInterval *string `mapstructure:"circonus_submission_interval"` - CirconusSubmissionURL *string `mapstructure:"circonus_submission_url"` - DisableHostname *bool `mapstructure:"disable_hostname"` - DogstatsdAddr *string `mapstructure:"dogstatsd_addr"` - DogstatsdTags []string `mapstructure:"dogstatsd_tags"` - RetryFailedConfiguration *bool `mapstructure:"retry_failed_connection"` - FilterDefault *bool `mapstructure:"filter_default"` - PrefixFilter []string `mapstructure:"prefix_filter"` - MetricsPrefix *string `mapstructure:"metrics_prefix"` - PrometheusRetentionTime *string `mapstructure:"prometheus_retention_time"` - StatsdAddr *string `mapstructure:"statsd_address"` - StatsiteAddr *string `mapstructure:"statsite_address"` + CirconusAPIApp *string `mapstructure:"circonus_api_app" json:"circonus_api_app,omitempty"` + CirconusAPIToken *string `mapstructure:"circonus_api_token" json:"circonus_api_token,omitempty"` + CirconusAPIURL *string `mapstructure:"circonus_api_url" json:"circonus_api_url,omitempty"` + CirconusBrokerID *string `mapstructure:"circonus_broker_id" json:"circonus_broker_id,omitempty"` + CirconusBrokerSelectTag *string `mapstructure:"circonus_broker_select_tag" json:"circonus_broker_select_tag,omitempty"` + CirconusCheckDisplayName *string `mapstructure:"circonus_check_display_name" json:"circonus_check_display_name,omitempty"` + CirconusCheckForceMetricActivation *string `mapstructure:"circonus_check_force_metric_activation" json:"circonus_check_force_metric_activation,omitempty"` + CirconusCheckID *string `mapstructure:"circonus_check_id" json:"circonus_check_id,omitempty"` + CirconusCheckInstanceID *string `mapstructure:"circonus_check_instance_id" json:"circonus_check_instance_id,omitempty"` + CirconusCheckSearchTag *string `mapstructure:"circonus_check_search_tag" json:"circonus_check_search_tag,omitempty"` + CirconusCheckTags *string `mapstructure:"circonus_check_tags" json:"circonus_check_tags,omitempty"` + CirconusSubmissionInterval *string `mapstructure:"circonus_submission_interval" json:"circonus_submission_interval,omitempty"` + CirconusSubmissionURL *string `mapstructure:"circonus_submission_url" json:"circonus_submission_url,omitempty"` + DisableHostname *bool `mapstructure:"disable_hostname" json:"disable_hostname,omitempty"` + DogstatsdAddr *string `mapstructure:"dogstatsd_addr" json:"dogstatsd_addr,omitempty"` + DogstatsdTags []string `mapstructure:"dogstatsd_tags" json:"dogstatsd_tags,omitempty"` + RetryFailedConfiguration *bool `mapstructure:"retry_failed_connection" json:"retry_failed_connection,omitempty"` + FilterDefault *bool `mapstructure:"filter_default" json:"filter_default,omitempty"` + PrefixFilter []string `mapstructure:"prefix_filter" json:"prefix_filter,omitempty"` + MetricsPrefix *string `mapstructure:"metrics_prefix" json:"metrics_prefix,omitempty"` + PrometheusRetentionTime *string `mapstructure:"prometheus_retention_time" json:"prometheus_retention_time,omitempty"` + StatsdAddr *string `mapstructure:"statsd_address" json:"statsd_address,omitempty"` + StatsiteAddr *string `mapstructure:"statsite_address" json:"statsite_address,omitempty"` } type Ports struct { - DNS *int `mapstructure:"dns"` - HTTP *int `mapstructure:"http"` - HTTPS *int `mapstructure:"https"` - SerfLAN *int `mapstructure:"serf_lan"` - SerfWAN *int `mapstructure:"serf_wan"` - Server *int `mapstructure:"server"` - GRPC *int `mapstructure:"grpc"` - GRPCTLS *int `mapstructure:"grpc_tls"` - ProxyMinPort *int `mapstructure:"proxy_min_port"` - ProxyMaxPort *int `mapstructure:"proxy_max_port"` - SidecarMinPort *int `mapstructure:"sidecar_min_port"` - SidecarMaxPort *int `mapstructure:"sidecar_max_port"` - ExposeMinPort *int `mapstructure:"expose_min_port"` - ExposeMaxPort *int `mapstructure:"expose_max_port"` + DNS *int `mapstructure:"dns" json:"dns,omitempty"` + HTTP *int `mapstructure:"http" json:"http,omitempty"` + HTTPS *int `mapstructure:"https" json:"https,omitempty"` + SerfLAN *int `mapstructure:"serf_lan" json:"serf_lan,omitempty"` + SerfWAN *int `mapstructure:"serf_wan" json:"serf_wan,omitempty"` + Server *int `mapstructure:"server" json:"server,omitempty"` + GRPC *int `mapstructure:"grpc" json:"grpc,omitempty"` + GRPCTLS *int `mapstructure:"grpc_tls" json:"grpc_tls,omitempty"` + ProxyMinPort *int `mapstructure:"proxy_min_port" json:"proxy_min_port,omitempty"` + ProxyMaxPort *int `mapstructure:"proxy_max_port" json:"proxy_max_port,omitempty"` + SidecarMinPort *int `mapstructure:"sidecar_min_port" json:"sidecar_min_port,omitempty"` + SidecarMaxPort *int `mapstructure:"sidecar_max_port" json:"sidecar_max_port,omitempty"` + ExposeMinPort *int `mapstructure:"expose_min_port" json:"expose_min_port,omitempty" ` + ExposeMaxPort *int `mapstructure:"expose_max_port" json:"expose_max_port,omitempty"` } type UnixSocket struct { @@ -873,23 +873,23 @@ type CloudConfigRaw struct { } type TLSProtocolConfig struct { - CAFile *string `mapstructure:"ca_file"` - CAPath *string `mapstructure:"ca_path"` - CertFile *string `mapstructure:"cert_file"` - KeyFile *string `mapstructure:"key_file"` - TLSMinVersion *string `mapstructure:"tls_min_version"` - TLSCipherSuites *string `mapstructure:"tls_cipher_suites"` - VerifyIncoming *bool `mapstructure:"verify_incoming"` - VerifyOutgoing *bool `mapstructure:"verify_outgoing"` - VerifyServerHostname *bool `mapstructure:"verify_server_hostname"` - UseAutoCert *bool `mapstructure:"use_auto_cert"` + CAFile *string `mapstructure:"ca_file" json:"ca_file,omitempty"` + CAPath *string `mapstructure:"ca_path" json:"ca_path,omitempty"` + CertFile *string `mapstructure:"cert_file" json:"cert_file,omitempty"` + KeyFile *string `mapstructure:"key_file" json:"key_file,omitempty"` + TLSMinVersion *string `mapstructure:"tls_min_version" json:"tls_min_version,omitempty"` + TLSCipherSuites *string `mapstructure:"tls_cipher_suites" json:"tls_cipher_suites,omitempty"` + VerifyIncoming *bool `mapstructure:"verify_incoming" json:"verify_incoming,omitempty"` + VerifyOutgoing *bool `mapstructure:"verify_outgoing" json:"verify_outgoing,omitempty"` + VerifyServerHostname *bool `mapstructure:"verify_server_hostname" json:"verify_server_hostname,omitempty"` + UseAutoCert *bool `mapstructure:"use_auto_cert" json:"use_auto_cert,omitempty"` } type TLS struct { - Defaults TLSProtocolConfig `mapstructure:"defaults"` - InternalRPC TLSProtocolConfig `mapstructure:"internal_rpc"` - HTTPS TLSProtocolConfig `mapstructure:"https"` - GRPC TLSProtocolConfig `mapstructure:"grpc"` + Defaults TLSProtocolConfig `mapstructure:"defaults" json:"defaults,omitempty"` + InternalRPC TLSProtocolConfig `mapstructure:"internal_rpc" json:"internal_rpc,omitempty"` + HTTPS TLSProtocolConfig `mapstructure:"https" json:"https,omitempty"` + GRPC TLSProtocolConfig `mapstructure:"grpc" json:"grpc,omitempty"` // GRPCModifiedByDeprecatedConfig is a flag used to indicate that GRPC was // modified by the deprecated field mapping (as apposed to a user-provided @@ -902,15 +902,15 @@ type TLS struct { // // Note: we use a *struct{} here because a simple bool isn't supported by our // config merging logic. - GRPCModifiedByDeprecatedConfig *struct{} `mapstructure:"-"` + GRPCModifiedByDeprecatedConfig *struct{} `mapstructure:"-" json:"-"` } type Peering struct { - Enabled *bool `mapstructure:"enabled"` + Enabled *bool `mapstructure:"enabled" json:"enabled,omitempty"` // TestAllowPeerRegistrations controls whether CatalogRegister endpoints allow registrations for objects with `PeerName` // This always gets overridden in NonUserSource() - TestAllowPeerRegistrations *bool `mapstructure:"test_allow_peer_registrations"` + TestAllowPeerRegistrations *bool `mapstructure:"test_allow_peer_registrations" json:"test_allow_peer_registrations,omitempty"` } type XDS struct { diff --git a/test/integration/consul-container/go.mod b/test/integration/consul-container/go.mod index 9536901cfb..f5c0f9c889 100644 --- a/test/integration/consul-container/go.mod +++ b/test/integration/consul-container/go.mod @@ -4,62 +4,174 @@ go 1.19 require ( github.com/docker/docker v20.10.11+incompatible - github.com/hashicorp/consul/api v1.15.2 + github.com/docker/go-connections v0.4.0 + github.com/hashicorp/consul v1.13.3 + github.com/hashicorp/consul/api v1.15.3 github.com/hashicorp/consul/sdk v0.11.0 - github.com/hashicorp/go-uuid v1.0.2 - github.com/hashicorp/hcl v1.0.0 - github.com/stretchr/testify v1.7.0 + github.com/hashicorp/serf v0.10.1 + github.com/itchyny/gojq v0.12.9 + github.com/pkg/errors v0.9.1 + github.com/stretchr/testify v1.8.0 + github.com/teris-io/shortid v0.0.0-20220617161101-71ec9f2aa569 github.com/testcontainers/testcontainers-go v0.13.0 ) require ( github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 // indirect + github.com/DataDog/datadog-go v3.2.0+incompatible // indirect github.com/Microsoft/go-winio v0.4.17 // indirect github.com/Microsoft/hcsshim v0.8.24 // indirect + github.com/PuerkitoBio/purell v1.1.1 // indirect + github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578 // indirect + github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e // indirect github.com/armon/go-metrics v0.3.10 // indirect + github.com/armon/go-radix v1.0.0 // indirect + github.com/asaskevich/govalidator v0.0.0-20210307081110-f21760c49a8d // indirect + github.com/aws/aws-sdk-go v1.42.34 // indirect + github.com/beorn7/perks v1.0.1 // indirect + github.com/boltdb/bolt v1.3.1 // indirect github.com/cenkalti/backoff/v4 v4.1.2 // indirect + github.com/cespare/xxhash/v2 v2.1.1 // indirect + github.com/circonus-labs/circonus-gometrics v2.3.1+incompatible // indirect + github.com/circonus-labs/circonusllhist v0.1.3 // indirect github.com/containerd/cgroups v1.0.3 // indirect github.com/containerd/containerd v1.5.13 // indirect + github.com/coreos/go-oidc v2.1.0+incompatible // indirect github.com/davecgh/go-spew v1.1.1 // indirect github.com/docker/distribution v2.7.1+incompatible // indirect - github.com/docker/go-connections v0.4.0 // indirect github.com/docker/go-units v0.4.0 // indirect - github.com/fatih/color v1.10.0 // indirect + github.com/fatih/color v1.13.0 // indirect + github.com/fsnotify/fsnotify v1.5.1 // indirect + github.com/go-logr/logr v0.2.0 // indirect + github.com/go-openapi/analysis v0.21.2 // indirect + github.com/go-openapi/errors v0.20.2 // indirect + github.com/go-openapi/jsonpointer v0.19.5 // indirect + github.com/go-openapi/jsonreference v0.19.6 // indirect + github.com/go-openapi/loads v0.21.1 // indirect + github.com/go-openapi/runtime v0.24.1 // indirect + github.com/go-openapi/spec v0.20.4 // indirect + github.com/go-openapi/strfmt v0.21.3 // indirect + github.com/go-openapi/swag v0.21.1 // indirect + github.com/go-openapi/validate v0.21.0 // indirect + github.com/go-ozzo/ozzo-validation v3.6.0+incompatible // indirect + github.com/go-test/deep v1.0.3 // indirect github.com/gogo/protobuf v1.3.2 // indirect github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e // indirect github.com/golang/protobuf v1.5.2 // indirect + github.com/golang/snappy v0.0.1 // indirect + github.com/google/btree v1.0.0 // indirect + github.com/google/gofuzz v1.2.0 // indirect github.com/google/uuid v1.3.0 // indirect + github.com/googleapis/gnostic v0.4.1 // indirect + github.com/gorilla/mux v1.7.3 // indirect + github.com/grpc-ecosystem/go-grpc-middleware v1.0.1-0.20190118093823-f849b5445de4 // indirect + github.com/hashicorp/consul-awsauth v0.0.0-20220713182709-05ac1c5c2706 // indirect + github.com/hashicorp/consul-net-rpc v0.0.0-20220307172752-3602954411b4 // indirect + github.com/hashicorp/consul/proto-public v0.1.0 // indirect github.com/hashicorp/errwrap v1.1.0 // indirect + github.com/hashicorp/go-bexpr v0.1.2 // indirect github.com/hashicorp/go-cleanhttp v0.5.2 // indirect - github.com/hashicorp/go-hclog v0.16.2 // indirect + github.com/hashicorp/go-connlimit v0.3.0 // indirect + github.com/hashicorp/go-hclog v1.2.1 // indirect github.com/hashicorp/go-immutable-radix v1.3.1 // indirect + github.com/hashicorp/go-memdb v1.3.4 // indirect + github.com/hashicorp/go-msgpack v1.1.5 // indirect + github.com/hashicorp/go-multierror v1.1.1 // indirect + github.com/hashicorp/go-raftchunking v0.6.2 // indirect + github.com/hashicorp/go-retryablehttp v0.6.7 // indirect github.com/hashicorp/go-rootcerts v1.0.2 // indirect + github.com/hashicorp/go-sockaddr v1.0.2 // indirect + github.com/hashicorp/go-syslog v1.0.0 // indirect + github.com/hashicorp/go-uuid v1.0.2 // indirect + github.com/hashicorp/go-version v1.2.1 // indirect github.com/hashicorp/golang-lru v0.5.4 // indirect - github.com/hashicorp/serf v0.10.1 // indirect + github.com/hashicorp/hcl v1.0.0 // indirect + github.com/hashicorp/hcp-scada-provider v0.1.0 // indirect + github.com/hashicorp/hcp-sdk-go v0.23.1-0.20220921131124-49168300a7dc // indirect + github.com/hashicorp/hil v0.0.0-20200423225030-a18a1cd20038 // indirect + github.com/hashicorp/memberlist v0.5.0 // indirect + github.com/hashicorp/net-rpc-msgpackrpc v0.0.0-20151116020338-a14192a58a69 // indirect + github.com/hashicorp/raft v1.3.11 // indirect + github.com/hashicorp/raft-autopilot v0.1.6 // indirect + github.com/hashicorp/raft-boltdb/v2 v2.2.2 // indirect + github.com/hashicorp/vault/api v1.0.5-0.20200717191844-f687267c8086 // indirect + github.com/hashicorp/vault/sdk v0.1.14-0.20200519221838-e0cfd64bc267 // indirect + github.com/hashicorp/yamux v0.0.0-20211028200310-0bc27b27de87 // indirect + github.com/imdario/mergo v0.3.13 // indirect + github.com/itchyny/timefmt-go v0.1.4 // indirect + github.com/jmespath/go-jmespath v0.4.0 // indirect + github.com/josharian/intern v1.0.0 // indirect + github.com/json-iterator/go v1.1.10 // indirect github.com/magiconair/properties v1.8.5 // indirect - github.com/mattn/go-colorable v0.1.8 // indirect - github.com/mattn/go-isatty v0.0.12 // indirect + github.com/mailru/easyjson v0.7.7 // indirect + github.com/mattn/go-colorable v0.1.12 // indirect + github.com/mattn/go-isatty v0.0.16 // indirect + github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 // indirect + github.com/miekg/dns v1.1.41 // indirect + github.com/mitchellh/colorstring v0.0.0-20190213212951-d06e56a500db // indirect + github.com/mitchellh/copystructure v1.0.0 // indirect github.com/mitchellh/go-homedir v1.1.0 // indirect - github.com/mitchellh/mapstructure v1.4.2 // indirect + github.com/mitchellh/go-testing-interface v1.14.0 // indirect + github.com/mitchellh/hashstructure v0.0.0-20170609045927-2bca23e0e452 // indirect + github.com/mitchellh/hashstructure/v2 v2.0.2 // indirect + github.com/mitchellh/mapstructure v1.4.3 // indirect + github.com/mitchellh/pointerstructure v1.2.1 // indirect + github.com/mitchellh/reflectwalk v1.0.1 // indirect github.com/moby/sys/mount v0.2.0 // indirect github.com/moby/sys/mountinfo v0.5.0 // indirect github.com/moby/term v0.0.0-20210619224110-3f7ff695adc6 // indirect + github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect + github.com/modern-go/reflect2 v1.0.1 // indirect github.com/morikuni/aec v0.0.0-20170113033406-39771216ff4c // indirect + github.com/oklog/ulid v1.3.1 // indirect github.com/opencontainers/go-digest v1.0.0 // indirect github.com/opencontainers/image-spec v1.0.2 // indirect github.com/opencontainers/runc v1.1.4 // indirect - github.com/pkg/errors v0.9.1 // indirect + github.com/opentracing/opentracing-go v1.2.0 // indirect + github.com/patrickmn/go-cache v2.1.0+incompatible // indirect + github.com/pierrec/lz4 v2.5.2+incompatible // indirect github.com/pmezard/go-difflib v1.0.0 // indirect + github.com/pquerna/cachecontrol v0.0.0-20180517163645-1555304b9b35 // indirect + github.com/prometheus/client_golang v1.7.1 // indirect + github.com/prometheus/client_model v0.2.0 // indirect + github.com/prometheus/common v0.10.0 // indirect + github.com/prometheus/procfs v0.6.0 // indirect + github.com/ryanuber/go-glob v1.0.0 // indirect + github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529 // indirect github.com/sirupsen/logrus v1.8.1 // indirect - go.opencensus.io v0.22.3 // indirect - golang.org/x/net v0.0.0-20211216030914-fe4d6282115f // indirect - golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10 // indirect - google.golang.org/genproto v0.0.0-20201110150050-8816d57aaa9a // indirect - google.golang.org/grpc v1.41.0 // indirect - google.golang.org/protobuf v1.27.1 // indirect - gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect + github.com/skratchdot/open-golang v0.0.0-20200116055534-eef842397966 // indirect + github.com/stretchr/objx v0.4.0 // indirect + github.com/tv42/httpunix v0.0.0-20150427012821-b75d8614f926 // indirect + go.etcd.io/bbolt v1.3.5 // indirect + go.mongodb.org/mongo-driver v1.10.0 // indirect + go.opencensus.io v0.22.4 // indirect + golang.org/x/crypto v0.0.0-20220622213112-05595931fe9d // indirect + golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd // indirect + golang.org/x/oauth2 v0.0.0-20201109201403-9fd604954f58 // indirect + golang.org/x/sync v0.0.0-20210220032951-036812b2e83c // indirect + golang.org/x/sys v0.0.0-20220829200755-d48e67d00261 // indirect + golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 // indirect + golang.org/x/text v0.3.7 // indirect + golang.org/x/time v0.0.0-20200630173020-3af7569d3a1e // indirect + google.golang.org/appengine v1.6.6 // indirect + google.golang.org/genproto v0.0.0-20220329172620-7be39ac1afc7 // indirect + google.golang.org/grpc v1.45.0 // indirect + google.golang.org/protobuf v1.28.0 // indirect + gopkg.in/inf.v0 v0.9.1 // indirect + gopkg.in/square/go-jose.v2 v2.5.1 // indirect + gopkg.in/yaml.v2 v2.4.0 // indirect + gopkg.in/yaml.v3 v3.0.1 // indirect + k8s.io/api v0.20.6 // indirect + k8s.io/apimachinery v0.20.6 // indirect + k8s.io/client-go v0.20.6 // indirect + k8s.io/klog/v2 v2.4.0 // indirect + k8s.io/utils v0.0.0-20201110183641-67b214c5f920 // indirect + sigs.k8s.io/structured-merge-diff/v4 v4.0.3 // indirect + sigs.k8s.io/yaml v1.2.0 // indirect ) replace github.com/hashicorp/consul/api => ../../../api replace github.com/hashicorp/consul/sdk => ../../../sdk + +replace github.com/hashicorp/consul => ../../.. diff --git a/test/integration/consul-container/go.sum b/test/integration/consul-container/go.sum index 643599e21f..699a570ca8 100644 --- a/test/integration/consul-container/go.sum +++ b/test/integration/consul-container/go.sum @@ -10,17 +10,27 @@ cloud.google.com/go v0.50.0/go.mod h1:r9sluTvynVuxRIOHXQEHMFffphuXHOMZMycpNR5e6T cloud.google.com/go v0.52.0/go.mod h1:pXajvRH/6o3+F9jDHZWQ5PbGhn+o8w9qiu/CffaVdO4= cloud.google.com/go v0.53.0/go.mod h1:fp/UouUEsRkN6ryDKNW/Upv/JBKnv6WDthjR6+vze6M= cloud.google.com/go v0.54.0/go.mod h1:1rq2OEkV3YMf6n/9ZvGWI3GWw0VoqH/1x2nd8Is/bPc= +cloud.google.com/go v0.56.0/go.mod h1:jr7tqZxxKOVYizybht9+26Z/gUq7tiRzu+ACVAMbKVk= +cloud.google.com/go v0.57.0/go.mod h1:oXiQ6Rzq3RAkkY7N6t3TcE6jE+CIBBbA36lwQ1JyzZs= +cloud.google.com/go v0.62.0/go.mod h1:jmCYTdRCQuc1PHIIJ/maLInMho30T/Y0M4hTdTShOYc= +cloud.google.com/go v0.65.0/go.mod h1:O5N8zS7uWy9vkA9vayVHs65eM1ubvY4h553ofrNHObY= cloud.google.com/go/bigquery v1.0.1/go.mod h1:i/xbL2UlR5RvWAURpBYZTtm/cXjCha9lbfbpx4poX+o= cloud.google.com/go/bigquery v1.3.0/go.mod h1:PjpwJnslEMmckchkHFfq+HTD2DmtT67aNFKH1/VBDHE= cloud.google.com/go/bigquery v1.4.0/go.mod h1:S8dzgnTigyfTmLBfrtrhyYhwRxG72rYxvftPBK2Dvzc= +cloud.google.com/go/bigquery v1.5.0/go.mod h1:snEHRnqQbz117VIFhE8bmtwIDY80NLUZUMb4Nv6dBIg= +cloud.google.com/go/bigquery v1.7.0/go.mod h1://okPTzCYNXSlb24MZs83e2Do+h+VXtc4gLoIoXIAPc= +cloud.google.com/go/bigquery v1.8.0/go.mod h1:J5hqkt3O0uAFnINi6JXValWIb1v0goeZM77hZzJN/fQ= cloud.google.com/go/datastore v1.0.0/go.mod h1:LXYbyblFSglQ5pkeyhO+Qmw7ukd3C+pD7TKLgZqpHYE= cloud.google.com/go/datastore v1.1.0/go.mod h1:umbIZjpQpHh4hmRpGhH4tLFup+FVzqBi1b3c64qFpCk= cloud.google.com/go/pubsub v1.0.1/go.mod h1:R0Gpsv3s54REJCy4fxDixWD93lHJMoZTyQ2kNxGRt3I= cloud.google.com/go/pubsub v1.1.0/go.mod h1:EwwdRX2sKPjnvnqCa270oGRyludottCI76h+R3AArQw= cloud.google.com/go/pubsub v1.2.0/go.mod h1:jhfEVHT8odbXTkndysNHCcx0awwzvfOlguIAii9o8iA= +cloud.google.com/go/pubsub v1.3.1/go.mod h1:i+ucay31+CNRpDW4Lu78I4xXG+O1r/MAHgjpRVR+TSU= cloud.google.com/go/storage v1.0.0/go.mod h1:IhtSnM/ZTZV8YYJWCY8RULGVqBDmpoyjwiyrjsg+URw= cloud.google.com/go/storage v1.5.0/go.mod h1:tpKbwo567HUNpVclU5sGELwQWBDZ8gh0ZeosJ0Rtdos= cloud.google.com/go/storage v1.6.0/go.mod h1:N7U0C8pVQ/+NIKOBQyamJIeKQKkZ+mxpohlUTyfDhBk= +cloud.google.com/go/storage v1.8.0/go.mod h1:Wv1Oy7z6Yz3DshWRJFhqM/UCfaWIRTdp0RXyy7KQOVs= +cloud.google.com/go/storage v1.10.0/go.mod h1:FLPqc6j+Ki4BU591ie1oL6qBQGu2Bl/tZ9ullr3+Kg0= dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU= github.com/Azure/azure-sdk-for-go v16.2.1+incompatible/go.mod h1:9XXNKU+eRnpl9moKnB4QOLf1HestfXbmab5FXxiDBjc= github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78/go.mod h1:LmzpDX56iTiv29bbRTIsUNlaFfuhWRQBWjQdVyAevI8= @@ -38,6 +48,8 @@ github.com/Azure/go-autorest/logger v0.2.0/go.mod h1:T9E3cAhj2VqvPOtCYAvby9aBXkZ github.com/Azure/go-autorest/tracing v0.6.0/go.mod h1:+vhtPC754Xsa23ID7GlGsrdKBpUA79WCAKPPZVC2DeU= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo= +github.com/DataDog/datadog-go v2.2.0+incompatible/go.mod h1:LButxg5PwREeZtORoXG3tL4fMGNddJ+vMq1mwgfaqoQ= +github.com/DataDog/datadog-go v3.2.0+incompatible h1:qSG2N4FghB1He/r2mFrWKCaL7dXCilEuNEeAn20fdD4= github.com/DataDog/datadog-go v3.2.0+incompatible/go.mod h1:LButxg5PwREeZtORoXG3tL4fMGNddJ+vMq1mwgfaqoQ= github.com/Microsoft/go-winio v0.4.11/go.mod h1:VhR8bwka0BXejwEJY73c50VrPtXAaKcyvVC4A4RozmA= github.com/Microsoft/go-winio v0.4.14/go.mod h1:qXqCSQ3Xa7+6tgxaGTIe4Kpcdsi+P8jBhyzoq1bpyYA= @@ -62,7 +74,9 @@ github.com/Microsoft/hcsshim/test v0.0.0-20201218223536-d3e5debf77da/go.mod h1:5 github.com/Microsoft/hcsshim/test v0.0.0-20210227013316-43a75bb4edd3/go.mod h1:mw7qgWloBUl75W/gVH3cQszUg1+gUITj7D6NY7ywVnY= github.com/NYTimes/gziphandler v0.0.0-20170623195520-56545f4a5d46/go.mod h1:3wb06e3pkSAbeQ52E9H9iFoQsEEwGN64994WTCIhntQ= github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU= +github.com/PuerkitoBio/purell v1.1.1 h1:WEQqlqaGbrPkxLJWfBwQmfEAE1Z7ONdDLqrN38tNFfI= github.com/PuerkitoBio/purell v1.1.1/go.mod h1:c11w/QuzBsJSee3cPx9rAFu61PvFxuPbtSwDGJws/X0= +github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578 h1:d+Bc7a5rLufV/sSk/8dngufqelfh6jnri85riMAaF/M= github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578/go.mod h1:uGdkoq3SwY9Y+13GIhn11/XLaGBb4BfwItxLd5jeuXE= github.com/Shopify/logrus-bugsnag v0.0.0-20171204204709-577dee27f20d/go.mod h1:HI8ITrYtUY+O+ZhtlqUnD8+KwNPOyugEhfP9fdUIaEQ= github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= @@ -71,18 +85,29 @@ github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRF github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0= github.com/alexflint/go-filemutex v0.0.0-20171022225611-72bdc8eae2ae/go.mod h1:CgnQgUtFrFz9mxFNtED3jI5tLDjKlOM+oUF/sTk6ps0= github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY= +github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e h1:QEF07wC0T1rKkctt1RINW/+RMTVmiwxETico2l3gxJA= github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod h1:3U/XgcO3hCbHZ8TKRvWD2dDTCfh9M9ya+I9JpbB7O8o= github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod h1:grANhF5doyWs3UAsr3K4I6qtAmlQcZDesFNEHPZAzj8= github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da/go.mod h1:Q73ZrmVTwzkszR9V5SSuryQ31EELlFMUz1kKyl939pY= +github.com/armon/go-metrics v0.0.0-20190430140413-ec5e00d3c878/go.mod h1:3AMJUQhVx52RsWOnlkpikZr01T/yAVN2gn0861vByNg= +github.com/armon/go-metrics v0.3.0/go.mod h1:zXjbSimjXTd7vOpY8B0/2LpvNvDoXBuplAD+gJD3GYs= github.com/armon/go-metrics v0.3.10 h1:FR+drcQStOe+32sYyJYyZ7FIdgoGGBnwLl+flodp8Uo= github.com/armon/go-metrics v0.3.10/go.mod h1:4O98XIr/9W0sxpJ8UaYkvjk10Iff7SnFrb4QAOwNTFc= github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8= +github.com/armon/go-radix v1.0.0 h1:F4z6KzEeeQIMeLFa97iZU6vupzoecKdU5TX24SNppXI= github.com/armon/go-radix v1.0.0/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8= github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a/go.mod h1:lB+ZfQJz7igIIfQNfa7Ml4HSf2uFQQRzpGGRXenZAgY= +github.com/asaskevich/govalidator v0.0.0-20200907205600-7a23bdc65eef/go.mod h1:WaHUgvxTVq04UNunO+XhnAqY/wQc+bxr74GqbsZ/Jqw= +github.com/asaskevich/govalidator v0.0.0-20210307081110-f21760c49a8d h1:Byv0BzEl3/e6D5CLfI0j/7hiIEtvGVFPCZ7Ei2oq8iQ= +github.com/asaskevich/govalidator v0.0.0-20210307081110-f21760c49a8d/go.mod h1:WaHUgvxTVq04UNunO+XhnAqY/wQc+bxr74GqbsZ/Jqw= github.com/aws/aws-sdk-go v1.15.11/go.mod h1:mFuSZ37Z9YOHbQEwBWztmVzqXrEkub65tZoCYDt7FT0= +github.com/aws/aws-sdk-go v1.25.37/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo= +github.com/aws/aws-sdk-go v1.42.34 h1:fqGAiKmCSRY1rEa4G9VqgkKKbNmLKYq5dKmLtQkvYi8= +github.com/aws/aws-sdk-go v1.42.34/go.mod h1:OGr6lGMAKGlG9CVrYnWYDKIyb829c6EVBRjxqjmPepc= github.com/beorn7/perks v0.0.0-20160804104726-4c0e84591b9a/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q= github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q= github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8= +github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM= github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw= github.com/bgentry/speakeasy v0.1.0/go.mod h1:+zsyZBPWlz7T6j88CTgSN5bM796AkVf0kBD4zp0CCIs= github.com/bitly/go-simplejson v0.5.0/go.mod h1:cXHtHw4XUPsvGaxgjIAn8PhEWG9NfngEKAMDJEczWVA= @@ -90,6 +115,8 @@ github.com/bits-and-blooms/bitset v1.2.0/go.mod h1:gIdJ4wp64HaoK2YrL1Q5/N7Y16edY github.com/blang/semver v3.1.0+incompatible/go.mod h1:kRBLl5iJ+tD4TcOOxsy/0fnwebNt5EWlYSAyrTnjyyk= github.com/blang/semver v3.5.1+incompatible/go.mod h1:kRBLl5iJ+tD4TcOOxsy/0fnwebNt5EWlYSAyrTnjyyk= github.com/bmizerany/assert v0.0.0-20160611221934-b7ed37b82869/go.mod h1:Ekp36dRnpXw/yCqJaO+ZrUyxD+3VXMFFr56k5XYrpB4= +github.com/boltdb/bolt v1.3.1 h1:JQmyP4ZBrce+ZQu0dY660FMfatumYDLun9hBCUVIkF4= +github.com/boltdb/bolt v1.3.1/go.mod h1:clJnj/oiGkjum5o1McbSZDSLxVThjynRyGBgiAx27Ps= github.com/bshuster-repo/logrus-logstash-hook v0.4.1/go.mod h1:zsTqEiSzDgAa/8GZR7E1qaXrhYNDKBYy5/dWPTIflbk= github.com/buger/jsonparser v0.0.0-20180808090653-f4dd9f5a6b44/go.mod h1:bbYlZJ7hK1yFx9hf58LP0zeX7UjIGs20ufpu3evjr+s= github.com/bugsnag/bugsnag-go v0.0.0-20141110184014-b1d153021fcd/go.mod h1:2oa8nejYd4cQ/b0hMIopN0lCRxU0bueqREvZLWFrtK8= @@ -100,6 +127,7 @@ github.com/cenkalti/backoff/v4 v4.1.2 h1:6Yo7N8UP2K6LWZnW94DLVSSrbobcWdVzAYOisuD github.com/cenkalti/backoff/v4 v4.1.2/go.mod h1:scbssz8iZGpm3xbr14ovlUdkxfGXNInqkPWOWmG2CLw= github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc= +github.com/cespare/xxhash/v2 v2.1.1 h1:6MnRN8NT7+YBpUIWxHtefFZOKTAPgGjpQSxqLNn0+qY= github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= github.com/checkpoint-restore/go-criu/v4 v4.1.0/go.mod h1:xUQBLp4RLc5zJtWY++yjOoMoB5lihDt7fai+75m+rGw= github.com/checkpoint-restore/go-criu/v5 v5.0.0/go.mod h1:cfwC0EG7HMUenopBsUf9d89JlCLQIfgVcNsNN0t6T2M= @@ -113,12 +141,17 @@ github.com/cilium/ebpf v0.2.0/go.mod h1:To2CFviqOWL/M0gIMsvSMlqe7em/l1ALkX1PyjrX github.com/cilium/ebpf v0.4.0/go.mod h1:4tRaxcgiL706VnOzHOdBlY8IEAIdxINsQBcU4xJJXRs= github.com/cilium/ebpf v0.6.2/go.mod h1:4tRaxcgiL706VnOzHOdBlY8IEAIdxINsQBcU4xJJXRs= github.com/cilium/ebpf v0.7.0/go.mod h1:/oI2+1shJiTGAMgl6/RgJr36Eo1jzrRcAWbcXO2usCA= +github.com/circonus-labs/circonus-gometrics v2.3.1+incompatible h1:C29Ae4G5GtYyYMm1aztcyj/J5ckgJm2zwdDajFbx1NY= github.com/circonus-labs/circonus-gometrics v2.3.1+incompatible/go.mod h1:nmEj6Dob7S7YxXgwXpfOuvO54S+tGdZdw9fuRZt25Ag= +github.com/circonus-labs/circonusllhist v0.1.3 h1:TJH+oke8D16535+jHExHj4nQvzlZrj7ug5D7I/orNUA= github.com/circonus-labs/circonusllhist v0.1.3/go.mod h1:kMXHVDlOchFAehlya5ePtbp5jckzBHf4XRpQvBOLI+I= github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= +github.com/cncf/udpa/go v0.0.0-20210930031921-04548b0d99d4/go.mod h1:6pvJx4me5XPnfI9Z40ddWsdw2W/uZgQLFXToKeRcDiI= github.com/cncf/xds/go v0.0.0-20210805033703-aa0b78936158/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= +github.com/cncf/xds/go v0.0.0-20210922020428-25de7278fc84/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= +github.com/cncf/xds/go v0.0.0-20211011173535-cb28da3451f1/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= github.com/cockroachdb/datadriven v0.0.0-20190809214429-80d97fb3cbaa/go.mod h1:zn76sxSg3SzpJ0PPJaLDCu+Bu0Lg3sKTORVIj19EIF8= github.com/containerd/aufs v0.0.0-20200908144142-dab0cbea06f4/go.mod h1:nukgQABAEopAHvB6j7cnP5zJ+/3aVcE7hCYqvIwAHyE= github.com/containerd/aufs v0.0.0-20201003224125-76a6863f2989/go.mod h1:AkGGQs9NM2vtYHaUen+NljV0/baGCAPELGm2q9ZXpWU= @@ -213,6 +246,7 @@ github.com/coreos/bbolt v1.3.2/go.mod h1:iRUV2dpdMOn7Bo10OQBFzIJO9kkE559Wcmn+qkE github.com/coreos/etcd v3.3.10+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE= github.com/coreos/go-iptables v0.4.5/go.mod h1:/mVI274lEDI2ns62jHCDnCyBF9Iwsmekav8Dbxlm1MU= github.com/coreos/go-iptables v0.5.0/go.mod h1:/mVI274lEDI2ns62jHCDnCyBF9Iwsmekav8Dbxlm1MU= +github.com/coreos/go-oidc v2.1.0+incompatible h1:sdJrfw8akMnCuUlaZU3tE/uYXFgfqom8DBE9so9EBsM= github.com/coreos/go-oidc v2.1.0+incompatible/go.mod h1:CgnwVTmzoESiwO9qyAFEMiHoZ1nMCKZlZ9V6mm3/LKc= github.com/coreos/go-semver v0.2.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk= github.com/coreos/go-semver v0.3.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk= @@ -276,38 +310,103 @@ github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7 github.com/evanphx/json-patch v4.9.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk= github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4= github.com/fatih/color v1.9.0/go.mod h1:eQcE1qtQxscV5RaZvpXrrb8Drkc3/DdQ+uUYCNjL+zU= -github.com/fatih/color v1.10.0 h1:s36xzo75JdqLaaWoiEHk767eHiwo0598uUxyfiPkDsg= github.com/fatih/color v1.10.0/go.mod h1:ELkj/draVOlAH/xkhN6mQ50Qd0MPOk5AAr3maGEBuJM= +github.com/fatih/color v1.13.0 h1:8LOYc1KYPPmyKMuN8QV2DNRWNbLo6LZ0iLs8+mlH53w= +github.com/fatih/color v1.13.0/go.mod h1:kLAiJbzzSOZDVNGyDpeOxJ47H46qBXwg5ILebYFFOfk= +github.com/fatih/structs v1.1.0/go.mod h1:9NiDSp5zOcgEDl+j00MP/WkGVPOlPRLejGD8Ga6PJ7M= github.com/form3tech-oss/jwt-go v3.2.2+incompatible/go.mod h1:pbq4aXjuKjdthFRnoDwaVPLA+WlJuPGy+QneDUgJi2k= +github.com/frankban/quicktest v1.11.3 h1:8sXhOn0uLys67V8EsXLc6eszDs8VXWxL3iRvebPhedY= github.com/frankban/quicktest v1.11.3/go.mod h1:wRf/ReqHper53s+kmmSZizM8NamnL3IM0I9ntUbOk+k= github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo= github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ= +github.com/fsnotify/fsnotify v1.5.1 h1:mZcQUHVQUQWoPXXtuf9yuEXKudkV2sx1E06UadKWpgI= +github.com/fsnotify/fsnotify v1.5.1/go.mod h1:T3375wBYaZdLLcVNkcVbzGHY7f1l/uK5T5Ai1i3InKU= github.com/fullsailor/pkcs7 v0.0.0-20190404230743-d7302db945fa/go.mod h1:KnogPXtdwXqoenmZCw6S+25EAm2MkxbG0deNDu4cbSA= github.com/garyburd/redigo v0.0.0-20150301180006-535138d7bcd7/go.mod h1:NR3MbYisc3/PwhQ00EMzDiPmrwpPxAn5GI05/YaO1SY= github.com/ghodss/yaml v0.0.0-20150909031657-73d445a93680/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= +github.com/go-asn1-ber/asn1-ber v1.3.1/go.mod h1:hEBeB/ic+5LoWskz+yKT7vGhhPYkProFKoKdwZRWMe0= github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU= github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8= github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8= github.com/go-ini/ini v1.25.4/go.mod h1:ByCAeIL28uOIIG0E3PJtZPDL8WnHpFKFOtgjp+3Ies8= github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as= github.com/go-kit/kit v0.9.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as= +github.com/go-ldap/ldap/v3 v3.1.3/go.mod h1:3rbOH3jRS2u6jg2rJnKAMLE/xQyCKIveG2Sa/Cohzb8= github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE= github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk= github.com/go-logr/logr v0.1.0/go.mod h1:ixOQHD9gLJUVQQ2ZOR7zLEifBX6tGkNJF4QyIY7sIas= +github.com/go-logr/logr v0.2.0 h1:QvGt2nLcHH0WK9orKa+ppBPAxREcH364nPUedEpK0TY= github.com/go-logr/logr v0.2.0/go.mod h1:z6/tIYblkpsD+a4lm/fGIIU9mZ+XfAiaFtq7xTgseGU= +github.com/go-openapi/analysis v0.21.2 h1:hXFrOYFHUAMQdu6zwAiKKJHJQ8kqZs1ux/ru1P1wLJU= +github.com/go-openapi/analysis v0.21.2/go.mod h1:HZwRk4RRisyG8vx2Oe6aqeSQcoxRp47Xkp3+K6q+LdY= +github.com/go-openapi/errors v0.19.8/go.mod h1:cM//ZKUKyO06HSwqAelJ5NsEMMcpa6VpXe8DOa1Mi1M= +github.com/go-openapi/errors v0.19.9/go.mod h1:cM//ZKUKyO06HSwqAelJ5NsEMMcpa6VpXe8DOa1Mi1M= +github.com/go-openapi/errors v0.20.2 h1:dxy7PGTqEh94zj2E3h1cUmQQWiM1+aeCROfAr02EmK8= +github.com/go-openapi/errors v0.20.2/go.mod h1:cM//ZKUKyO06HSwqAelJ5NsEMMcpa6VpXe8DOa1Mi1M= github.com/go-openapi/jsonpointer v0.19.2/go.mod h1:3akKfEdA7DF1sugOqz1dVQHBcuDBPKZGEoHC/NkiQRg= github.com/go-openapi/jsonpointer v0.19.3/go.mod h1:Pl9vOtqEWErmShwVjC8pYs9cog34VGT37dQOVbmoatg= +github.com/go-openapi/jsonpointer v0.19.5 h1:gZr+CIYByUqjcgeLXnQu2gHYQC9o73G2XUeOFYEICuY= +github.com/go-openapi/jsonpointer v0.19.5/go.mod h1:Pl9vOtqEWErmShwVjC8pYs9cog34VGT37dQOVbmoatg= github.com/go-openapi/jsonreference v0.19.2/go.mod h1:jMjeRr2HHw6nAVajTXJ4eiUwohSTlpa0o73RUL1owJc= github.com/go-openapi/jsonreference v0.19.3/go.mod h1:rjx6GuL8TTa9VaixXglHmQmIL98+wF9xc8zWvFonSJ8= +github.com/go-openapi/jsonreference v0.19.6 h1:UBIxjkht+AWIgYzCDSv2GN+E/togfwXUJFRTWhl2Jjs= +github.com/go-openapi/jsonreference v0.19.6/go.mod h1:diGHMEHg2IqXZGKxqyvWdfWU/aim5Dprw5bqpKkTvns= +github.com/go-openapi/loads v0.21.1 h1:Wb3nVZpdEzDTcly8S4HMkey6fjARRzb7iEaySimlDW0= +github.com/go-openapi/loads v0.21.1/go.mod h1:/DtAMXXneXFjbQMGEtbamCZb+4x7eGwkvZCvBmwUG+g= +github.com/go-openapi/runtime v0.24.1 h1:Sml5cgQKGYQHF+M7yYSHaH1eOjvTykrddTE/KtQVjqo= +github.com/go-openapi/runtime v0.24.1/go.mod h1:AKurw9fNre+h3ELZfk6ILsfvPN+bvvlaU/M9q/r9hpk= github.com/go-openapi/spec v0.19.3/go.mod h1:FpwSN1ksY1eteniUU7X0N/BgJ7a4WvBFVA8Lj9mJglo= +github.com/go-openapi/spec v0.20.4 h1:O8hJrt0UMnhHcluhIdUgCLRWyM2x7QkBXRvOs7m+O1M= +github.com/go-openapi/spec v0.20.4/go.mod h1:faYFR1CvsJZ0mNsmsphTMSoRrNV3TEDoAM7FOEWeq8I= +github.com/go-openapi/strfmt v0.21.0/go.mod h1:ZRQ409bWMj+SOgXofQAGTIo2Ebu72Gs+WaRADcS5iNg= +github.com/go-openapi/strfmt v0.21.1/go.mod h1:I/XVKeLc5+MM5oPNN7P6urMOpuLXEcNrCX/rPGuWb0k= +github.com/go-openapi/strfmt v0.21.2/go.mod h1:I/XVKeLc5+MM5oPNN7P6urMOpuLXEcNrCX/rPGuWb0k= +github.com/go-openapi/strfmt v0.21.3 h1:xwhj5X6CjXEZZHMWy1zKJxvW9AfHC9pkyUjLvHtKG7o= +github.com/go-openapi/strfmt v0.21.3/go.mod h1:k+RzNO0Da+k3FrrynSNN8F7n/peCmQQqbbXjtDfvmGg= github.com/go-openapi/swag v0.19.2/go.mod h1:POnQmlKehdgb5mhVOsnJFsivZCEZ/vjK9gh66Z9tfKk= github.com/go-openapi/swag v0.19.5/go.mod h1:POnQmlKehdgb5mhVOsnJFsivZCEZ/vjK9gh66Z9tfKk= +github.com/go-openapi/swag v0.19.15/go.mod h1:QYRuS/SOXUCsnplDa677K7+DxSOj6IPNl/eQntq43wQ= +github.com/go-openapi/swag v0.21.1 h1:wm0rhTb5z7qpJRHBdPOMuY4QjVUMbF6/kwoYeRAOrKU= +github.com/go-openapi/swag v0.21.1/go.mod h1:QYRuS/SOXUCsnplDa677K7+DxSOj6IPNl/eQntq43wQ= +github.com/go-openapi/validate v0.21.0 h1:+Wqk39yKOhfpLqNLEC0/eViCkzM5FVXVqrvt526+wcI= +github.com/go-openapi/validate v0.21.0/go.mod h1:rjnrwK57VJ7A8xqfpAOEKRH8yQSGUriMu5/zuPSQ1hg= +github.com/go-ozzo/ozzo-validation v3.6.0+incompatible h1:msy24VGS42fKO9K1vLz82/GeYW1cILu7Nuuj1N3BBkE= +github.com/go-ozzo/ozzo-validation v3.6.0+incompatible/go.mod h1:gsEKFIVnabGBt6mXmxK0MoFy+cZoTJY6mu5Ll3LVLBU= github.com/go-redis/redis v6.15.9+incompatible h1:K0pv1D7EQUjfyoMql+r/jZqCLizCGKFlFgcHWWmHQjg= github.com/go-redis/redis v6.15.9+incompatible/go.mod h1:NAIEuMOZ/fxfXJIrKDQDz8wamY7mA7PouImQ2Jvg6kA= github.com/go-sql-driver/mysql v1.6.0 h1:BCTh4TKNUYmOmMUcQ3IipzF5prigylS7XXjEkfCHuOE= github.com/go-sql-driver/mysql v1.6.0/go.mod h1:DCzpHaOWr8IXmIStZouvnhqoel9Qv2LBy8hT2VhHyBg= github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY= +github.com/go-stack/stack v1.8.1/go.mod h1:dcoOX6HbPZSZptuspn9bctJ+N/CnF5gGygcUP3XYfe4= +github.com/go-test/deep v1.0.2-0.20181118220953-042da051cf31/go.mod h1:wGDj63lr65AM2AQyKZd/NYHGb0R+1RLqB8NKt3aSFNA= +github.com/go-test/deep v1.0.2/go.mod h1:wGDj63lr65AM2AQyKZd/NYHGb0R+1RLqB8NKt3aSFNA= +github.com/go-test/deep v1.0.3 h1:ZrJSEWsXzPOxaZnFteGEfooLba+ju3FYIbOrS+rQd68= +github.com/go-test/deep v1.0.3/go.mod h1:wGDj63lr65AM2AQyKZd/NYHGb0R+1RLqB8NKt3aSFNA= +github.com/gobuffalo/attrs v0.0.0-20190224210810-a9411de4debd/go.mod h1:4duuawTqi2wkkpB4ePgWMaai6/Kc6WEz83bhFwpHzj0= +github.com/gobuffalo/depgen v0.0.0-20190329151759-d478694a28d3/go.mod h1:3STtPUQYuzV0gBVOY3vy6CfMm/ljR4pABfrTeHNLHUY= +github.com/gobuffalo/depgen v0.1.0/go.mod h1:+ifsuy7fhi15RWncXQQKjWS9JPkdah5sZvtHc2RXGlg= +github.com/gobuffalo/envy v1.6.15/go.mod h1:n7DRkBerg/aorDM8kbduw5dN3oXGswK5liaSCx4T5NI= +github.com/gobuffalo/envy v1.7.0/go.mod h1:n7DRkBerg/aorDM8kbduw5dN3oXGswK5liaSCx4T5NI= +github.com/gobuffalo/flect v0.1.0/go.mod h1:d2ehjJqGOH/Kjqcoz+F7jHTBbmDb38yXA598Hb50EGs= +github.com/gobuffalo/flect v0.1.1/go.mod h1:8JCgGVbRjJhVgD6399mQr4fx5rRfGKVzFjbj6RE/9UI= +github.com/gobuffalo/flect v0.1.3/go.mod h1:8JCgGVbRjJhVgD6399mQr4fx5rRfGKVzFjbj6RE/9UI= +github.com/gobuffalo/genny v0.0.0-20190329151137-27723ad26ef9/go.mod h1:rWs4Z12d1Zbf19rlsn0nurr75KqhYp52EAGGxTbBhNk= +github.com/gobuffalo/genny v0.0.0-20190403191548-3ca520ef0d9e/go.mod h1:80lIj3kVJWwOrXWWMRzzdhW3DsrdjILVil/SFKBzF28= +github.com/gobuffalo/genny v0.1.0/go.mod h1:XidbUqzak3lHdS//TPu2OgiFB+51Ur5f7CSnXZ/JDvo= +github.com/gobuffalo/genny v0.1.1/go.mod h1:5TExbEyY48pfunL4QSXxlDOmdsD44RRq4mVZ0Ex28Xk= +github.com/gobuffalo/gitgen v0.0.0-20190315122116-cc086187d211/go.mod h1:vEHJk/E9DmhejeLeNt7UVvlSGv3ziL+djtTr3yyzcOw= +github.com/gobuffalo/gogen v0.0.0-20190315121717-8f38393713f5/go.mod h1:V9QVDIxsgKNZs6L2IYiGR8datgMhB577vzTDqypH360= +github.com/gobuffalo/gogen v0.1.0/go.mod h1:8NTelM5qd8RZ15VjQTFkAW6qOMx5wBbW4dSCS3BY8gg= +github.com/gobuffalo/gogen v0.1.1/go.mod h1:y8iBtmHmGc4qa3urIyo1shvOD8JftTtfcKi+71xfDNE= +github.com/gobuffalo/logger v0.0.0-20190315122211-86e12af44bc2/go.mod h1:QdxcLw541hSGtBnhUc4gaNIXRjiDppFGaDqzbrBd3v8= +github.com/gobuffalo/mapi v1.0.1/go.mod h1:4VAGh89y6rVOvm5A8fKFxYG+wIW6LO1FMTG9hnKStFc= +github.com/gobuffalo/mapi v1.0.2/go.mod h1:4VAGh89y6rVOvm5A8fKFxYG+wIW6LO1FMTG9hnKStFc= +github.com/gobuffalo/packd v0.0.0-20190315124812-a385830c7fc0/go.mod h1:M2Juc+hhDXf/PnmBANFCqx4DM3wRbgDvnVWeG2RIxq4= +github.com/gobuffalo/packd v0.1.0/go.mod h1:M2Juc+hhDXf/PnmBANFCqx4DM3wRbgDvnVWeG2RIxq4= +github.com/gobuffalo/packr/v2 v2.0.9/go.mod h1:emmyGweYTm6Kdper+iywB6YK5YzuKchGtJQZ0Odn4pQ= +github.com/gobuffalo/packr/v2 v2.2.0/go.mod h1:CaAwI0GPIAv+5wKLtv8Afwl+Cm78K/I/VCm/3ptBN+0= +github.com/gobuffalo/syncx v0.0.0-20190224160051-33c29581e754/go.mod h1:HhnNqWY95UYwwW3uSASeV7vtgYkT2t16hJgV3AEPUpw= github.com/godbus/dbus v0.0.0-20151105175453-c7fdd8b5cd55/go.mod h1:/YcGZj5zSblfDWMMoOzV4fas9FZnQYTkDnsGvmh2Grw= github.com/godbus/dbus v0.0.0-20180201030542-885f9cc04c9c/go.mod h1:/YcGZj5zSblfDWMMoOzV4fas9FZnQYTkDnsGvmh2Grw= github.com/godbus/dbus v0.0.0-20190422162347-ade71ed3457e/go.mod h1:bBOAhwG1umN6/6ZUMtDFBMQR8jRg9O75tm9K00oMsK4= @@ -335,6 +434,8 @@ github.com/golang/mock v1.2.0/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfb github.com/golang/mock v1.3.1/go.mod h1:sBzyDLLjw3U8JLTeZvSv8jJB+tU5PVekmnlKIyFUx0Y= github.com/golang/mock v1.4.0/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw= github.com/golang/mock v1.4.1/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw= +github.com/golang/mock v1.4.3/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw= +github.com/golang/mock v1.4.4/go.mod h1:l3mdAwkq5BuhzHwde/uurv3sEJeZMXNpwsxVWU71h+4= github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= @@ -352,6 +453,8 @@ github.com/golang/protobuf v1.4.3/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk= github.com/golang/protobuf v1.5.2 h1:ROPKBNFfQgOUMifHyP+KYbvpjbdoFNs+aK7DXlji0Tw= github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= +github.com/golang/snappy v0.0.1 h1:Qgr9rKW7uDUkrbSmQeiDsGa8SjGyCOGtuasMWwvp2P4= +github.com/golang/snappy v0.0.1/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= github.com/google/btree v1.0.0 h1:0udJVsspx3VBr5FwtLhQQtuAsVc79tTq0ocGIPAU6qo= github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= @@ -359,23 +462,30 @@ github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5a github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/go-cmp v0.4.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/go-cmp v0.5.7 h1:81/ik6ipDQS2aGcBfIN5dHDB36BwrStyeAQquSYCV4o= github.com/google/go-cmp v0.5.7/go.mod h1:n+brtR0CgQNWTVd5ZUFpTBC8YFBDLK/h/bpaJ8/DtOE= +github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= github.com/google/gofuzz v1.1.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= +github.com/google/gofuzz v1.2.0 h1:xRy4A+RhZaiKjJ1bPfwQ8sedCA+YS2YcCHW6ec7JMi0= +github.com/google/gofuzz v1.2.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs= +github.com/google/martian/v3 v3.0.0/go.mod h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIGO+w/tUAp0= github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc= github.com/google/pprof v0.0.0-20190515194954-54271f7e092f/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc= github.com/google/pprof v0.0.0-20191218002539-d4f498aebedc/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= github.com/google/pprof v0.0.0-20200212024743-f11f1df84d12/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= github.com/google/pprof v0.0.0-20200229191704-1ebb73c60ed3/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= +github.com/google/pprof v0.0.0-20200430221834-fc25d7d30c6d/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= +github.com/google/pprof v0.0.0-20200708004538-1a94d8640e99/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI= github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510/go.mod h1:pupxD2MaaD3pAXIBCelhxNneeOaAeabZDe5s4K6zSpQ= +github.com/google/tcpproxy v0.0.0-20180808230851-dfa16c61dad2 h1:AtvtonGEH/fZK0XPNNBdB6swgy7Iudfx88wzyIpwqJ8= github.com/google/uuid v1.0.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/google/uuid v1.1.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= @@ -384,68 +494,125 @@ github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I= github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg= github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5mhpdKc/us6bOk= +github.com/googleapis/gnostic v0.4.1 h1:DLJCy1n/vrD4HPjOvYcT8aYQXpPIzoRZONaYwyycI+I= github.com/googleapis/gnostic v0.4.1/go.mod h1:LRhVm6pbyptWbWbuZ38d1eyptfvIytN3ir6b65WBswg= github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY= github.com/gorilla/handlers v0.0.0-20150720190736-60c7bfde3e33/go.mod h1:Qkdc/uu4tH4g6mTK6auzZ766c4CA0Ng8+o/OAirnOIQ= -github.com/gorilla/mux v1.7.2 h1:zoNxOV7WjqXptQOVngLmcSQgXmgk4NMz1HibBchjl/I= github.com/gorilla/mux v1.7.2/go.mod h1:1lud6UwP+6orDFRuTfBEV8e9/aOM/c4fVVCaMa2zaAs= +github.com/gorilla/mux v1.7.3 h1:gnP5JzjVOuiZD07fKKToCAOjS0yOpj/qPETTXCCS6hw= +github.com/gorilla/mux v1.7.3/go.mod h1:1lud6UwP+6orDFRuTfBEV8e9/aOM/c4fVVCaMa2zaAs= github.com/gorilla/websocket v0.0.0-20170926233335-4201258b820c/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoAMk2YaljkQ= github.com/gorilla/websocket v1.4.0/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoAMk2YaljkQ= github.com/gorilla/websocket v1.4.2/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7/go.mod h1:FecbI9+v66THATjSRHfNgh1IVFe/9kFxbXtjV0ctIMA= github.com/grpc-ecosystem/go-grpc-middleware v1.0.0/go.mod h1:FiyG127CGDf3tlThmgyCl78X/SZQqEOJBCDaAfeWzPs= +github.com/grpc-ecosystem/go-grpc-middleware v1.0.1-0.20190118093823-f849b5445de4 h1:z53tR0945TRRQO/fLEVPI6SMv7ZflF0TEaTAoU7tOzg= github.com/grpc-ecosystem/go-grpc-middleware v1.0.1-0.20190118093823-f849b5445de4/go.mod h1:FiyG127CGDf3tlThmgyCl78X/SZQqEOJBCDaAfeWzPs= github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod h1:8NvIoxWQoOIhqOTXgfV/d3M/q6VIi02HzZEHgUlZvzk= github.com/grpc-ecosystem/grpc-gateway v1.9.0/go.mod h1:vNeuVxBJEsws4ogUvrchl83t/GYV9WGTSLVdBhOQFDY= github.com/grpc-ecosystem/grpc-gateway v1.9.5/go.mod h1:vNeuVxBJEsws4ogUvrchl83t/GYV9WGTSLVdBhOQFDY= github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFbcEtjT1g+wF4CSlocrBnw= +github.com/hashicorp/consul-awsauth v0.0.0-20220713182709-05ac1c5c2706 h1:1ZEjnveDe20yFa6lSkfdQZm5BR/b271n0MsB5R2L3us= +github.com/hashicorp/consul-awsauth v0.0.0-20220713182709-05ac1c5c2706/go.mod h1:1Cs8FlmD1BfSQXJGcFLSV5FuIx1AbJP+EJGdxosoS2g= +github.com/hashicorp/consul-net-rpc v0.0.0-20220307172752-3602954411b4 h1:Com/5n/omNSBusX11zdyIYtidiqewLIanchbm//McZA= +github.com/hashicorp/consul-net-rpc v0.0.0-20220307172752-3602954411b4/go.mod h1:vWEAHAeAqfOwB3pSgHMQpIu8VH1jL+Ltg54Tw0wt/NI= +github.com/hashicorp/consul/proto-public v0.1.0 h1:O0LSmCqydZi363hsqc6n2v5sMz3usQMXZF6ziK3SzXU= +github.com/hashicorp/consul/proto-public v0.1.0/go.mod h1:vs2KkuWwtjkIgA5ezp4YKPzQp4GitV+q/+PvksrA92k= github.com/hashicorp/errwrap v0.0.0-20141028054710-7554cd9344ce/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4= github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4= github.com/hashicorp/errwrap v1.1.0 h1:OxrOeh75EUXMY8TBjag2fzXGZ40LB6IKw45YeGUDY2I= github.com/hashicorp/errwrap v1.1.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4= +github.com/hashicorp/go-bexpr v0.1.2 h1:ijMXI4qERbzxbCnkxmfUtwMyjrrk3y+Vt0MxojNCbBs= +github.com/hashicorp/go-bexpr v0.1.2/go.mod h1:ANbpTX1oAql27TZkKVeW8p1w8NTdnyzPe/0qqPCKohU= github.com/hashicorp/go-cleanhttp v0.5.0/go.mod h1:JpRdi6/HCYpAwUzNwuwqhbovhLtngrth3wmdIIUrZ80= github.com/hashicorp/go-cleanhttp v0.5.1/go.mod h1:JpRdi6/HCYpAwUzNwuwqhbovhLtngrth3wmdIIUrZ80= github.com/hashicorp/go-cleanhttp v0.5.2 h1:035FKYIWjmULyFRBKPs8TBQoi0x6d9G4xc9neXJWAZQ= github.com/hashicorp/go-cleanhttp v0.5.2/go.mod h1:kO/YDlP8L1346E6Sodw+PrpBSV4/SoxCXGY6BqNFT48= +github.com/hashicorp/go-connlimit v0.3.0 h1:oAojHGjFxUTTTA8c5XXnDqWJ2HLuWbDiBPTpWvNzvqM= +github.com/hashicorp/go-connlimit v0.3.0/go.mod h1:OUj9FGL1tPIhl/2RCfzYHrIiWj+VVPGNyVPnUX8AqS0= +github.com/hashicorp/go-hclog v0.0.0-20180709165350-ff2cf002a8dd/go.mod h1:9bjs9uLqI8l75knNv3lV1kA55veR+WUPSiKIWcQHudI= +github.com/hashicorp/go-hclog v0.9.1/go.mod h1:5CU+agLiy3J7N7QjHK5d05KxGsuXiQLrjA0H7acj2lQ= +github.com/hashicorp/go-hclog v0.9.2/go.mod h1:5CU+agLiy3J7N7QjHK5d05KxGsuXiQLrjA0H7acj2lQ= github.com/hashicorp/go-hclog v0.12.0/go.mod h1:whpDNt7SSdeAju8AWKIWsul05p54N/39EeqMAyrmvFQ= github.com/hashicorp/go-hclog v0.14.1/go.mod h1:whpDNt7SSdeAju8AWKIWsul05p54N/39EeqMAyrmvFQ= -github.com/hashicorp/go-hclog v0.16.2 h1:K4ev2ib4LdQETX5cSZBG0DVLk1jwGqSPXBjdah3veNs= -github.com/hashicorp/go-hclog v0.16.2/go.mod h1:whpDNt7SSdeAju8AWKIWsul05p54N/39EeqMAyrmvFQ= +github.com/hashicorp/go-hclog v1.2.1 h1:YQsLlGDJgwhXFpucSPyVbCBviQtjlHv3jLTlp8YmtEw= +github.com/hashicorp/go-hclog v1.2.1/go.mod h1:W4Qnvbt70Wk/zYJryRzDRU/4r0kIg0PVHBcfoyhpF5M= github.com/hashicorp/go-immutable-radix v1.0.0/go.mod h1:0y9vanUI8NX6FsYoO3zeMjhV/C5i9g4Q3DwcSNZ4P60= github.com/hashicorp/go-immutable-radix v1.3.0/go.mod h1:0y9vanUI8NX6FsYoO3zeMjhV/C5i9g4Q3DwcSNZ4P60= github.com/hashicorp/go-immutable-radix v1.3.1 h1:DKHmCUm2hRBK510BaiZlwvpD40f8bJFeZnpfm2KLowc= github.com/hashicorp/go-immutable-radix v1.3.1/go.mod h1:0y9vanUI8NX6FsYoO3zeMjhV/C5i9g4Q3DwcSNZ4P60= +github.com/hashicorp/go-kms-wrapping/entropy v0.1.0/go.mod h1:d1g9WGtAunDNpek8jUIEJnBlbgKS1N2Q61QkHiZyR1g= +github.com/hashicorp/go-memdb v1.3.4 h1:XSL3NR682X/cVk2IeV0d70N4DZ9ljI885xAEU8IoK3c= +github.com/hashicorp/go-memdb v1.3.4/go.mod h1:uBTr1oQbtuMgd1SSGoR8YV27eT3sBHbYiNm53bMpgSg= github.com/hashicorp/go-msgpack v0.5.3/go.mod h1:ahLV/dePpqEmjfWmKiqvPkv/twdG7iPBM1vqhUKIvfM= -github.com/hashicorp/go-msgpack v0.5.5 h1:i9R9JSrqIz0QVLz3sz+i3YJdT7TTSLcfLLzJi9aZTuI= github.com/hashicorp/go-msgpack v0.5.5/go.mod h1:ahLV/dePpqEmjfWmKiqvPkv/twdG7iPBM1vqhUKIvfM= +github.com/hashicorp/go-msgpack v1.1.5 h1:9byZdVjKTe5mce63pRVNP1L7UAmdHOTEMGehn6KvJWs= +github.com/hashicorp/go-msgpack v1.1.5/go.mod h1:gWVc3sv/wbDmR3rQsj1CAktEZzoz1YNK9NfGLXJ69/4= github.com/hashicorp/go-multierror v0.0.0-20161216184304-ed905158d874/go.mod h1:JMRHfdO9jKNzS/+BTlxCjKNQHg/jZAft8U7LloJvN7I= github.com/hashicorp/go-multierror v1.0.0/go.mod h1:dHtQlpGsu+cZNNAkkCN/P3hoUDHhCYQXV3UM06sGGrk= github.com/hashicorp/go-multierror v1.1.0/go.mod h1:spPvp8C1qA32ftKqdAHm4hHTbPw+vmowP0z+KUhOZdA= github.com/hashicorp/go-multierror v1.1.1 h1:H5DkEtf6CXdFp0N0Em5UCwQpXMWke8IA0+lD48awMYo= github.com/hashicorp/go-multierror v1.1.1/go.mod h1:iw975J/qwKPdAO1clOe2L8331t/9/fmwbPZ6JB6eMoM= +github.com/hashicorp/go-plugin v1.0.1/go.mod h1:++UyYGoz3o5w9ZzAdZxtQKrWWP+iqPBn3cQptSMzBuY= +github.com/hashicorp/go-raftchunking v0.6.2 h1:imj6CVkwXj6VzgXZQvzS+fSrkbFCzlJ2t00F3PacnuU= +github.com/hashicorp/go-raftchunking v0.6.2/go.mod h1:cGlg3JtDy7qy6c/3Bu660Mic1JF+7lWqIwCFSb08fX0= github.com/hashicorp/go-retryablehttp v0.5.3/go.mod h1:9B5zBasrRhHXnJnui7y6sL7es7NDiJgTc6Er0maI1Xs= +github.com/hashicorp/go-retryablehttp v0.6.6/go.mod h1:vAew36LZh98gCBJNLH42IQ1ER/9wtLZZ8meHqQvEYWY= +github.com/hashicorp/go-retryablehttp v0.6.7 h1:8/CAEZt/+F7kR7GevNHulKkUjLht3CPmn7egmhieNKo= +github.com/hashicorp/go-retryablehttp v0.6.7/go.mod h1:vAew36LZh98gCBJNLH42IQ1ER/9wtLZZ8meHqQvEYWY= github.com/hashicorp/go-rootcerts v1.0.2 h1:jzhAVGtqPKbwpyCPELlgNWhE1znq+qwJtW5Oi2viEzc= github.com/hashicorp/go-rootcerts v1.0.2/go.mod h1:pqUvnprVnM5bf7AOirdbb01K4ccR319Vf4pU3K5EGc8= github.com/hashicorp/go-sockaddr v1.0.0/go.mod h1:7Xibr9yA9JjQq1JpNB2Vw7kxv8xerXegt+ozgdvDeDU= github.com/hashicorp/go-sockaddr v1.0.2 h1:ztczhD1jLxIRjVejw8gFomI1BQZOe2WoVOu0SyteCQc= github.com/hashicorp/go-sockaddr v1.0.2/go.mod h1:rB4wwRAUzs07qva3c5SdrY/NEtAUjGlgmH/UkBUC97A= +github.com/hashicorp/go-syslog v1.0.0 h1:KaodqZuhUoZereWVIYmpUgZysurB1kBLX2j0MwMrUAE= github.com/hashicorp/go-syslog v1.0.0/go.mod h1:qPfqrKkXGihmCqbJM2mZgkZGvKG1dFdvsLplgctolz4= github.com/hashicorp/go-uuid v1.0.0/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro= github.com/hashicorp/go-uuid v1.0.1/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro= github.com/hashicorp/go-uuid v1.0.2 h1:cfejS+Tpcp13yd5nYHWDI6qVCny6wyX2Mt5SGur2IGE= github.com/hashicorp/go-uuid v1.0.2/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro= +github.com/hashicorp/go-version v1.1.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA= +github.com/hashicorp/go-version v1.2.1 h1:zEfKbn2+PDgroKdiOzqiE8rsmLqU2uwi5PB5pBJ3TkI= +github.com/hashicorp/go-version v1.2.1/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA= github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= github.com/hashicorp/golang-lru v0.5.4 h1:YDjusn29QI/Das2iO9M0BHnIbxPeyuCHsjMW+lJfyTc= github.com/hashicorp/golang-lru v0.5.4/go.mod h1:iADmTwqILo4mZ8BN3D2Q6+9jd8WM5uGBxy+E8yxSoD4= github.com/hashicorp/hcl v1.0.0 h1:0Anlzjpi4vEasTeNFn2mLJgTSwt0+6sfsiTG8qcWGx4= github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ= +github.com/hashicorp/hcp-scada-provider v0.1.0 h1:FSjTw7EBl6GJFv5533harm1vw15OaEYodNGHde908MI= +github.com/hashicorp/hcp-scada-provider v0.1.0/go.mod h1:8Pp3pBLzZ9DL56OHSbf55qhh+TpvmXBuR5cJx9jcdcA= +github.com/hashicorp/hcp-sdk-go v0.23.1-0.20220921131124-49168300a7dc h1:on26TCKYnX7JzZCtwkR/LWHSqMu40PoZ6h/0e6Pq8ug= +github.com/hashicorp/hcp-sdk-go v0.23.1-0.20220921131124-49168300a7dc/go.mod h1:/9UoDY2FYYA8lFaKBb2HmM/jKYZGANmf65q9QRc/cVw= +github.com/hashicorp/hil v0.0.0-20200423225030-a18a1cd20038 h1:n9J0rwVWXDpNd5iZnwY7w4WZyq53/rROeI7OVvLW8Ok= +github.com/hashicorp/hil v0.0.0-20200423225030-a18a1cd20038/go.mod h1:n2TSygSNwsLJ76m8qFXTSc7beTb+auJxYdqrnoqwZWE= github.com/hashicorp/logutils v1.0.0/go.mod h1:QIAnNjmIWmVIIkWDTG1z5v++HQmx9WQRO+LraFDTW64= github.com/hashicorp/mdns v1.0.4/go.mod h1:mtBihi+LeNXGtG8L9dX59gAEa12BDtBQSp4v/YAJqrc= github.com/hashicorp/memberlist v0.5.0 h1:EtYPN8DpAURiapus508I4n9CzHs2W+8NZGbmmR/prTM= github.com/hashicorp/memberlist v0.5.0/go.mod h1:yvyXLpo0QaGE59Y7hDTsTzDD25JYBZ4mHgHUZ8lrOI0= +github.com/hashicorp/net-rpc-msgpackrpc v0.0.0-20151116020338-a14192a58a69 h1:lc3c72qGlIMDqQpQH82Y4vaglRMMFdJbziYWriR4UcE= +github.com/hashicorp/net-rpc-msgpackrpc v0.0.0-20151116020338-a14192a58a69/go.mod h1:/z+jUGRBlwVpUZfjute9jWaF6/HuhjuFQuL1YXzVD1Q= +github.com/hashicorp/raft v1.1.0/go.mod h1:4Ak7FSPnuvmb0GV6vgIAJ4vYT4bek9bb6Q+7HVbyzqM= +github.com/hashicorp/raft v1.1.1/go.mod h1:vPAJM8Asw6u8LxC3eJCUZmRP/E4QmUGE1R7g7k8sG/8= +github.com/hashicorp/raft v1.2.0/go.mod h1:vPAJM8Asw6u8LxC3eJCUZmRP/E4QmUGE1R7g7k8sG/8= +github.com/hashicorp/raft v1.3.11 h1:p3v6gf6l3S797NnK5av3HcczOC1T5CLoaRvg0g9ys4A= +github.com/hashicorp/raft v1.3.11/go.mod h1:J8naEwc6XaaCfts7+28whSeRvCqTd6e20BlCU3LtEO4= +github.com/hashicorp/raft-autopilot v0.1.6 h1:C1q3RNF2FfXNZfHWbvVAu0QixaQK8K5pX4O5lh+9z4I= +github.com/hashicorp/raft-autopilot v0.1.6/go.mod h1:Af4jZBwaNOI+tXfIqIdbcAnh/UyyqIMj/pOISIfhArw= +github.com/hashicorp/raft-boltdb v0.0.0-20171010151810-6e5ba93211ea/go.mod h1:pNv7Wc3ycL6F5oOWn+tPGo2gWD4a5X+yp/ntwdKLjRk= +github.com/hashicorp/raft-boltdb v0.0.0-20210409134258-03c10cc3d4ea/go.mod h1:qRd6nFJYYS6Iqnc/8HcUmko2/2Gw8qTFEmxDLii6W5I= +github.com/hashicorp/raft-boltdb v0.0.0-20211202195631-7d34b9fb3f42 h1:Ye8SofeDHJzu9xvvaMmpMkqHELWW7rTcXwdUR0CWW48= +github.com/hashicorp/raft-boltdb/v2 v2.2.2 h1:rlkPtOllgIcKLxVT4nutqlTH2NRFn+tO1wwZk/4Dxqw= +github.com/hashicorp/raft-boltdb/v2 v2.2.2/go.mod h1:N8YgaZgNJLpZC+h+by7vDu5rzsRgONThTEeUS3zWbfY= github.com/hashicorp/serf v0.10.1 h1:Z1H2J60yRKvfDYAOZLd2MU0ND4AH/WDz7xYHDWQsIPY= github.com/hashicorp/serf v0.10.1/go.mod h1:yL2t6BqATOLGc5HF7qbFkTfXoPIY0WZdWHfEvMqbG+4= +github.com/hashicorp/vault/api v1.0.5-0.20200717191844-f687267c8086 h1:OKsyxKi2sNmqm1Gv93adf2AID2FOBFdCbbZn9fGtIdg= +github.com/hashicorp/vault/api v1.0.5-0.20200717191844-f687267c8086/go.mod h1:R3Umvhlxi2TN7Ex2hzOowyeNb+SfbVWI973N+ctaFMk= +github.com/hashicorp/vault/sdk v0.1.14-0.20200519221838-e0cfd64bc267 h1:e1ok06zGrWJW91rzRroyl5nRNqraaBe4d5hiKcVZuHM= +github.com/hashicorp/vault/sdk v0.1.14-0.20200519221838-e0cfd64bc267/go.mod h1:WX57W2PwkrOPQ6rVQk+dy5/htHIaB4aBM70EwKThu10= +github.com/hashicorp/yamux v0.0.0-20180604194846-3520598351bb/go.mod h1:+NfK9FKeTrX5uv1uIXGdwYDTeHna2qgaIlx54MXqjAM= +github.com/hashicorp/yamux v0.0.0-20211028200310-0bc27b27de87 h1:xixZ2bWeofWV68J+x6AzmKuVM/JWCQwkWm6GW/MUR6I= +github.com/hashicorp/yamux v0.0.0-20211028200310-0bc27b27de87/go.mod h1:CtWFDAQgb7dxtzFs4tWbplKIe2jSi3+5vKbgIO0SLnQ= github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU= github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc= github.com/imdario/mergo v0.3.5/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA= @@ -453,26 +620,44 @@ github.com/imdario/mergo v0.3.8/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJ github.com/imdario/mergo v0.3.10/go.mod h1:jmQim1M+e3UYxmgPu/WyfjB3N3VflVyUjjjwH0dnCYA= github.com/imdario/mergo v0.3.11/go.mod h1:jmQim1M+e3UYxmgPu/WyfjB3N3VflVyUjjjwH0dnCYA= github.com/imdario/mergo v0.3.12/go.mod h1:jmQim1M+e3UYxmgPu/WyfjB3N3VflVyUjjjwH0dnCYA= +github.com/imdario/mergo v0.3.13 h1:lFzP57bqS/wsqKssCGmtLAb8A0wKjLGrve2q3PPVcBk= +github.com/imdario/mergo v0.3.13/go.mod h1:4lJ1jqUDcsbIECGy0RUJAXNIhg+6ocWgb1ALK2O4oXg= github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8= +github.com/itchyny/gojq v0.12.9 h1:biKpbKwMxVYhCU1d6mR7qMr3f0Hn9F5k5YykCVb3gmM= +github.com/itchyny/gojq v0.12.9/go.mod h1:T4Ip7AETUXeGpD+436m+UEl3m3tokRgajd5pRfsR5oE= +github.com/itchyny/timefmt-go v0.1.4 h1:hFEfWVdwsEi+CY8xY2FtgWHGQaBaC3JeHd+cve0ynVM= +github.com/itchyny/timefmt-go v0.1.4/go.mod h1:nEP7L+2YmAbT2kZ2HfSs1d8Xtw9LY8D2stDBckWakZ8= github.com/j-keck/arping v0.0.0-20160618110441-2cf9dc699c56/go.mod h1:ymszkNOg6tORTn+6F6j+Jc8TOr5osrynvN6ivFWZ2GA= github.com/jmespath/go-jmespath v0.0.0-20160202185014-0b12d6b521d8/go.mod h1:Nht3zPeWKUH0NzdCt2Blrr5ys8VGpn0CEB0cQHVjt7k= github.com/jmespath/go-jmespath v0.0.0-20160803190731-bd40a432e4c7/go.mod h1:Nht3zPeWKUH0NzdCt2Blrr5ys8VGpn0CEB0cQHVjt7k= +github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af/go.mod h1:Nht3zPeWKUH0NzdCt2Blrr5ys8VGpn0CEB0cQHVjt7k= +github.com/jmespath/go-jmespath v0.4.0 h1:BEgLn5cpjn8UN1mAw4NjwDrS35OdebyEtFe+9YPoQUg= +github.com/jmespath/go-jmespath v0.4.0/go.mod h1:T8mJZnbsbmF+m6zOOFylbeCJqk5+pHWvzYPziyZiYoo= +github.com/jmespath/go-jmespath/internal/testify v1.5.1 h1:shLQSRRSCCPj3f2gpwzGwWFoC7ycTf1rcQZHOlsJ6N8= +github.com/jmespath/go-jmespath/internal/testify v1.5.1/go.mod h1:L3OGu8Wl2/fWfCI6z80xFu9LTZmf1ZRjMHUOPmWr69U= +github.com/joho/godotenv v1.3.0/go.mod h1:7hK45KPybAkOC6peb+G5yklZfMxEjkZhHbwpqxOKXbg= github.com/jonboulle/clockwork v0.1.0/go.mod h1:Ii8DK3G1RaLaWxj9trq07+26W01tbo22gdxWY5EU2bo= github.com/jonboulle/clockwork v0.2.2/go.mod h1:Pkfl5aHPm1nk2H9h0bjmnJD/BcgbGXUBGnn1kMkgxc8= +github.com/josharian/intern v1.0.0 h1:vlS4z54oSdjm0bgjRigI+G1HpF+tI+9rE5LLzOg8HmY= +github.com/josharian/intern v1.0.0/go.mod h1:5DoeVV0s6jJacbCEi61lwdGj/aVlrQvzHFFd8Hwg//Y= github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU= github.com/json-iterator/go v1.1.7/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= github.com/json-iterator/go v1.1.9/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= +github.com/json-iterator/go v1.1.10 h1:Kz6Cvnvv2wGdaG/V8yMvfkmNiXq9Ya2KUv4rouJJr68= github.com/json-iterator/go v1.1.10/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU= github.com/jstemmer/go-junit-report v0.9.1/go.mod h1:Brl9GWCQeLvo8nXZwPNNblvFj/XSXhF0NWZEnDohbsk= github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU= github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w= +github.com/karrick/godirwalk v1.8.0/go.mod h1:H5KPZjojv4lE+QYImBI8xVtrBRgYrIVsaRPx4tDPEn4= +github.com/karrick/godirwalk v1.10.3/go.mod h1:RoGL9dQei4vP9ilrpETWE8CLOZ1kiN0LhBygSwrAsHA= github.com/kisielk/errcheck v1.1.0/go.mod h1:EZBBE59ingxPouuu3KfxchcWSUPOHkagtvWXihfKN4Q= github.com/kisielk/errcheck v1.2.0/go.mod h1:/BMXB+zMLi60iA8Vv6Ksmxu/1UDYcXs4uQLJ+jE2L00= github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8= github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= github.com/klauspost/compress v1.11.3/go.mod h1:aoV0uJVorq1K+umq18yTdKaF57EivdYsUV+/s2qKfXs= github.com/klauspost/compress v1.11.13/go.mod h1:aoV0uJVorq1K+umq18yTdKaF57EivdYsUV+/s2qKfXs= +github.com/klauspost/compress v1.13.6/go.mod h1:/3/Vjq9QcHkK5uEr5lBEmyoZ1iFhe47etQ6QUkpK6sk= github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= github.com/konsorten/go-windows-terminal-sequences v1.0.2/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= github.com/konsorten/go-windows-terminal-sequences v1.0.3/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= @@ -492,22 +677,32 @@ github.com/magiconair/properties v1.8.5/go.mod h1:y3VJvCyxH9uVvJTWEGAELF3aiYNyPK github.com/mailru/easyjson v0.0.0-20190614124828-94de47d64c63/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc= github.com/mailru/easyjson v0.0.0-20190626092158-b2ccc519800e/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc= github.com/mailru/easyjson v0.7.0/go.mod h1:KAzv3t3aY1NaHWoQz1+4F1ccyAH66Jk7yos7ldAVICs= +github.com/mailru/easyjson v0.7.6/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJJLY9Nlc= +github.com/mailru/easyjson v0.7.7 h1:UGYAvKxe3sBsEDzO8ZeWOSlIQfWFlxbzLZe7hwFURr0= +github.com/mailru/easyjson v0.7.7/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJJLY9Nlc= +github.com/markbates/oncer v0.0.0-20181203154359-bf2de49a0be2/go.mod h1:Ld9puTsIW75CHf65OeIOkyKbteujpZVXDpWK6YGZbxE= +github.com/markbates/safe v1.0.1/go.mod h1:nAqgmRi7cY2nqMc92/bSEeQA+R4OheNU2T1kNSCBdG0= github.com/marstr/guid v1.1.0/go.mod h1:74gB1z2wpxxInTG6yaqA7KrtM0NZ+RbrcqDvYHefzho= github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU= github.com/mattn/go-colorable v0.1.4/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE= github.com/mattn/go-colorable v0.1.6/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc= -github.com/mattn/go-colorable v0.1.8 h1:c1ghPdyEDarC70ftn0y+A/Ee++9zz8ljHG1b13eJ0s8= github.com/mattn/go-colorable v0.1.8/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc= +github.com/mattn/go-colorable v0.1.9/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc= +github.com/mattn/go-colorable v0.1.12 h1:jF+Du6AlPIjs2BiUiQlKOX0rt3SujHxPnksPKZbaA40= +github.com/mattn/go-colorable v0.1.12/go.mod h1:u5H1YNBxpqRaxsYJYSkiCWKzEfiAb1Gb520KVy5xxl4= github.com/mattn/go-isatty v0.0.3/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4= github.com/mattn/go-isatty v0.0.4/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4= github.com/mattn/go-isatty v0.0.8/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s= github.com/mattn/go-isatty v0.0.10/go.mod h1:qgIWMr58cqv1PHHyhnkY9lrL7etaEgOFcMEpPG5Rm84= github.com/mattn/go-isatty v0.0.11/go.mod h1:PhnuNfih5lzO57/f3n+odYbM4JtupLOxQOAqxQCu2WE= -github.com/mattn/go-isatty v0.0.12 h1:wuysRhFDzyxgEmMf5xjvJ2M9dZoWAXNNr5LSBS7uHXY= github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU= +github.com/mattn/go-isatty v0.0.14/go.mod h1:7GGIvUiUoEMVVmxf/4nioHXj79iQHKdU27kJ6hsGG94= +github.com/mattn/go-isatty v0.0.16 h1:bq3VjFmv/sOjHtdEhmkEV4x1AJtvUvOJ2PFAZ5+peKQ= +github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM= github.com/mattn/go-runewidth v0.0.2/go.mod h1:LwmH8dsx7+W8Uxz3IHJYH5QSwggIsqBzpuz5H//U1FU= github.com/mattn/go-shellwords v1.0.3/go.mod h1:3xCvwCdWdlDJUrvuMn7Wuy9eWs4pE8vqg+NOMyg4B2o= github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0= +github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 h1:I0XW9+e1XWDxdcEniV4rQAIOPUGDq67JSCiRCgGCZLI= github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369/go.mod h1:BSXmuO+STAnVfrANrmjBb36TMTDstsz7MSK+HVaYKv4= github.com/miekg/dns v1.1.26/go.mod h1:bPDLeHnStXmXAq1m/Ch/hvfNHr14JKNPMBo3VZKjuso= github.com/miekg/dns v1.1.41 h1:WMszZWJG0XmzbK9FEmzH2TVcqYzFesusSIB41b8KHxY= @@ -516,15 +711,34 @@ github.com/miekg/pkcs11 v1.0.3/go.mod h1:XsNlhZGX73bx86s2hdc/FuaLm2CPZJemRLMA+WT github.com/mistifyio/go-zfs v2.1.2-0.20190413222219-f784269be439+incompatible/go.mod h1:8AuVvqP/mXw1px98n46wfvcGfQ4ci2FwoAjKYxuo3Z4= github.com/mitchellh/cli v1.0.0/go.mod h1:hNIlj7HEI86fIcpObd7a0FcrxTWetlwJDGcceTlRvqc= github.com/mitchellh/cli v1.1.0/go.mod h1:xcISNoH86gajksDmfB23e/pu+B+GeFRMYmoHXxx3xhI= +github.com/mitchellh/colorstring v0.0.0-20190213212951-d06e56a500db h1:62I3jR2EmQ4l5rM/4FEfDWcRD+abF5XlKShorW5LRoQ= +github.com/mitchellh/colorstring v0.0.0-20190213212951-d06e56a500db/go.mod h1:l0dey0ia/Uv7NcFFVbCLtqEBQbrT4OCwCSKTEv6enCw= +github.com/mitchellh/copystructure v1.0.0 h1:Laisrj+bAB6b/yJwB5Bt3ITZhGJdqmxquMKeZ+mmkFQ= +github.com/mitchellh/copystructure v1.0.0/go.mod h1:SNtv71yrdKgLRyLFxmLdkAbkKEFWgYaq1OVrnRcwhnw= github.com/mitchellh/go-homedir v1.1.0 h1:lukF9ziXFxDFPkA1vsr5zpc1XuPDn/wFntq5mG+4E0Y= github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0= +github.com/mitchellh/go-testing-interface v0.0.0-20171004221916-a61a99592b77/go.mod h1:kRemZodwjscx+RGhAo8eIhFbs2+BFgRtFPeD/KE+zxI= +github.com/mitchellh/go-testing-interface v1.0.0/go.mod h1:kRemZodwjscx+RGhAo8eIhFbs2+BFgRtFPeD/KE+zxI= +github.com/mitchellh/go-testing-interface v1.14.0 h1:/x0XQ6h+3U3nAyk1yx+bHPURrKa9sVVvYbuqZ7pIAtI= +github.com/mitchellh/go-testing-interface v1.14.0/go.mod h1:gfgS7OtZj6MA4U1UrDRp04twqAjfvlZyCfX3sDjEym8= github.com/mitchellh/go-wordwrap v1.0.0/go.mod h1:ZXFpozHsX6DPmq2I0TCekCxypsnAUbP2oI0UX1GXzOo= +github.com/mitchellh/hashstructure v0.0.0-20170609045927-2bca23e0e452 h1:hOY53G+kBFhbYFpRVxHl5eS7laP6B1+Cq+Z9Dry1iMU= +github.com/mitchellh/hashstructure v0.0.0-20170609045927-2bca23e0e452/go.mod h1:QjSHrPWS+BGUVBYkbTZWEnOh3G1DutKwClXU/ABz6AQ= +github.com/mitchellh/hashstructure/v2 v2.0.2 h1:vGKWl0YJqUNxE8d+h8f6NJLcCJrgbhC4NcD46KavDd4= +github.com/mitchellh/hashstructure/v2 v2.0.2/go.mod h1:MG3aRVU/N29oo/V/IhBX8GR/zz4kQkprJgF2EVszyDE= github.com/mitchellh/mapstructure v0.0.0-20160808181253-ca63d7c062ee/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y= github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y= +github.com/mitchellh/mapstructure v1.3.2/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo= +github.com/mitchellh/mapstructure v1.3.3/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo= github.com/mitchellh/mapstructure v1.4.1/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo= -github.com/mitchellh/mapstructure v1.4.2 h1:6h7AQ0yhTcIsmFmnAwQls75jp2Gzs4iB8W7pjMO+rqo= -github.com/mitchellh/mapstructure v1.4.2/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo= +github.com/mitchellh/mapstructure v1.4.3 h1:OVowDSCllw/YjdLkam3/sm7wEtOy59d8ndGgCcyj8cs= +github.com/mitchellh/mapstructure v1.4.3/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo= github.com/mitchellh/osext v0.0.0-20151018003038-5e2d6d41470f/go.mod h1:OkQIRizQZAeMln+1tSwduZz7+Af5oFlKirV/MSYes2A= +github.com/mitchellh/pointerstructure v1.2.1 h1:ZhBBeX8tSlRpu/FFhXH4RC4OJzFlqsQhoHZAz4x7TIw= +github.com/mitchellh/pointerstructure v1.2.1/go.mod h1:BRAsLI5zgXmw97Lf6s25bs8ohIXc3tViBH44KcwB2g4= +github.com/mitchellh/reflectwalk v1.0.0/go.mod h1:mSTlrgnPZtwu0c4WaC2kGObEpuNDbx0jmZXqmk4esnw= +github.com/mitchellh/reflectwalk v1.0.1 h1:FVzMWA5RllMAKIdUSC8mdWo3XtwoecrH79BY70sEEpE= +github.com/mitchellh/reflectwalk v1.0.1/go.mod h1:mSTlrgnPZtwu0c4WaC2kGObEpuNDbx0jmZXqmk4esnw= github.com/moby/locker v1.0.1/go.mod h1:S7SDdo5zpBK84bzzVlKr2V0hz+7x9hWbYC/kq7oQppc= github.com/moby/sys/mount v0.2.0 h1:WhCW5B355jtxndN5ovugJlMFJawbUODuW8fSnEH6SSM= github.com/moby/sys/mount v0.2.0/go.mod h1:aAivFE2LB3W4bACsUXChRHQ0qKWsetY4Y9V7sxOougM= @@ -537,9 +751,12 @@ github.com/moby/term v0.0.0-20200312100748-672ec06f55cd/go.mod h1:DdlQx2hp0Ss5/f github.com/moby/term v0.0.0-20210619224110-3f7ff695adc6 h1:dcztxKSvZ4Id8iPpHERQBbIJfabdt4wUm5qy3wOL2Zc= github.com/moby/term v0.0.0-20210619224110-3f7ff695adc6/go.mod h1:E2VnQOmVuvZB6UYnnDB0qG5Nq/1tD9acaOpo6xmt0Kw= github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= +github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w8PVh93nsPXa1VrQ6jlwL5oN8l14QlcNfg= github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= +github.com/modern-go/reflect2 v1.0.1 h1:9f412s+6RmYXLWZSEzVVgPGK7C2PphHj5RJrvfx9AWI= github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= +github.com/montanaflynn/stats v0.0.0-20171201202039-1bf9dbcd8cbe/go.mod h1:wL8QJuTMNUDYhXwkmfOly8iTdp5TEcJFWZD2D7SIkUc= github.com/morikuni/aec v0.0.0-20170113033406-39771216ff4c h1:nXxl5PrvVm2L/wCy8dQu6DMTwH4oIuGN8GJDAlqDdVE= github.com/morikuni/aec v0.0.0-20170113033406-39771216ff4c/go.mod h1:BbKIizmSmc5MMPqRYbxO4ZU0S0+P200+tUnFx7PXmsc= github.com/mrunalp/fileutils v0.5.0/go.mod h1:M1WthSahJixYnrXQl/DFQuteStB1weuxD2QJNHXfbSQ= @@ -548,7 +765,11 @@ github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8m github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U= github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f/go.mod h1:ZdcZmHo+o7JKHSa8/e818NopupXU1YMK5fe1lsApnBw= github.com/ncw/swift v1.0.47/go.mod h1:23YIA4yWVnGwv2dQlN4bB7egfYX6YLn0Yo/S6zZO/ZM= +github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e h1:fD57ERR4JtEqsWbfPhv4DMiApHyliiK5xCTNVSPiaAs= +github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno= github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A= +github.com/oklog/run v1.0.0/go.mod h1:dlhp/R75TPv97u0XWUtDeV/lRKWPKSdTuV0TZvrmrQA= +github.com/oklog/ulid v1.3.1 h1:EGfNDEx6MqHz8B3uNV6QAib1UR2Lm97sHi3ocA6ESJ4= github.com/oklog/ulid v1.3.1/go.mod h1:CirwcVhetQ6Lv90oh/F+FBtV6XMibvdAFo93nm5qn4U= github.com/olekukonko/tablewriter v0.0.0-20170122224234-a0225b3f23b5/go.mod h1:vsDQFd/mU46D+Z4whnwzcISnGGzXWMclvtLoiIKAKIo= github.com/onsi/ginkgo v0.0.0-20151202141238-7f8ab55aaf3b/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= @@ -592,12 +813,20 @@ github.com/opencontainers/selinux v1.6.0/go.mod h1:VVGKuOLlE7v4PJyT6h7mNWvq1rzqi github.com/opencontainers/selinux v1.8.0/go.mod h1:RScLhm78qiWa2gbVCcGkC7tCGdgk3ogry1nUQF8Evvo= github.com/opencontainers/selinux v1.8.2/go.mod h1:MUIHuUEvKB1wtJjQdOyYRgOnLD2xAPP8dBsCoU0KuF8= github.com/opencontainers/selinux v1.10.0/go.mod h1:2i0OySw99QjzBBQByd1Gr9gSjvuho1lHsJxIJ3gGbJI= +github.com/opentracing/opentracing-go v1.2.0 h1:uEJPy/1a5RIPAJ0Ov+OIO8OxWu77jEv+1B0VhjKrZUs= +github.com/opentracing/opentracing-go v1.2.0/go.mod h1:GxEUsuufX4nBwe+T+Wl9TAgYrxe9dPLANfrWvHYVTgc= github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc= github.com/pascaldekloe/goe v0.1.0 h1:cBOtyMzM9HTpWjXfbbunk26uA6nG3a8n06Wieeh0MwY= github.com/pascaldekloe/goe v0.1.0/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc= +github.com/patrickmn/go-cache v2.1.0+incompatible h1:HRMgzkcYKYpi3C8ajMPV8OFXaaRUnok+kx1WdO15EQc= +github.com/patrickmn/go-cache v2.1.0+incompatible/go.mod h1:3Qf8kWWT7OJRJbdiICTKqZju1ZixQ/KpMGzzAfe6+WQ= github.com/pelletier/go-toml v1.2.0/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic= +github.com/pelletier/go-toml v1.7.0/go.mod h1:vwGMzjaWMwyfHwgIBhI2YUM4fB6nL6lVAvS1LBMMhTE= github.com/pelletier/go-toml v1.8.1/go.mod h1:T2/BmBdy8dvIRq1a/8aqjN41wvWlN4lrapLU/GW4pbc= github.com/peterbourgon/diskv v2.0.1+incompatible/go.mod h1:uqqh8zWWbv1HBMNONnaR/tNboyR3/BZd58JJSHlUSCU= +github.com/pierrec/lz4 v2.0.5+incompatible/go.mod h1:pdkljMzZIN41W+lC3N2tnIh5sFi+IEE17M5jbnwPHcY= +github.com/pierrec/lz4 v2.5.2+incompatible h1:WCjObylUIOlKy/+7Abdn34TLIkXiA4UWUMhxq9m9ZXI= +github.com/pierrec/lz4 v2.5.2+incompatible/go.mod h1:pdkljMzZIN41W+lC3N2tnIh5sFi+IEE17M5jbnwPHcY= github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pkg/errors v0.8.1-0.20171018195549-f15c970de5b7/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= @@ -608,27 +837,35 @@ github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZN github.com/posener/complete v1.1.1/go.mod h1:em0nMJCgc9GFtwrmVmEMR/ZL6WyhyjMBndrE9hABlRI= github.com/posener/complete v1.2.3/go.mod h1:WZIdtGGp+qx0sLrYKtIRAruyNpv6hFCicSgv7Sy7s/s= github.com/pquerna/cachecontrol v0.0.0-20171018203845-0dec1b30a021/go.mod h1:prYjPmNq4d1NPVmpShWobRqXY3q7Vp+80DqgxxUrUIA= +github.com/pquerna/cachecontrol v0.0.0-20180517163645-1555304b9b35 h1:J9b7z+QKAmPf4YLrFg6oQUotqHQeUNWwkvo7jZp1GLU= +github.com/pquerna/cachecontrol v0.0.0-20180517163645-1555304b9b35/go.mod h1:prYjPmNq4d1NPVmpShWobRqXY3q7Vp+80DqgxxUrUIA= github.com/prometheus/client_golang v0.0.0-20180209125602-c332b6f63c06/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw= github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw= +github.com/prometheus/client_golang v0.9.2/go.mod h1:OsXs2jCmiKlQ1lTBmv21f2mNfw4xf/QclQDMrYNZzcM= github.com/prometheus/client_golang v0.9.3/go.mod h1:/TN21ttK/J9q6uSwhBd54HahCDft0ttaMvbicHlPoso= github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo= github.com/prometheus/client_golang v1.1.0/go.mod h1:I1FGZT9+L76gKKOs5djB6ezCbFQP1xR9D75/vuwEF3g= github.com/prometheus/client_golang v1.4.0/go.mod h1:e9GMxYsXl05ICDXkRhurwBS4Q3OK1iX/F2sw+iXX5zU= +github.com/prometheus/client_golang v1.7.1 h1:NTGy1Ja9pByO+xAeH/qiWnLrKtr3hJPNjaVUwnjpdpA= github.com/prometheus/client_golang v1.7.1/go.mod h1:PY5Wy2awLA44sXw4AOSfFBetzPP4j5+D6mVACh+pe2M= github.com/prometheus/client_model v0.0.0-20171117100541-99fa1f4be8e5/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= +github.com/prometheus/client_model v0.2.0 h1:uq5h0d+GuxiXLJLNABMgp2qUWDPiLvgCzz2dUR+/W/M= github.com/prometheus/client_model v0.2.0/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= github.com/prometheus/common v0.0.0-20180110214958-89604d197083/go.mod h1:daVV7qP5qjZbuso7PdcryaAu0sAZbrN9i7WWcTMWvro= github.com/prometheus/common v0.0.0-20181113130724-41aa239b4cce/go.mod h1:daVV7qP5qjZbuso7PdcryaAu0sAZbrN9i7WWcTMWvro= +github.com/prometheus/common v0.0.0-20181126121408-4724e9255275/go.mod h1:daVV7qP5qjZbuso7PdcryaAu0sAZbrN9i7WWcTMWvro= github.com/prometheus/common v0.4.0/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4= github.com/prometheus/common v0.4.1/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4= github.com/prometheus/common v0.6.0/go.mod h1:eBmuwkDJBwy6iBfxCBob6t6dR6ENT/y+J+Zk0j9GMYc= github.com/prometheus/common v0.9.1/go.mod h1:yhUN8i9wzaXS3w1O07YhxHEBxD+W35wd8bs7vj7HSQ4= +github.com/prometheus/common v0.10.0 h1:RyRA7RzGXQZiW+tGMr7sxa85G1z0yOpM1qq5c8lNawc= github.com/prometheus/common v0.10.0/go.mod h1:Tlit/dnDKsSWFlCLTWaA1cyBgKHSMdTB80sz/V91rCo= github.com/prometheus/procfs v0.0.0-20180125133057-cb4147076ac7/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= +github.com/prometheus/procfs v0.0.0-20181204211112-1dc9a6cbc91a/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= github.com/prometheus/procfs v0.0.0-20190507164030-5867b95ac084/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA= github.com/prometheus/procfs v0.0.0-20190522114515-bc1a522cf7b1/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA= github.com/prometheus/procfs v0.0.2/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA= @@ -637,14 +874,19 @@ github.com/prometheus/procfs v0.0.5/go.mod h1:4A/X28fw3Fc593LaREMrKMqOKvUAntwMDa github.com/prometheus/procfs v0.0.8/go.mod h1:7Qr8sr6344vo1JqZ6HhLceV9o3AJ1Ff+GxbHq6oeK9A= github.com/prometheus/procfs v0.1.3/go.mod h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4OA4YeYWdaU= github.com/prometheus/procfs v0.2.0/go.mod h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4OA4YeYWdaU= +github.com/prometheus/procfs v0.6.0 h1:mxy4L2jP6qMonqmq+aTtOx1ifVWUgG/TAmntgbh3xv4= github.com/prometheus/procfs v0.6.0/go.mod h1:cz+aTbrPOrUb4q7XlbU9ygM+/jj0fzG6c1xBZuNvfVA= github.com/prometheus/tsdb v0.7.1/go.mod h1:qhTCs0VvXwvX/y3TZrWD7rabWM+ijKTux40TwIPHuXU= github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod h1:XWv6SoW27p1b0cqNHllgS5HIMJraePCO15w5zCzIWYg= github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ= +github.com/rogpeppe/go-internal v1.1.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= +github.com/rogpeppe/go-internal v1.2.2/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= github.com/ryanuber/columnize v0.0.0-20160712163229-9b3edd62028f/go.mod h1:sm1tb6uqfes/u+d4ooFouqFdy9/2g9QGwK3SQygK0Ts= github.com/ryanuber/columnize v2.1.0+incompatible/go.mod h1:sm1tb6uqfes/u+d4ooFouqFdy9/2g9QGwK3SQygK0Ts= +github.com/ryanuber/go-glob v1.0.0 h1:iQh3xXAumdQ+4Ufa5b25cRpC5TYKlno6hsv6Cb3pkBk= +github.com/ryanuber/go-glob v1.0.0/go.mod h1:807d1WSdnB0XRJzKNil9Om6lcp/3a0v4qIHxIXzX/Yc= github.com/safchain/ethtool v0.0.0-20190326074333-42ed695e3de8/go.mod h1:Z0q5wiBQGYcxhMZ6gUqHn6pYNLypFAvaL3UvgZLR0U4= github.com/satori/go.uuid v1.2.0/go.mod h1:dA0hQrYB0VpLJoorglMZABFdXlWrHn1NEOzdhQKdks0= github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529 h1:nn5Wsu0esKSJiIVhscUtVbo7ada43DJhG55ua/hjS5I= @@ -655,12 +897,15 @@ github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeV github.com/sirupsen/logrus v1.0.4-0.20170822132746-89742aefa4b2/go.mod h1:pMByvHTf9Beacp5x1UXfOR9xyW/9antXMhjMPG0dEzc= github.com/sirupsen/logrus v1.0.6/go.mod h1:pMByvHTf9Beacp5x1UXfOR9xyW/9antXMhjMPG0dEzc= github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo= +github.com/sirupsen/logrus v1.4.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo= github.com/sirupsen/logrus v1.4.1/go.mod h1:ni0Sbl8bgC9z8RoU9G6nDWqqs/fq4eDPysMBDgk/93Q= github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE= github.com/sirupsen/logrus v1.6.0/go.mod h1:7uNnSEd1DgxDLC74fIahvMZmmYsHGZGEOFrfsX/uA88= github.com/sirupsen/logrus v1.7.0/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0= github.com/sirupsen/logrus v1.8.1 h1:dJKuHgqk1NNQlqoA6BTlM1Wf9DOH3NBjQyu0h9+AZZE= github.com/sirupsen/logrus v1.8.1/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0= +github.com/skratchdot/open-golang v0.0.0-20200116055534-eef842397966 h1:JIAuq3EEf9cgbU6AtGPK4CTG3Zf6CKMNqf0MHTggAUA= +github.com/skratchdot/open-golang v0.0.0-20200116055534-eef842397966/go.mod h1:sUM3LWHvSMaG192sy56D9F7CNvL7jUJVXoqM1QKLnog= github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc= github.com/smartystreets/goconvey v0.0.0-20190330032615-68dc04aab96a/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA= github.com/soheilhy/cmux v0.1.4/go.mod h1:IM3LyeVVIOuxMH7sFAkER9+bJ4dT7Ms6E4xg4kGIyLM= @@ -676,30 +921,40 @@ github.com/spf13/pflag v0.0.0-20170130214245-9ff6c6923cff/go.mod h1:DYY7MBk1bdzu github.com/spf13/pflag v1.0.1-0.20171106142849-4c012f6dcd95/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4= github.com/spf13/pflag v1.0.1/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4= github.com/spf13/pflag v1.0.3/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4= +github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA= github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= github.com/spf13/viper v1.4.0/go.mod h1:PTJ7Z/lr49W6bUbkmS1V3by4uWynFiR9p7+dSq/yZzE= github.com/stefanberger/go-pkcs11uri v0.0.0-20201008174630-78d3cae3a980/go.mod h1:AO3tvPzVZ/ayst6UlUKUv6rcPQInYe3IknH3jYhAKu8= github.com/stretchr/objx v0.0.0-20180129172003-8a3f7159479f/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= -github.com/stretchr/objx v0.2.0 h1:Hbg2NidpLE8veEBkEZTL3CvlkUIVzuU9jDplZO54c48= github.com/stretchr/objx v0.2.0/go.mod h1:qt09Ya8vawLte6SNmTgCsAVtYtaKzEcn8ATUoHMkEqE= +github.com/stretchr/objx v0.4.0 h1:M2gUjqZET1qApGOWNSnZ49BAIMX4F/1plDv3+l31EJ4= +github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw= github.com/stretchr/testify v0.0.0-20180303142811-b89eecf5ca5d/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA= github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= -github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5CcY= github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= +github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= +github.com/stretchr/testify v1.7.2/go.mod h1:R6va5+xMeoiuVRoj+gSkQ7d3FALtqAAGI1FQKckRals= +github.com/stretchr/testify v1.8.0 h1:pSgiaMZlXftHpm5L7V1+rVB+AZJydKsMxsQBIJw4PKk= +github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= github.com/syndtr/gocapability v0.0.0-20170704070218-db04d3cc01c8/go.mod h1:hkRG7XYTFWNJGYcbNJQlaLq0fg1yr4J4t/NcTQtrfww= github.com/syndtr/gocapability v0.0.0-20180916011248-d98352740cb2/go.mod h1:hkRG7XYTFWNJGYcbNJQlaLq0fg1yr4J4t/NcTQtrfww= github.com/syndtr/gocapability v0.0.0-20200815063812-42c35b437635/go.mod h1:hkRG7XYTFWNJGYcbNJQlaLq0fg1yr4J4t/NcTQtrfww= github.com/tchap/go-patricia v2.2.6+incompatible/go.mod h1:bmLyhP68RS6kStMGxByiQ23RP/odRBOTVjwp2cDyi6I= +github.com/teris-io/shortid v0.0.0-20220617161101-71ec9f2aa569 h1:xzABM9let0HLLqFypcxvLmlvEciCHL7+Lv+4vwZqecI= +github.com/teris-io/shortid v0.0.0-20220617161101-71ec9f2aa569/go.mod h1:2Ly+NIftZN4de9zRmENdYbvPQeaVIYKWpLFStLFEBgI= github.com/testcontainers/testcontainers-go v0.13.0 h1:OUujSlEGsXVo/ykPVZk3KanBNGN0TYb/7oKIPVn15JA= github.com/testcontainers/testcontainers-go v0.13.0/go.mod h1:z1abufU633Eb/FmSBTzV6ntZAC1eZBYPtaFsn4nPuDk= +github.com/tidwall/pretty v1.0.0 h1:HsD+QiTn7sK6flMKIvNmpqz1qrpP3Ps6jOKIKMooyg4= +github.com/tidwall/pretty v1.0.0/go.mod h1:XNkn88O1ChpSDQmQeStsy+sBenx6DDtFZJxhVysOjyk= github.com/tmc/grpc-websocket-proxy v0.0.0-20170815181823-89b8d40f7ca8/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U= github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U= +github.com/tv42/httpunix v0.0.0-20150427012821-b75d8614f926 h1:G3dpKMzFDjgEh2q1Z7zUUtKa8ViPtH+ocF0bE0g00O8= github.com/tv42/httpunix v0.0.0-20150427012821-b75d8614f926/go.mod h1:9ESjWnEqriFuLhtthL60Sar/7RFoluCcXsuvEwTV5KM= github.com/ugorji/go v1.1.4/go.mod h1:uQMGLiO92mf5W77hV/PUCpI3pbzQx3CRekS0kk+RGrc= github.com/urfave/cli v0.0.0-20171014202726-7bc6a0acffa5/go.mod h1:70zkFmudgCuE/ngEzBv17Jvp/497gISqfk5gWijbERA= @@ -714,12 +969,20 @@ github.com/vishvananda/netns v0.0.0-20191106174202-0a2b9b5464df/go.mod h1:JP3t17 github.com/vishvananda/netns v0.0.0-20200728191858-db3c7e526aae/go.mod h1:DD4vA1DwXk04H54A1oHXtwZmA0grkVMdPxx/VGLCah0= github.com/willf/bitset v1.1.11-0.20200630133818-d5bec3311243/go.mod h1:RjeCKbqT1RxIR/KWY6phxZiaY1IyutSBfGjNPySAYV4= github.com/willf/bitset v1.1.11/go.mod h1:83CECat5yLh5zVOf4P1ErAgKA5UDvKtgyUABdr3+MjI= +github.com/xdg-go/pbkdf2 v1.0.0/go.mod h1:jrpuAogTd400dnrH08LKmI/xc1MbPOebTwRqcT5RDeI= +github.com/xdg-go/scram v1.0.2/go.mod h1:1WAq6h33pAW+iRreB34OORO2Nf7qel3VV3fjBj+hCSs= +github.com/xdg-go/scram v1.1.1/go.mod h1:RaEWvsqvNKKvBPvcKeFjrG2cJqOkHTiyTpzz23ni57g= +github.com/xdg-go/stringprep v1.0.2/go.mod h1:8F9zXuvzgwmyT5DUm4GUfZGDdT3W+LCvS6+da4O5kxM= +github.com/xdg-go/stringprep v1.0.3/go.mod h1:W3f5j4i+9rC0kuIEJL0ky1VpHXQU3ocBgklLGvcBnW8= github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f/go.mod h1:N2zxlSyiKSe5eX1tZViRH5QA0qijqEDrYZiPEAiq3wU= github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415/go.mod h1:GwrjFmJcFw6At/Gs6z4yjiIwzuJ1/+UwLxMQDVQXShQ= github.com/xeipuuv/gojsonschema v0.0.0-20180618132009-1d523034197f/go.mod h1:5yf86TLmAcydyeJq5YvxkGPE2fm/u4myDekKRoLuqhs= github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod h1:UETIi67q53MR2AWcXfiuqkDkRtnGDLqkBTpCHuJHxtU= github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77/go.mod h1:aYKd//L2LvnjZzWKhF00oedf4jCCReLcmhLdhm1A27Q= +github.com/youmark/pkcs8 v0.0.0-20181117223130-1be2e3e5546d/go.mod h1:rHwXgn7JulP+udvsHwJoVG1YGAP6VLg4y9I5dyZdqmA= +github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= +github.com/yuin/goldmark v1.1.32/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= github.com/yvasiyarov/go-metrics v0.0.0-20140926110328-57bccd1ccd43/go.mod h1:aX5oPXxHm3bOH+xeAttToC8pqch2ScQN/JoXYupl6xs= @@ -727,17 +990,26 @@ github.com/yvasiyarov/gorelic v0.0.0-20141212073537-a9bba5b9ab50/go.mod h1:NUSPS github.com/yvasiyarov/newrelic_platform_go v0.0.0-20140908184405-b21fdbd4370f/go.mod h1:GlGEuHIJweS1mbCqG+7vt2nvWLzLLnRHbXz5JKd/Qbg= go.etcd.io/bbolt v1.3.2/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU= go.etcd.io/bbolt v1.3.3/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU= +go.etcd.io/bbolt v1.3.5 h1:XAzx9gjCb0Rxj7EoqcClPD1d5ZBxZJk0jbuoPHenBt0= go.etcd.io/bbolt v1.3.5/go.mod h1:G5EMThwa9y8QZGBClrRx5EY+Yw9kAhnjy3bSjsnlVTQ= go.etcd.io/etcd v0.5.0-alpha.5.0.20200910180754-dd1b699fc489/go.mod h1:yVHk9ub3CSBatqGNg7GRmsnfLWtoW60w4eDYfh7vHDg= +go.mongodb.org/mongo-driver v1.7.3/go.mod h1:NqaYOwnXWr5Pm7AOpO5QFxKJ503nbMse/R79oO62zWg= +go.mongodb.org/mongo-driver v1.7.5/go.mod h1:VXEWRZ6URJIkUq2SCAyapmhH0ZLRBP+FT4xhp5Zvxng= +go.mongodb.org/mongo-driver v1.8.3/go.mod h1:0sQWfOeY63QTntERDJJ/0SuKK0T1uVSgKCuAROlKEPY= +go.mongodb.org/mongo-driver v1.10.0 h1:UtV6N5k14upNp4LTduX0QCufG124fSu25Wz9tu94GLg= +go.mongodb.org/mongo-driver v1.10.0/go.mod h1:wsihk0Kdgv8Kqu1Anit4sfK+22vSFbUrAVEYRhCXrA8= go.mozilla.org/pkcs7 v0.0.0-20200128120323-432b2356ecb1/go.mod h1:SNgMg+EgDFwmvSmLRTNKC5fegJjB7v23qTQ0XLGUNHk= go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU= go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8= go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= -go.opencensus.io v0.22.3 h1:8sGtKOrtQqkN1bp2AtX+misvLIlOmsEsNd+9NIcPEm8= go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= +go.opencensus.io v0.22.4 h1:LYy1Hy3MJdrCdMwwzxA/dRok4ejH+RwNGbuoD9fCjto= +go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI= go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= +go.uber.org/goleak v1.1.10/go.mod h1:8a7PlsEVH3e/a/GLqe5IIrQx6GzcnRmZEufDUTk4A7A= +go.uber.org/goleak v1.1.12 h1:gZAh5/EyT/HQwlpkCy6wTpqfH9H8Lz8zbm3dZh+OyzA= go.uber.org/goleak v1.1.12/go.mod h1:cwTWslyiVhfpKIDGSZEM2HlOvcqm+tG4zioyIeLoqMQ= go.uber.org/multierr v1.1.0/go.mod h1:wR5kodmAFQ0UK8QlbwjlSNy0Z68gJhDJUG5sjR94q/0= go.uber.org/zap v1.10.0/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q= @@ -745,16 +1017,22 @@ golang.org/x/crypto v0.0.0-20171113213409-9f005a07e0d3/go.mod h1:6SG95UA2DQfeDnf golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20181009213950-7c1a557ab941/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= +golang.org/x/crypto v0.0.0-20190418165655-df01cb2cc480/go.mod h1:WFFai1msRO1wXaEeE5yQxYXgSfI8pQAWXbQop6sCtWE= +golang.org/x/crypto v0.0.0-20190422162423-af44ce270edf/go.mod h1:WFFai1msRO1wXaEeE5yQxYXgSfI8pQAWXbQop6sCtWE= golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20190611184440-5c40567a22f8/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20190701094942-4def268fd1a4/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20190923035154-9ee001bba392/go.mod h1:/lpIB1dKB+9EgE3H3cr1v9wB50oz8l4C4h62xy7jSTY= golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= +golang.org/x/crypto v0.0.0-20200302210943-78000ba7a073/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20200728195943-123391ffb6de/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20201002170205-7f63de1d35b0/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= +golang.org/x/crypto v0.0.0-20201216223049-8b5274cf687f/go.mod h1:jdWPYTVW3xRLrWPugEBEK3UY2ZEsg3UU495nc5E+M+I= golang.org/x/crypto v0.0.0-20210322153248-0c34fe9e7dc2/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4= +golang.org/x/crypto v0.0.0-20220622213112-05595931fe9d h1:sK3txAijHtOK88l68nt020reeT1ZdKLIYetKl95FzVY= +golang.org/x/crypto v0.0.0-20220622213112-05595931fe9d/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8= @@ -791,6 +1069,7 @@ golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73r golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20181011144130-49bb7cea24b1/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20181201002055-351d144fa1fc/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20181220203305-927f97764cc3/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= @@ -803,6 +1082,7 @@ golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR golang.org/x/net v0.0.0-20190613194153-d28f0bde5980/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20190619014844-b5b0513f8c1b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20190628185345-da137c7871d7/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20190724013045-ca1201d0de80/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20190813141303-74dc4d7220e7/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20190827160401-ba9fcec4b297/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= @@ -815,6 +1095,12 @@ golang.org/x/net v0.0.0-20200222125558-5a598a2470a0/go.mod h1:z5CRVTTTmAJ677TzLL golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20200301022130-244492dfa37a/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20200324143707-d3edc9973b7e/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= +golang.org/x/net v0.0.0-20200501053045-e0ff5e5a1de5/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= +golang.org/x/net v0.0.0-20200506145744-7e3656a0809f/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= +golang.org/x/net v0.0.0-20200513185701-a91f0712d120/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= +golang.org/x/net v0.0.0-20200520182314-0ba52f642ac2/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= +golang.org/x/net v0.0.0-20200602114024-627f9648deb9/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= +golang.org/x/net v0.0.0-20200625001655-4c5254603344/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= golang.org/x/net v0.0.0-20200707034311-ab3426394381/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= golang.org/x/net v0.0.0-20200822124328-c89045814202/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= golang.org/x/net v0.0.0-20201006153459-a7d1128ccaa0/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= @@ -824,23 +1110,31 @@ golang.org/x/net v0.0.0-20201224014010-6772e930b67b/go.mod h1:m0MpNAwzfU5UDzcl9v golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM= golang.org/x/net v0.0.0-20210410081132-afb366fc7cd1/go.mod h1:9tjilg8BloeKEkVJvy7fQ90B1CfIiPueXVOjqfkSzI8= +golang.org/x/net v0.0.0-20210421230115-4e50805a0758/go.mod h1:72T/g9IO56b78aLF+1Kcs5dz7/ng1VjMUvfKvpfy+jM= golang.org/x/net v0.0.0-20211108170745-6635138e15ea/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= -golang.org/x/net v0.0.0-20211216030914-fe4d6282115f h1:hEYJvxw1lSnWIl8X9ofsYMklzaDs90JI2az5YMd4fPM= +golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20211216030914-fe4d6282115f/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= +golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd h1:O7DYs+zxREGLKzKoMQrtrEacpb0ZVXA5rIwylE2Xchk= +golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20191202225959-858c2ad4c8b6/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= +golang.org/x/oauth2 v0.0.0-20201109201403-9fd604954f58 h1:Mj83v+wSRNEar42a/MQgxk9X42TdEmrOl9i+y8WbxLo= +golang.org/x/oauth2 v0.0.0-20201109201403-9fd604954f58/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20190412183630-56d357773e84/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20200317015054-43a5402ce75a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20201207232520-09787c993a3a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20210220032951-036812b2e83c h1:5KslGYwFpkhGh+Q16bwMP3cOontH8FOep7tGV86Y7SQ= golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sys v0.0.0-20180823144017-11551d06cbcc/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= @@ -848,15 +1142,20 @@ golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5h golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20181107165924-66b7b1311ac8/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20190129075346-302c3dd5f1cc/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190403152447-81d4e9dc473e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190419153524-e8e3143a4f4a/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190502145724-3ef323f4f1fd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190507160741-ecd444e8653b/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190514135907-3a4b5fb9f71f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190522044717-8097e1b27ff5/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190523142557-0e01d883c5c5/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190531175056-4c3a928424d2/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190602015325-4c4f7f33c9ed/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190606165138-5da285871e9c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190606203320-7fc4e5ec1444/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= @@ -892,9 +1191,15 @@ golang.org/x/sys v0.0.0-20200217220822-9197077df867/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200302150141-5c8b2ff67527/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200331124033-c3d80250170d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200501052902-10377860bb8e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200511232937-7e40ca221e25/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200515095857-1151b9dac4a9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200523222454-059865788121/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200615200032-f1bc736245b1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200622214017-ed371f2e16b4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200728102440-3e129f6d46b1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200803210538-64077c9b5642/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200817155316-9781c653f443/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200909081042-eff7692f9009/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200916030750-2334cc1a136f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= @@ -910,31 +1215,44 @@ golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20210303074136-134d130e1a04/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210324051608-47abb6519492/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210420072515-93ed5bcd2bfe/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210426230700-d19ff857e887/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210616094352-59db8d763f22/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210906170528-6f6e22806c34/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20210927094055-39ccf1dd6fa6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20211025201205-69cdffdb9359/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20211116061358-0a5406a5449c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20211124211545-fe61309f8881/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220412211240-33da011f77ad/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10 h1:WIoqL4EROvwiPdUtaip4VcDdpZ4kha7wBWZrbVKCIZg= +golang.org/x/sys v0.0.0-20220503163025-988cb79eb6c6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220829200755-d48e67d00261 h1:v6hYoSR9T5oet+pMXwUWkbiVqx/63mlHjefrHmxwfeY= +golang.org/x/sys v0.0.0-20220829200755-d48e67d00261/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= +golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 h1:JGgROgKl9N8DuW20oFS5gxc+lE67/N3FcwmBPMe7ArY= +golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.4/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= -golang.org/x/text v0.3.6 h1:aRYxNxv6iGQlyVaZmk6ZgYEDa+Jg18DxebPSrd6bg1M= +golang.org/x/text v0.3.5/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= +golang.org/x/text v0.3.7 h1:olpwvP2KacW1ZWvsR7uQhoyTYvKAupfQrRGBFM352Gk= +golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= golang.org/x/time v0.0.0-20180412165947-fbb02b2291d2/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= +golang.org/x/time v0.0.0-20200416051211-89c76fbcd5d1/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20200630173020-3af7569d3a1e h1:EHBhcS0mlXEAVwNyO2dLfjToGsyY4j24pTs2ScHnX7s= golang.org/x/time v0.0.0-20200630173020-3af7569d3a1e/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/tools v0.0.0-20180221164845-07fd8470d635/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= @@ -946,9 +1264,14 @@ golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3 golang.org/x/tools v0.0.0-20190312151545-0bb0c0a6e846/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= golang.org/x/tools v0.0.0-20190312170243-e65039ee4138/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= golang.org/x/tools v0.0.0-20190328211700-ab21143f2384/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= +golang.org/x/tools v0.0.0-20190329151228-23e29df326fe/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= +golang.org/x/tools v0.0.0-20190416151739-9c9e1878f421/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= +golang.org/x/tools v0.0.0-20190420181800-aa740d480789/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= +golang.org/x/tools v0.0.0-20190424220101-1e8e1cfdf96b/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= golang.org/x/tools v0.0.0-20190425150028-36563e24a262/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= golang.org/x/tools v0.0.0-20190506145303-2d16b83fe98c/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= +golang.org/x/tools v0.0.0-20190531172133-b3315ee88b7d/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= golang.org/x/tools v0.0.0-20190606124116-d0a3d012864b/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= golang.org/x/tools v0.0.0-20190614205625-5aca471b1d59/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= golang.org/x/tools v0.0.0-20190621195816-6e04913cbbac/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= @@ -958,6 +1281,7 @@ golang.org/x/tools v0.0.0-20190816200558-6889da9d5479/go.mod h1:b+2E5dAYhXwXZwtn golang.org/x/tools v0.0.0-20190907020128-2ca718005c18/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20190911174233-4f2ddba30aff/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191012152004-8de300cfc20a/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.0.0-20191108193012-7d206e10da11/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191113191852-77e3bb0ad9e7/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191115202509-3a792d9c32b2/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= @@ -972,15 +1296,24 @@ golang.org/x/tools v0.0.0-20200204074204-1cc6d1ef6c74/go.mod h1:TB2adYChydJhpapK golang.org/x/tools v0.0.0-20200207183749-b753a1ba74fa/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= golang.org/x/tools v0.0.0-20200212150539-ea181f53ac56/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= golang.org/x/tools v0.0.0-20200224181240-023911ca70b2/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= +golang.org/x/tools v0.0.0-20200227222343-706bc42d1f0d/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= golang.org/x/tools v0.0.0-20200304193943-95d2e580d8eb/go.mod h1:o4KQGtdN14AW+yjsvvwRTJJuXz8XRtIHtEnmAXLyFUw= +golang.org/x/tools v0.0.0-20200312045724-11d5b4c81c7d/go.mod h1:o4KQGtdN14AW+yjsvvwRTJJuXz8XRtIHtEnmAXLyFUw= +golang.org/x/tools v0.0.0-20200331025713-a30bf2db82d4/go.mod h1:Sl4aGygMT6LrqrWclx+PTx3U+LnKx/seiNR+3G19Ar8= +golang.org/x/tools v0.0.0-20200501065659-ab2804fb9c9d/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= +golang.org/x/tools v0.0.0-20200512131952-2bc93b1c0c88/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= +golang.org/x/tools v0.0.0-20200515010526-7d3b6ebf133d/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= +golang.org/x/tools v0.0.0-20200618134242-20370b0cb4b2/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= +golang.org/x/tools v0.0.0-20200729194436-6467de6f59a7/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= +golang.org/x/tools v0.0.0-20200804011535-6c149bb5ef0d/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= +golang.org/x/tools v0.0.0-20200825202427-b303f430e36d/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= golang.org/x/tools v0.1.0/go.mod h1:xkSsbof2nBLbhDlRMhhhyNLN/zl3eTqcnHD5viDpcZ0= golang.org/x/tools v0.1.5/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 h1:go1bK/D/BFZV2I8cIQd1NKEZ+0owSTG1fDTci4IqFcE= golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= google.golang.org/api v0.0.0-20160322025152-9bf6e6e569ff/go.mod h1:4mhQ8q/RsB7i+udVvVy5NUi08OU8ZlA0gRVgrF7VFY0= google.golang.org/api v0.4.0/go.mod h1:8k5glujaEP+g9n7WNsDg8QP6cUVNI86fCNMcbazEtwE= @@ -992,12 +1325,20 @@ google.golang.org/api v0.14.0/go.mod h1:iLdEw5Ide6rF15KTC1Kkl0iskquN2gFfn9o9XIsb google.golang.org/api v0.15.0/go.mod h1:iLdEw5Ide6rF15KTC1Kkl0iskquN2gFfn9o9XIsbkAI= google.golang.org/api v0.17.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE= google.golang.org/api v0.18.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE= +google.golang.org/api v0.19.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE= google.golang.org/api v0.20.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE= +google.golang.org/api v0.22.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE= +google.golang.org/api v0.24.0/go.mod h1:lIXQywCXRcnZPGlsd8NbLnOjtAoL6em04bJ9+z0MncE= +google.golang.org/api v0.28.0/go.mod h1:lIXQywCXRcnZPGlsd8NbLnOjtAoL6em04bJ9+z0MncE= +google.golang.org/api v0.29.0/go.mod h1:Lcubydp8VUV7KeIHD9z2Bys/sm/vGKnG1UHuDBSrHWM= +google.golang.org/api v0.30.0/go.mod h1:QGmEvQ87FHZNiUVJkT14jQNYJ4ZJjdRF23ZXz5138Fc= google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= google.golang.org/appengine v1.5.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= google.golang.org/appengine v1.6.1/go.mod h1:i06prIuMbXzDqacNJfV5OdTW448YApPu5ww/cMBSeb0= google.golang.org/appengine v1.6.5/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc= +google.golang.org/appengine v1.6.6 h1:lMO5rYAqUxkmaj76jAkRUvt5JZgFymx/+Q5Mzfivuhc= +google.golang.org/appengine v1.6.6/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc= google.golang.org/cloud v0.0.0-20151119220103-975617b05ea8/go.mod h1:0H1ncTHf11KCFhTc/+EFRbzSCOZx+VUbRMk55Yv5MYk= google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= google.golang.org/genproto v0.0.0-20190307195333-5fe7a883aa19/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= @@ -1018,16 +1359,29 @@ google.golang.org/genproto v0.0.0-20200122232147-0452cf42e150/go.mod h1:n3cpQtvx google.golang.org/genproto v0.0.0-20200204135345-fa8e72b47b90/go.mod h1:GmwEX6Z4W5gMy59cAlVYjN9JhxgbQH6Gn+gFDQe2lzA= google.golang.org/genproto v0.0.0-20200212174721-66ed5ce911ce/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= google.golang.org/genproto v0.0.0-20200224152610-e50cd9704f63/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= +google.golang.org/genproto v0.0.0-20200228133532-8c2c7df3a383/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= google.golang.org/genproto v0.0.0-20200305110556-506484158171/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= +google.golang.org/genproto v0.0.0-20200312145019-da6875a35672/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= +google.golang.org/genproto v0.0.0-20200331122359-1ee6d9798940/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= +google.golang.org/genproto v0.0.0-20200430143042-b979b6f78d84/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= +google.golang.org/genproto v0.0.0-20200511104702-f5ebc3bea380/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= google.golang.org/genproto v0.0.0-20200513103714-09dca8ec2884/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= +google.golang.org/genproto v0.0.0-20200515170657-fc4c6c6a6587/go.mod h1:YsZOwe1myG/8QRHRsmBRE1LrgQY60beZKjly0O1fX9U= google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo= -google.golang.org/genproto v0.0.0-20201110150050-8816d57aaa9a h1:pOwg4OoaRYScjmR4LlLgdtnyoHYTSAVhhqe5uPdpII8= +google.golang.org/genproto v0.0.0-20200618031413-b414f8b61790/go.mod h1:jDfRM7FcilCzHH/e9qn6dsT145K34l5v+OpcnNgKAAA= +google.golang.org/genproto v0.0.0-20200729003335-053ba62fc06f/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= +google.golang.org/genproto v0.0.0-20200804131852-c06518451d9c/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= +google.golang.org/genproto v0.0.0-20200825200019-8632dd797987/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/genproto v0.0.0-20201110150050-8816d57aaa9a/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= +google.golang.org/genproto v0.0.0-20220329172620-7be39ac1afc7 h1:HOL66YCI20JvN2hVk6o2YIp9i/3RvzVUz82PqNr7fXw= +google.golang.org/genproto v0.0.0-20220329172620-7be39ac1afc7/go.mod h1:8w6bsBMX6yCPbAVTeqQHvzxW0EIFigd5lZyahWgyfDo= google.golang.org/grpc v0.0.0-20160317175043-d3ddb4469d5a/go.mod h1:yo6s7OP7yaDglbqo1J04qKzAhqBH6lvTonzMVmEdcZw= +google.golang.org/grpc v1.14.0/go.mod h1:yo6s7OP7yaDglbqo1J04qKzAhqBH6lvTonzMVmEdcZw= google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38= google.golang.org/grpc v1.21.0/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM= google.golang.org/grpc v1.21.1/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM= +google.golang.org/grpc v1.22.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg= google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg= google.golang.org/grpc v1.23.1/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg= google.golang.org/grpc v1.24.0/go.mod h1:XDChyiUovWa60DnaeDeZmSW86xtLtjtZbwvSiRnRtcA= @@ -1035,12 +1389,15 @@ google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQ google.golang.org/grpc v1.26.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= google.golang.org/grpc v1.27.1/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= +google.golang.org/grpc v1.28.0/go.mod h1:rpkK4SK4GF4Ach/+MFLZUBavHOvF2JJB5uozKKal+60= +google.golang.org/grpc v1.29.1/go.mod h1:itym6AZVZYACWQqET3MqgPpjcuV5QH3BxFS3IjizoKk= google.golang.org/grpc v1.30.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak= +google.golang.org/grpc v1.31.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak= google.golang.org/grpc v1.33.1/go.mod h1:fr5YgcSWrqhRRxogOsw7RzIpsmvOZ6IcH4kBYTpR3n0= google.golang.org/grpc v1.33.2/go.mod h1:JMHMWHQWaTccqQQlmk3MJZS+GWXOdAesneDmEnv2fbc= google.golang.org/grpc v1.36.0/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU= -google.golang.org/grpc v1.41.0 h1:f+PlOh7QV4iIJkPrx5NQ7qaNGFQ3OTse67yaDHfju4E= -google.golang.org/grpc v1.41.0/go.mod h1:U3l9uK9J0sini8mHphKoXyaqDA/8VyGnDee1zzIUK6k= +google.golang.org/grpc v1.45.0 h1:NEpgUqV3Z+ZjkqMsxMg11IaDrXY4RY6CQukSGK0uI1M= +google.golang.org/grpc v1.45.0/go.mod h1:lN7owxKUQEqMfSyQikvvk5tf/6zMPsrK+ONuO11+0rQ= google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0= google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM= @@ -1053,24 +1410,28 @@ google.golang.org/protobuf v1.24.0/go.mod h1:r/3tXBNzIEhYS9I1OUVjXDlt8tc493IdKGj google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c= google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= -google.golang.org/protobuf v1.27.1 h1:SnqbnDw1V7RiZcXPx5MEeqPv2s79L9i7BJUlG/+RurQ= google.golang.org/protobuf v1.27.1/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= +google.golang.org/protobuf v1.28.0 h1:w43yiav+6bVFTBQFZX0r7ipe9JQ1QsbMgHwbBziscLw= +google.golang.org/protobuf v1.28.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= gopkg.in/airbrake/gobrake.v2 v2.0.9/go.mod h1:/h5ZAUhDkGaJfjzjKLSjv6zCL6O0LLBxU4K+aSYdM/U= 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-20141024133853-64131543e789/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= -gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 h1:YR8cESwS4TdDjEe65xsg0ogRM/Nc3DYOhEAlW+xobZo= gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f h1:BLraFXnmrev5lT+xlilqcH8XK9/i0At2xKjWk4p6zsU= +gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/cheggaaa/pb.v1 v1.0.25/go.mod h1:V/YB90LKu/1FcN3WVnfiiE5oMCibMjukxqG/qStrOgw= gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI= gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys= gopkg.in/gemnasium/logrus-airbrake-hook.v2 v2.1.2/go.mod h1:Xk6kEKp8OKb+X14hQBKWaSkCsqBpgog8nAV2xsGOxlo= +gopkg.in/inf.v0 v0.9.1 h1:73M5CoZyi3ZLMOyDlQh031Cx6N9NDJ2Vvfl76EDAgDc= gopkg.in/inf.v0 v0.9.1/go.mod h1:cWUDdTG/fYaXco+Dcufb5Vnc6Gp2YChqWtbxRZE0mXw= gopkg.in/natefinch/lumberjack.v2 v2.0.0/go.mod h1:l0ndWWf7gzL7RNwBG7wST/UCcT4T24xpD6X8LsfU/+k= gopkg.in/resty.v1 v1.12.0/go.mod h1:mDo4pnntr5jdWRML875a/NmxYqAlA73dVijT2AXvQQo= gopkg.in/square/go-jose.v2 v2.2.2/go.mod h1:M9dMgbHiYLoDGQrXy7OpJDJWiKiU//h+vD76mk0e1AI= gopkg.in/square/go-jose.v2 v2.3.1/go.mod h1:M9dMgbHiYLoDGQrXy7OpJDJWiKiU//h+vD76mk0e1AI= +gopkg.in/square/go-jose.v2 v2.5.1 h1:7odma5RETjNHWJnR32wx8t+Io4djHE1PqxCFx3iiZ2w= gopkg.in/square/go-jose.v2 v2.5.1/go.mod h1:M9dMgbHiYLoDGQrXy7OpJDJWiKiU//h+vD76mk0e1AI= gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw= gopkg.in/yaml.v2 v2.0.0-20170812160011-eb3733d160e7/go.mod h1:JAlM8MvJe8wmxCU4Bli9HhUf9+ttbYbLASfIpnQbh74= @@ -1081,10 +1442,15 @@ gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.5/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= +gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY= gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= -gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b h1:h8qDotaEPuJATrMmW04NCwg7v22aHH28wwpauUhK9Oo= +gopkg.in/yaml.v3 v3.0.0-20200605160147-a5ece683394c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= +gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= +gopkg.in/yaml.v3 v3.0.0/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= +gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= +gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gotest.tools v2.2.0+incompatible h1:VsBPFP1AI068pPrMxtb/S8Zkgf9xEmTLJjfM+P5UIEo= gotest.tools v2.2.0+incompatible/go.mod h1:DsYFclhRJ6vuDpmuTbkuFWG+y2sxOXAzmJt81HFBacw= gotest.tools/gotestsum v1.7.0/go.mod h1:V1m4Jw3eBerhI/A6qCxUE07RnCg7ACkKj9BYcAm09V8= @@ -1097,17 +1463,21 @@ honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod h1:rf3lG4BRIbNafJWh honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg= honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= +honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= k8s.io/api v0.20.1/go.mod h1:KqwcCVogGxQY3nBlRpwt+wpAMF/KjaCc7RpywacvqUo= k8s.io/api v0.20.4/go.mod h1:++lNL1AJMkDymriNniQsWRkMDzRaX2Y/POTUi8yvqYQ= +k8s.io/api v0.20.6 h1:bgdZrW++LqgrLikWYNruIKAtltXbSCX2l5mJu11hrVE= k8s.io/api v0.20.6/go.mod h1:X9e8Qag6JV/bL5G6bU8sdVRltWKmdHsFUGS3eVndqE8= k8s.io/apimachinery v0.20.1/go.mod h1:WlLqWAHZGg07AeltaI0MV5uk1Omp8xaN0JGLY6gkRpU= k8s.io/apimachinery v0.20.4/go.mod h1:WlLqWAHZGg07AeltaI0MV5uk1Omp8xaN0JGLY6gkRpU= +k8s.io/apimachinery v0.20.6 h1:R5p3SlhaABYShQSO6LpPsYHjV05Q+79eBUR0Ut/f4tk= k8s.io/apimachinery v0.20.6/go.mod h1:ejZXtW1Ra6V1O5H8xPBGz+T3+4gfkTCeExAHKU57MAc= k8s.io/apiserver v0.20.1/go.mod h1:ro5QHeQkgMS7ZGpvf4tSMx6bBOgPfE+f52KwvXfScaU= k8s.io/apiserver v0.20.4/go.mod h1:Mc80thBKOyy7tbvFtB4kJv1kbdD0eIH8k8vianJcbFM= k8s.io/apiserver v0.20.6/go.mod h1:QIJXNt6i6JB+0YQRNcS0hdRHJlMhflFmsBDeSgT1r8Q= k8s.io/client-go v0.20.1/go.mod h1:/zcHdt1TeWSd5HoUe6elJmHSQ6uLLgp4bIJHVEuy+/Y= k8s.io/client-go v0.20.4/go.mod h1:LiMv25ND1gLUdBeYxBIwKpkSC5IsozMMmOOeSJboP+k= +k8s.io/client-go v0.20.6 h1:nJZOfolnsVtDtbGJNCxzOtKUAu7zvXjB8+pMo9UNxZo= k8s.io/client-go v0.20.6/go.mod h1:nNQMnOvEUEsOzRRFIIkdmYOjAZrC8bgq0ExboWSU1I0= k8s.io/component-base v0.20.1/go.mod h1:guxkoJnNoh8LNrbtiQOlyp2Y2XFCZQmrcg2n/DeYNLk= k8s.io/component-base v0.20.4/go.mod h1:t4p9EdiagbVCJKrQ1RsA5/V4rFQNDfRlevJajlGwgjI= @@ -1118,9 +1488,11 @@ k8s.io/cri-api v0.20.4/go.mod h1:2JRbKt+BFLTjtrILYVqQK5jqhI+XNdF6UiGMgczeBCI= k8s.io/cri-api v0.20.6/go.mod h1:ew44AjNXwyn1s0U4xCKGodU7J1HzBeZ1MpGrpa5r8Yc= k8s.io/gengo v0.0.0-20200413195148-3a45101e95ac/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0= k8s.io/klog/v2 v2.0.0/go.mod h1:PBfzABfn139FHAV07az/IF9Wp1bkk3vpT2XSJ76fSDE= +k8s.io/klog/v2 v2.4.0 h1:7+X0fUguPyrKEC4WjH8iGDg3laWgMo5tMnRTIGTTxGQ= k8s.io/klog/v2 v2.4.0/go.mod h1:Od+F08eJP+W3HUb4pSrPpgp9DGU4GzlpG/TmITuYh/Y= k8s.io/kube-openapi v0.0.0-20201113171705-d219536bb9fd/go.mod h1:WOJ3KddDSol4tAGcJo0Tvi+dK12EcqSLqcWsryKMpfM= k8s.io/kubernetes v1.13.0/go.mod h1:ocZa8+6APFNC2tX1DZASIbocyYT5jHzqFVsY5aoB7Jk= +k8s.io/utils v0.0.0-20201110183641-67b214c5f920 h1:CbnUZsM497iRC5QMVkHwyl8s2tB3g7yaSHkYPkpgelw= k8s.io/utils v0.0.0-20201110183641-67b214c5f920/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA= rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8= rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0= @@ -1128,6 +1500,8 @@ rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA= sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.14/go.mod h1:LEScyzhFmoF5pso/YSeBstl57mOzx9xlU9n85RGrDQg= sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.15/go.mod h1:LEScyzhFmoF5pso/YSeBstl57mOzx9xlU9n85RGrDQg= sigs.k8s.io/structured-merge-diff/v4 v4.0.2/go.mod h1:bJZC9H9iH24zzfZ/41RGcq60oK1F7G282QMXDPYydCw= +sigs.k8s.io/structured-merge-diff/v4 v4.0.3 h1:4oyYo8NREp49LBBhKxEqCulFjg26rawYKrnCmg+Sr6c= sigs.k8s.io/structured-merge-diff/v4 v4.0.3/go.mod h1:bJZC9H9iH24zzfZ/41RGcq60oK1F7G282QMXDPYydCw= sigs.k8s.io/yaml v1.1.0/go.mod h1:UJmg0vDUVViEyp3mgSv9WPwZCDxu4rQW1olrI1uml+o= +sigs.k8s.io/yaml v1.2.0 h1:kr/MCeFWJWTwyaHoR9c8EjH9OumOmoF9YGiZd7lFm/Q= sigs.k8s.io/yaml v1.2.0/go.mod h1:yfXDCHCao9+ENCvLSE62v9VSji2MKu5jeNfTrofGhJc= diff --git a/test/integration/consul-container/libs/agent/agent.go b/test/integration/consul-container/libs/agent/agent.go new file mode 100644 index 0000000000..e964757797 --- /dev/null +++ b/test/integration/consul-container/libs/agent/agent.go @@ -0,0 +1,29 @@ +package agent + +import ( + "context" + + "github.com/hashicorp/consul/api" +) + +// Agent represent a Consul agent abstraction +type Agent interface { + GetAddr() (string, int) + GetClient() *api.Client + GetName() string + GetConfig() Config + GetDatacenter() string + IsServer() bool + RegisterTermination(func() error) + Terminate() error + Upgrade(ctx context.Context, config Config, index int) error +} + +// Config is a set of configurations required to create a Agent +type Config struct { + JSON string + Certs map[string]string + Image string + Version string + Cmd []string +} diff --git a/test/integration/consul-container/libs/agent/builder.go b/test/integration/consul-container/libs/agent/builder.go new file mode 100644 index 0000000000..831e139902 --- /dev/null +++ b/test/integration/consul-container/libs/agent/builder.go @@ -0,0 +1,266 @@ +package agent + +import ( + "encoding/json" + "path/filepath" + + "github.com/pkg/errors" + + agentconfig "github.com/hashicorp/consul/agent/config" + "github.com/hashicorp/consul/test/integration/consul-container/libs/utils" + "github.com/hashicorp/consul/tlsutil" +) + +const ( + remoteCertDirectory = "/consul/config/certs" +) + +// BuildContext provides a reusable object meant to share common configuration settings +// between agent configuration builders. +type BuildContext struct { + datacenter string + encryptKey string + caCert string + caKey string + index int // keeps track of the certificates issued for naming purposes + injectAutoEncryption bool // initialize the built-in CA and set up agents to use auto-encrpt + injectCerts bool // initializes the built-in CA and distributes client certificates to agents + injectGossipEncryption bool // setup the agents to use a gossip encryption key +} + +// BuildOptions define the desired automated test setup overrides that are +// applied across agents in the cluster +type BuildOptions struct { + Datacenter string // Override datacenter for agents + InjectCerts bool // Provides a CA for all agents and (future) agent certs. + InjectAutoEncryption bool // Configures auto-encrypt for TLS and sets up certs. Overrides InjectCerts. + InjectGossipEncryption bool // Provides a gossip encryption key for all agents. +} + +func NewBuildContext(opts BuildOptions) (*BuildContext, error) { + ctx := &BuildContext{ + datacenter: opts.Datacenter, + injectAutoEncryption: opts.InjectAutoEncryption, + injectCerts: opts.InjectCerts, + injectGossipEncryption: opts.InjectGossipEncryption, + } + + if opts.InjectGossipEncryption { + serfKey, err := newSerfEncryptionKey() + if err != nil { + return nil, errors.Wrap(err, "could not generate serf encryption key") + } + ctx.encryptKey = serfKey + } + + if opts.InjectAutoEncryption || opts.InjectCerts { + // This is the same call that 'consul tls ca create` will run + caCert, caKey, err := tlsutil.GenerateCA(tlsutil.CAOpts{Domain: "consul", PermittedDNSDomains: []string{"consul", "localhost"}}) + if err != nil { + return nil, errors.Wrap(err, "could not generate built-in CA root pair") + } + ctx.caCert = caCert + ctx.caKey = caKey + } + return ctx, nil +} + +func (c *BuildContext) GetCerts() (cert string, key string) { + return c.caCert, c.caKey +} + +type Builder struct { + conf *agentconfig.Config + certs map[string]string + context *BuildContext +} + +// NewConfigBuilder instantiates a builder object with sensible defaults for a single consul instance +// This includes the following: +// * default ports with no plaintext options +// * debug logging +// * single server with bootstrap +// * bind to all interfaces, advertise on 'eth0' +// * connect enabled +func NewConfigBuilder(ctx *BuildContext) *Builder { + b := &Builder{ + certs: map[string]string{}, + conf: &agentconfig.Config{ + AdvertiseAddrLAN: utils.StringToPointer(`{{ GetInterfaceIP "eth0" }}`), + BindAddr: utils.StringToPointer("0.0.0.0"), + Bootstrap: utils.BoolToPointer(true), + ClientAddr: utils.StringToPointer("0.0.0.0"), + Connect: agentconfig.Connect{ + Enabled: utils.BoolToPointer(true), + }, + LogLevel: utils.StringToPointer("DEBUG"), + ServerMode: utils.BoolToPointer(true), + }, + context: ctx, + } + + // These are the default ports, disabling plaintext transport + b.conf.Ports = agentconfig.Ports{ + DNS: utils.IntToPointer(8600), + HTTP: nil, + HTTPS: utils.IntToPointer(8501), + GRPC: utils.IntToPointer(8502), + GRPCTLS: utils.IntToPointer(8503), + SerfLAN: utils.IntToPointer(8301), + SerfWAN: utils.IntToPointer(8302), + Server: utils.IntToPointer(8300), + } + + return b +} + +func (b *Builder) Bootstrap(servers int) *Builder { + if servers < 1 { + b.conf.Bootstrap = nil + b.conf.BootstrapExpect = nil + } else if servers == 1 { + b.conf.Bootstrap = utils.BoolToPointer(true) + b.conf.BootstrapExpect = nil + } else { + b.conf.Bootstrap = nil + b.conf.BootstrapExpect = utils.IntToPointer(servers) + } + return b +} + +func (b *Builder) Client() *Builder { + b.conf.Ports.Server = nil + b.conf.ServerMode = nil + b.conf.Bootstrap = nil + b.conf.BootstrapExpect = nil + return b +} + +func (b *Builder) Datacenter(name string) *Builder { + b.conf.Datacenter = utils.StringToPointer(name) + return b +} + +func (b *Builder) Peering(enable bool) *Builder { + b.conf.Peering = agentconfig.Peering{ + Enabled: utils.BoolToPointer(enable), + } + return b +} + +func (b *Builder) RetryJoin(names ...string) *Builder { + b.conf.RetryJoinLAN = names + return b +} + +func (b *Builder) Telemetry(statSite string) *Builder { + b.conf.Telemetry = agentconfig.Telemetry{ + StatsiteAddr: utils.StringToPointer(statSite), + } + return b +} + +// ToAgentConfig renders the builders configuration into a string +// representation of the json config file for agents. +// DANGER! Some fields may not have json tags in the Agent Config. +// You may need to add these yourself. +func (b *Builder) ToAgentConfig() (*Config, error) { + b.injectContextOptions() + + out, err := json.MarshalIndent(b.conf, "", " ") + if err != nil { + return nil, errors.Wrap(err, "could not marshall builder") + } + + conf := &Config{ + Certs: b.certs, + Cmd: []string{"agent"}, + Image: *utils.TargetImage, + JSON: string(out), + Version: *utils.TargetVersion, + } + + return conf, nil +} + +func (b *Builder) injectContextOptions() { + if b.context == nil { + return + } + + var dc string + if b.context.datacenter != "" { + b.conf.Datacenter = utils.StringToPointer(b.context.datacenter) + dc = b.context.datacenter + } + if b.conf.Datacenter == nil || *b.conf.Datacenter == "" { + dc = "dc1" + } + + server := b.conf.ServerMode != nil && *b.conf.ServerMode + + if b.context.encryptKey != "" { + b.conf.EncryptKey = utils.StringToPointer(b.context.encryptKey) + } + + // For any TLS setup, we add the CA to agent conf + if b.context.caCert != "" { + // Add the ca file to the list of certs that will be mounted to consul + filename := filepath.Join(remoteCertDirectory, "consul-agent-ca.pem") + b.certs[filename] = b.context.caCert + + b.conf.TLS = agentconfig.TLS{ + Defaults: agentconfig.TLSProtocolConfig{ + CAFile: utils.StringToPointer(filename), + VerifyOutgoing: utils.BoolToPointer(true), // Secure settings + }, + InternalRPC: agentconfig.TLSProtocolConfig{ + VerifyServerHostname: utils.BoolToPointer(true), + }, + } + } + + // Also for any TLS setup, generate server key pairs from the CA + if b.context.caCert != "" && server { + keyFileName, priv, certFileName, pub := newServerTLSKeyPair(dc, b.context) + + // Add the key pair to the list that will be mounted to consul + certFileName = filepath.Join(remoteCertDirectory, certFileName) + keyFileName = filepath.Join(remoteCertDirectory, keyFileName) + + b.certs[certFileName] = pub + b.certs[keyFileName] = priv + + b.conf.TLS.Defaults.CertFile = utils.StringToPointer(certFileName) + b.conf.TLS.Defaults.KeyFile = utils.StringToPointer(keyFileName) + b.conf.TLS.Defaults.VerifyIncoming = utils.BoolToPointer(true) // Only applies to servers for auto-encrypt + } + + // This assumes we've already gone through the CA/Cert setup in the previous conditional + if b.context.injectAutoEncryption && server { + b.conf.AutoEncrypt = agentconfig.AutoEncrypt{ + AllowTLS: utils.BoolToPointer(true), // This setting is different between client and servers + } + + b.conf.TLS.GRPC = agentconfig.TLSProtocolConfig{ + UseAutoCert: utils.BoolToPointer(true), // This is required for peering to work over the non-GRPC_TLS port + } + + // VerifyIncoming does not apply to client agents for auto-encrypt + } + + if b.context.injectAutoEncryption && !server { + b.conf.AutoEncrypt = agentconfig.AutoEncrypt{ + TLS: utils.BoolToPointer(true), // This setting is different between client and servers + } + + b.conf.TLS.GRPC = agentconfig.TLSProtocolConfig{ + UseAutoCert: utils.BoolToPointer(true), // This is required for peering to work over the non-GRPC_TLS port + } + } + + if b.context.injectCerts && !b.context.injectAutoEncryption { + panic("client certificate distribution not implemented") + } + b.context.index++ +} diff --git a/test/integration/consul-container/libs/agent/container.go b/test/integration/consul-container/libs/agent/container.go new file mode 100644 index 0000000000..198c73f8ed --- /dev/null +++ b/test/integration/consul-container/libs/agent/container.go @@ -0,0 +1,421 @@ +package agent + +import ( + "context" + "encoding/json" + "fmt" + "os" + "path/filepath" + "strconv" + "time" + + dockercontainer "github.com/docker/docker/api/types/container" + "github.com/docker/docker/pkg/ioutils" + "github.com/pkg/errors" + "github.com/testcontainers/testcontainers-go" + "github.com/testcontainers/testcontainers-go/wait" + + "github.com/hashicorp/consul/api" + "github.com/hashicorp/consul/test/integration/consul-container/libs/utils" +) + +const bootLogLine = "Consul agent running" +const disableRYUKEnv = "TESTCONTAINERS_RYUK_DISABLED" + +// consulContainerNode implements the Agent interface by running a Consul agent +// in a container. +type consulContainerNode struct { + ctx context.Context + client *api.Client + pod testcontainers.Container + container testcontainers.Container + serverMode bool + ip string + port int + datacenter string + config Config + podReq testcontainers.ContainerRequest + consulReq testcontainers.ContainerRequest + certDir string + dataDir string + network string + id int + terminateFuncs []func() error +} + +// NewConsulContainer starts a Consul agent in a container with the given config. +func NewConsulContainer(ctx context.Context, config Config, network string, index int) (Agent, error) { + license, err := readLicense() + if err != nil { + return nil, err + } + + pc, err := readSomeConfigFileFields(config.JSON) + if err != nil { + return nil, err + } + + consulType := "client" + if pc.Server { + consulType = "server" + } + name := utils.RandName(fmt.Sprintf("%s-consul-%s-%d", pc.Datacenter, consulType, index)) + + // Inject new Agent name + config.Cmd = append(config.Cmd, "-node", name) + + tmpDirData, err := ioutils.TempDir("", name) + if err != nil { + return nil, err + } + err = os.Chmod(tmpDirData, 0777) + if err != nil { + return nil, err + } + + configFile, err := createConfigFile(config.JSON) + if err != nil { + return nil, err + } + + tmpCertData, err := ioutils.TempDir("", fmt.Sprintf("%s-certs", name)) + if err != nil { + return nil, err + } + err = os.Chmod(tmpCertData, 0777) + if err != nil { + return nil, err + } + + for filename, cert := range config.Certs { + err := createCertFile(tmpCertData, filename, cert) + if err != nil { + return nil, errors.Wrapf(err, "failed to write file %s", filename) + } + } + + opts := containerOpts{ + name: name, + certDir: tmpCertData, + configFile: configFile, + dataDir: tmpDirData, + license: license, + addtionalNetworks: []string{"bridge", network}, + hostname: fmt.Sprintf("agent-%d", index), + } + podReq, consulReq := newContainerRequest(config, opts) + + podContainer, err := startContainer(ctx, podReq) + if err != nil { + return nil, err + } + + localIP, err := podContainer.Host(ctx) + if err != nil { + return nil, err + } + + mappedPort, err := podContainer.MappedPort(ctx, "8500") + if err != nil { + return nil, err + } + + ip, err := podContainer.ContainerIP(ctx) + if err != nil { + return nil, err + } + + consulContainer, err := startContainer(ctx, consulReq) + if err != nil { + return nil, err + } + + if err := consulContainer.StartLogProducer(ctx); err != nil { + return nil, err + } + consulContainer.FollowOutput(&LogConsumer{ + Prefix: name, + }) + + uri := fmt.Sprintf("http://%s:%s", localIP, mappedPort.Port()) + apiConfig := api.DefaultConfig() + apiConfig.Address = uri + apiClient, err := api.NewClient(apiConfig) + if err != nil { + return nil, err + } + + return &consulContainerNode{ + config: config, + pod: podContainer, + container: consulContainer, + serverMode: pc.Server, + ip: ip, + port: mappedPort.Int(), + datacenter: pc.Datacenter, + client: apiClient, + ctx: ctx, + podReq: podReq, + consulReq: consulReq, + dataDir: tmpDirData, + certDir: tmpCertData, + network: network, + id: index, + }, nil +} + +func (c *consulContainerNode) GetName() string { + name, err := c.container.Name(c.ctx) + if err != nil { + return "" + } + return name +} + +func (c *consulContainerNode) GetConfig() Config { + return c.config +} + +func (c *consulContainerNode) GetDatacenter() string { + return c.datacenter +} + +func (c *consulContainerNode) IsServer() bool { + return c.serverMode +} + +// GetClient returns an API client that can be used to communicate with the Agent. +func (c *consulContainerNode) GetClient() *api.Client { + return c.client +} + +// GetAddr return the network address associated with the Agent. +func (c *consulContainerNode) GetAddr() (string, int) { + return c.ip, c.port +} + +func (c *consulContainerNode) RegisterTermination(f func() error) { + c.terminateFuncs = append(c.terminateFuncs, f) +} + +func (c *consulContainerNode) Upgrade(ctx context.Context, config Config, index int) error { + pc, err := readSomeConfigFileFields(config.JSON) + if err != nil { + return err + } + + consulType := "client" + if pc.Server { + consulType = "server" + } + name := utils.RandName(fmt.Sprintf("%s-consul-%s-%d", pc.Datacenter, consulType, index)) + + // Inject new Agent name + config.Cmd = append(config.Cmd, "-node", name) + + file, err := createConfigFile(config.JSON) + if err != nil { + return err + } + + for filename, cert := range config.Certs { + err := createCertFile(c.certDir, filename, cert) + if err != nil { + return errors.Wrapf(err, "failed to write file %s", filename) + } + } + + // We'll keep the same pod. + opts := containerOpts{ + name: c.consulReq.Name, + certDir: c.certDir, + configFile: file, + dataDir: c.dataDir, + license: "", + addtionalNetworks: []string{"bridge", c.network}, + hostname: fmt.Sprintf("agent-%d", c.id), + } + _, consulReq2 := newContainerRequest(config, opts) + consulReq2.Env = c.consulReq.Env // copy license + + _ = c.container.StopLogProducer() + if err := c.container.Terminate(ctx); err != nil { + return err + } + + c.consulReq = consulReq2 + + container, err := startContainer(ctx, c.consulReq) + if err != nil { + return err + } + + if err := container.StartLogProducer(ctx); err != nil { + return err + } + container.FollowOutput(&LogConsumer{ + Prefix: name, + }) + + c.container = container + + return nil +} + +// Terminate attempts to terminate the agent container. +// This might also include running termination functions for containers associated with the agent. +// On failure, an error will be returned and the reaper process (RYUK) will handle cleanup. +func (c *consulContainerNode) Terminate() error { + + // Services might register a termination function that should also fire + // when the "agent" is cleaned up + for _, f := range c.terminateFuncs { + err := f() + if err != nil { + + } + } + + if c.container == nil { + return nil + } + + err := c.container.StopLogProducer() + + if err1 := c.container.Terminate(c.ctx); err == nil { + err = err1 + } + + c.container = nil + + return err +} + +func startContainer(ctx context.Context, req testcontainers.ContainerRequest) (testcontainers.Container, error) { + return testcontainers.GenericContainer(ctx, testcontainers.GenericContainerRequest{ + ContainerRequest: req, + Started: true, + }) +} + +const pauseImage = "k8s.gcr.io/pause:3.3" + +type containerOpts struct { + certDir string + configFile string + dataDir string + hostname string + index int + license string + name string + addtionalNetworks []string +} + +func newContainerRequest(config Config, opts containerOpts) (podRequest, consulRequest testcontainers.ContainerRequest) { + skipReaper := isRYUKDisabled() + + pod := testcontainers.ContainerRequest{ + Image: pauseImage, + AutoRemove: false, + Name: opts.name + "-pod", + SkipReaper: skipReaper, + ExposedPorts: []string{"8500/tcp"}, + Hostname: opts.hostname, + Networks: opts.addtionalNetworks, + } + + // For handshakes like auto-encrypt, it can take 10's of seconds for the agent to become "ready". + // If we only wait until the log stream starts, subsequent commands to agents will fail. + // TODO: optimize the wait strategy + app := testcontainers.ContainerRequest{ + NetworkMode: dockercontainer.NetworkMode("container:" + opts.name + "-pod"), + Image: config.Image + ":" + config.Version, + WaitingFor: wait.ForLog(bootLogLine).WithStartupTimeout(60 * time.Second), // See note above + AutoRemove: false, + Name: opts.name, + Mounts: []testcontainers.ContainerMount{ + {Source: testcontainers.DockerBindMountSource{HostPath: opts.certDir}, Target: "/consul/config/certs"}, + {Source: testcontainers.DockerBindMountSource{HostPath: opts.configFile}, Target: "/consul/config/config.json"}, + {Source: testcontainers.DockerBindMountSource{HostPath: opts.dataDir}, Target: "/consul/data"}, + }, + Cmd: config.Cmd, + SkipReaper: skipReaper, + Env: map[string]string{"CONSUL_LICENSE": opts.license}, + } + return pod, app +} + +// isRYUKDisabled returns whether the reaper process (RYUK) has been disabled +// by an environment variable. +// +// https://github.com/testcontainers/moby-ryuk +func isRYUKDisabled() bool { + skipReaperStr := os.Getenv(disableRYUKEnv) + skipReaper, err := strconv.ParseBool(skipReaperStr) + if err != nil { + return false + } + return skipReaper +} + +func readLicense() (string, error) { + license := os.Getenv("CONSUL_LICENSE") + if license == "" { + licensePath := os.Getenv("CONSUL_LICENSE_PATH") + if licensePath != "" { + licenseBytes, err := os.ReadFile(licensePath) + if err != nil { + return "", err + } + license = string(licenseBytes) + } + } + return license, nil +} + +func createConfigFile(JSON string) (string, error) { + tmpDir, err := ioutils.TempDir("", "consul-container-test-config") + if err != nil { + return "", err + } + err = os.Chmod(tmpDir, 0777) + if err != nil { + return "", err + } + err = os.Mkdir(tmpDir+"/config", 0777) + if err != nil { + return "", err + } + configFile := tmpDir + "/config/config.hcl" + err = os.WriteFile(configFile, []byte(JSON), 0644) + if err != nil { + return "", err + } + return configFile, nil +} + +func createCertFile(dir, filename, cert string) error { + filename = filepath.Base(filename) + path := filepath.Join(dir, filename) + err := os.WriteFile(path, []byte(cert), 0644) + if err != nil { + return errors.Wrap(err, "could not write cert file") + } + return nil +} + +type parsedConfig struct { + Datacenter string `json:"datacenter"` + Server bool `json:"server"` +} + +func readSomeConfigFileFields(JSON string) (parsedConfig, error) { + var pc parsedConfig + if err := json.Unmarshal([]byte(JSON), &pc); err != nil { + return pc, errors.Wrap(err, "failed to parse config file") + } + if pc.Datacenter == "" { + pc.Datacenter = "dc1" + } + return pc, nil +} diff --git a/test/integration/consul-container/libs/agent/encryption.go b/test/integration/consul-container/libs/agent/encryption.go new file mode 100644 index 0000000000..a486dcb5b8 --- /dev/null +++ b/test/integration/consul-container/libs/agent/encryption.go @@ -0,0 +1,58 @@ +package agent + +import ( + "crypto/rand" + "crypto/x509" + "encoding/base64" + "fmt" + "net" + + "github.com/pkg/errors" + + "github.com/hashicorp/consul/tlsutil" +) + +func newSerfEncryptionKey() (string, error) { + key := make([]byte, 32) + n, err := rand.Reader.Read(key) + if err != nil { + return "", errors.Wrap(err, "error reading random data") + } + if n != 32 { + return "", errors.Wrap(err, "couldn't read enough entropy. Generate more entropy!") + } + + return base64.StdEncoding.EncodeToString(key), nil +} + +func newServerTLSKeyPair(dc string, ctx *BuildContext) (string, string, string, string) { + // Generate agent-specific key pair. Borrowed from 'consul tls cert create -server -dc ' + name := fmt.Sprintf("server.%s.%s", dc, "consul") + + dnsNames := []string{ + name, + "localhost", + } + ipAddresses := []net.IP{net.ParseIP("127.0.0.1")} + extKeyUsage := []x509.ExtKeyUsage{x509.ExtKeyUsageServerAuth, x509.ExtKeyUsageClientAuth} + + signer, err := tlsutil.ParseSigner(ctx.caKey) + if err != nil { + panic("could not parse signer from CA key") + } + + pub, priv, err := tlsutil.GenerateCert(tlsutil.CertOpts{ + Signer: signer, CA: ctx.caCert, Name: name, Days: 365, + DNSNames: dnsNames, IPAddresses: ipAddresses, ExtKeyUsage: extKeyUsage, + }) + + prefix := fmt.Sprintf("%s-server-%s", dc, "consul") + certFileName := fmt.Sprintf("%s-%d.pem", prefix, ctx.index) + keyFileName := fmt.Sprintf("%s-%d-key.pem", prefix, ctx.index) + + if err = tlsutil.Verify(ctx.caCert, pub, name); err != nil { + panic(fmt.Sprintf("could not verify keypair for %s and %s", certFileName, keyFileName)) + } + + return keyFileName, priv, certFileName, pub +} diff --git a/test/integration/consul-container/libs/node/log.go b/test/integration/consul-container/libs/agent/log.go similarity index 62% rename from test/integration/consul-container/libs/node/log.go rename to test/integration/consul-container/libs/agent/log.go index 58b63f2ea0..c46f486b19 100644 --- a/test/integration/consul-container/libs/node/log.go +++ b/test/integration/consul-container/libs/agent/log.go @@ -1,4 +1,4 @@ -package node +package agent import ( "fmt" @@ -7,13 +7,13 @@ import ( "github.com/testcontainers/testcontainers-go" ) -type NodeLogConsumer struct { +type LogConsumer struct { Prefix string } -var _ testcontainers.LogConsumer = (*NodeLogConsumer)(nil) +var _ testcontainers.LogConsumer = (*LogConsumer)(nil) -func (c *NodeLogConsumer) Accept(log testcontainers.Log) { +func (c *LogConsumer) Accept(log testcontainers.Log) { switch log.LogType { case "STDOUT": fmt.Fprint(os.Stdout, c.Prefix+" ~~ "+string(log.Content)) diff --git a/test/integration/consul-container/libs/assert/common.go b/test/integration/consul-container/libs/assert/common.go new file mode 100644 index 0000000000..d7b5ef1ae9 --- /dev/null +++ b/test/integration/consul-container/libs/assert/common.go @@ -0,0 +1,10 @@ +package assert + +import ( + "time" +) + +const ( + defaultTimeout = 5 * time.Second + defaultWait = 500 * time.Millisecond +) diff --git a/test/integration/consul-container/libs/assert/peering.go b/test/integration/consul-container/libs/assert/peering.go new file mode 100644 index 0000000000..87fd2bf8c7 --- /dev/null +++ b/test/integration/consul-container/libs/assert/peering.go @@ -0,0 +1,44 @@ +package assert + +import ( + "context" + "testing" + "time" + + "github.com/hashicorp/consul/api" + "github.com/hashicorp/consul/sdk/testutil/retry" +) + +// PeeringStatus verifies the peering connection is the specified state with a default retry. +func PeeringStatus(t *testing.T, client *api.Client, peerName string, status api.PeeringState) { + failer := func() *retry.Timer { + return &retry.Timer{Timeout: 20 * time.Second, Wait: defaultWait} + } + + retry.RunWith(failer(), t, func(r *retry.R) { + peering, _, err := client.Peerings().Read(context.Background(), peerName, &api.QueryOptions{}) + if err != nil { + r.Fatal("error reading peering data") + } + if status != peering.State { + r.Fatal("peering state did not match: got ", peering.State, " want ", status) + } + }) +} + +// PeeringExports verifies the correct number of exported services with a default retry. +func PeeringExports(t *testing.T, client *api.Client, peerName string, exports int) { + failer := func() *retry.Timer { + return &retry.Timer{Timeout: defaultTimeout, Wait: defaultWait} + } + + retry.RunWith(failer(), t, func(r *retry.R) { + peering, _, err := client.Peerings().Read(context.Background(), peerName, &api.QueryOptions{}) + if err != nil { + r.Fatal("error reading peering data") + } + if exports != len(peering.StreamStatus.ExportedServices) { + r.Fatal("peering exported services did not match: got ", len(peering.StreamStatus.ExportedServices), " want ", exports) + } + }) +} diff --git a/test/integration/consul-container/libs/assert/service.go b/test/integration/consul-container/libs/assert/service.go new file mode 100644 index 0000000000..266dbdd71d --- /dev/null +++ b/test/integration/consul-container/libs/assert/service.go @@ -0,0 +1,62 @@ +package assert + +import ( + "fmt" + "io" + "net/http" + "strings" + "testing" + "time" + + "github.com/hashicorp/consul/api" + "github.com/hashicorp/consul/sdk/testutil/retry" +) + +const ( + defaultHTTPTimeout = 30 * time.Second + defaultHTTPWait = defaultWait +) + +// HTTPServiceEchoes verifies that a post to the given ip/port combination returns the data +// in the response body +func HTTPServiceEchoes(t *testing.T, ip string, port int) { + phrase := "hello" + failer := func() *retry.Timer { + return &retry.Timer{Timeout: defaultHTTPTimeout, Wait: defaultHTTPWait} + } + + client := http.DefaultClient + url := fmt.Sprintf("http://%s:%d", ip, port) + + retry.RunWith(failer(), t, func(r *retry.R) { + t.Logf("making call to %s", url) + reader := strings.NewReader(phrase) + res, err := client.Post(url, "text/plain", reader) + if err != nil { + r.Fatal("could not make call to service ", url) + } + defer res.Body.Close() + + body, err := io.ReadAll(res.Body) + if err != nil { + r.Fatal("could not read response body ", url) + } + + if !strings.Contains(string(body), phrase) { + r.Fatal("received an incorrect response ", body) + } + }) +} + +// CatalogServiceExists verifies the service name exists in the Consul catalog +func CatalogServiceExists(t *testing.T, c *api.Client, svc string) { + retry.Run(t, func(r *retry.R) { + services, _, err := c.Catalog().Service(svc, "", nil) + if err != nil { + r.Fatal("error reading peering data") + } + if len(services) == 0 { + r.Fatal("did not find catalog entry for ", svc) + } + }) +} diff --git a/test/integration/consul-container/libs/cluster/cluster.go b/test/integration/consul-container/libs/cluster/cluster.go index 89b7fac9ef..81eb805230 100644 --- a/test/integration/consul-container/libs/cluster/cluster.go +++ b/test/integration/consul-container/libs/cluster/cluster.go @@ -2,99 +2,157 @@ package cluster import ( "context" - "crypto/rand" - "encoding/base64" "fmt" "strings" "testing" "time" + "github.com/hashicorp/serf/serf" + "github.com/pkg/errors" + "github.com/stretchr/testify/require" + "github.com/teris-io/shortid" + "github.com/testcontainers/testcontainers-go" + "github.com/hashicorp/consul/api" "github.com/hashicorp/consul/sdk/testutil/retry" - "github.com/hashicorp/consul/test/integration/consul-container/libs/node" - "github.com/stretchr/testify/require" + libagent "github.com/hashicorp/consul/test/integration/consul-container/libs/agent" ) // Cluster provides an interface for creating and controlling a Consul cluster -// in integration tests, with nodes running in containers. +// in integration tests, with agents running in containers. +// These fields are public in the event someone might want to surgically +// craft a test case. type Cluster struct { - Nodes []node.Node - EncryptKey string + Agents []libagent.Agent + CACert string + CAKey string + ID string + Index int + Network testcontainers.Network + NetworkName string } -// New creates a Consul cluster. A node will be started for each of the given +// New creates a Consul cluster. An agent will be started for each of the given // configs and joined to the cluster. -func New(configs []node.Config) (*Cluster, error) { - serfKey, err := newSerfEncryptionKey() +// +// A cluster has its own docker network for DNS connectivity, but is also joined +func New(configs []libagent.Config) (*Cluster, error) { + id, err := shortid.Generate() if err != nil { - return nil, err + return nil, errors.Wrap(err, "could not cluster id") + } + + name := fmt.Sprintf("consul-int-cluster-%s", id) + network, err := createNetwork(name) + if err != nil { + return nil, errors.Wrap(err, "could not create cluster container network") } cluster := Cluster{ - EncryptKey: serfKey, + ID: id, + Network: network, + NetworkName: name, } - nodes := make([]node.Node, len(configs)) - for idx, c := range configs { - c.HCL += fmt.Sprintf(" encrypt=%q", serfKey) - - n, err := node.NewConsulContainer(context.Background(), c) - if err != nil { - return nil, err - } - nodes[idx] = n - } - if err := cluster.AddNodes(nodes); err != nil { - return nil, err + if err := cluster.Add(configs); err != nil { + return nil, errors.Wrap(err, "could not start or join all agents") } return &cluster, nil } -// AddNodes joins the given nodes to the cluster. -func (c *Cluster) AddNodes(nodes []node.Node) error { - var joinAddr string - if len(c.Nodes) >= 1 { - joinAddr, _ = c.Nodes[0].GetAddr() - } else if len(nodes) >= 1 { - joinAddr, _ = nodes[0].GetAddr() - } +// Add starts an agent with the given configuration and joins it with the existing cluster +func (c *Cluster) Add(configs []libagent.Config) error { - for _, node := range nodes { - err := node.GetClient().Agent().Join(joinAddr, false) + agents := make([]libagent.Agent, len(configs)) + for idx, conf := range configs { + n, err := libagent.NewConsulContainer(context.Background(), conf, c.NetworkName, c.Index) if err != nil { - return err + return errors.Wrapf(err, "could not add container index %d", idx) } - c.Nodes = append(c.Nodes, node) + agents[idx] = n + c.Index++ + } + if err := c.Join(agents); err != nil { + return errors.Wrapf(err, "could not join agent") } return nil } -// Terminate will attempt to terminate all nodes in the cluster. If any node +// Join joins the given agent to the cluster. +func (c *Cluster) Join(agents []libagent.Agent) error { + var joinAddr string + if len(c.Agents) >= 1 { + joinAddr, _ = c.Agents[0].GetAddr() + } else if len(agents) >= 1 { + joinAddr, _ = agents[0].GetAddr() + } + + for _, n := range agents { + err := n.GetClient().Agent().Join(joinAddr, false) + if err != nil { + return errors.Wrapf(err, "could not join agent %s to %s", n.GetName(), joinAddr) + } + c.Agents = append(c.Agents, n) + } + return nil +} + +// Remove instructs the agent to leave the cluster then removes it +// from the cluster Agent list. +func (c *Cluster) Remove(n libagent.Agent) error { + err := n.GetClient().Agent().Leave() + if err != nil { + return errors.Wrapf(err, "could not remove agent %s", n.GetName()) + } + + foundIdx := -1 + for idx, this := range c.Agents { + if this == n { + foundIdx = idx + break + } + } + + if foundIdx == -1 { + return errors.New("could not find agent in cluster") + } + + c.Agents = append(c.Agents[:foundIdx], c.Agents[foundIdx+1:]...) + return nil +} + +// Terminate will attempt to terminate all agents in the cluster and its network. If any agent // termination fails, Terminate will abort and return an error. func (c *Cluster) Terminate() error { - for _, n := range c.Nodes { + for _, n := range c.Agents { err := n.Terminate() if err != nil { return err } } + + // Testcontainers seems to clean this the network. + // Trigger it now will throw an error while the containers are still shutting down + //if err := c.Network.Remove(context.Background()); err != nil { + // return errors.Wrapf(err, "could not terminate cluster network %s", c.ID) + //} return nil } -// Leader returns the cluster leader node, or an error if no leader is +// Leader returns the cluster leader agent, or an error if no leader is // available. -func (c *Cluster) Leader() (node.Node, error) { - if len(c.Nodes) < 1 { - return nil, fmt.Errorf("no node available") +func (c *Cluster) Leader() (libagent.Agent, error) { + if len(c.Agents) < 1 { + return nil, fmt.Errorf("no agent available") } - n0 := c.Nodes[0] + n0 := c.Agents[0] - leaderAdd, err := GetLeader(n0.GetClient()) + leaderAdd, err := getLeader(n0.GetClient()) if err != nil { return nil, err } - for _, n := range c.Nodes { + for _, n := range c.Agents { addr, _ := n.GetAddr() if strings.Contains(leaderAdd, addr) { return n, nil @@ -103,30 +161,58 @@ func (c *Cluster) Leader() (node.Node, error) { return nil, fmt.Errorf("leader not found") } -func newSerfEncryptionKey() (string, error) { - key := make([]byte, 32) - n, err := rand.Reader.Read(key) - if err != nil { - return "", fmt.Errorf("Error reading random data: %w", err) - } - if n != 32 { - return "", fmt.Errorf("Couldn't read enough entropy. Generate more entropy!") - } - - return base64.StdEncoding.EncodeToString(key), nil -} - -func GetLeader(client *api.Client) (string, error) { +func getLeader(client *api.Client) (string, error) { leaderAdd, err := client.Status().Leader() if err != nil { - return "", err + return "", errors.Wrap(err, "could not query leader") } if leaderAdd == "" { - return "", fmt.Errorf("no leader available") + return "", errors.New("no leader available") } return leaderAdd, nil } +// Followers returns the cluster following servers. +func (c *Cluster) Followers() ([]libagent.Agent, error) { + var followers []libagent.Agent + + leader, err := c.Leader() + if err != nil { + return nil, fmt.Errorf("could not determine leader: %w", err) + } + + for _, n := range c.Agents { + if n != leader && n.IsServer() { + followers = append(followers, n) + } + } + return followers, nil +} + +// Servers returns the handle to server agents +func (c *Cluster) Servers() ([]libagent.Agent, error) { + var servers []libagent.Agent + + for _, n := range c.Agents { + if n.IsServer() { + servers = append(servers, n) + } + } + return servers, nil +} + +// Clients returns the handle to client agents +func (c *Cluster) Clients() ([]libagent.Agent, error) { + var clients []libagent.Agent + + for _, n := range c.Agents { + if !n.IsServer() { + clients = append(clients, n) + } + } + return clients, nil +} + const retryTimeout = 20 * time.Second const retryFrequency = 500 * time.Millisecond @@ -148,7 +234,7 @@ func WaitForLeader(t *testing.T, cluster *Cluster, client *api.Client) { func waitForLeaderFromClient(t *testing.T, client *api.Client) { retry.RunWith(LongFailer(), t, func(r *retry.R) { - leader, err := GetLeader(client) + leader, err := getLeader(client) require.NoError(r, err) require.NotEmpty(r, leader) }) @@ -157,7 +243,13 @@ func waitForLeaderFromClient(t *testing.T, client *api.Client) { func WaitForMembers(t *testing.T, client *api.Client, expectN int) { retry.RunWith(LongFailer(), t, func(r *retry.R) { members, err := client.Agent().Members(false) + var activeMembers int + for _, member := range members { + if serf.MemberStatus(member.Status) == serf.StatusAlive { + activeMembers++ + } + } require.NoError(r, err) - require.Len(r, members, expectN) + require.Equal(r, activeMembers, expectN) }) } diff --git a/test/integration/consul-container/libs/cluster/network.go b/test/integration/consul-container/libs/cluster/network.go new file mode 100644 index 0000000000..89abf6f7e5 --- /dev/null +++ b/test/integration/consul-container/libs/cluster/network.go @@ -0,0 +1,23 @@ +package cluster + +import ( + "context" + + "github.com/pkg/errors" + "github.com/testcontainers/testcontainers-go" +) + +func createNetwork(name string) (testcontainers.Network, error) { + req := testcontainers.GenericNetworkRequest{ + NetworkRequest: testcontainers.NetworkRequest{ + Name: name, + Attachable: true, + CheckDuplicate: true, + }, + } + network, err := testcontainers.GenericNetwork(context.Background(), req) + if err != nil { + return nil, errors.Wrap(err, "could not create network") + } + return network, nil +} diff --git a/test/integration/consul-container/libs/node/consul-container.go b/test/integration/consul-container/libs/node/consul-container.go deleted file mode 100644 index 4185308433..0000000000 --- a/test/integration/consul-container/libs/node/consul-container.go +++ /dev/null @@ -1,295 +0,0 @@ -package node - -import ( - "context" - "fmt" - "os" - "strconv" - "time" - - dockercontainer "github.com/docker/docker/api/types/container" - "github.com/docker/docker/pkg/ioutils" - "github.com/hashicorp/consul/api" - "github.com/hashicorp/hcl" - "github.com/testcontainers/testcontainers-go" - "github.com/testcontainers/testcontainers-go/wait" - - "github.com/hashicorp/consul/test/integration/consul-container/libs/utils" -) - -const bootLogLine = "Consul agent running" -const disableRYUKEnv = "TESTCONTAINERS_RYUK_DISABLED" - -// consulContainerNode implements the Node interface by running a Consul node -// in a container. -type consulContainerNode struct { - ctx context.Context - client *api.Client - pod testcontainers.Container - container testcontainers.Container - ip string - port int - config Config - podReq testcontainers.ContainerRequest - consulReq testcontainers.ContainerRequest - dataDir string -} - -func (c *consulContainerNode) GetConfig() Config { - return c.config -} - -func startContainer(ctx context.Context, req testcontainers.ContainerRequest) (testcontainers.Container, error) { - return testcontainers.GenericContainer(ctx, testcontainers.GenericContainerRequest{ - ContainerRequest: req, - Started: true, - }) -} - -// NewConsulContainer starts a Consul node in a container with the given config. -func NewConsulContainer(ctx context.Context, config Config) (Node, error) { - license, err := readLicense() - if err != nil { - return nil, err - } - name := utils.RandName("consul-") - - tmpDirData, err := ioutils.TempDir("", name) - if err != nil { - return nil, err - } - err = os.Chmod(tmpDirData, 0777) - if err != nil { - return nil, err - } - - pc, err := readSomeConfigFileFields(config.HCL) - if err != nil { - return nil, err - } - - configFile, err := createConfigFile(config.HCL) - if err != nil { - return nil, err - } - - podReq, consulReq := newContainerRequest(config, name, configFile, tmpDirData, license) - - podContainer, err := startContainer(ctx, podReq) - if err != nil { - return nil, err - } - - localIP, err := podContainer.Host(ctx) - if err != nil { - return nil, err - } - - mappedPort, err := podContainer.MappedPort(ctx, "8500") - if err != nil { - return nil, err - } - - ip, err := podContainer.ContainerIP(ctx) - if err != nil { - return nil, err - } - - consulContainer, err := startContainer(ctx, consulReq) - if err != nil { - return nil, err - } - - if err := consulContainer.StartLogProducer(ctx); err != nil { - return nil, err - } - consulContainer.FollowOutput(&NodeLogConsumer{ - Prefix: pc.NodeName, - }) - - uri := fmt.Sprintf("http://%s:%s", localIP, mappedPort.Port()) - apiConfig := api.DefaultConfig() - apiConfig.Address = uri - apiClient, err := api.NewClient(apiConfig) - if err != nil { - return nil, err - } - - return &consulContainerNode{ - config: config, - pod: podContainer, - container: consulContainer, - ip: ip, - port: mappedPort.Int(), - client: apiClient, - ctx: ctx, - podReq: podReq, - consulReq: consulReq, - dataDir: tmpDirData, - }, nil -} - -const pauseImage = "k8s.gcr.io/pause:3.3" - -func newContainerRequest(config Config, name, configFile, dataDir, license string) (podRequest, consulRequest testcontainers.ContainerRequest) { - skipReaper := isRYUKDisabled() - - pod := testcontainers.ContainerRequest{ - Image: pauseImage, - AutoRemove: false, - Name: name + "-pod", - SkipReaper: skipReaper, - ExposedPorts: []string{"8500/tcp"}, - } - - app := testcontainers.ContainerRequest{ - NetworkMode: dockercontainer.NetworkMode("container:" + name + "-pod"), - Image: config.Image + ":" + config.Version, - WaitingFor: wait.ForLog(bootLogLine).WithStartupTimeout(10 * time.Second), - AutoRemove: false, - Name: name, - Mounts: []testcontainers.ContainerMount{ - {Source: testcontainers.DockerBindMountSource{HostPath: configFile}, Target: "/consul/config/config.hcl"}, - {Source: testcontainers.DockerBindMountSource{HostPath: dataDir}, Target: "/consul/data"}, - }, - Cmd: config.Cmd, - SkipReaper: skipReaper, - Env: map[string]string{"CONSUL_LICENSE": license}, - } - - return pod, app -} - -// GetClient returns an API client that can be used to communicate with the Node. -func (c *consulContainerNode) GetClient() *api.Client { - return c.client -} - -// GetAddr return the network address associated with the Node. -func (c *consulContainerNode) GetAddr() (string, int) { - return c.ip, c.port -} - -func (c *consulContainerNode) Upgrade(ctx context.Context, config Config) error { - pc, err := readSomeConfigFileFields(config.HCL) - if err != nil { - return err - } - - file, err := createConfigFile(config.HCL) - if err != nil { - return err - } - - // We'll keep the same pod. - _, consulReq2 := newContainerRequest( - config, - c.consulReq.Name, - file, - c.dataDir, - "", - ) - consulReq2.Env = c.consulReq.Env // copy license - - _ = c.container.StopLogProducer() - if err := c.container.Terminate(ctx); err != nil { - return err - } - - c.consulReq = consulReq2 - - container, err := startContainer(ctx, c.consulReq) - if err != nil { - return err - } - - if err := container.StartLogProducer(ctx); err != nil { - return err - } - container.FollowOutput(&NodeLogConsumer{ - Prefix: pc.NodeName, - }) - - c.container = container - - return nil -} - -// Terminate attempts to terminate the container. On failure, an error will be -// returned and the reaper process (RYUK) will handle cleanup. -func (c *consulContainerNode) Terminate() error { - if c.container == nil { - return nil - } - - err := c.container.StopLogProducer() - - if err1 := c.container.Terminate(c.ctx); err == nil { - err = err1 - } - - c.container = nil - - return err -} - -// isRYUKDisabled returns whether the reaper process (RYUK) has been disabled -// by an environment variable. -// -// https://github.com/testcontainers/moby-ryuk -func isRYUKDisabled() bool { - skipReaperStr := os.Getenv(disableRYUKEnv) - skipReaper, err := strconv.ParseBool(skipReaperStr) - if err != nil { - return false - } - return skipReaper -} - -func readLicense() (string, error) { - license := os.Getenv("CONSUL_LICENSE") - if license == "" { - licensePath := os.Getenv("CONSUL_LICENSE_PATH") - if licensePath != "" { - licenseBytes, err := os.ReadFile(licensePath) - if err != nil { - return "", err - } - license = string(licenseBytes) - } - } - return license, nil -} - -func createConfigFile(HCL string) (string, error) { - tmpDir, err := ioutils.TempDir("", "consul-container-test-config") - if err != nil { - return "", err - } - err = os.Chmod(tmpDir, 0777) - if err != nil { - return "", err - } - err = os.Mkdir(tmpDir+"/config", 0777) - if err != nil { - return "", err - } - configFile := tmpDir + "/config/config.hcl" - err = os.WriteFile(configFile, []byte(HCL), 0644) - if err != nil { - return "", err - } - return configFile, nil -} - -type parsedConfig struct { - NodeName string `hcl:"node_name"` -} - -func readSomeConfigFileFields(HCL string) (parsedConfig, error) { - var pc parsedConfig - if err := hcl.Decode(&pc, HCL); err != nil { - return pc, fmt.Errorf("Failed to parse config file: %w", err) - } - return pc, nil -} diff --git a/test/integration/consul-container/libs/node/consul-container_oss.go b/test/integration/consul-container/libs/node/consul-container_oss.go deleted file mode 100644 index 515e9dbbb5..0000000000 --- a/test/integration/consul-container/libs/node/consul-container_oss.go +++ /dev/null @@ -1,4 +0,0 @@ -//go:build !consulent -// +build !consulent - -package node diff --git a/test/integration/consul-container/libs/node/node.go b/test/integration/consul-container/libs/node/node.go deleted file mode 100644 index 14cf3ab8d4..0000000000 --- a/test/integration/consul-container/libs/node/node.go +++ /dev/null @@ -1,24 +0,0 @@ -package node - -import ( - "context" - - "github.com/hashicorp/consul/api" -) - -// Node represent a Consul node abstraction -type Node interface { - Terminate() error - GetClient() *api.Client - GetAddr() (string, int) - GetConfig() Config - Upgrade(ctx context.Context, config Config) error -} - -// Config is a set of configurations required to create a Node -type Config struct { - HCL string - Image string - Version string - Cmd []string -} diff --git a/test/integration/consul-container/libs/service/assets/Dockerfile-consul-envoy b/test/integration/consul-container/libs/service/assets/Dockerfile-consul-envoy new file mode 100644 index 0000000000..41941a3367 --- /dev/null +++ b/test/integration/consul-container/libs/service/assets/Dockerfile-consul-envoy @@ -0,0 +1,7 @@ +# Note this arg has to be before the first FROM +ARG ENVOY_VERSION + +FROM consul:local as consul + +FROM docker.mirror.hashicorp.services/envoyproxy/envoy:v${ENVOY_VERSION} +COPY --from=consul /bin/consul /bin/consul diff --git a/test/integration/consul-container/libs/service/common.go b/test/integration/consul-container/libs/service/common.go new file mode 100644 index 0000000000..8687898dbe --- /dev/null +++ b/test/integration/consul-container/libs/service/common.go @@ -0,0 +1,57 @@ +package service + +import ( + "archive/tar" + "bytes" + _ "embed" + "os" + + "github.com/testcontainers/testcontainers-go" +) + +const latestEnvoyVersion = "1.23.1" +const envoyEnvKey = "ENVOY_VERSION" + +const hashicorpDockerProxy = "docker.mirror.hashicorp.services" + +//go:embed assets/Dockerfile-consul-envoy +var consulEnvoyDockerfile string + +// getDevContainerDockerfile returns the necessary context to build a combined consul and +// envoy image for running "consul connect envoy ..." +func getDevContainerDockerfile() (testcontainers.FromDockerfile, error) { + var buf bytes.Buffer + tw := tar.NewWriter(&buf) + + dockerfileBytes := []byte(consulEnvoyDockerfile) + + hdr := &tar.Header{ + Name: "Dockerfile", + Mode: 0600, + Size: int64(len(dockerfileBytes)), + } + if err := tw.WriteHeader(hdr); err != nil { + return testcontainers.FromDockerfile{}, err + } + + if _, err := tw.Write(dockerfileBytes); err != nil { + return testcontainers.FromDockerfile{}, err + } + + if err := tw.Close(); err != nil { + return testcontainers.FromDockerfile{}, err + } + reader := bytes.NewReader(buf.Bytes()) + fromDockerfile := testcontainers.FromDockerfile{ + ContextArchive: reader, + } + + return fromDockerfile, nil +} + +func getEnvoyVersion() string { + if version, ok := os.LookupEnv(envoyEnvKey); ok && version != "" { + return version + } + return latestEnvoyVersion +} diff --git a/test/integration/consul-container/libs/service/connect.go b/test/integration/consul-container/libs/service/connect.go new file mode 100644 index 0000000000..7d7bcab737 --- /dev/null +++ b/test/integration/consul-container/libs/service/connect.go @@ -0,0 +1,144 @@ +package service + +import ( + "context" + "fmt" + "time" + + "github.com/docker/go-connections/nat" + "github.com/testcontainers/testcontainers-go" + "github.com/testcontainers/testcontainers-go/wait" + + libnode "github.com/hashicorp/consul/test/integration/consul-container/libs/agent" + "github.com/hashicorp/consul/test/integration/consul-container/libs/utils" +) + +// ConnectContainer +type ConnectContainer struct { + ctx context.Context + container testcontainers.Container + ip string + appPort int + adminPort int + req testcontainers.ContainerRequest +} + +func (g ConnectContainer) GetName() string { + name, err := g.container.Name(g.ctx) + if err != nil { + return "" + } + return name +} + +func (g ConnectContainer) GetAddr() (string, int) { + return g.ip, g.appPort +} + +func (g ConnectContainer) Start() error { + if g.container == nil { + return fmt.Errorf("container has not been initialized") + } + return g.container.Start(context.Background()) +} + +func (g ConnectContainer) GetAdminAddr() (string, int) { + return "localhost", g.adminPort +} + +// Terminate attempts to terminate the container. On failure, an error will be +// returned and the reaper process (RYUK) will handle cleanup. +func (c ConnectContainer) Terminate() error { + if c.container == nil { + return nil + } + + err := c.container.StopLogProducer() + + if err1 := c.container.Terminate(c.ctx); err == nil { + err = err1 + } + + c.container = nil + + return err +} + +func NewConnectService(ctx context.Context, name string, serviceName string, serviceBindPort int, node libnode.Agent) (Service, error) { + namePrefix := fmt.Sprintf("%s-service-connect-%s", node.GetDatacenter(), name) + containerName := utils.RandName(namePrefix) + + envoyVersion := getEnvoyVersion() + buildargs := map[string]*string{ + "ENVOY_VERSION": utils.StringToPointer(envoyVersion), + } + + dockerfileCtx, err := getDevContainerDockerfile() + if err != nil { + return nil, err + } + dockerfileCtx.BuildArgs = buildargs + + nodeIP, _ := node.GetAddr() + + req := testcontainers.ContainerRequest{ + FromDockerfile: dockerfileCtx, + WaitingFor: wait.ForLog("").WithStartupTimeout(10 * time.Second), + AutoRemove: false, + Name: containerName, + Cmd: []string{ + "consul", "connect", "envoy", + "-sidecar-for", serviceName, + "-service", name, + "-admin-bind", "0.0.0.0:19000", + "-grpc-addr", fmt.Sprintf("%s:8502", nodeIP), + "-http-addr", fmt.Sprintf("%s:8500", nodeIP), + "--", + "--log-level", "trace"}, + ExposedPorts: []string{ + fmt.Sprintf("%d/tcp", serviceBindPort), // Envoy Listener + "19000/tcp", // Envoy Admin Port + }, + } + container, err := testcontainers.GenericContainer(ctx, testcontainers.GenericContainerRequest{ + ContainerRequest: req, + Started: true, + }) + if err != nil { + return nil, err + } + + ip, err := container.ContainerIP(ctx) + if err != nil { + return nil, err + } + + mappedAppPort, err := container.MappedPort(ctx, nat.Port(fmt.Sprintf("%d", serviceBindPort))) + if err != nil { + return nil, err + } + mappedAdminPort, err := container.MappedPort(ctx, nat.Port(fmt.Sprintf("%d", 19000))) + if err != nil { + return nil, err + } + + if err := container.StartLogProducer(ctx); err != nil { + return nil, err + } + container.FollowOutput(&LogConsumer{ + Prefix: containerName, + }) + + // Register the termination function the agent so the containers can stop together + terminate := func() error { + return container.Terminate(context.Background()) + } + node.RegisterTermination(terminate) + + return &ConnectContainer{ + container: container, + ip: ip, + appPort: mappedAppPort.Int(), + adminPort: mappedAdminPort.Int(), + }, nil +} diff --git a/test/integration/consul-container/libs/service/examples.go b/test/integration/consul-container/libs/service/examples.go new file mode 100644 index 0000000000..9bb60a516d --- /dev/null +++ b/test/integration/consul-container/libs/service/examples.go @@ -0,0 +1,113 @@ +package service + +import ( + "context" + "fmt" + "time" + + "github.com/docker/go-connections/nat" + "github.com/testcontainers/testcontainers-go" + "github.com/testcontainers/testcontainers-go/wait" + + libnode "github.com/hashicorp/consul/test/integration/consul-container/libs/agent" + "github.com/hashicorp/consul/test/integration/consul-container/libs/utils" +) + +// exampleContainer +type exampleContainer struct { + ctx context.Context + container testcontainers.Container + ip string + httpPort int + grpcPort int + req testcontainers.ContainerRequest +} + +func (g exampleContainer) GetName() string { + name, err := g.container.Name(g.ctx) + if err != nil { + return "" + } + return name +} + +func (g exampleContainer) GetAddr() (string, int) { + return g.ip, g.httpPort +} + +func (g exampleContainer) Start() error { + if g.container == nil { + return fmt.Errorf("container has not been initialized") + } + return g.container.Start(context.Background()) +} + +// Terminate attempts to terminate the container. On failure, an error will be +// returned and the reaper process (RYUK) will handle cleanup. +func (c exampleContainer) Terminate() error { + if c.container == nil { + return nil + } + + err := c.container.StopLogProducer() + + if err1 := c.container.Terminate(c.ctx); err == nil { + err = err1 + } + + c.container = nil + + return err +} + +func NewExampleService(ctx context.Context, name string, httpPort int, grpcPort int, node libnode.Agent) (Service, error) { + namePrefix := fmt.Sprintf("%s-service-example-%s", node.GetDatacenter(), name) + containerName := utils.RandName(namePrefix) + + req := testcontainers.ContainerRequest{ + Image: hashicorpDockerProxy + "/fortio/fortio", + WaitingFor: wait.ForLog("").WithStartupTimeout(10 * time.Second), + AutoRemove: false, + Name: containerName, + Cmd: []string{"server", "-http-port", fmt.Sprintf("%d", httpPort), "-grpc-port", fmt.Sprintf("%d", grpcPort), "-redirect-port", "-disabled"}, + Env: map[string]string{"FORTIO_NAME": name}, + ExposedPorts: []string{ + fmt.Sprintf("%d/tcp", httpPort), // HTTP Listener + fmt.Sprintf("%d/tcp", grpcPort), // GRPC Listener + }, + } + container, err := testcontainers.GenericContainer(ctx, testcontainers.GenericContainerRequest{ + ContainerRequest: req, + Started: true, + }) + if err != nil { + return nil, err + } + ip, err := container.ContainerIP(ctx) + if err != nil { + return nil, err + } + mappedHTPPPort, err := container.MappedPort(ctx, nat.Port(fmt.Sprintf("%d", httpPort))) + if err != nil { + return nil, err + } + + mappedGRPCPort, err := container.MappedPort(ctx, nat.Port(fmt.Sprintf("%d", grpcPort))) + if err != nil { + return nil, err + } + + if err := container.StartLogProducer(ctx); err != nil { + return nil, err + } + container.FollowOutput(&LogConsumer{ + Prefix: containerName, + }) + + terminate := func() error { + return container.Terminate(context.Background()) + } + node.RegisterTermination(terminate) + + return &exampleContainer{container: container, ip: ip, httpPort: mappedHTPPPort.Int(), grpcPort: mappedGRPCPort.Int()}, nil +} diff --git a/test/integration/consul-container/libs/service/gateway.go b/test/integration/consul-container/libs/service/gateway.go new file mode 100644 index 0000000000..7d0485583c --- /dev/null +++ b/test/integration/consul-container/libs/service/gateway.go @@ -0,0 +1,128 @@ +package service + +import ( + "context" + "fmt" + "time" + + "github.com/testcontainers/testcontainers-go" + "github.com/testcontainers/testcontainers-go/wait" + + libnode "github.com/hashicorp/consul/test/integration/consul-container/libs/agent" + "github.com/hashicorp/consul/test/integration/consul-container/libs/utils" +) + +// gatewayContainer +type gatewayContainer struct { + ctx context.Context + container testcontainers.Container + ip string + port int + req testcontainers.ContainerRequest +} + +func (g gatewayContainer) GetName() string { + name, err := g.container.Name(g.ctx) + if err != nil { + return "" + } + return name +} + +func (g gatewayContainer) GetAddr() (string, int) { + return g.ip, g.port +} + +func (g gatewayContainer) Start() error { + if g.container == nil { + return fmt.Errorf("container has not been initialized") + } + return g.container.Start(context.Background()) +} + +// Terminate attempts to terminate the container. On failure, an error will be +// returned and the reaper process (RYUK) will handle cleanup. +func (c gatewayContainer) Terminate() error { + if c.container == nil { + return nil + } + + err := c.container.StopLogProducer() + + if err1 := c.container.Terminate(c.ctx); err == nil { + err = err1 + } + + c.container = nil + + return err +} + +func NewGatewayService(ctx context.Context, name string, kind string, node libnode.Agent) (Service, error) { + namePrefix := fmt.Sprintf("%s-service-gateway-%s", node.GetDatacenter(), name) + containerName := utils.RandName(namePrefix) + + envoyVersion := getEnvoyVersion() + buildargs := map[string]*string{ + "ENVOY_VERSION": utils.StringToPointer(envoyVersion), + } + + dockerfileCtx, err := getDevContainerDockerfile() + if err != nil { + return nil, err + } + dockerfileCtx.BuildArgs = buildargs + + nodeIP, _ := node.GetAddr() + + req := testcontainers.ContainerRequest{ + FromDockerfile: dockerfileCtx, + WaitingFor: wait.ForLog("").WithStartupTimeout(10 * time.Second), + AutoRemove: false, + Name: containerName, + Cmd: []string{ + "consul", "connect", "envoy", + fmt.Sprintf("-gateway=%s", kind), + "-register", + "-service", name, + "-address", "{{ GetInterfaceIP \"eth0\" }}:8443", + fmt.Sprintf("-grpc-addr=%s:%d", nodeIP, 8502), + "-admin-bind", "0.0.0.0:19000", + "--", + "--log-level", "info"}, + Env: map[string]string{"CONSUL_HTTP_ADDR": fmt.Sprintf("%s:%d", nodeIP, 8500)}, + ExposedPorts: []string{ + "8443/tcp", // Envoy Gateway Listener + "19000/tcp", // Envoy Admin Port + }, + } + container, err := testcontainers.GenericContainer(ctx, testcontainers.GenericContainerRequest{ + ContainerRequest: req, + Started: true, + }) + if err != nil { + return nil, err + } + ip, err := container.ContainerIP(ctx) + if err != nil { + return nil, err + } + mappedPort, err := container.MappedPort(ctx, "8443") + if err != nil { + return nil, err + } + + if err := container.StartLogProducer(ctx); err != nil { + return nil, err + } + container.FollowOutput(&LogConsumer{ + Prefix: containerName, + }) + + terminate := func() error { + return container.Terminate(context.Background()) + } + node.RegisterTermination(terminate) + + return &gatewayContainer{container: container, ip: ip, port: mappedPort.Int()}, nil +} diff --git a/test/integration/consul-container/libs/service/helpers.go b/test/integration/consul-container/libs/service/helpers.go new file mode 100644 index 0000000000..eac3de13fe --- /dev/null +++ b/test/integration/consul-container/libs/service/helpers.go @@ -0,0 +1,144 @@ +package service + +import ( + "context" + "fmt" + "io" + "net/http" + + "github.com/hashicorp/consul/api" + libnode "github.com/hashicorp/consul/test/integration/consul-container/libs/agent" +) + +func CreateAndRegisterStaticServerAndSidecar(node libnode.Agent) (Service, Service, error) { + // Create a service and proxy instance + serverService, err := NewExampleService(context.Background(), "static-server", 8080, 8079, node) + if err != nil { + return nil, nil, err + } + + serverConnectProxy, err := NewConnectService(context.Background(), "static-server-sidecar", "static-server", 8080, node) // bindPort not used + if err != nil { + return nil, nil, err + } + + serverServiceIP, _ := serverService.GetAddr() + serverConnectProxyIP, _ := serverConnectProxy.GetAddr() + + // Register the static-server service and sidecar + req := &api.AgentServiceRegistration{ + Name: "static-server", + Port: 8080, + Address: serverServiceIP, + Connect: &api.AgentServiceConnect{ + SidecarService: &api.AgentServiceRegistration{ + Name: "static-server-sidecar-proxy", + Port: 20000, + Address: serverConnectProxyIP, + Kind: api.ServiceKindConnectProxy, + Checks: api.AgentServiceChecks{ + &api.AgentServiceCheck{ + Name: "Connect Sidecar Listening", + TCP: fmt.Sprintf("%s:%d", serverConnectProxyIP, 20000), + Interval: "10s", + }, + &api.AgentServiceCheck{ + Name: "Connect Sidecar Aliasing Static Server", + AliasService: "static-server", + }, + }, + Proxy: &api.AgentServiceConnectProxyConfig{ + DestinationServiceName: "static-server", + LocalServiceAddress: serverServiceIP, + LocalServicePort: 8080, + }, + }, + }, + Check: &api.AgentServiceCheck{ + Name: "Connect Sidecar Listening", + TCP: fmt.Sprintf("%s:%d", serverServiceIP, 8080), + Interval: "10s", + }, + } + + err = node.GetClient().Agent().ServiceRegister(req) + if err != nil { + return serverService, serverConnectProxy, err + } + + return serverService, serverConnectProxy, nil +} + +func CreateAndRegisterStaticClientSidecar(node libnode.Agent, peerName string, localMeshGateway bool) (Service, error) { + // Create a service and proxy instance + clientConnectProxy, err := NewConnectService(context.Background(), "static-client-sidecar", "static-client", 5000, node) + if err != nil { + return nil, err + } + + clientConnectProxyIP, _ := clientConnectProxy.GetAddr() + + mgwMode := api.MeshGatewayModeRemote + if localMeshGateway { + mgwMode = api.MeshGatewayModeLocal + } + + // Register the static-client service and sidecar + req := &api.AgentServiceRegistration{ + Name: "static-client", + Port: 8080, + Connect: &api.AgentServiceConnect{ + SidecarService: &api.AgentServiceRegistration{ + Name: "static-client-sidecar-proxy", + Port: 20000, + Kind: api.ServiceKindConnectProxy, + Checks: api.AgentServiceChecks{ + &api.AgentServiceCheck{ + Name: "Connect Sidecar Listening", + TCP: fmt.Sprintf("%s:%d", clientConnectProxyIP, 20000), + Interval: "10s", + }, + }, + Proxy: &api.AgentServiceConnectProxyConfig{ + Upstreams: []api.Upstream{ + { + DestinationName: "static-server", + DestinationPeer: peerName, + LocalBindAddress: "0.0.0.0", + LocalBindPort: 5000, + MeshGateway: api.MeshGatewayConfig{ + Mode: mgwMode, + }, + }, + }, + }, + }, + }, + Checks: api.AgentServiceChecks{}, + } + + err = node.GetClient().Agent().ServiceRegister(req) + if err != nil { + return clientConnectProxy, err + } + + return clientConnectProxy, nil +} + +func GetEnvoyConfigDump(port int) (string, error) { + client := http.DefaultClient + url := fmt.Sprintf("http://localhost:%d/config_dump?include_eds", port) + + res, err := client.Get(url) + if err != nil { + return "", err + } + defer res.Body.Close() + + body, err := io.ReadAll(res.Body) + if err != nil { + return "", err + } + + return string(body), nil +} diff --git a/test/integration/consul-container/libs/service/log.go b/test/integration/consul-container/libs/service/log.go new file mode 100644 index 0000000000..d210f35c8a --- /dev/null +++ b/test/integration/consul-container/libs/service/log.go @@ -0,0 +1,23 @@ +package service + +import ( + "fmt" + "os" + + "github.com/testcontainers/testcontainers-go" +) + +type LogConsumer struct { + Prefix string +} + +var _ testcontainers.LogConsumer = (*LogConsumer)(nil) + +func (c *LogConsumer) Accept(log testcontainers.Log) { + switch log.LogType { + case "STDOUT": + fmt.Fprint(os.Stdout, c.Prefix+" ~~ "+string(log.Content)) + case "STDERR": + fmt.Fprint(os.Stderr, c.Prefix+" ~~ "+string(log.Content)) + } +} diff --git a/test/integration/consul-container/libs/service/service.go b/test/integration/consul-container/libs/service/service.go new file mode 100644 index 0000000000..3ecdf87689 --- /dev/null +++ b/test/integration/consul-container/libs/service/service.go @@ -0,0 +1,10 @@ +package service + +// Service represents a process that will be registered with the +// Consul catalog, including Consul components such as sidecars and gateways +type Service interface { + Terminate() error + GetName() string + GetAddr() (string, int) + Start() (err error) +} diff --git a/test/integration/consul-container/libs/utils/helpers.go b/test/integration/consul-container/libs/utils/helpers.go new file mode 100644 index 0000000000..6dace27b27 --- /dev/null +++ b/test/integration/consul-container/libs/utils/helpers.go @@ -0,0 +1,17 @@ +package utils + +import ( + "github.com/hashicorp/consul/api" +) + +func ApplyDefaultProxySettings(c *api.Client) (bool, error) { + req := &api.ProxyConfigEntry{ + Name: "global", + Kind: "proxy-defaults", + Config: map[string]any{ + "protocol": "tcp", + }, + } + ok, _, err := c.ConfigEntries().Set(req, &api.WriteOptions{}) + return ok, err +} diff --git a/test/integration/consul-container/libs/utils/utils.go b/test/integration/consul-container/libs/utils/utils.go index 552b85d0b7..c95307e490 100644 --- a/test/integration/consul-container/libs/utils/utils.go +++ b/test/integration/consul-container/libs/utils/utils.go @@ -1,13 +1,60 @@ package utils import ( - "github.com/hashicorp/go-uuid" + "encoding/json" + "fmt" + + "github.com/itchyny/gojq" + "github.com/teris-io/shortid" ) func RandName(name string) string { - generateUUID, err := uuid.GenerateUUID() + shortID, err := shortid.New(1, shortid.DefaultABC, 6666) + id, err := shortID.Generate() if err != nil { return "" } - return name + generateUUID + return name + "-" + id +} + +// JQFilter uses the provided "jq" filter to parse json. +// Matching results are returned as a slice of strings. +func JQFilter(config, filter string) ([]string, error) { + result := []string{} + query, err := gojq.Parse(filter) + if err != nil { + return nil, err + } + + var m interface{} + err = json.Unmarshal([]byte(config), &m) + if err != nil { + return nil, err + } + + iter := query.Run(m) + for { + v, ok := iter.Next() + if !ok { + break + } + if err, ok := v.(error); ok { + return nil, err + } + s := fmt.Sprintf("%v", v) + result = append(result, s) + } + return result, nil +} + +func IntToPointer(i int) *int { + return &i +} + +func BoolToPointer(b bool) *bool { + return &b +} + +func StringToPointer(s string) *string { + return &s } diff --git a/test/integration/consul-container/test/basic/connect_service_test.go b/test/integration/consul-container/test/basic/connect_service_test.go new file mode 100644 index 0000000000..099b7d728d --- /dev/null +++ b/test/integration/consul-container/test/basic/connect_service_test.go @@ -0,0 +1,88 @@ +package basic + +import ( + "testing" + + "github.com/stretchr/testify/require" + + libagent "github.com/hashicorp/consul/test/integration/consul-container/libs/agent" + libassert "github.com/hashicorp/consul/test/integration/consul-container/libs/assert" + libcluster "github.com/hashicorp/consul/test/integration/consul-container/libs/cluster" + libservice "github.com/hashicorp/consul/test/integration/consul-container/libs/service" + "github.com/hashicorp/consul/test/integration/consul-container/libs/utils" +) + +// TestBasicConnectService Summary +// This test makes sure two services in the same datacenter have connectivity. +// A simulated client (a direct HTTP call) talks to it's upstream proxy through the +// +// Steps: +// * Create a single agent cluster. +// * Create the example static-server and sidecar containers, then register them both with Consul +// * Create an example static-client sidecar, then register both the service and sidecar with Consul +// * Make sure a call to the client sidecar local bind port returns a response from the upstream, static-server +func TestBasicConnectService(t *testing.T) { + cluster := createCluster(t) + defer terminate(t, cluster) + + clientService := createServices(t, cluster) + _, port := clientService.GetAddr() + + libassert.HTTPServiceEchoes(t, "localhost", port) +} + +func terminate(t *testing.T, cluster *libcluster.Cluster) { + err := cluster.Terminate() + require.NoError(t, err) +} + +// createCluster +func createCluster(t *testing.T) *libcluster.Cluster { + opts := libagent.BuildOptions{ + InjectAutoEncryption: true, + InjectGossipEncryption: true, + } + ctx, err := libagent.NewBuildContext(opts) + require.NoError(t, err) + + conf, err := libagent.NewConfigBuilder(ctx).ToAgentConfig() + require.NoError(t, err) + t.Logf("Cluster config:\n%s", conf.JSON) + + configs := []libagent.Config{*conf} + + cluster, err := libcluster.New(configs) + require.NoError(t, err) + + node := cluster.Agents[0] + client := node.GetClient() + libcluster.WaitForLeader(t, cluster, client) + libcluster.WaitForMembers(t, client, 1) + + // Default Proxy Settings + ok, err := utils.ApplyDefaultProxySettings(client) + require.NoError(t, err) + require.True(t, ok) + + return cluster +} + +func createServices(t *testing.T, cluster *libcluster.Cluster) libservice.Service { + node := cluster.Agents[0] + client := node.GetClient() + + // Create a service and proxy instance + _, _, err := libservice.CreateAndRegisterStaticServerAndSidecar(node) + require.NoError(t, err) + + libassert.CatalogServiceExists(t, client, "static-server-sidecar-proxy") + libassert.CatalogServiceExists(t, client, "static-server") + + // Create a client proxy instance with the server as an upstream + clientConnectProxy, err := libservice.CreateAndRegisterStaticClientSidecar(node, "", false) + require.NoError(t, err) + + libassert.CatalogServiceExists(t, client, "static-client-sidecar-proxy") + + return clientConnectProxy +} diff --git a/test/integration/consul-container/metrics/leader_test.go b/test/integration/consul-container/test/metrics/leader_test.go similarity index 69% rename from test/integration/consul-container/metrics/leader_test.go rename to test/integration/consul-container/test/metrics/leader_test.go index 96a9e8d99c..964b1bd7b7 100644 --- a/test/integration/consul-container/metrics/leader_test.go +++ b/test/integration/consul-container/test/metrics/leader_test.go @@ -12,55 +12,40 @@ import ( "github.com/stretchr/testify/require" + "github.com/hashicorp/consul/test/integration/consul-container/libs/agent" + libagent "github.com/hashicorp/consul/test/integration/consul-container/libs/agent" libcluster "github.com/hashicorp/consul/test/integration/consul-container/libs/cluster" - "github.com/hashicorp/consul/test/integration/consul-container/libs/node" "github.com/hashicorp/consul/test/integration/consul-container/libs/utils" ) // Given a 3-server cluster, when the leader is elected, then leader's isLeader is 1 and non-leader's 0 func TestLeadershipMetrics(t *testing.T) { - var configs []node.Config - configs = append(configs, - node.Config{ - HCL: `node_name="` + utils.RandName("consul-server") + `" - log_level="DEBUG" - server=true - telemetry { - statsite_address = "127.0.0.1:2180" - }`, - Cmd: []string{"agent", "-client=0.0.0.0"}, - Version: *utils.TargetVersion, - Image: *utils.TargetImage, - }) + var configs []agent.Config + statsConf, err := libagent.NewConfigBuilder(nil).Telemetry("127.0.0.0:2180").ToAgentConfig() + require.NoError(t, err) + configs = append(configs, *statsConf) + + conf, err := libagent.NewConfigBuilder(nil).Bootstrap(3).ToAgentConfig() + require.NoError(t, err) numServer := 3 for i := 1; i < numServer; i++ { - configs = append(configs, - node.Config{ - HCL: `node_name="` + utils.RandName("consul-server") + `" - log_level="DEBUG" - bootstrap_expect=3 - server=true`, - Cmd: []string{"agent", "-client=0.0.0.0"}, - Version: *utils.TargetVersion, - Image: *utils.TargetImage, - }) - + configs = append(configs, *conf) } cluster, err := libcluster.New(configs) require.NoError(t, err) defer terminate(t, cluster) - svrCli := cluster.Nodes[0].GetClient() + svrCli := cluster.Agents[0].GetClient() libcluster.WaitForLeader(t, cluster, svrCli) libcluster.WaitForMembers(t, svrCli, 3) - retryWithBackoff := func(agentNode node.Node, expectedStr string) error { + retryWithBackoff := func(agent agent.Agent, expectedStr string) error { waiter := &utils.Waiter{ MaxWait: 5 * time.Minute, } - _, port := agentNode.GetAddr() + _, port := agent.GetAddr() ctx := context.Background() for { if waiter.Failures() > 5 { @@ -78,14 +63,14 @@ func TestLeadershipMetrics(t *testing.T) { } } - leaderNode, err := cluster.Leader() + leader, err := cluster.Leader() require.NoError(t, err) - leadAddr, leaderPort := leaderNode.GetAddr() + leadAddr, leaderPort := leader.GetAddr() - for i, n := range cluster.Nodes { + for i, n := range cluster.Agents { addr, port := n.GetAddr() if addr == leadAddr && port == leaderPort { - err = retryWithBackoff(leaderNode, ".server.isLeader\",\"Value\":1,") + err = retryWithBackoff(leader, ".server.isLeader\",\"Value\":1,") require.NoError(t, err, "%dth node(leader): could not find the metric %q in the /v1/agent/metrics response", i, ".server.isLeader\",\"Value\":1,") } else { err = retryWithBackoff(n, ".server.isLeader\",\"Value\":0,") diff --git a/test/integration/consul-container/test/peering/rotate_server_and_ca_then_fail_test.go b/test/integration/consul-container/test/peering/rotate_server_and_ca_then_fail_test.go new file mode 100644 index 0000000000..cbfa917999 --- /dev/null +++ b/test/integration/consul-container/test/peering/rotate_server_and_ca_then_fail_test.go @@ -0,0 +1,372 @@ +package peering + +import ( + "context" + "encoding/pem" + "fmt" + "sync" + "testing" + "time" + + "github.com/stretchr/testify/require" + + "github.com/hashicorp/consul/api" + "github.com/hashicorp/consul/sdk/testutil/retry" + libagent "github.com/hashicorp/consul/test/integration/consul-container/libs/agent" + libassert "github.com/hashicorp/consul/test/integration/consul-container/libs/assert" + libcluster "github.com/hashicorp/consul/test/integration/consul-container/libs/cluster" + libservice "github.com/hashicorp/consul/test/integration/consul-container/libs/service" + "github.com/hashicorp/consul/test/integration/consul-container/libs/utils" +) + +const ( + acceptingPeerName = "accepting-to-dialer" + dialingPeerName = "dialing-to-acceptor" +) + +// TestPeering_RotateServerAndCAThenFail_ +// This test runs a few scenarios back to back +// 1. It makes sure that the peering stream send server address updates between peers. +// It also verifies that dialing clusters will use this stored information to supersede the addresses +// encoded in the peering token. +// 2. Rotate the CA in the exporting cluster and ensure services don't break +// 3. Terminate the server nodes in the exporting cluster and make sure the importing cluster can still dial it's +// upstream. +// +// ## Steps +// ### Part 1 +// - Create an accepting cluster with 3 servers. 1 client should be used to host a service for export +// - Create a single agent dialing cluster. +// - Create the peering and export the service. Verify it is working +// - Incrementally replace the follower nodes. +// - Replace the leader agent +// - Verify the dialer can reach the new server nodes and the service becomes available. +// +// ### Part 2 +// - Push an update to the CA Configuration in the exporting cluster and wait for the new root to be generated +// - Verify envoy client sidecar has two certificates for the upstream server +// - Make sure there is still service connectivity from the importing cluster +// +// ### Part 3 +// - Terminate the server nodes in the exporting cluster +// - Make sure there is still service connectivity from the importing cluster +func TestPeering_RotateServerAndCAThenFail_(t *testing.T) { + var acceptingCluster, dialingCluster *libcluster.Cluster + var acceptingClient, dialingClient *api.Client + var acceptingCtx *libagent.BuildContext + var clientSidecarService libservice.Service + + var wg sync.WaitGroup + + wg.Add(1) + go func() { + acceptingCluster, acceptingClient, acceptingCtx = creatingAcceptingClusterAndSetup(t) + wg.Done() + }() + defer func() { + terminate(t, acceptingCluster) + }() + + wg.Add(1) + go func() { + dialingCluster, dialingClient, clientSidecarService = createDialingClusterAndSetup(t) + wg.Done() + }() + defer func() { + terminate(t, dialingCluster) + }() + + wg.Wait() + + generateReq := api.PeeringGenerateTokenRequest{ + PeerName: acceptingPeerName, + } + generateRes, _, err := acceptingClient.Peerings().GenerateToken(context.Background(), generateReq, &api.WriteOptions{}) + require.NoError(t, err) + + establishReq := api.PeeringEstablishRequest{ + PeerName: dialingPeerName, + PeeringToken: generateRes.PeeringToken, + } + _, _, err = dialingClient.Peerings().Establish(context.Background(), establishReq, &api.WriteOptions{}) + require.NoError(t, err) + + libassert.PeeringStatus(t, acceptingClient, acceptingPeerName, api.PeeringStateActive) + libassert.PeeringExports(t, acceptingClient, acceptingPeerName, 1) + + _, port := clientSidecarService.GetAddr() + libassert.HTTPServiceEchoes(t, "localhost", port) + + t.Run("test rotating servers", func(t *testing.T) { + + // Start by replacing the Followers + leader, err := acceptingCluster.Leader() + require.NoError(t, err) + + followers, err := acceptingCluster.Followers() + require.NoError(t, err) + require.Len(t, followers, 2) + + for idx, follower := range followers { + t.Log("Removing follower", idx) + rotateServer(t, acceptingCluster, acceptingClient, acceptingCtx, follower) + } + + t.Log("Removing leader") + rotateServer(t, acceptingCluster, acceptingClient, acceptingCtx, leader) + + libassert.PeeringStatus(t, acceptingClient, acceptingPeerName, api.PeeringStateActive) + libassert.PeeringExports(t, acceptingClient, acceptingPeerName, 1) + + libassert.HTTPServiceEchoes(t, "localhost", port) + }) + + t.Run("rotate exporting cluster's root CA", func(t *testing.T) { + config, meta, err := acceptingClient.Connect().CAGetConfig(&api.QueryOptions{}) + require.NoError(t, err) + + t.Logf("%+v", config) + + req := &api.CAConfig{ + Provider: "consul", + Config: map[string]interface{}{ + "PrivateKeyType": "ec", + "PrivateKeyBits": 384, + }, + } + _, err = acceptingClient.Connect().CASetConfig(req, &api.WriteOptions{}) + require.NoError(t, err) + + // wait up to 30 seconds for the update + _, _, err = acceptingClient.Connect().CAGetConfig(&api.QueryOptions{ + WaitIndex: meta.LastIndex, + WaitTime: 30 * time.Second, + }) + require.NoError(t, err) + + // There should be two root certs now + rootList, _, err := acceptingClient.Connect().CARoots(&api.QueryOptions{}) + require.NoError(t, err) + require.Len(t, rootList.Roots, 2) + + // Connectivity should still be contained + _, port := clientSidecarService.GetAddr() + libassert.HTTPServiceEchoes(t, "localhost", port) + + verifySidecarHasTwoRootCAs(t, clientSidecarService) + + }) + + t.Run("terminate exporting clusters servers and ensure imported services are still reachable", func(t *testing.T) { + // Keep this list for later + newNodes, err := acceptingCluster.Clients() + require.NoError(t, err) + + serverNodes, err := acceptingCluster.Servers() + require.NoError(t, err) + for _, node := range serverNodes { + require.NoError(t, node.Terminate()) + } + + // Remove the nodes from the cluster to prevent double-termination + acceptingCluster.Agents = newNodes + + // ensure any transitory actions like replication cleanup would not affect the next verifications + time.Sleep(30 * time.Second) + + _, port := clientSidecarService.GetAddr() + libassert.HTTPServiceEchoes(t, "localhost", port) + }) +} + +func terminate(t *testing.T, cluster *libcluster.Cluster) { + err := cluster.Terminate() + require.NoError(t, err) +} + +// creatingAcceptingClusterAndSetup creates a cluster with 3 servers and 1 client. +// It also creates and registers a service+sidecar. +// The API client returned is pointed at the client agent. +func creatingAcceptingClusterAndSetup(t *testing.T) (*libcluster.Cluster, *api.Client, *libagent.BuildContext) { + var configs []libagent.Config + + opts := libagent.BuildOptions{ + InjectAutoEncryption: true, + InjectGossipEncryption: true, + } + ctx, err := libagent.NewBuildContext(opts) + require.NoError(t, err) + + numServer := 3 + for i := 0; i < numServer; i++ { + serverConf, err := libagent.NewConfigBuilder(ctx). + Bootstrap(3). + Peering(true). + RetryJoin(fmt.Sprintf("agent-%d", (i+1)%3)). // Round-robin join the servers + ToAgentConfig() + require.NoError(t, err) + t.Logf("dc1 server config %d: \n%s", i, serverConf.JSON) + + configs = append(configs, *serverConf) + } + + // Add a stable client to register the service + clientConf, err := libagent.NewConfigBuilder(ctx). + Client(). + Peering(true). + RetryJoin("agent-0", "agent-1", "agent-2"). + ToAgentConfig() + require.NoError(t, err) + + t.Logf("dc1 client config: \n%s", clientConf.JSON) + + configs = append(configs, *clientConf) + + cluster, err := libcluster.New(configs) + require.NoError(t, err) + + // Use the client agent as the HTTP endpoint since we will not rotate it + clientNode := cluster.Agents[3] + client := clientNode.GetClient() + libcluster.WaitForLeader(t, cluster, client) + libcluster.WaitForMembers(t, client, 4) + + // Default Proxy Settings + ok, err := utils.ApplyDefaultProxySettings(client) + require.NoError(t, err) + require.True(t, ok) + + // Create the mesh gateway for dataplane traffic + _, err = libservice.NewGatewayService(context.Background(), "mesh", "mesh", clientNode) + require.NoError(t, err) + + // Create a service and proxy instance + _, _, err = libservice.CreateAndRegisterStaticServerAndSidecar(clientNode) + require.NoError(t, err) + + libassert.CatalogServiceExists(t, client, "static-server") + libassert.CatalogServiceExists(t, client, "static-server-sidecar-proxy") + + // Export the service + config := &api.ExportedServicesConfigEntry{ + Name: "default", + Services: []api.ExportedService{ + { + Name: "static-server", + Consumers: []api.ServiceConsumer{ + {Peer: acceptingPeerName}, + }, + }, + }, + } + ok, _, err = client.ConfigEntries().Set(config, &api.WriteOptions{}) + require.NoError(t, err) + require.True(t, ok) + + return cluster, client, ctx +} + +// createDialingClusterAndSetup creates a cluster for peering with a single dev agent +func createDialingClusterAndSetup(t *testing.T) (*libcluster.Cluster, *api.Client, libservice.Service) { + opts := libagent.BuildOptions{ + Datacenter: "dc2", + InjectAutoEncryption: true, + InjectGossipEncryption: true, + } + ctx, err := libagent.NewBuildContext(opts) + require.NoError(t, err) + + conf, err := libagent.NewConfigBuilder(ctx). + Peering(true). + ToAgentConfig() + require.NoError(t, err) + t.Logf("dc2 server config: \n%s", conf.JSON) + + configs := []libagent.Config{*conf} + + cluster, err := libcluster.New(configs) + require.NoError(t, err) + + node := cluster.Agents[0] + client := node.GetClient() + libcluster.WaitForLeader(t, cluster, client) + libcluster.WaitForMembers(t, client, 1) + + // Default Proxy Settings + ok, err := utils.ApplyDefaultProxySettings(client) + require.NoError(t, err) + require.True(t, ok) + + // Create the mesh gateway for dataplane traffic + _, err = libservice.NewGatewayService(context.Background(), "mesh", "mesh", node) + require.NoError(t, err) + + // Create a service and proxy instance + clientProxyService, err := libservice.CreateAndRegisterStaticClientSidecar(node, dialingPeerName, true) + require.NoError(t, err) + + libassert.CatalogServiceExists(t, client, "static-client-sidecar-proxy") + + return cluster, client, clientProxyService +} + +// rotateServer add a new server agent to the cluster, then forces the prior agent to leave. +func rotateServer(t *testing.T, cluster *libcluster.Cluster, client *api.Client, ctx *libagent.BuildContext, node libagent.Agent) { + conf, err := libagent.NewConfigBuilder(ctx). + Bootstrap(0). + Peering(true). + RetryJoin("agent-3"). // Always use the client agent since it never leaves the cluster + ToAgentConfig() + require.NoError(t, err) + + err = cluster.Add([]libagent.Config{*conf}) + require.NoError(t, err, "could not start new node") + + libcluster.WaitForMembers(t, client, 5) + + require.NoError(t, cluster.Remove(node)) + + libcluster.WaitForMembers(t, client, 4) +} + +func verifySidecarHasTwoRootCAs(t *testing.T, sidecar libservice.Service) { + connectContainer, ok := sidecar.(*libservice.ConnectContainer) + require.True(t, ok) + _, adminPort := connectContainer.GetAdminAddr() + + failer := func() *retry.Timer { + return &retry.Timer{Timeout: 30 * time.Second, Wait: 1 * time.Second} + } + + retry.RunWith(failer(), t, func(r *retry.R) { + dump, err := libservice.GetEnvoyConfigDump(adminPort) + if err != nil { + r.Fatal("could not curl envoy configuration") + } + + // Make sure there are two certs in the sidecar + filter := `.configs[] | select(.["@type"] | contains("type.googleapis.com/envoy.admin.v3.ClustersConfigDump")).dynamic_active_clusters[] | select(.cluster.name | contains("static-server.default.dialing-to-acceptor.external")).cluster.transport_socket.typed_config.common_tls_context.validation_context.trusted_ca.inline_string` + results, err := utils.JQFilter(dump, filter) + if err != nil { + r.Fatal("could not parse envoy configuration") + } + if len(results) != 1 { + r.Fatal("could not find certificates in cluster TLS context") + } + + rest := []byte(results[0]) + var count int + for len(rest) > 0 { + var p *pem.Block + p, rest = pem.Decode(rest) + if p == nil { + break + } + count++ + } + + if count != 2 { + r.Fatalf("expected 2 TLS certificates and %d present", count) + } + }) +} diff --git a/test/integration/consul-container/upgrade/README.md b/test/integration/consul-container/test/upgrade/README.md similarity index 100% rename from test/integration/consul-container/upgrade/README.md rename to test/integration/consul-container/test/upgrade/README.md diff --git a/test/integration/consul-container/upgrade/healthcheck_test.go b/test/integration/consul-container/test/upgrade/healthcheck_test.go similarity index 71% rename from test/integration/consul-container/upgrade/healthcheck_test.go rename to test/integration/consul-container/test/upgrade/healthcheck_test.go index e3d298c17b..f318faf60e 100644 --- a/test/integration/consul-container/upgrade/healthcheck_test.go +++ b/test/integration/consul-container/test/upgrade/healthcheck_test.go @@ -10,8 +10,8 @@ import ( "github.com/hashicorp/consul/api" + libagent "github.com/hashicorp/consul/test/integration/consul-container/libs/agent" libcluster "github.com/hashicorp/consul/test/integration/consul-container/libs/cluster" - "github.com/hashicorp/consul/test/integration/consul-container/libs/node" "github.com/hashicorp/consul/test/integration/consul-container/libs/utils" ) @@ -25,11 +25,11 @@ func TestTargetServersWithLatestGAClients(t *testing.T) { cluster := serversCluster(t, numServers, *utils.TargetVersion, *utils.TargetImage) defer terminate(t, cluster) - clients := clientsCreate(t, numClients, *utils.LatestImage, *utils.LatestVersion, cluster.EncryptKey) + clients := clientsCreate(t, numClients, *utils.LatestImage, *utils.LatestVersion, cluster) - require.NoError(t, cluster.AddNodes(clients)) + require.NoError(t, cluster.Join(clients)) - client := cluster.Nodes[0].GetClient() + client := cluster.Agents[0].GetClient() libcluster.WaitForLeader(t, cluster, client) libcluster.WaitForMembers(t, client, 4) @@ -71,29 +71,32 @@ func TestTargetServersWithLatestGAClients(t *testing.T) { // Test health check GRPC call using Mixed (majority latest) Servers and Latest GA Clients func TestMixedServersMajorityLatestGAClient(t *testing.T) { - var configs []node.Config - configs = append(configs, - node.Config{ - HCL: `node_name="` + utils.RandName("consul-server") + `" - log_level="DEBUG" - server=true`, - Cmd: []string{"agent", "-client=0.0.0.0"}, - Version: *utils.TargetVersion, - Image: *utils.TargetImage, - }) + var configs []libagent.Config + + leaderConf, err := libagent.NewConfigBuilder(nil).ToAgentConfig() + require.NoError(t, err) + + configs = append(configs, *leaderConf) + + // This needs a specialized config since it is using an older version of the agent. + // That is missing fields like GRPC_TLS and PEERING, which are passed as defaults + serverConf := `{ + "advertise_addr": "{{ GetInterfaceIP \"eth0\" }}", + "bind_addr": "0.0.0.0", + "client_addr": "0.0.0.0", + "log_level": "DEBUG", + "server": true, + "bootstrap_expect": 3 + }` for i := 1; i < 3; i++ { configs = append(configs, - node.Config{ - HCL: `node_name="` + utils.RandName("consul-server") + `" - log_level="DEBUG" - bootstrap_expect=3 - server=true`, - Cmd: []string{"agent", "-client=0.0.0.0"}, + libagent.Config{ + JSON: serverConf, + Cmd: []string{"agent"}, Version: *utils.LatestVersion, Image: *utils.LatestImage, }) - } cluster, err := libcluster.New(configs) @@ -104,9 +107,9 @@ func TestMixedServersMajorityLatestGAClient(t *testing.T) { numClients = 1 ) - clients := clientsCreate(t, numClients, *utils.LatestImage, *utils.LatestVersion, cluster.EncryptKey) + clients := clientsCreate(t, numClients, *utils.LatestImage, *utils.LatestVersion, cluster) - require.NoError(t, cluster.AddNodes(clients)) + require.NoError(t, cluster.Join(clients)) client := clients[0].GetClient() @@ -149,26 +152,26 @@ func TestMixedServersMajorityLatestGAClient(t *testing.T) { // Test health check GRPC call using Mixed (majority target) Servers and Latest GA Clients func TestMixedServersMajorityTargetGAClient(t *testing.T) { - var configs []node.Config - for i := 0; i < 2; i++ { - configs = append(configs, - node.Config{ - HCL: `node_name="` + utils.RandName("consul-server") + `" - log_level="DEBUG" - bootstrap_expect=3 - server=true`, - Cmd: []string{"agent", "-client=0.0.0.0"}, - Version: *utils.TargetVersion, - Image: *utils.TargetImage, - }) + var configs []libagent.Config + for i := 0; i < 2; i++ { + serverConf, err := libagent.NewConfigBuilder(nil).Bootstrap(3).ToAgentConfig() + require.NoError(t, err) + configs = append(configs, *serverConf) } + + leaderConf := `{ + "advertise_addr": "{{ GetInterfaceIP \"eth0\" }}", + "bind_addr": "0.0.0.0", + "client_addr": "0.0.0.0", + "log_level": "DEBUG", + "server": true + }` + configs = append(configs, - node.Config{ - HCL: `node_name="` + utils.RandName("consul-server") + `" - log_level="DEBUG" - server=true`, - Cmd: []string{"agent", "-client=0.0.0.0"}, + libagent.Config{ + JSON: leaderConf, + Cmd: []string{"agent"}, Version: *utils.LatestVersion, Image: *utils.LatestImage, }) @@ -181,9 +184,9 @@ func TestMixedServersMajorityTargetGAClient(t *testing.T) { numClients = 1 ) - clients := clientsCreate(t, numClients, *utils.LatestImage, *utils.LatestVersion, cluster.EncryptKey) + clients := clientsCreate(t, numClients, *utils.LatestImage, *utils.LatestVersion, cluster) - require.NoError(t, cluster.AddNodes(clients)) + require.NoError(t, cluster.Join(clients)) client := clients[0].GetClient() @@ -211,7 +214,7 @@ func TestMixedServersMajorityTargetGAClient(t *testing.T) { &api.AgentServiceRegistration{Name: serviceName, Port: 9998}, )) - timer := time.NewTimer(1 * time.Second) + timer := time.NewTimer(3 * time.Second) select { case err := <-errCh: require.NoError(t, err) @@ -224,20 +227,29 @@ func TestMixedServersMajorityTargetGAClient(t *testing.T) { } } -func clientsCreate(t *testing.T, numClients int, image string, version string, serfKey string) []node.Node { - clients := make([]node.Node, numClients) +func clientsCreate(t *testing.T, numClients int, image string, version string, cluster *libcluster.Cluster) []libagent.Agent { + clients := make([]libagent.Agent, numClients) + + // This needs a specialized config since it is using an older version of the agent. + // That is missing fields like GRPC_TLS and PEERING, which are passed as defaults + conf := `{ + "advertise_addr": "{{ GetInterfaceIP \"eth0\" }}", + "bind_addr": "0.0.0.0", + "client_addr": "0.0.0.0", + "log_level": "DEBUG" + }` + for i := 0; i < numClients; i++ { var err error - clients[i], err = node.NewConsulContainer(context.Background(), - node.Config{ - HCL: fmt.Sprintf(` - node_name = %q - log_level = "DEBUG" - encrypt = %q`, utils.RandName("consul-client"), serfKey), - Cmd: []string{"agent", "-client=0.0.0.0"}, + clients[i], err = libagent.NewConsulContainer(context.Background(), + libagent.Config{ + JSON: conf, + Cmd: []string{"agent"}, Version: version, Image: image, - }) + }, + cluster.NetworkName, + cluster.Index) require.NoError(t, err) } return clients @@ -257,23 +269,21 @@ func serviceCreate(t *testing.T, client *api.Client, serviceName string) uint64 } func serversCluster(t *testing.T, numServers int, version string, image string) *libcluster.Cluster { - var configs []node.Config + var configs []libagent.Config + + conf, err := libagent.NewConfigBuilder(nil). + Bootstrap(3). + ToAgentConfig() + require.NoError(t, err) + for i := 0; i < numServers; i++ { - configs = append(configs, node.Config{ - HCL: `node_name="` + utils.RandName("consul-server") + `" - log_level="DEBUG" - bootstrap_expect=3 - server=true`, - Cmd: []string{"agent", "-client=0.0.0.0"}, - Version: version, - Image: image, - }) + configs = append(configs, *conf) } cluster, err := libcluster.New(configs) require.NoError(t, err) libcluster.WaitForLeader(t, cluster, nil) - libcluster.WaitForMembers(t, cluster.Nodes[0].GetClient(), numServers) + libcluster.WaitForMembers(t, cluster.Agents[0].GetClient(), numServers) return cluster }