Pass feast project name to RedisOnlineStore

Tsotne Tabidze · achals · commit bd17fbfc4c63 · 2022-03-08T12:16:33.000-08:00
Signed-off-by: Tsotne Tabidze &lt;tsotne@tecton.ai&gt;
Signed-off-by: Felix Wang &lt;wangfelix98@gmail.com&gt;
Signed-off-by: Achal Shah &lt;achals@gmail.com&gt;
diff --git a/go/feast/connector.go b/go/feast/connector.go
@@ -11,7 +11,7 @@ func getOnlineStore(config *RepoConfig) (OnlineStore, error) {
 		return nil, errors.New(fmt.Sprintf("could not get online store type from online store config: %+v", config.OnlineStore))
 	}
 	if onlineStoreType == "redis" {
-		onlineStore, err := NewRedisOnlineStore(config.OnlineStore)
+		onlineStore, err := NewRedisOnlineStore(config.Project, config.OnlineStore)
 		return onlineStore, err
 	} else {
 		// TODO(willem): Python connectors here
diff --git a/go/feast/redisonlinestore.go b/go/feast/redisonlinestore.go
@@ -24,10 +24,12 @@ type RedisOnlineStore struct {
 	password string
 	// Redis connection encryption
 	ssl bool
+	// Feast project name
+	project string
 }
 
-func NewRedisOnlineStore(onlineStoreConfig map[string]interface{}) (*RedisOnlineStore, error) {
-	r := RedisOnlineStore{}
+func NewRedisOnlineStore(project string, onlineStoreConfig map[string]interface{}) (*RedisOnlineStore, error) {
+	r := RedisOnlineStore{project: project}
 	// Parse redis_type and write it into r.t
 	redisTypeJson, ok := onlineStoreConfig["redis_type"]
 	if !ok {
diff --git a/go/feast/redisonlinestore_test.go b/go/feast/redisonlinestore_test.go
@@ -9,59 +9,71 @@ func TestNewRedisOnlineStore1(t *testing.T) {
 	onlineStoreConfig := map[string]interface{}{
 		"type": "redis",
 	}
-	r, err := NewRedisOnlineStore(onlineStoreConfig)
+	r, err := NewRedisOnlineStore("feature_repo", onlineStoreConfig)
 	assert.Nil(t, err)
-	assert.Equal(t, []string{"localhost:6379"}, r.addrs)
-	assert.Empty(t, r.password)
-	assert.False(t, r.ssl)
-	assert.Equal(t, redisNode, r.t)
+	assert.Equal(t, &RedisOnlineStore{
+		t:        redisNode,
+		addrs:    []string{"localhost:6379"},
+		password: "",
+		ssl:      false,
+		project:  "feature_repo",
+	}, r)
 }
 
 func TestNewRedisOnlineStore2(t *testing.T) {
 	onlineStoreConfig := map[string]interface{}{
 		"type":       "redis",
 		"redis_type": "redis",
 	}
-	r, err := NewRedisOnlineStore(onlineStoreConfig)
+	r, err := NewRedisOnlineStore("feature_repo", onlineStoreConfig)
 	assert.Nil(t, err)
-	assert.Equal(t, []string{"localhost:6379"}, r.addrs)
-	assert.Empty(t, r.password)
-	assert.False(t, r.ssl)
-	assert.Equal(t, redisNode, r.t)
+	assert.Equal(t, &RedisOnlineStore{
+		t:        redisNode,
+		addrs:    []string{"localhost:6379"},
+		password: "",
+		ssl:      false,
+		project:  "feature_repo",
+	}, r)
 }
 
 func TestNewRedisOnlineStore3(t *testing.T) {
 	onlineStoreConfig := map[string]interface{}{
 		"type":       "redis",
 		"redis_type": "redis_cluster",
 	}
-	r, err := NewRedisOnlineStore(onlineStoreConfig)
+	r, err := NewRedisOnlineStore("feature_repo", onlineStoreConfig)
 	assert.Nil(t, err)
-	assert.Equal(t, []string{"localhost:6379"}, r.addrs)
-	assert.Empty(t, r.password)
-	assert.False(t, r.ssl)
-	assert.Equal(t, redisCluster, r.t)
+	assert.Equal(t, &RedisOnlineStore{
+		t:        redisCluster,
+		addrs:    []string{"localhost:6379"},
+		password: "",
+		ssl:      false,
+		project:  "feature_repo",
+	}, r)
 }
 
 func TestNewRedisOnlineStore4(t *testing.T) {
 	onlineStoreConfig := map[string]interface{}{
 		"type":              "redis_cluster",
 		"connection_string": "localhost:6379,localhost:6380,password=123456,ssl=true",
 	}
-	r, err := NewRedisOnlineStore(onlineStoreConfig)
+	r, err := NewRedisOnlineStore("feature_repo", onlineStoreConfig)
 	assert.Nil(t, err)
-	assert.Equal(t, []string{"localhost:6379", "localhost:6380"}, r.addrs)
-	assert.Equal(t, "123456", r.password)
-	assert.True(t, r.ssl)
-	assert.Equal(t, redisNode, r.t)
+	assert.Equal(t, &RedisOnlineStore{
+		t:        redisNode,
+		addrs:    []string{"localhost:6379", "localhost:6380"},
+		password: "123456",
+		ssl:      true,
+		project:  "feature_repo",
+	}, r)
 }
 
 func TestNewRedisOnlineStore5(t *testing.T) {
 	onlineStoreConfig := map[string]interface{}{
 		"type":              "redis_cluster",
 		"connection_string": "localhost:6379,foo=bar",
 	}
-	_, err := NewRedisOnlineStore(onlineStoreConfig)
+	_, err := NewRedisOnlineStore("feature_repo", onlineStoreConfig)
 	assert.NotNil(t, err)
 }
 
@@ -70,6 +82,6 @@ func TestNewRedisOnlineStore6(t *testing.T) {
 		"type":              "redis_cluster",
 		"connection_string": "localhost:6379,test",
 	}
-	_, err := NewRedisOnlineStore(onlineStoreConfig)
+	_, err := NewRedisOnlineStore("feature_repo", onlineStoreConfig)
 	assert.NotNil(t, err)
 }

Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@ func getOnlineStore(config *RepoConfig) (OnlineStore, error) {`
`11`	`11`	`return nil, errors.New(fmt.Sprintf("could not get online store type from online store config: %+v", config.OnlineStore))`
`12`	`12`	`}`
`13`	`13`	`if onlineStoreType == "redis" {`
`14`		`- onlineStore, err := NewRedisOnlineStore(config.OnlineStore)`
	`14`	`+ onlineStore, err := NewRedisOnlineStore(config.Project, config.OnlineStore)`
`15`	`15`	`return onlineStore, err`
`16`	`16`	`} else {`
`17`	`17`	`// TODO(willem): Python connectors here`