2014-08-13 17:42:10 +00:00
|
|
|
package consul
|
|
|
|
|
|
|
|
import (
|
|
|
|
"github.com/hashicorp/consul/acl"
|
pkg refactor
command/agent/* -> agent/*
command/consul/* -> agent/consul/*
command/agent/command{,_test}.go -> command/agent{,_test}.go
command/base/command.go -> command/base.go
command/base/* -> command/*
commands.go -> command/commands.go
The script which did the refactor is:
(
cd $GOPATH/src/github.com/hashicorp/consul
git mv command/agent/command.go command/agent.go
git mv command/agent/command_test.go command/agent_test.go
git mv command/agent/flag_slice_value{,_test}.go command/
git mv command/agent .
git mv command/base/command.go command/base.go
git mv command/base/config_util{,_test}.go command/
git mv commands.go command/
git mv consul agent
rmdir command/base/
gsed -i -e 's|package agent|package command|' command/agent{,_test}.go
gsed -i -e 's|package agent|package command|' command/flag_slice_value{,_test}.go
gsed -i -e 's|package base|package command|' command/base.go command/config_util{,_test}.go
gsed -i -e 's|package main|package command|' command/commands.go
gsed -i -e 's|base.Command|BaseCommand|' command/commands.go
gsed -i -e 's|agent.Command|AgentCommand|' command/commands.go
gsed -i -e 's|\tCommand:|\tBaseCommand:|' command/commands.go
gsed -i -e 's|base\.||' command/commands.go
gsed -i -e 's|command\.||' command/commands.go
gsed -i -e 's|command|c|' main.go
gsed -i -e 's|range Commands|range command.Commands|' main.go
gsed -i -e 's|Commands: Commands|Commands: command.Commands|' main.go
gsed -i -e 's|base\.BoolValue|BoolValue|' command/operator_autopilot_set.go
gsed -i -e 's|base\.DurationValue|DurationValue|' command/operator_autopilot_set.go
gsed -i -e 's|base\.StringValue|StringValue|' command/operator_autopilot_set.go
gsed -i -e 's|base\.UintValue|UintValue|' command/operator_autopilot_set.go
gsed -i -e 's|\bCommand\b|BaseCommand|' command/base.go
gsed -i -e 's|BaseCommand Options|Command Options|' command/base.go
gsed -i -e 's|base.Command|BaseCommand|' command/*.go
gsed -i -e 's|c\.Command|c.BaseCommand|g' command/*.go
gsed -i -e 's|\tCommand:|\tBaseCommand:|' command/*_test.go
gsed -i -e 's|base\.||' command/*_test.go
gsed -i -e 's|\bCommand\b|AgentCommand|' command/agent{,_test}.go
gsed -i -e 's|cmd.AgentCommand|cmd.BaseCommand|' command/agent.go
gsed -i -e 's|cli.AgentCommand = new(Command)|cli.Command = new(AgentCommand)|' command/agent_test.go
gsed -i -e 's|exec.AgentCommand|exec.Command|' command/agent_test.go
gsed -i -e 's|exec.BaseCommand|exec.Command|' command/agent_test.go
gsed -i -e 's|NewTestAgent|agent.NewTestAgent|' command/agent_test.go
gsed -i -e 's|= TestConfig|= agent.TestConfig|' command/agent_test.go
gsed -i -e 's|: RetryJoin|: agent.RetryJoin|' command/agent_test.go
gsed -i -e 's|\.\./\.\./|../|' command/config_util_test.go
gsed -i -e 's|\bverifyUniqueListeners|VerifyUniqueListeners|' agent/config{,_test}.go command/agent.go
gsed -i -e 's|\bserfLANKeyring\b|SerfLANKeyring|g' agent/{agent,keyring,testagent}.go command/agent.go
gsed -i -e 's|\bserfWANKeyring\b|SerfWANKeyring|g' agent/{agent,keyring,testagent}.go command/agent.go
gsed -i -e 's|\bNewAgent\b|agent.New|g' command/agent{,_test}.go
gsed -i -e 's|\bNewAgent|New|' agent/{acl_test,agent,testagent}.go
gsed -i -e 's|\bAgent\b|agent.&|g' command/agent{,_test}.go
gsed -i -e 's|\bBool\b|agent.&|g' command/agent{,_test}.go
gsed -i -e 's|\bConfig\b|agent.&|g' command/agent{,_test}.go
gsed -i -e 's|\bDefaultConfig\b|agent.&|g' command/agent{,_test}.go
gsed -i -e 's|\bDevConfig\b|agent.&|g' command/agent{,_test}.go
gsed -i -e 's|\bMergeConfig\b|agent.&|g' command/agent{,_test}.go
gsed -i -e 's|\bReadConfigPaths\b|agent.&|g' command/agent{,_test}.go
gsed -i -e 's|\bParseMetaPair\b|agent.&|g' command/agent{,_test}.go
gsed -i -e 's|\bSerfLANKeyring\b|agent.&|g' command/agent{,_test}.go
gsed -i -e 's|\bSerfWANKeyring\b|agent.&|g' command/agent{,_test}.go
gsed -i -e 's|circonus\.agent|circonus|g' command/agent{,_test}.go
gsed -i -e 's|logger\.agent|logger|g' command/agent{,_test}.go
gsed -i -e 's|metrics\.agent|metrics|g' command/agent{,_test}.go
gsed -i -e 's|// agent.Agent|// agent|' command/agent{,_test}.go
gsed -i -e 's|a\.agent\.Config|a.Config|' command/agent{,_test}.go
gsed -i -e 's|agent\.AppendSliceValue|AppendSliceValue|' command/{configtest,validate}.go
gsed -i -e 's|consul/consul|agent/consul|' GNUmakefile
gsed -i -e 's|\.\./test|../../test|' agent/consul/server_test.go
# fix imports
f=$(grep -rl 'github.com/hashicorp/consul/command/agent' * | grep '\.go')
gsed -i -e 's|github.com/hashicorp/consul/command/agent|github.com/hashicorp/consul/agent|' $f
goimports -w $f
f=$(grep -rl 'github.com/hashicorp/consul/consul' * | grep '\.go')
gsed -i -e 's|github.com/hashicorp/consul/consul|github.com/hashicorp/consul/agent/consul|' $f
goimports -w $f
goimports -w command/*.go main.go
)
2017-06-09 22:28:28 +00:00
|
|
|
"github.com/hashicorp/consul/agent/consul/structs"
|
2014-08-13 17:42:10 +00:00
|
|
|
)
|
|
|
|
|
2014-08-13 18:31:23 +00:00
|
|
|
type dirEntFilter struct {
|
|
|
|
acl acl.ACL
|
|
|
|
ent structs.DirEntries
|
|
|
|
}
|
|
|
|
|
|
|
|
func (d *dirEntFilter) Len() int {
|
|
|
|
return len(d.ent)
|
|
|
|
}
|
|
|
|
func (d *dirEntFilter) Filter(i int) bool {
|
|
|
|
return !d.acl.KeyRead(d.ent[i].Key)
|
|
|
|
}
|
|
|
|
func (d *dirEntFilter) Move(dst, src, span int) {
|
|
|
|
copy(d.ent[dst:dst+span], d.ent[src:src+span])
|
|
|
|
}
|
|
|
|
|
|
|
|
// FilterDirEnt is used to filter a list of directory entries
|
|
|
|
// by applying an ACL policy
|
2014-08-13 17:42:10 +00:00
|
|
|
func FilterDirEnt(acl acl.ACL, ent structs.DirEntries) structs.DirEntries {
|
2014-08-13 18:31:23 +00:00
|
|
|
df := dirEntFilter{acl: acl, ent: ent}
|
|
|
|
return ent[:FilterEntries(&df)]
|
|
|
|
}
|
|
|
|
|
|
|
|
type keyFilter struct {
|
|
|
|
acl acl.ACL
|
|
|
|
keys []string
|
|
|
|
}
|
2014-08-13 17:42:10 +00:00
|
|
|
|
2014-08-13 18:31:23 +00:00
|
|
|
func (k *keyFilter) Len() int {
|
|
|
|
return len(k.keys)
|
|
|
|
}
|
|
|
|
func (k *keyFilter) Filter(i int) bool {
|
|
|
|
return !k.acl.KeyRead(k.keys[i])
|
|
|
|
}
|
|
|
|
|
|
|
|
func (k *keyFilter) Move(dst, src, span int) {
|
|
|
|
copy(k.keys[dst:dst+span], k.keys[src:src+span])
|
|
|
|
}
|
|
|
|
|
|
|
|
// FilterKeys is used to filter a list of keys by
|
|
|
|
// applying an ACL policy
|
|
|
|
func FilterKeys(acl acl.ACL, keys []string) []string {
|
|
|
|
kf := keyFilter{acl: acl, keys: keys}
|
|
|
|
return keys[:FilterEntries(&kf)]
|
|
|
|
}
|
|
|
|
|
2016-05-13 22:58:55 +00:00
|
|
|
type txnResultsFilter struct {
|
|
|
|
acl acl.ACL
|
|
|
|
results structs.TxnResults
|
|
|
|
}
|
|
|
|
|
|
|
|
func (t *txnResultsFilter) Len() int {
|
|
|
|
return len(t.results)
|
|
|
|
}
|
|
|
|
|
|
|
|
func (t *txnResultsFilter) Filter(i int) bool {
|
|
|
|
result := t.results[i]
|
|
|
|
if result.KV != nil {
|
|
|
|
return !t.acl.KeyRead(result.KV.Key)
|
|
|
|
}
|
2017-04-21 01:59:42 +00:00
|
|
|
return false
|
2016-05-13 22:58:55 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
func (t *txnResultsFilter) Move(dst, src, span int) {
|
|
|
|
copy(t.results[dst:dst+span], t.results[src:src+span])
|
|
|
|
}
|
|
|
|
|
|
|
|
// FilterTxnResults is used to filter a list of transaction results by
|
|
|
|
// applying an ACL policy.
|
|
|
|
func FilterTxnResults(acl acl.ACL, results structs.TxnResults) structs.TxnResults {
|
|
|
|
rf := txnResultsFilter{acl: acl, results: results}
|
|
|
|
return results[:FilterEntries(&rf)]
|
|
|
|
}
|
|
|
|
|
2015-09-15 12:22:08 +00:00
|
|
|
// Filter interface is used with FilterEntries to do an
|
2014-08-13 18:31:23 +00:00
|
|
|
// in-place filter of a slice.
|
|
|
|
type Filter interface {
|
|
|
|
Len() int
|
|
|
|
Filter(int) bool
|
|
|
|
Move(dst, src, span int)
|
|
|
|
}
|
|
|
|
|
|
|
|
// FilterEntries is used to do an inplace filter of
|
|
|
|
// a slice. This has cost proportional to the list length.
|
|
|
|
func FilterEntries(f Filter) int {
|
2014-08-13 17:42:10 +00:00
|
|
|
// Compact the list
|
|
|
|
dst := 0
|
|
|
|
src := 0
|
2014-08-13 18:31:23 +00:00
|
|
|
n := f.Len()
|
2014-08-13 17:42:10 +00:00
|
|
|
for dst < n {
|
2014-08-13 18:31:23 +00:00
|
|
|
for src < n && f.Filter(src) {
|
2014-08-13 17:42:10 +00:00
|
|
|
src++
|
|
|
|
}
|
2014-08-13 18:31:23 +00:00
|
|
|
if src == n {
|
|
|
|
break
|
|
|
|
}
|
2014-08-13 17:42:10 +00:00
|
|
|
end := src + 1
|
2014-08-13 18:31:23 +00:00
|
|
|
for end < n && !f.Filter(end) {
|
2014-08-13 17:42:10 +00:00
|
|
|
end++
|
|
|
|
}
|
|
|
|
span := end - src
|
2014-08-13 18:31:23 +00:00
|
|
|
if span > 0 {
|
|
|
|
f.Move(dst, src, span)
|
|
|
|
dst += span
|
|
|
|
src += span
|
|
|
|
}
|
2014-08-13 17:42:10 +00:00
|
|
|
}
|
|
|
|
|
2014-08-13 18:31:23 +00:00
|
|
|
// Return the size of the slice
|
|
|
|
return dst
|
2014-08-13 17:42:10 +00:00
|
|
|
}
|