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.

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

feat: Enable Registry and Config Access Token #224

Merged
merged 1 commit into from
Mar 30, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@ module github.com/edgexfoundry/app-service-configurable

go 1.15

require github.com/edgexfoundry/app-functions-sdk-go/v2 v2.0.0-dev.35
require github.com/edgexfoundry/app-functions-sdk-go/v2 v2.0.0-dev.37
2 changes: 2 additions & 0 deletions res/functional-tests/configuration.toml
Original file line number Diff line number Diff line change
Expand Up @@ -71,11 +71,13 @@ Protocol = "http"
ReadMaxLimit = 100
StartupMsg = "Configurable Application Service Started"
Timeout = "5s"
ConfigAccessTokenFile = '/tmp/edgex/secrets/AppService-functional-tests/consul-token' # ignored in non-secure mode

[Registry]
Host = "localhost"
Port = 8500
Type = "consul"
AccessTokenFile = '/tmp/edgex/secrets/AppService-functional-tests/consul-token' # ignored in non-secure mode

[Clients]
[Clients.edgex-core-data]
Expand Down
2 changes: 2 additions & 0 deletions res/http-export/configuration.toml
Original file line number Diff line number Diff line change
Expand Up @@ -79,11 +79,13 @@ Protocol = "http"
ReadMaxLimit = 100
StartupMsg = "AppServiceConfigurable-http-export has Started"
Timeout = "5s"
ConfigAccessTokenFile = '/tmp/edgex/secrets/AppService-http-export/consul-token' # ignored in non-secure mode

[Registry]
Host = "localhost"
Port = 8500
Type = "consul"
AccessTokenFile = '/tmp/edgex/secrets/AppService-http-export/consul-token' # ignored in non-secure mode

# Database is require when Store and Forward is enabled
# Note when running in docker from compose file set the following environment variables:
Expand Down
2 changes: 2 additions & 0 deletions res/mqtt-export/configuration.toml
Original file line number Diff line number Diff line change
Expand Up @@ -85,11 +85,13 @@ Protocol = "http"
ReadMaxLimit = 100
StartupMsg = "AppServiceConfigurable-mqtt-export has Started"
Timeout = "5s"
ConfigAccessTokenFile = '/tmp/edgex/secrets/AppService-mqtt-export/consul-token' # ignored in non-secure mode

[Registry]
Host = "localhost"
Port = 8500
Type = "consul"
AccessTokenFile = '/tmp/edgex/secrets/AppService-mqtt-export/consul-token' # ignored in non-secure mode

# Database is require when Store and Forward is enabled
# Note when running in docker from compose file set the following environment variables:
Expand Down
2 changes: 2 additions & 0 deletions res/push-to-core/configuration.toml
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,13 @@ Protocol = "http"
ReadMaxLimit = 100
StartupMsg = "Configurable Application Service Started"
Timeout = "5s"
ConfigAccessTokenFile = '/tmp/edgex/secrets/AppService-push-to-core/consul-token' # ignored in non-secure mode

[Registry]
Host = "localhost"
Port = 8500
Type = "consul"
AccessTokenFile = '/tmp/edgex/secrets/AppService-push-to-core/consul-token' # ignored in non-secure mode

[Clients]
[Clients.edgex-core-data]
Expand Down
2 changes: 2 additions & 0 deletions res/rules-engine-mqtt/configuration.toml
Original file line number Diff line number Diff line change
Expand Up @@ -33,11 +33,13 @@ Protocol = "http"
ReadMaxLimit = 100
StartupMsg = "AppService-rules-engine using MQTT message bus has Started"
Timeout = "5s"
ConfigAccessTokenFile = '/tmp/edgex/secrets/AppService-rules-engine-mqtt/consul-token' # ignored in non-secure mode

[Registry]
Host = "localhost"
Port = 8500
Type = "consul"
AccessTokenFile = '/tmp/edgex/secrets/AppService-rules-engine-mqtt/consul-token' # ignored in non-secure mode

[Clients]
[Clients.edgex-core-data]
Expand Down
2 changes: 2 additions & 0 deletions res/rules-engine-redis/configuration.toml
Original file line number Diff line number Diff line change
Expand Up @@ -43,11 +43,13 @@ Protocol = "http"
ReadMaxLimit = 100
StartupMsg = "AppService-rules-engine using Redis Streams Message Bus has Started"
Timeout = "5s"
ConfigAccessTokenFile = '/tmp/edgex/secrets/AppService-rules-engine-redis/consul-token' # ignored in non-secure mode

[Registry]
Host = "localhost"
Port = 8500
Type = "consul"
AccessTokenFile = '/tmp/edgex/secrets/AppService-rules-engine-redis/consul-token' # ignored in non-secure mode

[Clients]
[Clients.edgex-core-data]
Expand Down
2 changes: 2 additions & 0 deletions res/rules-engine/configuration.toml
Original file line number Diff line number Diff line change
Expand Up @@ -33,11 +33,13 @@ Protocol = "http"
ReadMaxLimit = 100
StartupMsg = "AppService-rules-engine using ZMQ Message Bus has Started"
Timeout = "5s"
ConfigAccessTokenFile = '/tmp/edgex/secrets/AppService-rules-engine/consul-token' # ignored in non-secure mode

[Registry]
Host = "localhost"
Port = 8500
Type = "consul"
AccessTokenFile = '/tmp/edgex/secrets/AppService-rules-engine/consul-token' # ignored in non-secure mode

[Clients]
[Clients.edgex-core-data]
Expand Down
2 changes: 2 additions & 0 deletions res/sample/configuration.toml
Original file line number Diff line number Diff line change
Expand Up @@ -127,11 +127,13 @@ Protocol = "http"
ReadMaxLimit = 100
StartupMsg = "Sample Configurable Application Service Started"
Timeout = "5s"
ConfigAccessTokenFile = '/tmp/edgex/secrets/AppService-sample/consul-token' # ignored in non-secure mode

[Registry]
Host = "localhost"
Port = 8500
Type = "consul"
AccessTokenFile = '/tmp/edgex/secrets/AppService-sample/consul-token' # ignored in non-secure mode

# Database is require when Store and Forward is enabled
[Database]
Expand Down