aws-amplify · ShadowCat567 · May 2, 2025 · May 5, 2025 · May 6, 2025 · May 6, 2025
@@ -37,9 +37,9 @@ function confirm() {
     Username: userName,
   };
 
-  AWS.config.region = region;
+  // AWS.config.region = region;
 
-  var cognitoidentityserviceprovider = new AWS.CognitoIdentityServiceProvider();
+  var cognitoidentityserviceprovider = new AWS.CognitoIdentityServiceProvider({ region: region });
 
   cognitoidentityserviceprovider.confirmSignUp(params, function (err, data) {
     if (err) {

@@ -4,14 +4,15 @@ import { createReadStream, readdirSync, existsSync } from 'fs-extra';
 import mime from 'mime-types';
 import * as path from 'path';
 import { getAuthResourceName } from '../../../utils/getAuthResourceName';
+import AWS from 'aws-sdk';
 
 const providerName = 'awscloudformation';
 
 const getS3Client = async (context: $TSContext, action: string): Promise<S3> => {
   const providerPlugins = context.amplify.getProviderPlugins(context);
   const provider = await import(providerPlugins[providerName]);
-  const aws = await provider.getConfiguredAWSClient(context, AmplifyCategories.AUTH, action);
-  return new aws.S3();
+  const config = await provider.getConfiguredAWSClient(context, AmplifyCategories.AUTH, action);
+  return new AWS.S3(config);
 };
 
 /**

@@ -1,5 +1,6 @@
 const chalk = require('chalk');
 const constants = require('../../constants');
+const AWS = require('aws-sdk');
 
 const providerName = 'awscloudformation';
 
@@ -43,8 +44,8 @@ async function invalidate(context) {
 async function getCloudFrontClient(context, action) {
   const providerPlugins = context.amplify.getProviderPlugins(context);
   const provider = require(providerPlugins[providerName]);
-  const aws = await provider.getConfiguredAWSClient(context, constants.CategoryName, action);
-  return new aws.CloudFront();
+  const config = await provider.getConfiguredAWSClient(context, constants.CategoryName, action);
+  return new AWS.CloudFront(config);
 }
 
 module.exports = {

@@ -3,6 +3,7 @@ const sequential = require('promise-sequential');
 const fileScanner = require('./file-scanner');
 const constants = require('../../constants');
 const { uploadFile } = require('./upload-file');
+const { AWS } = require('aws-sdk');
 
 const serviceName = 'S3AndCloudFront';
 const providerName = 'awscloudformation';
@@ -41,8 +42,8 @@ function sortUploadFiles(fileList) {
 async function getS3Client(context, action) {
   const providerPlugins = context.amplify.getProviderPlugins(context);
   const provider = require(providerPlugins[providerName]);
-  const aws = await provider.getConfiguredAWSClient(context, constants.CategoryName, action);
-  return new aws.S3();
+  const config = await provider.getConfiguredAWSClient(context, constants.CategoryName, action);
+  return new AWS.S3(config);
 }
 
 function getHostingBucketName(context) {

@@ -2,6 +2,8 @@ import { $TSAny, $TSContext, AmplifyCategories, AmplifyError } from '@aws-amplif
 import { printer } from '@aws-amplify/amplify-prompts';
 import ora from 'ora';
 import os from 'os';
+import { ProxyAgent } from 'proxy-agent';
+import AWS from 'aws-sdk';
 
 const providerName = 'awscloudformation';
 const policyNamePrefix = 'pinpoint_amplify-';
@@ -150,8 +152,16 @@ const getIamClient = async (context: $TSContext, action: string | undefined): Pr
   const providerPlugins = context.amplify.getProviderPlugins(context);
   // eslint-disable-next-line import/no-dynamic-require, global-require, @typescript-eslint/no-var-requires
   const provider = require(providerPlugins[providerName]);
-  const aws = await provider.getConfiguredAWSClient(context, AmplifyCategories.NOTIFICATIONS, action);
-  return new aws.IAM();
+  let httpAgent = undefined;
+  const httpProxy = process.env.HTTP_PROXY || process.env.HTTPS_PROXY;
+  if (httpProxy) {
+    httpAgent = new ProxyAgent();
+  }
+  const config = await provider.getConfiguredAWSClient(context, AmplifyCategories.NOTIFICATIONS, action);
+  return new AWS.IAM({
+    ...config,
+    httpOptions: { agent: httpAgent },
+  });
 };
 
 const getPolicyDoc = (context: $TSContext): string => {

@@ -543,17 +543,19 @@ export const getPinpointClient = async (
     region: pinpointApp?.Region ?? (await mapServiceRegion(context, cred?.region || resolveRegion())),
     customUserAgent: formUserAgentParam(context, userAgentAction),
   };
+  let httpAgent = undefined;
 
   // HTTP_PROXY & HTTPS_PROXY env vars are read automatically by ProxyAgent, but we check to see if they are set before using the proxy
   if (httpProxy) {
-    aws.config.update({
-      httpOptions: {
-        agent: new ProxyAgent(),
-      },
-    });
+    httpAgent = new ProxyAgent();
+    // aws.config.update({
+    //   httpOptions: {
+    //     agent: new ProxyAgent(),
+    //   },
+    // });
   }
 
-  return new aws.Pinpoint({ ...cred, ...defaultOptions });
+  return new aws.Pinpoint({ ...cred, ...defaultOptions, httpOptions: { agent: httpAgent } });
 };
 
 export const mapServiceRegion = async (context: $TSContext, region: string): Promise<string> => {

@@ -10,6 +10,7 @@
     "@aws-amplify/amplify-cli-core": "4.4.1",
     "@aws-amplify/amplify-environment-parameters": "1.9.19",
     "archiver": "^7.0.1",
+    "aws-sdk": "^2.1692.0",
     "chalk": "^4.1.1",
     "cli-table3": "^0.6.0",
     "execa": "^5.1.1",

@@ -1,21 +1,30 @@
 const constants = require('../constants/plugin-constants');
+const { AWS } = require('aws-sdk');
 
 async function getAmplifyClient(context) {
-  const AWS = await getAWSClient(context);
-  return new AWS.Amplify();
+  const config = await getAWSClient(context);
+  const provider = getAWSProvider(context);
+  return new AWS.Amplify(config);
 }
 
 async function getS3Client(context) {
-  const AWS = await getAWSClient(context);
-  return new AWS.S3();
+  const config = await getAWSClient(context);
+  const provider = getAWSProvider(context);
+  return new AWS.S3(config);
 }
 
+// **this is a problem and needs to be fixed
 async function getAWSClient(context) {
   const providerPlugin = context.amplify.getProviderPlugins(context);
   const provider = require(providerPlugin[constants.PROVIDER]);
   return await provider.getConfiguredAWSClient(context, constants.CATEGORY, 'create');
 }
 
+function getAWSProvider(context) {
+  const providerPlugin = context.amplify.getProviderPlugins(context);
+  return require(providerPlugin[constants.PROVIDER]);
+}
+
 module.exports = {
   getAmplifyClient,
   getS3Client,

@@ -1,12 +1,13 @@
 const fs = require('fs-extra');
 const mime = require('mime-types');
 const constants = require('../constants');
+const AWS = require('aws-sdk');
 
 export async function getS3Client(context, action) {
   const providerPlugins = context.amplify.getProviderPlugins(context);
   const provider = require(providerPlugins[constants.providerName]);
-  const aws = await provider.getConfiguredAWSClient(context, constants.CategoryName, action);
-  return new aws.S3();
+  const config = await provider.getConfiguredAWSClient(context, constants.CategoryName, action);
+  return new AWS.S3(config);
 }
 
 export async function uploadFile(s3Client, bucketName, filePath, fileKey) {

@@ -7,20 +7,27 @@ const route = '/mock-testing';
 const bucket = 'mock-testing';
 const localDirS3 = __dirname + '/test-data/';
 
+const fakeAccessId = 'fakeaccesskeyidfortesting';
+const fakeSecretKey = 'fakeaccesssecretkeyfortesting';
+const fakeRegion = 'eu-west-2';
+
 let s3client;
 let simulator;
 
 jest.setTimeout(2000000);
 
 beforeAll(async () => {
-  AWS.config.update({
-    accessKeyId: 'fakeaccesskeyidfortesting',
-    secretAccessKey: 'fakeaccesssecretkeyfortesting',
-    region: 'eu-west-2',
-  });
+  // AWS.config.update({
+  //   accessKeyId: 'fakeaccesskeyidfortesting',
+  //   secretAccessKey: 'fakeaccesssecretkeyfortesting',
+  //   region: 'eu-west-2',
+  // });
 
   const ep = new AWS.Endpoint('http://localhost:20005');
   s3client = new AWS.S3({
+    accessKeyId: fakeAccessId,
+    secretAccessKey: fakeSecretKey,
+    region: fakeRegion,
     apiVersion: '2006-03-01',
     endpoint: ep.href,
     s3BucketEndpoint: true,

@@ -296,9 +296,12 @@ const addAppClient = async (
   const projectDetails = getProjectMeta(projectRoot);
   const authDetails = getAuthProjectDetails(projectRoot);
   const creds = new aws.SharedIniFileCredentials({ profile: profileName });
-  aws.config.credentials = creds;
+  //aws.config.credentials = creds;
 
-  const cognitoClient = new aws.CognitoIdentityServiceProvider({ region: projectDetails.providers.awscloudformation.Region });
+  const cognitoClient = new aws.CognitoIdentityServiceProvider({
+    credentials: creds,
+    region: projectDetails.providers.awscloudformation.Region,
+  });
   const response = await cognitoClient
     .createUserPoolClient({
       ClientName: clientName,
@@ -332,9 +335,12 @@ export const deleteAppClient = async (profileName: string, projectRoot: string,
   const authDetails = getAuthProjectDetails(projectRoot);
   const projectDetails = getProjectMeta(projectRoot);
   const creds = new aws.SharedIniFileCredentials({ profile: profileName });
-  aws.config.credentials = creds;
+  //aws.config.credentials = creds;
 
-  const cognitoClient = new aws.CognitoIdentityServiceProvider({ region: projectDetails.providers.awscloudformation.Region });
+  const cognitoClient = new aws.CognitoIdentityServiceProvider({
+    credentials: creds,
+    region: projectDetails.providers.awscloudformation.Region,
+  });
   await cognitoClient.deleteUserPoolClient({ ClientId: clientId, UserPoolId: authDetails.meta.UserPoolId }).promise();
 };
 

@@ -1,12 +1,13 @@
 const aws = require('aws-sdk');
-const { ProxyAgent } = require('proxy-agent');
+// const { ProxyAgent } = require('proxy-agent');
 const configurationManager = require('../configuration-manager');
 const { regions: amplifyServiceRegions } = require('../aws-regions');
+const { proxyAgent } = require('./aws-globals');
 
 async function getConfiguredAmplifyClient(context, options = {}) {
   let cred = {};
   let defaultOptions = {};
-  const httpProxy = process.env.HTTP_PROXY || process.env.HTTPS_PROXY;
+  // const httpProxy = process.env.HTTP_PROXY || process.env.HTTPS_PROXY;
   const envVarEndpoint = process.env.AWS_AMPLIFY_ENDPOINT;
 
   try {
@@ -21,15 +22,23 @@ async function getConfiguredAmplifyClient(context, options = {}) {
     };
   }
 
-  if (httpProxy) {
-    aws.config.update({
-      httpOptions: {
-        agent: new ProxyAgent(),
-      },
-    });
-  }
+  // **affected by SDK migrations
+  // if (httpProxy) {
+  //   aws.config.update({
+  //     httpOptions: {
+  //       agent: new ProxyAgent(),
+  //     },
+  //   });
+  // }
 
-  const config = { ...cred, ...defaultOptions, ...options };
+  const config = {
+    ...cred,
+    ...defaultOptions,
+    ...options,
+    httpOptions: {
+      agent: proxyAgent(),
+    },
+  };
 
   // this is the "project" config level case, creds and region are explicitly set or retrieved from a profile
   if (config.region) {

@@ -2,6 +2,7 @@ import { $TSContext } from '@aws-amplify/amplify-cli-core';
 import aws from './aws.js';
 import { APIGateway as APIGW } from 'aws-sdk';
 import { loadConfiguration } from '../configuration-manager';
+import { proxyAgent } from './aws-globals';
 
 export class APIGateway {
   private static instance: APIGateway;
@@ -24,6 +25,12 @@ export class APIGateway {
 
   constructor(context: $TSContext, creds, options = {}) {
     this.context = context;
-    this.apigw = new aws.APIGateway({ ...creds, ...options });
+    this.apigw = new aws.APIGateway({
+      ...creds,
+      ...options,
+      httpOptions: {
+        agent: proxyAgent(),
+      },
+    });
   }
 }
@@ -1,5 +1,6 @@
 const aws = require('./aws.js');
 const configurationManager = require('../configuration-manager');
+const { proxyAgent } = require('./aws-globals');
 
 class AppSync {
   constructor(context, options = {}) {
@@ -12,7 +13,13 @@ class AppSync {
       }
 
       this.context = context;
-      this.appSync = new aws.AppSync({ ...cred, ...options });
+      this.appSync = new aws.AppSync({
+        ...cred,
+        ...options,
+        httpOptions: {
+          agent: proxyAgent(),
+        },
+      });
       return this;
     })();
   }

@@ -20,6 +20,7 @@ const { initializeProgressBars } = require('./aws-cfn-progress-formatter');
 const { getStatusToErrorMsg, collectStackErrorMessages } = require('./cloudformation-error-serializer');
 
 const { printer } = require('@aws-amplify/amplify-prompts');
+const { proxyAgent } = require('./aws-globals');
 
 const CFN_MAX_CONCURRENT_REQUEST = 5;
 const CFN_POLL_TIME = (process.env.IS_AMPLIFY_CI ? 30 : 5) * 1000; // 5 secs wait to check if  new stacks are created by root stack
@@ -55,7 +56,14 @@ class CloudFormation {
         userAgentOption.customUserAgent = userAgentParam;
       }
 
-      this.cfn = new aws.CloudFormation({ ...cred, ...options, ...userAgentOption });
+      this.cfn = new aws.CloudFormation({
+        ...cred,
+        ...options,
+        ...userAgentOption,
+        httpOptions: {
+          agent: proxyAgent(),
+        },
+      });
       this.context = context;
       if (Object.keys(eventMap).length) {
         this.eventMap = eventMap;

@@ -2,6 +2,7 @@ import { $TSContext } from '@aws-amplify/amplify-cli-core';
 import aws from './aws.js';
 import * as AWS from 'aws-sdk';
 import { AwsSecrets, loadConfiguration } from '../configuration-manager';
+import { proxyAgent } from './aws-globals';
 
 export class CognitoUserPoolClientProvider {
   private static instance: CognitoUserPoolClientProvider;
@@ -22,6 +23,12 @@ export class CognitoUserPoolClientProvider {
   }
 
   constructor(creds: AwsSecrets, options = {}) {
-    this.client = new aws.CognitoIdentityServiceProvider({ ...creds, ...options });
+    this.client = new aws.CognitoIdentityServiceProvider({
+      ...creds,
+      ...options,
+      httpOptions: {
+        agent: proxyAgent(),
+      },
+    });
   }
 }