Skip to content

Commit e143c85

Browse files
committed
Release 1.30.0
1 parent fbee017 commit e143c85

File tree

4 files changed

+51
-17
lines changed

4 files changed

+51
-17
lines changed

README.md

Lines changed: 19 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -4,31 +4,36 @@ languages:
44
- java
55
products:
66
- azure
7-
- azure-resource-manager
8-
description: "Azure Resource sample for deploying resources using an ARM template and showing progress."
9-
urlFragment: resources-java-deploy-using-arm-template-with-progress
7+
extensions:
8+
- services: Resources
9+
- platforms: java
1010
---
1111

12-
# Deploy Using ARM Template With Progress (Java)
12+
# Getting Started with Resources - Deploy Using ARM Template With Progress - in Java #
1313

14-
Azure Resource sample for deploying resources using an ARM template and showing progress.
1514

16-
## Running this sample
15+
Azure Resource sample for deploying resources using an ARM template and
16+
showing progress.
17+
18+
19+
## Running this Sample ##
1720

1821
To run this sample:
1922

2023
Set the environment variable `AZURE_AUTH_LOCATION` with the full path for an auth file. See [how to create an auth file](https://github.com/Azure/azure-libraries-for-java/blob/master/AUTH.md).
2124

22-
```bash
23-
git clone https://github.com/Azure-Samples/resources-java-deploy-using-arm-template-with-progress.git
24-
cd resources-java-deploy-using-arm-template-with-progress
25-
mvn clean compile exec:java
26-
```
25+
git clone https://github.com/Azure-Samples/resources-java-deploy-using-arm-template-with-progress.git
26+
27+
cd resources-java-deploy-using-arm-template-with-progress
28+
29+
mvn clean compile exec:java
2730

28-
## More information
31+
## More information ##
2932

3033
[http://azure.com/java](http://azure.com/java)
3134

32-
If you don't have a Microsoft Azure subscription you can get a FREE trial account [here](http://go.microsoft.com/fwlink/?LinkId=330212).
35+
If you don't have a Microsoft Azure subscription you can get a FREE trial account [here](http://go.microsoft.com/fwlink/?LinkId=330212)
36+
37+
---
3338

34-
This project has adopted the [Microsoft Open Source Code of Conduct](https://opensource.microsoft.com/codeofconduct/). For more information see the [Code of Conduct FAQ](https://opensource.microsoft.com/codeofconduct/faq/) or contact [[email protected]](mailto:[email protected]) with any additional questions or comments.
39+
This project has adopted the [Microsoft Open Source Code of Conduct](https://opensource.microsoft.com/codeofconduct/). For more information see the [Code of Conduct FAQ](https://opensource.microsoft.com/codeofconduct/faq/) or contact [[email protected]](mailto:[email protected]) with any additional questions or comments.

pom.xml

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,12 +53,22 @@
5353
<dependency>
5454
<groupId>com.microsoft.azure</groupId>
5555
<artifactId>azure</artifactId>
56-
<version>1.24.1</version>
56+
<version>1.30.0</version>
5757
</dependency>
5858
<dependency>
5959
<groupId>commons-net</groupId>
6060
<artifactId>commons-net</artifactId>
6161
<version>3.3</version>
6262
</dependency>
63+
<dependency>
64+
<groupId>commons-lang</groupId>
65+
<artifactId>commons-lang</artifactId>
66+
<version>2.6</version>
67+
</dependency>
68+
<dependency>
69+
<groupId>org.apache.commons</groupId>
70+
<artifactId>commons-lang3</artifactId>
71+
<version>3.7</version>
72+
</dependency>
6373
</dependencies>
6474
</project>

src/main/java/com/microsoft/azure/management/samples/Utils.java

Lines changed: 20 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -739,6 +739,24 @@ public static void print(LoadBalancer resource) {
739739
}
740740
}
741741

742+
// Show HTTPS probes
743+
info.append("\n\tHTTPS probes: ")
744+
.append(resource.httpsProbes().size());
745+
for (LoadBalancerHttpProbe probe : resource.httpsProbes().values()) {
746+
info.append("\n\t\tProbe name: ").append(probe.name())
747+
.append("\n\t\t\tPort: ").append(probe.port())
748+
.append("\n\t\t\tInterval in seconds: ").append(probe.intervalInSeconds())
749+
.append("\n\t\t\tRetries before unhealthy: ").append(probe.numberOfProbes())
750+
.append("\n\t\t\tHTTPS request path: ").append(probe.requestPath());
751+
752+
// Show associated load balancing rules
753+
info.append("\n\t\t\tReferenced from load balancing rules: ")
754+
.append(probe.loadBalancingRules().size());
755+
for (LoadBalancingRule rule : probe.loadBalancingRules().values()) {
756+
info.append("\n\t\t\t\tName: ").append(rule.name());
757+
}
758+
}
759+
742760
// Show load balancing rules
743761
info.append("\n\tLoad balancing rules: ")
744762
.append(resource.loadBalancingRules().size());
@@ -994,7 +1012,7 @@ public static void print(AppServicePlan resource) {
9941012
*/
9951013
public static void print(WebAppBase resource) {
9961014
StringBuilder builder = new StringBuilder().append("Web app: ").append(resource.id())
997-
.append("Name: ").append(resource.name())
1015+
.append("\n\tName: ").append(resource.name())
9981016
.append("\n\tState: ").append(resource.state())
9991017
.append("\n\tResource group: ").append(resource.resourceGroupName())
10001018
.append("\n\tRegion: ").append(resource.region())
@@ -1377,6 +1395,7 @@ public static String createRandomName(String namePrefix) {
13771395
*/
13781396
public static void createCertificate(String certPath, String pfxPath,
13791397
String alias, String password, String cnName) throws Exception {
1398+
SdkContext.prepareFileLocation(new File(pfxPath), new File(certPath));
13801399
if (new File(pfxPath).exists()) {
13811400
return;
13821401
}

src/main/resources/templateValue.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
"type": "Microsoft.Web/sites",
2727
"location": "[resourceGroup().location]",
2828
"tags": {
29-
"[concat('hidden-related:', resourceGroup().id, '/providers/Microsoft.Web/serverfarms/', parameters('hostingPlanName'))]": "Resource",
29+
"[concat('hidden-related:', resourceGroup()\\.id, '/providers/Microsoft\\.Web/serverfarms/', parameters('hostingPlanName'))]": "Resource",
3030
"displayName": "Website"
3131
},
3232
"dependsOn": [

0 commit comments

Comments
 (0)