Remove C# Cloud Connector and Restructure cloud_connectors directory

.github/workflows/dotnet-ci.yml

@@ -29,13 +29,9 @@ jobs:
           key: ${{ runner.os }}-nuget-${{ hashFiles('**/packages.lock.json') }}
           restore-keys: |
             ${{ runner.os }}-nuget
-      - name: Build Digital Twins Connector
-        run: ./cloud_connectors/azure/digital_twins_connector/build.sh
       - name: Build MQTT Connector's Azure Function
         run: |
-          dotnet build cloud_connectors/azure/mqtt_connector/azure_function/src/function.csproj -warnaserror
-          dotnet build cloud_connectors/azure/mqtt_connector/azure_function/tests/MQTTConnectorAzureFunction.Tests.csproj -warnaserror
-      - name: Digital Twins Connector Tests
-        run: dotnet test cloud_connectors/azure/digital_twins_connector/tests/**/*.csproj
+          dotnet build cloud_connectors/resources/azure_function/src/function.csproj -warnaserror
+          dotnet build cloud_connectors/resources/azure_function/tests/MQTTConnectorAzureFunction.Tests.csproj -warnaserror
       - name: MQTT Connector's Azure Function Tests
-        run: dotnet test cloud_connectors/azure/mqtt_connector/azure_function/tests/MQTTConnectorAzureFunction.Tests.csproj
+        run: dotnet test cloud_connectors/resources/azure_function/tests/MQTTConnectorAzureFunction.Tests.csproj

.github/workflows/markdown-ci.yml

@@ -28,5 +28,5 @@ jobs:
     steps:
     - uses: actions/checkout@v2
     - run: |
-        npm install markdown-link-check
+        npm install markdown-link-check@3.11.2
         find . -type d \( -name node_modules -o -name .github \) -prune -o -type f -name '*.md' -print0 | xargs -0 -n1 node_modules/.bin/markdown-link-check --config ./tools/.markdownlinkcheck.json --quiet

.github/workflows/security-audit.yml

@@ -21,11 +21,15 @@ jobs:
           submodules: recursive
       - name: Install Rust toolchain
         uses: ./.github/actions/install-rust-toolchain
+      # Ignored advisories:
+      # - https://rustsec.org/advisories/RUSTSEC-2024-0320 : yaml-rust is unmaintained
+      #   - This is a dependency of the config crate, which does not have a version without yaml-rust.
+      #     See https://github.com/mehcode/config-rs/issues/473 and https://github.com/eclipse-ibeji/ibeji-example-applications/issues/61
       - name: Cargo audit
         uses: actions-rs/cargo@v1
         with:
           command: audit
-          args: --deny warnings
+          args: --deny warnings --ignore RUSTSEC-2024-0320
 
   security_audit_csharp:
     runs-on: ubuntu-latest
@@ -56,9 +60,7 @@ jobs:
         uses: github/codeql-action/init@v2
         with:
           languages: ${{ matrix.language }}
-      - name: Build Digital Twins Connector
-        run: ./cloud_connectors/azure/digital_twins_connector/build.sh
       - name: Build MQTT Connector's Azure Function
-        run: dotnet build cloud_connectors/azure/mqtt_connector/azure_function/src/function.csproj
+        run: dotnet build cloud_connectors/resources/azure_function/src/function.csproj
       - name: Perform CodeQL Analysis
         uses: github/codeql-action/analyze@v2

Cargo.toml

@@ -6,30 +6,22 @@
 # The default resolver for workspaces is different than for regular packages, so use v2 to avoid warnings
 resolver = "2"
 members = [
-    "cloud_connectors/azure/mqtt_connector",
-    "cloud_connectors/azure/proto-build",
-    "freyja_adapters/cloud/azure_cloud_connector_adapter",
+    "cloud_connectors/mqtt_connector",
     "freyja_apps/e2e",
     "freyja_apps/ibeji_integration",
     "freyja_apps/in_memory",
 ]
 
 [workspace.dependencies]
 # Local dependencies
-azure-cloud-connector-adapter = { path = "freyja_adapters/cloud/azure_cloud_connector_adapter" }
-azure-cloud-connector-proto = { path = "cloud_connectors/azure/proto-build" }
 
 # ESDV dependencies
 # Versioning is managed by the Cargo.lock file rather than copying rev properties to all of these
 
-## Ibeji
-core-protobuf-data-access = { git = "https://github.com/eclipse-ibeji/ibeji" }
-
 ## Freyja
 cloud-connector-proto = { git = "https://github.com/eclipse-ibeji/freyja" }
 file-service-discovery-adapter = { git = "https://github.com/eclipse-ibeji/freyja" }
 freyja = { git = "https://github.com/eclipse-ibeji/freyja" }
-freyja-build-common = { git = "https://github.com/eclipse-ibeji/freyja" }
 freyja-common = { git = "https://github.com/eclipse-ibeji/freyja" }
 grpc-cloud-adapter = { git = "https://github.com/eclipse-ibeji/freyja" }
 grpc-digital-twin-adapter = { git = "https://github.com/eclipse-ibeji/freyja" }
@@ -43,9 +35,6 @@ managed-subscribe-data-adapter = { git = "https://github.com/eclipse-ibeji/freyj
 mqtt-data-adapter = { git = "https://github.com/eclipse-ibeji/freyja" }
 proc-macros = { git = "https://github.com/eclipse-ibeji/freyja" }
 
-## Chariott
-service_discovery_proto = { git = "https://github.com/eclipse-chariott/chariott" }
-
 # Cargo dependencies
 async-trait = "0.1.77"
 env_logger = "0.11.3"
@@ -55,12 +44,7 @@ paho-mqtt = "0.12.1"
 prost = "0.12.3"
 serde = "1.0.197"
 serde_json = "1.0.114"
-strum = "0.26.1"
-strum_macros = "0.26.2"
-tempfile = "3.10.1"
 time = "0.3.34"
 tokio = "1.36.0"
-tokio-stream = "0.1.14"
 tonic = "0.11.0"
-tonic-build = "0.11.0"
-tower = "0.4.13"
+tonic-build = "0.11.0"

README.md

@@ -17,7 +17,6 @@ Coming soon!
 The Freyja examples include:
 
 - [Example Freyja Apps](./freyja_apps/): These are examples of how to write a Freyja application using its plugin model. Each example has a README describing its usage, and the `template` app can be used to get started with your own adapters.
-- [Example Freyja Adapters](./freyja_adapters/): These are examples of adapters that can be used with Freyja. Each adapter has a README describing its usage.
 - [Example Cloud Connectors](./cloud_connectors/): These are examples of cloud connectors that Freyja can interface with through the `CloudAdapter` trait. These serve as examples of how to integrate with specific cloud solutions.
 
 ### Supported Ibeji Samples