Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update upload blob sample to use MQTT #2482

Merged
merged 7 commits into from
May 5, 2023
Merged

Update upload blob sample to use MQTT #2482

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
50cbcd8
Update upload blob sample to use MQTT
ericwolz May 4, 2023
f919de5
fix py urllib3
ericwolz May 4, 2023
3dd39fe
fix py requests version
ericwolz May 4, 2023
f5cb671
fixed py urllib3
ericwolz May 4, 2023
0011027
removed py req test
ericwolz May 4, 2023
f4b6a72
requests to version 2.29
ericwolz May 4, 2023
e2e8291
Merge branch 'main' into ericwol/mqtt_upload
ericwolz May 4, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions doc/setting_up_vcpkg.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ The most recent [portfile.cmake](https://github.com/microsoft/vcpkg/blob/master/
```powershell
# Install azure-iot-sdk-c package with integration
.\vcpkg.exe integrate install
.\vcpkg.exe install azure-iot-sdk-c
.\vcpkg.exe install azure-iot-sdk-c:x64-windows
popd

# Open the Azure IoT C SDK telemetry sample solution for Visual Studio.
Expand All @@ -50,10 +50,10 @@ The most recent [portfile.cmake](https://github.com/microsoft/vcpkg/blob/master/

```powershell
# Install azure-iot-sdk-c package
.\vcpkg.exe install azure-iot-sdk-c
.\vcpkg.exe install azure-iot-sdk-c:x64-windows

# Export nuget package locally
.\vcpkg.exe export azure-iot-sdk-c --nuget
.\vcpkg.exe export azure-iot-sdk-c:x64-windows --nuget
popd

# Open the Azure IoT C SDK telemetry sample solution for Visual Studio.
Expand Down
4 changes: 2 additions & 2 deletions ..._client/samples/iothub_client_sample_upload_to_blob/iothub_client_sample_upload_to_blob.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ and removing calls to _DoWork will yield the same results. */

#include "azure_c_shared_utility/shared_util_options.h"
#include "iothub_message.h"
#include "iothubtransporthttp.h"
#include "iothubtransportmqtt.h"

#ifdef SET_TRUSTED_CERT_IN_SAMPLES
#include "certs.h"
Expand All @@ -45,7 +45,7 @@ int main(void)
(void)IoTHub_Init();
(void)printf("Starting the IoTHub client sample upload to blob...\r\n");

device_ll_handle = IoTHubDeviceClient_LL_CreateFromConnectionString(connectionString, HTTP_Protocol);
device_ll_handle = IoTHubDeviceClient_LL_CreateFromConnectionString(connectionString, MQTT_Protocol);
ericwolz marked this conversation as resolved.
Show resolved Hide resolved
if (device_ll_handle == NULL)
{
(void)printf("Failure creating IotHub device. Hint: Check your connection string.\r\n");
Expand Down
4 changes: 2 additions & 2 deletions ...t/samples/iothub_client_sample_upload_to_blob_mb/iothub_client_sample_upload_to_blob_mb.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ and removing calls to _DoWork will yield the same results. */
#include "iothub.h"
#include "iothub_device_client_ll.h"
#include "iothub_message.h"
#include "iothubtransporthttp.h"
#include "iothubtransportmqtt.h"

#ifdef SET_TRUSTED_CERT_IN_SAMPLES
#include "certs.h"
Expand Down Expand Up @@ -96,7 +96,7 @@ int main(void)
(void)IoTHub_Init();
(void)printf("Starting the IoTHub client sample upload to blob with multiple blocks...\r\n");

device_ll_handle = IoTHubDeviceClient_LL_CreateFromConnectionString(connectionString, HTTP_Protocol);
device_ll_handle = IoTHubDeviceClient_LL_CreateFromConnectionString(connectionString, MQTT_Protocol);
ericwolz marked this conversation as resolved.
Show resolved Hide resolved
if (device_ll_handle == NULL)
{
(void)printf("Failure creating IotHub device. Hint: Check your connection string.\r\n");
Expand Down
4 changes: 2 additions & 2 deletions jenkins/raspberrypi/pyscripts/requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
docker>=6.0.0
requests>=2.27.1
requests>=2.27.1,<2.29.0
colorama>=0.4.4
urllib3>=1.26.8
urllib3>=1.26.8,<2.0.0
six>=1.16.0