fixup2

Author: jpinkney-aws

packages/core/src/shared/regions/regionProvider.ts

@@ -170,24 +170,22 @@ export class RegionProvider {
         local: () => Endpoints | Promise<Endpoints>
         remote: () => Endpoints | Promise<Endpoints>
     }) {
-        const load = async () => {
-            getLogger().info('endpoints: retrieving AWS endpoints data')
-            this.loadFromEndpoints(await endpointsProvider.local())
+        getLogger().info('endpoints: retrieving AWS endpoints data')
 
-            try {
-                this.loadFromEndpoints(await endpointsProvider.remote())
-            } catch (err) {
-                getLogger().warn(
-                    `endpoints: failed to load from remote source, region data may appear outdated: %s`,
-                    err
-                )
-            }
+        try {
+            this.loadFromEndpoints(await endpointsProvider.local())
+        } catch (err) {
+            getLogger().warn(`endpoints: failed to load from local source: %s`, err)
         }
 
-        return load().catch((err) => {
-            getLogger().error('Failure while loading Endpoints Manifest: %s', err)
+        try {
+            this.loadFromEndpoints(await endpointsProvider.remote())
+        } catch (err) {
+            getLogger().warn(`endpoints: failed to load from remote source, region data may appear outdated: %s`, err)
+        }
 
-            return vscode.window.showErrorMessage(
+        if (this.getRegions().length === 0) {
+            void vscode.window.showErrorMessage(
                 `${localize(
                     'AWS.error.endpoint.load.failure',
                     'The {0} Toolkit was unable to load endpoints data.',
@@ -197,7 +195,7 @@ export class RegionProvider {
                     'Toolkit functionality may be impacted until VS Code is restarted.'
                 )}`
             )
-        })
+        }
     }
 }
 

packages/core/src/testInteg/regionProvider.test.ts

@@ -7,32 +7,23 @@ import assert from 'assert'
 import { makeEndpointsProvider } from '../extension'
 import { RegionProvider } from '../shared/regions/regionProvider'
 import globals from '../shared/extensionGlobals'
-import { makeTemporaryToolkitFolder } from '../shared/filesystemUtilities'
-import { fs } from '../shared/fs/fs'
 import path from 'path'
+import { TestFolder } from '../test/testUtil'
 
 describe('Region Provider', async function () {
-    let tempDir: string
+    let tempFolder: TestFolder
 
     before(async () => {
-        tempDir = await makeTemporaryToolkitFolder()
-    })
-
-    after(async () => {
-        await fs.delete(tempDir, {
-            recursive: true,
-            force: true,
-        })
+        tempFolder = await TestFolder.create()
     })
 
     it('resolves from remote', async function () {
         /**
          * Make sure the local file doesn't resolve to any endpoints.
          * That way we can make sure remote contents are fetched
          */
-        const filePath = path.join(tempDir, 'foo.json')
-        await fs.writeFile(filePath, '{}')
-        globals.manifestPaths.endpoints = filePath
+        await tempFolder.write('foo.json', '{}')
+        globals.manifestPaths.endpoints = path.join(tempFolder.path, 'foo.json')
 
         await assert.doesNotReject(async () => {
             const endpointProvider = makeEndpointsProvider()