Update microsoft dev-tunnels to v0.1.13 #11205
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
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 |
|---|---|---|
|
|
@@ -14,6 +14,7 @@ import ( | |
| "net/http/httptest" | ||
| "net/url" | ||
| "regexp" | ||
| "strconv" | ||
| "strings" | ||
| "sync" | ||
| "time" | ||
|
|
@@ -25,7 +26,28 @@ import ( | |
| "golang.org/x/crypto/ssh" | ||
| ) | ||
|
|
||
| type mockClientOpts struct { | ||
| ports map[int]tunnels.TunnelPort // Port number to protocol | ||
| } | ||
|
|
||
| type mockClientOpt func(*mockClientOpts) | ||
|
|
||
| // WithSpecificPorts allows you to specify a map of ports to TunnelPorts that will be returned by the mock HTTP client. | ||
| // Note that this does not take a copy of the map, so you should not modify the map after passing it to this function. | ||
| func WithSpecificPorts(ports map[int]tunnels.TunnelPort) mockClientOpt { | ||
|
Member
Author
There was a problem hiding this comment. The majority of changes in this file relate to this. Previous behaviour was maintained when this is not provided to avoid a lot of test churn. If you provide these ports, they will be used when working with the http server tunnel port endpoints. |
||
| return func(opts *mockClientOpts) { | ||
| opts.ports = ports | ||
| } | ||
| } | ||
|
|
||
| func NewMockHttpClient(opts ...mockClientOpt) (*http.Client, error) { | ||
| mockClientOpts := &mockClientOpts{} | ||
| for _, opt := range opts { | ||
| opt(mockClientOpts) | ||
| } | ||
|
|
||
| specifiedPorts := mockClientOpts.ports | ||
|
|
||
| accessToken := "tunnel access-token" | ||
| relayServer, err := newMockrelayServer(withAccessToken(accessToken)) | ||
| if err != nil { | ||
|
|
@@ -35,7 +57,7 @@ func NewMockHttpClient() (*http.Client, error) { | |
| hostURL := strings.Replace(relayServer.URL(), "http://", "ws://", 1) | ||
| mockServer := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { | ||
| var response []byte | ||
| if r.URL.Path == "/tunnels/tunnel-id" { | ||
|
Member
Author
There was a problem hiding this comment. Consequence of dropping of |
||
| tunnel := &tunnels.Tunnel{ | ||
| AccessTokens: map[tunnels.TunnelAccessScope]string{ | ||
| tunnels.TunnelAccessScopeConnect: accessToken, | ||
|
|
@@ -54,54 +76,141 @@ func NewMockHttpClient() (*http.Client, error) { | |
| if err != nil { | ||
| log.Fatalf("json.Marshal returned an error: %v", err) | ||
| } | ||
|
|
||
| _, _ = w.Write(response) | ||
| return | ||
| } else if strings.HasPrefix(r.URL.Path, "/tunnels/tunnel-id/ports") { | ||
| // Use regex to capture the port number from the end of the path | ||
| re := regexp.MustCompile(`\/(\d+)$`) | ||
| matches := re.FindStringSubmatch(r.URL.Path) | ||
| targetingSpecificPort := len(matches) > 0 | ||
|
|
||
| if targetingSpecificPort { | ||
| if r.Method == http.MethodDelete { | ||
| w.WriteHeader(http.StatusOK) | ||
| return | ||
| } | ||
|
|
||
| if r.Method == http.MethodGet { | ||
| // If no ports were configured, then we assume that every request for a port is valid. | ||
| if specifiedPorts == nil { | ||
| response, err := json.Marshal(tunnels.TunnelPort{ | ||
| AccessControl: &tunnels.TunnelAccessControl{ | ||
| Entries: []tunnels.TunnelAccessControlEntry{}, | ||
| }, | ||
| }) | ||
|
|
||
| if err != nil { | ||
| log.Fatalf("json.Marshal returned an error: %v", err) | ||
| } | ||
|
|
||
| _, _ = w.Write(response) | ||
| return | ||
| } else { | ||
| // Otherwise we'll fetch the port from our configured ports and include the protocol in the response. | ||
| port, err := strconv.Atoi(matches[1]) | ||
| if err != nil { | ||
| log.Fatalf("strconv.Atoi returned an error: %v", err) | ||
| } | ||
|
|
||
| tunnelPort, ok := specifiedPorts[port] | ||
| if !ok { | ||
| w.WriteHeader(http.StatusNotFound) | ||
| return | ||
| } | ||
|
|
||
| response, err := json.Marshal(tunnelPort) | ||
|
|
||
| if err != nil { | ||
| log.Fatalf("json.Marshal returned an error: %v", err) | ||
| } | ||
|
|
||
| _, _ = w.Write(response) | ||
| return | ||
| } | ||
| } | ||
|
|
||
| // Else this is an unexpected request, fall through to 404 at the bottom | ||
| } | ||
|
|
||
| // If it's a PUT request, we assume it's for creating a new port so we'll do some validation | ||
| // and then return a stub. | ||
| if r.Method == http.MethodPut { | ||
|
Member
Author
There was a problem hiding this comment. Now I did change this to a PUT. This is now a PUT in https://github.com/microsoft/dev-tunnels/blob/06ba8571935cd11a5384cb7d597fa1b796c59282/go/tunnels/manager.go#L465 But previously was a POST: https://github.com/microsoft/dev-tunnels/blob/97233d20448e1c3cb0e0fd9114acf68c7e5c0249/go/tunnels/manager.go#L370 |
||
| // If a port was already configured with this number, and the protocol has changed, return a 400 Bad Request. | ||
| if specifiedPorts != nil { | ||
| port, err := strconv.Atoi(matches[1]) | ||
| if err != nil { | ||
| log.Fatalf("strconv.Atoi returned an error: %v", err) | ||
| } | ||
|
|
||
| var portRequest tunnels.TunnelPort | ||
| if err := json.NewDecoder(r.Body).Decode(&portRequest); err != nil { | ||
| log.Fatalf("json.NewDecoder returned an error: %v", err) | ||
| } | ||
|
|
||
| tunnelPort, ok := specifiedPorts[port] | ||
| if ok { | ||
| if tunnelPort.Protocol != portRequest.Protocol { | ||
| w.WriteHeader(http.StatusBadRequest) | ||
| return | ||
| } | ||
| } | ||
|
|
||
| // Create or update the new port entry. | ||
| specifiedPorts[port] = portRequest | ||
| } | ||
|
|
||
| response, err := json.Marshal(tunnels.TunnelPort{ | ||
| AccessControl: &tunnels.TunnelAccessControl{ | ||
| Entries: []tunnels.TunnelAccessControlEntry{}, | ||
| }, | ||
| }) | ||
|
|
||
| if err != nil { | ||
| log.Fatalf("json.Marshal returned an error: %v", err) | ||
| } | ||
|
|
||
| _, _ = w.Write(response) | ||
| return | ||
| } | ||
|
|
||
| // Finally, if it's not targeting a specific port or a POST request, we return a list of ports, either | ||
| // totally stubbed, or whatever was configured in the mock client options. | ||
| if specifiedPorts == nil { | ||
| response, err := json.Marshal(tunnels.TunnelPortListResponse{ | ||
| Value: []tunnels.TunnelPort{ | ||
| { | ||
| AccessControl: &tunnels.TunnelAccessControl{ | ||
| Entries: []tunnels.TunnelAccessControlEntry{}, | ||
| }, | ||
| }, | ||
| }, | ||
| }) | ||
| if err != nil { | ||
| log.Fatalf("json.Marshal returned an error: %v", err) | ||
| } | ||
|
|
||
| _, _ = w.Write(response) | ||
| return | ||
| } else { | ||
| var ports []tunnels.TunnelPort | ||
| for _, tunnelPort := range specifiedPorts { | ||
| ports = append(ports, tunnelPort) | ||
| } | ||
| response, err := json.Marshal(tunnels.TunnelPortListResponse{ | ||
| Value: ports, | ||
| }) | ||
| if err != nil { | ||
| log.Fatalf("json.Marshal returned an error: %v", err) | ||
| } | ||
|
|
||
| _, _ = w.Write(response) | ||
| return | ||
| } | ||
| } else { | ||
| w.WriteHeader(http.StatusNotFound) | ||
| return | ||
| } | ||
| })) | ||
|
|
||
| url, err := url.Parse(mockServer.URL) | ||
|
|
||
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
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.
Consequence of now requiring api version as per description