Merge branch 'master' into documentation

grafnu · Mar 1, 2024 · a7a9882 · a7a9882
2 parents fe24205 + fbbaf3f
commit a7a9882
Show file tree

Hide file tree

Showing 46 changed files with 2,998 additions and 363 deletions.
diff --git a/.gencode_hash.txt b/.gencode_hash.txt
@@ -2,10 +2,10 @@
 41c2bc68fc3b8151b6a504c8adfe47d7453b972a38e4e056238241ae12ad2859  gencode/docs/command_mapping.html
 81ba8b959b8ac79fe792eef5a4aaf984fcfbe3e7b94987556dd23a329dbaac5b  gencode/docs/config.html
 22bfb3fd7c0e73dac4cbd830aa7983714917ec6da813f6bf5768ce3aa9786fb2  gencode/docs/config_mapping.html
-e9f5572ab03a36aa926b5b0496fc58af03eca92b83271eafa3e2e65f7936f05b  gencode/docs/configuration_endpoint.html
-4ac793390f9a8e9bb6aa74f72265cd166fe185a426df7589b7bf56a5c409e3fd  gencode/docs/configuration_execution.html
-f7fc9ba938347df94df71bb3c5fee5aae3626de8eb7f5bdc36357c186b0f7b36  gencode/docs/configuration_pod.html
-e8c20a53a51febbeb7da3869b768635cb2030d3c690bf92cdb8516835f750664  gencode/docs/configuration_pubber.html
+a626529e7bbcfbe32e734585c342a300b26161afaab4565d6328726bfb1da7c2  gencode/docs/configuration_endpoint.html
+2ca2acaca1c68ff641a60873ed18e49416b2fe8419df88902b5eb9c248bb42e5  gencode/docs/configuration_execution.html
+b052fb2c7db24f398ade7a490230f40b8db7d3fd1ed06f081ec14998bcadb2de  gencode/docs/configuration_pod.html
+f8c01f4bf8a8dc13db3458d4f01ebec64c79417e76caa066f8279cd0fb7a062c  gencode/docs/configuration_pubber.html
 9a4c3876ca5dd7bbbec722a88cfbf99deef5eda23e62404259cad0a3bc242cfd  gencode/docs/event.html
 06e6f3a4d8de12d11fce0071baff640a9c4dc01d72d537557ed10b08eda4ccab  gencode/docs/event_discovery.html
 78f655972772f4bee92d88c3a26535612735c794837bfd6f479faeb2e8d8691e  gencode/docs/event_mapping.html
@@ -14,9 +14,10 @@ f849ebe1085d81fb0f16654b7c9d3d14c59b56b1c75154e100b85398694657fd  gencode/docs/e
 a4a99c4be9483e889c2d0d180d72d2ed332d587ac9305c7615da0e70fd55a56d  gencode/docs/event_validation.html
 61326830be577c3f594a8e7fb5c7f078be47fbcbef2f222e70d9e64517b12209  gencode/docs/metadata.html
 93bfecd5facd0ead4c75a90f350fa715e6fb8bdab71d81b1f3e46994f03c1c2e  gencode/docs/monitoring.html
-a300dd8e873610121d817385acbd16a75a914766ead0b0d798031d1ca0499ad4  gencode/docs/persistent_device.html
+96808a602a71cec03e205466f93e0a27c6bf642d08d70ea80dbe00a5adf61410  gencode/docs/persistent_device.html
 5d039d607af9ec75ee552dfe36b16c702687ea16f5663f41fc49b4533b86e00d  gencode/docs/properties.html
