Skip to content

Commit 22e0405

Browse files
committed
SDKQE-3638: Fix to support reading ReleaseId for GCP cluster
1 parent a77b7a5 commit 22e0405

1 file changed

Lines changed: 8 additions & 2 deletions

File tree

deployment/clouddeploy/helper.go

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -91,13 +91,19 @@ func isServiceEqual(services1 []capellacontrol.ClusterInfo_Service, services2 []
9191
}
9292

9393
func getReleaseIdFromServerImage(serverImage string) (string, error) {
94-
lastIndex := strings.LastIndex(serverImage, ".")
94+
// GCP images don't contain "." instead they have "-" and therefore cbdino is not able to read release ID for gcp images.
95+
// For example -
96+
// gcp image: "couchbase-cloud-server-7-6-5-5724-v1-0-53" has release ID "1.0.53"
97+
// aws image: "couchbase-cloud-server-7.6.5-5724-arm64-v1.0.53" has release ID "1.0.53"
98+
// azure image: "couchbase-cloud-server-7.6.5-v5720.0.53" has release ID "1.0.53"
99+
formattedServerImage := strings.ReplaceAll(serverImage, "-", ".")
100+
lastIndex := strings.LastIndex(formattedServerImage, ".")
95101
if lastIndex == -1 {
96102
// "." not found, handle error
97103
return "", errors.New(fmt.Sprintf("ServerImage is not in expected format"))
98104
}
99105
// The release ID is formed by combining the number after the last dot in the server image with "1.0.".
100-
releaseNumberStr := serverImage[lastIndex+1:]
106+
releaseNumberStr := formattedServerImage[lastIndex+1:]
101107

102108
// Validate if the release number is a valid integer
103109
releaseNumber, err := strconv.Atoi(releaseNumberStr)

0 commit comments

Comments
 (0)