mirror of
				https://github.com/actions/setup-go.git
				synced 2025-10-31 14:04:41 -04:00 
			
		
		
		
	refactor: Use early return pattern to avoid nested conditions (#302)
This commit is contained in:
		| @@ -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); | ||||
|   }); | ||||
| }); | ||||
|   | ||||
							
								
								
									
										15
									
								
								dist/cache-save/index.js
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										15
									
								
								dist/cache-save/index.js
									
									
									
									
										vendored
									
									
								
							| @@ -60471,16 +60471,15 @@ function isGhes() { | ||||
| } | ||||
| exports.isGhes = isGhes; | ||||
| function isCacheFeatureAvailable() { | ||||
|     if (!cache.isFeatureAvailable()) { | ||||
|         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.'); | ||||
|         } | ||||
|         else { | ||||
|             core.warning('The runner was not able to contact the cache service. Caching will be skipped'); | ||||
|         } | ||||
|     if (cache.isFeatureAvailable()) { | ||||
|         return true; | ||||
|     } | ||||
|     if (isGhes()) { | ||||
|         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; | ||||
|     } | ||||
|     return true; | ||||
|     core.warning('The runner was not able to contact the cache service. Caching will be skipped'); | ||||
|     return false; | ||||
| } | ||||
| exports.isCacheFeatureAvailable = isCacheFeatureAvailable; | ||||
| 
 | ||||
|   | ||||
							
								
								
									
										15
									
								
								dist/setup/index.js
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										15
									
								
								dist/setup/index.js
									
									
									
									
										vendored
									
									
								
							| @@ -63144,16 +63144,15 @@ function isGhes() { | ||||
| } | ||||
| exports.isGhes = isGhes; | ||||
| function isCacheFeatureAvailable() { | ||||
|     if (!cache.isFeatureAvailable()) { | ||||
|         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.'); | ||||
|         } | ||||
|         else { | ||||
|             core.warning('The runner was not able to contact the cache service. Caching will be skipped'); | ||||
|         } | ||||
|     if (cache.isFeatureAvailable()) { | ||||
|         return true; | ||||
|     } | ||||
|     if (isGhes()) { | ||||
|         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; | ||||
|     } | ||||
|     return true; | ||||
|     core.warning('The runner was not able to contact the cache service. Caching will be skipped'); | ||||
|     return false; | ||||
| } | ||||
| exports.isCacheFeatureAvailable = isCacheFeatureAvailable; | ||||
| 
 | ||||
|   | ||||
| @@ -57,19 +57,19 @@ export function isGhes(): boolean { | ||||
| } | ||||
|  | ||||
| export function isCacheFeatureAvailable(): boolean { | ||||
|   if (!cache.isFeatureAvailable()) { | ||||
|     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.' | ||||
|       ); | ||||
|     } else { | ||||
|       core.warning( | ||||
|         'The runner was not able to contact the cache service. Caching will be skipped' | ||||
|       ); | ||||
|     } | ||||
|   if (cache.isFeatureAvailable()) { | ||||
|     return true; | ||||
|   } | ||||
|  | ||||
|   if (isGhes()) { | ||||
|     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; | ||||
|   } | ||||
|  | ||||
|   return true; | ||||
|   core.warning( | ||||
|     'The runner was not able to contact the cache service. Caching will be skipped' | ||||
|   ); | ||||
|   return false; | ||||
| } | ||||
|   | ||||
		Reference in New Issue
	
	Block a user