-1766f84518a315fe57e4a4bf934c0a386ad61d87091754a6bab097c686c16019  gencode/docs/readme.md
+9b4413e13e835bc4f76d6f74e7a6935eb58255ca95d499256a6ee6c37d3afc49  gencode/docs/query_cloud.html
+3ad206c2afce110cdeb0bc5bb13cd959a2d7016ca40caec6fcc544a451469af4  gencode/docs/readme.md
 741b880216be3743f6747800a042f2dbd89f3b0344c6b0a965f4bc010f03a930  gencode/docs/schema_doc.css
 878ea88206c974f40643c3cc430875f9c4e8c5e3fd6bcd6358bd3eb6d48699a9  gencode/docs/schema_doc.min.js
 7ed934930aee763e0beebc349725ba3909115e8d346bb762f28bcbe745bb163a  gencode/docs/schema_extras.js
@@ -39,6 +40,7 @@ fcbed49f1af8b791d8c52bcbe18f65521a79d9ac3eb33ec3afd9b342ab2bfc56  gencode/java/u
 c47b17d70ed7fffae5cb829623088358eca22c8fa5613edd97518bed0b522620  gencode/java/udmi/schema/CapabilityValidationState.java
 ec164962f2f00924ecb41ae07c2e01d6bf027951ccc605e0210988370b987973  gencode/java/udmi/schema/Category.java
 f6a557eb73dfa077d7c5daf897bde345c7403232808608c39e24a0cbee2755c9  gencode/java/udmi/schema/CloudModel.java
+8b3c78c77a6ccade42d8c3fea9a7c8196344f2f68dfac1dd8685a0727ec31bac  gencode/java/udmi/schema/CloudQuery.java
 377eb78de936317676faaf7ec5a32ad17f2c2c54a3280df87f5fcc2d36c7014d  gencode/java/udmi/schema/Config.java
 cf9762392e02b5d04c6498963222cc0c00f7be6c3cd82bde3d063a5eceba2b65  gencode/java/udmi/schema/Connections.java
 8164e93ccc76d78548d456890e064df8427a09bbcd50686b37a10d3ff5ad429f  gencode/java/udmi/schema/Credential.java
@@ -51,7 +53,7 @@ e809df42a73ed843977e447fa3333140dcdbe7d09b4e88bf1b8fd52fbaf9ae1a  gencode/java/u
 5b4508ce3ac0235c9ab97494aa0f2d2ccad88ebc83da28eca2c405fd906e84af  gencode/java/udmi/schema/DiscoveryEvent.java
 04112dd47b0f761131c276c67d3cd8b789d25e6716b5732be9fef14fc6831f1d  gencode/java/udmi/schema/DiscoveryModel.java
 0a11a539707571f79bd82b1958886cecae3209e2daef36dfca885adb4c61a07a  gencode/java/udmi/schema/DiscoveryState.java
-87b9dd3686a5c071846ed3837cb0347933003a1835a514a05c96f2fe94e6578f  gencode/java/udmi/schema/EndpointConfiguration.java
+fe9eb9928e66f8f34863312778959f49f6a6f2b5f6fa4e647b68c21aa61f0521  gencode/java/udmi/schema/EndpointConfiguration.java
 dc25e685886e11a741418be9191a478e13c0244647b5a0cac65d6c1e55055578  gencode/java/udmi/schema/Entry.java
 06758aca1e0043ddf343b504030f47bb19260e99a82e2d66f12e86092a2434ca  gencode/java/udmi/schema/Enumerate.java
 8a51984458d96d1798d067005902defa57410167a27dcfb0b730ea38a3326011  gencode/java/udmi/schema/Envelope.java
@@ -86,7 +88,7 @@ df64e4ddbf543ac70e7c2af9d3fbc20ffe3dff68c6718aa9ceadab7f64d3d171  gencode/java/u
 b3b7ef6cae004d5fdb4052f860df0aa583df87bb798a027fc769aeaf16489789  gencode/java/udmi/schema/MonitoringMetric.java
 4e7fb33911cf11845d494a07502577647cb96e1196cb7b76553190d14b6ed099  gencode/java/udmi/schema/Operation.java
 5e1c5411fae4d7c47391ceb5d19ae864fcd484df75ac6b6db39fd2d12647dec8  gencode/java/udmi/schema/Physical_tag.java
