Allow Bigtable appProfileId to be configurable (#32)

terryyylim · web-flow · commit eb30e700782a · 2021-05-18T13:32:16.000+08:00
Signed-off-by: Terence Lim &lt;terencelimxp@gmail.com&gt;
diff --git a/serving/src/main/java/feast/serving/config/FeastProperties.java b/serving/src/main/java/feast/serving/config/FeastProperties.java
@@ -314,7 +314,10 @@ public RedisStoreConfig getRedisConfig() {
     }
 
     public BigTableStoreConfig getBigtableConfig() {
-      return new BigTableStoreConfig(this.config.get("project_id"), this.config.get("instance_id"));
+      return new BigTableStoreConfig(
+          this.config.get("project_id"),
+          this.config.get("instance_id"),
+          this.config.get("app_profile_id"));
     }
 
     public CassandraStoreConfig getCassandraConfig() {
diff --git a/serving/src/main/java/feast/serving/config/ServingServiceConfigV2.java b/serving/src/main/java/feast/serving/config/ServingServiceConfigV2.java
@@ -59,6 +59,7 @@ public BigtableDataClient bigtableClient(FeastProperties feastProperties) throws
         BigtableDataSettings.newBuilder()
             .setProjectId(projectId)
             .setInstanceId(instanceId)
+            .setAppProfileId(config.getAppProfileId())
             .build());
   }
 
diff --git a/serving/src/main/resources/application.yml b/serving/src/main/resources/application.yml
@@ -59,6 +59,7 @@ feast:
       config:
         project_id: <gcp_project>
         instance_id: <gcp_bigtable_instance>
+        app_profile_id: <gcp_bigtable_app_profile_id>
     - name: cassandra
       type: CASSANDRA
       config:
diff --git a/serving/src/test/java/feast/serving/it/ServingServiceBigTableIT.java b/serving/src/test/java/feast/serving/it/ServingServiceBigTableIT.java
@@ -96,6 +96,7 @@ public class ServingServiceBigTableIT extends BaseAuthIT {
 
   static final String PROJECT_ID = "test-project";
   static final String INSTANCE_ID = "test-instance";
+  static final String APP_PROFILE_ID = "default";
   static ManagedChannel channel;
 
   static final FeatureReferenceV2 feature1Reference =
@@ -865,6 +866,7 @@ public BigtableDataClient bigtableClient() throws IOException {
                   environment.getServicePort("bigtable_1", BIGTABLE_PORT))
               .setProjectId(PROJECT_ID)
               .setInstanceId(INSTANCE_ID)
+              .setAppProfileId(APP_PROFILE_ID)
               .build());
     }
   }
diff --git a/storage/connectors/bigtable/src/main/java/feast/storage/connectors/bigtable/retriever/BigTableStoreConfig.java b/storage/connectors/bigtable/src/main/java/feast/storage/connectors/bigtable/retriever/BigTableStoreConfig.java
@@ -19,10 +19,12 @@
 public class BigTableStoreConfig {
   private final String projectId;
   private final String instanceId;
+  private final String appProfileId;
 
-  public BigTableStoreConfig(String projectId, String instanceId) {
+  public BigTableStoreConfig(String projectId, String instanceId, String appProfileId) {
     this.projectId = projectId;
     this.instanceId = instanceId;
+    this.appProfileId = appProfileId;
   }
 
   public String getProjectId() {
@@ -32,4 +34,8 @@ public String getProjectId() {
   public String getInstanceId() {
     return this.instanceId;
   }
+
+  public String getAppProfileId() {
+    return this.appProfileId;
+  }
 }

Original file line number	Diff line number	Diff line change
`@@ -314,7 +314,10 @@ public RedisStoreConfig getRedisConfig() {`
`314`	`314`	`}`
`315`	`315`
`316`	`316`	`public BigTableStoreConfig getBigtableConfig() {`
`317`		`- return new BigTableStoreConfig(this.config.get("project_id"), this.config.get("instance_id"));`
	`317`	`+ return new BigTableStoreConfig(`
	`318`	`+ this.config.get("project_id"),`
	`319`	`+ this.config.get("instance_id"),`
	`320`	`+ this.config.get("app_profile_id"));`
`318`	`321`	`}`
`319`	`322`
`320`	`323`	`public CassandraStoreConfig getCassandraConfig() {`
Original file line number	Diff line number	Diff line change
`@@ -59,6 +59,7 @@ public BigtableDataClient bigtableClient(FeastProperties feastProperties) throws`
`59`	`59`	`BigtableDataSettings.newBuilder()`
`60`	`60`	`.setProjectId(projectId)`
`61`	`61`	`.setInstanceId(instanceId)`
	`62`	`+ .setAppProfileId(config.getAppProfileId())`
`62`	`63`	`.build());`
`63`	`64`	`}`
`64`	`65`
Original file line number	Diff line number	Diff line change
`@@ -96,6 +96,7 @@ public class ServingServiceBigTableIT extends BaseAuthIT {`
`96`	`96`
`97`	`97`	`static final String PROJECT_ID = "test-project";`
`98`	`98`	`static final String INSTANCE_ID = "test-instance";`
	`99`	`+ static final String APP_PROFILE_ID = "default";`
`99`	`100`	`static ManagedChannel channel;`
`100`	`101`
`101`	`102`	`static final FeatureReferenceV2 feature1Reference =`
`@@ -865,6 +866,7 @@ public BigtableDataClient bigtableClient() throws IOException {`
`865`	`866`	`environment.getServicePort("bigtable_1", BIGTABLE_PORT))`
`866`	`867`	`.setProjectId(PROJECT_ID)`
`867`	`868`	`.setInstanceId(INSTANCE_ID)`
	`869`	`+ .setAppProfileId(APP_PROFILE_ID)`
`868`	`870`	`.build());`
`869`	`871`	`}`
`870`	`872`	`}`