Merge pull request #107 from PelionIoT/update-client-4.13.2

Update client 4.13.2
PelionIoT · Dec 20, 2023 · 8ea4238 · 8ea4238
2 parents 5ec8687 + 209ec69
commit 8ea4238
Show file tree

Hide file tree

Showing 13 changed files with 52 additions and 18 deletions.
diff --git a/.github/workflows/devmode-test-build.yml b/.github/workflows/devmode-test-build.yml
@@ -21,12 +21,12 @@ jobs:
       EDGE_CONFIGS_DIR: scripts-internal/edge/edge-config/build-mbed-edge-devmode-test
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         name: checkout repo
         with:
           submodules: recursive
       - name: Check out scripts-internal repository code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           repository: PelionIoT/scripts-internal
           token: ${{ secrets.ACCESS_TOKEN }}

diff --git a/.github/workflows/misspell.yml b/.github/workflows/misspell.yml
@@ -11,7 +11,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Check out code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Run misspell (findings may not increase)
         if: always()
         run: |

diff --git a/.github/workflows/pr-check-tests.yml b/.github/workflows/pr-check-tests.yml
@@ -26,7 +26,7 @@ jobs:
         with:
           submodules: recursive
       - name: Check out scripts-internal repository code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           repository: PelionIoT/scripts-internal
           token: ${{ secrets.ACCESS_TOKEN }}
@@ -45,12 +45,12 @@ jobs:
       EDGE_CONFIGS_DIR: scripts-internal/edge/edge-config/build-mbed-edge-devmode-test
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         name: Checkout repo
         with:
           submodules: recursive
       - name: Check out scripts-internal repository code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           repository: PelionIoT/scripts-internal
           token: ${{ secrets.ACCESS_TOKEN }}

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,7 +1,12 @@
 # Changelog for Edge
 
-## Release 0.x.y
+## Release 0.21.1
+
+* Update mbed-cloud-client to version [4.13.2](https://github.com/PelionIoT/mbed-cloud-client/blob/4.13.2/CHANGELOG.md).
+* Update `cURL` to version 8.5.0 (from 7.87.0).
+* Update `Dockerfile` base image to Ubuntu 22.04 (from Ubuntu 20.04).
 * Fixed numerous small spelling mistakes pointed by `misspell`.
+
 ## Release 0.21.0
 
 * Update mbed-cloud-client to version 4.13.1.

diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:20.04
+FROM ubuntu:22.04
 
 ARG developer_certificate=./config/mbed_cloud_dev_credentials.c
 ARG update_certificate=./config/update_default_resources.c

diff --git a/Dockerfile.test b/Dockerfile.test
@@ -1,4 +1,4 @@
-FROM ubuntu:20.04
+FROM ubuntu:22.04
 
 WORKDIR /usr/src/app/mbed-edge
 

diff --git a/README.md b/README.md
@@ -493,4 +493,24 @@ make build-doc
 This generates the Doxygen documentation under `build-doc/doxygen` folder.
 Run for example: `firefox build-doc/doxygen/index.html &` to view them.
 
-NOTE! If you have a `snap`-based Firefox in use, it will not have access rights to show local files anymore.
+NOTE! If you have a `snap`-based Firefox in use, it will not have access rights to show local files by default.
+
+## Troubleshooting
+
+### mbed-edge will not start due port being taken
+
+```
+$ bin/edge-core 
+2023-12-11 11:42:06.302 tid:  20972 [ERR ][serv]: Couldn't bind to port 8080.
+2023-12-11 11:42:06.302 tid:  20972 [ERR ][serv]: Cannot create http server to port 8080.
+2023-12-11 11:42:06.302 tid:  20972 [ERR ][serv]: Could not create http server.
+```
+
+Someone else has taken port 8080. You can see who is taking the port with:
+```
+sudo lsof -i :8080 
+```
+
+Solutions:
+- Remove that other program using that same port.
+- Start mbed-edge to a different port than 8080 (`bin/mbed-edge --http-port <int>``).
diff --git a/edge-tool/README.md b/edge-tool/README.md
@@ -21,6 +21,15 @@ source ./edge-tool/bin/activate
 python3 setup.py install
 ```
 
+Please note that Yocto-builds work differently, they do not follow the `requirements.txt`. The Yocto builds bring in the Python-modules via recipes (version specific).
+
+## Run tests
+
+You can run the tests simply with `pytest``.
+```
+pytest -v
+```
+
 ### How to run
 
 The entry point for Edge tool is [edge_tool.py](./edge_tool.py).

diff --git a/edge-tool/requirements.txt b/edge-tool/requirements.txt
@@ -1,6 +1,6 @@
 docopt==0.6.2
 cbor2==5.4.6
 pyclibrary==0.2.1
-cryptography==39.0.1
+cryptography==41.0.7
 six==1.16.0
 pytest==7.1.3
diff --git a/edge-tool/setup.py b/edge-tool/setup.py
@@ -31,7 +31,7 @@
 
 setup(
     name="edge-tool",
-    version="0.21.0",
+    version="0.22.0",
     author="DM devops and sre",
     author_email="dmdevopsandsre@izumanetworks.com",
     packages=find_packages(),

diff --git a/lib/mbed-cloud-client b/lib/mbed-cloud-client
diff --git a/lib/mbedtls b/lib/mbedtls
diff --git a/lib/pal-platform/pal-platform.json b/lib/pal-platform/pal-platform.json
@@ -35,11 +35,11 @@
         "to": "Middleware/parsec_se_driver/parsec_se_driver"
       },
       "curl": {
-        "version": "7.87.0",
+        "version": "8.5.0",
         "from": {
           "protocol": "git",
           "location": "https://github.com/curl/curl.git",
-          "tag": "curl-7_87_0"
+          "tag": "curl-8_5_0"
         },
         "to": "Middleware/curl/curl"
       }
@@ -101,11 +101,11 @@
         "to": "Middleware/mbedtls/mbedtls"
       },
       "curl": {
-        "version": "7.87.0",
+        "version": "8.5.0",
         "from": {
           "protocol": "git",
           "location": "https://github.com/curl/curl.git",
-          "tag": "curl-7_87_0"
+          "tag": "curl-8.5_0"
         },
         "to": "Middleware/curl/curl"
       }