Merge branch 'main' into feature/graphql_graphdb

.devcontainer/devcontainersetup.sh

@@ -2,8 +2,7 @@
 # This script is to be executed on creation of the dev container in order to create a working development enviornment
 WORKSPACE=/workspaces/unifiednamespace
 # 1. setup the python enviornment
-pip3 install --upgrade poetry 
-poetry run pip install --upgrade pip poetry 
+pip3 install --upgrade poetry pip
 poetry install
 
 # 2. create minimalistic secret files for all the modules. 
@@ -147,7 +146,7 @@ fi
 
 # 2.5 Merge the secret configurations of the other modules for graphQL service to successfully integrate with the back ends
 # always created
-INPUT_FILES=$(find . -type f -not -path "$WORKSPACE/07_uns_graphql/*" -name ".secrets.yaml")
+INPUT_FILES=$(find $WORKSPACE -type f -not -path "$WORKSPACE/07_uns_graphql/*" -name ".secrets.yaml")
 
 # Define the output file
 OUTPUT_FILE=$WORKSPACE/07_uns_graphql/conf/.secrets.yaml

02_mqtt-cluster/README.md

@@ -34,7 +34,7 @@ Where in:
 
 1. **Step 1**: Download or install protoc. Refer
     * [Installing on Linux/MacOs](https://grpc.io/docs/protoc-installation/)
-    * [Install pre-compiled version](https://github.com/protocolbuffers/protobuf/releases). This project currently is using version  [Protocol Buffers v27.3](https://github.com/protocolbuffers/protobuf/releases/tag/v27.3)
+    * [Install pre-compiled version](https://github.com/protocolbuffers/protobuf/releases). This project currently is using version  [Protocol Buffers v28.0](https://github.com/protocolbuffers/protobuf/releases/tag/v28.0)
     and downloaded the pre-compiled versions for  linux-x86_64 and win64. For other platforms please replace with the appropriate runtime or compile the runtime directly
 1. **Step 2**: Copy the [SparkPlugB protocol buffer specification](https://github.com/eclipse/tahu/tree/master/sparkplug_b/sparkplug_b.proto) from [Eclipse Tahu project](https://github.com/eclipse/tahu/tree/master/sparkplug_b) to the folder [./sparkplug_b](./sparkplug_b/)
 1. **Step 3**: Compile the SparkplugB protocol buffer into python class by the following command
@@ -235,11 +235,11 @@ poetry run pytest  test/
 
 1. The protoc executable for [Linux](./protobuf/bin/protoc) is for x86_64  architecture and will need execute rights to be able to run and compile the [sparkplug_b.proto](./sparkplug_b/sparkplug_b.proto) specification.
    The protoc executable for [Windows](./protobuf/bin/protoc.exe) is for a 64 bit processor.
-   For other architectures please download the appropriate pre compiled version of [Protobuf release v27.3](https://github.com/protocolbuffers/protobuf/releases/tag/v27.3) e.g.
-    * [protoc-27.3-linux-aarch_64.zip](https://github.com/protocolbuffers/protobuf/releases/download/v27.3/protoc-27.3-linux-aarch_64.zip)
-    * [protoc-27.3-linux-ppcle_64.zip](https://github.com/protocolbuffers/protobuf/releases/download/v27.3/protoc-27.3-linux-ppcle_64.zip)
-    * [protoc-27.3-linux-x86_32.zip](https://github.com/protocolbuffers/protobuf/releases/download/v27.3/protoc-27.3-linux-x86_32.zip)
-    * [protoc-27.3-win32.zip](https://github.com/protocolbuffers/protobuf/releases/download/v27.3/protoc-27.3-win32.zip)
+   For other architectures please download the appropriate pre compiled version of [Protobuf release v28.0](https://github.com/protocolbuffers/protobuf/releases/tag/v28.0) e.g.
+    * [protoc-28.0-linux-aarch_64.zip](https://github.com/protocolbuffers/protobuf/releases/download/v28.0/protoc-28.0-linux-aarch_64.zip)
+    * [protoc-28.0-linux-ppcle_64.zip](https://github.com/protocolbuffers/protobuf/releases/download/v28.0/protoc-28.0-linux-ppcle_64.zip)
+    * [protoc-28.0-linux-x86_32.zip](https://github.com/protocolbuffers/protobuf/releases/download/v28.0/protoc-28.0-linux-x86_32.zip)
+    * [protoc-28.0-win32.zip](https://github.com/protocolbuffers/protobuf/releases/download/v28.0/protoc-28.0-win32.zip)
 
 1. Need to understand how to handle metric types DataSet, Template
 

02_mqtt-cluster/protobuf/include/google/protobuf/cpp_features.proto

@@ -24,7 +24,6 @@ message CppFeatures {
     retention = RETENTION_RUNTIME,
     targets = TARGET_TYPE_FIELD,
     targets = TARGET_TYPE_FILE,
-    // TODO Enable this in google3 once protoc rolls out.
     feature_support = {
       edition_introduced: EDITION_2023,
       edition_deprecated: EDITION_2023,
@@ -33,7 +32,7 @@ message CppFeatures {
                            "edition 2025.  Mark enum type on the enum "
                            "definitions themselves rather than on fields.",
     },
-    edition_defaults = { edition: EDITION_PROTO2, value: "true" },
+    edition_defaults = { edition: EDITION_LEGACY, value: "true" },
     edition_defaults = { edition: EDITION_PROTO3, value: "false" }
   ];
 
@@ -48,11 +47,10 @@ message CppFeatures {
     retention = RETENTION_RUNTIME,
     targets = TARGET_TYPE_FIELD,
     targets = TARGET_TYPE_FILE,
-    // TODO Enable this in google3 once protoc rolls out.
     feature_support = {
       edition_introduced: EDITION_2023,
     },
-    edition_defaults = { edition: EDITION_PROTO2, value: "STRING" },
+    edition_defaults = { edition: EDITION_LEGACY, value: "STRING" },
     edition_defaults = { edition: EDITION_2024, value: "VIEW" }
   ];
 }

02_mqtt-cluster/protobuf/include/google/protobuf/descriptor.proto

@@ -635,13 +635,14 @@ message MessageOptions {
 }
 
 message FieldOptions {
+  // NOTE: ctype is deprecated. Use `features.(pb.cpp).string_type` instead.
   // The ctype option instructs the C++ code generator to use a different
   // representation of the field than it normally would.  See the specific
   // options below.  This option is only implemented to support use of
   // [ctype=CORD] and [ctype=STRING] (the default) on non-repeated fields of
-  // type "bytes" in the open source release -- sorry, we'll try to include
-  // other types in a future version!
-  optional CType ctype = 1 [default = STRING];
+  // type "bytes" in the open source release.
+  // TODO: make ctype actually deprecated.
+  optional CType ctype = 1 [/*deprecated = true,*/ default = STRING];
   enum CType {
     // Default mode.
     STRING = 0;
@@ -974,11 +975,10 @@ message FeatureSet {
     retention = RETENTION_RUNTIME,
     targets = TARGET_TYPE_FIELD,
     targets = TARGET_TYPE_FILE,
-    // TODO Enable this in google3 once protoc rolls out.
     feature_support = {
       edition_introduced: EDITION_2023,
     },
-    edition_defaults = { edition: EDITION_PROTO2, value: "EXPLICIT" },
+    edition_defaults = { edition: EDITION_LEGACY, value: "EXPLICIT" },
     edition_defaults = { edition: EDITION_PROTO3, value: "IMPLICIT" },
     edition_defaults = { edition: EDITION_2023, value: "EXPLICIT" }
   ];
@@ -992,11 +992,10 @@ message FeatureSet {
     retention = RETENTION_RUNTIME,
     targets = TARGET_TYPE_ENUM,
     targets = TARGET_TYPE_FILE,
-    // TODO Enable this in google3 once protoc rolls out.
     feature_support = {
       edition_introduced: EDITION_2023,
     },
-    edition_defaults = { edition: EDITION_PROTO2, value: "CLOSED" },
+    edition_defaults = { edition: EDITION_LEGACY, value: "CLOSED" },
     edition_defaults = { edition: EDITION_PROTO3, value: "OPEN" }
   ];
 
@@ -1009,11 +1008,10 @@ message FeatureSet {
     retention = RETENTION_RUNTIME,
     targets = TARGET_TYPE_FIELD,
     targets = TARGET_TYPE_FILE,
-    // TODO Enable this in google3 once protoc rolls out.
     feature_support = {
       edition_introduced: EDITION_2023,
     },
-    edition_defaults = { edition: EDITION_PROTO2, value: "EXPANDED" },
+    edition_defaults = { edition: EDITION_LEGACY, value: "EXPANDED" },
     edition_defaults = { edition: EDITION_PROTO3, value: "PACKED" }
   ];
 
@@ -1027,11 +1025,10 @@ message FeatureSet {
     retention = RETENTION_RUNTIME,
     targets = TARGET_TYPE_FIELD,
     targets = TARGET_TYPE_FILE,
-    // TODO Enable this in google3 once protoc rolls out.
     feature_support = {
       edition_introduced: EDITION_2023,
     },
-    edition_defaults = { edition: EDITION_PROTO2, value: "NONE" },
+    edition_defaults = { edition: EDITION_LEGACY, value: "NONE" },
     edition_defaults = { edition: EDITION_PROTO3, value: "VERIFY" }
   ];
 
@@ -1044,11 +1041,10 @@ message FeatureSet {
     retention = RETENTION_RUNTIME,
     targets = TARGET_TYPE_FIELD,
     targets = TARGET_TYPE_FILE,
-    // TODO Enable this in google3 once protoc rolls out.
     feature_support = {
       edition_introduced: EDITION_2023,
     },
-    edition_defaults = { edition: EDITION_PROTO2, value: "LENGTH_PREFIXED" }
+    edition_defaults = { edition: EDITION_LEGACY, value: "LENGTH_PREFIXED" }
   ];
 
   enum JsonFormat {
@@ -1061,11 +1057,10 @@ message FeatureSet {
     targets = TARGET_TYPE_MESSAGE,
     targets = TARGET_TYPE_ENUM,
     targets = TARGET_TYPE_FILE,
-    // TODO Enable this in google3 once protoc rolls out.
     feature_support = {
       edition_introduced: EDITION_2023,
     },
-    edition_defaults = { edition: EDITION_PROTO2, value: "LEGACY_BEST_EFFORT" },
+    edition_defaults = { edition: EDITION_LEGACY, value: "LEGACY_BEST_EFFORT" },
     edition_defaults = { edition: EDITION_PROTO3, value: "ALLOW" }
   ];
 

02_mqtt-cluster/protobuf/include/google/protobuf/java_features.proto

@@ -27,7 +27,6 @@ message JavaFeatures {
     retention = RETENTION_RUNTIME,
     targets = TARGET_TYPE_FIELD,
     targets = TARGET_TYPE_FILE,
-    // TODO Enable this in google3 once protoc rolls out.
     feature_support = {
       edition_introduced: EDITION_2023,
       edition_deprecated: EDITION_2023,
@@ -36,7 +35,7 @@ message JavaFeatures {
                            "edition 2025.  Mark enum type on the enum "
                            "definitions themselves rather than on fields.",
     },
-    edition_defaults = { edition: EDITION_PROTO2, value: "true" },
+    edition_defaults = { edition: EDITION_LEGACY, value: "true" },
     edition_defaults = { edition: EDITION_PROTO3, value: "false" }
   ];
 
@@ -56,7 +55,6 @@ message JavaFeatures {
     retention = RETENTION_RUNTIME,
     targets = TARGET_TYPE_FIELD,
     targets = TARGET_TYPE_FILE,
-    // TODO Enable this in google3 once protoc rolls out.
     feature_support = {
       edition_introduced: EDITION_2023,
       edition_deprecated: EDITION_2024,
@@ -66,6 +64,6 @@ message JavaFeatures {
                            "use the global cross-language utf8_validation "
                            "feature.",
     },
-    edition_defaults = { edition: EDITION_PROTO2, value: "DEFAULT" }
+    edition_defaults = { edition: EDITION_LEGACY, value: "DEFAULT" }
   ];
 }

02_mqtt-cluster/protobuf/protobuf.version

@@ -1 +1 @@
-v27.3
+v28.0

02_mqtt-cluster/pyproject.toml

@@ -28,15 +28,15 @@ packages = [
 python = "^3.12"
 logger = "^1.4"
 paho-mqtt = "^2.1.0"
-protobuf = "^5.27"
+protobuf = "^5.28"
 
 [tool.poetry.group.test.dependencies]
-pytest = "^8.2.1"
+pytest = "^8.3.3"
 pytest-xdist = { version="^3.6.1",extras =["psutil2"]}
 pytest-timeout = "^2.3.1" 
 pytest-cov = "^5.0.0"
-safety = "^3.2.4"
-ruff = "^0.5.6"
+safety = "^3.2.7"
+ruff = "^0.6.7"
 
 
 [build-system]