Skip to content

Commit abca950

Browse files
author
Jim Wang @ Intel
authored
fix: Remove retry related properties and update secret path of SecretStore config (edgexfoundry#272)
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: edgexfoundry#271 Signed-off-by: Jim Wang <yutsung.jim.wang@intel.com>
1 parent 0572519 commit abca950

File tree

7 files changed

+7
-19
lines changed

7 files changed

+7
-19
lines changed

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@ module github.com/edgexfoundry/app-service-configurable
22

33
go 1.16
44

5-
require github.com/edgexfoundry/app-functions-sdk-go/v2 v2.0.0-dev.66
5+
require github.com/edgexfoundry/app-functions-sdk-go/v2 v2.0.0-dev.67

res/functional-tests/configuration.toml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -92,13 +92,11 @@ Type = "consul"
9292
Type = 'vault'
9393
Host = 'localhost'
9494
Port = 8200
95-
Path = '/v1/secret/edgex/app-functional-tests/'
95+
Path = 'app-functional-tests/'
9696
Protocol = 'http'
9797
RootCaCertPath = ''
9898
ServerName = ''
9999
TokenFile = '/tmp/edgex/secrets/app-functional-tests/secrets-token.json'
100-
AdditionalRetryAttempts = 10
101-
RetryWaitPeriod = "1s"
102100
[SecretStore.Authentication]
103101
AuthType = 'X-Vault-Token'
104102

res/http-export/configuration.toml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -101,13 +101,11 @@ Timeout = "30s"
101101
Type = 'vault'
102102
Host = 'localhost'
103103
Port = 8200
104-
Path = '/v1/secret/edgex/app-http-export/'
104+
Path = 'app-http-export/'
105105
Protocol = 'http'
106106
RootCaCertPath = ''
107107
ServerName = ''
108108
TokenFile = '/tmp/edgex/secrets/app-http-export/secrets-token.json'
109-
AdditionalRetryAttempts = 10
110-
RetryWaitPeriod = "1s"
111109
[SecretStore.Authentication]
112110
AuthType = 'X-Vault-Token'
113111

res/mqtt-export/configuration.toml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -109,13 +109,11 @@ Timeout = "30s"
109109
Type = 'vault'
110110
Host = 'localhost'
111111
Port = 8200
112-
Path = '/v1/secret/edgex/app-mqtt-export/'
112+
Path = 'app-mqtt-export/'
113113
Protocol = 'http'
114114
RootCaCertPath = ''
115115
ServerName = ''
116116
TokenFile = '/tmp/edgex/secrets/app-mqtt-export/secrets-token.json'
117-
AdditionalRetryAttempts = 10
118-
RetryWaitPeriod = "1s"
119117
[SecretStore.Authentication]
120118
AuthType = 'X-Vault-Token'
121119

res/push-to-core/configuration.toml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,13 +38,11 @@ Type = "consul"
3838
Type = 'vault'
3939
Host = 'localhost'
4040
Port = 8200
41-
Path = '/v1/secret/edgex/app-push-to-core/'
41+
Path = 'app-push-to-core/'
4242
Protocol = 'http'
4343
RootCaCertPath = ''
4444
ServerName = ''
4545
TokenFile = '/tmp/edgex/secrets/app-push-to-core/secrets-token.json'
46-
AdditionalRetryAttempts = 10
47-
RetryWaitPeriod = "1s"
4846
[SecretStore.Authentication]
4947
AuthType = 'X-Vault-Token'
5048

res/rules-engine/configuration.toml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -61,13 +61,11 @@ Timeout = "30s"
6161
Type = 'vault'
6262
Host = 'localhost'
6363
Port = 8200
64-
Path = '/v1/secret/edgex/app-rules-engine/'
64+
Path = 'app-rules-engine/'
6565
Protocol = 'http'
6666
RootCaCertPath = ''
6767
ServerName = ''
6868
TokenFile = '/tmp/edgex/secrets/app-rules-engine/secrets-token.json'
69-
AdditionalRetryAttempts = 10
70-
RetryWaitPeriod = "1s"
7169
[SecretStore.Authentication]
7270
AuthType = 'X-Vault-Token'
7371

res/sample/configuration.toml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -151,13 +151,11 @@ Timeout = "30s"
151151
Type = 'vault'
152152
Host = 'localhost'
153153
Port = 8200
154-
Path = '/v1/secret/edgex/app-sample/'
154+
Path = 'app-sample/'
155155
Protocol = 'http'
156156
RootCaCertPath = ''
157157
ServerName = ''
158158
TokenFile = '/tmp/edgex/secrets/app-sample/secrets-token.json'
159-
AdditionalRetryAttempts = 10
160-
RetryWaitPeriod = "1s"
161159
[SecretStore.Authentication]
162160
AuthType = 'X-Vault-Token'
163161

0 commit comments

Comments
 (0)