Upgrade okta lib #8143
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -3,15 +3,16 @@ package okta | |
| import ( | ||
| "context" | ||
| "fmt" | ||
| "github.com/hashicorp/go-cleanhttp" | ||
| "net/http" | ||
| "net/url" | ||
| "time" | ||
|
|
||
| oktaold "github.com/chrismalek/oktasdk-go/okta" | ||
| "github.com/hashicorp/vault/sdk/framework" | ||
| "github.com/hashicorp/vault/sdk/helper/tokenutil" | ||
| "github.com/hashicorp/vault/sdk/logical" | ||
| oktanew "github.com/okta/okta-sdk-golang/okta" | ||
| ) | ||
|
|
||
| const ( | ||
|
|
@@ -266,8 +267,46 @@ func (b *backend) pathConfigExistenceCheck(ctx context.Context, req *logical.Req | |
| return cfg != nil, nil | ||
| } | ||
|
|
||
| type oktaShim interface { | ||
| Client() *oktanew.Client | ||
| NewRequest(method string, url string, body interface{}) (*http.Request, error) | ||
| Do(req *http.Request, v interface{}) (interface{}, error) | ||
| } | ||
|
|
||
| type oktaShimNew struct { | ||
| client *oktanew.Client | ||
| } | ||
|
|
||
| func (new *oktaShimNew) Client() *oktanew.Client { | ||
| return new.client | ||
| } | ||
|
|
||
| func (new *oktaShimNew) NewRequest(method string, url string, body interface{}) (*http.Request, error) { | ||
| return new.client.GetRequestExecutor().NewRequest(method, url, body) | ||
| } | ||
|
|
||
| func (new *oktaShimNew) Do(req *http.Request, v interface{}) (interface{}, error) { | ||
| return new.client.GetRequestExecutor().Do(req, v) | ||
| } | ||
|
|
||
| type oktaShimOld struct { | ||
| client *oktaold.Client | ||
| } | ||
|
|
||
| func (new *oktaShimOld) Client() *oktanew.Client { | ||
| return nil | ||
| } | ||
|
|
||
| func (new *oktaShimOld) NewRequest(method string, url string, body interface{}) (*http.Request, error) { | ||
| return new.client.NewRequest(method, url, body) | ||
| } | ||
|
|
||
| func (new *oktaShimOld) Do(req *http.Request, v interface{}) (interface{}, error) { | ||
| return new.client.Do(req, v) | ||
| } | ||
|
|
||
| // OktaClient creates a basic okta client connection | ||
| func (c *ConfigEntry) OktaClient() (oktaShim, error) { | ||
| baseURL := defaultBaseURL | ||
| if c.Production != nil { | ||
| if !*c.Production { | ||
|
|
@@ -278,9 +317,20 @@ func (c *ConfigEntry) OktaClient() *okta.Client { | |
| baseURL = c.BaseURL | ||
| } | ||
|
|
||
| if c.Token != "" { | ||
| client, err := oktanew.NewClient(context.Background(), | ||
|
There was a problem hiding this comment. I was going to ask about context handling improvements, but it looks like the Okta SDK doesn't even do anything with the context, so nvm! https://github.com/okta/okta-sdk-golang/blob/7334d45e99bc09e0dbe209ef961aa40827e9d012/okta/okta.go#L55 |
||
| oktanew.WithOrgUrl("https://"+c.Org+"."+baseURL), | ||
| oktanew.WithToken(c.Token)) | ||
| if err != nil { | ||
| return nil, err | ||
| } | ||
| return &oktaShimNew{client}, nil | ||
| } | ||
| client, err := oktaold.NewClientWithDomain(cleanhttp.DefaultClient(), c.Org, baseURL, "") | ||
| if err != nil { | ||
| return nil, err | ||
| } | ||
| return &oktaShimOld{client}, nil | ||
| } | ||
|
|
||
| // ConfigEntry for Okta | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
nit:
fmt.Sprintfis redundant asErrorResponseassumes a format string + parameters