Skip to content

Commit f6e9cca

Browse files
notdryftzoewangg
authored andcommitted
EC2MetadataUtils: add marketplaceProductCodes inside InstanceInfo's POJO
1 parent 48e30b2 commit f6e9cca

File tree

4 files changed

+17
-2
lines changed

4 files changed

+17
-2
lines changed
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
{
2+
"category": "AWS SDK for Java v2",
3+
"type": "feature",
4+
"description": "EC2MetadataUtils: add marketplaceProductCodes inside InstanceInfo's POJO"
5+
}

core/regions/src/it/java/software/amazon/awssdk/regions/util/EC2MetadataUtilsIntegrationTest.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -109,5 +109,6 @@ public void testInstanceInfo() {
109109
Assert.assertEquals("us-east-1b", info.getAvailabilityZone());
110110
Assert.assertEquals("10.201.215.38", info.getPrivateIp());
111111
Assert.assertEquals("bar", info.getDevpayProductCodes()[0]);
112+
Assert.assertEquals("qaz", info.getMarketplaceProductCodes()[0]);
112113
}
113114
}

core/regions/src/main/java/software/amazon/awssdk/regions/internal/util/EC2MetadataUtils.java

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -484,6 +484,7 @@ public static class InstanceInfo {
484484
private final String availabilityZone;
485485
private final String privateIp;
486486
private final String[] devpayProductCodes;
487+
private final String[] marketplaceProductCodes;
487488

488489
@JsonCreator
489490
public InstanceInfo(
@@ -500,7 +501,8 @@ public InstanceInfo(
500501
@JsonProperty(value = "version", required = true) String version,
501502
@JsonProperty(value = "availabilityZone", required = true) String availabilityZone,
502503
@JsonProperty(value = "privateIp", required = true) String privateIp,
503-
@JsonProperty(value = "devpayProductCodes", required = false) String[] devpayProductCodes) {
504+
@JsonProperty(value = "devpayProductCodes", required = false) String[] devpayProductCodes,
505+
@JsonProperty(value = "marketplaceProductCodes", required = false) String[] marketplaceProductCodes) {
504506
this.pendingTime = pendingTime;
505507
this.instanceType = instanceType;
506508
this.imageId = imageId;
@@ -517,6 +519,8 @@ public InstanceInfo(
517519
this.privateIp = privateIp;
518520
this.devpayProductCodes = devpayProductCodes == null
519521
? null : devpayProductCodes.clone();
522+
this.marketplaceProductCodes = marketplaceProductCodes == null
523+
? null : marketplaceProductCodes.clone();
520524
}
521525

522526
public String getPendingTime() {
@@ -574,6 +578,10 @@ public String getPrivateIp() {
574578
public String[] getDevpayProductCodes() {
575579
return devpayProductCodes == null ? null : devpayProductCodes.clone();
576580
}
581+
582+
public String[] getMarketplaceProductCodes() {
583+
return marketplaceProductCodes == null ? null : marketplaceProductCodes.clone();
584+
}
577585
}
578586

579587
/**

core/regions/src/test/java/software/amazon/awssdk/regions/internal/util/EC2MetadataUtilsServer.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -213,7 +213,8 @@ protected String constructInstanceInfo() {
213213
+ "\"version\":\"2010-08-31\","
214214
+ "\"availabilityZone\":\"us-east-1b\","
215215
+ "\"privateIp\":\"10.201.215.38\","
216-
+ "\"devpayProductCodes\":[\"bar\"]"
216+
+ "\"devpayProductCodes\":[\"bar\"],"
217+
+ "\"marketplaceProductCodes\":[\"qaz\"]"
217218
+ "}";
218219
}
219220

0 commit comments

Comments
 (0)