From 3bc24e2acfdf4e474d481a45e4ea8f93df333f08 Mon Sep 17 00:00:00 2001 From: Daniel Prilik Date: Thu, 21 Jan 2021 12:51:44 -0500 Subject: [PATCH] bump aziot submodule --- edgelet/aziot | 2 +- edgelet/iotedge/src/check/mod.rs | 2 +- edgelet/iotedge/src/init/import/mod.rs | 10 +++++----- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/edgelet/aziot b/edgelet/aziot index 75633f15533..3043cafb91d 160000 --- a/edgelet/aziot +++ b/edgelet/aziot @@ -1 +1 @@ -Subproject commit 75633f155333a96730c33534d5a7fed311e7f501 +Subproject commit 3043cafb91d9343d64b5d548ae27c6c017412dc2 diff --git a/edgelet/iotedge/src/check/mod.rs b/edgelet/iotedge/src/check/mod.rs index 10bf42b6619..1e91d25fe4d 100644 --- 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 index e958db3f2be..eb2336ff910 100644 --- 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(),