fix(serverless): rename aws-serverless to aws-sam (#2074)

BREAKING CHANGE: renamed `aws-serverless` to `aws-sam`

packages/@aws-cdk/aws-rds/lib/rotation-single-user.ts

@@ -1,7 +1,7 @@
 import ec2 = require('@aws-cdk/aws-ec2');
 import lambda = require('@aws-cdk/aws-lambda');
+import serverless = require('@aws-cdk/aws-sam');
 import secretsmanager = require('@aws-cdk/aws-secretsmanager');
-import serverless = require('@aws-cdk/aws-serverless');
 import cdk = require('@aws-cdk/cdk');
 
 /**

packages/@aws-cdk/aws-rds/package.json

@@ -66,7 +66,7 @@
  "@aws-cdk/aws-kms": "^0.26.0",
  "@aws-cdk/aws-lambda": "^0.26.0",
  "@aws-cdk/aws-secretsmanager": "^0.26.0",
- "@aws-cdk/aws-serverless": "^0.26.0",
+ "@aws-cdk/aws-sam": "^0.26.0",
  "@aws-cdk/cdk": "^0.26.0"
  },
  "homepage": "https://github.com/awslabs/aws-cdk",

packages/@aws-cdk/aws-sam/README.md

@@ -0,0 +1,7 @@
+## AWS Serverless Application Model Construct Library
+
+```ts
+const sam = require('@aws-cdk/aws-sam');
+```
+
+Note: we recommended to use `@aws-cdk/aws-lambda`, `aws-cdk/aws-lambda-event-sources` and `@aws-cdk/aws-apigateway` packages to build 'serverless' applications with the CDK instead of the `AWS::Serverless` resources exposes by `@aws-cdk/aws-sam`.

packages/@aws-cdk/aws-serverless/lib/index.ts → packages/@aws-cdk/aws-sam/lib/index.ts

@@ -1,2 +1,2 @@
 // AWS::Serverless CloudFormation Resources:
-export * from './serverless.generated';
+export * from './sam.generated';

packages/@aws-cdk/aws-serverless/package.json → packages/@aws-cdk/aws-sam/package.json

@@ -1,23 +1,23 @@
 {
- "name": "@aws-cdk/aws-serverless",
+ "name": "@aws-cdk/aws-sam",
  "version": "0.26.0",
- "description": "The CDK Construct Library for AWS::Serverless",
+ "description": "The CDK Construct Library for the AWS Serverless Application Model (SAM) resources",
  "main": "lib/index.js",
  "types": "lib/index.d.ts",
  "jsii": {
  "outdir": "dist",
  "targets": {
  "dotnet": {
- "namespace": "Amazon.CDK.AWS.Serverless",
- "packageId": "Amazon.CDK.AWS.Serverless",
+ "namespace": "Amazon.CDK.AWS.SAM",
+ "packageId": "Amazon.CDK.AWS.SAM",
  "signAssembly": true,
  "assemblyOriginatorKeyFile": "../../key.snk"
  },
  "java": {
- "package": "software.amazon.awscdk.services.serverless",
+ "package": "software.amazon.awscdk.services.sam",
  "maven": {
  "groupId": "software.amazon.awscdk",
- "artifactId": "serverless"
+ "artifactId": "sam"
  }
  },
  "sphinx": {}
@@ -46,7 +46,7 @@
  "aws",
  "cdk",
  "constructs",
- "aws-serverless"
+ "aws-sam"
  ],
  "author": {
  "name": "Amazon Web Services",

packages/decdk/package.json

@@ -104,10 +104,10 @@
  "@aws-cdk/aws-s3": "^0.26.0",
  "@aws-cdk/aws-s3-deployment": "^0.26.0",
  "@aws-cdk/aws-s3-notifications": "^0.26.0",
+ "@aws-cdk/aws-sam": "^0.26.0",
  "@aws-cdk/aws-sagemaker": "^0.26.0",
  "@aws-cdk/aws-sdb": "^0.26.0",
  "@aws-cdk/aws-secretsmanager": "^0.26.0",
- "@aws-cdk/aws-serverless": "^0.26.0",
  "@aws-cdk/aws-servicecatalog": "^0.26.0",
  "@aws-cdk/aws-servicediscovery": "^0.26.0",
  "@aws-cdk/aws-ses": "^0.26.0",

packages/decdk/test/schema.test.ts

@@ -21,7 +21,7 @@ beforeAll(async () => {
  await typesys.load(path.dirname(require.resolve('@aws-cdk/cdk/.jsii')));
 });
 
-test('schemaForInterface: interface with primitives', () => {
+test('schemaForInterface: interface with primitives', async () => {
  // GIVEN
  const defs = { };
  const ctx = SchemaContext.root(defs);

tools/awslint/lib/rules/module.ts

@@ -25,7 +25,17 @@ moduleLinter.add( {
  eval: e => {
  if (!e.ctx.namespace) { return; }
  if (!e.ctx.assembly) { return; }
- const namespace = e.ctx.namespace.toLocaleLowerCase().replace('::', '-');
+ const namespace = overrideNamespace(e.ctx.namespace.toLocaleLowerCase().replace('::', '-'));
  e.assertEquals(e.ctx.assembly.name, `@aws-cdk/${namespace}`, e.ctx.assembly.name);
  }
 });
+
+/**
+ * Overrides special-case namespaces like aws-serverless=>aws-sam
+ */
+function overrideNamespace(namespace: string) {
+ if (namespace === 'aws-serverless') {
+ return 'aws-sam';
+ }
+ return namespace;
+}

tools/cfn2ts/lib/genspec.ts

@@ -119,7 +119,17 @@ export function packageName(module: SpecName | string): string {
  throw new Error(`Module component name must be "AWS::Xxx" or "Alexa::Xxx" (module: ${module})`);
  }
 
- return parts[parts.length - 1].toLowerCase();
+ return overridePackageName(parts[parts.length - 1].toLowerCase());
+}
+
+/**
+ * Overrides special-case namespaces like serverless=>sam
+ */
+function overridePackageName(name: string) {
+ if (name === 'serverless') {
+ return 'sam';
+ }
+ return name;
 }
 
 /**