Merge pull request #22 from microsoftgraph/bugfix/middleware-pipeline

baywet · web-flow · commit 650ddc193328 · 2021-12-03T05:20:23.000-08:00
single execution middleware pipeline fix
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -11,6 +11,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Changed
 
+## [0.0.5] - 2021-12-02
+
+### Changed
+
+- Fixes a bug where the middleware pipeline would run only on the first request of the client/adapter/http client.
+
 ## [0.0.4] - 2021-12-01
 
 ### Changed
diff --git a/go.mod b/go.mod
@@ -4,8 +4,8 @@ go 1.17
 
 require (
 	github.com/google/uuid v1.3.0
-	github.com/microsoft/kiota/abstractions/go v0.0.0-20211201125630-3501743a5dc5
-	github.com/microsoft/kiota/http/go/nethttp v0.0.0-20211130101617-a4871ba0f35f
+	github.com/microsoft/kiota/abstractions/go v0.0.0-20211202082735-099f3c37853a
+	github.com/microsoft/kiota/http/go/nethttp v0.0.0-20211203130928-8449c9e67101
 	github.com/stretchr/testify v1.7.0
 )
 
diff --git a/go.sum b/go.sum
@@ -14,10 +14,16 @@ github.com/microsoft/kiota/abstractions/go v0.0.0-20211130101617-a4871ba0f35f h1
 github.com/microsoft/kiota/abstractions/go v0.0.0-20211130101617-a4871ba0f35f/go.mod h1:m37MbLdeSZ7DBzKtGI+GmlDSIybJBkKhsvLMqkYosb8=
 github.com/microsoft/kiota/abstractions/go v0.0.0-20211201125630-3501743a5dc5 h1:IL8rUlP+UMFRvL/bu26HkVMnhU7I5IWKciDIWOAQfEQ=
 github.com/microsoft/kiota/abstractions/go v0.0.0-20211201125630-3501743a5dc5/go.mod h1:m37MbLdeSZ7DBzKtGI+GmlDSIybJBkKhsvLMqkYosb8=
+github.com/microsoft/kiota/abstractions/go v0.0.0-20211202082735-099f3c37853a h1:c2vBeXjRwGJUL7aG1gHFwB+LpdDL20XKIOKQWKUoNQk=
+github.com/microsoft/kiota/abstractions/go v0.0.0-20211202082735-099f3c37853a/go.mod h1:m37MbLdeSZ7DBzKtGI+GmlDSIybJBkKhsvLMqkYosb8=
 github.com/microsoft/kiota/authentication/go/azure v0.0.0-20211201125630-3501743a5dc5 h1:d1ilFuzPOvADm4xiFHJ1SZ00SufAgyqfVXd3TCtS8c0=
 github.com/microsoft/kiota/authentication/go/azure v0.0.0-20211201125630-3501743a5dc5/go.mod h1:bmdumwBCIHlVdafcpHNNGzySN/v2mImqWTPgV1adBmA=
 github.com/microsoft/kiota/http/go/nethttp v0.0.0-20211130101617-a4871ba0f35f h1:1VRJ6bj+YljEUqXRf+MgPWdfJZf85/juVCwkS7GviZ8=
 github.com/microsoft/kiota/http/go/nethttp v0.0.0-20211130101617-a4871ba0f35f/go.mod h1:GHdBYJaaiuZKz78KcLSrjcin5FGXUK3e0wlX69NJMwE=
+github.com/microsoft/kiota/http/go/nethttp v0.0.0-20211202082735-099f3c37853a h1:w93KbR22weJ4CKHepKHkirx18j0XMShPWjSRn5ziMwA=
+github.com/microsoft/kiota/http/go/nethttp v0.0.0-20211202082735-099f3c37853a/go.mod h1:GHdBYJaaiuZKz78KcLSrjcin5FGXUK3e0wlX69NJMwE=
+github.com/microsoft/kiota/http/go/nethttp v0.0.0-20211203130928-8449c9e67101 h1:kTG9Tg52O2gNm8LzwyiPyjFendknhU4iqnylDjKQgNU=
+github.com/microsoft/kiota/http/go/nethttp v0.0.0-20211203130928-8449c9e67101/go.mod h1:GHdBYJaaiuZKz78KcLSrjcin5FGXUK3e0wlX69NJMwE=
 github.com/modocache/gover v0.0.0-20171022184752-b58185e213c5/go.mod h1:caMODM3PzxT8aQXRPkAt8xlV/e7d7w8GM5g0fa5F0D8=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
diff --git a/graph_odata_query_handler.go b/graph_odata_query_handler.go
@@ -54,11 +54,11 @@ func NewGraphODataQueryHandlerWithOptions(options GraphODataQueryHandlerOptions)
 	}
 }
 
