29d5811f0d
* Persist HCP management token from server config We want to move away from injecting an initial management token into Consul clusters linked to HCP. The reasoning is that by using a separate class of token we can have more flexibility in terms of allowing HCP's token to co-exist with the user's management token. Down the line we can also more easily adjust the permissions attached to HCP's token to limit it's scope. With these changes, the cloud management token is like the initial management token in that iit has the same global management policy and if it is created it effectively bootstraps the ACL system. * Update SDK and mock HCP server The HCP management token will now be sent in a special field rather than as Consul's "initial management" token configuration. This commit also updates the mock HCP server to more accurately reflect the behavior of the CCM backend. * Refactor HCP bootstrapping logic and add tests We want to allow users to link Consul clusters that already exist to HCP. Existing clusters need care when bootstrapped by HCP, since we do not want to do things like change ACL/TLS settings for a running cluster. Additional changes: * Deconstruct MaybeBootstrap so that it can be tested. The HCP Go SDK requires HTTPS to fetch a token from the Auth URL, even if the backend server is mocked. By pulling the hcp.Client creation out we can modify its TLS configuration in tests while keeping the secure behavior in production code. * Add light validation for data received/loaded. * Sanitize initial_management token from received config, since HCP will only ever use the CloudConfig.MangementToken. * Add changelog entry
512 lines
14 KiB
Plaintext
512 lines
14 KiB
Plaintext
{
|
|
"ACLEnableKeyListPolicy": false,
|
|
"ACLInitialManagementToken": "hidden",
|
|
"ACLResolverSettings": {
|
|
"ACLDefaultPolicy": "",
|
|
"ACLDownPolicy": "",
|
|
"ACLPolicyTTL": "0s",
|
|
"ACLRoleTTL": "0s",
|
|
"ACLTokenTTL": "0s",
|
|
"ACLsEnabled": false,
|
|
"Datacenter": "",
|
|
"EnterpriseMeta": {},
|
|
"NodeName": ""
|
|
},
|
|
"ACLTokenReplication": false,
|
|
"ACLTokens": {
|
|
"ACLAgentRecoveryToken": "hidden",
|
|
"ACLAgentToken": "hidden",
|
|
"ACLConfigFileRegistrationToken": "hidden",
|
|
"ACLDefaultToken": "hidden",
|
|
"ACLReplicationToken": "hidden",
|
|
"DataDir": "",
|
|
"EnablePersistence": false,
|
|
"EnterpriseConfig": {}
|
|
},
|
|
"ACLsEnabled": false,
|
|
"AEInterval": "0s",
|
|
"AdvertiseAddrLAN": "",
|
|
"AdvertiseAddrWAN": "",
|
|
"AdvertiseReconnectTimeout": "0s",
|
|
"AllowWriteHTTPFrom": [
|
|
"127.0.0.0/8",
|
|
"::1/128"
|
|
],
|
|
"AutoConfig": {
|
|
"Authorizer": {
|
|
"AllowReuse": false,
|
|
"AuthMethod": {
|
|
"ACLAuthMethodEnterpriseFields": {},
|
|
"Config": {},
|
|
"Description": "",
|
|
"DisplayName": "",
|
|
"EnterpriseMeta": {},
|
|
"MaxTokenTTL": "0s",
|
|
"Name": "",
|
|
"RaftIndex": {
|
|
"CreateIndex": 0,
|
|
"ModifyIndex": 0
|
|
},
|
|
"TokenLocality": "",
|
|
"Type": ""
|
|
},
|
|
"ClaimAssertions": [],
|
|
"Enabled": false
|
|
},
|
|
"DNSSANs": [],
|
|
"Enabled": false,
|
|
"IPSANs": [],
|
|
"IntroToken": "hidden",
|
|
"IntroTokenFile": "",
|
|
"ServerAddresses": []
|
|
},
|
|
"AutoEncryptAllowTLS": false,
|
|
"AutoEncryptDNSSAN": [],
|
|
"AutoEncryptIPSAN": [],
|
|
"AutoEncryptTLS": false,
|
|
"AutoReloadConfig": false,
|
|
"AutoReloadConfigCoalesceInterval": "0s",
|
|
"AutopilotCleanupDeadServers": false,
|
|
"AutopilotDisableUpgradeMigration": false,
|
|
"AutopilotLastContactThreshold": "0s",
|
|
"AutopilotMaxTrailingLogs": 0,
|
|
"AutopilotMinQuorum": 0,
|
|
"AutopilotRedundancyZoneTag": "",
|
|
"AutopilotServerStabilizationTime": "0s",
|
|
"AutopilotUpgradeVersionTag": "",
|
|
"BindAddr": "127.0.0.1",
|
|
"Bootstrap": false,
|
|
"BootstrapExpect": 0,
|
|
"BuildDate": "2019-11-20 05:00:00 +0000 UTC",
|
|
"Cache": {
|
|
"EntryFetchMaxBurst": 42,
|
|
"EntryFetchRate": 0.334,
|
|
"Logger": null
|
|
},
|
|
"CheckDeregisterIntervalMin": "0s",
|
|
"CheckOutputMaxSize": 4096,
|
|
"CheckReapInterval": "0s",
|
|
"CheckUpdateInterval": "0s",
|
|
"Checks": [
|
|
{
|
|
"AliasNode": "",
|
|
"AliasService": "",
|
|
"Body": "",
|
|
"DeregisterCriticalServiceAfter": "0s",
|
|
"DisableRedirects": false,
|
|
"DockerContainerID": "",
|
|
"EnterpriseMeta": {},
|
|
"FailuresBeforeCritical": 0,
|
|
"FailuresBeforeWarning": 0,
|
|
"GRPC": "",
|
|
"GRPCUseTLS": false,
|
|
"H2PING": "",
|
|
"H2PingUseTLS": false,
|
|
"HTTP": "",
|
|
"Header": {},
|
|
"ID": "",
|
|
"Interval": "0s",
|
|
"Method": "",
|
|
"Name": "zoo",
|
|
"Notes": "",
|
|
"OSService": "",
|
|
"OutputMaxSize": 4096,
|
|
"ScriptArgs": [],
|
|
"ServiceID": "",
|
|
"Shell": "",
|
|
"Status": "",
|
|
"SuccessBeforePassing": 0,
|
|
"TCP": "",
|
|
"TLSServerName": "",
|
|
"TLSSkipVerify": false,
|
|
"TTL": "0s",
|
|
"Timeout": "0s",
|
|
"Token": "hidden",
|
|
"UDP": ""
|
|
}
|
|
],
|
|
"ClientAddrs": [],
|
|
"Cloud": {
|
|
"AuthURL": "",
|
|
"ClientID": "id",
|
|
"ClientSecret": "hidden",
|
|
"Hostname": "",
|
|
"ManagementToken": "hidden",
|
|
"ResourceID": "cluster1",
|
|
"ScadaAddress": "",
|
|
"TLSConfig": null
|
|
},
|
|
"ConfigEntryBootstrap": [],
|
|
"ConnectCAConfig": {},
|
|
"ConnectCAProvider": "",
|
|
"ConnectEnabled": false,
|
|
"ConnectMeshGatewayWANFederationEnabled": false,
|
|
"ConnectSidecarMaxPort": 0,
|
|
"ConnectSidecarMinPort": 0,
|
|
"ConnectTestCALeafRootChangeSpread": "0s",
|
|
"ConsulCoordinateUpdateBatchSize": 0,
|
|
"ConsulCoordinateUpdateMaxBatches": 0,
|
|
"ConsulCoordinateUpdatePeriod": "15s",
|
|
"ConsulRaftElectionTimeout": "0s",
|
|
"ConsulRaftHeartbeatTimeout": "0s",
|
|
"ConsulRaftLeaderLeaseTimeout": "0s",
|
|
"ConsulServerHealthInterval": "0s",
|
|
"DNSARecordLimit": 0,
|
|
"DNSAddrs": [
|
|
"tcp://1.2.3.4:5678",
|
|
"udp://1.2.3.4:5678"
|
|
],
|
|
"DNSAllowStale": false,
|
|
"DNSAltDomain": "",
|
|
"DNSCacheMaxAge": "0s",
|
|
"DNSDisableCompression": false,
|
|
"DNSDomain": "",
|
|
"DNSEnableTruncate": false,
|
|
"DNSMaxStale": "0s",
|
|
"DNSNodeMetaTXT": false,
|
|
"DNSNodeTTL": "0s",
|
|
"DNSOnlyPassing": false,
|
|
"DNSPort": 0,
|
|
"DNSRecursorStrategy": "",
|
|
"DNSRecursorTimeout": "0s",
|
|
"DNSRecursors": [],
|
|
"DNSSOA": {
|
|
"Expire": 86400,
|
|
"Minttl": 0,
|
|
"Refresh": 3600,
|
|
"Retry": 600
|
|
},
|
|
"DNSServiceTTL": {},
|
|
"DNSUDPAnswerLimit": 0,
|
|
"DNSUseCache": false,
|
|
"DataDir": "",
|
|
"Datacenter": "",
|
|
"DefaultQueryTime": "0s",
|
|
"DevMode": false,
|
|
"DisableAnonymousSignature": false,
|
|
"DisableCoordinates": false,
|
|
"DisableHTTPUnprintableCharFilter": false,
|
|
"DisableHostNodeID": false,
|
|
"DisableKeyringFile": false,
|
|
"DisableRemoteExec": false,
|
|
"DisableUpdateCheck": false,
|
|
"DiscardCheckOutput": false,
|
|
"DiscoveryMaxStale": "0s",
|
|
"EnableAgentTLSForChecks": false,
|
|
"EnableCentralServiceConfig": false,
|
|
"EnableDebug": false,
|
|
"EnableLocalScriptChecks": false,
|
|
"EnableRemoteScriptChecks": false,
|
|
"EncryptKey": "hidden",
|
|
"EnterpriseRuntimeConfig": {},
|
|
"ExposeMaxPort": 0,
|
|
"ExposeMinPort": 0,
|
|
"GRPCAddrs": [],
|
|
"GRPCPort": 0,
|
|
"GRPCTLSAddrs": [],
|
|
"GRPCTLSPort": 0,
|
|
"GossipLANGossipInterval": "0s",
|
|
"GossipLANGossipNodes": 0,
|
|
"GossipLANProbeInterval": "0s",
|
|
"GossipLANProbeTimeout": "0s",
|
|
"GossipLANRetransmitMult": 0,
|
|
"GossipLANSuspicionMult": 0,
|
|
"GossipWANGossipInterval": "0s",
|
|
"GossipWANGossipNodes": 0,
|
|
"GossipWANProbeInterval": "0s",
|
|
"GossipWANProbeTimeout": "0s",
|
|
"GossipWANRetransmitMult": 0,
|
|
"GossipWANSuspicionMult": 0,
|
|
"HTTPAddrs": [
|
|
"tcp://1.2.3.4:5678",
|
|
"unix:///var/run/foo"
|
|
],
|
|
"HTTPBlockEndpoints": [],
|
|
"HTTPMaxConnsPerClient": 0,
|
|
"HTTPMaxHeaderBytes": 0,
|
|
"HTTPPort": 0,
|
|
"HTTPResponseHeaders": {},
|
|
"HTTPSAddrs": [],
|
|
"HTTPSHandshakeTimeout": "0s",
|
|
"HTTPSPort": 0,
|
|
"HTTPUseCache": false,
|
|
"KVMaxValueSize": 1234567800000000,
|
|
"LeaveDrainTime": "0s",
|
|
"LeaveOnTerm": false,
|
|
"LocalProxyConfigResyncInterval": "0s",
|
|
"Locality": {
|
|
"Region": "us-west-1",
|
|
"Zone": "us-west-1a"
|
|
},
|
|
"Logging": {
|
|
"EnableSyslog": false,
|
|
"LogFilePath": "",
|
|
"LogJSON": false,
|
|
"LogLevel": "",
|
|
"LogRotateBytes": 0,
|
|
"LogRotateDuration": "0s",
|
|
"LogRotateMaxFiles": 0,
|
|
"Name": "",
|
|
"SyslogFacility": ""
|
|
},
|
|
"MaxQueryTime": "0s",
|
|
"NodeID": "",
|
|
"NodeMeta": {},
|
|
"NodeName": "",
|
|
"PeeringEnabled": false,
|
|
"PeeringTestAllowPeerRegistrations": false,
|
|
"PidFile": "",
|
|
"PrimaryDatacenter": "",
|
|
"PrimaryGateways": [
|
|
"pmgw_foo=bar pmgw_key=baz pmgw_secret=boom pmgw_bang=bar"
|
|
],
|
|
"PrimaryGatewaysInterval": "0s",
|
|
"RPCAdvertiseAddr": "",
|
|
"RPCBindAddr": "",
|
|
"RPCClientTimeout": "0s",
|
|
"RPCConfig": {
|
|
"EnableStreaming": false
|
|
},
|
|
"RPCHandshakeTimeout": "0s",
|
|
"RPCHoldTimeout": "0s",
|
|
"RPCMaxBurst": 0,
|
|
"RPCMaxConnsPerClient": 0,
|
|
"RPCProtocol": 0,
|
|
"RPCRateLimit": 0,
|
|
"RaftLogStoreConfig": {
|
|
"Backend": "",
|
|
"BoltDB": {
|
|
"NoFreelistSync": false
|
|
},
|
|
"DisableLogCache": false,
|
|
"Verification": {
|
|
"Enabled": false,
|
|
"Interval": "0s"
|
|
},
|
|
"WAL": {
|
|
"SegmentSize": 0
|
|
}
|
|
},
|
|
"RaftProtocol": 3,
|
|
"RaftSnapshotInterval": "0s",
|
|
"RaftSnapshotThreshold": 0,
|
|
"RaftTrailingLogs": 0,
|
|
"ReadReplica": false,
|
|
"ReconnectTimeoutLAN": "0s",
|
|
"ReconnectTimeoutWAN": "0s",
|
|
"RejoinAfterLeave": false,
|
|
"Reporting": {
|
|
"License": {
|
|
"Enabled": false
|
|
}
|
|
},
|
|
"RequestLimitsMode": 0,
|
|
"RequestLimitsReadRate": 0,
|
|
"RequestLimitsWriteRate": 0,
|
|
"RetryJoinIntervalLAN": "0s",
|
|
"RetryJoinIntervalWAN": "0s",
|
|
"RetryJoinLAN": [
|
|
"foo=bar key=hidden secret=hidden bang=bar"
|
|
],
|
|
"RetryJoinMaxAttemptsLAN": 0,
|
|
"RetryJoinMaxAttemptsWAN": 0,
|
|
"RetryJoinWAN": [
|
|
"wan_foo=bar wan_key=hidden wan_secret=hidden wan_bang=bar"
|
|
],
|
|
"Revision": "",
|
|
"SegmentLimit": 0,
|
|
"SegmentName": "",
|
|
"SegmentNameLimit": 0,
|
|
"Segments": [],
|
|
"SerfAdvertiseAddrLAN": "tcp://1.2.3.4:5678",
|
|
"SerfAdvertiseAddrWAN": "",
|
|
"SerfAllowedCIDRsLAN": [
|
|
"192.168.1.0/24",
|
|
"127.0.0.0/8"
|
|
],
|
|
"SerfAllowedCIDRsWAN": [],
|
|
"SerfBindAddrLAN": "",
|
|
"SerfBindAddrWAN": "",
|
|
"SerfPortLAN": 0,
|
|
"SerfPortWAN": 0,
|
|
"ServerMode": false,
|
|
"ServerName": "",
|
|
"ServerPort": 0,
|
|
"Services": [
|
|
{
|
|
"Address": "",
|
|
"Check": {
|
|
"AliasNode": "",
|
|
"AliasService": "",
|
|
"Body": "",
|
|
"CheckID": "",
|
|
"DeregisterCriticalServiceAfter": "0s",
|
|
"DisableRedirects": false,
|
|
"DockerContainerID": "",
|
|
"FailuresBeforeCritical": 0,
|
|
"FailuresBeforeWarning": 0,
|
|
"GRPC": "",
|
|
"GRPCUseTLS": false,
|
|
"H2PING": "",
|
|
"H2PingUseTLS": false,
|
|
"HTTP": "",
|
|
"Header": {},
|
|
"Interval": "0s",
|
|
"Method": "",
|
|
"Name": "blurb",
|
|
"Notes": "",
|
|
"OSService": "",
|
|
"OutputMaxSize": 4096,
|
|
"ProxyGRPC": "",
|
|
"ProxyHTTP": "",
|
|
"ScriptArgs": [],
|
|
"Shell": "",
|
|
"Status": "",
|
|
"SuccessBeforePassing": 0,
|
|
"TCP": "",
|
|
"TLSServerName": "",
|
|
"TLSSkipVerify": false,
|
|
"TTL": "0s",
|
|
"Timeout": "0s",
|
|
"UDP": ""
|
|
},
|
|
"Checks": [],
|
|
"Connect": null,
|
|
"EnableTagOverride": false,
|
|
"EnterpriseMeta": {},
|
|
"ID": "",
|
|
"Kind": "",
|
|
"Locality": null,
|
|
"Meta": {},
|
|
"Name": "foo",
|
|
"Port": 0,
|
|
"Proxy": null,
|
|
"SocketPath": "",
|
|
"TaggedAddresses": {},
|
|
"Tags": [],
|
|
"Token": "hidden",
|
|
"Weights": {
|
|
"Passing": 67,
|
|
"Warning": 3
|
|
}
|
|
}
|
|
],
|
|
"SessionTTLMin": "0s",
|
|
"SkipLeaveOnInt": false,
|
|
"StaticRuntimeConfig": {
|
|
"EncryptVerifyIncoming": false,
|
|
"EncryptVerifyOutgoing": false
|
|
},
|
|
"SyncCoordinateIntervalMin": "0s",
|
|
"SyncCoordinateRateTarget": 0,
|
|
"TLS": {
|
|
"AutoTLS": false,
|
|
"Domain": "",
|
|
"EnableAgentTLSForChecks": false,
|
|
"GRPC": {
|
|
"CAFile": "",
|
|
"CAPath": "",
|
|
"CertFile": "",
|
|
"CipherSuites": [],
|
|
"KeyFile": "hidden",
|
|
"TLSMinVersion": "",
|
|
"UseAutoCert": false,
|
|
"VerifyIncoming": false,
|
|
"VerifyOutgoing": false,
|
|
"VerifyServerHostname": false
|
|
},
|
|
"HTTPS": {
|
|
"CAFile": "",
|
|
"CAPath": "",
|
|
"CertFile": "",
|
|
"CipherSuites": [],
|
|
"KeyFile": "hidden",
|
|
"TLSMinVersion": "",
|
|
"UseAutoCert": false,
|
|
"VerifyIncoming": false,
|
|
"VerifyOutgoing": false,
|
|
"VerifyServerHostname": false
|
|
},
|
|
"InternalRPC": {
|
|
"CAFile": "",
|
|
"CAPath": "",
|
|
"CertFile": "",
|
|
"CipherSuites": [],
|
|
"KeyFile": "hidden",
|
|
"TLSMinVersion": "",
|
|
"UseAutoCert": false,
|
|
"VerifyIncoming": false,
|
|
"VerifyOutgoing": false,
|
|
"VerifyServerHostname": false
|
|
},
|
|
"NodeName": "",
|
|
"ServerMode": false,
|
|
"ServerName": ""
|
|
},
|
|
"TaggedAddresses": {},
|
|
"Telemetry": {
|
|
"AllowedPrefixes": [],
|
|
"BlockedPrefixes": [],
|
|
"CirconusAPIApp": "",
|
|
"CirconusAPIToken": "hidden",
|
|
"CirconusAPIURL": "",
|
|
"CirconusBrokerID": "",
|
|
"CirconusBrokerSelectTag": "",
|
|
"CirconusCheckDisplayName": "",
|
|
"CirconusCheckForceMetricActivation": "",
|
|
"CirconusCheckID": "",
|
|
"CirconusCheckInstanceID": "",
|
|
"CirconusCheckSearchTag": "",
|
|
"CirconusCheckTags": "",
|
|
"CirconusSubmissionInterval": "",
|
|
"CirconusSubmissionURL": "",
|
|
"Disable": false,
|
|
"DisableHostname": false,
|
|
"DogstatsdAddr": "",
|
|
"DogstatsdTags": [],
|
|
"FilterDefault": false,
|
|
"MetricsPrefix": "",
|
|
"PrometheusOpts": {
|
|
"CounterDefinitions": [],
|
|
"Expiration": "0s",
|
|
"GaugeDefinitions": [],
|
|
"Name": "",
|
|
"Registerer": null,
|
|
"SummaryDefinitions": []
|
|
},
|
|
"RetryFailedConfiguration": false,
|
|
"StatsdAddr": "",
|
|
"StatsiteAddr": ""
|
|
},
|
|
"TranslateWANAddrs": false,
|
|
"TxnMaxReqLen": 5678000000000000,
|
|
"UIConfig": {
|
|
"ContentPath": "",
|
|
"DashboardURLTemplates": {},
|
|
"Dir": "",
|
|
"Enabled": false,
|
|
"HCPEnabled": false,
|
|
"MetricsProvider": "",
|
|
"MetricsProviderFiles": [],
|
|
"MetricsProviderOptionsJSON": "",
|
|
"MetricsProxy": {
|
|
"AddHeaders": [
|
|
{
|
|
"Name": "foo",
|
|
"Value": "hidden"
|
|
}
|
|
],
|
|
"BaseURL": "",
|
|
"PathAllowlist": []
|
|
}
|
|
},
|
|
"UnixSocketGroup": "",
|
|
"UnixSocketMode": "",
|
|
"UnixSocketUser": "",
|
|
"UseStreamingBackend": false,
|
|
"Version": "",
|
|
"VersionMetadata": "",
|
|
"VersionPrerelease": "",
|
|
"Watches": [],
|
|
"XDSUpdateRateLimit": 0
|
|
} |