mirror of
https://github.com/status-im/consul.git
synced 2025-01-09 13:26:07 +00:00
a2a8e9c783
- Upgrade the ConfigEntry.ListAll RPC to be kind-aware so that older copies of consul will not see new config entries it doesn't understand replicate down. - Add shim conversion code so that the old API/CLI method of interacting with intentions will continue to work so long as none of these are edited via config entry endpoints. Almost all of the read-only APIs will continue to function indefinitely. - Add new APIs that operate on individual intentions without IDs so that the UI doesn't need to implement CAS operations. - Add a new serf feature flag indicating support for intentions-as-config-entries. - The old line-item intentions way of interacting with the state store will transparently flip between the legacy memdb table and the config entry representations so that readers will never see a hiccup during migration where the results are incomplete. It uses a piece of system metadata to control the flip. - The primary datacenter will begin migrating intentions into config entries on startup once all servers in the datacenter are on a version of Consul with the intentions-as-config-entries feature flag. When it is complete the old state store representations will be cleared. We also record a piece of system metadata indicating this has occurred. We use this metadata to skip ALL of this code the next time the leader starts up. - The secondary datacenters continue to run the old intentions replicator until all servers in the secondary DC and primary DC support intentions-as-config-entries (via serf flag). Once this condition it met the old intentions replicator ceases. - The secondary datacenters replicate the new config entries as they are migrated in the primary. When they detect that the primary has zeroed it's old state store table it waits until all config entries up to that point are replicated and then zeroes its own copy of the old state store table. We also record a piece of system metadata indicating this has occurred. We use this metadata to skip ALL of this code the next time the leader starts up.
192 lines
4.5 KiB
Go
192 lines
4.5 KiB
Go
package write
|
|
|
|
import (
|
|
"flag"
|
|
"fmt"
|
|
"io"
|
|
"time"
|
|
|
|
"github.com/hashicorp/consul/api"
|
|
"github.com/hashicorp/consul/command/flags"
|
|
"github.com/hashicorp/consul/command/helpers"
|
|
"github.com/hashicorp/consul/lib/decode"
|
|
"github.com/hashicorp/go-multierror"
|
|
"github.com/mitchellh/cli"
|
|
"github.com/mitchellh/mapstructure"
|
|
)
|
|
|
|
func New(ui cli.Ui) *cmd {
|
|
c := &cmd{UI: ui}
|
|
c.init()
|
|
return c
|
|
}
|
|
|
|
type cmd struct {
|
|
UI cli.Ui
|
|
flags *flag.FlagSet
|
|
http *flags.HTTPFlags
|
|
help string
|
|
|
|
cas bool
|
|
modifyIndex uint64
|
|
testStdin io.Reader
|
|
}
|
|
|
|
func (c *cmd) init() {
|
|
c.flags = flag.NewFlagSet("", flag.ContinueOnError)
|
|
c.http = &flags.HTTPFlags{}
|
|
c.flags.BoolVar(&c.cas, "cas", false,
|
|
"Perform a Check-And-Set operation. Specifying this value also "+
|
|
"requires the -modify-index flag to be set. The default value "+
|
|
"is false.")
|
|
c.flags.Uint64Var(&c.modifyIndex, "modify-index", 0,
|
|
"Unsigned integer representing the ModifyIndex of the config entry. "+
|
|
"This is used in combination with the -cas flag.")
|
|
flags.Merge(c.flags, c.http.ClientFlags())
|
|
flags.Merge(c.flags, c.http.ServerFlags())
|
|
flags.Merge(c.flags, c.http.NamespaceFlags())
|
|
c.help = flags.Usage(help, c.flags)
|
|
}
|
|
|
|
func (c *cmd) Run(args []string) int {
|
|
if err := c.flags.Parse(args); err != nil {
|
|
return 1
|
|
}
|
|
|
|
args = c.flags.Args()
|
|
if len(args) != 1 {
|
|
c.UI.Error("Must provide exactly one positional argument to specify the config entry to write")
|
|
return 1
|
|
}
|
|
|
|
data, err := helpers.LoadDataSourceNoRaw(args[0], c.testStdin)
|
|
if err != nil {
|
|
c.UI.Error(fmt.Sprintf("Failed to load data: %v", err))
|
|
return 1
|
|
}
|
|
|
|
entry, err := parseConfigEntry(data)
|
|
if err != nil {
|
|
c.UI.Error(fmt.Sprintf("Failed to decode config entry input: %v", err))
|
|
return 1
|
|
}
|
|
|
|
client, err := c.http.APIClient()
|
|
if err != nil {
|
|
c.UI.Error(fmt.Sprintf("Error connect to Consul agent: %s", err))
|
|
return 1
|
|
}
|
|
|
|
entries := client.ConfigEntries()
|
|
|
|
written := false
|
|
if c.cas {
|
|
written, _, err = entries.CAS(entry, c.modifyIndex, nil)
|
|
} else {
|
|
written, _, err = entries.Set(entry, nil)
|
|
}
|
|
if err != nil {
|
|
c.UI.Error(fmt.Sprintf("Error writing config entry %s/%s: %v", entry.GetKind(), entry.GetName(), err))
|
|
return 1
|
|
}
|
|
|
|
if !written {
|
|
c.UI.Error(fmt.Sprintf("Config entry not updated: %s/%s", entry.GetKind(), entry.GetName()))
|
|
return 1
|
|
}
|
|
|
|
c.UI.Info(fmt.Sprintf("Config entry written: %s/%s", entry.GetKind(), entry.GetName()))
|
|
return 0
|
|
}
|
|
|
|
func parseConfigEntry(data string) (api.ConfigEntry, error) {
|
|
// parse the data
|
|
var raw map[string]interface{}
|
|
if err := hclDecode(&raw, data); err != nil {
|
|
return nil, fmt.Errorf("Failed to decode config entry input: %v", err)
|
|
}
|
|
|
|
return newDecodeConfigEntry(raw)
|
|
}
|
|
|
|
// There is a 'structs' variation of this in
|
|
// agent/structs/config_entry.go:DecodeConfigEntry
|
|
func newDecodeConfigEntry(raw map[string]interface{}) (api.ConfigEntry, error) {
|
|
var entry api.ConfigEntry
|
|
|
|
kindVal, ok := raw["Kind"]
|
|
if !ok {
|
|
kindVal, ok = raw["kind"]
|
|
}
|
|
if !ok {
|
|
return nil, fmt.Errorf("Payload does not contain a kind/Kind key at the top level")
|
|
}
|
|
|
|
if kindStr, ok := kindVal.(string); ok {
|
|
newEntry, err := api.MakeConfigEntry(kindStr, "")
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
entry = newEntry
|
|
} else {
|
|
return nil, fmt.Errorf("Kind value in payload is not a string")
|
|
}
|
|
|
|
var md mapstructure.Metadata
|
|
decodeConf := &mapstructure.DecoderConfig{
|
|
DecodeHook: mapstructure.ComposeDecodeHookFunc(
|
|
decode.HookWeakDecodeFromSlice,
|
|
decode.HookTranslateKeys,
|
|
mapstructure.StringToTimeDurationHookFunc(),
|
|
mapstructure.StringToTimeHookFunc(time.RFC3339),
|
|
),
|
|
Metadata: &md,
|
|
Result: &entry,
|
|
WeaklyTypedInput: true,
|
|
}
|
|
|
|
decoder, err := mapstructure.NewDecoder(decodeConf)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
if err := decoder.Decode(raw); err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
for _, k := range md.Unused {
|
|
err = multierror.Append(err, fmt.Errorf("invalid config key %q", k))
|
|
}
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
return entry, nil
|
|
}
|
|
|
|
func (c *cmd) Synopsis() string {
|
|
return synopsis
|
|
}
|
|
|
|
func (c *cmd) Help() string {
|
|
return flags.Usage(c.help, nil)
|
|
}
|
|
|
|
const synopsis = "Create or update a centralized config entry"
|
|
const help = `
|
|
Usage: consul config write [options] <configuration>
|
|
|
|
Request a config entry to be created or updated. The configuration
|
|
argument is either a file path or '-' to indicate that the config
|
|
should be read from stdin. The data should be either in HCL or
|
|
JSON form.
|
|
|
|
Example (from file):
|
|
|
|
$ consul config write web.service.hcl
|
|
|
|
Example (from stdin):
|
|
|
|
$ consul config write -
|
|
`
|