From 838f1a590b4d9d74b50d5ad4dfe75470602fa772 Mon Sep 17 00:00:00 2001 From: Weidong Xu Date: Mon, 28 Sep 2020 09:39:26 +0800 Subject: [PATCH 1/8] rename curl/post method --- .../appservice/AppServiceTest.java | 8 ++-- .../samples/ManageFunctionAppLogs.java | 14 +++---- .../ManageFunctionAppSourceControl.java | 24 +++++------ .../ManageFunctionAppWithAuthentication.java | 14 +++---- .../ManageLinuxFunctionAppSourceControl.java | 8 ++-- .../ManageLinuxWebAppSourceControl.java | 16 +++---- ...geLinuxWebAppStorageAccountConnection.java | 4 +- ...anageLinuxWebAppWithContainerRegistry.java | 4 +- .../samples/ManageWebAppCosmosDbByMsi.java | 4 +- .../ManageWebAppCosmosDbThroughKeyVault.java | 4 +- .../appservice/samples/ManageWebAppLogs.java | 10 ++--- .../appservice/samples/ManageWebAppSlots.java | 8 ++-- .../samples/ManageWebAppSourceControl.java | 30 ++++++------- .../ManageWebAppSourceControlAsync.java | 16 +++---- .../ManageWebAppStorageAccountConnection.java | 4 +- .../samples/ManageCdnProfileWithWebApp.java | 2 +- ...tainerInstanceWithAzureFileShareMount.java | 4 +- ...WithManualAzureFileShareMountCreation.java | 4 +- ...erInstanceWithMultipleContainerImages.java | 4 +- ...ManyUsingContainerServiceOrchestrator.java | 8 ++-- ...eSettingsBasedOnPerformanceOrSchedule.java | 2 +- .../azure/resourcemanager/samples/Utils.java | 42 ++++++++++--------- 22 files changed, 118 insertions(+), 116 deletions(-) diff --git a/sdk/resourcemanager/azure-resourcemanager-appservice/src/test/java/com/azure/resourcemanager/appservice/AppServiceTest.java b/sdk/resourcemanager/azure-resourcemanager-appservice/src/test/java/com/azure/resourcemanager/appservice/AppServiceTest.java index b50bb3961e51..33643411c8ce 100644 --- a/sdk/resourcemanager/azure-resourcemanager-appservice/src/test/java/com/azure/resourcemanager/appservice/AppServiceTest.java +++ b/sdk/resourcemanager/azure-resourcemanager-appservice/src/test/java/com/azure/resourcemanager/appservice/AppServiceTest.java @@ -196,7 +196,7 @@ public static void uploadFileToWebApp(PublishingProfile profile, String fileName protected Response curl(String urlString) throws IOException { try { - Mono>> response = + Mono>> response = HTTP_CLIENT.getString(getHost(urlString), getPathAndQuery(urlString)) .retryWhen(Retry .fixedDelay(3, Duration.ofSeconds(30)) @@ -235,7 +235,7 @@ private String getPathAndQuery(String urlString) throws MalformedURLException { return path; } - private static Mono> stringResponse(Mono>> responseMono) { + private static Mono> stringResponse(Mono>> responseMono) { return responseMono .flatMap( response -> @@ -263,12 +263,12 @@ private static Mono> stringResponse(Mono>> getString( + Mono>> getString( @HostParam("$host") String host, @PathParam(value = "path", encoded = true) String path); @Post("{path}") @ExpectedResponses({200, 400, 404}) - Mono>> postString( + Mono>> postString( @HostParam("$host") String host, @PathParam(value = "path", encoded = true) String path, @BodyParam("text/plain") String body); diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/appservice/samples/ManageFunctionAppLogs.java b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/appservice/samples/ManageFunctionAppLogs.java index 216ff50a4232..9b948afd6ac2 100644 --- a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/appservice/samples/ManageFunctionAppLogs.java +++ b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/appservice/samples/ManageFunctionAppLogs.java @@ -83,7 +83,7 @@ public static boolean runSample(AzureResourceManager azureResourceManager) throw // warm up System.out.println("Warming up " + appUrl + "/api/square..."); - Utils.post("http://" + appUrl + "/api/square", "625"); + Utils.sendPostRequest("http://" + appUrl + "/api/square", "625"); ResourceManagerUtils.sleep(Duration.ofSeconds(5)); //============================================================ @@ -95,11 +95,11 @@ public static boolean runSample(AzureResourceManager azureResourceManager) throw StopWatch stopWatch = new StopWatch(); stopWatch.start(); new Thread(() -> { - Utils.post("http://" + appUrl + "/api/square", "625"); + Utils.sendPostRequest("http://" + appUrl + "/api/square", "625"); ResourceManagerUtils.sleep(Duration.ofSeconds(10)); - Utils.post("http://" + appUrl + "/api/square", "725"); + Utils.sendPostRequest("http://" + appUrl + "/api/square", "725"); ResourceManagerUtils.sleep(Duration.ofSeconds(10)); - Utils.post("http://" + appUrl + "/api/square", "825"); + Utils.sendPostRequest("http://" + appUrl + "/api/square", "825"); }).start(); while (line != null && stopWatch.getTime() < 90000) { System.out.println(line); @@ -113,11 +113,11 @@ public static boolean runSample(AzureResourceManager azureResourceManager) throw new Thread(() -> { ResourceManagerUtils.sleep(Duration.ofSeconds(5)); System.out.println("Starting hitting"); - Utils.post("http://" + appUrl + "/api/square", "625"); + Utils.sendPostRequest("http://" + appUrl + "/api/square", "625"); ResourceManagerUtils.sleep(Duration.ofSeconds(10)); - Utils.post("http://" + appUrl + "/api/square", "725"); + Utils.sendPostRequest("http://" + appUrl + "/api/square", "725"); ResourceManagerUtils.sleep(Duration.ofSeconds(10)); - Utils.post("http://" + appUrl + "/api/square", "825"); + Utils.sendPostRequest("http://" + appUrl + "/api/square", "825"); }).start(); final AtomicInteger count = new AtomicInteger(0); diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/appservice/samples/ManageFunctionAppSourceControl.java b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/appservice/samples/ManageFunctionAppSourceControl.java index fab1b336abc5..16c267f4ea19 100644 --- a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/appservice/samples/ManageFunctionAppSourceControl.java +++ b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/appservice/samples/ManageFunctionAppSourceControl.java @@ -92,10 +92,10 @@ public static boolean runSample(AzureResourceManager azureResourceManager) throw // warm up System.out.println("Warming up " + app1Url + "/api/square..."); - Utils.post("http://" + app1Url + "/api/square", "625"); + Utils.sendPostRequest("http://" + app1Url + "/api/square", "625"); ResourceManagerUtils.sleep(Duration.ofSeconds(5)); System.out.println("CURLing " + app1Url + "/api/square..."); - System.out.println("Square of 625 is " + Utils.post("http://" + app1Url + "/api/square", "625")); + System.out.println("Square of 625 is " + Utils.sendPostRequest("http://" + app1Url + "/api/square", "625")); //============================================================ // Create a second function app with local git source control @@ -136,10 +136,10 @@ public static boolean runSample(AzureResourceManager azureResourceManager) throw // warm up System.out.println("Warming up " + app2Url + "/api/square..."); - Utils.post("http://" + app2Url + "/api/square", "725"); + Utils.sendPostRequest("http://" + app2Url + "/api/square", "725"); ResourceManagerUtils.sleep(Duration.ofSeconds(5)); System.out.println("CURLing " + app2Url + "/api/square..."); - System.out.println("Square of 725 is " + Utils.post("http://" + app2Url + "/api/square", "725")); + System.out.println("Square of 725 is " + Utils.sendPostRequest("http://" + app2Url + "/api/square", "725")); //============================================================ // Create a 3rd function app with a public GitHub repo in Azure-Samples @@ -160,10 +160,10 @@ public static boolean runSample(AzureResourceManager azureResourceManager) throw // warm up System.out.println("Warming up " + app3Url + "/api/square..."); - Utils.post("http://" + app3Url + "/api/square", "825"); + Utils.sendPostRequest("http://" + app3Url + "/api/square", "825"); ResourceManagerUtils.sleep(Duration.ofSeconds(5)); System.out.println("CURLing " + app3Url + "/api/square..."); - System.out.println("Square of 825 is " + Utils.post("http://" + app3Url + "/api/square", "825")); + System.out.println("Square of 825 is " + Utils.sendPostRequest("http://" + app3Url + "/api/square", "825")); //============================================================ // Create a 4th function app with a personal GitHub repo and turn on continuous integration @@ -187,10 +187,10 @@ public static boolean runSample(AzureResourceManager azureResourceManager) throw // warm up System.out.println("Warming up " + app4Url + "..."); - Utils.curl("http://" + app4Url); + Utils.sendGetRequest("http://" + app4Url); ResourceManagerUtils.sleep(Duration.ofSeconds(5)); System.out.println("CURLing " + app4Url + "..."); - System.out.println(Utils.curl("http://" + app4Url)); + System.out.println(Utils.sendGetRequest("http://" + app4Url)); //============================================================ // Create a 5th function app with web deploy @@ -213,10 +213,10 @@ public static boolean runSample(AzureResourceManager azureResourceManager) throw // warm up System.out.println("Warming up " + app5Url + "/api/square..."); - Utils.post("http://" + app5Url + "/api/square", "925"); + Utils.sendPostRequest("http://" + app5Url + "/api/square", "925"); ResourceManagerUtils.sleep(Duration.ofSeconds(5)); System.out.println("CURLing " + app5Url + "/api/square..."); - System.out.println("Square of 925 is " + Utils.post("http://" + app5Url + "/api/square", "925")); + System.out.println("Square of 925 is " + Utils.sendPostRequest("http://" + app5Url + "/api/square", "925")); //============================================================ // Create a 6th function app with zip deploy @@ -239,10 +239,10 @@ public static boolean runSample(AzureResourceManager azureResourceManager) throw // warm up System.out.println("Warming up " + app6Url + "/api/square..."); - Utils.post("http://" + app6Url + "/api/square", "926"); + Utils.sendPostRequest("http://" + app6Url + "/api/square", "926"); ResourceManagerUtils.sleep(Duration.ofSeconds(5)); System.out.println("CURLing " + app6Url + "/api/square..."); - System.out.println("Square of 926 is " + Utils.post("http://" + app6Url + "/api/square", "926")); + System.out.println("Square of 926 is " + Utils.sendPostRequest("http://" + app6Url + "/api/square", "926")); return true; } finally { diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/appservice/samples/ManageFunctionAppWithAuthentication.java b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/appservice/samples/ManageFunctionAppWithAuthentication.java index 48d82c2aef64..208cece1313a 100644 --- a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/appservice/samples/ManageFunctionAppWithAuthentication.java +++ b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/appservice/samples/ManageFunctionAppWithAuthentication.java @@ -126,10 +126,10 @@ public static boolean runSample(AzureResourceManager azureResourceManager) throw // warm up System.out.println("Warming up " + app1Url + "/api/square..."); - Utils.post("http://" + app1Url + "/api/square", "625"); + Utils.sendPostRequest("http://" + app1Url + "/api/square", "625"); ResourceManagerUtils.sleep(Duration.ofSeconds(5)); System.out.println("CURLing " + app1Url + "/api/square..."); - System.out.println("Square of 625 is " + Utils.post("http://" + app1Url + "/api/square?code=" + app1.getMasterKey(), "625")); + System.out.println("Square of 625 is " + Utils.sendPostRequest("http://" + app1Url + "/api/square?code=" + app1.getMasterKey(), "625")); //============================================================ // Deploy to app 2 through Git @@ -158,17 +158,17 @@ public static boolean runSample(AzureResourceManager azureResourceManager) throw // warm up System.out.println("Warming up " + app2Url + "/api/square..."); - Utils.post("http://" + app2Url + "/api/square", "725"); + Utils.sendPostRequest("http://" + app2Url + "/api/square", "725"); ResourceManagerUtils.sleep(Duration.ofSeconds(5)); System.out.println("CURLing " + app2Url + "/api/square..."); - System.out.println("Square of 725 is " + Utils.post("http://" + app2Url + "/api/square?code=" + functionKey, "725")); + System.out.println("Square of 725 is " + Utils.sendPostRequest("http://" + app2Url + "/api/square?code=" + functionKey, "725")); System.out.println("Adding a new key to function app " + app2.name() + "..."); NameValuePair newKey = app2.addFunctionKey("square", "newkey", null); System.out.println("CURLing " + app2Url + "/api/square..."); - System.out.println("Square of 825 is " + Utils.post("http://" + app2Url + "/api/square?code=" + newKey.value(), "825")); + System.out.println("Square of 825 is " + Utils.sendPostRequest("http://" + app2Url + "/api/square?code=" + newKey.value(), "825")); //============================================================ // Deploy to app 3 through Git @@ -189,10 +189,10 @@ public static boolean runSample(AzureResourceManager azureResourceManager) throw // warm up System.out.println("Warming up " + app3Url + "/api/square..."); - Utils.post("http://" + app3Url + "/api/square", "925"); + Utils.sendPostRequest("http://" + app3Url + "/api/square", "925"); ResourceManagerUtils.sleep(Duration.ofSeconds(5)); System.out.println("CURLing " + app3Url + "/api/square..."); - System.out.println("Square of 925 is " + Utils.post("http://" + app3Url + "/api/square?code=mysecretkey", "925")); + System.out.println("Square of 925 is " + Utils.sendPostRequest("http://" + app3Url + "/api/square?code=mysecretkey", "925")); return true; } finally { diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/appservice/samples/ManageLinuxFunctionAppSourceControl.java b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/appservice/samples/ManageLinuxFunctionAppSourceControl.java index a2238fbff4ba..c9a86ec194e3 100644 --- a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/appservice/samples/ManageLinuxFunctionAppSourceControl.java +++ b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/appservice/samples/ManageLinuxFunctionAppSourceControl.java @@ -73,7 +73,7 @@ public static boolean runSample(AzureResourceManager azureResourceManager) { StopWatch stopWatch = new StopWatch(); stopWatch.start(); while (stopWatch.getTime() < TIMEOUT_IN_SECONDS * 1000) { - String response = Utils.get("https://" + app1UrlFunction); + String response = Utils.sendGetRequest("https://" + app1UrlFunction); if (response != null && response.contains("Hello")) { break; } @@ -82,7 +82,7 @@ public static boolean runSample(AzureResourceManager azureResourceManager) { // call function System.out.println("CURLing " + app1UrlFunction + "..."); - System.out.println("Response is " + Utils.get("https://" + app1UrlFunction)); + System.out.println("Response is " + Utils.sendGetRequest("https://" + app1UrlFunction)); // response would be "Hello, ..." @@ -110,7 +110,7 @@ public static boolean runSample(AzureResourceManager azureResourceManager) { stopWatch = new StopWatch(); stopWatch.start(); while (stopWatch.getTime() < TIMEOUT_IN_SECONDS * 1000) { - String response = Utils.get("https://" + app2UrlFunction); + String response = Utils.sendGetRequest("https://" + app2UrlFunction); if (response != null && response.contains("Hello")) { break; } @@ -119,7 +119,7 @@ public static boolean runSample(AzureResourceManager azureResourceManager) { // call function System.out.println("CURLing " + app2UrlFunction + "..."); - System.out.println("Response is " + Utils.get("https://" + app2UrlFunction)); + System.out.println("Response is " + Utils.sendGetRequest("https://" + app2UrlFunction)); // response would be "Hello, ..." return true; diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/appservice/samples/ManageLinuxWebAppSourceControl.java b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/appservice/samples/ManageLinuxWebAppSourceControl.java index 353df6b5c775..5955df38e153 100644 --- a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/appservice/samples/ManageLinuxWebAppSourceControl.java +++ b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/appservice/samples/ManageLinuxWebAppSourceControl.java @@ -85,10 +85,10 @@ public static boolean runSample(AzureResourceManager azureResourceManager) throw // warm up System.out.println("Warming up " + app1Url + "/helloworld..."); - Utils.curl("http://" + app1Url + "/helloworld/"); + Utils.sendGetRequest("http://" + app1Url + "/helloworld/"); ResourceManagerUtils.sleep(Duration.ofSeconds(5)); System.out.println("CURLing " + app1Url + "/helloworld..."); - System.out.println(Utils.curl("http://" + app1Url + "/helloworld/")); + System.out.println(Utils.sendGetRequest("http://" + app1Url + "/helloworld/")); //============================================================ // Create a second web app with local git source control @@ -129,10 +129,10 @@ public static boolean runSample(AzureResourceManager azureResourceManager) throw // warm up System.out.println("Warming up " + app2Url + "/helloworld..."); - Utils.curl("http://" + app2Url + "/helloworld/"); + Utils.sendGetRequest("http://" + app2Url + "/helloworld/"); ResourceManagerUtils.sleep(Duration.ofSeconds(5)); System.out.println("CURLing " + app2Url + "/helloworld..."); - System.out.println(Utils.curl("http://" + app2Url + "/helloworld/")); + System.out.println(Utils.sendGetRequest("http://" + app2Url + "/helloworld/")); //============================================================ // Create a 3rd web app with a public GitHub repo in Azure-Samples @@ -153,10 +153,10 @@ public static boolean runSample(AzureResourceManager azureResourceManager) throw // warm up System.out.println("Warming up " + app3Url + "..."); - Utils.curl("http://" + app3Url); + Utils.sendGetRequest("http://" + app3Url); ResourceManagerUtils.sleep(Duration.ofSeconds(5)); System.out.println("CURLing " + app3Url + "..."); - System.out.println(Utils.curl("http://" + app3Url)); + System.out.println(Utils.sendGetRequest("http://" + app3Url)); //============================================================ // Create a 4th web app with a personal GitHub repo and turn on continuous integration @@ -180,10 +180,10 @@ public static boolean runSample(AzureResourceManager azureResourceManager) throw // warm up System.out.println("Warming up " + app4Url + "..."); - Utils.curl("http://" + app4Url); + Utils.sendGetRequest("http://" + app4Url); ResourceManagerUtils.sleep(Duration.ofSeconds(5)); System.out.println("CURLing " + app4Url + "..."); - System.out.println(Utils.curl("http://" + app4Url)); + System.out.println(Utils.sendGetRequest("http://" + app4Url)); return true; } finally { diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/appservice/samples/ManageLinuxWebAppStorageAccountConnection.java b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/appservice/samples/ManageLinuxWebAppStorageAccountConnection.java index 29fa1049cc59..b9bdc0d8c6f2 100644 --- a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/appservice/samples/ManageLinuxWebAppStorageAccountConnection.java +++ b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/appservice/samples/ManageLinuxWebAppStorageAccountConnection.java @@ -119,10 +119,10 @@ public static boolean runSample(AzureResourceManager azureResourceManager) { // warm up System.out.println("Warming up " + app1Url + "/azure-samples-blob-traverser..."); - Utils.curl("http://" + app1Url + "/azure-samples-blob-traverser/"); + Utils.sendGetRequest("http://" + app1Url + "/azure-samples-blob-traverser/"); ResourceManagerUtils.sleep(Duration.ofSeconds(5)); System.out.println("CURLing " + app1Url + "/azure-samples-blob-traverser..."); - System.out.println(Utils.curl("http://" + app1Url + "/azure-samples-blob-traverser/")); + System.out.println(Utils.sendGetRequest("http://" + app1Url + "/azure-samples-blob-traverser/")); return true; } finally { diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/appservice/samples/ManageLinuxWebAppWithContainerRegistry.java b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/appservice/samples/ManageLinuxWebAppWithContainerRegistry.java index d4f8f588df87..5f05694af52c 100644 --- a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/appservice/samples/ManageLinuxWebAppWithContainerRegistry.java +++ b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/appservice/samples/ManageLinuxWebAppWithContainerRegistry.java @@ -151,10 +151,10 @@ public static boolean runSample(AzureResourceManager azureResourceManager) throw // warm up System.out.println("Warming up " + appUrl + "..."); - Utils.get("http://" + appUrl); + Utils.sendGetRequest("http://" + appUrl); ResourceManagerUtils.sleep(Duration.ofSeconds(5)); System.out.println("CURLing " + appUrl + "..."); - System.out.println(Utils.get("http://" + appUrl)); + System.out.println(Utils.sendGetRequest("http://" + appUrl)); return true; } finally { diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/appservice/samples/ManageWebAppCosmosDbByMsi.java b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/appservice/samples/ManageWebAppCosmosDbByMsi.java index f5ef8546d55c..5054c5a1606c 100644 --- a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/appservice/samples/ManageWebAppCosmosDbByMsi.java +++ b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/appservice/samples/ManageWebAppCosmosDbByMsi.java @@ -140,10 +140,10 @@ public static boolean runSample(AzureResourceManager azureResourceManager, Token // warm up System.out.println("Warming up " + appUrl + "..."); - Utils.curl("http://" + appUrl); + Utils.sendGetRequest("http://" + appUrl); ResourceManagerUtils.sleep(Duration.ofSeconds(10)); System.out.println("CURLing " + appUrl); - System.out.println(Utils.curl("http://" + appUrl)); + System.out.println(Utils.sendGetRequest("http://" + appUrl)); return true; diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/appservice/samples/ManageWebAppCosmosDbThroughKeyVault.java b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/appservice/samples/ManageWebAppCosmosDbThroughKeyVault.java index 291f074f0b9e..5e394071fbf5 100644 --- a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/appservice/samples/ManageWebAppCosmosDbThroughKeyVault.java +++ b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/appservice/samples/ManageWebAppCosmosDbThroughKeyVault.java @@ -139,10 +139,10 @@ public static boolean runSample(AzureResourceManager azureResourceManager, Strin // warm up System.out.println("Warming up " + appUrl + "..."); - Utils.curl("http://" + appUrl); + Utils.sendGetRequest("http://" + appUrl); ResourceManagerUtils.sleep(Duration.ofSeconds(10)); System.out.println("CURLing " + appUrl); - System.out.println(Utils.curl("http://" + appUrl)); + System.out.println(Utils.sendGetRequest("http://" + appUrl)); return true; diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/appservice/samples/ManageWebAppLogs.java b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/appservice/samples/ManageWebAppLogs.java index e209d1390025..9a99e7f2e4a4 100644 --- a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/appservice/samples/ManageWebAppLogs.java +++ b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/appservice/samples/ManageWebAppLogs.java @@ -103,10 +103,10 @@ public void run() { // warm up System.out.println("Warming up " + appUrl + "/coffeeshop..."); - Utils.curl("http://" + appUrl + "/coffeeshop/"); + Utils.sendGetRequest("http://" + appUrl + "/coffeeshop/"); ResourceManagerUtils.sleep(Duration.ofSeconds(5)); System.out.println("CURLing " + appUrl + "/coffeeshop..."); - System.out.println(Utils.curl("http://" + appUrl + "/coffeeshop/")); + System.out.println(Utils.sendGetRequest("http://" + appUrl + "/coffeeshop/")); } }).start(); // Watch logs for 2 minutes @@ -124,11 +124,11 @@ public void run() { public void run() { ResourceManagerUtils.sleep(Duration.ofSeconds(10)); System.out.println("Starting hitting"); - Utils.curl("http://" + appUrl + "/coffeeshop/"); + Utils.sendGetRequest("http://" + appUrl + "/coffeeshop/"); ResourceManagerUtils.sleep(Duration.ofSeconds(15)); - Utils.curl("http://" + appUrl + "/coffeeshop/"); + Utils.sendGetRequest("http://" + appUrl + "/coffeeshop/"); ResourceManagerUtils.sleep(Duration.ofSeconds(20)); - Utils.curl("http://" + appUrl + "/coffeeshop/"); + Utils.sendGetRequest("http://" + appUrl + "/coffeeshop/"); } }).start(); diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/appservice/samples/ManageWebAppSlots.java b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/appservice/samples/ManageWebAppSlots.java index 05340c173795..6ac40662b717 100644 --- a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/appservice/samples/ManageWebAppSlots.java +++ b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/appservice/samples/ManageWebAppSlots.java @@ -144,7 +144,7 @@ private static WebApp createWebApp(AzureResourceManager azureResourceManager, St Utils.print(app); System.out.println("CURLing " + appUrl + "..."); - System.out.println(Utils.curl("http://" + appUrl)); + System.out.println(Utils.sendGetRequest("http://" + appUrl)); return app; } @@ -177,10 +177,10 @@ private static void deployToStaging(DeploymentSlot slot) { System.out.println("Deployed staging branch to slot " + slot.name()); System.out.println("CURLing " + slotUrl + "..."); - System.out.println(Utils.curl("http://" + slotUrl)); + System.out.println(Utils.sendGetRequest("http://" + slotUrl)); System.out.println("CURLing " + appUrl + "..."); - System.out.println(Utils.curl("http://" + appUrl)); + System.out.println(Utils.sendGetRequest("http://" + appUrl)); } private static void swapProductionBacktoSlot(DeploymentSlot slot) { @@ -192,6 +192,6 @@ private static void swapProductionBacktoSlot(DeploymentSlot slot) { System.out.println("Swapped production slot back to " + slot.name()); System.out.println("CURLing " + appUrl + "..."); - System.out.println(Utils.curl("http://" + appUrl)); + System.out.println(Utils.sendGetRequest("http://" + appUrl)); } } diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/appservice/samples/ManageWebAppSourceControl.java b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/appservice/samples/ManageWebAppSourceControl.java index c77fb7f46afa..b486e7bd4c81 100644 --- a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/appservice/samples/ManageWebAppSourceControl.java +++ b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/appservice/samples/ManageWebAppSourceControl.java @@ -97,10 +97,10 @@ public static boolean runSample(AzureResourceManager azureResourceManager) throw // warm up System.out.println("Warming up " + app1Url + "/helloworld..."); - Utils.curl("http://" + app1Url + "/helloworld/"); + Utils.sendGetRequest("http://" + app1Url + "/helloworld/"); ResourceManagerUtils.sleep(Duration.ofSeconds(5)); System.out.println("CURLing " + app1Url + "/helloworld..."); - System.out.println(Utils.curl("http://" + app1Url + "/helloworld/")); + System.out.println(Utils.sendGetRequest("http://" + app1Url + "/helloworld/")); //============================================================ // Create a second web app with local git source control @@ -142,10 +142,10 @@ public static boolean runSample(AzureResourceManager azureResourceManager) throw // warm up System.out.println("Warming up " + app2Url + "/helloworld..."); - Utils.curl("http://" + app2Url + "/helloworld/"); + Utils.sendGetRequest("http://" + app2Url + "/helloworld/"); ResourceManagerUtils.sleep(Duration.ofSeconds(5)); System.out.println("CURLing " + app2Url + "/helloworld..."); - System.out.println(Utils.curl("http://" + app2Url + "/helloworld/")); + System.out.println(Utils.sendGetRequest("http://" + app2Url + "/helloworld/")); //============================================================ // Create a 3rd web app with a public GitHub repo in Azure-Samples @@ -165,10 +165,10 @@ public static boolean runSample(AzureResourceManager azureResourceManager) throw // warm up System.out.println("Warming up " + app3Url + "..."); - Utils.curl("http://" + app3Url); + Utils.sendGetRequest("http://" + app3Url); ResourceManagerUtils.sleep(Duration.ofSeconds(5)); System.out.println("CURLing " + app3Url + "..."); - System.out.println(Utils.curl("http://" + app3Url)); + System.out.println(Utils.sendGetRequest("http://" + app3Url)); //============================================================ // Create a 4th web app with a personal GitHub repo and turn on continuous integration @@ -191,10 +191,10 @@ public static boolean runSample(AzureResourceManager azureResourceManager) throw // warm up System.out.println("Warming up " + app4Url + "..."); - Utils.curl("http://" + app4Url); + Utils.sendGetRequest("http://" + app4Url); ResourceManagerUtils.sleep(Duration.ofSeconds(5)); System.out.println("CURLing " + app4Url + "..."); - System.out.println(Utils.curl("http://" + app4Url)); + System.out.println(Utils.sendGetRequest("http://" + app4Url)); //============================================================ // Create a 5th web app with the existing app service plan @@ -233,12 +233,12 @@ public static boolean runSample(AzureResourceManager azureResourceManager) throw // warm up System.out.println("Warming up " + app5Url + "/helloworld..."); - Utils.curl("http://" + app5Url + "/helloworld/"); + Utils.sendGetRequest("http://" + app5Url + "/helloworld/"); ResourceManagerUtils.sleep(Duration.ofSeconds(5)); System.out.println("CURLing " + app5Url + "/helloworld..."); - System.out.println(Utils.curl("http://" + app5Url + "/helloworld/")); + System.out.println(Utils.sendGetRequest("http://" + app5Url + "/helloworld/")); System.out.println("CURLing " + app5Url + "/coffeeshop..."); - System.out.println(Utils.curl("http://" + app5Url + "/coffeeshop/")); + System.out.println(Utils.sendGetRequest("http://" + app5Url + "/coffeeshop/")); //============================================================ // Create a 6th web app with the existing app service plan @@ -274,12 +274,12 @@ public static boolean runSample(AzureResourceManager azureResourceManager) throw // warm up System.out.println("Warming up " + app6Url + "/helloworld..."); - Utils.curl("http://" + app6Url + "/helloworld/"); + Utils.sendGetRequest("http://" + app6Url + "/helloworld/"); ResourceManagerUtils.sleep(Duration.ofSeconds(5)); System.out.println("CURLing " + app6Url + "/helloworld..."); - System.out.println(Utils.curl("http://" + app6Url + "/helloworld/")); + System.out.println(Utils.sendGetRequest("http://" + app6Url + "/helloworld/")); System.out.println("CURLing " + app6Url + "/coffeeshop..."); - System.out.println(Utils.curl("http://" + app6Url + "/coffeeshop/")); + System.out.println(Utils.sendGetRequest("http://" + app6Url + "/coffeeshop/")); //============================================================ // Create a 7th web app with the existing app service plan @@ -317,7 +317,7 @@ public static boolean runSample(AzureResourceManager azureResourceManager) throw // warm up System.out.println("Warming up " + app7Url); - Utils.curl("http://" + app7Url); + Utils.sendGetRequest("http://" + app7Url); return true; } finally { try { diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/appservice/samples/ManageWebAppSourceControlAsync.java b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/appservice/samples/ManageWebAppSourceControlAsync.java index 43500556a22a..e4ffc1c95491 100644 --- a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/appservice/samples/ManageWebAppSourceControlAsync.java +++ b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/appservice/samples/ManageWebAppSourceControlAsync.java @@ -159,22 +159,22 @@ public static boolean runSample(final AzureResourceManager azureResourceManager) // warm up System.out.println("Warming up " + app1Url + "/helloworld..."); - Utils.curl("http://" + app1Url + "/helloworld/"); + Utils.sendGetRequest("http://" + app1Url + "/helloworld/"); System.out.println("Warming up " + app2Url + "/helloworld..."); - Utils.curl("http://" + app2Url + "/helloworld/"); + Utils.sendGetRequest("http://" + app2Url + "/helloworld/"); System.out.println("Warming up " + app3Url + "..."); - Utils.curl("http://" + app3Url); + Utils.sendGetRequest("http://" + app3Url); System.out.println("Warming up " + app4Url + "..."); - Utils.curl("http://" + app4Url); + Utils.sendGetRequest("http://" + app4Url); ResourceManagerUtils.sleep(Duration.ofSeconds(5)); System.out.println("CURLing " + app1Url + "/helloworld..."); - System.out.println(Utils.curl("http://" + app1Url + "/helloworld/")); + System.out.println(Utils.sendGetRequest("http://" + app1Url + "/helloworld/")); System.out.println("CURLing " + app2Url + "/helloworld..."); - System.out.println(Utils.curl("http://" + app2Url + "/helloworld/")); + System.out.println(Utils.sendGetRequest("http://" + app2Url + "/helloworld/")); System.out.println("CURLing " + app3Url + "..."); - System.out.println(Utils.curl("http://" + app3Url)); + System.out.println(Utils.sendGetRequest("http://" + app3Url)); System.out.println("CURLing " + app4Url + "..."); - System.out.println(Utils.curl("http://" + app4Url)); + System.out.println(Utils.sendGetRequest("http://" + app4Url)); return true; } finally { diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/appservice/samples/ManageWebAppStorageAccountConnection.java b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/appservice/samples/ManageWebAppStorageAccountConnection.java index a91d764ab9eb..b5f19228e0f1 100644 --- a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/appservice/samples/ManageWebAppStorageAccountConnection.java +++ b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/appservice/samples/ManageWebAppStorageAccountConnection.java @@ -120,10 +120,10 @@ public static boolean runSample(AzureResourceManager azureResourceManager) { // warm up System.out.println("Warming up " + app1Url + "/azure-samples-blob-traverser..."); - Utils.curl("http://" + app1Url + "/azure-samples-blob-traverser/"); + Utils.sendGetRequest("http://" + app1Url + "/azure-samples-blob-traverser/"); ResourceManagerUtils.sleep(Duration.ofSeconds(5)); System.out.println("ResourceManagerUtils.curling " + app1Url + "/azure-samples-blob-traverser..."); - System.out.println(Utils.curl("http://" + app1Url + "/azure-samples-blob-traverser/")); + System.out.println(Utils.sendGetRequest("http://" + app1Url + "/azure-samples-blob-traverser/")); return true; } finally { diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/cdn/samples/ManageCdnProfileWithWebApp.java b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/cdn/samples/ManageCdnProfileWithWebApp.java index 241df813c625..0dfe224dc85e 100644 --- a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/cdn/samples/ManageCdnProfileWithWebApp.java +++ b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/cdn/samples/ManageCdnProfileWithWebApp.java @@ -178,7 +178,7 @@ private static WebApp createWebApp(String appName, Region region, AzureResourceM Utils.print(app); System.out.println("CURLing " + appUrl + "..."); - System.out.println(Utils.curl("http://" + appUrl)); + System.out.println(Utils.sendGetRequest("http://" + appUrl)); return app; } } diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/containerinstance/samples/ManageContainerInstanceWithAzureFileShareMount.java b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/containerinstance/samples/ManageContainerInstanceWithAzureFileShareMount.java index f369e60bd539..c763d3434c75 100644 --- a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/containerinstance/samples/ManageContainerInstanceWithAzureFileShareMount.java +++ b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/containerinstance/samples/ManageContainerInstanceWithAzureFileShareMount.java @@ -68,10 +68,10 @@ public static boolean runSample(AzureResourceManager azureResourceManager) { // warm up System.out.println("Warming up " + containerGroup.ipAddress()); - Utils.curl("http://" + containerGroup.ipAddress()); + Utils.sendGetRequest("http://" + containerGroup.ipAddress()); ResourceManagerUtils.sleep(Duration.ofSeconds(30)); System.out.println("CURLing " + containerGroup.ipAddress()); - System.out.println(Utils.curl("http://" + containerGroup.ipAddress())); + System.out.println(Utils.sendGetRequest("http://" + containerGroup.ipAddress())); //============================================================= // Check the container instance logs diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/containerinstance/samples/ManageContainerInstanceWithManualAzureFileShareMountCreation.java b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/containerinstance/samples/ManageContainerInstanceWithManualAzureFileShareMountCreation.java index 51397968d682..763331a55eed 100644 --- a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/containerinstance/samples/ManageContainerInstanceWithManualAzureFileShareMountCreation.java +++ b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/containerinstance/samples/ManageContainerInstanceWithManualAzureFileShareMountCreation.java @@ -95,10 +95,10 @@ public static boolean runSample(AzureResourceManager azureResourceManager) { // warm up System.out.println("Warming up " + containerGroup.ipAddress()); - Utils.curl("http://" + containerGroup.ipAddress()); + Utils.sendGetRequest("http://" + containerGroup.ipAddress()); ResourceManagerUtils.sleep(Duration.ofSeconds(15)); System.out.println("CURLing " + containerGroup.ipAddress()); - System.out.println(Utils.curl("http://" + containerGroup.ipAddress())); + System.out.println(Utils.sendGetRequest("http://" + containerGroup.ipAddress())); //============================================================= // Check the container instance logs diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/containerinstance/samples/ManageContainerInstanceWithMultipleContainerImages.java b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/containerinstance/samples/ManageContainerInstanceWithMultipleContainerImages.java index 690a3f9593c6..af1a0066cb0b 100644 --- a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/containerinstance/samples/ManageContainerInstanceWithMultipleContainerImages.java +++ b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/containerinstance/samples/ManageContainerInstanceWithMultipleContainerImages.java @@ -71,10 +71,10 @@ public static boolean runSample(AzureResourceManager azureResourceManager) { // warm up System.out.println("Warming up " + containerGroup.ipAddress()); - Utils.curl("http://" + containerGroup.ipAddress()); + Utils.sendGetRequest("http://" + containerGroup.ipAddress()); ResourceManagerUtils.sleep(Duration.ofSeconds(15)); System.out.println("CURLing " + containerGroup.ipAddress()); - System.out.println(Utils.curl("http://" + containerGroup.ipAddress())); + System.out.println(Utils.sendGetRequest("http://" + containerGroup.ipAddress())); //============================================================= // Check the container instance logs diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/containerinstance/samples/ManageContainerInstanceZeroToOneAndOneToManyUsingContainerServiceOrchestrator.java b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/containerinstance/samples/ManageContainerInstanceZeroToOneAndOneToManyUsingContainerServiceOrchestrator.java index 48b701385ce9..1b0727a190fe 100644 --- a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/containerinstance/samples/ManageContainerInstanceZeroToOneAndOneToManyUsingContainerServiceOrchestrator.java +++ b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/containerinstance/samples/ManageContainerInstanceZeroToOneAndOneToManyUsingContainerServiceOrchestrator.java @@ -212,10 +212,10 @@ public static boolean runSample(AzureResourceManager azureResourceManager, Strin // warm up System.out.println("Warming up " + containerGroup.ipAddress()); - Utils.curl("http://" + containerGroup.ipAddress()); + Utils.sendGetRequest("http://" + containerGroup.ipAddress()); ResourceManagerUtils.sleep(Duration.ofSeconds(15)); System.out.println("CURLing " + containerGroup.ipAddress()); - System.out.println(Utils.curl("http://" + containerGroup.ipAddress())); + System.out.println(Utils.sendGetRequest("http://" + containerGroup.ipAddress())); //============================================================= // Check the container instance logs @@ -468,10 +468,10 @@ public static boolean runSample(AzureResourceManager azureResourceManager, Strin if (serviceIP != null) { // warm up System.out.println("Warming up " + serviceIP); - Utils.curl("http://" + serviceIP); + Utils.sendGetRequest("http://" + serviceIP); ResourceManagerUtils.sleep(Duration.ofSeconds(15)); System.out.println("CURLing " + serviceIP); - System.out.println(Utils.curl("http://" + serviceIP)); + System.out.println(Utils.sendGetRequest("http://" + serviceIP)); } else { System.out.println("ERROR: service unavailable"); } diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/monitor/samples/AutoscaleSettingsBasedOnPerformanceOrSchedule.java b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/monitor/samples/AutoscaleSettingsBasedOnPerformanceOrSchedule.java index 963af49ec6b6..cdb79ea097d2 100644 --- a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/monitor/samples/AutoscaleSettingsBasedOnPerformanceOrSchedule.java +++ b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/monitor/samples/AutoscaleSettingsBasedOnPerformanceOrSchedule.java @@ -104,7 +104,7 @@ public static boolean runSample(AzureResourceManager azureResourceManager) { // Trigger scale-out action for (int i = 0; i < 11; i++) { ResourceManagerUtils.sleep(Duration.ofSeconds(5)); - Utils.curl(deployedWebAppUrl); + Utils.sendGetRequest(deployedWebAppUrl); } // Now you can browse the history of autoscale form the azure portal diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/samples/Utils.java b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/samples/Utils.java index dbc40ee1cf73..829036396cf9 100644 --- a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/samples/Utils.java +++ b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/samples/Utils.java @@ -3254,9 +3254,17 @@ public static void print(SpringApp springApp) { System.out.println(info.toString()); } - public static String curl(String urlString) { + /** + * Sends a GET request to target URL. + *

+ * The method does not handle 301 redirect. + * + * @param urlString the target URL. + * @return Content of the HTTP response. + */ + public static String sendGetRequest(String urlString) { try { - Mono>> response = + Mono>> response = HTTP_CLIENT.getString(getHost(urlString), getPathAndQuery(urlString)) .retryWhen(Retry .fixedDelay(3, Duration.ofSeconds(30)) @@ -3276,22 +3284,16 @@ public static String curl(String urlString) { } } - public static String get(String urlString) { - try { - SimpleResponse response = stringResponse(HTTP_CLIENT.getString(getHost(urlString), getPathAndQuery(urlString))).block(); - if (response != null) { - return response.getValue(); - } else { - return null; - } - } catch (Exception e) { - return null; - } - } - - public static String post(String urlString, String body) { + /** + * Sends a POST request to target URL. + * + * @param urlString the target URL. + * @param body the request body. + * @return Content of the HTTP response. + * */ + public static String sendPostRequest(String urlString, String body) { try { - SimpleResponse response = stringResponse(HTTP_CLIENT.postString(getHost(urlString), getPathAndQuery(urlString), body)).block(); + Response response = stringResponse(HTTP_CLIENT.postString(getHost(urlString), getPathAndQuery(urlString), body)).block(); if (response != null) { return response.getValue(); } else { @@ -3302,7 +3304,7 @@ public static String post(String urlString, String body) { } } - private static Mono> stringResponse(Mono>> responseMono) { + private static Mono> stringResponse(Mono>> responseMono) { return responseMono.flatMap(response -> FluxUtil.collectBytesInByteBufferStream(response.getValue()) .map(bytes -> new String(bytes, StandardCharsets.UTF_8)) .map(str -> new SimpleResponse<>(response.getRequest(), response.getStatusCode(), response.getHeaders(), str))); @@ -3338,11 +3340,11 @@ private static String getPathAndQuery(String urlString) throws MalformedURLExcep private interface WebAppTestClient { @Get("{path}") @ExpectedResponses({200, 400, 404}) - Mono>> getString(@HostParam("$host") String host, @PathParam(value = "path", encoded = true) String path); + Mono>> getString(@HostParam("$host") String host, @PathParam(value = "path", encoded = true) String path); @Post("{path}") @ExpectedResponses({200, 400, 404}) - Mono>> postString(@HostParam("$host") String host, @PathParam(value = "path", encoded = true) String path, @BodyParam("text/plain") String body); + Mono>> postString(@HostParam("$host") String host, @PathParam(value = "path", encoded = true) String path, @BodyParam("text/plain") String body); } public static int getSize(Iterable iterable) { From 22759ed7e33f8c10e582197eedeee8adea4ea926 Mon Sep 17 00:00:00 2001 From: Weidong Xu Date: Mon, 28 Sep 2020 09:46:35 +0800 Subject: [PATCH 2/8] randomResourceName in samples Utils --- .../azure/resourcemanager/samples/Utils.java | 25 +++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/samples/Utils.java b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/samples/Utils.java index 829036396cf9..b16698ebe96e 100644 --- a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/samples/Utils.java +++ b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/samples/Utils.java @@ -25,6 +25,7 @@ import com.azure.core.util.FluxUtil; import com.azure.core.util.serializer.JacksonAdapter; import com.azure.core.util.serializer.SerializerEncoding; +import com.azure.resourcemanager.AzureResourceManager; import com.azure.resourcemanager.appplatform.models.ConfigServerProperties; import com.azure.resourcemanager.appplatform.models.ConfigServerState; import com.azure.resourcemanager.appplatform.models.MonitoringSettingProperties; @@ -240,6 +241,30 @@ public static String password() { return password; } + /** + * Creates a randomized resource name. + * Please provider your own implementation, or avoid using the method, if code is to be used in production. + * + * @param azure the AzureResourceManager instance. + * @param prefix the prefix to the name. + * @param maxLen the max length of the name. + * @return the randomized resource name. + */ + public static String randomResourceName(AzureResourceManager azure, String prefix, int maxLen) { + return azure.resourceGroups().manager().internalContext().randomResourceName(prefix, maxLen); + } + + /** + * Creates a random UUID. + * Please provider your own implementation, or avoid using the method, if code is to be used in production. + * + * @param azure the AzureResourceManager instance. + * @return the random UUID. + */ + public static String randomUuid(AzureResourceManager azure) { + return azure.resourceGroups().manager().internalContext().randomUuid(); + } + /** * Print resource group info. * From 740bdc0429b2cf14f6806fc4c0d5d66ce97d1594 Mon Sep 17 00:00:00 2001 From: Weidong Xu Date: Mon, 28 Sep 2020 09:55:59 +0800 Subject: [PATCH 3/8] put randomResourceName to samples Utils --- .../utils/ResourceManagerUtils.java | 17 ------- .../samples/ManageSpringCloud.java | 12 ++--- .../samples/ManageFunctionAppBasic.java | 10 ++-- .../samples/ManageFunctionAppLogs.java | 4 +- .../ManageFunctionAppSourceControl.java | 14 +++--- .../ManageFunctionAppWithAuthentication.java | 8 ++-- .../ManageFunctionAppWithDomainSsl.java | 8 ++-- .../ManageLinuxFunctionAppSourceControl.java | 12 ++--- .../samples/ManageLinuxWebAppBasic.java | 10 ++-- .../ManageLinuxWebAppSourceControl.java | 10 ++-- .../ManageLinuxWebAppSqlConnection.java | 8 ++-- ...geLinuxWebAppStorageAccountConnection.java | 8 ++-- ...anageLinuxWebAppWithContainerRegistry.java | 6 +-- .../ManageLinuxWebAppWithDomainSsl.java | 8 ++-- .../ManageLinuxWebAppWithTrafficManager.java | 22 ++++----- .../appservice/samples/ManageWebAppBasic.java | 10 ++-- .../samples/ManageWebAppCosmosDbByMsi.java | 8 ++-- .../ManageWebAppCosmosDbThroughKeyVault.java | 8 ++-- .../appservice/samples/ManageWebAppLogs.java | 4 +- .../appservice/samples/ManageWebAppSlots.java | 8 ++-- .../samples/ManageWebAppSourceControl.java | 18 ++++---- .../ManageWebAppSourceControlAsync.java | 12 ++--- .../samples/ManageWebAppSqlConnection.java | 8 ++-- .../ManageWebAppStorageAccountConnection.java | 8 ++-- .../ManageWebAppWithAuthentication.java | 10 ++-- .../samples/ManageWebAppWithDomainSsl.java | 8 ++-- .../ManageWebAppWithTrafficManager.java | 22 ++++----- .../ManageCdnProfileWithCustomDomain.java | 9 ++-- .../samples/ManageCdnProfileWithWebApp.java | 6 +-- .../ConvertVirtualMachineToManagedDisks.java | 4 +- ...VirtualMachineUsingCustomImageFromVHD.java | 12 ++--- ...eVirtualMachineUsingCustomImageFromVM.java | 12 ++--- ...chineUsingSpecializedDiskFromSnapshot.java | 18 ++++---- ...ualMachineUsingSpecializedDiskFromVhd.java | 14 +++--- ...MachinesAsyncTrackingRelatedResources.java | 12 ++--- .../CreateVirtualMachinesInParallel.java | 11 +++-- ...hinesUsingCustomImageOrSpecializedVHD.java | 10 ++-- .../samples/ManageAvailabilitySet.java | 12 ++--- .../compute/samples/ManageManagedDisks.java | 46 +++++++++---------- ...nabledVirtualMachineBelongsToAADGroup.java | 12 ++--- ...geStorageFromMSIEnabledVirtualMachine.java | 8 ++-- ...eUserAssignedMSIEnabledVirtualMachine.java | 10 ++-- .../compute/samples/ManageVirtualMachine.java | 10 ++-- .../samples/ManageVirtualMachineAsync.java | 12 ++--- .../ManageVirtualMachineExtension.java | 10 ++-- .../samples/ManageVirtualMachineScaleSet.java | 8 ++-- .../ManageVirtualMachineScaleSetAsync.java | 8 ++-- ...tualMachineScaleSetWithUnmanagedDisks.java | 14 +++--- .../samples/ManageVirtualMachineWithDisk.java | 12 ++--- ...anageVirtualMachineWithUnmanagedDisks.java | 6 +-- .../ManageVirtualMachinesInParallel.java | 6 +-- .../samples/ManageZonalVirtualMachine.java | 12 ++--- .../ManageZonalVirtualMachineScaleSet.java | 8 ++-- ...tainerInstanceWithAzureFileShareMount.java | 6 +-- ...WithManualAzureFileShareMountCreation.java | 8 ++-- ...erInstanceWithMultipleContainerImages.java | 4 +- ...ManyUsingContainerServiceOrchestrator.java | 8 ++-- .../samples/ManageContainerRegistry.java | 4 +- .../ManageContainerRegistryWithWebhooks.java | 4 +- ...teCosmosDBTableWithVirtualNetworkRule.java | 6 +-- ...CreateCosmosDBWithEventualConsistency.java | 4 +- .../samples/CreateCosmosDBWithIPRange.java | 4 +- .../CreateCosmosDBWithKindMongoDB.java | 4 +- .../cosmos/samples/ManageHACosmosDB.java | 4 +- .../dns/samples/ManageDns.java | 12 ++--- .../eventhubs/samples/ManageEventHub.java | 12 ++--- .../samples/ManageEventHubEvents.java | 4 +- .../ManageEventHubGeoDisasterRecovery.java | 10 ++-- .../keyvault/samples/ManageKeyVault.java | 6 +-- ...mageFromContainerRegistryToKubernetes.java | 6 +-- .../samples/ManageKubernetesCluster.java | 4 +- ...bernetesClusterWithAdvancedNetworking.java | 6 +-- ...eSettingsBasedOnPerformanceOrSchedule.java | 6 +-- .../samples/QueryMetricsAndActivityLogs.java | 4 +- ...SecurityBreachOrRiskActivityLogAlerts.java | 4 +- .../WebAppPerformanceMonitoringAlerts.java | 2 +- ...reateSimpleInternetFacingLoadBalancer.java | 12 ++--- .../samples/ManageApplicationGateway.java | 10 ++-- .../network/samples/ManageExpressRoute.java | 11 +++-- .../network/samples/ManageIPAddress.java | 12 ++--- .../samples/ManageInternalLoadBalancer.java | 18 ++++---- .../ManageInternetFacingLoadBalancer.java | 16 +++---- .../samples/ManageNetworkInterface.java | 16 +++---- ...anageNetworkPeeringInSameSubscription.java | 8 ++-- .../samples/ManageNetworkSecurityGroup.java | 18 ++++---- .../network/samples/ManageNetworkWatcher.java | 16 +++---- .../ManageSimpleApplicationGateway.java | 2 +- ...eVirtualMachinesInParallelWithNetwork.java | 10 ++-- .../network/samples/ManageVirtualNetwork.java | 12 ++--- .../samples/ManageVirtualNetworkAsync.java | 12 ++--- .../ManageVpnGatewayPoint2SiteConnection.java | 6 +-- .../ManageVpnGatewaySite2SiteConnection.java | 10 ++-- .../ManageVpnGatewayVNet2VNetConnection.java | 24 +++++----- ...erifyNetworkPeeringWithNetworkWatcher.java | 14 +++--- .../privatedns/samples/ManagePrivateDns.java | 14 +++--- .../rediscache/samples/ManageRedisCache.java | 8 ++-- .../samples/DeployUsingARMTemplate.java | 9 ++-- .../samples/DeployUsingARMTemplateAsync.java | 5 +- ...ngARMTemplateWithDeploymentOperations.java | 5 +- .../DeployUsingARMTemplateWithProgress.java | 9 ++-- .../DeployUsingARMTemplateWithTags.java | 9 ++-- .../DeployVirtualMachineUsingARMTemplate.java | 6 +-- .../resources/samples/ManageResource.java | 7 +-- .../samples/ManageResourceGroup.java | 9 ++-- .../resourcemanager/samples/DockerUtils.java | 4 +- .../azure/resourcemanager/samples/Utils.java | 18 ++++++++ ...iceBusPublishSubscribeAdvanceFeatures.java | 14 +++--- .../ServiceBusPublishSubscribeBasic.java | 10 ++-- .../ServiceBusQueueAdvanceFeatures.java | 8 ++-- .../samples/ServiceBusQueueBasic.java | 8 ++-- ...ServiceBusWithClaimBasedAuthorization.java | 12 ++--- .../sql/samples/GettingSqlServerMetrics.java | 4 +- .../sql/samples/ManageSqlDatabase.java | 4 +- .../ManageSqlDatabaseInElasticPool.java | 4 +- ...qlDatabasesAcrossDifferentDataCenters.java | 12 ++--- .../sql/samples/ManageSqlFailoverGroups.java | 8 ++-- .../sql/samples/ManageSqlFirewallRules.java | 4 +- .../ManageSqlImportExportDatabase.java | 6 +-- .../samples/ManageSqlServerDnsAliases.java | 8 ++-- ...nageSqlServerKeysWithAzureKeyVaultKey.java | 8 ++-- .../ManageSqlServerSecurityAlertPolicy.java | 6 +-- .../samples/ManageSqlVirtualNetworkRules.java | 6 +-- ...ageSqlWithRecoveredOrRestoredDatabase.java | 4 +- .../storage/samples/ManageStorageAccount.java | 8 ++-- .../samples/ManageStorageAccountAsync.java | 6 +-- .../ManageStorageAccountNetworkRules.java | 10 ++-- .../samples/ManageSimpleTrafficManager.java | 9 ++-- .../samples/ManageTrafficManager.java | 10 ++-- 128 files changed, 613 insertions(+), 601 deletions(-) diff --git a/sdk/resourcemanager/azure-resourcemanager-resources/src/main/java/com/azure/resourcemanager/resources/fluentcore/utils/ResourceManagerUtils.java b/sdk/resourcemanager/azure-resourcemanager-resources/src/main/java/com/azure/resourcemanager/resources/fluentcore/utils/ResourceManagerUtils.java index d177ea21d4f9..4e6979e417c6 100644 --- a/sdk/resourcemanager/azure-resourcemanager-resources/src/main/java/com/azure/resourcemanager/resources/fluentcore/utils/ResourceManagerUtils.java +++ b/sdk/resourcemanager/azure-resourcemanager-resources/src/main/java/com/azure/resourcemanager/resources/fluentcore/utils/ResourceManagerUtils.java @@ -251,23 +251,6 @@ public String randomResourceName(String prefix, int maxLen) { return identifierFunction.apply("").getRandomName(prefix, maxLen); } - /** - * Generates the specified number of random resource names with the same prefix. - * - * @param prefix the prefix to be used if possible - * @param maxLen the maximum length for the random generated name - * @param count the number of names to generate - * @return random names - */ - public String[] randomResourceNames(String prefix, int maxLen, int count) { - String[] names = new String[count]; - IdentifierProvider resourceNamer = identifierFunction.apply(""); - for (int i = 0; i < count; i++) { - names[i] = resourceNamer.getRandomName(prefix, maxLen); - } - return names; - } - /** * Gets a random UUID. * diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/appplatform/samples/ManageSpringCloud.java b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/appplatform/samples/ManageSpringCloud.java index fe0bf697d791..eaf05d6d720e 100644 --- a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/appplatform/samples/ManageSpringCloud.java +++ b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/appplatform/samples/ManageSpringCloud.java @@ -72,13 +72,13 @@ public class ManageSpringCloud { * @throws IllegalStateException unexcepted state */ public static boolean runSample(AzureResourceManager azureResourceManager, String clientId) throws IOException, KeyStoreException, CertificateException, NoSuchAlgorithmException { - final String rgName = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("rg", 24); - final String serviceName = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("service", 24); + final String rgName = Utils.randomResourceName(azureResourceManager, "rg", 24); + final String serviceName = Utils.randomResourceName(azureResourceManager, "service", 24); final Region region = Region.US_EAST; - final String domainName = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("jsdkdemo-", 20) + ".com"; - final String certOrderName = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("cert", 15); - final String vaultName = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("vault", 15); - final String certName = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("cert", 15); + final String domainName = Utils.randomResourceName(azureResourceManager, "jsdkdemo-", 20) + ".com"; + final String certOrderName = Utils.randomResourceName(azureResourceManager, "cert", 15); + final String vaultName = Utils.randomResourceName(azureResourceManager, "vault", 15); + final String certName = Utils.randomResourceName(azureResourceManager, "cert", 15); try { azureResourceManager.resourceGroups().define(rgName) diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/appservice/samples/ManageFunctionAppBasic.java b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/appservice/samples/ManageFunctionAppBasic.java index b5e0e94f46d0..711b982aa23d 100644 --- a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/appservice/samples/ManageFunctionAppBasic.java +++ b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/appservice/samples/ManageFunctionAppBasic.java @@ -33,11 +33,11 @@ public final class ManageFunctionAppBasic { */ public static boolean runSample(AzureResourceManager azureResourceManager) { // New resources - final String app1Name = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("webapp1-", 20); - final String app2Name = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("webapp2-", 20); - final String app3Name = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("webapp3-", 20); - final String rg1Name = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("rg1NEMV_", 24); - final String rg2Name = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("rg2NEMV_", 24); + final String app1Name = Utils.randomResourceName(azureResourceManager, "webapp1-", 20); + final String app2Name = Utils.randomResourceName(azureResourceManager, "webapp2-", 20); + final String app3Name = Utils.randomResourceName(azureResourceManager, "webapp3-", 20); + final String rg1Name = Utils.randomResourceName(azureResourceManager, "rg1NEMV_", 24); + final String rg2Name = Utils.randomResourceName(azureResourceManager, "rg2NEMV_", 24); try { diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/appservice/samples/ManageFunctionAppLogs.java b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/appservice/samples/ManageFunctionAppLogs.java index 9b948afd6ac2..57dd82c73a18 100644 --- a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/appservice/samples/ManageFunctionAppLogs.java +++ b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/appservice/samples/ManageFunctionAppLogs.java @@ -41,9 +41,9 @@ public final class ManageFunctionAppLogs { public static boolean runSample(AzureResourceManager azureResourceManager) throws IOException { // New resources final String suffix = ".azurewebsites.net"; - final String appName = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("webapp1-", 20); + final String appName = Utils.randomResourceName(azureResourceManager, "webapp1-", 20); final String appUrl = appName + suffix; - final String rgName = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("rg1NEMV_", 24); + final String rgName = Utils.randomResourceName(azureResourceManager, "rg1NEMV_", 24); try { diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/appservice/samples/ManageFunctionAppSourceControl.java b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/appservice/samples/ManageFunctionAppSourceControl.java index 16c267f4ea19..2b690d245d65 100644 --- a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/appservice/samples/ManageFunctionAppSourceControl.java +++ b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/appservice/samples/ManageFunctionAppSourceControl.java @@ -45,19 +45,19 @@ public final class ManageFunctionAppSourceControl { public static boolean runSample(AzureResourceManager azureResourceManager) throws GitAPIException { // New resources final String suffix = ".azurewebsites.net"; - final String app1Name = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("webapp1-", 20); - final String app2Name = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("webapp2-", 20); - final String app3Name = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("webapp3-", 20); - final String app4Name = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("webapp4-", 20); - final String app5Name = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("webapp5-", 20); - final String app6Name = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("webapp6-", 20); + final String app1Name = Utils.randomResourceName(azureResourceManager, "webapp1-", 20); + final String app2Name = Utils.randomResourceName(azureResourceManager, "webapp2-", 20); + final String app3Name = Utils.randomResourceName(azureResourceManager, "webapp3-", 20); + final String app4Name = Utils.randomResourceName(azureResourceManager, "webapp4-", 20); + final String app5Name = Utils.randomResourceName(azureResourceManager, "webapp5-", 20); + final String app6Name = Utils.randomResourceName(azureResourceManager, "webapp6-", 20); final String app1Url = app1Name + suffix; final String app2Url = app2Name + suffix; final String app3Url = app3Name + suffix; final String app4Url = app4Name + suffix; final String app5Url = app5Name + suffix; final String app6Url = app6Name + suffix; - final String rgName = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("rg1NEMV_", 24); + final String rgName = Utils.randomResourceName(azureResourceManager, "rg1NEMV_", 24); try { diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/appservice/samples/ManageFunctionAppWithAuthentication.java b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/appservice/samples/ManageFunctionAppWithAuthentication.java index 208cece1313a..27678cacc536 100644 --- a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/appservice/samples/ManageFunctionAppWithAuthentication.java +++ b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/appservice/samples/ManageFunctionAppWithAuthentication.java @@ -48,13 +48,13 @@ public final class ManageFunctionAppWithAuthentication { public static boolean runSample(AzureResourceManager azureResourceManager) throws GitAPIException { // New resources final String suffix = ".azurewebsites.net"; - final String app1Name = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("webapp1-", 20); - final String app2Name = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("webapp2-", 20); - final String app3Name = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("webapp3-", 20); + final String app1Name = Utils.randomResourceName(azureResourceManager, "webapp1-", 20); + final String app2Name = Utils.randomResourceName(azureResourceManager, "webapp2-", 20); + final String app3Name = Utils.randomResourceName(azureResourceManager, "webapp3-", 20); final String app1Url = app1Name + suffix; final String app2Url = app2Name + suffix; final String app3Url = app3Name + suffix; - final String rgName = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("rg1NEMV_", 24); + final String rgName = Utils.randomResourceName(azureResourceManager, "rg1NEMV_", 24); try { diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/appservice/samples/ManageFunctionAppWithDomainSsl.java b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/appservice/samples/ManageFunctionAppWithDomainSsl.java index 4b3c85cfd58b..6dff00bf7722 100644 --- a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/appservice/samples/ManageFunctionAppWithDomainSsl.java +++ b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/appservice/samples/ManageFunctionAppWithDomainSsl.java @@ -39,10 +39,10 @@ public final class ManageFunctionAppWithDomainSsl { */ public static boolean runSample(AzureResourceManager azureResourceManager) throws IOException { // New resources - final String app1Name = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("webapp1-", 20); - final String app2Name = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("webapp2-", 20); - final String rgName = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("rgNEMV_", 24); - final String domainName = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("jsdkdemo-", 20) + ".com"; + final String app1Name = Utils.randomResourceName(azureResourceManager, "webapp1-", 20); + final String app2Name = Utils.randomResourceName(azureResourceManager, "webapp2-", 20); + final String rgName = Utils.randomResourceName(azureResourceManager, "rgNEMV_", 24); + final String domainName = Utils.randomResourceName(azureResourceManager, "jsdkdemo-", 20) + ".com"; final String certPassword = Utils.password(); try { diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/appservice/samples/ManageLinuxFunctionAppSourceControl.java b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/appservice/samples/ManageLinuxFunctionAppSourceControl.java index c9a86ec194e3..00a46adbcc41 100644 --- a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/appservice/samples/ManageLinuxFunctionAppSourceControl.java +++ b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/appservice/samples/ManageLinuxFunctionAppSourceControl.java @@ -38,14 +38,14 @@ public class ManageLinuxFunctionAppSourceControl { */ public static boolean runSample(AzureResourceManager azureResourceManager) { final String suffix = ".azurewebsites.net"; - final String app1Name = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("webapp1-", 20); - final String app2Name = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("webapp2-", 20); + final String app1Name = Utils.randomResourceName(azureResourceManager, "webapp1-", 20); + final String app2Name = Utils.randomResourceName(azureResourceManager, "webapp2-", 20); final String app1Url = app1Name + suffix; final String app2Url = app2Name + suffix; - final String plan1Name = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("plan1-", 20); - final String plan2Name = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("plan2-", 20); - final String storage1Name = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("storage1", 20); - final String rgName = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("rg1NEMV_", 24); + final String plan1Name = Utils.randomResourceName(azureResourceManager, "plan1-", 20); + final String plan2Name = Utils.randomResourceName(azureResourceManager, "plan2-", 20); + final String storage1Name = Utils.randomResourceName(azureResourceManager, "storage1", 20); + final String rgName = Utils.randomResourceName(azureResourceManager, "rg1NEMV_", 24); try { diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/appservice/samples/ManageLinuxWebAppBasic.java b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/appservice/samples/ManageLinuxWebAppBasic.java index ddebd86762bf..722417682190 100644 --- a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/appservice/samples/ManageLinuxWebAppBasic.java +++ b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/appservice/samples/ManageLinuxWebAppBasic.java @@ -37,11 +37,11 @@ public final class ManageLinuxWebAppBasic { */ public static boolean runSample(AzureResourceManager azureResourceManager) { // New resources - final String app1Name = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("webapp1-", 20); - final String app2Name = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("webapp2-", 20); - final String app3Name = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("webapp3-", 20); - final String rg1Name = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("rg1NEMV_", 24); - final String rg2Name = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("rg2NEMV_", 24); + final String app1Name = Utils.randomResourceName(azureResourceManager, "webapp1-", 20); + final String app2Name = Utils.randomResourceName(azureResourceManager, "webapp2-", 20); + final String app3Name = Utils.randomResourceName(azureResourceManager, "webapp3-", 20); + final String rg1Name = Utils.randomResourceName(azureResourceManager, "rg1NEMV_", 24); + final String rg2Name = Utils.randomResourceName(azureResourceManager, "rg2NEMV_", 24); try { diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/appservice/samples/ManageLinuxWebAppSourceControl.java b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/appservice/samples/ManageLinuxWebAppSourceControl.java index 5955df38e153..9b9ecc716b19 100644 --- a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/appservice/samples/ManageLinuxWebAppSourceControl.java +++ b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/appservice/samples/ManageLinuxWebAppSourceControl.java @@ -45,15 +45,15 @@ public final class ManageLinuxWebAppSourceControl { public static boolean runSample(AzureResourceManager azureResourceManager) throws GitAPIException { // New resources final String suffix = ".azurewebsites.net"; - final String app1Name = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("webapp1-", 20); - final String app2Name = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("webapp2-", 20); - final String app3Name = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("webapp3-", 20); - final String app4Name = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("webapp4-", 20); + final String app1Name = Utils.randomResourceName(azureResourceManager, "webapp1-", 20); + final String app2Name = Utils.randomResourceName(azureResourceManager, "webapp2-", 20); + final String app3Name = Utils.randomResourceName(azureResourceManager, "webapp3-", 20); + final String app4Name = Utils.randomResourceName(azureResourceManager, "webapp4-", 20); final String app1Url = app1Name + suffix; final String app2Url = app2Name + suffix; final String app3Url = app3Name + suffix; final String app4Url = app4Name + suffix; - final String rgName = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("rg1NEMV_", 24); + final String rgName = Utils.randomResourceName(azureResourceManager, "rg1NEMV_", 24); try { diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/appservice/samples/ManageLinuxWebAppSqlConnection.java b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/appservice/samples/ManageLinuxWebAppSqlConnection.java index 1fac583f6b2f..432547ed738e 100644 --- a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/appservice/samples/ManageLinuxWebAppSqlConnection.java +++ b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/appservice/samples/ManageLinuxWebAppSqlConnection.java @@ -38,13 +38,13 @@ public final class ManageLinuxWebAppSqlConnection { public static boolean runSample(AzureResourceManager azureResourceManager) throws IOException { // New resources final String suffix = ".azurewebsites.net"; - final String appName = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("webapp1-", 20); + final String appName = Utils.randomResourceName(azureResourceManager, "webapp1-", 20); final String appUrl = appName + suffix; - final String sqlServerName = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("jsdkserver", 20); - final String sqlDbName = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("jsdkdb", 20); + final String sqlServerName = Utils.randomResourceName(azureResourceManager, "jsdkserver", 20); + final String sqlDbName = Utils.randomResourceName(azureResourceManager, "jsdkdb", 20); final String admin = "jsdkadmin"; final String password = Utils.password(); - final String rgName = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("rg1NEMV_", 24); + final String rgName = Utils.randomResourceName(azureResourceManager, "rg1NEMV_", 24); try { diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/appservice/samples/ManageLinuxWebAppStorageAccountConnection.java b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/appservice/samples/ManageLinuxWebAppStorageAccountConnection.java index b9bdc0d8c6f2..8b34ccf12138 100644 --- a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/appservice/samples/ManageLinuxWebAppStorageAccountConnection.java +++ b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/appservice/samples/ManageLinuxWebAppStorageAccountConnection.java @@ -52,11 +52,11 @@ public final class ManageLinuxWebAppStorageAccountConnection { public static boolean runSample(AzureResourceManager azureResourceManager) { // New resources final String suffix = ".azurewebsites.net"; - final String app1Name = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("webapp1-", 20); + final String app1Name = Utils.randomResourceName(azureResourceManager, "webapp1-", 20); final String app1Url = app1Name + suffix; - final String storageName = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("jsdkstore", 20); - final String containerName = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("jcontainer", 20); - final String rgName = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("rg1NEMV_", 24); + final String storageName = Utils.randomResourceName(azureResourceManager, "jsdkstore", 20); + final String containerName = Utils.randomResourceName(azureResourceManager, "jcontainer", 20); + final String rgName = Utils.randomResourceName(azureResourceManager, "rg1NEMV_", 24); try { diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/appservice/samples/ManageLinuxWebAppWithContainerRegistry.java b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/appservice/samples/ManageLinuxWebAppWithContainerRegistry.java index 5f05694af52c..503f313a6e43 100644 --- a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/appservice/samples/ManageLinuxWebAppWithContainerRegistry.java +++ b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/appservice/samples/ManageLinuxWebAppWithContainerRegistry.java @@ -50,9 +50,9 @@ public class ManageLinuxWebAppWithContainerRegistry { * @return true if sample runs successfully */ public static boolean runSample(AzureResourceManager azureResourceManager) throws IOException, InterruptedException { - final String rgName = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("rgACR", 15); - final String acrName = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("acrsample", 20); - final String appName = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("webapp", 20); + final String rgName = Utils.randomResourceName(azureResourceManager, "rgACR", 15); + final String acrName = Utils.randomResourceName(azureResourceManager, "acrsample", 20); + final String appName = Utils.randomResourceName(azureResourceManager, "webapp", 20); final String appUrl = appName + ".azurewebsites.net"; final Region region = Region.US_EAST; final String dockerImageName = "tomcat"; diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/appservice/samples/ManageLinuxWebAppWithDomainSsl.java b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/appservice/samples/ManageLinuxWebAppWithDomainSsl.java index b15235c9418c..7b207172031c 100644 --- a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/appservice/samples/ManageLinuxWebAppWithDomainSsl.java +++ b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/appservice/samples/ManageLinuxWebAppWithDomainSsl.java @@ -42,10 +42,10 @@ public final class ManageLinuxWebAppWithDomainSsl { */ public static boolean runSample(AzureResourceManager azureResourceManager) throws IOException { // New resources - final String app1Name = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("webapp1-", 20); - final String app2Name = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("webapp2-", 20); - final String rgName = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("rgNEMV_", 24); - final String domainName = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("jsdkdemo-", 20) + ".com"; + final String app1Name = Utils.randomResourceName(azureResourceManager, "webapp1-", 20); + final String app2Name = Utils.randomResourceName(azureResourceManager, "webapp2-", 20); + final String rgName = Utils.randomResourceName(azureResourceManager, "rgNEMV_", 24); + final String domainName = Utils.randomResourceName(azureResourceManager, "jsdkdemo-", 20) + ".com"; final String certPassword = Utils.password(); try { diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/appservice/samples/ManageLinuxWebAppWithTrafficManager.java b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/appservice/samples/ManageLinuxWebAppWithTrafficManager.java index 93109041b2f3..309c3dd34bf4 100644 --- a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/appservice/samples/ManageLinuxWebAppWithTrafficManager.java +++ b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/appservice/samples/ManageLinuxWebAppWithTrafficManager.java @@ -50,23 +50,23 @@ public final class ManageLinuxWebAppWithTrafficManager { * @return true if sample runs successfully */ public static boolean runSample(AzureResourceManager azureResourceManager) throws IOException { - rgName = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("rgNEMV_", 24); + rgName = Utils.randomResourceName(azureResourceManager, "rgNEMV_", 24); if (ManageLinuxWebAppWithTrafficManager.azureResourceManager == null) { ManageLinuxWebAppWithTrafficManager.azureResourceManager = azureResourceManager; } // New resources - final String app1Name = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("webapp1-", 20); - final String app2Name = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("webapp2-", 20); - final String app3Name = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("webapp3-", 20); - final String app4Name = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("webapp4-", 20); - final String app5Name = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("webapp5-", 20); - final String plan1Name = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("jplan1_", 15); - final String plan2Name = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("jplan2_", 15); - final String plan3Name = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("jplan3_", 15); - final String domainName = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("jsdkdemo-", 20) + ".com"; - final String tmName = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("jsdktm-", 20); + final String app1Name = Utils.randomResourceName(azureResourceManager, "webapp1-", 20); + final String app2Name = Utils.randomResourceName(azureResourceManager, "webapp2-", 20); + final String app3Name = Utils.randomResourceName(azureResourceManager, "webapp3-", 20); + final String app4Name = Utils.randomResourceName(azureResourceManager, "webapp4-", 20); + final String app5Name = Utils.randomResourceName(azureResourceManager, "webapp5-", 20); + final String plan1Name = Utils.randomResourceName(azureResourceManager, "jplan1_", 15); + final String plan2Name = Utils.randomResourceName(azureResourceManager, "jplan2_", 15); + final String plan3Name = Utils.randomResourceName(azureResourceManager, "jplan3_", 15); + final String domainName = Utils.randomResourceName(azureResourceManager, "jsdkdemo-", 20) + ".com"; + final String tmName = Utils.randomResourceName(azureResourceManager, "jsdktm-", 20); try { diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/appservice/samples/ManageWebAppBasic.java b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/appservice/samples/ManageWebAppBasic.java index 2ebc6559fd28..270cbe41582a 100644 --- a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/appservice/samples/ManageWebAppBasic.java +++ b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/appservice/samples/ManageWebAppBasic.java @@ -36,11 +36,11 @@ public final class ManageWebAppBasic { */ public static boolean runSample(AzureResourceManager azureResourceManager) { // New resources - final String app1Name = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("webapp1-", 20); - final String app2Name = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("webapp2-", 20); - final String app3Name = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("webapp3-", 20); - final String rg1Name = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("rg1NEMV_", 24); - final String rg2Name = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("rg2NEMV_", 24); + final String app1Name = Utils.randomResourceName(azureResourceManager, "webapp1-", 20); + final String app2Name = Utils.randomResourceName(azureResourceManager, "webapp2-", 20); + final String app3Name = Utils.randomResourceName(azureResourceManager, "webapp3-", 20); + final String rg1Name = Utils.randomResourceName(azureResourceManager, "rg1NEMV_", 24); + final String rg2Name = Utils.randomResourceName(azureResourceManager, "rg2NEMV_", 24); try { diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/appservice/samples/ManageWebAppCosmosDbByMsi.java b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/appservice/samples/ManageWebAppCosmosDbByMsi.java index 5054c5a1606c..8970d87f6cf1 100644 --- a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/appservice/samples/ManageWebAppCosmosDbByMsi.java +++ b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/appservice/samples/ManageWebAppCosmosDbByMsi.java @@ -47,10 +47,10 @@ public final class ManageWebAppCosmosDbByMsi { public static boolean runSample(AzureResourceManager azureResourceManager, TokenCredential credential, String clientId) { // New resources final Region region = Region.US_WEST; - final String appName = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("webapp1-", 20); - final String rgName = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("rg1NEMV_", 24); - final String vaultName = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("vault", 20); - final String cosmosName = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("cosmosdb", 20); + final String appName = Utils.randomResourceName(azureResourceManager, "webapp1-", 20); + final String rgName = Utils.randomResourceName(azureResourceManager, "rg1NEMV_", 24); + final String vaultName = Utils.randomResourceName(azureResourceManager, "vault", 20); + final String cosmosName = Utils.randomResourceName(azureResourceManager, "cosmosdb", 20); final String appUrl = appName + ".azurewebsites.net"; try { diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/appservice/samples/ManageWebAppCosmosDbThroughKeyVault.java b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/appservice/samples/ManageWebAppCosmosDbThroughKeyVault.java index 5e394071fbf5..c5522a09e7a2 100644 --- a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/appservice/samples/ManageWebAppCosmosDbThroughKeyVault.java +++ b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/appservice/samples/ManageWebAppCosmosDbThroughKeyVault.java @@ -43,10 +43,10 @@ public final class ManageWebAppCosmosDbThroughKeyVault { public static boolean runSample(AzureResourceManager azureResourceManager, String clientId) { // New resources final Region region = Region.US_WEST; - final String appName = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("webapp1-", 20); - final String rgName = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("rg1NEMV_", 24); - final String vaultName = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("vault", 20); - final String cosmosName = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("cosmosdb", 20); + final String appName = Utils.randomResourceName(azureResourceManager, "webapp1-", 20); + final String rgName = Utils.randomResourceName(azureResourceManager, "rg1NEMV_", 24); + final String vaultName = Utils.randomResourceName(azureResourceManager, "vault", 20); + final String cosmosName = Utils.randomResourceName(azureResourceManager, "cosmosdb", 20); final String appUrl = appName + ".azurewebsites.net"; try { diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/appservice/samples/ManageWebAppLogs.java b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/appservice/samples/ManageWebAppLogs.java index 9a99e7f2e4a4..32be2ad2c9d2 100644 --- a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/appservice/samples/ManageWebAppLogs.java +++ b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/appservice/samples/ManageWebAppLogs.java @@ -45,9 +45,9 @@ public final class ManageWebAppLogs { public static boolean runSample(AzureResourceManager azureResourceManager) throws IOException { // New resources final String suffix = ".azurewebsites.net"; - final String appName = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("webapp1-", 20); + final String appName = Utils.randomResourceName(azureResourceManager, "webapp1-", 20); final String appUrl = appName + suffix; - final String rgName = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("rg1NEMV_", 24); + final String rgName = Utils.randomResourceName(azureResourceManager, "rg1NEMV_", 24); try { diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/appservice/samples/ManageWebAppSlots.java b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/appservice/samples/ManageWebAppSlots.java index 6ac40662b717..8bb29e7053d9 100644 --- a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/appservice/samples/ManageWebAppSlots.java +++ b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/appservice/samples/ManageWebAppSlots.java @@ -37,10 +37,10 @@ public final class ManageWebAppSlots { */ public static boolean runSample(AzureResourceManager azureResourceManager) { // New resources - final String resourceGroupName = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("rg", 24); - final String app1Name = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("webapp1-", 20); - final String app2Name = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("webapp2-", 20); - final String app3Name = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("webapp3-", 20); + final String resourceGroupName = Utils.randomResourceName(azureResourceManager, "rg", 24); + final String app1Name = Utils.randomResourceName(azureResourceManager, "webapp1-", 20); + final String app2Name = Utils.randomResourceName(azureResourceManager, "webapp2-", 20); + final String app3Name = Utils.randomResourceName(azureResourceManager, "webapp3-", 20); final String slotName = "staging"; try { diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/appservice/samples/ManageWebAppSourceControl.java b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/appservice/samples/ManageWebAppSourceControl.java index b486e7bd4c81..beb3c007a1af 100644 --- a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/appservice/samples/ManageWebAppSourceControl.java +++ b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/appservice/samples/ManageWebAppSourceControl.java @@ -50,13 +50,13 @@ public final class ManageWebAppSourceControl { public static boolean runSample(AzureResourceManager azureResourceManager) throws GitAPIException { // New resources final String suffix = ".azurewebsites.net"; - final String app1Name = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("webapp1-", 20); - final String app2Name = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("webapp2-", 20); - final String app3Name = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("webapp3-", 20); - final String app4Name = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("webapp4-", 20); - final String app5Name = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("webapp5-", 20); - final String app6Name = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("webapp6-", 20); - final String app7Name = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("webapp7-", 20); + final String app1Name = Utils.randomResourceName(azureResourceManager, "webapp1-", 20); + final String app2Name = Utils.randomResourceName(azureResourceManager, "webapp2-", 20); + final String app3Name = Utils.randomResourceName(azureResourceManager, "webapp3-", 20); + final String app4Name = Utils.randomResourceName(azureResourceManager, "webapp4-", 20); + final String app5Name = Utils.randomResourceName(azureResourceManager, "webapp5-", 20); + final String app6Name = Utils.randomResourceName(azureResourceManager, "webapp6-", 20); + final String app7Name = Utils.randomResourceName(azureResourceManager, "webapp7-", 20); final String app1Url = app1Name + suffix; final String app2Url = app2Name + suffix; final String app3Url = app3Name + suffix; @@ -64,8 +64,8 @@ public static boolean runSample(AzureResourceManager azureResourceManager) throw final String app5Url = app5Name + suffix; final String app6Url = app6Name + suffix; final String app7Url = app7Name + suffix; - final String rgName = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("rg1NEMV_", 24); - final String rg7Name = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("rg7NEMV_", 24); + final String rgName = Utils.randomResourceName(azureResourceManager, "rg1NEMV_", 24); + final String rg7Name = Utils.randomResourceName(azureResourceManager, "rg7NEMV_", 24); try { diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/appservice/samples/ManageWebAppSourceControlAsync.java b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/appservice/samples/ManageWebAppSourceControlAsync.java index e4ffc1c95491..7c1ef1438459 100644 --- a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/appservice/samples/ManageWebAppSourceControlAsync.java +++ b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/appservice/samples/ManageWebAppSourceControlAsync.java @@ -44,16 +44,16 @@ public final class ManageWebAppSourceControlAsync { public static boolean runSample(final AzureResourceManager azureResourceManager) { // New resources final String suffix = ".azurewebsites.net"; - final String app1Name = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("webapp1-", 20); - final String app2Name = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("webapp2-", 20); - final String app3Name = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("webapp3-", 20); - final String app4Name = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("webapp4-", 20); + final String app1Name = Utils.randomResourceName(azureResourceManager, "webapp1-", 20); + final String app2Name = Utils.randomResourceName(azureResourceManager, "webapp2-", 20); + final String app3Name = Utils.randomResourceName(azureResourceManager, "webapp3-", 20); + final String app4Name = Utils.randomResourceName(azureResourceManager, "webapp4-", 20); final String app1Url = app1Name + suffix; final String app2Url = app2Name + suffix; final String app3Url = app3Name + suffix; final String app4Url = app4Name + suffix; - final String planName = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("jplan_", 15); - final String rgName = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("rg1NEMV_", 24); + final String planName = Utils.randomResourceName(azureResourceManager, "jplan_", 15); + final String rgName = Utils.randomResourceName(azureResourceManager, "rg1NEMV_", 24); try { diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/appservice/samples/ManageWebAppSqlConnection.java b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/appservice/samples/ManageWebAppSqlConnection.java index 8b74b9547637..d910633b8a65 100644 --- a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/appservice/samples/ManageWebAppSqlConnection.java +++ b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/appservice/samples/ManageWebAppSqlConnection.java @@ -37,13 +37,13 @@ public final class ManageWebAppSqlConnection { public static boolean runSample(AzureResourceManager azureResourceManager) throws IOException { // New resources final String suffix = ".azurewebsites.net"; - final String appName = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("webapp1-", 20); + final String appName = Utils.randomResourceName(azureResourceManager, "webapp1-", 20); final String appUrl = appName + suffix; - final String sqlServerName = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("jsdkserver", 20); - final String sqlDbName = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("jsdkdb", 20); + final String sqlServerName = Utils.randomResourceName(azureResourceManager, "jsdkserver", 20); + final String sqlDbName = Utils.randomResourceName(azureResourceManager, "jsdkdb", 20); final String admin = "jsdkadmin"; final String password = Utils.password(); - final String rgName = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("rg1NEMV_", 24); + final String rgName = Utils.randomResourceName(azureResourceManager, "rg1NEMV_", 24); try { diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/appservice/samples/ManageWebAppStorageAccountConnection.java b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/appservice/samples/ManageWebAppStorageAccountConnection.java index b5f19228e0f1..48d562d80c09 100644 --- a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/appservice/samples/ManageWebAppStorageAccountConnection.java +++ b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/appservice/samples/ManageWebAppStorageAccountConnection.java @@ -53,11 +53,11 @@ public final class ManageWebAppStorageAccountConnection { public static boolean runSample(AzureResourceManager azureResourceManager) { // New resources final String suffix = ".azurewebsites.net"; - final String app1Name = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("webapp1-", 20); + final String app1Name = Utils.randomResourceName(azureResourceManager, "webapp1-", 20); final String app1Url = app1Name + suffix; - final String storageName = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("jsdkstore", 20); - final String containerName = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("jcontainer", 20); - final String rgName = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("rg1NEMV_", 24); + final String storageName = Utils.randomResourceName(azureResourceManager, "jsdkstore", 20); + final String containerName = Utils.randomResourceName(azureResourceManager, "jcontainer", 20); + final String rgName = Utils.randomResourceName(azureResourceManager, "rg1NEMV_", 24); try { diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/appservice/samples/ManageWebAppWithAuthentication.java b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/appservice/samples/ManageWebAppWithAuthentication.java index fa84ff4cfe1b..e4da35b9f547 100644 --- a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/appservice/samples/ManageWebAppWithAuthentication.java +++ b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/appservice/samples/ManageWebAppWithAuthentication.java @@ -38,15 +38,15 @@ public final class ManageWebAppWithAuthentication { public static boolean runSample(AzureResourceManager azureResourceManager) { // New resources final String suffix = ".azurewebsites.net"; - final String app1Name = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("webapp1-", 20); - final String app2Name = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("webapp2-", 20); - final String app3Name = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("webapp3-", 20); - final String app4Name = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("webapp4-", 20); + final String app1Name = Utils.randomResourceName(azureResourceManager, "webapp1-", 20); + final String app2Name = Utils.randomResourceName(azureResourceManager, "webapp2-", 20); + final String app3Name = Utils.randomResourceName(azureResourceManager, "webapp3-", 20); + final String app4Name = Utils.randomResourceName(azureResourceManager, "webapp4-", 20); final String app1Url = app1Name + suffix; final String app2Url = app2Name + suffix; final String app3Url = app3Name + suffix; final String app4Url = app4Name + suffix; - final String rgName = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("rg1NEMV_", 24); + final String rgName = Utils.randomResourceName(azureResourceManager, "rg1NEMV_", 24); try { diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/appservice/samples/ManageWebAppWithDomainSsl.java b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/appservice/samples/ManageWebAppWithDomainSsl.java index eb29728e0479..6f778547430c 100644 --- a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/appservice/samples/ManageWebAppWithDomainSsl.java +++ b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/appservice/samples/ManageWebAppWithDomainSsl.java @@ -41,10 +41,10 @@ public final class ManageWebAppWithDomainSsl { */ public static boolean runSample(AzureResourceManager azureResourceManager) throws IOException { // New resources - final String app1Name = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("webapp1-", 20); - final String app2Name = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("webapp2-", 20); - final String rgName = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("rgNEMV_", 24); - final String domainName = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("jsdkdemo-", 20) + ".com"; + final String app1Name = Utils.randomResourceName(azureResourceManager, "webapp1-", 20); + final String app2Name = Utils.randomResourceName(azureResourceManager, "webapp2-", 20); + final String rgName = Utils.randomResourceName(azureResourceManager, "rgNEMV_", 24); + final String domainName = Utils.randomResourceName(azureResourceManager, "jsdkdemo-", 20) + ".com"; final String certPassword = Utils.password(); try { diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/appservice/samples/ManageWebAppWithTrafficManager.java b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/appservice/samples/ManageWebAppWithTrafficManager.java index f5690b370cee..4874462cbc86 100644 --- a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/appservice/samples/ManageWebAppWithTrafficManager.java +++ b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/appservice/samples/ManageWebAppWithTrafficManager.java @@ -49,23 +49,23 @@ public final class ManageWebAppWithTrafficManager { * @return true if sample runs successfully */ public static boolean runSample(AzureResourceManager azureResourceManager) throws IOException { - rgName = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("rgNEMV_", 24); + rgName = Utils.randomResourceName(azureResourceManager, "rgNEMV_", 24); if (ManageWebAppWithTrafficManager.azureResourceManager == null) { ManageWebAppWithTrafficManager.azureResourceManager = azureResourceManager; } // New resources - final String app1Name = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("webapp1-", 20); - final String app2Name = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("webapp2-", 20); - final String app3Name = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("webapp3-", 20); - final String app4Name = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("webapp4-", 20); - final String app5Name = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("webapp5-", 20); - final String plan1Name = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("jplan1_", 15); - final String plan2Name = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("jplan2_", 15); - final String plan3Name = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("jplan3_", 15); - final String domainName = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("jsdkdemo-", 20) + ".com"; - final String tmName = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("jsdktm-", 20); + final String app1Name = Utils.randomResourceName(azureResourceManager, "webapp1-", 20); + final String app2Name = Utils.randomResourceName(azureResourceManager, "webapp2-", 20); + final String app3Name = Utils.randomResourceName(azureResourceManager, "webapp3-", 20); + final String app4Name = Utils.randomResourceName(azureResourceManager, "webapp4-", 20); + final String app5Name = Utils.randomResourceName(azureResourceManager, "webapp5-", 20); + final String plan1Name = Utils.randomResourceName(azureResourceManager, "jplan1_", 15); + final String plan2Name = Utils.randomResourceName(azureResourceManager, "jplan2_", 15); + final String plan3Name = Utils.randomResourceName(azureResourceManager, "jplan3_", 15); + final String domainName = Utils.randomResourceName(azureResourceManager, "jsdkdemo-", 20) + ".com"; + final String tmName = Utils.randomResourceName(azureResourceManager, "jsdktm-", 20); try { diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/cdn/samples/ManageCdnProfileWithCustomDomain.java b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/cdn/samples/ManageCdnProfileWithCustomDomain.java index b6e2f0c2f9e0..5583b29ffb51 100644 --- a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/cdn/samples/ManageCdnProfileWithCustomDomain.java +++ b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/cdn/samples/ManageCdnProfileWithCustomDomain.java @@ -16,6 +16,7 @@ import com.azure.resourcemanager.resources.fluentcore.arm.CountryIsoCode; import com.azure.resourcemanager.resources.fluentcore.arm.CountryPhoneCode; import com.azure.core.management.Region; +import com.azure.resourcemanager.samples.Utils; import java.util.Map; @@ -35,10 +36,10 @@ public class ManageCdnProfileWithCustomDomain { * @return true if sample runs successfully */ public static boolean runSample(AzureResourceManager azureResourceManager) { - final String rgName = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("rgNEMV", 24); - final String domainName = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("jsdkcdn", 15) + ".com"; - final String cdnProfileName = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("jsdkcdnp", 24); - final String cdnEndpointName = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("jsdkcdne", 24); + final String rgName = Utils.randomResourceName(azureResourceManager, "rgNEMV", 24); + final String domainName = Utils.randomResourceName(azureResourceManager, "jsdkcdn", 15) + ".com"; + final String cdnProfileName = Utils.randomResourceName(azureResourceManager, "jsdkcdnp", 24); + final String cdnEndpointName = Utils.randomResourceName(azureResourceManager, "jsdkcdne", 24); final Region region = Region.US_WEST; final String cnameRecordName = "sample"; String customDomain = cnameRecordName + "." + domainName; diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/cdn/samples/ManageCdnProfileWithWebApp.java b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/cdn/samples/ManageCdnProfileWithWebApp.java index 0dfe224dc85e..c4317edfb0c6 100644 --- a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/cdn/samples/ManageCdnProfileWithWebApp.java +++ b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/cdn/samples/ManageCdnProfileWithWebApp.java @@ -44,8 +44,8 @@ public class ManageCdnProfileWithWebApp { * @return true if sample runs successfully */ public static boolean runSample(AzureResourceManager azureResourceManager) { - final String resourceGroupName = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("rg", 20); - final String cdnProfileName = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("cdnStandardProfile", 20); + final String resourceGroupName = Utils.randomResourceName(azureResourceManager, "rg", 20); + final String cdnProfileName = Utils.randomResourceName(azureResourceManager, "cdnStandardProfile", 20); String[] appNames = new String[8]; try { @@ -58,7 +58,7 @@ public static boolean runSample(AzureResourceManager azureResourceManager) { // ============================================================ // Create 8 websites for (int i = 0; i < 8; i++) { - appNames[i] = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("webapp" + (i + 1) + "-", 20); + appNames[i] = Utils.randomResourceName(azureResourceManager, "webapp" + (i + 1) + "-", 20); } // 2 in US diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/compute/samples/ConvertVirtualMachineToManagedDisks.java b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/compute/samples/ConvertVirtualMachineToManagedDisks.java index 7eed336e796c..74c2208f7b73 100644 --- a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/compute/samples/ConvertVirtualMachineToManagedDisks.java +++ b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/compute/samples/ConvertVirtualMachineToManagedDisks.java @@ -30,8 +30,8 @@ public final class ConvertVirtualMachineToManagedDisks { * @return true if sample runs successfully */ public static boolean runSample(AzureResourceManager azureResourceManager) { - final String linuxVMName = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("VM1", 15); - final String rgName = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("rgCOMV", 15); + final String linuxVMName = Utils.randomResourceName(azureResourceManager, "VM1", 15); + final String rgName = Utils.randomResourceName(azureResourceManager, "rgCOMV", 15); final String userName = "tirekicker"; final String password = Utils.password(); final Region region = Region.US_WEST; diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/compute/samples/CreateVirtualMachineUsingCustomImageFromVHD.java b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/compute/samples/CreateVirtualMachineUsingCustomImageFromVHD.java index 6bbd353d0dc4..68221db73cd5 100644 --- a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/compute/samples/CreateVirtualMachineUsingCustomImageFromVHD.java +++ b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/compute/samples/CreateVirtualMachineUsingCustomImageFromVHD.java @@ -45,12 +45,12 @@ public final class CreateVirtualMachineUsingCustomImageFromVHD { * @return true if sample runs successfully */ public static boolean runSample(AzureResourceManager azureResourceManager) { - final String linuxVMName1 = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("VM1", 10); - final String linuxVMName2 = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("VM2", 10); - final String linuxVMName3 = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("VM3", 10); - final String customImageName = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("img", 10); - final String rgName = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("rgCOMV", 15); - final String publicIPDnsLabel = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("pip", 10); + final String linuxVMName1 = Utils.randomResourceName(azureResourceManager, "VM1", 10); + final String linuxVMName2 = Utils.randomResourceName(azureResourceManager, "VM2", 10); + final String linuxVMName3 = Utils.randomResourceName(azureResourceManager, "VM3", 10); + final String customImageName = Utils.randomResourceName(azureResourceManager, "img", 10); + final String rgName = Utils.randomResourceName(azureResourceManager, "rgCOMV", 15); + final String publicIPDnsLabel = Utils.randomResourceName(azureResourceManager, "pip", 10); final String userName = "tirekicker"; final String password = Utils.password(); final Region region = Region.US_WEST_CENTRAL; diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/compute/samples/CreateVirtualMachineUsingCustomImageFromVM.java b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/compute/samples/CreateVirtualMachineUsingCustomImageFromVM.java index 16062fae0d79..c491ea658253 100644 --- a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/compute/samples/CreateVirtualMachineUsingCustomImageFromVM.java +++ b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/compute/samples/CreateVirtualMachineUsingCustomImageFromVM.java @@ -43,12 +43,12 @@ public final class CreateVirtualMachineUsingCustomImageFromVM { * @return true if sample runs successfully */ public static boolean runSample(AzureResourceManager azureResourceManager) { - final String linuxVMName1 = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("VM1", 15); - final String linuxVMName2 = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("VM2", 15); - final String linuxVMName3 = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("VM3", 15); - final String customImageName = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("img", 15); - final String rgName = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("rgCOMV", 15); - final String publicIpDnsLabel = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("pip", 15); + final String linuxVMName1 = Utils.randomResourceName(azureResourceManager, "VM1", 15); + final String linuxVMName2 = Utils.randomResourceName(azureResourceManager, "VM2", 15); + final String linuxVMName3 = Utils.randomResourceName(azureResourceManager, "VM3", 15); + final String customImageName = Utils.randomResourceName(azureResourceManager, "img", 15); + final String rgName = Utils.randomResourceName(azureResourceManager, "rgCOMV", 15); + final String publicIpDnsLabel = Utils.randomResourceName(azureResourceManager, "pip", 15); final String userName = "tirekicker"; final String password = Utils.password(); final Region region = Region.US_WEST_CENTRAL; diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/compute/samples/CreateVirtualMachineUsingSpecializedDiskFromSnapshot.java b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/compute/samples/CreateVirtualMachineUsingSpecializedDiskFromSnapshot.java index a4f85d5d24c3..18b17e5277be 100644 --- a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/compute/samples/CreateVirtualMachineUsingSpecializedDiskFromSnapshot.java +++ b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/compute/samples/CreateVirtualMachineUsingSpecializedDiskFromSnapshot.java @@ -39,15 +39,15 @@ public final class CreateVirtualMachineUsingSpecializedDiskFromSnapshot { * @return true if sample runs successfully */ public static boolean runSample(AzureResourceManager azureResourceManager) { - final String linuxVMName1 = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("VM1", 15); - final String linuxVMName2 = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("VM2", 15); - final String managedOSSnapshotName = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("ss-os-", 15); - final String managedDataDiskSnapshotPrefix = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("ss-data-", 15); - final String managedNewOSDiskName = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("ds-os-nw-", 15); - final String managedNewDataDiskNamePrefix = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("ds-data-nw-", 15); - - final String rgName = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("rgCOMV", 15); - final String publicIpDnsLabel = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("pip", 15); + final String linuxVMName1 = Utils.randomResourceName(azureResourceManager, "VM1", 15); + final String linuxVMName2 = Utils.randomResourceName(azureResourceManager, "VM2", 15); + final String managedOSSnapshotName = Utils.randomResourceName(azureResourceManager, "ss-os-", 15); + final String managedDataDiskSnapshotPrefix = Utils.randomResourceName(azureResourceManager, "ss-data-", 15); + final String managedNewOSDiskName = Utils.randomResourceName(azureResourceManager, "ds-os-nw-", 15); + final String managedNewDataDiskNamePrefix = Utils.randomResourceName(azureResourceManager, "ds-data-nw-", 15); + + final String rgName = Utils.randomResourceName(azureResourceManager, "rgCOMV", 15); + final String publicIpDnsLabel = Utils.randomResourceName(azureResourceManager, "pip", 15); final String userName = "tirekicker"; final String password = Utils.password(); final Region region = Region.US_WEST_CENTRAL; diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/compute/samples/CreateVirtualMachineUsingSpecializedDiskFromVhd.java b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/compute/samples/CreateVirtualMachineUsingSpecializedDiskFromVhd.java index 29c63903c2b7..37c0687d5e22 100644 --- a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/compute/samples/CreateVirtualMachineUsingSpecializedDiskFromVhd.java +++ b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/compute/samples/CreateVirtualMachineUsingSpecializedDiskFromVhd.java @@ -38,13 +38,13 @@ public class CreateVirtualMachineUsingSpecializedDiskFromVhd { * @return true if sample runs successfully */ public static boolean runSample(AzureResourceManager azureResourceManager) { - final String linuxVMName1 = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("VM1", 15); - final String linuxVMName2 = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("VM2", 15); - final String managedOSDiskName = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("ds-os-", 15); - final String managedDataDiskNamePrefix = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("ds-data-", 15); - final String rgName = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("rgCOMV", 15); - final String publicIpDnsLabel = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("pip", 15); - final String storageAccountName = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("stg", 15); + final String linuxVMName1 = Utils.randomResourceName(azureResourceManager, "VM1", 15); + final String linuxVMName2 = Utils.randomResourceName(azureResourceManager, "VM2", 15); + final String managedOSDiskName = Utils.randomResourceName(azureResourceManager, "ds-os-", 15); + final String managedDataDiskNamePrefix = Utils.randomResourceName(azureResourceManager, "ds-data-", 15); + final String rgName = Utils.randomResourceName(azureResourceManager, "rgCOMV", 15); + final String publicIpDnsLabel = Utils.randomResourceName(azureResourceManager, "pip", 15); + final String storageAccountName = Utils.randomResourceName(azureResourceManager, "stg", 15); final String userName = "tirekicker"; final String password = Utils.password(); final Region region = Region.US_WEST_CENTRAL; diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/compute/samples/CreateVirtualMachinesAsyncTrackingRelatedResources.java b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/compute/samples/CreateVirtualMachinesAsyncTrackingRelatedResources.java index 318a5e831227..7cd0a668c5c2 100644 --- a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/compute/samples/CreateVirtualMachinesAsyncTrackingRelatedResources.java +++ b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/compute/samples/CreateVirtualMachinesAsyncTrackingRelatedResources.java @@ -61,7 +61,7 @@ public final class CreateVirtualMachinesAsyncTrackingRelatedResources { public static boolean runSample(AzureResourceManager azureResourceManager) { final int desiredVMCount = 6; final Region region = Region.US_WEST; - final String resourceGroupName = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("rg", 15); + final String resourceGroupName = Utils.randomResourceName(azureResourceManager, "rg", 15); final List errors = new ArrayList<>(); try { @@ -95,7 +95,7 @@ public static boolean runSample(AzureResourceManager azureResourceManager) { Collection> relatedDefinitions = new ArrayList<>(); // Define a network for each VM - String networkName = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("net", 14); + String networkName = Utils.randomResourceName(azureResourceManager, "net", 14); Creatable networkDefinition = azureResourceManager.networks().define(networkName) .withRegion(region) .withExistingResourceGroup(resourceGroup) @@ -103,14 +103,14 @@ public static boolean runSample(AzureResourceManager azureResourceManager) { relatedDefinitions.add(networkDefinition); // Define a PIP for each VM - String pipName = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("pip", 14); + String pipName = Utils.randomResourceName(azureResourceManager, "pip", 14); Creatable pipDefinition = azureResourceManager.publicIpAddresses().define(pipName) .withRegion(region) .withExistingResourceGroup(resourceGroup); relatedDefinitions.add(pipDefinition); // Define a NIC for each VM - String nicName = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("nic", 14); + String nicName = Utils.randomResourceName(azureResourceManager, "nic", 14); Creatable nicDefinition = azureResourceManager.networkInterfaces().define(nicName) .withRegion(region) .withExistingResourceGroup(resourceGroup) @@ -119,13 +119,13 @@ public static boolean runSample(AzureResourceManager azureResourceManager) { .withNewPrimaryPublicIPAddress(pipDefinition); // Define an availability set for each VM - String availabilitySetName = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("as", 14); + String availabilitySetName = Utils.randomResourceName(azureResourceManager, "as", 14); Creatable availabilitySetDefinition = azureResourceManager.availabilitySets().define(availabilitySetName) .withRegion(region) .withExistingResourceGroup(resourceGroup); relatedDefinitions.add(availabilitySetDefinition); - String vmName = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("vm", 14); + String vmName = Utils.randomResourceName(azureResourceManager, "vm", 14); // Define a VM String userName; diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/compute/samples/CreateVirtualMachinesInParallel.java b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/compute/samples/CreateVirtualMachinesInParallel.java index 0c1f5e425b8f..65d66ce17edc 100644 --- a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/compute/samples/CreateVirtualMachinesInParallel.java +++ b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/compute/samples/CreateVirtualMachinesInParallel.java @@ -18,6 +18,7 @@ import com.azure.resourcemanager.resources.fluentcore.model.Creatable; import com.azure.resourcemanager.resources.fluentcore.model.CreatedResources; import com.azure.core.management.profile.AzureProfile; +import com.azure.resourcemanager.samples.Utils; import com.azure.resourcemanager.storage.models.StorageAccount; import org.apache.commons.lang.time.StopWatch; @@ -37,7 +38,7 @@ public final class CreateVirtualMachinesInParallel { * @return true if sample runs successfully */ public static boolean runSample(AzureResourceManager azureResourceManager) { - final String rgName = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("rgCOPD", 24); + final String rgName = Utils.randomResourceName(azureResourceManager, "rgCOPD", 24); final String userName = "tirekicker"; final String sshKey = "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCfSPC2K7LZcFKEO+/t3dzmQYtrJFZNxOsbVgOVKietqHyvmYGHEC0J2wPdAqQ/63g/hhAEFRoyehM+rbeDri4txB3YFfnOK58jqdkyXzupWqXzOrlKY4Wz9SKjjN765+dqUITjKRIaAip1Ri137szRg71WnrmdP3SphTRlCx1Bk2nXqWPsclbRDCiZeF8QOTi4JqbmJyK5+0UqhqYRduun8ylAwKKQJ1NJt85sYIHn9f1Rfr6Tq2zS0wZ7DHbZL+zB5rSlAr8QyUdg/GQD+cmSs6LvPJKL78d6hMGk84ARtFo4A79ovwX/Fj01znDQkU6nJildfkaolH2rWFG/qttD azjava@javalib.com"; @@ -87,7 +88,7 @@ public static boolean runSample(AzureResourceManager azureResourceManager) { // Create 1 network creatable per region // Prepare Creatable Network definition (Where all the virtual machines get added to) // - String networkName = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("vnetCOPD-", 20); + String networkName = Utils.randomResourceName(azureResourceManager, "vnetCOPD-", 20); Creatable networkCreatable = azureResourceManager.networks().define(networkName) .withRegion(region) .withExistingResourceGroup(resourceGroup) @@ -96,12 +97,12 @@ public static boolean runSample(AzureResourceManager azureResourceManager) { //============================================================= // Create 1 storage creatable per region (For storing VMs disk) // - String storageAccountName = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("stgcopd", 20); + String storageAccountName = Utils.randomResourceName(azureResourceManager, "stgcopd", 20); Creatable storageAccountCreatable = azureResourceManager.storageAccounts().define(storageAccountName) .withRegion(region) .withExistingResourceGroup(resourceGroup); - String linuxVMNamePrefix = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("vm-", 15); + String linuxVMNamePrefix = Utils.randomResourceName(azureResourceManager, "vm-", 15); for (int i = 1; i <= vmCount; i++) { //============================================================= @@ -111,7 +112,7 @@ public static boolean runSample(AzureResourceManager azureResourceManager) { .define(String.format("%s-%d", linuxVMNamePrefix, i)) .withRegion(region) .withExistingResourceGroup(resourceGroup) - .withLeafDomainLabel(azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("pip", 10)); + .withLeafDomainLabel(Utils.randomResourceName(azureResourceManager, "pip", 10)); // publicIpCreatableKeys.add(publicIPAddressCreatable.key()); diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/compute/samples/CreateVirtualMachinesUsingCustomImageOrSpecializedVHD.java b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/compute/samples/CreateVirtualMachinesUsingCustomImageOrSpecializedVHD.java index 850e9606bb52..7bdef4e2f0c4 100644 --- a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/compute/samples/CreateVirtualMachinesUsingCustomImageOrSpecializedVHD.java +++ b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/compute/samples/CreateVirtualMachinesUsingCustomImageOrSpecializedVHD.java @@ -43,11 +43,11 @@ public final class CreateVirtualMachinesUsingCustomImageOrSpecializedVHD { * @return true if sample runs successfully */ public static boolean runSample(AzureResourceManager azureResourceManager) { - final String linuxVMName1 = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("VM1", 15); - final String linuxVMName2 = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("VM2", 15); - final String linuxVMName3 = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("VM3", 15); - final String rgName = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("rgCOMV", 15); - final String publicIPDnsLabel = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("pip", 15); + final String linuxVMName1 = Utils.randomResourceName(azureResourceManager, "VM1", 15); + final String linuxVMName2 = Utils.randomResourceName(azureResourceManager, "VM2", 15); + final String linuxVMName3 = Utils.randomResourceName(azureResourceManager, "VM3", 15); + final String rgName = Utils.randomResourceName(azureResourceManager, "rgCOMV", 15); + final String publicIPDnsLabel = Utils.randomResourceName(azureResourceManager, "pip", 15); final String userName = "tirekicker"; final String password = Utils.password(); diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/compute/samples/ManageAvailabilitySet.java b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/compute/samples/ManageAvailabilitySet.java index 343a7a9952e9..4c951ef75e81 100644 --- a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/compute/samples/ManageAvailabilitySet.java +++ b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/compute/samples/ManageAvailabilitySet.java @@ -40,12 +40,12 @@ public final class ManageAvailabilitySet { */ public static boolean runSample(AzureResourceManager azureResourceManager) { final Region region = Region.US_WEST_CENTRAL; - final String rgName = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("rgCOMA", 15); - final String availSetName1 = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("av1", 15); - final String availSetName2 = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("av2", 15); - final String vm1Name = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("vm1", 15); - final String vm2Name = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("vm2", 15); - final String vnetName = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("vnet", 15); + final String rgName = Utils.randomResourceName(azureResourceManager, "rgCOMA", 15); + final String availSetName1 = Utils.randomResourceName(azureResourceManager, "av1", 15); + final String availSetName2 = Utils.randomResourceName(azureResourceManager, "av2", 15); + final String vm1Name = Utils.randomResourceName(azureResourceManager, "vm1", 15); + final String vm2Name = Utils.randomResourceName(azureResourceManager, "vm2", 15); + final String vnetName = Utils.randomResourceName(azureResourceManager, "vnet", 15); final String userName = "tirekicker"; final String password = Utils.password(); diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/compute/samples/ManageManagedDisks.java b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/compute/samples/ManageManagedDisks.java index ab4159ed0ee0..5dd77ded2b0f 100644 --- a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/compute/samples/ManageManagedDisks.java +++ b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/compute/samples/ManageManagedDisks.java @@ -46,7 +46,7 @@ public final class ManageManagedDisks { */ public static boolean runSample(AzureResourceManager azureResourceManager) { final Region region = Region.US_SOUTH_CENTRAL; - final String rgName = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("rgCOMV", 15); + final String rgName = Utils.randomResourceName(azureResourceManager, "rgCOMV", 15); final String userName = "tirekicker"; final String sshkey = "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCfSPC2K7LZcFKEO+/t3dzmQYtrJFZNxOsbVgOVKietqHyvmYGHEC0J2wPdAqQ/63g/hhAEFRoyehM+rbeDri4txB3YFfnOK58jqdkyXzupWqXzOrlKY4Wz9SKjjN765+dqUITjKRIaAip1Ri137szRg71WnrmdP3SphTRlCx1Bk2nXqWPsclbRDCiZeF8QOTi4JqbmJyK5+0UqhqYRduun8ylAwKKQJ1NJt85sYIHn9f1Rfr6Tq2zS0wZ7DHbZL+zB5rSlAr8QyUdg/GQD+cmSs6LvPJKL78d6hMGk84ARtFo4A79ovwX/Fj01znDQkU6nJildfkaolH2rWFG/qttD azjava@javalib.com"; @@ -57,8 +57,8 @@ public static boolean runSample(AzureResourceManager azureResourceManager) { System.out.println("Creating VM [with an implicit Managed OS disk and explicit Managed data disk]"); - final String linuxVM1Name = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("vm" + "-", 18); - final String linuxVM1Pip = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("pip" + "-", 18); + final String linuxVM1Name = Utils.randomResourceName(azureResourceManager, "vm" + "-", 18); + final String linuxVM1Pip = Utils.randomResourceName(azureResourceManager, "pip" + "-", 18); VirtualMachine linuxVM1 = azureResourceManager.virtualMachines() .define(linuxVM1Name) .withRegion(region) @@ -81,7 +81,7 @@ public static boolean runSample(AzureResourceManager azureResourceManager) { System.out.println("Creating VMSS [with implicit managed OS disks and explicit managed data disks]"); - final String vmScaleSetName = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("vmss" + "-", 18); + final String vmScaleSetName = Utils.randomResourceName(azureResourceManager, "vmss" + "-", 18); VirtualMachineScaleSet vmScaleSet = azureResourceManager.virtualMachineScaleSets() .define(vmScaleSetName) .withRegion(region) @@ -108,7 +108,7 @@ public static boolean runSample(AzureResourceManager azureResourceManager) { System.out.println("Creating empty data disk [to attach to a VM]"); - final String diskName = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("dsk" + "-", 18); + final String diskName = Utils.randomResourceName(azureResourceManager, "dsk" + "-", 18); Disk dataDisk = azureResourceManager.disks().define(diskName) .withRegion(region) .withExistingResourceGroup(rgName) @@ -120,8 +120,8 @@ public static boolean runSample(AzureResourceManager azureResourceManager) { System.out.println("Creating VM [with new managed data disks and disk attached]"); - final String linuxVM2Name = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("vm" + "-", 10); - final String linuxVM2Pip = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("pip" + "-", 18); + final String linuxVM2Name = Utils.randomResourceName(azureResourceManager, "vm" + "-", 10); + final String linuxVM2Pip = Utils.randomResourceName(azureResourceManager, "pip" + "-", 18); VirtualMachine linuxVM2 = azureResourceManager.virtualMachines().define(linuxVM2Name) .withRegion(region) .withExistingResourceGroup(rgName) @@ -162,7 +162,7 @@ public static boolean runSample(AzureResourceManager azureResourceManager) { System.out.println("Creating custom image from specialized virtual machine"); - final String customImageName = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("cimg" + "-", 10); + final String customImageName = Utils.randomResourceName(azureResourceManager, "cimg" + "-", 10); VirtualMachineCustomImage virtualMachineCustomImage = azureResourceManager.virtualMachineCustomImages() .define(customImageName) .withRegion(region) @@ -174,7 +174,7 @@ public static boolean runSample(AzureResourceManager azureResourceManager) { System.out.println("Creating VM [from custom image]"); - final String linuxVM3Name = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("vm" + "-", 10); + final String linuxVM3Name = Utils.randomResourceName(azureResourceManager, "vm" + "-", 10); VirtualMachine linuxVM3 = azureResourceManager.virtualMachines().define(linuxVM3Name) .withRegion(region) .withExistingResourceGroup(rgName) @@ -191,7 +191,7 @@ public static boolean runSample(AzureResourceManager azureResourceManager) { // Create a VM from a VHD (Create Virtual Machine Using Specialized VHD) - final String linuxVMName4 = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("vm" + "-", 10); + final String linuxVMName4 = Utils.randomResourceName(azureResourceManager, "vm" + "-", 10); final String specializedVhd = linuxVM.osUnmanagedDiskVhdUri(); azureResourceManager.virtualMachines().deleteById(linuxVM.id()); @@ -231,7 +231,7 @@ public static boolean runSample(AzureResourceManager azureResourceManager) { System.out.println("Creating snapshot [from managed OS disk]"); // Create a managed snapshot for an OS disk - final String managedOSSnapshotName = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("snp" + "-", 10); + final String managedOSSnapshotName = Utils.randomResourceName(azureResourceManager, "snp" + "-", 10); Snapshot osSnapshot = azureResourceManager.snapshots().define(managedOSSnapshotName) .withRegion(region) .withExistingResourceGroup(rgName) @@ -243,7 +243,7 @@ public static boolean runSample(AzureResourceManager azureResourceManager) { System.out.println("Creating managed OS disk [from snapshot]"); // Create a managed disk from the managed snapshot for the OS disk - final String managedNewOSDiskName = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("dsk" + "-", 10); + final String managedNewOSDiskName = Utils.randomResourceName(azureResourceManager, "dsk" + "-", 10); Disk newOSDisk = azureResourceManager.disks().define(managedNewOSDiskName) .withRegion(region) .withExistingResourceGroup(rgName) @@ -256,7 +256,7 @@ public static boolean runSample(AzureResourceManager azureResourceManager) { System.out.println("Creating managed data snapshot [from managed data disk]"); // Create a managed snapshot for a data disk - final String managedDataDiskSnapshotName = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("dsk" + "-", 10); + final String managedDataDiskSnapshotName = Utils.randomResourceName(azureResourceManager, "dsk" + "-", 10); Snapshot dataSnapshot = azureResourceManager.snapshots().define(managedDataDiskSnapshotName) .withRegion(region) .withExistingResourceGroup(rgName) @@ -269,7 +269,7 @@ public static boolean runSample(AzureResourceManager azureResourceManager) { System.out.println("Creating managed data disk [from managed snapshot]"); // Create a managed disk from the managed snapshot for the data disk - final String managedNewDataDiskName = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("dsk" + "-", 10); + final String managedNewDataDiskName = Utils.randomResourceName(azureResourceManager, "dsk" + "-", 10); Disk newDataDisk = azureResourceManager.disks().define(managedNewDataDiskName) .withRegion(region) .withExistingResourceGroup(rgName) @@ -281,7 +281,7 @@ public static boolean runSample(AzureResourceManager azureResourceManager) { System.out.println("Creating VM [with specialized OS managed disk]"); - final String linuxVM6Name = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("vm" + "-", 10); + final String linuxVM6Name = Utils.randomResourceName(azureResourceManager, "vm" + "-", 10); VirtualMachine linuxVM6 = azureResourceManager.virtualMachines().define(linuxVM6Name) .withRegion(region) .withExistingResourceGroup(rgName) @@ -299,8 +299,8 @@ public static boolean runSample(AzureResourceManager azureResourceManager) { System.out.println("Creating VM [with un-managed disk for migration]"); - final String linuxVM7Name = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("vm" + "-", 10); - final String linuxVM7Pip = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("pip" + "-", 18); + final String linuxVM7Name = Utils.randomResourceName(azureResourceManager, "vm" + "-", 10); + final String linuxVM7Pip = Utils.randomResourceName(azureResourceManager, "pip" + "-", 18); VirtualMachine linuxVM7 = azureResourceManager.virtualMachines().define(linuxVM7Name) .withRegion(region) .withNewResourceGroup(rgName) @@ -378,8 +378,8 @@ public static void main(String[] args) { private static VirtualMachine prepareSpecializedUnmanagedVirtualMachine(AzureResourceManager azureResourceManager, Region region, String rgName) { final String userName = "tirekicker"; final String password = Utils.password(); - final String linuxVMName1 = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("vm" + "-", 10); - final String publicIpDnsLabel = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("pip" + "-", 20); + final String linuxVMName1 = Utils.randomResourceName(azureResourceManager, "vm" + "-", 10); + final String publicIpDnsLabel = Utils.randomResourceName(azureResourceManager, "pip" + "-", 20); VirtualMachine linuxVM = azureResourceManager.virtualMachines().define(linuxVMName1) .withRegion(region) @@ -416,8 +416,8 @@ private static VirtualMachine prepareSpecializedUnmanagedVirtualMachine(AzureRes private static VirtualMachine prepareSpecializedManagedVirtualMachine(AzureResourceManager azureResourceManager, Region region, String rgName) { final String userName = "tirekicker"; final String password = Utils.password(); - final String linuxVMName1 = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("vm" + "-", 10); - final String publicIPDnsLabel = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("pip" + "-", 20); + final String linuxVMName1 = Utils.randomResourceName(azureResourceManager, "vm" + "-", 10); + final String publicIPDnsLabel = Utils.randomResourceName(azureResourceManager, "pip" + "-", 20); VirtualMachine linuxVM = azureResourceManager.virtualMachines().define(linuxVMName1) .withRegion(region) @@ -467,7 +467,7 @@ private static void deprovisionAgentInLinuxVM(String host, int port, String user } private static Network prepareNetwork(AzureResourceManager azureResourceManager, Region region, String rgName) { - final String vnetName = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("vnet", 24); + final String vnetName = Utils.randomResourceName(azureResourceManager, "vnet", 24); Network network = azureResourceManager.networks().define(vnetName) .withRegion(region) @@ -481,7 +481,7 @@ private static Network prepareNetwork(AzureResourceManager azureResourceManager, } private static LoadBalancer prepareLoadBalancer(AzureResourceManager azureResourceManager, Region region, String rgName) { - final String loadBalancerName1 = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("intlb" + "-", 18); + final String loadBalancerName1 = Utils.randomResourceName(azureResourceManager, "intlb" + "-", 18); final String frontendName = loadBalancerName1 + "-FE1"; final String backendPoolName1 = loadBalancerName1 + "-BAP1"; final String backendPoolName2 = loadBalancerName1 + "-BAP2"; diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/compute/samples/ManageResourceFromMSIEnabledVirtualMachineBelongsToAADGroup.java b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/compute/samples/ManageResourceFromMSIEnabledVirtualMachineBelongsToAADGroup.java index 9d1683ce238a..4f39ce85fad1 100644 --- a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/compute/samples/ManageResourceFromMSIEnabledVirtualMachineBelongsToAADGroup.java +++ b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/compute/samples/ManageResourceFromMSIEnabledVirtualMachineBelongsToAADGroup.java @@ -44,11 +44,11 @@ public final class ManageResourceFromMSIEnabledVirtualMachineBelongsToAADGroup { * @return true if sample runs successfully */ public static boolean runSample(AzureResourceManager azureResourceManager) { - String groupName = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("group", 15); - final String rgName = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("rgCOMV", 15); - String roleAssignmentName = azureResourceManager.resourceGroups().manager().internalContext().randomUuid(); - final String linuxVMName = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("VM1", 15); - final String pipName = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("pip1", 15); + String groupName = Utils.randomResourceName(azureResourceManager, "group", 15); + final String rgName = Utils.randomResourceName(azureResourceManager, "rgCOMV", 15); + String roleAssignmentName = Utils.randomUuid(azureResourceManager); + final String linuxVMName = Utils.randomResourceName(azureResourceManager, "VM1", 15); + final String pipName = Utils.randomResourceName(azureResourceManager, "pip1", 15); final String userName = "tirekicker"; final String password = Utils.password(); final Region region = Region.US_SOUTH_CENTRAL; @@ -133,7 +133,7 @@ public static boolean runSample(AzureResourceManager azureResourceManager) { // Prepare custom script t install az cli that uses MSI to create a storage account // - final String stgName = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("st44", 15); + final String stgName = Utils.randomResourceName(azureResourceManager, "st44", 15); installCommand = installCommand.replace("{stgName}", stgName) .replace("{rgName}", rgName) .replace("{location}", region.name()); diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/compute/samples/ManageStorageFromMSIEnabledVirtualMachine.java b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/compute/samples/ManageStorageFromMSIEnabledVirtualMachine.java index ec960701cc69..588f3470242c 100644 --- a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/compute/samples/ManageStorageFromMSIEnabledVirtualMachine.java +++ b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/compute/samples/ManageStorageFromMSIEnabledVirtualMachine.java @@ -37,9 +37,9 @@ public final class ManageStorageFromMSIEnabledVirtualMachine { * @return true if sample runs successfully */ public static boolean runSample(AzureResourceManager azureResourceManager) { - final String linuxVMName = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("VM1", 15); - final String rgName = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("rgCOMV", 15); - final String pipName = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("pip1", 15); + final String linuxVMName = Utils.randomResourceName(azureResourceManager, "VM1", 15); + final String rgName = Utils.randomResourceName(azureResourceManager, "rgCOMV", 15); + final String pipName = Utils.randomResourceName(azureResourceManager, "pip1", 15); final String userName = "tirekicker"; final String password = Utils.password(); final Region region = Region.US_WEST_CENTRAL; @@ -76,7 +76,7 @@ public static boolean runSample(AzureResourceManager azureResourceManager) { // Prepare custom script t install az cli that uses MSI to create a storage account // - final String stgName = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("st44", 15); + final String stgName = Utils.randomResourceName(azureResourceManager, "st44", 15); installCommand = installCommand.replace("{stgName}", stgName) .replace("{rgName}", rgName) .replace("{location}", region.name()); diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/compute/samples/ManageUserAssignedMSIEnabledVirtualMachine.java b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/compute/samples/ManageUserAssignedMSIEnabledVirtualMachine.java index 8d6a85cca7ed..018fcc0b22f5 100644 --- a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/compute/samples/ManageUserAssignedMSIEnabledVirtualMachine.java +++ b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/compute/samples/ManageUserAssignedMSIEnabledVirtualMachine.java @@ -41,11 +41,11 @@ public final class ManageUserAssignedMSIEnabledVirtualMachine { * @return true if sample runs successfully */ public static boolean runSample(AzureResourceManager azureResourceManager) { - final String rgName1 = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("uamsi-rg-1", 15); - final String rgName2 = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("uamsi-rg-2", 15); - final String identityName = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("id", 15); - final String linuxVMName = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("VM1", 15); - final String pipName = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("pip1", 15); + final String rgName1 = Utils.randomResourceName(azureResourceManager, "uamsi-rg-1", 15); + final String rgName2 = Utils.randomResourceName(azureResourceManager, "uamsi-rg-2", 15); + final String identityName = Utils.randomResourceName(azureResourceManager, "id", 15); + final String linuxVMName = Utils.randomResourceName(azureResourceManager, "VM1", 15); + final String pipName = Utils.randomResourceName(azureResourceManager, "pip1", 15); final String userName = "tirekicker"; final String password = Utils.password(); final Region region = Region.US_WEST_CENTRAL; diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/compute/samples/ManageVirtualMachine.java b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/compute/samples/ManageVirtualMachine.java index 6252e55f732f..24e2a3ee09e9 100644 --- a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/compute/samples/ManageVirtualMachine.java +++ b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/compute/samples/ManageVirtualMachine.java @@ -43,9 +43,9 @@ public final class ManageVirtualMachine { */ public static boolean runSample(AzureResourceManager azureResourceManager) { final Region region = Region.US_WEST_CENTRAL; - final String windowsVMName = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("wVM", 15); - final String linuxVMName = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("lVM", 15); - final String rgName = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("rgCOMV", 15); + final String windowsVMName = Utils.randomResourceName(azureResourceManager, "wVM", 15); + final String linuxVMName = Utils.randomResourceName(azureResourceManager, "lVM", 15); + final String rgName = Utils.randomResourceName(azureResourceManager, "rgCOMV", 15); final String userName = "tirekicker"; final String password = Utils.password(); @@ -56,7 +56,7 @@ public static boolean runSample(AzureResourceManager azureResourceManager) { // Prepare a creatable data disk for VM // - Creatable dataDiskCreatable = azureResourceManager.disks().define(azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("dsk-", 15)) + Creatable dataDiskCreatable = azureResourceManager.disks().define(Utils.randomResourceName(azureResourceManager, "dsk-", 15)) .withRegion(region) .withExistingResourceGroup(rgName) .withData() @@ -65,7 +65,7 @@ public static boolean runSample(AzureResourceManager azureResourceManager) { // Create a data disk to attach to VM // Disk dataDisk = azureResourceManager.disks() - .define(azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("dsk-", 15)) + .define(Utils.randomResourceName(azureResourceManager, "dsk-", 15)) .withRegion(region) .withNewResourceGroup(rgName) .withData() diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/compute/samples/ManageVirtualMachineAsync.java b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/compute/samples/ManageVirtualMachineAsync.java index 7e5a2759d02d..e3e0d6cb8006 100644 --- a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/compute/samples/ManageVirtualMachineAsync.java +++ b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/compute/samples/ManageVirtualMachineAsync.java @@ -46,9 +46,9 @@ public final class ManageVirtualMachineAsync { */ public static boolean runSample(final AzureResourceManager azureResourceManager) { final Region region = Region.US_WEST_CENTRAL; - final String windowsVMName = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("wVM", 15); - final String linuxVMName = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("lVM", 15); - final String rgName = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("rgCOMV", 15); + final String windowsVMName = Utils.randomResourceName(azureResourceManager, "wVM", 15); + final String linuxVMName = Utils.randomResourceName(azureResourceManager, "lVM", 15); + final String rgName = Utils.randomResourceName(azureResourceManager, "rgCOMV", 15); final String userName = "tirekicker"; final String password = Utils.password(); final String windowsVmKey = "WindowsVM"; @@ -63,7 +63,7 @@ public static boolean runSample(final AzureResourceManager azureResourceManager) // final Date t1 = new Date(); - final Creatable dataDiskCreatable = azureResourceManager.disks().define(azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("dsk-", 15)) + final Creatable dataDiskCreatable = azureResourceManager.disks().define(Utils.randomResourceName(azureResourceManager, "dsk-", 15)) .withRegion(region) .withExistingResourceGroup(rgName) .withData() @@ -71,7 +71,7 @@ public static boolean runSample(final AzureResourceManager azureResourceManager) // Create a data disk to attach to VM // - Mono dataDiskMono = azureResourceManager.disks().define(azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("dsk-", 15)) + Mono dataDiskMono = azureResourceManager.disks().define(Utils.randomResourceName(azureResourceManager, "dsk-", 15)) .withRegion(region) .withNewResourceGroup(rgName) .withData() @@ -80,7 +80,7 @@ public static boolean runSample(final AzureResourceManager azureResourceManager) final Map createdVms = new TreeMap<>(); - Mono nicMono = azureResourceManager.networkInterfaces().define(azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("nic", 20)) + Mono nicMono = azureResourceManager.networkInterfaces().define(Utils.randomResourceName(azureResourceManager, "nic", 20)) .withRegion(region) .withNewResourceGroup(rgName) .withNewPrimaryNetwork("10.0.0.0/28") diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/compute/samples/ManageVirtualMachineExtension.java b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/compute/samples/ManageVirtualMachineExtension.java index 2b374de67a6b..2e4e135df24f 100644 --- a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/compute/samples/ManageVirtualMachineExtension.java +++ b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/compute/samples/ManageVirtualMachineExtension.java @@ -35,11 +35,11 @@ public final class ManageVirtualMachineExtension { */ public static boolean runSample(AzureResourceManager azureResourceManager) { final Region region = Region.US_WEST_CENTRAL; - final String linuxVMName = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("lVM", 10); - final String windowsVMName = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("wVM", 10); - final String rgName = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("rgCOVE", 15); - final String pipDnsLabelLinuxVM = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("rgPip1", 25); - final String pipDnsLabelWindowsVM = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("rgPip2", 25); + final String linuxVMName = Utils.randomResourceName(azureResourceManager, "lVM", 10); + final String windowsVMName = Utils.randomResourceName(azureResourceManager, "wVM", 10); + final String rgName = Utils.randomResourceName(azureResourceManager, "rgCOVE", 15); + final String pipDnsLabelLinuxVM = Utils.randomResourceName(azureResourceManager, "rgPip1", 25); + final String pipDnsLabelWindowsVM = Utils.randomResourceName(azureResourceManager, "rgPip2", 25); // Linux configurations // diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/compute/samples/ManageVirtualMachineScaleSet.java b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/compute/samples/ManageVirtualMachineScaleSet.java index 558f0a331171..953c1b35a044 100644 --- a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/compute/samples/ManageVirtualMachineScaleSet.java +++ b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/compute/samples/ManageVirtualMachineScaleSet.java @@ -51,9 +51,9 @@ public final class ManageVirtualMachineScaleSet { */ public static boolean runSample(AzureResourceManager azureResourceManager) { final Region region = Region.US_EAST2; - final String rgName = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("rgCOVS", 15); - final String vnetName = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("vnet", 24); - final String loadBalancerName1 = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("intlb" + "-", 18); + final String rgName = Utils.randomResourceName(azureResourceManager, "rgCOVS", 15); + final String vnetName = Utils.randomResourceName(azureResourceManager, "vnet", 24); + final String loadBalancerName1 = Utils.randomResourceName(azureResourceManager, "intlb" + "-", 18); final String publicIpName = "pip-" + loadBalancerName1; final String frontendName = loadBalancerName1 + "-FE1"; final String backendPoolName1 = loadBalancerName1 + "-BAP1"; @@ -65,7 +65,7 @@ public static boolean runSample(AzureResourceManager azureResourceManager) { final String httpsLoadBalancingRule = "httpsRule"; final String natPool50XXto22 = "natPool50XXto22"; final String natPool60XXto23 = "natPool60XXto23"; - final String vmssName = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("vmss", 24); + final String vmssName = Utils.randomResourceName(azureResourceManager, "vmss", 24); final String userName = "tirekicker"; final String sshKey = "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCfSPC2K7LZcFKEO+/t3dzmQYtrJFZNxOsbVgOVKietqHyvmYGHEC0J2wPdAqQ/63g/hhAEFRoyehM+rbeDri4txB3YFfnOK58jqdkyXzupWqXzOrlKY4Wz9SKjjN765+dqUITjKRIaAip1Ri137szRg71WnrmdP3SphTRlCx1Bk2nXqWPsclbRDCiZeF8QOTi4JqbmJyK5+0UqhqYRduun8ylAwKKQJ1NJt85sYIHn9f1Rfr6Tq2zS0wZ7DHbZL+zB5rSlAr8QyUdg/GQD+cmSs6LvPJKL78d6hMGk84ARtFo4A79ovwX/Fj01znDQkU6nJildfkaolH2rWFG/qttD azjava@javalib.com"; diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/compute/samples/ManageVirtualMachineScaleSetAsync.java b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/compute/samples/ManageVirtualMachineScaleSetAsync.java index 9172e6297925..543b05527e02 100644 --- a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/compute/samples/ManageVirtualMachineScaleSetAsync.java +++ b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/compute/samples/ManageVirtualMachineScaleSetAsync.java @@ -48,9 +48,9 @@ public final class ManageVirtualMachineScaleSetAsync { */ public static boolean runSample(final AzureResourceManager azureResourceManager) { final Region region = Region.US_WEST_CENTRAL; - final String rgName = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("rgCOVS", 15); - final String vnetName = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("vnet", 24); - final String loadBalancerName1 = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("intlb" + "-", 18); + final String rgName = Utils.randomResourceName(azureResourceManager, "rgCOVS", 15); + final String vnetName = Utils.randomResourceName(azureResourceManager, "vnet", 24); + final String loadBalancerName1 = Utils.randomResourceName(azureResourceManager, "intlb" + "-", 18); final String publicIpName = "pip-" + loadBalancerName1; final String frontendName = loadBalancerName1 + "-FE1"; final String backendPoolName1 = loadBalancerName1 + "-BAP1"; @@ -62,7 +62,7 @@ public static boolean runSample(final AzureResourceManager azureResourceManager) final String httpsLoadBalancingRule = "httpsRule"; final String natPool50XXto22 = "natPool50XXto22"; final String natPool60XXto23 = "natPool60XXto23"; - final String vmssName = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("vmss", 24); + final String vmssName = Utils.randomResourceName(azureResourceManager, "vmss", 24); final String userName = "tirekicker"; final String sshKey = "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCfSPC2K7LZcFKEO+/t3dzmQYtrJFZNxOsbVgOVKietqHyvmYGHEC0J2wPdAqQ/63g/hhAEFRoyehM+rbeDri4txB3YFfnOK58jqdkyXzupWqXzOrlKY4Wz9SKjjN765+dqUITjKRIaAip1Ri137szRg71WnrmdP3SphTRlCx1Bk2nXqWPsclbRDCiZeF8QOTi4JqbmJyK5+0UqhqYRduun8ylAwKKQJ1NJt85sYIHn9f1Rfr6Tq2zS0wZ7DHbZL+zB5rSlAr8QyUdg/GQD+cmSs6LvPJKL78d6hMGk84ARtFo4A79ovwX/Fj01znDQkU6nJildfkaolH2rWFG/qttD azjava@javalib.com"; diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/compute/samples/ManageVirtualMachineScaleSetWithUnmanagedDisks.java b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/compute/samples/ManageVirtualMachineScaleSetWithUnmanagedDisks.java index 395cbbf9169b..da54bc1f520a 100644 --- a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/compute/samples/ManageVirtualMachineScaleSetWithUnmanagedDisks.java +++ b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/compute/samples/ManageVirtualMachineScaleSetWithUnmanagedDisks.java @@ -49,9 +49,9 @@ public final class ManageVirtualMachineScaleSetWithUnmanagedDisks { */ public static boolean runSample(AzureResourceManager azureResourceManager) { final Region region = Region.US_EAST2; - final String rgName = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("rgCOVS", 15); - final String vnetName = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("vnet", 24); - final String loadBalancerName1 = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("intlb" + "-", 18); + final String rgName = Utils.randomResourceName(azureResourceManager, "rgCOVS", 15); + final String vnetName = Utils.randomResourceName(azureResourceManager, "vnet", 24); + final String loadBalancerName1 = Utils.randomResourceName(azureResourceManager, "intlb" + "-", 18); final String publicIpName = "pip-" + loadBalancerName1; final String frontendName = loadBalancerName1 + "-FE1"; final String backendPoolName1 = loadBalancerName1 + "-BAP1"; @@ -64,10 +64,10 @@ public static boolean runSample(AzureResourceManager azureResourceManager) { final String natPool50XXto22 = "natPool50XXto22"; final String natPool60XXto23 = "natPool60XXto23"; - final String vmssName = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("vmss", 24); - final String storageAccountName1 = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("stg1", 24); - final String storageAccountName2 = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("stg2", 24); - final String storageAccountName3 = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("stg3", 24); + final String vmssName = Utils.randomResourceName(azureResourceManager, "vmss", 24); + final String storageAccountName1 = Utils.randomResourceName(azureResourceManager, "stg1", 24); + final String storageAccountName2 = Utils.randomResourceName(azureResourceManager, "stg2", 24); + final String storageAccountName3 = Utils.randomResourceName(azureResourceManager, "stg3", 24); final String userName = "tirekicker"; final String sshKey = "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCfSPC2K7LZcFKEO+/t3dzmQYtrJFZNxOsbVgOVKietqHyvmYGHEC0J2wPdAqQ/63g/hhAEFRoyehM+rbeDri4txB3YFfnOK58jqdkyXzupWqXzOrlKY4Wz9SKjjN765+dqUITjKRIaAip1Ri137szRg71WnrmdP3SphTRlCx1Bk2nXqWPsclbRDCiZeF8QOTi4JqbmJyK5+0UqhqYRduun8ylAwKKQJ1NJt85sYIHn9f1Rfr6Tq2zS0wZ7DHbZL+zB5rSlAr8QyUdg/GQD+cmSs6LvPJKL78d6hMGk84ARtFo4A79ovwX/Fj01znDQkU6nJildfkaolH2rWFG/qttD azjava@javalib.com"; diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/compute/samples/ManageVirtualMachineWithDisk.java b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/compute/samples/ManageVirtualMachineWithDisk.java index 48f006758fa7..dd3943cc4485 100644 --- a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/compute/samples/ManageVirtualMachineWithDisk.java +++ b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/compute/samples/ManageVirtualMachineWithDisk.java @@ -44,9 +44,9 @@ public final class ManageVirtualMachineWithDisk { * @return true if sample runs successfully */ public static boolean runSample(AzureResourceManager azureResourceManager) { - final String linuxVMName1 = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("VM1", 15); - final String rgName = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("rgCOMV", 15); - final String publicIPDnsLabel = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("pip", 15); + final String linuxVMName1 = Utils.randomResourceName(azureResourceManager, "VM1", 15); + final String rgName = Utils.randomResourceName(azureResourceManager, "rgCOMV", 15); + final String publicIPDnsLabel = Utils.randomResourceName(azureResourceManager, "pip", 15); final String userName = "tirekicker"; final String password = Utils.password(); final Region region = Region.US_WEST_CENTRAL; @@ -56,7 +56,7 @@ public static boolean runSample(AzureResourceManager azureResourceManager) { // System.out.println("Creating an empty managed disk"); - Disk dataDisk1 = azureResourceManager.disks().define(azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("dsk-", 15)) + Disk dataDisk1 = azureResourceManager.disks().define(Utils.randomResourceName(azureResourceManager, "dsk-", 15)) .withRegion(region) .withNewResourceGroup(rgName) .withData() @@ -67,7 +67,7 @@ public static boolean runSample(AzureResourceManager azureResourceManager) { // Prepare first creatable data disk // - Creatable dataDiskCreatable1 = azureResourceManager.disks().define(azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("dsk-", 15)) + Creatable dataDiskCreatable1 = azureResourceManager.disks().define(Utils.randomResourceName(azureResourceManager, "dsk-", 15)) .withRegion(region) .withExistingResourceGroup(rgName) .withData() @@ -75,7 +75,7 @@ public static boolean runSample(AzureResourceManager azureResourceManager) { // Prepare second creatable data disk // - Creatable dataDiskCreatable2 = azureResourceManager.disks().define(azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("dsk-", 15)) + Creatable dataDiskCreatable2 = azureResourceManager.disks().define(Utils.randomResourceName(azureResourceManager, "dsk-", 15)) .withRegion(region) .withExistingResourceGroup(rgName) .withData() diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/compute/samples/ManageVirtualMachineWithUnmanagedDisks.java b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/compute/samples/ManageVirtualMachineWithUnmanagedDisks.java index 45eeb1c83507..bd3b2e0f095c 100644 --- a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/compute/samples/ManageVirtualMachineWithUnmanagedDisks.java +++ b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/compute/samples/ManageVirtualMachineWithUnmanagedDisks.java @@ -44,9 +44,9 @@ public final class ManageVirtualMachineWithUnmanagedDisks { */ public static boolean runSample(AzureResourceManager azureResourceManager) { final Region region = Region.US_WEST_CENTRAL; - final String windowsVMName = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("wVM", 15); - final String linuxVMName = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("lVM", 15); - final String rgName = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("rgCOMV", 15); + final String windowsVMName = Utils.randomResourceName(azureResourceManager, "wVM", 15); + final String linuxVMName = Utils.randomResourceName(azureResourceManager, "lVM", 15); + final String rgName = Utils.randomResourceName(azureResourceManager, "rgCOMV", 15); final String userName = "tirekicker"; final String password = Utils.password(); final String dataDiskName = "disk2"; diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/compute/samples/ManageVirtualMachinesInParallel.java b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/compute/samples/ManageVirtualMachinesInParallel.java index b09110925217..859e6d4aab52 100644 --- a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/compute/samples/ManageVirtualMachinesInParallel.java +++ b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/compute/samples/ManageVirtualMachinesInParallel.java @@ -38,9 +38,9 @@ public final class ManageVirtualMachinesInParallel { public static boolean runSample(AzureResourceManager azureResourceManager) { final int vmCount = 10; final Region region = Region.US_SOUTH_CENTRAL; - final String rgName = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("rgCOPP", 24); - final String networkName = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("vnetCOMV", 24); - final String storageAccountName = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("stgCOMV", 20); + final String rgName = Utils.randomResourceName(azureResourceManager, "rgCOPP", 24); + final String networkName = Utils.randomResourceName(azureResourceManager, "vnetCOMV", 24); + final String storageAccountName = Utils.randomResourceName(azureResourceManager, "stgCOMV", 20); final String userName = "tirekicker"; final String password = Utils.password(); try { diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/compute/samples/ManageZonalVirtualMachine.java b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/compute/samples/ManageZonalVirtualMachine.java index 4afd1f43aa8d..c76977fed98a 100644 --- a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/compute/samples/ManageZonalVirtualMachine.java +++ b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/compute/samples/ManageZonalVirtualMachine.java @@ -34,12 +34,12 @@ public final class ManageZonalVirtualMachine { */ public static boolean runSample(AzureResourceManager azureResourceManager) { final Region region = Region.US_EAST2; - final String rgName = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("rgCOMV", 15); - final String vmName1 = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("lVM1", 15); - final String vmName2 = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("lVM2", 15); - final String pipName1 = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("pip1", 15); - final String pipName2 = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("pip2", 15); - final String diskName = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("ds", 15); + final String rgName = Utils.randomResourceName(azureResourceManager, "rgCOMV", 15); + final String vmName1 = Utils.randomResourceName(azureResourceManager, "lVM1", 15); + final String vmName2 = Utils.randomResourceName(azureResourceManager, "lVM2", 15); + final String pipName1 = Utils.randomResourceName(azureResourceManager, "pip1", 15); + final String pipName2 = Utils.randomResourceName(azureResourceManager, "pip2", 15); + final String diskName = Utils.randomResourceName(azureResourceManager, "ds", 15); final String userName = "tirekicker"; final String password = Utils.password(); diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/compute/samples/ManageZonalVirtualMachineScaleSet.java b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/compute/samples/ManageZonalVirtualMachineScaleSet.java index 471f2b0f80b1..85156b3128a4 100644 --- a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/compute/samples/ManageZonalVirtualMachineScaleSet.java +++ b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/compute/samples/ManageZonalVirtualMachineScaleSet.java @@ -42,16 +42,16 @@ public final class ManageZonalVirtualMachineScaleSet { */ public static boolean runSample(AzureResourceManager azureResourceManager) { final Region region = Region.US_EAST2; - final String rgName = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("rgCOMV", 15); - final String loadBalancerName = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("extlb", 15); + final String rgName = Utils.randomResourceName(azureResourceManager, "rgCOMV", 15); + final String loadBalancerName = Utils.randomResourceName(azureResourceManager, "extlb", 15); final String publicIPName = "pip-" + loadBalancerName; final String frontendName = loadBalancerName + "-FE1"; final String backendPoolName1 = loadBalancerName + "-BAP1"; final String backendPoolName2 = loadBalancerName + "-BAP2"; final String natPoolName1 = loadBalancerName + "-INP1"; final String natPoolName2 = loadBalancerName + "-INP2"; - final String vmssName1 = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("vmss1", 15); - final String vmssName2 = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("vmss2", 15); + final String vmssName1 = Utils.randomResourceName(azureResourceManager, "vmss1", 15); + final String vmssName2 = Utils.randomResourceName(azureResourceManager, "vmss2", 15); final String userName = "tirekicker"; final String password = Utils.password(); diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/containerinstance/samples/ManageContainerInstanceWithAzureFileShareMount.java b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/containerinstance/samples/ManageContainerInstanceWithAzureFileShareMount.java index c763d3434c75..579db3534dc7 100644 --- a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/containerinstance/samples/ManageContainerInstanceWithAzureFileShareMount.java +++ b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/containerinstance/samples/ManageContainerInstanceWithAzureFileShareMount.java @@ -34,9 +34,9 @@ public class ManageContainerInstanceWithAzureFileShareMount { * @return true if sample runs successfully */ public static boolean runSample(AzureResourceManager azureResourceManager) { - final String rgName = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("rgACI", 15); - final String aciName = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("acisample", 20); - final String shareName = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("fileshare", 20); + final String rgName = Utils.randomResourceName(azureResourceManager, "rgACI", 15); + final String aciName = Utils.randomResourceName(azureResourceManager, "acisample", 20); + final String shareName = Utils.randomResourceName(azureResourceManager, "fileshare", 20); final String containerImageName = "seanmckenna/aci-hellofiles"; final String volumeMountName = "aci-helloshare"; diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/containerinstance/samples/ManageContainerInstanceWithManualAzureFileShareMountCreation.java b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/containerinstance/samples/ManageContainerInstanceWithManualAzureFileShareMountCreation.java index 763331a55eed..5ee66d3c79b4 100644 --- a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/containerinstance/samples/ManageContainerInstanceWithManualAzureFileShareMountCreation.java +++ b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/containerinstance/samples/ManageContainerInstanceWithManualAzureFileShareMountCreation.java @@ -36,10 +36,10 @@ public class ManageContainerInstanceWithManualAzureFileShareMountCreation { * @return true if sample runs successfully */ public static boolean runSample(AzureResourceManager azureResourceManager) { - final String rgName = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("rgACI", 15); - final String aciName = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("acisample", 20); - final String saName = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("sa", 20); - final String shareName = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("fileshare", 20); + final String rgName = Utils.randomResourceName(azureResourceManager, "rgACI", 15); + final String aciName = Utils.randomResourceName(azureResourceManager, "acisample", 20); + final String saName = Utils.randomResourceName(azureResourceManager, "sa", 20); + final String shareName = Utils.randomResourceName(azureResourceManager, "fileshare", 20); final String containerImageName = "seanmckenna/aci-hellofiles"; final String volumeMountName = "aci-helloshare"; diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/containerinstance/samples/ManageContainerInstanceWithMultipleContainerImages.java b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/containerinstance/samples/ManageContainerInstanceWithMultipleContainerImages.java index af1a0066cb0b..04bdd63327c7 100644 --- a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/containerinstance/samples/ManageContainerInstanceWithMultipleContainerImages.java +++ b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/containerinstance/samples/ManageContainerInstanceWithMultipleContainerImages.java @@ -33,8 +33,8 @@ public class ManageContainerInstanceWithMultipleContainerImages { * @return true if sample runs successfully */ public static boolean runSample(AzureResourceManager azureResourceManager) { - final String rgName = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("rgACI", 15); - final String aciName = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("acisample", 20); + final String rgName = Utils.randomResourceName(azureResourceManager, "rgACI", 15); + final String aciName = Utils.randomResourceName(azureResourceManager, "acisample", 20); final String containerImageName1 = "microsoft/aci-helloworld"; final String containerImageName2 = "microsoft/aci-tutorial-sidecar"; diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/containerinstance/samples/ManageContainerInstanceZeroToOneAndOneToManyUsingContainerServiceOrchestrator.java b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/containerinstance/samples/ManageContainerInstanceZeroToOneAndOneToManyUsingContainerServiceOrchestrator.java index 1b0727a190fe..5952df7254ca 100644 --- a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/containerinstance/samples/ManageContainerInstanceZeroToOneAndOneToManyUsingContainerServiceOrchestrator.java +++ b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/containerinstance/samples/ManageContainerInstanceZeroToOneAndOneToManyUsingContainerServiceOrchestrator.java @@ -89,17 +89,17 @@ public class ManageContainerInstanceZeroToOneAndOneToManyUsingContainerServiceOr * @return true if sample runs successfully */ public static boolean runSample(AzureResourceManager azureResourceManager, String clientId, String secret) throws IOException, InterruptedException, JSchException { - final String rgName = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("rgaci", 15); + final String rgName = Utils.randomResourceName(azureResourceManager, "rgaci", 15); final Region region = Region.US_EAST2; - final String acrName = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("acr", 20); + final String acrName = Utils.randomResourceName(azureResourceManager, "acr", 20); - final String aciName = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("acisample", 20); + final String aciName = Utils.randomResourceName(azureResourceManager, "acisample", 20); final String containerImageName = "microsoft/aci-helloworld"; final String containerImageTag = "latest"; final String dockerContainerName = "sample-hello"; - final String acsName = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("acssample", 30); + final String acsName = Utils.randomResourceName(azureResourceManager, "acssample", 30); String servicePrincipalClientId = clientId; // replace with a real service principal client id String servicePrincipalSecret = secret; // and corresponding secret final String rootUserName = "acsuser"; diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/containerregistry/samples/ManageContainerRegistry.java b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/containerregistry/samples/ManageContainerRegistry.java index b81d441b1c8d..6c9c8799c653 100644 --- a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/containerregistry/samples/ManageContainerRegistry.java +++ b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/containerregistry/samples/ManageContainerRegistry.java @@ -47,8 +47,8 @@ public class ManageContainerRegistry { * @return true if sample runs successfully */ public static boolean runSample(AzureResourceManager azureResourceManager) throws IOException { - final String rgName = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("rgACR", 15); - final String acrName = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("acrsample", 20); + final String rgName = Utils.randomResourceName(azureResourceManager, "rgACR", 15); + final String acrName = Utils.randomResourceName(azureResourceManager, "acrsample", 20); final Region region = Region.US_EAST; final String dockerImageName = "hello-world"; final String dockerImageTag = "latest"; diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/containerregistry/samples/ManageContainerRegistryWithWebhooks.java b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/containerregistry/samples/ManageContainerRegistryWithWebhooks.java index bf2028649050..daae7e6e3827 100644 --- a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/containerregistry/samples/ManageContainerRegistryWithWebhooks.java +++ b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/containerregistry/samples/ManageContainerRegistryWithWebhooks.java @@ -50,8 +50,8 @@ public class ManageContainerRegistryWithWebhooks { * @return true if sample runs successfully */ public static boolean runSample(AzureResourceManager azureResourceManager) throws IOException, InterruptedException { - final String rgName = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("rgACR", 15); - final String acrName = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("acrsample", 20); + final String rgName = Utils.randomResourceName(azureResourceManager, "rgACR", 15); + final String acrName = Utils.randomResourceName(azureResourceManager, "acrsample", 20); final Region region = Region.US_WEST_CENTRAL; final String dockerImageName = "hello-world"; final String dockerImageTag = "latest"; diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/cosmos/samples/CreateCosmosDBTableWithVirtualNetworkRule.java b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/cosmos/samples/CreateCosmosDBTableWithVirtualNetworkRule.java index 5f807ee25618..af137011c3ee 100644 --- a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/cosmos/samples/CreateCosmosDBTableWithVirtualNetworkRule.java +++ b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/cosmos/samples/CreateCosmosDBTableWithVirtualNetworkRule.java @@ -36,9 +36,9 @@ public class CreateCosmosDBTableWithVirtualNetworkRule { * @return true if sample runs successfully */ public static boolean runSample(AzureResourceManager azureResourceManager) { - final String docDBName = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("cosmosdb", 15); - final String rgName = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("rgcosmosdb", 24); - final String vnetName = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("vnetcosmosdb", 20); + final String docDBName = Utils.randomResourceName(azureResourceManager, "cosmosdb", 15); + final String rgName = Utils.randomResourceName(azureResourceManager, "rgcosmosdb", 24); + final String vnetName = Utils.randomResourceName(azureResourceManager, "vnetcosmosdb", 20); try { // ============================================================ diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/cosmos/samples/CreateCosmosDBWithEventualConsistency.java b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/cosmos/samples/CreateCosmosDBWithEventualConsistency.java index 73529df94aeb..e78045d4bc95 100644 --- a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/cosmos/samples/CreateCosmosDBWithEventualConsistency.java +++ b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/cosmos/samples/CreateCosmosDBWithEventualConsistency.java @@ -40,8 +40,8 @@ public final class CreateCosmosDBWithEventualConsistency { * @return true if sample runs successfully */ public static boolean runSample(AzureResourceManager azureResourceManager) { - final String docDBName = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("docDb", 10); - final String rgName = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("rgNEMV", 24); + final String docDBName = Utils.randomResourceName(azureResourceManager, "docDb", 10); + final String rgName = Utils.randomResourceName(azureResourceManager, "rgNEMV", 24); try { //============================================================ diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/cosmos/samples/CreateCosmosDBWithIPRange.java b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/cosmos/samples/CreateCosmosDBWithIPRange.java index bf1851907108..929787fe65bc 100644 --- a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/cosmos/samples/CreateCosmosDBWithIPRange.java +++ b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/cosmos/samples/CreateCosmosDBWithIPRange.java @@ -27,8 +27,8 @@ public final class CreateCosmosDBWithIPRange { * @return true if sample runs successfully */ public static boolean runSample(AzureResourceManager azureResourceManager) { - final String docDBName = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("docDb", 10); - final String rgName = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("rgNEMV", 24); + final String docDBName = Utils.randomResourceName(azureResourceManager, "docDb", 10); + final String rgName = Utils.randomResourceName(azureResourceManager, "rgNEMV", 24); try { //============================================================ diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/cosmos/samples/CreateCosmosDBWithKindMongoDB.java b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/cosmos/samples/CreateCosmosDBWithKindMongoDB.java index 8860b563e165..b1d7a74739ed 100644 --- a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/cosmos/samples/CreateCosmosDBWithKindMongoDB.java +++ b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/cosmos/samples/CreateCosmosDBWithKindMongoDB.java @@ -33,8 +33,8 @@ public final class CreateCosmosDBWithKindMongoDB { * @return true if sample runs successfully */ public static boolean runSample(AzureResourceManager azureResourceManager) { - final String docDBName = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("docDb", 10); - final String rgName = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("rgNEMV", 24); + final String docDBName = Utils.randomResourceName(azureResourceManager, "docDb", 10); + final String rgName = Utils.randomResourceName(azureResourceManager, "rgNEMV", 24); try { //============================================================ diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/cosmos/samples/ManageHACosmosDB.java b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/cosmos/samples/ManageHACosmosDB.java index ead63459368e..ffbc3cc58530 100644 --- a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/cosmos/samples/ManageHACosmosDB.java +++ b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/cosmos/samples/ManageHACosmosDB.java @@ -41,8 +41,8 @@ public final class ManageHACosmosDB { * @return true if sample runs successfully */ public static boolean runSample(AzureResourceManager azureResourceManager) { - final String docDBName = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("docDb", 10); - final String rgName = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("rgNEMV", 24); + final String docDBName = Utils.randomResourceName(azureResourceManager, "docDb", 10); + final String rgName = Utils.randomResourceName(azureResourceManager, "rgNEMV", 24); try { //============================================================ diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/dns/samples/ManageDns.java b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/dns/samples/ManageDns.java index f683c8e872bf..c9ec14af5e4b 100644 --- a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/dns/samples/ManageDns.java +++ b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/dns/samples/ManageDns.java @@ -51,8 +51,8 @@ public class ManageDns { */ public static boolean runSample(AzureResourceManager azureResourceManager) throws IOException { final String customDomainName = "THE CUSTOM DOMAIN THAT YOU OWN (e.g. contoso.com)"; - final String rgName = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("rgNEMV_", 24); - final String webAppName = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("webapp1-", 20); + final String rgName = Utils.randomResourceName(azureResourceManager, "rgNEMV_", 24); + final String webAppName = Utils.randomResourceName(azureResourceManager, "webapp1-", 20); try { ResourceGroup resourceGroup = azureResourceManager.resourceGroups().define(rgName) @@ -134,12 +134,12 @@ public static boolean runSample(AzureResourceManager azureResourceManager) throw System.out.println("Creating a virtual machine with public IP..."); VirtualMachine virtualMachine1 = azureResourceManager.virtualMachines() - .define(azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("employeesvm-", 20)) + .define(Utils.randomResourceName(azureResourceManager, "employeesvm-", 20)) .withRegion(Region.US_EAST) .withExistingResourceGroup(resourceGroup) .withNewPrimaryNetwork("10.0.0.0/28") .withPrimaryPrivateIPAddressDynamic() - .withNewPrimaryPublicIPAddress(azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("empip-", 20)) + .withNewPrimaryPublicIPAddress(Utils.randomResourceName(azureResourceManager, "empip-", 20)) .withPopularWindowsImage(KnownWindowsVirtualMachineImage.WINDOWS_SERVER_2012_R2_DATACENTER) .withAdminUsername("testuser") .withAdminPassword("12NewPA$$w0rd!") @@ -216,12 +216,12 @@ public static boolean runSample(AzureResourceManager azureResourceManager) throw System.out.println("Creating a virtual machine with public IP..."); VirtualMachine virtualMachine2 = azureResourceManager.virtualMachines() - .define(azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("partnersvm-", 20)) + .define(Utils.randomResourceName(azureResourceManager, "partnersvm-", 20)) .withRegion(Region.US_EAST) .withExistingResourceGroup(resourceGroup) .withNewPrimaryNetwork("10.0.0.0/28") .withPrimaryPrivateIPAddressDynamic() - .withNewPrimaryPublicIPAddress(azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("ptnerpip-", 20)) + .withNewPrimaryPublicIPAddress(Utils.randomResourceName(azureResourceManager, "ptnerpip-", 20)) .withPopularWindowsImage(KnownWindowsVirtualMachineImage.WINDOWS_SERVER_2012_R2_DATACENTER) .withAdminUsername("testuser") .withAdminPassword("12NewPA$$w0rd!") diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/eventhubs/samples/ManageEventHub.java b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/eventhubs/samples/ManageEventHub.java index 3514fea75fb2..4b864b7a212e 100644 --- a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/eventhubs/samples/ManageEventHub.java +++ b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/eventhubs/samples/ManageEventHub.java @@ -35,12 +35,12 @@ public class ManageEventHub { * @return true if sample runs successfully */ public static boolean runSample(AzureResourceManager azureResourceManager) { - final String rgName = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("rgNEMV_", 24); - final String namespaceName1 = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("ns", 14); - final String namespaceName2 = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("ns", 14); - final String storageAccountName = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("stg", 14); - final String eventHubName1 = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("eh", 14); - final String eventHubName2 = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("eh", 14); + final String rgName = Utils.randomResourceName(azureResourceManager, "rgNEMV_", 24); + final String namespaceName1 = Utils.randomResourceName(azureResourceManager, "ns", 14); + final String namespaceName2 = Utils.randomResourceName(azureResourceManager, "ns", 14); + final String storageAccountName = Utils.randomResourceName(azureResourceManager, "stg", 14); + final String eventHubName1 = Utils.randomResourceName(azureResourceManager, "eh", 14); + final String eventHubName2 = Utils.randomResourceName(azureResourceManager, "eh", 14); try { //============================================================ diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/eventhubs/samples/ManageEventHubEvents.java b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/eventhubs/samples/ManageEventHubEvents.java index 632fce9a0c00..3c9f79dff554 100644 --- a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/eventhubs/samples/ManageEventHubEvents.java +++ b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/eventhubs/samples/ManageEventHubEvents.java @@ -34,8 +34,8 @@ public class ManageEventHubEvents { */ public static boolean runSample(AzureResourceManager azureResourceManager) { final Region region = Region.US_EAST; - final String rgName = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("rgEvHb", 24); - final String namespaceName = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("ns", 24); + final String rgName = Utils.randomResourceName(azureResourceManager, "rgEvHb", 24); + final String namespaceName = Utils.randomResourceName(azureResourceManager, "ns", 24); final String eventHubName = "FirstEventHub"; String diagnosticSettingId = null; diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/eventhubs/samples/ManageEventHubGeoDisasterRecovery.java b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/eventhubs/samples/ManageEventHubGeoDisasterRecovery.java index 4139bf62719b..37a7697d4bc8 100644 --- a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/eventhubs/samples/ManageEventHubGeoDisasterRecovery.java +++ b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/eventhubs/samples/ManageEventHubGeoDisasterRecovery.java @@ -37,11 +37,11 @@ public class ManageEventHubGeoDisasterRecovery { * @return true if sample runs successfully */ public static boolean runSample(AzureResourceManager azureResourceManager) { - final String rgName = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("rgNEMV_", 24); - final String primaryNamespaceName = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("ns", 14); - final String secondaryNamespaceName = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("ns", 14); - final String geoDRName = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("geodr", 14); - final String eventHubName = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("eh", 14); + final String rgName = Utils.randomResourceName(azureResourceManager, "rgNEMV_", 24); + final String primaryNamespaceName = Utils.randomResourceName(azureResourceManager, "ns", 14); + final String secondaryNamespaceName = Utils.randomResourceName(azureResourceManager, "ns", 14); + final String geoDRName = Utils.randomResourceName(azureResourceManager, "geodr", 14); + final String eventHubName = Utils.randomResourceName(azureResourceManager, "eh", 14); boolean isFailOverSucceeded = false; EventHubDisasterRecoveryPairing pairing = null; diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/keyvault/samples/ManageKeyVault.java b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/keyvault/samples/ManageKeyVault.java index d01c9c72dd16..3a4991277e22 100644 --- a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/keyvault/samples/ManageKeyVault.java +++ b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/keyvault/samples/ManageKeyVault.java @@ -36,9 +36,9 @@ public final class ManageKeyVault { * @return true if sample runs successfully */ public static boolean runSample(AzureResourceManager azureResourceManager, String clientId) { - final String vaultName1 = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("vault1", 20); - final String vaultName2 = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("vault2", 20); - final String rgName = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("rgNEMV", 24); + final String vaultName1 = Utils.randomResourceName(azureResourceManager, "vault1", 20); + final String vaultName2 = Utils.randomResourceName(azureResourceManager, "vault2", 20); + final String rgName = Utils.randomResourceName(azureResourceManager, "rgNEMV", 24); try { //============================================================ diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/kubernetescluster/samples/DeployImageFromContainerRegistryToKubernetes.java b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/kubernetescluster/samples/DeployImageFromContainerRegistryToKubernetes.java index c8109ee2a526..efdcabb22b90 100644 --- a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/kubernetescluster/samples/DeployImageFromContainerRegistryToKubernetes.java +++ b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/kubernetescluster/samples/DeployImageFromContainerRegistryToKubernetes.java @@ -80,9 +80,9 @@ public class DeployImageFromContainerRegistryToKubernetes { * @return true if sample runs successfully */ public static boolean runSample(AzureResourceManager azureResourceManager, String clientId, String secret) throws IOException, JSchException, InterruptedException { - final String rgName = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("rgaks", 15); - final String acrName = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("acrsample", 20); - final String aksName = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("akssample", 30); + final String rgName = Utils.randomResourceName(azureResourceManager, "rgaks", 15); + final String acrName = Utils.randomResourceName(azureResourceManager, "acrsample", 20); + final String aksName = Utils.randomResourceName(azureResourceManager, "akssample", 30); final String rootUserName = "aksuser"; final Region region = Region.US_EAST; final String dockerImageName = "nginx"; diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/kubernetescluster/samples/ManageKubernetesCluster.java b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/kubernetescluster/samples/ManageKubernetesCluster.java index 94cc90f739a6..63845373c962 100644 --- a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/kubernetescluster/samples/ManageKubernetesCluster.java +++ b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/kubernetescluster/samples/ManageKubernetesCluster.java @@ -37,8 +37,8 @@ public class ManageKubernetesCluster { * @return true if sample runs successfully */ public static boolean runSample(AzureResourceManager azureResourceManager, String clientId, String secret) throws IOException, JSchException { - final String rgName = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("rgaks", 15); - final String aksName = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("akssample", 30); + final String rgName = Utils.randomResourceName(azureResourceManager, "rgaks", 15); + final String aksName = Utils.randomResourceName(azureResourceManager, "akssample", 30); final Region region = Region.US_EAST; String servicePrincipalClientId = clientId; // replace with a real service principal client id String servicePrincipalSecret = secret; // and corresponding secret diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/kubernetescluster/samples/ManagedKubernetesClusterWithAdvancedNetworking.java b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/kubernetescluster/samples/ManagedKubernetesClusterWithAdvancedNetworking.java index a2dd74f8381c..a8625f045b44 100644 --- a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/kubernetescluster/samples/ManagedKubernetesClusterWithAdvancedNetworking.java +++ b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/kubernetescluster/samples/ManagedKubernetesClusterWithAdvancedNetworking.java @@ -41,9 +41,9 @@ public class ManagedKubernetesClusterWithAdvancedNetworking { * @return true if sample runs successfully */ public static boolean runSample(AzureResourceManager azureResourceManager, String clientId, String secret) throws IOException, JSchException { - final String rgName = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("rgaks", 15); - final String vnetName = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("vnetaks", 20); - final String aksName = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("akssample", 30); + final String rgName = Utils.randomResourceName(azureResourceManager, "rgaks", 15); + final String vnetName = Utils.randomResourceName(azureResourceManager, "vnetaks", 20); + final String aksName = Utils.randomResourceName(azureResourceManager, "akssample", 30); final Region region = Region.US_CENTRAL; String servicePrincipalClientId = clientId; // replace it with a real service principal client id String servicePrincipalSecret = secret; // and the corresponding secret diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/monitor/samples/AutoscaleSettingsBasedOnPerformanceOrSchedule.java b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/monitor/samples/AutoscaleSettingsBasedOnPerformanceOrSchedule.java index cdb79ea097d2..18f7fa719c66 100644 --- a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/monitor/samples/AutoscaleSettingsBasedOnPerformanceOrSchedule.java +++ b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/monitor/samples/AutoscaleSettingsBasedOnPerformanceOrSchedule.java @@ -40,9 +40,9 @@ public final class AutoscaleSettingsBasedOnPerformanceOrSchedule { * @return true if sample runs successfully */ public static boolean runSample(AzureResourceManager azureResourceManager) { - final String webappName = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("MyTestScaleWebApp", 20); - final String autoscaleSettingsName = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("autoscalename1", 20); - final String rgName = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("myResourceGroup", 20); + final String webappName = Utils.randomResourceName(azureResourceManager, "MyTestScaleWebApp", 20); + final String autoscaleSettingsName = Utils.randomResourceName(azureResourceManager, "autoscalename1", 20); + final String rgName = Utils.randomResourceName(azureResourceManager, "myResourceGroup", 20); try { // ============================================================ diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/monitor/samples/QueryMetricsAndActivityLogs.java b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/monitor/samples/QueryMetricsAndActivityLogs.java index 1af7783b85da..26d91cb106a4 100644 --- a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/monitor/samples/QueryMetricsAndActivityLogs.java +++ b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/monitor/samples/QueryMetricsAndActivityLogs.java @@ -60,8 +60,8 @@ public final class QueryMetricsAndActivityLogs { * @return true if sample runs successfully */ public static boolean runSample(AzureResourceManager azureResourceManager) throws IOException { - final String storageAccountName = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("saMonitor", 20); - final String rgName = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("rgMonitor", 20); + final String storageAccountName = Utils.randomResourceName(azureResourceManager, "saMonitor", 20); + final String rgName = Utils.randomResourceName(azureResourceManager, "rgMonitor", 20); try { // ============================================================ diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/monitor/samples/SecurityBreachOrRiskActivityLogAlerts.java b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/monitor/samples/SecurityBreachOrRiskActivityLogAlerts.java index 9ee9731ada32..67eb15ab2163 100644 --- a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/monitor/samples/SecurityBreachOrRiskActivityLogAlerts.java +++ b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/monitor/samples/SecurityBreachOrRiskActivityLogAlerts.java @@ -38,8 +38,8 @@ public final class SecurityBreachOrRiskActivityLogAlerts { * @return true if sample runs successfully */ public static boolean runSample(AzureResourceManager azureResourceManager) { - final String storageAccountName = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("saMonitor", 20); - final String rgName = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("rgMonitor", 20); + final String storageAccountName = Utils.randomResourceName(azureResourceManager, "saMonitor", 20); + final String rgName = Utils.randomResourceName(azureResourceManager, "rgMonitor", 20); try { // ============================================================ diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/monitor/samples/WebAppPerformanceMonitoringAlerts.java b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/monitor/samples/WebAppPerformanceMonitoringAlerts.java index 8f2757f71eaf..43afbb7e3134 100644 --- a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/monitor/samples/WebAppPerformanceMonitoringAlerts.java +++ b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/monitor/samples/WebAppPerformanceMonitoringAlerts.java @@ -36,7 +36,7 @@ public final class WebAppPerformanceMonitoringAlerts { * @return true if sample runs successfully */ public static boolean runSample(AzureResourceManager azureResourceManager) { - final String rgName = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("rgMonitor", 20); + final String rgName = Utils.randomResourceName(azureResourceManager, "rgMonitor", 20); try { // ============================================================ diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/network/samples/CreateSimpleInternetFacingLoadBalancer.java b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/network/samples/CreateSimpleInternetFacingLoadBalancer.java index 561fd545bf90..923bfe8a3ef6 100644 --- a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/network/samples/CreateSimpleInternetFacingLoadBalancer.java +++ b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/network/samples/CreateSimpleInternetFacingLoadBalancer.java @@ -61,13 +61,13 @@ public final class CreateSimpleInternetFacingLoadBalancer { */ public static boolean runSample(AzureResourceManager azureResourceManager) { final Region region = Region.US_EAST; - final String resourceGroupName = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("rg", 15); - final String vnetName = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("vnet", 24); - final String loadBalancerName = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("lb" + "-", 18); - final String publicIpName = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("pip", 18); + final String resourceGroupName = Utils.randomResourceName(azureResourceManager, "rg", 15); + final String vnetName = Utils.randomResourceName(azureResourceManager, "vnet", 24); + final String loadBalancerName = Utils.randomResourceName(azureResourceManager, "lb" + "-", 18); + final String publicIpName = Utils.randomResourceName(azureResourceManager, "pip", 18); final String httpLoadBalancingRule = "httpRule"; - final String availabilitySetName = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("av", 24); + final String availabilitySetName = Utils.randomResourceName(azureResourceManager, "av", 24); final String userName = "tirekicker"; final String sshKey = "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCfSPC2K7LZcFKEO+/t3dzmQYtrJFZNxOsbVgOVKietqHyvmYGHEC0J2wPdAqQ/63g/hhAEFRoyehM+rbeDri4txB3YFfnOK58jqdkyXzupWqXzOrlKY4Wz9SKjjN765+dqUITjKRIaAip1Ri137szRg71WnrmdP3SphTRlCx1Bk2nXqWPsclbRDCiZeF8QOTi4JqbmJyK5+0UqhqYRduun8ylAwKKQJ1NJt85sYIHn9f1Rfr6Tq2zS0wZ7DHbZL+zB5rSlAr8QyUdg/GQD+cmSs6LvPJKL78d6hMGk84ARtFo4A79ovwX/Fj01znDQkU6nJildfkaolH2rWFG/qttD azjava@javalib.com"; try { @@ -98,7 +98,7 @@ public static boolean runSample(AzureResourceManager azureResourceManager) { for (int i = 0; i < 2; i++) { virtualMachineDefinitions.add( - azureResourceManager.virtualMachines().define(azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("vm", 24)) + azureResourceManager.virtualMachines().define(Utils.randomResourceName(azureResourceManager, "vm", 24)) .withRegion(region) .withExistingResourceGroup(resourceGroupName) .withNewPrimaryNetwork(networkDefinition) diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/network/samples/ManageApplicationGateway.java b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/network/samples/ManageApplicationGateway.java index f282551c72e7..c009cbbdf941 100644 --- a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/network/samples/ManageApplicationGateway.java +++ b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/network/samples/ManageApplicationGateway.java @@ -83,8 +83,8 @@ public final class ManageApplicationGateway { * @return true if sample runs successfully */ public static boolean runSample(AzureResourceManager azureResourceManager) throws IOException { - final String rgName = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("rgNEAG", 15); - final String pipName = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("pip" + "-", 18); + final String rgName = Utils.randomResourceName(azureResourceManager, "rgNEAG", 15); + final String pipName = Utils.randomResourceName(azureResourceManager, "pip" + "-", 18); final String userName = "tirekicker"; final String sshKey = "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCfSPC2K7LZcFKEO+/t3dzmQYtrJFZNxOsbVgOVKietqHyvmYGHEC0J2wPdAqQ/63g/hhAEFRoyehM+rbeDri4txB3YFfnOK58jqdkyXzupWqXzOrlKY4Wz9SKjjN765+dqUITjKRIaAip1Ri137szRg71WnrmdP3SphTRlCx1Bk2nXqWPsclbRDCiZeF8QOTi4JqbmJyK5+0UqhqYRduun8ylAwKKQJ1NJt85sYIHn9f1Rfr6Tq2zS0wZ7DHbZL+zB5rSlAr8QyUdg/GQD+cmSs6LvPJKL78d6hMGk84ARtFo4A79ovwX/Fj01znDQkU6nJildfkaolH2rWFG/qttD azjava@javalib.com"; @@ -134,7 +134,7 @@ public static boolean runSample(AzureResourceManager azureResourceManager) throw //============================================================= // Create 1 network creatable per region // Prepare Creatable Network definition (Where all the virtual machines get added to) - String networkName = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("vnetNEAG-", 20); + String networkName = Utils.randomResourceName(azureResourceManager, "vnetNEAG-", 20); Creatable networkCreatable = azureResourceManager.networks().define(networkName) .withRegion(regions[i]) @@ -144,12 +144,12 @@ public static boolean runSample(AzureResourceManager azureResourceManager) throw //============================================================= // Create 1 storage creatable per region (For storing VMs disk) - String storageAccountName = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("stgneag", 20); + String storageAccountName = Utils.randomResourceName(azureResourceManager, "stgneag", 20); Creatable storageAccountCreatable = azureResourceManager.storageAccounts().define(storageAccountName) .withRegion(regions[i]) .withExistingResourceGroup(resourceGroup); - String linuxVMNamePrefix = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("vm-", 15); + String linuxVMNamePrefix = Utils.randomResourceName(azureResourceManager, "vm-", 15); for (int j = 0; j < vmCountInAPool; j++) { diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/network/samples/ManageExpressRoute.java b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/network/samples/ManageExpressRoute.java index a960eddddcd0..fee812e6df36 100644 --- a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/network/samples/ManageExpressRoute.java +++ b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/network/samples/ManageExpressRoute.java @@ -15,6 +15,7 @@ import com.azure.resourcemanager.network.models.VirtualNetworkGatewaySkuName; import com.azure.core.management.Region; import com.azure.core.management.profile.AzureProfile; +import com.azure.resourcemanager.samples.Utils; /** * Azure Network sample for managing express route circuits. @@ -35,11 +36,11 @@ public final class ManageExpressRoute { */ public static boolean runSample(AzureResourceManager azureResourceManager) { final Region region = Region.US_NORTH_CENTRAL; - final String rgName = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("rg", 20); - final String ercName = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("erc", 20); - final String gatewayName = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("gtw", 20); - final String connectionName = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("con", 20); - final String vnetName = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("vnet", 20); + final String rgName = Utils.randomResourceName(azureResourceManager, "rg", 20); + final String ercName = Utils.randomResourceName(azureResourceManager, "erc", 20); + final String gatewayName = Utils.randomResourceName(azureResourceManager, "gtw", 20); + final String connectionName = Utils.randomResourceName(azureResourceManager, "con", 20); + final String vnetName = Utils.randomResourceName(azureResourceManager, "vnet", 20); try { //============================================================ diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/network/samples/ManageIPAddress.java b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/network/samples/ManageIPAddress.java index 2700b3da3738..53c3adee2e0e 100644 --- a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/network/samples/ManageIPAddress.java +++ b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/network/samples/ManageIPAddress.java @@ -36,12 +36,12 @@ public final class ManageIPAddress { * @return true if sample runs successfully */ public static boolean runSample(AzureResourceManager azureResourceManager) { - final String publicIPAddressName1 = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("pip1", 20); - final String publicIPAddressName2 = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("pip2", 20); - final String publicIPAddressLeafDNS1 = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("pip1", 20); - final String publicIPAddressLeafDNS2 = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("pip2", 20); - final String vmName = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("vm", 8); - final String rgName = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("rgNEMP", 24); + final String publicIPAddressName1 = Utils.randomResourceName(azureResourceManager, "pip1", 20); + final String publicIPAddressName2 = Utils.randomResourceName(azureResourceManager, "pip2", 20); + final String publicIPAddressLeafDNS1 = Utils.randomResourceName(azureResourceManager, "pip1", 20); + final String publicIPAddressLeafDNS2 = Utils.randomResourceName(azureResourceManager, "pip2", 20); + final String vmName = Utils.randomResourceName(azureResourceManager, "vm", 8); + final String rgName = Utils.randomResourceName(azureResourceManager, "rgNEMP", 24); final String userName = "tirekicker"; final String password = Utils.password(); diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/network/samples/ManageInternalLoadBalancer.java b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/network/samples/ManageInternalLoadBalancer.java index 71e209e0ad02..3d31687ce26f 100644 --- a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/network/samples/ManageInternalLoadBalancer.java +++ b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/network/samples/ManageInternalLoadBalancer.java @@ -75,12 +75,12 @@ public final class ManageInternalLoadBalancer { * @return true if sample runs successfully */ public static boolean runSample(AzureResourceManager azureResourceManager) { - final String rgName = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("rgNEML", 15); + final String rgName = Utils.randomResourceName(azureResourceManager, "rgNEML", 15); - final String vnetName = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("vnet", 24); + final String vnetName = Utils.randomResourceName(azureResourceManager, "vnet", 24); - final String loadBalancerName3 = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("intlb3" + "-", 18); - final String loadBalancerName4 = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("intlb4" + "-", 18); + final String loadBalancerName3 = Utils.randomResourceName(azureResourceManager, "intlb3" + "-", 18); + final String loadBalancerName4 = Utils.randomResourceName(azureResourceManager, "intlb4" + "-", 18); final String privateFrontEndName = loadBalancerName3 + "-BE"; final String backendPoolName3 = loadBalancerName3 + "-BAP3"; @@ -93,12 +93,12 @@ public static boolean runSample(AzureResourceManager azureResourceManager) { final String natRule6002to22forVM4 = "nat6002to22forVM4"; final String natRule6003to23forVM4 = "nat6003to23forVM4"; - final String networkInterfaceName3 = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("nic3", 24); - final String networkInterfaceName4 = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("nic4", 24); + final String networkInterfaceName3 = Utils.randomResourceName(azureResourceManager, "nic3", 24); + final String networkInterfaceName4 = Utils.randomResourceName(azureResourceManager, "nic4", 24); - final String availSetName = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("av2", 24); - final String vmName3 = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("lVM3", 24); - final String vmName4 = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("lVM4", 24); + final String availSetName = Utils.randomResourceName(azureResourceManager, "av2", 24); + final String vmName3 = Utils.randomResourceName(azureResourceManager, "lVM3", 24); + final String vmName4 = Utils.randomResourceName(azureResourceManager, "lVM4", 24); final String userName = "tirekicker"; final String sshKey = "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCfSPC2K7LZcFKEO+/t3dzmQYtrJFZNxOsbVgOVKietqHyvmYGHEC0J2wPdAqQ/63g/hhAEFRoyehM+rbeDri4txB3YFfnOK58jqdkyXzupWqXzOrlKY4Wz9SKjjN765+dqUITjKRIaAip1Ri137szRg71WnrmdP3SphTRlCx1Bk2nXqWPsclbRDCiZeF8QOTi4JqbmJyK5+0UqhqYRduun8ylAwKKQJ1NJt85sYIHn9f1Rfr6Tq2zS0wZ7DHbZL+zB5rSlAr8QyUdg/GQD+cmSs6LvPJKL78d6hMGk84ARtFo4A79ovwX/Fj01znDQkU6nJildfkaolH2rWFG/qttD azjava@javalib.com"; try { diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/network/samples/ManageInternetFacingLoadBalancer.java b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/network/samples/ManageInternetFacingLoadBalancer.java index 1863d31a1b75..510c60e3d5d7 100644 --- a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/network/samples/ManageInternetFacingLoadBalancer.java +++ b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/network/samples/ManageInternetFacingLoadBalancer.java @@ -75,12 +75,12 @@ public final class ManageInternetFacingLoadBalancer { * @return true if sample runs successfully */ public static boolean runSample(AzureResourceManager azureResourceManager) { - final String rgName = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("rgNEML", 15); + final String rgName = Utils.randomResourceName(azureResourceManager, "rgNEML", 15); - final String vnetName = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("vnet", 24); + final String vnetName = Utils.randomResourceName(azureResourceManager, "vnet", 24); - final String loadBalancerName1 = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("intlb1" + "-", 18); - final String loadBalancerName2 = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("intlb2" + "-", 18); + final String loadBalancerName1 = Utils.randomResourceName(azureResourceManager, "intlb1" + "-", 18); + final String loadBalancerName2 = Utils.randomResourceName(azureResourceManager, "intlb2" + "-", 18); final String publicIpName1 = "pip1-" + loadBalancerName1; final String publicIpName2 = "pip2-" + loadBalancerName1; final String frontendName = loadBalancerName1 + "-FE1"; @@ -96,10 +96,10 @@ public static boolean runSample(AzureResourceManager azureResourceManager) { final String natRule5002to22forVM2 = "nat5002to22forVM2"; final String natRule5003to23forVM2 = "nat5003to23forVM2"; - final String networkInterfaceName1 = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("nic1", 24); - final String networkInterfaceName2 = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("nic2", 24); + final String networkInterfaceName1 = Utils.randomResourceName(azureResourceManager, "nic1", 24); + final String networkInterfaceName2 = Utils.randomResourceName(azureResourceManager, "nic2", 24); - final String availSetName = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("av", 24); + final String availSetName = Utils.randomResourceName(azureResourceManager, "av", 24); final String userName = "tirekicker"; final String sshKey = "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCfSPC2K7LZcFKEO+/t3dzmQYtrJFZNxOsbVgOVKietqHyvmYGHEC0J2wPdAqQ/63g/hhAEFRoyehM+rbeDri4txB3YFfnOK58jqdkyXzupWqXzOrlKY4Wz9SKjjN765+dqUITjKRIaAip1Ri137szRg71WnrmdP3SphTRlCx1Bk2nXqWPsclbRDCiZeF8QOTi4JqbmJyK5+0UqhqYRduun8ylAwKKQJ1NJt85sYIHn9f1Rfr6Tq2zS0wZ7DHbZL+zB5rSlAr8QyUdg/GQD+cmSs6LvPJKL78d6hMGk84ARtFo4A79ovwX/Fj01znDQkU6nJildfkaolH2rWFG/qttD azjava@javalib.com"; try { @@ -294,7 +294,7 @@ public static boolean runSample(AzureResourceManager azureResourceManager) { List> virtualMachineCreateables1 = new ArrayList>(); for (Creatable nicDefinition : networkInterfaceCreatables) { - virtualMachineCreateables1.add(azureResourceManager.virtualMachines().define(azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("lVM1", 24)) + virtualMachineCreateables1.add(azureResourceManager.virtualMachines().define(Utils.randomResourceName(azureResourceManager, "lVM1", 24)) .withRegion(Region.US_EAST) .withExistingResourceGroup(rgName) .withNewPrimaryNetworkInterface(nicDefinition) diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/network/samples/ManageNetworkInterface.java b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/network/samples/ManageNetworkInterface.java index 6040757e9624..9517fb85b223 100644 --- a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/network/samples/ManageNetworkInterface.java +++ b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/network/samples/ManageNetworkInterface.java @@ -38,16 +38,16 @@ public final class ManageNetworkInterface { */ public static boolean runSample(AzureResourceManager azureResourceManager) { final Region region = Region.US_NORTH_CENTRAL; - final String vnetName = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("vnet", 24); - final String networkInterfaceName1 = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("nic1", 24); - final String networkInterfaceName2 = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("nic2", 24); - final String networkInterfaceName3 = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("nic3", 24); - final String publicIPAddressLeafDNS1 = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("pip1", 24); - final String publicIPAddressLeafDNS2 = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("pip2", 24); + final String vnetName = Utils.randomResourceName(azureResourceManager, "vnet", 24); + final String networkInterfaceName1 = Utils.randomResourceName(azureResourceManager, "nic1", 24); + final String networkInterfaceName2 = Utils.randomResourceName(azureResourceManager, "nic2", 24); + final String networkInterfaceName3 = Utils.randomResourceName(azureResourceManager, "nic3", 24); + final String publicIPAddressLeafDNS1 = Utils.randomResourceName(azureResourceManager, "pip1", 24); + final String publicIPAddressLeafDNS2 = Utils.randomResourceName(azureResourceManager, "pip2", 24); // TODO: adjust the length of vm name from 8 to 24 - final String vmName = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("vm", 8); - final String rgName = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("rgNEMI", 24); + final String vmName = Utils.randomResourceName(azureResourceManager, "vm", 8); + final String rgName = Utils.randomResourceName(azureResourceManager, "rgNEMI", 24); final String userName = "tirekicker"; final String password = Utils.password(); try { diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/network/samples/ManageNetworkPeeringInSameSubscription.java b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/network/samples/ManageNetworkPeeringInSameSubscription.java index a3c8bb265de9..9baff309f619 100644 --- a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/network/samples/ManageNetworkPeeringInSameSubscription.java +++ b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/network/samples/ManageNetworkPeeringInSameSubscription.java @@ -67,10 +67,10 @@ public final class ManageNetworkPeeringInSameSubscription { */ public static boolean runSample(AzureResourceManager azureResourceManager) { final Region region = Region.US_EAST; - final String resourceGroupName = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("rg", 15); - final String vnetAName = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("net", 15); - final String vnetBName = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("net", 15); - final String peeringABName = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("peer", 15); + final String resourceGroupName = Utils.randomResourceName(azureResourceManager, "rg", 15); + final String vnetAName = Utils.randomResourceName(azureResourceManager, "net", 15); + final String vnetBName = Utils.randomResourceName(azureResourceManager, "net", 15); + final String peeringABName = Utils.randomResourceName(azureResourceManager, "peer", 15); try { //============================================================= diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/network/samples/ManageNetworkSecurityGroup.java b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/network/samples/ManageNetworkSecurityGroup.java index abec3f13708e..336bf5d3274c 100644 --- a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/network/samples/ManageNetworkSecurityGroup.java +++ b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/network/samples/ManageNetworkSecurityGroup.java @@ -45,15 +45,15 @@ public final class ManageNetworkSecurityGroup { */ public static boolean runSample(AzureResourceManager azureResourceManager) throws UnsupportedEncodingException, JSchException { final Region region = Region.US_NORTH_CENTRAL; - final String frontEndNSGName = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("fensg", 24); - final String backEndNSGName = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("bensg", 24); - final String rgName = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("rgNEMS", 24); - final String vnetName = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("vnet", 24); - final String networkInterfaceName1 = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("nic1", 24); - final String networkInterfaceName2 = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("nic2", 24); - final String publicIPAddressLeafDNS1 = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("pip1", 24); - final String frontEndVMName = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("fevm", 24); - final String backEndVMName = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("bevm", 24); + final String frontEndNSGName = Utils.randomResourceName(azureResourceManager, "fensg", 24); + final String backEndNSGName = Utils.randomResourceName(azureResourceManager, "bensg", 24); + final String rgName = Utils.randomResourceName(azureResourceManager, "rgNEMS", 24); + final String vnetName = Utils.randomResourceName(azureResourceManager, "vnet", 24); + final String networkInterfaceName1 = Utils.randomResourceName(azureResourceManager, "nic1", 24); + final String networkInterfaceName2 = Utils.randomResourceName(azureResourceManager, "nic2", 24); + final String publicIPAddressLeafDNS1 = Utils.randomResourceName(azureResourceManager, "pip1", 24); + final String frontEndVMName = Utils.randomResourceName(azureResourceManager, "fevm", 24); + final String backEndVMName = Utils.randomResourceName(azureResourceManager, "bevm", 24); final String userName = "tirekicker"; try { final String sshKey = SSHShell.generateSSHKeys(null, null).getSshPublicKey(); diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/network/samples/ManageNetworkWatcher.java b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/network/samples/ManageNetworkWatcher.java index e2a3090e2dd3..75364e008453 100644 --- a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/network/samples/ManageNetworkWatcher.java +++ b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/network/samples/ManageNetworkWatcher.java @@ -72,17 +72,17 @@ public final class ManageNetworkWatcher { */ public static boolean runSample(AzureResourceManager azureResourceManager) { final Region region = Region.US_NORTH_CENTRAL; - final String nwName = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("nw", 8); + final String nwName = Utils.randomResourceName(azureResourceManager, "nw", 8); final String userName = "tirekicker"; - final String vnetName = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("vnet", 20); - final String dnsLabel = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("pipdns", 20); + final String vnetName = Utils.randomResourceName(azureResourceManager, "vnet", 20); + final String dnsLabel = Utils.randomResourceName(azureResourceManager, "pipdns", 20); final String subnetName = "subnet1"; - final String nsgName = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("nsg", 20); - final String rgName = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("rg", 24); - final String saName = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("sa", 24); - final String vmName = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("vm", 24); - final String packetCaptureName = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("pc", 8); + final String nsgName = Utils.randomResourceName(azureResourceManager, "nsg", 20); + final String rgName = Utils.randomResourceName(azureResourceManager, "rg", 24); + final String saName = Utils.randomResourceName(azureResourceManager, "sa", 24); + final String vmName = Utils.randomResourceName(azureResourceManager, "vm", 24); + final String packetCaptureName = Utils.randomResourceName(azureResourceManager, "pc", 8); final String packetCaptureStorageContainer = "packetcapture"; // file name to save packet capture log locally final String packetCaptureFile = "packetcapture.cap"; diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/network/samples/ManageSimpleApplicationGateway.java b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/network/samples/ManageSimpleApplicationGateway.java index b984d513b1e2..07b0296e6266 100644 --- a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/network/samples/ManageSimpleApplicationGateway.java +++ b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/network/samples/ManageSimpleApplicationGateway.java @@ -61,7 +61,7 @@ public final class ManageSimpleApplicationGateway { * @return true if sample runs successfully */ public static boolean runSample(AzureResourceManager azureResourceManager) throws IOException { - final String rgName = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("rgNEAGS", 15); + final String rgName = Utils.randomResourceName(azureResourceManager, "rgNEAGS", 15); try { //======================================================================= // Create an application gateway diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/network/samples/ManageVirtualMachinesInParallelWithNetwork.java b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/network/samples/ManageVirtualMachinesInParallelWithNetwork.java index 4a157524556c..b6729b7be789 100644 --- a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/network/samples/ManageVirtualMachinesInParallelWithNetwork.java +++ b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/network/samples/ManageVirtualMachinesInParallelWithNetwork.java @@ -44,11 +44,11 @@ public final class ManageVirtualMachinesInParallelWithNetwork { public static boolean runSample(AzureResourceManager azureResourceManager) { final int frontendVMCount = 4; final int backendVMCount = 4; - final String rgName = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("rgNEPP", 24); - final String frontEndNsgName = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("fensg", 24); - final String backEndNsgName = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("bensg", 24); - final String networkName = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("vnetCOMV", 24); - final String storageAccountName = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("stgCOMV", 20); + final String rgName = Utils.randomResourceName(azureResourceManager, "rgNEPP", 24); + final String frontEndNsgName = Utils.randomResourceName(azureResourceManager, "fensg", 24); + final String backEndNsgName = Utils.randomResourceName(azureResourceManager, "bensg", 24); + final String networkName = Utils.randomResourceName(azureResourceManager, "vnetCOMV", 24); + final String storageAccountName = Utils.randomResourceName(azureResourceManager, "stgCOMV", 20); final String userName = "tirekicker"; final String password = Utils.password(); final Region region = Region.US_SOUTH_CENTRAL; diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/network/samples/ManageVirtualNetwork.java b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/network/samples/ManageVirtualNetwork.java index 5c3b8b145fa3..9fd6006b6063 100644 --- a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/network/samples/ManageVirtualNetwork.java +++ b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/network/samples/ManageVirtualNetwork.java @@ -38,18 +38,18 @@ public final class ManageVirtualNetwork { * @return true if sample runs successfully */ public static boolean runSample(AzureResourceManager azureResourceManager) { - final String vnetName1 = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("vnet1", 20); - final String vnetName2 = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("vnet2", 20); + final String vnetName1 = Utils.randomResourceName(azureResourceManager, "vnet1", 20); + final String vnetName2 = Utils.randomResourceName(azureResourceManager, "vnet2", 20); final String vnet1FrontEndSubnetName = "frontend"; final String vnet1BackEndSubnetName = "backend"; final String vnet1FrontEndSubnetNsgName = "frontendnsg"; final String vnet1BackEndSubnetNsgName = "backendnsg"; - final String frontEndVMName = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("fevm", 24); - final String backEndVMName = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("bevm", 24); - final String publicIPAddressLeafDnsForFrontEndVM = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("pip1", 24); + final String frontEndVMName = Utils.randomResourceName(azureResourceManager, "fevm", 24); + final String backEndVMName = Utils.randomResourceName(azureResourceManager, "bevm", 24); + final String publicIPAddressLeafDnsForFrontEndVM = Utils.randomResourceName(azureResourceManager, "pip1", 24); final String userName = "tirekicker"; final String sshKey = "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCfSPC2K7LZcFKEO+/t3dzmQYtrJFZNxOsbVgOVKietqHyvmYGHEC0J2wPdAqQ/63g/hhAEFRoyehM+rbeDri4txB3YFfnOK58jqdkyXzupWqXzOrlKY4Wz9SKjjN765+dqUITjKRIaAip1Ri137szRg71WnrmdP3SphTRlCx1Bk2nXqWPsclbRDCiZeF8QOTi4JqbmJyK5+0UqhqYRduun8ylAwKKQJ1NJt85sYIHn9f1Rfr6Tq2zS0wZ7DHbZL+zB5rSlAr8QyUdg/GQD+cmSs6LvPJKL78d6hMGk84ARtFo4A79ovwX/Fj01znDQkU6nJildfkaolH2rWFG/qttD azjava@javalib.com"; - final String rgName = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("rgNEMV", 24); + final String rgName = Utils.randomResourceName(azureResourceManager, "rgNEMV", 24); try { //============================================================ diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/network/samples/ManageVirtualNetworkAsync.java b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/network/samples/ManageVirtualNetworkAsync.java index 42e6bdfad779..56153ebda0bc 100644 --- a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/network/samples/ManageVirtualNetworkAsync.java +++ b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/network/samples/ManageVirtualNetworkAsync.java @@ -54,18 +54,18 @@ private static class Indexable2Duration { * @return true if sample runs successfully */ public static boolean runSample(final AzureResourceManager azureResourceManager) { - final String vnetName1 = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("vnet1", 20); - final String vnetName2 = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("vnet2", 20); + final String vnetName1 = Utils.randomResourceName(azureResourceManager, "vnet1", 20); + final String vnetName2 = Utils.randomResourceName(azureResourceManager, "vnet2", 20); final String vnet1FrontEndSubnetName = "frontend"; final String vnet1BackEndSubnetName = "backend"; final String vnet1FrontEndSubnetNsgName = "frontendnsg"; final String vnet1BackEndSubnetNsgName = "backendnsg"; - final String frontEndVMName = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("fevm", 24); - final String backEndVMName = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("bevm", 24); - final String publicIPAddressLeafDnsForFrontEndVM = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("pip1", 24); + final String frontEndVMName = Utils.randomResourceName(azureResourceManager, "fevm", 24); + final String backEndVMName = Utils.randomResourceName(azureResourceManager, "bevm", 24); + final String publicIPAddressLeafDnsForFrontEndVM = Utils.randomResourceName(azureResourceManager, "pip1", 24); final String userName = "tirekicker"; final String sshKey = "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCfSPC2K7LZcFKEO+/t3dzmQYtrJFZNxOsbVgOVKietqHyvmYGHEC0J2wPdAqQ/63g/hhAEFRoyehM+rbeDri4txB3YFfnOK58jqdkyXzupWqXzOrlKY4Wz9SKjjN765+dqUITjKRIaAip1Ri137szRg71WnrmdP3SphTRlCx1Bk2nXqWPsclbRDCiZeF8QOTi4JqbmJyK5+0UqhqYRduun8ylAwKKQJ1NJt85sYIHn9f1Rfr6Tq2zS0wZ7DHbZL+zB5rSlAr8QyUdg/GQD+cmSs6LvPJKL78d6hMGk84ARtFo4A79ovwX/Fj01znDQkU6nJildfkaolH2rWFG/qttD azjava@javalib.com"; - final String rgName = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("rgNEMV", 24); + final String rgName = Utils.randomResourceName(azureResourceManager, "rgNEMV", 24); try { //============================================================ diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/network/samples/ManageVpnGatewayPoint2SiteConnection.java b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/network/samples/ManageVpnGatewayPoint2SiteConnection.java index a19a1123134a..772a04fca0bd 100644 --- a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/network/samples/ManageVpnGatewayPoint2SiteConnection.java +++ b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/network/samples/ManageVpnGatewayPoint2SiteConnection.java @@ -47,9 +47,9 @@ public static boolean runSample(AzureResourceManager azureResourceManager) throw final String certPath = System.getenv("CERT_PATH"); final String clientCertThumbprint = System.getenv("CLIENT_CERT_THUMBPRINT"); final Region region = Region.US_WEST2; - final String rgName = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("rg", 20); - final String vnetName = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("vnet", 20); - final String vpnGatewayName = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("vngw", 20); + final String rgName = Utils.randomResourceName(azureResourceManager, "rg", 20); + final String vnetName = Utils.randomResourceName(azureResourceManager, "vnet", 20); + final String vpnGatewayName = Utils.randomResourceName(azureResourceManager, "vngw", 20); try { //============================================================ diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/network/samples/ManageVpnGatewaySite2SiteConnection.java b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/network/samples/ManageVpnGatewaySite2SiteConnection.java index 60be87e808a3..16bd70997eea 100644 --- a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/network/samples/ManageVpnGatewaySite2SiteConnection.java +++ b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/network/samples/ManageVpnGatewaySite2SiteConnection.java @@ -34,11 +34,11 @@ public final class ManageVpnGatewaySite2SiteConnection { */ public static boolean runSample(AzureResourceManager azureResourceManager) { final Region region = Region.US_WEST2; - final String rgName = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("rg", 20); - final String vnetName = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("vnet", 20); - final String vpnGatewayName = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("vngw", 20); - final String localGatewayName = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("lngw", 20); - final String connectionName = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("con", 20); + final String rgName = Utils.randomResourceName(azureResourceManager, "rg", 20); + final String vnetName = Utils.randomResourceName(azureResourceManager, "vnet", 20); + final String vpnGatewayName = Utils.randomResourceName(azureResourceManager, "vngw", 20); + final String localGatewayName = Utils.randomResourceName(azureResourceManager, "lngw", 20); + final String connectionName = Utils.randomResourceName(azureResourceManager, "con", 20); try { diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/network/samples/ManageVpnGatewayVNet2VNetConnection.java b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/network/samples/ManageVpnGatewayVNet2VNetConnection.java index 9983e266391b..244efba59634 100644 --- a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/network/samples/ManageVpnGatewayVNet2VNetConnection.java +++ b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/network/samples/ManageVpnGatewayVNet2VNetConnection.java @@ -55,18 +55,18 @@ public final class ManageVpnGatewayVNet2VNetConnection { */ public static boolean runSample(AzureResourceManager azureResourceManager) { final Region region = Region.US_WEST2; - final String rgName = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("rg", 20); - final String vnetName = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("vnet", 20); - final String vnet2Name = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("vnet", 20); - final String vpnGatewayName = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("vngw", 20); - final String vpnGateway2Name = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("vngw2", 20); - final String connectionName = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("con", 20); - final String connection2Name = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("con2", 20); - final String nwName = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("nw", 20); - final String vm1Name = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("vm1", 20); - final String vm2Name = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("vm2", 20); + final String rgName = Utils.randomResourceName(azureResourceManager, "rg", 20); + final String vnetName = Utils.randomResourceName(azureResourceManager, "vnet", 20); + final String vnet2Name = Utils.randomResourceName(azureResourceManager, "vnet", 20); + final String vpnGatewayName = Utils.randomResourceName(azureResourceManager, "vngw", 20); + final String vpnGateway2Name = Utils.randomResourceName(azureResourceManager, "vngw2", 20); + final String connectionName = Utils.randomResourceName(azureResourceManager, "con", 20); + final String connection2Name = Utils.randomResourceName(azureResourceManager, "con2", 20); + final String nwName = Utils.randomResourceName(azureResourceManager, "nw", 20); + final String vm1Name = Utils.randomResourceName(azureResourceManager, "vm1", 20); + final String vm2Name = Utils.randomResourceName(azureResourceManager, "vm2", 20); final String rootname = "tirekicker"; - final String password = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("pWd!", 15); + final String password = Utils.randomResourceName(azureResourceManager, "pWd!", 15); final String storageContainerName = "results"; try { @@ -132,7 +132,7 @@ public static boolean runSample(AzureResourceManager azureResourceManager) { .withExistingResourceGroup(rgName) .create(); // Create storage account to store troubleshooting information - StorageAccount storageAccount = azureResourceManager.storageAccounts().define("sa" + azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("", 8)) + StorageAccount storageAccount = azureResourceManager.storageAccounts().define("sa" + Utils.randomResourceName(azureResourceManager, "", 8)) .withRegion(region) .withExistingResourceGroup(rgName) .create(); diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/network/samples/VerifyNetworkPeeringWithNetworkWatcher.java b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/network/samples/VerifyNetworkPeeringWithNetworkWatcher.java index c524a7f2e2d3..ad60e78be5ff 100644 --- a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/network/samples/VerifyNetworkPeeringWithNetworkWatcher.java +++ b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/network/samples/VerifyNetworkPeeringWithNetworkWatcher.java @@ -60,20 +60,20 @@ public final class VerifyNetworkPeeringWithNetworkWatcher { */ public static boolean runSample(AzureResourceManager azureResourceManager) { final Region region = Region.US_SOUTH_CENTRAL; - final String resourceGroupName = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("rg", 15); - final String vnetAName = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("net", 15); - final String vnetBName = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("net", 15); + final String resourceGroupName = Utils.randomResourceName(azureResourceManager, "rg", 15); + final String vnetAName = Utils.randomResourceName(azureResourceManager, "net", 15); + final String vnetBName = Utils.randomResourceName(azureResourceManager, "net", 15); - final String[] vmNames = azureResourceManager.resourceGroups().manager().internalContext().randomResourceNames("vm", 15, 2); + final String[] vmNames = Utils.randomResourceNames(azureResourceManager, "vm", 15, 2); final String[] vmIPAddresses = new String[]{ /* within subnetA */ "10.0.0.8", /* within subnetB */ "10.1.0.8" }; - final String peeringABName = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("peer", 15); + final String peeringABName = Utils.randomResourceName(azureResourceManager, "peer", 15); final String rootname = "tirekicker"; - final String password = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("pWd!", 15); - final String networkWatcherName = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("netwch", 20); + final String password = Utils.randomResourceName(azureResourceManager, "pWd!", 15); + final String networkWatcherName = Utils.randomResourceName(azureResourceManager, "netwch", 20); try { diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/privatedns/samples/ManagePrivateDns.java b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/privatedns/samples/ManagePrivateDns.java index f15cda6ce409..8830fd922ae4 100644 --- a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/privatedns/samples/ManagePrivateDns.java +++ b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/privatedns/samples/ManagePrivateDns.java @@ -39,13 +39,13 @@ public class ManagePrivateDns { * @return true if sample runs successfully */ public static boolean runSample(AzureResourceManager azureResourceManager) { - final String rgName = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("rgNEMV", 24); - final String vnetName = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("vnetwork-1", 24); - final String subnetName = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("subnet-1", 24); - final String linkName = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("vnlink-1", 24); - final String vm1Name = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("vm1-", 24); - final String vm2Name = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("vm2-", 24); - final String rsName = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("recordset1-", 24); + final String rgName = Utils.randomResourceName(azureResourceManager, "rgNEMV", 24); + final String vnetName = Utils.randomResourceName(azureResourceManager, "vnetwork-1", 24); + final String subnetName = Utils.randomResourceName(azureResourceManager, "subnet-1", 24); + final String linkName = Utils.randomResourceName(azureResourceManager, "vnlink-1", 24); + final String vm1Name = Utils.randomResourceName(azureResourceManager, "vm1-", 24); + final String vm2Name = Utils.randomResourceName(azureResourceManager, "vm2-", 24); + final String rsName = Utils.randomResourceName(azureResourceManager, "recordset1-", 24); final String userName = "tirekicker"; final String password = Utils.password(); diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/rediscache/samples/ManageRedisCache.java b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/rediscache/samples/ManageRedisCache.java index 40a62f3ee6ae..1d2547352fac 100644 --- a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/rediscache/samples/ManageRedisCache.java +++ b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/rediscache/samples/ManageRedisCache.java @@ -45,10 +45,10 @@ public final class ManageRedisCache { * @return true if sample runs successfully */ public static boolean runSample(AzureResourceManager azureResourceManager) { - final String redisCacheName1 = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("rc1", 20); - final String redisCacheName2 = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("rc2", 20); - final String redisCacheName3 = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("rc3", 20); - final String rgName = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("rgRCMC", 20); + final String redisCacheName1 = Utils.randomResourceName(azureResourceManager, "rc1", 20); + final String redisCacheName2 = Utils.randomResourceName(azureResourceManager, "rc2", 20); + final String redisCacheName3 = Utils.randomResourceName(azureResourceManager, "rc3", 20); + final String rgName = Utils.randomResourceName(azureResourceManager, "rgRCMC", 20); try { // ============================================================ // Define a redis cache diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/resources/samples/DeployUsingARMTemplate.java b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/resources/samples/DeployUsingARMTemplate.java index d29542167025..c63fafb890e9 100644 --- a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/resources/samples/DeployUsingARMTemplate.java +++ b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/resources/samples/DeployUsingARMTemplate.java @@ -14,6 +14,7 @@ import com.azure.resourcemanager.resources.models.DeploymentOperation; import com.azure.core.management.Region; import com.azure.core.management.profile.AzureProfile; +import com.azure.resourcemanager.samples.Utils; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; @@ -35,8 +36,8 @@ public final class DeployUsingARMTemplate { * @return true if sample runs successfully */ public static boolean runSample(AzureResourceManager azureResourceManager) throws IOException, IllegalAccessException { - final String rgName = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("rgRSAT", 24); - final String deploymentName = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("dpRSAT", 24); + final String rgName = Utils.randomResourceName(azureResourceManager, "rgRSAT", 24); + final String deploymentName = Utils.randomResourceName(azureResourceManager, "dpRSAT", 24); try { String templateJson = DeployUsingARMTemplate.getTemplate(azureResourceManager); @@ -137,8 +138,8 @@ public static void main(String[] args) { } private static String getTemplate(AzureResourceManager azureResourceManager) throws IllegalAccessException, JsonProcessingException, IOException { - final String hostingPlanName = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("hpRSAT", 24); - final String webappName = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("wnRSAT", 24); + final String hostingPlanName = Utils.randomResourceName(azureResourceManager, "hpRSAT", 24); + final String webappName = Utils.randomResourceName(azureResourceManager, "wnRSAT", 24); try (InputStream embeddedTemplate = DeployUsingARMTemplate.class.getResourceAsStream("/templateValue.json")) { diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/resources/samples/DeployUsingARMTemplateAsync.java b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/resources/samples/DeployUsingARMTemplateAsync.java index 348ac63dd6b5..bf78ae56e282 100644 --- a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/resources/samples/DeployUsingARMTemplateAsync.java +++ b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/resources/samples/DeployUsingARMTemplateAsync.java @@ -12,6 +12,7 @@ import com.azure.resourcemanager.AzureResourceManager; import com.azure.core.management.Region; import com.azure.resourcemanager.resources.models.DeploymentMode; +import com.azure.resourcemanager.samples.Utils; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.node.ObjectNode; import com.google.common.io.ByteStreams; @@ -38,8 +39,8 @@ public final class DeployUsingARMTemplateAsync { * @return true if sample runs successfully */ public static boolean runSample(final AzureResourceManager azureResourceManager) throws InterruptedException { - final String rgPrefix = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("rgJavaTest", 16); - final String deploymentPrefix = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("javaTest", 16); + final String rgPrefix = Utils.randomResourceName(azureResourceManager, "rgJavaTest", 16); + final String deploymentPrefix = Utils.randomResourceName(azureResourceManager, "javaTest", 16); final String sshKey = getSSHPublicKey(); final int numDeployments = 3; diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/resources/samples/DeployUsingARMTemplateWithDeploymentOperations.java b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/resources/samples/DeployUsingARMTemplateWithDeploymentOperations.java index ca40eddc53ea..e4ddc9e72833 100644 --- a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/resources/samples/DeployUsingARMTemplateWithDeploymentOperations.java +++ b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/resources/samples/DeployUsingARMTemplateWithDeploymentOperations.java @@ -13,6 +13,7 @@ import com.azure.resourcemanager.resources.models.DeploymentOperation; import com.azure.core.management.Region; import com.azure.core.management.profile.AzureProfile; +import com.azure.resourcemanager.samples.Utils; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.node.ObjectNode; import com.google.common.io.ByteStreams; @@ -41,8 +42,8 @@ public final class DeployUsingARMTemplateWithDeploymentOperations { * @return true if sample runs successfully */ public static boolean runSample(final AzureResourceManager azureResourceManager, int defaultPollingInterval) throws InterruptedException { - final String rgPrefix = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("rgJavaTest", 16); - final String deploymentPrefix = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("javaTest", 16); + final String rgPrefix = Utils.randomResourceName(azureResourceManager, "rgJavaTest", 16); + final String deploymentPrefix = Utils.randomResourceName(azureResourceManager, "javaTest", 16); final String sshKey = getSSHPublicKey(); final int numDeployments = 3; final int pollingInterval = defaultPollingInterval < 0 ? 15 : defaultPollingInterval; // in seconds diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/resources/samples/DeployUsingARMTemplateWithProgress.java b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/resources/samples/DeployUsingARMTemplateWithProgress.java index 31f190d42aaf..d606b318bc72 100644 --- a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/resources/samples/DeployUsingARMTemplateWithProgress.java +++ b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/resources/samples/DeployUsingARMTemplateWithProgress.java @@ -13,6 +13,7 @@ import com.azure.core.management.Region; import com.azure.core.management.profile.AzureProfile; import com.azure.resourcemanager.resources.fluentcore.utils.ResourceManagerUtils; +import com.azure.resourcemanager.samples.Utils; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; @@ -36,8 +37,8 @@ public final class DeployUsingARMTemplateWithProgress { * @return true if sample runs successfully */ public static boolean runSample(AzureResourceManager azureResourceManager) throws IOException, IllegalAccessException { - final String rgName = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("rgRSAP", 24); - final String deploymentName = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("dpRSAP", 24); + final String rgName = Utils.randomResourceName(azureResourceManager, "rgRSAP", 24); + final String deploymentName = Utils.randomResourceName(azureResourceManager, "dpRSAP", 24); try { String templateJson = DeployUsingARMTemplateWithProgress.getTemplate(azureResourceManager); @@ -123,8 +124,8 @@ public static void main(String[] args) { } private static String getTemplate(AzureResourceManager azureResourceManager) throws IllegalAccessException, JsonProcessingException, IOException { - final String hostingPlanName = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("hpRSAT", 24); - final String webappName = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("wnRSAT", 24); + final String hostingPlanName = Utils.randomResourceName(azureResourceManager, "hpRSAT", 24); + final String webappName = Utils.randomResourceName(azureResourceManager, "wnRSAT", 24); try (InputStream embeddedTemplate = DeployUsingARMTemplateWithProgress.class.getResourceAsStream("/templateValue.json")) { diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/resources/samples/DeployUsingARMTemplateWithTags.java b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/resources/samples/DeployUsingARMTemplateWithTags.java index fea9b39f6560..bc9e9671934f 100644 --- a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/resources/samples/DeployUsingARMTemplateWithTags.java +++ b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/resources/samples/DeployUsingARMTemplateWithTags.java @@ -15,6 +15,7 @@ import com.azure.resourcemanager.resources.models.GenericResource; import com.azure.core.management.Region; import com.azure.core.management.profile.AzureProfile; +import com.azure.resourcemanager.samples.Utils; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; @@ -39,8 +40,8 @@ public final class DeployUsingARMTemplateWithTags { * @return true if sample runs successfully */ public static boolean runSample(AzureResourceManager azureResourceManager) throws IOException, IllegalAccessException { - final String rgName = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("rgRSAT", 24); - final String deploymentName = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("dpRSAT", 24); + final String rgName = Utils.randomResourceName(azureResourceManager, "rgRSAT", 24); + final String deploymentName = Utils.randomResourceName(azureResourceManager, "dpRSAT", 24); try { String templateJson = getTemplate(azureResourceManager); @@ -140,8 +141,8 @@ public static void main(String[] args) { } private static String getTemplate(AzureResourceManager azureResourceManager) throws IllegalAccessException, JsonProcessingException, IOException { - final String hostingPlanName = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("hpRSAT", 24); - final String webappName = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("wnRSAT", 24); + final String hostingPlanName = Utils.randomResourceName(azureResourceManager, "hpRSAT", 24); + final String webappName = Utils.randomResourceName(azureResourceManager, "wnRSAT", 24); try (InputStream embeddedTemplate = DeployUsingARMTemplateWithProgress.class.getResourceAsStream("/templateValue.json")) { diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/resources/samples/DeployVirtualMachineUsingARMTemplate.java b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/resources/samples/DeployVirtualMachineUsingARMTemplate.java index 6cfae3ac5ab6..15fbd29c37b1 100644 --- a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/resources/samples/DeployVirtualMachineUsingARMTemplate.java +++ b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/resources/samples/DeployVirtualMachineUsingARMTemplate.java @@ -34,8 +34,8 @@ public class DeployVirtualMachineUsingARMTemplate { * @return true if sample runs successfully */ public static boolean runSample(AzureResourceManager azureResourceManager) throws IOException, IllegalAccessException { - final String rgName = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("rgRSAT", 24); - final String deploymentName = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("dpRSAT", 24); + final String rgName = Utils.randomResourceName(azureResourceManager, "rgRSAT", 24); + final String deploymentName = Utils.randomResourceName(azureResourceManager, "dpRSAT", 24); try { String templateJson = DeployVirtualMachineUsingARMTemplate.getTemplate(azureResourceManager); @@ -124,7 +124,7 @@ public static void main(String[] args) { private static String getTemplate(AzureResourceManager azureResourceManager) throws IllegalAccessException, JsonProcessingException, IOException { final String adminUsername = "tirekicker"; final String adminPassword = Utils.password(); - final String osDiskName = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("osdisk-", 24); + final String osDiskName = Utils.randomResourceName(azureResourceManager, "osdisk-", 24); try (InputStream embeddedTemplate = DeployUsingARMTemplateWithProgress.class.getResourceAsStream("/virtualMachineWithManagedDisksTemplate.json")) { diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/resources/samples/ManageResource.java b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/resources/samples/ManageResource.java index 05959e22e0f7..d0612ae4ecdf 100644 --- a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/resources/samples/ManageResource.java +++ b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/resources/samples/ManageResource.java @@ -10,6 +10,7 @@ import com.azure.resourcemanager.AzureResourceManager; import com.azure.core.management.Region; import com.azure.core.management.profile.AzureProfile; +import com.azure.resourcemanager.samples.Utils; import com.azure.resourcemanager.storage.models.StorageAccount; import com.azure.resourcemanager.storage.models.StorageAccountSkuType; @@ -31,9 +32,9 @@ public final class ManageResource { * @return true if sample runs successfully */ public static boolean runSample(AzureResourceManager azureResourceManager) { - final String rgName = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("rgRSMR", 24); - final String resourceName1 = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("rn1", 24); - final String resourceName2 = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("rn2", 24); + final String rgName = Utils.randomResourceName(azureResourceManager, "rgRSMR", 24); + final String resourceName1 = Utils.randomResourceName(azureResourceManager, "rn1", 24); + final String resourceName2 = Utils.randomResourceName(azureResourceManager, "rn2", 24); try { diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/resources/samples/ManageResourceGroup.java b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/resources/samples/ManageResourceGroup.java index 64eff3460c16..c9bf84ae08e0 100644 --- a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/resources/samples/ManageResourceGroup.java +++ b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/resources/samples/ManageResourceGroup.java @@ -11,6 +11,7 @@ import com.azure.resourcemanager.resources.models.ResourceGroup; import com.azure.core.management.Region; import com.azure.core.management.profile.AzureProfile; +import com.azure.resourcemanager.samples.Utils; /** * Azure Resource sample for managing resource groups - @@ -29,10 +30,10 @@ public final class ManageResourceGroup { * @return true if sample runs successfully */ public static boolean runSample(AzureResourceManager azureResourceManager) { - final String rgName = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("rgRSMA", 24); - final String rgName2 = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("rgRSMA", 24); - final String resourceTagName = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("rgRSTN", 24); - final String resourceTagValue = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("rgRSTV", 24); + final String rgName = Utils.randomResourceName(azureResourceManager, "rgRSMA", 24); + final String rgName2 = Utils.randomResourceName(azureResourceManager, "rgRSMA", 24); + final String resourceTagName = Utils.randomResourceName(azureResourceManager, "rgRSTN", 24); + final String resourceTagValue = Utils.randomResourceName(azureResourceManager, "rgRSTV", 24); try { diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/samples/DockerUtils.java b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/samples/DockerUtils.java index e526256826ab..811c851e6418 100644 --- a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/samples/DockerUtils.java +++ b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/samples/DockerUtils.java @@ -190,8 +190,8 @@ public static DockerClientConfig createDockerClientConfig(String host, String re */ public static DockerClient fromNewDockerVM(AzureResourceManager azureResourceManager, String rgName, Region region, String registryServerUrl, String username, String password) { - final String dockerVMName = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("dockervm", 15); - final String publicIPDnsLabel = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("pip", 10); + final String dockerVMName = Utils.randomResourceName(azureResourceManager, "dockervm", 15); + final String publicIPDnsLabel = Utils.randomResourceName(azureResourceManager, "pip", 10); final String vmUserName = "dockerUser"; final String vmPassword = Utils.password(); diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/samples/Utils.java b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/samples/Utils.java index b16698ebe96e..0d31d7a6994a 100644 --- a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/samples/Utils.java +++ b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/samples/Utils.java @@ -254,6 +254,24 @@ public static String randomResourceName(AzureResourceManager azure, String prefi return azure.resourceGroups().manager().internalContext().randomResourceName(prefix, maxLen); } + /** + * Generates the specified number of random resource names with the same prefix. + * Please provider your own implementation, or avoid using the method, if code is to be used in production. + * + * @param azure the AzureResourceManager instance. + * @param prefix the prefix to be used if possible + * @param maxLen the maximum length for the random generated name + * @param count the number of names to generate + * @return the randomized resource names. + */ + public static String[] randomResourceNames(AzureResourceManager azure, String prefix, int maxLen, int count) { + String[] names = new String[count]; + for (int i = 0; i < count; i++) { + names[i] = randomResourceName(azure, prefix, maxLen); + } + return names; + } + /** * Creates a random UUID. * Please provider your own implementation, or avoid using the method, if code is to be used in production. diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/servicebus/samples/ServiceBusPublishSubscribeAdvanceFeatures.java b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/servicebus/samples/ServiceBusPublishSubscribeAdvanceFeatures.java index 4dded70be1fb..44d3ea66a507 100644 --- a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/servicebus/samples/ServiceBusPublishSubscribeAdvanceFeatures.java +++ b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/servicebus/samples/ServiceBusPublishSubscribeAdvanceFeatures.java @@ -46,13 +46,13 @@ public final class ServiceBusPublishSubscribeAdvanceFeatures { */ public static boolean runSample(AzureResourceManager azureResourceManager) { // New resources - final String rgName = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("rgSB04_", 24); - final String namespaceName = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("namespace", 20); - final String topic1Name = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("topic1_", 24); - final String topic2Name = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("topic2_", 24); - final String subscription1Name = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("subs_", 24); - final String subscription2Name = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("subs_", 24); - final String subscription3Name = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("subs_", 24); + final String rgName = Utils.randomResourceName(azureResourceManager, "rgSB04_", 24); + final String namespaceName = Utils.randomResourceName(azureResourceManager, "namespace", 20); + final String topic1Name = Utils.randomResourceName(azureResourceManager, "topic1_", 24); + final String topic2Name = Utils.randomResourceName(azureResourceManager, "topic2_", 24); + final String subscription1Name = Utils.randomResourceName(azureResourceManager, "subs_", 24); + final String subscription2Name = Utils.randomResourceName(azureResourceManager, "subs_", 24); + final String subscription3Name = Utils.randomResourceName(azureResourceManager, "subs_", 24); final String sendRuleName = "SendRule"; final String manageRuleName = "ManageRule"; diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/servicebus/samples/ServiceBusPublishSubscribeBasic.java b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/servicebus/samples/ServiceBusPublishSubscribeBasic.java index c388bda14c18..804dc1f4d91e 100644 --- a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/servicebus/samples/ServiceBusPublishSubscribeBasic.java +++ b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/servicebus/samples/ServiceBusPublishSubscribeBasic.java @@ -48,11 +48,11 @@ public final class ServiceBusPublishSubscribeBasic { */ public static boolean runSample(AzureResourceManager azureResourceManager) { // New resources - final String rgName = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("rgSB02_", 24); - final String namespaceName = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("namespace", 20); - final String topicName = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("topic_", 24); - final String subscription1Name = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("sub1_", 24); - final String subscription2Name = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("sub2_", 24); + final String rgName = Utils.randomResourceName(azureResourceManager, "rgSB02_", 24); + final String namespaceName = Utils.randomResourceName(azureResourceManager, "namespace", 20); + final String topicName = Utils.randomResourceName(azureResourceManager, "topic_", 24); + final String subscription1Name = Utils.randomResourceName(azureResourceManager, "sub1_", 24); + final String subscription2Name = Utils.randomResourceName(azureResourceManager, "sub2_", 24); try { //============================================================ diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/servicebus/samples/ServiceBusQueueAdvanceFeatures.java b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/servicebus/samples/ServiceBusQueueAdvanceFeatures.java index 34b9de7abe9d..7a82ad27aec9 100644 --- a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/servicebus/samples/ServiceBusQueueAdvanceFeatures.java +++ b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/servicebus/samples/ServiceBusQueueAdvanceFeatures.java @@ -48,10 +48,10 @@ public final class ServiceBusQueueAdvanceFeatures { */ public static boolean runSample(AzureResourceManager azureResourceManager) { // New resources - final String rgName = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("rgSB04_", 24); - final String namespaceName = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("namespace", 20); - final String queue1Name = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("queue1_", 24); - final String queue2Name = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("queue2_", 24); + final String rgName = Utils.randomResourceName(azureResourceManager, "rgSB04_", 24); + final String namespaceName = Utils.randomResourceName(azureResourceManager, "namespace", 20); + final String queue1Name = Utils.randomResourceName(azureResourceManager, "queue1_", 24); + final String queue2Name = Utils.randomResourceName(azureResourceManager, "queue2_", 24); final String sendRuleName = "SendRule"; try { diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/servicebus/samples/ServiceBusQueueBasic.java b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/servicebus/samples/ServiceBusQueueBasic.java index ce185ad0730f..1584706ef1ec 100644 --- a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/servicebus/samples/ServiceBusQueueBasic.java +++ b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/servicebus/samples/ServiceBusQueueBasic.java @@ -46,10 +46,10 @@ public final class ServiceBusQueueBasic { */ public static boolean runSample(AzureResourceManager azureResourceManager) { // New resources - final String rgName = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("rgSB01_", 24); - final String namespaceName = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("namespace", 20); - final String queue1Name = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("queue1_", 24); - final String queue2Name = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("queue2_", 24); + final String rgName = Utils.randomResourceName(azureResourceManager, "rgSB01_", 24); + final String namespaceName = Utils.randomResourceName(azureResourceManager, "namespace", 20); + final String queue1Name = Utils.randomResourceName(azureResourceManager, "queue1_", 24); + final String queue2Name = Utils.randomResourceName(azureResourceManager, "queue2_", 24); try { //============================================================ diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/servicebus/samples/ServiceBusWithClaimBasedAuthorization.java b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/servicebus/samples/ServiceBusWithClaimBasedAuthorization.java index 7eeae908ab4b..d6f1f5fa3605 100644 --- a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/servicebus/samples/ServiceBusWithClaimBasedAuthorization.java +++ b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/servicebus/samples/ServiceBusWithClaimBasedAuthorization.java @@ -42,12 +42,12 @@ public final class ServiceBusWithClaimBasedAuthorization { */ public static boolean runSample(AzureResourceManager azureResourceManager) { // New resources - final String rgName = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("rgSB03_", 24); - final String namespaceName = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("namespace", 20); - final String queueName = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("queue1_", 24); - final String topicName = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("topic_", 24); - final String subscription1Name = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("sub1_", 24); - final String subscription2Name = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("sub2_", 24); + final String rgName = Utils.randomResourceName(azureResourceManager, "rgSB03_", 24); + final String namespaceName = Utils.randomResourceName(azureResourceManager, "namespace", 20); + final String queueName = Utils.randomResourceName(azureResourceManager, "queue1_", 24); + final String topicName = Utils.randomResourceName(azureResourceManager, "topic_", 24); + final String subscription1Name = Utils.randomResourceName(azureResourceManager, "sub1_", 24); + final String subscription2Name = Utils.randomResourceName(azureResourceManager, "sub2_", 24); try { //============================================================ diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/sql/samples/GettingSqlServerMetrics.java b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/sql/samples/GettingSqlServerMetrics.java index 1621bb12ceab..0e9c7de77bc5 100644 --- a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/sql/samples/GettingSqlServerMetrics.java +++ b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/sql/samples/GettingSqlServerMetrics.java @@ -52,10 +52,10 @@ public class GettingSqlServerMetrics { * @return true if sample runs successfully */ public static boolean runSample(AzureResourceManager azureResourceManager) throws ClassNotFoundException, SQLException { - final String sqlServerName = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("sqltest", 20); + final String sqlServerName = Utils.randomResourceName(azureResourceManager, "sqltest", 20); final String dbName = "dbSample"; final String epName = "epSample"; - final String rgName = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("rgsql", 20); + final String rgName = Utils.randomResourceName(azureResourceManager, "rgsql", 20); final String administratorLogin = "sqladmin3423"; final String administratorPassword = Utils.password(); OffsetDateTime startTime = OffsetDateTime.now().minusDays(1); diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/sql/samples/ManageSqlDatabase.java b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/sql/samples/ManageSqlDatabase.java index 31ea712036ac..5a537941c87f 100644 --- a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/sql/samples/ManageSqlDatabase.java +++ b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/sql/samples/ManageSqlDatabase.java @@ -38,8 +38,8 @@ public final class ManageSqlDatabase { * @return true if sample runs successfully */ public static boolean runSample(AzureResourceManager azureResourceManager) { - final String sqlServerName = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("sqlserver", 20); - final String rgName = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("rgRSDSI", 20); + final String sqlServerName = Utils.randomResourceName(azureResourceManager, "sqlserver", 20); + final String rgName = Utils.randomResourceName(azureResourceManager, "rgRSDSI", 20); final String administratorLogin = "sqladmin3423"; final String administratorPassword = Utils.password(); final String firewallRuleIPAddress = "10.0.0.1"; diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/sql/samples/ManageSqlDatabaseInElasticPool.java b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/sql/samples/ManageSqlDatabaseInElasticPool.java index d1a94b598be1..f23b443ea90f 100644 --- a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/sql/samples/ManageSqlDatabaseInElasticPool.java +++ b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/sql/samples/ManageSqlDatabaseInElasticPool.java @@ -41,8 +41,8 @@ public final class ManageSqlDatabaseInElasticPool { * @return true if sample runs successfully */ public static boolean runSample(AzureResourceManager azureResourceManager) { - final String sqlServerName = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("sqlserver", 20); - final String rgName = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("rgRSSDEP", 20); + final String sqlServerName = Utils.randomResourceName(azureResourceManager, "sqlserver", 20); + final String rgName = Utils.randomResourceName(azureResourceManager, "rgRSSDEP", 20); final String elasticPoolName = "myElasticPool"; final String elasticPool2Name = "secondElasticPool"; final String administratorLogin = "sqladmin3423"; diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/sql/samples/ManageSqlDatabasesAcrossDifferentDataCenters.java b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/sql/samples/ManageSqlDatabasesAcrossDifferentDataCenters.java index a441b1cfcc4e..595384de9df5 100644 --- a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/sql/samples/ManageSqlDatabasesAcrossDifferentDataCenters.java +++ b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/sql/samples/ManageSqlDatabasesAcrossDifferentDataCenters.java @@ -49,12 +49,12 @@ public final class ManageSqlDatabasesAcrossDifferentDataCenters { * @return true if sample runs successfully */ public static boolean runSample(AzureResourceManager azureResourceManager) { - final String sqlServerName = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("sqlserver", 20); - final String rgName = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("rgRSSDRE", 20); + final String sqlServerName = Utils.randomResourceName(azureResourceManager, "sqlserver", 20); + final String rgName = Utils.randomResourceName(azureResourceManager, "rgRSSDRE", 20); final String administratorLogin = "sqladmin3423"; final String administratorPassword = Utils.password(); - final String slaveSqlServer1Name = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("slave1sql", 20); - final String slaveSqlServer2Name = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("slave2sql", 20); + final String slaveSqlServer1Name = Utils.randomResourceName(azureResourceManager, "slave1sql", 20); + final String slaveSqlServer2Name = Utils.randomResourceName(azureResourceManager, "slave2sql", 20); final String databaseName = "mydatabase"; final String networkPrefix = "network"; final String virtualMachinePrefix = "samplevm"; @@ -134,7 +134,7 @@ public static boolean runSample(AzureResourceManager azureResourceManager) { System.out.println("Creating virtual networks in different regions."); for (Region region: regions) { - creatableNetworks.add(azureResourceManager.networks().define(azureResourceManager.resourceGroups().manager().internalContext().randomResourceName(networkPrefix, 20)) + creatableNetworks.add(azureResourceManager.networks().define(Utils.randomResourceName(azureResourceManager, networkPrefix, 20)) .withRegion(region) .withExistingResourceGroup(rgName)); } @@ -146,7 +146,7 @@ public static boolean runSample(AzureResourceManager azureResourceManager) { System.out.println("Creating virtual machines in different regions."); for (Network network: networks) { - String virtualMachineName = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName(virtualMachinePrefix, 20); + String virtualMachineName = Utils.randomResourceName(azureResourceManager, virtualMachinePrefix, 20); Creatable publicIPAddressCreatable = azureResourceManager.publicIpAddresses().define(virtualMachineName) .withRegion(network.region()) .withExistingResourceGroup(rgName) diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/sql/samples/ManageSqlFailoverGroups.java b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/sql/samples/ManageSqlFailoverGroups.java index 919e588e1127..6e3be306b965 100644 --- a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/sql/samples/ManageSqlFailoverGroups.java +++ b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/sql/samples/ManageSqlFailoverGroups.java @@ -35,10 +35,10 @@ public class ManageSqlFailoverGroups { * @return true if sample runs successfully */ public static boolean runSample(AzureResourceManager azureResourceManager) { - final String sqlPrimaryServerName = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("sqlpri", 20); - final String sqlSecondaryServerName = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("sqlsec", 20); - final String rgName = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("rgsql", 20); - final String failoverGroupName = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("fog", 20); + final String sqlPrimaryServerName = Utils.randomResourceName(azureResourceManager, "sqlpri", 20); + final String sqlSecondaryServerName = Utils.randomResourceName(azureResourceManager, "sqlsec", 20); + final String rgName = Utils.randomResourceName(azureResourceManager, "rgsql", 20); + final String failoverGroupName = Utils.randomResourceName(azureResourceManager, "fog", 20); final String dbName = "dbSample"; final String administratorLogin = "sqladmin3423"; final String administratorPassword = Utils.password(); diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/sql/samples/ManageSqlFirewallRules.java b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/sql/samples/ManageSqlFirewallRules.java index 537274952857..fc081e635b6f 100644 --- a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/sql/samples/ManageSqlFirewallRules.java +++ b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/sql/samples/ManageSqlFirewallRules.java @@ -37,8 +37,8 @@ public final class ManageSqlFirewallRules { * @return true if sample runs successfully */ public static boolean runSample(AzureResourceManager azureResourceManager) { - final String sqlServerName = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("sqlserver", 20); - final String rgName = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("rgRSSDFW", 20); + final String sqlServerName = Utils.randomResourceName(azureResourceManager, "sqlserver", 20); + final String rgName = Utils.randomResourceName(azureResourceManager, "rgRSSDFW", 20); final String administratorLogin = "sqladmin3423"; final String administratorPassword = Utils.password(); final String firewallRuleIPAddress = "10.0.0.1"; diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/sql/samples/ManageSqlImportExportDatabase.java b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/sql/samples/ManageSqlImportExportDatabase.java index 903b8307b507..e784b4bca024 100644 --- a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/sql/samples/ManageSqlImportExportDatabase.java +++ b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/sql/samples/ManageSqlImportExportDatabase.java @@ -33,9 +33,9 @@ public final class ManageSqlImportExportDatabase { * @return true if sample runs successfully */ public static boolean runSample(AzureResourceManager azureResourceManager) { - final String sqlServerName = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("sqlserver", 20); - final String rgName = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("rgsql", 20); - String storageName = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName(sqlServerName, 23); + final String sqlServerName = Utils.randomResourceName(azureResourceManager, "sqlserver", 20); + final String rgName = Utils.randomResourceName(azureResourceManager, "rgsql", 20); + String storageName = Utils.randomResourceName(azureResourceManager, sqlServerName, 23); final String administratorLogin = "sqladmin3423"; final String administratorPassword = Utils.password(); final String dbFromSampleName = "db-from-sample"; diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/sql/samples/ManageSqlServerDnsAliases.java b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/sql/samples/ManageSqlServerDnsAliases.java index cd417cbff6f2..86873a4a71d6 100644 --- a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/sql/samples/ManageSqlServerDnsAliases.java +++ b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/sql/samples/ManageSqlServerDnsAliases.java @@ -40,11 +40,11 @@ public class ManageSqlServerDnsAliases { * @return true if sample runs successfully */ public static boolean runSample(AzureResourceManager azureResourceManager) throws ClassNotFoundException, SQLException { - final String sqlServerForTestName = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("sqltest", 20); - final String sqlServerForProdName = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("sqlprod", 20); - final String sqlServerDnsAlias = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("sqlserver", 20); + final String sqlServerForTestName = Utils.randomResourceName(azureResourceManager, "sqltest", 20); + final String sqlServerForProdName = Utils.randomResourceName(azureResourceManager, "sqlprod", 20); + final String sqlServerDnsAlias = Utils.randomResourceName(azureResourceManager, "sqlserver", 20); final String dbName = "dbSample"; - final String rgName = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("rgRSSDFW", 20); + final String rgName = Utils.randomResourceName(azureResourceManager, "rgRSSDFW", 20); final String administratorLogin = "sqladmin3423"; final String administratorPassword = Utils.password(); try { diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/sql/samples/ManageSqlServerKeysWithAzureKeyVaultKey.java b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/sql/samples/ManageSqlServerKeysWithAzureKeyVaultKey.java index 04dce40c1fa4..797e5e54b735 100644 --- a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/sql/samples/ManageSqlServerKeysWithAzureKeyVaultKey.java +++ b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/sql/samples/ManageSqlServerKeysWithAzureKeyVaultKey.java @@ -43,10 +43,10 @@ public class ManageSqlServerKeysWithAzureKeyVaultKey { * @return true if sample runs successfully */ public static boolean runSample(AzureResourceManager azureResourceManager, String objectId) { - final String sqlServerName = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("sqlsrv", 20); - final String rgName = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("rgsql", 20); - final String vaultName = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("sqlkv", 20); - final String keyName = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("sqlkey", 20); + final String sqlServerName = Utils.randomResourceName(azureResourceManager, "sqlsrv", 20); + final String rgName = Utils.randomResourceName(azureResourceManager, "rgsql", 20); + final String vaultName = Utils.randomResourceName(azureResourceManager, "sqlkv", 20); + final String keyName = Utils.randomResourceName(azureResourceManager, "sqlkey", 20); final String administratorLogin = "sqladmin3423"; final String administratorPassword = Utils.password(); diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/sql/samples/ManageSqlServerSecurityAlertPolicy.java b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/sql/samples/ManageSqlServerSecurityAlertPolicy.java index 24440ce92200..5e20ea526e6c 100644 --- a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/sql/samples/ManageSqlServerSecurityAlertPolicy.java +++ b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/sql/samples/ManageSqlServerSecurityAlertPolicy.java @@ -33,9 +33,9 @@ public class ManageSqlServerSecurityAlertPolicy { * @return true if sample runs successfully */ public static boolean runSample(AzureResourceManager azureResourceManager) { - final String sqlServerName = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("sql", 20); - final String storageAccountName = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("sqlsa", 20); - final String rgName = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("rgsql", 20); + final String sqlServerName = Utils.randomResourceName(azureResourceManager, "sql", 20); + final String storageAccountName = Utils.randomResourceName(azureResourceManager, "sqlsa", 20); + final String rgName = Utils.randomResourceName(azureResourceManager, "rgsql", 20); final Region region = Region.US_EAST; final String dbName = "dbSample"; final String administratorLogin = "sqladmin3423"; diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/sql/samples/ManageSqlVirtualNetworkRules.java b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/sql/samples/ManageSqlVirtualNetworkRules.java index 6a984eb748ae..fe86584c9ebc 100644 --- a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/sql/samples/ManageSqlVirtualNetworkRules.java +++ b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/sql/samples/ManageSqlVirtualNetworkRules.java @@ -37,11 +37,11 @@ public class ManageSqlVirtualNetworkRules { * @return true if sample runs successfully */ public static boolean runSample(AzureResourceManager azureResourceManager) { - final String sqlServerName = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("sqlserver", 20); - final String rgName = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("rgRSSDFW", 20); + final String sqlServerName = Utils.randomResourceName(azureResourceManager, "sqlserver", 20); + final String rgName = Utils.randomResourceName(azureResourceManager, "rgRSSDFW", 20); final String administratorLogin = "sqladmin3423"; final String administratorPassword = Utils.password(); - final String vnetName = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("vnetsql", 20); + final String vnetName = Utils.randomResourceName(azureResourceManager, "vnetsql", 20); try { diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/sql/samples/ManageSqlWithRecoveredOrRestoredDatabase.java b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/sql/samples/ManageSqlWithRecoveredOrRestoredDatabase.java index 06296cfe3649..a290c6aa2c90 100644 --- a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/sql/samples/ManageSqlWithRecoveredOrRestoredDatabase.java +++ b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/sql/samples/ManageSqlWithRecoveredOrRestoredDatabase.java @@ -37,8 +37,8 @@ public final class ManageSqlWithRecoveredOrRestoredDatabase { * @return true if sample runs successfully */ public static boolean runSample(AzureResourceManager azureResourceManager) { - final String sqlServerName = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("sqlserver", 20); - final String rgName = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("rgsql", 20); + final String sqlServerName = Utils.randomResourceName(azureResourceManager, "sqlserver", 20); + final String rgName = Utils.randomResourceName(azureResourceManager, "rgsql", 20); final String administratorLogin = "sqladmin3423"; final String administratorPassword = Utils.password(); final String dbToDeleteName = "db-to-delete"; diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/storage/samples/ManageStorageAccount.java b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/storage/samples/ManageStorageAccount.java index 31caddbbe3b5..077728c2ee0e 100644 --- a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/storage/samples/ManageStorageAccount.java +++ b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/storage/samples/ManageStorageAccount.java @@ -40,10 +40,10 @@ public final class ManageStorageAccount { * @return true if sample runs successfully */ public static boolean runSample(AzureResourceManager azureResourceManager) { - final String storageAccountName = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("sa", 8); - final String storageAccountName2 = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("sa2", 8); - final String storageAccountName3 = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("sa3", 8); - final String rgName = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("rgSTMS", 8); + final String storageAccountName = Utils.randomResourceName(azureResourceManager, "sa", 8); + final String storageAccountName2 = Utils.randomResourceName(azureResourceManager, "sa2", 8); + final String storageAccountName3 = Utils.randomResourceName(azureResourceManager, "sa3", 8); + final String rgName = Utils.randomResourceName(azureResourceManager, "rgSTMS", 8); try { // ============================================================ diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/storage/samples/ManageStorageAccountAsync.java b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/storage/samples/ManageStorageAccountAsync.java index ab660c32f218..7562c81b8ae2 100644 --- a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/storage/samples/ManageStorageAccountAsync.java +++ b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/storage/samples/ManageStorageAccountAsync.java @@ -30,9 +30,9 @@ public final class ManageStorageAccountAsync { * @return true if sample runs successfully */ public static boolean runSample(final AzureResourceManager azureResourceManager) { - final String storageAccountName = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("sa", 8); - final String storageAccountName2 = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("sa2", 8); - final String rgName = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("rgSTMS", 8); + final String storageAccountName = Utils.randomResourceName(azureResourceManager, "sa", 8); + final String storageAccountName2 = Utils.randomResourceName(azureResourceManager, "sa2", 8); + final String rgName = Utils.randomResourceName(azureResourceManager, "rgSTMS", 8); try { // ============================================================ diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/storage/samples/ManageStorageAccountNetworkRules.java b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/storage/samples/ManageStorageAccountNetworkRules.java index 0b30fd3e188a..fc3304d6ce09 100644 --- a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/storage/samples/ManageStorageAccountNetworkRules.java +++ b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/storage/samples/ManageStorageAccountNetworkRules.java @@ -36,12 +36,12 @@ public final class ManageStorageAccountNetworkRules { * @return true if sample runs successfully */ public static boolean runSample(AzureResourceManager azureResourceManager) { - final String rgName = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("rgSTMS", 8); - final String networkName = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("nw", 8); + final String rgName = Utils.randomResourceName(azureResourceManager, "rgSTMS", 8); + final String networkName = Utils.randomResourceName(azureResourceManager, "nw", 8); final String subnetName = "subnetA"; - final String storageAccountName = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("sa", 8); - final String publicIpName = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("pip", 8); - final String vmName = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("vm", 8); + final String storageAccountName = Utils.randomResourceName(azureResourceManager, "sa", 8); + final String publicIpName = Utils.randomResourceName(azureResourceManager, "pip", 8); + final String vmName = Utils.randomResourceName(azureResourceManager, "vm", 8); try { // ============================================================ diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/trafficmanager/samples/ManageSimpleTrafficManager.java b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/trafficmanager/samples/ManageSimpleTrafficManager.java index e8013be9d262..afe7e11321e8 100644 --- a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/trafficmanager/samples/ManageSimpleTrafficManager.java +++ b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/trafficmanager/samples/ManageSimpleTrafficManager.java @@ -15,6 +15,7 @@ import com.azure.core.management.Region; import com.azure.resourcemanager.resources.fluentcore.model.Creatable; import com.azure.resourcemanager.resources.models.ResourceGroup; +import com.azure.resourcemanager.samples.Utils; import com.azure.resourcemanager.trafficmanager.models.TrafficManagerProfile; import org.apache.commons.lang.time.StopWatch; @@ -39,7 +40,7 @@ public final class ManageSimpleTrafficManager { * @return true if sample runs successfully */ public static boolean runSample(AzureResourceManager azureResourceManager) { - final String rgName = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("rgCOPD", 24); + final String rgName = Utils.randomResourceName(azureResourceManager, "rgCOPD", 24); final String userName = "tirekicker"; final String sshKey = "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCfSPC2K7LZcFKEO+/t3dzmQYtrJFZNxOsbVgOVKietqHyvmYGHEC0J2wPdAqQ/63g/hhAEFRoyehM+rbeDri4txB3YFfnOK58jqdkyXzupWqXzOrlKY4Wz9SKjjN765+dqUITjKRIaAip1Ri137szRg71WnrmdP3SphTRlCx1Bk2nXqWPsclbRDCiZeF8QOTi4JqbmJyK5+0UqhqYRduun8ylAwKKQJ1NJt85sYIHn9f1Rfr6Tq2zS0wZ7DHbZL+zB5rSlAr8QyUdg/GQD+cmSs6LvPJKL78d6hMGk84ARtFo4A79ovwX/Fj01znDQkU6nJildfkaolH2rWFG/qttD azjava@javalib.com"; final int vmCountPerRegion = 2; @@ -64,7 +65,7 @@ public static boolean runSample(AzureResourceManager azureResourceManager) { List> creatableVirtualMachines = new ArrayList<>(); for (Region region : regions) { - String linuxVMNamePrefix = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("vm", 15); + String linuxVMNamePrefix = Utils.randomResourceName(azureResourceManager, "vm", 15); for (int i = 0; i < vmCountPerRegion; i++) { //============================================================= // Create a virtual machine in its own virtual network @@ -99,7 +100,7 @@ public static boolean runSample(AzureResourceManager azureResourceManager) { //============================================================= // Create 1 traffic manager profile // - String trafficManagerName = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("tra", 15); + String trafficManagerName = Utils.randomResourceName(azureResourceManager, "tra", 15); TrafficManagerProfile.DefinitionStages.WithEndpoint profileWithEndpoint = azureResourceManager.trafficManagerProfiles() .define(trafficManagerName) .withExistingResourceGroup(resourceGroup) @@ -109,7 +110,7 @@ public static boolean runSample(AzureResourceManager azureResourceManager) { TrafficManagerProfile.DefinitionStages.WithCreate profileWithCreate = null; int routingPriority = 1; for (VirtualMachine vm : virtualMachines) { - String endpointName = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("ep", 15); + String endpointName = Utils.randomResourceName(azureResourceManager, "ep", 15); profileWithCreate = profileWithEndpoint.defineAzureTargetEndpoint(endpointName) .toResourceId(vm.getPrimaryPublicIPAddressId()) .withRoutingPriority(routingPriority++) diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/trafficmanager/samples/ManageTrafficManager.java b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/trafficmanager/samples/ManageTrafficManager.java index f065679f40cd..77dfaa7d7eff 100644 --- a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/trafficmanager/samples/ManageTrafficManager.java +++ b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/trafficmanager/samples/ManageTrafficManager.java @@ -49,13 +49,13 @@ public final class ManageTrafficManager { * @return true if sample runs successfully */ public static boolean runSample(AzureResourceManager azureResourceManager) throws IOException { - final String rgName = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("rgNEMV_", 24); - final String domainName = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("jsdkdemo-", 20) + ".com"; + final String rgName = Utils.randomResourceName(azureResourceManager, "rgNEMV_", 24); + final String domainName = Utils.randomResourceName(azureResourceManager, "jsdkdemo-", 20) + ".com"; // [SuppressMessage("Microsoft.Security", "CS002:SecretInNextLine", Justification="Serves as an example, not for deployment. Please change when using this in your code.")] final String certPassword = "StrongPass!12"; - final String appServicePlanNamePrefix = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("jplan1_", 15); - final String webAppNamePrefix = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("webapp1-", 20); - final String tmName = azureResourceManager.resourceGroups().manager().internalContext().randomResourceName("jsdktm-", 20); + final String appServicePlanNamePrefix = Utils.randomResourceName(azureResourceManager, "jplan1_", 15); + final String webAppNamePrefix = Utils.randomResourceName(azureResourceManager, "webapp1-", 20); + final String tmName = Utils.randomResourceName(azureResourceManager, "jsdktm-", 20); final List regions = new ArrayList<>(); // The regions in which web app needs to be created // From f0ff45d094398dec657bcc3d431e62948a65b745 Mon Sep 17 00:00:00 2001 From: Weidong Xu Date: Mon, 28 Sep 2020 10:14:57 +0800 Subject: [PATCH 4/8] update merged sample --- .../samples/ManageLinuxWebAppCosmosDbByMsi.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/appservice/samples/ManageLinuxWebAppCosmosDbByMsi.java b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/appservice/samples/ManageLinuxWebAppCosmosDbByMsi.java index 2f2b7799f22b..6a07b2ad4401 100644 --- a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/appservice/samples/ManageLinuxWebAppCosmosDbByMsi.java +++ b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/appservice/samples/ManageLinuxWebAppCosmosDbByMsi.java @@ -50,12 +50,12 @@ public final class ManageLinuxWebAppCosmosDbByMsi { public static boolean runSample(AzureResourceManager azure, String clientId) throws IOException, InterruptedException { // New resources final Region region = Region.US_WEST; - final String acrName = azure.resourceGroups().manager().internalContext().randomResourceName("acr", 20); - final String appName = azure.resourceGroups().manager().internalContext().randomResourceName("webapp1-", 20); + final String acrName = Utils.randomResourceName(azure, "acr", 20); + final String appName = Utils.randomResourceName(azure, "webapp1-", 20); final String password = Utils.password(); - final String rgName = azure.resourceGroups().manager().internalContext().randomResourceName("rg1NEMV_", 24); - final String vaultName = azure.resourceGroups().manager().internalContext().randomResourceName("vault", 20); - final String cosmosName = azure.resourceGroups().manager().internalContext().randomResourceName("cosmosdb", 20); + final String rgName = Utils.randomResourceName(azure, "rg1NEMV_", 24); + final String vaultName = Utils.randomResourceName(azure, "vault", 20); + final String cosmosName = Utils.randomResourceName(azure, "cosmosdb", 20); String servicePrincipalClientId = clientId; // replace with a real service principal client id From d0f7e760826d4ff67bc3adec7277474c16fedf49 Mon Sep 17 00:00:00 2001 From: Weidong Xu Date: Mon, 28 Sep 2020 10:35:56 +0800 Subject: [PATCH 5/8] increase retry count, appservice seems take much longer to get app/function ready to use --- .../azure/resourcemanager/samples/Utils.java | 25 +++++++++++++------ 1 file changed, 18 insertions(+), 7 deletions(-) diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/samples/Utils.java b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/samples/Utils.java index 0d31d7a6994a..a89c4f799443 100644 --- a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/samples/Utils.java +++ b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/samples/Utils.java @@ -3300,6 +3300,7 @@ public static void print(SpringApp springApp) { /** * Sends a GET request to target URL. *

+ * Retry logic tuned for AppService. * The method does not handle 301 redirect. * * @param urlString the target URL. @@ -3310,7 +3311,7 @@ public static String sendGetRequest(String urlString) { Mono>> response = HTTP_CLIENT.getString(getHost(urlString), getPathAndQuery(urlString)) .retryWhen(Retry - .fixedDelay(3, Duration.ofSeconds(30)) + .fixedDelay(5, Duration.ofSeconds(30)) .filter(t -> { if (t instanceof TimeoutException) { return true; @@ -3329,6 +3330,8 @@ public static String sendGetRequest(String urlString) { /** * Sends a POST request to target URL. + *

+ * Retry logic tuned for AppService. * * @param urlString the target URL. * @param body the request body. @@ -3336,12 +3339,20 @@ public static String sendGetRequest(String urlString) { * */ public static String sendPostRequest(String urlString, String body) { try { - Response response = stringResponse(HTTP_CLIENT.postString(getHost(urlString), getPathAndQuery(urlString), body)).block(); - if (response != null) { - return response.getValue(); - } else { - return null; - } + Mono> response = + stringResponse(HTTP_CLIENT.postString(getHost(urlString), getPathAndQuery(urlString), body)) + .retryWhen(Retry + .fixedDelay(5, Duration.ofSeconds(30)) + .filter(t -> {if (t instanceof TimeoutException) { + return true; + } else if (t instanceof HttpResponseException + && ((HttpResponseException) t).getResponse().getStatusCode() == 404) { + return true; + } + return false; + })); + Response ret = response.block(); + return ret == null ? null : ret.getValue(); } catch (Exception e) { return null; } From 7280707ee1c8d3f5c33b35710a3014aca1d5fc75 Mon Sep 17 00:00:00 2001 From: Weidong Xu Date: Mon, 28 Sep 2020 10:44:47 +0800 Subject: [PATCH 6/8] improvement on retry and logging Signed-off-by: Weidong Xu --- .../ManageServicePrincipalCredentials.java | 12 ++-- .../samples/ManageUsersGroupsAndRoles.java | 12 ++-- ...etUserAssignedMSIFromServicePrincipal.java | 11 ++-- .../azure/resourcemanager/samples/Utils.java | 63 +++++++++++++++---- 4 files changed, 70 insertions(+), 28 deletions(-) diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/authorization/samples/ManageServicePrincipalCredentials.java b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/authorization/samples/ManageServicePrincipalCredentials.java index 06fb83ae0ac4..a7e83282d0a5 100644 --- a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/authorization/samples/ManageServicePrincipalCredentials.java +++ b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/authorization/samples/ManageServicePrincipalCredentials.java @@ -40,15 +40,15 @@ public final class ManageServicePrincipalCredentials { * @return true if sample runs successfully */ public static boolean runSample(AzureResourceManager.Authenticated authenticated, AzureProfile profile) throws IOException { - final String spName = authenticated.roleAssignments().manager().internalContext().randomResourceName("sp", 20); - final String appName = authenticated.roleAssignments().manager().internalContext().randomResourceName("app", 20); + final String spName = Utils.randomResourceName(authenticated, "sp", 20); + final String appName = Utils.randomResourceName(authenticated, "app", 20); final String appUrl = "https://" + appName; - final String passwordName1 = authenticated.roleAssignments().manager().internalContext().randomResourceName("password", 20); + final String passwordName1 = Utils.randomResourceName(authenticated, "password", 20); final String password1 = "P@ssw0rd"; - final String passwordName2 = authenticated.roleAssignments().manager().internalContext().randomResourceName("password", 20); + final String passwordName2 = Utils.randomResourceName(authenticated, "password", 20); final String password2 = "StrongP@ss!12"; - final String certName1 = authenticated.roleAssignments().manager().internalContext().randomResourceName("cert", 20); - final String raName = authenticated.roleAssignments().manager().internalContext().randomUuid(); + final String certName1 = Utils.randomResourceName(authenticated, "cert", 20); + final String raName = Utils.randomUuid(authenticated); String servicePrincipalId = ""; try { // ============================================================ diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/authorization/samples/ManageUsersGroupsAndRoles.java b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/authorization/samples/ManageUsersGroupsAndRoles.java index e1472ec672a0..b98c44e03741 100644 --- a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/authorization/samples/ManageUsersGroupsAndRoles.java +++ b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/authorization/samples/ManageUsersGroupsAndRoles.java @@ -40,13 +40,13 @@ public final class ManageUsersGroupsAndRoles { * @return true if sample runs successfully */ public static boolean runSample(AzureResourceManager.Authenticated authenticated, AzureProfile profile) { - final String userEmail = authenticated.roleAssignments().manager().internalContext().randomResourceName("test", 15); + final String userEmail = Utils.randomResourceName(authenticated, "test", 15); final String userName = userEmail.replace("test", "Test "); - final String spName = authenticated.roleAssignments().manager().internalContext().randomResourceName("sp", 15); - final String raName1 = authenticated.roleAssignments().manager().internalContext().randomUuid(); - final String raName2 = authenticated.roleAssignments().manager().internalContext().randomUuid(); - final String groupEmail1 = authenticated.roleAssignments().manager().internalContext().randomResourceName("group1", 15); - final String groupEmail2 = authenticated.roleAssignments().manager().internalContext().randomResourceName("group2", 15); + final String spName = Utils.randomResourceName(authenticated, "sp", 15); + final String raName1 = Utils.randomUuid(authenticated); + final String raName2 = Utils.randomUuid(authenticated); + final String groupEmail1 = Utils.randomResourceName(authenticated, "group1", 15); + final String groupEmail2 = Utils.randomResourceName(authenticated, "group2", 15); final String groupName1 = groupEmail1.replace("group1", "Group "); final String groupName2 = groupEmail2.replace("group2", "Group "); String spId = ""; diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/compute/samples/ManageScaleSetUserAssignedMSIFromServicePrincipal.java b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/compute/samples/ManageScaleSetUserAssignedMSIFromServicePrincipal.java index 3c0cefc6aa5b..c9379a72cc6e 100644 --- a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/compute/samples/ManageScaleSetUserAssignedMSIFromServicePrincipal.java +++ b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/compute/samples/ManageScaleSetUserAssignedMSIFromServicePrincipal.java @@ -23,6 +23,7 @@ import com.azure.core.management.Region; import com.azure.core.management.profile.AzureProfile; import com.azure.resourcemanager.resources.fluentcore.arm.ResourceId; +import com.azure.resourcemanager.samples.Utils; /** * Azure Compute sample for assigning service identity to virtual machine scale set using newly created service principal @@ -41,11 +42,11 @@ public final class ManageScaleSetUserAssignedMSIFromServicePrincipal { */ public static boolean runSample(AzureResourceManager.Authenticated authenticated) { Region region = Region.US_WEST_CENTRAL; - String vmssName = authenticated.roleAssignments().manager().internalContext().randomResourceName("vmss", 15); - String spName1 = authenticated.roleAssignments().manager().internalContext().randomResourceName("sp1", 21); - String rgName = authenticated.roleAssignments().manager().internalContext().randomResourceName("rg", 22); - String identityName1 = authenticated.roleAssignments().manager().internalContext().randomResourceName("msi-id1", 15); - String identityName2 = authenticated.roleAssignments().manager().internalContext().randomResourceName("msi-id1", 15); + String vmssName = Utils.randomResourceName(authenticated, "vmss", 15); + String spName1 = Utils.randomResourceName(authenticated, "sp1", 21); + String rgName = Utils.randomResourceName(authenticated, "rg", 22); + String identityName1 = Utils.randomResourceName(authenticated, "msi-id1", 15); + String identityName2 = Utils.randomResourceName(authenticated, "msi-id1", 15); ServicePrincipal servicePrincipal = null; String subscription = "0b1f6471-1bf0-4dda-aec3-cb9272f09590"; diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/samples/Utils.java b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/samples/Utils.java index a89c4f799443..2f84e666aecf 100644 --- a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/samples/Utils.java +++ b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/samples/Utils.java @@ -23,6 +23,7 @@ import com.azure.core.http.rest.SimpleResponse; import com.azure.core.management.exception.ManagementException; import com.azure.core.util.FluxUtil; +import com.azure.core.util.logging.ClientLogger; import com.azure.core.util.serializer.JacksonAdapter; import com.azure.core.util.serializer.SerializerEncoding; import com.azure.resourcemanager.AzureResourceManager; @@ -234,6 +235,7 @@ */ public final class Utils { + /** @return a generated password */ public static String password() { String password = new ResourceManagerUtils.InternalRuntimeContext().randomResourceName("Pa5$", 12); @@ -283,6 +285,30 @@ public static String randomUuid(AzureResourceManager azure) { return azure.resourceGroups().manager().internalContext().randomUuid(); } + /** + * Creates a randomized resource name. + * Please provider your own implementation, or avoid using the method, if code is to be used in production. + * + * @param authenticated the AzureResourceManager.Authenticated instance. + * @param prefix the prefix to the name. + * @param maxLen the max length of the name. + * @return the randomized resource name. + */ + public static String randomResourceName(AzureResourceManager.Authenticated authenticated, String prefix, int maxLen) { + return Utils.randomResourceName(authenticated, prefix, maxLen); + } + + /** + * Creates a random UUID. + * Please provider your own implementation, or avoid using the method, if code is to be used in production. + * + * @param authenticated the AzureResourceManager.Authenticated instance. + * @return the random UUID. + */ + public static String randomUuid(AzureResourceManager.Authenticated authenticated) { + return Utils.randomUuid(authenticated); + } + /** * Print resource group info. * @@ -3307,23 +3333,30 @@ public static void print(SpringApp springApp) { * @return Content of the HTTP response. */ public static String sendGetRequest(String urlString) { + ClientLogger logger = new ClientLogger(Utils.class); + try { Mono>> response = HTTP_CLIENT.getString(getHost(urlString), getPathAndQuery(urlString)) .retryWhen(Retry .fixedDelay(5, Duration.ofSeconds(30)) .filter(t -> { + boolean retry = false; if (t instanceof TimeoutException) { - return true; + retry = true; } else if (t instanceof HttpResponseException && ((HttpResponseException) t).getResponse().getStatusCode() == 503) { - return true; + retry = true; + } + if (retry) { + logger.info("retry GET request to {}", urlString); } - return false; + return retry; })); Response ret = stringResponse(response).block(); return ret == null ? null : ret.getValue(); } catch (MalformedURLException e) { + logger.logThrowableAsError(e); return null; } } @@ -3338,22 +3371,30 @@ public static String sendGetRequest(String urlString) { * @return Content of the HTTP response. * */ public static String sendPostRequest(String urlString, String body) { + ClientLogger logger = new ClientLogger(Utils.class); + try { Mono> response = stringResponse(HTTP_CLIENT.postString(getHost(urlString), getPathAndQuery(urlString), body)) .retryWhen(Retry .fixedDelay(5, Duration.ofSeconds(30)) - .filter(t -> {if (t instanceof TimeoutException) { - return true; - } else if (t instanceof HttpResponseException - && ((HttpResponseException) t).getResponse().getStatusCode() == 404) { - return true; - } - return false; - })); + .filter(t -> { + boolean retry = false; + if (t instanceof TimeoutException) { + retry = true; + } else if (t instanceof HttpResponseException + && ((HttpResponseException) t).getResponse().getStatusCode() == 404) { + retry = true; + } + if (retry) { + logger.info("retry POST request to {}", urlString); + } + return retry; + })); Response ret = response.block(); return ret == null ? null : ret.getValue(); } catch (Exception e) { + logger.logThrowableAsError(e); return null; } } From f70c1d93f87b4c8d3d9620c43a670c2b0076d128 Mon Sep 17 00:00:00 2001 From: Weidong Xu Date: Mon, 28 Sep 2020 11:19:27 +0800 Subject: [PATCH 7/8] fix bug --- .../java/com/azure/resourcemanager/samples/Utils.java | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/samples/Utils.java b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/samples/Utils.java index 2f84e666aecf..9cb88a6b39bc 100644 --- a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/samples/Utils.java +++ b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/samples/Utils.java @@ -295,7 +295,7 @@ public static String randomUuid(AzureResourceManager azure) { * @return the randomized resource name. */ public static String randomResourceName(AzureResourceManager.Authenticated authenticated, String prefix, int maxLen) { - return Utils.randomResourceName(authenticated, prefix, maxLen); + return authenticated.roleAssignments().manager().internalContext().randomResourceName(prefix, maxLen); } /** @@ -306,7 +306,7 @@ public static String randomResourceName(AzureResourceManager.Authenticated authe * @return the random UUID. */ public static String randomUuid(AzureResourceManager.Authenticated authenticated) { - return Utils.randomUuid(authenticated); + return authenticated.roleAssignments().manager().internalContext().randomUuid(); } /** @@ -3348,6 +3348,7 @@ public static String sendGetRequest(String urlString) { && ((HttpResponseException) t).getResponse().getStatusCode() == 503) { retry = true; } + if (retry) { logger.info("retry GET request to {}", urlString); } @@ -3382,10 +3383,8 @@ public static String sendPostRequest(String urlString, String body) { boolean retry = false; if (t instanceof TimeoutException) { retry = true; - } else if (t instanceof HttpResponseException - && ((HttpResponseException) t).getResponse().getStatusCode() == 404) { - retry = true; } + if (retry) { logger.info("retry POST request to {}", urlString); } From b2e0a718bdd76a4327e42482d087df69040fddf5 Mon Sep 17 00:00:00 2001 From: Weidong Xu Date: Mon, 28 Sep 2020 12:11:29 +0800 Subject: [PATCH 8/8] ftp deploy to function app need to use a different path --- .../samples/ManageFunctionAppLogs.java | 6 ++--- .../ManageFunctionAppSourceControl.java | 6 ++--- .../azure/resourcemanager/samples/Utils.java | 27 ++++++++++++++----- 3 files changed, 27 insertions(+), 12 deletions(-) diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/appservice/samples/ManageFunctionAppLogs.java b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/appservice/samples/ManageFunctionAppLogs.java index 57dd82c73a18..5f3527fecc32 100644 --- a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/appservice/samples/ManageFunctionAppLogs.java +++ b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/appservice/samples/ManageFunctionAppLogs.java @@ -71,9 +71,9 @@ public static boolean runSample(AzureResourceManager azureResourceManager) throw System.out.println("Deploying a function app to " + appName + " through FTP..."); - Utils.uploadFileViaFtp(app.getPublishingProfile(), "host.json", ManageFunctionAppLogs.class.getResourceAsStream("/square-function-app/host.json")); - Utils.uploadFileViaFtp(app.getPublishingProfile(), "square/function.json", ManageFunctionAppLogs.class.getResourceAsStream("/square-function-app/square/function.json")); - Utils.uploadFileViaFtp(app.getPublishingProfile(), "square/index.js", ManageFunctionAppLogs.class.getResourceAsStream("/square-function-app/square/index.js")); + Utils.uploadFileForFunctionViaFtp(app.getPublishingProfile(), "host.json", ManageFunctionAppLogs.class.getResourceAsStream("/square-function-app/host.json")); + Utils.uploadFileForFunctionViaFtp(app.getPublishingProfile(), "square/function.json", ManageFunctionAppLogs.class.getResourceAsStream("/square-function-app/square/function.json")); + Utils.uploadFileForFunctionViaFtp(app.getPublishingProfile(), "square/index.js", ManageFunctionAppLogs.class.getResourceAsStream("/square-function-app/square/index.js")); // sync triggers app.syncTriggers(); diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/appservice/samples/ManageFunctionAppSourceControl.java b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/appservice/samples/ManageFunctionAppSourceControl.java index 2b690d245d65..d079cf2bc1b1 100644 --- a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/appservice/samples/ManageFunctionAppSourceControl.java +++ b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/appservice/samples/ManageFunctionAppSourceControl.java @@ -80,9 +80,9 @@ public static boolean runSample(AzureResourceManager azureResourceManager) throw System.out.println("Deploying a function app to " + app1Name + " through FTP..."); - Utils.uploadFileViaFtp(app1.getPublishingProfile(), "host.json", ManageFunctionAppSourceControl.class.getResourceAsStream("/square-function-app/host.json")); - Utils.uploadFileViaFtp(app1.getPublishingProfile(), "square/function.json", ManageFunctionAppSourceControl.class.getResourceAsStream("/square-function-app/square/function.json")); - Utils.uploadFileViaFtp(app1.getPublishingProfile(), "square/index.js", ManageFunctionAppSourceControl.class.getResourceAsStream("/square-function-app/square/index.js")); + Utils.uploadFileForFunctionViaFtp(app1.getPublishingProfile(), "host.json", ManageFunctionAppSourceControl.class.getResourceAsStream("/square-function-app/host.json")); + Utils.uploadFileForFunctionViaFtp(app1.getPublishingProfile(), "square/function.json", ManageFunctionAppSourceControl.class.getResourceAsStream("/square-function-app/square/function.json")); + Utils.uploadFileForFunctionViaFtp(app1.getPublishingProfile(), "square/index.js", ManageFunctionAppSourceControl.class.getResourceAsStream("/square-function-app/square/index.js")); // sync triggers app1.syncTriggers(); diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/samples/Utils.java b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/samples/Utils.java index 9cb88a6b39bc..029918d63064 100644 --- a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/samples/Utils.java +++ b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/samples/Utils.java @@ -236,6 +236,9 @@ public final class Utils { + private Utils() { + } + /** @return a generated password */ public static String password() { String password = new ResourceManagerUtils.InternalRuntimeContext().randomResourceName("Pa5$", 12); @@ -2248,17 +2251,33 @@ public static void print(VirtualMachineCustomImage image) { } /** - * Uploads a file to an Azure app service. + * Uploads a file to an Azure app service for Web App. * * @param profile the publishing profile for the app service. * @param fileName the name of the file on server * @param file the local file */ public static void uploadFileViaFtp(PublishingProfile profile, String fileName, InputStream file) { + String path = "./site/wwwroot/webapps"; + uploadFileViaFtp(profile, fileName, file, path); + } + + /** + * Uploads a file to an Azure app service for Function App. + * + * @param profile the publishing profile for the app service. + * @param fileName the name of the file on server + * @param file the local file + */ + public static void uploadFileForFunctionViaFtp(PublishingProfile profile, String fileName, InputStream file) { + String path = "./site/wwwroot"; + uploadFileViaFtp(profile, fileName, file, path); + } + + private static void uploadFileViaFtp(PublishingProfile profile, String fileName, InputStream file, String path) { FTPClient ftpClient = new FTPClient(); String[] ftpUrlSegments = profile.ftpUrl().split("/", 2); String server = ftpUrlSegments[0]; - String path = "./site/wwwroot/webapps"; if (fileName.contains("/")) { int lastslash = fileName.lastIndexOf('/'); path = path + "/" + fileName.substring(0, lastslash); @@ -2282,10 +2301,6 @@ public static void uploadFileViaFtp(PublishingProfile profile, String fileName, } } - private Utils() { - - } - /** * Print service bus namespace info. *