-3e331b3817cc87f2fe087aae3a1e599819ceda1ca086094d7f400f5f1c3bdbb9  gencode/java/udmi/schema/PodConfiguration.java
+afd4e8dcf55ac7fd91a00bc5348efb7dfe7950037a0eae9365a27d24c4f2f2e9  gencode/java/udmi/schema/PodConfiguration.java
 d808259db6bbcd26ecf438844ce286d15d4750906be24588d97acfbe8a4ae315  gencode/java/udmi/schema/PointEnumerationEvent.java
 468c2c95e9dcbaf4ff706fad7f168c14321eaa35b7fb190848ea8bfd86d981d7  gencode/java/udmi/schema/PointPointsetConfig.java
 8f3fc1cdc2dcd3e524863f4675aebabc450a35f5fd1cdc3fd37289b5cab7f2ec  gencode/java/udmi/schema/PointPointsetEvent.java
@@ -123,7 +125,7 @@ e657fce78cbce01fa4747f1da62dc0442b20ec2d1c196b6e56f3dd465c078ad4  gencode/java/u
 d54631f8bada01ffecf34361891ee52d41786b1289ce56a9edb696b6ad2d3ace  gencode/java/udmi/schema/ValidationState.java
 e007ddd1ceeae3603c85110c33e1bb4a418ff9c7a791ca0df25b7ea3caeafd36  gencode/java/udmi/schema/ValidationSummary.java
 b77d953fd22e655c0f10ae32deeaa222769d971f8c38b3379eba45720fb910cc  gencode/java/udmi/schema/VirtualEquipmentLinks.java
-cf0da75640384f1033a0ac43c758f3ec2f2814878d9a84bd222a4a17d06e2f4d  gencode/python/udmi/schema/__init__.py
+16db8b6457e9e4a568996fd6b512ffa0344b51469c7f24c2b473411caeeef462  gencode/python/udmi/schema/__init__.py
 21a1521cef58f195ef6c44f2b63b820bf981408806f58d3370eeeea07cc5436c  gencode/python/udmi/schema/access_iot.py
 4b25dd95f863059b761269f93adcae7049507924a1c6e74d6856849203c179db  gencode/python/udmi/schema/ancillary_properties.py
 dab4f5fca272ec48c2881bca2b6bc43786ada47fa1f6dd935c35f7ce0eb6b0f6  gencode/python/udmi/schema/building_translation.py
@@ -145,9 +147,9 @@ ac3facbd96f7cb2f7e387e7497d6a36af379a2687329571f250c5670f9933244  gencode/python
 7da3bdb37f338260d5f3829fa5fcbb9bbf9f146b514a68319c314a96c6b8ac12  gencode/python/udmi/schema/config_system.py
 cce623b34fd694880039a1c080214c33e00acaef5bc72276cf11a3bb2de40000  gencode/python/udmi/schema/config_system_testing.py
 30b1809e364cb3f7070002bb4a9954b11b25543b099b4bbe450d280001e4de55  gencode/python/udmi/schema/config_udmi.py
-8f047e5a423235a90f11e6804c57a0b00de4298bdbef22f3feb0b994ef5a5f05  gencode/python/udmi/schema/configuration_endpoint.py
+0e3a99d1ad748319b31b8d88d85dbcdfb7ae060612b5740e64492eac4271ca3c  gencode/python/udmi/schema/configuration_endpoint.py
 14fd646b9a8638b87e4c421c9dadfb7ed2e66ad02b256217423e3b5dd6c39fd1  gencode/python/udmi/schema/configuration_execution.py
-e30f937983f98673b3e67ac1369fe86964d785092964f7e95cd39611f9283d7c  gencode/python/udmi/schema/configuration_pod.py
+afc89a204d7099791303cf9231b19cc6ba320d1de95a921381f5e47bbafac842  gencode/python/udmi/schema/configuration_pod.py
 c61ee66daa7e632850bc2705370baa8c057e7a34792c6a29b9e4ca00c0eb195b  gencode/python/udmi/schema/configuration_pod_base.py
 ef61eea743cc2629893b18411636672cdfec0e209e58eb7918b33b43edab5196  gencode/python/udmi/schema/configuration_pod_bridge.py
 bed77c13436a192047a0dcdcaea7c5d7175e99a76c6c40409cce9e232ab5bc12  gencode/python/udmi/schema/configuration_pubber.py
