From 88f771e7ee60d4230bcffc6885cf6ee7b9409728 Mon Sep 17 00:00:00 2001 From: Azure-Fluent Date: Tue, 14 Jan 2020 16:23:37 +0800 Subject: [PATCH] Release 1.30.0 --- README.md | 48 ++++++++++--------- pom.xml | 12 ++++- .../ManageFunctionAppWithAuthentication.java | 2 +- .../azure/management/samples/Utils.java | 21 +++++++- 4 files changed, 57 insertions(+), 26 deletions(-) diff --git a/README.md b/README.md index 26ac728..45e0d79 100644 --- a/README.md +++ b/README.md @@ -4,42 +4,44 @@ languages: - java products: - azure -- azure-functions -description: "Azure App Service basic sample for managing function apps." -urlFragment: app-service-java-manage-authentication-for-functions +extensions: +- services: Appservice +- platforms: java --- -# Manage Function App With Authentication (Java) +# Getting Started with Appservice - Manage Function App With Authentication - in Java # -Azure App Service basic sample for managing function apps. -- Create 3 function apps under the same new app service plan and with the same storage account - - Deploy 1 & 2 via Git a function that calculates the square of a number - - Deploy 3 via Web Deploy - - Enable app level authentication for the 1st function app - - Verify the 1st function app can be accessed with the admin key - - Enable function level authentication for the 2nd function app - - Verify the 2nd function app can be accessed with the function key - - Enable function level authentication for the 3rd function app - - Verify the 3rd function app can be accessed with the function key + Azure App Service basic sample for managing function apps. + - Create 3 function apps under the same new app service plan and with the same storage account + - Deploy 1 & 2 via Git a function that calculates the square of a number + - Deploy 3 via Web Deploy + - Enable app level authentication for the 1st function app + - Verify the 1st function app can be accessed with the admin key + - Enable function level authentication for the 2nd function app + - Verify the 2nd function app can be accessed with the function key + - Enable function level authentication for the 3rd function app + - Verify the 3rd function app can be accessed with the function key -## 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-authentication-for-functions.git -cd app-service-java-manage-authentication-for-functions -mvn clean compile exec:java -``` + git clone https://github.com/Azure-Samples/app-service-java-manage-authentication-for-functions.git -## More information + cd app-service-java-manage-authentication-for-functions + + 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 [opencode@microsoft.com](mailto:opencode@microsoft.com) 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 [opencode@microsoft.com](mailto:opencode@microsoft.com) with any additional questions or comments. \ No newline at end of file diff --git a/pom.xml b/pom.xml index 6cebea6..32b1fd1 100644 --- a/pom.xml +++ b/pom.xml @@ -53,7 +53,7 @@ com.microsoft.azure azure - 1.24.1 + 1.30.0 commons-net @@ -65,5 +65,15 @@ org.eclipse.jgit 4.5.0.201609210915-r + + commons-lang + commons-lang + 2.6 + + + org.apache.commons + commons-lang3 + 3.7 + diff --git a/src/main/java/com/microsoft/azure/management/appservice/samples/ManageFunctionAppWithAuthentication.java b/src/main/java/com/microsoft/azure/management/appservice/samples/ManageFunctionAppWithAuthentication.java index 555e09d..9c05400 100644 --- a/src/main/java/com/microsoft/azure/management/appservice/samples/ManageFunctionAppWithAuthentication.java +++ b/src/main/java/com/microsoft/azure/management/appservice/samples/ManageFunctionAppWithAuthentication.java @@ -182,7 +182,7 @@ public static boolean runSample(Azure azure) { System.out.println("Deploying a local function app to " + app3Name + " through web deploy..."); app3.deploy() - .withPackageUri("https://github.com/Azure/azure-sdk-for-java/raw/master/azure-samples/src/main/resources/square-function-app-function-auth.zip") + .withPackageUri("https://github.com/Azure/azure-libraries-for-java/raw/master/azure-samples/src/main/resources/square-function-app-function-auth.zip") .withExistingDeploymentsDeleted(false) .execute(); diff --git a/src/main/java/com/microsoft/azure/management/samples/Utils.java b/src/main/java/com/microsoft/azure/management/samples/Utils.java index baf6241..9940f93 100644 --- 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; }