Skip to content

Commit

Permalink
refactor!: Use config stem from common constants (#1238)
Browse files Browse the repository at this point in the history
* refactor!: Use config stem from common constants

BREAKING CHANGE: Location of service's configuration in Consul has changed

closes #1236

Signed-off-by: Leonard Goodell <leonard.goodell@intel.com>
  • Loading branch information
Lenny Goodell authored Dec 13, 2022
1 parent 1061222 commit d07e074
Show file tree
Hide file tree
Showing 7 changed files with 7 additions and 10 deletions.
1 change: 0 additions & 1 deletion app-service-template/functions/sample.go
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,6 @@ func (s *Sample) LogEventDetails(ctx interfaces.AppFunctionContext, data interfa
lc.Debugf("LogEventDetails called in pipeline '%s'", ctx.PipelineId())

if data == nil {
// Go here for details on Error Handle: https://docs.edgexfoundry.org/latest/microservices/application/ErrorHandling/
return false, fmt.Errorf("function LogEventDetails in pipeline '%s': No Data Received", ctx.PipelineId())
}

Expand Down
2 changes: 1 addition & 1 deletion app-service-template/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ require (
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/diegoholiveira/jsonlogic/v3 v3.2.6 // indirect
github.com/eclipse/paho.mqtt.golang v1.4.2 // indirect
github.com/edgexfoundry/go-mod-bootstrap/v3 v3.0.0-dev.1 // indirect
github.com/edgexfoundry/go-mod-bootstrap/v3 v3.0.0-dev.2 // indirect
github.com/edgexfoundry/go-mod-configuration/v3 v3.0.0-dev.2 // indirect
github.com/edgexfoundry/go-mod-messaging/v3 v3.0.0-dev.1 // indirect
github.com/edgexfoundry/go-mod-registry/v3 v3.0.0-dev.3 // indirect
Expand Down
4 changes: 2 additions & 2 deletions app-service-template/go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,8 @@ github.com/diegoholiveira/jsonlogic/v3 v3.2.6 h1:EV607wRY72hT3V90ZOQw+zjXR9KIUV9
github.com/diegoholiveira/jsonlogic/v3 v3.2.6/go.mod h1:9oE8z9G+0OMxOoLHF3fhek3KuqD5CBqM0B6XFL08MSg=
github.com/eclipse/paho.mqtt.golang v1.4.2 h1:66wOzfUHSSI1zamx7jR6yMEI5EuHnT1G6rNA5PM12m4=
github.com/eclipse/paho.mqtt.golang v1.4.2/go.mod h1:JGt0RsEwEX+Xa/agj90YJ9d9DH2b7upDZMK9HRbFvCA=
github.com/edgexfoundry/go-mod-bootstrap/v3 v3.0.0-dev.1 h1:4Vgy7BJt1oLgLGBm97ePCzNIVxF08NcNYpTHqnOih5o=
github.com/edgexfoundry/go-mod-bootstrap/v3 v3.0.0-dev.1/go.mod h1:hap7XdFAmfYRLRLn5H4Ebr97OlIpEvIpxSiGVR3CLig=
github.com/edgexfoundry/go-mod-bootstrap/v3 v3.0.0-dev.2 h1:W6ti+mcJhUEyNnKXK0WTG/kH8e5gZFwdXPvo0mWWy+w=
github.com/edgexfoundry/go-mod-bootstrap/v3 v3.0.0-dev.2/go.mod h1:hap7XdFAmfYRLRLn5H4Ebr97OlIpEvIpxSiGVR3CLig=
github.com/edgexfoundry/go-mod-configuration/v3 v3.0.0-dev.2 h1:xp5MsP+qf/fuJxy8fT7k1N+c4j4C6w04qMCBXm6id7o=
github.com/edgexfoundry/go-mod-configuration/v3 v3.0.0-dev.2/go.mod h1:1Vv4uWAo6r7k6jUlqVJW8JOL6YKVBc6sRL8Al3DrMck=
github.com/edgexfoundry/go-mod-core-contracts/v3 v3.0.0-dev.2 h1:tleTxhbBISfDNn596rU71n+GOy27dMIme+v8Vl0uhpw=
Expand Down
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ require (
bitbucket.org/bertimus9/systemstat v0.5.0
github.com/diegoholiveira/jsonlogic/v3 v3.2.6
github.com/eclipse/paho.mqtt.golang v1.4.2
github.com/edgexfoundry/go-mod-bootstrap/v3 v3.0.0-dev.1
github.com/edgexfoundry/go-mod-bootstrap/v3 v3.0.0-dev.2
github.com/edgexfoundry/go-mod-core-contracts/v3 v3.0.0-dev.2
github.com/edgexfoundry/go-mod-messaging/v3 v3.0.0-dev.1
github.com/edgexfoundry/go-mod-registry/v3 v3.0.0-dev.3
Expand Down
4 changes: 2 additions & 2 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,8 @@ github.com/diegoholiveira/jsonlogic/v3 v3.2.6 h1:EV607wRY72hT3V90ZOQw+zjXR9KIUV9
github.com/diegoholiveira/jsonlogic/v3 v3.2.6/go.mod h1:9oE8z9G+0OMxOoLHF3fhek3KuqD5CBqM0B6XFL08MSg=
github.com/eclipse/paho.mqtt.golang v1.4.2 h1:66wOzfUHSSI1zamx7jR6yMEI5EuHnT1G6rNA5PM12m4=
github.com/eclipse/paho.mqtt.golang v1.4.2/go.mod h1:JGt0RsEwEX+Xa/agj90YJ9d9DH2b7upDZMK9HRbFvCA=
github.com/edgexfoundry/go-mod-bootstrap/v3 v3.0.0-dev.1 h1:4Vgy7BJt1oLgLGBm97ePCzNIVxF08NcNYpTHqnOih5o=
github.com/edgexfoundry/go-mod-bootstrap/v3 v3.0.0-dev.1/go.mod h1:hap7XdFAmfYRLRLn5H4Ebr97OlIpEvIpxSiGVR3CLig=
github.com/edgexfoundry/go-mod-bootstrap/v3 v3.0.0-dev.2 h1:W6ti+mcJhUEyNnKXK0WTG/kH8e5gZFwdXPvo0mWWy+w=
github.com/edgexfoundry/go-mod-bootstrap/v3 v3.0.0-dev.2/go.mod h1:hap7XdFAmfYRLRLn5H4Ebr97OlIpEvIpxSiGVR3CLig=
github.com/edgexfoundry/go-mod-configuration/v3 v3.0.0-dev.2 h1:xp5MsP+qf/fuJxy8fT7k1N+c4j4C6w04qMCBXm6id7o=
github.com/edgexfoundry/go-mod-configuration/v3 v3.0.0-dev.2/go.mod h1:1Vv4uWAo6r7k6jUlqVJW8JOL6YKVBc6sRL8Al3DrMck=
github.com/edgexfoundry/go-mod-core-contracts/v3 v3.0.0-dev.2 h1:tleTxhbBISfDNn596rU71n+GOy27dMIme+v8Vl0uhpw=
Expand Down
2 changes: 1 addition & 1 deletion internal/app/service.go
Original file line number Diff line number Diff line change
Expand Up @@ -498,7 +498,7 @@ func (svc *Service) Initialize() error {
svc.ctx.appCancelCtx,
svc.flags,
svc.serviceKey,
internal.ConfigRegistryStem,
commonConstants.ConfigStemApp,
svc.config,
configUpdated,
startupTimer,
Expand Down
2 changes: 0 additions & 2 deletions internal/constant.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,6 @@ import (
)

const (
ConfigRegistryStem = "edgex/appservices/"

ApiTriggerRoute = common.ApiBase + "/trigger"
ApiAddSecretRoute = common.ApiBase + "/secret"
)
Expand Down

0 comments on commit d07e074

Please sign in to comment.