@@ -186,6 +188,7 @@ b48ae013d203eb31cc388a084c0cc6f93d4d5534336d4da2ecbccd84a085ea2b  gencode/python
 26da2bca967fc7d5179e41e07cfa5da8b1019dd28bf55b68d89193b831b064cd  gencode/python/udmi/schema/options_pubber.py
 6c5f3dd1c5ca9d821e3c48298af118fc7eafd97af9265dfd34b2ed8642efca77  gencode/python/udmi/schema/persistent_device.py
 a58f8c98e837a5b56126ca0f410e02f1e9cfcd80a8cb429e0ef522defab1f690  gencode/python/udmi/schema/properties.py
+219a9f7053cfaa7d3bde5251c00a98aa90bae2594c549cc417d4ace88341e8bb  gencode/python/udmi/schema/query_cloud.py
 e604cf0280fe772de5f4e5ecf10dc6c564b6177eeff9cd9fb8b385af8fe10a95  gencode/python/udmi/schema/state.py
 4a908cee3fb8afb559bcbfa594e57dbc515a35e4468e02600751b2fcce05a238  gencode/python/udmi/schema/state_blobset.py
 182e07b534403dcc121d980672e41b0fa2ee55c4da1f5c56f0dad5d599450c80  gencode/python/udmi/schema/state_blobset_blob.py

diff --git a/.github/workflows/testing.yml b/.github/workflows/testing.yml
@@ -21,7 +21,7 @@ jobs:
         with:
           distribution: 'temurin'
           java-version: '17'
-      - uses: actions/setup-python@v4
+      - uses: actions/setup-python@v5
         with:
           python-version: '3.10'
       - name: Checkout source
@@ -177,11 +177,11 @@ jobs:
         run: |
           bin/support ${{ github.repository_owner }}_${{ github.job }}_
           tar -tzvf *udmi-support*.tgz
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4
         if: ${{ !cancelled() }}
         with:
           if-no-files-found: error
-          name: udmi-support_${{ github.run_id }}
+          name: udmi-support_${{ github.run_id }}-${{ matrix.shard }}
           path: '*_udmi-support_*.tgz'
 
   baseline:
@@ -221,11 +221,11 @@ jobs:
       - name: support bundle
         if: ${{ !cancelled() }}
         run: UDMI_REGISTRY_SUFFIX=_b bin/support ${{ github.repository_owner }}_${{ github.job }}_
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4
         if: ${{ !cancelled() }}
         with:
           if-no-files-found: error
-          name: udmi-support_${{ github.run_id }}
+          name: udmi-support_${{ github.run_id }}-b
           path: '*_udmi-support_*.tgz'
 
   redirect:
@@ -257,11 +257,11 @@ jobs:
       - name: support bundle
         if: ${{ !cancelled() }}
         run: UDMI_REGISTRY_SUFFIX=_r bin/support ${{ github.repository_owner }}_${{ github.job }}_
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4
         if: ${{ !cancelled() }}
         with:
           if-no-files-found: error
-          name: udmi-support_${{ github.run_id }}
+          name: udmi-support_${{ github.run_id }}-r
           path: '*_udmi-support_*.tgz'
 
   posttest:
@@ -275,13 +275,23 @@ jobs:
       UDMI_ALT_REGISTRY: ZZ-REDIRECT-NA
     steps:
       - uses: actions/checkout@v4
-      - uses: actions/setup-python@v4
+      - uses: actions/setup-python@v5
         with:
           python-version: '3.10'
       - name: Base setup
         run: bin/setup_base
