-
Notifications
You must be signed in to change notification settings - Fork 120
feat: Add support for optional follow_redirects #526
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.
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
Open
srlynch1
wants to merge
3
commits into
hashicorp:main
Choose a base branch
from
hashi-demo-lab:main
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
3 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or 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 hidden or 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 | ||||
|---|---|---|---|---|---|---|
|
|
@@ -171,6 +171,11 @@ a 5xx-range (except 501) status code is received. For further details see | |||||
| Description: `The HTTP response status code.`, | ||||||
| Computed: true, | ||||||
| }, | ||||||
|
|
||||||
| "follow_redirects": schema.BoolAttribute{ | ||||||
| Description: "If false, do not follow HTTP redirects. Defaults to true.", | ||||||
|
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
Suggested change
|
||||||
| Optional: true, | ||||||
| }, | ||||||
| }, | ||||||
|
|
||||||
| Blocks: map[string]schema.Block{ | ||||||
|
|
@@ -295,6 +300,13 @@ func (d *httpDataSource) Read(ctx context.Context, req datasource.ReadRequest, r | |||||
| retryClient := retryablehttp.NewClient() | ||||||
| retryClient.HTTPClient.Transport = clonedTr | ||||||
|
|
||||||
| // Configure no-follow behavior when follow_redirects is explicitly false | ||||||
| if !model.FollowRedirects.IsNull() && !model.FollowRedirects.ValueBool() { | ||||||
| retryClient.HTTPClient.CheckRedirect = func(req *http.Request, via []*http.Request) error { | ||||||
| return http.ErrUseLastResponse | ||||||
| } | ||||||
| } | ||||||
|
|
||||||
| var timeout time.Duration | ||||||
|
|
||||||
| if model.RequestTimeout.ValueInt64() > 0 { | ||||||
|
|
@@ -437,6 +449,7 @@ type modelV0 struct { | |||||
| Body types.String `tfsdk:"body"` | ||||||
| ResponseBodyBase64 types.String `tfsdk:"response_body_base64"` | ||||||
| StatusCode types.Int64 `tfsdk:"status_code"` | ||||||
| FollowRedirects types.Bool `tfsdk:"follow_redirects"` | ||||||
| } | ||||||
|
|
||||||
| type retryModel struct { | ||||||
|
|
||||||
This file contains hidden or 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 |
|---|---|---|
|
|
@@ -1020,6 +1020,52 @@ func TestDataSource_ResponseBodyBinary(t *testing.T) { | |
| }) | ||
| } | ||
|
|
||
| // TestDataSource_FollowRedirects verifies that the follow_redirects flag controls redirect behavior. | ||
| func TestDataSource_FollowRedirects(t *testing.T) { | ||
| // Target server returns 200 OK | ||
| target := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { | ||
| w.Header().Set("Content-Type", "text/plain") | ||
| w.WriteHeader(http.StatusOK) | ||
| _, _ = w.Write([]byte("OK")) | ||
| })) | ||
| defer target.Close() | ||
|
|
||
| // Redirect server sends 302 to target | ||
| redirect := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { | ||
| http.Redirect(w, r, target.URL, http.StatusFound) | ||
| })) | ||
| defer redirect.Close() | ||
|
|
||
| resource.UnitTest(t, resource.TestCase{ | ||
| ProtoV5ProviderFactories: protoV5ProviderFactories(), | ||
| Steps: []resource.TestStep{ | ||
| { | ||
| Config: fmt.Sprintf(` | ||
| data "http" "http_test" { | ||
| url = %q | ||
| follow_redirects = false | ||
|
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. IF you want to go the extra mile add a test with |
||
| } | ||
| `, redirect.URL), | ||
| Check: resource.ComposeTestCheckFunc( | ||
| resource.TestCheckResourceAttr("data.http.http_test", "status_code", fmt.Sprintf("%d", http.StatusFound)), | ||
| resource.TestCheckResourceAttr("data.http.http_test", "response_headers.Location", target.URL), | ||
| ), | ||
| }, | ||
| { | ||
| Config: fmt.Sprintf(` | ||
| data "http" "http_test" { | ||
| url = %q | ||
| } | ||
| `, redirect.URL), | ||
| Check: resource.ComposeTestCheckFunc( | ||
| resource.TestCheckResourceAttr("data.http.http_test", "status_code", fmt.Sprintf("%d", http.StatusOK)), | ||
| resource.TestCheckResourceAttr("data.http.http_test", "response_body", "OK"), | ||
| ), | ||
| }, | ||
| }, | ||
| }) | ||
| } | ||
|
|
||
| func checkServerAndProxyRequestCount(proxyRequestCount, serverRequestCount *int) resource.TestCheckFunc { | ||
| return func(_ *terraform.State) error { | ||
| if *proxyRequestCount != *serverRequestCount { | ||
|
|
||
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.