diff --git a/go.mod b/go.mod index bc1f1302..394ef3bb 100644 --- a/go.mod +++ b/go.mod @@ -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 diff --git a/res/functional-tests/configuration.toml b/res/functional-tests/configuration.toml index 3090cef0..ca4ec3eb 100644 --- a/res/functional-tests/configuration.toml +++ b/res/functional-tests/configuration.toml @@ -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] diff --git a/res/http-export/configuration.toml b/res/http-export/configuration.toml index c1fb5fb6..2363286a 100644 --- a/res/http-export/configuration.toml +++ b/res/http-export/configuration.toml @@ -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: diff --git a/res/mqtt-export/configuration.toml b/res/mqtt-export/configuration.toml index 7220a9d4..ef8dce38 100644 --- a/res/mqtt-export/configuration.toml +++ b/res/mqtt-export/configuration.toml @@ -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: diff --git a/res/push-to-core/configuration.toml b/res/push-to-core/configuration.toml index f6551c56..0d2933da 100644 --- a/res/push-to-core/configuration.toml +++ b/res/push-to-core/configuration.toml @@ -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] diff --git a/res/rules-engine-mqtt/configuration.toml b/res/rules-engine-mqtt/configuration.toml index d9d737c9..ffe123d4 100644 --- a/res/rules-engine-mqtt/configuration.toml +++ b/res/rules-engine-mqtt/configuration.toml @@ -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] diff --git a/res/rules-engine-redis/configuration.toml b/res/rules-engine-redis/configuration.toml index a4e6b9c2..ba07be2b 100644 --- a/res/rules-engine-redis/configuration.toml +++ b/res/rules-engine-redis/configuration.toml @@ -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] diff --git a/res/rules-engine/configuration.toml b/res/rules-engine/configuration.toml index 5a4f69a8..2ffc9354 100644 --- a/res/rules-engine/configuration.toml +++ b/res/rules-engine/configuration.toml @@ -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] diff --git a/res/sample/configuration.toml b/res/sample/configuration.toml index 0f74c35f..43bb7908 100644 --- a/res/sample/configuration.toml +++ b/res/sample/configuration.toml @@ -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]