fix for incorrect cloud domain identification (#890)

- if user logs in `https://cloud.astronomer-dev.io` it gets validated as cloud domaini
- before it used to incorrectly get identified as software domain

context/context.go

@@ -17,7 +17,8 @@ var (
 	// CloudDomainRegex is used to differentiate cloud domain from software domain
 	// See https://github.com/astronomer/astrohub-cli/issues/7 for regexp rationale
 	// This will need to be handled as part of the permanent solution to issue #432
-	CloudDomainRegex     = regexp.MustCompile(`(?:(pr\d{4,6})\.|^)(?:cloud\.|)astronomer(?:-(dev|stage|perf))?\.io$`)
+	// CloudDomainRegex     = regexp.MustCompile(`(?:(pr\d{4,6})\.|^)(?:cloud\.|)astronomer(?:-(dev|stage|perf))?\.io$`)
+	CloudDomainRegex     = regexp.MustCompile(`(?:https:\/\/|^)(?:(pr\d{4,6})\.|)(?:cloud\.|)astronomer(?:-(dev|stage|perf))?\.io(?:\/|)$`)
 	contextDeleteWarnMsg = "Are you sure you want to delete currently used context: %s"
 	cancelCtxDeleteMsg   = "Canceling context delete..."
 	failCtxDeleteMsg     = "Error deleting context %s: "

context/context_test.go

@@ -127,7 +127,17 @@ func TestIsCloudDomain(t *testing.T) {
 		"astronomer-dev.io",
 		"astronomer-stage.io",
 		"astronomer-perf.io",
+		"cloud.astronomer.io",
 		"cloud.astronomer-dev.io",
+		"cloud.astronomer-stage.io",
+		"cloud.astronomer-perf.io",
+		"https://cloud.astronomer.io",
+		"https://cloud.astronomer-dev.io",
+		"https://cloud.astronomer-dev.io/",
+		"https://cloud.astronomer-stage.io",
+		"https://cloud.astronomer-stage.io/",
+		"https://cloud.astronomer-perf.io",
+		"https://cloud.astronomer-perf.io/",
 		"pr1234.cloud.astronomer-dev.io",
 		"pr1234.astronomer-dev.io",
 		"pr12345.astronomer-dev.io",

pkg/domainutil/domain.go

@@ -16,6 +16,8 @@ var PRPreviewDomainRegex = regexp.MustCompile(`^(pr\d{4,6}).astronomer-dev\.io$`
 func FormatDomain(domain string) string {
 	if strings.Contains(domain, "cloud") {
 		domain = strings.Replace(domain, "cloud.", "", 1)
+		domain = strings.Replace(domain, "https://", "", 1)
+		domain = strings.TrimRight(domain, "/") // removes trailing / if present
 	} else if domain == "" {
 		domain = DefaultDomain
 	}

pkg/domainutil/domain_test.go

@@ -52,18 +52,38 @@ func TestFormatDomain(t *testing.T) {
 		actual := FormatDomain("cloud.astronomer-dev.io")
 		assert.Equal(t, "astronomer-dev.io", actual)
 	})
+	t.Run("removes https://cloud from cloud.astronomer-dev.io", func(t *testing.T) {
+		actual := FormatDomain("https://cloud.astronomer-dev.io")
+		assert.Equal(t, "astronomer-dev.io", actual)
+	})
+	t.Run("removes trailing / from cloud.astronomer-dev.io", func(t *testing.T) {
+		actual := FormatDomain("https://cloud.astronomer-dev.io/")
+		assert.Equal(t, "astronomer-dev.io", actual)
+	})
 	t.Run("removes cloud from cloud.astronomer-stage.io", func(t *testing.T) {
 		actual := FormatDomain("cloud.astronomer-stage.io")
 		assert.Equal(t, "astronomer-stage.io", actual)
 	})
+	t.Run("removes https://cloud from cloud.astronomer-stage.io", func(t *testing.T) {
+		actual := FormatDomain("https://cloud.astronomer-stage.io")
+		assert.Equal(t, "astronomer-stage.io", actual)
+	})
 	t.Run("removes cloud from cloud.astronomer-perf.io", func(t *testing.T) {
 		actual := FormatDomain("cloud.astronomer-perf.io")
 		assert.Equal(t, "astronomer-perf.io", actual)
 	})
+	t.Run("removes https://cloud from cloud.astronomer-perf.io", func(t *testing.T) {
+		actual := FormatDomain("https://cloud.astronomer-perf.io")
+		assert.Equal(t, "astronomer-perf.io", actual)
+	})
 	t.Run("removes cloud from pr1234.cloud.astronomer-dev.io", func(t *testing.T) {
 		actual := FormatDomain("pr1234.cloud.astronomer-dev.io")
 		assert.Equal(t, "pr1234.astronomer-dev.io", actual)
 	})
+	t.Run("removes https://cloud from pr1234.cloud.astronomer-dev.io", func(t *testing.T) {
+		actual := FormatDomain("https://pr1234.cloud.astronomer-dev.io")
+		assert.Equal(t, "pr1234.astronomer-dev.io", actual)
+	})
 	t.Run("sets default domain if one was not provided", func(t *testing.T) {
 		actual := FormatDomain("")
 		assert.Equal(t, "astronomer.io", actual)