fix: Userpool does not exist (#14262)

* fix: cognito provider

* chore: also update geo

* fix: v3 style credentials

* chore: remove client destructuring, not needed

---------

Co-authored-by: aws-amplify-bot <aws@amazon.com>
Co-authored-by: Vieltojarvi <lvielto@amazon.com>

Author: 3 people

packages/amplify-provider-awscloudformation/src/aws-utils/CognitoUserPoolService.ts

@@ -23,21 +23,28 @@ import {
   ListUserPoolsRequest,
 } from '@aws-sdk/client-cognito-identity-provider';
 import { ICognitoUserPoolService } from '@aws-amplify/amplify-util-import';
-import { loadConfiguration } from '../configuration-manager';
+import { AwsSecrets, loadConfiguration } from '../configuration-manager';
 import { fileLogger } from '../utils/aws-logger';
 import { pagedAWSCall } from './paged-call';
 const logger = fileLogger('CognitoUserPoolService');
 
 export const createCognitoUserPoolService = async (context: $TSContext, options: $TSAny): Promise<CognitoUserPoolService> => {
-  let credentials = {};
+  let credentials: AwsSecrets = {};
 
   try {
     credentials = await loadConfiguration(context);
   } catch (e) {
     // could not load credentials
   }
 
-  const cognito = new CognitoIdentityProviderClient({ ...credentials, ...options });
+  const cognito = new CognitoIdentityProviderClient({
+    ...options,
+    credentials: {
+      accessKeyId: credentials.accessKeyId,
+      secretAccessKey: credentials.secretAccessKey,
+    },
+    region: credentials.region,
+  });
 
   return new CognitoUserPoolService(cognito);
 };

packages/amplify-provider-awscloudformation/src/aws-utils/IdentityPoolService.ts

@@ -10,19 +10,26 @@ import {
   ListIdentityPoolsResponse,
   ListIdentityPoolsInput,
 } from '@aws-sdk/client-cognito-identity';
-import { loadConfiguration } from '../configuration-manager';
+import { AwsSecrets, loadConfiguration } from '../configuration-manager';
 import { pagedAWSCall } from './paged-call';
 
 export const createIdentityPoolService = async (context: $TSContext, options: $TSAny): Promise<IdentityPoolService> => {
-  let credentials = {};
+  let credentials: AwsSecrets = {};
 
   try {
     credentials = await loadConfiguration(context);
   } catch (e) {
     // could not load credentials
   }
 
-  const cognitoIdentity = new CognitoIdentityClient({ ...credentials, ...options });
+  const cognitoIdentity = new CognitoIdentityClient({
+    ...options,
+    credentials: {
+      accessKeyId: credentials.accessKeyId,
+      secretAccessKey: credentials.secretAccessKey,
+    },
+    region: credentials.region,
+  });
 
   return new IdentityPoolService(cognitoIdentity);
 };

packages/amplify-provider-awscloudformation/src/aws-utils/aws-cognito-client.ts

@@ -24,8 +24,12 @@ export class CognitoUserPoolClientProvider {
 
   constructor(creds: AwsSecrets, options = {}) {
     const clientConfig: CognitoIdentityProviderClientConfig = {
-      ...creds,
       ...options,
+      credentials: {
+        accessKeyId: creds.accessKeyId,
+        secretAccessKey: creds.secretAccessKey,
+      },
+      region: creds.region,
       requestHandler: new NodeHttpHandler({
         httpAgent: proxyAgent(),
         httpsAgent: proxyAgent(),

packages/amplify-provider-awscloudformation/src/aws-utils/aws-location-service.ts

@@ -23,8 +23,12 @@ export class LocationService {
 
   private constructor(cred: AwsSecrets, options = {}) {
     this.client = new LocationClient({
-      ...cred,
       ...options,
+      credentials: {
+        accessKeyId: cred.accessKeyId,
+        secretAccessKey: cred.secretAccessKey,
+      },
+      region: cred.region,
       requestHandler: new NodeHttpHandler({
         httpAgent: proxyAgent(),
         httpsAgent: proxyAgent(),