restructured codebase to be flatter and easier to navigate

Southclaws · Southclaws · commit 7f0234b67d68 · 2020-03-20T13:13:57.000Z
diff --git a/config/config.go b/config/config.go
@@ -10,7 +10,7 @@ import (
 	"github.com/pkg/errors"
 	"github.com/robertkrimen/otto"
 
-	"github.com/picostack/pico/service/task"
+	"github.com/picostack/pico/task"
 )
 
 // State represents a desired system state
diff --git a/config/config_test.go b/config/config_test.go
@@ -7,7 +7,7 @@ import (
 	"github.com/robertkrimen/otto"
 	"github.com/stretchr/testify/assert"
 
-	"github.com/picostack/pico/service/task"
+	"github.com/picostack/pico/task"
 )
 
 func Test_applyFileTargets(t *testing.T) {
diff --git a/executor/cmd.go b/executor/cmd.go
@@ -4,8 +4,8 @@ import (
 	"github.com/pkg/errors"
 	"go.uber.org/zap"
 
-	"github.com/picostack/pico/service/secret"
-	"github.com/picostack/pico/service/task"
+	"github.com/picostack/pico/secret"
+	"github.com/picostack/pico/task"
 )
 
 var _ Executor = &CommandExecutor{}
diff --git a/executor/cmd_test.go b/executor/cmd_test.go
@@ -7,9 +7,9 @@ import (
 
 	"golang.org/x/sync/errgroup"
 
-	"github.com/picostack/pico/service/executor"
-	"github.com/picostack/pico/service/secret/memory"
-	"github.com/picostack/pico/service/task"
+	"github.com/picostack/pico/executor"
+	"github.com/picostack/pico/secret/memory"
+	"github.com/picostack/pico/task"
 )
 
 func TestMain(m *testing.M) {
diff --git a/executor/executor.go b/executor/executor.go
@@ -1,6 +1,6 @@
 package executor
 
-import "github.com/picostack/pico/service/task"
+import "github.com/picostack/pico/task"
 
 // Executor describes a type that can handle events and react to them. An
 // executor is also responsible for hydrating a target with secrets.
diff --git a/executor/printer.go b/executor/printer.go
@@ -3,7 +3,7 @@ package executor
 import (
 	"fmt"
 
-	"github.com/picostack/pico/service/task"
+	"github.com/picostack/pico/task"
 )
 
 // Printer implements an executor that doesn't actually execute, just prints.
diff --git a/reconfigurer/git.go b/reconfigurer/git.go
@@ -6,11 +6,12 @@ import (
 	"time"
 
 	"github.com/Southclaws/gitwatch"
-	"github.com/picostack/pico/service/config"
-	"github.com/picostack/pico/service/watcher"
 	"github.com/pkg/errors"
 	"go.uber.org/zap"
 	"gopkg.in/src-d/go-git.v4/plumbing/transport"
+
+	"github.com/picostack/pico/config"
+	"github.com/picostack/pico/watcher"
 )
 
 var _ Provider = &GitProvider{}
diff --git a/reconfigurer/reconfigurer.go b/reconfigurer/reconfigurer.go
@@ -1,7 +1,7 @@
 package reconfigurer
 
 import (
-	"github.com/picostack/pico/service/watcher"
+	"github.com/picostack/pico/watcher"
 )
 
 // Provider describes a type that can provide config state events to a target
diff --git a/reconfigurer/static.go b/reconfigurer/static.go
@@ -1,8 +1,8 @@
 package reconfigurer
 
 import (
-	"github.com/picostack/pico/service/config"
-	"github.com/picostack/pico/service/watcher"
+	"github.com/picostack/pico/config"
+	"github.com/picostack/pico/watcher"
 )
 
 var _ Provider = &Static{}
diff --git a/secret/memory/memory.go b/secret/memory/memory.go
@@ -1,7 +1,7 @@
 package memory
 
 import (
-	"github.com/picostack/pico/service/secret"
+	"github.com/picostack/pico/secret"
 )
 
 // MemorySecrets implements a simple in-memory secret.Store for testing
diff --git a/secret/secret.go b/secret/secret.go
diff --git a/secret/vault/vault.go b/secret/vault/vault.go
@@ -11,7 +11,7 @@ import (
 	"github.com/pkg/errors"
 	"go.uber.org/zap"
 
-	"github.com/picostack/pico/service/secret"
+	"github.com/picostack/pico/secret"
 )
 
 // VaultSecrets implements a secret.Store backed by Hashicorp Vault
diff --git a/secret/vault/vault_test.go b/secret/vault/vault_test.go
diff --git a/service/service.go b/service/service.go
@@ -11,13 +11,13 @@ import (
 	"gopkg.in/src-d/go-git.v4/plumbing/transport"
 	"gopkg.in/src-d/go-git.v4/plumbing/transport/ssh"
 
-	"github.com/picostack/pico/service/executor"
-	"github.com/picostack/pico/service/reconfigurer"
-	"github.com/picostack/pico/service/secret"
-	"github.com/picostack/pico/service/secret/memory"
-	"github.com/picostack/pico/service/secret/vault"
-	"github.com/picostack/pico/service/task"
-	"github.com/picostack/pico/service/watcher"
+	"github.com/picostack/pico/executor"
+	"github.com/picostack/pico/reconfigurer"
+	"github.com/picostack/pico/secret"
+	"github.com/picostack/pico/secret/memory"
+	"github.com/picostack/pico/secret/vault"
+	"github.com/picostack/pico/task"
+	"github.com/picostack/pico/watcher"
 )
 
 // Config specifies static configuration parameters (from CLI or environment)
diff --git a/task/diff.go b/task/diff.go
diff --git a/task/diff_test.go b/task/diff_test.go
diff --git a/task/target.go b/task/target.go
diff --git a/watcher/git.go b/watcher/git.go
@@ -12,8 +12,8 @@ import (
 	"go.uber.org/zap"
 	"gopkg.in/src-d/go-git.v4/plumbing/transport"
 
-	"github.com/picostack/pico/service/config"
-	"github.com/picostack/pico/service/task"
+	"github.com/picostack/pico/config"
+	"github.com/picostack/pico/task"
 )
 
 var _ Watcher = &GitWatcher{}
diff --git a/watcher/git_config_state_test.go b/watcher/git_config_state_test.go
@@ -6,8 +6,8 @@ import (
 
 	"github.com/stretchr/testify/assert"
 
-	"github.com/picostack/pico/service/config"
-	"github.com/picostack/pico/service/task"
+	"github.com/picostack/pico/config"
+	"github.com/picostack/pico/task"
 )
 
 func TestStateTransitions(t *testing.T) {
diff --git a/watcher/git_events_test.go b/watcher/git_events_test.go
@@ -8,8 +8,8 @@ import (
 	"github.com/Southclaws/gitwatch"
 	"github.com/stretchr/testify/assert"
 
-	"github.com/picostack/pico/service/config"
-	"github.com/picostack/pico/service/task"
+	"github.com/picostack/pico/config"
+	"github.com/picostack/pico/task"
 )
 
 func TestGitEvents(t *testing.T) {
diff --git a/watcher/git_test.go b/watcher/git_test.go
@@ -5,7 +5,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/picostack/pico/service/task"
+	"github.com/picostack/pico/task"
 )
 
 var w *GitWatcher
diff --git a/watcher/mock.go b/watcher/mock.go
@@ -1,6 +1,6 @@
 package watcher
 
-import "github.com/picostack/pico/service/config"
+import "github.com/picostack/pico/config"
 
 var _ Watcher = &MockWatcher{}
 
diff --git a/watcher/watcher.go b/watcher/watcher.go
@@ -1,7 +1,7 @@
 package watcher
 
 import (
-	"github.com/picostack/pico/service/config"
+	"github.com/picostack/pico/config"
 )
 
 // Watcher describes a type that receives a configuration and sets up the

Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@ import (`
`10`	`10`	`"github.com/pkg/errors"`
`11`	`11`	`"github.com/robertkrimen/otto"`
`12`	`12`
`13`		`- "github.com/picostack/pico/service/task"`
	`13`	`+ "github.com/picostack/pico/task"`
`14`	`14`	`)`
`15`	`15`
`16`	`16`	`// State represents a desired system state`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@ import (`
`7`	`7`	`"github.com/robertkrimen/otto"`
`8`	`8`	`"github.com/stretchr/testify/assert"`
`9`	`9`
`10`		`- "github.com/picostack/pico/service/task"`
	`10`	`+ "github.com/picostack/pico/task"`
`11`	`11`	`)`
`12`	`12`
`13`	`13`	`func Test_applyFileTargets(t *testing.T) {`
Original file line number	Diff line number	Diff line change
`@@ -4,8 +4,8 @@ import (`
`4`	`4`	`"github.com/pkg/errors"`
`5`	`5`	`"go.uber.org/zap"`
`6`	`6`
`7`		`- "github.com/picostack/pico/service/secret"`
`8`		`- "github.com/picostack/pico/service/task"`
	`7`	`+ "github.com/picostack/pico/secret"`
	`8`	`+ "github.com/picostack/pico/task"`
`9`	`9`	`)`
`10`	`10`
`11`	`11`	`var _ Executor = &CommandExecutor{}`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@ package executor`
`3`	`3`	`import (`
`4`	`4`	`"fmt"`
`5`	`5`
`6`		`- "github.com/picostack/pico/service/task"`
	`6`	`+ "github.com/picostack/pico/task"`
`7`	`7`	`)`
`8`	`8`
`9`	`9`	`// Printer implements an executor that doesn't actually execute, just prints.`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`package reconfigurer`
`2`	`2`
`3`	`3`	`import (`
`4`		`- "github.com/picostack/pico/service/watcher"`
	`4`	`+ "github.com/picostack/pico/watcher"`
`5`	`5`	`)`
`6`	`6`
`7`	`7`	`// Provider describes a type that can provide config state events to a target`
Original file line number	Diff line number	Diff line change
`@@ -1,8 +1,8 @@`
`1`	`1`	`package reconfigurer`
`2`	`2`
`3`	`3`	`import (`
`4`		`- "github.com/picostack/pico/service/config"`
`5`		`- "github.com/picostack/pico/service/watcher"`
	`4`	`+ "github.com/picostack/pico/config"`
	`5`	`+ "github.com/picostack/pico/watcher"`
`6`	`6`	`)`
`7`	`7`
`8`	`8`	`var _ Provider = &Static{}`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`package memory`
`2`	`2`
`3`	`3`	`import (`
`4`		`- "github.com/picostack/pico/service/secret"`
	`4`	`+ "github.com/picostack/pico/secret"`
`5`	`5`	`)`
`6`	`6`
`7`	`7`	`// MemorySecrets implements a simple in-memory secret.Store for testing`