Move source files out of plugin folder

lucaslorentz · May 19, 2022 · e8df9c8 · e8df9c8
1 parent 2ac1042
commit e8df9c8
Show file tree

Hide file tree

Showing 63 changed files with 45 additions and 51 deletions.
diff --git a/build.sh b/build.sh
@@ -5,10 +5,8 @@ set -e
 echo ==PARAMETERS==
 echo ARTIFACTS: "${ARTIFACTS:=./artifacts}"
 
-cd plugin
 go vet ./...
 go test -race ./...
-cd ../
 
 go install github.com/caddyserver/xcaddy/cmd/xcaddy@latest
 

diff --git a/plugin/caddyfile/caddyfile.go → caddyfile/caddyfile.go b/plugin/caddyfile/caddyfile.go → caddyfile/caddyfile.go
diff --git a/plugin/caddyfile/fromlabels.go → caddyfile/fromlabels.go b/plugin/caddyfile/fromlabels.go → caddyfile/fromlabels.go
diff --git a/plugin/caddyfile/fromlabels_test.go → caddyfile/fromlabels_test.go b/plugin/caddyfile/fromlabels_test.go → caddyfile/fromlabels_test.go
diff --git a/plugin/caddyfile/lexer.go → caddyfile/lexer.go b/plugin/caddyfile/lexer.go → caddyfile/lexer.go
diff --git a/plugin/caddyfile/marshal.go → caddyfile/marshal.go b/plugin/caddyfile/marshal.go → caddyfile/marshal.go
diff --git a/plugin/caddyfile/marshal_test.go → caddyfile/marshal_test.go b/plugin/caddyfile/marshal_test.go → caddyfile/marshal_test.go
diff --git a/plugin/caddyfile/merge.go → caddyfile/merge.go b/plugin/caddyfile/merge.go → caddyfile/merge.go
diff --git a/plugin/caddyfile/merge_test.go → caddyfile/merge_test.go b/plugin/caddyfile/merge_test.go → caddyfile/merge_test.go
diff --git a/plugin/caddyfile/processor.go → caddyfile/processor.go b/plugin/caddyfile/processor.go → caddyfile/processor.go
diff --git a/plugin/caddyfile/processor_test.go → caddyfile/processor_test.go b/plugin/caddyfile/processor_test.go → caddyfile/processor_test.go
diff --git a/...data/labels/follow_alphabetical_order.txt → ...data/labels/follow_alphabetical_order.txt b/...data/labels/follow_alphabetical_order.txt → ...data/labels/follow_alphabetical_order.txt
diff --git a/...dyfile/testdata/labels/global_options.txt → caddyfile/testdata/labels/global_options.txt b/...dyfile/testdata/labels/global_options.txt → caddyfile/testdata/labels/global_options.txt
diff --git a/...ata/labels/global_options_comes_first.txt → ...ata/labels/global_options_comes_first.txt b/...ata/labels/global_options_comes_first.txt → ...ata/labels/global_options_comes_first.txt
diff --git a/...in/caddyfile/testdata/labels/grouping.txt → caddyfile/testdata/labels/grouping.txt b/...in/caddyfile/testdata/labels/grouping.txt → caddyfile/testdata/labels/grouping.txt
diff --git a/...labels/isolate_directives_with_suffix.txt → ...labels/isolate_directives_with_suffix.txt b/...labels/isolate_directives_with_suffix.txt → ...labels/isolate_directives_with_suffix.txt
diff --git a/...e/testdata/labels/matchers_come_first.txt → ...e/testdata/labels/matchers_come_first.txt b/...e/testdata/labels/matchers_come_first.txt → ...e/testdata/labels/matchers_come_first.txt
diff --git a/...a/labels/one_line_matchers_come_first.txt → ...a/labels/one_line_matchers_come_first.txt b/...a/labels/one_line_matchers_come_first.txt → ...a/labels/one_line_matchers_come_first.txt
diff --git a/...er_and_isolate_directives_with_prefix.txt → ...er_and_isolate_directives_with_prefix.txt b/...er_and_isolate_directives_with_prefix.txt → ...er_and_isolate_directives_with_prefix.txt
diff --git a/plugin/caddyfile/testdata/labels/quotes.txt → caddyfile/testdata/labels/quotes.txt b/plugin/caddyfile/testdata/labels/quotes.txt → caddyfile/testdata/labels/quotes.txt
diff --git a/...e/testdata/labels/snippets_come_first.txt → ...e/testdata/labels/snippets_come_first.txt b/...e/testdata/labels/snippets_come_first.txt → ...e/testdata/labels/snippets_come_first.txt
diff --git a/...dyfile/testdata/labels/template_error.txt → caddyfile/testdata/labels/template_error.txt b/...dyfile/testdata/labels/template_error.txt → caddyfile/testdata/labels/template_error.txt
diff --git a/...estdata/labels/templates_empty_values.txt → ...estdata/labels/templates_empty_values.txt b/...estdata/labels/templates_empty_values.txt → ...estdata/labels/templates_empty_values.txt
diff --git a/...testdata/labels/wildcard_certificates.txt → ...testdata/labels/wildcard_certificates.txt b/...testdata/labels/wildcard_certificates.txt → ...testdata/labels/wildcard_certificates.txt
@@ -1,20 +1,20 @@
-caddy = *.example.com
-caddy.1_@foo = host foo.example.com
-caddy.1_handle = @foo
-caddy.1_handle.reverse_proxy = foo:8080
-
-caddy = *.example.com
-caddy.2_@bar = host bar.example.com
-caddy.2_handle = @bar
-caddy.2_handle.reverse_proxy = bar:8080
-----------
-*.example.com {
-	@foo host foo.example.com
-	@bar host bar.example.com
-	handle @foo {
-		reverse_proxy foo:8080
-	}
-	handle @bar {
-		reverse_proxy bar:8080
-	}
+caddy = *.example.com
+caddy.1_@foo = host foo.example.com
+caddy.1_handle = @foo
+caddy.1_handle.reverse_proxy = foo:8080
+
+caddy = *.example.com
+caddy.2_@bar = host bar.example.com
+caddy.2_handle = @bar
+caddy.2_handle.reverse_proxy = bar:8080
+----------
+*.example.com {
+	@foo host foo.example.com
+	@bar host bar.example.com
+	handle @foo {
+		reverse_proxy foo:8080
+	}
+	handle @bar {
+		reverse_proxy bar:8080
+	}
 }
diff --git a/...in/caddyfile/testdata/marshal/marshal.txt → caddyfile/testdata/marshal/marshal.txt b/...in/caddyfile/testdata/marshal/marshal.txt → caddyfile/testdata/marshal/marshal.txt
diff --git a/...a/merge/php_fastcgi_different_matcher.txt → ...a/merge/php_fastcgi_different_matcher.txt b/...a/merge/php_fastcgi_different_matcher.txt → ...a/merge/php_fastcgi_different_matcher.txt
diff --git a/...testdata/merge/php_fastcgi_no_matcher.txt → ...testdata/merge/php_fastcgi_no_matcher.txt b/...testdata/merge/php_fastcgi_no_matcher.txt → ...testdata/merge/php_fastcgi_no_matcher.txt
diff --git a/...stdata/merge/php_fastcgi_same_matcher.txt → ...stdata/merge/php_fastcgi_same_matcher.txt b/...stdata/merge/php_fastcgi_same_matcher.txt → ...stdata/merge/php_fastcgi_same_matcher.txt
diff --git a/...merge/reverse_proxy_different_matcher.txt → ...merge/reverse_proxy_different_matcher.txt b/...merge/reverse_proxy_different_matcher.txt → ...merge/reverse_proxy_different_matcher.txt
diff --git a/...stdata/merge/reverse_proxy_no_matcher.txt → ...stdata/merge/reverse_proxy_no_matcher.txt b/...stdata/merge/reverse_proxy_no_matcher.txt → ...stdata/merge/reverse_proxy_no_matcher.txt
diff --git a/...data/merge/reverse_proxy_same_matcher.txt → ...data/merge/reverse_proxy_same_matcher.txt b/...data/merge/reverse_proxy_same_matcher.txt → ...data/merge/reverse_proxy_same_matcher.txt
diff --git a/plugin/caddyfile/testdata/process/blank.txt → caddyfile/testdata/process/blank.txt b/plugin/caddyfile/testdata/process/blank.txt → caddyfile/testdata/process/blank.txt
diff --git a/plugin/caddyfile/testdata/process/empty.txt → caddyfile/testdata/process/empty.txt b/plugin/caddyfile/testdata/process/empty.txt → caddyfile/testdata/process/empty.txt
diff --git a/...dyfile/testdata/process/invalid_block.txt → caddyfile/testdata/process/invalid_block.txt b/...dyfile/testdata/process/invalid_block.txt → caddyfile/testdata/process/invalid_block.txt
diff --git a/...ddyfile/testdata/process/invalid_file.txt → caddyfile/testdata/process/invalid_file.txt b/...ddyfile/testdata/process/invalid_file.txt → caddyfile/testdata/process/invalid_file.txt
diff --git a/plugin/cmd.go → cmd.go b/plugin/cmd.go → cmd.go
@@ -1,4 +1,4 @@
-package plugin
+package caddydockerproxy
 
 import (
 	"flag"
@@ -10,8 +10,8 @@ import (
 
 	"github.com/caddyserver/caddy/v2"
 	caddycmd "github.com/caddyserver/caddy/v2/cmd"
-	"github.com/lucaslorentz/caddy-docker-proxy/v2/plugin/config"
-	"github.com/lucaslorentz/caddy-docker-proxy/v2/plugin/generator"
+	"github.com/lucaslorentz/caddy-docker-proxy/v2/config"
+	"github.com/lucaslorentz/caddy-docker-proxy/v2/generator"
 
 	"go.uber.org/zap"
 )

diff --git a/plugin/config/options.go → config/options.go b/plugin/config/options.go → config/options.go
diff --git a/plugin/docker/client.go → docker/client.go b/plugin/docker/client.go → docker/client.go
diff --git a/plugin/docker/client_mock.go → docker/client_mock.go b/plugin/docker/client_mock.go → docker/client_mock.go
diff --git a/plugin/docker/utils.go → docker/utils.go b/plugin/docker/utils.go → docker/utils.go
diff --git a/plugin/docker/utils_mock.go → docker/utils_mock.go b/plugin/docker/utils_mock.go → docker/utils_mock.go
diff --git a/plugin/docker/utils_test.go → docker/utils_test.go b/plugin/docker/utils_test.go → docker/utils_test.go
diff --git a/plugin/generator/containers.go → generator/containers.go b/plugin/generator/containers.go → generator/containers.go
@@ -2,7 +2,7 @@ package generator
 
 import (
 	"github.com/docker/docker/api/types"
-	"github.com/lucaslorentz/caddy-docker-proxy/v2/plugin/caddyfile"
+	"github.com/lucaslorentz/caddy-docker-proxy/v2/caddyfile"
 	"go.uber.org/zap"
 )
 

diff --git a/plugin/generator/containers_test.go → generator/containers_test.go b/plugin/generator/containers_test.go → generator/containers_test.go
@@ -5,7 +5,7 @@ import (
 
 	"github.com/docker/docker/api/types"
 	"github.com/docker/docker/api/types/network"
-	"github.com/lucaslorentz/caddy-docker-proxy/v2/plugin/config"
+	"github.com/lucaslorentz/caddy-docker-proxy/v2/config"
 )
 
 func TestContainers_TemplateData(t *testing.T) {

diff --git a/plugin/generator/generator.go → generator/generator.go b/plugin/generator/generator.go → generator/generator.go
@@ -11,9 +11,9 @@ import (
 
 	"github.com/docker/docker/api/types"
 	"github.com/docker/docker/api/types/swarm"
-	"github.com/lucaslorentz/caddy-docker-proxy/v2/plugin/caddyfile"
-	"github.com/lucaslorentz/caddy-docker-proxy/v2/plugin/config"
-	"github.com/lucaslorentz/caddy-docker-proxy/v2/plugin/docker"
+	"github.com/lucaslorentz/caddy-docker-proxy/v2/caddyfile"
+	"github.com/lucaslorentz/caddy-docker-proxy/v2/config"
+	"github.com/lucaslorentz/caddy-docker-proxy/v2/docker"
 
 	"go.uber.org/zap"
 )

diff --git a/plugin/generator/generator_test.go → generator/generator_test.go b/plugin/generator/generator_test.go → generator/generator_test.go
@@ -11,8 +11,8 @@ import (
 	"github.com/docker/docker/api/types"
 	"github.com/docker/docker/api/types/network"
 	"github.com/docker/docker/api/types/swarm"
-	"github.com/lucaslorentz/caddy-docker-proxy/v2/plugin/config"
-	"github.com/lucaslorentz/caddy-docker-proxy/v2/plugin/docker"
+	"github.com/lucaslorentz/caddy-docker-proxy/v2/config"
+	"github.com/lucaslorentz/caddy-docker-proxy/v2/docker"
 	"github.com/stretchr/testify/assert"
 	"go.uber.org/zap"
 	"go.uber.org/zap/zapcore"

diff --git a/plugin/generator/labels.go → generator/labels.go b/plugin/generator/labels.go → generator/labels.go
@@ -5,7 +5,7 @@ import (
 	"strings"
 	"text/template"
 
-	"github.com/lucaslorentz/caddy-docker-proxy/v2/plugin/caddyfile"
+	"github.com/lucaslorentz/caddy-docker-proxy/v2/caddyfile"
 )
 
 type targetsProvider func() ([]string, error)

diff --git a/plugin/generator/labels_test.go → generator/labels_test.go b/plugin/generator/labels_test.go → generator/labels_test.go
diff --git a/plugin/generator/services.go → generator/services.go b/plugin/generator/services.go → generator/services.go
@@ -7,7 +7,7 @@ import (
 	"github.com/docker/docker/api/types"
 	"github.com/docker/docker/api/types/filters"
 	"github.com/docker/docker/api/types/swarm"
-	"github.com/lucaslorentz/caddy-docker-proxy/v2/plugin/caddyfile"
+	"github.com/lucaslorentz/caddy-docker-proxy/v2/caddyfile"
 
 	"go.uber.org/zap"
 )

diff --git a/plugin/generator/services_test.go → generator/services_test.go b/plugin/generator/services_test.go → generator/services_test.go
@@ -5,7 +5,7 @@ import (
 
 	"github.com/docker/docker/api/types"
 	"github.com/docker/docker/api/types/swarm"
-	"github.com/lucaslorentz/caddy-docker-proxy/v2/plugin/config"
+	"github.com/lucaslorentz/caddy-docker-proxy/v2/config"
 )
 
 func TestServices_TemplateData(t *testing.T) {

diff --git a/...or/testdata/labels/all_special_labels.txt → ...or/testdata/labels/all_special_labels.txt b/...or/testdata/labels/all_special_labels.txt → ...or/testdata/labels/all_special_labels.txt
diff --git a/...labels/doesnt_override_existing_proxy.txt → ...labels/doesnt_override_existing_proxy.txt b/...labels/doesnt_override_existing_proxy.txt → ...labels/doesnt_override_existing_proxy.txt
diff --git a/...tor/testdata/labels/h2c_reverse_proxy.txt → ...tor/testdata/labels/h2c_reverse_proxy.txt b/...tor/testdata/labels/h2c_reverse_proxy.txt → ...tor/testdata/labels/h2c_reverse_proxy.txt
diff --git a/...ator/testdata/labels/invalid_template.txt → ...ator/testdata/labels/invalid_template.txt b/...ator/testdata/labels/invalid_template.txt → ...ator/testdata/labels/invalid_template.txt
diff --git a/...estdata/labels/minimum_special_labels.txt → ...estdata/labels/minimum_special_labels.txt b/...estdata/labels/minimum_special_labels.txt → ...estdata/labels/minimum_special_labels.txt
diff --git a/...or/testdata/labels/multiple_addresses.txt → ...or/testdata/labels/multiple_addresses.txt b/...or/testdata/labels/multiple_addresses.txt → ...or/testdata/labels/multiple_addresses.txt
diff --git a/...ator/testdata/labels/multiple_configs.txt → ...ator/testdata/labels/multiple_configs.txt b/...ator/testdata/labels/multiple_configs.txt → ...ator/testdata/labels/multiple_configs.txt
diff --git a/...proxy_directives_are_moved_into_route.txt → ...proxy_directives_are_moved_into_route.txt b/...proxy_directives_are_moved_into_route.txt → ...proxy_directives_are_moved_into_route.txt
diff --git a/...generator/testdata/labels/with_groups.txt → generator/testdata/labels/with_groups.txt b/...generator/testdata/labels/with_groups.txt → generator/testdata/labels/with_groups.txt
diff --git a/plugin/loader.go → loader.go b/plugin/loader.go → loader.go
@@ -1,4 +1,4 @@
-package plugin
+package caddydockerproxy
 
 import (
 	"bytes"
@@ -17,9 +17,10 @@ import (
 	"github.com/docker/docker/api/types"
 	"github.com/docker/docker/api/types/filters"
 	"github.com/docker/docker/client"
-	"github.com/lucaslorentz/caddy-docker-proxy/v2/plugin/config"
-	"github.com/lucaslorentz/caddy-docker-proxy/v2/plugin/docker"
-	"github.com/lucaslorentz/caddy-docker-proxy/v2/plugin/generator"
+	"github.com/lucaslorentz/caddy-docker-proxy/v2/config"
+	"github.com/lucaslorentz/caddy-docker-proxy/v2/docker"
+	"github.com/lucaslorentz/caddy-docker-proxy/v2/generator"
+	"github.com/lucaslorentz/caddy-docker-proxy/v2/utils"
 
 	"go.uber.org/zap"
 )
@@ -35,16 +36,16 @@ type DockerLoader struct {
 	lastCaddyfile   []byte
 	lastJSONConfig  []byte
 	lastVersion     int64
-	serversVersions *StringInt64CMap
-	serversUpdating *StringBoolCMap
+	serversVersions *utils.StringInt64CMap
+	serversUpdating *utils.StringBoolCMap
 }
 
 // CreateDockerLoader creates a docker loader
 func CreateDockerLoader(options *config.Options) *DockerLoader {
 	return &DockerLoader{
 		options:         options,
-		serversVersions: newStringInt64CMap(),
-		serversUpdating: newStringBoolCMap(),
+		serversVersions: utils.NewStringInt64CMap(),
+		serversUpdating: utils.NewStringBoolCMap(),
 	}
 }
 

diff --git a/main.go b/main.go
diff --git a/plugin/stringBoolCMap.go → utils/stringBoolCMap.go b/plugin/stringBoolCMap.go → utils/stringBoolCMap.go
@@ -1,4 +1,4 @@
-package plugin
+package utils
 
 import (
 	"sync"
@@ -10,7 +10,7 @@ type StringBoolCMap struct {
 	internal map[string]bool
 }
 
-func newStringBoolCMap() *StringBoolCMap {
+func NewStringBoolCMap() *StringBoolCMap {
 	return &StringBoolCMap{
 		mutex:    sync.RWMutex{},
 		internal: map[string]bool{},

diff --git a/plugin/stringInt64CMap.go → utils/stringInt64CMap.go b/plugin/stringInt64CMap.go → utils/stringInt64CMap.go
@@ -1,4 +1,4 @@
-package plugin
+package utils
 
 import (
 	"sync"
@@ -10,7 +10,7 @@ type StringInt64CMap struct {
 	internal map[string]int64
 }
 
-func newStringInt64CMap() *StringInt64CMap {
+func NewStringInt64CMap() *StringInt64CMap {
 	return &StringInt64CMap{
 		mutex:    sync.RWMutex{},
 		internal: map[string]int64{},