Check minor version and default keys to match in compatibility matrix

airflow/docker_test.go

@@ -89,7 +89,9 @@ services:
     ports:
       - 127.0.0.1:5432:5432
     volumes:
+
       - postgres_data:/var/lib/postgresql/data
+
     environment:
       POSTGRES_USER: postgres
       POSTGRES_PASSWORD: postgres
@@ -115,7 +117,9 @@ services:
       - airflow_home/include:/usr/local/airflow/include:z
       - airflow_home/tests:/usr/local/airflow/tests:z
 
+
       - airflow_logs:/usr/local/airflow/logs
+
 
 
   webserver:
@@ -146,7 +150,9 @@ services:
       - airflow_home/plugins:/usr/local/airflow/plugins:z
       - airflow_home/include:/usr/local/airflow/include:z
       - airflow_home/tests:/usr/local/airflow/tests:z
+
       - airflow_logs:/usr/local/airflow/logs
+
     healthcheck:
       test: curl --fail http://webserver:8080/health || exit 1
       interval: 2s
@@ -200,7 +206,9 @@ services:
     ports:
       - 127.0.0.1:5432:5432
     volumes:
+
       - postgres_data:/var/lib/postgresql/data
+
     environment:
       POSTGRES_USER: postgres
       POSTGRES_PASSWORD: postgres
@@ -226,7 +234,9 @@ services:
       - airflow_home/include:/usr/local/airflow/include:z
       - airflow_home/tests:/usr/local/airflow/tests:z
 
+
       - airflow_logs:/usr/local/airflow/logs
+
 
 
   webserver:
@@ -257,7 +267,9 @@ services:
       - airflow_home/plugins:/usr/local/airflow/plugins:z
       - airflow_home/include:/usr/local/airflow/include:z
       - airflow_home/tests:/usr/local/airflow/tests:z
+
       - airflow_logs:/usr/local/airflow/logs
+
     healthcheck:
       test: curl --fail http://webserver:8080/health || exit 1
       interval: 2s
@@ -285,7 +297,9 @@ services:
       - airflow_home/dags:/usr/local/airflow/dags:z
       - airflow_home/plugins:/usr/local/airflow/plugins:z
       - airflow_home/include:/usr/local/airflow/include:z
+
       - airflow_logs:/usr/local/airflow/logs
+
 
 
 `

cmd/sql/flow_test.go

@@ -172,24 +172,12 @@ func execFlowCmd(args ...string) error {
 	return err
 }
 
-func execFlowCmdWrongVersion(args ...string) error {
-	version.CurrVersion = "foo"
-	cmd := NewFlowCommand()
-	cmd.SetArgs(args)
-	_, err := cmd.ExecuteC()
-	return err
-}
-
 func TestFlowCmd(t *testing.T) {
 	defer patchExecuteCmdInDocker(t, 0, nil)()
 	err := execFlowCmd()
 	assert.NoError(t, err)
 }
 
-func TestFlowCmdWrongVersion(t *testing.T) {
-	assert.PanicsWithError(t, "error running []: error parsing response for SQL CLI version %!w(<nil>)", func() { execFlowCmdWrongVersion() })
-}
-
 func TestFlowCmdError(t *testing.T) {
 	defer patchExecuteCmdInDocker(t, 0, errMock)()
 	err := execFlowCmd("version")

pkg/testing/testing.go

@@ -58,6 +58,7 @@ func NewTestConfig(platform string) []byte {
 local:
   enabled: true
   host: http://localhost:8871/v1
+duplicate_volumes: true
 context: %s
 contexts:
   %s:

sql/flow_config.go

@@ -5,6 +5,7 @@ import (
 	"encoding/json"
 	"fmt"
 	"net/http"
+	"regexp"
 )
 
 type configResponse struct {
@@ -38,6 +39,13 @@ var (
 
 var httpClient = &http.Client{}
 
+var semVerRegex = regexp.MustCompile("^(.*)[.](.*)[.](.*)$")
+
+const (
+	trimmedMinorVersionRegexMatchString = "$1.$2"
+	defaultVersionString                = "default"
+)
+
 type AstroSQLCliVersion struct {
 	Version    string
 	Prerelease bool
@@ -61,7 +69,14 @@ func GetPypiVersion(configURL, astroCliVersion string) (AstroSQLCliVersion, erro
 	}
 	SQLCliCompatibility, exists := resp.SQLCliCompatibility[astroCliVersion]
 	if !exists {
-		return AstroSQLCliVersion{}, fmt.Errorf("error parsing response for SQL CLI version %w", err)
+		astroCliMinorVersion := semVerRegex.ReplaceAllString(astroCliVersion, trimmedMinorVersionRegexMatchString)
+		SQLCliCompatibility, exists = resp.SQLCliCompatibility[astroCliMinorVersion]
+		if !exists {
+			SQLCliCompatibility, exists = resp.SQLCliCompatibility[defaultVersionString]
+			if !exists {
+				return AstroSQLCliVersion{}, fmt.Errorf("error parsing response for SQL CLI version %w", err)
+			}
+		}
 	}
 	return AstroSQLCliVersion{SQLCliCompatibility.SQLCliVersion, SQLCliCompatibility.PreRelease}, nil
 }

sql/flow_config_test.go

@@ -26,10 +26,19 @@ func TestGetPypiVersionInvalidHTTPRequestFailure(t *testing.T) {
 	assert.ErrorContains(t, err, expectedErrContains)
 }
 
-func TestGetPypiVersionInvalidAstroCliVersionFailure(t *testing.T) {
-	_, err := GetPypiVersion("https://raw.githubusercontent.com/astronomer/astro-sdk/astro-cli/sql-cli/config/astro-cli.json", "foo")
-	expectedErrContains := "error parsing response for SQL CLI version"
-	assert.ErrorContains(t, err, expectedErrContains)
+func TestGetPypiVersionInvalidAstroCliVersionExactMatchSuccess(t *testing.T) {
+	_, err := GetPypiVersion("https://raw.githubusercontent.com/astronomer/astro-sdk/astro-cli/sql-cli/config/astro-cli.json", "1.9.0")
+	assert.NoError(t, err)
+}
+
+func TestGetPypiVersionInvalidAstroCliVersionMinorVersionMatchSuccess(t *testing.T) {
+	_, err := GetPypiVersion("https://raw.githubusercontent.com/astronomer/astro-sdk/astro-cli/sql-cli/config/astro-cli.json", "1.10.1")
+	assert.NoError(t, err)
+}
+
+func TestGetPypiVersionInvalidAstroCliVersionDefaultMatchSuccess(t *testing.T) {
+	_, err := GetPypiVersion("https://raw.githubusercontent.com/astronomer/astro-sdk/astro-cli/sql-cli/config/astro-cli.json", "x.y.z")
+	assert.NoError(t, err)
 }
 
 func TestGetBaseDockerImageURIInvalidURLFailure(t *testing.T) {