fix: resolve comments made in PR #1229 for issue #1199

Signed-off-by: Marc-Philippe Fuller <[email protected]>
edgexfoundry · Nov 30, 2022 · c8c98ea · c8c98ea
1 parent 3ad1ce6
commit c8c98ea
Show file tree

Hide file tree

Showing 7 changed files with 132 additions and 132 deletions.
diff --git a/internal/app/service.go b/internal/app/service.go
@@ -84,7 +84,7 @@ type Service struct {
 	config                     *common.ConfigurationStruct
 	lc                         logger.LoggingClient
 	usingConfigurablePipeline  bool
-	runtime                    *runtime.AppServiceRuntime
+	runtime                    *runtime.FunctionsPipelineRuntime
 	webserver                  *webserver.WebServer
 	ctx                        contextGroup
 	deferredFunctions          []bootstrap.Deferred
@@ -549,7 +549,7 @@ func (svc *Service) Initialize() error {
 		return fmt.Errorf("unable to parse Service.RequestTimeout configuration as a time duration: %s", err.Error())
 	}
 
-	svc.runtime = runtime.NewAppServiceRuntime(svc.serviceKey, svc.targetType, svc.dic)
+	svc.runtime = runtime.NewFunctionPipelineRuntime(svc.serviceKey, svc.targetType, svc.dic)
 
 	// Bootstrapping is complete, so now need to retrieve the needed objects from the containers.
 	svc.lc = bootstrapContainer.LoggingClientFrom(svc.dic.Get)

diff --git a/internal/app/service_test.go b/internal/app/service_test.go
@@ -256,7 +256,7 @@ func TestSetupHTTPTrigger(t *testing.T) {
 		},
 	}
 
-	testRuntime := runtime.NewAppServiceRuntime("", nil, dic)
+	testRuntime := runtime.NewFunctionPipelineRuntime("", nil, dic)
 	testRuntime.SetDefaultFunctionsPipeline(nil)
 
 	sdk.runtime = testRuntime
@@ -276,7 +276,7 @@ func TestSetupMessageBusTrigger(t *testing.T) {
 			},
 		},
 	}
-	testRuntime := runtime.NewAppServiceRuntime("", nil, dic)
+	testRuntime := runtime.NewFunctionPipelineRuntime("", nil, dic)
 	testRuntime.SetDefaultFunctionsPipeline(nil)
 
 	sdk.runtime = testRuntime
@@ -305,7 +305,7 @@ func TestSetDefaultFunctionsPipelineOneTransform(t *testing.T) {
 	service := Service{
 		lc:      lc,
 		dic:     dic,
-		runtime: runtime.NewAppServiceRuntime("", nil, dic),
+		runtime: runtime.NewFunctionPipelineRuntime("", nil, dic),
 		config: &common.ConfigurationStruct{
 			Trigger: common.TriggerInfo{
 				Type: TriggerTypeMessageBus,
@@ -324,7 +324,7 @@ func TestService_AddFunctionsPipelineForTopics(t *testing.T) {
 	service := Service{
 		lc:      lc,
 		dic:     dic,
-		runtime: runtime.NewAppServiceRuntime("", nil, dic),
+		runtime: runtime.NewFunctionPipelineRuntime("", nil, dic),
 		config: &common.ConfigurationStruct{
 			Trigger: common.TriggerInfo{
 				Type: TriggerTypeMessageBus,

diff --git a/internal/app/triggermessageprocessor.go b/internal/app/triggermessageprocessor.go
@@ -41,7 +41,7 @@ import (
 
 type simpleTriggerServiceBinding struct {
 	*Service
-	*runtime.AppServiceRuntime
+	*runtime.FunctionsPipelineRuntime
 }
 
 func (b *simpleTriggerServiceBinding) SecretProvider() messaging.SecretDataProvider {