Skip to content

omit empty on new yaml items #7248

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.

Sign up for GitHub

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

Merged
bheni merged 2 commits into from
Jan 4, 2024
Merged

omit empty on new yaml items #7248

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f3135b5
omit empty on new yaml items
bheni Jan 4, 2024
3122969
only omit empty on ptr types
bheni Jan 4, 2024
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
6 changes: 3 additions & 3 deletions go/cmd/dolt/commands/sqlserver/yaml_config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,8 +126,8 @@ type MetricsYAMLConfig struct {
}

type RemotesapiYAMLConfig struct {
Port_ *int `yaml:"port"`
ReadOnly_ *bool `yaml:"read_only" minver:"1.30.0"`
Port_ *int `yaml:"port,omitempty"`
ReadOnly_ *bool `yaml:"read_only,omitempty" minver:"1.30.0"`
}

func (r RemotesapiYAMLConfig) Port() int {
Expand Down Expand Up @@ -155,7 +155,7 @@ type YAMLConfig struct {
DataDirStr *string `yaml:"data_dir,omitempty"`
CfgDirStr *string `yaml:"cfg_dir,omitempty"`
MetricsConfig MetricsYAMLConfig `yaml:"metrics"`
RemotesapiConfig RemotesapiYAMLConfig `yaml:"remotesapi"`
RemotesapiConfig RemotesapiYAMLConfig `yaml:"remotesapi,omitempty"`
ClusterCfg *ClusterYAMLConfig `yaml:"cluster,omitempty"`
PrivilegeFile *string `yaml:"privilege_file,omitempty"`
BranchControlFile *string `yaml:"branch_control_file,omitempty"`
Expand Down