Skip to content

Commit 281c083

Browse files
author
Elad Ben-Israel
authored
fix(cdk): temporary fix to java "cdk init" template (#732)
Fixes #711 Seems like jsii stopped generating method overloads which is the reason some of the method signatures caused compilation errors. Also, IIdentityResource was renamed to IPrincipal. We should revisit once aws/jsii#233 is fixed. But at least we want to make sure the init template compiles.
1 parent a79190c commit 281c083

File tree

2 files changed

+7
-5
lines changed

2 files changed

+7
-5
lines changed

packages/aws-cdk/lib/init-templates/app/java/src/main/java/com/myorg/HelloConstruct.java

+5-4
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
package com.myorg;
22

33
import software.amazon.awscdk.Construct;
4-
import software.amazon.awscdk.services.iam.IIdentityResource;
4+
import software.amazon.awscdk.services.iam.IPrincipal;
55
import software.amazon.awscdk.services.s3.Bucket;
6+
import software.amazon.awscdk.services.s3.BucketProps;
67

78
import java.util.ArrayList;
89
import java.util.List;
@@ -17,15 +18,15 @@ public HelloConstruct(final Construct parent, final String name, final HelloCons
1718
super(parent, name);
1819

1920
for (int i = 0; i < props.getBucketCount(); ++i) {
20-
buckets.add(new Bucket(this, "Bucket" + String.valueOf(i)));
21+
buckets.add(new Bucket(this, "Bucket" + String.valueOf(i), BucketProps.builder().build()));
2122
}
2223
}
2324

2425
/**
2526
* Given an principal, grants it READ access on all buckets.
2627
* @param principal The principal (User, Group, Role)
2728
*/
28-
public void grantRead(final IIdentityResource principal) {
29-
buckets.forEach(b -> b.grantRead(principal));
29+
public void grantRead(final IPrincipal principal) {
30+
buckets.forEach(b -> b.grantRead(principal, "*"));
3031
}
3132
}

packages/aws-cdk/lib/init-templates/app/java/src/main/java/com/myorg/HelloStack.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
import software.amazon.awscdk.Stack;
55
import software.amazon.awscdk.StackProps;
66
import software.amazon.awscdk.services.iam.User;
7+
import software.amazon.awscdk.services.iam.UserProps;
78
import software.amazon.awscdk.services.sns.Topic;
89
import software.amazon.awscdk.services.sns.TopicProps;
910
import software.amazon.awscdk.services.sqs.Queue;
@@ -31,7 +32,7 @@ public HelloStack(final App parent, final String name, final StackProps props) {
3132
.withBucketCount(5)
3233
.build());
3334

34-
User user = new User(this, "MyUser");
35+
User user = new User(this, "MyUser", UserProps.builder().build());
3536
hello.grantRead(user);
3637
}
3738
}

0 commit comments

Comments
 (0)