diff --git a/lib/plugins/aws/package/compile/events/api-gateway/lib/deployment.js b/lib/plugins/aws/package/compile/events/api-gateway/lib/deployment.js index 1e153410e..23263b944 100644 --- a/lib/plugins/aws/package/compile/events/api-gateway/lib/deployment.js +++ b/lib/plugins/aws/package/compile/events/api-gateway/lib/deployment.js @@ -13,7 +13,7 @@ module.exports = { Type: 'AWS::ApiGateway::Deployment', Properties: { RestApiId: this.provider.getApiGatewayRestApiId(), - StageName: this.provider.getStage(), + StageName: this.provider.getApiGatewayStage(), Description: this.provider.getApiGatewayDescription(), }, DependsOn: this.apiGatewayMethodLogicalIds, diff --git a/test/unit/lib/cli/triage/fixtures/@serverless/compose/ts/project/serverless-compose.ts b/test/unit/lib/cli/triage/fixtures/@serverless/compose/ts/project/serverless-compose.ts index 8b81b5c25..5bb050f52 100644 --- a/test/unit/lib/cli/triage/fixtures/@serverless/compose/ts/project/serverless-compose.ts +++ b/test/unit/lib/cli/triage/fixtures/@serverless/compose/ts/project/serverless-compose.ts @@ -5,4 +5,4 @@ module.exports = { "path": "resources" } } -} +}; diff --git a/test/unit/lib/plugins/aws/package/compile/events/api-gateway/lib/stage/index.test.js b/test/unit/lib/plugins/aws/package/compile/events/api-gateway/lib/stage/index.test.js index e2e78b6e0..d0e683488 100644 --- a/test/unit/lib/plugins/aws/package/compile/events/api-gateway/lib/stage/index.test.js +++ b/test/unit/lib/plugins/aws/package/compile/events/api-gateway/lib/stage/index.test.js @@ -407,4 +407,25 @@ describe('test/unit/lib/plugins/aws/package/compile/events/apiGateway/lib/stage/ }, }); }); + + it('should use stage name from provider if provider.apiGateway.stage is configured', async () => { + // https://github.com/serverless/serverless/issues/11675 + const { cfTemplate, awsNaming } = await runServerless({ + fixture: 'api-gateway', + command: 'package', + configExt: { + provider: { + apiGateway: { + stage: 'foo', + }, + }, + }, + }); + expect(awsNaming.provider.getApiGatewayStage()).to.equal('foo'); + const [apiGatewayDeploymentKey] = Object.keys(cfTemplate.Resources).filter((k) => + k.startsWith('ApiGatewayDeployment') + ); + const apiGatewayDeployment = cfTemplate.Resources[apiGatewayDeploymentKey]; + expect(apiGatewayDeployment.Properties.StageName).to.equal('foo'); + }); });