Fix inheritance inconsistencies that aren't yet caught by jsii. (#491)

aws · Aug 3, 2018 · f5ca82b · f5ca82b
1 parent e7508a7
commit f5ca82b
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 10 deletions.
diff --git a/packages/@aws-cdk/aws-custom-resources/lib/singletonlambda.ts b/packages/@aws-cdk/aws-custom-resources/lib/singletonlambda.ts
@@ -22,10 +22,10 @@ export interface SingletonLambdaProps extends lambda.LambdaProps {
  * for every SingletonLambda you create.
  */
 export class SingletonLambda extends lambda.LambdaRef {
-    public functionName: lambda.FunctionName;
-    public functionArn: lambda.FunctionArn;
-    public role?: iam.Role | undefined;
-    protected canCreatePermissions: boolean;
+    public readonly functionName: lambda.FunctionName;
+    public readonly functionArn: lambda.FunctionArn;
+    public readonly role?: iam.Role | undefined;
+    protected readonly canCreatePermissions: boolean;
     private lambdaFunction: lambda.LambdaRef;
 
     constructor(parent: cdk.Construct, name: string, props: SingletonLambdaProps) {

diff --git a/packages/@aws-cdk/aws-lambda-codepipeline/lib/pipeline-action.ts b/packages/@aws-cdk/aws-lambda-codepipeline/lib/pipeline-action.ts
@@ -80,7 +80,7 @@ export class PipelineInvokeAction extends codepipeline.Action {
      * Add an input artifact
      * @param artifact
      */
-    public addInputArtifact(artifact: codepipeline.Artifact): PipelineInvokeAction {
+    protected addInputArtifact(artifact: codepipeline.Artifact): codepipeline.Action {
         super.addInputArtifact(artifact);
         return this;
     }

diff --git a/packages/aws-cdk-dotnet/generate.sh b/packages/aws-cdk-dotnet/generate.sh
@@ -23,11 +23,6 @@ echo $NUGET_CONFIG_CONTENT > ./src/NuGet.config
 AWS_CDK=../@aws-cdk
 echo "Searching $AWS_CDK for jsii packages..."
 for i in $( ls $AWS_CDK ); do
-    # Generation of aws-custom-resources is blocked due to https://github.com/awslabs/aws-cdk/issues/383
-    if [ "$i" == "aws-custom-resources" ]; then
-        continue
-    fi
-
     AWS_CDK_PACKAGE=$AWS_CDK/$i
     AWS_CDK_ASSEMBLY=$AWS_CDK_PACKAGE/.jsii
     if [ -e $AWS_CDK_ASSEMBLY ]; then