Rename serverless to sam

aws · Mar 22, 2019 · cf61189 · cf61189
1 parent 0de2206
commit cf61189
Show file tree

Hide file tree

Showing 12 changed files with 35 additions and 15 deletions.
diff --git a/packages/@aws-cdk/aws-serverless/.gitignore → packages/@aws-cdk/aws-sam/.gitignore b/packages/@aws-cdk/aws-serverless/.gitignore → packages/@aws-cdk/aws-sam/.gitignore
diff --git a/packages/@aws-cdk/aws-serverless/.npmignore → packages/@aws-cdk/aws-sam/.npmignore b/packages/@aws-cdk/aws-serverless/.npmignore → packages/@aws-cdk/aws-sam/.npmignore
diff --git a/packages/@aws-cdk/aws-serverless/LICENSE → packages/@aws-cdk/aws-sam/LICENSE b/packages/@aws-cdk/aws-serverless/LICENSE → packages/@aws-cdk/aws-sam/LICENSE
diff --git a/packages/@aws-cdk/aws-serverless/NOTICE → packages/@aws-cdk/aws-sam/NOTICE b/packages/@aws-cdk/aws-serverless/NOTICE → packages/@aws-cdk/aws-sam/NOTICE
diff --git a/packages/@aws-cdk/aws-sam/README.md b/packages/@aws-cdk/aws-sam/README.md
@@ -0,0 +1,5 @@
+## AWS Serverless Construct Library
+
+```ts
+const sam = require('@aws-cdk/aws-sam');
+```
diff --git a/...ages/@aws-cdk/aws-serverless/lib/index.ts → packages/@aws-cdk/aws-sam/lib/index.ts b/...ages/@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';
diff --git a/...ages/@aws-cdk/aws-serverless/package.json → packages/@aws-cdk/aws-sam/package.json b/...ages/@aws-cdk/aws-serverless/package.json → packages/@aws-cdk/aws-sam/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "@aws-cdk/aws-serverless",
+  "name": "@aws-cdk/aws-sam",
   "version": "0.26.0",
   "description": "The CDK Construct Library for AWS::Serverless",
   "main": "lib/index.js",
@@ -8,16 +8,16 @@
     "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",

diff --git a/...dk/aws-serverless/test/test.serverless.ts → packages/@aws-cdk/aws-sam/test/test.sam.ts b/...dk/aws-serverless/test/test.serverless.ts → packages/@aws-cdk/aws-sam/test/test.sam.ts
diff --git a/packages/@aws-cdk/aws-serverless/README.md b/packages/@aws-cdk/aws-serverless/README.md
diff --git a/packages/decdk/package.json b/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",

diff --git a/tools/awslint/lib/rules/module.ts b/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;
+}
diff --git a/tools/cfn2ts/lib/genspec.ts b/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;
 }
 
 /**