-func (middleware GraphODataQueryHandler) Intercept(pipeline khttp.Pipeline, req *nethttp.Request) (*nethttp.Response, error) {
+func (middleware GraphODataQueryHandler) Intercept(pipeline khttp.Pipeline, middlewareIndex int, req *nethttp.Request) (*nethttp.Response, error) {
 	reqOption, ok := req.Context().Value(keyValue).(graphODataQueryHandlerOptionsInt)
 	if ok && reqOption.GetShouldReplace()(req) || !ok && middleware.handlerOptions.ShouldReplace(req) {
 		req.URL.RawQuery = middleware.regex.ReplaceAllString("?"+req.URL.RawQuery, "$1$$$2=")[1:]
 		// inserting and removing the ? sign so we can make no dollar mandatory and avoid adding a second dollar when already here
 	}
-	return pipeline.Next(req)
+	return pipeline.Next(req, middlewareIndex)
 }
diff --git a/graph_odata_query_handler_test.go b/graph_odata_query_handler_test.go
@@ -23,7 +23,7 @@ func TestItReplacesQueryParameters(t *testing.T) {
 	if err != nil {
 		t.Error(err)
 	}
-	resp, err := handler.Intercept(newNoopPipeline(), req)
+	resp, err := handler.Intercept(newNoopPipeline(), 0, req)
 	if err != nil {
 		t.Error(err)
 	}
diff --git a/graph_telemetry_handler.go b/graph_telemetry_handler.go
@@ -43,8 +43,8 @@ func NewGraphTelemetryHandler(options *GraphClientOptions) *GraphTelemetryHandle
 		sdkVersion: serviceVersionPrefix + "graph-go-core/" + CoreVersion + featuresSuffix,
 	}
 }
