fix: Adjust providers endpoint (#12154)

* fix: Fiormatting * feat: Remove Dashboard onboarding from framework (#12151) * fix: Providers test --------- Co-authored-by: Max Marze <max@marze.dev>
serverless · Sep 15, 2023 · 9b770a2 · 9b770a2
1 parent 590bb7e
commit 9b770a2
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 17 deletions.
diff --git a/lib/cli/interactive-setup/aws-credentials.js b/lib/cli/interactive-setup/aws-credentials.js
@@ -199,7 +199,9 @@ const steps = {
   },
   handleProviderCreation: async ({ configuration: { org: orgName }, stepHistory }) => {
     const providersUrl = `${dashboardFrontend}/${orgName}/settings/providers?source=cli&providerId=new&provider=aws`;
+
     openBrowser(providersUrl);
+
     log.notice('To learn more about providers, visit: http://slss.io/add-providers-dashboard');
 
     const providerProgress = progress.get('provider');
@@ -227,26 +229,26 @@ const steps = {
         });
       }, timeoutDuration);
 
-      onEvent = (event) => {
+      onEvent = (provider) => {
         if (inquirerPrompt) {
           // Disable inquirer prompt asking to skip without setting provider
           inquirerPrompt.ui.close();
         }
 
         clearTimeout(showSkipPromptTimeout);
-        resolve(event);
+        resolve(provider);
       };
     });
 
+    // Get orgUid
+    const orgUid = await getOrgUidByName(orgName);
+
     // Listen for `provider.created` event to detect creation of new provider
     const sdk = await getSdkInstance(orgName);
     try {
       await sdk.connect({
-        orgName,
+        orgUid,
         onEvent,
-        filter: {
-          events: ['provider.created'],
-        },
       });
     } catch (err) {
       // Ensure that prompt timeout is cleared in case of error
@@ -261,19 +263,19 @@ const steps = {
       throw err;
     }
 
-    let maybeEvent;
+    let provider;
     try {
-      maybeEvent = await p;
+      provider = await p;
     } finally {
       sdk.disconnect();
     }
 
     providerProgress.remove();
 
     log.notice();
-    if (maybeEvent) {
+    if (provider) {
       log.notice.success('AWS Access Role provider was successfully created');
-      return maybeEvent.data.object.provider_uid;
+      return provider.providerUid;
     }
 
     log.notice.skip(

diff --git a/test/unit/lib/cli/interactive-setup/aws-credentials.test.js b/test/unit/lib/cli/interactive-setup/aws-credentials.test.js
@@ -439,13 +439,7 @@ describe('test/unit/lib/cli/interactive-setup/aws-credentials.test.js', () => {
       const internalMockedSdk = {
         ...mockedSdk,
         connect: ({ onEvent }) => {
-          onEvent({
-            data: {
-              object: {
-                provider_uid: providerUid,
-              },
-            },
-          });
+          onEvent({ providerUid });
         },
         getProviders: async () => {
           return {