Update vendor (#1228)

2020-09-04 23:29:13 +02:00
parent 17747a5c88
commit 2f59abdda7
1436 changed files with 21840 additions and 3466 deletions
--- a/vendor/github.com/gomarkdown/markdown/README.md
+++ b/vendor/github.com/gomarkdown/markdown/README.md
@@ -113,7 +113,7 @@ opts := html.RendererOptions{
 }
 renderer := html.NewRenderer(opts)
 md := "test\n```\nthis code block will be dropped from output\n```\ntext"
-html := markdown.ToHTML([]byte(s), nil, renderer)
+html := markdown.ToHTML([]byte(md), nil, renderer)
 ````

 ## Sanitize untrusted content
--- a/vendor/github.com/gomarkdown/markdown/go.sum
+++ b/vendor/github.com/gomarkdown/markdown/go.sum
@@ -0,0 +1 @@
+golang.org/dl v0.0.0-20190829154251-82a15e2f2ead/go.mod h1:IUMfjQLJQd4UTqG1Z90tenwKoCX93Gn3MAQJMOSBsDQ=
--- a/vendor/github.com/gomarkdown/markdown/parser/block.go
+++ b/vendor/github.com/gomarkdown/markdown/parser/block.go
@@ -26,8 +26,10 @@ var (
 	blockTags = map[string]struct{}{
 		"blockquote": {},
 		"del":        {},
+		"dd":         {},
 		"div":        {},
 		"dl":         {},
+		"dt":         {},
 		"fieldset":   {},
 		"form":       {},
 		"h1":         {},
@@ -36,23 +38,28 @@ var (
 		"h4":         {},
 		"h5":         {},
 		"h6":         {},
-		"iframe":     {},
-		"ins":        {},
-		"math":       {},
-		"noscript":   {},
-		"ol":         {},
-		"pre":        {},
-		"p":          {},
-		"script":     {},
-		"style":      {},
-		"table":      {},
-		"ul":         {},
+		// TODO: technically block but breaks Inline HTML (Simple).text
+		//"hr":         {},
+		"iframe":   {},
+		"ins":      {},
+		"li":       {},
+		"math":     {},
+		"noscript": {},
+		"ol":       {},
+		"pre":      {},
+		"p":        {},
+		"script":   {},
+		"style":    {},
+		"table":    {},
+		"ul":       {},

 		// HTML5
 		"address":    {},
 		"article":    {},
 		"aside":      {},
 		"canvas":     {},
+		"details":    {},
+		"dialog":     {},
 		"figcaption": {},
 		"figure":     {},
 		"footer":     {},
@@ -230,8 +237,10 @@ func (p *Parser) block(data []byte) {
 		// or
 		// ______
 		if p.isHRule(data) {
-			p.addBlock(&ast.HorizontalRule{})
 			i := skipUntilChar(data, 0, '\n')
+			hr := ast.HorizontalRule{}
+			hr.Literal = bytes.Trim(data[:i], " \n")
+			p.addBlock(&hr)
 			data = data[i:]
 			continue
 		}
--- a/vendor/github.com/google/gops/agent/agent.go
+++ b/vendor/github.com/google/gops/agent/agent.go
@@ -222,7 +222,10 @@ func handle(conn io.ReadWriter, msg []byte) error {
 		fmt.Fprintf(conn, "last-gc: %v\n", lastGC)
 		fmt.Fprintf(conn, "gc-pause-total: %v\n", time.Duration(s.PauseTotalNs))
 		fmt.Fprintf(conn, "gc-pause: %v\n", s.PauseNs[(s.NumGC+255)%256])
+		fmt.Fprintf(conn, "gc-pause-end: %v\n", s.PauseEnd[(s.NumGC+255)%256])
 		fmt.Fprintf(conn, "num-gc: %v\n", s.NumGC)
+		fmt.Fprintf(conn, "num-forced-gc: %v\n", s.NumForcedGC)
+		fmt.Fprintf(conn, "gc-cpu-fraction: %v\n", s.GCCPUFraction)
 		fmt.Fprintf(conn, "enable-gc: %v\n", s.EnableGC)
 		fmt.Fprintf(conn, "debug-gc: %v\n", s.DebugGC)
 	case signal.Version:
--- a/vendor/github.com/gorilla/schema/.travis.yml
+++ b/vendor/github.com/gorilla/schema/.travis.yml
@@ -1,18 +0,0 @@
-language: go
-sudo: false
-
-matrix:
-  include:
-    - go: 1.5
-    - go: 1.6
-    - go: 1.7
-    - go: 1.8
-    - go: tip
-  allow_failures:
-    - go: tip
-
-script:
-  - go get -t -v ./...
-  - diff -u <(echo -n) <(gofmt -d .)
-  - go vet $(go list ./... | grep -v /vendor/)
-  - go test -v -race ./...
--- a/vendor/github.com/gorilla/schema/decoder.go
+++ b/vendor/github.com/gorilla/schema/decoder.go
@@ -152,9 +152,15 @@ type fieldWithPrefix struct {
 func isEmptyFields(fields []fieldWithPrefix, src map[string][]string) bool {
 	for _, f := range fields {
 		for _, path := range f.paths(f.prefix) {
-			if !isEmpty(f.typ, src[path]) {
+			v, ok := src[path]
+			if ok && !isEmpty(f.typ, v) {
 				return false
 			}
+			for key := range src {
+				if !isEmpty(f.typ, src[key]) && strings.HasPrefix(key, path) {
+					return false
+				}
+			}
 		}
 	}
 	return true
@@ -182,6 +188,17 @@ func (d *Decoder) decode(v reflect.Value, path string, parts []pathPart, values
 			}
 			v = v.Elem()
 		}
+
+		// alloc embedded structs
+		if v.Type().Kind() == reflect.Struct {
+			for i := 0; i < v.NumField(); i++ {
+				field := v.Field(i)
+				if field.Type().Kind() == reflect.Ptr && field.IsNil() && v.Type().Field(i).Anonymous == true {
+					field.Set(reflect.New(field.Type().Elem()))
+				}
+			}
+		}
+
 		v = v.FieldByName(name)
 	}
 	// Don't even bother for unexported fields.
--- a/vendor/github.com/gorilla/schema/encoder.go
+++ b/vendor/github.com/gorilla/schema/encoder.go
@@ -57,6 +57,13 @@ func isZero(v reflect.Value) bool {
 		}
 		return z
 	case reflect.Struct:
+		type zero interface {
+			IsZero() bool
+		}
+		if v.Type().Implements(reflect.TypeOf((*zero)(nil)).Elem()) {
+			iz := v.MethodByName("IsZero").Call([]reflect.Value{})[0]
+			return iz.Interface().(bool)
+		}
 		z := true
 		for i := 0; i < v.NumField(); i++ {
 			z = z && isZero(v.Field(i))
--- a/vendor/github.com/labstack/echo/v4/.travis.yml
+++ b/vendor/github.com/labstack/echo/v4/.travis.yml
@@ -1,7 +1,7 @@
 language: go
 go:
-  - 1.12.x
-  - 1.13.x
+  - 1.14.x
+  - 1.15.x
  - tip
 env:
  - GO111MODULE=on
--- a/vendor/github.com/labstack/echo/v4/README.md
+++ b/vendor/github.com/labstack/echo/v4/README.md
@@ -17,7 +17,7 @@ Therefore a Go version capable of understanding /vN suffixed imports is required

 - 1.9.7+
 - 1.10.3+
- 1.11+
+- 1.14+

 Any of these versions will allow you to import Echo as `github.com/labstack/echo/v4` which is the recommended
 way of using Echo going forward.
@@ -52,7 +52,7 @@ Lower is better!

 ### Installation

-```go
+```sh
 // go get github.com/labstack/echo/{version}
 go get github.com/labstack/echo/v4
 ```
--- a/vendor/github.com/labstack/echo/v4/echo.go
+++ b/vendor/github.com/labstack/echo/v4/echo.go
@@ -48,6 +48,7 @@ import (
 	"net"
 	"net/http"
 	"net/url"
+	"os"
 	"path"
 	"path/filepath"
 	"reflect"
@@ -230,7 +231,7 @@ const (

 const (
 	// Version of Echo
-	Version = "4.1.16"
+	Version = "4.1.17"
 	website = "https://echo.labstack.com"
 	// http://patorjk.com/software/taag/#p=display&f=Small%20Slant&t=Echo
 	banner = `
@@ -479,7 +480,20 @@ func (common) static(prefix, root string, get func(string, HandlerFunc, ...Middl
 		if err != nil {
 			return err
 		}
+
 		name := filepath.Join(root, path.Clean("/"+p)) // "/"+ for security
+		fi, err := os.Stat(name)
+		if err != nil {
+			// The access path does not exist
+			return NotFoundHandler(c)
+		}
+
+		// If the request is for a directory and does not end with "/"
+		p = c.Request().URL.Path // path must not be empty.
+		if fi.IsDir() && p[len(p)-1] != '/' {
+			// Redirect to ends with "/"
+			return c.Redirect(http.StatusMovedPermanently, p+"/")
+		}
 		return c.File(name)
 	}
 	if prefix == "/" {
@@ -504,11 +518,7 @@ func (e *Echo) add(host, method, path string, handler HandlerFunc, middleware ..
 	name := handlerName(handler)
 	router := e.findRouter(host)
 	router.Add(method, path, func(c Context) error {
-		h := handler
-		// Chain middleware
-		for i := len(middleware) - 1; i >= 0; i-- {
-			h = middleware[i](h)
-		}
+		h := applyMiddleware(handler, middleware...)
 		return h(c)
 	})
 	r := &Route{
@@ -606,12 +616,12 @@ func (e *Echo) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 	h := NotFoundHandler

 	if e.premiddleware == nil {
-		e.findRouter(r.Host).Find(r.Method, getPath(r), c)
+		e.findRouter(r.Host).Find(r.Method, GetPath(r), c)
 		h = c.Handler()
 		h = applyMiddleware(h, e.middleware...)
 	} else {
 		h = func(c Context) error {
-			e.findRouter(r.Host).Find(r.Method, getPath(r), c)
+			e.findRouter(r.Host).Find(r.Method, GetPath(r), c)
 			h := c.Handler()
 			h = applyMiddleware(h, e.middleware...)
 			return h(c)
@@ -795,6 +805,11 @@ func (he *HTTPError) SetInternal(err error) *HTTPError {
 	return he
 }

+// Unwrap satisfies the Go 1.13 error wrapper interface.
+func (he *HTTPError) Unwrap() error {
+	return he.Internal
+}
+
 // WrapHandler wraps `http.Handler` into `echo.HandlerFunc`.
 func WrapHandler(h http.Handler) HandlerFunc {
 	return func(c Context) error {
@@ -817,7 +832,8 @@ func WrapMiddleware(m func(http.Handler) http.Handler) MiddlewareFunc {
 	}
 }

-func getPath(r *http.Request) string {
+// GetPath returns RawPath, if it's empty returns Path from URL
+func GetPath(r *http.Request) string {
 	path := r.URL.RawPath
 	if path == "" {
 		path = r.URL.Path
--- a/vendor/github.com/labstack/echo/v4/go.mod
+++ b/vendor/github.com/labstack/echo/v4/go.mod
@@ -1,14 +1,15 @@
 module github.com/labstack/echo/v4

-go 1.14
+go 1.15

 require (
 	github.com/dgrijalva/jwt-go v3.2.0+incompatible
 	github.com/labstack/gommon v0.3.0
-	github.com/mattn/go-colorable v0.1.6 // indirect
+	github.com/mattn/go-colorable v0.1.7 // indirect
 	github.com/stretchr/testify v1.4.0
-	github.com/valyala/fasttemplate v1.1.0
-	golang.org/x/crypto v0.0.0-20200221231518-2aa609cf4a9d
-	golang.org/x/net v0.0.0-20200226121028-0de0cce0169b
-	golang.org/x/text v0.3.2 // indirect
+	github.com/valyala/fasttemplate v1.2.1
+	golang.org/x/crypto v0.0.0-20200820211705-5c72a883971a
+	golang.org/x/net v0.0.0-20200822124328-c89045814202
+	golang.org/x/sys v0.0.0-20200826173525-f9321e4c35a6 // indirect
+	golang.org/x/text v0.3.3 // indirect
 )
--- a/vendor/github.com/labstack/echo/v4/go.sum
+++ b/vendor/github.com/labstack/echo/v4/go.sum
@@ -1,14 +1,13 @@
 github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/dgrijalva/jwt-go v1.0.2 h1:KPldsxuKGsS2FPWsNeg9ZO18aCrGKujPoWXn2yo+KQM=
 github.com/dgrijalva/jwt-go v3.2.0+incompatible h1:7qlOGliEKZXTDg6OTjfoBKDXWrumCAMpl/TFQ4/5kLM=
 github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ=
 github.com/labstack/gommon v0.3.0 h1:JEeO0bvc78PKdyHxloTKiF8BD5iGrH8T6MSeGvSgob0=
 github.com/labstack/gommon v0.3.0/go.mod h1:MULnywXg0yavhxWKc+lOruYdAhDwPK9wf0OL7NoOu+k=
 github.com/mattn/go-colorable v0.1.2 h1:/bC9yWikZXAL9uJdulbSfyVNIR3n3trXl+v8+1sx8mU=
 github.com/mattn/go-colorable v0.1.2/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE=
-github.com/mattn/go-colorable v0.1.6 h1:6Su7aK7lXmJ/U79bYtBjLNaha4Fs1Rg9plHpcH+vvnE=
-github.com/mattn/go-colorable v0.1.6/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc=
+github.com/mattn/go-colorable v0.1.7 h1:bQGKb3vps/j0E9GfJQ03JyhRuxsvdAanXlT9BTw3mdw=
+github.com/mattn/go-colorable v0.1.7/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc=
 github.com/mattn/go-isatty v0.0.8/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s=
 github.com/mattn/go-isatty v0.0.9 h1:d5US/mDsogSGW37IV293h//ZFaeajb69h+EHFsv2xGg=
 github.com/mattn/go-isatty v0.0.9/go.mod h1:YNRxwqDuOph6SZLI9vUUz6OYw3QyUt7WiY2yME+cCiQ=
@@ -23,14 +22,15 @@ github.com/valyala/bytebufferpool v1.0.0 h1:GqA5TC/0021Y/b9FG4Oi9Mr3q7XYx6Kllzaw
 github.com/valyala/bytebufferpool v1.0.0/go.mod h1:6bBcMArwyJ5K/AmCkWv1jt77kVWyCJ6HpOuEn7z0Csc=
 github.com/valyala/fasttemplate v1.0.1 h1:tY9CJiPnMXf1ERmG2EyK7gNUd+c6RKGD0IfU8WdUSz8=
 github.com/valyala/fasttemplate v1.0.1/go.mod h1:UQGH1tvbgY+Nz5t2n7tXsz52dQxojPUpymEIMZ47gx8=
-github.com/valyala/fasttemplate v1.1.0 h1:RZqt0yGBsps8NGvLSGW804QQqCUYYLsaOjTVHy1Ocw4=
-github.com/valyala/fasttemplate v1.1.0/go.mod h1:UQGH1tvbgY+Nz5t2n7tXsz52dQxojPUpymEIMZ47gx8=
+github.com/valyala/fasttemplate v1.2.1 h1:TVEnxayobAdVkhQfrfes2IzOB6o+z4roRkPF52WA1u4=
+github.com/valyala/fasttemplate v1.2.1/go.mod h1:KHLXt3tVN2HBp8eijSv/kGJopbvo7S+qRAEEKiv+SiQ=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
-golang.org/x/crypto v0.0.0-20200221231518-2aa609cf4a9d h1:1ZiEyfaQIg3Qh0EoqpwAakHVhecoE5wlSg5GjnafJGw=
-golang.org/x/crypto v0.0.0-20200221231518-2aa609cf4a9d/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
+golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
+golang.org/x/crypto v0.0.0-20200820211705-5c72a883971a h1:vclmkQCjlDX5OydZ9wv8rBCcS0QyQY66Mpf/7BZbInM=
+golang.org/x/crypto v0.0.0-20200820211705-5c72a883971a/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
 golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
-golang.org/x/net v0.0.0-20200226121028-0de0cce0169b h1:0mm1VjtFUOIlE1SbDlwjYaDxZVDP2S5ou6y0gSgXHu8=
-golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/net v0.0.0-20200822124328-c89045814202 h1:VvcQYSHwXgi7W+TpUR6A9g6Up98WAHf3f/ulnJ62IyA=
+golang.org/x/net v0.0.0-20200822124328-c89045814202/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
@@ -39,11 +39,15 @@ golang.org/x/sys v0.0.0-20190813064441-fde4db37ae7a/go.mod h1:h1NjWce9XRLGQEsW7w
 golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae h1:/WDfKMnPU+m5M4xB+6x4kaepxRw6jWvR5iDRdvjHgy8=
 golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200826173525-f9321e4c35a6 h1:DvY3Zkh7KabQE/kfzMvYvKirSiguP9Q/veMtkYyf0o8=
+golang.org/x/sys v0.0.0-20200826173525-f9321e4c35a6/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/text v0.3.0 h1:g61tztE5qeGQ89tm6NTjjM9VPIm088od1l6aSorWRWg=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
-golang.org/x/text v0.3.2 h1:tW2bmiBqwgJj/UpqtC8EpXEZVYOwU0yG4iWbprSVAcs=
-golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
+golang.org/x/text v0.3.3 h1:cokOdA+Jmi5PJGXLlLllQSgYigAEfHXJAERHVMaCc2k=
+golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
+gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/yaml.v2 v2.2.2 h1:ZCJp+EgiOT7lHqUV2J862kp8Qj64Jo6az82+3Td9dZw=
 gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
--- a/vendor/github.com/labstack/echo/v4/group.go
+++ b/vendor/github.com/labstack/echo/v4/group.go
@@ -109,7 +109,7 @@ func (g *Group) Static(prefix, root string) {

 // File implements `Echo#File()` for sub-routes within the Group.
 func (g *Group) File(path, file string) {
-	g.file(g.prefix+path, file, g.GET)
+	g.file(path, file, g.GET)
 }

 // Add implements `Echo#Add()` for sub-routes within the Group.
--- a/vendor/github.com/labstack/echo/v4/middleware/compress.go
+++ b/vendor/github.com/labstack/echo/v4/middleware/compress.go
@@ -119,3 +119,10 @@ func (w *gzipResponseWriter) Flush() {
 func (w *gzipResponseWriter) Hijack() (net.Conn, *bufio.ReadWriter, error) {
 	return w.ResponseWriter.(http.Hijacker).Hijack()
 }
+
+func (w *gzipResponseWriter) Push(target string, opts *http.PushOptions) error {
+	if p, ok := w.ResponseWriter.(http.Pusher); ok {
+		return p.Push(target, opts)
+	}
+	return http.ErrNotSupported
+}
--- a/vendor/github.com/labstack/echo/v4/middleware/proxy.go
+++ b/vendor/github.com/labstack/echo/v4/middleware/proxy.go
@@ -45,6 +45,9 @@ type (
 		// Examples: If custom TLS certificates are required.
 		Transport http.RoundTripper

+		// ModifyResponse defines function to modify response from ProxyTarget.
+		ModifyResponse func(*http.Response) error
+
 		rewriteRegex map[*regexp.Regexp]string
 	}

@@ -224,7 +227,7 @@ func ProxyWithConfig(config ProxyConfig) echo.MiddlewareFunc {

 			// Rewrite
 			for k, v := range config.rewriteRegex {
-				replacer := captureTokens(k, req.URL.Path)
+				replacer := captureTokens(k, echo.GetPath(req))
 				if replacer != nil {
 					req.URL.Path = replacer.Replace(v)
 				}
--- a/vendor/github.com/labstack/echo/v4/middleware/proxy_1_11.go
+++ b/vendor/github.com/labstack/echo/v4/middleware/proxy_1_11.go
@@ -20,5 +20,6 @@ func proxyHTTP(tgt *ProxyTarget, c echo.Context, config ProxyConfig) http.Handle
 		c.Set("_error", echo.NewHTTPError(http.StatusBadGateway, fmt.Sprintf("remote %s unreachable, could not forward: %v", desc, err)))
 	}
 	proxy.Transport = config.Transport
+	proxy.ModifyResponse = config.ModifyResponse
 	return proxy
 }
--- a/vendor/github.com/labstack/echo/v4/middleware/recover.go
+++ b/vendor/github.com/labstack/echo/v4/middleware/recover.go
@@ -5,6 +5,7 @@ import (
 	"runtime"

 	"github.com/labstack/echo/v4"
+	"github.com/labstack/gommon/log"
 )

 type (
@@ -25,6 +26,10 @@ type (
 		// DisablePrintStack disables printing stack trace.
 		// Optional. Default value as false.
 		DisablePrintStack bool `yaml:"disable_print_stack"`
+
+		// LogLevel is log level to printing stack trace.
+		// Optional. Default value 0 (Print).
+		LogLevel log.Lvl
 	}
 )

@@ -35,6 +40,7 @@ var (
 		StackSize:         4 << 10, // 4 KB
 		DisableStackAll:   false,
 		DisablePrintStack: false,
+		LogLevel:          0,
 	}
 )

@@ -70,7 +76,21 @@ func RecoverWithConfig(config RecoverConfig) echo.MiddlewareFunc {
 					stack := make([]byte, config.StackSize)
 					length := runtime.Stack(stack, !config.DisableStackAll)
 					if !config.DisablePrintStack {
-						c.Logger().Printf("[PANIC RECOVER] %v %s\n", err, stack[:length])
+						msg := fmt.Sprintf("[PANIC RECOVER] %v %s\n", err, stack[:length])
+						switch config.LogLevel {
+						case log.DEBUG:
+							c.Logger().Debug(msg)
+						case log.INFO:
+							c.Logger().Info(msg)
+						case log.WARN:
+							c.Logger().Warn(msg)
+						case log.ERROR:
+							c.Logger().Error(msg)
+						case log.OFF:
+							// None.
+						default:
+							c.Logger().Print(msg)
+						}
 					}
 					c.Error(err)
 				}
--- a/vendor/github.com/labstack/echo/v4/router.go
+++ b/vendor/github.com/labstack/echo/v4/router.go
@@ -355,6 +355,10 @@ func (r *Router) Find(method, path string, c Context) {

 		// Attempt to go back up the tree on no matching prefix or no remaining search
 		if l != pl || search == "" {
+			// Handle special case of trailing slash route with existing any route (see #1526)
+			if path[len(path)-1] == '/' && cn.findChildByKind(akind) != nil {
+				goto Any
+			}
 			if nn == nil { // Issue #1348
 				return // Not found
 			}
--- a/vendor/github.com/matterbridge/discordgo/.travis.yml
+++ b/vendor/github.com/matterbridge/discordgo/.travis.yml
@@ -1,9 +1,11 @@
 language: go
 go:
-    - 1.10.x
    - 1.11.x
    - 1.12.x
    - 1.13.x
+    - 1.14.x
+env:
+    - GO111MODULE=on
 install:
    - go get github.com/bwmarrin/discordgo
    - go get -v .
--- a/vendor/github.com/matterbridge/discordgo/README.md
+++ b/vendor/github.com/matterbridge/discordgo/README.md
@@ -26,41 +26,17 @@ Gophers](https://discord.gg/0f1SbxBZjYq9jLBk) chat server.**

 ## Getting Started

-### master vs develop Branch
-* The master branch represents the latest released version of DiscordGo.  This
-branch will always have a stable and tested version of the library. Each release
-is tagged and you can easily download a specific release and view release notes
-on the github [releases](https://github.com/bwmarrin/discordgo/releases) page.
-
-* The develop branch is where all development happens and almost always has
-new features over the master branch.  However breaking changes are frequently
-added to develop and even sometimes bugs are introduced.  Bugs get fixed and 
-the breaking changes get documented before pushing to master.  
-
-*So, what should you use?*
-
-If you can accept the constant changing nature of *develop*, it is the 
-recommended branch to use.  Otherwise, if you want to tail behind development
-slightly and have a more stable package with documented releases, use *master*.
-
 ### Installing

 This assumes you already have a working Go environment, if not please see
 [this page](https://golang.org/doc/install) first.

-`go get` *will always pull the latest released version from the master branch.*
+`go get` *will always pull the latest tagged release from the master branch.*

 ```sh
 go get github.com/bwmarrin/discordgo
 ```

-If you want to use the develop branch, follow these steps next.
-
-```sh
-cd $GOPATH/src/github.com/bwmarrin/discordgo
-git checkout develop
-```
-
 ### Usage

 Import the package into your project.
@@ -81,7 +57,7 @@ See Documentation and Examples below for more detailed information.

 ## Documentation

-**NOTICE** : This library and the Discord API are unfinished.
+**NOTICE**: This library and the Discord API are unfinished.
 Because of that there may be major changes to library in the future.

 The DiscordGo code is fairly well documented at this point and is currently
@@ -112,12 +88,11 @@ Contributions are very welcomed, however please follow the below guidelines.

 - First open an issue describing the bug or enhancement so it can be
 discussed.  
- Fork the develop branch and make your changes.  
 - Try to match current naming conventions as closely as possible.  
 - This package is intended to be a low level direct mapping of the Discord API, 
 so please avoid adding enhancements outside of that scope without first 
 discussing it.
- Create a Pull Request with your changes against the develop branch.
+- Create a Pull Request with your changes against the master branch.


 ## List of Discord APIs
--- a/vendor/github.com/matterbridge/discordgo/discord.go
+++ b/vendor/github.com/matterbridge/discordgo/discord.go
@@ -22,7 +22,7 @@ import (
 )

 // VERSION of DiscordGo, follows Semantic Versioning. (http://semver.org/)
-const VERSION = "0.21.1"
+const VERSION = "0.22.0"

 // ErrMFA will be risen by New when the user has 2FA.
 var ErrMFA = errors.New("account has 2FA enabled")
--- a/vendor/github.com/matterbridge/discordgo/message.go
+++ b/vendor/github.com/matterbridge/discordgo/message.go
@@ -16,6 +16,7 @@ import (
 )

 // MessageType is the type of Message
+// https://discord.com/developers/docs/resources/channel#message-object-message-types
 type MessageType int

 // Block contains the valid known MessageType values
@@ -33,6 +34,8 @@ const (
 	MessageTypeUserPremiumGuildSubscriptionTierTwo
 	MessageTypeUserPremiumGuildSubscriptionTierThree
 	MessageTypeChannelFollowAdd
+	MessageTypeGuildDiscoveryDisqualified
+	MessageTypeGuildDiscoveryRequalified
 )

 // A Message stores all data related to a specific Discord message.
@@ -117,9 +120,22 @@ type Message struct {
 	// The flags of the message, which describe extra features of a message.
 	// This is a combination of bit masks; the presence of a certain permission can
 	// be checked by performing a bitwise AND between this int and the flag.
-	Flags int `json:"flags"`
+	Flags MessageFlags `json:"flags"`
 }

+// MessageFlags is the flags of "message" (see MessageFlags* consts)
+// https://discord.com/developers/docs/resources/channel#message-object-message-flags
+type MessageFlags int
+
+// Valid MessageFlags values
+const (
+	MessageFlagsCrossPosted MessageFlags = 1 << iota
+	MessageFlagsIsCrossPosted
+	MessageFlagsSupressEmbeds
+	MessageFlagsSourceMessageDeleted
+	MessageFlagsUrgent
+)
+
 // File stores info about files you e.g. send in messages.
 type File struct {
 	Name        string
@@ -245,10 +261,9 @@ type MessageEmbedThumbnail struct {

 // MessageEmbedVideo is a part of a MessageEmbed struct.
 type MessageEmbedVideo struct {
-	URL      string `json:"url,omitempty"`
-	ProxyURL string `json:"proxy_url,omitempty"`
-	Width    int    `json:"width,omitempty"`
-	Height   int    `json:"height,omitempty"`
+	URL    string `json:"url,omitempty"`
+	Width  int    `json:"width,omitempty"`
+	Height int    `json:"height,omitempty"`
 }

 // MessageEmbedProvider is a part of a MessageEmbed struct.
@@ -275,7 +290,7 @@ type MessageEmbedField struct {
 // An MessageEmbed stores data for message embeds.
 type MessageEmbed struct {
 	URL         string                 `json:"url,omitempty"`
-	Type        string                 `json:"type,omitempty"`
+	Type        EmbedType              `json:"type,omitempty"`
 	Title       string                 `json:"title,omitempty"`
 	Description string                 `json:"description,omitempty"`
 	Timestamp   string                 `json:"timestamp,omitempty"`
@@ -289,6 +304,20 @@ type MessageEmbed struct {
 	Fields      []*MessageEmbedField   `json:"fields,omitempty"`
 }

+// EmbedType is the type of embed
+// https://discord.com/developers/docs/resources/channel#embed-object-embed-types
+type EmbedType string
+
+// Block of valid EmbedTypes
+const (
+	EmbedTypeRich    EmbedType = "rich"
+	EmbedTypeImage   EmbedType = "image"
+	EmbedTypeVideo   EmbedType = "video"
+	EmbedTypeGifv    EmbedType = "gifv"
+	EmbedTypeArticle EmbedType = "article"
+	EmbedTypeLink    EmbedType = "link"
+)
+
 // MessageReactions holds a reactions object for a message.
 type MessageReactions struct {
 	Count int    `json:"count"`
@@ -307,7 +336,7 @@ type MessageActivityType int

 // Constants for the different types of Message Activity
 const (
-	MessageActivityTypeJoin = iota + 1
+	MessageActivityTypeJoin MessageActivityType = iota + 1
 	MessageActivityTypeSpectate
 	MessageActivityTypeListen
 	MessageActivityTypeJoinRequest
@@ -319,7 +348,7 @@ type MessageFlag int
 // Constants for the different bit offsets of Message Flags
 const (
 	// This message has been published to subscribed channels (via Channel Following)
-	MessageFlagCrossposted = 1 << iota
+	MessageFlagCrossposted MessageFlag = 1 << iota
 	// This message originated from a message in another channel (via Channel Following)
 	MessageFlagIsCrosspost
 	// Do not include any embeds when serializing this message
--- a/vendor/github.com/matterbridge/discordgo/oauth2.go
+++ b/vendor/github.com/matterbridge/discordgo/oauth2.go
@@ -13,6 +13,33 @@ package discordgo
 // Code specific to Discord OAuth2 Applications
 // ------------------------------------------------------------------------------------------------

+// The MembershipState represents whether the user is in the team or has been invited into it
+type MembershipState int
+
+// Constants for the different stages of the MembershipState
+const (
+	MembershipStateInvited MembershipState = iota + 1
+	MembershipStateAccepted
+)
+
+// A TeamMember struct stores values for a single Team Member, extending the normal User data - note that the user field is partial
+type TeamMember struct {
+	User            *User           `json:"user"`
+	TeamID          string          `json:"team_id"`
+	MembershipState MembershipState `json:"membership_state"`
+	Permissions     []string        `json:"permissions"`
+}
+
+// A Team struct stores the members of a Discord Developer Team as well as some metadata about it
+type Team struct {
+	ID          string        `json:"id"`
+	Name        string        `json:"name"`
+	Description string        `json:"description"`
+	Icon        string        `json:"icon"`
+	OwnerID     string        `json:"owner_user_id"`
+	Members     []*TeamMember `json:"members"`
+}
+
 // An Application struct stores values for a Discord OAuth2 Application
 type Application struct {
 	ID                  string    `json:"id,omitempty"`
@@ -27,6 +54,7 @@ type Application struct {
 	Flags               int       `json:"flags,omitempty"`
 	Owner               *User     `json:"owner"`
 	Bot                 *User     `json:"bot"`
+	Team                *Team     `json:"team"`
 }

 // Application returns an Application structure of a specific Application
--- a/vendor/github.com/matterbridge/discordgo/restapi.go
+++ b/vendor/github.com/matterbridge/discordgo/restapi.go
@@ -844,13 +844,13 @@ func (s *Session) GuildMemberEdit(guildID, userID string, roles []string) (err e
 // GuildMemberMove moves a guild member from one voice channel to another/none
 //  guildID   : The ID of a Guild.
 //  userID    : The ID of a User.
-//  channelID : The ID of a channel to move user to, or null?
+//  channelID : The ID of a channel to move user to or nil to remove from voice channel
 // NOTE : I am not entirely set on the name of this function and it may change
 // prior to the final 1.0.0 release of Discordgo
-func (s *Session) GuildMemberMove(guildID, userID, channelID string) (err error) {
+func (s *Session) GuildMemberMove(guildID string, userID string, channelID *string) (err error) {

 	data := struct {
-		ChannelID string `json:"channel_id"`
+		ChannelID *string `json:"channel_id"`
 	}{channelID}

 	_, err = s.RequestWithBucketID("PATCH", EndpointGuildMember(guildID, userID), data, EndpointGuildMember(guildID, ""))
@@ -1309,6 +1309,19 @@ func (s *Session) GuildAuditLog(guildID, userID, beforeID string, actionType, li
 	return
 }

+// GuildEmojis returns all emoji
+// guildID : The ID of a Guild.
+func (s *Session) GuildEmojis(guildID string) (emoji []*Emoji, err error) {
+
+	body, err := s.RequestWithBucketID("GET", EndpointGuildEmojis(guildID), nil, EndpointGuildEmojis(guildID))
+	if err != nil {
+		return
+	}
+
+	err = unmarshal(body, &emoji)
+	return
+}
+
 // GuildEmojiCreate creates a new emoji
 // guildID : The ID of a Guild.
 // name    : The Name of the Emoji.
--- a/vendor/github.com/matterbridge/discordgo/structs.go
+++ b/vendor/github.com/matterbridge/discordgo/structs.go
@@ -143,13 +143,24 @@ type Integration struct {
 	Enabled           bool               `json:"enabled"`
 	Syncing           bool               `json:"syncing"`
 	RoleID            string             `json:"role_id"`
-	ExpireBehavior    int                `json:"expire_behavior"`
+	EnableEmoticons   bool               `json:"enable_emoticons"`
+	ExpireBehavior    ExpireBehavior     `json:"expire_behavior"`
 	ExpireGracePeriod int                `json:"expire_grace_period"`
 	User              *User              `json:"user"`
 	Account           IntegrationAccount `json:"account"`
 	SyncedAt          Timestamp          `json:"synced_at"`
 }

+//ExpireBehavior of Integration
+// https://discord.com/developers/docs/resources/guild#integration-object-integration-expire-behaviors
+type ExpireBehavior int
+
+// Block of valid ExpireBehaviors
+const (
+	ExpireBehaviorRemoveRole ExpireBehavior = iota
+	ExpireBehaviorKick
+)
+
 // IntegrationAccount is integration account information
 // sent by the UserConnections endpoint
 type IntegrationAccount struct {
@@ -180,23 +191,34 @@ type ICEServer struct {

 // A Invite stores all data related to a specific Discord Guild or Channel invite.
 type Invite struct {
-	Guild     *Guild    `json:"guild"`
-	Channel   *Channel  `json:"channel"`
-	Inviter   *User     `json:"inviter"`
-	Code      string    `json:"code"`
-	CreatedAt Timestamp `json:"created_at"`
-	MaxAge    int       `json:"max_age"`
-	Uses      int       `json:"uses"`
-	MaxUses   int       `json:"max_uses"`
-	Revoked   bool      `json:"revoked"`
-	Temporary bool      `json:"temporary"`
-	Unique    bool      `json:"unique"`
+	Guild          *Guild         `json:"guild"`
+	Channel        *Channel       `json:"channel"`
+	Inviter        *User          `json:"inviter"`
+	Code           string         `json:"code"`
+	CreatedAt      Timestamp      `json:"created_at"`
+	MaxAge         int            `json:"max_age"`
+	Uses           int            `json:"uses"`
+	MaxUses        int            `json:"max_uses"`
+	Revoked        bool           `json:"revoked"`
+	Temporary      bool           `json:"temporary"`
+	Unique         bool           `json:"unique"`
+	TargetUser     *User          `json:"target_user"`
+	TargetUserType TargetUserType `json:"target_user_type"`

 	// will only be filled when using InviteWithCounts
 	ApproximatePresenceCount int `json:"approximate_presence_count"`
 	ApproximateMemberCount   int `json:"approximate_member_count"`
 }

+// TargetUserType is the type of the target user
+// https://discord.com/developers/docs/resources/invite#invite-object-target-user-types
+type TargetUserType int
+
+// Block contains known TargetUserType values
+const (
+	TargetUserTypeStream TargetUserType = iota
+)
+
 // ChannelType is the type of a Channel
 type ChannelType int

@@ -268,6 +290,12 @@ type Channel struct {
 	// Amount of seconds a user has to wait before sending another message (0-21600)
 	// bots, as well as users with the permission manage_messages or manage_channel, are unaffected
 	RateLimitPerUser int `json:"rate_limit_per_user"`
+
+	// ID of the DM creator Zeroed if guild channel
+	OwnerID string `json:"owner_id"`
+
+	// ApplicationID of the DM creator Zeroed if guild channel or not a bot user
+	ApplicationID string `json:"application_id"`
 }

 // Mention returns a string which mentions the channel
@@ -301,8 +329,9 @@ type Emoji struct {
 	ID            string   `json:"id"`
 	Name          string   `json:"name"`
 	Roles         []string `json:"roles"`
-	Managed       bool     `json:"managed"`
+	User          *User    `json:"user"`
 	RequireColons bool     `json:"require_colons"`
+	Managed       bool     `json:"managed"`
 	Animated      bool     `json:"animated"`
 	Available     bool     `json:"available"`
 }
@@ -398,11 +427,17 @@ type Guild struct {
 	// The user ID of the owner of the guild.
 	OwnerID string `json:"owner_id"`

+	// If we are the owner of the guild
+	Owner bool `json:"owner"`
+
 	// The time at which the current user joined the guild.
 	// This field is only present in GUILD_CREATE events and websocket
 	// update events, and thus is only present in state-cached guilds.
 	JoinedAt Timestamp `json:"joined_at"`

+	// The hash of the guild's discovery splash.
+	DiscoverySplash string `json:"discovery_splash"`
+
 	// The hash of the guild's splash.
 	Splash string `json:"splash"`

@@ -426,8 +461,7 @@ type Guild struct {
 	Large bool `json:"large"`

 	// The default message notification setting for the guild.
-	// 0 == all messages, 1 == mentions only.
-	DefaultMessageNotifications int `json:"default_message_notifications"`
+	DefaultMessageNotifications MessageNotifications `json:"default_message_notifications"`

 	// A list of roles in the guild.
 	Roles []*Role `json:"roles"`
@@ -445,6 +479,12 @@ type Guild struct {
 	// update events, and thus is only present in state-cached guilds.
 	Presences []*Presence `json:"presences"`

+	// The maximum number of presences for the guild (the default value, currently 25000, is in effect when null is returned)
+	MaxPresences int `json:"max_presences"`
+
+	// The maximum number of members for the guild
+	MaxMembers int `json:"max_members"`
+
 	// A list of channels in the guild.
 	// This field is only present in GUILD_CREATE events and websocket
 	// update events, and thus is only present in state-cached guilds.
@@ -469,6 +509,9 @@ type Guild struct {
 	// Required MFA level for the guild
 	MfaLevel MfaLevel `json:"mfa_level"`

+	// The application id of the guild if bot created.
+	ApplicationID string `json:"application_id"`
+
 	// Whether or not the Server Widget is enabled
 	WidgetEnabled bool `json:"widget_enabled"`

@@ -478,6 +521,12 @@ type Guild struct {
 	// The Channel ID to which system messages are sent (eg join and leave messages)
 	SystemChannelID string `json:"system_channel_id"`

+	// The System channel flags
+	SystemChannelFlags SystemChannelFlag `json:"system_channel_flags"`
+
+	// The ID of the rules channel ID, used for rules.
+	RulesChannelID string `json:"rules_channel_id"`
+
 	// the vanity url code for the guild
 	VanityURLCode string `json:"vanity_url_code"`

@@ -492,8 +541,46 @@ type Guild struct {

 	// The total number of users currently boosting this server
 	PremiumSubscriptionCount int `json:"premium_subscription_count"`
+
+	// The preferred locale of a guild with the "PUBLIC" feature; used in server discovery and notices from Discord; defaults to "en-US"
+	PreferredLocale string `json:"preferred_locale"`
+
+	// The id of the channel where admins and moderators of guilds with the "PUBLIC" feature receive notices from Discord
+	PublicUpdatesChannelID string `json:"public_updates_channel_id"`
+
+	// The maximum amount of users in a video channel
+	MaxVideoChannelUsers int `json:"max_video_channel_users"`
+
+	// Approximate number of members in this guild, returned from the GET /guild/<id> endpoint when with_counts is true
+	ApproximateMemberCount int `json:"approximate_member_count"`
+
+	// Approximate number of non-offline members in this guild, returned from the GET /guild/<id> endpoint when with_counts is true
+	ApproximatePresenceCount int `json:"approximate_presence_count"`
+
+	// Permissions of our user
+	Permissions int `json:"permissions"`
 }

+// MessageNotifications is the notification level for a guild
+// https://discord.com/developers/docs/resources/guild#guild-object-default-message-notification-level
+type MessageNotifications int
+
+// Block containing known MessageNotifications values
+const (
+	MessageNotificationsAllMessages MessageNotifications = iota
+	MessageNotificationsOnlyMentions
+)
+
+// SystemChannelFlag is the type of flags in the system channel (see SystemChannelFlag* consts)
+// https://discord.com/developers/docs/resources/guild#guild-object-system-channel-flags
+type SystemChannelFlag int
+
+// Block containing known SystemChannelFlag values
+const (
+	SystemChannelFlagsSuppressJoin SystemChannelFlag = 1 << iota
+	SystemChannelFlagsSuppressPremium
+)
+
 // IconURL returns a URL to the guild's icon.
 func (g *Guild) IconURL() string {
 	if g.Icon == "" {
@@ -775,79 +862,157 @@ type GuildEmbed struct {
 }

 // A GuildAuditLog stores data for a guild audit log.
+// https://discord.com/developers/docs/resources/audit-log#audit-log-object-audit-log-structure
 type GuildAuditLog struct {
-	Webhooks []struct {
-		ChannelID string `json:"channel_id"`
-		GuildID   string `json:"guild_id"`
-		ID        string `json:"id"`
-		Avatar    string `json:"avatar"`
-		Name      string `json:"name"`
-	} `json:"webhooks,omitempty"`
-	Users []struct {
-		Username      string `json:"username"`
-		Discriminator string `json:"discriminator"`
-		Bot           bool   `json:"bot"`
-		ID            string `json:"id"`
-		Avatar        string `json:"avatar"`
-	} `json:"users,omitempty"`
-	AuditLogEntries []struct {
-		TargetID string `json:"target_id"`
-		Changes  []struct {
-			NewValue interface{} `json:"new_value"`
-			OldValue interface{} `json:"old_value"`
-			Key      string      `json:"key"`
-		} `json:"changes,omitempty"`
-		UserID     string `json:"user_id"`
-		ID         string `json:"id"`
-		ActionType int    `json:"action_type"`
-		Options    struct {
-			DeleteMembersDay string `json:"delete_member_days"`
-			MembersRemoved   string `json:"members_removed"`
-			ChannelID        string `json:"channel_id"`
-			Count            string `json:"count"`
-			ID               string `json:"id"`
-			Type             string `json:"type"`
-			RoleName         string `json:"role_name"`
-		} `json:"options,omitempty"`
-		Reason string `json:"reason"`
-	} `json:"audit_log_entries"`
+	Webhooks        []*Webhook       `json:"webhooks,omitempty"`
+	Users           []*User          `json:"users,omitempty"`
+	AuditLogEntries []*AuditLogEntry `json:"audit_log_entries"`
+	Integrations    []*Integration   `json:"integrations"`
 }

+// AuditLogEntry for a GuildAuditLog
+// https://discord.com/developers/docs/resources/audit-log#audit-log-entry-object-audit-log-entry-structure
+type AuditLogEntry struct {
+	TargetID   string            `json:"target_id"`
+	Changes    []*AuditLogChange `json:"changes"`
+	UserID     string            `json:"user_id"`
+	ID         string            `json:"id"`
+	ActionType *AuditLogAction   `json:"action_type"`
+	Options    *AuditLogOptions  `json:"options"`
+	Reason     string            `json:"reason"`
+}
+
+// AuditLogChange for an AuditLogEntry
+type AuditLogChange struct {
+	NewValue interface{}        `json:"new_value"`
+	OldValue interface{}        `json:"old_value"`
+	Key      *AuditLogChangeKey `json:"key"`
+}
+
+// AuditLogChangeKey value for AuditLogChange
+// https://discord.com/developers/docs/resources/audit-log#audit-log-change-object-audit-log-change-key
+type AuditLogChangeKey string
+
+// Block of valid AuditLogChangeKey
+const (
+	AuditLogChangeKeyName                       AuditLogChangeKey = "name"
+	AuditLogChangeKeyIconHash                   AuditLogChangeKey = "icon_hash"
+	AuditLogChangeKeySplashHash                 AuditLogChangeKey = "splash_hash"
+	AuditLogChangeKeyOwnerID                    AuditLogChangeKey = "owner_id"
+	AuditLogChangeKeyRegion                     AuditLogChangeKey = "region"
+	AuditLogChangeKeyAfkChannelID               AuditLogChangeKey = "afk_channel_id"
+	AuditLogChangeKeyAfkTimeout                 AuditLogChangeKey = "afk_timeout"
+	AuditLogChangeKeyMfaLevel                   AuditLogChangeKey = "mfa_level"
+	AuditLogChangeKeyVerificationLevel          AuditLogChangeKey = "verification_level"
+	AuditLogChangeKeyExplicitContentFilter      AuditLogChangeKey = "explicit_content_filter"
+	AuditLogChangeKeyDefaultMessageNotification AuditLogChangeKey = "default_message_notifications"
+	AuditLogChangeKeyVanityURLCode              AuditLogChangeKey = "vanity_url_code"
+	AuditLogChangeKeyRoleAdd                    AuditLogChangeKey = "$add"
+	AuditLogChangeKeyRoleRemove                 AuditLogChangeKey = "$remove"
+	AuditLogChangeKeyPruneDeleteDays            AuditLogChangeKey = "prune_delete_days"
+	AuditLogChangeKeyWidgetEnabled              AuditLogChangeKey = "widget_enabled"
+	AuditLogChangeKeyWidgetChannelID            AuditLogChangeKey = "widget_channel_id"
+	AuditLogChangeKeySystemChannelID            AuditLogChangeKey = "system_channel_id"
+	AuditLogChangeKeyPosition                   AuditLogChangeKey = "position"
+	AuditLogChangeKeyTopic                      AuditLogChangeKey = "topic"
+	AuditLogChangeKeyBitrate                    AuditLogChangeKey = "bitrate"
+	AuditLogChangeKeyPermissionOverwrite        AuditLogChangeKey = "permission_overwrites"
+	AuditLogChangeKeyNSFW                       AuditLogChangeKey = "nsfw"
+	AuditLogChangeKeyApplicationID              AuditLogChangeKey = "application_id"
+	AuditLogChangeKeyRateLimitPerUser           AuditLogChangeKey = "rate_limit_per_user"
+	AuditLogChangeKeyPermissions                AuditLogChangeKey = "permissions"
+	AuditLogChangeKeyColor                      AuditLogChangeKey = "color"
+	AuditLogChangeKeyHoist                      AuditLogChangeKey = "hoist"
+	AuditLogChangeKeyMentionable                AuditLogChangeKey = "mentionable"
+	AuditLogChangeKeyAllow                      AuditLogChangeKey = "allow"
+	AuditLogChangeKeyDeny                       AuditLogChangeKey = "deny"
+	AuditLogChangeKeyCode                       AuditLogChangeKey = "code"
+	AuditLogChangeKeyChannelID                  AuditLogChangeKey = "channel_id"
+	AuditLogChangeKeyInviterID                  AuditLogChangeKey = "inviter_id"
+	AuditLogChangeKeyMaxUses                    AuditLogChangeKey = "max_uses"
+	AuditLogChangeKeyUses                       AuditLogChangeKey = "uses"
+	AuditLogChangeKeyMaxAge                     AuditLogChangeKey = "max_age"
+	AuditLogChangeKeyTempoary                   AuditLogChangeKey = "temporary"
+	AuditLogChangeKeyDeaf                       AuditLogChangeKey = "deaf"
+	AuditLogChangeKeyMute                       AuditLogChangeKey = "mute"
+	AuditLogChangeKeyNick                       AuditLogChangeKey = "nick"
+	AuditLogChangeKeyAvatarHash                 AuditLogChangeKey = "avatar_hash"
+	AuditLogChangeKeyID                         AuditLogChangeKey = "id"
+	AuditLogChangeKeyType                       AuditLogChangeKey = "type"
+	AuditLogChangeKeyEnableEmoticons            AuditLogChangeKey = "enable_emoticons"
+	AuditLogChangeKeyExpireBehavior             AuditLogChangeKey = "expire_behavior"
+	AuditLogChangeKeyExpireGracePeriod          AuditLogChangeKey = "expire_grace_period"
+)
+
+// AuditLogOptions optional data for the AuditLog
+// https://discord.com/developers/docs/resources/audit-log#audit-log-entry-object-optional-audit-entry-info
+type AuditLogOptions struct {
+	DeleteMemberDays string               `json:"delete_member_days"`
+	MembersRemoved   string               `json:"members_removed"`
+	ChannelID        string               `json:"channel_id"`
+	MessageID        string               `json:"message_id"`
+	Count            string               `json:"count"`
+	ID               string               `json:"id"`
+	Type             *AuditLogOptionsType `json:"type"`
+	RoleName         string               `json:"role_name"`
+}
+
+// AuditLogOptionsType of the AuditLogOption
+// https://discord.com/developers/docs/resources/audit-log#audit-log-entry-object-optional-audit-entry-info
+type AuditLogOptionsType string
+
+// Valid Types for AuditLogOptionsType
+const (
+	AuditLogOptionsTypeMember AuditLogOptionsType = "member"
+	AuditLogOptionsTypeRole   AuditLogOptionsType = "role"
+)
+
+// AuditLogAction is the Action of the AuditLog (see AuditLogAction* consts)
+// https://discord.com/developers/docs/resources/audit-log#audit-log-entry-object-audit-log-events
+type AuditLogAction int
+
 // Block contains Discord Audit Log Action Types
 const (
-	AuditLogActionGuildUpdate = 1
+	AuditLogActionGuildUpdate AuditLogAction = 1

-	AuditLogActionChannelCreate          = 10
-	AuditLogActionChannelUpdate          = 11
-	AuditLogActionChannelDelete          = 12
-	AuditLogActionChannelOverwriteCreate = 13
-	AuditLogActionChannelOverwriteUpdate = 14
-	AuditLogActionChannelOverwriteDelete = 15
+	AuditLogActionChannelCreate          AuditLogAction = 10
+	AuditLogActionChannelUpdate          AuditLogAction = 11
+	AuditLogActionChannelDelete          AuditLogAction = 12
+	AuditLogActionChannelOverwriteCreate AuditLogAction = 13
+	AuditLogActionChannelOverwriteUpdate AuditLogAction = 14
+	AuditLogActionChannelOverwriteDelete AuditLogAction = 15

-	AuditLogActionMemberKick       = 20
-	AuditLogActionMemberPrune      = 21
-	AuditLogActionMemberBanAdd     = 22
-	AuditLogActionMemberBanRemove  = 23
-	AuditLogActionMemberUpdate     = 24
-	AuditLogActionMemberRoleUpdate = 25
+	AuditLogActionMemberKick       AuditLogAction = 20
+	AuditLogActionMemberPrune      AuditLogAction = 21
+	AuditLogActionMemberBanAdd     AuditLogAction = 22
+	AuditLogActionMemberBanRemove  AuditLogAction = 23
+	AuditLogActionMemberUpdate     AuditLogAction = 24
+	AuditLogActionMemberRoleUpdate AuditLogAction = 25

-	AuditLogActionRoleCreate = 30
-	AuditLogActionRoleUpdate = 31
-	AuditLogActionRoleDelete = 32
+	AuditLogActionRoleCreate AuditLogAction = 30
+	AuditLogActionRoleUpdate AuditLogAction = 31
+	AuditLogActionRoleDelete AuditLogAction = 32

-	AuditLogActionInviteCreate = 40
-	AuditLogActionInviteUpdate = 41
-	AuditLogActionInviteDelete = 42
+	AuditLogActionInviteCreate AuditLogAction = 40
+	AuditLogActionInviteUpdate AuditLogAction = 41
+	AuditLogActionInviteDelete AuditLogAction = 42

-	AuditLogActionWebhookCreate = 50
-	AuditLogActionWebhookUpdate = 51
-	AuditLogActionWebhookDelete = 52
+	AuditLogActionWebhookCreate AuditLogAction = 50
+	AuditLogActionWebhookUpdate AuditLogAction = 51
+	AuditLogActionWebhookDelete AuditLogAction = 52

-	AuditLogActionEmojiCreate = 60
-	AuditLogActionEmojiUpdate = 61
-	AuditLogActionEmojiDelete = 62
+	AuditLogActionEmojiCreate AuditLogAction = 60
+	AuditLogActionEmojiUpdate AuditLogAction = 61
+	AuditLogActionEmojiDelete AuditLogAction = 62

-	AuditLogActionMessageDelete = 72
+	AuditLogActionMessageDelete     AuditLogAction = 72
+	AuditLogActionMessageBulkDelete AuditLogAction = 73
+	AuditLogActionMessagePin        AuditLogAction = 74
+	AuditLogActionMessageUnpin      AuditLogAction = 75
+
+	AuditLogActionIntegrationCreate AuditLogAction = 80
+	AuditLogActionIntegrationUpdate AuditLogAction = 81
+	AuditLogActionIntegrationDelete AuditLogAction = 82
 )

 // A UserGuildSettingsChannelOverride stores data for a channel override for a users guild settings.
@@ -884,23 +1049,35 @@ type APIErrorMessage struct {

 // Webhook stores the data for a webhook.
 type Webhook struct {
-	ID        string `json:"id"`
-	GuildID   string `json:"guild_id"`
-	ChannelID string `json:"channel_id"`
-	User      *User  `json:"user"`
-	Name      string `json:"name"`
-	Avatar    string `json:"avatar"`
-	Token     string `json:"token"`
+	ID        string      `json:"id"`
+	Type      WebhookType `json:"type"`
+	GuildID   string      `json:"guild_id"`
+	ChannelID string      `json:"channel_id"`
+	User      *User       `json:"user"`
+	Name      string      `json:"name"`
+	Avatar    string      `json:"avatar"`
+	Token     string      `json:"token"`
 }

+// WebhookType is the type of Webhook (see WebhookType* consts) in the Webhook struct
+// https://discord.com/developers/docs/resources/webhook#webhook-object-webhook-types
+type WebhookType int
+
+// Valid WebhookType values
+const (
+	WebhookTypeIncoming WebhookType = iota
+	WebhookTypeChannelFollower
+)
+
 // WebhookParams is a struct for webhook params, used in the WebhookExecute command.
 type WebhookParams struct {
-	Content   string          `json:"content,omitempty"`
-	Username  string          `json:"username,omitempty"`
-	AvatarURL string          `json:"avatar_url,omitempty"`
-	TTS       bool            `json:"tts,omitempty"`
-	File      *File           `json:"-"`
-	Embeds    []*MessageEmbed `json:"embeds,omitempty"`
+	Content         string                  `json:"content,omitempty"`
+	Username        string                  `json:"username,omitempty"`
+	AvatarURL       string                  `json:"avatar_url,omitempty"`
+	TTS             bool                    `json:"tts,omitempty"`
+	File            *File                   `json:"-"`
+	Embeds          []*MessageEmbed         `json:"embeds,omitempty"`
+	AllowedMentions *MessageAllowedMentions `json:"allowed_mentions,omitempty"`
 }

 // MessageReaction stores the data for a message reaction.
@@ -940,7 +1117,6 @@ type Activity struct {
 type ActivityType int

 // Valid ActivityType values
-// https://discord.com/developers/docs/topics/gateway#activity-object-activity-types
 const (
 	ActivityTypeGame GameType = iota
 	ActivityTypeStreaming
--- a/vendor/github.com/mattn/go-colorable/colorable_windows.go
+++ b/vendor/github.com/mattn/go-colorable/colorable_windows.go
@@ -10,6 +10,7 @@ import (
 	"os"
 	"strconv"
 	"strings"
+	"sync"
 	"syscall"
 	"unsafe"

@@ -27,6 +28,7 @@ const (
 	backgroundRed       = 0x40
 	backgroundIntensity = 0x80
 	backgroundMask      = (backgroundRed | backgroundBlue | backgroundGreen | backgroundIntensity)
+	commonLvbUnderscore = 0x8000

 	cENABLE_VIRTUAL_TERMINAL_PROCESSING = 0x4
 )
@@ -93,6 +95,7 @@ type Writer struct {
 	oldattr   word
 	oldpos    coord
 	rest      bytes.Buffer
+	mutex     sync.Mutex
 }

 // NewColorable returns new instance of Writer which handles escape sequence from File.
@@ -432,6 +435,8 @@ func atoiWithDefault(s string, def int) (int, error) {

 // Write writes data on console
 func (w *Writer) Write(data []byte) (n int, err error) {
+	w.mutex.Lock()
+	defer w.mutex.Unlock()
 	var csbi consoleScreenBufferInfo
 	procGetConsoleScreenBufferInfo.Call(uintptr(w.handle), uintptr(unsafe.Pointer(&csbi)))

@@ -683,14 +688,19 @@ loop:
 					switch {
 					case n == 0 || n == 100:
 						attr = w.oldattr
-					case 1 <= n && n <= 5:
+					case n == 4:
+						attr |= commonLvbUnderscore
+					case (1 <= n && n <= 3) || n == 5:
 						attr |= foregroundIntensity
-					case n == 7:
-						attr = ((attr & foregroundMask) << 4) | ((attr & backgroundMask) >> 4)
-					case n == 22 || n == 25:
-						attr |= foregroundIntensity
-					case n == 27:
-						attr = ((attr & foregroundMask) << 4) | ((attr & backgroundMask) >> 4)
+					case n == 7 || n == 27:
+						attr =
+							(attr &^ (foregroundMask | backgroundMask)) |
+								((attr & foregroundMask) << 4) |
+								((attr & backgroundMask) >> 4)
+					case n == 22:
+						attr &^= foregroundIntensity
+					case n == 24:
+						attr &^= commonLvbUnderscore
 					case 30 <= n && n <= 37:
 						attr &= backgroundMask
 						if (n-30)&1 != 0 {
--- a/vendor/github.com/slack-go/slack/attachments.go
+++ b/vendor/github.com/slack-go/slack/attachments.go
@@ -75,7 +75,7 @@ type Attachment struct {
 	Title     string `json:"title,omitempty"`
 	TitleLink string `json:"title_link,omitempty"`
 	Pretext   string `json:"pretext,omitempty"`
-	Text      string `json:"text,omitempty"`
+	Text      string `json:"text"` // Required

 	ImageURL string `json:"image_url,omitempty"`
 	ThumbURL string `json:"thumb_url,omitempty"`
--- a/vendor/github.com/slack-go/slack/block.go
+++ b/vendor/github.com/slack-go/slack/block.go
@@ -16,6 +16,7 @@ const (
 	MBTContext MessageBlockType = "context"
 	MBTFile    MessageBlockType = "file"
 	MBTInput   MessageBlockType = "input"
+	MBTHeader  MessageBlockType = "header"
 )

 // Block defines an interface all block types should implement
--- a/vendor/github.com/slack-go/slack/block_conv.go
+++ b/vendor/github.com/slack-go/slack/block_conv.go
@@ -111,6 +111,12 @@ func (b *InputBlock) UnmarshalJSON(data []byte) error {
 		e = &SelectBlockElement{}
 	case "multi_static_select", "multi_external_select", "multi_users_select", "multi_conversations_select", "multi_channels_select":
 		e = &MultiSelectBlockElement{}
+	case "checkboxes":
+		e = &CheckboxGroupsBlockElement{}
+	case "overflow":
+		e = &OverflowBlockElement{}
+	case "radio_buttons":
+		e = &RadioButtonsBlockElement{}
 	default:
 		return errors.New("unsupported block element type")
 	}
@@ -175,6 +181,8 @@ func (b *BlockElements) UnmarshalJSON(data []byte) error {
 			blockElement = &PlainTextInputBlockElement{}
 		case "checkboxes":
 			blockElement = &CheckboxGroupsBlockElement{}
+		case "radio_buttons":
+			blockElement = &RadioButtonsBlockElement{}
 		case "static_select", "external_select", "users_select", "conversations_select", "channels_select":
 			blockElement = &SelectBlockElement{}
 		default:
--- a/vendor/github.com/slack-go/slack/block_header.go
+++ b/vendor/github.com/slack-go/slack/block_header.go
@@ -0,0 +1,38 @@
+package slack
+
+// HeaderBlock defines a new block of type header
+//
+// More Information: https://api.slack.com/reference/messaging/blocks#header
+type HeaderBlock struct {
+	Type    MessageBlockType `json:"type"`
+	Text    *TextBlockObject `json:"text,omitempty"`
+	BlockID string           `json:"block_id,omitempty"`
+}
+
+// BlockType returns the type of the block
+func (s HeaderBlock) BlockType() MessageBlockType {
+	return s.Type
+}
+
+// HeaderBlockOption allows configuration of options for a new header block
+type HeaderBlockOption func(*HeaderBlock)
+
+func HeaderBlockOptionBlockID(blockID string) HeaderBlockOption {
+	return func(block *HeaderBlock) {
+		block.BlockID = blockID
+	}
+}
+
+// NewHeaderBlock returns a new instance of a header block to be rendered
+func NewHeaderBlock(textObj *TextBlockObject, options ...HeaderBlockOption) *HeaderBlock {
+	block := HeaderBlock{
+		Type: MBTHeader,
+		Text: textObj,
+	}
+
+	for _, option := range options {
+		option(&block)
+	}
+
+	return &block
+}
--- a/vendor/github.com/slack-go/slack/errors.go
+++ b/vendor/github.com/slack-go/slack/errors.go
@@ -9,6 +9,7 @@ const (
 	ErrRTMGoodbye           = errorsx.String("goodbye detected")
 	ErrRTMDeadman           = errorsx.String("deadman switch triggered")
 	ErrParametersMissing    = errorsx.String("received empty parameters")
+	ErrBlockIDNotUnique     = errorsx.String("Block ID needs to be unique")
 	ErrInvalidConfiguration = errorsx.String("invalid configuration")
 	ErrMissingHeaders       = errorsx.String("missing headers")
 	ErrExpiredTimestamp     = errorsx.String("timestamp is too old")
--- a/vendor/github.com/slack-go/slack/oauth.go
+++ b/vendor/github.com/slack-go/slack/oauth.go
@@ -33,14 +33,15 @@ type OAuthResponse struct {

 // OAuthV2Response ...
 type OAuthV2Response struct {
-	AccessToken string                    `json:"access_token"`
-	TokenType   string                    `json:"token_type"`
-	Scope       string                    `json:"scope"`
-	BotUserID   string                    `json:"bot_user_id"`
-	AppID       string                    `json:"app_id"`
-	Team        OAuthV2ResponseTeam       `json:"team"`
-	Enterprise  OAuthV2ResponseEnterprise `json:"enterprise"`
-	AuthedUser  OAuthV2ResponseAuthedUser `json:"authed_user"`
+	AccessToken     string                       `json:"access_token"`
+	TokenType       string                       `json:"token_type"`
+	Scope           string                       `json:"scope"`
+	BotUserID       string                       `json:"bot_user_id"`
+	AppID           string                       `json:"app_id"`
+	Team            OAuthV2ResponseTeam          `json:"team"`
+	IncomingWebhook OAuthResponseIncomingWebhook `json:"incoming_webhook"`
+	Enterprise      OAuthV2ResponseEnterprise    `json:"enterprise"`
+	AuthedUser      OAuthV2ResponseAuthedUser    `json:"authed_user"`
 	SlackResponse
 }

--- a/vendor/github.com/slack-go/slack/views.go
+++ b/vendor/github.com/slack-go/slack/views.go
@@ -150,6 +150,23 @@ func (api *Client) OpenView(triggerID string, view ModalViewRequest) (*ViewRespo
 	return api.OpenViewContext(context.Background(), triggerID, view)
 }

+// ValidateUniqueBlockID will verify if each input block has a unique block ID if set
+func ValidateUniqueBlockID(view ModalViewRequest) bool {
+
+	uniqueBlockID := map[string]bool{}
+
+	for _, b := range view.Blocks.BlockSet {
+		if inputBlock, ok := b.(*InputBlock); ok {
+			if _, ok := uniqueBlockID[inputBlock.BlockID]; ok {
+				return false
+			}
+			uniqueBlockID[inputBlock.BlockID] = true
+		}
+	}
+
+	return true
+}
+
 // OpenViewContext opens a view for a user with a custom context.
 func (api *Client) OpenViewContext(
 	ctx context.Context,
@@ -159,6 +176,11 @@ func (api *Client) OpenViewContext(
 	if triggerID == "" {
 		return nil, ErrParametersMissing
 	}
+
+	if !ValidateUniqueBlockID(view) {
+		return nil, ErrBlockIDNotUnique
+	}
+
 	req := openViewRequest{
 		TriggerID: triggerID,
 		View:      view,
--- a/vendor/github.com/spf13/viper/util.go
+++ b/vendor/github.com/spf13/viper/util.go
@@ -91,13 +91,22 @@ func insensitiviseMap(m map[string]interface{}) {
 func absPathify(inPath string) string {
 	jww.INFO.Println("Trying to resolve absolute path to", inPath)

-	if strings.HasPrefix(inPath, "$HOME") {
+	if inPath == "$HOME" || strings.HasPrefix(inPath, "$HOME"+string(os.PathSeparator)) {
 		inPath = userHomeDir() + inPath[5:]
 	}

 	if strings.HasPrefix(inPath, "$") {
 		end := strings.Index(inPath, string(os.PathSeparator))
-		inPath = os.Getenv(inPath[1:end]) + inPath[end:]
+
+		var value, suffix string
+		if end == -1 {
+			value = os.Getenv(inPath[1:])
+		} else {
+			value = os.Getenv(inPath[1:end])
+			suffix = inPath[end:]
+		}
+
+		inPath = value + suffix
 	}

 	if filepath.IsAbs(inPath) {
--- a/vendor/github.com/spf13/viper/viper.go
+++ b/vendor/github.com/spf13/viper/viper.go
@@ -896,13 +896,7 @@ func UnmarshalKey(key string, rawVal interface{}, opts ...DecoderConfigOption) e
 	return v.UnmarshalKey(key, rawVal, opts...)
 }
 func (v *Viper) UnmarshalKey(key string, rawVal interface{}, opts ...DecoderConfigOption) error {
-	err := decode(v.Get(key), defaultDecoderConfig(rawVal, opts...))
-
-	if err != nil {
-		return err
-	}
-
-	return nil
+	return decode(v.Get(key), defaultDecoderConfig(rawVal, opts...))
 }

 // Unmarshal unmarshals the config into a Struct. Make sure that the tags
@@ -911,13 +905,7 @@ func Unmarshal(rawVal interface{}, opts ...DecoderConfigOption) error {
 	return v.Unmarshal(rawVal, opts...)
 }
 func (v *Viper) Unmarshal(rawVal interface{}, opts ...DecoderConfigOption) error {
-	err := decode(v.AllSettings(), defaultDecoderConfig(rawVal, opts...))
-
-	if err != nil {
-		return err
-	}
-
-	return nil
+	return decode(v.AllSettings(), defaultDecoderConfig(rawVal, opts...))
 }

 // defaultDecoderConfig returns default mapsstructure.DecoderConfig with suppot
@@ -956,13 +944,7 @@ func (v *Viper) UnmarshalExact(rawVal interface{}, opts ...DecoderConfigOption)
 	config := defaultDecoderConfig(rawVal, opts...)
 	config.ErrorUnused = true

-	err := decode(v.AllSettings(), config)
-
-	if err != nil {
-		return err
-	}
-
-	return nil
+	return decode(v.AllSettings(), config)
 }

 // BindPFlags binds a full flag set to the configuration, using each flag's long
--- a/vendor/github.com/valyala/fasttemplate/go.mod
+++ b/vendor/github.com/valyala/fasttemplate/go.mod
@@ -1,3 +1,5 @@
 module github.com/valyala/fasttemplate

+go 1.12
+
 require github.com/valyala/bytebufferpool v1.0.0
--- a/vendor/github.com/valyala/fasttemplate/template.go
+++ b/vendor/github.com/valyala/fasttemplate/template.go
@@ -9,8 +9,9 @@ package fasttemplate
 import (
 	"bytes"
 	"fmt"
-	"github.com/valyala/bytebufferpool"
 	"io"
+
+	"github.com/valyala/bytebufferpool"
 )

 // ExecuteFunc calls f on each template tag (placeholder) occurrence.
@@ -49,6 +50,9 @@ func ExecuteFunc(template, startTag, endTag string, w io.Writer, f TagFunc) (int

 		ni, err = f(w, unsafeBytes2String(s[:n]))
 		nn += int64(ni)
+		if err != nil {
+			return nn, err
+		}
 		s = s[n+len(b):]
 	}
 	ni, err = w.Write(s)
@@ -73,6 +77,22 @@ func Execute(template, startTag, endTag string, w io.Writer, m map[string]interf
 	return ExecuteFunc(template, startTag, endTag, w, func(w io.Writer, tag string) (int, error) { return stdTagFunc(w, tag, m) })
 }

+// ExecuteStd works the same way as Execute, but keeps the unknown placeholders.
+// This can be used as a drop-in replacement for strings.Replacer
+//
+// Substitution map m may contain values with the following types:
+//   * []byte - the fastest value type
+//   * string - convenient value type
+//   * TagFunc - flexible value type
+//
+// Returns the number of bytes written to w.
+//
+// This function is optimized for constantly changing templates.
+// Use Template.ExecuteStd for frozen templates.
+func ExecuteStd(template, startTag, endTag string, w io.Writer, m map[string]interface{}) (int64, error) {
+	return ExecuteFunc(template, startTag, endTag, w, func(w io.Writer, tag string) (int, error) { return keepUnknownTagFunc(w, startTag, endTag, tag, m) })
+}
+
 // ExecuteFuncString calls f on each template tag (placeholder) occurrence
 // and substitutes it with the data written to TagFunc's w.
 //
@@ -81,19 +101,32 @@ func Execute(template, startTag, endTag string, w io.Writer, m map[string]interf
 // This function is optimized for constantly changing templates.
 // Use Template.ExecuteFuncString for frozen templates.
 func ExecuteFuncString(template, startTag, endTag string, f TagFunc) string {
+	s, err := ExecuteFuncStringWithErr(template, startTag, endTag, f)
+	if err != nil {
+		panic(fmt.Sprintf("unexpected error: %s", err))
+	}
+	return s
+}
+
+// ExecuteFuncStringWithErr is nearly the same as ExecuteFuncString
+// but when f returns an error, ExecuteFuncStringWithErr won't panic like ExecuteFuncString
+// it just returns an empty string and the error f returned
+func ExecuteFuncStringWithErr(template, startTag, endTag string, f TagFunc) (string, error) {
 	tagsCount := bytes.Count(unsafeString2Bytes(template), unsafeString2Bytes(startTag))
 	if tagsCount == 0 {
-		return template
+		return template, nil
 	}

 	bb := byteBufferPool.Get()
 	if _, err := ExecuteFunc(template, startTag, endTag, bb, f); err != nil {
-		panic(fmt.Sprintf("unexpected error: %s", err))
+		bb.Reset()
+		byteBufferPool.Put(bb)
+		return "", err
 	}
 	s := string(bb.B)
 	bb.Reset()
 	byteBufferPool.Put(bb)
-	return s
+	return s, nil
 }

 var byteBufferPool bytebufferpool.Pool
@@ -112,6 +145,20 @@ func ExecuteString(template, startTag, endTag string, m map[string]interface{})
 	return ExecuteFuncString(template, startTag, endTag, func(w io.Writer, tag string) (int, error) { return stdTagFunc(w, tag, m) })
 }

+// ExecuteStringStd works the same way as ExecuteString, but keeps the unknown placeholders.
+// This can be used as a drop-in replacement for strings.Replacer
+//
+// Substitution map m may contain values with the following types:
+//   * []byte - the fastest value type
+//   * string - convenient value type
+//   * TagFunc - flexible value type
+//
+// This function is optimized for constantly changing templates.
+// Use Template.ExecuteStringStd for frozen templates.
+func ExecuteStringStd(template, startTag, endTag string, m map[string]interface{}) string {
+	return ExecuteFuncString(template, startTag, endTag, func(w io.Writer, tag string) (int, error) { return keepUnknownTagFunc(w, startTag, endTag, tag, m) })
+}
+
 // Template implements simple template engine, which can be used for fast
 // tags' (aka placeholders) substitution.
 type Template struct {
@@ -267,6 +314,19 @@ func (t *Template) Execute(w io.Writer, m map[string]interface{}) (int64, error)
 	return t.ExecuteFunc(w, func(w io.Writer, tag string) (int, error) { return stdTagFunc(w, tag, m) })
 }

+// ExecuteStd works the same way as Execute, but keeps the unknown placeholders.
+// This can be used as a drop-in replacement for strings.Replacer
+//
+// Substitution map m may contain values with the following types:
+//   * []byte - the fastest value type
+//   * string - convenient value type
+//   * TagFunc - flexible value type
+//
+// Returns the number of bytes written to w.
+func (t *Template) ExecuteStd(w io.Writer, m map[string]interface{}) (int64, error) {
+	return t.ExecuteFunc(w, func(w io.Writer, tag string) (int, error) { return keepUnknownTagFunc(w, t.startTag, t.endTag, tag, m) })
+}
+
 // ExecuteFuncString calls f on each template tag (placeholder) occurrence
 // and substitutes it with the data written to TagFunc's w.
 //
@@ -275,14 +335,31 @@ func (t *Template) Execute(w io.Writer, m map[string]interface{}) (int64, error)
 // This function is optimized for frozen templates.
 // Use ExecuteFuncString for constantly changing templates.
 func (t *Template) ExecuteFuncString(f TagFunc) string {
+	s, err := t.ExecuteFuncStringWithErr(f)
+	if err != nil {
+		panic(fmt.Sprintf("unexpected error: %s", err))
+	}
+	return s
+}
+
+// ExecuteFuncStringWithErr calls f on each template tag (placeholder) occurrence
+// and substitutes it with the data written to TagFunc's w.
+//
+// Returns the resulting string.
+//
+// This function is optimized for frozen templates.
+// Use ExecuteFuncString for constantly changing templates.
+func (t *Template) ExecuteFuncStringWithErr(f TagFunc) (string, error) {
 	bb := t.byteBufferPool.Get()
 	if _, err := t.ExecuteFunc(bb, f); err != nil {
-		panic(fmt.Sprintf("unexpected error: %s", err))
+		bb.Reset()
+		t.byteBufferPool.Put(bb)
+		return "", err
 	}
 	s := string(bb.Bytes())
 	bb.Reset()
 	t.byteBufferPool.Put(bb)
-	return s
+	return s, nil
 }

 // ExecuteString substitutes template tags (placeholders) with the corresponding
@@ -299,6 +376,20 @@ func (t *Template) ExecuteString(m map[string]interface{}) string {
 	return t.ExecuteFuncString(func(w io.Writer, tag string) (int, error) { return stdTagFunc(w, tag, m) })
 }

+// ExecuteStringStd works the same way as ExecuteString, but keeps the unknown placeholders.
+// This can be used as a drop-in replacement for strings.Replacer
+//
+// Substitution map m may contain values with the following types:
+//   * []byte - the fastest value type
+//   * string - convenient value type
+//   * TagFunc - flexible value type
+//
+// This function is optimized for frozen templates.
+// Use ExecuteStringStd for constantly changing templates.
+func (t *Template) ExecuteStringStd(m map[string]interface{}) string {
+	return t.ExecuteFuncString(func(w io.Writer, tag string) (int, error) { return keepUnknownTagFunc(w, t.startTag, t.endTag, tag, m) })
+}
+
 func stdTagFunc(w io.Writer, tag string, m map[string]interface{}) (int, error) {
 	v := m[tag]
 	if v == nil {
@@ -315,3 +406,32 @@ func stdTagFunc(w io.Writer, tag string, m map[string]interface{}) (int, error)
 		panic(fmt.Sprintf("tag=%q contains unexpected value type=%#v. Expected []byte, string or TagFunc", tag, v))
 	}
 }
+
+func keepUnknownTagFunc(w io.Writer, startTag, endTag, tag string, m map[string]interface{}) (int, error) {
+	v, ok := m[tag]
+	if !ok {
+		if _, err := w.Write(unsafeString2Bytes(startTag)); err != nil {
+			return 0, err
+		}
+		if _, err := w.Write(unsafeString2Bytes(tag)); err != nil {
+			return 0, err
+		}
+		if _, err := w.Write(unsafeString2Bytes(endTag)); err != nil {
+			return 0, err
+		}
+		return len(startTag) + len(tag) + len(endTag), nil
+	}
+	if v == nil {
+		return 0, nil
+	}
+	switch value := v.(type) {
+	case []byte:
+		return w.Write(value)
+	case string:
+		return w.Write([]byte(value))
+	case TagFunc:
+		return value(w, tag)
+	default:
+		panic(fmt.Sprintf("tag=%q contains unexpected value type=%#v. Expected []byte, string or TagFunc", tag, v))
+	}
+}
--- a/vendor/github.com/valyala/fasttemplate/unsafe.go
+++ b/vendor/github.com/valyala/fasttemplate/unsafe.go
@@ -11,12 +11,11 @@ func unsafeBytes2String(b []byte) string {
 	return *(*string)(unsafe.Pointer(&b))
 }

-func unsafeString2Bytes(s string) []byte {
+func unsafeString2Bytes(s string) (b []byte) {
 	sh := (*reflect.StringHeader)(unsafe.Pointer(&s))
-	bh := reflect.SliceHeader{
-		Data: sh.Data,
-		Len:  sh.Len,
-		Cap:  sh.Len,
-	}
-	return *(*[]byte)(unsafe.Pointer(&bh))
+	bh := (*reflect.SliceHeader)(unsafe.Pointer(&b))
+	bh.Data = sh.Data
+	bh.Cap = sh.Len
+	bh.Len = sh.Len
+	return b
 }
--- a/vendor/github.com/yaegashi/msgraph.go/beta/ActionAad.go
+++ b/vendor/github.com/yaegashi/msgraph.go/beta/ActionAad.go
@@ -1,4 +1,4 @@
-// Code generated by msgraph-generate.go DO NOT EDIT.
+// Code generated by msgraph.go/gen DO NOT EDIT.

 package msgraph

--- a/vendor/github.com/yaegashi/msgraph.go/beta/ActionAccess.go
+++ b/vendor/github.com/yaegashi/msgraph.go/beta/ActionAccess.go
@@ -1,4 +1,4 @@
-// Code generated by msgraph-generate.go DO NOT EDIT.
+// Code generated by msgraph.go/gen DO NOT EDIT.

 package msgraph

@@ -73,9 +73,9 @@ func (r *AccessPackageAccessPackageAssignmentPoliciesCollectionRequest) Paging(c
 	}
 	var values []AccessPackageAssignmentPolicy
 	for {
-		defer res.Body.Close()
 		if res.StatusCode != http.StatusOK {
 			b, _ := ioutil.ReadAll(res.Body)
+			res.Body.Close()
 			errRes := &ErrorResponse{Response: res}
 			err := jsonx.Unmarshal(b, errRes)
 			if err != nil {
@@ -88,6 +88,7 @@ func (r *AccessPackageAccessPackageAssignmentPoliciesCollectionRequest) Paging(c
 			value  []AccessPackageAssignmentPolicy
 		)
 		err := jsonx.NewDecoder(res.Body).Decode(&paging)
+		res.Body.Close()
 		if err != nil {
 			return nil, err
 		}
@@ -182,9 +183,9 @@ func (r *AccessPackageAccessPackageResourceRoleScopesCollectionRequest) Paging(c
 	}
 	var values []AccessPackageResourceRoleScope
 	for {
-		defer res.Body.Close()
 		if res.StatusCode != http.StatusOK {
 			b, _ := ioutil.ReadAll(res.Body)
+			res.Body.Close()
 			errRes := &ErrorResponse{Response: res}
 			err := jsonx.Unmarshal(b, errRes)
 			if err != nil {
@@ -197,6 +198,7 @@ func (r *AccessPackageAccessPackageResourceRoleScopesCollectionRequest) Paging(c
 			value  []AccessPackageResourceRoleScope
 		)
 		err := jsonx.NewDecoder(res.Body).Decode(&paging)
+		res.Body.Close()
 		if err != nil {
 			return nil, err
 		}
@@ -298,9 +300,9 @@ func (r *AccessPackageAssignmentAccessPackageAssignmentRequestsCollectionRequest
 	}
 	var values []AccessPackageAssignmentRequestObject
 	for {
-		defer res.Body.Close()
 		if res.StatusCode != http.StatusOK {
 			b, _ := ioutil.ReadAll(res.Body)
+			res.Body.Close()
 			errRes := &ErrorResponse{Response: res}
 			err := jsonx.Unmarshal(b, errRes)
 			if err != nil {
@@ -313,6 +315,7 @@ func (r *AccessPackageAssignmentAccessPackageAssignmentRequestsCollectionRequest
 			value  []AccessPackageAssignmentRequestObject
 		)
 		err := jsonx.NewDecoder(res.Body).Decode(&paging)
+		res.Body.Close()
 		if err != nil {
 			return nil, err
 		}
@@ -400,9 +403,9 @@ func (r *AccessPackageAssignmentAccessPackageAssignmentResourceRolesCollectionRe
 	}
 	var values []AccessPackageAssignmentResourceRole
 	for {
-		defer res.Body.Close()
 		if res.StatusCode != http.StatusOK {
 			b, _ := ioutil.ReadAll(res.Body)
+			res.Body.Close()
 			errRes := &ErrorResponse{Response: res}
 			err := jsonx.Unmarshal(b, errRes)
 			if err != nil {
@@ -415,6 +418,7 @@ func (r *AccessPackageAssignmentAccessPackageAssignmentResourceRolesCollectionRe
 			value  []AccessPackageAssignmentResourceRole
 		)
 		err := jsonx.NewDecoder(res.Body).Decode(&paging)
+		res.Body.Close()
 		if err != nil {
 			return nil, err
 		}
@@ -544,9 +548,9 @@ func (r *AccessPackageAssignmentResourceRoleAccessPackageAssignmentsCollectionRe
 	}
 	var values []AccessPackageAssignment
 	for {
-		defer res.Body.Close()
 		if res.StatusCode != http.StatusOK {
 			b, _ := ioutil.ReadAll(res.Body)
+			res.Body.Close()
 			errRes := &ErrorResponse{Response: res}
 			err := jsonx.Unmarshal(b, errRes)
 			if err != nil {
@@ -559,6 +563,7 @@ func (r *AccessPackageAssignmentResourceRoleAccessPackageAssignmentsCollectionRe
 			value  []AccessPackageAssignment
 		)
 		err := jsonx.NewDecoder(res.Body).Decode(&paging)
+		res.Body.Close()
 		if err != nil {
 			return nil, err
 		}
@@ -667,9 +672,9 @@ func (r *AccessPackageCatalogAccessPackageResourceRolesCollectionRequest) Paging
 	}
 	var values []AccessPackageResourceRole
 	for {
-		defer res.Body.Close()
 		if res.StatusCode != http.StatusOK {
 			b, _ := ioutil.ReadAll(res.Body)
+			res.Body.Close()
 			errRes := &ErrorResponse{Response: res}
 			err := jsonx.Unmarshal(b, errRes)
 			if err != nil {
@@ -682,6 +687,7 @@ func (r *AccessPackageCatalogAccessPackageResourceRolesCollectionRequest) Paging
 			value  []AccessPackageResourceRole
 		)
 		err := jsonx.NewDecoder(res.Body).Decode(&paging)
+		res.Body.Close()
 		if err != nil {
 			return nil, err
 		}
@@ -769,9 +775,9 @@ func (r *AccessPackageCatalogAccessPackageResourceScopesCollectionRequest) Pagin
 	}
 	var values []AccessPackageResourceScope
 	for {
-		defer res.Body.Close()
 		if res.StatusCode != http.StatusOK {
 			b, _ := ioutil.ReadAll(res.Body)
+			res.Body.Close()
 			errRes := &ErrorResponse{Response: res}
 			err := jsonx.Unmarshal(b, errRes)
 			if err != nil {
@@ -784,6 +790,7 @@ func (r *AccessPackageCatalogAccessPackageResourceScopesCollectionRequest) Pagin
 			value  []AccessPackageResourceScope
 		)
 		err := jsonx.NewDecoder(res.Body).Decode(&paging)
+		res.Body.Close()
 		if err != nil {
 			return nil, err
 		}
@@ -871,9 +878,9 @@ func (r *AccessPackageCatalogAccessPackageResourcesCollectionRequest) Paging(ctx
 	}
 	var values []AccessPackageResource
 	for {
-		defer res.Body.Close()
 		if res.StatusCode != http.StatusOK {
 			b, _ := ioutil.ReadAll(res.Body)
+			res.Body.Close()
 			errRes := &ErrorResponse{Response: res}
 			err := jsonx.Unmarshal(b, errRes)
 			if err != nil {
@@ -886,6 +893,7 @@ func (r *AccessPackageCatalogAccessPackageResourcesCollectionRequest) Paging(ctx
 			value  []AccessPackageResource
 		)
 		err := jsonx.NewDecoder(res.Body).Decode(&paging)
+		res.Body.Close()
 		if err != nil {
 			return nil, err
 		}
@@ -973,9 +981,9 @@ func (r *AccessPackageCatalogAccessPackagesCollectionRequest) Paging(ctx context
 	}
 	var values []AccessPackage
 	for {
-		defer res.Body.Close()
 		if res.StatusCode != http.StatusOK {
 			b, _ := ioutil.ReadAll(res.Body)
+			res.Body.Close()
 			errRes := &ErrorResponse{Response: res}
 			err := jsonx.Unmarshal(b, errRes)
 			if err != nil {
@@ -988,6 +996,7 @@ func (r *AccessPackageCatalogAccessPackagesCollectionRequest) Paging(ctx context
 			value  []AccessPackage
 		)
 		err := jsonx.NewDecoder(res.Body).Decode(&paging)
+		res.Body.Close()
 		if err != nil {
 			return nil, err
 		}
@@ -1075,9 +1084,9 @@ func (r *AccessPackageResourceAccessPackageResourceRolesCollectionRequest) Pagin
 	}
 	var values []AccessPackageResourceRole
 	for {
-		defer res.Body.Close()
 		if res.StatusCode != http.StatusOK {
 			b, _ := ioutil.ReadAll(res.Body)
+			res.Body.Close()
 			errRes := &ErrorResponse{Response: res}
 			err := jsonx.Unmarshal(b, errRes)
 			if err != nil {
@@ -1090,6 +1099,7 @@ func (r *AccessPackageResourceAccessPackageResourceRolesCollectionRequest) Pagin
 			value  []AccessPackageResourceRole
 		)
 		err := jsonx.NewDecoder(res.Body).Decode(&paging)
+		res.Body.Close()
 		if err != nil {
 			return nil, err
 		}
@@ -1177,9 +1187,9 @@ func (r *AccessPackageResourceAccessPackageResourceScopesCollectionRequest) Pagi
 	}
 	var values []AccessPackageResourceScope
 	for {
-		defer res.Body.Close()
 		if res.StatusCode != http.StatusOK {
 			b, _ := ioutil.ReadAll(res.Body)
+			res.Body.Close()
 			errRes := &ErrorResponse{Response: res}
 			err := jsonx.Unmarshal(b, errRes)
 			if err != nil {
@@ -1192,6 +1202,7 @@ func (r *AccessPackageResourceAccessPackageResourceScopesCollectionRequest) Pagi
 			value  []AccessPackageResourceScope
 		)
 		err := jsonx.NewDecoder(res.Body).Decode(&paging)
+		res.Body.Close()
 		if err != nil {
 			return nil, err
 		}
@@ -1321,9 +1332,9 @@ func (r *AccessReviewDecisionsCollectionRequest) Paging(ctx context.Context, met
 	}
 	var values []AccessReviewDecision
 	for {
-		defer res.Body.Close()
 		if res.StatusCode != http.StatusOK {
 			b, _ := ioutil.ReadAll(res.Body)
+			res.Body.Close()
 			errRes := &ErrorResponse{Response: res}
 			err := jsonx.Unmarshal(b, errRes)
 			if err != nil {
@@ -1336,6 +1347,7 @@ func (r *AccessReviewDecisionsCollectionRequest) Paging(ctx context.Context, met
 			value  []AccessReviewDecision
 		)
 		err := jsonx.NewDecoder(res.Body).Decode(&paging)
+		res.Body.Close()
 		if err != nil {
 			return nil, err
 		}
@@ -1423,9 +1435,9 @@ func (r *AccessReviewInstancesCollectionRequest) Paging(ctx context.Context, met
 	}
 	var values []AccessReview
 	for {
-		defer res.Body.Close()
 		if res.StatusCode != http.StatusOK {
 			b, _ := ioutil.ReadAll(res.Body)
+			res.Body.Close()
 			errRes := &ErrorResponse{Response: res}
 			err := jsonx.Unmarshal(b, errRes)
 			if err != nil {
@@ -1438,6 +1450,7 @@ func (r *AccessReviewInstancesCollectionRequest) Paging(ctx context.Context, met
 			value  []AccessReview
 		)
 		err := jsonx.NewDecoder(res.Body).Decode(&paging)
+		res.Body.Close()
 		if err != nil {
 			return nil, err
 		}
@@ -1525,9 +1538,9 @@ func (r *AccessReviewMyDecisionsCollectionRequest) Paging(ctx context.Context, m
 	}
 	var values []AccessReviewDecision
 	for {
-		defer res.Body.Close()
 		if res.StatusCode != http.StatusOK {
 			b, _ := ioutil.ReadAll(res.Body)
+			res.Body.Close()
 			errRes := &ErrorResponse{Response: res}
 			err := jsonx.Unmarshal(b, errRes)
 			if err != nil {
@@ -1540,6 +1553,7 @@ func (r *AccessReviewMyDecisionsCollectionRequest) Paging(ctx context.Context, m
 			value  []AccessReviewDecision
 		)
 		err := jsonx.NewDecoder(res.Body).Decode(&paging)
+		res.Body.Close()
 		if err != nil {
 			return nil, err
 		}
@@ -1627,9 +1641,9 @@ func (r *AccessReviewReviewersCollectionRequest) Paging(ctx context.Context, met
 	}
 	var values []AccessReviewReviewer
 	for {
-		defer res.Body.Close()
 		if res.StatusCode != http.StatusOK {
 			b, _ := ioutil.ReadAll(res.Body)
+			res.Body.Close()
 			errRes := &ErrorResponse{Response: res}
 			err := jsonx.Unmarshal(b, errRes)
 			if err != nil {
@@ -1642,6 +1656,7 @@ func (r *AccessReviewReviewersCollectionRequest) Paging(ctx context.Context, met
 			value  []AccessReviewReviewer
 		)
 		err := jsonx.NewDecoder(res.Body).Decode(&paging)
+		res.Body.Close()
 		if err != nil {
 			return nil, err
 		}
--- a/vendor/github.com/yaegashi/msgraph.go/beta/ActionActive.go
+++ b/vendor/github.com/yaegashi/msgraph.go/beta/ActionActive.go
@@ -1,4 +1,4 @@
-// Code generated by msgraph-generate.go DO NOT EDIT.
+// Code generated by msgraph.go/gen DO NOT EDIT.

 package msgraph

--- a/vendor/github.com/yaegashi/msgraph.go/beta/ActionActivity.go
+++ b/vendor/github.com/yaegashi/msgraph.go/beta/ActionActivity.go
@@ -1,4 +1,4 @@
-// Code generated by msgraph-generate.go DO NOT EDIT.
+// Code generated by msgraph.go/gen DO NOT EDIT.

 package msgraph

--- a/vendor/github.com/yaegashi/msgraph.go/beta/ActionAdministrative.go
+++ b/vendor/github.com/yaegashi/msgraph.go/beta/ActionAdministrative.go
@@ -1,4 +1,4 @@
-// Code generated by msgraph-generate.go DO NOT EDIT.
+// Code generated by msgraph.go/gen DO NOT EDIT.

 package msgraph

@@ -53,9 +53,9 @@ func (r *AdministrativeUnitExtensionsCollectionRequest) Paging(ctx context.Conte
 	}
 	var values []Extension
 	for {
-		defer res.Body.Close()
 		if res.StatusCode != http.StatusOK {
 			b, _ := ioutil.ReadAll(res.Body)
+			res.Body.Close()
 			errRes := &ErrorResponse{Response: res}
 			err := jsonx.Unmarshal(b, errRes)
 			if err != nil {
@@ -68,6 +68,7 @@ func (r *AdministrativeUnitExtensionsCollectionRequest) Paging(ctx context.Conte
 			value  []Extension
 		)
 		err := jsonx.NewDecoder(res.Body).Decode(&paging)
+		res.Body.Close()
 		if err != nil {
 			return nil, err
 		}
@@ -155,9 +156,9 @@ func (r *AdministrativeUnitMembersCollectionRequest) Paging(ctx context.Context,
 	}
 	var values []DirectoryObject
 	for {
-		defer res.Body.Close()
 		if res.StatusCode != http.StatusOK {
 			b, _ := ioutil.ReadAll(res.Body)
+			res.Body.Close()
 			errRes := &ErrorResponse{Response: res}
 			err := jsonx.Unmarshal(b, errRes)
 			if err != nil {
@@ -170,6 +171,7 @@ func (r *AdministrativeUnitMembersCollectionRequest) Paging(ctx context.Context,
 			value  []DirectoryObject
 		)
 		err := jsonx.NewDecoder(res.Body).Decode(&paging)
+		res.Body.Close()
 		if err != nil {
 			return nil, err
 		}
@@ -257,9 +259,9 @@ func (r *AdministrativeUnitScopedRoleMembersCollectionRequest) Paging(ctx contex
 	}
 	var values []ScopedRoleMembership
 	for {
-		defer res.Body.Close()
 		if res.StatusCode != http.StatusOK {
 			b, _ := ioutil.ReadAll(res.Body)
+			res.Body.Close()
 			errRes := &ErrorResponse{Response: res}
 			err := jsonx.Unmarshal(b, errRes)
 			if err != nil {
@@ -272,6 +274,7 @@ func (r *AdministrativeUnitScopedRoleMembersCollectionRequest) Paging(ctx contex
 			value  []ScopedRoleMembership
 		)
 		err := jsonx.NewDecoder(res.Body).Decode(&paging)
+		res.Body.Close()
 		if err != nil {
 			return nil, err
 		}
--- a/vendor/github.com/yaegashi/msgraph.go/beta/ActionAdvanced.go
+++ b/vendor/github.com/yaegashi/msgraph.go/beta/ActionAdvanced.go
@@ -1,4 +1,4 @@
-// Code generated by msgraph-generate.go DO NOT EDIT.
+// Code generated by msgraph.go/gen DO NOT EDIT.

 package msgraph

@@ -53,9 +53,9 @@ func (r *AdvancedThreatProtectionOnboardingStateSummaryAdvancedThreatProtectionO
 	}
 	var values []AdvancedThreatProtectionOnboardingDeviceSettingState
 	for {
-		defer res.Body.Close()
 		if res.StatusCode != http.StatusOK {
 			b, _ := ioutil.ReadAll(res.Body)
+			res.Body.Close()
 			errRes := &ErrorResponse{Response: res}
 			err := jsonx.Unmarshal(b, errRes)
 			if err != nil {
@@ -68,6 +68,7 @@ func (r *AdvancedThreatProtectionOnboardingStateSummaryAdvancedThreatProtectionO
 			value  []AdvancedThreatProtectionOnboardingDeviceSettingState
 		)
 		err := jsonx.NewDecoder(res.Body).Decode(&paging)
+		res.Body.Close()
 		if err != nil {
 			return nil, err
 		}
--- a/vendor/github.com/yaegashi/msgraph.go/beta/ActionAgreement.go
+++ b/vendor/github.com/yaegashi/msgraph.go/beta/ActionAgreement.go
@@ -1,4 +1,4 @@
-// Code generated by msgraph-generate.go DO NOT EDIT.
+// Code generated by msgraph.go/gen DO NOT EDIT.

 package msgraph

@@ -53,9 +53,9 @@ func (r *AgreementFilesCollectionRequest) Paging(ctx context.Context, method, pa
 	}
 	var values []AgreementFile
 	for {
-		defer res.Body.Close()
 		if res.StatusCode != http.StatusOK {
 			b, _ := ioutil.ReadAll(res.Body)
+			res.Body.Close()
 			errRes := &ErrorResponse{Response: res}
 			err := jsonx.Unmarshal(b, errRes)
 			if err != nil {
@@ -68,6 +68,7 @@ func (r *AgreementFilesCollectionRequest) Paging(ctx context.Context, method, pa
 			value  []AgreementFile
 		)
 		err := jsonx.NewDecoder(res.Body).Decode(&paging)
+		res.Body.Close()
 		if err != nil {
 			return nil, err
 		}
--- a/vendor/github.com/yaegashi/msgraph.go/beta/ActionAlert.go
+++ b/vendor/github.com/yaegashi/msgraph.go/beta/ActionAlert.go
@@ -1,4 +1,4 @@
-// Code generated by msgraph-generate.go DO NOT EDIT.
+// Code generated by msgraph.go/gen DO NOT EDIT.

 package msgraph

--- a/vendor/github.com/yaegashi/msgraph.go/beta/ActionAndroid.go
+++ b/vendor/github.com/yaegashi/msgraph.go/beta/ActionAndroid.go
@@ -1,4 +1,4 @@
-// Code generated by msgraph-generate.go DO NOT EDIT.
+// Code generated by msgraph.go/gen DO NOT EDIT.

 package msgraph

@@ -167,9 +167,9 @@ func (r *AndroidDeviceOwnerScepCertificateProfileManagedDeviceCertificateStatesC
 	}
 	var values []ManagedDeviceCertificateState
 	for {
-		defer res.Body.Close()
 		if res.StatusCode != http.StatusOK {
 			b, _ := ioutil.ReadAll(res.Body)
+			res.Body.Close()
 			errRes := &ErrorResponse{Response: res}
 			err := jsonx.Unmarshal(b, errRes)
 			if err != nil {
@@ -182,6 +182,7 @@ func (r *AndroidDeviceOwnerScepCertificateProfileManagedDeviceCertificateStatesC
 			value  []ManagedDeviceCertificateState
 		)
 		err := jsonx.NewDecoder(res.Body).Decode(&paging)
+		res.Body.Close()
 		if err != nil {
 			return nil, err
 		}
@@ -332,9 +333,9 @@ func (r *AndroidForWorkImportedPFXCertificateProfileManagedDeviceCertificateStat
 	}
 	var values []ManagedDeviceCertificateState
 	for {
-		defer res.Body.Close()
 		if res.StatusCode != http.StatusOK {
 			b, _ := ioutil.ReadAll(res.Body)
+			res.Body.Close()
 			errRes := &ErrorResponse{Response: res}
 			err := jsonx.Unmarshal(b, errRes)
 			if err != nil {
@@ -347,6 +348,7 @@ func (r *AndroidForWorkImportedPFXCertificateProfileManagedDeviceCertificateStat
 			value  []ManagedDeviceCertificateState
 		)
 		err := jsonx.NewDecoder(res.Body).Decode(&paging)
+		res.Body.Close()
 		if err != nil {
 			return nil, err
 		}
@@ -434,9 +436,9 @@ func (r *AndroidForWorkPkcsCertificateProfileManagedDeviceCertificateStatesColle
 	}
 	var values []ManagedDeviceCertificateState
 	for {
-		defer res.Body.Close()
 		if res.StatusCode != http.StatusOK {
 			b, _ := ioutil.ReadAll(res.Body)
+			res.Body.Close()
 			errRes := &ErrorResponse{Response: res}
 			err := jsonx.Unmarshal(b, errRes)
 			if err != nil {
@@ -449,6 +451,7 @@ func (r *AndroidForWorkPkcsCertificateProfileManagedDeviceCertificateStatesColle
 			value  []ManagedDeviceCertificateState
 		)
 		err := jsonx.NewDecoder(res.Body).Decode(&paging)
+		res.Body.Close()
 		if err != nil {
 			return nil, err
 		}
@@ -536,9 +539,9 @@ func (r *AndroidForWorkScepCertificateProfileManagedDeviceCertificateStatesColle
 	}
 	var values []ManagedDeviceCertificateState
 	for {
-		defer res.Body.Close()
 		if res.StatusCode != http.StatusOK {
 			b, _ := ioutil.ReadAll(res.Body)
+			res.Body.Close()
 			errRes := &ErrorResponse{Response: res}
 			err := jsonx.Unmarshal(b, errRes)
 			if err != nil {
@@ -551,6 +554,7 @@ func (r *AndroidForWorkScepCertificateProfileManagedDeviceCertificateStatesColle
 			value  []ManagedDeviceCertificateState
 		)
 		err := jsonx.NewDecoder(res.Body).Decode(&paging)
+		res.Body.Close()
 		if err != nil {
 			return nil, err
 		}
@@ -645,9 +649,9 @@ func (r *AndroidImportedPFXCertificateProfileManagedDeviceCertificateStatesColle
 	}
 	var values []ManagedDeviceCertificateState
 	for {
-		defer res.Body.Close()
 		if res.StatusCode != http.StatusOK {
 			b, _ := ioutil.ReadAll(res.Body)
+			res.Body.Close()
 			errRes := &ErrorResponse{Response: res}
 			err := jsonx.Unmarshal(b, errRes)
 			if err != nil {
@@ -660,6 +664,7 @@ func (r *AndroidImportedPFXCertificateProfileManagedDeviceCertificateStatesColle
 			value  []ManagedDeviceCertificateState
 		)
 		err := jsonx.NewDecoder(res.Body).Decode(&paging)
+		res.Body.Close()
 		if err != nil {
 			return nil, err
 		}
@@ -747,9 +752,9 @@ func (r *AndroidManagedAppProtectionAppsCollectionRequest) Paging(ctx context.Co
 	}
 	var values []ManagedMobileApp
 	for {
-		defer res.Body.Close()
 		if res.StatusCode != http.StatusOK {
 			b, _ := ioutil.ReadAll(res.Body)
+			res.Body.Close()
 			errRes := &ErrorResponse{Response: res}
 			err := jsonx.Unmarshal(b, errRes)
 			if err != nil {
@@ -762,6 +767,7 @@ func (r *AndroidManagedAppProtectionAppsCollectionRequest) Paging(ctx context.Co
 			value  []ManagedMobileApp
 		)
 		err := jsonx.NewDecoder(res.Body).Decode(&paging)
+		res.Body.Close()
 		if err != nil {
 			return nil, err
 		}
@@ -856,9 +862,9 @@ func (r *AndroidPkcsCertificateProfileManagedDeviceCertificateStatesCollectionRe
 	}
 	var values []ManagedDeviceCertificateState
 	for {
-		defer res.Body.Close()
 		if res.StatusCode != http.StatusOK {
 			b, _ := ioutil.ReadAll(res.Body)
+			res.Body.Close()
 			errRes := &ErrorResponse{Response: res}
 			err := jsonx.Unmarshal(b, errRes)
 			if err != nil {
@@ -871,6 +877,7 @@ func (r *AndroidPkcsCertificateProfileManagedDeviceCertificateStatesCollectionRe
 			value  []ManagedDeviceCertificateState
 		)
 		err := jsonx.NewDecoder(res.Body).Decode(&paging)
+		res.Body.Close()
 		if err != nil {
 			return nil, err
 		}
@@ -958,9 +965,9 @@ func (r *AndroidScepCertificateProfileManagedDeviceCertificateStatesCollectionRe
 	}
 	var values []ManagedDeviceCertificateState
 	for {
-		defer res.Body.Close()
 		if res.StatusCode != http.StatusOK {
 			b, _ := ioutil.ReadAll(res.Body)
+			res.Body.Close()
 			errRes := &ErrorResponse{Response: res}
 			err := jsonx.Unmarshal(b, errRes)
 			if err != nil {
@@ -973,6 +980,7 @@ func (r *AndroidScepCertificateProfileManagedDeviceCertificateStatesCollectionRe
 			value  []ManagedDeviceCertificateState
 		)
 		err := jsonx.NewDecoder(res.Body).Decode(&paging)
+		res.Body.Close()
 		if err != nil {
 			return nil, err
 		}
@@ -1095,9 +1103,9 @@ func (r *AndroidWorkProfilePkcsCertificateProfileManagedDeviceCertificateStatesC
 	}
 	var values []ManagedDeviceCertificateState
 	for {
-		defer res.Body.Close()
 		if res.StatusCode != http.StatusOK {
 			b, _ := ioutil.ReadAll(res.Body)
+			res.Body.Close()
 			errRes := &ErrorResponse{Response: res}
 			err := jsonx.Unmarshal(b, errRes)
 			if err != nil {
@@ -1110,6 +1118,7 @@ func (r *AndroidWorkProfilePkcsCertificateProfileManagedDeviceCertificateStatesC
 			value  []ManagedDeviceCertificateState
 		)
 		err := jsonx.NewDecoder(res.Body).Decode(&paging)
+		res.Body.Close()
 		if err != nil {
 			return nil, err
 		}
@@ -1197,9 +1206,9 @@ func (r *AndroidWorkProfileScepCertificateProfileManagedDeviceCertificateStatesC
 	}
 	var values []ManagedDeviceCertificateState
 	for {
-		defer res.Body.Close()
 		if res.StatusCode != http.StatusOK {
 			b, _ := ioutil.ReadAll(res.Body)
+			res.Body.Close()
 			errRes := &ErrorResponse{Response: res}
 			err := jsonx.Unmarshal(b, errRes)
 			if err != nil {
@@ -1212,6 +1221,7 @@ func (r *AndroidWorkProfileScepCertificateProfileManagedDeviceCertificateStatesC
 			value  []ManagedDeviceCertificateState
 		)
 		err := jsonx.NewDecoder(res.Body).Decode(&paging)
+		res.Body.Close()
 		if err != nil {
 			return nil, err
 		}
--- a/vendor/github.com/yaegashi/msgraph.go/beta/ActionApp.go
+++ b/vendor/github.com/yaegashi/msgraph.go/beta/ActionApp.go
@@ -1,4 +1,4 @@
-// Code generated by msgraph-generate.go DO NOT EDIT.
+// Code generated by msgraph.go/gen DO NOT EDIT.

 package msgraph

@@ -57,9 +57,9 @@ func (r *AppCatalogsTeamsAppsCollectionRequest) Paging(ctx context.Context, meth
 	}
 	var values []TeamsApp
 	for {
-		defer res.Body.Close()
 		if res.StatusCode != http.StatusOK {
 			b, _ := ioutil.ReadAll(res.Body)
+			res.Body.Close()
 			errRes := &ErrorResponse{Response: res}
 			err := jsonx.Unmarshal(b, errRes)
 			if err != nil {
@@ -72,6 +72,7 @@ func (r *AppCatalogsTeamsAppsCollectionRequest) Paging(ctx context.Context, meth
 			value  []TeamsApp
 		)
 		err := jsonx.NewDecoder(res.Body).Decode(&paging)
+		res.Body.Close()
 		if err != nil {
 			return nil, err
 		}
@@ -159,9 +160,9 @@ func (r *AppVulnerabilityTaskManagedDevicesCollectionRequest) Paging(ctx context
 	}
 	var values []AppVulnerabilityManagedDevice
 	for {
-		defer res.Body.Close()
 		if res.StatusCode != http.StatusOK {
 			b, _ := ioutil.ReadAll(res.Body)
+			res.Body.Close()
 			errRes := &ErrorResponse{Response: res}
 			err := jsonx.Unmarshal(b, errRes)
 			if err != nil {
@@ -174,6 +175,7 @@ func (r *AppVulnerabilityTaskManagedDevicesCollectionRequest) Paging(ctx context
 			value  []AppVulnerabilityManagedDevice
 		)
 		err := jsonx.NewDecoder(res.Body).Decode(&paging)
+		res.Body.Close()
 		if err != nil {
 			return nil, err
 		}
@@ -261,9 +263,9 @@ func (r *AppVulnerabilityTaskMobileAppsCollectionRequest) Paging(ctx context.Con
 	}
 	var values []AppVulnerabilityMobileApp
 	for {
-		defer res.Body.Close()
 		if res.StatusCode != http.StatusOK {
 			b, _ := ioutil.ReadAll(res.Body)
+			res.Body.Close()
 			errRes := &ErrorResponse{Response: res}
 			err := jsonx.Unmarshal(b, errRes)
 			if err != nil {
@@ -276,6 +278,7 @@ func (r *AppVulnerabilityTaskMobileAppsCollectionRequest) Paging(ctx context.Con
 			value  []AppVulnerabilityMobileApp
 		)
 		err := jsonx.NewDecoder(res.Body).Decode(&paging)
+		res.Body.Close()
 		if err != nil {
 			return nil, err
 		}
--- a/vendor/github.com/yaegashi/msgraph.go/beta/ActionApple.go
+++ b/vendor/github.com/yaegashi/msgraph.go/beta/ActionApple.go
@@ -1,4 +1,4 @@
-// Code generated by msgraph-generate.go DO NOT EDIT.
+// Code generated by msgraph.go/gen DO NOT EDIT.

 package msgraph

@@ -59,9 +59,9 @@ func (r *AppleUserInitiatedEnrollmentProfileAssignmentsCollectionRequest) Paging
 	}
 	var values []AppleEnrollmentProfileAssignment
 	for {
-		defer res.Body.Close()
 		if res.StatusCode != http.StatusOK {
 			b, _ := ioutil.ReadAll(res.Body)
+			res.Body.Close()
 			errRes := &ErrorResponse{Response: res}
 			err := jsonx.Unmarshal(b, errRes)
 			if err != nil {
@@ -74,6 +74,7 @@ func (r *AppleUserInitiatedEnrollmentProfileAssignmentsCollectionRequest) Paging
 			value  []AppleEnrollmentProfileAssignment
 		)
 		err := jsonx.NewDecoder(res.Body).Decode(&paging)
+		res.Body.Close()
 		if err != nil {
 			return nil, err
 		}
--- a/vendor/github.com/yaegashi/msgraph.go/beta/ActionApplication.go
+++ b/vendor/github.com/yaegashi/msgraph.go/beta/ActionApplication.go
@@ -1,4 +1,4 @@
-// Code generated by msgraph-generate.go DO NOT EDIT.
+// Code generated by msgraph.go/gen DO NOT EDIT.

 package msgraph

@@ -96,9 +96,9 @@ func (r *ApplicationExtensionPropertiesCollectionRequest) Paging(ctx context.Con
 	}
 	var values []ExtensionProperty
 	for {
-		defer res.Body.Close()
 		if res.StatusCode != http.StatusOK {
 			b, _ := ioutil.ReadAll(res.Body)
+			res.Body.Close()
 			errRes := &ErrorResponse{Response: res}
 			err := jsonx.Unmarshal(b, errRes)
 			if err != nil {
@@ -111,6 +111,7 @@ func (r *ApplicationExtensionPropertiesCollectionRequest) Paging(ctx context.Con
 			value  []ExtensionProperty
 		)
 		err := jsonx.NewDecoder(res.Body).Decode(&paging)
+		res.Body.Close()
 		if err != nil {
 			return nil, err
 		}
@@ -198,9 +199,9 @@ func (r *ApplicationOwnersCollectionRequest) Paging(ctx context.Context, method,
 	}
 	var values []DirectoryObject
 	for {
-		defer res.Body.Close()
 		if res.StatusCode != http.StatusOK {
 			b, _ := ioutil.ReadAll(res.Body)
+			res.Body.Close()
 			errRes := &ErrorResponse{Response: res}
 			err := jsonx.Unmarshal(b, errRes)
 			if err != nil {
@@ -213,6 +214,7 @@ func (r *ApplicationOwnersCollectionRequest) Paging(ctx context.Context, method,
 			value  []DirectoryObject
 		)
 		err := jsonx.NewDecoder(res.Body).Decode(&paging)
+		res.Body.Close()
 		if err != nil {
 			return nil, err
 		}
@@ -300,9 +302,9 @@ func (r *ApplicationPoliciesCollectionRequest) Paging(ctx context.Context, metho
 	}
 	var values []DirectoryObject
 	for {
-		defer res.Body.Close()
 		if res.StatusCode != http.StatusOK {
 			b, _ := ioutil.ReadAll(res.Body)
+			res.Body.Close()
 			errRes := &ErrorResponse{Response: res}
 			err := jsonx.Unmarshal(b, errRes)
 			if err != nil {
@@ -315,6 +317,7 @@ func (r *ApplicationPoliciesCollectionRequest) Paging(ctx context.Context, metho
 			value  []DirectoryObject
 		)
 		err := jsonx.NewDecoder(res.Body).Decode(&paging)
+		res.Body.Close()
 		if err != nil {
 			return nil, err
 		}
--- a/vendor/github.com/yaegashi/msgraph.go/beta/ActionApproval.go
+++ b/vendor/github.com/yaegashi/msgraph.go/beta/ActionApproval.go
@@ -1,4 +1,4 @@
-// Code generated by msgraph-generate.go DO NOT EDIT.
+// Code generated by msgraph.go/gen DO NOT EDIT.

 package msgraph

@@ -53,9 +53,9 @@ func (r *ApprovalWorkflowProviderBusinessFlowsCollectionRequest) Paging(ctx cont
 	}
 	var values []BusinessFlow
 	for {
-		defer res.Body.Close()
 		if res.StatusCode != http.StatusOK {
 			b, _ := ioutil.ReadAll(res.Body)
+			res.Body.Close()
 			errRes := &ErrorResponse{Response: res}
 			err := jsonx.Unmarshal(b, errRes)
 			if err != nil {
@@ -68,6 +68,7 @@ func (r *ApprovalWorkflowProviderBusinessFlowsCollectionRequest) Paging(ctx cont
 			value  []BusinessFlow
 		)
 		err := jsonx.NewDecoder(res.Body).Decode(&paging)
+		res.Body.Close()
 		if err != nil {
 			return nil, err
 		}
@@ -155,9 +156,9 @@ func (r *ApprovalWorkflowProviderBusinessFlowsWithRequestsAwaitingMyDecisionColl
 	}
 	var values []BusinessFlow
 	for {
-		defer res.Body.Close()
 		if res.StatusCode != http.StatusOK {
 			b, _ := ioutil.ReadAll(res.Body)
+			res.Body.Close()
 			errRes := &ErrorResponse{Response: res}
 			err := jsonx.Unmarshal(b, errRes)
 			if err != nil {
@@ -170,6 +171,7 @@ func (r *ApprovalWorkflowProviderBusinessFlowsWithRequestsAwaitingMyDecisionColl
 			value  []BusinessFlow
 		)
 		err := jsonx.NewDecoder(res.Body).Decode(&paging)
+		res.Body.Close()
 		if err != nil {
 			return nil, err
 		}
@@ -257,9 +259,9 @@ func (r *ApprovalWorkflowProviderPolicyTemplatesCollectionRequest) Paging(ctx co
 	}
 	var values []GovernancePolicyTemplate
 	for {
-		defer res.Body.Close()
 		if res.StatusCode != http.StatusOK {
 			b, _ := ioutil.ReadAll(res.Body)
+			res.Body.Close()
 			errRes := &ErrorResponse{Response: res}
 			err := jsonx.Unmarshal(b, errRes)
 			if err != nil {
@@ -272,6 +274,7 @@ func (r *ApprovalWorkflowProviderPolicyTemplatesCollectionRequest) Paging(ctx co
 			value  []GovernancePolicyTemplate
 		)
 		err := jsonx.NewDecoder(res.Body).Decode(&paging)
+		res.Body.Close()
 		if err != nil {
 			return nil, err
 		}
@@ -359,9 +362,9 @@ func (r *ApprovalWorkflowProviderRequestsCollectionRequest) Paging(ctx context.C
 	}
 	var values []RequestObject
 	for {
-		defer res.Body.Close()
 		if res.StatusCode != http.StatusOK {
 			b, _ := ioutil.ReadAll(res.Body)
+			res.Body.Close()
 			errRes := &ErrorResponse{Response: res}
 			err := jsonx.Unmarshal(b, errRes)
 			if err != nil {
@@ -374,6 +377,7 @@ func (r *ApprovalWorkflowProviderRequestsCollectionRequest) Paging(ctx context.C
 			value  []RequestObject
 		)
 		err := jsonx.NewDecoder(res.Body).Decode(&paging)
+		res.Body.Close()
 		if err != nil {
 			return nil, err
 		}
@@ -461,9 +465,9 @@ func (r *ApprovalWorkflowProviderRequestsAwaitingMyDecisionCollectionRequest) Pa
 	}
 	var values []RequestObject
 	for {
-		defer res.Body.Close()
 		if res.StatusCode != http.StatusOK {
 			b, _ := ioutil.ReadAll(res.Body)
+			res.Body.Close()
 			errRes := &ErrorResponse{Response: res}
 			err := jsonx.Unmarshal(b, errRes)
 			if err != nil {
@@ -476,6 +480,7 @@ func (r *ApprovalWorkflowProviderRequestsAwaitingMyDecisionCollectionRequest) Pa
 			value  []RequestObject
 		)
 		err := jsonx.NewDecoder(res.Body).Decode(&paging)
+		res.Body.Close()
 		if err != nil {
 			return nil, err
 		}
--- a/vendor/github.com/yaegashi/msgraph.go/beta/ActionAttachment.go
+++ b/vendor/github.com/yaegashi/msgraph.go/beta/ActionAttachment.go
@@ -1,4 +1,4 @@
-// Code generated by msgraph-generate.go DO NOT EDIT.
+// Code generated by msgraph.go/gen DO NOT EDIT.

 package msgraph

--- a/vendor/github.com/yaegashi/msgraph.go/beta/ActionAudit.go
+++ b/vendor/github.com/yaegashi/msgraph.go/beta/ActionAudit.go
@@ -1,4 +1,4 @@
-// Code generated by msgraph-generate.go DO NOT EDIT.
+// Code generated by msgraph.go/gen DO NOT EDIT.

 package msgraph

@@ -53,9 +53,9 @@ func (r *AuditLogRootDirectoryAuditsCollectionRequest) Paging(ctx context.Contex
 	}
 	var values []DirectoryAudit
 	for {
-		defer res.Body.Close()
 		if res.StatusCode != http.StatusOK {
 			b, _ := ioutil.ReadAll(res.Body)
+			res.Body.Close()
 			errRes := &ErrorResponse{Response: res}
 			err := jsonx.Unmarshal(b, errRes)
 			if err != nil {
@@ -68,6 +68,7 @@ func (r *AuditLogRootDirectoryAuditsCollectionRequest) Paging(ctx context.Contex
 			value  []DirectoryAudit
 		)
 		err := jsonx.NewDecoder(res.Body).Decode(&paging)
+		res.Body.Close()
 		if err != nil {
 			return nil, err
 		}
@@ -155,9 +156,9 @@ func (r *AuditLogRootDirectoryProvisioningCollectionRequest) Paging(ctx context.
 	}
 	var values []ProvisioningObjectSummary
 	for {
-		defer res.Body.Close()
 		if res.StatusCode != http.StatusOK {
 			b, _ := ioutil.ReadAll(res.Body)
+			res.Body.Close()
 			errRes := &ErrorResponse{Response: res}
 			err := jsonx.Unmarshal(b, errRes)
 			if err != nil {
@@ -170,6 +171,7 @@ func (r *AuditLogRootDirectoryProvisioningCollectionRequest) Paging(ctx context.
 			value  []ProvisioningObjectSummary
 		)
 		err := jsonx.NewDecoder(res.Body).Decode(&paging)
+		res.Body.Close()
 		if err != nil {
 			return nil, err
 		}
@@ -257,9 +259,9 @@ func (r *AuditLogRootProvisioningCollectionRequest) Paging(ctx context.Context,
 	}
 	var values []ProvisioningObjectSummary
 	for {
-		defer res.Body.Close()
 		if res.StatusCode != http.StatusOK {
 			b, _ := ioutil.ReadAll(res.Body)
+			res.Body.Close()
 			errRes := &ErrorResponse{Response: res}
 			err := jsonx.Unmarshal(b, errRes)
 			if err != nil {
@@ -272,6 +274,7 @@ func (r *AuditLogRootProvisioningCollectionRequest) Paging(ctx context.Context,
 			value  []ProvisioningObjectSummary
 		)
 		err := jsonx.NewDecoder(res.Body).Decode(&paging)
+		res.Body.Close()
 		if err != nil {
 			return nil, err
 		}
@@ -359,9 +362,9 @@ func (r *AuditLogRootRestrictedSignInsCollectionRequest) Paging(ctx context.Cont
 	}
 	var values []RestrictedSignIn
 	for {
-		defer res.Body.Close()
 		if res.StatusCode != http.StatusOK {
 			b, _ := ioutil.ReadAll(res.Body)
+			res.Body.Close()
 			errRes := &ErrorResponse{Response: res}
 			err := jsonx.Unmarshal(b, errRes)
 			if err != nil {
@@ -374,6 +377,7 @@ func (r *AuditLogRootRestrictedSignInsCollectionRequest) Paging(ctx context.Cont
 			value  []RestrictedSignIn
 		)
 		err := jsonx.NewDecoder(res.Body).Decode(&paging)
+		res.Body.Close()
 		if err != nil {
 			return nil, err
 		}
@@ -461,9 +465,9 @@ func (r *AuditLogRootSignInsCollectionRequest) Paging(ctx context.Context, metho
 	}
 	var values []SignIn
 	for {
-		defer res.Body.Close()
 		if res.StatusCode != http.StatusOK {
 			b, _ := ioutil.ReadAll(res.Body)
+			res.Body.Close()
 			errRes := &ErrorResponse{Response: res}
 			err := jsonx.Unmarshal(b, errRes)
 			if err != nil {
@@ -476,6 +480,7 @@ func (r *AuditLogRootSignInsCollectionRequest) Paging(ctx context.Context, metho
 			value  []SignIn
 		)
 		err := jsonx.NewDecoder(res.Body).Decode(&paging)
+		res.Body.Close()
 		if err != nil {
 			return nil, err
 		}
--- a/vendor/github.com/yaegashi/msgraph.go/beta/ActionBase.go
+++ b/vendor/github.com/yaegashi/msgraph.go/beta/ActionBase.go
@@ -1,4 +1,4 @@
-// Code generated by msgraph-generate.go DO NOT EDIT.
+// Code generated by msgraph.go/gen DO NOT EDIT.

 package msgraph

--- a/vendor/github.com/yaegashi/msgraph.go/beta/ActionBooking.go
+++ b/vendor/github.com/yaegashi/msgraph.go/beta/ActionBooking.go
@@ -1,4 +1,4 @@
-// Code generated by msgraph-generate.go DO NOT EDIT.
+// Code generated by msgraph.go/gen DO NOT EDIT.

 package msgraph

@@ -67,9 +67,9 @@ func (r *BookingBusinessAppointmentsCollectionRequest) Paging(ctx context.Contex
 	}
 	var values []BookingAppointment
 	for {
-		defer res.Body.Close()
 		if res.StatusCode != http.StatusOK {
 			b, _ := ioutil.ReadAll(res.Body)
+			res.Body.Close()
 			errRes := &ErrorResponse{Response: res}
 			err := jsonx.Unmarshal(b, errRes)
 			if err != nil {
@@ -82,6 +82,7 @@ func (r *BookingBusinessAppointmentsCollectionRequest) Paging(ctx context.Contex
 			value  []BookingAppointment
 		)
 		err := jsonx.NewDecoder(res.Body).Decode(&paging)
+		res.Body.Close()
 		if err != nil {
 			return nil, err
 		}
@@ -169,9 +170,9 @@ func (r *BookingBusinessCalendarViewCollectionRequest) Paging(ctx context.Contex
 	}
 	var values []BookingAppointment
 	for {
-		defer res.Body.Close()
 		if res.StatusCode != http.StatusOK {
 			b, _ := ioutil.ReadAll(res.Body)
+			res.Body.Close()
 			errRes := &ErrorResponse{Response: res}
 			err := jsonx.Unmarshal(b, errRes)
 			if err != nil {
@@ -184,6 +185,7 @@ func (r *BookingBusinessCalendarViewCollectionRequest) Paging(ctx context.Contex
 			value  []BookingAppointment
 		)
 		err := jsonx.NewDecoder(res.Body).Decode(&paging)
+		res.Body.Close()
 		if err != nil {
 			return nil, err
 		}
@@ -271,9 +273,9 @@ func (r *BookingBusinessCustomersCollectionRequest) Paging(ctx context.Context,
 	}
 	var values []BookingCustomer
 	for {
-		defer res.Body.Close()
 		if res.StatusCode != http.StatusOK {
 			b, _ := ioutil.ReadAll(res.Body)
+			res.Body.Close()
 			errRes := &ErrorResponse{Response: res}
 			err := jsonx.Unmarshal(b, errRes)
 			if err != nil {
@@ -286,6 +288,7 @@ func (r *BookingBusinessCustomersCollectionRequest) Paging(ctx context.Context,
 			value  []BookingCustomer
 		)
 		err := jsonx.NewDecoder(res.Body).Decode(&paging)
+		res.Body.Close()
 		if err != nil {
 			return nil, err
 		}
@@ -373,9 +376,9 @@ func (r *BookingBusinessServicesCollectionRequest) Paging(ctx context.Context, m
 	}
 	var values []BookingService
 	for {
-		defer res.Body.Close()
 		if res.StatusCode != http.StatusOK {
 			b, _ := ioutil.ReadAll(res.Body)
+			res.Body.Close()
 			errRes := &ErrorResponse{Response: res}
 			err := jsonx.Unmarshal(b, errRes)
 			if err != nil {
@@ -388,6 +391,7 @@ func (r *BookingBusinessServicesCollectionRequest) Paging(ctx context.Context, m
 			value  []BookingService
 		)
 		err := jsonx.NewDecoder(res.Body).Decode(&paging)
+		res.Body.Close()
 		if err != nil {
 			return nil, err
 		}
@@ -475,9 +479,9 @@ func (r *BookingBusinessStaffMembersCollectionRequest) Paging(ctx context.Contex
 	}
 	var values []BookingStaffMember
 	for {
-		defer res.Body.Close()
 		if res.StatusCode != http.StatusOK {
 			b, _ := ioutil.ReadAll(res.Body)
+			res.Body.Close()
 			errRes := &ErrorResponse{Response: res}
 			err := jsonx.Unmarshal(b, errRes)
 			if err != nil {
@@ -490,6 +494,7 @@ func (r *BookingBusinessStaffMembersCollectionRequest) Paging(ctx context.Contex
 			value  []BookingStaffMember
 		)
 		err := jsonx.NewDecoder(res.Body).Decode(&paging)
+		res.Body.Close()
 		if err != nil {
 			return nil, err
 		}
--- a/vendor/github.com/yaegashi/msgraph.go/beta/ActionBusiness.go
+++ b/vendor/github.com/yaegashi/msgraph.go/beta/ActionBusiness.go
@@ -1,4 +1,4 @@
-// Code generated by msgraph-generate.go DO NOT EDIT.
+// Code generated by msgraph.go/gen DO NOT EDIT.

 package msgraph

--- a/vendor/github.com/yaegashi/msgraph.go/beta/ActionCalendar.go
+++ b/vendor/github.com/yaegashi/msgraph.go/beta/ActionCalendar.go
@@ -1,4 +1,4 @@
-// Code generated by msgraph-generate.go DO NOT EDIT.
+// Code generated by msgraph.go/gen DO NOT EDIT.

 package msgraph

@@ -69,9 +69,9 @@ func (r *CalendarCalendarPermissionsCollectionRequest) Paging(ctx context.Contex
 	}
 	var values []CalendarPermission
 	for {
-		defer res.Body.Close()
 		if res.StatusCode != http.StatusOK {
 			b, _ := ioutil.ReadAll(res.Body)
+			res.Body.Close()
 			errRes := &ErrorResponse{Response: res}
 			err := jsonx.Unmarshal(b, errRes)
 			if err != nil {
@@ -84,6 +84,7 @@ func (r *CalendarCalendarPermissionsCollectionRequest) Paging(ctx context.Contex
 			value  []CalendarPermission
 		)
 		err := jsonx.NewDecoder(res.Body).Decode(&paging)
+		res.Body.Close()
 		if err != nil {
 			return nil, err
 		}
@@ -171,9 +172,9 @@ func (r *CalendarCalendarViewCollectionRequest) Paging(ctx context.Context, meth
 	}
 	var values []Event
 	for {
-		defer res.Body.Close()
 		if res.StatusCode != http.StatusOK {
 			b, _ := ioutil.ReadAll(res.Body)
+			res.Body.Close()
 			errRes := &ErrorResponse{Response: res}
 			err := jsonx.Unmarshal(b, errRes)
 			if err != nil {
@@ -186,6 +187,7 @@ func (r *CalendarCalendarViewCollectionRequest) Paging(ctx context.Context, meth
 			value  []Event
 		)
 		err := jsonx.NewDecoder(res.Body).Decode(&paging)
+		res.Body.Close()
 		if err != nil {
 			return nil, err
 		}
@@ -273,9 +275,9 @@ func (r *CalendarEventsCollectionRequest) Paging(ctx context.Context, method, pa
 	}
 	var values []Event
 	for {
-		defer res.Body.Close()
 		if res.StatusCode != http.StatusOK {
 			b, _ := ioutil.ReadAll(res.Body)
+			res.Body.Close()
 			errRes := &ErrorResponse{Response: res}
 			err := jsonx.Unmarshal(b, errRes)
 			if err != nil {
@@ -288,6 +290,7 @@ func (r *CalendarEventsCollectionRequest) Paging(ctx context.Context, method, pa
 			value  []Event
 		)
 		err := jsonx.NewDecoder(res.Body).Decode(&paging)
+		res.Body.Close()
 		if err != nil {
 			return nil, err
 		}
@@ -375,9 +378,9 @@ func (r *CalendarMultiValueExtendedPropertiesCollectionRequest) Paging(ctx conte
 	}
 	var values []MultiValueLegacyExtendedProperty
 	for {
-		defer res.Body.Close()
 		if res.StatusCode != http.StatusOK {
 			b, _ := ioutil.ReadAll(res.Body)
+			res.Body.Close()
 			errRes := &ErrorResponse{Response: res}
 			err := jsonx.Unmarshal(b, errRes)
 			if err != nil {
@@ -390,6 +393,7 @@ func (r *CalendarMultiValueExtendedPropertiesCollectionRequest) Paging(ctx conte
 			value  []MultiValueLegacyExtendedProperty
 		)
 		err := jsonx.NewDecoder(res.Body).Decode(&paging)
+		res.Body.Close()
 		if err != nil {
 			return nil, err
 		}
@@ -477,9 +481,9 @@ func (r *CalendarSingleValueExtendedPropertiesCollectionRequest) Paging(ctx cont
 	}
 	var values []SingleValueLegacyExtendedProperty
 	for {
-		defer res.Body.Close()
 		if res.StatusCode != http.StatusOK {
 			b, _ := ioutil.ReadAll(res.Body)
+			res.Body.Close()
 			errRes := &ErrorResponse{Response: res}
 			err := jsonx.Unmarshal(b, errRes)
 			if err != nil {
@@ -492,6 +496,7 @@ func (r *CalendarSingleValueExtendedPropertiesCollectionRequest) Paging(ctx cont
 			value  []SingleValueLegacyExtendedProperty
 		)
 		err := jsonx.NewDecoder(res.Body).Decode(&paging)
+		res.Body.Close()
 		if err != nil {
 			return nil, err
 		}
@@ -579,9 +584,9 @@ func (r *CalendarGroupCalendarsCollectionRequest) Paging(ctx context.Context, me
 	}
 	var values []Calendar
 	for {
-		defer res.Body.Close()
 		if res.StatusCode != http.StatusOK {
 			b, _ := ioutil.ReadAll(res.Body)
+			res.Body.Close()
 			errRes := &ErrorResponse{Response: res}
 			err := jsonx.Unmarshal(b, errRes)
 			if err != nil {
@@ -594,6 +599,7 @@ func (r *CalendarGroupCalendarsCollectionRequest) Paging(ctx context.Context, me
 			value  []Calendar
 		)
 		err := jsonx.NewDecoder(res.Body).Decode(&paging)
+		res.Body.Close()
 		if err != nil {
 			return nil, err
 		}
--- a/vendor/github.com/yaegashi/msgraph.go/beta/ActionCall.go
+++ b/vendor/github.com/yaegashi/msgraph.go/beta/ActionCall.go
@@ -1,4 +1,4 @@
-// Code generated by msgraph-generate.go DO NOT EDIT.
+// Code generated by msgraph.go/gen DO NOT EDIT.

 package msgraph

@@ -189,9 +189,9 @@ func (r *CallAudioRoutingGroupsCollectionRequest) Paging(ctx context.Context, me
 	}
 	var values []AudioRoutingGroup
 	for {
-		defer res.Body.Close()
 		if res.StatusCode != http.StatusOK {
 			b, _ := ioutil.ReadAll(res.Body)
+			res.Body.Close()
 			errRes := &ErrorResponse{Response: res}
 			err := jsonx.Unmarshal(b, errRes)
 			if err != nil {
@@ -204,6 +204,7 @@ func (r *CallAudioRoutingGroupsCollectionRequest) Paging(ctx context.Context, me
 			value  []AudioRoutingGroup
 		)
 		err := jsonx.NewDecoder(res.Body).Decode(&paging)
+		res.Body.Close()
 		if err != nil {
 			return nil, err
 		}
@@ -291,9 +292,9 @@ func (r *CallOperationsCollectionRequest) Paging(ctx context.Context, method, pa
 	}
 	var values []CommsOperation
 	for {
-		defer res.Body.Close()
 		if res.StatusCode != http.StatusOK {
 			b, _ := ioutil.ReadAll(res.Body)
+			res.Body.Close()
 			errRes := &ErrorResponse{Response: res}
 			err := jsonx.Unmarshal(b, errRes)
 			if err != nil {
@@ -306,6 +307,7 @@ func (r *CallOperationsCollectionRequest) Paging(ctx context.Context, method, pa
 			value  []CommsOperation
 		)
 		err := jsonx.NewDecoder(res.Body).Decode(&paging)
+		res.Body.Close()
 		if err != nil {
 			return nil, err
 		}
@@ -393,9 +395,9 @@ func (r *CallParticipantsCollectionRequest) Paging(ctx context.Context, method,
 	}
 	var values []Participant
 	for {
-		defer res.Body.Close()
 		if res.StatusCode != http.StatusOK {
 			b, _ := ioutil.ReadAll(res.Body)
+			res.Body.Close()
 			errRes := &ErrorResponse{Response: res}
 			err := jsonx.Unmarshal(b, errRes)
 			if err != nil {
@@ -408,6 +410,7 @@ func (r *CallParticipantsCollectionRequest) Paging(ctx context.Context, method,
 			value  []Participant
 		)
 		err := jsonx.NewDecoder(res.Body).Decode(&paging)
+		res.Body.Close()
 		if err != nil {
 			return nil, err
 		}
--- a/vendor/github.com/yaegashi/msgraph.go/beta/ActionChannel.go
+++ b/vendor/github.com/yaegashi/msgraph.go/beta/ActionChannel.go
@@ -1,4 +1,4 @@
-// Code generated by msgraph-generate.go DO NOT EDIT.
+// Code generated by msgraph.go/gen DO NOT EDIT.

 package msgraph

@@ -60,9 +60,9 @@ func (r *ChannelMembersCollectionRequest) Paging(ctx context.Context, method, pa
 	}
 	var values []ConversationMember
 	for {
-		defer res.Body.Close()
 		if res.StatusCode != http.StatusOK {
 			b, _ := ioutil.ReadAll(res.Body)
+			res.Body.Close()
 			errRes := &ErrorResponse{Response: res}
 			err := jsonx.Unmarshal(b, errRes)
 			if err != nil {
@@ -75,6 +75,7 @@ func (r *ChannelMembersCollectionRequest) Paging(ctx context.Context, method, pa
 			value  []ConversationMember
 		)
 		err := jsonx.NewDecoder(res.Body).Decode(&paging)
+		res.Body.Close()
 		if err != nil {
 			return nil, err
 		}
@@ -162,9 +163,9 @@ func (r *ChannelMessagesCollectionRequest) Paging(ctx context.Context, method, p
 	}
 	var values []ChatMessage
 	for {
-		defer res.Body.Close()
 		if res.StatusCode != http.StatusOK {
 			b, _ := ioutil.ReadAll(res.Body)
+			res.Body.Close()
 			errRes := &ErrorResponse{Response: res}
 			err := jsonx.Unmarshal(b, errRes)
 			if err != nil {
@@ -177,6 +178,7 @@ func (r *ChannelMessagesCollectionRequest) Paging(ctx context.Context, method, p
 			value  []ChatMessage
 		)
 		err := jsonx.NewDecoder(res.Body).Decode(&paging)
+		res.Body.Close()
 		if err != nil {
 			return nil, err
 		}
@@ -264,9 +266,9 @@ func (r *ChannelTabsCollectionRequest) Paging(ctx context.Context, method, path
 	}
 	var values []TeamsTab
 	for {
-		defer res.Body.Close()
 		if res.StatusCode != http.StatusOK {
 			b, _ := ioutil.ReadAll(res.Body)
+			res.Body.Close()
 			errRes := &ErrorResponse{Response: res}
 			err := jsonx.Unmarshal(b, errRes)
 			if err != nil {
@@ -279,6 +281,7 @@ func (r *ChannelTabsCollectionRequest) Paging(ctx context.Context, method, path
 			value  []TeamsTab
 		)
 		err := jsonx.NewDecoder(res.Body).Decode(&paging)
+		res.Body.Close()
 		if err != nil {
 			return nil, err
 		}
--- a/vendor/github.com/yaegashi/msgraph.go/beta/ActionChat.go
+++ b/vendor/github.com/yaegashi/msgraph.go/beta/ActionChat.go
@@ -1,4 +1,4 @@
-// Code generated by msgraph-generate.go DO NOT EDIT.
+// Code generated by msgraph.go/gen DO NOT EDIT.

 package msgraph

@@ -53,9 +53,9 @@ func (r *ChatInstalledAppsCollectionRequest) Paging(ctx context.Context, method,
 	}
 	var values []TeamsAppInstallation
 	for {
-		defer res.Body.Close()
 		if res.StatusCode != http.StatusOK {
 			b, _ := ioutil.ReadAll(res.Body)
+			res.Body.Close()
 			errRes := &ErrorResponse{Response: res}
 			err := jsonx.Unmarshal(b, errRes)
 			if err != nil {
@@ -68,6 +68,7 @@ func (r *ChatInstalledAppsCollectionRequest) Paging(ctx context.Context, method,
 			value  []TeamsAppInstallation
 		)
 		err := jsonx.NewDecoder(res.Body).Decode(&paging)
+		res.Body.Close()
 		if err != nil {
 			return nil, err
 		}
@@ -155,9 +156,9 @@ func (r *ChatMembersCollectionRequest) Paging(ctx context.Context, method, path
 	}
 	var values []ConversationMember
 	for {
-		defer res.Body.Close()
 		if res.StatusCode != http.StatusOK {
 			b, _ := ioutil.ReadAll(res.Body)
+			res.Body.Close()
 			errRes := &ErrorResponse{Response: res}
 			err := jsonx.Unmarshal(b, errRes)
 			if err != nil {
@@ -170,6 +171,7 @@ func (r *ChatMembersCollectionRequest) Paging(ctx context.Context, method, path
 			value  []ConversationMember
 		)
 		err := jsonx.NewDecoder(res.Body).Decode(&paging)
+		res.Body.Close()
 		if err != nil {
 			return nil, err
 		}
@@ -257,9 +259,9 @@ func (r *ChatMessagesCollectionRequest) Paging(ctx context.Context, method, path
 	}
 	var values []ChatMessage
 	for {
-		defer res.Body.Close()
 		if res.StatusCode != http.StatusOK {
 			b, _ := ioutil.ReadAll(res.Body)
+			res.Body.Close()
 			errRes := &ErrorResponse{Response: res}
 			err := jsonx.Unmarshal(b, errRes)
 			if err != nil {
@@ -272,6 +274,7 @@ func (r *ChatMessagesCollectionRequest) Paging(ctx context.Context, method, path
 			value  []ChatMessage
 		)
 		err := jsonx.NewDecoder(res.Body).Decode(&paging)
+		res.Body.Close()
 		if err != nil {
 			return nil, err
 		}
@@ -359,9 +362,9 @@ func (r *ChatMessageHostedContentsCollectionRequest) Paging(ctx context.Context,
 	}
 	var values []ChatMessageHostedContent
 	for {
-		defer res.Body.Close()
 		if res.StatusCode != http.StatusOK {
 			b, _ := ioutil.ReadAll(res.Body)
+			res.Body.Close()
 			errRes := &ErrorResponse{Response: res}
 			err := jsonx.Unmarshal(b, errRes)
 			if err != nil {
@@ -374,6 +377,7 @@ func (r *ChatMessageHostedContentsCollectionRequest) Paging(ctx context.Context,
 			value  []ChatMessageHostedContent
 		)
 		err := jsonx.NewDecoder(res.Body).Decode(&paging)
+		res.Body.Close()
 		if err != nil {
 			return nil, err
 		}
@@ -461,9 +465,9 @@ func (r *ChatMessageRepliesCollectionRequest) Paging(ctx context.Context, method
 	}
 	var values []ChatMessage
 	for {
-		defer res.Body.Close()
 		if res.StatusCode != http.StatusOK {
 			b, _ := ioutil.ReadAll(res.Body)
+			res.Body.Close()
 			errRes := &ErrorResponse{Response: res}
 			err := jsonx.Unmarshal(b, errRes)
 			if err != nil {
@@ -476,6 +480,7 @@ func (r *ChatMessageRepliesCollectionRequest) Paging(ctx context.Context, method
 			value  []ChatMessage
 		)
 		err := jsonx.NewDecoder(res.Body).Decode(&paging)
+		res.Body.Close()
 		if err != nil {
 			return nil, err
 		}
--- a/vendor/github.com/yaegashi/msgraph.go/beta/ActionCloud.go
+++ b/vendor/github.com/yaegashi/msgraph.go/beta/ActionCloud.go
@@ -1,4 +1,4 @@
-// Code generated by msgraph-generate.go DO NOT EDIT.
+// Code generated by msgraph.go/gen DO NOT EDIT.

 package msgraph

@@ -59,9 +59,9 @@ func (r *CloudCommunicationsCallsCollectionRequest) Paging(ctx context.Context,
 	}
 	var values []Call
 	for {
-		defer res.Body.Close()
 		if res.StatusCode != http.StatusOK {
 			b, _ := ioutil.ReadAll(res.Body)
+			res.Body.Close()
 			errRes := &ErrorResponse{Response: res}
 			err := jsonx.Unmarshal(b, errRes)
 			if err != nil {
@@ -74,6 +74,7 @@ func (r *CloudCommunicationsCallsCollectionRequest) Paging(ctx context.Context,
 			value  []Call
 		)
 		err := jsonx.NewDecoder(res.Body).Decode(&paging)
+		res.Body.Close()
 		if err != nil {
 			return nil, err
 		}
@@ -161,9 +162,9 @@ func (r *CloudCommunicationsOnlineMeetingsCollectionRequest) Paging(ctx context.
 	}
 	var values []OnlineMeeting
 	for {
-		defer res.Body.Close()
 		if res.StatusCode != http.StatusOK {
 			b, _ := ioutil.ReadAll(res.Body)
+			res.Body.Close()
 			errRes := &ErrorResponse{Response: res}
 			err := jsonx.Unmarshal(b, errRes)
 			if err != nil {
@@ -176,6 +177,7 @@ func (r *CloudCommunicationsOnlineMeetingsCollectionRequest) Paging(ctx context.
 			value  []OnlineMeeting
 		)
 		err := jsonx.NewDecoder(res.Body).Decode(&paging)
+		res.Body.Close()
 		if err != nil {
 			return nil, err
 		}
--- a/vendor/github.com/yaegashi/msgraph.go/beta/ActionCommand.go
+++ b/vendor/github.com/yaegashi/msgraph.go/beta/ActionCommand.go
@@ -1,4 +1,4 @@
-// Code generated by msgraph-generate.go DO NOT EDIT.
+// Code generated by msgraph.go/gen DO NOT EDIT.

 package msgraph

--- a/vendor/github.com/yaegashi/msgraph.go/beta/ActionComms.go
+++ b/vendor/github.com/yaegashi/msgraph.go/beta/ActionComms.go
@@ -1,4 +1,4 @@
-// Code generated by msgraph-generate.go DO NOT EDIT.
+// Code generated by msgraph.go/gen DO NOT EDIT.

 package msgraph

@@ -53,9 +53,9 @@ func (r *CommsApplicationCallsCollectionRequest) Paging(ctx context.Context, met
 	}
 	var values []Call
 	for {
-		defer res.Body.Close()
 		if res.StatusCode != http.StatusOK {
 			b, _ := ioutil.ReadAll(res.Body)
+			res.Body.Close()
 			errRes := &ErrorResponse{Response: res}
 			err := jsonx.Unmarshal(b, errRes)
 			if err != nil {
@@ -68,6 +68,7 @@ func (r *CommsApplicationCallsCollectionRequest) Paging(ctx context.Context, met
 			value  []Call
 		)
 		err := jsonx.NewDecoder(res.Body).Decode(&paging)
+		res.Body.Close()
 		if err != nil {
 			return nil, err
 		}
@@ -155,9 +156,9 @@ func (r *CommsApplicationOnlineMeetingsCollectionRequest) Paging(ctx context.Con
 	}
 	var values []OnlineMeeting
 	for {
-		defer res.Body.Close()
 		if res.StatusCode != http.StatusOK {
 			b, _ := ioutil.ReadAll(res.Body)
+			res.Body.Close()
 			errRes := &ErrorResponse{Response: res}
 			err := jsonx.Unmarshal(b, errRes)
 			if err != nil {
@@ -170,6 +171,7 @@ func (r *CommsApplicationOnlineMeetingsCollectionRequest) Paging(ctx context.Con
 			value  []OnlineMeeting
 		)
 		err := jsonx.NewDecoder(res.Body).Decode(&paging)
+		res.Body.Close()
 		if err != nil {
 			return nil, err
 		}
--- a/vendor/github.com/yaegashi/msgraph.go/beta/ActionCompany.go
+++ b/vendor/github.com/yaegashi/msgraph.go/beta/ActionCompany.go
@@ -1,4 +1,4 @@
-// Code generated by msgraph-generate.go DO NOT EDIT.
+// Code generated by msgraph.go/gen DO NOT EDIT.

 package msgraph

@@ -53,9 +53,9 @@ func (r *CompanyAccountsCollectionRequest) Paging(ctx context.Context, method, p
 	}
 	var values []Account
 	for {
-		defer res.Body.Close()
 		if res.StatusCode != http.StatusOK {
 			b, _ := ioutil.ReadAll(res.Body)
+			res.Body.Close()
 			errRes := &ErrorResponse{Response: res}
 			err := jsonx.Unmarshal(b, errRes)
 			if err != nil {
@@ -68,6 +68,7 @@ func (r *CompanyAccountsCollectionRequest) Paging(ctx context.Context, method, p
 			value  []Account
 		)
 		err := jsonx.NewDecoder(res.Body).Decode(&paging)
+		res.Body.Close()
 		if err != nil {
 			return nil, err
 		}
@@ -155,9 +156,9 @@ func (r *CompanyAgedAccountsPayableCollectionRequest) Paging(ctx context.Context
 	}
 	var values []AgedAccountsPayable
 	for {
-		defer res.Body.Close()
 		if res.StatusCode != http.StatusOK {
 			b, _ := ioutil.ReadAll(res.Body)
+			res.Body.Close()
 			errRes := &ErrorResponse{Response: res}
 			err := jsonx.Unmarshal(b, errRes)
 			if err != nil {
@@ -170,6 +171,7 @@ func (r *CompanyAgedAccountsPayableCollectionRequest) Paging(ctx context.Context
 			value  []AgedAccountsPayable
 		)
 		err := jsonx.NewDecoder(res.Body).Decode(&paging)
+		res.Body.Close()
 		if err != nil {
 			return nil, err
 		}
@@ -257,9 +259,9 @@ func (r *CompanyAgedAccountsReceivableCollectionRequest) Paging(ctx context.Cont
 	}
 	var values []AgedAccountsReceivable
 	for {
-		defer res.Body.Close()
 		if res.StatusCode != http.StatusOK {
 			b, _ := ioutil.ReadAll(res.Body)
+			res.Body.Close()
 			errRes := &ErrorResponse{Response: res}
 			err := jsonx.Unmarshal(b, errRes)
 			if err != nil {
@@ -272,6 +274,7 @@ func (r *CompanyAgedAccountsReceivableCollectionRequest) Paging(ctx context.Cont
 			value  []AgedAccountsReceivable
 		)
 		err := jsonx.NewDecoder(res.Body).Decode(&paging)
+		res.Body.Close()
 		if err != nil {
 			return nil, err
 		}
@@ -359,9 +362,9 @@ func (r *CompanyCompanyInformationCollectionRequest) Paging(ctx context.Context,
 	}
 	var values []CompanyInformation
 	for {
-		defer res.Body.Close()
 		if res.StatusCode != http.StatusOK {
 			b, _ := ioutil.ReadAll(res.Body)
+			res.Body.Close()
 			errRes := &ErrorResponse{Response: res}
 			err := jsonx.Unmarshal(b, errRes)
 			if err != nil {
@@ -374,6 +377,7 @@ func (r *CompanyCompanyInformationCollectionRequest) Paging(ctx context.Context,
 			value  []CompanyInformation
 		)
 		err := jsonx.NewDecoder(res.Body).Decode(&paging)
+		res.Body.Close()
 		if err != nil {
 			return nil, err
 		}
@@ -461,9 +465,9 @@ func (r *CompanyCountriesRegionsCollectionRequest) Paging(ctx context.Context, m
 	}
 	var values []CountryRegion
 	for {
-		defer res.Body.Close()
 		if res.StatusCode != http.StatusOK {
 			b, _ := ioutil.ReadAll(res.Body)
+			res.Body.Close()
 			errRes := &ErrorResponse{Response: res}
 			err := jsonx.Unmarshal(b, errRes)
 			if err != nil {
@@ -476,6 +480,7 @@ func (r *CompanyCountriesRegionsCollectionRequest) Paging(ctx context.Context, m
 			value  []CountryRegion
 		)
 		err := jsonx.NewDecoder(res.Body).Decode(&paging)
+		res.Body.Close()
 		if err != nil {
 			return nil, err
 		}
@@ -563,9 +568,9 @@ func (r *CompanyCurrenciesCollectionRequest) Paging(ctx context.Context, method,
 	}
 	var values []Currency
 	for {
-		defer res.Body.Close()
 		if res.StatusCode != http.StatusOK {
 			b, _ := ioutil.ReadAll(res.Body)
+			res.Body.Close()
 			errRes := &ErrorResponse{Response: res}
 			err := jsonx.Unmarshal(b, errRes)
 			if err != nil {
@@ -578,6 +583,7 @@ func (r *CompanyCurrenciesCollectionRequest) Paging(ctx context.Context, method,
 			value  []Currency
 		)
 		err := jsonx.NewDecoder(res.Body).Decode(&paging)
+		res.Body.Close()
 		if err != nil {
 			return nil, err
 		}
@@ -665,9 +671,9 @@ func (r *CompanyCustomerPaymentJournalsCollectionRequest) Paging(ctx context.Con
 	}
 	var values []CustomerPaymentJournal
 	for {
-		defer res.Body.Close()
 		if res.StatusCode != http.StatusOK {
 			b, _ := ioutil.ReadAll(res.Body)
+			res.Body.Close()
 			errRes := &ErrorResponse{Response: res}
 			err := jsonx.Unmarshal(b, errRes)
 			if err != nil {
@@ -680,6 +686,7 @@ func (r *CompanyCustomerPaymentJournalsCollectionRequest) Paging(ctx context.Con
 			value  []CustomerPaymentJournal
 		)
 		err := jsonx.NewDecoder(res.Body).Decode(&paging)
+		res.Body.Close()
 		if err != nil {
 			return nil, err
 		}
@@ -767,9 +774,9 @@ func (r *CompanyCustomerPaymentsCollectionRequest) Paging(ctx context.Context, m
 	}
 	var values []CustomerPayment
 	for {
-		defer res.Body.Close()
 		if res.StatusCode != http.StatusOK {
 			b, _ := ioutil.ReadAll(res.Body)
+			res.Body.Close()
 			errRes := &ErrorResponse{Response: res}
 			err := jsonx.Unmarshal(b, errRes)
 			if err != nil {
@@ -782,6 +789,7 @@ func (r *CompanyCustomerPaymentsCollectionRequest) Paging(ctx context.Context, m
 			value  []CustomerPayment
 		)
 		err := jsonx.NewDecoder(res.Body).Decode(&paging)
+		res.Body.Close()
 		if err != nil {
 			return nil, err
 		}
@@ -869,9 +877,9 @@ func (r *CompanyCustomersCollectionRequest) Paging(ctx context.Context, method,
 	}
 	var values []Customer
 	for {
-		defer res.Body.Close()
 		if res.StatusCode != http.StatusOK {
 			b, _ := ioutil.ReadAll(res.Body)
+			res.Body.Close()
 			errRes := &ErrorResponse{Response: res}
 			err := jsonx.Unmarshal(b, errRes)
 			if err != nil {
@@ -884,6 +892,7 @@ func (r *CompanyCustomersCollectionRequest) Paging(ctx context.Context, method,
 			value  []Customer
 		)
 		err := jsonx.NewDecoder(res.Body).Decode(&paging)
+		res.Body.Close()
 		if err != nil {
 			return nil, err
 		}
@@ -971,9 +980,9 @@ func (r *CompanyDimensionValuesCollectionRequest) Paging(ctx context.Context, me
 	}
 	var values []DimensionValue
 	for {
-		defer res.Body.Close()
 		if res.StatusCode != http.StatusOK {
 			b, _ := ioutil.ReadAll(res.Body)
+			res.Body.Close()
 			errRes := &ErrorResponse{Response: res}
 			err := jsonx.Unmarshal(b, errRes)
 			if err != nil {
@@ -986,6 +995,7 @@ func (r *CompanyDimensionValuesCollectionRequest) Paging(ctx context.Context, me
 			value  []DimensionValue
 		)
 		err := jsonx.NewDecoder(res.Body).Decode(&paging)
+		res.Body.Close()
 		if err != nil {
 			return nil, err
 		}
@@ -1073,9 +1083,9 @@ func (r *CompanyDimensionsCollectionRequest) Paging(ctx context.Context, method,
 	}
 	var values []Dimension
 	for {
-		defer res.Body.Close()
 		if res.StatusCode != http.StatusOK {
 			b, _ := ioutil.ReadAll(res.Body)
+			res.Body.Close()
 			errRes := &ErrorResponse{Response: res}
 			err := jsonx.Unmarshal(b, errRes)
 			if err != nil {
@@ -1088,6 +1098,7 @@ func (r *CompanyDimensionsCollectionRequest) Paging(ctx context.Context, method,
 			value  []Dimension
 		)
 		err := jsonx.NewDecoder(res.Body).Decode(&paging)
+		res.Body.Close()
 		if err != nil {
 			return nil, err
 		}
@@ -1175,9 +1186,9 @@ func (r *CompanyEmployeesCollectionRequest) Paging(ctx context.Context, method,
 	}
 	var values []Employee
 	for {
-		defer res.Body.Close()
 		if res.StatusCode != http.StatusOK {
 			b, _ := ioutil.ReadAll(res.Body)
+			res.Body.Close()
 			errRes := &ErrorResponse{Response: res}
 			err := jsonx.Unmarshal(b, errRes)
 			if err != nil {
@@ -1190,6 +1201,7 @@ func (r *CompanyEmployeesCollectionRequest) Paging(ctx context.Context, method,
 			value  []Employee
 		)
 		err := jsonx.NewDecoder(res.Body).Decode(&paging)
+		res.Body.Close()
 		if err != nil {
 			return nil, err
 		}
@@ -1277,9 +1289,9 @@ func (r *CompanyGeneralLedgerEntriesCollectionRequest) Paging(ctx context.Contex
 	}
 	var values []GeneralLedgerEntry
 	for {
-		defer res.Body.Close()
 		if res.StatusCode != http.StatusOK {
 			b, _ := ioutil.ReadAll(res.Body)
+			res.Body.Close()
 			errRes := &ErrorResponse{Response: res}
 			err := jsonx.Unmarshal(b, errRes)
 			if err != nil {
@@ -1292,6 +1304,7 @@ func (r *CompanyGeneralLedgerEntriesCollectionRequest) Paging(ctx context.Contex
 			value  []GeneralLedgerEntry
 		)
 		err := jsonx.NewDecoder(res.Body).Decode(&paging)
+		res.Body.Close()
 		if err != nil {
 			return nil, err
 		}
@@ -1379,9 +1392,9 @@ func (r *CompanyItemCategoriesCollectionRequest) Paging(ctx context.Context, met
 	}
 	var values []ItemCategory
 	for {
-		defer res.Body.Close()
 		if res.StatusCode != http.StatusOK {
 			b, _ := ioutil.ReadAll(res.Body)
+			res.Body.Close()
 			errRes := &ErrorResponse{Response: res}
 			err := jsonx.Unmarshal(b, errRes)
 			if err != nil {
@@ -1394,6 +1407,7 @@ func (r *CompanyItemCategoriesCollectionRequest) Paging(ctx context.Context, met
 			value  []ItemCategory
 		)
 		err := jsonx.NewDecoder(res.Body).Decode(&paging)
+		res.Body.Close()
 		if err != nil {
 			return nil, err
 		}
@@ -1481,9 +1495,9 @@ func (r *CompanyItemsCollectionRequest) Paging(ctx context.Context, method, path
 	}
 	var values []Item
 	for {
-		defer res.Body.Close()
 		if res.StatusCode != http.StatusOK {
 			b, _ := ioutil.ReadAll(res.Body)
+			res.Body.Close()
 			errRes := &ErrorResponse{Response: res}
 			err := jsonx.Unmarshal(b, errRes)
 			if err != nil {
@@ -1496,6 +1510,7 @@ func (r *CompanyItemsCollectionRequest) Paging(ctx context.Context, method, path
 			value  []Item
 		)
 		err := jsonx.NewDecoder(res.Body).Decode(&paging)
+		res.Body.Close()
 		if err != nil {
 			return nil, err
 		}
@@ -1583,9 +1598,9 @@ func (r *CompanyJournalLinesCollectionRequest) Paging(ctx context.Context, metho
 	}
 	var values []JournalLine
 	for {
-		defer res.Body.Close()
 		if res.StatusCode != http.StatusOK {
 			b, _ := ioutil.ReadAll(res.Body)
+			res.Body.Close()
 			errRes := &ErrorResponse{Response: res}
 			err := jsonx.Unmarshal(b, errRes)
 			if err != nil {
@@ -1598,6 +1613,7 @@ func (r *CompanyJournalLinesCollectionRequest) Paging(ctx context.Context, metho
 			value  []JournalLine
 		)
 		err := jsonx.NewDecoder(res.Body).Decode(&paging)
+		res.Body.Close()
 		if err != nil {
 			return nil, err
 		}
@@ -1685,9 +1701,9 @@ func (r *CompanyJournalsCollectionRequest) Paging(ctx context.Context, method, p
 	}
 	var values []Journal
 	for {
-		defer res.Body.Close()
 		if res.StatusCode != http.StatusOK {
 			b, _ := ioutil.ReadAll(res.Body)
+			res.Body.Close()
 			errRes := &ErrorResponse{Response: res}
 			err := jsonx.Unmarshal(b, errRes)
 			if err != nil {
@@ -1700,6 +1716,7 @@ func (r *CompanyJournalsCollectionRequest) Paging(ctx context.Context, method, p
 			value  []Journal
 		)
 		err := jsonx.NewDecoder(res.Body).Decode(&paging)
+		res.Body.Close()
 		if err != nil {
 			return nil, err
 		}
@@ -1787,9 +1804,9 @@ func (r *CompanyPaymentMethodsCollectionRequest) Paging(ctx context.Context, met
 	}
 	var values []PaymentMethod
 	for {
-		defer res.Body.Close()
 		if res.StatusCode != http.StatusOK {
 			b, _ := ioutil.ReadAll(res.Body)
+			res.Body.Close()
 			errRes := &ErrorResponse{Response: res}
 			err := jsonx.Unmarshal(b, errRes)
 			if err != nil {
@@ -1802,6 +1819,7 @@ func (r *CompanyPaymentMethodsCollectionRequest) Paging(ctx context.Context, met
 			value  []PaymentMethod
 		)
 		err := jsonx.NewDecoder(res.Body).Decode(&paging)
+		res.Body.Close()
 		if err != nil {
 			return nil, err
 		}
@@ -1889,9 +1907,9 @@ func (r *CompanyPaymentTermsCollectionRequest) Paging(ctx context.Context, metho
 	}
 	var values []PaymentTerm
 	for {
-		defer res.Body.Close()
 		if res.StatusCode != http.StatusOK {
 			b, _ := ioutil.ReadAll(res.Body)
+			res.Body.Close()
 			errRes := &ErrorResponse{Response: res}
 			err := jsonx.Unmarshal(b, errRes)
 			if err != nil {
@@ -1904,6 +1922,7 @@ func (r *CompanyPaymentTermsCollectionRequest) Paging(ctx context.Context, metho
 			value  []PaymentTerm
 		)
 		err := jsonx.NewDecoder(res.Body).Decode(&paging)
+		res.Body.Close()
 		if err != nil {
 			return nil, err
 		}
@@ -1991,9 +2010,9 @@ func (r *CompanyPictureCollectionRequest) Paging(ctx context.Context, method, pa
 	}
 	var values []Picture
 	for {
-		defer res.Body.Close()
 		if res.StatusCode != http.StatusOK {
 			b, _ := ioutil.ReadAll(res.Body)
+			res.Body.Close()
 			errRes := &ErrorResponse{Response: res}
 			err := jsonx.Unmarshal(b, errRes)
 			if err != nil {
@@ -2006,6 +2025,7 @@ func (r *CompanyPictureCollectionRequest) Paging(ctx context.Context, method, pa
 			value  []Picture
 		)
 		err := jsonx.NewDecoder(res.Body).Decode(&paging)
+		res.Body.Close()
 		if err != nil {
 			return nil, err
 		}
@@ -2093,9 +2113,9 @@ func (r *CompanyPurchaseInvoiceLinesCollectionRequest) Paging(ctx context.Contex
 	}
 	var values []PurchaseInvoiceLine
 	for {
-		defer res.Body.Close()
 		if res.StatusCode != http.StatusOK {
 			b, _ := ioutil.ReadAll(res.Body)
+			res.Body.Close()
 			errRes := &ErrorResponse{Response: res}
 			err := jsonx.Unmarshal(b, errRes)
 			if err != nil {
@@ -2108,6 +2128,7 @@ func (r *CompanyPurchaseInvoiceLinesCollectionRequest) Paging(ctx context.Contex
 			value  []PurchaseInvoiceLine
 		)
 		err := jsonx.NewDecoder(res.Body).Decode(&paging)
+		res.Body.Close()
 		if err != nil {
 			return nil, err
 		}
@@ -2195,9 +2216,9 @@ func (r *CompanyPurchaseInvoicesCollectionRequest) Paging(ctx context.Context, m
 	}
 	var values []PurchaseInvoice
 	for {
-		defer res.Body.Close()
 		if res.StatusCode != http.StatusOK {
 			b, _ := ioutil.ReadAll(res.Body)
+			res.Body.Close()
 			errRes := &ErrorResponse{Response: res}
 			err := jsonx.Unmarshal(b, errRes)
 			if err != nil {
@@ -2210,6 +2231,7 @@ func (r *CompanyPurchaseInvoicesCollectionRequest) Paging(ctx context.Context, m
 			value  []PurchaseInvoice
 		)
 		err := jsonx.NewDecoder(res.Body).Decode(&paging)
+		res.Body.Close()
 		if err != nil {
 			return nil, err
 		}
@@ -2297,9 +2319,9 @@ func (r *CompanySalesCreditMemoLinesCollectionRequest) Paging(ctx context.Contex
 	}
 	var values []SalesCreditMemoLine
 	for {
-		defer res.Body.Close()
 		if res.StatusCode != http.StatusOK {
 			b, _ := ioutil.ReadAll(res.Body)
+			res.Body.Close()
 			errRes := &ErrorResponse{Response: res}
 			err := jsonx.Unmarshal(b, errRes)
 			if err != nil {
@@ -2312,6 +2334,7 @@ func (r *CompanySalesCreditMemoLinesCollectionRequest) Paging(ctx context.Contex
 			value  []SalesCreditMemoLine
 		)
 		err := jsonx.NewDecoder(res.Body).Decode(&paging)
+		res.Body.Close()
 		if err != nil {
 			return nil, err
 		}
@@ -2399,9 +2422,9 @@ func (r *CompanySalesCreditMemosCollectionRequest) Paging(ctx context.Context, m
 	}
 	var values []SalesCreditMemo
 	for {
-		defer res.Body.Close()
 		if res.StatusCode != http.StatusOK {
 			b, _ := ioutil.ReadAll(res.Body)
+			res.Body.Close()
 			errRes := &ErrorResponse{Response: res}
 			err := jsonx.Unmarshal(b, errRes)
 			if err != nil {
@@ -2414,6 +2437,7 @@ func (r *CompanySalesCreditMemosCollectionRequest) Paging(ctx context.Context, m
 			value  []SalesCreditMemo
 		)
 		err := jsonx.NewDecoder(res.Body).Decode(&paging)
+		res.Body.Close()
 		if err != nil {
 			return nil, err
 		}
@@ -2501,9 +2525,9 @@ func (r *CompanySalesInvoiceLinesCollectionRequest) Paging(ctx context.Context,
 	}
 	var values []SalesInvoiceLine
 	for {
-		defer res.Body.Close()
 		if res.StatusCode != http.StatusOK {
 			b, _ := ioutil.ReadAll(res.Body)
+			res.Body.Close()
 			errRes := &ErrorResponse{Response: res}
 			err := jsonx.Unmarshal(b, errRes)
 			if err != nil {
@@ -2516,6 +2540,7 @@ func (r *CompanySalesInvoiceLinesCollectionRequest) Paging(ctx context.Context,
 			value  []SalesInvoiceLine
 		)
 		err := jsonx.NewDecoder(res.Body).Decode(&paging)
+		res.Body.Close()
 		if err != nil {
 			return nil, err
 		}
@@ -2603,9 +2628,9 @@ func (r *CompanySalesInvoicesCollectionRequest) Paging(ctx context.Context, meth
 	}
 	var values []SalesInvoice
 	for {
-		defer res.Body.Close()
 		if res.StatusCode != http.StatusOK {
 			b, _ := ioutil.ReadAll(res.Body)
+			res.Body.Close()
 			errRes := &ErrorResponse{Response: res}
 			err := jsonx.Unmarshal(b, errRes)
 			if err != nil {
@@ -2618,6 +2643,7 @@ func (r *CompanySalesInvoicesCollectionRequest) Paging(ctx context.Context, meth
 			value  []SalesInvoice
 		)
 		err := jsonx.NewDecoder(res.Body).Decode(&paging)
+		res.Body.Close()
 		if err != nil {
 			return nil, err
 		}
@@ -2705,9 +2731,9 @@ func (r *CompanySalesOrderLinesCollectionRequest) Paging(ctx context.Context, me
 	}
 	var values []SalesOrderLine
 	for {
-		defer res.Body.Close()
 		if res.StatusCode != http.StatusOK {
 			b, _ := ioutil.ReadAll(res.Body)
+			res.Body.Close()
 			errRes := &ErrorResponse{Response: res}
 			err := jsonx.Unmarshal(b, errRes)
 			if err != nil {
@@ -2720,6 +2746,7 @@ func (r *CompanySalesOrderLinesCollectionRequest) Paging(ctx context.Context, me
 			value  []SalesOrderLine
 		)
 		err := jsonx.NewDecoder(res.Body).Decode(&paging)
+		res.Body.Close()
 		if err != nil {
 			return nil, err
 		}
@@ -2807,9 +2834,9 @@ func (r *CompanySalesOrdersCollectionRequest) Paging(ctx context.Context, method
 	}
 	var values []SalesOrder
 	for {
-		defer res.Body.Close()
 		if res.StatusCode != http.StatusOK {
 			b, _ := ioutil.ReadAll(res.Body)
+			res.Body.Close()
 			errRes := &ErrorResponse{Response: res}
 			err := jsonx.Unmarshal(b, errRes)
 			if err != nil {
@@ -2822,6 +2849,7 @@ func (r *CompanySalesOrdersCollectionRequest) Paging(ctx context.Context, method
 			value  []SalesOrder
 		)
 		err := jsonx.NewDecoder(res.Body).Decode(&paging)
+		res.Body.Close()
 		if err != nil {
 			return nil, err
 		}
@@ -2909,9 +2937,9 @@ func (r *CompanySalesQuoteLinesCollectionRequest) Paging(ctx context.Context, me
 	}
 	var values []SalesQuoteLine
 	for {
-		defer res.Body.Close()
 		if res.StatusCode != http.StatusOK {
 			b, _ := ioutil.ReadAll(res.Body)
+			res.Body.Close()
 			errRes := &ErrorResponse{Response: res}
 			err := jsonx.Unmarshal(b, errRes)
 			if err != nil {
@@ -2924,6 +2952,7 @@ func (r *CompanySalesQuoteLinesCollectionRequest) Paging(ctx context.Context, me
 			value  []SalesQuoteLine
 		)
 		err := jsonx.NewDecoder(res.Body).Decode(&paging)
+		res.Body.Close()
 		if err != nil {
 			return nil, err
 		}
@@ -3011,9 +3040,9 @@ func (r *CompanySalesQuotesCollectionRequest) Paging(ctx context.Context, method
 	}
 	var values []SalesQuote
 	for {
-		defer res.Body.Close()
 		if res.StatusCode != http.StatusOK {
 			b, _ := ioutil.ReadAll(res.Body)
+			res.Body.Close()
 			errRes := &ErrorResponse{Response: res}
 			err := jsonx.Unmarshal(b, errRes)
 			if err != nil {
@@ -3026,6 +3055,7 @@ func (r *CompanySalesQuotesCollectionRequest) Paging(ctx context.Context, method
 			value  []SalesQuote
 		)
 		err := jsonx.NewDecoder(res.Body).Decode(&paging)
+		res.Body.Close()
 		if err != nil {
 			return nil, err
 		}
@@ -3113,9 +3143,9 @@ func (r *CompanyShipmentMethodsCollectionRequest) Paging(ctx context.Context, me
 	}
 	var values []ShipmentMethod
 	for {
-		defer res.Body.Close()
 		if res.StatusCode != http.StatusOK {
 			b, _ := ioutil.ReadAll(res.Body)
+			res.Body.Close()
 			errRes := &ErrorResponse{Response: res}
 			err := jsonx.Unmarshal(b, errRes)
 			if err != nil {
@@ -3128,6 +3158,7 @@ func (r *CompanyShipmentMethodsCollectionRequest) Paging(ctx context.Context, me
 			value  []ShipmentMethod
 		)
 		err := jsonx.NewDecoder(res.Body).Decode(&paging)
+		res.Body.Close()
 		if err != nil {
 			return nil, err
 		}
@@ -3215,9 +3246,9 @@ func (r *CompanyTaxAreasCollectionRequest) Paging(ctx context.Context, method, p
 	}
 	var values []TaxArea
 	for {
-		defer res.Body.Close()
 		if res.StatusCode != http.StatusOK {
 			b, _ := ioutil.ReadAll(res.Body)
+			res.Body.Close()
 			errRes := &ErrorResponse{Response: res}
 			err := jsonx.Unmarshal(b, errRes)
 			if err != nil {
@@ -3230,6 +3261,7 @@ func (r *CompanyTaxAreasCollectionRequest) Paging(ctx context.Context, method, p
 			value  []TaxArea
 		)
 		err := jsonx.NewDecoder(res.Body).Decode(&paging)
+		res.Body.Close()
 		if err != nil {
 			return nil, err
 		}
@@ -3317,9 +3349,9 @@ func (r *CompanyTaxGroupsCollectionRequest) Paging(ctx context.Context, method,
 	}
 	var values []TaxGroup
 	for {
-		defer res.Body.Close()
 		if res.StatusCode != http.StatusOK {
 			b, _ := ioutil.ReadAll(res.Body)
+			res.Body.Close()
 			errRes := &ErrorResponse{Response: res}
 			err := jsonx.Unmarshal(b, errRes)
 			if err != nil {
@@ -3332,6 +3364,7 @@ func (r *CompanyTaxGroupsCollectionRequest) Paging(ctx context.Context, method,
 			value  []TaxGroup
 		)
 		err := jsonx.NewDecoder(res.Body).Decode(&paging)
+		res.Body.Close()
 		if err != nil {
 			return nil, err
 		}
@@ -3419,9 +3452,9 @@ func (r *CompanyUnitsOfMeasureCollectionRequest) Paging(ctx context.Context, met
 	}
 	var values []UnitOfMeasure
 	for {
-		defer res.Body.Close()
 		if res.StatusCode != http.StatusOK {
 			b, _ := ioutil.ReadAll(res.Body)
+			res.Body.Close()
 			errRes := &ErrorResponse{Response: res}
 			err := jsonx.Unmarshal(b, errRes)
 			if err != nil {
@@ -3434,6 +3467,7 @@ func (r *CompanyUnitsOfMeasureCollectionRequest) Paging(ctx context.Context, met
 			value  []UnitOfMeasure
 		)
 		err := jsonx.NewDecoder(res.Body).Decode(&paging)
+		res.Body.Close()
 		if err != nil {
 			return nil, err
 		}
@@ -3521,9 +3555,9 @@ func (r *CompanyVendorsCollectionRequest) Paging(ctx context.Context, method, pa
 	}
 	var values []Vendor
 	for {
-		defer res.Body.Close()
 		if res.StatusCode != http.StatusOK {
 			b, _ := ioutil.ReadAll(res.Body)
+			res.Body.Close()
 			errRes := &ErrorResponse{Response: res}
 			err := jsonx.Unmarshal(b, errRes)
 			if err != nil {
@@ -3536,6 +3570,7 @@ func (r *CompanyVendorsCollectionRequest) Paging(ctx context.Context, method, pa
 			value  []Vendor
 		)
 		err := jsonx.NewDecoder(res.Body).Decode(&paging)
+		res.Body.Close()
 		if err != nil {
 			return nil, err
 		}
--- a/vendor/github.com/yaegashi/msgraph.go/beta/ActionConditional.go
+++ b/vendor/github.com/yaegashi/msgraph.go/beta/ActionConditional.go
@@ -1,4 +1,4 @@
-// Code generated by msgraph-generate.go DO NOT EDIT.
+// Code generated by msgraph.go/gen DO NOT EDIT.

 package msgraph

@@ -53,9 +53,9 @@ func (r *ConditionalAccessRootNamedLocationsCollectionRequest) Paging(ctx contex
 	}
 	var values []NamedLocation
 	for {
-		defer res.Body.Close()
 		if res.StatusCode != http.StatusOK {
 			b, _ := ioutil.ReadAll(res.Body)
+			res.Body.Close()
 			errRes := &ErrorResponse{Response: res}
 			err := jsonx.Unmarshal(b, errRes)
 			if err != nil {
@@ -68,6 +68,7 @@ func (r *ConditionalAccessRootNamedLocationsCollectionRequest) Paging(ctx contex
 			value  []NamedLocation
 		)
 		err := jsonx.NewDecoder(res.Body).Decode(&paging)
+		res.Body.Close()
 		if err != nil {
 			return nil, err
 		}
@@ -155,9 +156,9 @@ func (r *ConditionalAccessRootPoliciesCollectionRequest) Paging(ctx context.Cont
 	}
 	var values []ConditionalAccessPolicy
 	for {
-		defer res.Body.Close()
 		if res.StatusCode != http.StatusOK {
 			b, _ := ioutil.ReadAll(res.Body)
+			res.Body.Close()
 			errRes := &ErrorResponse{Response: res}
 			err := jsonx.Unmarshal(b, errRes)
 			if err != nil {
@@ -170,6 +171,7 @@ func (r *ConditionalAccessRootPoliciesCollectionRequest) Paging(ctx context.Cont
 			value  []ConditionalAccessPolicy
 		)
 		err := jsonx.NewDecoder(res.Body).Decode(&paging)
+		res.Body.Close()
 		if err != nil {
 			return nil, err
 		}
--- a/vendor/github.com/yaegashi/msgraph.go/beta/ActionContact.go
+++ b/vendor/github.com/yaegashi/msgraph.go/beta/ActionContact.go
@@ -1,4 +1,4 @@
-// Code generated by msgraph-generate.go DO NOT EDIT.
+// Code generated by msgraph.go/gen DO NOT EDIT.

 package msgraph

@@ -53,9 +53,9 @@ func (r *ContactExtensionsCollectionRequest) Paging(ctx context.Context, method,
 	}
 	var values []Extension
 	for {
-		defer res.Body.Close()
 		if res.StatusCode != http.StatusOK {
 			b, _ := ioutil.ReadAll(res.Body)
+			res.Body.Close()
 			errRes := &ErrorResponse{Response: res}
 			err := jsonx.Unmarshal(b, errRes)
 			if err != nil {
@@ -68,6 +68,7 @@ func (r *ContactExtensionsCollectionRequest) Paging(ctx context.Context, method,
 			value  []Extension
 		)
 		err := jsonx.NewDecoder(res.Body).Decode(&paging)
+		res.Body.Close()
 		if err != nil {
 			return nil, err
 		}
@@ -155,9 +156,9 @@ func (r *ContactMultiValueExtendedPropertiesCollectionRequest) Paging(ctx contex
 	}
 	var values []MultiValueLegacyExtendedProperty
 	for {
-		defer res.Body.Close()
 		if res.StatusCode != http.StatusOK {
 			b, _ := ioutil.ReadAll(res.Body)
+			res.Body.Close()
 			errRes := &ErrorResponse{Response: res}
 			err := jsonx.Unmarshal(b, errRes)
 			if err != nil {
@@ -170,6 +171,7 @@ func (r *ContactMultiValueExtendedPropertiesCollectionRequest) Paging(ctx contex
 			value  []MultiValueLegacyExtendedProperty
 		)
 		err := jsonx.NewDecoder(res.Body).Decode(&paging)
+		res.Body.Close()
 		if err != nil {
 			return nil, err
 		}
@@ -264,9 +266,9 @@ func (r *ContactSingleValueExtendedPropertiesCollectionRequest) Paging(ctx conte
 	}
 	var values []SingleValueLegacyExtendedProperty
 	for {
-		defer res.Body.Close()
 		if res.StatusCode != http.StatusOK {
 			b, _ := ioutil.ReadAll(res.Body)
+			res.Body.Close()
 			errRes := &ErrorResponse{Response: res}
 			err := jsonx.Unmarshal(b, errRes)
 			if err != nil {
@@ -279,6 +281,7 @@ func (r *ContactSingleValueExtendedPropertiesCollectionRequest) Paging(ctx conte
 			value  []SingleValueLegacyExtendedProperty
 		)
 		err := jsonx.NewDecoder(res.Body).Decode(&paging)
+		res.Body.Close()
 		if err != nil {
 			return nil, err
 		}
@@ -366,9 +369,9 @@ func (r *ContactFolderChildFoldersCollectionRequest) Paging(ctx context.Context,
 	}
 	var values []ContactFolder
 	for {
-		defer res.Body.Close()
 		if res.StatusCode != http.StatusOK {
 			b, _ := ioutil.ReadAll(res.Body)
+			res.Body.Close()
 			errRes := &ErrorResponse{Response: res}
 			err := jsonx.Unmarshal(b, errRes)
 			if err != nil {
@@ -381,6 +384,7 @@ func (r *ContactFolderChildFoldersCollectionRequest) Paging(ctx context.Context,
 			value  []ContactFolder
 		)
 		err := jsonx.NewDecoder(res.Body).Decode(&paging)
+		res.Body.Close()
 		if err != nil {
 			return nil, err
 		}
@@ -468,9 +472,9 @@ func (r *ContactFolderContactsCollectionRequest) Paging(ctx context.Context, met
 	}
 	var values []Contact
 	for {
-		defer res.Body.Close()
 		if res.StatusCode != http.StatusOK {
 			b, _ := ioutil.ReadAll(res.Body)
+			res.Body.Close()
 			errRes := &ErrorResponse{Response: res}
 			err := jsonx.Unmarshal(b, errRes)
 			if err != nil {
@@ -483,6 +487,7 @@ func (r *ContactFolderContactsCollectionRequest) Paging(ctx context.Context, met
 			value  []Contact
 		)
 		err := jsonx.NewDecoder(res.Body).Decode(&paging)
+		res.Body.Close()
 		if err != nil {
 			return nil, err
 		}
@@ -570,9 +575,9 @@ func (r *ContactFolderMultiValueExtendedPropertiesCollectionRequest) Paging(ctx
 	}
 	var values []MultiValueLegacyExtendedProperty
 	for {
-		defer res.Body.Close()
 		if res.StatusCode != http.StatusOK {
 			b, _ := ioutil.ReadAll(res.Body)
+			res.Body.Close()
 			errRes := &ErrorResponse{Response: res}
 			err := jsonx.Unmarshal(b, errRes)
 			if err != nil {
@@ -585,6 +590,7 @@ func (r *ContactFolderMultiValueExtendedPropertiesCollectionRequest) Paging(ctx
 			value  []MultiValueLegacyExtendedProperty
 		)
 		err := jsonx.NewDecoder(res.Body).Decode(&paging)
+		res.Body.Close()
 		if err != nil {
 			return nil, err
 		}
@@ -672,9 +678,9 @@ func (r *ContactFolderSingleValueExtendedPropertiesCollectionRequest) Paging(ctx
 	}
 	var values []SingleValueLegacyExtendedProperty
 	for {
-		defer res.Body.Close()
 		if res.StatusCode != http.StatusOK {
 			b, _ := ioutil.ReadAll(res.Body)
+			res.Body.Close()
 			errRes := &ErrorResponse{Response: res}
 			err := jsonx.Unmarshal(b, errRes)
 			if err != nil {
@@ -687,6 +693,7 @@ func (r *ContactFolderSingleValueExtendedPropertiesCollectionRequest) Paging(ctx
 			value  []SingleValueLegacyExtendedProperty
 		)
 		err := jsonx.NewDecoder(res.Body).Decode(&paging)
+		res.Body.Close()
 		if err != nil {
 			return nil, err
 		}
--- a/vendor/github.com/yaegashi/msgraph.go/beta/ActionContent.go
+++ b/vendor/github.com/yaegashi/msgraph.go/beta/ActionContent.go
@@ -1,4 +1,4 @@
-// Code generated by msgraph-generate.go DO NOT EDIT.
+// Code generated by msgraph.go/gen DO NOT EDIT.

 package msgraph

@@ -53,9 +53,9 @@ func (r *ContentTypeColumnLinksCollectionRequest) Paging(ctx context.Context, me
 	}
 	var values []ColumnLink
 	for {
-		defer res.Body.Close()
 		if res.StatusCode != http.StatusOK {
 			b, _ := ioutil.ReadAll(res.Body)
+			res.Body.Close()
 			errRes := &ErrorResponse{Response: res}
 			err := jsonx.Unmarshal(b, errRes)
 			if err != nil {
@@ -68,6 +68,7 @@ func (r *ContentTypeColumnLinksCollectionRequest) Paging(ctx context.Context, me
 			value  []ColumnLink
 		)
 		err := jsonx.NewDecoder(res.Body).Decode(&paging)
+		res.Body.Close()
 		if err != nil {
 			return nil, err
 		}
--- a/vendor/github.com/yaegashi/msgraph.go/beta/ActionConversation.go
+++ b/vendor/github.com/yaegashi/msgraph.go/beta/ActionConversation.go
@@ -1,4 +1,4 @@
-// Code generated by msgraph-generate.go DO NOT EDIT.
+// Code generated by msgraph.go/gen DO NOT EDIT.

 package msgraph

@@ -59,9 +59,9 @@ func (r *ConversationThreadsCollectionRequest) Paging(ctx context.Context, metho
 	}
 	var values []ConversationThread
 	for {
-		defer res.Body.Close()
 		if res.StatusCode != http.StatusOK {
 			b, _ := ioutil.ReadAll(res.Body)
+			res.Body.Close()
 			errRes := &ErrorResponse{Response: res}
 			err := jsonx.Unmarshal(b, errRes)
 			if err != nil {
@@ -74,6 +74,7 @@ func (r *ConversationThreadsCollectionRequest) Paging(ctx context.Context, metho
 			value  []ConversationThread
 		)
 		err := jsonx.NewDecoder(res.Body).Decode(&paging)
+		res.Body.Close()
 		if err != nil {
 			return nil, err
 		}
@@ -161,9 +162,9 @@ func (r *ConversationThreadPostsCollectionRequest) Paging(ctx context.Context, m
 	}
 	var values []Post
 	for {
-		defer res.Body.Close()
 		if res.StatusCode != http.StatusOK {
 			b, _ := ioutil.ReadAll(res.Body)
+			res.Body.Close()
 			errRes := &ErrorResponse{Response: res}
 			err := jsonx.Unmarshal(b, errRes)
 			if err != nil {
@@ -176,6 +177,7 @@ func (r *ConversationThreadPostsCollectionRequest) Paging(ctx context.Context, m
 			value  []Post
 		)
 		err := jsonx.NewDecoder(res.Body).Decode(&paging)
+		res.Body.Close()
 		if err != nil {
 			return nil, err
 		}
--- a/vendor/github.com/yaegashi/msgraph.go/beta/ActionCustomer.go
+++ b/vendor/github.com/yaegashi/msgraph.go/beta/ActionCustomer.go
@@ -1,4 +1,4 @@
-// Code generated by msgraph-generate.go DO NOT EDIT.
+// Code generated by msgraph.go/gen DO NOT EDIT.

 package msgraph

@@ -74,9 +74,9 @@ func (r *CustomerPictureCollectionRequest) Paging(ctx context.Context, method, p
 	}
 	var values []Picture
 	for {
-		defer res.Body.Close()
 		if res.StatusCode != http.StatusOK {
 			b, _ := ioutil.ReadAll(res.Body)
+			res.Body.Close()
 			errRes := &ErrorResponse{Response: res}
 			err := jsonx.Unmarshal(b, errRes)
 			if err != nil {
@@ -89,6 +89,7 @@ func (r *CustomerPictureCollectionRequest) Paging(ctx context.Context, method, p
 			value  []Picture
 		)
 		err := jsonx.NewDecoder(res.Body).Decode(&paging)
+		res.Body.Close()
 		if err != nil {
 			return nil, err
 		}
@@ -197,9 +198,9 @@ func (r *CustomerPaymentJournalCustomerPaymentsCollectionRequest) Paging(ctx con
 	}
 	var values []CustomerPayment
 	for {
-		defer res.Body.Close()
 		if res.StatusCode != http.StatusOK {
 			b, _ := ioutil.ReadAll(res.Body)
+			res.Body.Close()
 			errRes := &ErrorResponse{Response: res}
 			err := jsonx.Unmarshal(b, errRes)
 			if err != nil {
@@ -212,6 +213,7 @@ func (r *CustomerPaymentJournalCustomerPaymentsCollectionRequest) Paging(ctx con
 			value  []CustomerPayment
 		)
 		err := jsonx.NewDecoder(res.Body).Decode(&paging)
+		res.Body.Close()
 		if err != nil {
 			return nil, err
 		}
--- a/vendor/github.com/yaegashi/msgraph.go/beta/ActionData.go
+++ b/vendor/github.com/yaegashi/msgraph.go/beta/ActionData.go
@@ -1,4 +1,4 @@
-// Code generated by msgraph-generate.go DO NOT EDIT.
+// Code generated by msgraph.go/gen DO NOT EDIT.

 package msgraph

@@ -67,9 +67,9 @@ func (r *DataClassificationServiceClassifyFileCollectionRequest) Paging(ctx cont
 	}
 	var values []FileClassificationRequestObject
 	for {
-		defer res.Body.Close()
 		if res.StatusCode != http.StatusOK {
 			b, _ := ioutil.ReadAll(res.Body)
+			res.Body.Close()
 			errRes := &ErrorResponse{Response: res}
 			err := jsonx.Unmarshal(b, errRes)
 			if err != nil {
@@ -82,6 +82,7 @@ func (r *DataClassificationServiceClassifyFileCollectionRequest) Paging(ctx cont
 			value  []FileClassificationRequestObject
 		)
 		err := jsonx.NewDecoder(res.Body).Decode(&paging)
+		res.Body.Close()
 		if err != nil {
 			return nil, err
 		}
@@ -169,9 +170,9 @@ func (r *DataClassificationServiceClassifyFileJobsCollectionRequest) Paging(ctx
 	}
 	var values []JobResponseBase
 	for {
-		defer res.Body.Close()
 		if res.StatusCode != http.StatusOK {
 			b, _ := ioutil.ReadAll(res.Body)
+			res.Body.Close()
 			errRes := &ErrorResponse{Response: res}
 			err := jsonx.Unmarshal(b, errRes)
 			if err != nil {
@@ -184,6 +185,7 @@ func (r *DataClassificationServiceClassifyFileJobsCollectionRequest) Paging(ctx
 			value  []JobResponseBase
 		)
 		err := jsonx.NewDecoder(res.Body).Decode(&paging)
+		res.Body.Close()
 		if err != nil {
 			return nil, err
 		}
@@ -271,9 +273,9 @@ func (r *DataClassificationServiceClassifyTextCollectionRequest) Paging(ctx cont
 	}
 	var values []TextClassificationRequestObject
 	for {
-		defer res.Body.Close()
 		if res.StatusCode != http.StatusOK {
 			b, _ := ioutil.ReadAll(res.Body)
+			res.Body.Close()
 			errRes := &ErrorResponse{Response: res}
 			err := jsonx.Unmarshal(b, errRes)
 			if err != nil {
@@ -286,6 +288,7 @@ func (r *DataClassificationServiceClassifyTextCollectionRequest) Paging(ctx cont
 			value  []TextClassificationRequestObject
 		)
 		err := jsonx.NewDecoder(res.Body).Decode(&paging)
+		res.Body.Close()
 		if err != nil {
 			return nil, err
 		}
@@ -373,9 +376,9 @@ func (r *DataClassificationServiceClassifyTextJobsCollectionRequest) Paging(ctx
 	}
 	var values []JobResponseBase
 	for {
-		defer res.Body.Close()
 		if res.StatusCode != http.StatusOK {
 			b, _ := ioutil.ReadAll(res.Body)
+			res.Body.Close()
 			errRes := &ErrorResponse{Response: res}
 			err := jsonx.Unmarshal(b, errRes)
 			if err != nil {
@@ -388,6 +391,7 @@ func (r *DataClassificationServiceClassifyTextJobsCollectionRequest) Paging(ctx
 			value  []JobResponseBase
 		)
 		err := jsonx.NewDecoder(res.Body).Decode(&paging)
+		res.Body.Close()
 		if err != nil {
 			return nil, err
 		}
@@ -475,9 +479,9 @@ func (r *DataClassificationServiceEvaluateDlpPoliciesJobsCollectionRequest) Pagi
 	}
 	var values []JobResponseBase
 	for {
-		defer res.Body.Close()
 		if res.StatusCode != http.StatusOK {
 			b, _ := ioutil.ReadAll(res.Body)
+			res.Body.Close()
 			errRes := &ErrorResponse{Response: res}
 			err := jsonx.Unmarshal(b, errRes)
 			if err != nil {
@@ -490,6 +494,7 @@ func (r *DataClassificationServiceEvaluateDlpPoliciesJobsCollectionRequest) Pagi
 			value  []JobResponseBase
 		)
 		err := jsonx.NewDecoder(res.Body).Decode(&paging)
+		res.Body.Close()
 		if err != nil {
 			return nil, err
 		}
@@ -577,9 +582,9 @@ func (r *DataClassificationServiceEvaluateLabelJobsCollectionRequest) Paging(ctx
 	}
 	var values []JobResponseBase
 	for {
-		defer res.Body.Close()
 		if res.StatusCode != http.StatusOK {
 			b, _ := ioutil.ReadAll(res.Body)
+			res.Body.Close()
 			errRes := &ErrorResponse{Response: res}
 			err := jsonx.Unmarshal(b, errRes)
 			if err != nil {
@@ -592,6 +597,7 @@ func (r *DataClassificationServiceEvaluateLabelJobsCollectionRequest) Paging(ctx
 			value  []JobResponseBase
 		)
 		err := jsonx.NewDecoder(res.Body).Decode(&paging)
+		res.Body.Close()
 		if err != nil {
 			return nil, err
 		}
@@ -679,9 +685,9 @@ func (r *DataClassificationServiceExactMatchDataStoresCollectionRequest) Paging(
 	}
 	var values []ExactMatchDataStore
 	for {
-		defer res.Body.Close()
 		if res.StatusCode != http.StatusOK {
 			b, _ := ioutil.ReadAll(res.Body)
+			res.Body.Close()
 			errRes := &ErrorResponse{Response: res}
 			err := jsonx.Unmarshal(b, errRes)
 			if err != nil {
@@ -694,6 +700,7 @@ func (r *DataClassificationServiceExactMatchDataStoresCollectionRequest) Paging(
 			value  []ExactMatchDataStore
 		)
 		err := jsonx.NewDecoder(res.Body).Decode(&paging)
+		res.Body.Close()
 		if err != nil {
 			return nil, err
 		}
@@ -781,9 +788,9 @@ func (r *DataClassificationServiceExactMatchUploadAgentsCollectionRequest) Pagin
 	}
 	var values []ExactMatchUploadAgent
 	for {
-		defer res.Body.Close()
 		if res.StatusCode != http.StatusOK {
 			b, _ := ioutil.ReadAll(res.Body)
+			res.Body.Close()
 			errRes := &ErrorResponse{Response: res}
 			err := jsonx.Unmarshal(b, errRes)
 			if err != nil {
@@ -796,6 +803,7 @@ func (r *DataClassificationServiceExactMatchUploadAgentsCollectionRequest) Pagin
 			value  []ExactMatchUploadAgent
 		)
 		err := jsonx.NewDecoder(res.Body).Decode(&paging)
+		res.Body.Close()
 		if err != nil {
 			return nil, err
 		}
@@ -883,9 +891,9 @@ func (r *DataClassificationServiceJobsCollectionRequest) Paging(ctx context.Cont
 	}
 	var values []JobResponseBase
 	for {
-		defer res.Body.Close()
 		if res.StatusCode != http.StatusOK {
 			b, _ := ioutil.ReadAll(res.Body)
+			res.Body.Close()
 			errRes := &ErrorResponse{Response: res}
 			err := jsonx.Unmarshal(b, errRes)
 			if err != nil {
@@ -898,6 +906,7 @@ func (r *DataClassificationServiceJobsCollectionRequest) Paging(ctx context.Cont
 			value  []JobResponseBase
 		)
 		err := jsonx.NewDecoder(res.Body).Decode(&paging)
+		res.Body.Close()
 		if err != nil {
 			return nil, err
 		}
@@ -985,9 +994,9 @@ func (r *DataClassificationServiceLabelsAndPoliciesEvaluationJobsCollectionReque
 	}
 	var values []JobResponseBase
 	for {
-		defer res.Body.Close()
 		if res.StatusCode != http.StatusOK {
 			b, _ := ioutil.ReadAll(res.Body)
+			res.Body.Close()
 			errRes := &ErrorResponse{Response: res}
 			err := jsonx.Unmarshal(b, errRes)
 			if err != nil {
@@ -1000,6 +1009,7 @@ func (r *DataClassificationServiceLabelsAndPoliciesEvaluationJobsCollectionReque
 			value  []JobResponseBase
 		)
 		err := jsonx.NewDecoder(res.Body).Decode(&paging)
+		res.Body.Close()
 		if err != nil {
 			return nil, err
 		}
@@ -1087,9 +1097,9 @@ func (r *DataClassificationServiceSensitiveTypesCollectionRequest) Paging(ctx co
 	}
 	var values []SensitiveType
 	for {
-		defer res.Body.Close()
 		if res.StatusCode != http.StatusOK {
 			b, _ := ioutil.ReadAll(res.Body)
+			res.Body.Close()
 			errRes := &ErrorResponse{Response: res}
 			err := jsonx.Unmarshal(b, errRes)
 			if err != nil {
@@ -1102,6 +1112,7 @@ func (r *DataClassificationServiceSensitiveTypesCollectionRequest) Paging(ctx co
 			value  []SensitiveType
 		)
 		err := jsonx.NewDecoder(res.Body).Decode(&paging)
+		res.Body.Close()
 		if err != nil {
 			return nil, err
 		}
@@ -1189,9 +1200,9 @@ func (r *DataClassificationServiceSensitivityLabelsCollectionRequest) Paging(ctx
 	}
 	var values []SensitivityLabel
 	for {
-		defer res.Body.Close()
 		if res.StatusCode != http.StatusOK {
 			b, _ := ioutil.ReadAll(res.Body)
+			res.Body.Close()
 			errRes := &ErrorResponse{Response: res}
 			err := jsonx.Unmarshal(b, errRes)
 			if err != nil {
@@ -1204,6 +1215,7 @@ func (r *DataClassificationServiceSensitivityLabelsCollectionRequest) Paging(ctx
 			value  []SensitivityLabel
 		)
 		err := jsonx.NewDecoder(res.Body).Decode(&paging)
+		res.Body.Close()
 		if err != nil {
 			return nil, err
 		}
--- a/vendor/github.com/yaegashi/msgraph.go/beta/ActionDefault.go
+++ b/vendor/github.com/yaegashi/msgraph.go/beta/ActionDefault.go
@@ -1,4 +1,4 @@
-// Code generated by msgraph-generate.go DO NOT EDIT.
+// Code generated by msgraph.go/gen DO NOT EDIT.

 package msgraph

@@ -53,9 +53,9 @@ func (r *DefaultManagedAppProtectionAppsCollectionRequest) Paging(ctx context.Co
 	}
 	var values []ManagedMobileApp
 	for {
-		defer res.Body.Close()
 		if res.StatusCode != http.StatusOK {
 			b, _ := ioutil.ReadAll(res.Body)
+			res.Body.Close()
 			errRes := &ErrorResponse{Response: res}
 			err := jsonx.Unmarshal(b, errRes)
 			if err != nil {
@@ -68,6 +68,7 @@ func (r *DefaultManagedAppProtectionAppsCollectionRequest) Paging(ctx context.Co
 			value  []ManagedMobileApp
 		)
 		err := jsonx.NewDecoder(res.Body).Decode(&paging)
+		res.Body.Close()
 		if err != nil {
 			return nil, err
 		}
--- a/vendor/github.com/yaegashi/msgraph.go/beta/ActionDep.go
+++ b/vendor/github.com/yaegashi/msgraph.go/beta/ActionDep.go
@@ -1,4 +1,4 @@
-// Code generated by msgraph-generate.go DO NOT EDIT.
+// Code generated by msgraph.go/gen DO NOT EDIT.

 package msgraph

@@ -87,9 +87,9 @@ func (r *DepOnboardingSettingEnrollmentProfilesCollectionRequest) Paging(ctx con
 	}
 	var values []EnrollmentProfile
 	for {
-		defer res.Body.Close()
 		if res.StatusCode != http.StatusOK {
 			b, _ := ioutil.ReadAll(res.Body)
+			res.Body.Close()
 			errRes := &ErrorResponse{Response: res}
 			err := jsonx.Unmarshal(b, errRes)
 			if err != nil {
@@ -102,6 +102,7 @@ func (r *DepOnboardingSettingEnrollmentProfilesCollectionRequest) Paging(ctx con
 			value  []EnrollmentProfile
 		)
 		err := jsonx.NewDecoder(res.Body).Decode(&paging)
+		res.Body.Close()
 		if err != nil {
 			return nil, err
 		}
@@ -189,9 +190,9 @@ func (r *DepOnboardingSettingImportedAppleDeviceIdentitiesCollectionRequest) Pag
 	}
 	var values []ImportedAppleDeviceIdentity
 	for {
-		defer res.Body.Close()
 		if res.StatusCode != http.StatusOK {
 			b, _ := ioutil.ReadAll(res.Body)
+			res.Body.Close()
 			errRes := &ErrorResponse{Response: res}
 			err := jsonx.Unmarshal(b, errRes)
 			if err != nil {
@@ -204,6 +205,7 @@ func (r *DepOnboardingSettingImportedAppleDeviceIdentitiesCollectionRequest) Pag
 			value  []ImportedAppleDeviceIdentity
 		)
 		err := jsonx.NewDecoder(res.Body).Decode(&paging)
+		res.Body.Close()
 		if err != nil {
 			return nil, err
 		}
--- a/vendor/github.com/yaegashi/msgraph.go/beta/ActionDetected.go
+++ b/vendor/github.com/yaegashi/msgraph.go/beta/ActionDetected.go
@@ -1,4 +1,4 @@
-// Code generated by msgraph-generate.go DO NOT EDIT.
+// Code generated by msgraph.go/gen DO NOT EDIT.

 package msgraph

@@ -53,9 +53,9 @@ func (r *DetectedAppManagedDevicesCollectionRequest) Paging(ctx context.Context,
 	}
 	var values []ManagedDevice
 	for {
-		defer res.Body.Close()
 		if res.StatusCode != http.StatusOK {
 			b, _ := ioutil.ReadAll(res.Body)
+			res.Body.Close()
 			errRes := &ErrorResponse{Response: res}
 			err := jsonx.Unmarshal(b, errRes)
 			if err != nil {
@@ -68,6 +68,7 @@ func (r *DetectedAppManagedDevicesCollectionRequest) Paging(ctx context.Context,
 			value  []ManagedDevice
 		)
 		err := jsonx.NewDecoder(res.Body).Decode(&paging)
+		res.Body.Close()
 		if err != nil {
 			return nil, err
 		}
--- a/vendor/github.com/yaegashi/msgraph.go/beta/ActionDevice.go
+++ b/vendor/github.com/yaegashi/msgraph.go/beta/ActionDevice.go
--- a/vendor/github.com/yaegashi/msgraph.go/beta/ActionDimension.go
+++ b/vendor/github.com/yaegashi/msgraph.go/beta/ActionDimension.go
@@ -1,4 +1,4 @@
-// Code generated by msgraph-generate.go DO NOT EDIT.
+// Code generated by msgraph.go/gen DO NOT EDIT.

 package msgraph

@@ -53,9 +53,9 @@ func (r *DimensionDimensionValuesCollectionRequest) Paging(ctx context.Context,
 	}
 	var values []DimensionValue
 	for {
-		defer res.Body.Close()
 		if res.StatusCode != http.StatusOK {
 			b, _ := ioutil.ReadAll(res.Body)
+			res.Body.Close()
 			errRes := &ErrorResponse{Response: res}
 			err := jsonx.Unmarshal(b, errRes)
 			if err != nil {
@@ -68,6 +68,7 @@ func (r *DimensionDimensionValuesCollectionRequest) Paging(ctx context.Context,
 			value  []DimensionValue
 		)
 		err := jsonx.NewDecoder(res.Body).Decode(&paging)
+		res.Body.Close()
 		if err != nil {
 			return nil, err
 		}
--- a/vendor/github.com/yaegashi/msgraph.go/beta/ActionDirectory.go
+++ b/vendor/github.com/yaegashi/msgraph.go/beta/ActionDirectory.go
@@ -1,4 +1,4 @@
-// Code generated by msgraph-generate.go DO NOT EDIT.
+// Code generated by msgraph.go/gen DO NOT EDIT.

 package msgraph

@@ -113,9 +113,9 @@ func (r *DirectoryDeletedItemsCollectionRequest) Paging(ctx context.Context, met
 	}
 	var values []DirectoryObject
 	for {
-		defer res.Body.Close()
 		if res.StatusCode != http.StatusOK {
 			b, _ := ioutil.ReadAll(res.Body)
+			res.Body.Close()
 			errRes := &ErrorResponse{Response: res}
 			err := jsonx.Unmarshal(b, errRes)
 			if err != nil {
@@ -128,6 +128,7 @@ func (r *DirectoryDeletedItemsCollectionRequest) Paging(ctx context.Context, met
 			value  []DirectoryObject
 		)
 		err := jsonx.NewDecoder(res.Body).Decode(&paging)
+		res.Body.Close()
 		if err != nil {
 			return nil, err
 		}
@@ -215,9 +216,9 @@ func (r *DirectoryFeatureRolloutPoliciesCollectionRequest) Paging(ctx context.Co
 	}
 	var values []FeatureRolloutPolicy
 	for {
-		defer res.Body.Close()
 		if res.StatusCode != http.StatusOK {
 			b, _ := ioutil.ReadAll(res.Body)
+			res.Body.Close()
 			errRes := &ErrorResponse{Response: res}
 			err := jsonx.Unmarshal(b, errRes)
 			if err != nil {
@@ -230,6 +231,7 @@ func (r *DirectoryFeatureRolloutPoliciesCollectionRequest) Paging(ctx context.Co
 			value  []FeatureRolloutPolicy
 		)
 		err := jsonx.NewDecoder(res.Body).Decode(&paging)
+		res.Body.Close()
 		if err != nil {
 			return nil, err
 		}
@@ -317,9 +319,9 @@ func (r *DirectoryRoleMembersCollectionRequest) Paging(ctx context.Context, meth
 	}
 	var values []DirectoryObject
 	for {
-		defer res.Body.Close()
 		if res.StatusCode != http.StatusOK {
 			b, _ := ioutil.ReadAll(res.Body)
+			res.Body.Close()
 			errRes := &ErrorResponse{Response: res}
 			err := jsonx.Unmarshal(b, errRes)
 			if err != nil {
@@ -332,6 +334,7 @@ func (r *DirectoryRoleMembersCollectionRequest) Paging(ctx context.Context, meth
 			value  []DirectoryObject
 		)
 		err := jsonx.NewDecoder(res.Body).Decode(&paging)
+		res.Body.Close()
 		if err != nil {
 			return nil, err
 		}
@@ -419,9 +422,9 @@ func (r *DirectoryRoleScopedMembersCollectionRequest) Paging(ctx context.Context
 	}
 	var values []ScopedRoleMembership
 	for {
-		defer res.Body.Close()
 		if res.StatusCode != http.StatusOK {
 			b, _ := ioutil.ReadAll(res.Body)
+			res.Body.Close()
 			errRes := &ErrorResponse{Response: res}
 			err := jsonx.Unmarshal(b, errRes)
 			if err != nil {
@@ -434,6 +437,7 @@ func (r *DirectoryRoleScopedMembersCollectionRequest) Paging(ctx context.Context
 			value  []ScopedRoleMembership
 		)
 		err := jsonx.NewDecoder(res.Body).Decode(&paging)
+		res.Body.Close()
 		if err != nil {
 			return nil, err
 		}
--- a/vendor/github.com/yaegashi/msgraph.go/beta/ActionDocument.go
+++ b/vendor/github.com/yaegashi/msgraph.go/beta/ActionDocument.go
@@ -1,4 +1,4 @@
-// Code generated by msgraph-generate.go DO NOT EDIT.
+// Code generated by msgraph.go/gen DO NOT EDIT.

 package msgraph

@@ -53,9 +53,9 @@ func (r *DocumentCommentsCollectionRequest) Paging(ctx context.Context, method,
 	}
 	var values []DocumentComment
 	for {
-		defer res.Body.Close()
 		if res.StatusCode != http.StatusOK {
 			b, _ := ioutil.ReadAll(res.Body)
+			res.Body.Close()
 			errRes := &ErrorResponse{Response: res}
 			err := jsonx.Unmarshal(b, errRes)
 			if err != nil {
@@ -68,6 +68,7 @@ func (r *DocumentCommentsCollectionRequest) Paging(ctx context.Context, method,
 			value  []DocumentComment
 		)
 		err := jsonx.NewDecoder(res.Body).Decode(&paging)
+		res.Body.Close()
 		if err != nil {
 			return nil, err
 		}
@@ -155,9 +156,9 @@ func (r *DocumentCommentRepliesCollectionRequest) Paging(ctx context.Context, me
 	}
 	var values []DocumentCommentReply
 	for {
-		defer res.Body.Close()
 		if res.StatusCode != http.StatusOK {
 			b, _ := ioutil.ReadAll(res.Body)
+			res.Body.Close()
 			errRes := &ErrorResponse{Response: res}
 			err := jsonx.Unmarshal(b, errRes)
 			if err != nil {
@@ -170,6 +171,7 @@ func (r *DocumentCommentRepliesCollectionRequest) Paging(ctx context.Context, me
 			value  []DocumentCommentReply
 		)
 		err := jsonx.NewDecoder(res.Body).Decode(&paging)
+		res.Body.Close()
 		if err != nil {
 			return nil, err
 		}
--- a/vendor/github.com/yaegashi/msgraph.go/beta/ActionDomain.go
+++ b/vendor/github.com/yaegashi/msgraph.go/beta/ActionDomain.go
@@ -1,4 +1,4 @@
-// Code generated by msgraph-generate.go DO NOT EDIT.
+// Code generated by msgraph.go/gen DO NOT EDIT.

 package msgraph

@@ -63,9 +63,9 @@ func (r *DomainDomainNameReferencesCollectionRequest) Paging(ctx context.Context
 	}
 	var values []DirectoryObject
 	for {
-		defer res.Body.Close()
 		if res.StatusCode != http.StatusOK {
 			b, _ := ioutil.ReadAll(res.Body)
+			res.Body.Close()
 			errRes := &ErrorResponse{Response: res}
 			err := jsonx.Unmarshal(b, errRes)
 			if err != nil {
@@ -78,6 +78,7 @@ func (r *DomainDomainNameReferencesCollectionRequest) Paging(ctx context.Context
 			value  []DirectoryObject
 		)
 		err := jsonx.NewDecoder(res.Body).Decode(&paging)
+		res.Body.Close()
 		if err != nil {
 			return nil, err
 		}
@@ -165,9 +166,9 @@ func (r *DomainServiceConfigurationRecordsCollectionRequest) Paging(ctx context.
 	}
 	var values []DomainDNSRecord
 	for {
-		defer res.Body.Close()
 		if res.StatusCode != http.StatusOK {
 			b, _ := ioutil.ReadAll(res.Body)
+			res.Body.Close()
 			errRes := &ErrorResponse{Response: res}
 			err := jsonx.Unmarshal(b, errRes)
 			if err != nil {
@@ -180,6 +181,7 @@ func (r *DomainServiceConfigurationRecordsCollectionRequest) Paging(ctx context.
 			value  []DomainDNSRecord
 		)
 		err := jsonx.NewDecoder(res.Body).Decode(&paging)
+		res.Body.Close()
 		if err != nil {
 			return nil, err
 		}
@@ -267,9 +269,9 @@ func (r *DomainVerificationDNSRecordsCollectionRequest) Paging(ctx context.Conte
 	}
 	var values []DomainDNSRecord
 	for {
-		defer res.Body.Close()
 		if res.StatusCode != http.StatusOK {
 			b, _ := ioutil.ReadAll(res.Body)
+			res.Body.Close()
 			errRes := &ErrorResponse{Response: res}
 			err := jsonx.Unmarshal(b, errRes)
 			if err != nil {
@@ -282,6 +284,7 @@ func (r *DomainVerificationDNSRecordsCollectionRequest) Paging(ctx context.Conte
 			value  []DomainDNSRecord
 		)
 		err := jsonx.NewDecoder(res.Body).Decode(&paging)
+		res.Body.Close()
 		if err != nil {
 			return nil, err
 		}
--- a/vendor/github.com/yaegashi/msgraph.go/beta/ActionDrive.go
+++ b/vendor/github.com/yaegashi/msgraph.go/beta/ActionDrive.go
@@ -1,4 +1,4 @@
-// Code generated by msgraph-generate.go DO NOT EDIT.
+// Code generated by msgraph.go/gen DO NOT EDIT.

 package msgraph

@@ -158,9 +158,9 @@ func (r *DriveActivitiesCollectionRequest) Paging(ctx context.Context, method, p
 	}
 	var values []ItemActivityOLD
 	for {
-		defer res.Body.Close()
 		if res.StatusCode != http.StatusOK {
 			b, _ := ioutil.ReadAll(res.Body)
+			res.Body.Close()
 			errRes := &ErrorResponse{Response: res}
 			err := jsonx.Unmarshal(b, errRes)
 			if err != nil {
@@ -173,6 +173,7 @@ func (r *DriveActivitiesCollectionRequest) Paging(ctx context.Context, method, p
 			value  []ItemActivityOLD
 		)
 		err := jsonx.NewDecoder(res.Body).Decode(&paging)
+		res.Body.Close()
 		if err != nil {
 			return nil, err
 		}
@@ -260,9 +261,9 @@ func (r *DriveBundlesCollectionRequest) Paging(ctx context.Context, method, path
 	}
 	var values []DriveItem
 	for {
-		defer res.Body.Close()
 		if res.StatusCode != http.StatusOK {
 			b, _ := ioutil.ReadAll(res.Body)
+			res.Body.Close()
 			errRes := &ErrorResponse{Response: res}
 			err := jsonx.Unmarshal(b, errRes)
 			if err != nil {
@@ -275,6 +276,7 @@ func (r *DriveBundlesCollectionRequest) Paging(ctx context.Context, method, path
 			value  []DriveItem
 		)
 		err := jsonx.NewDecoder(res.Body).Decode(&paging)
+		res.Body.Close()
 		if err != nil {
 			return nil, err
 		}
@@ -362,9 +364,9 @@ func (r *DriveFollowingCollectionRequest) Paging(ctx context.Context, method, pa
 	}
 	var values []DriveItem
 	for {
-		defer res.Body.Close()
 		if res.StatusCode != http.StatusOK {
 			b, _ := ioutil.ReadAll(res.Body)
+			res.Body.Close()
 			errRes := &ErrorResponse{Response: res}
 			err := jsonx.Unmarshal(b, errRes)
 			if err != nil {
@@ -377,6 +379,7 @@ func (r *DriveFollowingCollectionRequest) Paging(ctx context.Context, method, pa
 			value  []DriveItem
 		)
 		err := jsonx.NewDecoder(res.Body).Decode(&paging)
+		res.Body.Close()
 		if err != nil {
 			return nil, err
 		}
@@ -464,9 +467,9 @@ func (r *DriveItemsCollectionRequest) Paging(ctx context.Context, method, path s
 	}
 	var values []DriveItem
 	for {
-		defer res.Body.Close()
 		if res.StatusCode != http.StatusOK {
 			b, _ := ioutil.ReadAll(res.Body)
+			res.Body.Close()
 			errRes := &ErrorResponse{Response: res}
 			err := jsonx.Unmarshal(b, errRes)
 			if err != nil {
@@ -479,6 +482,7 @@ func (r *DriveItemsCollectionRequest) Paging(ctx context.Context, method, path s
 			value  []DriveItem
 		)
 		err := jsonx.NewDecoder(res.Body).Decode(&paging)
+		res.Body.Close()
 		if err != nil {
 			return nil, err
 		}
@@ -580,9 +584,9 @@ func (r *DriveSpecialCollectionRequest) Paging(ctx context.Context, method, path
 	}
 	var values []DriveItem
 	for {
-		defer res.Body.Close()
 		if res.StatusCode != http.StatusOK {
 			b, _ := ioutil.ReadAll(res.Body)
+			res.Body.Close()
 			errRes := &ErrorResponse{Response: res}
 			err := jsonx.Unmarshal(b, errRes)
 			if err != nil {
@@ -595,6 +599,7 @@ func (r *DriveSpecialCollectionRequest) Paging(ctx context.Context, method, path
 			value  []DriveItem
 		)
 		err := jsonx.NewDecoder(res.Body).Decode(&paging)
+		res.Body.Close()
 		if err != nil {
 			return nil, err
 		}
@@ -682,9 +687,9 @@ func (r *DriveItemActivitiesCollectionRequest) Paging(ctx context.Context, metho
 	}
 	var values []ItemActivityOLD
 	for {
-		defer res.Body.Close()
 		if res.StatusCode != http.StatusOK {
 			b, _ := ioutil.ReadAll(res.Body)
+			res.Body.Close()
 			errRes := &ErrorResponse{Response: res}
 			err := jsonx.Unmarshal(b, errRes)
 			if err != nil {
@@ -697,6 +702,7 @@ func (r *DriveItemActivitiesCollectionRequest) Paging(ctx context.Context, metho
 			value  []ItemActivityOLD
 		)
 		err := jsonx.NewDecoder(res.Body).Decode(&paging)
+		res.Body.Close()
 		if err != nil {
 			return nil, err
 		}
@@ -791,9 +797,9 @@ func (r *DriveItemChildrenCollectionRequest) Paging(ctx context.Context, method,
 	}
 	var values []DriveItem
 	for {
-		defer res.Body.Close()
 		if res.StatusCode != http.StatusOK {
 			b, _ := ioutil.ReadAll(res.Body)
+			res.Body.Close()
 			errRes := &ErrorResponse{Response: res}
 			err := jsonx.Unmarshal(b, errRes)
 			if err != nil {
@@ -806,6 +812,7 @@ func (r *DriveItemChildrenCollectionRequest) Paging(ctx context.Context, method,
 			value  []DriveItem
 		)
 		err := jsonx.NewDecoder(res.Body).Decode(&paging)
+		res.Body.Close()
 		if err != nil {
 			return nil, err
 		}
@@ -907,9 +914,9 @@ func (r *DriveItemPermissionsCollectionRequest) Paging(ctx context.Context, meth
 	}
 	var values []Permission
 	for {
-		defer res.Body.Close()
 		if res.StatusCode != http.StatusOK {
 			b, _ := ioutil.ReadAll(res.Body)
+			res.Body.Close()
 			errRes := &ErrorResponse{Response: res}
 			err := jsonx.Unmarshal(b, errRes)
 			if err != nil {
@@ -922,6 +929,7 @@ func (r *DriveItemPermissionsCollectionRequest) Paging(ctx context.Context, meth
 			value  []Permission
 		)
 		err := jsonx.NewDecoder(res.Body).Decode(&paging)
+		res.Body.Close()
 		if err != nil {
 			return nil, err
 		}
@@ -1009,9 +1017,9 @@ func (r *DriveItemSubscriptionsCollectionRequest) Paging(ctx context.Context, me
 	}
 	var values []Subscription
 	for {
-		defer res.Body.Close()
 		if res.StatusCode != http.StatusOK {
 			b, _ := ioutil.ReadAll(res.Body)
+			res.Body.Close()
 			errRes := &ErrorResponse{Response: res}
 			err := jsonx.Unmarshal(b, errRes)
 			if err != nil {
@@ -1024,6 +1032,7 @@ func (r *DriveItemSubscriptionsCollectionRequest) Paging(ctx context.Context, me
 			value  []Subscription
 		)
 		err := jsonx.NewDecoder(res.Body).Decode(&paging)
+		res.Body.Close()
 		if err != nil {
 			return nil, err
 		}
@@ -1111,9 +1120,9 @@ func (r *DriveItemThumbnailsCollectionRequest) Paging(ctx context.Context, metho
 	}
 	var values []ThumbnailSet
 	for {
-		defer res.Body.Close()
 		if res.StatusCode != http.StatusOK {
 			b, _ := ioutil.ReadAll(res.Body)
+			res.Body.Close()
 			errRes := &ErrorResponse{Response: res}
 			err := jsonx.Unmarshal(b, errRes)
 			if err != nil {
@@ -1126,6 +1135,7 @@ func (r *DriveItemThumbnailsCollectionRequest) Paging(ctx context.Context, metho
 			value  []ThumbnailSet
 		)
 		err := jsonx.NewDecoder(res.Body).Decode(&paging)
+		res.Body.Close()
 		if err != nil {
 			return nil, err
 		}
@@ -1213,9 +1223,9 @@ func (r *DriveItemVersionsCollectionRequest) Paging(ctx context.Context, method,
 	}
 	var values []DriveItemVersion
 	for {
-		defer res.Body.Close()
 		if res.StatusCode != http.StatusOK {
 			b, _ := ioutil.ReadAll(res.Body)
+			res.Body.Close()
 			errRes := &ErrorResponse{Response: res}
 			err := jsonx.Unmarshal(b, errRes)
 			if err != nil {
@@ -1228,6 +1238,7 @@ func (r *DriveItemVersionsCollectionRequest) Paging(ctx context.Context, method,
 			value  []DriveItemVersion
 		)
 		err := jsonx.NewDecoder(res.Body).Decode(&paging)
+		res.Body.Close()
 		if err != nil {
 			return nil, err
 		}
--- a/vendor/github.com/yaegashi/msgraph.go/beta/ActionEducation.go
+++ b/vendor/github.com/yaegashi/msgraph.go/beta/ActionEducation.go
@@ -1,4 +1,4 @@
-// Code generated by msgraph-generate.go DO NOT EDIT.
+// Code generated by msgraph.go/gen DO NOT EDIT.

 package msgraph

@@ -85,9 +85,9 @@ func (r *EducationAssignmentCategoriesCollectionRequest) Paging(ctx context.Cont
 	}
 	var values []EducationCategory
 	for {
-		defer res.Body.Close()
 		if res.StatusCode != http.StatusOK {
 			b, _ := ioutil.ReadAll(res.Body)
+			res.Body.Close()
 			errRes := &ErrorResponse{Response: res}
 			err := jsonx.Unmarshal(b, errRes)
 			if err != nil {
@@ -100,6 +100,7 @@ func (r *EducationAssignmentCategoriesCollectionRequest) Paging(ctx context.Cont
 			value  []EducationCategory
 		)
 		err := jsonx.NewDecoder(res.Body).Decode(&paging)
+		res.Body.Close()
 		if err != nil {
 			return nil, err
 		}
@@ -187,9 +188,9 @@ func (r *EducationAssignmentResourcesCollectionRequest) Paging(ctx context.Conte
 	}
 	var values []EducationAssignmentResource
 	for {
-		defer res.Body.Close()
 		if res.StatusCode != http.StatusOK {
 			b, _ := ioutil.ReadAll(res.Body)
+			res.Body.Close()
 			errRes := &ErrorResponse{Response: res}
 			err := jsonx.Unmarshal(b, errRes)
 			if err != nil {
@@ -202,6 +203,7 @@ func (r *EducationAssignmentResourcesCollectionRequest) Paging(ctx context.Conte
 			value  []EducationAssignmentResource
 		)
 		err := jsonx.NewDecoder(res.Body).Decode(&paging)
+		res.Body.Close()
 		if err != nil {
 			return nil, err
 		}
@@ -296,9 +298,9 @@ func (r *EducationAssignmentSubmissionsCollectionRequest) Paging(ctx context.Con
 	}
 	var values []EducationSubmission
 	for {
-		defer res.Body.Close()
 		if res.StatusCode != http.StatusOK {
 			b, _ := ioutil.ReadAll(res.Body)
+			res.Body.Close()
 			errRes := &ErrorResponse{Response: res}
 			err := jsonx.Unmarshal(b, errRes)
 			if err != nil {
@@ -311,6 +313,7 @@ func (r *EducationAssignmentSubmissionsCollectionRequest) Paging(ctx context.Con
 			value  []EducationSubmission
 		)
 		err := jsonx.NewDecoder(res.Body).Decode(&paging)
+		res.Body.Close()
 		if err != nil {
 			return nil, err
 		}
@@ -398,9 +401,9 @@ func (r *EducationClassAssignmentCategoriesCollectionRequest) Paging(ctx context
 	}
 	var values []EducationCategory
 	for {
-		defer res.Body.Close()
 		if res.StatusCode != http.StatusOK {
 			b, _ := ioutil.ReadAll(res.Body)
+			res.Body.Close()
 			errRes := &ErrorResponse{Response: res}
 			err := jsonx.Unmarshal(b, errRes)
 			if err != nil {
@@ -413,6 +416,7 @@ func (r *EducationClassAssignmentCategoriesCollectionRequest) Paging(ctx context
 			value  []EducationCategory
 		)
 		err := jsonx.NewDecoder(res.Body).Decode(&paging)
+		res.Body.Close()
 		if err != nil {
 			return nil, err
 		}
@@ -500,9 +504,9 @@ func (r *EducationClassAssignmentsCollectionRequest) Paging(ctx context.Context,
 	}
 	var values []EducationAssignment
 	for {
-		defer res.Body.Close()
 		if res.StatusCode != http.StatusOK {
 			b, _ := ioutil.ReadAll(res.Body)
+			res.Body.Close()
 			errRes := &ErrorResponse{Response: res}
 			err := jsonx.Unmarshal(b, errRes)
 			if err != nil {
@@ -515,6 +519,7 @@ func (r *EducationClassAssignmentsCollectionRequest) Paging(ctx context.Context,
 			value  []EducationAssignment
 		)
 		err := jsonx.NewDecoder(res.Body).Decode(&paging)
+		res.Body.Close()
 		if err != nil {
 			return nil, err
 		}
@@ -609,9 +614,9 @@ func (r *EducationClassMembersCollectionRequest) Paging(ctx context.Context, met
 	}
 	var values []EducationUser
 	for {
-		defer res.Body.Close()
 		if res.StatusCode != http.StatusOK {
 			b, _ := ioutil.ReadAll(res.Body)
+			res.Body.Close()
 			errRes := &ErrorResponse{Response: res}
 			err := jsonx.Unmarshal(b, errRes)
 			if err != nil {
@@ -624,6 +629,7 @@ func (r *EducationClassMembersCollectionRequest) Paging(ctx context.Context, met
 			value  []EducationUser
 		)
 		err := jsonx.NewDecoder(res.Body).Decode(&paging)
+		res.Body.Close()
 		if err != nil {
 			return nil, err
 		}
@@ -711,9 +717,9 @@ func (r *EducationClassSchoolsCollectionRequest) Paging(ctx context.Context, met
 	}
 	var values []EducationSchool
 	for {
-		defer res.Body.Close()
 		if res.StatusCode != http.StatusOK {
 			b, _ := ioutil.ReadAll(res.Body)
+			res.Body.Close()
 			errRes := &ErrorResponse{Response: res}
 			err := jsonx.Unmarshal(b, errRes)
 			if err != nil {
@@ -726,6 +732,7 @@ func (r *EducationClassSchoolsCollectionRequest) Paging(ctx context.Context, met
 			value  []EducationSchool
 		)
 		err := jsonx.NewDecoder(res.Body).Decode(&paging)
+		res.Body.Close()
 		if err != nil {
 			return nil, err
 		}
@@ -813,9 +820,9 @@ func (r *EducationClassTeachersCollectionRequest) Paging(ctx context.Context, me
 	}
 	var values []EducationUser
 	for {
-		defer res.Body.Close()
 		if res.StatusCode != http.StatusOK {
 			b, _ := ioutil.ReadAll(res.Body)
+			res.Body.Close()
 			errRes := &ErrorResponse{Response: res}
 			err := jsonx.Unmarshal(b, errRes)
 			if err != nil {
@@ -828,6 +835,7 @@ func (r *EducationClassTeachersCollectionRequest) Paging(ctx context.Context, me
 			value  []EducationUser
 		)
 		err := jsonx.NewDecoder(res.Body).Decode(&paging)
+		res.Body.Close()
 		if err != nil {
 			return nil, err
 		}
@@ -915,9 +923,9 @@ func (r *EducationRootClassesCollectionRequest) Paging(ctx context.Context, meth
 	}
 	var values []EducationClass
 	for {
-		defer res.Body.Close()
 		if res.StatusCode != http.StatusOK {
 			b, _ := ioutil.ReadAll(res.Body)
+			res.Body.Close()
 			errRes := &ErrorResponse{Response: res}
 			err := jsonx.Unmarshal(b, errRes)
 			if err != nil {
@@ -930,6 +938,7 @@ func (r *EducationRootClassesCollectionRequest) Paging(ctx context.Context, meth
 			value  []EducationClass
 		)
 		err := jsonx.NewDecoder(res.Body).Decode(&paging)
+		res.Body.Close()
 		if err != nil {
 			return nil, err
 		}
@@ -1024,9 +1033,9 @@ func (r *EducationRootSchoolsCollectionRequest) Paging(ctx context.Context, meth
 	}
 	var values []EducationSchool
 	for {
-		defer res.Body.Close()
 		if res.StatusCode != http.StatusOK {
 			b, _ := ioutil.ReadAll(res.Body)
+			res.Body.Close()
 			errRes := &ErrorResponse{Response: res}
 			err := jsonx.Unmarshal(b, errRes)
 			if err != nil {
@@ -1039,6 +1048,7 @@ func (r *EducationRootSchoolsCollectionRequest) Paging(ctx context.Context, meth
 			value  []EducationSchool
 		)
 		err := jsonx.NewDecoder(res.Body).Decode(&paging)
+		res.Body.Close()
 		if err != nil {
 			return nil, err
 		}
@@ -1126,9 +1136,9 @@ func (r *EducationRootSynchronizationProfilesCollectionRequest) Paging(ctx conte
 	}
 	var values []EducationSynchronizationProfile
 	for {
-		defer res.Body.Close()
 		if res.StatusCode != http.StatusOK {
 			b, _ := ioutil.ReadAll(res.Body)
+			res.Body.Close()
 			errRes := &ErrorResponse{Response: res}
 			err := jsonx.Unmarshal(b, errRes)
 			if err != nil {
@@ -1141,6 +1151,7 @@ func (r *EducationRootSynchronizationProfilesCollectionRequest) Paging(ctx conte
 			value  []EducationSynchronizationProfile
 		)
 		err := jsonx.NewDecoder(res.Body).Decode(&paging)
+		res.Body.Close()
 		if err != nil {
 			return nil, err
 		}
@@ -1228,9 +1239,9 @@ func (r *EducationRootUsersCollectionRequest) Paging(ctx context.Context, method
 	}
 	var values []EducationUser
 	for {
-		defer res.Body.Close()
 		if res.StatusCode != http.StatusOK {
 			b, _ := ioutil.ReadAll(res.Body)
+			res.Body.Close()
 			errRes := &ErrorResponse{Response: res}
 			err := jsonx.Unmarshal(b, errRes)
 			if err != nil {
@@ -1243,6 +1254,7 @@ func (r *EducationRootUsersCollectionRequest) Paging(ctx context.Context, method
 			value  []EducationUser
 		)
 		err := jsonx.NewDecoder(res.Body).Decode(&paging)
+		res.Body.Close()
 		if err != nil {
 			return nil, err
 		}
@@ -1337,9 +1349,9 @@ func (r *EducationSchoolClassesCollectionRequest) Paging(ctx context.Context, me
 	}
 	var values []EducationClass
 	for {
-		defer res.Body.Close()
 		if res.StatusCode != http.StatusOK {
 			b, _ := ioutil.ReadAll(res.Body)
+			res.Body.Close()
 			errRes := &ErrorResponse{Response: res}
 			err := jsonx.Unmarshal(b, errRes)
 			if err != nil {
@@ -1352,6 +1364,7 @@ func (r *EducationSchoolClassesCollectionRequest) Paging(ctx context.Context, me
 			value  []EducationClass
 		)
 		err := jsonx.NewDecoder(res.Body).Decode(&paging)
+		res.Body.Close()
 		if err != nil {
 			return nil, err
 		}
@@ -1439,9 +1452,9 @@ func (r *EducationSchoolUsersCollectionRequest) Paging(ctx context.Context, meth
 	}
 	var values []EducationUser
 	for {
-		defer res.Body.Close()
 		if res.StatusCode != http.StatusOK {
 			b, _ := ioutil.ReadAll(res.Body)
+			res.Body.Close()
 			errRes := &ErrorResponse{Response: res}
 			err := jsonx.Unmarshal(b, errRes)
 			if err != nil {
@@ -1454,6 +1467,7 @@ func (r *EducationSchoolUsersCollectionRequest) Paging(ctx context.Context, meth
 			value  []EducationUser
 		)
 		err := jsonx.NewDecoder(res.Body).Decode(&paging)
+		res.Body.Close()
 		if err != nil {
 			return nil, err
 		}
@@ -1541,9 +1555,9 @@ func (r *EducationSubmissionOutcomesCollectionRequest) Paging(ctx context.Contex
 	}
 	var values []EducationOutcome
 	for {
-		defer res.Body.Close()
 		if res.StatusCode != http.StatusOK {
 			b, _ := ioutil.ReadAll(res.Body)
+			res.Body.Close()
 			errRes := &ErrorResponse{Response: res}
 			err := jsonx.Unmarshal(b, errRes)
 			if err != nil {
@@ -1556,6 +1570,7 @@ func (r *EducationSubmissionOutcomesCollectionRequest) Paging(ctx context.Contex
 			value  []EducationOutcome
 		)
 		err := jsonx.NewDecoder(res.Body).Decode(&paging)
+		res.Body.Close()
 		if err != nil {
 			return nil, err
 		}
@@ -1643,9 +1658,9 @@ func (r *EducationSubmissionResourcesCollectionRequest) Paging(ctx context.Conte
 	}
 	var values []EducationSubmissionResource
 	for {
-		defer res.Body.Close()
 		if res.StatusCode != http.StatusOK {
 			b, _ := ioutil.ReadAll(res.Body)
+			res.Body.Close()
 			errRes := &ErrorResponse{Response: res}
 			err := jsonx.Unmarshal(b, errRes)
 			if err != nil {
@@ -1658,6 +1673,7 @@ func (r *EducationSubmissionResourcesCollectionRequest) Paging(ctx context.Conte
 			value  []EducationSubmissionResource
 		)
 		err := jsonx.NewDecoder(res.Body).Decode(&paging)
+		res.Body.Close()
 		if err != nil {
 			return nil, err
 		}
@@ -1745,9 +1761,9 @@ func (r *EducationSubmissionSubmittedResourcesCollectionRequest) Paging(ctx cont
 	}
 	var values []EducationSubmissionResource
 	for {
-		defer res.Body.Close()
 		if res.StatusCode != http.StatusOK {
 			b, _ := ioutil.ReadAll(res.Body)
+			res.Body.Close()
 			errRes := &ErrorResponse{Response: res}
 			err := jsonx.Unmarshal(b, errRes)
 			if err != nil {
@@ -1760,6 +1776,7 @@ func (r *EducationSubmissionSubmittedResourcesCollectionRequest) Paging(ctx cont
 			value  []EducationSubmissionResource
 		)
 		err := jsonx.NewDecoder(res.Body).Decode(&paging)
+		res.Body.Close()
 		if err != nil {
 			return nil, err
 		}
@@ -1847,9 +1864,9 @@ func (r *EducationSynchronizationProfileErrorsCollectionRequest) Paging(ctx cont
 	}
 	var values []EducationSynchronizationError
 	for {
-		defer res.Body.Close()
 		if res.StatusCode != http.StatusOK {
 			b, _ := ioutil.ReadAll(res.Body)
+			res.Body.Close()
 			errRes := &ErrorResponse{Response: res}
 			err := jsonx.Unmarshal(b, errRes)
 			if err != nil {
@@ -1862,6 +1879,7 @@ func (r *EducationSynchronizationProfileErrorsCollectionRequest) Paging(ctx cont
 			value  []EducationSynchronizationError
 		)
 		err := jsonx.NewDecoder(res.Body).Decode(&paging)
+		res.Body.Close()
 		if err != nil {
 			return nil, err
 		}
@@ -1956,9 +1974,9 @@ func (r *EducationUserAssignmentsCollectionRequest) Paging(ctx context.Context,
 	}
 	var values []EducationAssignment
 	for {
-		defer res.Body.Close()
 		if res.StatusCode != http.StatusOK {
 			b, _ := ioutil.ReadAll(res.Body)
+			res.Body.Close()
 			errRes := &ErrorResponse{Response: res}
 			err := jsonx.Unmarshal(b, errRes)
 			if err != nil {
@@ -1971,6 +1989,7 @@ func (r *EducationUserAssignmentsCollectionRequest) Paging(ctx context.Context,
 			value  []EducationAssignment
 		)
 		err := jsonx.NewDecoder(res.Body).Decode(&paging)
+		res.Body.Close()
 		if err != nil {
 			return nil, err
 		}
@@ -2058,9 +2077,9 @@ func (r *EducationUserClassesCollectionRequest) Paging(ctx context.Context, meth
 	}
 	var values []EducationClass
 	for {
-		defer res.Body.Close()
 		if res.StatusCode != http.StatusOK {
 			b, _ := ioutil.ReadAll(res.Body)
+			res.Body.Close()
 			errRes := &ErrorResponse{Response: res}
 			err := jsonx.Unmarshal(b, errRes)
 			if err != nil {
@@ -2073,6 +2092,7 @@ func (r *EducationUserClassesCollectionRequest) Paging(ctx context.Context, meth
 			value  []EducationClass
 		)
 		err := jsonx.NewDecoder(res.Body).Decode(&paging)
+		res.Body.Close()
 		if err != nil {
 			return nil, err
 		}
@@ -2160,9 +2180,9 @@ func (r *EducationUserRubricsCollectionRequest) Paging(ctx context.Context, meth
 	}
 	var values []EducationRubric
 	for {
-		defer res.Body.Close()
 		if res.StatusCode != http.StatusOK {
 			b, _ := ioutil.ReadAll(res.Body)
+			res.Body.Close()
 			errRes := &ErrorResponse{Response: res}
 			err := jsonx.Unmarshal(b, errRes)
 			if err != nil {
@@ -2175,6 +2195,7 @@ func (r *EducationUserRubricsCollectionRequest) Paging(ctx context.Context, meth
 			value  []EducationRubric
 		)
 		err := jsonx.NewDecoder(res.Body).Decode(&paging)
+		res.Body.Close()
 		if err != nil {
 			return nil, err
 		}
@@ -2262,9 +2283,9 @@ func (r *EducationUserSchoolsCollectionRequest) Paging(ctx context.Context, meth
 	}
 	var values []EducationSchool
 	for {
-		defer res.Body.Close()
 		if res.StatusCode != http.StatusOK {
 			b, _ := ioutil.ReadAll(res.Body)
+			res.Body.Close()
 			errRes := &ErrorResponse{Response: res}
 			err := jsonx.Unmarshal(b, errRes)
 			if err != nil {
@@ -2277,6 +2298,7 @@ func (r *EducationUserSchoolsCollectionRequest) Paging(ctx context.Context, meth
 			value  []EducationSchool
 		)
 		err := jsonx.NewDecoder(res.Body).Decode(&paging)
+		res.Body.Close()
 		if err != nil {
 			return nil, err
 		}
@@ -2364,9 +2386,9 @@ func (r *EducationUserTaughtClassesCollectionRequest) Paging(ctx context.Context
 	}
 	var values []EducationClass
 	for {
-		defer res.Body.Close()
 		if res.StatusCode != http.StatusOK {
 			b, _ := ioutil.ReadAll(res.Body)
+			res.Body.Close()
 			errRes := &ErrorResponse{Response: res}
 			err := jsonx.Unmarshal(b, errRes)
 			if err != nil {
@@ -2379,6 +2401,7 @@ func (r *EducationUserTaughtClassesCollectionRequest) Paging(ctx context.Context
 			value  []EducationClass
 		)
 		err := jsonx.NewDecoder(res.Body).Decode(&paging)
+		res.Body.Close()
 		if err != nil {
 			return nil, err
 		}
--- a/vendor/github.com/yaegashi/msgraph.go/beta/ActionEmbedded.go
+++ b/vendor/github.com/yaegashi/msgraph.go/beta/ActionEmbedded.go
@@ -1,4 +1,4 @@
-// Code generated by msgraph-generate.go DO NOT EDIT.
+// Code generated by msgraph.go/gen DO NOT EDIT.

 package msgraph

@@ -59,9 +59,9 @@ func (r *EmbeddedSIMActivationCodePoolAssignmentsCollectionRequest) Paging(ctx c
 	}
 	var values []EmbeddedSIMActivationCodePoolAssignment
 	for {
-		defer res.Body.Close()
 		if res.StatusCode != http.StatusOK {
 			b, _ := ioutil.ReadAll(res.Body)
+			res.Body.Close()
 			errRes := &ErrorResponse{Response: res}
 			err := jsonx.Unmarshal(b, errRes)
 			if err != nil {
@@ -74,6 +74,7 @@ func (r *EmbeddedSIMActivationCodePoolAssignmentsCollectionRequest) Paging(ctx c
 			value  []EmbeddedSIMActivationCodePoolAssignment
 		)
 		err := jsonx.NewDecoder(res.Body).Decode(&paging)
+		res.Body.Close()
 		if err != nil {
 			return nil, err
 		}
@@ -161,9 +162,9 @@ func (r *EmbeddedSIMActivationCodePoolDeviceStatesCollectionRequest) Paging(ctx
 	}
 	var values []EmbeddedSIMDeviceState
 	for {
-		defer res.Body.Close()
 		if res.StatusCode != http.StatusOK {
 			b, _ := ioutil.ReadAll(res.Body)
+			res.Body.Close()
 			errRes := &ErrorResponse{Response: res}
 			err := jsonx.Unmarshal(b, errRes)
 			if err != nil {
@@ -176,6 +177,7 @@ func (r *EmbeddedSIMActivationCodePoolDeviceStatesCollectionRequest) Paging(ctx
 			value  []EmbeddedSIMDeviceState
 		)
 		err := jsonx.NewDecoder(res.Body).Decode(&paging)
+		res.Body.Close()
 		if err != nil {
 			return nil, err
 		}
--- a/vendor/github.com/yaegashi/msgraph.go/beta/ActionEmployee.go
+++ b/vendor/github.com/yaegashi/msgraph.go/beta/ActionEmployee.go
@@ -1,4 +1,4 @@
-// Code generated by msgraph-generate.go DO NOT EDIT.
+// Code generated by msgraph.go/gen DO NOT EDIT.

 package msgraph

@@ -53,9 +53,9 @@ func (r *EmployeePictureCollectionRequest) Paging(ctx context.Context, method, p
 	}
 	var values []Picture
 	for {
-		defer res.Body.Close()
 		if res.StatusCode != http.StatusOK {
 			b, _ := ioutil.ReadAll(res.Body)
+			res.Body.Close()
 			errRes := &ErrorResponse{Response: res}
 			err := jsonx.Unmarshal(b, errRes)
 			if err != nil {
@@ -68,6 +68,7 @@ func (r *EmployeePictureCollectionRequest) Paging(ctx context.Context, method, p
 			value  []Picture
 		)
 		err := jsonx.NewDecoder(res.Body).Decode(&paging)
+		res.Body.Close()
 		if err != nil {
 			return nil, err
 		}
--- a/vendor/github.com/yaegashi/msgraph.go/beta/ActionEnrollment.go
+++ b/vendor/github.com/yaegashi/msgraph.go/beta/ActionEnrollment.go
@@ -1,4 +1,4 @@
-// Code generated by msgraph-generate.go DO NOT EDIT.
+// Code generated by msgraph.go/gen DO NOT EDIT.

 package msgraph

--- a/vendor/github.com/yaegashi/msgraph.go/beta/ActionEntitlement.go
+++ b/vendor/github.com/yaegashi/msgraph.go/beta/ActionEntitlement.go
@@ -1,4 +1,4 @@
-// Code generated by msgraph-generate.go DO NOT EDIT.
+// Code generated by msgraph.go/gen DO NOT EDIT.

 package msgraph

@@ -53,9 +53,9 @@ func (r *EntitlementManagementAccessPackageAssignmentPoliciesCollectionRequest)
 	}
 	var values []AccessPackageAssignmentPolicy
 	for {
-		defer res.Body.Close()
 		if res.StatusCode != http.StatusOK {
 			b, _ := ioutil.ReadAll(res.Body)
+			res.Body.Close()
 			errRes := &ErrorResponse{Response: res}
 			err := jsonx.Unmarshal(b, errRes)
 			if err != nil {
@@ -68,6 +68,7 @@ func (r *EntitlementManagementAccessPackageAssignmentPoliciesCollectionRequest)
 			value  []AccessPackageAssignmentPolicy
 		)
 		err := jsonx.NewDecoder(res.Body).Decode(&paging)
+		res.Body.Close()
 		if err != nil {
 			return nil, err
 		}
@@ -155,9 +156,9 @@ func (r *EntitlementManagementAccessPackageAssignmentRequestsCollectionRequest)
 	}
 	var values []AccessPackageAssignmentRequestObject
 	for {
-		defer res.Body.Close()
 		if res.StatusCode != http.StatusOK {
 			b, _ := ioutil.ReadAll(res.Body)
+			res.Body.Close()
 			errRes := &ErrorResponse{Response: res}
 			err := jsonx.Unmarshal(b, errRes)
 			if err != nil {
@@ -170,6 +171,7 @@ func (r *EntitlementManagementAccessPackageAssignmentRequestsCollectionRequest)
 			value  []AccessPackageAssignmentRequestObject
 		)
 		err := jsonx.NewDecoder(res.Body).Decode(&paging)
+		res.Body.Close()
 		if err != nil {
 			return nil, err
 		}
@@ -257,9 +259,9 @@ func (r *EntitlementManagementAccessPackageAssignmentResourceRolesCollectionRequ
 	}
 	var values []AccessPackageAssignmentResourceRole
 	for {
-		defer res.Body.Close()
 		if res.StatusCode != http.StatusOK {
 			b, _ := ioutil.ReadAll(res.Body)
+			res.Body.Close()
 			errRes := &ErrorResponse{Response: res}
 			err := jsonx.Unmarshal(b, errRes)
 			if err != nil {
@@ -272,6 +274,7 @@ func (r *EntitlementManagementAccessPackageAssignmentResourceRolesCollectionRequ
 			value  []AccessPackageAssignmentResourceRole
 		)
 		err := jsonx.NewDecoder(res.Body).Decode(&paging)
+		res.Body.Close()
 		if err != nil {
 			return nil, err
 		}
@@ -359,9 +362,9 @@ func (r *EntitlementManagementAccessPackageAssignmentsCollectionRequest) Paging(
 	}
 	var values []AccessPackageAssignment
 	for {
-		defer res.Body.Close()
 		if res.StatusCode != http.StatusOK {
 			b, _ := ioutil.ReadAll(res.Body)
+			res.Body.Close()
 			errRes := &ErrorResponse{Response: res}
 			err := jsonx.Unmarshal(b, errRes)
 			if err != nil {
@@ -374,6 +377,7 @@ func (r *EntitlementManagementAccessPackageAssignmentsCollectionRequest) Paging(
 			value  []AccessPackageAssignment
 		)
 		err := jsonx.NewDecoder(res.Body).Decode(&paging)
+		res.Body.Close()
 		if err != nil {
 			return nil, err
 		}
@@ -461,9 +465,9 @@ func (r *EntitlementManagementAccessPackageCatalogsCollectionRequest) Paging(ctx
 	}
 	var values []AccessPackageCatalog
 	for {
-		defer res.Body.Close()
 		if res.StatusCode != http.StatusOK {
 			b, _ := ioutil.ReadAll(res.Body)
+			res.Body.Close()
 			errRes := &ErrorResponse{Response: res}
 			err := jsonx.Unmarshal(b, errRes)
 			if err != nil {
@@ -476,6 +480,7 @@ func (r *EntitlementManagementAccessPackageCatalogsCollectionRequest) Paging(ctx
 			value  []AccessPackageCatalog
 		)
 		err := jsonx.NewDecoder(res.Body).Decode(&paging)
+		res.Body.Close()
 		if err != nil {
 			return nil, err
 		}
@@ -563,9 +568,9 @@ func (r *EntitlementManagementAccessPackageResourceRequestsCollectionRequest) Pa
 	}
 	var values []AccessPackageResourceRequestObject
 	for {
-		defer res.Body.Close()
 		if res.StatusCode != http.StatusOK {
 			b, _ := ioutil.ReadAll(res.Body)
+			res.Body.Close()
 			errRes := &ErrorResponse{Response: res}
 			err := jsonx.Unmarshal(b, errRes)
 			if err != nil {
@@ -578,6 +583,7 @@ func (r *EntitlementManagementAccessPackageResourceRequestsCollectionRequest) Pa
 			value  []AccessPackageResourceRequestObject
 		)
 		err := jsonx.NewDecoder(res.Body).Decode(&paging)
+		res.Body.Close()
 		if err != nil {
 			return nil, err
 		}
@@ -665,9 +671,9 @@ func (r *EntitlementManagementAccessPackageResourceRoleScopesCollectionRequest)
 	}
 	var values []AccessPackageResourceRoleScope
 	for {
-		defer res.Body.Close()
 		if res.StatusCode != http.StatusOK {
 			b, _ := ioutil.ReadAll(res.Body)
+			res.Body.Close()
 			errRes := &ErrorResponse{Response: res}
 			err := jsonx.Unmarshal(b, errRes)
 			if err != nil {
@@ -680,6 +686,7 @@ func (r *EntitlementManagementAccessPackageResourceRoleScopesCollectionRequest)
 			value  []AccessPackageResourceRoleScope
 		)
 		err := jsonx.NewDecoder(res.Body).Decode(&paging)
+		res.Body.Close()
 		if err != nil {
 			return nil, err
 		}
@@ -767,9 +774,9 @@ func (r *EntitlementManagementAccessPackageResourcesCollectionRequest) Paging(ct
 	}
 	var values []AccessPackageResource
 	for {
-		defer res.Body.Close()
 		if res.StatusCode != http.StatusOK {
 			b, _ := ioutil.ReadAll(res.Body)
+			res.Body.Close()
 			errRes := &ErrorResponse{Response: res}
 			err := jsonx.Unmarshal(b, errRes)
 			if err != nil {
@@ -782,6 +789,7 @@ func (r *EntitlementManagementAccessPackageResourcesCollectionRequest) Paging(ct
 			value  []AccessPackageResource
 		)
 		err := jsonx.NewDecoder(res.Body).Decode(&paging)
+		res.Body.Close()
 		if err != nil {
 			return nil, err
 		}
@@ -869,9 +877,9 @@ func (r *EntitlementManagementAccessPackagesCollectionRequest) Paging(ctx contex
 	}
 	var values []AccessPackage
 	for {
-		defer res.Body.Close()
 		if res.StatusCode != http.StatusOK {
 			b, _ := ioutil.ReadAll(res.Body)
+			res.Body.Close()
 			errRes := &ErrorResponse{Response: res}
 			err := jsonx.Unmarshal(b, errRes)
 			if err != nil {
@@ -884,6 +892,7 @@ func (r *EntitlementManagementAccessPackagesCollectionRequest) Paging(ctx contex
 			value  []AccessPackage
 		)
 		err := jsonx.NewDecoder(res.Body).Decode(&paging)
+		res.Body.Close()
 		if err != nil {
 			return nil, err
 		}
--- a/vendor/github.com/yaegashi/msgraph.go/beta/ActionEvent.go
+++ b/vendor/github.com/yaegashi/msgraph.go/beta/ActionEvent.go
@@ -1,4 +1,4 @@
-// Code generated by msgraph-generate.go DO NOT EDIT.
+// Code generated by msgraph.go/gen DO NOT EDIT.

 package msgraph

@@ -133,9 +133,9 @@ func (r *EventAttachmentsCollectionRequest) Paging(ctx context.Context, method,
 	}
 	var values []Attachment
 	for {
-		defer res.Body.Close()
 		if res.StatusCode != http.StatusOK {
 			b, _ := ioutil.ReadAll(res.Body)
+			res.Body.Close()
 			errRes := &ErrorResponse{Response: res}
 			err := jsonx.Unmarshal(b, errRes)
 			if err != nil {
@@ -148,6 +148,7 @@ func (r *EventAttachmentsCollectionRequest) Paging(ctx context.Context, method,
 			value  []Attachment
 		)
 		err := jsonx.NewDecoder(res.Body).Decode(&paging)
+		res.Body.Close()
 		if err != nil {
 			return nil, err
 		}
@@ -242,9 +243,9 @@ func (r *EventExtensionsCollectionRequest) Paging(ctx context.Context, method, p
 	}
 	var values []Extension
 	for {
-		defer res.Body.Close()
 		if res.StatusCode != http.StatusOK {
 			b, _ := ioutil.ReadAll(res.Body)
+			res.Body.Close()
 			errRes := &ErrorResponse{Response: res}
 			err := jsonx.Unmarshal(b, errRes)
 			if err != nil {
@@ -257,6 +258,7 @@ func (r *EventExtensionsCollectionRequest) Paging(ctx context.Context, method, p
 			value  []Extension
 		)
 		err := jsonx.NewDecoder(res.Body).Decode(&paging)
+		res.Body.Close()
 		if err != nil {
 			return nil, err
 		}
@@ -344,9 +346,9 @@ func (r *EventInstancesCollectionRequest) Paging(ctx context.Context, method, pa
 	}
 	var values []Event
 	for {
-		defer res.Body.Close()
 		if res.StatusCode != http.StatusOK {
 			b, _ := ioutil.ReadAll(res.Body)
+			res.Body.Close()
 			errRes := &ErrorResponse{Response: res}
 			err := jsonx.Unmarshal(b, errRes)
 			if err != nil {
@@ -359,6 +361,7 @@ func (r *EventInstancesCollectionRequest) Paging(ctx context.Context, method, pa
 			value  []Event
 		)
 		err := jsonx.NewDecoder(res.Body).Decode(&paging)
+		res.Body.Close()
 		if err != nil {
 			return nil, err
 		}
@@ -446,9 +449,9 @@ func (r *EventMultiValueExtendedPropertiesCollectionRequest) Paging(ctx context.
 	}
 	var values []MultiValueLegacyExtendedProperty
 	for {
-		defer res.Body.Close()
 		if res.StatusCode != http.StatusOK {
 			b, _ := ioutil.ReadAll(res.Body)
+			res.Body.Close()
 			errRes := &ErrorResponse{Response: res}
 			err := jsonx.Unmarshal(b, errRes)
 			if err != nil {
@@ -461,6 +464,7 @@ func (r *EventMultiValueExtendedPropertiesCollectionRequest) Paging(ctx context.
 			value  []MultiValueLegacyExtendedProperty
 		)
 		err := jsonx.NewDecoder(res.Body).Decode(&paging)
+		res.Body.Close()
 		if err != nil {
 			return nil, err
 		}
@@ -548,9 +552,9 @@ func (r *EventSingleValueExtendedPropertiesCollectionRequest) Paging(ctx context
 	}
 	var values []SingleValueLegacyExtendedProperty
 	for {
-		defer res.Body.Close()
 		if res.StatusCode != http.StatusOK {
 			b, _ := ioutil.ReadAll(res.Body)
+			res.Body.Close()
 			errRes := &ErrorResponse{Response: res}
 			err := jsonx.Unmarshal(b, errRes)
 			if err != nil {
@@ -563,6 +567,7 @@ func (r *EventSingleValueExtendedPropertiesCollectionRequest) Paging(ctx context
 			value  []SingleValueLegacyExtendedProperty
 		)
 		err := jsonx.NewDecoder(res.Body).Decode(&paging)
+		res.Body.Close()
 		if err != nil {
 			return nil, err
 		}
--- a/vendor/github.com/yaegashi/msgraph.go/beta/ActionExact.go
+++ b/vendor/github.com/yaegashi/msgraph.go/beta/ActionExact.go
@@ -1,4 +1,4 @@
-// Code generated by msgraph-generate.go DO NOT EDIT.
+// Code generated by msgraph.go/gen DO NOT EDIT.

 package msgraph

@@ -75,9 +75,9 @@ func (r *ExactMatchDataStoreSessionsCollectionRequest) Paging(ctx context.Contex
 	}
 	var values []ExactMatchSession
 	for {
-		defer res.Body.Close()
 		if res.StatusCode != http.StatusOK {
 			b, _ := ioutil.ReadAll(res.Body)
+			res.Body.Close()
 			errRes := &ErrorResponse{Response: res}
 			err := jsonx.Unmarshal(b, errRes)
 			if err != nil {
@@ -90,6 +90,7 @@ func (r *ExactMatchDataStoreSessionsCollectionRequest) Paging(ctx context.Contex
 			value  []ExactMatchSession
 		)
 		err := jsonx.NewDecoder(res.Body).Decode(&paging)
+		res.Body.Close()
 		if err != nil {
 			return nil, err
 		}
@@ -177,9 +178,9 @@ func (r *ExactMatchLookupJobMatchingRowsCollectionRequest) Paging(ctx context.Co
 	}
 	var values []LookupResultRow
 	for {
-		defer res.Body.Close()
 		if res.StatusCode != http.StatusOK {
 			b, _ := ioutil.ReadAll(res.Body)
+			res.Body.Close()
 			errRes := &ErrorResponse{Response: res}
 			err := jsonx.Unmarshal(b, errRes)
 			if err != nil {
@@ -192,6 +193,7 @@ func (r *ExactMatchLookupJobMatchingRowsCollectionRequest) Paging(ctx context.Co
 			value  []LookupResultRow
 		)
 		err := jsonx.NewDecoder(res.Body).Decode(&paging)
+		res.Body.Close()
 		if err != nil {
 			return nil, err
 		}
--- a/vendor/github.com/yaegashi/msgraph.go/beta/ActionExternal.go
+++ b/vendor/github.com/yaegashi/msgraph.go/beta/ActionExternal.go
@@ -1,4 +1,4 @@
-// Code generated by msgraph-generate.go DO NOT EDIT.
+// Code generated by msgraph.go/gen DO NOT EDIT.

 package msgraph

@@ -53,9 +53,9 @@ func (r *ExternalConnectionsCollectionRequest) Paging(ctx context.Context, metho
 	}
 	var values []ExternalConnection
 	for {
-		defer res.Body.Close()
 		if res.StatusCode != http.StatusOK {
 			b, _ := ioutil.ReadAll(res.Body)
+			res.Body.Close()
 			errRes := &ErrorResponse{Response: res}
 			err := jsonx.Unmarshal(b, errRes)
 			if err != nil {
@@ -68,6 +68,7 @@ func (r *ExternalConnectionsCollectionRequest) Paging(ctx context.Context, metho
 			value  []ExternalConnection
 		)
 		err := jsonx.NewDecoder(res.Body).Decode(&paging)
+		res.Body.Close()
 		if err != nil {
 			return nil, err
 		}
@@ -155,9 +156,9 @@ func (r *ExternalConnectionItemsCollectionRequest) Paging(ctx context.Context, m
 	}
 	var values []ExternalItem
 	for {
-		defer res.Body.Close()
 		if res.StatusCode != http.StatusOK {
 			b, _ := ioutil.ReadAll(res.Body)
+			res.Body.Close()
 			errRes := &ErrorResponse{Response: res}
 			err := jsonx.Unmarshal(b, errRes)
 			if err != nil {
@@ -170,6 +171,7 @@ func (r *ExternalConnectionItemsCollectionRequest) Paging(ctx context.Context, m
 			value  []ExternalItem
 		)
 		err := jsonx.NewDecoder(res.Body).Decode(&paging)
+		res.Body.Close()
 		if err != nil {
 			return nil, err
 		}
@@ -257,9 +259,9 @@ func (r *ExternalConnectionOperationsCollectionRequest) Paging(ctx context.Conte
 	}
 	var values []ConnectionOperation
 	for {
-		defer res.Body.Close()
 		if res.StatusCode != http.StatusOK {
 			b, _ := ioutil.ReadAll(res.Body)
+			res.Body.Close()
 			errRes := &ErrorResponse{Response: res}
 			err := jsonx.Unmarshal(b, errRes)
 			if err != nil {
@@ -272,6 +274,7 @@ func (r *ExternalConnectionOperationsCollectionRequest) Paging(ctx context.Conte
 			value  []ConnectionOperation
 		)
 		err := jsonx.NewDecoder(res.Body).Decode(&paging)
+		res.Body.Close()
 		if err != nil {
 			return nil, err
 		}
--- a/vendor/github.com/yaegashi/msgraph.go/beta/ActionFeature.go
+++ b/vendor/github.com/yaegashi/msgraph.go/beta/ActionFeature.go
@@ -1,4 +1,4 @@
-// Code generated by msgraph-generate.go DO NOT EDIT.
+// Code generated by msgraph.go/gen DO NOT EDIT.

 package msgraph

@@ -53,9 +53,9 @@ func (r *FeatureRolloutPolicyAppliesToCollectionRequest) Paging(ctx context.Cont
 	}
 	var values []DirectoryObject
 	for {
-		defer res.Body.Close()
 		if res.StatusCode != http.StatusOK {
 			b, _ := ioutil.ReadAll(res.Body)
+			res.Body.Close()
 			errRes := &ErrorResponse{Response: res}
 			err := jsonx.Unmarshal(b, errRes)
 			if err != nil {
@@ -68,6 +68,7 @@ func (r *FeatureRolloutPolicyAppliesToCollectionRequest) Paging(ctx context.Cont
 			value  []DirectoryObject
 		)
 		err := jsonx.NewDecoder(res.Body).Decode(&paging)
+		res.Body.Close()
 		if err != nil {
 			return nil, err
 		}
--- a/vendor/github.com/yaegashi/msgraph.go/beta/ActionFinancials.go
+++ b/vendor/github.com/yaegashi/msgraph.go/beta/ActionFinancials.go
@@ -1,4 +1,4 @@
-// Code generated by msgraph-generate.go DO NOT EDIT.
+// Code generated by msgraph.go/gen DO NOT EDIT.

 package msgraph

@@ -53,9 +53,9 @@ func (r *FinancialsCompaniesCollectionRequest) Paging(ctx context.Context, metho
 	}
 	var values []Company
 	for {
-		defer res.Body.Close()
 		if res.StatusCode != http.StatusOK {
 			b, _ := ioutil.ReadAll(res.Body)
+			res.Body.Close()
 			errRes := &ErrorResponse{Response: res}
 			err := jsonx.Unmarshal(b, errRes)
 			if err != nil {
@@ -68,6 +68,7 @@ func (r *FinancialsCompaniesCollectionRequest) Paging(ctx context.Context, metho
 			value  []Company
 		)
 		err := jsonx.NewDecoder(res.Body).Decode(&paging)
+		res.Body.Close()
 		if err != nil {
 			return nil, err
 		}
--- a/vendor/github.com/yaegashi/msgraph.go/beta/ActionGeneral.go
+++ b/vendor/github.com/yaegashi/msgraph.go/beta/ActionGeneral.go
@@ -1,4 +1,4 @@
-// Code generated by msgraph-generate.go DO NOT EDIT.
+// Code generated by msgraph.go/gen DO NOT EDIT.

 package msgraph

--- a/vendor/github.com/yaegashi/msgraph.go/beta/ActionGovernance.go
+++ b/vendor/github.com/yaegashi/msgraph.go/beta/ActionGovernance.go
@@ -1,4 +1,4 @@
-// Code generated by msgraph-generate.go DO NOT EDIT.
+// Code generated by msgraph.go/gen DO NOT EDIT.

 package msgraph

@@ -82,9 +82,9 @@ func (r *GovernanceResourceRoleAssignmentRequestsCollectionRequest) Paging(ctx c
 	}
 	var values []GovernanceRoleAssignmentRequestObject
 	for {
-		defer res.Body.Close()
 		if res.StatusCode != http.StatusOK {
 			b, _ := ioutil.ReadAll(res.Body)
+			res.Body.Close()
 			errRes := &ErrorResponse{Response: res}
 			err := jsonx.Unmarshal(b, errRes)
 			if err != nil {
@@ -97,6 +97,7 @@ func (r *GovernanceResourceRoleAssignmentRequestsCollectionRequest) Paging(ctx c
 			value  []GovernanceRoleAssignmentRequestObject
 		)
 		err := jsonx.NewDecoder(res.Body).Decode(&paging)
+		res.Body.Close()
 		if err != nil {
 			return nil, err
 		}
@@ -184,9 +185,9 @@ func (r *GovernanceResourceRoleAssignmentsCollectionRequest) Paging(ctx context.
 	}
 	var values []GovernanceRoleAssignment
 	for {
-		defer res.Body.Close()
 		if res.StatusCode != http.StatusOK {
 			b, _ := ioutil.ReadAll(res.Body)
+			res.Body.Close()
 			errRes := &ErrorResponse{Response: res}
 			err := jsonx.Unmarshal(b, errRes)
 			if err != nil {
@@ -199,6 +200,7 @@ func (r *GovernanceResourceRoleAssignmentsCollectionRequest) Paging(ctx context.
 			value  []GovernanceRoleAssignment
 		)
 		err := jsonx.NewDecoder(res.Body).Decode(&paging)
+		res.Body.Close()
 		if err != nil {
 			return nil, err
 		}
@@ -286,9 +288,9 @@ func (r *GovernanceResourceRoleDefinitionsCollectionRequest) Paging(ctx context.
 	}
 	var values []GovernanceRoleDefinition
 	for {
-		defer res.Body.Close()
 		if res.StatusCode != http.StatusOK {
 			b, _ := ioutil.ReadAll(res.Body)
+			res.Body.Close()
 			errRes := &ErrorResponse{Response: res}
 			err := jsonx.Unmarshal(b, errRes)
 			if err != nil {
@@ -301,6 +303,7 @@ func (r *GovernanceResourceRoleDefinitionsCollectionRequest) Paging(ctx context.
 			value  []GovernanceRoleDefinition
 		)
 		err := jsonx.NewDecoder(res.Body).Decode(&paging)
+		res.Body.Close()
 		if err != nil {
 			return nil, err
 		}
@@ -388,9 +391,9 @@ func (r *GovernanceResourceRoleSettingsCollectionRequest) Paging(ctx context.Con
 	}
 	var values []GovernanceRoleSetting
 	for {
-		defer res.Body.Close()
 		if res.StatusCode != http.StatusOK {
 			b, _ := ioutil.ReadAll(res.Body)
+			res.Body.Close()
 			errRes := &ErrorResponse{Response: res}
 			err := jsonx.Unmarshal(b, errRes)
 			if err != nil {
@@ -403,6 +406,7 @@ func (r *GovernanceResourceRoleSettingsCollectionRequest) Paging(ctx context.Con
 			value  []GovernanceRoleSetting
 		)
 		err := jsonx.NewDecoder(res.Body).Decode(&paging)
+		res.Body.Close()
 		if err != nil {
 			return nil, err
 		}
--- a/vendor/github.com/yaegashi/msgraph.go/beta/ActionGroup.go
+++ b/vendor/github.com/yaegashi/msgraph.go/beta/ActionGroup.go
@@ -1,4 +1,4 @@
-// Code generated by msgraph-generate.go DO NOT EDIT.
+// Code generated by msgraph.go/gen DO NOT EDIT.

 package msgraph

@@ -153,9 +153,9 @@ func (r *GroupAcceptedSendersCollectionRequest) Paging(ctx context.Context, meth
 	}
 	var values []DirectoryObject
 	for {
-		defer res.Body.Close()
 		if res.StatusCode != http.StatusOK {
 			b, _ := ioutil.ReadAll(res.Body)
+			res.Body.Close()
 			errRes := &ErrorResponse{Response: res}
 			err := jsonx.Unmarshal(b, errRes)
 			if err != nil {
@@ -168,6 +168,7 @@ func (r *GroupAcceptedSendersCollectionRequest) Paging(ctx context.Context, meth
 			value  []DirectoryObject
 		)
 		err := jsonx.NewDecoder(res.Body).Decode(&paging)
+		res.Body.Close()
 		if err != nil {
 			return nil, err
 		}
@@ -255,9 +256,9 @@ func (r *GroupAppRoleAssignmentsCollectionRequest) Paging(ctx context.Context, m
 	}
 	var values []AppRoleAssignment
 	for {
-		defer res.Body.Close()
 		if res.StatusCode != http.StatusOK {
 			b, _ := ioutil.ReadAll(res.Body)
+			res.Body.Close()
 			errRes := &ErrorResponse{Response: res}
 			err := jsonx.Unmarshal(b, errRes)
 			if err != nil {
@@ -270,6 +271,7 @@ func (r *GroupAppRoleAssignmentsCollectionRequest) Paging(ctx context.Context, m
 			value  []AppRoleAssignment
 		)
 		err := jsonx.NewDecoder(res.Body).Decode(&paging)
+		res.Body.Close()
 		if err != nil {
 			return nil, err
 		}
@@ -364,9 +366,9 @@ func (r *GroupCalendarViewCollectionRequest) Paging(ctx context.Context, method,
 	}
 	var values []Event
 	for {
-		defer res.Body.Close()
 		if res.StatusCode != http.StatusOK {
 			b, _ := ioutil.ReadAll(res.Body)
+			res.Body.Close()
 			errRes := &ErrorResponse{Response: res}
 			err := jsonx.Unmarshal(b, errRes)
 			if err != nil {
@@ -379,6 +381,7 @@ func (r *GroupCalendarViewCollectionRequest) Paging(ctx context.Context, method,
 			value  []Event
 		)
 		err := jsonx.NewDecoder(res.Body).Decode(&paging)
+		res.Body.Close()
 		if err != nil {
 			return nil, err
 		}
@@ -466,9 +469,9 @@ func (r *GroupConversationsCollectionRequest) Paging(ctx context.Context, method
 	}
 	var values []Conversation
 	for {
-		defer res.Body.Close()
 		if res.StatusCode != http.StatusOK {
 			b, _ := ioutil.ReadAll(res.Body)
+			res.Body.Close()
 			errRes := &ErrorResponse{Response: res}
 			err := jsonx.Unmarshal(b, errRes)
 			if err != nil {
@@ -481,6 +484,7 @@ func (r *GroupConversationsCollectionRequest) Paging(ctx context.Context, method
 			value  []Conversation
 		)
 		err := jsonx.NewDecoder(res.Body).Decode(&paging)
+		res.Body.Close()
 		if err != nil {
 			return nil, err
 		}
@@ -582,9 +586,9 @@ func (r *GroupDrivesCollectionRequest) Paging(ctx context.Context, method, path
 	}
 	var values []Drive
 	for {
-		defer res.Body.Close()
 		if res.StatusCode != http.StatusOK {
 			b, _ := ioutil.ReadAll(res.Body)
+			res.Body.Close()
 			errRes := &ErrorResponse{Response: res}
 			err := jsonx.Unmarshal(b, errRes)
 			if err != nil {
@@ -597,6 +601,7 @@ func (r *GroupDrivesCollectionRequest) Paging(ctx context.Context, method, path
 			value  []Drive
 		)
 		err := jsonx.NewDecoder(res.Body).Decode(&paging)
+		res.Body.Close()
 		if err != nil {
 			return nil, err
 		}
@@ -684,9 +689,9 @@ func (r *GroupEndpointsCollectionRequest) Paging(ctx context.Context, method, pa
 	}
 	var values []Endpoint
 	for {
-		defer res.Body.Close()
 		if res.StatusCode != http.StatusOK {
 			b, _ := ioutil.ReadAll(res.Body)
+			res.Body.Close()
 			errRes := &ErrorResponse{Response: res}
 			err := jsonx.Unmarshal(b, errRes)
 			if err != nil {
@@ -699,6 +704,7 @@ func (r *GroupEndpointsCollectionRequest) Paging(ctx context.Context, method, pa
 			value  []Endpoint
 		)
 		err := jsonx.NewDecoder(res.Body).Decode(&paging)
+		res.Body.Close()
 		if err != nil {
 			return nil, err
 		}
@@ -786,9 +792,9 @@ func (r *GroupEventsCollectionRequest) Paging(ctx context.Context, method, path
 	}
 	var values []Event
 	for {
-		defer res.Body.Close()
 		if res.StatusCode != http.StatusOK {
 			b, _ := ioutil.ReadAll(res.Body)
+			res.Body.Close()
 			errRes := &ErrorResponse{Response: res}
 			err := jsonx.Unmarshal(b, errRes)
 			if err != nil {
@@ -801,6 +807,7 @@ func (r *GroupEventsCollectionRequest) Paging(ctx context.Context, method, path
 			value  []Event
 		)
 		err := jsonx.NewDecoder(res.Body).Decode(&paging)
+		res.Body.Close()
 		if err != nil {
 			return nil, err
 		}
@@ -888,9 +895,9 @@ func (r *GroupExtensionsCollectionRequest) Paging(ctx context.Context, method, p
 	}
 	var values []Extension
 	for {
-		defer res.Body.Close()
 		if res.StatusCode != http.StatusOK {
 			b, _ := ioutil.ReadAll(res.Body)
+			res.Body.Close()
 			errRes := &ErrorResponse{Response: res}
 			err := jsonx.Unmarshal(b, errRes)
 			if err != nil {
@@ -903,6 +910,7 @@ func (r *GroupExtensionsCollectionRequest) Paging(ctx context.Context, method, p
 			value  []Extension
 		)
 		err := jsonx.NewDecoder(res.Body).Decode(&paging)
+		res.Body.Close()
 		if err != nil {
 			return nil, err
 		}
@@ -990,9 +998,9 @@ func (r *GroupGroupLifecyclePoliciesCollectionRequest) Paging(ctx context.Contex
 	}
 	var values []GroupLifecyclePolicy
 	for {
-		defer res.Body.Close()
 		if res.StatusCode != http.StatusOK {
 			b, _ := ioutil.ReadAll(res.Body)
+			res.Body.Close()
 			errRes := &ErrorResponse{Response: res}
 			err := jsonx.Unmarshal(b, errRes)
 			if err != nil {
@@ -1005,6 +1013,7 @@ func (r *GroupGroupLifecyclePoliciesCollectionRequest) Paging(ctx context.Contex
 			value  []GroupLifecyclePolicy
 		)
 		err := jsonx.NewDecoder(res.Body).Decode(&paging)
+		res.Body.Close()
 		if err != nil {
 			return nil, err
 		}
@@ -1092,9 +1101,9 @@ func (r *GroupMemberOfCollectionRequest) Paging(ctx context.Context, method, pat
 	}
 	var values []DirectoryObject
 	for {
-		defer res.Body.Close()
 		if res.StatusCode != http.StatusOK {
 			b, _ := ioutil.ReadAll(res.Body)
+			res.Body.Close()
 			errRes := &ErrorResponse{Response: res}
 			err := jsonx.Unmarshal(b, errRes)
 			if err != nil {
@@ -1107,6 +1116,7 @@ func (r *GroupMemberOfCollectionRequest) Paging(ctx context.Context, method, pat
 			value  []DirectoryObject
 		)
 		err := jsonx.NewDecoder(res.Body).Decode(&paging)
+		res.Body.Close()
 		if err != nil {
 			return nil, err
 		}
@@ -1194,9 +1204,9 @@ func (r *GroupMembersCollectionRequest) Paging(ctx context.Context, method, path
 	}
 	var values []DirectoryObject
 	for {
-		defer res.Body.Close()
 		if res.StatusCode != http.StatusOK {
 			b, _ := ioutil.ReadAll(res.Body)
+			res.Body.Close()
 			errRes := &ErrorResponse{Response: res}
 			err := jsonx.Unmarshal(b, errRes)
 			if err != nil {
@@ -1209,6 +1219,7 @@ func (r *GroupMembersCollectionRequest) Paging(ctx context.Context, method, path
 			value  []DirectoryObject
 		)
 		err := jsonx.NewDecoder(res.Body).Decode(&paging)
+		res.Body.Close()
 		if err != nil {
 			return nil, err
 		}
@@ -1296,9 +1307,9 @@ func (r *GroupMembersWithLicenseErrorsCollectionRequest) Paging(ctx context.Cont
 	}
 	var values []DirectoryObject
 	for {
-		defer res.Body.Close()
 		if res.StatusCode != http.StatusOK {
 			b, _ := ioutil.ReadAll(res.Body)
+			res.Body.Close()
 			errRes := &ErrorResponse{Response: res}
 			err := jsonx.Unmarshal(b, errRes)
 			if err != nil {
@@ -1311,6 +1322,7 @@ func (r *GroupMembersWithLicenseErrorsCollectionRequest) Paging(ctx context.Cont
 			value  []DirectoryObject
 		)
 		err := jsonx.NewDecoder(res.Body).Decode(&paging)
+		res.Body.Close()
 		if err != nil {
 			return nil, err
 		}
@@ -1405,9 +1417,9 @@ func (r *GroupOwnersCollectionRequest) Paging(ctx context.Context, method, path
 	}
 	var values []DirectoryObject
 	for {
-		defer res.Body.Close()
 		if res.StatusCode != http.StatusOK {
 			b, _ := ioutil.ReadAll(res.Body)
+			res.Body.Close()
 			errRes := &ErrorResponse{Response: res}
 			err := jsonx.Unmarshal(b, errRes)
 			if err != nil {
@@ -1420,6 +1432,7 @@ func (r *GroupOwnersCollectionRequest) Paging(ctx context.Context, method, path
 			value  []DirectoryObject
 		)
 		err := jsonx.NewDecoder(res.Body).Decode(&paging)
+		res.Body.Close()
 		if err != nil {
 			return nil, err
 		}
@@ -1507,9 +1520,9 @@ func (r *GroupPermissionGrantsCollectionRequest) Paging(ctx context.Context, met
 	}
 	var values []ResourceSpecificPermissionGrant
 	for {
-		defer res.Body.Close()
 		if res.StatusCode != http.StatusOK {
 			b, _ := ioutil.ReadAll(res.Body)
+			res.Body.Close()
 			errRes := &ErrorResponse{Response: res}
 			err := jsonx.Unmarshal(b, errRes)
 			if err != nil {
@@ -1522,6 +1535,7 @@ func (r *GroupPermissionGrantsCollectionRequest) Paging(ctx context.Context, met
 			value  []ResourceSpecificPermissionGrant
 		)
 		err := jsonx.NewDecoder(res.Body).Decode(&paging)
+		res.Body.Close()
 		if err != nil {
 			return nil, err
 		}
@@ -1616,9 +1630,9 @@ func (r *GroupPhotosCollectionRequest) Paging(ctx context.Context, method, path
 	}
 	var values []ProfilePhoto
 	for {
-		defer res.Body.Close()
 		if res.StatusCode != http.StatusOK {
 			b, _ := ioutil.ReadAll(res.Body)
+			res.Body.Close()
 			errRes := &ErrorResponse{Response: res}
 			err := jsonx.Unmarshal(b, errRes)
 			if err != nil {
@@ -1631,6 +1645,7 @@ func (r *GroupPhotosCollectionRequest) Paging(ctx context.Context, method, path
 			value  []ProfilePhoto
 		)
 		err := jsonx.NewDecoder(res.Body).Decode(&paging)
+		res.Body.Close()
 		if err != nil {
 			return nil, err
 		}
@@ -1725,9 +1740,9 @@ func (r *GroupRejectedSendersCollectionRequest) Paging(ctx context.Context, meth
 	}
 	var values []DirectoryObject
 	for {
-		defer res.Body.Close()
 		if res.StatusCode != http.StatusOK {
 			b, _ := ioutil.ReadAll(res.Body)
+			res.Body.Close()
 			errRes := &ErrorResponse{Response: res}
 			err := jsonx.Unmarshal(b, errRes)
 			if err != nil {
@@ -1740,6 +1755,7 @@ func (r *GroupRejectedSendersCollectionRequest) Paging(ctx context.Context, meth
 			value  []DirectoryObject
 		)
 		err := jsonx.NewDecoder(res.Body).Decode(&paging)
+		res.Body.Close()
 		if err != nil {
 			return nil, err
 		}
@@ -1827,9 +1843,9 @@ func (r *GroupSettingsCollectionRequest) Paging(ctx context.Context, method, pat
 	}
 	var values []DirectorySetting
 	for {
-		defer res.Body.Close()
 		if res.StatusCode != http.StatusOK {
 			b, _ := ioutil.ReadAll(res.Body)
+			res.Body.Close()
 			errRes := &ErrorResponse{Response: res}
 			err := jsonx.Unmarshal(b, errRes)
 			if err != nil {
@@ -1842,6 +1858,7 @@ func (r *GroupSettingsCollectionRequest) Paging(ctx context.Context, method, pat
 			value  []DirectorySetting
 		)
 		err := jsonx.NewDecoder(res.Body).Decode(&paging)
+		res.Body.Close()
 		if err != nil {
 			return nil, err
 		}
@@ -1929,9 +1946,9 @@ func (r *GroupSitesCollectionRequest) Paging(ctx context.Context, method, path s
 	}
 	var values []Site
 	for {
-		defer res.Body.Close()
 		if res.StatusCode != http.StatusOK {
 			b, _ := ioutil.ReadAll(res.Body)
+			res.Body.Close()
 			errRes := &ErrorResponse{Response: res}
 			err := jsonx.Unmarshal(b, errRes)
 			if err != nil {
@@ -1944,6 +1961,7 @@ func (r *GroupSitesCollectionRequest) Paging(ctx context.Context, method, path s
 			value  []Site
 		)
 		err := jsonx.NewDecoder(res.Body).Decode(&paging)
+		res.Body.Close()
 		if err != nil {
 			return nil, err
 		}
@@ -2038,9 +2056,9 @@ func (r *GroupThreadsCollectionRequest) Paging(ctx context.Context, method, path
 	}
 	var values []ConversationThread
 	for {
-		defer res.Body.Close()
 		if res.StatusCode != http.StatusOK {
 			b, _ := ioutil.ReadAll(res.Body)
+			res.Body.Close()
 			errRes := &ErrorResponse{Response: res}
 			err := jsonx.Unmarshal(b, errRes)
 			if err != nil {
@@ -2053,6 +2071,7 @@ func (r *GroupThreadsCollectionRequest) Paging(ctx context.Context, method, path
 			value  []ConversationThread
 		)
 		err := jsonx.NewDecoder(res.Body).Decode(&paging)
+		res.Body.Close()
 		if err != nil {
 			return nil, err
 		}
@@ -2140,9 +2159,9 @@ func (r *GroupTransitiveMemberOfCollectionRequest) Paging(ctx context.Context, m
 	}
 	var values []DirectoryObject
 	for {
-		defer res.Body.Close()
 		if res.StatusCode != http.StatusOK {
 			b, _ := ioutil.ReadAll(res.Body)
+			res.Body.Close()
 			errRes := &ErrorResponse{Response: res}
 			err := jsonx.Unmarshal(b, errRes)
 			if err != nil {
@@ -2155,6 +2174,7 @@ func (r *GroupTransitiveMemberOfCollectionRequest) Paging(ctx context.Context, m
 			value  []DirectoryObject
 		)
 		err := jsonx.NewDecoder(res.Body).Decode(&paging)
+		res.Body.Close()
 		if err != nil {
 			return nil, err
 		}
@@ -2242,9 +2262,9 @@ func (r *GroupTransitiveMembersCollectionRequest) Paging(ctx context.Context, me
 	}
 	var values []DirectoryObject
 	for {
-		defer res.Body.Close()
 		if res.StatusCode != http.StatusOK {
 			b, _ := ioutil.ReadAll(res.Body)
+			res.Body.Close()
 			errRes := &ErrorResponse{Response: res}
 			err := jsonx.Unmarshal(b, errRes)
 			if err != nil {
@@ -2257,6 +2277,7 @@ func (r *GroupTransitiveMembersCollectionRequest) Paging(ctx context.Context, me
 			value  []DirectoryObject
 		)
 		err := jsonx.NewDecoder(res.Body).Decode(&paging)
+		res.Body.Close()
 		if err != nil {
 			return nil, err
 		}
@@ -2344,9 +2365,9 @@ func (r *GroupPolicyConfigurationAssignmentsCollectionRequest) Paging(ctx contex
 	}
 	var values []GroupPolicyConfigurationAssignment
 	for {
-		defer res.Body.Close()
 		if res.StatusCode != http.StatusOK {
 			b, _ := ioutil.ReadAll(res.Body)
+			res.Body.Close()
 			errRes := &ErrorResponse{Response: res}
 			err := jsonx.Unmarshal(b, errRes)
 			if err != nil {
@@ -2359,6 +2380,7 @@ func (r *GroupPolicyConfigurationAssignmentsCollectionRequest) Paging(ctx contex
 			value  []GroupPolicyConfigurationAssignment
 		)
 		err := jsonx.NewDecoder(res.Body).Decode(&paging)
+		res.Body.Close()
 		if err != nil {
 			return nil, err
 		}
@@ -2446,9 +2468,9 @@ func (r *GroupPolicyConfigurationDefinitionValuesCollectionRequest) Paging(ctx c
 	}
 	var values []GroupPolicyDefinitionValue
 	for {
-		defer res.Body.Close()
 		if res.StatusCode != http.StatusOK {
 			b, _ := ioutil.ReadAll(res.Body)
+			res.Body.Close()
 			errRes := &ErrorResponse{Response: res}
 			err := jsonx.Unmarshal(b, errRes)
 			if err != nil {
@@ -2461,6 +2483,7 @@ func (r *GroupPolicyConfigurationDefinitionValuesCollectionRequest) Paging(ctx c
 			value  []GroupPolicyDefinitionValue
 		)
 		err := jsonx.NewDecoder(res.Body).Decode(&paging)
+		res.Body.Close()
 		if err != nil {
 			return nil, err
 		}
@@ -2555,9 +2578,9 @@ func (r *GroupPolicyDefinitionPresentationsCollectionRequest) Paging(ctx context
 	}
 	var values []GroupPolicyPresentation
 	for {
-		defer res.Body.Close()
 		if res.StatusCode != http.StatusOK {
 			b, _ := ioutil.ReadAll(res.Body)
+			res.Body.Close()
 			errRes := &ErrorResponse{Response: res}
 			err := jsonx.Unmarshal(b, errRes)
 			if err != nil {
@@ -2570,6 +2593,7 @@ func (r *GroupPolicyDefinitionPresentationsCollectionRequest) Paging(ctx context
 			value  []GroupPolicyPresentation
 		)
 		err := jsonx.NewDecoder(res.Body).Decode(&paging)
+		res.Body.Close()
 		if err != nil {
 			return nil, err
 		}
@@ -2657,9 +2681,9 @@ func (r *GroupPolicyDefinitionFileDefinitionsCollectionRequest) Paging(ctx conte
 	}
 	var values []GroupPolicyDefinition
 	for {
-		defer res.Body.Close()
 		if res.StatusCode != http.StatusOK {
 			b, _ := ioutil.ReadAll(res.Body)
+			res.Body.Close()
 			errRes := &ErrorResponse{Response: res}
 			err := jsonx.Unmarshal(b, errRes)
 			if err != nil {
@@ -2672,6 +2696,7 @@ func (r *GroupPolicyDefinitionFileDefinitionsCollectionRequest) Paging(ctx conte
 			value  []GroupPolicyDefinition
 		)
 		err := jsonx.NewDecoder(res.Body).Decode(&paging)
+		res.Body.Close()
 		if err != nil {
 			return nil, err
 		}
@@ -2766,9 +2791,9 @@ func (r *GroupPolicyDefinitionValuePresentationValuesCollectionRequest) Paging(c
 	}
 	var values []GroupPolicyPresentationValue
 	for {
-		defer res.Body.Close()
 		if res.StatusCode != http.StatusOK {
 			b, _ := ioutil.ReadAll(res.Body)
+			res.Body.Close()
 			errRes := &ErrorResponse{Response: res}
 			err := jsonx.Unmarshal(b, errRes)
 			if err != nil {
@@ -2781,6 +2806,7 @@ func (r *GroupPolicyDefinitionValuePresentationValuesCollectionRequest) Paging(c
 			value  []GroupPolicyPresentationValue
 		)
 		err := jsonx.NewDecoder(res.Body).Decode(&paging)
+		res.Body.Close()
 		if err != nil {
 			return nil, err
 		}
@@ -2868,9 +2894,9 @@ func (r *GroupPolicyMigrationReportGroupPolicySettingMappingsCollectionRequest)
 	}
 	var values []GroupPolicySettingMapping
 	for {
-		defer res.Body.Close()
 		if res.StatusCode != http.StatusOK {
 			b, _ := ioutil.ReadAll(res.Body)
+			res.Body.Close()
 			errRes := &ErrorResponse{Response: res}
 			err := jsonx.Unmarshal(b, errRes)
 			if err != nil {
@@ -2883,6 +2909,7 @@ func (r *GroupPolicyMigrationReportGroupPolicySettingMappingsCollectionRequest)
 			value  []GroupPolicySettingMapping
 		)
 		err := jsonx.NewDecoder(res.Body).Decode(&paging)
+		res.Body.Close()
 		if err != nil {
 			return nil, err
 		}
--- a/vendor/github.com/yaegashi/msgraph.go/beta/ActionIOS.go
+++ b/vendor/github.com/yaegashi/msgraph.go/beta/ActionIOS.go
@@ -1,4 +1,4 @@
-// Code generated by msgraph-generate.go DO NOT EDIT.
+// Code generated by msgraph.go/gen DO NOT EDIT.

 package msgraph

@@ -158,9 +158,9 @@ func (r *IOSEnterpriseWiFiConfigurationRootCertificatesForServerValidationCollec
 	}
 	var values []IOSTrustedRootCertificate
 	for {
-		defer res.Body.Close()
 		if res.StatusCode != http.StatusOK {
 			b, _ := ioutil.ReadAll(res.Body)
+			res.Body.Close()
 			errRes := &ErrorResponse{Response: res}
 			err := jsonx.Unmarshal(b, errRes)
 			if err != nil {
@@ -173,6 +173,7 @@ func (r *IOSEnterpriseWiFiConfigurationRootCertificatesForServerValidationCollec
 			value  []IOSTrustedRootCertificate
 		)
 		err := jsonx.NewDecoder(res.Body).Decode(&paging)
+		res.Body.Close()
 		if err != nil {
 			return nil, err
 		}
@@ -260,9 +261,9 @@ func (r *IOSImportedPFXCertificateProfileManagedDeviceCertificateStatesCollectio
 	}
 	var values []ManagedDeviceCertificateState
 	for {
-		defer res.Body.Close()
 		if res.StatusCode != http.StatusOK {
 			b, _ := ioutil.ReadAll(res.Body)
+			res.Body.Close()
 			errRes := &ErrorResponse{Response: res}
 			err := jsonx.Unmarshal(b, errRes)
 			if err != nil {
@@ -275,6 +276,7 @@ func (r *IOSImportedPFXCertificateProfileManagedDeviceCertificateStatesCollectio
 			value  []ManagedDeviceCertificateState
 		)
 		err := jsonx.NewDecoder(res.Body).Decode(&paging)
+		res.Body.Close()
 		if err != nil {
 			return nil, err
 		}
@@ -362,9 +364,9 @@ func (r *IOSLobAppProvisioningConfigurationAssignmentsCollectionRequest) Paging(
 	}
 	var values []IOSLobAppProvisioningConfigurationAssignment
 	for {
-		defer res.Body.Close()
 		if res.StatusCode != http.StatusOK {
 			b, _ := ioutil.ReadAll(res.Body)
+			res.Body.Close()
 			errRes := &ErrorResponse{Response: res}
 			err := jsonx.Unmarshal(b, errRes)
 			if err != nil {
@@ -377,6 +379,7 @@ func (r *IOSLobAppProvisioningConfigurationAssignmentsCollectionRequest) Paging(
 			value  []IOSLobAppProvisioningConfigurationAssignment
 		)
 		err := jsonx.NewDecoder(res.Body).Decode(&paging)
+		res.Body.Close()
 		if err != nil {
 			return nil, err
 		}
@@ -464,9 +467,9 @@ func (r *IOSLobAppProvisioningConfigurationDeviceStatusesCollectionRequest) Pagi
 	}
 	var values []ManagedDeviceMobileAppConfigurationDeviceStatus
 	for {
-		defer res.Body.Close()
 		if res.StatusCode != http.StatusOK {
 			b, _ := ioutil.ReadAll(res.Body)
+			res.Body.Close()
 			errRes := &ErrorResponse{Response: res}
 			err := jsonx.Unmarshal(b, errRes)
 			if err != nil {
@@ -479,6 +482,7 @@ func (r *IOSLobAppProvisioningConfigurationDeviceStatusesCollectionRequest) Pagi
 			value  []ManagedDeviceMobileAppConfigurationDeviceStatus
 		)
 		err := jsonx.NewDecoder(res.Body).Decode(&paging)
+		res.Body.Close()
 		if err != nil {
 			return nil, err
 		}
@@ -566,9 +570,9 @@ func (r *IOSLobAppProvisioningConfigurationGroupAssignmentsCollectionRequest) Pa
 	}
 	var values []MobileAppProvisioningConfigGroupAssignment
 	for {
-		defer res.Body.Close()
 		if res.StatusCode != http.StatusOK {
 			b, _ := ioutil.ReadAll(res.Body)
+			res.Body.Close()
 			errRes := &ErrorResponse{Response: res}
 			err := jsonx.Unmarshal(b, errRes)
 			if err != nil {
@@ -581,6 +585,7 @@ func (r *IOSLobAppProvisioningConfigurationGroupAssignmentsCollectionRequest) Pa
 			value  []MobileAppProvisioningConfigGroupAssignment
 		)
 		err := jsonx.NewDecoder(res.Body).Decode(&paging)
+		res.Body.Close()
 		if err != nil {
 			return nil, err
 		}
@@ -668,9 +673,9 @@ func (r *IOSLobAppProvisioningConfigurationUserStatusesCollectionRequest) Paging
 	}
 	var values []ManagedDeviceMobileAppConfigurationUserStatus
 	for {
-		defer res.Body.Close()
 		if res.StatusCode != http.StatusOK {
 			b, _ := ioutil.ReadAll(res.Body)
+			res.Body.Close()
 			errRes := &ErrorResponse{Response: res}
 			err := jsonx.Unmarshal(b, errRes)
 			if err != nil {
@@ -683,6 +688,7 @@ func (r *IOSLobAppProvisioningConfigurationUserStatusesCollectionRequest) Paging
 			value  []ManagedDeviceMobileAppConfigurationUserStatus
 		)
 		err := jsonx.NewDecoder(res.Body).Decode(&paging)
+		res.Body.Close()
 		if err != nil {
 			return nil, err
 		}
@@ -770,9 +776,9 @@ func (r *IOSManagedAppProtectionAppsCollectionRequest) Paging(ctx context.Contex
 	}
 	var values []ManagedMobileApp
 	for {
-		defer res.Body.Close()
 		if res.StatusCode != http.StatusOK {
 			b, _ := ioutil.ReadAll(res.Body)
+			res.Body.Close()
 			errRes := &ErrorResponse{Response: res}
 			err := jsonx.Unmarshal(b, errRes)
 			if err != nil {
@@ -785,6 +791,7 @@ func (r *IOSManagedAppProtectionAppsCollectionRequest) Paging(ctx context.Contex
 			value  []ManagedMobileApp
 		)
 		err := jsonx.NewDecoder(res.Body).Decode(&paging)
+		res.Body.Close()
 		if err != nil {
 			return nil, err
 		}
@@ -879,9 +886,9 @@ func (r *IOSPkcsCertificateProfileManagedDeviceCertificateStatesCollectionReques
 	}
 	var values []ManagedDeviceCertificateState
 	for {
-		defer res.Body.Close()
 		if res.StatusCode != http.StatusOK {
 			b, _ := ioutil.ReadAll(res.Body)
+			res.Body.Close()
 			errRes := &ErrorResponse{Response: res}
 			err := jsonx.Unmarshal(b, errRes)
 			if err != nil {
@@ -894,6 +901,7 @@ func (r *IOSPkcsCertificateProfileManagedDeviceCertificateStatesCollectionReques
 			value  []ManagedDeviceCertificateState
 		)
 		err := jsonx.NewDecoder(res.Body).Decode(&paging)
+		res.Body.Close()
 		if err != nil {
 			return nil, err
 		}
@@ -981,9 +989,9 @@ func (r *IOSScepCertificateProfileManagedDeviceCertificateStatesCollectionReques
 	}
 	var values []ManagedDeviceCertificateState
 	for {
-		defer res.Body.Close()
 		if res.StatusCode != http.StatusOK {
 			b, _ := ioutil.ReadAll(res.Body)
+			res.Body.Close()
 			errRes := &ErrorResponse{Response: res}
 			err := jsonx.Unmarshal(b, errRes)
 			if err != nil {
@@ -996,6 +1004,7 @@ func (r *IOSScepCertificateProfileManagedDeviceCertificateStatesCollectionReques
 			value  []ManagedDeviceCertificateState
 		)
 		err := jsonx.NewDecoder(res.Body).Decode(&paging)
+		res.Body.Close()
 		if err != nil {
 			return nil, err
 		}
@@ -1104,9 +1113,9 @@ func (r *IOSVPPAppAssignedLicensesCollectionRequest) Paging(ctx context.Context,
 	}
 	var values []IOSVPPAppAssignedLicense
 	for {
-		defer res.Body.Close()
 		if res.StatusCode != http.StatusOK {
 			b, _ := ioutil.ReadAll(res.Body)
+			res.Body.Close()
 			errRes := &ErrorResponse{Response: res}
 			err := jsonx.Unmarshal(b, errRes)
 			if err != nil {
@@ -1119,6 +1128,7 @@ func (r *IOSVPPAppAssignedLicensesCollectionRequest) Paging(ctx context.Context,
 			value  []IOSVPPAppAssignedLicense
 		)
 		err := jsonx.NewDecoder(res.Body).Decode(&paging)
+		res.Body.Close()
 		if err != nil {
 			return nil, err
 		}
--- a/vendor/github.com/yaegashi/msgraph.go/beta/ActionIdentity.go
+++ b/vendor/github.com/yaegashi/msgraph.go/beta/ActionIdentity.go
@@ -1,4 +1,4 @@
-// Code generated by msgraph-generate.go DO NOT EDIT.
+// Code generated by msgraph.go/gen DO NOT EDIT.

 package msgraph

@@ -53,9 +53,9 @@ func (r *IdentityContainerUserFlowsCollectionRequest) Paging(ctx context.Context
 	}
 	var values []IdentityUserFlow
 	for {
-		defer res.Body.Close()
 		if res.StatusCode != http.StatusOK {
 			b, _ := ioutil.ReadAll(res.Body)
+			res.Body.Close()
 			errRes := &ErrorResponse{Response: res}
 			err := jsonx.Unmarshal(b, errRes)
 			if err != nil {
@@ -68,6 +68,7 @@ func (r *IdentityContainerUserFlowsCollectionRequest) Paging(ctx context.Context
 			value  []IdentityUserFlow
 		)
 		err := jsonx.NewDecoder(res.Body).Decode(&paging)
+		res.Body.Close()
 		if err != nil {
 			return nil, err
 		}
--- a/vendor/github.com/yaegashi/msgraph.go/beta/ActionImported.go
+++ b/vendor/github.com/yaegashi/msgraph.go/beta/ActionImported.go
@@ -1,4 +1,4 @@
-// Code generated by msgraph-generate.go DO NOT EDIT.
+// Code generated by msgraph.go/gen DO NOT EDIT.

 package msgraph

@@ -81,9 +81,9 @@ func (r *ImportedWindowsAutopilotDeviceIdentityUploadDeviceIdentitiesCollectionR
 	}
 	var values []ImportedWindowsAutopilotDeviceIdentity
 	for {
-		defer res.Body.Close()
 		if res.StatusCode != http.StatusOK {
 			b, _ := ioutil.ReadAll(res.Body)
+			res.Body.Close()
 			errRes := &ErrorResponse{Response: res}
 			err := jsonx.Unmarshal(b, errRes)
 			if err != nil {
@@ -96,6 +96,7 @@ func (r *ImportedWindowsAutopilotDeviceIdentityUploadDeviceIdentitiesCollectionR
 			value  []ImportedWindowsAutopilotDeviceIdentity
 		)
 		err := jsonx.NewDecoder(res.Body).Decode(&paging)
+		res.Body.Close()
 		if err != nil {
 			return nil, err
 		}
--- a/vendor/github.com/yaegashi/msgraph.go/beta/ActionInference.go
+++ b/vendor/github.com/yaegashi/msgraph.go/beta/ActionInference.go
@@ -1,4 +1,4 @@
-// Code generated by msgraph-generate.go DO NOT EDIT.
+// Code generated by msgraph.go/gen DO NOT EDIT.

 package msgraph

@@ -53,9 +53,9 @@ func (r *InferenceClassificationOverridesCollectionRequest) Paging(ctx context.C
 	}
 	var values []InferenceClassificationOverride
 	for {
-		defer res.Body.Close()
 		if res.StatusCode != http.StatusOK {
 			b, _ := ioutil.ReadAll(res.Body)
+			res.Body.Close()
 			errRes := &ErrorResponse{Response: res}
 			err := jsonx.Unmarshal(b, errRes)
 			if err != nil {
@@ -68,6 +68,7 @@ func (r *InferenceClassificationOverridesCollectionRequest) Paging(ctx context.C
 			value  []InferenceClassificationOverride
 		)
 		err := jsonx.NewDecoder(res.Body).Decode(&paging)
+		res.Body.Close()
 		if err != nil {
 			return nil, err
 		}
--- a/vendor/github.com/yaegashi/msgraph.go/beta/ActionInformation.go
+++ b/vendor/github.com/yaegashi/msgraph.go/beta/ActionInformation.go
@@ -1,4 +1,4 @@
-// Code generated by msgraph-generate.go DO NOT EDIT.
+// Code generated by msgraph.go/gen DO NOT EDIT.

 package msgraph

@@ -93,9 +93,9 @@ func (r *InformationProtectionDataLossPreventionPoliciesCollectionRequest) Pagin
 	}
 	var values []DataLossPreventionPolicy
 	for {
-		defer res.Body.Close()
 		if res.StatusCode != http.StatusOK {
 			b, _ := ioutil.ReadAll(res.Body)
+			res.Body.Close()
 			errRes := &ErrorResponse{Response: res}
 			err := jsonx.Unmarshal(b, errRes)
 			if err != nil {
@@ -108,6 +108,7 @@ func (r *InformationProtectionDataLossPreventionPoliciesCollectionRequest) Pagin
 			value  []DataLossPreventionPolicy
 		)
 		err := jsonx.NewDecoder(res.Body).Decode(&paging)
+		res.Body.Close()
 		if err != nil {
 			return nil, err
 		}
@@ -202,9 +203,9 @@ func (r *InformationProtectionSensitivityLabelsCollectionRequest) Paging(ctx con
 	}
 	var values []SensitivityLabel
 	for {
-		defer res.Body.Close()
 		if res.StatusCode != http.StatusOK {
 			b, _ := ioutil.ReadAll(res.Body)
+			res.Body.Close()
 			errRes := &ErrorResponse{Response: res}
 			err := jsonx.Unmarshal(b, errRes)
 			if err != nil {
@@ -217,6 +218,7 @@ func (r *InformationProtectionSensitivityLabelsCollectionRequest) Paging(ctx con
 			value  []SensitivityLabel
 		)
 		err := jsonx.NewDecoder(res.Body).Decode(&paging)
+		res.Body.Close()
 		if err != nil {
 			return nil, err
 		}
@@ -311,9 +313,9 @@ func (r *InformationProtectionThreatAssessmentRequestsCollectionRequest) Paging(
 	}
 	var values []ThreatAssessmentRequestObject
 	for {
-		defer res.Body.Close()
 		if res.StatusCode != http.StatusOK {
 			b, _ := ioutil.ReadAll(res.Body)
+			res.Body.Close()
 			errRes := &ErrorResponse{Response: res}
 			err := jsonx.Unmarshal(b, errRes)
 			if err != nil {
@@ -326,6 +328,7 @@ func (r *InformationProtectionThreatAssessmentRequestsCollectionRequest) Paging(
 			value  []ThreatAssessmentRequestObject
 		)
 		err := jsonx.NewDecoder(res.Body).Decode(&paging)
+		res.Body.Close()
 		if err != nil {
 			return nil, err
 		}
@@ -413,9 +416,9 @@ func (r *InformationProtectionPolicyLabelsCollectionRequest) Paging(ctx context.
 	}
 	var values []InformationProtectionLabel
 	for {
-		defer res.Body.Close()
 		if res.StatusCode != http.StatusOK {
 			b, _ := ioutil.ReadAll(res.Body)
+			res.Body.Close()
 			errRes := &ErrorResponse{Response: res}
 			err := jsonx.Unmarshal(b, errRes)
 			if err != nil {
@@ -428,6 +431,7 @@ func (r *InformationProtectionPolicyLabelsCollectionRequest) Paging(ctx context.
 			value  []InformationProtectionLabel
 		)
 		err := jsonx.NewDecoder(res.Body).Decode(&paging)
+		res.Body.Close()
 		if err != nil {
 			return nil, err
 		}
--- a/vendor/github.com/yaegashi/msgraph.go/beta/ActionIntune.go
+++ b/vendor/github.com/yaegashi/msgraph.go/beta/ActionIntune.go
@@ -1,4 +1,4 @@
-// Code generated by msgraph-generate.go DO NOT EDIT.
+// Code generated by msgraph.go/gen DO NOT EDIT.

 package msgraph

@@ -59,9 +59,9 @@ func (r *IntuneBrandingProfileAssignmentsCollectionRequest) Paging(ctx context.C
 	}
 	var values []IntuneBrandingProfileAssignment
 	for {
-		defer res.Body.Close()
 		if res.StatusCode != http.StatusOK {
 			b, _ := ioutil.ReadAll(res.Body)
+			res.Body.Close()
 			errRes := &ErrorResponse{Response: res}
 			err := jsonx.Unmarshal(b, errRes)
 			if err != nil {
@@ -74,6 +74,7 @@ func (r *IntuneBrandingProfileAssignmentsCollectionRequest) Paging(ctx context.C
 			value  []IntuneBrandingProfileAssignment
 		)
 		err := jsonx.NewDecoder(res.Body).Decode(&paging)
+		res.Body.Close()
 		if err != nil {
 			return nil, err
 		}
--- a/vendor/github.com/yaegashi/msgraph.go/beta/ActionInvitation.go
+++ b/vendor/github.com/yaegashi/msgraph.go/beta/ActionInvitation.go
@@ -1,4 +1,4 @@
-// Code generated by msgraph-generate.go DO NOT EDIT.
+// Code generated by msgraph.go/gen DO NOT EDIT.

 package msgraph

--- a/vendor/github.com/yaegashi/msgraph.go/beta/ActionItem.go
+++ b/vendor/github.com/yaegashi/msgraph.go/beta/ActionItem.go
@@ -1,4 +1,4 @@
-// Code generated by msgraph-generate.go DO NOT EDIT.
+// Code generated by msgraph.go/gen DO NOT EDIT.

 package msgraph

@@ -60,9 +60,9 @@ func (r *ItemPictureCollectionRequest) Paging(ctx context.Context, method, path
 	}
 	var values []Picture
 	for {
-		defer res.Body.Close()
 		if res.StatusCode != http.StatusOK {
 			b, _ := ioutil.ReadAll(res.Body)
+			res.Body.Close()
 			errRes := &ErrorResponse{Response: res}
 			err := jsonx.Unmarshal(b, errRes)
 			if err != nil {
@@ -75,6 +75,7 @@ func (r *ItemPictureCollectionRequest) Paging(ctx context.Context, method, path
 			value  []Picture
 		)
 		err := jsonx.NewDecoder(res.Body).Decode(&paging)
+		res.Body.Close()
 		if err != nil {
 			return nil, err
 		}
@@ -183,9 +184,9 @@ func (r *ItemActivityStatActivitiesCollectionRequest) Paging(ctx context.Context
 	}
 	var values []ItemActivity
 	for {
-		defer res.Body.Close()
 		if res.StatusCode != http.StatusOK {
 			b, _ := ioutil.ReadAll(res.Body)
+			res.Body.Close()
 			errRes := &ErrorResponse{Response: res}
 			err := jsonx.Unmarshal(b, errRes)
 			if err != nil {
@@ -198,6 +199,7 @@ func (r *ItemActivityStatActivitiesCollectionRequest) Paging(ctx context.Context
 			value  []ItemActivity
 		)
 		err := jsonx.NewDecoder(res.Body).Decode(&paging)
+		res.Body.Close()
 		if err != nil {
 			return nil, err
 		}
@@ -292,9 +294,9 @@ func (r *ItemAnalyticsItemActivityStatsCollectionRequest) Paging(ctx context.Con
 	}
 	var values []ItemActivityStat
 	for {
-		defer res.Body.Close()
 		if res.StatusCode != http.StatusOK {
 			b, _ := ioutil.ReadAll(res.Body)
+			res.Body.Close()
 			errRes := &ErrorResponse{Response: res}
 			err := jsonx.Unmarshal(b, errRes)
 			if err != nil {
@@ -307,6 +309,7 @@ func (r *ItemAnalyticsItemActivityStatsCollectionRequest) Paging(ctx context.Con
 			value  []ItemActivityStat
 		)
 		err := jsonx.NewDecoder(res.Body).Decode(&paging)
+		res.Body.Close()
 		if err != nil {
 			return nil, err
 		}
--- a/Show More
+++ b/Show More
				`@@ -0,0 +1 @@`
				`golang.org/dl v0.0.0-20190829154251-82a15e2f2ead/go.mod h1:IUMfjQLJQd4UTqG1Z90tenwKoCX93Gn3MAQJMOSBsDQ=`