Skip to content

Commit d7ecad2

Browse files
vramk23vramk23
authored
Merge pull request #476 from kube-tarian/plugin-data-with-uimodule
adding plugin uimoduleendpoint
2 parents d96d6cb + 1388f23 commit d7ecad2

File tree

33 files changed

+2792
-4611
lines changed

33 files changed

+2792
-4611
lines changed

‎capten/agent/internal/api/agent_cluster_apps.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -76,16 +76,16 @@ func (a *Agent) GetClusterAppLaunches(ctx context.Context, request *agentpb.GetC
7676
}
7777

7878
appConfig := r.GetConfig()
79-
if len(appConfig.LaunchURL) == 0 {
79+
if len(appConfig.UiEndpoint) == 0 {
8080
continue
8181
}
8282

8383
cfgs = append(cfgs, &agentpb.AppLaunchConfig{
8484
ReleaseName: r.GetConfig().GetReleaseName(),
8585
Category: r.GetConfig().GetCategory(),
86-
Description: r.GetConfig().GetLaunchUIDescription(),
86+
Description: r.GetConfig().GetDescription(),
8787
Icon: r.GetConfig().GetIcon(),
88-
LaunchURL: r.GetConfig().GetLaunchURL(),
88+
UiEndpoint: r.GetConfig().GetUiEndpoint(),
8989
SsoSupported: ssoSupported,
9090
})
9191
}

