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

Jump to bottom

Enable creation of strong names for .NET assemblies. #643

Merged
merged 10 commits into from
Sep 11, 2018
Merged

Enable creation of strong names for .NET assemblies. #643

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
e4598c8
Enable creation of strong names for .NET assemblies.
mpiroc Aug 27, 2018
8be41f6
Address feedback from code review.
mpiroc Aug 30, 2018
ec72837
Merge branch 'pirocchi/init' into pirocchi/snk
mpiroc Sep 5, 2018
2e7e0ea
Restore unintentionally removed newline.
mpiroc Sep 5, 2018
a575a2a
Merge branch 'pirocchi/init' into pirocchi/snk
mpiroc Sep 7, 2018
b59db47
Merge changes to fetch-dotnet-snk.sh from jsii repo.
mpiroc Sep 7, 2018
2ba98d8
feat(aws-dynamodb): Support server-side encryption (#684)
jungseoklee Sep 11, 2018
34655f2
Add `cdk init` template for .NET, and re-enable .NET targets (#617)
mpiroc Sep 11, 2018
884740d
Merge branch 'master' into pirocchi/snk
Sep 11, 2018
2a90730
Merge branch 'pirocchi/init' into pirocchi/snk
rix0rrr Sep 11, 2018
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
3 changes: 3 additions & 0 deletions buildspec.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,9 @@ phases:
install:
commands:
- /bin/bash ./install.sh
pre_build:
commands:
- /bin/bash ./fetch-dotnet-snk.sh
build:
commands:
- /bin/bash ./build.sh
Expand Down
29 changes: 29 additions & 0 deletions fetch-dotnet-snk.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
#!/bin/bash
set -euo pipefail

# This script retrieves the .snk file needed
# to create strong names for .NET assemblies.
echo "Retrieving SNK..."

sudo apt install jq -y

ROLE=$(aws sts assume-role --region us-east-2 --role-arn ${DOTNET_STRONG_NAME_ROLE_ARN:-} --role-session-name "cdk-dotnet-snk")
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

region pass in?

export AWS_ACCESS_KEY_ID=$(echo $ROLE | jq -r .Credentials.AccessKeyId)
export AWS_SECRET_ACCESS_KEY=$(echo $ROLE | jq -r .Credentials.SecretAccessKey)
export AWS_SESSION_TOKEN=$(echo $ROLE | jq .Credentials.SessionToken)

SNK_SECRET=$(aws secretsmanager get-secret-value --region us-east-2 --secret-id ${DOTNET_STRONG_NAME_SECRET_ID:-})
TMP_DIR=$(mktemp -d)
TMP_KEY="$TMP_DIR/key.snk"
echo $SNK_SECRET | jq -r .SecretBinary | base64 --decode > $TMP_KEY

for PACKAGE_PATH in packages/@aws-cdk/*; do
JSII_PROPERTY=$(cat "$PACKAGE_PATH/package.json" | jq -r .jsii)
if [ -z $JSII_PROPERTY ]; then
continue
fi

cp $TMP_KEY $PACKAGE_PATH
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Instead of copying this file everywhere, maybe the .NET build can consult an environment variable for it's location?

Copy link
Contributor Author

@mpiroc mpiroc Aug 30, 2018 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

  • Using an environment variable is an extra level of indirection that we don't need (we already have too many [levels of indirection]!). There's no cost to copying the file everywhere.
  • I'm trying to minimize any necessary changes if we ever decide to move away from a monorepo. While an environment variable would still work with one package per repo, it seems like overkill.

Copy link
Contributor Author

@mpiroc mpiroc Aug 30, 2018 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Another issue with using an environment variable is: How would it be set? The temporary directory is created by fetch-dotnet-snk.sh, but build.sh is a sibling process of fetch-dotnet-snk.sh, not a descendant. A process can't modify its parent's environment variables.

done

rm -rf $TMP_DIR
4 changes: 3 additions & 1 deletion packages/@aws-cdk/assets/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,9 @@
},
"dotnet": {
"namespace": "Amazon.CDK.Assets",
"packageId": "Amazon.CDK.Assets"
"packageId": "Amazon.CDK.Assets",
"signAssembly": true,
"assemblyOriginatorKeyFile": "../../key.snk"
},
"sphinx": {}
}
Expand Down
4 changes: 3 additions & 1 deletion packages/@aws-cdk/aws-apigateway/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,9 @@
},
"dotnet": {
"namespace": "Amazon.CDK.AWS.APIGateway",
"packageId": "Amazon.CDK.AWS.APIGateway"
"packageId": "Amazon.CDK.AWS.APIGateway",
"signAssembly": true,
"assemblyOriginatorKeyFile": "../../key.snk"
},
"sphinx": {}
}
Expand Down
4 changes: 3 additions & 1 deletion packages/@aws-cdk/aws-applicationautoscaling/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,9 @@
},
"dotnet": {
"namespace": "Amazon.CDK.AWS.ApplicationAutoScaling",
"packageId": "Amazon.CDK.AWS.ApplicationAutoScaling"
"packageId": "Amazon.CDK.AWS.ApplicationAutoScaling",
"signAssembly": true,
"assemblyOriginatorKeyFile": "../../key.snk"
},
"sphinx": {}
}
Expand Down
4 changes: 3 additions & 1 deletion packages/@aws-cdk/aws-appsync/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,9 @@
},
"dotnet": {
"namespace": "Amazon.CDK.AWS.AppSync",
"packageId": "Amazon.CDK.AWS.AppSync"
"packageId": "Amazon.CDK.AWS.AppSync",
"signAssembly": true,
"assemblyOriginatorKeyFile": "../../key.snk"
},
"sphinx": {}
}
Expand Down
4 changes: 3 additions & 1 deletion packages/@aws-cdk/aws-athena/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,9 @@
},
"dotnet": {
"namespace": "Amazon.CDK.AWS.Athena",
"packageId": "Amazon.CDK.AWS.Athena"
"packageId": "Amazon.CDK.AWS.Athena",
"signAssembly": true,
"assemblyOriginatorKeyFile": "../../key.snk"
},
"sphinx": {}
}
Expand Down
4 changes: 3 additions & 1 deletion packages/@aws-cdk/aws-autoscaling/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,9 @@
},
"dotnet": {
"namespace": "Amazon.CDK.AWS.AutoScaling",
"packageId": "Amazon.CDK.AWS.AutoScaling"
"packageId": "Amazon.CDK.AWS.AutoScaling",
"signAssembly": true,
"assemblyOriginatorKeyFile": "../../key.snk"
},
"sphinx": {}
}
Expand Down
4 changes: 3 additions & 1 deletion packages/@aws-cdk/aws-autoscalingplans/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,9 @@
},
"dotnet": {
"namespace": "Amazon.CDK.AWS.AutoScalingPlans",
"packageId": "Amazon.CDK.AWS.AutoScalingPlans"
"packageId": "Amazon.CDK.AWS.AutoScalingPlans",
"signAssembly": true,
"assemblyOriginatorKeyFile": "../../key.snk"
},
"sphinx": {}
}
Expand Down
4 changes: 3 additions & 1 deletion packages/@aws-cdk/aws-batch/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,9 @@
},
"dotnet": {
"namespace": "Amazon.CDK.AWS.Batch",
"packageId": "Amazon.CDK.AWS.Batch"
"packageId": "Amazon.CDK.AWS.Batch",
"signAssembly": true,
"assemblyOriginatorKeyFile": "../../key.snk"
},
"sphinx": {}
}
Expand Down
4 changes: 3 additions & 1 deletion packages/@aws-cdk/aws-budgets/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,9 @@
},
"dotnet": {
"namespace": "Amazon.CDK.AWS.Budgets",
"packageId": "Amazon.CDK.AWS.Budgets"
"packageId": "Amazon.CDK.AWS.Budgets",
"signAssembly": true,
"assemblyOriginatorKeyFile": "../../key.snk"
},
"sphinx": {}
}
Expand Down
4 changes: 3 additions & 1 deletion packages/@aws-cdk/aws-certificatemanager/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,9 @@
},
"dotnet": {
"namespace": "Amazon.CDK.AWS.CertificateManager",
"packageId": "Amazon.CDK.AWS.CertificateManager"
"packageId": "Amazon.CDK.AWS.CertificateManager",
"signAssembly": true,
"assemblyOriginatorKeyFile": "../../key.snk"
},
"sphinx": {}
}
Expand Down
4 changes: 3 additions & 1 deletion packages/@aws-cdk/aws-cloud9/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,9 @@
},
"dotnet": {
"namespace": "Amazon.CDK.AWS.Cloud9",
"packageId": "Amazon.CDK.AWS.Cloud9"
"packageId": "Amazon.CDK.AWS.Cloud9",
"signAssembly": true,
"assemblyOriginatorKeyFile": "../../key.snk"
},
"sphinx": {}
}
Expand Down
4 changes: 3 additions & 1 deletion packages/@aws-cdk/aws-cloudformation/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,9 @@
},
"dotnet": {
"namespace": "Amazon.CDK.AWS.CloudFormation",
"packageId": "Amazon.CDK.AWS.CloudFormation"
"packageId": "Amazon.CDK.AWS.CloudFormation",
"signAssembly": true,
"assemblyOriginatorKeyFile": "../../key.snk"
},
"sphinx": {}
}
Expand Down
4 changes: 3 additions & 1 deletion packages/@aws-cdk/aws-cloudfront/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,9 @@
},
"dotnet": {
"namespace": "Amazon.CDK.AWS.CloudFront",
"packageId": "Amazon.CDK.AWS.CloudFront"
"packageId": "Amazon.CDK.AWS.CloudFront",
"signAssembly": true,
"assemblyOriginatorKeyFile": "../../key.snk"
},
"sphinx": {}
}
Expand Down
4 changes: 3 additions & 1 deletion packages/@aws-cdk/aws-cloudtrail/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,9 @@
},
"dotnet": {
"namespace": "Amazon.CDK.AWS.CloudTrail",
"packageId": "Amazon.CDK.AWS.CloudTrail"
"packageId": "Amazon.CDK.AWS.CloudTrail",
"signAssembly": true,
"assemblyOriginatorKeyFile": "../../key.snk"
},
"sphinx": {}
}
Expand Down
4 changes: 3 additions & 1 deletion packages/@aws-cdk/aws-cloudwatch/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,9 @@
},
"dotnet": {
"namespace": "Amazon.CDK.AWS.CloudWatch",
"packageId": "Amazon.CDK.AWS.CloudWatch"
"packageId": "Amazon.CDK.AWS.CloudWatch",
"signAssembly": true,
"assemblyOriginatorKeyFile": "../../key.snk"
},
"sphinx": {}
}
Expand Down
4 changes: 3 additions & 1 deletion packages/@aws-cdk/aws-codebuild/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,9 @@
},
"dotnet": {
"namespace": "Amazon.CDK.AWS.CodeBuild",
"packageId": "Amazon.CDK.AWS.CodeBuild"
"packageId": "Amazon.CDK.AWS.CodeBuild",
"signAssembly": true,
"assemblyOriginatorKeyFile": "../../key.snk"
},
"sphinx": {}
}
Expand Down
4 changes: 3 additions & 1 deletion packages/@aws-cdk/aws-codecommit/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,9 @@
},
"dotnet": {
"namespace": "Amazon.CDK.AWS.CodeCommit",
"packageId": "Amazon.CDK.AWS.CodeCommit"
"packageId": "Amazon.CDK.AWS.CodeCommit",
"signAssembly": true,
"assemblyOriginatorKeyFile": "../../key.snk"
},
"sphinx": {}
}
Expand Down
4 changes: 3 additions & 1 deletion packages/@aws-cdk/aws-codedeploy/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,9 @@
},
"dotnet": {
"namespace": "Amazon.CDK.AWS.CodeDeploy",
"packageId": "Amazon.CDK.AWS.CodeDeploy"
"packageId": "Amazon.CDK.AWS.CodeDeploy",
"signAssembly": true,
"assemblyOriginatorKeyFile": "../../key.snk"
},
"sphinx": {}
}
Expand Down
4 changes: 3 additions & 1 deletion packages/@aws-cdk/aws-codepipeline-api/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,9 @@
},
"dotnet": {
"namespace": "Amazon.CDK.AWS.Codepipeline.Api",
"packageId": "Amazon.CDK.AWS.Codepipeline.Api"
"packageId": "Amazon.CDK.AWS.Codepipeline.Api",
"signAssembly": true,
"assemblyOriginatorKeyFile": "../../key.snk"
},
"sphinx": {}
}
Expand Down
4 changes: 3 additions & 1 deletion packages/@aws-cdk/aws-codepipeline/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,9 @@
},
"dotnet": {
"namespace": "Amazon.CDK.AWS.CodePipeline",
"packageId": "Amazon.CDK.AWS.CodePipeline"
"packageId": "Amazon.CDK.AWS.CodePipeline",
"signAssembly": true,
"assemblyOriginatorKeyFile": "../../key.snk"
},
"sphinx": {}
}
Expand Down
4 changes: 3 additions & 1 deletion packages/@aws-cdk/aws-cognito/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,9 @@
},
"dotnet": {
"namespace": "Amazon.CDK.AWS.Cognito",
"packageId": "Amazon.CDK.AWS.Cognito"
"packageId": "Amazon.CDK.AWS.Cognito",
"signAssembly": true,
"assemblyOriginatorKeyFile": "../../key.snk"
},
"sphinx": {}
}
Expand Down
4 changes: 3 additions & 1 deletion packages/@aws-cdk/aws-config/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,9 @@
},
"dotnet": {
"namespace": "Amazon.CDK.AWS.Config",
"packageId": "Amazon.CDK.AWS.Config"
"packageId": "Amazon.CDK.AWS.Config",
"signAssembly": true,
"assemblyOriginatorKeyFile": "../../key.snk"
},
"sphinx": {}
}
Expand Down
4 changes: 3 additions & 1 deletion packages/@aws-cdk/aws-datapipeline/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,9 @@
},
"dotnet": {
"namespace": "Amazon.CDK.AWS.DataPipeline",
"packageId": "Amazon.CDK.AWS.DataPipeline"
"packageId": "Amazon.CDK.AWS.DataPipeline",
"signAssembly": true,
"assemblyOriginatorKeyFile": "../../key.snk"
},
"sphinx": {}
}
Expand Down
4 changes: 3 additions & 1 deletion packages/@aws-cdk/aws-dax/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,9 @@
},
"dotnet": {
"namespace": "Amazon.CDK.AWS.DAX",
"packageId": "Amazon.CDK.AWS.DAX"
"packageId": "Amazon.CDK.AWS.DAX",
"signAssembly": true,
"assemblyOriginatorKeyFile": "../../key.snk"
},
"sphinx": {}
}
Expand Down
4 changes: 3 additions & 1 deletion packages/@aws-cdk/aws-directoryservice/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,9 @@
},
"dotnet": {
"namespace": "Amazon.CDK.AWS.DirectoryService",
"packageId": "Amazon.CDK.AWS.DirectoryService"
"packageId": "Amazon.CDK.AWS.DirectoryService",
"signAssembly": true,
"assemblyOriginatorKeyFile": "../../key.snk"
},
"sphinx": {}
}
Expand Down
4 changes: 3 additions & 1 deletion packages/@aws-cdk/aws-dms/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,9 @@
},
"dotnet": {
"namespace": "Amazon.CDK.AWS.DMS",
"packageId": "Amazon.CDK.AWS.DMS"
"packageId": "Amazon.CDK.AWS.DMS",
"signAssembly": true,
"assemblyOriginatorKeyFile": "../../key.snk"
},
"sphinx": {}
}
Expand Down
4 changes: 3 additions & 1 deletion packages/@aws-cdk/aws-dynamodb/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,9 @@
},
"dotnet": {
"namespace": "Amazon.CDK.AWS.DynamoDB",
"packageId": "Amazon.CDK.AWS.DynamoDB"
"packageId": "Amazon.CDK.AWS.DynamoDB",
"signAssembly": true,
"assemblyOriginatorKeyFile": "../../key.snk"
},
"sphinx": {}
}
Expand Down
4 changes: 3 additions & 1 deletion packages/@aws-cdk/aws-ec2/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,9 @@
},
"dotnet": {
"namespace": "Amazon.CDK.AWS.EC2",
"packageId": "Amazon.CDK.AWS.EC2"
"packageId": "Amazon.CDK.AWS.EC2",
"signAssembly": true,
"assemblyOriginatorKeyFile": "../../key.snk"
},
"sphinx": {}
}
Expand Down
4 changes: 3 additions & 1 deletion packages/@aws-cdk/aws-ecr/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,9 @@
},
"dotnet": {
"namespace": "Amazon.CDK.AWS.ECR",
"packageId": "Amazon.CDK.AWS.ECR"
"packageId": "Amazon.CDK.AWS.ECR",
"signAssembly": true,
"assemblyOriginatorKeyFile": "../../key.snk"
},
"sphinx": {}
}
Expand Down
4 changes: 3 additions & 1 deletion packages/@aws-cdk/aws-ecs/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,9 @@
},
"dotnet": {
"namespace": "Amazon.CDK.AWS.ECS",
"packageId": "Amazon.CDK.AWS.ECS"
"packageId": "Amazon.CDK.AWS.ECS",
"signAssembly": true,
"assemblyOriginatorKeyFile": "../../key.snk"
},
"sphinx": {}
}
Expand Down
4 changes: 3 additions & 1 deletion packages/@aws-cdk/aws-efs/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,9 @@
},
"dotnet": {
"namespace": "Amazon.CDK.AWS.EFS",
"packageId": "Amazon.CDK.AWS.EFS"
"packageId": "Amazon.CDK.AWS.EFS",
"signAssembly": true,
"assemblyOriginatorKeyFile": "../../key.snk"
},
"sphinx": {}
}
Expand Down
4 changes: 3 additions & 1 deletion packages/@aws-cdk/aws-eks/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,9 @@
},
"dotnet": {
"namespace": "Amazon.CDK.AWS.EKS",
"packageId": "Amazon.CDK.AWS.EKS"
"packageId": "Amazon.CDK.AWS.EKS",
"signAssembly": true,
"assemblyOriginatorKeyFile": "../../key.snk"
},
"sphinx": {}
}
Expand Down
Loading