Merge pull request #260 from kube-tarian/update-cloud-provider-apis

update cloud provider app to take cloud specific attributes
kube-tarian · Oct 22, 2023 · 9199799 · 9199799
2 parents d6354cd + 31cde4e
commit 9199799
Show file tree

Hide file tree

Showing 8 changed files with 1,333 additions and 3,168 deletions.
diff --git a/capten/agent/pkg/pb/agentpb/agent.pb.go b/capten/agent/pkg/pb/agentpb/agent.pb.go
diff --git a/capten/agent/pkg/pb/captenpluginspb/capten_plugins.pb.go b/capten/agent/pkg/pb/captenpluginspb/capten_plugins.pb.go
diff --git a/proto/agent.proto b/proto/agent.proto
@@ -220,44 +220,6 @@ message AppLaunchConfig {
   string launchUIDescription = 6;
 }
 
-message ClusterGitoptsConfig {
-  string usecase = 1;
-  string projectUrl = 2;
-  string status=3;
-  map<string, string> credential=4;
-}
-
-message SetClusterGitoptsProjectRequest {
-  string usecase = 1;
-  string projectUrl = 2;
-  map<string, string> credential=3;
-}
-
-message SetClusterGitoptsProjectResponse {
-  StatusCode status = 1;
-  string statusMessage = 2;
-}
-
-message GetClusterGitoptsProjectRequest {
-  string usecase = 1;
-}
-
-message GetClusterGitoptsProjectResponse {
-  StatusCode status = 1;
-  string statusMessage = 2;
-  ClusterGitoptsConfig clusterGitoptsConfig = 3;
-}
-
-message DeleteClusterGitoptsProjectRequest {
-  string usecase = 1;
-  string projectUrl = 2;
-}
-
-message DeleteClusterGitoptsProjectResponse {
-  StatusCode status = 1;
-  string statusMessage = 2;
-}
-
 message UpgradeAppRequest {
   AppConfig appConfig =1;
   AppValues appValues = 2;

diff --git a/proto/capten_plugins.proto b/proto/capten_plugins.proto
@@ -96,8 +96,7 @@ message GetGitProjectsForLabelsResponse {
 message AddCloudProviderRequest {
     string cloudType = 1;
     repeated string labels = 2;
-    string accessKey = 3;
-    string secretKey = 4;
+    map<string, string> cloudAttributes = 3;
 }
 
 message AddCloudProviderResponse {
@@ -110,8 +109,7 @@ message UpdateCloudProviderRequest {
     string id = 1;
     string cloudType = 2;
     repeated string labels = 3;
-    string accessKey = 4;
-    string secretKey = 5;
+    map<string, string> cloudAttributes = 4;
 }
 
 message UpdateCloudProviderResponse {
@@ -136,8 +134,7 @@ message CloudProvider {
     string cloudType = 2;
     repeated string labels = 3;
     string lastUpdateTime = 4;
-    string accessKey = 5;
-    string secretKey = 6;
+    map<string, string> cloudAttributes = 5;
 }
 
 message GetCloudProvidersResponse {

diff --git a/proto/server.proto b/proto/server.proto
@@ -315,43 +315,3 @@ message UnDeployStoreAppResponse{
   StatusCode status = 1;
   string statusMessage = 2;
 }
-message ClusterGitoptsConfig {
-  string usecase = 1;
-  string projectUrl = 2;
-  string status=3;
-  map<string, string> credential=4;
-}
-
-message SetClusterGitoptsProjectRequest {
-  string clusterId = 1;
-  string usecase = 2;
-  string projectUrl = 3;
-  map<string, string> credential=4;
-}
-
-message SetClusterGitoptsProjectResponse {
-  StatusCode status = 1;
-  string statusMessage = 2;
-}
-
-message GetClusterGitoptsProjectRequest {
-  string clusterId = 1;
-  string usecase = 2;
-}
-
-message GetClusterGitoptsProjectResponse {
-  StatusCode status = 1;
-  string statusMessage = 2;
-  ClusterGitoptsConfig clusterGitoptsConfig = 3;
-}
-
-message DeleteClusterGitoptsProjectRequest {
-  string clusterId = 1;
-  string usecase = 2;
-  string projectUrl = 3;
-}
-
-message DeleteClusterGitoptsProjectResponse {
-  StatusCode status = 1;
-  string statusMessage = 2;
-}