Skip to content

Commit

Permalink
bump aziot submodule
Browse files Browse the repository at this point in the history
  • Loading branch information
@daprilik
daprilik committed Jan 21, 2021
1 parent 835f9fa commit bb2e0a7
Show file tree
Hide file tree
Showing 14 changed files with 22 additions and 25 deletions.
2 changes: 1 addition & 1 deletion edgelet/aziot
Submodule aziot updated 42 files
+248 −31 Cargo.lock
+2 −0 Cargo.toml
+1 −1 Makefile
+72 −50 aziot/src/check_list.rs
+2 −2 aziot/src/init.rs
+1 −1 aziot/test-files/init/dps-symmetric-key/identityd.toml
+1 −1 aziot/test-files/init/dps-tpm/identityd.toml
+1 −1 aziot/test-files/init/dps-x509-pkcs11-est-bootstrap/identityd.toml
+1 −1 aziot/test-files/init/dps-x509-pkcs11-est/identityd.toml
+1 −1 aziot/test-files/init/dps-x509-pkcs11-localca/identityd.toml
+1 −1 aziot/test-files/init/dps-x509-pkcs11/identityd.toml
+1 −1 aziot/test-files/init/dps-x509/identityd.toml
+1 −1 aziot/test-files/init/manual-connection-string/identityd.toml
+1 −1 aziot/test-files/init/manual-symmetric-key/identityd.toml
+1 −1 aziot/test-files/init/manual-x509-pkcs11/identityd.toml
+1 −1 aziot/test-files/init/manual-x509/identityd.toml
+1 −1 aziotd/Cargo.toml
+3 −6 aziotd/src/error.rs
+25 −141 aziotd/src/main.rs
+2 −0 cert/aziot-certd/src/lib.rs
+1 −1 ci/e2e-tests.sh
+11 −0 config-common/Cargo.toml
+47 −0 config-common/src/error.rs
+168 −0 config-common/src/lib.rs
+36 −0 contrib/third-party-notices.sh
+2 −2 http-common/src/connector.rs
+3 −3 identity/aziot-identity-common/src/lib.rs
+7 −7 identity/aziot-identityd-config/src/lib.rs
+1 −1 identity/aziot-identityd-config/test/good_sas_config.toml
+3 −1 identity/aziot-identityd/Cargo.toml
+1 −2 identity/aziot-identityd/config/unix/default.toml
+3 −3 identity/aziot-identityd/src/auth/authentication.rs
+2 −3 identity/aziot-identityd/src/auth/authorization.rs
+4 −1 identity/aziot-identityd/src/auth/mod.rs
+36 −20 identity/aziot-identityd/src/configext.rs
+5 −0 identity/aziot-identityd/src/error.rs
+4 −1 identity/aziot-identityd/src/http/reprovision_device.rs
+397 −1 identity/aziot-identityd/src/identity.rs
+177 −515 identity/aziot-identityd/src/lib.rs
+1 −1 identity/aziot-identityd/test/good_auth_settings.toml
+2 −0 key/aziot-keyd/src/lib.rs
+2 −0 tpm/aziot-tpmd/src/lib.rs
2 changes: 1 addition & 1 deletion edgelet/iotedge/src/check/mod.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -222,7 +222,7 @@ impl Check {
{
let aziot_check_out = std::process::Command::new(aziot_bin)
.arg("check-list")
.arg("--json")
.arg("--output=json")
.output();

match aziot_check_out {
Expand Down
21 changes: 9 additions & 12 deletions edgelet/iotedge/src/init/import/mod.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -253,7 +253,7 @@ fn execute_inner(
) = {
let old_config::Provisioning {
provisioning,
dynamic_reprovisioning,
dynamic_reprovisioning: _,
} = provisioning;

match provisioning {
Expand All @@ -268,7 +268,7 @@ fn execute_inner(
),
}) => (
aziot_identityd_config::Provisioning {
dynamic_reprovisioning: *dynamic_reprovisioning,
always_reprovision_on_startup: true,
provisioning: aziot_identityd_config::ProvisioningType::Manual {
iothub_hostname: hostname.clone(),
device_id: device_id.clone(),
Expand All @@ -295,7 +295,7 @@ fn execute_inner(
}),
}) => (
aziot_identityd_config::Provisioning {
dynamic_reprovisioning: *dynamic_reprovisioning,
always_reprovision_on_startup: true,
provisioning: aziot_identityd_config::ProvisioningType::Manual {
iothub_hostname: iothub_hostname.clone(),
device_id: device_id.clone(),
Expand Down Expand Up @@ -330,11 +330,10 @@ fn execute_inner(
symmetric_key,
},
),
// TODO: Start migrating this when IS adds support for this flag
always_reprovision_on_startup: _,
always_reprovision_on_startup,
}) => (
aziot_identityd_config::Provisioning {
dynamic_reprovisioning: *dynamic_reprovisioning,
always_reprovision_on_startup: *always_reprovision_on_startup,
provisioning: aziot_identityd_config::ProvisioningType::Dps {
global_endpoint: global_endpoint.to_string(),
scope_id: scope_id.clone(),
Expand All @@ -360,11 +359,10 @@ fn execute_inner(
identity_cert,
identity_pk,
}),
// TODO: Start migrating this when IS adds support for this flag
always_reprovision_on_startup: _,
always_reprovision_on_startup,
}) => (
aziot_identityd_config::Provisioning {
dynamic_reprovisioning: *dynamic_reprovisioning,
always_reprovision_on_startup: *always_reprovision_on_startup,
provisioning: aziot_identityd_config::ProvisioningType::Dps {
global_endpoint: global_endpoint.to_string(),
scope_id: scope_id.clone(),
Expand Down Expand Up @@ -400,11 +398,10 @@ fn execute_inner(
old_config::AttestationMethod::Tpm(old_config::TpmAttestationInfo {
registration_id,
}),
// TODO: Start migrating this when IS adds support for this flag
always_reprovision_on_startup: _,
always_reprovision_on_startup,
}) => (
aziot_identityd_config::Provisioning {
dynamic_reprovisioning: *dynamic_reprovisioning,
always_reprovision_on_startup: *always_reprovision_on_startup,
provisioning: aziot_identityd_config::ProvisioningType::Dps {
global_endpoint: global_endpoint.to_string(),
scope_id: scope_id.clone(),
Expand Down
2 changes: 1 addition & 1 deletion edgelet/iotedge/test-files/init/import/ca-certs/identityd.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ hostname = "my-device"
homedir = "/var/lib/aziot/identityd"

[provisioning]
dynamic_reprovisioning = false
always_reprovision_on_startup = true
source = "manual"
iothub_hostname = "example.azure-devices.net"
device_id = "my-device"
Expand Down
2 changes: 1 addition & 1 deletion edgelet/iotedge/test-files/init/import/complex-agent-spec/identityd.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ hostname = "my-device"
homedir = "/var/lib/aziot/identityd"

[provisioning]
dynamic_reprovisioning = false
always_reprovision_on_startup = true
source = "manual"
iothub_hostname = "example.azure-devices.net"
device_id = "my-device"
Expand Down
2 changes: 1 addition & 1 deletion edgelet/iotedge/test-files/init/import/dps-symmetric-key/identityd.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ hostname = "my-device"
homedir = "/var/lib/aziot/identityd"

[provisioning]
dynamic_reprovisioning = true
always_reprovision_on_startup = true
source = "dps"
global_endpoint = "https://global.azure-devices-provisioning.net/"
scope_id = "0ab1234C5D6"
Expand Down
2 changes: 1 addition & 1 deletion edgelet/iotedge/test-files/init/import/dps-tpm/identityd.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ hostname = "my-device"
homedir = "/var/lib/aziot/identityd"

[provisioning]
dynamic_reprovisioning = true
always_reprovision_on_startup = true
source = "dps"
global_endpoint = "https://global.azure-devices-provisioning.net/"
scope_id = "0ab1234C5D6"
Expand Down
2 changes: 1 addition & 1 deletion edgelet/iotedge/test-files/init/import/dps-x509/identityd.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ hostname = "my-device"
homedir = "/var/lib/aziot/identityd"

[provisioning]
dynamic_reprovisioning = true
always_reprovision_on_startup = true
source = "dps"
global_endpoint = "https://global.azure-devices-provisioning.net/"
scope_id = "0ab1234C5D6"
Expand Down
2 changes: 1 addition & 1 deletion edgelet/iotedge/test-files/init/import/manual-connection-string-2/identityd.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ hostname = "my-device"
homedir = "/var/lib/aziot/identityd"

[provisioning]
dynamic_reprovisioning = false
always_reprovision_on_startup = true
source = "manual"
iothub_hostname = "example.azure-devices.net"
device_id = "my-device"
Expand Down
2 changes: 1 addition & 1 deletion edgelet/iotedge/test-files/init/import/manual-connection-string/identityd.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ hostname = "my-device"
homedir = "/var/lib/aziot/identityd"

[provisioning]
dynamic_reprovisioning = false
always_reprovision_on_startup = true
source = "manual"
iothub_hostname = "example.azure-devices.net"
device_id = "my-device"
Expand Down
2 changes: 1 addition & 1 deletion edgelet/iotedge/test-files/init/import/manual-x509/identityd.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ hostname = "my-device"
homedir = "/var/lib/aziot/identityd"

[provisioning]
dynamic_reprovisioning = true
always_reprovision_on_startup = true
source = "manual"
iothub_hostname = "example.azure-devices.net"
device_id = "my-device"
Expand Down
2 changes: 1 addition & 1 deletion edgelet/iotedge/test-files/init/import/moby-runtime-content-trust/identityd.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ hostname = "my-device"
homedir = "/var/lib/aziot/identityd"

[provisioning]
dynamic_reprovisioning = false
always_reprovision_on_startup = true
source = "manual"
iothub_hostname = "example.azure-devices.net"
device_id = "my-device"
Expand Down
2 changes: 1 addition & 1 deletion edgelet/iotedge/test-files/init/import/moby-runtime-network-2/identityd.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ hostname = "my-device"
homedir = "/var/lib/aziot/identityd"

[provisioning]
dynamic_reprovisioning = false
always_reprovision_on_startup = true
source = "manual"
iothub_hostname = "example.azure-devices.net"
device_id = "my-device"
Expand Down
2 changes: 1 addition & 1 deletion edgelet/iotedge/test-files/init/import/moby-runtime-network/identityd.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ hostname = "my-device"
homedir = "/var/lib/aziot/identityd"

[provisioning]
dynamic_reprovisioning = false
always_reprovision_on_startup = true
source = "manual"
iothub_hostname = "example.azure-devices.net"
device_id = "my-device"
Expand Down

0 comments on commit bb2e0a7

Please sign in to comment.