Skip to content

Commit

Permalink
Merge branch 'main' into kc/add-url-flag-to-agent-all-types-tcp-http-tls
Browse files Browse the repository at this point in the history
  • Loading branch information
KristopherPaulsen committed Jul 17, 2024
2 parents 25ca989 + ac81e74 commit b4ccdf1
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 1 deletion.
13 changes: 13 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,20 @@
## 1.10.0

Enhancements:

- Adds fasthttp example
- Adds `WithBindings` option
- Adds support for `TrafficPolicy` field

Changes:

- Replace log adapter module license symlinks with full files
- Send `Policy` to the backend as a `TrafficPolicy` string
- unsafe.Pointer -> atomic.Pointer

Bug fixes:

- Propagate half-closes correctly in forward

## 1.9.1

Expand Down
4 changes: 3 additions & 1 deletion config/policy.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import (
"errors"
"fmt"

"github.com/inconshreveable/log15"
"gopkg.in/yaml.v3"

po "golang.ngrok.com/ngrok/policy"
Expand Down Expand Up @@ -77,7 +78,8 @@ func (p *policy) ApplyTCP(opts *tcpOptions) {

// policyToString converts the policy into a JSON string representation. This is to help remap Policy to TrafficPolicy.
func policyToString(p *policy) string {
fmt.Println("WithPolicy has been deprecated. Please use WithPolicyString instead, as WithPolicy will stop working soon.")
logger := log15.New()
logger.Warn("WithPolicy has been deprecated. Please use WithPolicyString instead, as WithPolicy will stop working soon.")

val, err := json.Marshal(p)
if err != nil {
Expand Down

0 comments on commit b4ccdf1

Please sign in to comment.