Skip to content

Commit

Permalink
Merge pull request #7 from Piszmog/develop
Browse files Browse the repository at this point in the history
update to go 1.12
  • Loading branch information
Piszmog authored Apr 7, 2019
2 parents a0d4d70 + 46c678f commit a32b618
Show file tree
Hide file tree
Showing 5 changed files with 23 additions and 19 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
language: go

go:
- "1.11"
- "1.12"

env:
- GO111MODULE=on
Expand Down
4 changes: 2 additions & 2 deletions configuration.go
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ func (configClient ConfigClient) GetConfiguration(applicationName string, profil
continue
}
if err != nil {
return nil, errors.Wrapf(err, "failed to retrieve application configurations")
return nil, errors.Wrap(err, "failed to retrieve application configurations")
}
if resp.StatusCode != 200 {
return nil, errors.Errorf("server responded with status code %d", resp.StatusCode)
Expand All @@ -48,7 +48,7 @@ func (configClient ConfigClient) GetConfiguration(applicationName string, profil
err = decoder.Decode(configuration)
resp.Body.Close()
if err != nil {
return nil, errors.Wrapf(err, "failed to decode response from url")
return nil, errors.Wrap(err, "failed to decode response from url")
}
return configuration, nil
}
Expand Down
10 changes: 5 additions & 5 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
module github.com/Piszmog/cloudconfigclient

go 1.12

require (
github.com/Piszmog/cfservices v1.3.2
github.com/Piszmog/httpclient v1.0.1
github.com/golang/protobuf v1.1.0 // indirect
github.com/pkg/errors v0.8.0
github.com/Piszmog/cfservices v1.3.5
github.com/Piszmog/httpclient v1.0.3
github.com/pkg/errors v0.8.1
golang.org/x/net v0.0.0-20180808004115-f9ce57c11b24
golang.org/x/oauth2 v0.0.0-20180724155351-3d292e4d0cdc
google.golang.org/appengine v1.1.0 // indirect
)
24 changes: 14 additions & 10 deletions go.sum
Original file line number Diff line number Diff line change
@@ -1,14 +1,18 @@
github.com/Piszmog/cfservices v1.3.1 h1:xiX4kjYJUxJYUBDgUJ+OgdqUsLX48yFq8YMZs/gdGyE=
github.com/Piszmog/cfservices v1.3.1/go.mod h1:uxLe5gKNnODE9Bt1aJd5WjaeTg8/Qr6Dibd1wFgfAwk=
github.com/Piszmog/cfservices v1.3.2 h1:QvAphVK6Mz/zN7ZWa13eiwqpGhe0mO1CO/usF3yA3UE=
github.com/Piszmog/cfservices v1.3.2/go.mod h1:uxLe5gKNnODE9Bt1aJd5WjaeTg8/Qr6Dibd1wFgfAwk=
github.com/Piszmog/httpclient v1.0.1 h1:LBgUxwb2zrwv/c1qx0D4lSwmz28ZNf7k91EsNbclJk0=
github.com/Piszmog/httpclient v1.0.1/go.mod h1:FcqjAm4HhYGYfQaFY8kZ2Y+SGiO51s4H3K6GEtAHOn4=
github.com/golang/protobuf v1.1.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
github.com/Piszmog/cfservices v1.3.5 h1:2IYneTEX90IhsSEA2xxSGf8AUgxcJrEyeJCoOI1nrKs=
github.com/Piszmog/cfservices v1.3.5/go.mod h1:44R6Fu07XQvBkK470cCNZRo3QKjoYkvYuJb4mvV69VY=
github.com/Piszmog/httpclient v1.0.3 h1:DBaEIXXqMoGkX7VYpUVxbmDJd2bmfaFJngm9ZEOlpTs=
github.com/Piszmog/httpclient v1.0.3/go.mod h1:Kl3+2ZVsjPLTownDvoPUW5ROhnF8i5PROzySDQ19/DQ=
github.com/golang/protobuf v1.2.0 h1:P3YflyNX/ehuJFLhxviNdFxQPkGK5cDcApsge1SqnvM=
github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
github.com/pkg/errors v0.8.1 h1:iURUrRGxPUNPdy5/HRSm+Yj6okJ6UtLINN0Q9M4+h3I=
github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
golang.org/x/net v0.0.0-20180808004115-f9ce57c11b24 h1:mEsFm194MmS9vCwxFy+zwu0EU7ZkxxMD1iH++vmGdUY=
golang.org/x/net v0.0.0-20180808004115-f9ce57c11b24/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
golang.org/x/oauth2 v0.0.0-20180724155351-3d292e4d0cdc h1:3ElrZeO6IBP+M8kgu5YFwRo92Gqr+zBg3aooYQ6ziqU=
golang.org/x/oauth2 v0.0.0-20180724155351-3d292e4d0cdc/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
google.golang.org/appengine v1.1.0 h1:igQkv0AAhEIvTEpD5LIpAfav2eeVO9HBTjvKHVJPRSs=
google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM=
golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6 h1:bjcUS9ztw9kFmmIxJInhon/0Is3p+EHBKNgquIzo1OI=
golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
google.golang.org/appengine v1.5.0 h1:KxkO13IPW4Lslp2bz+KHP2E3gtFlrIGNThxkZQ3g+4c=
google.golang.org/appengine v1.5.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
2 changes: 1 addition & 1 deletion resource.go
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ func (configClient ConfigClient) GetFile(directory string, file string, interfac
continue
}
if err != nil {
return errors.Wrapf(err, "failed to retrieve file")
return errors.Wrap(err, "failed to retrieve file")
}
if resp.StatusCode != 200 {
return errors.Errorf("server responded with status code %d", resp.StatusCode)
Expand Down

0 comments on commit a32b618

Please sign in to comment.