‎capten/agent/internal/api/capten_plugin_apis.go‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,9 @@ func (a *Agent) GetCaptenPlugins(ctx context.Context, request *captenpluginspb.G
2929
plugins = append(plugins, &captenpluginspb.CaptenPlugin{
3030
PluginName: r.GetConfig().GetPluginName(),
3131
PluginDescription: r.GetConfig().GetPluginDescription(),
32-
LaunchIcon: r.GetConfig().GetIcon(),
33-
LaunchURL: r.GetConfig().GetLaunchURL(),
32+
Icon: r.GetConfig().GetIcon(),
33+
UiEndpoint: r.GetConfig().GetUiEndpoint(),
34+
UiModuleEndpoint: r.GetConfig().GetUiModuleEndpoint(),
3435
ApiEndpoint: r.GetConfig().GetApiEndpoint(),
3536
InstallStatus: r.GetConfig().GetInstallStatus(),
3637
RuntimeStatus: r.GetConfig().GetRuntimeStatus(),

‎capten/agent/internal/capten-store/app_config_store.go‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ const (
3535
appName, description, category = "app_name", "description", "category"
3636
chartName, repoName, repoUrl = "chart_name", "repo_name", "repo_url"
3737
namespace, releaseName, version = "namespace", "release_name", "version"
38-
launchUrl, launchUIDesc = "launch_url", "launch_redirect_url"
38+
uiEndpoint, uiModuleEndpoint = "ui_endpoint", "ui_module_endpoint"
3939
createNamespace, privilegedNamespace = "create_namespace", "privileged_namespace"
4040
overrideValues, launchUiValues = "override_values", "launch_ui_values"
4141
templateValues, defaultApp = "template_values", "default_app"
@@ -51,7 +51,7 @@ var (
5151
appName, description, category,
5252
chartName, repoName, repoUrl,
5353
namespace, releaseName, version,
54-
launchUrl, launchUIDesc,
54+
uiEndpoint, uiModuleEndpoint,
5555
createNamespace, privilegedNamespace,
5656
overrideValues, launchUiValues,
5757
templateValues, defaultApp,
@@ -97,7 +97,7 @@ func (a *Store) GetAppConfig(appReleaseName string) (*agentpb.SyncAppData, error
9797
&config.AppName, &config.Description, &config.Category,
9898
&config.ChartName, &config.RepoName, &config.RepoURL,
9999
&config.Namespace, &config.ReleaseName, &config.Version,
100-
&config.LaunchURL, &config.LaunchUIDescription,
100+
&config.UiEndpoint, &config.UiModuleEndpoint,
101101
&config.CreateNamespace, &config.PrivilegedNamespace,
102102
&overrideValues, &launchUiValues,
103103
&templateValues, &config.DefualtApp,
@@ -135,7 +135,7 @@ func (a *Store) GetAllApps() ([]*agentpb.SyncAppData, error) {
135135
&config.AppName, &config.Description, &config.Category,
136136
&config.ChartName, &config.RepoName, &config.RepoURL,
137137
&config.Namespace, &config.ReleaseName, &config.Version,
138-
&config.LaunchURL, &config.LaunchUIDescription,
138+
&config.UiEndpoint, &config.UiEndpoint,
139139
&config.CreateNamespace, &config.PrivilegedNamespace,
140140
&overrideValues, &launchUiValues,
141141
&templateValues, &config.DefualtApp,
@@ -197,14 +197,14 @@ func formUpdateKvPairs(config *agentpb.SyncAppData) (string, bool) {
197197
fmt.Sprintf("%s = true", privilegedNamespace))
198198
}
199199

200-
if config.Config.LaunchURL != "" {
200+
if config.Config.UiEndpoint != "" {
201201
params = append(params,
202-
fmt.Sprintf("%s = '%s'", launchUrl, config.Config.LaunchURL))
202+
fmt.Sprintf("%s = '%s'", uiEndpoint, config.Config.UiEndpoint))
203203
}
204204

205-
if config.Config.LaunchUIDescription != "" {
205+
if config.Config.UiModuleEndpoint != "" {
206206
params = append(params,
207-
fmt.Sprintf("%s = '%s'", launchUIDesc, config.Config.LaunchUIDescription))
207+
fmt.Sprintf("%s = '%s'", uiModuleEndpoint, config.Config.UiModuleEndpoint))
208208
}
209209

210210
if config.Config.AppName != "" {

‎capten/agent/internal/pb/captenpluginspb/capten_plugins.pb.go‎

Lines changed: 450 additions & 439 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎capten/common-pkg/agentpb/agent.pb.go‎

Lines changed: 264 additions & 275 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎capten/common-pkg/cluster-plugins/clusterpluginspb/cluster_plugins.pb.go‎

Lines changed: 116 additions & 105 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎capten/common-pkg/pluginconfig-store/app_config_store.go‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ const (
3535
appName, description, category = "app_name", "description", "category"
3636
chartName, repoName, repoUrl = "chart_name", "repo_name", "repo_url"
3737
namespace, releaseName, version = "namespace", "release_name", "version"
38-
launchUrl, launchUIDesc = "launch_url", "launch_redirect_url"
38+
appUiEndpoint, uiModuleEndpoint = "ui_endpoint", "ui_module_endpoint"
3939
createNamespace, privilegedNamespace = "create_namespace", "privileged_namespace"
4040
overrideValues, launchUiValues = "override_values", "launch_ui_values"
4141
templateValues, defaultApp = "template_values", "default_app"
@@ -51,7 +51,7 @@ var (
5151
appName, description, category,
5252
chartName, repoName, repoUrl,
5353
namespace, releaseName, version,
54-
launchUrl, launchUIDesc,
54+
appUiEndpoint, uiModuleEndpoint,
5555
createNamespace, privilegedNamespace,
5656
overrideValues, launchUiValues,
5757
templateValues, defaultApp,
@@ -97,7 +97,7 @@ func (a *Store) GetAppConfig(appReleaseName string) (*agentpb.SyncAppData, error
9797
&config.AppName, &config.Description, &config.Category,
9898
&config.ChartName, &config.RepoName, &config.RepoURL,
9999
&config.Namespace, &config.ReleaseName, &config.Version,
100-
&config.LaunchURL, &config.LaunchUIDescription,
100+
&config.UiEndpoint, &config.UiModuleEndpoint,
101101
&config.CreateNamespace, &config.PrivilegedNamespace,
102102
&overrideValues, &launchUiValues,
103103
&templateValues, &config.DefualtApp,
@@ -134,7 +134,7 @@ func (a *Store) GetAllApps() ([]*agentpb.SyncAppData, error) {
134134
&config.AppName, &config.Description, &config.Category,
135135
&config.ChartName, &config.RepoName, &config.RepoURL,
136136
&config.Namespace, &config.ReleaseName, &config.Version,
137-
&config.LaunchURL, &config.LaunchUIDescription,
137+
&config.UiEndpoint, &config.UiModuleEndpoint,
138138
&config.CreateNamespace, &config.PrivilegedNamespace,
139139
&overrideValues, &launchUiValues,
140140
&templateValues, &config.DefualtApp,
@@ -195,14 +195,14 @@ func formUpdateKvPairs(config *agentpb.SyncAppData) (string, bool) {
195195
fmt.Sprintf("%s = true", privilegedNamespace))
196196
}
197197

198-
if config.Config.LaunchURL != "" {
198+
if config.Config.UiEndpoint != "" {
199199
params = append(params,
200-
fmt.Sprintf("%s = '%s'", launchUrl, config.Config.LaunchURL))
200+
fmt.Sprintf("%s = '%s'", appUiEndpoint, config.Config.UiEndpoint))
201201
}
202202

203-
if config.Config.LaunchUIDescription != "" {
203+
if config.Config.UiModuleEndpoint != "" {
204204
params = append(params,
205-
fmt.Sprintf("%s = '%s'", launchUIDesc, config.Config.LaunchUIDescription))
205+
fmt.Sprintf("%s = '%s'", uiModuleEndpoint, config.Config.UiModuleEndpoint))
206206
}
207207

208208
if config.Config.AppName != "" {

0 commit comments

Comments
 (0)