TBR: services/device: move impl, starter, installer packages under deviced/internal
Change-Id: I7a3edbd10e102198dddf6c3b626b7f59262ba0b3
diff --git a/services/device/deviced/commands.go b/services/device/deviced/commands.go
index 02d1c17..4673b8c 100644
--- a/services/device/deviced/commands.go
+++ b/services/device/deviced/commands.go
@@ -11,8 +11,8 @@
"v.io/v23/context"
"v.io/x/lib/cmdline"
"v.io/x/ref/lib/v23cmd"
- "v.io/x/ref/services/device/internal/impl"
- "v.io/x/ref/services/device/internal/installer"
+ "v.io/x/ref/services/device/deviced/internal/impl"
+ "v.io/x/ref/services/device/deviced/internal/installer"
)
var (
diff --git a/services/device/internal/impl/app_service.go b/services/device/deviced/internal/impl/app_service.go
similarity index 100%
rename from services/device/internal/impl/app_service.go
rename to services/device/deviced/internal/impl/app_service.go
diff --git a/services/device/internal/impl/app_starting_util.go b/services/device/deviced/internal/impl/app_starting_util.go
similarity index 100%
rename from services/device/internal/impl/app_starting_util.go
rename to services/device/deviced/internal/impl/app_starting_util.go
diff --git a/services/device/internal/impl/app_state.go b/services/device/deviced/internal/impl/app_state.go
similarity index 100%
rename from services/device/internal/impl/app_state.go
rename to services/device/deviced/internal/impl/app_state.go
diff --git a/services/device/internal/impl/app_state_test.go b/services/device/deviced/internal/impl/app_state_test.go
similarity index 100%
rename from services/device/internal/impl/app_state_test.go
rename to services/device/deviced/internal/impl/app_state_test.go
diff --git a/services/device/internal/impl/applife/app_life_test.go b/services/device/deviced/internal/impl/applife/app_life_test.go
similarity index 99%
rename from services/device/internal/impl/applife/app_life_test.go
rename to services/device/deviced/internal/impl/applife/app_life_test.go
index f381c7e..a5f1867 100644
--- a/services/device/internal/impl/applife/app_life_test.go
+++ b/services/device/deviced/internal/impl/applife/app_life_test.go
@@ -26,9 +26,9 @@
"v.io/x/ref"
"v.io/x/ref/lib/mgmt"
vsecurity "v.io/x/ref/lib/security"
+ "v.io/x/ref/services/device/deviced/internal/impl"
+ "v.io/x/ref/services/device/deviced/internal/impl/utiltest"
"v.io/x/ref/services/device/internal/errors"
- "v.io/x/ref/services/device/internal/impl"
- "v.io/x/ref/services/device/internal/impl/utiltest"
"v.io/x/ref/services/internal/servicetest"
"v.io/x/ref/test"
"v.io/x/ref/test/testutil"
diff --git a/services/device/internal/impl/applife/doc.go b/services/device/deviced/internal/impl/applife/doc.go
similarity index 100%
rename from services/device/internal/impl/applife/doc.go
rename to services/device/deviced/internal/impl/applife/doc.go
diff --git a/services/device/internal/impl/applife/impl_test.go b/services/device/deviced/internal/impl/applife/impl_test.go
similarity index 84%
rename from services/device/internal/impl/applife/impl_test.go
rename to services/device/deviced/internal/impl/applife/impl_test.go
index bceee06..0808c65 100644
--- a/services/device/internal/impl/applife/impl_test.go
+++ b/services/device/deviced/internal/impl/applife/impl_test.go
@@ -7,7 +7,7 @@
import (
"testing"
- "v.io/x/ref/services/device/internal/impl/utiltest"
+ "v.io/x/ref/services/device/deviced/internal/impl/utiltest"
)
func TestMain(m *testing.M) {
diff --git a/services/device/internal/impl/applife/instance_reaping_test.go b/services/device/deviced/internal/impl/applife/instance_reaping_test.go
similarity index 97%
rename from services/device/internal/impl/applife/instance_reaping_test.go
rename to services/device/deviced/internal/impl/applife/instance_reaping_test.go
index 78d0eca..86d4c73 100644
--- a/services/device/internal/impl/applife/instance_reaping_test.go
+++ b/services/device/deviced/internal/impl/applife/instance_reaping_test.go
@@ -13,7 +13,7 @@
"v.io/v23/services/stats"
"v.io/v23/vdl"
- "v.io/x/ref/services/device/internal/impl/utiltest"
+ "v.io/x/ref/services/device/deviced/internal/impl/utiltest"
"v.io/x/ref/services/internal/servicetest"
)
diff --git a/services/device/internal/impl/associate_instance_test.go b/services/device/deviced/internal/impl/associate_instance_test.go
similarity index 100%
rename from services/device/internal/impl/associate_instance_test.go
rename to services/device/deviced/internal/impl/associate_instance_test.go
diff --git a/services/device/internal/impl/association_instance.go b/services/device/deviced/internal/impl/association_instance.go
similarity index 100%
rename from services/device/internal/impl/association_instance.go
rename to services/device/deviced/internal/impl/association_instance.go
diff --git a/services/device/internal/impl/association_state.go b/services/device/deviced/internal/impl/association_state.go
similarity index 100%
rename from services/device/internal/impl/association_state.go
rename to services/device/deviced/internal/impl/association_state.go
diff --git a/services/device/internal/impl/association_state_test.go b/services/device/deviced/internal/impl/association_state_test.go
similarity index 97%
rename from services/device/internal/impl/association_state_test.go
rename to services/device/deviced/internal/impl/association_state_test.go
index 6dba927..0e586c5 100644
--- a/services/device/internal/impl/association_state_test.go
+++ b/services/device/deviced/internal/impl/association_state_test.go
@@ -13,8 +13,8 @@
"v.io/v23/services/device"
- "v.io/x/ref/services/device/internal/impl"
- "v.io/x/ref/services/device/internal/impl/utiltest"
+ "v.io/x/ref/services/device/deviced/internal/impl"
+ "v.io/x/ref/services/device/deviced/internal/impl/utiltest"
)
// TestAssociationPersistance verifies correct operation of association
diff --git a/services/device/internal/impl/callback.go b/services/device/deviced/internal/impl/callback.go
similarity index 100%
rename from services/device/internal/impl/callback.go
rename to services/device/deviced/internal/impl/callback.go
diff --git a/services/device/internal/impl/claim.go b/services/device/deviced/internal/impl/claim.go
similarity index 100%
rename from services/device/internal/impl/claim.go
rename to services/device/deviced/internal/impl/claim.go
diff --git a/services/device/internal/impl/config_service.go b/services/device/deviced/internal/impl/config_service.go
similarity index 100%
rename from services/device/internal/impl/config_service.go
rename to services/device/deviced/internal/impl/config_service.go
diff --git a/services/device/internal/impl/daemonreap/daemon_reaping_test.go b/services/device/deviced/internal/impl/daemonreap/daemon_reaping_test.go
similarity index 98%
rename from services/device/internal/impl/daemonreap/daemon_reaping_test.go
rename to services/device/deviced/internal/impl/daemonreap/daemon_reaping_test.go
index b35512c..72f816a 100644
--- a/services/device/internal/impl/daemonreap/daemon_reaping_test.go
+++ b/services/device/deviced/internal/impl/daemonreap/daemon_reaping_test.go
@@ -11,7 +11,7 @@
"v.io/v23/services/device"
- "v.io/x/ref/services/device/internal/impl/utiltest"
+ "v.io/x/ref/services/device/deviced/internal/impl/utiltest"
"v.io/x/ref/services/internal/servicetest"
)
diff --git a/services/device/internal/impl/daemonreap/doc.go b/services/device/deviced/internal/impl/daemonreap/doc.go
similarity index 100%
rename from services/device/internal/impl/daemonreap/doc.go
rename to services/device/deviced/internal/impl/daemonreap/doc.go
diff --git a/services/device/internal/impl/daemonreap/impl_test.go b/services/device/deviced/internal/impl/daemonreap/impl_test.go
similarity index 84%
rename from services/device/internal/impl/daemonreap/impl_test.go
rename to services/device/deviced/internal/impl/daemonreap/impl_test.go
index dd72081..5f0ed8f 100644
--- a/services/device/internal/impl/daemonreap/impl_test.go
+++ b/services/device/deviced/internal/impl/daemonreap/impl_test.go
@@ -7,7 +7,7 @@
import (
"testing"
- "v.io/x/ref/services/device/internal/impl/utiltest"
+ "v.io/x/ref/services/device/deviced/internal/impl/utiltest"
)
func TestMain(m *testing.M) {
diff --git a/services/device/internal/impl/daemonreap/instance_reaping_kill_test.go b/services/device/deviced/internal/impl/daemonreap/instance_reaping_kill_test.go
similarity index 98%
rename from services/device/internal/impl/daemonreap/instance_reaping_kill_test.go
rename to services/device/deviced/internal/impl/daemonreap/instance_reaping_kill_test.go
index 32216e6..c2383f6 100644
--- a/services/device/internal/impl/daemonreap/instance_reaping_kill_test.go
+++ b/services/device/deviced/internal/impl/daemonreap/instance_reaping_kill_test.go
@@ -13,7 +13,7 @@
"v.io/v23/services/device"
"v.io/x/ref"
- "v.io/x/ref/services/device/internal/impl/utiltest"
+ "v.io/x/ref/services/device/deviced/internal/impl/utiltest"
"v.io/x/ref/services/internal/servicetest"
)
diff --git a/services/device/internal/impl/daemonreap/persistent_daemon_kill_test.go b/services/device/deviced/internal/impl/daemonreap/persistent_daemon_kill_test.go
similarity index 97%
rename from services/device/internal/impl/daemonreap/persistent_daemon_kill_test.go
rename to services/device/deviced/internal/impl/daemonreap/persistent_daemon_kill_test.go
index 11c21d6..58f511f 100644
--- a/services/device/internal/impl/daemonreap/persistent_daemon_kill_test.go
+++ b/services/device/deviced/internal/impl/daemonreap/persistent_daemon_kill_test.go
@@ -14,7 +14,7 @@
"v.io/v23/services/device"
"v.io/x/ref"
- "v.io/x/ref/services/device/internal/impl/utiltest"
+ "v.io/x/ref/services/device/deviced/internal/impl/utiltest"
"v.io/x/ref/services/internal/servicetest"
)
diff --git a/services/device/internal/impl/daemonreap/race0_test.go b/services/device/deviced/internal/impl/daemonreap/race0_test.go
similarity index 100%
rename from services/device/internal/impl/daemonreap/race0_test.go
rename to services/device/deviced/internal/impl/daemonreap/race0_test.go
diff --git a/services/device/internal/impl/daemonreap/race_test.go b/services/device/deviced/internal/impl/daemonreap/race_test.go
similarity index 100%
rename from services/device/internal/impl/daemonreap/race_test.go
rename to services/device/deviced/internal/impl/daemonreap/race_test.go
diff --git a/services/device/internal/impl/device_service.go b/services/device/deviced/internal/impl/device_service.go
similarity index 100%
rename from services/device/internal/impl/device_service.go
rename to services/device/deviced/internal/impl/device_service.go
diff --git a/services/device/internal/impl/dispatcher.go b/services/device/deviced/internal/impl/dispatcher.go
similarity index 97%
rename from services/device/internal/impl/dispatcher.go
rename to services/device/deviced/internal/impl/dispatcher.go
index c972ec1..5cd449e 100644
--- a/services/device/internal/impl/dispatcher.go
+++ b/services/device/deviced/internal/impl/dispatcher.go
@@ -72,6 +72,11 @@
deviceSuffix = "device"
configSuffix = "cfg"
+ // TODO(caprita): the value of pkgPath corresponds to the previous
+ // package where the error ids were defined. Updating error ids needs
+ // to be carefully coordinated between clients and servers, so we should
+ // do it when we settle on the final location for these error
+ // definitions.
pkgPath = "v.io/x/ref/services/device/internal/impl"
)
diff --git a/services/device/internal/impl/globsuid/args_darwin_test.go b/services/device/deviced/internal/impl/globsuid/args_darwin_test.go
similarity index 100%
rename from services/device/internal/impl/globsuid/args_darwin_test.go
rename to services/device/deviced/internal/impl/globsuid/args_darwin_test.go
diff --git a/services/device/internal/impl/globsuid/args_linux_test.go b/services/device/deviced/internal/impl/globsuid/args_linux_test.go
similarity index 100%
rename from services/device/internal/impl/globsuid/args_linux_test.go
rename to services/device/deviced/internal/impl/globsuid/args_linux_test.go
diff --git a/services/device/internal/impl/globsuid/doc.go b/services/device/deviced/internal/impl/globsuid/doc.go
similarity index 100%
rename from services/device/internal/impl/globsuid/doc.go
rename to services/device/deviced/internal/impl/globsuid/doc.go
diff --git a/services/device/internal/impl/globsuid/glob_test.go b/services/device/deviced/internal/impl/globsuid/glob_test.go
similarity index 97%
rename from services/device/internal/impl/globsuid/glob_test.go
rename to services/device/deviced/internal/impl/globsuid/glob_test.go
index ee3b5d8..166761c 100644
--- a/services/device/internal/impl/globsuid/glob_test.go
+++ b/services/device/deviced/internal/impl/globsuid/glob_test.go
@@ -9,8 +9,8 @@
"syscall"
"testing"
- "v.io/x/ref/services/device/internal/impl"
- "v.io/x/ref/services/device/internal/impl/utiltest"
+ "v.io/x/ref/services/device/deviced/internal/impl"
+ "v.io/x/ref/services/device/deviced/internal/impl/utiltest"
"v.io/x/ref/services/internal/servicetest"
"v.io/x/ref/test"
)
diff --git a/services/device/internal/impl/globsuid/impl_test.go b/services/device/deviced/internal/impl/globsuid/impl_test.go
similarity index 84%
rename from services/device/internal/impl/globsuid/impl_test.go
rename to services/device/deviced/internal/impl/globsuid/impl_test.go
index 820a15e..783a31f 100644
--- a/services/device/internal/impl/globsuid/impl_test.go
+++ b/services/device/deviced/internal/impl/globsuid/impl_test.go
@@ -7,7 +7,7 @@
import (
"testing"
- "v.io/x/ref/services/device/internal/impl/utiltest"
+ "v.io/x/ref/services/device/deviced/internal/impl/utiltest"
)
func TestMain(m *testing.M) {
diff --git a/services/device/internal/impl/globsuid/signature_match_test.go b/services/device/deviced/internal/impl/globsuid/signature_match_test.go
similarity index 97%
rename from services/device/internal/impl/globsuid/signature_match_test.go
rename to services/device/deviced/internal/impl/globsuid/signature_match_test.go
index 5426c1b..bab4cc8 100644
--- a/services/device/internal/impl/globsuid/signature_match_test.go
+++ b/services/device/deviced/internal/impl/globsuid/signature_match_test.go
@@ -18,9 +18,9 @@
"v.io/v23/services/device"
"v.io/v23/services/repository"
"v.io/v23/verror"
+ "v.io/x/ref/services/device/deviced/internal/impl"
+ "v.io/x/ref/services/device/deviced/internal/impl/utiltest"
"v.io/x/ref/services/device/internal/errors"
- "v.io/x/ref/services/device/internal/impl"
- "v.io/x/ref/services/device/internal/impl/utiltest"
"v.io/x/ref/services/internal/binarylib"
"v.io/x/ref/services/internal/servicetest"
"v.io/x/ref/test"
diff --git a/services/device/internal/impl/globsuid/suid_test.go b/services/device/deviced/internal/impl/globsuid/suid_test.go
similarity index 98%
rename from services/device/internal/impl/globsuid/suid_test.go
rename to services/device/deviced/internal/impl/globsuid/suid_test.go
index b101c1c..010cfcd 100644
--- a/services/device/internal/impl/globsuid/suid_test.go
+++ b/services/device/deviced/internal/impl/globsuid/suid_test.go
@@ -18,8 +18,8 @@
"v.io/v23/security/access"
"v.io/v23/services/device"
"v.io/v23/verror"
- "v.io/x/ref/services/device/internal/impl"
- "v.io/x/ref/services/device/internal/impl/utiltest"
+ "v.io/x/ref/services/device/deviced/internal/impl"
+ "v.io/x/ref/services/device/deviced/internal/impl/utiltest"
"v.io/x/ref/services/internal/servicetest"
"v.io/x/ref/test"
"v.io/x/ref/test/testutil"
diff --git a/services/device/internal/impl/helper_manager.go b/services/device/deviced/internal/impl/helper_manager.go
similarity index 100%
rename from services/device/internal/impl/helper_manager.go
rename to services/device/deviced/internal/impl/helper_manager.go
diff --git a/services/device/internal/impl/impl_helper_test.go b/services/device/deviced/internal/impl/impl_helper_test.go
similarity index 92%
rename from services/device/internal/impl/impl_helper_test.go
rename to services/device/deviced/internal/impl/impl_helper_test.go
index 5d150dd..f500671 100644
--- a/services/device/internal/impl/impl_helper_test.go
+++ b/services/device/deviced/internal/impl/impl_helper_test.go
@@ -15,8 +15,8 @@
"v.io/v23/context"
"v.io/x/ref/internal/logger"
- "v.io/x/ref/services/device/internal/impl"
- "v.io/x/ref/services/device/internal/impl/utiltest"
+ "v.io/x/ref/services/device/deviced/internal/impl"
+ "v.io/x/ref/services/device/deviced/internal/impl/utiltest"
)
func TestBaseCleanupDir(t *testing.T) {
diff --git a/services/device/internal/impl/impl_test.go b/services/device/deviced/internal/impl/impl_test.go
similarity index 98%
rename from services/device/internal/impl/impl_test.go
rename to services/device/deviced/internal/impl/impl_test.go
index bfa74ef..98fcb30 100644
--- a/services/device/internal/impl/impl_test.go
+++ b/services/device/deviced/internal/impl/impl_test.go
@@ -21,11 +21,11 @@
"v.io/v23/services/application"
"v.io/v23/services/device"
"v.io/x/ref"
+ "v.io/x/ref/services/device/deviced/internal/impl"
+ "v.io/x/ref/services/device/deviced/internal/impl/utiltest"
+ "v.io/x/ref/services/device/deviced/internal/installer"
"v.io/x/ref/services/device/internal/config"
"v.io/x/ref/services/device/internal/errors"
- "v.io/x/ref/services/device/internal/impl"
- "v.io/x/ref/services/device/internal/impl/utiltest"
- "v.io/x/ref/services/device/internal/installer"
"v.io/x/ref/services/internal/binarylib"
"v.io/x/ref/services/internal/servicetest"
"v.io/x/ref/test"
diff --git a/services/device/internal/impl/instance_reaping.go b/services/device/deviced/internal/impl/instance_reaping.go
similarity index 100%
rename from services/device/internal/impl/instance_reaping.go
rename to services/device/deviced/internal/impl/instance_reaping.go
diff --git a/services/device/internal/impl/only_for_test.go b/services/device/deviced/internal/impl/only_for_test.go
similarity index 100%
rename from services/device/internal/impl/only_for_test.go
rename to services/device/deviced/internal/impl/only_for_test.go
diff --git a/services/device/internal/impl/perms/debug_perms_test.go b/services/device/deviced/internal/impl/perms/debug_perms_test.go
similarity index 99%
rename from services/device/internal/impl/perms/debug_perms_test.go
rename to services/device/deviced/internal/impl/perms/debug_perms_test.go
index e643c12..5affa34 100644
--- a/services/device/internal/impl/perms/debug_perms_test.go
+++ b/services/device/deviced/internal/impl/perms/debug_perms_test.go
@@ -16,7 +16,7 @@
"v.io/v23/services/permissions"
"v.io/v23/verror"
- "v.io/x/ref/services/device/internal/impl/utiltest"
+ "v.io/x/ref/services/device/deviced/internal/impl/utiltest"
"v.io/x/ref/services/internal/servicetest"
"v.io/x/ref/test/testutil"
)
diff --git a/services/device/internal/impl/perms/doc.go b/services/device/deviced/internal/impl/perms/doc.go
similarity index 100%
rename from services/device/internal/impl/perms/doc.go
rename to services/device/deviced/internal/impl/perms/doc.go
diff --git a/services/device/internal/impl/perms/impl_test.go b/services/device/deviced/internal/impl/perms/impl_test.go
similarity index 84%
rename from services/device/internal/impl/perms/impl_test.go
rename to services/device/deviced/internal/impl/perms/impl_test.go
index 37a5102..a6ac9ad 100644
--- a/services/device/internal/impl/perms/impl_test.go
+++ b/services/device/deviced/internal/impl/perms/impl_test.go
@@ -7,7 +7,7 @@
import (
"testing"
- "v.io/x/ref/services/device/internal/impl/utiltest"
+ "v.io/x/ref/services/device/deviced/internal/impl/utiltest"
)
func TestMain(m *testing.M) {
diff --git a/services/device/internal/impl/perms/perms_test.go b/services/device/deviced/internal/impl/perms/perms_test.go
similarity index 98%
rename from services/device/internal/impl/perms/perms_test.go
rename to services/device/deviced/internal/impl/perms/perms_test.go
index 856d2a7..22cc971 100644
--- a/services/device/internal/impl/perms/perms_test.go
+++ b/services/device/deviced/internal/impl/perms/perms_test.go
@@ -16,9 +16,9 @@
"v.io/v23/security/access"
"v.io/v23/services/device"
"v.io/v23/verror"
+ "v.io/x/ref/services/device/deviced/internal/impl"
+ "v.io/x/ref/services/device/deviced/internal/impl/utiltest"
"v.io/x/ref/services/device/internal/errors"
- "v.io/x/ref/services/device/internal/impl"
- "v.io/x/ref/services/device/internal/impl/utiltest"
"v.io/x/ref/services/internal/servicetest"
"v.io/x/ref/test"
"v.io/x/ref/test/testutil"
diff --git a/services/device/internal/impl/perms_propagator.go b/services/device/deviced/internal/impl/perms_propagator.go
similarity index 100%
rename from services/device/internal/impl/perms_propagator.go
rename to services/device/deviced/internal/impl/perms_propagator.go
diff --git a/services/device/internal/impl/profile.go b/services/device/deviced/internal/impl/profile.go
similarity index 100%
rename from services/device/internal/impl/profile.go
rename to services/device/deviced/internal/impl/profile.go
diff --git a/services/device/internal/impl/proxy_invoker.go b/services/device/deviced/internal/impl/proxy_invoker.go
similarity index 100%
rename from services/device/internal/impl/proxy_invoker.go
rename to services/device/deviced/internal/impl/proxy_invoker.go
diff --git a/services/device/internal/impl/proxy_invoker_test.go b/services/device/deviced/internal/impl/proxy_invoker_test.go
similarity index 100%
rename from services/device/internal/impl/proxy_invoker_test.go
rename to services/device/deviced/internal/impl/proxy_invoker_test.go
diff --git a/services/device/internal/impl/reaping/doc.go b/services/device/deviced/internal/impl/reaping/doc.go
similarity index 100%
rename from services/device/internal/impl/reaping/doc.go
rename to services/device/deviced/internal/impl/reaping/doc.go
diff --git a/services/device/internal/impl/reaping/impl_test.go b/services/device/deviced/internal/impl/reaping/impl_test.go
similarity index 84%
rename from services/device/internal/impl/reaping/impl_test.go
rename to services/device/deviced/internal/impl/reaping/impl_test.go
index 66d1c4e..9db563f 100644
--- a/services/device/internal/impl/reaping/impl_test.go
+++ b/services/device/deviced/internal/impl/reaping/impl_test.go
@@ -7,7 +7,7 @@
import (
"testing"
- "v.io/x/ref/services/device/internal/impl/utiltest"
+ "v.io/x/ref/services/device/deviced/internal/impl/utiltest"
)
func TestMain(m *testing.M) {
diff --git a/services/device/internal/impl/reaping/instance_reaping_test.go b/services/device/deviced/internal/impl/reaping/instance_reaping_test.go
similarity index 97%
rename from services/device/internal/impl/reaping/instance_reaping_test.go
rename to services/device/deviced/internal/impl/reaping/instance_reaping_test.go
index 55ed52f..009050c 100644
--- a/services/device/internal/impl/reaping/instance_reaping_test.go
+++ b/services/device/deviced/internal/impl/reaping/instance_reaping_test.go
@@ -14,8 +14,8 @@
"v.io/v23/services/device"
"v.io/x/ref"
- "v.io/x/ref/services/device/internal/impl"
- "v.io/x/ref/services/device/internal/impl/utiltest"
+ "v.io/x/ref/services/device/deviced/internal/impl"
+ "v.io/x/ref/services/device/deviced/internal/impl/utiltest"
"v.io/x/ref/services/internal/servicetest"
)
diff --git a/services/device/internal/impl/restart_policy.go b/services/device/deviced/internal/impl/restart_policy.go
similarity index 100%
rename from services/device/internal/impl/restart_policy.go
rename to services/device/deviced/internal/impl/restart_policy.go
diff --git a/services/device/internal/impl/restart_policy_test.go b/services/device/deviced/internal/impl/restart_policy_test.go
similarity index 100%
rename from services/device/internal/impl/restart_policy_test.go
rename to services/device/deviced/internal/impl/restart_policy_test.go
diff --git a/services/device/internal/impl/shell_darwin.go b/services/device/deviced/internal/impl/shell_darwin.go
similarity index 100%
rename from services/device/internal/impl/shell_darwin.go
rename to services/device/deviced/internal/impl/shell_darwin.go
diff --git a/services/device/internal/impl/shell_linux.go b/services/device/deviced/internal/impl/shell_linux.go
similarity index 100%
rename from services/device/internal/impl/shell_linux.go
rename to services/device/deviced/internal/impl/shell_linux.go
diff --git a/services/device/internal/impl/tidyup.go b/services/device/deviced/internal/impl/tidyup.go
similarity index 100%
rename from services/device/internal/impl/tidyup.go
rename to services/device/deviced/internal/impl/tidyup.go
diff --git a/services/device/internal/impl/util.go b/services/device/deviced/internal/impl/util.go
similarity index 100%
rename from services/device/internal/impl/util.go
rename to services/device/deviced/internal/impl/util.go
diff --git a/services/device/internal/impl/utiltest/app.go b/services/device/deviced/internal/impl/utiltest/app.go
similarity index 100%
rename from services/device/internal/impl/utiltest/app.go
rename to services/device/deviced/internal/impl/utiltest/app.go
diff --git a/services/device/internal/impl/utiltest/helpers.go b/services/device/deviced/internal/impl/utiltest/helpers.go
similarity index 99%
rename from services/device/internal/impl/utiltest/helpers.go
rename to services/device/deviced/internal/impl/utiltest/helpers.go
index edcd261..be18494 100644
--- a/services/device/internal/impl/utiltest/helpers.go
+++ b/services/device/deviced/internal/impl/utiltest/helpers.go
@@ -34,7 +34,7 @@
"v.io/x/ref/internal/logger"
"v.io/x/ref/lib/xrpc"
_ "v.io/x/ref/runtime/factories/roaming"
- "v.io/x/ref/services/device/internal/impl"
+ "v.io/x/ref/services/device/deviced/internal/impl"
"v.io/x/ref/services/internal/binarylib"
"v.io/x/ref/services/internal/servicetest"
"v.io/x/ref/test"
diff --git a/services/device/internal/impl/utiltest/mock_repo.go b/services/device/deviced/internal/impl/utiltest/mock_repo.go
similarity index 98%
rename from services/device/internal/impl/utiltest/mock_repo.go
rename to services/device/deviced/internal/impl/utiltest/mock_repo.go
index 4d1ddf5..c096d6d 100644
--- a/services/device/internal/impl/utiltest/mock_repo.go
+++ b/services/device/deviced/internal/impl/utiltest/mock_repo.go
@@ -105,7 +105,7 @@
// BINARY REPOSITORY INTERFACE IMPLEMENTATION
// TODO(toddw): Move the errors from dispatcher.go into a common location.
-const pkgPath = "v.io/x/ref/services/device/internal/impl/utiltest"
+const pkgPath = "v.io/x/ref/services/device/deviced/internal/impl/utiltest"
var ErrOperationFailed = verror.Register(pkgPath+".OperationFailed", verror.NoRetry, "")
diff --git a/services/device/internal/impl/utiltest/modules.go b/services/device/deviced/internal/impl/utiltest/modules.go
similarity index 97%
rename from services/device/internal/impl/utiltest/modules.go
rename to services/device/deviced/internal/impl/utiltest/modules.go
index ee029dd..a3d327c 100644
--- a/services/device/internal/impl/utiltest/modules.go
+++ b/services/device/deviced/internal/impl/utiltest/modules.go
@@ -15,9 +15,9 @@
"v.io/v23/rpc"
"v.io/x/ref/internal/logger"
"v.io/x/ref/lib/signals"
+ "v.io/x/ref/services/device/deviced/internal/impl"
+ "v.io/x/ref/services/device/deviced/internal/starter"
"v.io/x/ref/services/device/internal/config"
- "v.io/x/ref/services/device/internal/impl"
- "v.io/x/ref/services/device/internal/starter"
"v.io/x/ref/services/device/internal/suid"
"v.io/x/ref/test"
"v.io/x/ref/test/modules"
diff --git a/services/device/internal/installer/device_installer.go b/services/device/deviced/internal/installer/device_installer.go
similarity index 99%
rename from services/device/internal/installer/device_installer.go
rename to services/device/deviced/internal/installer/device_installer.go
index 3ca9638..8d5007d 100644
--- a/services/device/internal/installer/device_installer.go
+++ b/services/device/deviced/internal/installer/device_installer.go
@@ -53,8 +53,8 @@
"v.io/v23/naming"
"v.io/v23/services/application"
"v.io/x/ref"
+ "v.io/x/ref/services/device/deviced/internal/impl"
"v.io/x/ref/services/device/internal/config"
- "v.io/x/ref/services/device/internal/impl"
"v.io/x/ref/services/device/internal/sysinit"
)
diff --git a/services/device/internal/starter/starter.go b/services/device/deviced/internal/starter/starter.go
similarity index 98%
rename from services/device/internal/starter/starter.go
rename to services/device/deviced/internal/starter/starter.go
index 2123c6e..2a5b857 100644
--- a/services/device/internal/starter/starter.go
+++ b/services/device/deviced/internal/starter/starter.go
@@ -24,13 +24,13 @@
"v.io/x/ref/lib/xrpc"
"v.io/x/ref/runtime/factories/roaming"
"v.io/x/ref/services/debug/debuglib"
+ "v.io/x/ref/services/device/deviced/internal/impl"
"v.io/x/ref/services/device/internal/config"
- "v.io/x/ref/services/device/internal/impl"
"v.io/x/ref/services/internal/pathperms"
"v.io/x/ref/services/mounttable/mounttablelib"
)
-const pkgPath = "v.io/x/ref/services/device/internal/starter"
+const pkgPath = "v.io/x/ref/services/device/deviced/internal/starter"
var (
errCantSaveInfo = verror.Register(pkgPath+".errCantSaveInfo", verror.NoRetry, "{1:}{2:} failed to save info{:_}")
diff --git a/services/device/deviced/server.go b/services/device/deviced/server.go
index 79cff6d..d659743 100644
--- a/services/device/deviced/server.go
+++ b/services/device/deviced/server.go
@@ -24,8 +24,8 @@
"v.io/x/ref/lib/mgmt"
"v.io/x/ref/lib/signals"
_ "v.io/x/ref/runtime/factories/roaming"
+ "v.io/x/ref/services/device/deviced/internal/starter"
"v.io/x/ref/services/device/internal/config"
- "v.io/x/ref/services/device/internal/starter"
)
const pkgPath = "v.io/x/ref/services/device/deviced"
