2021-09-03 21:12:30 +00:00
|
|
|
package config
|
|
|
|
|
|
|
|
import (
|
2022-03-24 19:32:25 +00:00
|
|
|
"fmt"
|
2021-09-03 21:12:30 +00:00
|
|
|
"sort"
|
|
|
|
"testing"
|
2021-09-22 17:38:40 +00:00
|
|
|
"time"
|
2021-09-03 21:12:30 +00:00
|
|
|
|
|
|
|
"github.com/stretchr/testify/require"
|
2022-03-18 10:46:58 +00:00
|
|
|
|
|
|
|
"github.com/hashicorp/consul/tlsutil"
|
2022-03-24 19:32:25 +00:00
|
|
|
"github.com/hashicorp/consul/types"
|
2021-09-03 21:12:30 +00:00
|
|
|
)
|
|
|
|
|
|
|
|
func TestLoad_DeprecatedConfig(t *testing.T) {
|
|
|
|
opts := LoadOpts{
|
|
|
|
HCL: []string{`
|
|
|
|
data_dir = "/foo"
|
|
|
|
|
|
|
|
acl_datacenter = "dcone"
|
|
|
|
|
2021-12-01 21:08:14 +00:00
|
|
|
acl_agent_token = "token1"
|
|
|
|
acl_token = "token2"
|
2021-09-03 21:12:30 +00:00
|
|
|
|
2021-12-01 21:08:14 +00:00
|
|
|
acl_replication_token = "token3"
|
2021-09-03 21:33:20 +00:00
|
|
|
|
2021-09-03 22:00:28 +00:00
|
|
|
acl_default_policy = "deny"
|
|
|
|
acl_down_policy = "async-cache"
|
|
|
|
|
2021-09-22 17:38:40 +00:00
|
|
|
acl_ttl = "3h"
|
2021-09-22 21:22:52 +00:00
|
|
|
acl_enable_key_list_policy = true
|
2021-09-22 17:38:40 +00:00
|
|
|
|
2022-03-18 10:46:58 +00:00
|
|
|
ca_file = "some-ca-file"
|
|
|
|
ca_path = "some-ca-path"
|
|
|
|
cert_file = "some-cert-file"
|
|
|
|
key_file = "some-key-file"
|
2022-03-24 19:32:25 +00:00
|
|
|
tls_cipher_suites = "TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA"
|
|
|
|
tls_min_version = "tls11"
|
2022-03-18 10:46:58 +00:00
|
|
|
verify_incoming = true
|
|
|
|
verify_incoming_https = false
|
|
|
|
verify_incoming_rpc = false
|
|
|
|
verify_outgoing = true
|
|
|
|
verify_server_hostname = true
|
|
|
|
tls_prefer_server_cipher_suites = true
|
2021-09-03 21:12:30 +00:00
|
|
|
`},
|
|
|
|
}
|
|
|
|
patchLoadOptsShims(&opts)
|
|
|
|
result, err := Load(opts)
|
|
|
|
require.NoError(t, err)
|
|
|
|
|
|
|
|
expectWarns := []string{
|
|
|
|
deprecationWarning("acl_agent_token", "acl.tokens.agent"),
|
|
|
|
deprecationWarning("acl_datacenter", "primary_datacenter"),
|
2021-09-03 22:00:28 +00:00
|
|
|
deprecationWarning("acl_default_policy", "acl.default_policy"),
|
|
|
|
deprecationWarning("acl_down_policy", "acl.down_policy"),
|
2021-09-22 21:22:52 +00:00
|
|
|
deprecationWarning("acl_enable_key_list_policy", "acl.enable_key_list_policy"),
|
2021-09-03 21:33:20 +00:00
|
|
|
deprecationWarning("acl_replication_token", "acl.tokens.replication"),
|
2021-09-03 21:12:30 +00:00
|
|
|
deprecationWarning("acl_token", "acl.tokens.default"),
|
2021-09-22 17:38:40 +00:00
|
|
|
deprecationWarning("acl_ttl", "acl.token_ttl"),
|
2022-03-18 10:46:58 +00:00
|
|
|
deprecationWarning("ca_file", "tls.defaults.ca_file"),
|
|
|
|
deprecationWarning("ca_path", "tls.defaults.ca_path"),
|
|
|
|
deprecationWarning("cert_file", "tls.defaults.cert_file"),
|
|
|
|
deprecationWarning("key_file", "tls.defaults.key_file"),
|
|
|
|
deprecationWarning("tls_cipher_suites", "tls.defaults.tls_cipher_suites"),
|
2022-03-24 19:32:25 +00:00
|
|
|
fmt.Sprintf("'tls_min_version' value 'tls11' is deprecated, please specify 'TLSv1_1' instead"),
|
2022-03-18 10:46:58 +00:00
|
|
|
deprecationWarning("tls_min_version", "tls.defaults.tls_min_version"),
|
|
|
|
deprecationWarning("verify_incoming", "tls.defaults.verify_incoming"),
|
|
|
|
deprecationWarning("verify_incoming_https", "tls.https.verify_incoming"),
|
|
|
|
deprecationWarning("verify_incoming_rpc", "tls.internal_rpc.verify_incoming"),
|
|
|
|
deprecationWarning("verify_outgoing", "tls.defaults.verify_outgoing"),
|
|
|
|
deprecationWarning("verify_server_hostname", "tls.internal_rpc.verify_server_hostname"),
|
|
|
|
"The 'tls_prefer_server_cipher_suites' field is deprecated and will be ignored.",
|
2021-09-03 21:12:30 +00:00
|
|
|
}
|
2022-03-18 10:46:58 +00:00
|
|
|
require.ElementsMatch(t, expectWarns, result.Warnings)
|
2021-09-03 21:12:30 +00:00
|
|
|
// Ideally this would compare against the entire result.RuntimeConfig, but
|
|
|
|
// we have so many non-zero defaults in that response that the noise of those
|
|
|
|
// defaults makes this test difficult to read. So as a workaround, compare
|
|
|
|
// specific values.
|
|
|
|
rt := result.RuntimeConfig
|
|
|
|
require.Equal(t, true, rt.ACLsEnabled)
|
|
|
|
require.Equal(t, "dcone", rt.PrimaryDatacenter)
|
2021-12-01 21:08:14 +00:00
|
|
|
require.Equal(t, "token1", rt.ACLTokens.ACLAgentToken)
|
|
|
|
require.Equal(t, "token2", rt.ACLTokens.ACLDefaultToken)
|
|
|
|
require.Equal(t, "token3", rt.ACLTokens.ACLReplicationToken)
|
2021-09-03 22:00:28 +00:00
|
|
|
require.Equal(t, "deny", rt.ACLResolverSettings.ACLDefaultPolicy)
|
|
|
|
require.Equal(t, "async-cache", rt.ACLResolverSettings.ACLDownPolicy)
|
2021-09-22 17:38:40 +00:00
|
|
|
require.Equal(t, 3*time.Hour, rt.ACLResolverSettings.ACLTokenTTL)
|
2021-09-22 21:22:52 +00:00
|
|
|
require.Equal(t, true, rt.ACLEnableKeyListPolicy)
|
2022-03-18 10:46:58 +00:00
|
|
|
|
|
|
|
for _, l := range []tlsutil.ProtocolConfig{rt.TLS.InternalRPC, rt.TLS.GRPC, rt.TLS.HTTPS} {
|
|
|
|
require.Equal(t, "some-ca-file", l.CAFile)
|
|
|
|
require.Equal(t, "some-ca-path", l.CAPath)
|
|
|
|
require.Equal(t, "some-cert-file", l.CertFile)
|
|
|
|
require.Equal(t, "some-key-file", l.KeyFile)
|
2022-03-24 19:32:25 +00:00
|
|
|
require.Equal(t, types.TLSVersion("TLSv1_1"), l.TLSMinVersion)
|
|
|
|
require.Equal(t, []types.TLSCipherSuite{types.TLSCipherSuite("TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA")}, l.CipherSuites)
|
2022-03-18 10:46:58 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
require.False(t, rt.TLS.InternalRPC.VerifyIncoming)
|
|
|
|
require.False(t, rt.TLS.HTTPS.VerifyIncoming)
|
2022-05-18 15:15:57 +00:00
|
|
|
require.False(t, rt.TLS.GRPC.VerifyIncoming)
|
2022-03-18 10:46:58 +00:00
|
|
|
require.True(t, rt.TLS.InternalRPC.VerifyOutgoing)
|
|
|
|
require.True(t, rt.TLS.HTTPS.VerifyOutgoing)
|
|
|
|
require.True(t, rt.TLS.InternalRPC.VerifyServerHostname)
|
2021-09-03 21:12:30 +00:00
|
|
|
}
|
2021-09-03 21:42:52 +00:00
|
|
|
|
|
|
|
func TestLoad_DeprecatedConfig_ACLReplication(t *testing.T) {
|
|
|
|
opts := LoadOpts{
|
|
|
|
HCL: []string{`
|
|
|
|
data_dir = "/foo"
|
|
|
|
|
|
|
|
enable_acl_replication = true
|
|
|
|
|
|
|
|
`},
|
|
|
|
}
|
|
|
|
patchLoadOptsShims(&opts)
|
|
|
|
result, err := Load(opts)
|
|
|
|
require.NoError(t, err)
|
|
|
|
|
|
|
|
expectWarns := []string{
|
|
|
|
deprecationWarning("enable_acl_replication", "acl.enable_token_replication"),
|
|
|
|
}
|
|
|
|
sort.Strings(result.Warnings)
|
|
|
|
require.Equal(t, expectWarns, result.Warnings)
|
|
|
|
// Ideally this would compare against the entire result.RuntimeConfig, but
|
|
|
|
// we have so many non-zero defaults in that response that the noise of those
|
|
|
|
// defaults makes this test difficult to read. So as a workaround, compare
|
|
|
|
// specific values.
|
|
|
|
rt := result.RuntimeConfig
|
|
|
|
require.Equal(t, true, rt.ACLTokenReplication)
|
|
|
|
}
|
2021-12-01 21:08:14 +00:00
|
|
|
|
|
|
|
func TestLoad_DeprecatedConfig_ACLMasterTokens(t *testing.T) {
|
|
|
|
t.Run("top-level fields", func(t *testing.T) {
|
|
|
|
|
|
|
|
opts := LoadOpts{
|
|
|
|
HCL: []string{`
|
|
|
|
data_dir = "/foo"
|
|
|
|
|
|
|
|
acl_master_token = "token1"
|
|
|
|
acl_agent_master_token = "token2"
|
|
|
|
`},
|
|
|
|
}
|
|
|
|
patchLoadOptsShims(&opts)
|
|
|
|
|
|
|
|
result, err := Load(opts)
|
bulk rewrite using this script
set -euo pipefail
unset CDPATH
cd "$(dirname "$0")"
for f in $(git grep '\brequire := require\.New(' | cut -d':' -f1 | sort -u); do
echo "=== require: $f ==="
sed -i '/require := require.New(t)/d' $f
# require.XXX(blah) but not require.XXX(tblah) or require.XXX(rblah)
sed -i 's/\brequire\.\([a-zA-Z0-9_]*\)(\([^tr]\)/require.\1(t,\2/g' $f
# require.XXX(tblah) but not require.XXX(t, blah)
sed -i 's/\brequire\.\([a-zA-Z0-9_]*\)(\(t[^,]\)/require.\1(t,\2/g' $f
# require.XXX(rblah) but not require.XXX(r, blah)
sed -i 's/\brequire\.\([a-zA-Z0-9_]*\)(\(r[^,]\)/require.\1(t,\2/g' $f
gofmt -s -w $f
done
for f in $(git grep '\bassert := assert\.New(' | cut -d':' -f1 | sort -u); do
echo "=== assert: $f ==="
sed -i '/assert := assert.New(t)/d' $f
# assert.XXX(blah) but not assert.XXX(tblah) or assert.XXX(rblah)
sed -i 's/\bassert\.\([a-zA-Z0-9_]*\)(\([^tr]\)/assert.\1(t,\2/g' $f
# assert.XXX(tblah) but not assert.XXX(t, blah)
sed -i 's/\bassert\.\([a-zA-Z0-9_]*\)(\(t[^,]\)/assert.\1(t,\2/g' $f
# assert.XXX(rblah) but not assert.XXX(r, blah)
sed -i 's/\bassert\.\([a-zA-Z0-9_]*\)(\(r[^,]\)/assert.\1(t,\2/g' $f
gofmt -s -w $f
done
2022-01-20 16:46:23 +00:00
|
|
|
require.NoError(t, err)
|
2021-12-01 21:08:14 +00:00
|
|
|
|
|
|
|
expectWarns := []string{
|
|
|
|
deprecationWarning("acl_master_token", "acl.tokens.initial_management"),
|
|
|
|
deprecationWarning("acl_agent_master_token", "acl.tokens.agent_recovery"),
|
|
|
|
}
|
bulk rewrite using this script
set -euo pipefail
unset CDPATH
cd "$(dirname "$0")"
for f in $(git grep '\brequire := require\.New(' | cut -d':' -f1 | sort -u); do
echo "=== require: $f ==="
sed -i '/require := require.New(t)/d' $f
# require.XXX(blah) but not require.XXX(tblah) or require.XXX(rblah)
sed -i 's/\brequire\.\([a-zA-Z0-9_]*\)(\([^tr]\)/require.\1(t,\2/g' $f
# require.XXX(tblah) but not require.XXX(t, blah)
sed -i 's/\brequire\.\([a-zA-Z0-9_]*\)(\(t[^,]\)/require.\1(t,\2/g' $f
# require.XXX(rblah) but not require.XXX(r, blah)
sed -i 's/\brequire\.\([a-zA-Z0-9_]*\)(\(r[^,]\)/require.\1(t,\2/g' $f
gofmt -s -w $f
done
for f in $(git grep '\bassert := assert\.New(' | cut -d':' -f1 | sort -u); do
echo "=== assert: $f ==="
sed -i '/assert := assert.New(t)/d' $f
# assert.XXX(blah) but not assert.XXX(tblah) or assert.XXX(rblah)
sed -i 's/\bassert\.\([a-zA-Z0-9_]*\)(\([^tr]\)/assert.\1(t,\2/g' $f
# assert.XXX(tblah) but not assert.XXX(t, blah)
sed -i 's/\bassert\.\([a-zA-Z0-9_]*\)(\(t[^,]\)/assert.\1(t,\2/g' $f
# assert.XXX(rblah) but not assert.XXX(r, blah)
sed -i 's/\bassert\.\([a-zA-Z0-9_]*\)(\(r[^,]\)/assert.\1(t,\2/g' $f
gofmt -s -w $f
done
2022-01-20 16:46:23 +00:00
|
|
|
require.ElementsMatch(t, expectWarns, result.Warnings)
|
2021-12-01 21:08:14 +00:00
|
|
|
|
|
|
|
rt := result.RuntimeConfig
|
bulk rewrite using this script
set -euo pipefail
unset CDPATH
cd "$(dirname "$0")"
for f in $(git grep '\brequire := require\.New(' | cut -d':' -f1 | sort -u); do
echo "=== require: $f ==="
sed -i '/require := require.New(t)/d' $f
# require.XXX(blah) but not require.XXX(tblah) or require.XXX(rblah)
sed -i 's/\brequire\.\([a-zA-Z0-9_]*\)(\([^tr]\)/require.\1(t,\2/g' $f
# require.XXX(tblah) but not require.XXX(t, blah)
sed -i 's/\brequire\.\([a-zA-Z0-9_]*\)(\(t[^,]\)/require.\1(t,\2/g' $f
# require.XXX(rblah) but not require.XXX(r, blah)
sed -i 's/\brequire\.\([a-zA-Z0-9_]*\)(\(r[^,]\)/require.\1(t,\2/g' $f
gofmt -s -w $f
done
for f in $(git grep '\bassert := assert\.New(' | cut -d':' -f1 | sort -u); do
echo "=== assert: $f ==="
sed -i '/assert := assert.New(t)/d' $f
# assert.XXX(blah) but not assert.XXX(tblah) or assert.XXX(rblah)
sed -i 's/\bassert\.\([a-zA-Z0-9_]*\)(\([^tr]\)/assert.\1(t,\2/g' $f
# assert.XXX(tblah) but not assert.XXX(t, blah)
sed -i 's/\bassert\.\([a-zA-Z0-9_]*\)(\(t[^,]\)/assert.\1(t,\2/g' $f
# assert.XXX(rblah) but not assert.XXX(r, blah)
sed -i 's/\bassert\.\([a-zA-Z0-9_]*\)(\(r[^,]\)/assert.\1(t,\2/g' $f
gofmt -s -w $f
done
2022-01-20 16:46:23 +00:00
|
|
|
require.Equal(t, "token1", rt.ACLInitialManagementToken)
|
|
|
|
require.Equal(t, "token2", rt.ACLTokens.ACLAgentRecoveryToken)
|
2021-12-01 21:08:14 +00:00
|
|
|
})
|
|
|
|
|
|
|
|
t.Run("embedded in tokens struct", func(t *testing.T) {
|
|
|
|
|
|
|
|
opts := LoadOpts{
|
|
|
|
HCL: []string{`
|
|
|
|
data_dir = "/foo"
|
|
|
|
|
|
|
|
acl {
|
|
|
|
tokens {
|
|
|
|
master = "token1"
|
|
|
|
agent_master = "token2"
|
|
|
|
}
|
|
|
|
}
|
|
|
|
`},
|
|
|
|
}
|
|
|
|
patchLoadOptsShims(&opts)
|
|
|
|
|
|
|
|
result, err := Load(opts)
|
bulk rewrite using this script
set -euo pipefail
unset CDPATH
cd "$(dirname "$0")"
for f in $(git grep '\brequire := require\.New(' | cut -d':' -f1 | sort -u); do
echo "=== require: $f ==="
sed -i '/require := require.New(t)/d' $f
# require.XXX(blah) but not require.XXX(tblah) or require.XXX(rblah)
sed -i 's/\brequire\.\([a-zA-Z0-9_]*\)(\([^tr]\)/require.\1(t,\2/g' $f
# require.XXX(tblah) but not require.XXX(t, blah)
sed -i 's/\brequire\.\([a-zA-Z0-9_]*\)(\(t[^,]\)/require.\1(t,\2/g' $f
# require.XXX(rblah) but not require.XXX(r, blah)
sed -i 's/\brequire\.\([a-zA-Z0-9_]*\)(\(r[^,]\)/require.\1(t,\2/g' $f
gofmt -s -w $f
done
for f in $(git grep '\bassert := assert\.New(' | cut -d':' -f1 | sort -u); do
echo "=== assert: $f ==="
sed -i '/assert := assert.New(t)/d' $f
# assert.XXX(blah) but not assert.XXX(tblah) or assert.XXX(rblah)
sed -i 's/\bassert\.\([a-zA-Z0-9_]*\)(\([^tr]\)/assert.\1(t,\2/g' $f
# assert.XXX(tblah) but not assert.XXX(t, blah)
sed -i 's/\bassert\.\([a-zA-Z0-9_]*\)(\(t[^,]\)/assert.\1(t,\2/g' $f
# assert.XXX(rblah) but not assert.XXX(r, blah)
sed -i 's/\bassert\.\([a-zA-Z0-9_]*\)(\(r[^,]\)/assert.\1(t,\2/g' $f
gofmt -s -w $f
done
2022-01-20 16:46:23 +00:00
|
|
|
require.NoError(t, err)
|
2021-12-01 21:08:14 +00:00
|
|
|
|
|
|
|
expectWarns := []string{
|
|
|
|
deprecationWarning("acl.tokens.master", "acl.tokens.initial_management"),
|
|
|
|
deprecationWarning("acl.tokens.agent_master", "acl.tokens.agent_recovery"),
|
|
|
|
}
|
bulk rewrite using this script
set -euo pipefail
unset CDPATH
cd "$(dirname "$0")"
for f in $(git grep '\brequire := require\.New(' | cut -d':' -f1 | sort -u); do
echo "=== require: $f ==="
sed -i '/require := require.New(t)/d' $f
# require.XXX(blah) but not require.XXX(tblah) or require.XXX(rblah)
sed -i 's/\brequire\.\([a-zA-Z0-9_]*\)(\([^tr]\)/require.\1(t,\2/g' $f
# require.XXX(tblah) but not require.XXX(t, blah)
sed -i 's/\brequire\.\([a-zA-Z0-9_]*\)(\(t[^,]\)/require.\1(t,\2/g' $f
# require.XXX(rblah) but not require.XXX(r, blah)
sed -i 's/\brequire\.\([a-zA-Z0-9_]*\)(\(r[^,]\)/require.\1(t,\2/g' $f
gofmt -s -w $f
done
for f in $(git grep '\bassert := assert\.New(' | cut -d':' -f1 | sort -u); do
echo "=== assert: $f ==="
sed -i '/assert := assert.New(t)/d' $f
# assert.XXX(blah) but not assert.XXX(tblah) or assert.XXX(rblah)
sed -i 's/\bassert\.\([a-zA-Z0-9_]*\)(\([^tr]\)/assert.\1(t,\2/g' $f
# assert.XXX(tblah) but not assert.XXX(t, blah)
sed -i 's/\bassert\.\([a-zA-Z0-9_]*\)(\(t[^,]\)/assert.\1(t,\2/g' $f
# assert.XXX(rblah) but not assert.XXX(r, blah)
sed -i 's/\bassert\.\([a-zA-Z0-9_]*\)(\(r[^,]\)/assert.\1(t,\2/g' $f
gofmt -s -w $f
done
2022-01-20 16:46:23 +00:00
|
|
|
require.ElementsMatch(t, expectWarns, result.Warnings)
|
2021-12-01 21:08:14 +00:00
|
|
|
|
|
|
|
rt := result.RuntimeConfig
|
bulk rewrite using this script
set -euo pipefail
unset CDPATH
cd "$(dirname "$0")"
for f in $(git grep '\brequire := require\.New(' | cut -d':' -f1 | sort -u); do
echo "=== require: $f ==="
sed -i '/require := require.New(t)/d' $f
# require.XXX(blah) but not require.XXX(tblah) or require.XXX(rblah)
sed -i 's/\brequire\.\([a-zA-Z0-9_]*\)(\([^tr]\)/require.\1(t,\2/g' $f
# require.XXX(tblah) but not require.XXX(t, blah)
sed -i 's/\brequire\.\([a-zA-Z0-9_]*\)(\(t[^,]\)/require.\1(t,\2/g' $f
# require.XXX(rblah) but not require.XXX(r, blah)
sed -i 's/\brequire\.\([a-zA-Z0-9_]*\)(\(r[^,]\)/require.\1(t,\2/g' $f
gofmt -s -w $f
done
for f in $(git grep '\bassert := assert\.New(' | cut -d':' -f1 | sort -u); do
echo "=== assert: $f ==="
sed -i '/assert := assert.New(t)/d' $f
# assert.XXX(blah) but not assert.XXX(tblah) or assert.XXX(rblah)
sed -i 's/\bassert\.\([a-zA-Z0-9_]*\)(\([^tr]\)/assert.\1(t,\2/g' $f
# assert.XXX(tblah) but not assert.XXX(t, blah)
sed -i 's/\bassert\.\([a-zA-Z0-9_]*\)(\(t[^,]\)/assert.\1(t,\2/g' $f
# assert.XXX(rblah) but not assert.XXX(r, blah)
sed -i 's/\bassert\.\([a-zA-Z0-9_]*\)(\(r[^,]\)/assert.\1(t,\2/g' $f
gofmt -s -w $f
done
2022-01-20 16:46:23 +00:00
|
|
|
require.Equal(t, "token1", rt.ACLInitialManagementToken)
|
|
|
|
require.Equal(t, "token2", rt.ACLTokens.ACLAgentRecoveryToken)
|
2021-12-01 21:08:14 +00:00
|
|
|
})
|
|
|
|
|
|
|
|
t.Run("both", func(t *testing.T) {
|
|
|
|
|
|
|
|
opts := LoadOpts{
|
|
|
|
HCL: []string{`
|
|
|
|
data_dir = "/foo"
|
|
|
|
|
|
|
|
acl_master_token = "token1"
|
|
|
|
acl_agent_master_token = "token2"
|
|
|
|
|
|
|
|
acl {
|
|
|
|
tokens {
|
|
|
|
master = "token3"
|
|
|
|
agent_master = "token4"
|
|
|
|
}
|
|
|
|
}
|
|
|
|
`},
|
|
|
|
}
|
|
|
|
patchLoadOptsShims(&opts)
|
|
|
|
|
|
|
|
result, err := Load(opts)
|
bulk rewrite using this script
set -euo pipefail
unset CDPATH
cd "$(dirname "$0")"
for f in $(git grep '\brequire := require\.New(' | cut -d':' -f1 | sort -u); do
echo "=== require: $f ==="
sed -i '/require := require.New(t)/d' $f
# require.XXX(blah) but not require.XXX(tblah) or require.XXX(rblah)
sed -i 's/\brequire\.\([a-zA-Z0-9_]*\)(\([^tr]\)/require.\1(t,\2/g' $f
# require.XXX(tblah) but not require.XXX(t, blah)
sed -i 's/\brequire\.\([a-zA-Z0-9_]*\)(\(t[^,]\)/require.\1(t,\2/g' $f
# require.XXX(rblah) but not require.XXX(r, blah)
sed -i 's/\brequire\.\([a-zA-Z0-9_]*\)(\(r[^,]\)/require.\1(t,\2/g' $f
gofmt -s -w $f
done
for f in $(git grep '\bassert := assert\.New(' | cut -d':' -f1 | sort -u); do
echo "=== assert: $f ==="
sed -i '/assert := assert.New(t)/d' $f
# assert.XXX(blah) but not assert.XXX(tblah) or assert.XXX(rblah)
sed -i 's/\bassert\.\([a-zA-Z0-9_]*\)(\([^tr]\)/assert.\1(t,\2/g' $f
# assert.XXX(tblah) but not assert.XXX(t, blah)
sed -i 's/\bassert\.\([a-zA-Z0-9_]*\)(\(t[^,]\)/assert.\1(t,\2/g' $f
# assert.XXX(rblah) but not assert.XXX(r, blah)
sed -i 's/\bassert\.\([a-zA-Z0-9_]*\)(\(r[^,]\)/assert.\1(t,\2/g' $f
gofmt -s -w $f
done
2022-01-20 16:46:23 +00:00
|
|
|
require.NoError(t, err)
|
2021-12-01 21:08:14 +00:00
|
|
|
|
|
|
|
rt := result.RuntimeConfig
|
bulk rewrite using this script
set -euo pipefail
unset CDPATH
cd "$(dirname "$0")"
for f in $(git grep '\brequire := require\.New(' | cut -d':' -f1 | sort -u); do
echo "=== require: $f ==="
sed -i '/require := require.New(t)/d' $f
# require.XXX(blah) but not require.XXX(tblah) or require.XXX(rblah)
sed -i 's/\brequire\.\([a-zA-Z0-9_]*\)(\([^tr]\)/require.\1(t,\2/g' $f
# require.XXX(tblah) but not require.XXX(t, blah)
sed -i 's/\brequire\.\([a-zA-Z0-9_]*\)(\(t[^,]\)/require.\1(t,\2/g' $f
# require.XXX(rblah) but not require.XXX(r, blah)
sed -i 's/\brequire\.\([a-zA-Z0-9_]*\)(\(r[^,]\)/require.\1(t,\2/g' $f
gofmt -s -w $f
done
for f in $(git grep '\bassert := assert\.New(' | cut -d':' -f1 | sort -u); do
echo "=== assert: $f ==="
sed -i '/assert := assert.New(t)/d' $f
# assert.XXX(blah) but not assert.XXX(tblah) or assert.XXX(rblah)
sed -i 's/\bassert\.\([a-zA-Z0-9_]*\)(\([^tr]\)/assert.\1(t,\2/g' $f
# assert.XXX(tblah) but not assert.XXX(t, blah)
sed -i 's/\bassert\.\([a-zA-Z0-9_]*\)(\(t[^,]\)/assert.\1(t,\2/g' $f
# assert.XXX(rblah) but not assert.XXX(r, blah)
sed -i 's/\bassert\.\([a-zA-Z0-9_]*\)(\(r[^,]\)/assert.\1(t,\2/g' $f
gofmt -s -w $f
done
2022-01-20 16:46:23 +00:00
|
|
|
require.Equal(t, "token3", rt.ACLInitialManagementToken)
|
|
|
|
require.Equal(t, "token4", rt.ACLTokens.ACLAgentRecoveryToken)
|
2021-12-01 21:08:14 +00:00
|
|
|
})
|
|
|
|
}
|