Skip to content

Commit

Permalink
Fix GCS Auth Issues (#554)
Browse files Browse the repository at this point in the history
* list instead of attrs

Signed-off-by: Joe Elliott <number101010@gmail.com>

* Added scope read/write

Signed-off-by: Joe Elliott <number101010@gmail.com>

* Revert "list instead of attrs"

This reverts commit 73a260c.

* changelog

Signed-off-by: Joe Elliott <number101010@gmail.com>
  • Loading branch information
joe-elliott committed Feb 24, 2021
1 parent 3129aae commit 618654d
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 2 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
## master / unreleased

* [ENHANCEMENT] Add a Shutdown handler to flush data to backend, at "/shutdown". [#526](https://github.com/grafana/tempo/pull/526)
* [BUGFIX] Fixes permissions errors on startup in GCS. [#554](https://github.com/grafana/tempo/pull/554)

## v0.6.0

Expand Down
5 changes: 3 additions & 2 deletions tempodb/backend/gcs/gcs.go
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,9 @@ func New(cfg *Config) (backend.Reader, backend.Writer, backend.Compactor, error)
ctx := context.Background()

customTransport := http.DefaultTransport.(*http.Transport).Clone()

transportOptions := []option.ClientOption{}
transportOptions := []option.ClientOption{
option.WithScopes(storage.ScopeReadWrite),
}
if cfg.Insecure {
transportOptions = append(transportOptions, option.WithoutAuthentication())
customTransport.TLSClientConfig = &tls.Config{InsecureSkipVerify: true}
Expand Down

0 comments on commit 618654d

Please sign in to comment.