Skip to content

Commit

Permalink
Merge branch 'main' into fix-create-selector
Browse files Browse the repository at this point in the history
  • Loading branch information
markphelps authored Nov 26, 2023
2 parents 51dc09a + a189086 commit 47f7740
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions internal/config/storage.go
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ type StorageConfig struct {
Git *Git `json:"git,omitempty" mapstructure:"git,omitempty" yaml:"git,omitempty"`
Object *Object `json:"object,omitempty" mapstructure:"object,omitempty" yaml:"object,omitempty"`
OCI *OCI `json:"oci,omitempty" mapstructure:"oci,omitempty" yaml:"oci,omitempty"`
ReadOnly *bool `json:"read_only,omitempty" mapstructure:"read_only,omitempty" yaml:"read_only,omitempty"`
ReadOnly *bool `json:"readOnly,omitempty" mapstructure:"read_only,omitempty" yaml:"read_only,omitempty"`
}

func (c *StorageConfig) setDefaults(v *viper.Viper) error {
Expand Down Expand Up @@ -253,7 +253,7 @@ type OCI struct {
// Tag defaults to 'latest' when not supplied.
Repository string `json:"repository,omitempty" mapstructure:"repository" yaml:"repository,omitempty"`
// BundlesDirectory is the root directory in which Flipt will store and access local feature bundles.
BundlesDirectory string `json:"bundles_directory,omitempty" mapstructure:"bundles_directory" yaml:"bundles_directory,omitempty"`
BundlesDirectory string `json:"bundlesDirectory,omitempty" mapstructure:"bundles_directory" yaml:"bundles_directory,omitempty"`
// Authentication configures authentication credentials for accessing the target registry
Authentication *OCIAuthentication `json:"-,omitempty" mapstructure:"authentication" yaml:"-,omitempty"`
PollInterval time.Duration `json:"pollInterval,omitempty" mapstructure:"poll_interval" yaml:"poll_interval,omitempty"`
Expand Down

0 comments on commit 47f7740

Please sign in to comment.