Skip to content

gophercloudext: add ClientOpts.CustomizeAuthOptions #180

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Nov 11, 2024
Merged

gophercloudext: add ClientOpts.CustomizeAuthOptions #180

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
267fb34
gophercloudext: add ClientOpts.CustomizeAuthOptions
majewsky Nov 11, 2024
88af5eb
fix new lints
majewsky Nov 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion easypg/snapshot.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -203,7 +203,7 @@ func newTableSnapshot(t *testing.T, db *sql.DB, tableName string, keyColumnNames
failOnErr(t, rows.Scan(scanTarget...))
row := make(rowSnapshot, len(columnNames))
for idx, columnName := range columnNames {
row[columnName] = scanTarget[idx].(*sqlValueSerializer).Serialized
row[columnName] = scanTarget[idx].(*sqlValueSerializer).Serialized //nolint:errcheck // this type assertion cannot fail because of how the slice is constructed
}
result.Rows[row.Key(result.KeyColumnNames)] = row
}
Expand Down
10 changes: 10 additions & 0 deletions gophercloudext/auth.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,13 @@ type ClientOpts struct {
// gophercloud.ProviderClient insists on taking ownership of whatever is
// given here, so we cannot just give http.DefaultClient here.
HTTPClient *http.Client

// CustomizeAuthOptions is a callback that can be used to modify the
// constructed AuthOptions before they are passed to the ProviderClient.
//
// This is used in rare special cases, e.g. when an application needs to
// spawn clients with different token scopes for specific operations.
CustomizeAuthOptions func(*gophercloud.AuthOptions)
}

// NewProviderClient authenticates with OpenStack using the credentials found
Expand Down Expand Up @@ -128,6 +135,9 @@ func NewProviderClient(ctx context.Context, optsPtr *ClientOpts) (*gophercloud.P
ApplicationCredentialID: os.Getenv(opts.EnvPrefix + "APPLICATION_CREDENTIAL_ID"),
ApplicationCredentialSecret: os.Getenv(opts.EnvPrefix + "APPLICATION_CREDENTIAL_SECRET"),
}
if opts.CustomizeAuthOptions != nil {
opts.CustomizeAuthOptions(&ao)
}

provider, err := openstack.NewClient(ao.IdentityEndpoint)
if err == nil {
Expand Down