fix logic issue

dgate-io · May 20, 2024 · a156517 · a156517
1 parent b231146
commit a156517
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 50 deletions.
diff --git a/functional-tests/admin_tests/modify_response_test.sh b/functional-tests/admin_tests/modify_response_test.sh
@@ -37,6 +37,6 @@ dgate-cli route create \
     namespace=test-ns \
     service='base_svc'
 
-curl ${PROXY_URL}/test -H Host:test.com
+curl -s ${PROXY_URL}/test -H Host:test.com
 
 echo "Modify Response Test Passed"
diff --git a/internal/proxy/module_extractor.go b/internal/proxy/module_extractor.go
@@ -101,10 +101,7 @@ func (me *moduleExtract) RequestHandlerFunc() (extractors.RequestHandlerFunc, bo
 }
 
 func NewDefaultModuleExtractor() ModuleExtractor {
-	return &moduleExtract{
-		fetchUpstreamUrl: extractors.DefaultFetchUpstreamFunction(),
-		errorHandler:     extractors.DefaultErrorHandlerFunction(),
-	}
+	return &moduleExtract{}
 }
 
 type ModuleExtractorFunc func(*RequestContextProvider) (ModuleExtractor, error)
diff --git a/pkg/modules/types/module_context.go b/pkg/modules/types/module_context.go
@@ -61,16 +61,16 @@ func (modCtx *ModuleContext) Params() map[string]string {
 	return modCtx.params
 }
 
-func (modCtx *ModuleContext) Route() spec.Route {
-	return *modCtx.route
+func (modCtx *ModuleContext) Route() *spec.Route {
+	return modCtx.route
 }
 
-func (modCtx *ModuleContext) Service() spec.Service {
-	return *modCtx.svc
+func (modCtx *ModuleContext) Service() *spec.Service {
+	return modCtx.svc
 }
 
-func (modCtx *ModuleContext) Namespace() spec.Namespace {
-	return *modCtx.ns
+func (modCtx *ModuleContext) Namespace() *spec.Namespace {
+	return modCtx.ns
 }
 
 func (modCtx *ModuleContext) Request() *RequestWrapper {

diff --git a/pkg/modules/types/wrapper_test.go b/pkg/modules/types/wrapper_test.go
diff --git a/pkg/scheduler/scheduler_test.go b/pkg/scheduler/scheduler_test.go
@@ -115,7 +115,7 @@ func TestScheduleTask_Overwrite(t *testing.T) {
 	assert.True(t, test2Flag.Load())
 }
 
-func TestScheduleTask_TimeoutIntervalFail(t *testing.T) {
+func TestScheduleTask_TimeoutIntervalError(t *testing.T) {
 	sch := scheduler.New(scheduler.Options{
 		Interval: time.Millisecond * 10,
 		AutoRun:  true,