Cache control

uselagoon · Apr 14, 2024 · 25f03ce · 25f03ce
1 parent ba23bc3
commit 25f03ce
Show file tree

Hide file tree

Showing 2 changed files with 40 additions and 3 deletions.
diff --git a/internal/handler/eolfunctions.go b/internal/handler/eolfunctions.go
@@ -38,8 +38,8 @@ type NewEOLDataArgs struct {
 func NewEOLData(args NewEOLDataArgs) (*EOLData, error) {
 
 	// basic assertions of logic
-	if args.ForceCacheRefresh && !args.PreventCacheRefresh {
-		return nil, fmt.Errorf("You cannot Force Cache Refresh AND Prevent Cache Refresh")
+	if args.ForceCacheRefresh && args.PreventCacheRefresh {
+		return nil, fmt.Errorf("you cannot Force Cache Refresh AND Prevent Cache Refresh")
 	}
 
 	packages := args.Packages
@@ -55,6 +55,9 @@ func NewEOLData(args NewEOLDataArgs) (*EOLData, error) {
 			return nil, err
 		}
 	} else if os.IsNotExist(err) {
+		if args.PreventCacheRefresh {
+			return nil, fmt.Errorf("cache not found and Prevent Cache Refresh enabled")
+		}
 		// Cache file does not exist, fetch data and write to file
 		endOfLifeInfo := GetEndOfLifeInfo(packages)
 		data.Packages = endOfLifeInfo
@@ -91,7 +94,7 @@ func GetEndOfLifeInfo(packageNames []string) map[string][]PackageInfo {
 
 		var data []PackageInfo
 		if err := json.Unmarshal(body, &data); err != nil {
-			fmt.Printf("Error parsing JSON for %s: %v\n", packageName, err)
+			fmt.Printf("error parsing JSON for %s: %v\n", packageName, err)
 			continue
 		}
 

diff --git a/internal/handler/eolfunctions_test.go b/internal/handler/eolfunctions_test.go
@@ -61,6 +61,20 @@ func TestNewEOLData(t *testing.T) {
 				},
 			},
 		},
+		{
+			name:    "Test Assertion Failure",
+			wantErr: true,
+			args: args{
+				EolArgs: NewEOLDataArgs{
+					Packages: []string{
+						"alpine",
+					},
+					CacheLocation:       "testnocache.json",
+					ForceCacheRefresh:   true,
+					PreventCacheRefresh: true,
+				},
+			},
+		},
 	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
@@ -82,6 +96,9 @@ func TestNewEOLData(t *testing.T) {
 				t.Errorf("NewEOLData() error = %v, wantErr %v", err, tt.wantErr)
 				return
 			}
+			if err != nil { // We've got an error, and probably don't need to report it, 'cause it was expected
+				return
+			}
 			if len(got.Packages[tt.args.EolArgs.Packages[0]]) == 0 {
 				t.Errorf("Could not find any Packages for package '%v'\n", tt.args.EolArgs.Packages[0])
 			}
@@ -111,6 +128,20 @@ func TestNewEOLDataWithExistingCache(t *testing.T) {
 				},
 			},
 		},
+		{
+			name:    "Test Nonexistent cache failure",
+			wantErr: true,
+			args: args{
+				EolArgs: NewEOLDataArgs{
+					Packages: []string{
+						"alpine",
+					},
+					CacheLocation:       "doesntexist.json",
+					ForceCacheRefresh:   false,
+					PreventCacheRefresh: true,
+				},
+			},
+		},
 	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
@@ -120,6 +151,9 @@ func TestNewEOLDataWithExistingCache(t *testing.T) {
 				t.Errorf("NewEOLData() error = %v, wantErr %v", err, tt.wantErr)
 				return
 			}
+			if err != nil {
+				return
+			}
 			if len(got.Packages[tt.args.EolArgs.Packages[0]]) == 0 {
 				t.Errorf("Could not find any Packages for package '%v'\n", tt.args.EolArgs.Packages[0])
 			}