Moved private packages to internal package

bit-wiz · Sep 7, 2023 · c898d6e · c898d6e
1 parent 7a82a39
commit c898d6e
Show file tree

Hide file tree

Showing 42 changed files with 40 additions and 40 deletions.
diff --git a/bootstrap/bootstrap.go b/bootstrap/bootstrap.go
@@ -8,13 +8,13 @@ import (
 	"github.com/rs/zerolog"
 	"github.com/rs/zerolog/log"
 	"github.com/runabol/tork/conf"
-	"github.com/runabol/tork/coordinator"
 	"github.com/runabol/tork/datastore"
 	"github.com/runabol/tork/db/postgres"
+	"github.com/runabol/tork/internal/coordinator"
+	"github.com/runabol/tork/internal/signals"
+	"github.com/runabol/tork/internal/worker"
 	"github.com/runabol/tork/mq"
 	"github.com/runabol/tork/runtime"
-	"github.com/runabol/tork/signals"
-	"github.com/runabol/tork/worker"
 )
 
 type Mode string

diff --git a/datastore/inmemory.go b/datastore/inmemory.go
@@ -10,7 +10,7 @@ import (
 	"github.com/pkg/errors"
 	"github.com/runabol/tork"
 
-	"github.com/runabol/tork/syncx"
+	"github.com/runabol/tork/internal/syncx"
 )
 
 var ErrTaskNotFound = errors.New("task not found")

diff --git a/datastore/inmemory_test.go b/datastore/inmemory_test.go
@@ -9,7 +9,7 @@ import (
 	"github.com/runabol/tork"
 	"github.com/runabol/tork/datastore"
 
-	"github.com/runabol/tork/uuid"
+	"github.com/runabol/tork/internal/uuid"
 	"github.com/stretchr/testify/assert"
 )
 

diff --git a/datastore/postgres_test.go b/datastore/postgres_test.go
@@ -12,7 +12,7 @@ import (
 	"github.com/runabol/tork"
 	"github.com/runabol/tork/db/postgres"
 
-	"github.com/runabol/tork/uuid"
+	"github.com/runabol/tork/internal/uuid"
 	"github.com/stretchr/testify/assert"
 )
 

diff --git a/clone/clone.go → internal/clone/clone.go b/clone/clone.go → internal/clone/clone.go
diff --git a/clone/clone_test.go → internal/clone/clone_test.go b/clone/clone_test.go → internal/clone/clone_test.go
@@ -3,7 +3,7 @@ package clone_test
 import (
 	"testing"
 
-	"github.com/runabol/tork/clone"
+	"github.com/runabol/tork/internal/clone"
 	"github.com/stretchr/testify/assert"
 )
 

