Telecominfraproject/wlan-cloud-ucentralfms
1
0
Fork 0
mirror of https://github.com/Telecominfraproject/wlan-cloud-ucentralfms.git synced 2026-01-27 02:23:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #85 from Telecominfraproject/feature/WIFI-12539

Browse Source 
[WIFI-12539] Config S3 SDK tool to allow multiple providers
This commit is contained in:
Stephane Bourque
2023-04-26 08:08:01 -07:00
committed by GitHub
parent 5ddbd0bad3 43658550df
commit bd7eca32f4
8 changed files with 36 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
CONFIGURATION.md
View File

@@ -30,6 +30,9 @@ s3.secret = *******************************************
s3.key = *******************************************
s3.retry = 60
s3.bucket.uri = ucentral-ap-firmware.s3.amazonaws.com
s3.endpoint.https = true
s3.endpointOverride = ""
s3.useVirtualAdressing = true
```
#### s3.bucketname
@@ -44,6 +47,12 @@ The AWS key for access for this S3 bucket
The AWS retry window in seconds.
#### s3.bucket.uri = ucentral-ap-firmware.s3.amazonaws.com
The URI to the S3 bucket
#### s3.endpointOverride = ""
The Endpoint Address to override if you using a different provider that not AWS.
#### s3.endpoint.https = true
The Endpoint Method if you using a HTTP endpoint
#### s3.useVirtualAdressing = true
In a virtual-hosted–style URI, the bucket name is part of the domain name in the URL. (Not supported by all providers)
## Generic OpenWiFi SDK parameters
### REST API External parameters

3
docker-entrypoint.sh
View File

@@ -25,6 +25,9 @@ if [[ "$TEMPLATE_CONFIG" = 'true' ]]; then
SECURITY_RESTAPI_DISABLE=${SECURITY_RESTAPI_DISABLE:-"false"} \
FIRMWAREDB_REFRESH=${FIRMWAREDB_REFRESH:-"86400"} \
FIRMWAREDB_MAXAGE=${FIRMWAREDB_MAXAGE:-"90"} \
S3_VIRTUAL_ADRESSING=${S3_VIRTUAL_ADRESSING:-"true"} \
S3_HTTPS=${S3_HTTPS:-"true"} \
S3_ENDPOINT=${S3_ENDPOINT:-""} \
S3_BUCKETNAME=${S3_BUCKETNAME:-"ucentral-ap-firmware"} \
S3_REGION=${S3_REGION:-"us-east-1"} \
S3_SECRET=${S3_SECRET:-"*******************************************"} \

3
helm/values.yaml
View File

@@ -143,6 +143,9 @@ configProperties:
openwifi.internal.restapi.host.0.cert: $OWFMS_ROOT/certs/restapi-cert.pem
openwifi.internal.restapi.host.0.key: $OWFMS_ROOT/certs/restapi-key.pem
# Firmware Microservice Specific Section
s3.endpointOverride: ""
s3.useVirtualAdressing: true
s3.endpoint.https: true
s3.bucketname: ucentral-ap-firmware
s3.region: us-east-1
s3.retry: 60

2
owfms.properties
View File

@@ -43,6 +43,8 @@ firmwaredb.maxage = 90
#
# Firmware Microservice Specific Section
#
s3.useVirtualAdressing = true
s3.endpoint.https = true
s3.bucketname = ucentral-ap-firmware
s3.region = us-east-1
s3.secret = *******************************************

3
owfms.properties.tmpl
View File

@@ -44,6 +44,9 @@ firmwaredb.maxage = ${FIRMWAREDB_MAXAGE}
#
# Firmware Microservice Specific Section
#
s3.useVirtualAdressing = ${S3_VIRTUAL_ADRESSING}
s3.endpointOverride = ${S3_ENDPOINT}
s3.endpoint.https = ${S3_HTTPS}
s3.bucketname = ${S3_BUCKETNAME}
s3.region = ${S3_REGION}
s3.secret = ${S3_SECRET}

11
src/ManifestCreator.cpp
View File

@@ -148,6 +148,9 @@ namespace OpenWifi {
int ManifestCreator::Start() {
Running_ = true;
S3EndpointOverride_ = MicroServiceConfigGetString("s3.endpointOverride", "");
S3EndpointHttps_ = MicroServiceConfigGetBool("s3.endpoint.https", true);
S3UseVirtualAdressing_ = MicroServiceConfigGetBool("s3.useVirtualAdressing", true);
S3BucketName_ = MicroServiceConfigGetString("s3.bucketname", "");
S3Region_ = MicroServiceConfigGetString("s3.region", "");
S3Secret_ = MicroServiceConfigGetString("s3.secret", "");
@@ -160,6 +163,12 @@ namespace OpenWifi {
AwsConfig_.enableTcpKeepAlive = true;
AwsConfig_.enableEndpointDiscovery = true;
AwsConfig_.useDualStack = true;
if(!S3EndpointHttps_)
AwsConfig_.scheme = Aws::Http::Scheme::HTTP;
if(!S3EndpointOverride_.empty()) {
AwsConfig_.endpointOverride = Aws::String(S3EndpointOverride_);
AwsConfig_.useDualStack = false;
}
if (!S3Region_.empty())
AwsConfig_.region = S3Region_;
AwsCreds_.SetAWSAccessKeyId(S3Key_);
@@ -214,7 +223,7 @@ namespace OpenWifi {
Aws::S3::Model::ListObjectsV2Request Request;
Request.WithBucket(S3BucketName_.c_str());
Aws::S3::S3Client S3Client(AwsCreds_, AwsConfig_);
Aws::S3::S3Client S3Client(AwsCreds_, AwsConfig_, Aws::Client::AWSAuthV4Signer::PayloadSigningPolicy::Never, S3UseVirtualAdressing_);
Request.SetMaxKeys(100);
Aws::S3::Model::ListObjectsV2Outcome Outcome;

3
src/ManifestCreator.h
View File

@@ -54,6 +54,9 @@ namespace OpenWifi {
private:
std::atomic_bool Running_ = false;
Aws::String S3EndpointOverride_;
bool S3EndpointHttps_;
bool S3UseVirtualAdressing_;
Aws::String S3BucketName_;
Aws::String S3Region_;
Aws::String S3Key_;

3
ucentralfms.properties.priv
View File

@@ -39,6 +39,9 @@ ucentral.system.commandchannel = /tmp/app.ucentralfms
#
# Firmware Microservice Specific Section
#
s3.endpointOverride = 172.31.30.127:9000
s3.endpoint.https = false
s3.useVirtualAdressing = false
s3.bucketname = ucentral-ap-firmware
s3.region = us-east-1
s3.secret = ****************************