Skip to content

Commit 3e9e99b

Browse files
lunarislunaris
authored
Remove use of deprecated getId methods in Java examples (#1787)
The `getId()` method on resources in Java is `@Deprecated`, and has been for some time. This commit removes uses of this method in favour of the recommended `id()`, which provides exactly the same behaviour and is consistent with other methods in the Java SDK/generated SDKs.
2 parents df56c01 + ba8ddef commit 3e9e99b

File tree

4 files changed

+40
-40
lines changed
  • aws-java-ansible-wordpress/src/main/java/myproject
  • aws-java-webserver/src/main/java/webserver
  • azure-java-appservice-sql/src/main/java/appservice
  • azure-java-function-graal-spring/infra/src/main/java/com/pulumi/example/infra

4 files changed

+40
-40
lines changed

‎aws-java-ansible-wordpress/src/main/java/myproject/App.java‎

Lines changed: 37 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -55,54 +55,54 @@ public static void stack(Context ctx) {
5555
// Read in the private key for easy use below (and to ensure it's marked a secret!)
5656
final var privateKey = Output.of(Files.readString(Path.of(privateKeyPath))).asSecret();
5757

58-
var prodVpc = new Vpc("prodVpc", VpcArgs.builder()
58+
var prodVpc = new Vpc("prodVpc", VpcArgs.builder()
5959
.cidrBlock("10.192.0.0/16")
6060
.enableDnsSupport(true)
6161
.enableDnsHostnames(true)
6262
.instanceTenancy("default")
6363
.build());
6464

65-
var prodSubnetPublic1 = new Subnet("prodSubnetPublic1", SubnetArgs.builder()
66-
.vpcId(prodVpc.getId())
65+
var prodSubnetPublic1 = new Subnet("prodSubnetPublic1", SubnetArgs.builder()
66+
.vpcId(prodVpc.id())
6767
.cidrBlock("10.192.0.0/24")
6868
.mapPublicIpOnLaunch(true)
6969
.availabilityZone(Output.of(availabilityZones.thenApply(azs -> azs.names().get(0))))
7070
.build());
7171

72-
var prodSubnetPrivate1 = new Subnet("prodSubnetPrivate1", SubnetArgs.builder()
73-
.vpcId(prodVpc.getId())
72+
var prodSubnetPrivate1 = new Subnet("prodSubnetPrivate1", SubnetArgs.builder()
73+
.vpcId(prodVpc.id())
7474
.cidrBlock("10.192.20.0/24")
7575
.mapPublicIpOnLaunch(false)
7676
.availabilityZone(Output.of(availabilityZones.thenApply(azs -> azs.names().get(1))))
7777
.build());
7878

79-
var prodSubnetPrivate2 = new Subnet("prodSubnetPrivate2", SubnetArgs.builder()
80-
.vpcId(prodVpc.getId())
79+
var prodSubnetPrivate2 = new Subnet("prodSubnetPrivate2", SubnetArgs.builder()
80+
.vpcId(prodVpc.id())
8181
.cidrBlock("10.192.21.0/24")
8282
.mapPublicIpOnLaunch(false)
8383
.availabilityZone(Output.of(availabilityZones.thenApply(azs -> azs.names().get(2))))
8484
.build());
8585

86-
var prodIgw = new InternetGateway("prodIgw", InternetGatewayArgs.builder()
87-
.vpcId(prodVpc.getId())
86+
var prodIgw = new InternetGateway("prodIgw", InternetGatewayArgs.builder()
87+
.vpcId(prodVpc.id())
8888
.build());
8989

90-
var prodPublicCrt = new RouteTable("prodPublicCrt", RouteTableArgs.builder()
91-
.vpcId(prodVpc.getId())
90+
var prodPublicCrt = new RouteTable("prodPublicCrt", RouteTableArgs.builder()
91+
.vpcId(prodVpc.id())
9292
.routes(RouteTableRouteArgs.builder()
9393
.cidrBlock("0.0.0.0/0")
94-
.gatewayId(prodIgw.getId())
94+
.gatewayId(prodIgw.id())
9595
.build())
9696
.build());
9797

98-
var prodCrtaPublicSubnet1 = new RouteTableAssociation("prodCrtaPublicSubnet1", RouteTableAssociationArgs.builder()
99-
.subnetId(prodSubnetPublic1.getId())
100-
.routeTableId(prodPublicCrt.getId())
98+
var prodCrtaPublicSubnet1 = new RouteTableAssociation("prodCrtaPublicSubnet1", RouteTableAssociationArgs.builder()
99+
.subnetId(prodSubnetPublic1.id())
100+
.routeTableId(prodPublicCrt.id())
101101
.build());
102102

103-
var ec2AllowRule = new SecurityGroup("ec2AllowRule", SecurityGroupArgs.builder()
104-
.vpcId(prodVpc.getId())
105-
.ingress(
103+
var ec2AllowRule = new SecurityGroup("ec2AllowRule", SecurityGroupArgs.builder()
104+
.vpcId(prodVpc.id())
105+
.ingress(
106106
SecurityGroupIngressArgs.builder()
107107
.description("ANY")
108108
.fromPort(0)
@@ -147,13 +147,13 @@ public static void stack(Context ctx) {
147147
.tags(Map.of("Name", "allow ssh,http,https"))
148148
.build());
149149

150-
var rdsAllowRule = new SecurityGroup("rdsAllowRule", SecurityGroupArgs.builder()
151-
.vpcId(prodVpc.getId())
150+
var rdsAllowRule = new SecurityGroup("rdsAllowRule", SecurityGroupArgs.builder()
151+
.vpcId(prodVpc.id())
152152
.ingress(SecurityGroupIngressArgs.builder()
153153
.fromPort(3306)
154154
.toPort(3306)
155155
.protocol("tcp")
156-
.securityGroups(ec2AllowRule.getId())
156+
.securityGroups(ec2AllowRule.id())
157157
.build())
158158
.egress(SecurityGroupEgressArgs.builder()
159159
.fromPort(0)
@@ -164,10 +164,10 @@ public static void stack(Context ctx) {
164164
.tags(Map.of("Name", "allow ec2"))
165165
.build());
166166

167-
var rdsSubnetGrp = new SubnetGroup("rdsSubnetGrp", SubnetGroupArgs.builder()
168-
.subnetIds(
169-
prodSubnetPrivate1.getId(),
170-
prodSubnetPrivate2.getId())
167+
var rdsSubnetGrp = new SubnetGroup("rdsSubnetGrp", SubnetGroupArgs.builder()
168+
.subnetIds(
169+
prodSubnetPrivate1.id(),
170+
prodSubnetPrivate2.id())
171171
.build());
172172

173173
var wordpressdb = new com.pulumi.aws.rds.Instance("wordpressdb",
@@ -176,36 +176,36 @@ public static void stack(Context ctx) {
176176
.engine("mysql")
177177
.engineVersion("5.7")
178178
.instanceClass(dbInstanceSize)
179-
.dbSubnetGroupName(rdsSubnetGrp.getId())
180-
.vpcSecurityGroupIds(rdsAllowRule.getId())
179+
.dbSubnetGroupName(rdsSubnetGrp.id())
180+
.vpcSecurityGroupIds(rdsAllowRule.id())
181181
.dbName(dbName)
182182
.username(dbUsername)
183183
.password(dbPassword)
184184
.skipFinalSnapshot(true)
185185
.build());
186186

187-
var wordpressKeypair = new KeyPair("wordpressKeypair", KeyPairArgs.builder()
187+
var wordpressKeypair = new KeyPair("wordpressKeypair", KeyPairArgs.builder()
188188
.publicKey(publicKey)
189189
.build());
190190

191191
var wordpressInstance = new com.pulumi.aws.ec2.Instance("wordpressInstance",
192192
com.pulumi.aws.ec2.InstanceArgs.builder()
193193
.ami(Output.of(awsLinuxAmi.thenApply(amiResult -> amiResult.id())))
194194
.instanceType(ec2InstanceSize)
195-
.subnetId(prodSubnetPublic1.getId())
196-
.vpcSecurityGroupIds(c2AllowRule.getId())
197-
.keyName(wordpressKeypair.getId())
195+
.subnetId(prodSubnetPublic1.id())
196+
.vpcSecurityGroupIds(c2AllowRule.id())
197+
.keyName(wordpressKeypair.id())
198198
.tags(Map.of("Name", "Wordpress.web"))
199199
.build(),
200200
CustomResourceOptions.builder()
201201
.dependsOn(wordpressdb)
202202
.build());
203203

204-
var wordpressEip = new Eip("wordpressEip", EipArgs.builder()
205-
.instance(wordpressInstance.getId())
204+
var wordpressEip = new Eip("wordpressEip", EipArgs.builder()
205+
.instance(wordpressInstance.id())
206206
.build());
207207

208-
var renderPlaybookCmd = new Command("renderPlaybookCmd", CommandArgs.builder()
208+
var renderPlaybookCmd = new Command("renderPlaybookCmd", CommandArgs.builder()
209209
.create("cat playbook.yml | envsubst > playbook_rendered.yml")
210210
.environment(Map.ofEntries(
211211
Map.entry("DB_RDS", wordpressdb.endpoint()),
@@ -215,7 +215,7 @@ public static void stack(Context ctx) {
215215
))
216216
.build());
217217

218-
var updatePythonCmd = new Command("updatePythonCmd", CommandArgs.builder()
218+
var updatePythonCmd = new Command("updatePythonCmd", CommandArgs.builder()
219219
.connection(ConnectionArgs.builder()
220220
.host(wordpressEip.publicIp())
221221
.port(22)
@@ -227,10 +227,10 @@ public static void stack(Context ctx) {
227227
""")
228228
.build());
229229

230-
var playAnsiblePlaybookCmd = new Command("playAnsiblePlaybookCmd", CommandArgs.builder()
230+
var playAnsiblePlaybookCmd = new Command("playAnsiblePlaybookCmd", CommandArgs.builder()
231231
.create(wordpressEip.publicIp().apply(publicIp -> String.format("ANSIBLE_HOST_KEY_CHECKING=False ansible-playbook -u ec2-user -i '%s,' --private-key %s playbook_rendered.yml", publicIp,privateKeyPath)))
232232
.build(), CustomResourceOptions.builder()
233-
.dependsOn(
233+
.dependsOn(
234234
renderPlaybookCmd,
235235
updatePythonCmd)
236236
.build());

‎aws-java-webserver/src/main/java/webserver/App.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ public static void stack(Context ctx) {
5353
final var server = new Instance("web-server-www", InstanceArgs.builder()
5454
.tags(Map.of("Name", "web-server-www"))
5555
.instanceType(Output.ofRight(com.pulumi.aws.ec2.enums.InstanceType.T2_Micro))
56-
.vpcSecurityGroupIds(group.getId().applyValue(List::of))
56+
.vpcSecurityGroupIds(group.id().applyValue(List::of))
5757
.ami(ami)
5858
.userData(userData)
5959
.build()

‎azure-java-appservice-sql/src/main/java/appservice/App.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ private static void stack(Context ctx) {
9999

100100
var app = new WebApp("webapp",
101101
WebAppArgs.builder().resourceGroupName(resourceGroup.name())
102-
.serverFarmId(appServicePlan.getId())
102+
.serverFarmId(appServicePlan.id())
103103
.siteConfig(SiteConfigArgs.builder()
104104
.appSettings(
105105
NameValuePairArgs.builder()

‎azure-java-function-graal-spring/infra/src/main/java/com/pulumi/example/infra/Main.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ private static void stack(Context ctx) {
8787
var app = storageConnectionString.applyValue(
8888
conn -> new WebApp("function", WebAppArgs.builder()
8989
.resourceGroupName(resourceGroup.name())
90-
.serverFarmId(plan.getId())
90+
.serverFarmId(plan.id())
9191
.kind("functionapp,linux,container")
9292
.httpsOnly(true)
9393
.siteConfig(SiteConfigArgs.builder()

0 commit comments

Comments
 (0)