From 7bffdcdf4ad21e3705ddd4b253a22ca7f1de30e3 Mon Sep 17 00:00:00 2001 From: 9seconds Date: Fri, 2 Apr 2021 21:41:02 +0300 Subject: [PATCH] Move config to internal --- internal/cli/access_test.go | 2 +- internal/cli/base.go | 2 +- {config => internal/config}/config.go | 0 {config => internal/config}/config_test.go | 2 +- {config => internal/config}/testdata/broken.toml | 0 {config => internal/config}/testdata/minimal.toml | 0 {config => internal/config}/testdata/only_secret.toml | 0 {config => internal/config}/type_blocklist_uri.go | 0 {config => internal/config}/type_blocklist_uri_test.go | 2 +- {config => internal/config}/type_bytes.go | 0 {config => internal/config}/type_bytes_test.go | 2 +- {config => internal/config}/type_duration.go | 0 {config => internal/config}/type_duration_test.go | 2 +- {config => internal/config}/type_error_rate.go | 0 {config => internal/config}/type_error_rate_test.go | 2 +- {config => internal/config}/type_hostport.go | 0 {config => internal/config}/type_hostport_test.go | 2 +- {config => internal/config}/type_http_path.go | 0 {config => internal/config}/type_http_path_test.go | 2 +- {config => internal/config}/type_ip.go | 0 {config => internal/config}/type_ip_test.go | 2 +- {config => internal/config}/type_metric_prefix.go | 0 {config => internal/config}/type_metric_prefix_test.go | 2 +- {config => internal/config}/type_port.go | 0 {config => internal/config}/type_port_test.go | 2 +- {config => internal/config}/type_prefer_ip.go | 0 {config => internal/config}/type_prefer_ip_test.go | 2 +- {config => internal/config}/type_statsd_tag_format.go | 0 {config => internal/config}/type_statsd_tag_format_test.go | 2 +- {config => internal/config}/type_url.go | 0 {config => internal/config}/type_url_test.go | 2 +- 31 files changed, 15 insertions(+), 15 deletions(-) rename {config => internal/config}/config.go (100%) rename {config => internal/config}/config_test.go (96%) rename {config => internal/config}/testdata/broken.toml (100%) rename {config => internal/config}/testdata/minimal.toml (100%) rename {config => internal/config}/testdata/only_secret.toml (100%) rename {config => internal/config}/type_blocklist_uri.go (100%) rename {config => internal/config}/type_blocklist_uri_test.go (98%) rename {config => internal/config}/type_bytes.go (100%) rename {config => internal/config}/type_bytes_test.go (98%) rename {config => internal/config}/type_duration.go (100%) rename {config => internal/config}/type_duration_test.go (98%) rename {config => internal/config}/type_error_rate.go (100%) rename {config => internal/config}/type_error_rate_test.go (98%) rename {config => internal/config}/type_hostport.go (100%) rename {config => internal/config}/type_hostport_test.go (98%) rename {config => internal/config}/type_http_path.go (100%) rename {config => internal/config}/type_http_path_test.go (97%) rename {config => internal/config}/type_ip.go (100%) rename {config => internal/config}/type_ip_test.go (98%) rename {config => internal/config}/type_metric_prefix.go (100%) rename {config => internal/config}/type_metric_prefix_test.go (98%) rename {config => internal/config}/type_port.go (100%) rename {config => internal/config}/type_port_test.go (98%) rename {config => internal/config}/type_prefer_ip.go (100%) rename {config => internal/config}/type_prefer_ip_test.go (98%) rename {config => internal/config}/type_statsd_tag_format.go (100%) rename {config => internal/config}/type_statsd_tag_format_test.go (98%) rename {config => internal/config}/type_url.go (100%) rename {config => internal/config}/type_url_test.go (98%) diff --git a/internal/cli/access_test.go b/internal/cli/access_test.go index 1a82e54..b55d40a 100644 --- a/internal/cli/access_test.go +++ b/internal/cli/access_test.go @@ -5,7 +5,7 @@ import ( "net/http" "testing" - "github.com/9seconds/mtg/v2/config" + "github.com/9seconds/mtg/v2/internal/config" "github.com/9seconds/mtg/v2/internal/testlib" "github.com/9seconds/mtg/v2/mtglib" "github.com/jarcoal/httpmock" diff --git a/internal/cli/base.go b/internal/cli/base.go index 6b6f892..95c4410 100644 --- a/internal/cli/base.go +++ b/internal/cli/base.go @@ -6,7 +6,7 @@ import ( "net/url" "os" - "github.com/9seconds/mtg/v2/config" + "github.com/9seconds/mtg/v2/internal/config" "github.com/9seconds/mtg/v2/mtglib" "github.com/9seconds/mtg/v2/network" ) diff --git a/config/config.go b/internal/config/config.go similarity index 100% rename from config/config.go rename to internal/config/config.go diff --git a/config/config_test.go b/internal/config/config_test.go similarity index 96% rename from config/config_test.go rename to internal/config/config_test.go index 940775c..e6b19e0 100644 --- a/config/config_test.go +++ b/internal/config/config_test.go @@ -5,7 +5,7 @@ import ( "path/filepath" "testing" - "github.com/9seconds/mtg/v2/config" + "github.com/9seconds/mtg/v2/internal/config" "github.com/stretchr/testify/suite" ) diff --git a/config/testdata/broken.toml b/internal/config/testdata/broken.toml similarity index 100% rename from config/testdata/broken.toml rename to internal/config/testdata/broken.toml diff --git a/config/testdata/minimal.toml b/internal/config/testdata/minimal.toml similarity index 100% rename from config/testdata/minimal.toml rename to internal/config/testdata/minimal.toml diff --git a/config/testdata/only_secret.toml b/internal/config/testdata/only_secret.toml similarity index 100% rename from config/testdata/only_secret.toml rename to internal/config/testdata/only_secret.toml diff --git a/config/type_blocklist_uri.go b/internal/config/type_blocklist_uri.go similarity index 100% rename from config/type_blocklist_uri.go rename to internal/config/type_blocklist_uri.go diff --git a/config/type_blocklist_uri_test.go b/internal/config/type_blocklist_uri_test.go similarity index 98% rename from config/type_blocklist_uri_test.go rename to internal/config/type_blocklist_uri_test.go index 3d53135..cdba55a 100644 --- a/config/type_blocklist_uri_test.go +++ b/internal/config/type_blocklist_uri_test.go @@ -9,7 +9,7 @@ import ( "strconv" "testing" - "github.com/9seconds/mtg/v2/config" + "github.com/9seconds/mtg/v2/internal/config" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/suite" ) diff --git a/config/type_bytes.go b/internal/config/type_bytes.go similarity index 100% rename from config/type_bytes.go rename to internal/config/type_bytes.go diff --git a/config/type_bytes_test.go b/internal/config/type_bytes_test.go similarity index 98% rename from config/type_bytes_test.go rename to internal/config/type_bytes_test.go index c9ff55a..e395274 100644 --- a/config/type_bytes_test.go +++ b/internal/config/type_bytes_test.go @@ -4,7 +4,7 @@ import ( "encoding/json" "testing" - "github.com/9seconds/mtg/v2/config" + "github.com/9seconds/mtg/v2/internal/config" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/suite" ) diff --git a/config/type_duration.go b/internal/config/type_duration.go similarity index 100% rename from config/type_duration.go rename to internal/config/type_duration.go diff --git a/config/type_duration_test.go b/internal/config/type_duration_test.go similarity index 98% rename from config/type_duration_test.go rename to internal/config/type_duration_test.go index c31d3ef..ad2dd4e 100644 --- a/config/type_duration_test.go +++ b/internal/config/type_duration_test.go @@ -5,7 +5,7 @@ import ( "testing" "time" - "github.com/9seconds/mtg/v2/config" + "github.com/9seconds/mtg/v2/internal/config" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/suite" ) diff --git a/config/type_error_rate.go b/internal/config/type_error_rate.go similarity index 100% rename from config/type_error_rate.go rename to internal/config/type_error_rate.go diff --git a/config/type_error_rate_test.go b/internal/config/type_error_rate_test.go similarity index 98% rename from config/type_error_rate_test.go rename to internal/config/type_error_rate_test.go index f3a1ed1..de99f09 100644 --- a/config/type_error_rate_test.go +++ b/internal/config/type_error_rate_test.go @@ -5,7 +5,7 @@ import ( "strconv" "testing" - "github.com/9seconds/mtg/v2/config" + "github.com/9seconds/mtg/v2/internal/config" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/suite" ) diff --git a/config/type_hostport.go b/internal/config/type_hostport.go similarity index 100% rename from config/type_hostport.go rename to internal/config/type_hostport.go diff --git a/config/type_hostport_test.go b/internal/config/type_hostport_test.go similarity index 98% rename from config/type_hostport_test.go rename to internal/config/type_hostport_test.go index 5cf1994..6972e1b 100644 --- a/config/type_hostport_test.go +++ b/internal/config/type_hostport_test.go @@ -5,7 +5,7 @@ import ( "net" "testing" - "github.com/9seconds/mtg/v2/config" + "github.com/9seconds/mtg/v2/internal/config" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/suite" ) diff --git a/config/type_http_path.go b/internal/config/type_http_path.go similarity index 100% rename from config/type_http_path.go rename to internal/config/type_http_path.go diff --git a/config/type_http_path_test.go b/internal/config/type_http_path_test.go similarity index 97% rename from config/type_http_path_test.go rename to internal/config/type_http_path_test.go index 4c456ef..01843db 100644 --- a/config/type_http_path_test.go +++ b/internal/config/type_http_path_test.go @@ -4,7 +4,7 @@ import ( "encoding/json" "testing" - "github.com/9seconds/mtg/v2/config" + "github.com/9seconds/mtg/v2/internal/config" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/suite" ) diff --git a/config/type_ip.go b/internal/config/type_ip.go similarity index 100% rename from config/type_ip.go rename to internal/config/type_ip.go diff --git a/config/type_ip_test.go b/internal/config/type_ip_test.go similarity index 98% rename from config/type_ip_test.go rename to internal/config/type_ip_test.go index 85189f4..86f14ed 100644 --- a/config/type_ip_test.go +++ b/internal/config/type_ip_test.go @@ -5,7 +5,7 @@ import ( "net" "testing" - "github.com/9seconds/mtg/v2/config" + "github.com/9seconds/mtg/v2/internal/config" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/suite" ) diff --git a/config/type_metric_prefix.go b/internal/config/type_metric_prefix.go similarity index 100% rename from config/type_metric_prefix.go rename to internal/config/type_metric_prefix.go diff --git a/config/type_metric_prefix_test.go b/internal/config/type_metric_prefix_test.go similarity index 98% rename from config/type_metric_prefix_test.go rename to internal/config/type_metric_prefix_test.go index 5598de0..0c3727d 100644 --- a/config/type_metric_prefix_test.go +++ b/internal/config/type_metric_prefix_test.go @@ -4,7 +4,7 @@ import ( "encoding/json" "testing" - "github.com/9seconds/mtg/v2/config" + "github.com/9seconds/mtg/v2/internal/config" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/suite" ) diff --git a/config/type_port.go b/internal/config/type_port.go similarity index 100% rename from config/type_port.go rename to internal/config/type_port.go diff --git a/config/type_port_test.go b/internal/config/type_port_test.go similarity index 98% rename from config/type_port_test.go rename to internal/config/type_port_test.go index 98ab187..75fc920 100644 --- a/config/type_port_test.go +++ b/internal/config/type_port_test.go @@ -5,7 +5,7 @@ import ( "strconv" "testing" - "github.com/9seconds/mtg/v2/config" + "github.com/9seconds/mtg/v2/internal/config" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/suite" ) diff --git a/config/type_prefer_ip.go b/internal/config/type_prefer_ip.go similarity index 100% rename from config/type_prefer_ip.go rename to internal/config/type_prefer_ip.go diff --git a/config/type_prefer_ip_test.go b/internal/config/type_prefer_ip_test.go similarity index 98% rename from config/type_prefer_ip_test.go rename to internal/config/type_prefer_ip_test.go index 6a93b53..917b918 100644 --- a/config/type_prefer_ip_test.go +++ b/internal/config/type_prefer_ip_test.go @@ -5,7 +5,7 @@ import ( "strings" "testing" - "github.com/9seconds/mtg/v2/config" + "github.com/9seconds/mtg/v2/internal/config" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/suite" ) diff --git a/config/type_statsd_tag_format.go b/internal/config/type_statsd_tag_format.go similarity index 100% rename from config/type_statsd_tag_format.go rename to internal/config/type_statsd_tag_format.go diff --git a/config/type_statsd_tag_format_test.go b/internal/config/type_statsd_tag_format_test.go similarity index 98% rename from config/type_statsd_tag_format_test.go rename to internal/config/type_statsd_tag_format_test.go index e3975af..b639ed4 100644 --- a/config/type_statsd_tag_format_test.go +++ b/internal/config/type_statsd_tag_format_test.go @@ -5,7 +5,7 @@ import ( "strings" "testing" - "github.com/9seconds/mtg/v2/config" + "github.com/9seconds/mtg/v2/internal/config" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/suite" ) diff --git a/config/type_url.go b/internal/config/type_url.go similarity index 100% rename from config/type_url.go rename to internal/config/type_url.go diff --git a/config/type_url_test.go b/internal/config/type_url_test.go similarity index 98% rename from config/type_url_test.go rename to internal/config/type_url_test.go index 1e7ccdb..4288172 100644 --- a/config/type_url_test.go +++ b/internal/config/type_url_test.go @@ -5,7 +5,7 @@ import ( "net/url" "testing" - "github.com/9seconds/mtg/v2/config" + "github.com/9seconds/mtg/v2/internal/config" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/suite" )