diff --git a/garnet/bin/BUILD.gn b/garnet/bin/BUILD.gn
index acf243fad994065be7ef57064d441663773a1ced..c1bdb932d8e3241aa3dd24282bd6a318c961f08e 100644
--- a/garnet/bin/BUILD.gn
+++ b/garnet/bin/BUILD.gn
@@ -7,7 +7,6 @@ group("bin") {
deps = [
"a11y",
"appmgr",
- "auth",
"catapult_converter",
"chrealm",
"cmc",
diff --git a/garnet/bin/auth/BUILD.gn b/garnet/bin/auth/BUILD.gn
deleted file mode 100644
index 7640099f6410eb4f2fa9722507f2dfe0fd0530c0..0000000000000000000000000000000000000000
--- a/garnet/bin/auth/BUILD.gn
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 2017 The Fuchsia Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-import("//build/package.gni")
-import("//build/testing/environments.gni")
-
-group("auth") {
- testonly = true
-
- public_deps = [
- ":auth_bin_tests",
- ]
-}
-
-package("auth_bin_tests") {
- testonly = true
-
- deps = [
- "testing/dev_auth_provider:dev_auth_provider",
- "testing/dev_auth_provider_iotid:dev_auth_provider_iotid",
- ]
-
- tests = [
- {
- name = "dev_auth_provider_bin_test"
- environments = basic_envs
- },
- {
- name = "dev_auth_provider_iotid_bin_test"
- environments = basic_envs
- },
- ]
-}
diff --git a/garnet/bin/auth/testing/BUILD.gn b/garnet/bin/auth/testing/BUILD.gn
deleted file mode 100644
index ec5df86fc7bce23948fd0daf535675ff306315c0..0000000000000000000000000000000000000000
--- a/garnet/bin/auth/testing/BUILD.gn
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 2018 The Fuchsia Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-import("//build/package.gni")
-
-group("testing") {
- testonly = true
- deps = [
- ":dev_auth_providers",
- "dev_auth_provider",
- "dev_auth_provider_iotid",
- ]
-}
-
-package("dev_auth_providers") {
- testonly = true
- deps = [
- "dev_auth_provider",
- "dev_auth_provider_iotid",
- ]
-
- binaries = [
- {
- name = "dev_auth_provider"
- },
- {
- name = "dev_auth_provider_iotid"
- },
- ]
-
- meta = [
- {
- path = rebase_path("meta/dev_auth_provider.cmx")
- dest = "dev_auth_provider.cmx"
- },
- {
- path = rebase_path("meta/dev_auth_provider_iotid.cmx")
- dest = "dev_auth_provider_iotid.cmx"
- },
- ]
-}
diff --git a/garnet/bin/auth/tests/token_manager_integration/dev_token_mgr_test.cc b/garnet/bin/auth/tests/token_manager_integration/dev_token_mgr_test.cc
index 813b5c68a744c837f65864e07ed2475c0cdd725b..9081b548222d8d711d77b7dd09b6c648d5f098ee 100644
--- a/garnet/bin/auth/tests/token_manager_integration/dev_token_mgr_test.cc
+++ b/garnet/bin/auth/tests/token_manager_integration/dev_token_mgr_test.cc
@@ -47,12 +47,12 @@ const bool kForce = true;
const TestComponentParam kTestComponentParams[] = {
{{kDevIdp,
- "fuchsia-pkg://fuchsia.com/dev_auth_providers#"
+ "fuchsia-pkg://fuchsia.com/dev_auth_provider#"
"meta/dev_auth_provider.cmx"},
"fuchsia-pkg://fuchsia.com/token_manager_factory#"
"meta/token_manager_factory.cmx"},
{{kDevIotIDIdp,
- "fuchsia-pkg://fuchsia.com/dev_auth_providers#"
+ "fuchsia-pkg://fuchsia.com/dev_auth_provider_iotid#"
"meta/dev_auth_provider_iotid.cmx"},
"fuchsia-pkg://fuchsia.com/token_manager_factory#"
"meta/token_manager_factory.cmx"}};
diff --git a/garnet/packages/tests/BUILD.gn b/garnet/packages/tests/BUILD.gn
index 8fec8554948ca0cf3721b80d5df953d7f481cc80..1b1d44d9248cdb95f1c6d08112e29f7367d9794b 100644
--- a/garnet/packages/tests/BUILD.gn
+++ b/garnet/packages/tests/BUILD.gn
@@ -203,11 +203,11 @@ group("feedback_agent") {
group("auth") {
testonly = true
public_deps = [
- "//garnet/bin/auth:auth_bin_tests",
- "//garnet/bin/auth/testing:dev_auth_providers",
"//garnet/bin/auth/tests/account_manager_integration:account_manager_integration_test_pkg",
"//garnet/bin/auth/tests/token_manager_integration:token_manager_integration_tests",
"//garnet/packages/prod:auth",
+ "//src/identity/bin/dev_auth_provider",
+ "//src/identity/bin/dev_auth_provider_iotid",
]
}
diff --git a/peridot/bin/basemgr/session_user_provider_impl.cc b/peridot/bin/basemgr/session_user_provider_impl.cc
index 1872e9ece5a786db848f9cd6a22bac6714fc0641..8b9d998fb6386eb08f7423c7d0ec7a73e70f2067 100644
--- a/peridot/bin/basemgr/session_user_provider_impl.cc
+++ b/peridot/bin/basemgr/session_user_provider_impl.cc
@@ -22,7 +22,7 @@ constexpr char kSessionUserProviderAppUrl[] = "session_user_provider_url";
// Dev auth provider configuration
constexpr char kDevAuthProviderType[] = "dev";
constexpr char kDevAuthProviderUrl[] =
- "fuchsia-pkg://fuchsia.com/dev_auth_providers#meta/"
+ "fuchsia-pkg://fuchsia.com/dev_auth_provider#meta/"
"dev_auth_provider.cmx";
// Google auth provider configuration
diff --git a/src/identity/bin/BUILD.gn b/src/identity/bin/BUILD.gn
index 82aaa90e715ea531b6558ce9920c01a408ba4df8..cf9cc6c5a5773d0a318b4c7953b096169fcc8330 100644
--- a/src/identity/bin/BUILD.gn
+++ b/src/identity/bin/BUILD.gn
@@ -21,22 +21,32 @@ group("tests") {
test_package("identity_bin_unittests") {
deps = [
- "google_auth_provider:google_auth_provider_unittests",
"account_handler:bin",
"account_manager:bin",
+ "dev_auth_provider:bin",
+ "dev_auth_provider_iotid:bin",
+ "google_auth_provider:google_auth_provider_unittests",
]
tests = [
+ {
+ name = "account_handler_bin_test"
+ environments = basic_envs
+ },
{
- name = "google_auth_provider_unittests"
+ name = "account_manager_bin_test"
environments = basic_envs
},
{
- name = "account_handler_bin_test"
+ name = "dev_auth_provider_bin_test"
environments = basic_envs
},
{
- name = "account_manager_bin_test"
+ name = "dev_auth_provider_iotid_bin_test"
+ environments = basic_envs
+ },
+ {
+ name = "google_auth_provider_unittests"
environments = basic_envs
},
]
diff --git a/src/identity/bin/account_manager/src/main.rs b/src/identity/bin/account_manager/src/main.rs
index abfc16e132e4f94c1c0b5b259ca184f0c859a2ad..aadd407a89f65728b8b1246bc6202ce813f8c90e 100644
--- a/src/identity/bin/account_manager/src/main.rs
+++ b/src/identity/bin/account_manager/src/main.rs
@@ -53,7 +53,7 @@ lazy_static! {
static ref DEV_AUTH_PROVIDER_CONFIG: Vec<AuthProviderConfig> = {
vec![AuthProviderConfig {
auth_provider_type: "dev_auth_provider".to_string(),
- url: "fuchsia-pkg://fuchsia.com/dev_auth_providers#meta/dev_auth_provider.cmx"
+ url: "fuchsia-pkg://fuchsia.com/dev_auth_provider#meta/dev_auth_provider.cmx"
.to_string(),
params: None
}]
diff --git a/garnet/bin/auth/testing/dev_auth_provider/BUILD.gn b/src/identity/bin/dev_auth_provider/BUILD.gn
similarity index 69%
rename from garnet/bin/auth/testing/dev_auth_provider/BUILD.gn
rename to src/identity/bin/dev_auth_provider/BUILD.gn
index 4f6685c8e80c20b150aae2a60beffcb7f26468dc..bb4dcc0cfc4e9f0da6eb7090d9360bd4e8007a02 100644
--- a/garnet/bin/auth/testing/dev_auth_provider/BUILD.gn
+++ b/src/identity/bin/dev_auth_provider/BUILD.gn
@@ -2,9 +2,11 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
+import("//build/package.gni")
import("//build/rust/rustc_binary.gni")
-rustc_binary("dev_auth_provider") {
+rustc_binary("bin") {
+ name = "dev_auth_provider"
with_unit_tests = true
edition = "2018"
@@ -21,3 +23,18 @@ rustc_binary("dev_auth_provider") {
"//third_party/rust_crates:rand",
]
}
+
+package("dev_auth_provider") {
+ deps = [
+ ":bin",
+ ]
+
+ binary = "rust_crates/dev_auth_provider"
+
+ meta = [
+ {
+ path = rebase_path("meta/dev_auth_provider.cmx")
+ dest = "dev_auth_provider.cmx"
+ },
+ ]
+}
diff --git a/garnet/bin/auth/testing/meta/dev_auth_provider.cmx b/src/identity/bin/dev_auth_provider/meta/dev_auth_provider.cmx
similarity index 70%
rename from garnet/bin/auth/testing/meta/dev_auth_provider.cmx
rename to src/identity/bin/dev_auth_provider/meta/dev_auth_provider.cmx
index 0f55eb0539febcd8b84b4906efdd5a8567759e4b..2994d32fc1e2c6a37c053d38ce86069636173a37 100644
--- a/garnet/bin/auth/testing/meta/dev_auth_provider.cmx
+++ b/src/identity/bin/dev_auth_provider/meta/dev_auth_provider.cmx
@@ -1,6 +1,6 @@
{
"program": {
- "binary": "bin/dev_auth_provider"
+ "binary": "bin/app"
},
"sandbox": {
"services": [ "fuchsia.logger.LogSink" ]
diff --git a/garnet/bin/auth/testing/dev_auth_provider/src/dev_auth_provider.rs b/src/identity/bin/dev_auth_provider/src/dev_auth_provider.rs
similarity index 100%
rename from garnet/bin/auth/testing/dev_auth_provider/src/dev_auth_provider.rs
rename to src/identity/bin/dev_auth_provider/src/dev_auth_provider.rs
diff --git a/garnet/bin/auth/testing/dev_auth_provider/src/dev_auth_provider_factory.rs b/src/identity/bin/dev_auth_provider/src/dev_auth_provider_factory.rs
similarity index 100%
rename from garnet/bin/auth/testing/dev_auth_provider/src/dev_auth_provider_factory.rs
rename to src/identity/bin/dev_auth_provider/src/dev_auth_provider_factory.rs
diff --git a/garnet/bin/auth/testing/dev_auth_provider/src/main.rs b/src/identity/bin/dev_auth_provider/src/main.rs
similarity index 100%
rename from garnet/bin/auth/testing/dev_auth_provider/src/main.rs
rename to src/identity/bin/dev_auth_provider/src/main.rs
diff --git a/garnet/bin/auth/testing/dev_auth_provider_iotid/BUILD.gn b/src/identity/bin/dev_auth_provider_iotid/BUILD.gn
similarity index 67%
rename from garnet/bin/auth/testing/dev_auth_provider_iotid/BUILD.gn
rename to src/identity/bin/dev_auth_provider_iotid/BUILD.gn
index 984503461996a83c54ecfb74d62fcecd4c105608..2e241f052c776d8ccaa006652bc04f0db25161a2 100644
--- a/garnet/bin/auth/testing/dev_auth_provider_iotid/BUILD.gn
+++ b/src/identity/bin/dev_auth_provider_iotid/BUILD.gn
@@ -2,9 +2,11 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
+import("//build/package.gni")
import("//build/rust/rustc_binary.gni")
-rustc_binary("dev_auth_provider_iotid") {
+rustc_binary("bin") {
+ name = "dev_auth_provider_iotid"
with_unit_tests = true
edition = "2018"
@@ -21,3 +23,18 @@ rustc_binary("dev_auth_provider_iotid") {
"//third_party/rust_crates:rand",
]
}
+
+package("dev_auth_provider_iotid") {
+ deps = [
+ ":bin",
+ ]
+
+ binary = "rust_crates/dev_auth_provider_iotid"
+
+ meta = [
+ {
+ path = rebase_path("meta/dev_auth_provider_iotid.cmx")
+ dest = "dev_auth_provider_iotid.cmx"
+ },
+ ]
+}
diff --git a/garnet/bin/auth/testing/meta/dev_auth_provider_iotid.cmx b/src/identity/bin/dev_auth_provider_iotid/meta/dev_auth_provider_iotid.cmx
similarity index 67%
rename from garnet/bin/auth/testing/meta/dev_auth_provider_iotid.cmx
rename to src/identity/bin/dev_auth_provider_iotid/meta/dev_auth_provider_iotid.cmx
index 340be09463774582cf863d020423b9f005dcb0b3..2994d32fc1e2c6a37c053d38ce86069636173a37 100644
--- a/garnet/bin/auth/testing/meta/dev_auth_provider_iotid.cmx
+++ b/src/identity/bin/dev_auth_provider_iotid/meta/dev_auth_provider_iotid.cmx
@@ -1,6 +1,6 @@
{
"program": {
- "binary": "bin/dev_auth_provider_iotid"
+ "binary": "bin/app"
},
"sandbox": {
"services": [ "fuchsia.logger.LogSink" ]
diff --git a/garnet/bin/auth/testing/dev_auth_provider_iotid/src/dev_auth_provider_iotid.rs b/src/identity/bin/dev_auth_provider_iotid/src/dev_auth_provider_iotid.rs
similarity index 100%
rename from garnet/bin/auth/testing/dev_auth_provider_iotid/src/dev_auth_provider_iotid.rs
rename to src/identity/bin/dev_auth_provider_iotid/src/dev_auth_provider_iotid.rs
diff --git a/garnet/bin/auth/testing/dev_auth_provider_iotid/src/dev_auth_provider_iotid_factory.rs b/src/identity/bin/dev_auth_provider_iotid/src/dev_auth_provider_iotid_factory.rs
similarity index 100%
rename from garnet/bin/auth/testing/dev_auth_provider_iotid/src/dev_auth_provider_iotid_factory.rs
rename to src/identity/bin/dev_auth_provider_iotid/src/dev_auth_provider_iotid_factory.rs
diff --git a/garnet/bin/auth/testing/dev_auth_provider_iotid/src/main.rs b/src/identity/bin/dev_auth_provider_iotid/src/main.rs
similarity index 100%
rename from garnet/bin/auth/testing/dev_auth_provider_iotid/src/main.rs
rename to src/identity/bin/dev_auth_provider_iotid/src/main.rs
diff --git a/src/identity/bin/meta/dev_auth_provider_bin_test.cmx b/src/identity/bin/meta/dev_auth_provider_bin_test.cmx
new file mode 100644
index 0000000000000000000000000000000000000000..b1ec2b23b24282d84872c6ec33c7a1d5433fc3ae
--- /dev/null
+++ b/src/identity/bin/meta/dev_auth_provider_bin_test.cmx
@@ -0,0 +1,7 @@
+{
+ "program": {
+ "binary": "test/dev_auth_provider_bin_test"
+ },
+ "sandbox": {
+ }
+}
diff --git a/src/identity/bin/meta/dev_auth_provider_iotid_bin_test.cmx b/src/identity/bin/meta/dev_auth_provider_iotid_bin_test.cmx
new file mode 100644
index 0000000000000000000000000000000000000000..d703a36e1c02356a4b761413f1a057dc549e5f2a
--- /dev/null
+++ b/src/identity/bin/meta/dev_auth_provider_iotid_bin_test.cmx
@@ -0,0 +1,7 @@
+{
+ "program": {
+ "binary": "test/dev_auth_provider_iotid_bin_test"
+ },
+ "sandbox": {
+ }
+}