-      - name: Download all workflow run artifacts
-        uses: actions/download-artifact@v3
+      - name: Download all sharded support packages
+        uses: actions/download-artifact@v4
+        with:
+          path: udmi-support_${{ github.run_id }}
+          pattern: udmi-support_${{ github.run_id }}-*
+          merge-multiple: true
+      - name: Upload merged support package
+        uses: actions/upload-artifact@v4
+        with:
+          if-no-files-found: error
+          name: udmi-support_${{ github.run_id }}
+          path: 'udmi-support_${{ github.run_id }}/*_udmi-support_*.tgz'
       - name: Processing support package
         run: bin/support_process udmi-support_*
       - name: Test run index

diff --git a/bin/sequencer b/bin/sequencer
@@ -21,9 +21,6 @@ log_level=INFO
 min_stage=PREVIEW
 export UDMI_VERSION=$udmi_version
 
-# For cross-env sort stability
-export LC_ALL=C
-
 rm -f $SEQUENCER_LOG $SEQUENCER_OUT $SCHEMA_OUT
 
 # Shortcut to run sequencer with a fixed config and cmd-line tests.

diff --git a/bin/sequencer_cache b/bin/sequencer_cache
@@ -27,9 +27,6 @@ CACHE_ROOT=validator/sequences
 TEST_ROOT=$RUNDIR/sites/udmi_site_model/out/devices/AHU-1
 ARCHIVE_ROOT=/tmp/$CACHE_ROOT
 
-# Fix sort order difference on different platforms.
-export LC_ALL=C
-
 function usage(){
     echo "Usage: $0 [OPTION]"
     echo

diff --git a/bin/start_hivemq b/bin/start_hivemq
@@ -0,0 +1,3 @@
+#!/bin/bash -e
+
+docker run -p 1883:1883 hivemq/hivemq-ce
diff --git a/bin/support_process b/bin/support_process
@@ -3,6 +3,9 @@
 archive=$1
 shift || true
 
+# Force consistent sort order
+export LC_ALL=C
+
 if [[ -z $archive ]]; then
     archive=$(ls -t ~/Downloads/udmi-support_*.zip ~/Downloads/udmi-support_*.tgz | head -n 1)
     echo Auto-detected archive $archive

diff --git a/bin/test_regclean b/bin/test_regclean
@@ -1,8 +1,5 @@
 #!/bin/bash -e
 
-# Force consistent sort order
-export LC_ALL=C
-
 UDMI_ROOT=$(dirname $0)/..
 cd $UDMI_ROOT
 

diff --git a/bin/test_sequencer b/bin/test_sequencer
@@ -1,8 +1,5 @@
 #!/bin/bash -e
 
-# Force consistent sort order
-export LC_ALL=C
-
 UDMI_ROOT=$(dirname $0)/..
 cd $UDMI_ROOT
 

diff --git a/bin/test_validator b/bin/test_validator
@@ -1,8 +1,5 @@
 #!/bin/bash -e
 
-# Force consistent sort order
-export LC_ALL=C
-
 UDMI_ROOT=$(realpath $(dirname $0)/..)
 cd $UDMI_ROOT
 

diff --git a/common/src/main/java/com/google/udmi/util/GeneralUtils.java b/common/src/main/java/com/google/udmi/util/GeneralUtils.java
@@ -289,6 +289,10 @@ public static <T> T ifTrueGet(Object conditional, Supplier<T> action, Supplier<T
     return isTrue(conditional) ? action.get() : alternate.get();
   }
 
+  public static <T> T ifTrueGet(Object conditional, Supplier<T> action, T alternate) {
+    return isTrue(conditional) ? action.get() : alternate;
+  }
+
   public static <T> void ifTrueThen(Object conditional, Runnable action) {
     ifTrueThen(conditional, action, null);
   }

diff --git a/gencode/docs/configuration_endpoint.html b/gencode/docs/configuration_endpoint.html
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		#!/bin/bash -e

		docker run -p 1883:1883 hivemq/hivemq-ce