Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Rename _iot_config to _iot_endpoint_config #418

Merged
merged 12 commits into from
Aug 15, 2022
Merged

Rename _iot_config to _iot_endpoint_config #418

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
bce66cd
Rename _iot_config to iot_endpoint_config
johnrandolph Aug 12, 2022
ba4d2c2
More
johnrandolph Aug 12, 2022
ce750ed
Again
johnrandolph Aug 15, 2022
6876b8d
Merge remote-tracking branch 'faucet/master' into chk
johnrandolph Aug 15, 2022
9b76e9f
Fix receive -> received
johnrandolph Aug 15, 2022
a4f84db
x
johnrandolph Aug 15, 2022
3bad2f6
Delete Blob.java
johnrandolph Aug 15, 2022
faea65a
rename schema constant
johnrandolph Aug 15, 2022
1c7bf5f
Merge branch 'iotrename' of github.com:johnrandolph/udmi into iotrename
johnrandolph Aug 15, 2022
be06918
Add changes
johnrandolph Aug 15, 2022
ca26671
x
johnrandolph Aug 15, 2022
a76c736
x
johnrandolph Aug 15, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .gencode_hash.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
6e1a32e071eb2df1fa40908767277bd648a821772dfeb57c58d905e10323d238 gencode/docs/config.html
bf79c2371745ef800d3434c9dd4155a9a4f10a3c5dd1b07246cbb0c641fd06bb gencode/docs/config.html
90679d3d866579501e7aa00b515af05d42fc9fe399eafacaacf297d1e4a22884 gencode/docs/envelope.html
9362682fa830ce9d98b3c074cab05ba44fae96a82de316a3520df3956e9325dc gencode/docs/event_discovery.html
8133e380e40f27c56accbffc665b2eeb56ec84a4da3b52ba7aa5e439c9c40572 gencode/docs/event_pointset.html
Expand All @@ -14,7 +14,7 @@ d39d7fe37a41c74a40080af7b0a429d201ab1fdff7444428c4b98eb7b38c332b gencode/java/u
0825a5cec83003bb0a6488c4ed7010a04ae0d3848ef36fe01bb4e6718ba7b96d gencode/java/udmi/schema/Aux.java
d326a550d75ab7f558f165f1a5e8c24eee2b0b52290a7472f529bb1e15d79fb2 gencode/java/udmi/schema/BlobBlobsetConfig.java
2c03651cb2ecda072b1418222eebb5560185669f8ffdd03021ad5ad8ff7ba3b0 gencode/java/udmi/schema/BlobBlobsetState.java
3fccb6bc6714fdc3dd912c8b1155e7ce19b0ac8a7ec48a01be9eb27bdd034a75 gencode/java/udmi/schema/BlobsetConfig.java
b9f903444ab08907e41eb123286434ff3207b1edd01397af3ddefb8475bbdadc gencode/java/udmi/schema/BlobsetConfig.java
fcbed49f1af8b791d8c52bcbe18f65521a79d9ac3eb33ec3afd9b342ab2bfc56 gencode/java/udmi/schema/BlobsetState.java
0c908ea34ee54aa66f9ce472ad23ecaec3c091f2afbba7b509e1515b5557f82c gencode/java/udmi/schema/Category.java
d6875f63ce67d1b945a0b75a4a660bd083cc52492371a7350c4109f6bf54968b gencode/java/udmi/schema/CloudIotConfig.java
Expand Down
2 changes: 1 addition & 1 deletion bin/test_redirect
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ cat <<EOF > out/blobs.json
{
"blobset": {
"blobs": {
"_iot_config": {
"_iot_endpoint_config": {
"phase": "final",
"base64": "$base64"
}
Expand Down
2 changes: 1 addition & 1 deletion gencode/docs/config.html
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion gencode/java/udmi/schema/BlobsetConfig.java
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion pubber/src/main/java/daq/pubber/Pubber.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -725,7 +725,7 @@ private void processConfigUpdate(Config config) {

private EndpointConfiguration extractEndpointBlobConfig() {
try {
String iotConfig = extractConfigBlob(SystemBlobsets.IOT_CONFIG.value());
String iotConfig = extractConfigBlob(SystemBlobsets.IOT_ENDPOINT_CONFIG.value());
if (iotConfig == null) {
return null;
}
Expand Down
2 changes: 1 addition & 1 deletion schema/common.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
"title": "System Blobsets",
"description": "Predefined system blobsets",
"enum": [
"_iot_config"
"_iot_endpoint_config"
]
},
"entry": {
Expand Down
2 changes: 1 addition & 1 deletion tests/config.tests/blobset_final.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"url": "https://manuf.com/path/file.zip",
"sha256": "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855"
},
"_endpoint_redirect": {
"_iot_endpoint_config": {
"phase": "final",
"content_type": "application/json",
"base64": "e30="
Expand Down
4 changes: 2 additions & 2 deletions tests/state.tests/blobset_received.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,9 @@
"level": 100
}
},
"_endpoint_redirect": {
"_iot_endpoint_config": {
"status": {
"message": "Received endpoint redirect",
"message": "Received endpoint config",
"category": "blobset.blob.received",
"timestamp": "2022-07-13T12:00:08.000Z",
"level": 100
Expand Down