Added pflag for stow config in storage (#95)

* Generated pflag for stow config Signed-off-by: Yuvraj <[email protected]> * more changes Signed-off-by: Yuvraj <[email protected]> * more changes Signed-off-by: Yuvraj <[email protected]>
flyteorg · Aug 13, 2021 · f6f76d8 · f6f76d8
1 parent 70ea45d
commit f6f76d8
Show file tree

Hide file tree

Showing 7 changed files with 76 additions and 110 deletions.
diff --git a/cli/pflags/api/testdata/testtype.go b/cli/pflags/api/testdata/testtype.go
diff --git a/cli/pflags/api/testdata/testtype_test.go b/cli/pflags/api/testdata/testtype_test.go
diff --git a/storage/config.go b/storage/config.go
@@ -47,7 +47,7 @@ var (
 type Config struct {
 	Type       Type             `json:"type" pflag:",Sets the type of storage to configure [s3/minio/local/mem/stow]."`
 	Connection ConnectionConfig `json:"connection"`
-	Stow       *StowConfig      `json:"stow,omitempty"`
+	Stow       StowConfig       `json:"stow,omitempty" pflag:",Storage config for stow backend."`
 	// Container here is misleading, it refers to a Bucket (AWS S3) like blobstore entity. In some terms it could be a table
 	InitContainer string `json:"container" pflag:",Initial container (in s3 a bucket) to create -if it doesn't exist-.'"`
 	// By default if this is not enabled, multiple containers are not supported by the storage layer. Only the configured `container` InitContainer will be allowed to requests data from. But, if enabled then data will be loaded to written to any
@@ -79,8 +79,8 @@ type ConnectionConfig struct {
 }
 
 type StowConfig struct {
-	Kind   string            `json:"kind,omitempty" pflag:"-,Kind of Stow backend to use. Refer to github/graymeta/stow"`
-	Config map[string]string `json:"config,omitempty" pflag:"-,Configuration for stow backend. Refer to github/graymeta/stow"`
+	Kind   string            `json:"kind,omitempty" pflag:",Kind of Stow backend to use. Refer to github/graymeta/stow"`
+	Config map[string]string `json:"config,omitempty" pflag:",Configuration for stow backend. Refer to github/graymeta/stow"`
 }
 
 type CachingConfig struct {

diff --git a/storage/config_flags.go b/storage/config_flags.go
diff --git a/storage/config_flags_test.go b/storage/config_flags_test.go
diff --git a/storage/stow_store.go b/storage/stow_store.go
@@ -4,6 +4,7 @@ import (
 	"context"
 	"fmt"
 	"io"
+	"reflect"
 	"sync"
 	"time"
 
@@ -319,7 +320,7 @@ func newStowRawStore(cfg *Config, metricsScope promutils.Scope) (RawStore, error
 
 	var cfgMap stow.ConfigMap
 	var kind string
-	if cfg.Stow != nil {
+	if !reflect.DeepEqual(cfg.Stow, StowConfig{}) {
 		kind = cfg.Stow.Kind
 		cfgMap = cfg.Stow.Config
 	} else {

diff --git a/storage/stow_store_test.go b/storage/stow_store_test.go
@@ -303,7 +303,7 @@ func TestNewLocalStore(t *testing.T) {
 	t.Run("Valid config", func(t *testing.T) {
 		testScope := promutils.NewTestScope()
 		store, err := newStowRawStore(&Config{
-			Stow: &StowConfig{
+			Stow: StowConfig{
 				Kind: local.Kind,
 				Config: map[string]string{
 					local.ConfigKeyPath: "./",
@@ -339,7 +339,7 @@ func TestNewLocalStore(t *testing.T) {
 		assert.NotNil(t, stats)
 
 		store, err := newStowRawStore(&Config{
-			Stow: &StowConfig{
+			Stow: StowConfig{
 				Kind: local.Kind,
 				Config: map[string]string{
 					local.ConfigKeyPath: tmpDir,
@@ -368,7 +368,7 @@ func TestNewLocalStore(t *testing.T) {
 		assert.NotNil(t, stats)
 
 		store, err := newStowRawStore(&Config{
-			Stow: &StowConfig{
+			Stow: StowConfig{
 				Kind: local.Kind,
 				Config: map[string]string{
 					local.ConfigKeyPath: tmpDir,
@@ -390,7 +390,7 @@ func TestNewLocalStore(t *testing.T) {
 		assert.NotNil(t, stats)
 
 		store, err := newStowRawStore(&Config{
-			Stow: &StowConfig{
+			Stow: StowConfig{
 				Kind: local.Kind,
 				Config: map[string]string{
 					local.ConfigKeyPath: tmpDir,
@@ -424,7 +424,7 @@ func Test_newStowRawStore(t *testing.T) {
 		{"fail", args{&Config{}, promutils.NewTestScope()}, true},
 		{"google", args{&Config{
 			InitContainer: "flyte",
-			Stow: &StowConfig{
+			Stow: StowConfig{
 				Kind: google.Kind,
 				Config: map[string]string{
 					google.ConfigProjectId: "x",