diff --git a/coordinator/api.go → internal/coordinator/api.go b/coordinator/api.go → internal/coordinator/api.go
@@ -16,7 +16,7 @@ import (
 	"github.com/rs/zerolog/log"
 	"github.com/runabol/tork"
 	"github.com/runabol/tork/datastore"
-	"github.com/runabol/tork/httpx"
+	"github.com/runabol/tork/internal/httpx"
 
 	"github.com/runabol/tork/mq"
 	"github.com/runabol/tork/version"

diff --git a/coordinator/api_test.go → internal/coordinator/api_test.go b/coordinator/api_test.go → internal/coordinator/api_test.go
@@ -16,7 +16,7 @@ import (
 
 	"github.com/runabol/tork/mq"
 
-	"github.com/runabol/tork/uuid"
+	"github.com/runabol/tork/internal/uuid"
 	"github.com/stretchr/testify/assert"
 )
 

diff --git a/coordinator/coordinator.go → internal/coordinator/coordinator.go b/coordinator/coordinator.go → internal/coordinator/coordinator.go
@@ -12,11 +12,11 @@ import (
 
 	"github.com/runabol/tork"
 	"github.com/runabol/tork/datastore"
-	"github.com/runabol/tork/eval"
+	"github.com/runabol/tork/internal/eval"
 
 	"github.com/runabol/tork/mq"
 
-	"github.com/runabol/tork/uuid"
+	"github.com/runabol/tork/internal/uuid"
 )
 
 // Coordinator is responsible for accepting tasks from

diff --git a/coordinator/coordinator_test.go → internal/coordinator/coordinator_test.go b/coordinator/coordinator_test.go → internal/coordinator/coordinator_test.go
@@ -12,8 +12,8 @@ import (
 
 	"github.com/runabol/tork/runtime"
 
-	"github.com/runabol/tork/uuid"
-	"github.com/runabol/tork/worker"
+	"github.com/runabol/tork/internal/uuid"
+	"github.com/runabol/tork/internal/worker"
 	"github.com/stretchr/testify/assert"
 	"gopkg.in/yaml.v3"
 )
@@ -1444,25 +1444,25 @@ func Test_completeEachTaskWithTx(t *testing.T) {
 }
 
 func TestRunHelloWorldJob(t *testing.T) {
-	j1 := doRunJob(t, "../examples/hello.yaml")
+	j1 := doRunJob(t, "../../examples/hello.yaml")
 	assert.Equal(t, tork.JobStateCompleted, j1.State)
 	assert.Equal(t, 1, len(j1.Execution))
 }
 
 func TestRunParallelJob(t *testing.T) {
-	j1 := doRunJob(t, "../examples/parallel.yaml")
+	j1 := doRunJob(t, "../../examples/parallel.yaml")
 	assert.Equal(t, tork.JobStateCompleted, j1.State)
 	assert.Equal(t, 9, len(j1.Execution))
 }
 
 func TestRunEachJob(t *testing.T) {
-	j1 := doRunJob(t, "../examples/each.yaml")
+	j1 := doRunJob(t, "../../examples/each.yaml")
 	assert.Equal(t, tork.JobStateCompleted, j1.State)
 	assert.Equal(t, 7, len(j1.Execution))
 }
 
 func TestRunSubjobJob(t *testing.T) {
-	j1 := doRunJob(t, "../examples/subjob.yaml")
+	j1 := doRunJob(t, "../../examples/subjob.yaml")
 	assert.Equal(t, tork.JobStateCompleted, j1.State)
 	assert.Equal(t, 6, len(j1.Execution))
 }

diff --git a/coordinator/input.go → internal/coordinator/input.go b/coordinator/input.go → internal/coordinator/input.go
@@ -6,11 +6,11 @@ import (
 
 	"github.com/go-playground/validator/v10"
 	"github.com/runabol/tork"
-	"github.com/runabol/tork/clone"
-	"github.com/runabol/tork/eval"
+	"github.com/runabol/tork/internal/clone"
+	"github.com/runabol/tork/internal/eval"
 	"github.com/runabol/tork/mq"
 
-	"github.com/runabol/tork/uuid"
+	"github.com/runabol/tork/internal/uuid"
 )
 
 type jobInput struct {

diff --git a/coordinator/input_test.go → internal/coordinator/input_test.go b/coordinator/input_test.go → internal/coordinator/input_test.go
diff --git a/coordinator/redact.go → internal/coordinator/redact.go b/coordinator/redact.go → internal/coordinator/redact.go
diff --git a/coordinator/redact_test.go → internal/coordinator/redact_test.go b/coordinator/redact_test.go → internal/coordinator/redact_test.go
diff --git a/eval/eval.go → internal/eval/eval.go b/eval/eval.go → internal/eval/eval.go
diff --git a/eval/eval_test.go → internal/eval/eval_test.go b/eval/eval_test.go → internal/eval/eval_test.go
@@ -5,7 +5,7 @@ import (
 	"testing"
 
 	"github.com/runabol/tork"
-	"github.com/runabol/tork/eval"
+	"github.com/runabol/tork/internal/eval"
 	"github.com/stretchr/testify/assert"
 )
 

diff --git a/eval/funcs.go → internal/eval/funcs.go b/eval/funcs.go → internal/eval/funcs.go
diff --git a/eval/funcs_test.go → internal/eval/funcs_test.go b/eval/funcs_test.go → internal/eval/funcs_test.go
diff --git a/httpx/httpx.go → internal/httpx/httpx.go b/httpx/httpx.go → internal/httpx/httpx.go
@@ -5,7 +5,7 @@ import (
 	"time"
 
 	"github.com/pkg/errors"
-	"github.com/runabol/tork/netx"
+	"github.com/runabol/tork/internal/netx"
 )
 
 func StartAsync(s *http.Server) error {

diff --git a/httpx/httpx_test.go → internal/httpx/httpx_test.go b/httpx/httpx_test.go → internal/httpx/httpx_test.go
@@ -7,7 +7,7 @@ import (
 	"net/http/httptest"
 	"testing"
 
-	"github.com/runabol/tork/httpx"
+	"github.com/runabol/tork/internal/httpx"
 	"github.com/stretchr/testify/assert"
 )
 

diff --git a/netx/netx.go → internal/netx/netx.go b/netx/netx.go → internal/netx/netx.go
diff --git a/netx/netx_test.go → internal/netx/netx_test.go b/netx/netx_test.go → internal/netx/netx_test.go
@@ -4,7 +4,7 @@ import (
 	"net"
 	"testing"
 
-	"github.com/runabol/tork/netx"
+	"github.com/runabol/tork/internal/netx"
 	"github.com/stretchr/testify/assert"
 )
 

diff --git a/signals/quit.go → internal/signals/quit.go b/signals/quit.go → internal/signals/quit.go
diff --git a/signals/quit_test.go → internal/signals/quit_test.go b/signals/quit_test.go → internal/signals/quit_test.go
@@ -5,7 +5,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/runabol/tork/signals"
+	"github.com/runabol/tork/internal/signals"
 	"github.com/stretchr/testify/assert"
 )
 

diff --git a/syncx/map.go → internal/syncx/map.go b/syncx/map.go → internal/syncx/map.go
diff --git a/syncx/map_test.go → internal/syncx/map_test.go b/syncx/map_test.go → internal/syncx/map_test.go
@@ -6,7 +6,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/runabol/tork/syncx"
+	"github.com/runabol/tork/internal/syncx"
 	"github.com/stretchr/testify/assert"
 	"golang.org/x/exp/slices"
 )

diff --git a/uuid/uuid.go → internal/uuid/uuid.go b/uuid/uuid.go → internal/uuid/uuid.go
diff --git a/uuid/uuid_test.go → internal/uuid/uuid_test.go b/uuid/uuid_test.go → internal/uuid/uuid_test.go
@@ -3,7 +3,7 @@ package uuid_test
 import (
 	"testing"
 
-	"github.com/runabol/tork/uuid"
+	"github.com/runabol/tork/internal/uuid"
 	"github.com/stretchr/testify/assert"
 )
 

diff --git a/worker/api.go → internal/worker/api.go b/worker/api.go → internal/worker/api.go
@@ -10,7 +10,7 @@ import (
 	"github.com/labstack/echo/v4"
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog/log"
-	"github.com/runabol/tork/httpx"
+	"github.com/runabol/tork/internal/httpx"
 	"github.com/runabol/tork/mq"
 	"github.com/runabol/tork/runtime"
 	"github.com/runabol/tork/version"

diff --git a/worker/api_test.go → internal/worker/api_test.go b/worker/api_test.go → internal/worker/api_test.go
diff --git a/worker/stats.go → internal/worker/stats.go b/worker/stats.go → internal/worker/stats.go
diff --git a/worker/stats_test.go → internal/worker/stats_test.go b/worker/stats_test.go → internal/worker/stats_test.go
diff --git a/worker/worker.go → internal/worker/worker.go b/worker/worker.go → internal/worker/worker.go
@@ -14,10 +14,10 @@ import (
 	"github.com/runabol/tork"
 	"github.com/runabol/tork/mq"
 
+	"github.com/runabol/tork/internal/syncx"
 	"github.com/runabol/tork/runtime"
-	"github.com/runabol/tork/syncx"
 
-	"github.com/runabol/tork/uuid"
+	"github.com/runabol/tork/internal/uuid"
 	"github.com/runabol/tork/version"
 )
 

diff --git a/worker/worker_test.go → internal/worker/worker_test.go b/worker/worker_test.go → internal/worker/worker_test.go
@@ -6,9 +6,9 @@ import (
 	"time"
 
 	"github.com/runabol/tork"
+	"github.com/runabol/tork/internal/uuid"
 	"github.com/runabol/tork/mq"
 	"github.com/runabol/tork/runtime"
-	"github.com/runabol/tork/uuid"
 	"github.com/runabol/tork/version"
 	"github.com/stretchr/testify/assert"
 )

diff --git a/job.go b/job.go
@@ -3,7 +3,7 @@ package tork
 import (
 	"time"
 
-	"github.com/runabol/tork/clone"
+	"github.com/runabol/tork/internal/clone"
 )
 
 type JobState string

diff --git a/mq/inmemory.go b/mq/inmemory.go
@@ -10,7 +10,7 @@ import (
 	"github.com/rs/zerolog/log"
 	"github.com/runabol/tork"
 
-	"github.com/runabol/tork/syncx"
+	"github.com/runabol/tork/internal/syncx"
 )
 
 const defaultQueueSize = 1000

diff --git a/mq/inmemory_test.go b/mq/inmemory_test.go
@@ -8,8 +8,8 @@ import (
 	"time"
 
 	"github.com/runabol/tork"
+	"github.com/runabol/tork/internal/uuid"
 	"github.com/runabol/tork/mq"
-	"github.com/runabol/tork/uuid"
 	"github.com/stretchr/testify/assert"
 )
 

diff --git a/mq/rabbitmq.go b/mq/rabbitmq.go
@@ -14,8 +14,8 @@ import (
 	amqp "github.com/rabbitmq/amqp091-go"
 	"github.com/rs/zerolog/log"
 	"github.com/runabol/tork"
-	"github.com/runabol/tork/syncx"
-	"github.com/runabol/tork/uuid"
+	"github.com/runabol/tork/internal/syncx"
+	"github.com/runabol/tork/internal/uuid"
 )
 
 type RabbitMQBroker struct {

diff --git a/mq/rabbitmq_test.go b/mq/rabbitmq_test.go
@@ -8,8 +8,8 @@ import (
 	"time"
 
 	"github.com/runabol/tork"
+	"github.com/runabol/tork/internal/uuid"
 	"github.com/runabol/tork/mq"
-	"github.com/runabol/tork/uuid"
 	"github.com/stretchr/testify/assert"
 )
 

diff --git a/runtime/docker.go b/runtime/docker.go
@@ -21,7 +21,7 @@ import (
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog/log"
 	"github.com/runabol/tork"
-	"github.com/runabol/tork/syncx"
+	"github.com/runabol/tork/internal/syncx"
 )
 
 type DockerRuntime struct {

diff --git a/runtime/docker_test.go b/runtime/docker_test.go
@@ -13,7 +13,7 @@ import (
 	"github.com/docker/docker/api/types/filters"
 	"github.com/runabol/tork"
 
-	"github.com/runabol/tork/uuid"
+	"github.com/runabol/tork/internal/uuid"
 	"github.com/stretchr/testify/assert"
 )
 

diff --git a/task.go b/task.go
@@ -3,7 +3,7 @@ package tork
 import (
 	"time"
 
-	"github.com/runabol/tork/clone"
+	"github.com/runabol/tork/internal/clone"
 )
 
 // State defines the list of states that a