Merge pull request #634 from circulon/feature/fix-use-with-localstack

fix not working with localstack #396

src/aws/acm-wrapper.ts

@@ -26,7 +26,8 @@ class ACMWrapper {
  credentials,
  region: isEdge ? Globals.defaultRegion : Globals.getRegion(),
  retryStrategy: Globals.getRetryStrategy(),
- requestHandler: Globals.getRequestHandler()
+ requestHandler: Globals.getRequestHandler(),
+ endpoint: Globals.getServiceEndpoint("acm")
  });
  }
 

src/aws/api-gateway-v1-wrapper.ts

@@ -27,13 +27,15 @@ import { getAWSPagedResults } from "../utils";
 class APIGatewayV1Wrapper extends APIGatewayBase {
  public readonly apiGateway: APIGatewayClient;
 
+
  constructor (credentials?: any) {
  super();
  this.apiGateway = new APIGatewayClient({
  credentials,
  region: Globals.getRegion(),
  retryStrategy: Globals.getRetryStrategy(),
- requestHandler: Globals.getRequestHandler()
+ requestHandler: Globals.getRequestHandler(),
+ endpoint: Globals.getServiceEndpoint("apigateway")
  });
  }
 

src/aws/api-gateway-v2-wrapper.ts

@@ -33,7 +33,8 @@ class APIGatewayV2Wrapper extends APIGatewayBase {
  credentials,
  region: Globals.getRegion(),
  retryStrategy: Globals.getRetryStrategy(),
- requestHandler: Globals.getRequestHandler()
+ requestHandler: Globals.getRequestHandler(),
+ endpoint: Globals.getServiceEndpoint("apigatewayv2")
  });
  }
 

src/aws/cloud-formation-wrapper.ts

@@ -31,7 +31,8 @@ class CloudFormationWrapper {
  credentials,
  region: Globals.getRegion(),
  retryStrategy: Globals.getRetryStrategy(),
- requestHandler: Globals.getRequestHandler()
+ requestHandler: Globals.getRequestHandler(),
+ endpoint: Globals.getServiceEndpoint("cloudformation")
  });
  }
 

src/aws/route53-wrapper.ts

@@ -17,20 +17,23 @@ class Route53Wrapper {
 
  constructor (credentials?: any, region?: string) {
  // not null and not undefined
+ const serviceEndpoint = Globals.getServiceEndpoint("route53");
  if (credentials) {
  this.region = region || Globals.getRegion();
  this.route53 = new Route53Client({
  credentials,
  region: this.region,
  retryStrategy: Globals.getRetryStrategy(),
- requestHandler: Globals.getRequestHandler()
+ requestHandler: Globals.getRequestHandler(),
+ endpoint: serviceEndpoint
  });
  } else {
  this.region = Globals.getRegion();
  this.route53 = new Route53Client({
  region: this.region,
  retryStrategy: Globals.getRetryStrategy(),
- requestHandler: Globals.getRequestHandler()
+ requestHandler: Globals.getRequestHandler(),
+ endpoint: serviceEndpoint
  });
  }
  }
@@ -59,7 +62,7 @@ class Route53Wrapper {
  "NextMarker",
  new ListHostedZonesCommand({})
  );
- Logging.logInfo(`Founded hosted zones list: ${hostedZones.map((zone) => zone.Name)}.`);
+ Logging.logInfo(`Found hosted zones list: ${hostedZones.map((zone) => zone.Name)}.`);
  } catch (err) {
  throw new Error(`Unable to list hosted zones in Route53.\n${err.message}`);
  }

src/aws/s3-wrapper.ts

@@ -10,7 +10,8 @@ class S3Wrapper {
  this.s3 = new S3Client({
  credentials,
  region: Globals.getRegion(),
- requestHandler: Globals.getRequestHandler()
+ requestHandler: Globals.getRequestHandler(),
+ endpoint: Globals.getServiceEndpoint("s3")
  });
  }
 

src/globals.ts

@@ -67,6 +67,14 @@ export default class Globals {
  return Globals.options.stage || Globals.serverless.service.provider.stage;
  }
 
+ public static getServiceEndpoint (service: string) {
+ if (Globals.serverless.providers.aws.sdk) {
+ const serviceConf = Globals.serverless.providers.aws.sdk.config[service];
+ return serviceConf.endpoint || null;
+ }
+ return null;
+ }
+
  public static getRegion () {
  const slsRegion = Globals.options.region || Globals.serverless.service.provider.region;
  return slsRegion || Globals.currentRegion || Globals.defaultRegion;

src/types.ts

@@ -60,7 +60,8 @@ export interface ServerlessInstance {
  };
  providers: {
  aws: {
- getCredentials (),
+ getCredentials (): any,
+ sdk: any
  },
  };
  cli: {