Skip to content

Commit

Permalink
update release notes (fatedier#4055)
Browse files Browse the repository at this point in the history
  • Loading branch information
fatedier authored Mar 12, 2024
1 parent 43ba7bd commit e6ec5a5
Show file tree
Hide file tree
Showing 8 changed files with 17 additions and 7 deletions.
9 changes: 9 additions & 0 deletions Release.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,12 @@
### Notable Changes

* The minimum supported Go version has been updated to `1.22`. In the new version of Go, the default minimum supported TLS version has been changed to `TLS 1.2`.
* The default value of `--strict-config` has been changed from `false` to `true`. If your configuration file uses a non-existent configuration item or has a spelling error, the application will throw an error. This startup parameter was introduced in version `v0.53.0`. If you wish to continue using the old behavior, you need to explicitly set `--strict-config=false`.

### Features

* Proxy supports configuring annotations, which will be displayed in the frps dashboard.

### Changes

* Removed dependencies on the forked version of kcp-go and beego log, kcp-go now uses the upstream version, and golib/log replaces beego log.
2 changes: 1 addition & 1 deletion cmd/frpc/sub/root.go
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ func init() {
rootCmd.PersistentFlags().StringVarP(&cfgFile, "config", "c", "./frpc.ini", "config file of frpc")
rootCmd.PersistentFlags().StringVarP(&cfgDir, "config_dir", "", "", "config directory, run one frpc service for each file in config directory")
rootCmd.PersistentFlags().BoolVarP(&showVersion, "version", "v", false, "version of frpc")
rootCmd.PersistentFlags().BoolVarP(&strictConfigMode, "strict_config", "", false, "strict config parsing mode, unknown fields will cause an error")
rootCmd.PersistentFlags().BoolVarP(&strictConfigMode, "strict_config", "", true, "strict config parsing mode, unknown fields will cause an errors")
}

var rootCmd = &cobra.Command{
Expand Down
2 changes: 1 addition & 1 deletion cmd/frps/root.go
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ var (
func init() {
rootCmd.PersistentFlags().StringVarP(&cfgFile, "config", "c", "", "config file of frps")
rootCmd.PersistentFlags().BoolVarP(&showVersion, "version", "v", false, "version of frps")
rootCmd.PersistentFlags().BoolVarP(&strictConfigMode, "strict_config", "", false, "strict config parsing mode, unknown fields will cause error")
rootCmd.PersistentFlags().BoolVarP(&strictConfigMode, "strict_config", "", true, "strict config parsing mode, unknown fields will cause errors")

config.RegisterServerConfigFlags(rootCmd, &serverCfg)
}
Expand Down
2 changes: 1 addition & 1 deletion pkg/config/v1/plugin.go
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ func (c *TypedClientPluginOptions) UnmarshalJSON(b []byte) error {
}

if err := decoder.Decode(options); err != nil {
return err
return fmt.Errorf("unmarshal ClientPluginOptions error: %v", err)
}
c.ClientPluginOptions = options
return nil
Expand Down
2 changes: 1 addition & 1 deletion pkg/config/v1/proxy.go
Original file line number Diff line number Diff line change
Expand Up @@ -186,7 +186,7 @@ func (c *TypedProxyConfig) UnmarshalJSON(b []byte) error {
decoder.DisallowUnknownFields()
}
if err := decoder.Decode(configurer); err != nil {
return err
return fmt.Errorf("unmarshal ProxyConfig error: %v", err)
}
c.ProxyConfigurer = configurer
return nil
Expand Down
2 changes: 1 addition & 1 deletion pkg/config/v1/visitor.go
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ func (c *TypedVisitorConfig) UnmarshalJSON(b []byte) error {
decoder.DisallowUnknownFields()
}
if err := decoder.Decode(configurer); err != nil {
return err
return fmt.Errorf("unmarshal VisitorConfig error: %v", err)
}
c.VisitorConfigurer = configurer
return nil
Expand Down
2 changes: 1 addition & 1 deletion pkg/util/version/version.go
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

package version

var version = "0.54.0"
var version = "0.55.0"

func Full() string {
return version
Expand Down
3 changes: 2 additions & 1 deletion test/e2e/v1/plugin/client.go
Original file line number Diff line number Diff line change
Expand Up @@ -30,10 +30,11 @@ var _ = ginkgo.Describe("[Feature: Client-Plugins]", func() {
name = "%s"
type = "tcp"
remotePort = {{ .%s }}
`+extra, proxyName, portName) + fmt.Sprintf(`
[proxies.plugin]
type = "unix_domain_socket"
unixPath = "{{ .%s }}"
`+extra, proxyName, portName, framework.UDSEchoServerAddr)
`, framework.UDSEchoServerAddr)
}

tests := []struct {
Expand Down

0 comments on commit e6ec5a5

Please sign in to comment.