-func (middleware GraphTelemetryHandler) Intercept(pipeline khttp.Pipeline, req *nethttp.Request) (*nethttp.Response, error) {
+func (middleware GraphTelemetryHandler) Intercept(pipeline khttp.Pipeline, middlewareIndex int, req *nethttp.Request) (*nethttp.Response, error) {
 	req.Header.Add("SdkVersion", middleware.sdkVersion)
 	req.Header.Add("client-request-id", uuid.NewString())
-	return pipeline.Next(req)
+	return pipeline.Next(req, middlewareIndex)
 }
diff --git a/graph_telemetry_handler_test.go b/graph_telemetry_handler_test.go
@@ -12,7 +12,7 @@ type NoopPipeline struct {
 	client *nethttp.Client
 }
 
-func (pipeline *NoopPipeline) Next(req *nethttp.Request) (*nethttp.Response, error) {
+func (pipeline *NoopPipeline) Next(req *nethttp.Request, middlewareIndex int) (*nethttp.Response, error) {
 	return pipeline.client.Do(req)
 }
 func newNoopPipeline() *NoopPipeline {
@@ -39,7 +39,7 @@ func TestItAddsHeaders(t *testing.T) {
 	if err != nil {
 		t.Error(err)
 	}
-	resp, err := handler.Intercept(newNoopPipeline(), req)
+	resp, err := handler.Intercept(newNoopPipeline(), 0, req)
 	if err != nil {
 		t.Error(err)
 	}
@@ -66,7 +66,7 @@ func TestItAddsServiceLibInfo(t *testing.T) {
 	if err != nil {
 		t.Error(err)
 	}
-	resp, err := handler.Intercept(newNoopPipeline(), req)
+	resp, err := handler.Intercept(newNoopPipeline(), 0, req)
 	if err != nil {
 		t.Error(err)
 	}
@@ -90,7 +90,7 @@ func TestItAddsServiceInfo(t *testing.T) {
 	if err != nil {
 		t.Error(err)
 	}
-	resp, err := handler.Intercept(newNoopPipeline(), req)
+	resp, err := handler.Intercept(newNoopPipeline(), 0, req)
 	if err != nil {
 		t.Error(err)
 	}
diff --git a/version.go b/version.go
@@ -1,3 +1,3 @@
 package msgraphgocore
 
-var CoreVersion = "0.0.4"
+var CoreVersion = "0.0.5"

Original file line number	Diff line number	Diff line change
`@@ -4,8 +4,8 @@ go 1.17`
`4`	`4`
`5`	`5`	`require (`
`6`	`6`	`github.com/google/uuid v1.3.0`
`7`		`- github.com/microsoft/kiota/abstractions/go v0.0.0-20211201125630-3501743a5dc5`
`8`		`- github.com/microsoft/kiota/http/go/nethttp v0.0.0-20211130101617-a4871ba0f35f`
	`7`	`+ github.com/microsoft/kiota/abstractions/go v0.0.0-20211202082735-099f3c37853a`
	`8`	`+ github.com/microsoft/kiota/http/go/nethttp v0.0.0-20211203130928-8449c9e67101`
`9`	`9`	`github.com/stretchr/testify v1.7.0`
`10`	`10`	`)`
`11`	`11`
Original file line number	Diff line number	Diff line change
`@@ -54,11 +54,11 @@ func NewGraphODataQueryHandlerWithOptions(options GraphODataQueryHandlerOptions)`
`54`	`54`	`}`
`55`	`55`	`}`
`56`	`56`
`57`		`-func (middleware GraphODataQueryHandler) Intercept(pipeline khttp.Pipeline, req nethttp.Request) (nethttp.Response, error) {`
	`57`	`+func (middleware GraphODataQueryHandler) Intercept(pipeline khttp.Pipeline, middlewareIndex int, req nethttp.Request) (nethttp.Response, error) {`
`58`	`58`	`reqOption, ok := req.Context().Value(keyValue).(graphODataQueryHandlerOptionsInt)`
`59`	`59`	`if ok && reqOption.GetShouldReplace()(req) \|\| !ok && middleware.handlerOptions.ShouldReplace(req) {`
`60`	`60`	`req.URL.RawQuery = middleware.regex.ReplaceAllString("?"+req.URL.RawQuery, "$1$$$2=")[1:]`
`61`	`61`	`// inserting and removing the ? sign so we can make no dollar mandatory and avoid adding a second dollar when already here`
`62`	`62`	`}`
`63`		`- return pipeline.Next(req)`
	`63`	`+ return pipeline.Next(req, middlewareIndex)`
`64`	`64`	`}`
Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@ func TestItReplacesQueryParameters(t *testing.T) {`
`23`	`23`	`if err != nil {`
`24`	`24`	`t.Error(err)`
`25`	`25`	`}`
`26`		`- resp, err := handler.Intercept(newNoopPipeline(), req)`
	`26`	`+ resp, err := handler.Intercept(newNoopPipeline(), 0, req)`
`27`	`27`	`if err != nil {`
`28`	`28`	`t.Error(err)`
`29`	`29`	`}`
Original file line number	Diff line number	Diff line change
`@@ -43,8 +43,8 @@ func NewGraphTelemetryHandler(options GraphClientOptions) GraphTelemetryHandle`
`43`	`43`	`sdkVersion: serviceVersionPrefix + "graph-go-core/" + CoreVersion + featuresSuffix,`
`44`	`44`	`}`
`45`	`45`	`}`
`46`		`-func (middleware GraphTelemetryHandler) Intercept(pipeline khttp.Pipeline, req nethttp.Request) (nethttp.Response, error) {`
	`46`	`+func (middleware GraphTelemetryHandler) Intercept(pipeline khttp.Pipeline, middlewareIndex int, req nethttp.Request) (nethttp.Response, error) {`
`47`	`47`	`req.Header.Add("SdkVersion", middleware.sdkVersion)`
`48`	`48`	`req.Header.Add("client-request-id", uuid.NewString())`
`49`		`- return pipeline.Next(req)`
	`49`	`+ return pipeline.Next(req, middlewareIndex)`
`50`	`50`	`}`
Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@ type NoopPipeline struct {`
`12`	`12`	`client *nethttp.Client`
`13`	`13`	`}`
`14`	`14`
`15`		`-func (pipeline NoopPipeline) Next(req nethttp.Request) (*nethttp.Response, error) {`
	`15`	`+func (pipeline NoopPipeline) Next(req nethttp.Request, middlewareIndex int) (*nethttp.Response, error) {`
`16`	`16`	`return pipeline.client.Do(req)`
`17`	`17`	`}`
`18`	`18`	`func newNoopPipeline() *NoopPipeline {`
`@@ -39,7 +39,7 @@ func TestItAddsHeaders(t *testing.T) {`
`39`	`39`	`if err != nil {`
`40`	`40`	`t.Error(err)`
`41`	`41`	`}`
`42`		`- resp, err := handler.Intercept(newNoopPipeline(), req)`
	`42`	`+ resp, err := handler.Intercept(newNoopPipeline(), 0, req)`
`43`	`43`	`if err != nil {`
`44`	`44`	`t.Error(err)`
`45`	`45`	`}`
`@@ -66,7 +66,7 @@ func TestItAddsServiceLibInfo(t *testing.T) {`
`66`	`66`	`if err != nil {`
`67`	`67`	`t.Error(err)`
`68`	`68`	`}`
`69`		`- resp, err := handler.Intercept(newNoopPipeline(), req)`
	`69`	`+ resp, err := handler.Intercept(newNoopPipeline(), 0, req)`
`70`	`70`	`if err != nil {`
`71`	`71`	`t.Error(err)`
`72`	`72`	`}`
`@@ -90,7 +90,7 @@ func TestItAddsServiceInfo(t *testing.T) {`
`90`	`90`	`if err != nil {`
`91`	`91`	`t.Error(err)`
`92`	`92`	`}`
`93`		`- resp, err := handler.Intercept(newNoopPipeline(), req)`
	`93`	`+ resp, err := handler.Intercept(newNoopPipeline(), 0, req)`
`94`	`94`	`if err != nil {`
`95`	`95`	`t.Error(err)`
`96`	`96`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,3 @@`
`1`	`1`	`package msgraphgocore`
`2`	`2`
`3`		`-var CoreVersion = "0.0.4"`
	`3`	`+var CoreVersion = "0.0.5"`