Skip to content

Commit bb1419a

Browse files
RustedBonesRustedBones
authored
[dependencies] Update dss to 0.21.0-rc1 (#1269)
1 parent a8bff14 commit bb1419a

File tree

5 files changed

+77
-35
lines changed

5 files changed

+77
-35
lines changed

‎build/dev/docker-compose.yaml‎

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ services:
2323
start_interval: 5s
2424

2525
rid_bootstrapper:
26-
image: interuss/dss:v0.19.0-rc2
26+
image: interuss/dss:v0.21.0-rc1
2727
command: /usr/bin/db-manager migrate --schemas_dir=/db-schemas/rid --db_version "latest" --cockroach_host crdb
2828
depends_on:
2929
crdb:
@@ -32,17 +32,26 @@ services:
3232
- dss_internal_network
3333

3434
scd_bootstrapper:
35-
image: interuss/dss:v0.19.0-rc2
35+
image: interuss/dss:v0.21.0-rc1
3636
command: /usr/bin/db-manager migrate --schemas_dir=/db-schemas/scd --db_version "latest" --cockroach_host crdb
3737
depends_on:
3838
crdb:
3939
condition: service_healthy
4040
networks:
4141
- dss_internal_network
4242

43+
aux_bootstrapper:
44+
image: interuss/dss:v0.21.0-rc1
45+
command: /usr/bin/db-manager migrate --schemas_dir=/db-schemas/aux_ --db_version "latest" --cockroach_host crdb
46+
depends_on:
47+
crdb:
48+
condition: service_healthy
49+
networks:
50+
- dss_internal_network
51+
4352
dss:
4453
hostname: dss.uss1.localutm
45-
image: interuss/dss:v0.19.0-rc2
54+
image: interuss/dss:v0.21.0-rc1
4655
volumes:
4756
- $PWD/../test-certs:/var/test-certs:ro
4857
- $PWD/startup/core_service.sh:/startup/core_service.sh:ro
@@ -72,6 +81,8 @@ services:
7281
hostname: oauth.authority.localutm
7382
image: interuss/dummy-oauth
7483
command: -private_key_file /var/test-certs/auth2.key
84+
volumes:
85+
- $PWD/../test-certs:/var/test-certs:ro
7586
expose:
7687
- 8085
7788
ports:

‎build/dev/startup/core_service.sh‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,9 @@ if [ "$DEBUG_ON" = "1" ]; then
1818
-addr :80 \
1919
-accepted_jwt_audiences localhost,host.docker.internal,dss.uss1.localutm,dss.uss2.localutm \
2020
-enable_scd \
21-
-enable_http
21+
-allow_http_base_urls \
22+
-locality local_dev \
23+
-public_endpoint http://127.0.0.1:80
2224
else
2325
echo "Debug Mode: off"
2426

@@ -30,5 +32,7 @@ else
3032
-addr :80 \
3133
-accepted_jwt_audiences localhost,host.docker.internal,dss.uss1.localutm,dss.uss2.localutm \
3234
-enable_scd \
33-
-enable_http
35+
-allow_http_base_urls \
36+
-locality local_dev \
37+
-public_endpoint http://127.0.0.1:80
3438
fi

‎build/test-certs/auth2.key‎

Lines changed: 25 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,27 @@
11
-----BEGIN RSA PRIVATE KEY-----
2-
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
1527
-----END RSA PRIVATE KEY-----

‎build/test-certs/auth2.pem‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
-----BEGIN PUBLIC KEY-----
2-
MIGeMA0GCSqGSIb3DQEBAQUAA4GMADCBiAKBgHkNtpy3GB0YTCl2VCCd22i0rJwI
3-
GBSazD4QRKvH6rch0IP4igb+02r7t0X//tuj0VbwtJz3cEICP8OGSqrdTSCGj5Y0
4-
3Oa2gPkx/0c0V8D0eSXS/CUC0qrYHnAGLqko7eW87HW0rh7nnl2bB4Lu+R8fOmQt
5-
5frCJ5eTkzwK5YczAgMBAAE=
2+
MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAtjrMt+vOxuqjOU+hwrVA
3+
gHjBMs9nMw1ONSpiLOpUQSnqvBwB0Zba+8e2tGJeQDWEf8KoVt3PfMa34EomLhWZ
4+
GWEosftV8gZSbneDjUnE+kUTXvZmMFa2Byc9njsl5N7dOC1pT7qHNJOB9RhK/9eh
5+
Pl7XczRuIJR7N/ZFk+XZSlFh5werq7ME7GdhBPFaO30KZRmRhgwVtAP2kA8sSrqg
6+
xXuuyy808UvT3MkzL63Sv/EzQSs8YLVAn/BwiQlmWxKFmtzNk9RJdYkxRJN1E9E2
7+
sS2i6b55j94hiPwwQ16GsAAWUT+ijezlHuGZU+OLYtYfoHy+4Ku31doQc0ujvtYO
8+
JQIDAQAB
69
-----END PUBLIC KEY-----

‎monitoring/monitorlib/auth.py‎

Lines changed: 25 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -36,19 +36,31 @@ class NoAuth(AuthAdapter):
3636
# This is the private key from test-certs/auth2.key.
3737
dummy_private_key = jwcrypto.jwk.JWK.from_pem(
3838
b"-----BEGIN RSA PRIVATE KEY-----\n"
39-
b"MIICWwIBAAKBgHkNtpy3GB0YTCl2VCCd22i0rJwIGBSazD4QRKvH6rch0IP4igb+\n"
40-
b"02r7t0X//tuj0VbwtJz3cEICP8OGSqrdTSCGj5Y03Oa2gPkx/0c0V8D0eSXS/CUC\n"
41-
b"0qrYHnAGLqko7eW87HW0rh7nnl2bB4Lu+R8fOmQt5frCJ5eTkzwK5YczAgMBAAEC\n"
42-
b"gYAtSgMjGKEt6XQ9IucQmN6Iiuf1LFYOB2gYZC+88PuQblc7uJWzTk08vlXwG3l3\n"
43-
b"JQ/h7gY0n6JhH8RJW4m96TO8TrlHLx5aVcW8E//CtgayMn3vBgXida3wvIlAXT8G\n"
44-
b"WezsNsWorXLVmz5yov0glu+TIk31iWB5DMs4xXhXdH/t8QJBALQzvF+y5bZEhZin\n"
45-
b"qTXkiKqMsKsJbXjP1Sp/3t52VnYVfbxN3CCb7yDU9kg5QwNa3ungE3cXXNMUr067\n"
46-
b"9zIraekCQQCr+NSeWAXIEutWewPIykYMQilVtiJH4oFfoEpxvecVv7ulw6kM+Jsb\n"
47-
b"o6Pi7x86tMVkwOCzZzy/Uyo/gSHnEZq7AkEAm0hBuU2VuTzOyr8fhvtJ8X2O97QG\n"
48-
b"C6c8j4Tk7lqXIuZeFRga6la091vMZmxBnPB/SpX28BbHvHUEpBpBZ5AVkQJAX7Lq\n"
49-
b"7urg3MPafpeaNYSKkovG4NGoJgSgJgzXIJCjJfE6hTZqvrMh7bGUo9aZtFugdT74\n"
50-
b"TB2pKncnTYuYyDN9vQJACDVr+wvYYA2VdnA9k+/1IyGc1HHd2npQqY9EduCeOGO8\n"
51-
b"rXQedG6rirVOF6ypkefIayc3usipVvfadpqcS5ERhw==\n"
39+
b"MIIEowIBAAKCAQEAtjrMt+vOxuqjOU+hwrVAgHjBMs9nMw1ONSpiLOpUQSnqvBwB\n"
40+
b"0Zba+8e2tGJeQDWEf8KoVt3PfMa34EomLhWZGWEosftV8gZSbneDjUnE+kUTXvZm\n"
41+
b"MFa2Byc9njsl5N7dOC1pT7qHNJOB9RhK/9ehPl7XczRuIJR7N/ZFk+XZSlFh5wer\n"
42+
b"q7ME7GdhBPFaO30KZRmRhgwVtAP2kA8sSrqgxXuuyy808UvT3MkzL63Sv/EzQSs8\n"
43+
b"YLVAn/BwiQlmWxKFmtzNk9RJdYkxRJN1E9E2sS2i6b55j94hiPwwQ16GsAAWUT+i\n"
44+
b"jezlHuGZU+OLYtYfoHy+4Ku31doQc0ujvtYOJQIDAQABAoIBACTuccLslXGW6BGb\n"
45+
b"Y+s0FKh00KLdicq87Za0ykTUENNMDXimLHAvpJ3Wcd7I+NUGg53o83j3Zy+gjm90\n"
46+
b"V5yLYAXWvQqlJ1vvkBE3Q4AE7VjTWwOp6DfvuuBkQYap8hoaWLcj7O3tna04H+Ru\n"
47+
b"UfTb3J/pVLzSaWdM8FP9I0jAEnOPBwwgmQ74G/NmCZpv39boLJQ2sdqY9gSaQUsn\n"
48+
b"4fwKtQQ6yBLDw8mkNnzxnRxXe7FiKjKtnTUp7GhELoQ37XbwJRJTlBA9jirxadss\n"
49+
b"4NiHpSq+QhkHdJPMOdE/DTZ0H52mJe92t+EEptJADX4O4b54oNaJ4p99Zk0rlW97\n"
50+
b"s3lowdkCgYEAygLJiYBpv/wuJd1peqLoYnOIBriFQi7vSF+Ho4UNnS76IapSZ/qY\n"
51+
b"nUGrTYNaNhTg39Gsbpdax7bnaWiTDNzdCiiQxMc5BSR3tDF52tIaOqvVFgd5KRu/\n"
52+
b"7pOtH8fToR770KviT85G8Wb+ozFY7F0/yklU+OQEtfmuAVs6bEx4m8cCgYEA5u6e\n"
53+
b"e00l01h/SvM7CoYdoOG9N1vyhMYbUBDR6SUIAaR25/UJPH7kPpAqxXKR1BWJh7q+\n"
54+
b"1cBF0ZFnQ3xkRsfETcvLPJLAsIMwd1HN2sJ0/tPSgFSw6RTFswa3SlpxON+8shcR\n"
55+
b"2617UhFDc/5MfCXiNb8u/4Ng7iacfjVhdLehzrMCgYAX1g5byCgyPBph42dPzisn\n"
56+
b"esRhLqKitZEMdCE4HToHAwUGtec1V69sVtRUuBwL55jFMCNthTRz/lP97xXy3ZjD\n"
57+
b"WxgB8BP9VFk/jNr5A/OOWrow+D7Gp/yUtR4ncte42kQSUkXI7ukWEPYY4XjBoxsk\n"
58+
b"zlRVbepUYpqylEYngzpz/wKBgQCNwSntXDT839T7iATU9/CWAhupMLrUv9qiMkD4\n"
59+
b"EXAxuef3iNWLmgS3Vr26iBJ2EmZit8JO6YCyHMQ7i87uF9ArRQ7Tdu3rLAyDIebw\n"
60+
b"Au/YQOR1PAeAe+zDcTrv3Eal98kXtMuUgpAxl0FFoXMHviV2go3x8I5+gZsMae4R\n"
61+
b"vGsJuwKBgH1KY+N3629mtdyhb1xfoxFRDq0Izyl/OpeWZHe4wd+nklkRsj0CvLHz\n"
62+
b"m+F5V4CxlUufLadvg9KFxd48UWTwqjrTysixDN4MUPngFoBSh0i/egq6DJlsEhAL\n"
63+
b"0Q9fZLTCV7sKG9FAUCWT6nE+k8K9U0hTCUeyVqx85iTUu10zQrTR\n"
5264
b"-----END RSA PRIVATE KEY-----"
5365
)
5466

0 commit comments

Comments
 (0)