Skip to content

Commit

Permalink
refactor!: Rename command line flags for the sake of consistency (#492)
Browse files Browse the repository at this point in the history
BREAKING CHANGE: renamed -c/--confdir to -cd/--configDirand -f/--file to -cf/--configFile

Signed-off-by: Leonard Goodell <leonard.goodell@intel.com>
  • Loading branch information
Lenny Goodell authored Jan 3, 2023
1 parent 567a951 commit cb787cf
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 12 deletions.
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -61,5 +61,5 @@ EXPOSE 48095
# SDK initialization failed: Could not load configuration file (./res/configuration.toml)...

ENTRYPOINT ["/app-service-configurable"]
CMD ["-cp=consul.http://edgex-core-consul:8500", "--registry", "--confdir=/res"]
CMD ["-cp=consul.http://edgex-core-consul:8500", "--registry"]

6 changes: 3 additions & 3 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ module github.com/edgexfoundry/app-service-configurable

go 1.18

require github.com/edgexfoundry/app-functions-sdk-go/v3 v3.0.0-dev.6
require github.com/edgexfoundry/app-functions-sdk-go/v3 v3.0.0-dev.7

require (
bitbucket.org/bertimus9/systemstat v0.5.0 // indirect
Expand All @@ -11,10 +11,10 @@ require (
github.com/cenkalti/backoff v2.2.1+incompatible // 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.2 // indirect
github.com/edgexfoundry/go-mod-bootstrap/v3 v3.0.0-dev.5 // indirect
github.com/edgexfoundry/go-mod-configuration/v3 v3.0.0-dev.2 // indirect
github.com/edgexfoundry/go-mod-core-contracts/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-messaging/v3 v3.0.0-dev.2 // indirect
github.com/edgexfoundry/go-mod-registry/v3 v3.0.0-dev.3 // indirect
github.com/edgexfoundry/go-mod-secrets/v3 v3.0.0-dev.1 // indirect
github.com/fatih/color v1.9.0 // indirect
Expand Down
14 changes: 7 additions & 7 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -45,16 +45,16 @@ 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/app-functions-sdk-go/v3 v3.0.0-dev.6 h1:Hbs4DM92zInIOVchKbhVBIi2JFpA6olrjOif3FMp2+0=
github.com/edgexfoundry/app-functions-sdk-go/v3 v3.0.0-dev.6/go.mod h1:dyF9VdIZnmmtZJtiy3ZXoEZp4nOei++qggdi0WVeu34=
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/app-functions-sdk-go/v3 v3.0.0-dev.7 h1:PiXBmWcOa+xhbPkLINNwQNxeG7BPAi1d1SUZzWGKhQk=
github.com/edgexfoundry/app-functions-sdk-go/v3 v3.0.0-dev.7/go.mod h1:rDrEMtfZDpnDXR4ocLNi+9IowvjqpRaTGHVgkKU+WpY=
github.com/edgexfoundry/go-mod-bootstrap/v3 v3.0.0-dev.5 h1:3WMWQ0oi++KFrau/e8BOTqgzORCa3G7bLG0w/wO72Io=
github.com/edgexfoundry/go-mod-bootstrap/v3 v3.0.0-dev.5/go.mod h1:cGXMUtbbzw+npJpMcFHPlXIN+ZPF71aiimhJ6v8kaSc=
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=
github.com/edgexfoundry/go-mod-core-contracts/v3 v3.0.0-dev.2/go.mod h1:7RwSq896VqelvSU7zYKs2tpZhgELVFECkiGf6XGLKfQ=
github.com/edgexfoundry/go-mod-messaging/v3 v3.0.0-dev.1 h1:TxRYbF8pWGsHHW8Q1i5uqudCNKsDZG5PR5NYwSRJTSg=
github.com/edgexfoundry/go-mod-messaging/v3 v3.0.0-dev.1/go.mod h1:8weo8jqtlN/lhglBEaFpysftIuFLkCmh6k/dHhPa7IY=
github.com/edgexfoundry/go-mod-messaging/v3 v3.0.0-dev.2 h1:bNXJHfxTo/1SzQbiJQUnySUGVP5i2FNwFsXQ+RzqR8Q=
github.com/edgexfoundry/go-mod-messaging/v3 v3.0.0-dev.2/go.mod h1:G0Vxoc8+JXwUqRH5ggyOZ/f/CIVPTswI5Ld7dI5uhIY=
github.com/edgexfoundry/go-mod-registry/v3 v3.0.0-dev.3 h1:QgZF9f70Cwpvkjw3tP1aiVGHc+yNFJNzW6hO8pDs3fg=
github.com/edgexfoundry/go-mod-registry/v3 v3.0.0-dev.3/go.mod h1:2w8v0sv+i21nY+DY6JV4PFxsNTuxpGAjlNFlFMTfZkk=
github.com/edgexfoundry/go-mod-secrets/v3 v3.0.0-dev.1 h1:dib+mZUuHqwVHt9pKAWC4lh60Fbc+6vKrD919LaknwI=
Expand Down Expand Up @@ -230,7 +230,7 @@ github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lN
github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U=
github.com/nats-io/jwt/v2 v2.3.0 h1:z2mA1a7tIf5ShggOFlR1oBPgd6hGqcDYsISxZByUzdI=
github.com/nats-io/nats-server/v2 v2.9.8 h1:jgxZsv+A3Reb3MgwxaINcNq/za8xZInKhDg9Q0cGN1o=
github.com/nats-io/nats-server/v2 v2.9.9 h1:bmj0RhvHOc8+z5/RuhI38GqPwtkFAHQuU3e99FVA/TI=
github.com/nats-io/nats.go v1.20.0 h1:T8JJnQfVSdh1CzGiwAOv5hEobYCBho/0EupGznYw0oM=
github.com/nats-io/nats.go v1.20.0/go.mod h1:tLqubohF7t4z3du1QDPYJIQQyhb4wl6DhjxEajSI7UA=
github.com/nats-io/nkeys v0.3.0 h1:cgM5tL53EvYRU+2YLXIK0G2mJtK12Ft9oeooSZMA2G8=
Expand Down
2 changes: 1 addition & 1 deletion snap/local/bin/service-wrapper.sh
Original file line number Diff line number Diff line change
Expand Up @@ -20,5 +20,5 @@ if [ -n "$EDGEX_STARTUP_INTERVAL" ]; then
export EDGEX_STARTUP_INTERVAL
fi

$SNAP/bin/app-service-configurable -confdir $SNAP_DATA/config/res $PROFILE_OPT -cp -r
$SNAP/bin/app-service-configurable -configDir $SNAP_DATA/config/res $PROFILE_OPT -cp -r

0 comments on commit cb787cf

Please sign in to comment.