Skip to content

Commit 418f2bf

Browse files
BehnamMozafariBehnamMozafari
authored
Merge pull request #1290 from IABTechLab/bmz-UID2-4606-runtime-config-application
Runtime config retrieval and application
2 parents 34dbbd9 + 63b0c4b commit 418f2bf

45 files changed

Lines changed: 1226 additions & 199 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎Dockerfile‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,8 @@ COPY ./target/${JAR_NAME}-${JAR_VERSION}-sources.jar /app
2020
COPY ./target/${JAR_NAME}-${JAR_VERSION}-static.tar.gz /app/static.tar.gz
2121
COPY ./conf/default-config.json ${EXTRA_CONFIG} /app/conf/
2222
COPY ./conf/*.xml /app/conf/
23+
COPY ./conf/runtime-config-defaults.json /app/conf/
24+
COPY ./conf/feat-flag/feat-flag.json /app/conf/feat-flag/
2325

2426
RUN tar xzvf /app/static.tar.gz --no-same-owner --no-same-permissions && rm -f /app/static.tar.gz
2527

‎conf/default-config.json‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,5 +36,4 @@
3636
"failure_shutdown_wait_hours": 120,
3737
"sharing_token_expiry_seconds": 2592000,
3838
"operator_type": "public"
39-
4039
}

‎conf/docker-config.json‎

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,13 @@
3737
"enclave_platform": null,
3838
"failure_shutdown_wait_hours": 120,
3939
"salts_expired_shutdown_hours": 12,
40-
"operator_type": "public"
41-
40+
"operator_type": "public",
41+
"runtime_config_store": {
42+
"type": "file",
43+
"config" : {
44+
"path": "conf/runtime-config-defaults.json",
45+
"format": "json"
46+
},
47+
"config_scan_period_ms": 5000
48+
}
4249
}

‎conf/feat-flag/feat-flag.json‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
{
2+
"remote_config": {
3+
"enabled": true
4+
}
5+
}

‎conf/integ-config.json‎

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,14 @@
1414
"optout_api_token": "test-operator-key",
1515
"optout_api_uri": "http://localhost:8081/optout/replicate",
1616
"salts_expired_shutdown_hours": 12,
17-
"operator_type": "public"
18-
17+
"operator_type": "public",
18+
"runtime_config_store": {
19+
"type": "http",
20+
"config" : {
21+
"host": "localhost",
22+
"port": 8088,
23+
"path": "/operator/config"
24+
},
25+
"config_scan_period_ms": 300000
26+
}
1927
}

‎conf/local-config.json‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,5 +36,13 @@
3636
"key_sharing_endpoint_provide_app_names": true,
3737
"client_side_token_generate_log_invalid_http_origins": true,
3838
"salts_expired_shutdown_hours": 12,
39-
"operator_type": "public"
39+
"operator_type": "public",
40+
"runtime_config_store": {
41+
"type": "file",
42+
"config" : {
43+
"path": "conf/runtime-config-defaults.json",
44+
"format": "json"
45+
},
46+
"config_scan_period_ms": 5000
47+
}
4048
}

‎conf/local-e2e-docker-private-config.json‎

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,5 +27,14 @@
2727
"optout_delta_rotate_interval": 60,
2828
"cloud_refresh_interval": 30,
2929
"salts_expired_shutdown_hours": 12,
30-
"operator_type": "private"
30+
"operator_type": "private",
31+
"runtime_config_store": {
32+
"type": "http",
33+
"config" : {
34+
"host": "core",
35+
"port": 8088,
36+
"path": "/operator/config"
37+
},
38+
"config_scan_period_ms": 300000
39+
}
3140
}

‎conf/local-e2e-docker-public-config.json‎

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,14 @@
3333
"optout_status_api_enabled": true,
3434
"cloud_refresh_interval": 30,
3535
"salts_expired_shutdown_hours": 12,
36-
"operator_type": "public"
37-
36+
"operator_type": "public",
37+
"runtime_config_store": {
38+
"type": "http",
39+
"config" : {
40+
"host": "core",
41+
"port": 8088,
42+
"path": "/operator/config"
43+
},
44+
"config_scan_period_ms": 300000
45+
}
3846
}

‎conf/local-e2e-private-config.json‎

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,14 @@
3838
"client_side_token_generate_domain_name_check_enabled": false,
3939
"client_side_token_generate_log_invalid_http_origins": true,
4040
"salts_expired_shutdown_hours": 12,
41-
"operator_type": "private"
42-
41+
"operator_type": "private",
42+
"runtime_config_store": {
43+
"type": "http",
44+
"config" : {
45+
"host": "localhost",
46+
"port": 8088,
47+
"path": "/operator/config"
48+
},
49+
"config_scan_period_ms": 300000
50+
}
4351
}

‎conf/local-e2e-public-config.json‎

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,14 @@
3939
"key_sharing_endpoint_provide_app_names": true,
4040
"client_side_token_generate_log_invalid_http_origins": true,
4141
"salts_expired_shutdown_hours": 12,
42-
"operator_type": "public"
43-
42+
"operator_type": "public",
43+
"runtime_config_store": {
44+
"type": "http",
45+
"config" : {
46+
"host": "localhost",
47+
"port": 8088,
48+
"path": "/operator/config"
49+
},
50+
"config_scan_period_ms": 300000
51+
}
4452
}

0 commit comments

Comments
 (0)