Swarm

.gencode_hash.txt

@@ -1,4 +1,4 @@
-be3ba62c64aeee199ef5f90368d1ef8010cc718bad72d2d2d667aed2545e1d3e  gencode/docs/config.html
+83cf5112955016827f7db491348459ac602bbd46ac29bb885dccaf513b5b3df6  gencode/docs/config.html
 e2944b13db5ff06be9caea51d03bca48f2cb093a8bb583dca14051255d34ea6b  gencode/docs/envelope.html
 04b55d0e207495a1c471423a5e89347342241bbd3c845de3e8355209692eb70a  gencode/docs/event_discovery.html
 8133e380e40f27c56accbffc665b2eeb56ec84a4da3b52ba7aa5e439c9c40572  gencode/docs/event_pointset.html
@@ -8,14 +8,14 @@ a82821e72af6d0ee35800e6262eb9bb05256309b98aed2dad1a368fd2d6882bb  gencode/docs/i
 741b880216be3743f6747800a042f2dbd89f3b0344c6b0a965f4bc010f03a930  gencode/docs/schema_doc.css
 878ea88206c974f40643c3cc430875f9c4e8c5e3fd6bcd6358bd3eb6d48699a9  gencode/docs/schema_doc.min.js
 7ed934930aee763e0beebc349725ba3909115e8d346bb762f28bcbe745bb163a  gencode/docs/schema_extras.js
-11efe0b82f5eea7a0af1c0c5785096c4dc44cb87e091c3fc131c4b463a6b4bf6  gencode/docs/state.html
+43019239edfdad71647c40d254b9b3aec68f3deb0c808ba636530c1cf9985fe0  gencode/docs/state.html
 d39d7fe37a41c74a40080af7b0a429d201ab1fdff7444428c4b98eb7b38c332b  gencode/java/udmi/schema/Asset.java
 0edc9b905bbe4ad0ee5ffdb7fb5d65a00ad171b2dad299ef128e59c0bd9dddc0  gencode/java/udmi/schema/AuditEvent.java
 0825a5cec83003bb0a6488c4ed7010a04ae0d3848ef36fe01bb4e6718ba7b96d  gencode/java/udmi/schema/Aux.java
-724ad8db7982f4d703c05245119dc7f7ff731d2141dd861893b55684e3cd6224  gencode/java/udmi/schema/BlobBlobsetConfig.java
-7f54da38284a1010de1a2590381022fa16d27fd141d76d1ba6eb471de4d94781  gencode/java/udmi/schema/BlobBlobsetState.java
+773223fd813648a9fb1eb890287f45fa127ef19a553186395f05a1a47d818716  gencode/java/udmi/schema/BlobBlobsetConfig.java
+2c03651cb2ecda072b1418222eebb5560185669f8ffdd03021ad5ad8ff7ba3b0  gencode/java/udmi/schema/BlobBlobsetState.java
 d2c5b5aae8db27b68104fc83a1f38de0a3f1b5d683f2b13599adf24e96c7d124  gencode/java/udmi/schema/BlobsetConfig.java
-b6ff9b8739a9c3bb6972f73db6fc54f451189c13b273e58bc11cb3d82c74ad40  gencode/java/udmi/schema/BlobsetState.java
+fcbed49f1af8b791d8c52bcbe18f65521a79d9ac3eb33ec3afd9b342ab2bfc56  gencode/java/udmi/schema/BlobsetState.java
 a2eeff86f4302272736d84602e2ca36a64d27c8ef6761cc05ffb8ad17b030d4d  gencode/java/udmi/schema/CloudModel.java
 ff79de9390aa25bb45fb3e2ebb682c865ccab764f56d9644377d9d28c0ab10e4  gencode/java/udmi/schema/Config.java
 587d67a67431349939dffd37b880c44e798a1eb607d54bd6d8a077bbac668067  gencode/java/udmi/schema/DiscoveryCommand.java
@@ -72,7 +72,7 @@ d3968b92497e83a63f18cc0e74484a9807f1bb92db0c92d556ec2caaa143d645  gencode/java/u
 704c8f0eec0b87015af8f7e524375f651b3d35f659ec89b4b022f8c1d0813ec5  gencode/python/udmi/schema/common.py
 b975892df78076dabc797b4c0be87f20b33eacda11f9d1ac1c09be33d4937a87  gencode/python/udmi/schema/config.py
 191e1926c16b55f4ef350a711f540eef17a0ec60bec8c193c94182786dc3624b  gencode/python/udmi/schema/config_blobset.py
-7abd40beb86ebd7eaeaacdeba895b95563b79b651ad2cfd73bdcac865c90a3a9  gencode/python/udmi/schema/config_blobset_blob.py
+95125e3459cec6e12f4e0d3912f9c519b1aec41cf1df9720b54481e69632d7f4  gencode/python/udmi/schema/config_blobset_blob.py
 ec6c6ab1fb0f37a29b7ebd162aa77da7f1e261e80da376942a3b39d17ccf1be4  gencode/python/udmi/schema/config_discovery.py
 a5edb9ac5ecd5a4459f93ce613691735f299f35718f2e35410206fc91c263dd1  gencode/python/udmi/schema/config_discovery_family.py
 b461bdc24310ef972faf579b5be577b5af67fb0977d6afb4c42955211b26e3d5  gencode/python/udmi/schema/config_gateway.py
