diff --git a/go.mod b/go.mod index 8313581..3603467 100644 --- a/go.mod +++ b/go.mod @@ -3,12 +3,12 @@ module github.com/bitrise-io/steps-fastlane go 1.20 require ( - github.com/bitrise-io/bitrise-init v0.0.0-20230901074816-efe492d99277 + github.com/bitrise-io/bitrise-init v0.0.0-20231030091557-cb74e61d668e github.com/bitrise-io/go-android/v2 v2.0.0-alpha.5 github.com/bitrise-io/go-steputils v1.0.6 - github.com/bitrise-io/go-steputils/v2 v2.0.0-alpha.21 - github.com/bitrise-io/go-utils v1.0.9 - github.com/bitrise-io/go-utils/v2 v2.0.0-alpha.19 + github.com/bitrise-io/go-steputils/v2 v2.0.0-alpha.22 + github.com/bitrise-io/go-utils v1.0.10 + github.com/bitrise-io/go-utils/v2 v2.0.0-alpha.20 github.com/bitrise-io/go-xcode v1.0.18 github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51 github.com/stretchr/testify v1.8.4 @@ -16,13 +16,13 @@ require ( require ( github.com/beevik/etree v1.2.0 // indirect - github.com/bitrise-io/bitrise v0.0.0-20230920132712-a20cb0493953 // indirect + github.com/bitrise-io/bitrise v0.0.0-20231201125551-92d4629867c3 // indirect github.com/bitrise-io/envman v0.0.0-20230802102824-1300c57d49c4 // indirect github.com/bitrise-io/stepman v0.0.0-20230728094915-939f0fe5c19a // indirect github.com/davecgh/go-spew v1.1.1 // indirect github.com/gofrs/uuid v4.4.0+incompatible // indirect github.com/hashicorp/go-cleanhttp v0.5.2 // indirect - github.com/hashicorp/go-retryablehttp v0.7.4 // indirect + github.com/hashicorp/go-retryablehttp v0.7.5 // indirect github.com/hashicorp/go-version v1.6.0 // indirect github.com/mitchellh/mapstructure v1.5.0 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect diff --git a/go.sum b/go.sum index 681b400..7bcd759 100644 --- a/go.sum +++ b/go.sum @@ -1,10 +1,10 @@ github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= github.com/beevik/etree v1.2.0 h1:l7WETslUG/T+xOPs47dtd6jov2Ii/8/OjCldk5fYfQw= github.com/beevik/etree v1.2.0/go.mod h1:aiPf89g/1k3AShMVAzriilpcE4R/Vuor90y83zVZWFc= -github.com/bitrise-io/bitrise v0.0.0-20230920132712-a20cb0493953 h1:rS8DshM/KP+n9wo//IZfy4pQHnLmpE3Z1rF1ajOo6eM= -github.com/bitrise-io/bitrise v0.0.0-20230920132712-a20cb0493953/go.mod h1:iFBfnKPLU0FAu4WRQacW46RCnmHxNw4pCCZ6br7DcIk= -github.com/bitrise-io/bitrise-init v0.0.0-20230901074816-efe492d99277 h1:9M6hXlQT3JlOhkX+voXPjh2v6XO0/RoxpUK47DWKmRI= -github.com/bitrise-io/bitrise-init v0.0.0-20230901074816-efe492d99277/go.mod h1:vNnQvJCk6BHH1AvaAqWTFdue9AiEeQ0uwODl8p1M/uE= +github.com/bitrise-io/bitrise v0.0.0-20231201125551-92d4629867c3 h1:1qyhgikIvhsr6U/UARDW0itU+Ia+czBIZYOtMTkg5tY= +github.com/bitrise-io/bitrise v0.0.0-20231201125551-92d4629867c3/go.mod h1:iFBfnKPLU0FAu4WRQacW46RCnmHxNw4pCCZ6br7DcIk= +github.com/bitrise-io/bitrise-init v0.0.0-20231030091557-cb74e61d668e h1:CRj2/pN/qH4clCYfnPEsz2gdAtnGHeXIegt6PGCUQjI= +github.com/bitrise-io/bitrise-init v0.0.0-20231030091557-cb74e61d668e/go.mod h1:yWEj9bvr0oD/jCQpce9BfaKS0SIwwXOCtPkNvaK0jEs= github.com/bitrise-io/envman v0.0.0-20230802102824-1300c57d49c4 h1:idT9p2ISMoW5SOz2ow3jWzxVNc4DkNreLeoTk8BGPHg= github.com/bitrise-io/envman v0.0.0-20230802102824-1300c57d49c4/go.mod h1:eZDEXpkF4BguvTERmhij3Vwf7Y2qvnJBBW/61hQRip4= github.com/bitrise-io/go-android/v2 v2.0.0-alpha.5 h1:iQ6ZEOzsetZXGyUeiYqdtZH7N5xWdzJCaIudsjgmyAQ= @@ -13,15 +13,15 @@ github.com/bitrise-io/go-pkcs12 v0.0.0-20230913085202-b40653eb06c7/go.mod h1:fly github.com/bitrise-io/go-steputils v1.0.2/go.mod h1:YIUaQnIAyK4pCvQG0hYHVkSzKNT9uL2FWmkFNW4mfNI= github.com/bitrise-io/go-steputils v1.0.6 h1:eBRL70DWwEd7DWYGd5Ds7OSIY5HElzhoDOI6UuITKQg= github.com/bitrise-io/go-steputils v1.0.6/go.mod h1:YIUaQnIAyK4pCvQG0hYHVkSzKNT9uL2FWmkFNW4mfNI= -github.com/bitrise-io/go-steputils/v2 v2.0.0-alpha.21 h1:I4LYivtjris4QwHPq4oqLNaprh+T6/0GVGzsNrW1dI8= -github.com/bitrise-io/go-steputils/v2 v2.0.0-alpha.21/go.mod h1:YeLAqkNuns7tiZNAlGJ8kOWvSEZy3SOKAQCv2CeWk5A= +github.com/bitrise-io/go-steputils/v2 v2.0.0-alpha.22 h1:fdBCkTiESynCfaEKw7wLdih+8Bxofixo72iIQu/6ibE= +github.com/bitrise-io/go-steputils/v2 v2.0.0-alpha.22/go.mod h1:R9HD1kg1Ay4zX+y7E+NfifzR/ZaP7DHDZsxKX/3IdpE= github.com/bitrise-io/go-utils v1.0.1/go.mod h1:ZY1DI+fEpZuFpO9szgDeICM4QbqoWVt0RSY3tRI1heY= github.com/bitrise-io/go-utils v1.0.2/go.mod h1:ZY1DI+fEpZuFpO9szgDeICM4QbqoWVt0RSY3tRI1heY= -github.com/bitrise-io/go-utils v1.0.9 h1:wy7FewUpseNSTZr41BbGH0csfFqzptFt4zy2pOAEOg0= -github.com/bitrise-io/go-utils v1.0.9/go.mod h1:ZY1DI+fEpZuFpO9szgDeICM4QbqoWVt0RSY3tRI1heY= +github.com/bitrise-io/go-utils v1.0.10 h1:o9avkvxcghjboVvwXn2WM2n5KMDLt74eeb/drYKmP0I= +github.com/bitrise-io/go-utils v1.0.10/go.mod h1:ZY1DI+fEpZuFpO9szgDeICM4QbqoWVt0RSY3tRI1heY= github.com/bitrise-io/go-utils/v2 v2.0.0-alpha.7/go.mod h1:6i0Gt0JRIbXpsrFDJT1YWghFfdN8qF26/fnpc/6d/88= -github.com/bitrise-io/go-utils/v2 v2.0.0-alpha.19 h1:55as5Iv0N4btuRP3YwRzN+BCMtKO210MnJ8mpxmeI7o= -github.com/bitrise-io/go-utils/v2 v2.0.0-alpha.19/go.mod h1:Laih4ji980SQkRgdnMCH0g4u2GZI/5nnbqmYT9UfKFQ= +github.com/bitrise-io/go-utils/v2 v2.0.0-alpha.20 h1:R+xJRWsuHhF/Pnx0gjI1+HH4Y0YSFVI+U/CbLpSx4sU= +github.com/bitrise-io/go-utils/v2 v2.0.0-alpha.20/go.mod h1:Laih4ji980SQkRgdnMCH0g4u2GZI/5nnbqmYT9UfKFQ= github.com/bitrise-io/go-xcode v1.0.18 h1:guFywV/AwcZuexqIQkL1ixc3QThpbJvA4voa9MqvPto= github.com/bitrise-io/go-xcode v1.0.18/go.mod h1:9OwsvrhZ4A2JxHVoEY7CPcABAKA+OE7FQqFfBfvbFuY= github.com/bitrise-io/stepman v0.0.0-20230728094915-939f0fe5c19a h1:XM2PrNSUjpI4pIOZ1TcZdD4kh7KYN2D+yC6WYy22hoo= @@ -41,8 +41,8 @@ github.com/hashicorp/go-cleanhttp v0.5.2/go.mod h1:kO/YDlP8L1346E6Sodw+PrpBSV4/S github.com/hashicorp/go-hclog v0.9.2 h1:CG6TE5H9/JXsFWJCfoIVpKFIkFe6ysEuHirp4DxCsHI= github.com/hashicorp/go-hclog v0.9.2/go.mod h1:5CU+agLiy3J7N7QjHK5d05KxGsuXiQLrjA0H7acj2lQ= github.com/hashicorp/go-retryablehttp v0.7.0/go.mod h1:vAew36LZh98gCBJNLH42IQ1ER/9wtLZZ8meHqQvEYWY= -github.com/hashicorp/go-retryablehttp v0.7.4 h1:ZQgVdpTdAL7WpMIwLzCfbalOcSUdkDZnpUv3/+BxzFA= -github.com/hashicorp/go-retryablehttp v0.7.4/go.mod h1:Jy/gPYAdjqffZ/yFGCFV2doI5wjtH1ewM9u8iYVjtX8= +github.com/hashicorp/go-retryablehttp v0.7.5 h1:bJj+Pj19UZMIweq/iie+1u5YCdGrnxCT9yvm0e+Nd5M= +github.com/hashicorp/go-retryablehttp v0.7.5/go.mod h1:Jy/gPYAdjqffZ/yFGCFV2doI5wjtH1ewM9u8iYVjtX8= github.com/hashicorp/go-version v1.5.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA= github.com/hashicorp/go-version v1.6.0 h1:feTTfFNnjP967rlCxM/I9g701jU+RN74YKx2mOkIeek= github.com/hashicorp/go-version v1.6.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA= diff --git a/vendor/github.com/bitrise-io/go-utils/command/command.go b/vendor/github.com/bitrise-io/go-utils/command/command.go index c068490..3dcdac5 100644 --- a/vendor/github.com/bitrise-io/go-utils/command/command.go +++ b/vendor/github.com/bitrise-io/go-utils/command/command.go @@ -2,10 +2,10 @@ package command import ( "errors" + "fmt" "io" "os" "os/exec" - "strconv" "strings" ) @@ -125,7 +125,7 @@ func (m Model) PrintableCommandArgs() string { func PrintableCommandArgs(isQuoteFirst bool, fullCommandArgs []string) string { cmdArgsDecorated := []string{} for idx, anArg := range fullCommandArgs { - quotedArg := strconv.Quote(anArg) + quotedArg := fmt.Sprintf("\"%s\"", anArg) if idx == 0 && !isQuoteFirst { quotedArg = anArg } diff --git a/vendor/github.com/bitrise-io/go-utils/v2/command/command.go b/vendor/github.com/bitrise-io/go-utils/v2/command/command.go index 4206c2b..5672ef6 100644 --- a/vendor/github.com/bitrise-io/go-utils/v2/command/command.go +++ b/vendor/github.com/bitrise-io/go-utils/v2/command/command.go @@ -5,7 +5,6 @@ import ( "fmt" "io" "os/exec" - "strconv" "strings" "github.com/bitrise-io/go-utils/v2/env" @@ -156,7 +155,7 @@ func (c command) Wait() error { func printableCommandArgs(isQuoteFirst bool, fullCommandArgs []string) string { var cmdArgsDecorated []string for idx, anArg := range fullCommandArgs { - quotedArg := strconv.Quote(anArg) + quotedArg := fmt.Sprintf("\"%s\"", anArg) if idx == 0 && !isQuoteFirst { quotedArg = anArg } diff --git a/vendor/github.com/hashicorp/go-retryablehttp/CHANGELOG.md b/vendor/github.com/hashicorp/go-retryablehttp/CHANGELOG.md index 33686e4..7a17b9f 100644 --- a/vendor/github.com/hashicorp/go-retryablehttp/CHANGELOG.md +++ b/vendor/github.com/hashicorp/go-retryablehttp/CHANGELOG.md @@ -1,3 +1,9 @@ +## 0.7.5 (Nov 8, 2023) + +BUG FIXES + +- client: fixes an issue where the request body is not preserved on temporary redirects or re-established HTTP/2 connections [GH-207] + ## 0.7.4 (Jun 6, 2023) BUG FIXES diff --git a/vendor/github.com/hashicorp/go-retryablehttp/client.go b/vendor/github.com/hashicorp/go-retryablehttp/client.go index cad96bd..c9edbd0 100644 --- a/vendor/github.com/hashicorp/go-retryablehttp/client.go +++ b/vendor/github.com/hashicorp/go-retryablehttp/client.go @@ -160,6 +160,20 @@ func (r *Request) SetBody(rawBody interface{}) error { } r.body = bodyReader r.ContentLength = contentLength + if bodyReader != nil { + r.GetBody = func() (io.ReadCloser, error) { + body, err := bodyReader() + if err != nil { + return nil, err + } + if rc, ok := body.(io.ReadCloser); ok { + return rc, nil + } + return io.NopCloser(body), nil + } + } else { + r.GetBody = func() (io.ReadCloser, error) { return http.NoBody, nil } + } return nil } @@ -302,18 +316,19 @@ func NewRequest(method, url string, rawBody interface{}) (*Request, error) { // The context controls the entire lifetime of a request and its response: // obtaining a connection, sending the request, and reading the response headers and body. func NewRequestWithContext(ctx context.Context, method, url string, rawBody interface{}) (*Request, error) { - bodyReader, contentLength, err := getBodyReaderAndContentLength(rawBody) + httpReq, err := http.NewRequestWithContext(ctx, method, url, nil) if err != nil { return nil, err } - httpReq, err := http.NewRequestWithContext(ctx, method, url, nil) - if err != nil { + req := &Request{ + Request: httpReq, + } + if err := req.SetBody(rawBody); err != nil { return nil, err } - httpReq.ContentLength = contentLength - return &Request{body: bodyReader, Request: httpReq}, nil + return req, nil } // Logger interface allows to use other loggers than diff --git a/vendor/modules.txt b/vendor/modules.txt index 59efe32..ad616cc 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -1,11 +1,11 @@ # github.com/beevik/etree v1.2.0 ## explicit; go 1.13 github.com/beevik/etree -# github.com/bitrise-io/bitrise v0.0.0-20230920132712-a20cb0493953 +# github.com/bitrise-io/bitrise v0.0.0-20231201125551-92d4629867c3 ## explicit; go 1.17 github.com/bitrise-io/bitrise/exitcode github.com/bitrise-io/bitrise/models -# github.com/bitrise-io/bitrise-init v0.0.0-20230901074816-efe492d99277 +# github.com/bitrise-io/bitrise-init v0.0.0-20231030091557-cb74e61d668e ## explicit; go 1.18 github.com/bitrise-io/bitrise-init/analytics github.com/bitrise-io/bitrise-init/models @@ -26,11 +26,11 @@ github.com/bitrise-io/go-steputils/command/rubycommand github.com/bitrise-io/go-steputils/input github.com/bitrise-io/go-steputils/step github.com/bitrise-io/go-steputils/tools -# github.com/bitrise-io/go-steputils/v2 v2.0.0-alpha.21 +# github.com/bitrise-io/go-steputils/v2 v2.0.0-alpha.22 ## explicit; go 1.17 github.com/bitrise-io/go-steputils/v2/ruby github.com/bitrise-io/go-steputils/v2/stepconf -# github.com/bitrise-io/go-utils v1.0.9 +# github.com/bitrise-io/go-utils v1.0.10 ## explicit; go 1.13 github.com/bitrise-io/go-utils/colorstring github.com/bitrise-io/go-utils/command @@ -42,7 +42,7 @@ github.com/bitrise-io/go-utils/parseutil github.com/bitrise-io/go-utils/pathutil github.com/bitrise-io/go-utils/pointers github.com/bitrise-io/go-utils/sliceutil -# github.com/bitrise-io/go-utils/v2 v2.0.0-alpha.19 +# github.com/bitrise-io/go-utils/v2 v2.0.0-alpha.20 ## explicit; go 1.17 github.com/bitrise-io/go-utils/v2/analytics github.com/bitrise-io/go-utils/v2/command @@ -69,7 +69,7 @@ github.com/gofrs/uuid # github.com/hashicorp/go-cleanhttp v0.5.2 ## explicit; go 1.13 github.com/hashicorp/go-cleanhttp -# github.com/hashicorp/go-retryablehttp v0.7.4 +# github.com/hashicorp/go-retryablehttp v0.7.5 ## explicit; go 1.13 github.com/hashicorp/go-retryablehttp # github.com/hashicorp/go-version v1.6.0