Merge pull request #26 from codecrafters-io/alpha-fixes-4

Alpha fixes - 4
codecrafters-io · Oct 1, 2024 · 9db82cc · 9db82cc
2 parents fce4f5a + 3cf4669
commit 9db82cc
Show file tree

Hide file tree

Showing 16 changed files with 402 additions and 531 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -35,7 +35,7 @@ jobs:
         uses: actions/checkout@v2
 
       - name: Set up Go
-        uses: actions/setup-go@v1
+        uses: actions/setup-go@v5
         with:
           go-version: 1.22.x
 

diff --git a/internal/assertions/apiversions_response_assertion.go b/internal/assertions/apiversions_response_assertion.go
@@ -50,13 +50,18 @@ func (a ApiVersionsResponseAssertion) Evaluate(fields []string, AssertApiVersion
 			for _, actualApiVersionKey := range a.ActualValue.ApiKeys {
 				if actualApiVersionKey.ApiKey == expectedApiVersionKey.ApiKey {
 					found = true
-					if actualApiVersionKey.MinVersion > expectedApiVersionKey.MinVersion {
+					if actualApiVersionKey.MaxVersion < expectedApiVersionKey.MinVersion {
+						return fmt.Errorf("Expected max version %v to be >= min version %v for %s", actualApiVersionKey.MaxVersion, actualApiVersionKey.MinVersion, apiKeyNames[expectedApiVersionKey.ApiKey])
+					}
+
+					// anything above or equal to expected minVersion is fine
+					if actualApiVersionKey.MinVersion < expectedApiVersionKey.MinVersion {
 						return fmt.Errorf("Expected API version %v to be supported for %s, got %v", expectedApiVersionKey.MaxVersion, apiKeyNames[expectedApiVersionKey.ApiKey], actualApiVersionKey.MaxVersion)
 					}
 					logger.Successf("✓ API version %v is supported for %s", actualApiVersionKey.MaxVersion, apiKeyNames[expectedApiVersionKey.ApiKey])
 
-					if actualApiVersionKey.MinVersion < expectedApiVersionKey.MinVersion {
-						return fmt.Errorf("Expected API version %v to be supported for %s, got %v", expectedApiVersionKey.MinVersion, apiKeyNames[expectedApiVersionKey.ApiKey], actualApiVersionKey.MinVersion)
+					if actualApiVersionKey.MaxVersion < expectedApiVersionKey.MaxVersion {
+						return fmt.Errorf("Expected API version %v to be supported for %s, got %v", expectedApiVersionKey.MaxVersion, apiKeyNames[expectedApiVersionKey.ApiKey], actualApiVersionKey.MaxVersion)
 					}
 					logger.Successf("✓ API version %v is supported for %s", actualApiVersionKey.MinVersion, apiKeyNames[expectedApiVersionKey.ApiKey])
 				}