Release 1.30.0

Azure-Samples · Jan 14, 2020 · 7a448eb · 7a448eb
1 parent 8baab3d
commit 7a448eb
Show file tree

Hide file tree

Showing 3 changed files with 53 additions and 22 deletions.
diff --git a/README.md b/README.md
@@ -4,39 +4,41 @@ languages:
 - java
 products:
 - azure
-- azure-app-service
-description: "Azure App Service basic sample for managing web apps."
-urlFragment: app-service-java-manage-web-apps
+extensions:
+- services: Appservice
+- platforms: java
 ---
 
-# Manage Azure App Service Web App (Java)
+# Getting Started with Appservice - Manage Web App Basic - in Java #
 
-Azure App Service basic sample for managing web apps.
 
-- Create 3 web apps under the same new app service plan:
- - 1, 2 are in the same resource group, 3 in a different one
- - Stop and start 1, restart 2
- - Add Java support to app 3
-- List web apps
-- Delete a web app
+  Azure App Service basic sample for managing web apps.
+   - Create 3 web apps under the same new app service plan:
+     - 1, 2 are in the same resource group, 3 in a different one
+     - Stop and start 1, restart 2
+     - Add Java support to app 3
+   - List web apps
+   - Delete a web app
 
 
-## Running this sample
+## Running this Sample ##
 
 To run this sample:
 
 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).
 
-```bash
-git clone https://github.com/Azure-Samples/app-service-java-manage-web-apps.git
-cd app-service-java-manage-web-apps
-mvn clean compile exec:java
-```
+    git clone https://github.com/Azure-Samples/app-service-java-manage-web-apps.git
 
-## More information
+    cd app-service-java-manage-web-apps
+
+    mvn clean compile exec:java
+
+## More information ##
 
 [http://azure.com/java](http://azure.com/java)
 
-If you don't have a Microsoft Azure subscription you can get a FREE trial account [here](http://go.microsoft.com/fwlink/?LinkId=330212).
+If you don't have a Microsoft Azure subscription you can get a FREE trial account [here](http://go.microsoft.com/fwlink/?LinkId=330212)
+
+---
 
-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.
+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.
diff --git a/pom.xml b/pom.xml
@@ -53,12 +53,22 @@
     <dependency>
       <groupId>com.microsoft.azure</groupId>
       <artifactId>azure</artifactId>
-      <version>1.24.1</version>
+      <version>1.30.0</version>
     </dependency>
     <dependency>
       <groupId>commons-net</groupId>
       <artifactId>commons-net</artifactId>
       <version>3.3</version>
     </dependency>
+    <dependency>
+      <groupId>commons-lang</groupId>
+      <artifactId>commons-lang</artifactId>
+      <version>2.6</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.commons</groupId>
+      <artifactId>commons-lang3</artifactId>
+      <version>3.7</version>
+    </dependency>
   </dependencies>
 </project>
diff --git a/src/main/java/com/microsoft/azure/management/samples/Utils.java b/src/main/java/com/microsoft/azure/management/samples/Utils.java
@@ -739,6 +739,24 @@ public static void print(LoadBalancer resource) {
             }
         }
 
+        // Show HTTPS probes
+        info.append("\n\tHTTPS probes: ")
+                .append(resource.httpsProbes().size());
+        for (LoadBalancerHttpProbe probe : resource.httpsProbes().values()) {
+            info.append("\n\t\tProbe name: ").append(probe.name())
+                    .append("\n\t\t\tPort: ").append(probe.port())
+                    .append("\n\t\t\tInterval in seconds: ").append(probe.intervalInSeconds())
+                    .append("\n\t\t\tRetries before unhealthy: ").append(probe.numberOfProbes())
+                    .append("\n\t\t\tHTTPS request path: ").append(probe.requestPath());
+
+            // Show associated load balancing rules
+            info.append("\n\t\t\tReferenced from load balancing rules: ")
+                    .append(probe.loadBalancingRules().size());
+            for (LoadBalancingRule rule : probe.loadBalancingRules().values()) {
+                info.append("\n\t\t\t\tName: ").append(rule.name());
+            }
+        }
+
         // Show load balancing rules
         info.append("\n\tLoad balancing rules: ")
                 .append(resource.loadBalancingRules().size());
@@ -994,7 +1012,7 @@ public static void print(AppServicePlan resource) {
      */
     public static void print(WebAppBase resource) {
         StringBuilder builder = new StringBuilder().append("Web app: ").append(resource.id())
-                .append("Name: ").append(resource.name())
+                .append("\n\tName: ").append(resource.name())
                 .append("\n\tState: ").append(resource.state())
                 .append("\n\tResource group: ").append(resource.resourceGroupName())
                 .append("\n\tRegion: ").append(resource.region())
@@ -1377,6 +1395,7 @@ public static String createRandomName(String namePrefix) {
      */
     public static void createCertificate(String certPath, String pfxPath,
                                          String alias, String password, String cnName) throws Exception {
+        SdkContext.prepareFileLocation(new File(pfxPath), new File(certPath));
         if (new File(pfxPath).exists()) {
             return;
         }