From 9e3e658487743b9bb3b2f9fd7aaa7653790d36a4 Mon Sep 17 00:00:00 2001
From: lenny <leonard.goodell@intel.com>
Date: Wed, 12 May 2021 15:58:22 -0700
Subject: [PATCH] refactor: Update for new service key names and overrides for
 hyphen to underscore

closes #252
closes #235

BREAKING CHANGE: Service key names used in configuration have changed.

Signed-off-by: lenny <leonard.goodell@intel.com>
---
 go.mod                                  | 6 ++++++
 res/functional-tests/configuration.toml | 2 +-
 res/http-export/configuration.toml      | 2 +-
 res/mqtt-export/configuration.toml      | 2 +-
 res/push-to-core/configuration.toml     | 2 +-
 res/rules-engine/configuration.toml     | 2 +-
 res/sample/configuration.toml           | 2 +-
 7 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/go.mod b/go.mod
index 04518ce9..ff60379c 100644
--- a/go.mod
+++ b/go.mod
@@ -3,3 +3,9 @@ module github.com/edgexfoundry/app-service-configurable
 go 1.16
 
 require github.com/edgexfoundry/app-functions-sdk-go/v2 v2.0.0-dev.58
+
+replace (
+	github.com/edgexfoundry/app-functions-sdk-go/v2 => ../app-functions-sdk-go
+	github.com/edgexfoundry/go-mod-bootstrap/v2 => ../MODS/go-mod-bootstrap
+    github.com/edgexfoundry/go-mod-core-contracts/v2 => ../MODS/go-mod-core-contracts
+)
\ No newline at end of file
diff --git a/res/functional-tests/configuration.toml b/res/functional-tests/configuration.toml
index 8c6e9952..91f73f50 100644
--- a/res/functional-tests/configuration.toml
+++ b/res/functional-tests/configuration.toml
@@ -78,7 +78,7 @@ Port = 8500
 Type = "consul"
 
 [Clients]
-  [Clients.edgex-core-data]
+  [Clients.core-data]
   Protocol = "http"
   Host = "localhost"
   Port = 48080
diff --git a/res/http-export/configuration.toml b/res/http-export/configuration.toml
index 4e1a2076..90922523 100644
--- a/res/http-export/configuration.toml
+++ b/res/http-export/configuration.toml
@@ -113,7 +113,7 @@ RetryWaitPeriod = "1s"
   AuthType = 'X-Vault-Token'
 
 [Clients]
-  [Clients.edgex-core-data]
+  [Clients.core-data]
   Protocol = "http"
   Host = "localhost"
   Port = 48080
diff --git a/res/mqtt-export/configuration.toml b/res/mqtt-export/configuration.toml
index 71994a7e..731f2401 100644
--- a/res/mqtt-export/configuration.toml
+++ b/res/mqtt-export/configuration.toml
@@ -119,7 +119,7 @@ RetryWaitPeriod = "1s"
   AuthType = 'X-Vault-Token'
 
 [Clients]
-  [Clients.edgex-core-data]
+  [Clients.core-data]
   Protocol = "http"
   Host = "localhost"
   Port = 48080
diff --git a/res/push-to-core/configuration.toml b/res/push-to-core/configuration.toml
index c9def332..a8ca9b54 100644
--- a/res/push-to-core/configuration.toml
+++ b/res/push-to-core/configuration.toml
@@ -26,7 +26,7 @@ Port = 8500
 Type = "consul"
 
 [Clients]
-  [Clients.edgex-core-data]
+  [Clients.core-data]
   Protocol = "http"
   Host = "localhost"
   Port = 48080
diff --git a/res/rules-engine/configuration.toml b/res/rules-engine/configuration.toml
index 6dd8d781..4ab708ef 100644
--- a/res/rules-engine/configuration.toml
+++ b/res/rules-engine/configuration.toml
@@ -73,7 +73,7 @@ RetryWaitPeriod = "1s"
   AuthType = 'X-Vault-Token'
 
 [Clients]
-  [Clients.edgex-core-data]
+  [Clients.core-data]
   Protocol = "http"
   Host = "localhost"
   Port = 48080
diff --git a/res/sample/configuration.toml b/res/sample/configuration.toml
index af42b820..7258f2eb 100644
--- a/res/sample/configuration.toml
+++ b/res/sample/configuration.toml
@@ -161,7 +161,7 @@ RetryWaitPeriod = "1s"
   AuthType = 'X-Vault-Token'
 
 [Clients]
-  [Clients.edgex-core-data]
+  [Clients.core-data]
   Protocol = "http"
   Host = "localhost"
   Port = 48080