Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
merged 1 commit into from
Aug 3, 2018
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions packages/@aws-cdk/aws-custom-resources/lib/singletonlambda.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
2 changes: 1 addition & 1 deletion packages/@aws-cdk/aws-lambda-codepipeline/lib/pipeline-action.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down
5 changes: 0 additions & 5 deletions packages/aws-cdk-dotnet/generate.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down