bump aziot submodule

Azure · Jan 21, 2021 · 3bc24e2 · 3bc24e2
1 parent 835f9fa
commit 3bc24e2
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/edgelet/aziot b/edgelet/aziot
diff --git a/edgelet/iotedge/src/check/mod.rs b/edgelet/iotedge/src/check/mod.rs
@@ -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 {

diff --git a/edgelet/iotedge/src/init/import/mod.rs b/edgelet/iotedge/src/init/import/mod.rs
@@ -268,7 +268,7 @@ fn execute_inner(
                     ),
             }) => (
                 aziot_identityd_config::Provisioning {
-                    dynamic_reprovisioning: *dynamic_reprovisioning,
+                    always_reprovision_on_startup: *dynamic_reprovisioning,
                     provisioning: aziot_identityd_config::ProvisioningType::Manual {
                         iothub_hostname: hostname.clone(),
                         device_id: device_id.clone(),
@@ -295,7 +295,7 @@ fn execute_inner(
                     }),
             }) => (
                 aziot_identityd_config::Provisioning {
-                    dynamic_reprovisioning: *dynamic_reprovisioning,
+                    always_reprovision_on_startup: *dynamic_reprovisioning,
                     provisioning: aziot_identityd_config::ProvisioningType::Manual {
                         iothub_hostname: iothub_hostname.clone(),
                         device_id: device_id.clone(),
@@ -334,7 +334,7 @@ fn execute_inner(
                 always_reprovision_on_startup: _,
             }) => (
                 aziot_identityd_config::Provisioning {
-                    dynamic_reprovisioning: *dynamic_reprovisioning,
+                    always_reprovision_on_startup: *dynamic_reprovisioning,
                     provisioning: aziot_identityd_config::ProvisioningType::Dps {
                         global_endpoint: global_endpoint.to_string(),
                         scope_id: scope_id.clone(),
@@ -364,7 +364,7 @@ fn execute_inner(
                 always_reprovision_on_startup: _,
             }) => (
                 aziot_identityd_config::Provisioning {
-                    dynamic_reprovisioning: *dynamic_reprovisioning,
+                    always_reprovision_on_startup: *dynamic_reprovisioning,
                     provisioning: aziot_identityd_config::ProvisioningType::Dps {
                         global_endpoint: global_endpoint.to_string(),
                         scope_id: scope_id.clone(),
@@ -404,7 +404,7 @@ fn execute_inner(
                 always_reprovision_on_startup: _,
             }) => (
                 aziot_identityd_config::Provisioning {
-                    dynamic_reprovisioning: *dynamic_reprovisioning,
+                    always_reprovision_on_startup: *dynamic_reprovisioning,
                     provisioning: aziot_identityd_config::ProvisioningType::Dps {
                         global_endpoint: global_endpoint.to_string(),
                         scope_id: scope_id.clone(),
+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