Merge pull request #443 from kube-tarian/fix-store-type-config

fix store type in store config response
kube-tarian · Mar 25, 2024 · 123a5dd · 123a5dd
2 parents aa02eec + 7590437
commit 123a5dd
Show file tree

Hide file tree

Showing 20 changed files with 1,487 additions and 1,490 deletions.
diff --git a/capten/agent/internal/api/agent_cluster_apps.go b/capten/agent/internal/api/agent_cluster_apps.go
@@ -15,6 +15,7 @@ func (a *Agent) SyncApp(ctx context.Context, request *agentpb.SyncAppRequest) (
 		}, nil
 	}
 
+	request.Data.Config.PluginStoreType = agentpb.PluginStoreType_DEFAULT_CAPTEN_STORE
 	if err := a.as.UpsertAppConfig(request.Data); err != nil {
 		a.log.Errorf("failed to update sync app config, %v", err)
 		return &agentpb.SyncAppResponse{

diff --git a/capten/agent/internal/capten-store/app_config_store.go b/capten/agent/internal/capten-store/app_config_store.go
@@ -43,7 +43,7 @@ const (
 	updateTime                           = "update_time"
 	usecase, projectUrl, status, details = "usecase", "project_url", "status", "details"
 	pluginName, pluginDescription        = "plugin_name", "plugin_description"
-	apiEndpoint                          = "api_endpoint"
+	apiEndpoint, pluginStoreType         = "api_endpoint", "plugin_store_type"
 )
 
 var (
@@ -57,7 +57,7 @@ var (
 		templateValues, defaultApp,
 		icon, installStatus,
 		updateTime, pluginName, pluginDescription,
-		apiEndpoint,
+		apiEndpoint, pluginStoreType,
 	}
 )
 
@@ -104,6 +104,7 @@ func (a *Store) GetAppConfig(appReleaseName string) (*agentpb.SyncAppData, error
 		&config.Icon, &config.InstallStatus,
 		&config.LastUpdateTime, &config.PluginName,
 		&config.PluginDescription, &config.ApiEndpoint,
+		&config.PluginStoreType,
 	); err != nil {
 		return nil, err
 	}
@@ -141,6 +142,7 @@ func (a *Store) GetAllApps() ([]*agentpb.SyncAppData, error) {
 		&config.Icon, &config.InstallStatus,
 		&config.LastUpdateTime, &config.PluginName,
 		&config.PluginDescription, &config.ApiEndpoint,
+		&config.PluginStoreType,
 	) {
 		configCopy := config
 		overrideValuesCopy, _ := base64.StdEncoding.DecodeString(overrideValues)
@@ -265,6 +267,9 @@ func formUpdateKvPairs(config *agentpb.SyncAppData) (string, bool) {
 			fmt.Sprintf("%s = '%s'", apiEndpoint, config.Config.ApiEndpoint))
 	}
 
+	params = append(params,
+		fmt.Sprintf("%s = %d", pluginStoreType, config.Config.PluginStoreType))
+
 	params = append(params,
 		fmt.Sprintf("%s = '%s'", updateTime, time.Now().Format(time.RFC3339)))
 

diff --git a/capten/common-pkg/agentpb/agent.pb.go b/capten/common-pkg/agentpb/agent.pb.go
diff --git a/capten/database/cassandra/migrations/014_app_config.down.cql b/capten/database/cassandra/migrations/014_app_config.down.cql
@@ -0,0 +1 @@
+ALTER TABLE ClusterAppConfig DROP COLUMN plugin_store_type;
diff --git a/capten/database/cassandra/migrations/014_app_config.up.cql b/capten/database/cassandra/migrations/014_app_config.up.cql
@@ -0,0 +1 @@
+ALTER TABLE ClusterAppConfig ADD plugin_store_type INT;
diff --git a/proto/agent.proto b/proto/agent.proto
@@ -188,6 +188,12 @@ message AppStatus {
   string runtimeStatus = 1;
 }
 
+enum PluginStoreType {
+  DEFAULT_CAPTEN_STORE = 0;
+  CENTRAL_CAPTEN_STORE = 1;
+  LOCAL_CAPTEN_STORE = 2;
+}
+
 message AppConfig {
   string releaseName = 1;
   string appName = 2;
@@ -210,6 +216,7 @@ message AppConfig {
   string pluginName = 19;
   string pluginDescription = 20;
   string apiEndpoint = 21;
+  PluginStoreType pluginStoreType = 22;
 }
 
 message AppValues {

diff --git a/proto/plugin_store.proto b/proto/plugin_store.proto
@@ -25,8 +25,9 @@ enum StatusCode {
 }
 
 enum StoreType {
-  CENTRAL_STORE = 0;
-  LOCAL_STORE = 1;  
+  DEFAULT_STORE = 0;
+  CENTRAL_STORE = 1;
+  LOCAL_STORE = 2;
 }
 
 message PluginStoreConfig {

diff --git a/proto/server.proto b/proto/server.proto
@@ -158,6 +158,12 @@ message ClusterAttribute {
   string value = 2;  
 }
 
+enum PluginStoreType {
+  DEFAULT_STORE = 0;
+  CENTRAL_STORE = 1;
+  LOCAL_STORE = 2;
+}
+
 message ClusterAppConfig {
   string releaseName = 1;
   string appName = 2;
@@ -177,6 +183,7 @@ message ClusterAppConfig {
   string runtimeStatus = 16;
   bool defualtApp = 17;
   string pluginName = 18;
+  PluginStoreType pluginStoreType = 19;
 }
 
 message AddStoreAppRequest {

diff --git a/server/examples/agent/agent_client.go b/server/examples/agent/agent_client.go
diff --git a/server/examples/astra/astra-client.go b/server/examples/astra/astra-client.go
diff --git a/server/examples/server/server_client.go b/server/examples/server/server_client.go
diff --git a/server/pkg/api/app_config_mapping.go b/server/pkg/api/app_config_mapping.go
@@ -26,6 +26,7 @@ func mapAgentAppsToServerResp(appDataList []*agentpb.AppData) []*serverpb.Cluste
 		clusterAppConfig.RuntimeStatus = ""
 		clusterAppConfig.DefualtApp = appConfig.Config.DefualtApp
 		clusterAppConfig.PluginName = appConfig.Config.PluginName
+		clusterAppConfig.PluginStoreType = serverpb.PluginStoreType(appConfig.Config.PluginStoreType)
 		clusterAppConfigs[index] = &clusterAppConfig
 	}
 	return clusterAppConfigs
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		ALTER TABLE ClusterAppConfig DROP COLUMN plugin_store_type;
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		ALTER TABLE ClusterAppConfig ADD plugin_store_type INT;