Skip to content

Commit

Permalink
fix: Remove retry related properties and update secret path of Secret…
Browse files Browse the repository at this point in the history
…Store config

SecretStore config no longer support Retry related properties and secret path now only needs service specific path, /v1/secret/edgex/ automatically prefix in front of it.

Fixes: #271

Signed-off-by: Jim Wang <yutsung.jim.wang@intel.com>
  • Loading branch information
jim-wang-intel committed May 27, 2021
1 parent 0572519 commit 0f39b46
Show file tree
Hide file tree
Showing 7 changed files with 7 additions and 19 deletions.
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.16

require github.com/edgexfoundry/app-functions-sdk-go/v2 v2.0.0-dev.66
require github.com/edgexfoundry/app-functions-sdk-go/v2 v2.0.0-dev.67
4 changes: 1 addition & 3 deletions res/functional-tests/configuration.toml
Original file line number Diff line number Diff line change
Expand Up @@ -92,13 +92,11 @@ Type = "consul"
Type = 'vault'
Host = 'localhost'
Port = 8200
Path = '/v1/secret/edgex/app-functional-tests/'
Path = 'app-functional-tests/'
Protocol = 'http'
RootCaCertPath = ''
ServerName = ''
TokenFile = '/tmp/edgex/secrets/app-functional-tests/secrets-token.json'
AdditionalRetryAttempts = 10
RetryWaitPeriod = "1s"
[SecretStore.Authentication]
AuthType = 'X-Vault-Token'

Expand Down
4 changes: 1 addition & 3 deletions res/http-export/configuration.toml
Original file line number Diff line number Diff line change
Expand Up @@ -101,13 +101,11 @@ Timeout = "30s"
Type = 'vault'
Host = 'localhost'
Port = 8200
Path = '/v1/secret/edgex/app-http-export/'
Path = 'app-http-export/'
Protocol = 'http'
RootCaCertPath = ''
ServerName = ''
TokenFile = '/tmp/edgex/secrets/app-http-export/secrets-token.json'
AdditionalRetryAttempts = 10
RetryWaitPeriod = "1s"
[SecretStore.Authentication]
AuthType = 'X-Vault-Token'

Expand Down
4 changes: 1 addition & 3 deletions res/mqtt-export/configuration.toml
Original file line number Diff line number Diff line change
Expand Up @@ -109,13 +109,11 @@ Timeout = "30s"
Type = 'vault'
Host = 'localhost'
Port = 8200
Path = '/v1/secret/edgex/app-mqtt-export/'
Path = 'app-mqtt-export/'
Protocol = 'http'
RootCaCertPath = ''
ServerName = ''
TokenFile = '/tmp/edgex/secrets/app-mqtt-export/secrets-token.json'
AdditionalRetryAttempts = 10
RetryWaitPeriod = "1s"
[SecretStore.Authentication]
AuthType = 'X-Vault-Token'

Expand Down
4 changes: 1 addition & 3 deletions res/push-to-core/configuration.toml
Original file line number Diff line number Diff line change
Expand Up @@ -38,13 +38,11 @@ Type = "consul"
Type = 'vault'
Host = 'localhost'
Port = 8200
Path = '/v1/secret/edgex/app-push-to-core/'
Path = 'app-push-to-core/'
Protocol = 'http'
RootCaCertPath = ''
ServerName = ''
TokenFile = '/tmp/edgex/secrets/app-push-to-core/secrets-token.json'
AdditionalRetryAttempts = 10
RetryWaitPeriod = "1s"
[SecretStore.Authentication]
AuthType = 'X-Vault-Token'

Expand Down
4 changes: 1 addition & 3 deletions res/rules-engine/configuration.toml
Original file line number Diff line number Diff line change
Expand Up @@ -61,13 +61,11 @@ Timeout = "30s"
Type = 'vault'
Host = 'localhost'
Port = 8200
Path = '/v1/secret/edgex/app-rules-engine/'
Path = 'app-rules-engine/'
Protocol = 'http'
RootCaCertPath = ''
ServerName = ''
TokenFile = '/tmp/edgex/secrets/app-rules-engine/secrets-token.json'
AdditionalRetryAttempts = 10
RetryWaitPeriod = "1s"
[SecretStore.Authentication]
AuthType = 'X-Vault-Token'

Expand Down
4 changes: 1 addition & 3 deletions res/sample/configuration.toml
Original file line number Diff line number Diff line change
Expand Up @@ -151,13 +151,11 @@ Timeout = "30s"
Type = 'vault'
Host = 'localhost'
Port = 8200
Path = '/v1/secret/edgex/app-sample/'
Path = 'app-sample/'
Protocol = 'http'
RootCaCertPath = ''
ServerName = ''
TokenFile = '/tmp/edgex/secrets/app-sample/secrets-token.json'
AdditionalRetryAttempts = 10
RetryWaitPeriod = "1s"
[SecretStore.Authentication]
AuthType = 'X-Vault-Token'

Expand Down

0 comments on commit 0f39b46

Please sign in to comment.