Skip to content
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

Merging to release-5.3.0: [TT-11405] Updating JSON tags and field names for TLS max and min versions (#6078) #6083

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions config/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -151,11 +151,11 @@ type StorageOptionsConf struct {
// Maximum TLS version that is supported.
// Options: ["1.0", "1.1", "1.2", "1.3"].
// Defaults to "1.3".
MaxVersion string `json:"max_version"`
TLSMaxVersion string `json:"tls_max_version"`
// Minimum TLS version that is supported.
// Options: ["1.0", "1.1", "1.2", "1.3"].
// Defaults to "1.2".
MinVersion string `json:"min_version"`
TLSMinVersion string `json:"tls_min_version"`
}

type NormalisedURLConfig struct {
Expand Down
4 changes: 2 additions & 2 deletions storage/connection_handler.go
Original file line number Diff line number Diff line change
Expand Up @@ -273,8 +273,8 @@ func NewConnector(connType string, conf config.Config) (model.Connector, error)
CAFile: cfg.CAFile,
CertFile: cfg.CertFile,
KeyFile: cfg.KeyFile,
MinVersion: cfg.MinVersion,
MaxVersion: cfg.MaxVersion,
MinVersion: cfg.TLSMinVersion,
MaxVersion: cfg.TLSMaxVersion,
}
opts = append(opts, model.WithTLS(&tls))
}
Expand Down
Loading