Merge pull request #530 from alphauslabs/recommendation

octo: Fix conflict api names
alphauslabs · Oct 1, 2024 · 285e1a7 · 285e1a7
2 parents f23d283 + 912356b
commit 285e1a7
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 26 deletions.
diff --git a/api/cover/recommendation/octoaws.proto b/api/cover/recommendation/octoaws.proto
@@ -6,7 +6,7 @@ option go_package = "github.com/alphauslabs/blue-sdk-go/api/cover/recommendation
 option java_package = "cloud.alphaus.blueapi.api.cover.recommendation";
 option java_outer_classname = "ApiCoverOctoAwsRecommendationProto";
 
-message AWSRecommendations {
+message OctoGeneratedAWSRecommendations {
 
 }
 

diff --git a/api/cover/recommendation/octoazurecsp.proto b/api/cover/recommendation/octoazurecsp.proto
@@ -6,6 +6,6 @@ option go_package = "github.com/alphauslabs/blue-sdk-go/api/cover/recommendation
 option java_package = "cloud.alphaus.blueapi.api.cover.recommendation";
 option java_outer_classname = "ApiCoverOctoAzureCspRecommendationProto";
 
-message AzureCSPRecommendations {
+message OctoGeneratedAzureCSPRecommendations {
 
 }
diff --git a/api/cover/recommendation/octogcp.proto b/api/cover/recommendation/octogcp.proto
@@ -6,6 +6,6 @@ option go_package = "github.com/alphauslabs/blue-sdk-go/api/cover/recommendation
 option java_package = "cloud.alphaus.blueapi.api.cover.recommendation";
 option java_outer_classname = "ApiCoverOctoGcpRecommendationProto";
 
-message GCPRecommendations {
+message OctoGeneratedGCPRecommendations {
 
 }
diff --git a/api/cover/recommendation/recommendation.proto b/api/cover/recommendation/recommendation.proto
@@ -40,7 +40,7 @@ message RecommendationData {
 }
 
 message OCTOGeneratedRecommendations {
- api.cover.recommendation.octoaws.AWSRecommendations aws = 1;
- api.cover.recommendation.octogcp.GCPRecommendations gcp = 2;
- api.cover.recommendation.octoazurecsp.AzureCSPRecommendations azurecsp = 3;
+ api.cover.recommendation.octoaws.OctoGeneratedAWSRecommendations aws = 1;
+ api.cover.recommendation.octogcp.OctoGeneratedGCPRecommendations gcp = 2;
+ api.cover.recommendation.octoazurecsp.OctoGeneratedAzureCSPRecommendations azurecsp = 3;
 }
diff --git a/openapiv2/apidocs.swagger.json b/openapiv2/apidocs.swagger.json
@@ -18933,6 +18933,9 @@
  }
  }
  },
+ "azurecspAzureCSPRecommendations": {
+ "type": "object"
+ },
  "billingv1AccessGroup": {
  "type": "object",
  "properties": {
@@ -21846,6 +21849,9 @@
  "default": "PENDING",
  "title": "Status of upload file"
  },
+ "gcpGCPRecommendations": {
+ "type": "object"
+ },
  "googlerpcStatus": {
  "type": "object",
  "properties": {
@@ -21869,6 +21875,15 @@
  },
  "description": "The `Status` type defines a logical error model that is suitable for\ndifferent programming environments, including REST APIs and RPC APIs. It is\nused by [gRPC](https://github.com/grpc). Each `Status` message contains\nthree pieces of data: error code, error message, and error details.\n\nYou can find out more about this error model and how to work with it in the\n[API Design Guide](https://cloud.google.com/apis/design/errors)."
  },
+ "octoawsOctoGeneratedAWSRecommendations": {
+ "type": "object"
+ },
+ "octoazurecspOctoGeneratedAzureCSPRecommendations": {
+ "type": "object"
+ },
+ "octogcpOctoGeneratedGCPRecommendations": {
+ "type": "object"
+ },
  "pricingPricingData": {
  "type": "object",
  "properties": {
@@ -21953,13 +21968,13 @@
  "type": "object",
  "properties": {
  "aws": {
- "$ref": "#/definitions/recommendationoctoawsAWSRecommendations"
+ "$ref": "#/definitions/octoawsOctoGeneratedAWSRecommendations"
  },
  "gcp": {
- "$ref": "#/definitions/recommendationoctogcpGCPRecommendations"
+ "$ref": "#/definitions/octogcpOctoGeneratedGCPRecommendations"
  },
  "azurecsp": {
- "$ref": "#/definitions/recommendationoctoazurecspAzureCSPRecommendations"
+ "$ref": "#/definitions/octoazurecspOctoGeneratedAzureCSPRecommendations"
  }
  }
  },
@@ -21970,10 +21985,10 @@
  "$ref": "#/definitions/recommendationawsAWSRecommendations"
  },
  "gcpRecommendations": {
- "$ref": "#/definitions/recommendationgcpGCPRecommendations"
+ "$ref": "#/definitions/gcpGCPRecommendations"
  },
  "azureCspRecommendations": {
- "$ref": "#/definitions/recommendationazurecspAzureCSPRecommendations"
+ "$ref": "#/definitions/azurecspAzureCSPRecommendations"
  },
  "octoGeneratedRecommendations": {
  "$ref": "#/definitions/recommendationOCTOGeneratedRecommendations"
@@ -22057,21 +22072,6 @@
  }
  }
  },
- "recommendationazurecspAzureCSPRecommendations": {
- "type": "object"
- },
- "recommendationgcpGCPRecommendations": {
- "type": "object"
- },
- "recommendationoctoawsAWSRecommendations": {
- "type": "object"
- },
- "recommendationoctoazurecspAzureCSPRecommendations": {
- "type": "object"
- },
- "recommendationoctogcpGCPRecommendations": {
- "type": "object"
- },
  "rippleAssigned": {
  "type": "object",
  "properties": {