@@ -106,8 +106,8 @@ a58f8c98e837a5b56126ca0f410e02f1e9cfcd80a8cb429e0ef522defab1f690  gencode/python
 1f521678016ad267ad1c817896c7900ba30a85fc694669577b71148193db32c1  gencode/python/udmi/schema/reflect_config.py
 1a4eef286957d77418777eb7f4cd1ee13aa24c2d916ec71a7ff4e56de76e303e  gencode/python/udmi/schema/reflect_state.py
 32bc70a30e37e89cfae14b44add18d546a6f9e00a3ec3519ede9c7486114d39c  gencode/python/udmi/schema/state.py
-c8c8ecae303d9c96fb7a97106d722b32db8c3728a44a46db028cf0376d9dc79f  gencode/python/udmi/schema/state_blobset.py
-a5a914cb5d74c29671a4d29dfa6c700b3fec27d695d607e28814ad31307e82da  gencode/python/udmi/schema/state_blobset_blob.py
+4a908cee3fb8afb559bcbfa594e57dbc515a35e4468e02600751b2fcce05a238  gencode/python/udmi/schema/state_blobset.py
+16a3541464d48b0cda007668cbc9c00911b94d044fe69a23773df2648359723f  gencode/python/udmi/schema/state_blobset_blob.py
 26443a1f6d0be3469ff93aa7fdb4e6682e0439a3b29a8e237998dcebec5f6901  gencode/python/udmi/schema/state_discovery.py
 187400078dfc89912062ca1ad92f61e32d28126ae56119d83e6767d58cda1117  gencode/python/udmi/schema/state_discovery_family.py
 05e82aa15c64842e206ae8ce3d5810d115bb890d009ea5d657822fad0e0d2165  gencode/python/udmi/schema/state_gateway.py

.github/workflows/testing.yml

@@ -35,6 +35,40 @@ jobs:
           bin/test_registrar
           bin/test_sites
 
+  redirect:
+    name: Endpoint Redirection
+    runs-on: ubuntu-latest
+    timeout-minutes: 10
+    steps:
+      - uses: actions/checkout@v2
+      - uses: actions/setup-java@v1
+        with:
+          java-version: '11'
+      - name: base setup
+        run: |
+          bin/setup_base
+          bin/clone_model
+      - name: pubber run
+        env:
+          GCP_TARGET_PROJECT: ${{ secrets.GCP_TARGET_PROJECT }}
+        run: |
+          bin/test_redirect $GCP_TARGET_PROJECT
+      - name: pubber checks
+        env:
+          GCP_TARGET_PROJECT: ${{ secrets.GCP_TARGET_PROJECT }}
+        if: "${{ env.GCP_TARGET_PROJECT != '' }}"
+        run: |
+          # Simple checks that a redirect happened and failed
+          set +x
+          fgrep registries/ZZ-TRI-FECTA/devices/GAT-123 pubber.out
+          fgrep 'system.config.parse success' pubber.out
+          fgrep registries/missing/devices/GAT-123 pubber.out
+          fgrep 'Not authorized to connect' pubber.out
+      - name: pubber logs
+        if: ${{ always() }}
+        run: |
+          cat pubber.out || true
+
   udmi:
     name: Sequence tests
     runs-on: ubuntu-latest

bin/pubber

@@ -43,9 +43,11 @@ else
 
     cat <<EOF > /tmp/pubber_config.json
 {
-    "projectId": "$project_id",
+    "endpoint": {
+      "projectId": "$project_id",
+      "cloudRegion": "$cloud_region"
+    },
     "sitePath": "$site_path",
-    "cloudRegion": "$cloud_region",
     "deviceId": "$device_id",
     "serialNo": "$serial_no",
     "options": $options_json

bin/test_redirect

@@ -0,0 +1,41 @@
+#!/bin/bash -e
+
+ROOT_DIR=$(dirname $0)/..
+cd $ROOT_DIR
+
+if [[ $# != 1 ]]; then
+    echo Usage: $0 PROJECT_ID
+    false
+fi
+
+project_id=$1
+shift
+
+if [[ -n `which rot13` ]]; then
+   # Project is provided as a secret, so obfuscate to prevent redactions in server-side logs.
+   echo 'Using target project (rot13):' $(echo $project_id | rot13)
+else
+   echo 'Using target project:' $project_id
+fi
+
+site_path=sites/udmi_site_model
+device_id=AHU-22
+
+serial_no=sequencer-$RANDOM
+echo Using pubber with serial $serial_no
+
+PUBBER_OUT=pubber.out
+
+pids=`ps ax | fgrep pubber | fgrep java | awk '{print $1}'`
+if [[ -n $pids ]]; then
+    echo Killing pubber pids $pids
+    kill $pids
+fi
+
+echo Writing pubber output to $PUBBER_OUT
+echo bin/pubber $site_path $project_id $device_id $serial_no
+
+result=0
+timeout 5m bin/pubber $site_path $project_id $device_id $serial_no redirectRegistry=missing > $PUBBER_OUT 2>&1 || result=$?
+
+echo Pubber exit code $result