refactor: Use early return pattern to avoid nested conditions (#302)

__tests__/cache-utils.test.ts

@@ -162,7 +162,7 @@ describe('isCacheFeatureAvailable', () => {
     expect(functionResult).toBeFalsy();
   });
 
-  it('should throw when cache feature is unavailable and GHES is used', () => {
+  it('should warn when cache feature is unavailable and GHES is used', () => {
     //Arrange
     isFeatureAvailableSpy.mockImplementation(() => {
       return false;
@@ -170,10 +170,11 @@ describe('isCacheFeatureAvailable', () => {
 
     process.env['GITHUB_SERVER_URL'] = 'https://nongithub.com';
 
-    let errorMessage =
+    let warningMessage =
       'Cache action is only supported on GHES version >= 3.5. If you are on version >=3.5 Please check with GHES admin if Actions cache service is enabled or not.';
 
     //Act + Assert
-    expect(() => cacheUtils.isCacheFeatureAvailable()).toThrow(errorMessage);
+    expect(cacheUtils.isCacheFeatureAvailable()).toBeFalsy();
+    expect(warningSpy).toHaveBeenCalledWith(warningMessage);
   });
 });

dist/cache-save/index.js

@@ -60471,17 +60471,16 @@ function isGhes() {
 }
 exports.isGhes = isGhes;
 function isCacheFeatureAvailable() {
-    if (!cache.isFeatureAvailable()) {
+    if (cache.isFeatureAvailable()) {
+        return true;
+    }
     if (isGhes()) {
-            throw new Error('Cache action is only supported on GHES version >= 3.5. If you are on version >=3.5 Please check with GHES admin if Actions cache service is enabled or not.');
+        core.warning('Cache action is only supported on GHES version >= 3.5. If you are on version >=3.5 Please check with GHES admin if Actions cache service is enabled or not.');
+        return false;
     }
-        else {
     core.warning('The runner was not able to contact the cache service. Caching will be skipped');
-        }
     return false;
 }
-    return true;
-}
 exports.isCacheFeatureAvailable = isCacheFeatureAvailable;
 
 

dist/setup/index.js

@@ -63144,17 +63144,16 @@ function isGhes() {
 }
 exports.isGhes = isGhes;
 function isCacheFeatureAvailable() {
-    if (!cache.isFeatureAvailable()) {
+    if (cache.isFeatureAvailable()) {
+        return true;
+    }
     if (isGhes()) {
-            throw new Error('Cache action is only supported on GHES version >= 3.5. If you are on version >=3.5 Please check with GHES admin if Actions cache service is enabled or not.');
+        core.warning('Cache action is only supported on GHES version >= 3.5. If you are on version >=3.5 Please check with GHES admin if Actions cache service is enabled or not.');
+        return false;
     }
-        else {
     core.warning('The runner was not able to contact the cache service. Caching will be skipped');
-        }
     return false;
 }
-    return true;
-}
 exports.isCacheFeatureAvailable = isCacheFeatureAvailable;
 
 

src/cache-utils.ts

@@ -57,19 +57,19 @@ export function isGhes(): boolean {
 }
 
 export function isCacheFeatureAvailable(): boolean {
-  if (!cache.isFeatureAvailable()) {
+  if (cache.isFeatureAvailable()) {
+    return true;
+  }
+
   if (isGhes()) {
-      throw new Error(
+    core.warning(
       'Cache action is only supported on GHES version >= 3.5. If you are on version >=3.5 Please check with GHES admin if Actions cache service is enabled or not.'
     );
-    } else {
+    return false;
+  }
+
   core.warning(
     'The runner was not able to contact the cache service. Caching will be skipped'
   );
-    }
-
   return false;
 }
-
-  return true;
-}