Fixing isReplacementAvailableIn logic when field available in is empty (

#516) * Fixing isReplacementAvailableIn logic when field available in is empty * Fixing tests * Fixing tests * Fixed tests
FairwindsOps · Nov 9, 2023 · 7d28833 · 7d28833
1 parent 0f1ca9b
commit 7d28833
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 6 deletions.
diff --git a/pkg/api/output_test.go b/pkg/api/output_test.go
@@ -84,6 +84,7 @@ var testOutputDeprecatedNotRemoved = &Output{
 		ReplacementAPI: "none",
 		Component:      "foo",
 	},
+	ReplacementAvailable: false,
 }
 
 func init() {
@@ -109,7 +110,7 @@ func ExampleInstance_DisplayOutput_normal() {
 	// NAME-------------------- KIND-------- VERSION------------- REPLACEMENT-- REMOVED-- DEPRECATED-- REPL AVAIL--
 	// some name one----------- Deployment-- extensions/v1beta1-- apps/v1------ true----- true-------- true--------
 	// some name two----------- Deployment-- extensions/v1beta1-- apps/v1------ true----- true-------- true--------
-	// deprecated not removed-- Deployment-- apps/v1------------- none--------- false---- true-------- true--------
+	// deprecated not removed-- Deployment-- apps/v1------------- none--------- false---- true-------- false-------
 }
 
 func ExampleInstance_DisplayOutput_onlyShowRemoved() {
@@ -411,7 +412,7 @@ func TestGetReturnCode(t *testing.T) {
 				ignoreRemovals:               false,
 				ignoreReplacementUnavailable: false,
 			},
-			want: 2,
+			want: 4,
 		},
 		{
 			name: "version is deprecated ignore deprecations",
@@ -429,7 +430,7 @@ func TestGetReturnCode(t *testing.T) {
 				ignoreRemovals:               false,
 				ignoreReplacementUnavailable: false,
 			},
-			want: 0,
+			want: 4,
 		},
 		{
 			name: "version is removed",
@@ -447,7 +448,7 @@ func TestGetReturnCode(t *testing.T) {
 				ignoreRemovals:               false,
 				ignoreReplacementUnavailable: false,
 			},
-			want: 3,
+			want: 4,
 		},
 		{
 			name: "version is removed and replacement is unavailable",

diff --git a/pkg/api/versions.go b/pkg/api/versions.go
@@ -253,7 +253,7 @@ func (v *Version) isReplacementAvailableIn(targetVersions map[string]string) boo
 	}
 
 	if v.ReplacementAvailableIn == "" {
-		return true
+		return false
 	}
 
 	targetVersion, ok := targetVersions[v.Component]

diff --git a/pkg/api/versions_test.go b/pkg/api/versions_test.go
@@ -467,7 +467,7 @@ func TestVersion_isReplacementAvailableIn(t *testing.T) {
 			targetVersions:         map[string]string{"foo": "v1.16.0"},
 			component:              "foo",
 			replacementAvailableIn: "",
-			want:                   true,
+			want:                   false,
 		},
 		{
 			name:                   "targetVersions not included for component",