From 298fb250f12818925546bfde29d9f52091406656 Mon Sep 17 00:00:00 2001 From: Chuang <54572251+xccc-msft@users.noreply.github.com> Date: Thu, 24 Sep 2020 21:53:57 +0800 Subject: [PATCH] mgmt disallow user pass SdkContext into Manager class (#15539) * remove SdkContext from user input * update msi for sdk context change * update storage * add method setSdkContext * update after adding new method to set SdkContext * update pom for -add-opens --- .../appplatform/AppPlatformManager.java | 21 +---- .../azure-resourcemanager-appservice/pom.xml | 26 +++++++ .../appservice/AppServiceManager.java | 29 ++----- .../implementation/AppServiceBaseImpl.java | 2 +- .../implementation/FunctionAppImpl.java | 4 +- .../appservice/AppServiceTest.java | 5 +- .../authorization/AuthorizationManager.java | 23 ++---- .../azure/resourcemanager/cdn/CdnManager.java | 21 +---- .../cdn/implementation/CdnEndpointImpl.java | 6 +- .../cdn/implementation/CdnEndpointsImpl.java | 3 +- .../cdn/CdnManagementTest.java | 7 +- .../azure-resourcemanager-compute/pom.xml | 25 ++++++ .../compute/ComputeManager.java | 26 ++----- .../implementation/VirtualMachineImpl.java | 2 +- .../VirtualMachineScaleSetImpl.java | 2 +- .../compute/ComputeManagementTest.java | 15 ++-- .../pom.xml | 24 ++++++ .../ContainerInstanceManager.java | 27 ++----- .../implementation/ContainerGroupImpl.java | 6 +- .../ContainerInstanceManagementTest.java | 3 +- .../ContainerRegistryManager.java | 24 +----- .../ContainerServiceManager.java | 21 +---- .../resourcemanager/cosmos/CosmosManager.java | 20 +---- .../resourcemanager/dns/DnsZoneManager.java | 20 +---- .../eventhubs/EventHubsManager.java | 24 +----- .../keyvault/KeyVaultManager.java | 23 +----- .../azure-resourcemanager-monitor/pom.xml | 3 + .../monitor/MonitorManager.java | 25 ++---- .../monitor/MonitorManagementTest.java | 3 +- .../azure-resourcemanager-msi/pom.xml | 24 ++++++ .../azure/resourcemanager/msi/MSIManager.java | 27 ++----- .../msi/MSIIdentityManagementTests.java | 3 +- .../azure-resourcemanager-network/pom.xml | 22 ++++++ .../network/NetworkManager.java | 20 +---- ...onGatewayBackendHttpConfigurationImpl.java | 2 +- .../ApplicationGatewayImpl.java | 15 ++-- .../ApplicationGatewayListenerImpl.java | 9 ++- ...licationGatewayRequestRoutingRuleImpl.java | 9 ++- .../ApplicationGatewayUrlPathMapImpl.java | 2 +- .../LoadBalancerFrontendImpl.java | 2 +- .../implementation/LoadBalancerImpl.java | 6 +- .../LoadBalancerInboundNatPoolImpl.java | 6 +- .../LoadBalancerInboundNatRuleImpl.java | 6 +- .../implementation/LoadBalancingRuleImpl.java | 6 +- .../network/implementation/NetworkImpl.java | 2 +- .../implementation/NetworkInterfaceImpl.java | 2 +- .../implementation/NetworkPeeringImpl.java | 3 +- .../VirtualNetworkGatewayImpl.java | 10 ++- .../network/NetworkManagementTest.java | 3 +- .../privatedns/PrivateDnsZoneManager.java | 22 +----- .../resourcemanager/redis/RedisManager.java | 20 +---- .../resources/ResourceManager.java | 36 ++++----- .../resources/fluentcore/arm/Manager.java | 14 +--- .../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 +++--- .../ManageServicePrincipalCredentials.java | 12 +-- .../samples/ManageUsersGroupsAndRoles.java | 12 +-- .../ManageCdnProfileWithCustomDomain.java | 8 +- .../samples/ManageCdnProfileWithWebApp.java | 6 +- .../ConvertVirtualMachineToManagedDisks.java | 4 +- ...VirtualMachineUsingCustomImageFromVHD.java | 12 +-- ...eVirtualMachineUsingCustomImageFromVM.java | 12 +-- ...chineUsingSpecializedDiskFromSnapshot.java | 18 ++--- ...ualMachineUsingSpecializedDiskFromVhd.java | 14 ++-- ...MachinesAsyncTrackingRelatedResources.java | 12 +-- .../CreateVirtualMachinesInParallel.java | 10 +-- ...hinesUsingCustomImageOrSpecializedVHD.java | 10 +-- .../samples/ManageAvailabilitySet.java | 12 +-- .../compute/samples/ManageManagedDisks.java | 46 +++++------ ...nabledVirtualMachineBelongsToAADGroup.java | 12 +-- ...etUserAssignedMSIFromServicePrincipal.java | 10 +-- ...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 | 10 +-- .../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 | 8 +- .../samples/DeployUsingARMTemplateAsync.java | 4 +- ...ngARMTemplateWithDeploymentOperations.java | 4 +- .../DeployUsingARMTemplateWithProgress.java | 8 +- .../DeployUsingARMTemplateWithTags.java | 8 +- .../DeployVirtualMachineUsingARMTemplate.java | 6 +- .../resources/samples/ManageResource.java | 6 +- .../samples/ManageResourceGroup.java | 8 +- .../resourcemanager/samples/DockerUtils.java | 4 +- ...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 | 8 +- .../samples/ManageTrafficManager.java | 10 +-- .../samples/SamplesTestBase.java | 2 +- .../servicebus/ServiceBusManager.java | 22 +----- .../azure-resourcemanager-sql/pom.xml | 23 ++++++ .../resourcemanager/sql/SqlServerManager.java | 21 +---- .../sql/implementation/SqlServerImpl.java | 4 +- .../resourcemanager/sql/SqlServerTest.java | 3 +- .../storage/StorageManager.java | 20 +---- .../test/ResourceManagerTestBase.java | 46 +++++++++++ .../trafficmanager/TrafficManager.java | 20 +---- .../azure-resourcemanager/pom.xml | 32 ++++++++ .../resourcemanager/AzureResourceManager.java | 78 ++++++------------- .../ApplicationGatewayTests.java | 27 +++---- .../AzureResourceManagerTests.java | 13 ++-- .../resourcemanager/TestAvailabilitySet.java | 2 +- ...ContainerInstanceWithPrivateIpAddress.java | 4 +- ...hPublicIpAddressWithSystemAssignedMSI.java | 4 +- .../TestContainerRegistry.java | 2 +- .../azure/resourcemanager/TestCosmosDB.java | 2 +- .../com/azure/resourcemanager/TestDns.java | 2 +- .../TestExpressRouteCircuit.java | 4 +- .../TestKubernetesCluster.java | 2 +- .../resourcemanager/TestLoadBalancer.java | 16 ++-- .../TestLocalNetworkGateway.java | 2 +- .../com/azure/resourcemanager/TestNSG.java | 4 +- .../azure/resourcemanager/TestNetwork.java | 20 ++--- .../resourcemanager/TestNetworkInterface.java | 2 +- .../resourcemanager/TestNetworkWatcher.java | 6 +- .../azure/resourcemanager/TestPrivateDns.java | 2 +- .../resourcemanager/TestPublicIPAddress.java | 2 +- .../resourcemanager/TestPublicIPPrefix.java | 2 +- .../com/azure/resourcemanager/TestRedis.java | 2 +- .../TestResourceStreaming.java | 10 +-- .../resourcemanager/TestRouteTables.java | 6 +- .../com/azure/resourcemanager/TestSql.java | 2 +- .../resourcemanager/TestTrafficManager.java | 10 +-- .../resourcemanager/TestVirtualMachine.java | 2 +- .../TestVirtualMachineCustomData.java | 4 +- .../TestVirtualMachineDataDisk.java | 2 +- .../TestVirtualMachineInAvailabilitySet.java | 6 +- .../TestVirtualMachineNics.java | 10 +-- .../TestVirtualMachineSizes.java | 2 +- .../TestVirtualMachineSsh.java | 2 +- .../TestVirtualMachineSyncPoller.java | 12 +-- .../TestVirtualNetworkGateway.java | 12 +-- .../VirtualNetworkGatewayTests.java | 3 +- 227 files changed, 1136 insertions(+), 1251 deletions(-) diff --git a/sdk/resourcemanager/azure-resourcemanager-appplatform/src/main/java/com/azure/resourcemanager/appplatform/AppPlatformManager.java b/sdk/resourcemanager/azure-resourcemanager-appplatform/src/main/java/com/azure/resourcemanager/appplatform/AppPlatformManager.java index 27a6ea39a8789..3a7f1c8dc05fd 100644 --- a/sdk/resourcemanager/azure-resourcemanager-appplatform/src/main/java/com/azure/resourcemanager/appplatform/AppPlatformManager.java +++ b/sdk/resourcemanager/azure-resourcemanager-appplatform/src/main/java/com/azure/resourcemanager/appplatform/AppPlatformManager.java @@ -14,7 +14,6 @@ import com.azure.resourcemanager.resources.fluentcore.arm.Manager; import com.azure.core.management.profile.AzureProfile; import com.azure.resourcemanager.resources.fluentcore.utils.HttpPipelineProvider; -import com.azure.resourcemanager.resources.fluentcore.utils.SdkContext; /** Entry point to Azure App Platform management. */ public final class AppPlatformManager extends Manager { @@ -48,20 +47,7 @@ public static AppPlatformManager authenticate(TokenCredential credential, AzureP * @return the AppPlatformManager */ public static AppPlatformManager authenticate(HttpPipeline httpPipeline, AzureProfile profile) { - return authenticate(httpPipeline, profile, new SdkContext()); - } - - /** - * Creates an instance of AppPlatformManager that exposes app platform resource management API entry points. - * - * @param httpPipeline the HttpPipeline to be used for API calls. - * @param profile the profile to use - * @param sdkContext the sdk context - * @return the AppPlatformManager - */ - public static AppPlatformManager authenticate( - HttpPipeline httpPipeline, AzureProfile profile, SdkContext sdkContext) { - return new AppPlatformManager(httpPipeline, profile, sdkContext); + return new AppPlatformManager(httpPipeline, profile); } /** The interface allowing configurations to be set. */ @@ -83,7 +69,7 @@ public AppPlatformManager authenticate(TokenCredential credential, AzureProfile } } - private AppPlatformManager(HttpPipeline httpPipeline, AzureProfile profile, SdkContext sdkContext) { + private AppPlatformManager(HttpPipeline httpPipeline, AzureProfile profile) { super( httpPipeline, profile, @@ -91,8 +77,7 @@ private AppPlatformManager(HttpPipeline httpPipeline, AzureProfile profile, SdkC .pipeline(httpPipeline) .endpoint(profile.getEnvironment().getResourceManagerEndpoint()) .subscriptionId(profile.getSubscriptionId()) - .buildClient(), - sdkContext); + .buildClient()); } /** @return Entry point for Spring Service management API. */ diff --git a/sdk/resourcemanager/azure-resourcemanager-appservice/pom.xml b/sdk/resourcemanager/azure-resourcemanager-appservice/pom.xml index b721f296c0528..de50dd2e3cabb 100644 --- a/sdk/resourcemanager/azure-resourcemanager-appservice/pom.xml +++ b/sdk/resourcemanager/azure-resourcemanager-appservice/pom.xml @@ -144,6 +144,32 @@ + + java-lts + + [11,) + + + + + org.apache.maven.plugins + maven-surefire-plugin + 3.0.0-M3 + + + + --add-opens com.azure.resourcemanager.appservice/com.azure.resourcemanager.appservice=ALL-UNNAMED + --add-opens com.azure.resourcemanager.authorization/com.azure.resourcemanager.authorization=ALL-UNNAMED + --add-opens com.azure.resourcemanager.keyvault/com.azure.resourcemanager.keyvault=ALL-UNNAMED + --add-opens com.azure.resourcemanager.msi/com.azure.resourcemanager.msi=ALL-UNNAMED + --add-opens com.azure.resourcemanager.resources/com.azure.resourcemanager.resources=ALL-UNNAMED + --add-opens com.azure.resourcemanager.resources/com.azure.resourcemanager.resources.fluentcore.arm=ALL-UNNAMED + + + + + + diff --git a/sdk/resourcemanager/azure-resourcemanager-appservice/src/main/java/com/azure/resourcemanager/appservice/AppServiceManager.java b/sdk/resourcemanager/azure-resourcemanager-appservice/src/main/java/com/azure/resourcemanager/appservice/AppServiceManager.java index 41c2531e69ede..45fa2d92daf01 100644 --- a/sdk/resourcemanager/azure-resourcemanager-appservice/src/main/java/com/azure/resourcemanager/appservice/AppServiceManager.java +++ b/sdk/resourcemanager/azure-resourcemanager-appservice/src/main/java/com/azure/resourcemanager/appservice/AppServiceManager.java @@ -27,7 +27,6 @@ import com.azure.resourcemanager.resources.fluentcore.arm.Manager; import com.azure.core.management.profile.AzureProfile; import com.azure.resourcemanager.resources.fluentcore.utils.HttpPipelineProvider; -import com.azure.resourcemanager.resources.fluentcore.utils.SdkContext; import com.azure.resourcemanager.storage.StorageManager; /** Entry point to Azure storage resource management. */ @@ -73,20 +72,7 @@ public static AppServiceManager authenticate(TokenCredential credential, AzurePr * @return the StorageManager */ public static AppServiceManager authenticate(HttpPipeline httpPipeline, AzureProfile profile) { - return authenticate(httpPipeline, profile, new SdkContext()); - } - - /** - * Creates an instance of StorageManager that exposes storage resource management API entry points. - * - * @param httpPipeline the HttpPipeline to be used for API calls. - * @param profile the profile to use - * @param sdkContext the sdk context - * @return the StorageManager - */ - public static AppServiceManager authenticate( - HttpPipeline httpPipeline, AzureProfile profile, SdkContext sdkContext) { - return new AppServiceManager(httpPipeline, profile, sdkContext); + return new AppServiceManager(httpPipeline, profile); } /** The interface allowing configurations to be set. */ @@ -108,7 +94,7 @@ public AppServiceManager authenticate(TokenCredential credential, AzureProfile p } } - private AppServiceManager(HttpPipeline httpPipeline, AzureProfile profile, SdkContext sdkContext) { + private AppServiceManager(HttpPipeline httpPipeline, AzureProfile profile) { super( httpPipeline, profile, @@ -116,12 +102,11 @@ private AppServiceManager(HttpPipeline httpPipeline, AzureProfile profile, SdkCo .pipeline(httpPipeline) .endpoint(profile.getEnvironment().getResourceManagerEndpoint()) .subscriptionId(profile.getSubscriptionId()) - .buildClient(), - sdkContext); - keyVaultManager = KeyVaultManager.authenticate(httpPipeline, profile, sdkContext); - storageManager = StorageManager.authenticate(httpPipeline, profile, sdkContext); - authorizationManager = AuthorizationManager.authenticate(httpPipeline, profile, sdkContext); - dnsZoneManager = DnsZoneManager.authenticate(httpPipeline, profile, sdkContext); + .buildClient()); + keyVaultManager = KeyVaultManager.authenticate(httpPipeline, profile); + storageManager = StorageManager.authenticate(httpPipeline, profile); + authorizationManager = AuthorizationManager.authenticate(httpPipeline, profile); + dnsZoneManager = DnsZoneManager.authenticate(httpPipeline, profile); } /** @return the Graph RBAC manager instance. */ diff --git a/sdk/resourcemanager/azure-resourcemanager-appservice/src/main/java/com/azure/resourcemanager/appservice/implementation/AppServiceBaseImpl.java b/sdk/resourcemanager/azure-resourcemanager-appservice/src/main/java/com/azure/resourcemanager/appservice/implementation/AppServiceBaseImpl.java index f9dbe49ca22cd..3d3a5d883392b 100644 --- a/sdk/resourcemanager/azure-resourcemanager-appservice/src/main/java/com/azure/resourcemanager/appservice/implementation/AppServiceBaseImpl.java +++ b/sdk/resourcemanager/azure-resourcemanager-appservice/src/main/java/com/azure/resourcemanager/appservice/implementation/AppServiceBaseImpl.java @@ -365,7 +365,7 @@ Mono updateDiagnosticLogsConfig(SiteLogsConfigInner siteLog } private AppServicePlanImpl newDefaultAppServicePlan() { - String planName = this.manager().sdkContext().randomResourceName(name() + "plan", 32); + String planName = this.manager().resourceManager().sdkContext().randomResourceName(name() + "plan", 32); return newDefaultAppServicePlan(planName); } diff --git a/sdk/resourcemanager/azure-resourcemanager-appservice/src/main/java/com/azure/resourcemanager/appservice/implementation/FunctionAppImpl.java b/sdk/resourcemanager/azure-resourcemanager-appservice/src/main/java/com/azure/resourcemanager/appservice/implementation/FunctionAppImpl.java index 8f2eb8b64f3a2..76dc782e304cb 100644 --- a/sdk/resourcemanager/azure-resourcemanager-appservice/src/main/java/com/azure/resourcemanager/appservice/implementation/FunctionAppImpl.java +++ b/sdk/resourcemanager/azure-resourcemanager-appservice/src/main/java/com/azure/resourcemanager/appservice/implementation/FunctionAppImpl.java @@ -207,7 +207,7 @@ Mono submitAppSettings() { SETTING_WEBSITE_CONTENTAZUREFILECONNECTIONSTRING, connectionString); addAppSettingIfNotModified( SETTING_WEBSITE_CONTENTSHARE, - this.manager().sdkContext().randomResourceName(name(), 32)); + this.manager().resourceManager().sdkContext().randomResourceName(name(), 32)); } return FunctionAppImpl.super.submitAppSettings(); })) @@ -594,7 +594,7 @@ public Mono createAsync() { } if (currentStorageAccount == null && storageAccountToSet == null && storageAccountCreatable == null) { withNewStorageAccount( - this.manager().sdkContext().randomResourceName(name(), 20), + this.manager().resourceManager().sdkContext().randomResourceName(name(), 20), StorageAccountSkuType.STANDARD_GRS); } } 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 cad3a71eb313a..7e8067ba8c897 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 @@ -92,8 +92,9 @@ protected void initializeClients(HttpPipeline httpPipeline, AzureProfile profile resourceManager = ResourceManager.authenticate(httpPipeline, profile).withDefaultSubscription(); keyVaultManager = KeyVaultManager.authenticate(httpPipeline, profile); - appServiceManager = AppServiceManager.authenticate(httpPipeline, profile, sdkContext); - msiManager = MSIManager.authenticate(httpPipeline, profile, sdkContext); + appServiceManager = AppServiceManager.authenticate(httpPipeline, profile); + msiManager = MSIManager.authenticate(httpPipeline, profile); + setSdkContext(sdkContext, appServiceManager, msiManager); // useExistingDomainAndCertificate(); // createNewDomainAndCertificate(); diff --git a/sdk/resourcemanager/azure-resourcemanager-authorization/src/main/java/com/azure/resourcemanager/authorization/AuthorizationManager.java b/sdk/resourcemanager/azure-resourcemanager-authorization/src/main/java/com/azure/resourcemanager/authorization/AuthorizationManager.java index c4c52eaaea6cf..c7718e3dee19a 100644 --- a/sdk/resourcemanager/azure-resourcemanager-authorization/src/main/java/com/azure/resourcemanager/authorization/AuthorizationManager.java +++ b/sdk/resourcemanager/azure-resourcemanager-authorization/src/main/java/com/azure/resourcemanager/authorization/AuthorizationManager.java @@ -31,7 +31,7 @@ /** Entry point to Azure Graph RBAC management. */ public final class AuthorizationManager implements HasServiceClient { private final String tenantId; - private final SdkContext sdkContext; + private SdkContext sdkContext; // The sdk clients private final GraphRbacManagementClient graphRbacManagementClient; private final AuthorizationManagementClient authorizationManagementClient; @@ -62,20 +62,7 @@ public static AuthorizationManager authenticate(TokenCredential credential, Azur * @return the interface exposing Graph RBAC management API entry points that work across subscriptions */ public static AuthorizationManager authenticate(HttpPipeline httpPipeline, AzureProfile profile) { - return authenticate(httpPipeline, profile, new SdkContext()); - } - - /** - * Creates an instance of GraphRbacManager that exposes Graph RBAC management API entry points. - * - * @param httpPipeline the HttpPipeline to be used for API calls - * @param profile the profile used in Active Directory - * @param sdkContext the sdk context - * @return the interface exposing Graph RBAC management API entry points that work across subscriptions - */ - public static AuthorizationManager authenticate( - HttpPipeline httpPipeline, AzureProfile profile, SdkContext sdkContext) { - return new AuthorizationManager(httpPipeline, profile, sdkContext); + return new AuthorizationManager(httpPipeline, profile); } /** @@ -112,7 +99,7 @@ public AuthorizationManager authenticate(TokenCredential credential, AzureProfil } } - private AuthorizationManager(HttpPipeline httpPipeline, AzureProfile profile, SdkContext sdkContext) { + private AuthorizationManager(HttpPipeline httpPipeline, AzureProfile profile) { this.graphRbacManagementClient = new GraphRbacManagementClientBuilder() .pipeline(httpPipeline) @@ -126,7 +113,6 @@ private AuthorizationManager(HttpPipeline httpPipeline, AzureProfile profile, Sd .subscriptionId(profile.getSubscriptionId()) .buildClient(); this.tenantId = profile.getTenantId(); - this.sdkContext = sdkContext; } /** @@ -144,6 +130,9 @@ public String tenantId() { /** @return the sdk context in graph manager */ public SdkContext sdkContext() { + if (sdkContext == null) { + sdkContext = new SdkContext(); + } return sdkContext; } diff --git a/sdk/resourcemanager/azure-resourcemanager-cdn/src/main/java/com/azure/resourcemanager/cdn/CdnManager.java b/sdk/resourcemanager/azure-resourcemanager-cdn/src/main/java/com/azure/resourcemanager/cdn/CdnManager.java index 26d26c0d57685..65e22e7d2ea1f 100644 --- a/sdk/resourcemanager/azure-resourcemanager-cdn/src/main/java/com/azure/resourcemanager/cdn/CdnManager.java +++ b/sdk/resourcemanager/azure-resourcemanager-cdn/src/main/java/com/azure/resourcemanager/cdn/CdnManager.java @@ -13,7 +13,6 @@ import com.azure.resourcemanager.resources.fluentcore.arm.Manager; import com.azure.resourcemanager.resources.fluentcore.arm.implementation.AzureConfigurableImpl; import com.azure.resourcemanager.resources.fluentcore.utils.HttpPipelineProvider; -import com.azure.resourcemanager.resources.fluentcore.utils.SdkContext; import com.azure.resourcemanager.cdn.models.CdnProfiles; /** @@ -52,19 +51,7 @@ public static CdnManager authenticate(TokenCredential credential, AzureProfile p * @return the CDN Manager */ public static CdnManager authenticate(HttpPipeline httpPipeline, AzureProfile profile) { - return authenticate(httpPipeline, profile, new SdkContext()); - } - - /** - * Creates an instance of CDN Manager that exposes CDN manager management API entry points. - * - * @param httpPipeline the HttpPipeline to be used for API calls. - * @param profile the profile to use - * @param sdkContext the sdk context - * @return the CDN Manager - */ - public static CdnManager authenticate(HttpPipeline httpPipeline, AzureProfile profile, SdkContext sdkContext) { - return new CdnManager(httpPipeline, profile, sdkContext); + return new CdnManager(httpPipeline, profile); } /** @@ -93,7 +80,7 @@ public CdnManager authenticate(TokenCredential credential, AzureProfile profile) } } - private CdnManager(HttpPipeline httpPipeline, AzureProfile profile, SdkContext sdkContext) { + private CdnManager(HttpPipeline httpPipeline, AzureProfile profile) { super( httpPipeline, profile, @@ -101,9 +88,7 @@ private CdnManager(HttpPipeline httpPipeline, AzureProfile profile, SdkContext s .pipeline(httpPipeline) .endpoint(profile.getEnvironment().getResourceManagerEndpoint()) .subscriptionId(profile.getSubscriptionId()) - .buildClient(), - sdkContext - ); + .buildClient()); } /** diff --git a/sdk/resourcemanager/azure-resourcemanager-cdn/src/main/java/com/azure/resourcemanager/cdn/implementation/CdnEndpointImpl.java b/sdk/resourcemanager/azure-resourcemanager-cdn/src/main/java/com/azure/resourcemanager/cdn/implementation/CdnEndpointImpl.java index 98756dff4d83b..9d5cd4a459327 100644 --- a/sdk/resourcemanager/azure-resourcemanager-cdn/src/main/java/com/azure/resourcemanager/cdn/implementation/CdnEndpointImpl.java +++ b/sdk/resourcemanager/azure-resourcemanager-cdn/src/main/java/com/azure/resourcemanager/cdn/implementation/CdnEndpointImpl.java @@ -82,7 +82,8 @@ public Mono createResourceAsync() { self.parent().resourceGroupName(), self.parent().name(), self.name(), - self.parent().manager().sdkContext().randomResourceName("CustomDomain", 50), + self.parent().manager().resourceManager().sdkContext() + .randomResourceName("CustomDomain", 50), customDomainInner.hostname()), 32, 32) .then(self.parent().manager().serviceClient() .getCustomDomains().listByEndpointAsync( @@ -137,7 +138,8 @@ public Mono updateResourceAsync() { this.parent().resourceGroupName(), this.parent().name(), this.name(), - self.parent().manager().sdkContext().randomResourceName("CustomDomain", 50), + self.parent().manager().resourceManager().sdkContext() + .randomResourceName("CustomDomain", 50), itemToCreate.hostname() ), 32, 32); diff --git a/sdk/resourcemanager/azure-resourcemanager-cdn/src/main/java/com/azure/resourcemanager/cdn/implementation/CdnEndpointsImpl.java b/sdk/resourcemanager/azure-resourcemanager-cdn/src/main/java/com/azure/resourcemanager/cdn/implementation/CdnEndpointsImpl.java index c31b11b73579c..db0d94ef1eefe 100644 --- a/sdk/resourcemanager/azure-resourcemanager-cdn/src/main/java/com/azure/resourcemanager/cdn/implementation/CdnEndpointsImpl.java +++ b/sdk/resourcemanager/azure-resourcemanager-cdn/src/main/java/com/azure/resourcemanager/cdn/implementation/CdnEndpointsImpl.java @@ -110,7 +110,8 @@ private String generateUniqueEndpointName(String endpointNamePrefix) { CheckNameAvailabilityResult result; do { - endpointName = this.getParent().manager().sdkContext().randomResourceName(endpointNamePrefix, 50); + endpointName = this.getParent().manager().resourceManager().sdkContext() + .randomResourceName(endpointNamePrefix, 50); result = this.getParent().checkEndpointNameAvailability(endpointName); } while (!result.nameAvailable()); diff --git a/sdk/resourcemanager/azure-resourcemanager-cdn/src/test/java/com/azure/resourcemanager/cdn/CdnManagementTest.java b/sdk/resourcemanager/azure-resourcemanager-cdn/src/test/java/com/azure/resourcemanager/cdn/CdnManagementTest.java index 2c643b5de5fab..ba0fffed14201 100644 --- a/sdk/resourcemanager/azure-resourcemanager-cdn/src/test/java/com/azure/resourcemanager/cdn/CdnManagementTest.java +++ b/sdk/resourcemanager/azure-resourcemanager-cdn/src/test/java/com/azure/resourcemanager/cdn/CdnManagementTest.java @@ -15,7 +15,6 @@ import com.azure.resourcemanager.resources.fluentcore.utils.SdkContext; import com.azure.resourcemanager.test.ResourceManagerTestBase; import com.azure.resourcemanager.test.utils.TestDelayProvider; -import com.azure.resourcemanager.test.utils.TestIdentifierProvider; import java.time.temporal.ChronoUnit; import java.util.List; @@ -46,10 +45,8 @@ protected HttpPipeline buildHttpPipeline( @Override protected void initializeClients(HttpPipeline httpPipeline, AzureProfile profile) { SdkContext.setDelayProvider(new TestDelayProvider(!isPlaybackMode())); - SdkContext sdkContext = new SdkContext(); - sdkContext.setIdentifierFunction(name -> new TestIdentifierProvider(testResourceNamer)); resourceManager = - ResourceManager.authenticate(httpPipeline, profile).withSdkContext(sdkContext).withDefaultSubscription(); - cdnManager = CdnManager.authenticate(httpPipeline, profile, sdkContext); + ResourceManager.authenticate(httpPipeline, profile).withDefaultSubscription(); + cdnManager = CdnManager.authenticate(httpPipeline, profile); } } diff --git a/sdk/resourcemanager/azure-resourcemanager-compute/pom.xml b/sdk/resourcemanager/azure-resourcemanager-compute/pom.xml index ef61656e763c4..8dcbb77b22444 100644 --- a/sdk/resourcemanager/azure-resourcemanager-compute/pom.xml +++ b/sdk/resourcemanager/azure-resourcemanager-compute/pom.xml @@ -152,6 +152,31 @@ + + java-lts + + [11,) + + + + + org.apache.maven.plugins + maven-surefire-plugin + 3.0.0-M3 + + + + --add-opens com.azure.resourcemanager.authorization/com.azure.resourcemanager.authorization=ALL-UNNAMED + --add-opens com.azure.resourcemanager.msi/com.azure.resourcemanager.msi=ALL-UNNAMED + --add-opens com.azure.resourcemanager.compute/com.azure.resourcemanager.compute=ALL-UNNAMED + --add-opens com.azure.resourcemanager.resources/com.azure.resourcemanager.resources=ALL-UNNAMED + --add-opens com.azure.resourcemanager.resources/com.azure.resourcemanager.resources.fluentcore.arm=ALL-UNNAMED + + + + + + diff --git a/sdk/resourcemanager/azure-resourcemanager-compute/src/main/java/com/azure/resourcemanager/compute/ComputeManager.java b/sdk/resourcemanager/azure-resourcemanager-compute/src/main/java/com/azure/resourcemanager/compute/ComputeManager.java index eb932d72d3f16..f7db918b0da73 100644 --- a/sdk/resourcemanager/azure-resourcemanager-compute/src/main/java/com/azure/resourcemanager/compute/ComputeManager.java +++ b/sdk/resourcemanager/azure-resourcemanager-compute/src/main/java/com/azure/resourcemanager/compute/ComputeManager.java @@ -41,7 +41,6 @@ import com.azure.resourcemanager.resources.fluentcore.arm.Manager; import com.azure.core.management.profile.AzureProfile; import com.azure.resourcemanager.resources.fluentcore.utils.HttpPipelineProvider; -import com.azure.resourcemanager.resources.fluentcore.utils.SdkContext; import com.azure.resourcemanager.storage.StorageManager; /** Entry point to Azure compute resource management. */ @@ -109,19 +108,7 @@ public static ComputeManager authenticate(TokenCredential credential, AzureProfi * @return the ComputeManager */ public static ComputeManager authenticate(HttpPipeline httpPipeline, AzureProfile profile) { - return authenticate(httpPipeline, profile, new SdkContext()); - } - - /** - * Creates an instance of ComputeManager that exposes Compute resource management API entry points. - * - * @param httpPipeline the HttpPipeline to be used for API calls. - * @param profile the profile to use - * @param sdkContext the sdk context - * @return the ComputeManager - */ - public static ComputeManager authenticate(HttpPipeline httpPipeline, AzureProfile profile, SdkContext sdkContext) { - return new ComputeManager(httpPipeline, profile, sdkContext); + return new ComputeManager(httpPipeline, profile); } /** The interface allowing configurations to be set. */ @@ -144,18 +131,17 @@ public ComputeManager authenticate(TokenCredential credential, AzureProfile prof } } - private ComputeManager(HttpPipeline httpPipeline, AzureProfile profile, SdkContext sdkContext) { + private ComputeManager(HttpPipeline httpPipeline, AzureProfile profile) { super( httpPipeline, profile, new ComputeManagementClientBuilder() .pipeline(httpPipeline) .subscriptionId(profile.getSubscriptionId()) - .buildClient(), - sdkContext); - storageManager = StorageManager.authenticate(httpPipeline, profile, sdkContext); - networkManager = NetworkManager.authenticate(httpPipeline, profile, sdkContext); - authorizationManager = AuthorizationManager.authenticate(httpPipeline, profile, sdkContext); + .buildClient()); + storageManager = StorageManager.authenticate(httpPipeline, profile); + networkManager = NetworkManager.authenticate(httpPipeline, profile); + authorizationManager = AuthorizationManager.authenticate(httpPipeline, profile); } /** @return the availability set resource management API entry point */ diff --git a/sdk/resourcemanager/azure-resourcemanager-compute/src/main/java/com/azure/resourcemanager/compute/implementation/VirtualMachineImpl.java b/sdk/resourcemanager/azure-resourcemanager-compute/src/main/java/com/azure/resourcemanager/compute/implementation/VirtualMachineImpl.java index 1bc04760baf49..b094cf0cddc9e 100644 --- a/sdk/resourcemanager/azure-resourcemanager-compute/src/main/java/com/azure/resourcemanager/compute/implementation/VirtualMachineImpl.java +++ b/sdk/resourcemanager/azure-resourcemanager-compute/src/main/java/com/azure/resourcemanager/compute/implementation/VirtualMachineImpl.java @@ -195,7 +195,7 @@ public JsonProperty.Access findPropertyAccess(Annotated annotated) { this.authorizationManager = authorizationManager; this.vmName = name; this.isMarketplaceLinuxImage = false; - this.namer = this.manager().sdkContext().createIdentifierProvider(this.vmName); + this.namer = this.manager().resourceManager().sdkContext().createIdentifierProvider(this.vmName); this.creatableSecondaryNetworkInterfaceKeys = new ArrayList<>(); this.existingSecondaryNetworkInterfacesToAssociate = new ArrayList<>(); this.virtualMachineExtensions = diff --git a/sdk/resourcemanager/azure-resourcemanager-compute/src/main/java/com/azure/resourcemanager/compute/implementation/VirtualMachineScaleSetImpl.java b/sdk/resourcemanager/azure-resourcemanager-compute/src/main/java/com/azure/resourcemanager/compute/implementation/VirtualMachineScaleSetImpl.java index 89414e0f5b2f3..fe096627aa745 100644 --- a/sdk/resourcemanager/azure-resourcemanager-compute/src/main/java/com/azure/resourcemanager/compute/implementation/VirtualMachineScaleSetImpl.java +++ b/sdk/resourcemanager/azure-resourcemanager-compute/src/main/java/com/azure/resourcemanager/compute/implementation/VirtualMachineScaleSetImpl.java @@ -168,7 +168,7 @@ public class VirtualMachineScaleSetImpl super(name, innerModel, computeManager); this.storageManager = storageManager; this.networkManager = networkManager; - this.namer = this.manager().sdkContext().createIdentifierProvider(this.name()); + this.namer = this.manager().resourceManager().sdkContext().createIdentifierProvider(this.name()); this.managedDataDisks = new ManagedDataDiskCollection(this); this.virtualMachineScaleSetMsiHandler = new VirtualMachineScaleSetMsiHandler(authorizationManager, this); this.bootDiagnosticsHandler = new BootDiagnosticsHandler(this); diff --git a/sdk/resourcemanager/azure-resourcemanager-compute/src/test/java/com/azure/resourcemanager/compute/ComputeManagementTest.java b/sdk/resourcemanager/azure-resourcemanager-compute/src/test/java/com/azure/resourcemanager/compute/ComputeManagementTest.java index 64897d460a1e3..c89285addee88 100644 --- a/sdk/resourcemanager/azure-resourcemanager-compute/src/test/java/com/azure/resourcemanager/compute/ComputeManagementTest.java +++ b/sdk/resourcemanager/azure-resourcemanager-compute/src/test/java/com/azure/resourcemanager/compute/ComputeManagementTest.java @@ -71,13 +71,14 @@ protected void initializeClients(HttpPipeline httpPipeline, AzureProfile profile SdkContext sdkContext = new SdkContext(); sdkContext.setIdentifierFunction(name -> new TestIdentifierProvider(testResourceNamer)); resourceManager = - ResourceManager.authenticate(httpPipeline, profile).withSdkContext(sdkContext).withDefaultSubscription(); - computeManager = ComputeManager.authenticate(httpPipeline, profile, sdkContext); - networkManager = NetworkManager.authenticate(httpPipeline, profile, sdkContext); - storageManager = StorageManager.authenticate(httpPipeline, profile, sdkContext); - keyVaultManager = KeyVaultManager.authenticate(httpPipeline, profile, sdkContext); - authorizationManager = AuthorizationManager.authenticate(httpPipeline, profile, sdkContext); - msiManager = MSIManager.authenticate(httpPipeline, profile, sdkContext); + ResourceManager.authenticate(httpPipeline, profile).withDefaultSubscription(); + computeManager = ComputeManager.authenticate(httpPipeline, profile); + networkManager = NetworkManager.authenticate(httpPipeline, profile); + storageManager = StorageManager.authenticate(httpPipeline, profile); + keyVaultManager = KeyVaultManager.authenticate(httpPipeline, profile); + authorizationManager = AuthorizationManager.authenticate(httpPipeline, profile); + msiManager = MSIManager.authenticate(httpPipeline, profile); + setSdkContext(sdkContext, computeManager, networkManager, keyVaultManager, msiManager); } @Override diff --git a/sdk/resourcemanager/azure-resourcemanager-containerinstance/pom.xml b/sdk/resourcemanager/azure-resourcemanager-containerinstance/pom.xml index 60862a0c02418..fc0b851ffdc69 100644 --- a/sdk/resourcemanager/azure-resourcemanager-containerinstance/pom.xml +++ b/sdk/resourcemanager/azure-resourcemanager-containerinstance/pom.xml @@ -111,6 +111,30 @@ + + java-lts + + [11,) + + + + + org.apache.maven.plugins + maven-surefire-plugin + 3.0.0-M3 + + + + --add-opens com.azure.resourcemanager.authorization/com.azure.resourcemanager.authorization=ALL-UNNAMED + --add-opens com.azure.resourcemanager.containerinstance/com.azure.resourcemanager.containerinstance=ALL-UNNAMED + --add-opens com.azure.resourcemanager.resources/com.azure.resourcemanager.resources=ALL-UNNAMED + --add-opens com.azure.resourcemanager.resources/com.azure.resourcemanager.resources.fluentcore.arm=ALL-UNNAMED + + + + + + diff --git a/sdk/resourcemanager/azure-resourcemanager-containerinstance/src/main/java/com/azure/resourcemanager/containerinstance/ContainerInstanceManager.java b/sdk/resourcemanager/azure-resourcemanager-containerinstance/src/main/java/com/azure/resourcemanager/containerinstance/ContainerInstanceManager.java index 2cbc5462e87ed..d78c2ae683016 100644 --- a/sdk/resourcemanager/azure-resourcemanager-containerinstance/src/main/java/com/azure/resourcemanager/containerinstance/ContainerInstanceManager.java +++ b/sdk/resourcemanager/azure-resourcemanager-containerinstance/src/main/java/com/azure/resourcemanager/containerinstance/ContainerInstanceManager.java @@ -16,7 +16,6 @@ import com.azure.resourcemanager.resources.fluentcore.arm.Manager; import com.azure.core.management.profile.AzureProfile; import com.azure.resourcemanager.resources.fluentcore.utils.HttpPipelineProvider; -import com.azure.resourcemanager.resources.fluentcore.utils.SdkContext; import com.azure.resourcemanager.storage.StorageManager; /** Entry point to Azure container instance management. */ @@ -57,20 +56,7 @@ public static ContainerInstanceManager authenticate(TokenCredential credential, * @return the ContainerInstanceManager */ public static ContainerInstanceManager authenticate(HttpPipeline httpPipeline, AzureProfile profile) { - return authenticate(httpPipeline, profile, new SdkContext()); - } - - /** - * Creates an instance of ContainerInstanceManager that exposes resource management API entry points. - * - * @param httpPipeline the HttpPipeline to be used for API calls. - * @param profile the profile to use - * @param sdkContext the sdk context - * @return the ContainerInstanceManager - */ - public static ContainerInstanceManager authenticate( - HttpPipeline httpPipeline, AzureProfile profile, SdkContext sdkContext) { - return new ContainerInstanceManager(httpPipeline, profile, sdkContext); + return new ContainerInstanceManager(httpPipeline, profile); } /** The interface allowing configurations to be set. */ @@ -93,7 +79,7 @@ public ContainerInstanceManager authenticate(TokenCredential credential, AzurePr } } - private ContainerInstanceManager(HttpPipeline httpPipeline, AzureProfile profile, SdkContext sdkContext) { + private ContainerInstanceManager(HttpPipeline httpPipeline, AzureProfile profile) { super( httpPipeline, profile, @@ -101,12 +87,11 @@ private ContainerInstanceManager(HttpPipeline httpPipeline, AzureProfile profile .pipeline(httpPipeline) .endpoint(profile.getEnvironment().getResourceManagerEndpoint()) .subscriptionId(profile.getSubscriptionId()) - .buildClient(), - sdkContext); + .buildClient()); - this.storageManager = StorageManager.authenticate(httpPipeline, profile, sdkContext); - this.authorizationManager = AuthorizationManager.authenticate(httpPipeline, profile, sdkContext); - this.networkManager = NetworkManager.authenticate(httpPipeline, profile, sdkContext); + this.storageManager = StorageManager.authenticate(httpPipeline, profile); + this.authorizationManager = AuthorizationManager.authenticate(httpPipeline, profile); + this.networkManager = NetworkManager.authenticate(httpPipeline, profile); } /** @return the storage manager in container instance manager */ diff --git a/sdk/resourcemanager/azure-resourcemanager-containerinstance/src/main/java/com/azure/resourcemanager/containerinstance/implementation/ContainerGroupImpl.java b/sdk/resourcemanager/azure-resourcemanager-containerinstance/src/main/java/com/azure/resourcemanager/containerinstance/implementation/ContainerGroupImpl.java index 46aff333966a1..3d6a7c29cc9d6 100644 --- a/sdk/resourcemanager/azure-resourcemanager-containerinstance/src/main/java/com/azure/resourcemanager/containerinstance/implementation/ContainerGroupImpl.java +++ b/sdk/resourcemanager/azure-resourcemanager-containerinstance/src/main/java/com/azure/resourcemanager/containerinstance/implementation/ContainerGroupImpl.java @@ -360,7 +360,7 @@ public ContainerGroupImpl withNewAzureFileShareVolume(String volumeName, String manager() .storageManager() .storageAccounts() - .define(manager().sdkContext().randomResourceName("fs", 24)) + .define(manager().resourceManager().sdkContext().randomResourceName("fs", 24)) .withRegion(this.regionName()); Creatable creatable; if (this.creatableGroup != null) { @@ -468,7 +468,7 @@ public ContainerGroupImpl withExistingNetworkProfile(String networkProfileId) { @Override public ContainerGroupImpl withNewNetworkProfileOnExistingVirtualNetwork( String virtualNetworkId, String subnetName) { - creatableNetworkProfileName = manager().sdkContext().randomResourceName("aci-profile-", 20); + creatableNetworkProfileName = manager().resourceManager().sdkContext().randomResourceName("aci-profile-", 20); String subnetId = String.format("%s/subnets/%s", virtualNetworkId, subnetName); SubnetInner subnetInner = new SubnetInner(); subnetInner.withId(subnetId); @@ -493,7 +493,7 @@ public ContainerGroupImpl withNewNetworkProfileOnExistingVirtualNetwork( @Override public ContainerGroupImpl withNewVirtualNetwork(String addressSpace) { - String virtualNetworkName = manager().sdkContext().randomResourceName("net", 20); + String virtualNetworkName = manager().resourceManager().sdkContext().randomResourceName("net", 20); String subnetName = "subnet0"; creatableVirtualNetwork = diff --git a/sdk/resourcemanager/azure-resourcemanager-containerinstance/src/test/java/com/azure/resourcemanager/containerinstance/ContainerInstanceManagementTest.java b/sdk/resourcemanager/azure-resourcemanager-containerinstance/src/test/java/com/azure/resourcemanager/containerinstance/ContainerInstanceManagementTest.java index f9e51ceca9350..9dbf1361248ce 100644 --- a/sdk/resourcemanager/azure-resourcemanager-containerinstance/src/test/java/com/azure/resourcemanager/containerinstance/ContainerInstanceManagementTest.java +++ b/sdk/resourcemanager/azure-resourcemanager-containerinstance/src/test/java/com/azure/resourcemanager/containerinstance/ContainerInstanceManagementTest.java @@ -47,7 +47,8 @@ protected void initializeClients(HttpPipeline httpPipeline, AzureProfile profile SdkContext sdkContext = new SdkContext(); sdkContext.setIdentifierFunction(name -> new TestIdentifierProvider(testResourceNamer)); SdkContext.setDelayProvider(new TestDelayProvider(!isPlaybackMode())); - containerInstanceManager = ContainerInstanceManager.authenticate(httpPipeline, profile, sdkContext); + containerInstanceManager = ContainerInstanceManager.authenticate(httpPipeline, profile); + setSdkContext(sdkContext, containerInstanceManager); } @Override diff --git a/sdk/resourcemanager/azure-resourcemanager-containerregistry/src/main/java/com/azure/resourcemanager/containerregistry/ContainerRegistryManager.java b/sdk/resourcemanager/azure-resourcemanager-containerregistry/src/main/java/com/azure/resourcemanager/containerregistry/ContainerRegistryManager.java index 13a7ffed0a26e..974468340cb91 100644 --- a/sdk/resourcemanager/azure-resourcemanager-containerregistry/src/main/java/com/azure/resourcemanager/containerregistry/ContainerRegistryManager.java +++ b/sdk/resourcemanager/azure-resourcemanager-containerregistry/src/main/java/com/azure/resourcemanager/containerregistry/ContainerRegistryManager.java @@ -18,7 +18,6 @@ import com.azure.resourcemanager.resources.fluentcore.arm.Manager; import com.azure.core.management.profile.AzureProfile; import com.azure.resourcemanager.resources.fluentcore.utils.HttpPipelineProvider; -import com.azure.resourcemanager.resources.fluentcore.utils.SdkContext; import com.azure.resourcemanager.storage.StorageManager; /** Entry point to Azure container registry management. */ @@ -58,20 +57,7 @@ public static ContainerRegistryManager authenticate(TokenCredential credential, * @return the ContainerRegistryManager */ public static ContainerRegistryManager authenticate(HttpPipeline httpPipeline, AzureProfile profile) { - return authenticate(httpPipeline, profile, new SdkContext()); - } - - /** - * Creates an instance of ContainerRegistryManager that exposes Registry resource management API entry points. - * - * @param httpPipeline the HttpPipeline to be used for API calls. - * @param profile the profile to use - * @param sdkContext the sdk context - * @return the ContainerRegistryManager - */ - public static ContainerRegistryManager authenticate( - HttpPipeline httpPipeline, AzureProfile profile, SdkContext sdkContext) { - return new ContainerRegistryManager(httpPipeline, profile, sdkContext); + return new ContainerRegistryManager(httpPipeline, profile); } /** The interface allowing configurations to be set. */ @@ -99,9 +85,8 @@ public ContainerRegistryManager authenticate(TokenCredential credential, AzurePr * * @param httpPipeline the HttpPipeline used to authenticate through ContainerRegistryManager. * @param profile the profile to use - * @param sdkContext the sdk context */ - private ContainerRegistryManager(HttpPipeline httpPipeline, AzureProfile profile, SdkContext sdkContext) { + private ContainerRegistryManager(HttpPipeline httpPipeline, AzureProfile profile) { super( httpPipeline, profile, @@ -109,9 +94,8 @@ private ContainerRegistryManager(HttpPipeline httpPipeline, AzureProfile profile .pipeline(httpPipeline) .endpoint(profile.getEnvironment().getResourceManagerEndpoint()) .subscriptionId(profile.getSubscriptionId()) - .buildClient(), - sdkContext); - this.storageManager = StorageManager.authenticate(httpPipeline, profile, sdkContext); + .buildClient()); + this.storageManager = StorageManager.authenticate(httpPipeline, profile); } /** @return the availability set resource management API entry point */ diff --git a/sdk/resourcemanager/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/ContainerServiceManager.java b/sdk/resourcemanager/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/ContainerServiceManager.java index 661a876f3c033..bd84412dd7094 100644 --- a/sdk/resourcemanager/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/ContainerServiceManager.java +++ b/sdk/resourcemanager/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/ContainerServiceManager.java @@ -14,7 +14,6 @@ import com.azure.resourcemanager.resources.fluentcore.arm.Manager; import com.azure.core.management.profile.AzureProfile; import com.azure.resourcemanager.resources.fluentcore.utils.HttpPipelineProvider; -import com.azure.resourcemanager.resources.fluentcore.utils.SdkContext; /** Entry point to Azure Container Service management. */ public final class ContainerServiceManager @@ -51,20 +50,7 @@ public static ContainerServiceManager authenticate(TokenCredential credential, A * @return the ContainerServiceManager */ public static ContainerServiceManager authenticate(HttpPipeline httpPipeline, AzureProfile profile) { - return authenticate(httpPipeline, profile, new SdkContext()); - } - - /** - * Creates an instance of ContainerServiceManager that exposes Service resource management API entry points. - * - * @param httpPipeline the HttpPipeline to be used for API calls. - * @param profile the profile to use - * @param sdkContext the sdk context - * @return the ContainerServiceManager - */ - public static ContainerServiceManager authenticate( - HttpPipeline httpPipeline, AzureProfile profile, SdkContext sdkContext) { - return new ContainerServiceManager(httpPipeline, profile, sdkContext); + return new ContainerServiceManager(httpPipeline, profile); } /** The interface allowing configurations to be set. */ @@ -87,7 +73,7 @@ public ContainerServiceManager authenticate(TokenCredential credential, AzurePro } } - private ContainerServiceManager(HttpPipeline httpPipeline, AzureProfile profile, SdkContext sdkContext) { + private ContainerServiceManager(HttpPipeline httpPipeline, AzureProfile profile) { super( httpPipeline, profile, @@ -95,8 +81,7 @@ private ContainerServiceManager(HttpPipeline httpPipeline, AzureProfile profile, .endpoint(profile.getEnvironment().getResourceManagerEndpoint()) .pipeline(httpPipeline) .subscriptionId(profile.getSubscriptionId()) - .buildClient(), - sdkContext); + .buildClient()); } /** @return the Azure Kubernetes cluster resource management API entry point */ diff --git a/sdk/resourcemanager/azure-resourcemanager-cosmos/src/main/java/com/azure/resourcemanager/cosmos/CosmosManager.java b/sdk/resourcemanager/azure-resourcemanager-cosmos/src/main/java/com/azure/resourcemanager/cosmos/CosmosManager.java index 4474389f91db5..65a278414ec13 100644 --- a/sdk/resourcemanager/azure-resourcemanager-cosmos/src/main/java/com/azure/resourcemanager/cosmos/CosmosManager.java +++ b/sdk/resourcemanager/azure-resourcemanager-cosmos/src/main/java/com/azure/resourcemanager/cosmos/CosmosManager.java @@ -14,7 +14,6 @@ import com.azure.resourcemanager.resources.fluentcore.arm.Manager; import com.azure.core.management.profile.AzureProfile; import com.azure.resourcemanager.resources.fluentcore.utils.HttpPipelineProvider; -import com.azure.resourcemanager.resources.fluentcore.utils.SdkContext; /** Entry point to Azure compute resource management. */ public final class CosmosManager extends Manager { @@ -47,19 +46,7 @@ public static CosmosManager authenticate(TokenCredential credential, AzureProfil * @return the ComputeManager */ public static CosmosManager authenticate(HttpPipeline httpPipeline, AzureProfile profile) { - return authenticate(httpPipeline, profile, new SdkContext()); - } - - /** - * Creates an instance of ComputeManager that exposes Compute resource management API entry points. - * - * @param httpPipeline the HttpPipeline to be used for API calls. - * @param profile the profile to use - * @param sdkContext the sdk context - * @return the ComputeManager - */ - public static CosmosManager authenticate(HttpPipeline httpPipeline, AzureProfile profile, SdkContext sdkContext) { - return new CosmosManager(httpPipeline, profile, sdkContext); + return new CosmosManager(httpPipeline, profile); } /** The interface allowing configurations to be set. */ @@ -82,7 +69,7 @@ public CosmosManager authenticate(TokenCredential credential, AzureProfile profi } } - private CosmosManager(HttpPipeline httpPipeline, AzureProfile profile, SdkContext sdkContext) { + private CosmosManager(HttpPipeline httpPipeline, AzureProfile profile) { super( httpPipeline, profile, @@ -90,8 +77,7 @@ private CosmosManager(HttpPipeline httpPipeline, AzureProfile profile, SdkContex .endpoint(profile.getEnvironment().getResourceManagerEndpoint()) .pipeline(httpPipeline) .subscriptionId(profile.getSubscriptionId()) - .buildClient(), - sdkContext); + .buildClient()); } /** @return the cosmos db database account resource management API entry point */ diff --git a/sdk/resourcemanager/azure-resourcemanager-dns/src/main/java/com/azure/resourcemanager/dns/DnsZoneManager.java b/sdk/resourcemanager/azure-resourcemanager-dns/src/main/java/com/azure/resourcemanager/dns/DnsZoneManager.java index c644fc3b0a3a2..1eb1f5d99fb0c 100644 --- a/sdk/resourcemanager/azure-resourcemanager-dns/src/main/java/com/azure/resourcemanager/dns/DnsZoneManager.java +++ b/sdk/resourcemanager/azure-resourcemanager-dns/src/main/java/com/azure/resourcemanager/dns/DnsZoneManager.java @@ -14,7 +14,6 @@ import com.azure.resourcemanager.resources.fluentcore.arm.Manager; import com.azure.core.management.profile.AzureProfile; import com.azure.resourcemanager.resources.fluentcore.utils.HttpPipelineProvider; -import com.azure.resourcemanager.resources.fluentcore.utils.SdkContext; /** Entry point to Azure DNS zone management. */ public final class DnsZoneManager extends Manager { @@ -49,19 +48,7 @@ public static DnsZoneManager authenticate(TokenCredential credential, AzureProfi * @return the DnsZoneManager */ public static DnsZoneManager authenticate(HttpPipeline httpPipeline, AzureProfile profile) { - return new DnsZoneManager(httpPipeline, profile, new SdkContext()); - } - - /** - * Creates an instance of DnsZoneManager that exposes DNS zone management API entry points. - * - * @param httpPipeline the HttpPipeline to be used for API calls. - * @param profile the profile to use - * @param sdkContext the sdk context - * @return the DnsZoneManager - */ - public static DnsZoneManager authenticate(HttpPipeline httpPipeline, AzureProfile profile, SdkContext sdkContext) { - return new DnsZoneManager(httpPipeline, profile, sdkContext); + return new DnsZoneManager(httpPipeline, profile); } /** The interface allowing configurations to be set. */ @@ -84,7 +71,7 @@ public DnsZoneManager authenticate(TokenCredential credential, AzureProfile prof } } - private DnsZoneManager(HttpPipeline httpPipeline, AzureProfile profile, SdkContext sdkContext) { + private DnsZoneManager(HttpPipeline httpPipeline, AzureProfile profile) { super( httpPipeline, profile, @@ -92,8 +79,7 @@ private DnsZoneManager(HttpPipeline httpPipeline, AzureProfile profile, SdkConte .pipeline(httpPipeline) .endpoint(profile.getEnvironment().getResourceManagerEndpoint()) .subscriptionId(profile.getSubscriptionId()) - .buildClient(), - sdkContext); + .buildClient()); } /** @return entry point to DNS zone manager zone management */ diff --git a/sdk/resourcemanager/azure-resourcemanager-eventhubs/src/main/java/com/azure/resourcemanager/eventhubs/EventHubsManager.java b/sdk/resourcemanager/azure-resourcemanager-eventhubs/src/main/java/com/azure/resourcemanager/eventhubs/EventHubsManager.java index 2d046961d9b21..73c06af711146 100644 --- a/sdk/resourcemanager/azure-resourcemanager-eventhubs/src/main/java/com/azure/resourcemanager/eventhubs/EventHubsManager.java +++ b/sdk/resourcemanager/azure-resourcemanager-eventhubs/src/main/java/com/azure/resourcemanager/eventhubs/EventHubsManager.java @@ -26,7 +26,6 @@ import com.azure.resourcemanager.resources.fluentcore.arm.Manager; import com.azure.core.management.profile.AzureProfile; import com.azure.resourcemanager.resources.fluentcore.utils.HttpPipelineProvider; -import com.azure.resourcemanager.resources.fluentcore.utils.SdkContext; import com.azure.resourcemanager.storage.StorageManager; /** @@ -71,20 +70,7 @@ public static EventHubsManager authenticate(TokenCredential credential, AzurePro * @return the EventHubsManager */ public static EventHubsManager authenticate(HttpPipeline httpPipeline, AzureProfile profile) { - return authenticate(httpPipeline, profile, new SdkContext()); - } - - /** - * Creates an instance of EventHubsManager that exposes EventHub resource management API entry points. - * - * @param httpPipeline the HttpPipeline to be used for API calls. - * @param profile the profile to use - * @param sdkContext the sdk context - * @return the EventHubsManager - */ - public static EventHubsManager authenticate( - HttpPipeline httpPipeline, AzureProfile profile, SdkContext sdkContext) { - return new EventHubsManager(httpPipeline, profile, sdkContext); + return new EventHubsManager(httpPipeline, profile); } /** @@ -108,7 +94,7 @@ public EventHubsManager authenticate(TokenCredential credential, AzureProfile pr return EventHubsManager.authenticate(buildHttpPipeline(credential, profile), profile); } } - private EventHubsManager(HttpPipeline httpPipeline, AzureProfile profile, SdkContext sdkContext) { + private EventHubsManager(HttpPipeline httpPipeline, AzureProfile profile) { super( httpPipeline, profile, @@ -116,10 +102,8 @@ private EventHubsManager(HttpPipeline httpPipeline, AzureProfile profile, SdkCon .pipeline(httpPipeline) .endpoint(profile.getEnvironment().getResourceManagerEndpoint()) .subscriptionId(profile.getSubscriptionId()) - .buildClient(), - sdkContext - ); - storageManager = StorageManager.authenticate(httpPipeline, profile, sdkContext); + .buildClient()); + storageManager = StorageManager.authenticate(httpPipeline, profile); } /** diff --git a/sdk/resourcemanager/azure-resourcemanager-keyvault/src/main/java/com/azure/resourcemanager/keyvault/KeyVaultManager.java b/sdk/resourcemanager/azure-resourcemanager-keyvault/src/main/java/com/azure/resourcemanager/keyvault/KeyVaultManager.java index f462941791d15..a4f3b5d0dbb63 100644 --- a/sdk/resourcemanager/azure-resourcemanager-keyvault/src/main/java/com/azure/resourcemanager/keyvault/KeyVaultManager.java +++ b/sdk/resourcemanager/azure-resourcemanager-keyvault/src/main/java/com/azure/resourcemanager/keyvault/KeyVaultManager.java @@ -15,7 +15,6 @@ import com.azure.resourcemanager.resources.fluentcore.arm.Manager; import com.azure.core.management.profile.AzureProfile; import com.azure.resourcemanager.resources.fluentcore.utils.HttpPipelineProvider; -import com.azure.resourcemanager.resources.fluentcore.utils.SdkContext; /** Entry point to Azure KeyVault resource management. */ public final class KeyVaultManager extends Manager { @@ -55,20 +54,7 @@ public static KeyVaultManager authenticate(TokenCredential credential, AzureProf * @return the KeyVaultManager */ public static KeyVaultManager authenticate(HttpPipeline httpPipeline, AzureProfile profile) { - return authenticate(httpPipeline, profile, new SdkContext()); - } - - /** - * Creates an instance of KeyVaultManager that exposes KeyVault resource management API entry points. - * - * @param httpPipeline the HttpPipeline to be used for API calls - * @param profile the profile to use - * @param sdkContext the sdk context - * @return the KeyVaultManager - */ - public static KeyVaultManager authenticate( - HttpPipeline httpPipeline, AzureProfile profile, SdkContext sdkContext) { - return new KeyVaultManager(httpPipeline, profile, sdkContext); + return new KeyVaultManager(httpPipeline, profile); } /** The interface allowing configurations to be set. */ @@ -93,7 +79,7 @@ public KeyVaultManager authenticate(TokenCredential credential, AzureProfile pro } private KeyVaultManager( - final HttpPipeline httpPipeline, AzureProfile profile, SdkContext sdkContext) { + final HttpPipeline httpPipeline, AzureProfile profile) { super( httpPipeline, profile, @@ -101,9 +87,8 @@ private KeyVaultManager( .pipeline(httpPipeline) .endpoint(profile.getEnvironment().getResourceManagerEndpoint()) .subscriptionId(profile.getSubscriptionId()) - .buildClient(), - sdkContext); - authorizationManager = AuthorizationManager.authenticate(httpPipeline, profile, sdkContext); + .buildClient()); + authorizationManager = AuthorizationManager.authenticate(httpPipeline, profile); this.tenantId = profile.getTenantId(); } diff --git a/sdk/resourcemanager/azure-resourcemanager-monitor/pom.xml b/sdk/resourcemanager/azure-resourcemanager-monitor/pom.xml index 70c83e102569c..7a04c655ea1d2 100644 --- a/sdk/resourcemanager/azure-resourcemanager-monitor/pom.xml +++ b/sdk/resourcemanager/azure-resourcemanager-monitor/pom.xml @@ -132,6 +132,9 @@ --add-exports com.azure.resourcemanager.resources/com.azure.resourcemanager.resources.fluentcore.arm.collection.implementation=ALL-UNNAMED --add-exports com.azure.resourcemanager.resources/com.azure.resourcemanager.resources.fluentcore.arm.models.implementation=ALL-UNNAMED + + --add-opens com.azure.resourcemanager.resources/com.azure.resourcemanager.resources=ALL-UNNAMED + --add-opens com.azure.resourcemanager.resources/com.azure.resourcemanager.resources.fluentcore.arm=ALL-UNNAMED diff --git a/sdk/resourcemanager/azure-resourcemanager-monitor/src/main/java/com/azure/resourcemanager/monitor/MonitorManager.java b/sdk/resourcemanager/azure-resourcemanager-monitor/src/main/java/com/azure/resourcemanager/monitor/MonitorManager.java index 8f5a355afa533..a55eed0bb7744 100644 --- a/sdk/resourcemanager/azure-resourcemanager-monitor/src/main/java/com/azure/resourcemanager/monitor/MonitorManager.java +++ b/sdk/resourcemanager/azure-resourcemanager-monitor/src/main/java/com/azure/resourcemanager/monitor/MonitorManager.java @@ -24,7 +24,6 @@ import com.azure.resourcemanager.resources.fluentcore.arm.Manager; import com.azure.core.management.profile.AzureProfile; import com.azure.resourcemanager.resources.fluentcore.utils.HttpPipelineProvider; -import com.azure.resourcemanager.resources.fluentcore.utils.SdkContext; /** Entry point to Azure Monitor. */ public final class MonitorManager extends Manager { @@ -49,12 +48,11 @@ public static Configurable configure() { * * @param credential the credential to use * @param profile the profile to use - * @param sdkContext the sdk context * @return the MonitorManager */ public static MonitorManager authenticate( - TokenCredential credential, AzureProfile profile, SdkContext sdkContext) { - return authenticate(HttpPipelineProvider.buildHttpPipeline(credential, profile), profile, sdkContext); + TokenCredential credential, AzureProfile profile) { + return authenticate(HttpPipelineProvider.buildHttpPipeline(credential, profile), profile); } /** * Creates an instance of MonitorManager that exposes Monitor API entry points. @@ -64,19 +62,9 @@ public static MonitorManager authenticate( * @return the MonitorManager */ public static MonitorManager authenticate(HttpPipeline httpPipeline, AzureProfile profile) { - return new MonitorManager(httpPipeline, profile, new SdkContext()); - } - /** - * Creates an instance of MonitorManager that exposes Monitor API entry points. - * - * @param httpPipeline the HttpPipeline to be used for API calls. - * @param profile the profile to use - * @param sdkContext the sdk context - * @return the MonitorManager - */ - public static MonitorManager authenticate(HttpPipeline httpPipeline, AzureProfile profile, SdkContext sdkContext) { - return new MonitorManager(httpPipeline, profile, sdkContext); + return new MonitorManager(httpPipeline, profile); } + /** The interface allowing configurations to be set. */ public interface Configurable extends AzureConfigurable { /** @@ -144,7 +132,7 @@ public MonitorManager authenticate(TokenCredential credential, AzureProfile prof } } - private MonitorManager(HttpPipeline httpPipeline, AzureProfile profile, SdkContext sdkContext) { + private MonitorManager(HttpPipeline httpPipeline, AzureProfile profile) { super( httpPipeline, profile, @@ -152,7 +140,6 @@ private MonitorManager(HttpPipeline httpPipeline, AzureProfile profile, SdkConte .pipeline(httpPipeline) .endpoint(profile.getEnvironment().getResourceManagerEndpoint()) .subscriptionId(profile.getSubscriptionId()) - .buildClient(), - sdkContext); + .buildClient()); } } diff --git a/sdk/resourcemanager/azure-resourcemanager-monitor/src/test/java/com/azure/resourcemanager/monitor/MonitorManagementTest.java b/sdk/resourcemanager/azure-resourcemanager-monitor/src/test/java/com/azure/resourcemanager/monitor/MonitorManagementTest.java index c13801338d22c..3a1141fb9db44 100644 --- a/sdk/resourcemanager/azure-resourcemanager-monitor/src/test/java/com/azure/resourcemanager/monitor/MonitorManagementTest.java +++ b/sdk/resourcemanager/azure-resourcemanager-monitor/src/test/java/com/azure/resourcemanager/monitor/MonitorManagementTest.java @@ -60,8 +60,9 @@ protected void initializeClients(HttpPipeline httpPipeline, AzureProfile profile resourceManager = ResourceManager.authenticate(httpPipeline, profile).withDefaultSubscription(); monitorManager = MonitorManager.authenticate(httpPipeline, profile); - computeManager = ComputeManager.authenticate(httpPipeline, profile, sdkContext); + computeManager = ComputeManager.authenticate(httpPipeline, profile); storageManager = StorageManager.authenticate(httpPipeline, profile); + setSdkContext(sdkContext, computeManager); // eventHubManager = EventHubManager // .authenticate(restClient, defaultSubscription, sdkContext); diff --git a/sdk/resourcemanager/azure-resourcemanager-msi/pom.xml b/sdk/resourcemanager/azure-resourcemanager-msi/pom.xml index 6fa73adfcb095..76d805df00379 100644 --- a/sdk/resourcemanager/azure-resourcemanager-msi/pom.xml +++ b/sdk/resourcemanager/azure-resourcemanager-msi/pom.xml @@ -97,6 +97,30 @@ + + java-lts + + [11,) + + + + + org.apache.maven.plugins + maven-surefire-plugin + 3.0.0-M3 + + + + --add-opens com.azure.resourcemanager.authorization/com.azure.resourcemanager.authorization=ALL-UNNAMED + --add-opens com.azure.resourcemanager.msi/com.azure.resourcemanager.msi=ALL-UNNAMED + --add-opens com.azure.resourcemanager.resources/com.azure.resourcemanager.resources=ALL-UNNAMED + --add-opens com.azure.resourcemanager.resources/com.azure.resourcemanager.resources.fluentcore.arm=ALL-UNNAMED + + + + + + diff --git a/sdk/resourcemanager/azure-resourcemanager-msi/src/main/java/com/azure/resourcemanager/msi/MSIManager.java b/sdk/resourcemanager/azure-resourcemanager-msi/src/main/java/com/azure/resourcemanager/msi/MSIManager.java index 39ee318e969bf..41d8899c02687 100644 --- a/sdk/resourcemanager/azure-resourcemanager-msi/src/main/java/com/azure/resourcemanager/msi/MSIManager.java +++ b/sdk/resourcemanager/azure-resourcemanager-msi/src/main/java/com/azure/resourcemanager/msi/MSIManager.java @@ -15,7 +15,6 @@ import com.azure.resourcemanager.resources.fluentcore.arm.Manager; import com.azure.core.management.profile.AzureProfile; import com.azure.resourcemanager.resources.fluentcore.utils.HttpPipelineProvider; -import com.azure.resourcemanager.resources.fluentcore.utils.SdkContext; /** * Entry point to Azure Managed Service Identity (MSI) resource management. @@ -43,7 +42,7 @@ public static Configurable configure() { * @return the MSIManager */ public static MSIManager authenticate(TokenCredential credential, AzureProfile profile) { - return new MSIManager(HttpPipelineProvider.buildHttpPipeline(credential, profile), profile, new SdkContext()); + return new MSIManager(HttpPipelineProvider.buildHttpPipeline(credential, profile), profile); } /** @@ -55,20 +54,7 @@ public static MSIManager authenticate(TokenCredential credential, AzureProfile p * @return the MSIManager */ public static MSIManager authenticate(HttpPipeline httpPipeline, AzureProfile profile) { - return authenticate(httpPipeline, profile, new SdkContext()); - } - - /** - * Creates an instance of MSIManager that exposes Managed Service Identity (MSI) - * resource management API entry points. - * - * @param httpPipeline the HttpPipeline to be used for API calls. - * @param profile the profile to use - * @param sdkContext the sdk context - * @return the MSIManager - */ - public static MSIManager authenticate(HttpPipeline httpPipeline, AzureProfile profile, SdkContext sdkContext) { - return new MSIManager(httpPipeline, profile, sdkContext); + return new MSIManager(httpPipeline, profile); } /** @@ -95,16 +81,13 @@ public MSIManager authenticate(TokenCredential credential, AzureProfile profile) } } - private MSIManager(HttpPipeline httpPipeline, AzureProfile profile, SdkContext sdkContext) { + private MSIManager(HttpPipeline httpPipeline, AzureProfile profile) { super(httpPipeline, profile, new ManagedServiceIdentityClientBuilder() .pipeline(httpPipeline) .endpoint(profile.getEnvironment().getResourceManagerEndpoint()) .subscriptionId(profile.getSubscriptionId()) - .buildClient(), - sdkContext); - authorizationManager = AuthorizationManager.authenticate(httpPipeline, - profile, - sdkContext); + .buildClient()); + authorizationManager = AuthorizationManager.authenticate(httpPipeline, profile); } /** diff --git a/sdk/resourcemanager/azure-resourcemanager-msi/src/test/java/com/azure/resourcemanager/msi/MSIIdentityManagementTests.java b/sdk/resourcemanager/azure-resourcemanager-msi/src/test/java/com/azure/resourcemanager/msi/MSIIdentityManagementTests.java index 63ea42371841c..8d78d92b5d174 100644 --- a/sdk/resourcemanager/azure-resourcemanager-msi/src/test/java/com/azure/resourcemanager/msi/MSIIdentityManagementTests.java +++ b/sdk/resourcemanager/azure-resourcemanager-msi/src/test/java/com/azure/resourcemanager/msi/MSIIdentityManagementTests.java @@ -59,8 +59,9 @@ protected void initializeClients(HttpPipeline httpPipeline, AzureProfile profile SdkContext.setDelayProvider(new TestDelayProvider(!isPlaybackMode())); SdkContext sdkContext = new SdkContext(); sdkContext.setIdentifierFunction(name -> new TestIdentifierProvider(testResourceNamer)); - this.msiManager = MSIManager.authenticate(httpPipeline, profile, sdkContext); + this.msiManager = MSIManager.authenticate(httpPipeline, profile); this.resourceManager = msiManager.resourceManager(); + setSdkContext(sdkContext, msiManager); } @Override diff --git a/sdk/resourcemanager/azure-resourcemanager-network/pom.xml b/sdk/resourcemanager/azure-resourcemanager-network/pom.xml index eae9ddbfe0089..e8aeb2b7def46 100644 --- a/sdk/resourcemanager/azure-resourcemanager-network/pom.xml +++ b/sdk/resourcemanager/azure-resourcemanager-network/pom.xml @@ -114,6 +114,28 @@ + + java-lts + + [11,) + + + + + org.apache.maven.plugins + maven-surefire-plugin + 3.0.0-M3 + + + + --add-opens com.azure.resourcemanager.resources/com.azure.resourcemanager.resources=ALL-UNNAMED + --add-opens com.azure.resourcemanager.resources/com.azure.resourcemanager.resources.fluentcore.arm=ALL-UNNAMED + + + + + + diff --git a/sdk/resourcemanager/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/NetworkManager.java b/sdk/resourcemanager/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/NetworkManager.java index 4b4ec54671251..90cbdd76162d0 100644 --- a/sdk/resourcemanager/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/NetworkManager.java +++ b/sdk/resourcemanager/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/NetworkManager.java @@ -45,7 +45,6 @@ import com.azure.resourcemanager.resources.fluentcore.arm.Manager; import com.azure.core.management.profile.AzureProfile; import com.azure.resourcemanager.resources.fluentcore.utils.HttpPipelineProvider; -import com.azure.resourcemanager.resources.fluentcore.utils.SdkContext; /** Entry point to Azure network management. */ public final class NetworkManager extends Manager { @@ -97,19 +96,7 @@ public static NetworkManager authenticate(TokenCredential credential, AzureProfi * @return the NetworkManager */ public static NetworkManager authenticate(HttpPipeline httpPipeline, AzureProfile profile) { - return authenticate(httpPipeline, profile, new SdkContext()); - } - - /** - * Creates an instance of NetworkManager that exposes network resource management API entry points. - * - * @param httpPipeline the HttpPipeline to be used for API calls. - * @param profile the profile to use - * @param sdkContext the sdk context - * @return the NetworkManager - */ - public static NetworkManager authenticate(HttpPipeline httpPipeline, AzureProfile profile, SdkContext sdkContext) { - return new NetworkManager(httpPipeline, profile, sdkContext); + return new NetworkManager(httpPipeline, profile); } /** The interface allowing configurations to be set. */ @@ -132,7 +119,7 @@ public NetworkManager authenticate(TokenCredential credential, AzureProfile prof } } - private NetworkManager(HttpPipeline httpPipeline, AzureProfile profile, SdkContext sdkContext) { + private NetworkManager(HttpPipeline httpPipeline, AzureProfile profile) { super( httpPipeline, profile, @@ -140,8 +127,7 @@ private NetworkManager(HttpPipeline httpPipeline, AzureProfile profile, SdkConte .pipeline(httpPipeline) .endpoint(profile.getEnvironment().getResourceManagerEndpoint()) .subscriptionId(profile.getSubscriptionId()) - .buildClient(), - sdkContext); + .buildClient()); } /** @return entry point to route table management */ diff --git a/sdk/resourcemanager/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/ApplicationGatewayBackendHttpConfigurationImpl.java b/sdk/resourcemanager/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/ApplicationGatewayBackendHttpConfigurationImpl.java index 65543918db5f8..4e418da430c12 100644 --- a/sdk/resourcemanager/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/ApplicationGatewayBackendHttpConfigurationImpl.java +++ b/sdk/resourcemanager/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/ApplicationGatewayBackendHttpConfigurationImpl.java @@ -272,7 +272,7 @@ public ApplicationGatewayBackendHttpConfigurationImpl withAuthenticationCertific // If matching cert reference not found, create a new one if (certName == null) { - certName = this.parent().manager().sdkContext().randomResourceName("cert", 20); + certName = this.parent().manager().resourceManager().sdkContext().randomResourceName("cert", 20); this.parent().defineAuthenticationCertificate(certName).fromBase64(base64Data).attach(); } diff --git a/sdk/resourcemanager/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/ApplicationGatewayImpl.java b/sdk/resourcemanager/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/ApplicationGatewayImpl.java index 1ba4fceec1cb2..2e303447908e2 100644 --- a/sdk/resourcemanager/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/ApplicationGatewayImpl.java +++ b/sdk/resourcemanager/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/ApplicationGatewayImpl.java @@ -410,7 +410,8 @@ protected SubResource ensureBackendRef(String name) { } protected ApplicationGatewayBackendImpl ensureUniqueBackend() { - String name = this.manager().sdkContext().randomResourceName("backend", 20); + String name = this.manager().resourceManager().sdkContext() + .randomResourceName("backend", 20); ApplicationGatewayBackendImpl backend = this.defineBackend(name); backend.attach(); return backend; @@ -420,7 +421,7 @@ private ApplicationGatewayIpConfigurationImpl ensureDefaultIPConfig() { ApplicationGatewayIpConfigurationImpl ipConfig = (ApplicationGatewayIpConfigurationImpl) defaultIPConfiguration(); if (ipConfig == null) { - String name = this.manager().sdkContext().randomResourceName("ipcfg", 11); + String name = this.manager().resourceManager().sdkContext().randomResourceName("ipcfg", 11); ipConfig = this.defineIPConfiguration(name); ipConfig.attach(); } @@ -432,7 +433,7 @@ protected ApplicationGatewayFrontendImpl ensureDefaultPrivateFrontend() { if (frontend != null) { return frontend; } else { - String name = this.manager().sdkContext().randomResourceName("frontend", 14); + String name = this.manager().resourceManager().sdkContext().randomResourceName("frontend", 14); frontend = this.defineFrontend(name); frontend.attach(); this.defaultPrivateFrontend = frontend; @@ -445,7 +446,7 @@ protected ApplicationGatewayFrontendImpl ensureDefaultPublicFrontend() { if (frontend != null) { return frontend; } else { - String name = this.manager().sdkContext().randomResourceName("frontend", 14); + String name = this.manager().resourceManager().sdkContext().randomResourceName("frontend", 14); frontend = this.defineFrontend(name); frontend.attach(); this.defaultPublicFrontend = frontend; @@ -457,7 +458,7 @@ protected ApplicationGatewayFrontendImpl ensureDefaultPublicFrontend() { private Creatable ensureDefaultNetworkDefinition() { if (this.creatableNetwork == null) { - final String vnetName = this.manager().sdkContext().randomResourceName("vnet", 10); + final String vnetName = this.manager().resourceManager().sdkContext().randomResourceName("vnet", 10); this.creatableNetwork = this .manager() @@ -477,7 +478,7 @@ private Creatable ensureDefaultNetworkDefinition() { private Creatable ensureDefaultPipDefinition() { if (this.creatablePip == null) { - final String pipName = this.manager().sdkContext().randomResourceName("pip", 9); + final String pipName = this.manager().resourceManager().sdkContext().randomResourceName("pip", 9); this.creatablePip = this .manager() @@ -1043,7 +1044,7 @@ public ApplicationGatewayImpl withFrontendPort(int portNumber, String name) { // If no conflict, create a new port if (name == null) { // No name specified, so auto-name it - name = this.manager().sdkContext().randomResourceName("port", 9); + name = this.manager().resourceManager().sdkContext().randomResourceName("port", 9); } frontendPortByName = new ApplicationGatewayFrontendPort().withName(name).withPort(portNumber); diff --git a/sdk/resourcemanager/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/ApplicationGatewayListenerImpl.java b/sdk/resourcemanager/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/ApplicationGatewayListenerImpl.java index 5247625814a79..26c6001b49f2d 100644 --- a/sdk/resourcemanager/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/ApplicationGatewayListenerImpl.java +++ b/sdk/resourcemanager/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/ApplicationGatewayListenerImpl.java @@ -167,7 +167,8 @@ public ApplicationGatewayListenerImpl withFrontendPort(int portNumber) { String portName = this.parent().frontendPortNameFromNumber(portNumber); if (portName == null) { // Existing frontend port with this number not found so create one - portName = this.parent().manager().sdkContext().randomResourceName("port", 9); + portName = this.parent().manager().resourceManager().sdkContext() + .randomResourceName("port", 9); this.parent().withFrontendPort(portNumber, portName); } @@ -189,7 +190,8 @@ public ApplicationGatewayListenerImpl withSslCertificateFromKeyVaultSecretId(Str private ApplicationGatewayListenerImpl withSslCertificateFromKeyVaultSecretId( String keyVaultSecretId, String name) { if (name == null) { - name = this.parent().manager().sdkContext().randomResourceName("cert", 10); + name = this.parent().manager().resourceManager().sdkContext() + .randomResourceName("cert", 10); } this.parent().defineSslCertificate(name).withKeyVaultSecretId(keyVaultSecretId).attach(); return this; @@ -202,7 +204,8 @@ public ApplicationGatewayListenerImpl withSslCertificateFromPfxFile(File pfxFile private ApplicationGatewayListenerImpl withSslCertificateFromPfxFile(File pfxFile, String name) throws IOException { if (name == null) { - name = this.parent().manager().sdkContext().randomResourceName("cert", 10); + name = this.parent().manager().resourceManager().sdkContext() + .randomResourceName("cert", 10); } this.parent().defineSslCertificate(name).withPfxFromFile(pfxFile).attach(); return this.withSslCertificate(name); diff --git a/sdk/resourcemanager/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/ApplicationGatewayRequestRoutingRuleImpl.java b/sdk/resourcemanager/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/ApplicationGatewayRequestRoutingRuleImpl.java index 2c97339bd2ffd..bfabc22185984 100644 --- a/sdk/resourcemanager/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/ApplicationGatewayRequestRoutingRuleImpl.java +++ b/sdk/resourcemanager/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/ApplicationGatewayRequestRoutingRuleImpl.java @@ -217,7 +217,7 @@ public ApplicationGatewayRequestRoutingRuleImpl toBackendHttpConfiguration(Strin private ApplicationGatewayBackendHttpConfigurationImpl ensureBackendHttpConfig() { ApplicationGatewayBackendHttpConfigurationImpl config = this.backendHttpConfiguration(); if (config == null) { - final String name = this.parent().manager().sdkContext().randomResourceName("bckcfg", 11); + final String name = this.parent().manager().resourceManager().sdkContext().randomResourceName("bckcfg", 11); config = this.parent().defineBackendHttpConfiguration(name); config.attach(); this.toBackendHttpConfiguration(name); @@ -227,7 +227,7 @@ private ApplicationGatewayBackendHttpConfigurationImpl ensureBackendHttpConfig() @Override public ApplicationGatewayRequestRoutingRuleImpl toBackendHttpPort(int portNumber) { - String name = this.parent().manager().sdkContext().randomResourceName("backcfg", 12); + String name = this.parent().manager().resourceManager().sdkContext().randomResourceName("backcfg", 12); this.parent().defineBackendHttpConfiguration(name).withPort(portNumber).attach(); return this.toBackendHttpConfiguration(name); } @@ -268,7 +268,7 @@ private ApplicationGatewayRequestRoutingRuleImpl fromFrontendPort( if (needToCreate == ApplicationGatewayImpl.CreationState.NeedToCreate) { // If no listener exists for the requested port number yet and the name, create one if (name == null) { - name = this.parent().manager().sdkContext().randomResourceName("listener", 13); + name = this.parent().manager().resourceManager().sdkContext().randomResourceName("listener", 13); } listenerByPort = this.parent().defineListener(name).withFrontendPort(portNumber); @@ -300,7 +300,8 @@ private ApplicationGatewayRequestRoutingRuleImpl fromFrontendPort( private ApplicationGatewayListenerImpl ensureListener() { ApplicationGatewayListenerImpl listener = this.listener(); if (listener == null) { - final String name = this.parent().manager().sdkContext().randomResourceName("listener", 13); + final String name = this.parent().manager().resourceManager().sdkContext() + .randomResourceName("listener", 13); listener = this.parent().defineListener(name); listener.attach(); this.fromListener(name); diff --git a/sdk/resourcemanager/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/ApplicationGatewayUrlPathMapImpl.java b/sdk/resourcemanager/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/ApplicationGatewayUrlPathMapImpl.java index 900a93fd3952d..be2cd863c0bc3 100644 --- a/sdk/resourcemanager/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/ApplicationGatewayUrlPathMapImpl.java +++ b/sdk/resourcemanager/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/ApplicationGatewayUrlPathMapImpl.java @@ -93,7 +93,7 @@ public ApplicationGatewayUrlPathMapImpl toBackendHttpConfiguration(String name) @Override public ApplicationGatewayUrlPathMapImpl toBackendHttpPort(int portNumber) { - String name = this.parent().manager().sdkContext().randomResourceName("backcfg", 12); + String name = this.parent().manager().resourceManager().sdkContext().randomResourceName("backcfg", 12); this.parent().defineBackendHttpConfiguration(name).withPort(portNumber).attach(); return this.toBackendHttpConfiguration(name); } diff --git a/sdk/resourcemanager/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/LoadBalancerFrontendImpl.java b/sdk/resourcemanager/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/LoadBalancerFrontendImpl.java index ef391006465ec..760b347aa4fa4 100644 --- a/sdk/resourcemanager/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/LoadBalancerFrontendImpl.java +++ b/sdk/resourcemanager/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/LoadBalancerFrontendImpl.java @@ -236,7 +236,7 @@ public LoadBalancerFrontendImpl withNewPublicIpAddress(Creatable creatablePip, this.creatablePIPKeys.put(this.addDependency(creatablePip), frontendName); } else if (!existingPipFrontendName.equalsIgnoreCase(frontendName)) { // Existing PIP definition already in use but under a different frontend, so error - String exceptionMessage = + String exceptionMessage = "This public IP address definition is already associated with a frontend under a different name."; throw logger.logExceptionAsError(new IllegalArgumentException(exceptionMessage)); } diff --git a/sdk/resourcemanager/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/LoadBalancerInboundNatPoolImpl.java b/sdk/resourcemanager/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/LoadBalancerInboundNatPoolImpl.java index 52816ea5be422..48bfe67944ab2 100644 --- a/sdk/resourcemanager/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/LoadBalancerInboundNatPoolImpl.java +++ b/sdk/resourcemanager/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/LoadBalancerInboundNatPoolImpl.java @@ -112,21 +112,21 @@ public LoadBalancerInboundNatPoolImpl fromExistingPublicIPAddress(String resourc @Override public LoadBalancerInboundNatPoolImpl fromNewPublicIPAddress(String leafDnsLabel) { - String frontendName = this.parent().manager().sdkContext().randomResourceName("fe", 20); + String frontendName = this.parent().manager().resourceManager().sdkContext().randomResourceName("fe", 20); this.parent().withNewPublicIPAddress(leafDnsLabel, frontendName); return fromFrontend(frontendName); } @Override public LoadBalancerInboundNatPoolImpl fromNewPublicIPAddress(Creatable pipDefinition) { - String frontendName = this.parent().manager().sdkContext().randomResourceName("fe", 20); + String frontendName = this.parent().manager().resourceManager().sdkContext().randomResourceName("fe", 20); this.parent().withNewPublicIPAddress(pipDefinition, frontendName); return fromFrontend(frontendName); } @Override public LoadBalancerInboundNatPoolImpl fromNewPublicIPAddress() { - String dnsLabel = this.parent().manager().sdkContext().randomResourceName("fe", 20); + String dnsLabel = this.parent().manager().resourceManager().sdkContext().randomResourceName("fe", 20); return this.fromNewPublicIPAddress(dnsLabel); } diff --git a/sdk/resourcemanager/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/LoadBalancerInboundNatRuleImpl.java b/sdk/resourcemanager/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/LoadBalancerInboundNatRuleImpl.java index a74242d559ef0..b724065aa8408 100644 --- a/sdk/resourcemanager/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/LoadBalancerInboundNatRuleImpl.java +++ b/sdk/resourcemanager/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/LoadBalancerInboundNatRuleImpl.java @@ -162,7 +162,7 @@ public LoadBalancerInboundNatRuleImpl fromExistingPublicIPAddress(String resourc @Override public LoadBalancerInboundNatRuleImpl fromNewPublicIPAddress(String leafDnsLabel) { - String frontendName = this.parent().manager().sdkContext().randomResourceName("fe", 20); + String frontendName = this.parent().manager().resourceManager().sdkContext().randomResourceName("fe", 20); this.parent().withNewPublicIPAddress(leafDnsLabel, frontendName); this.fromFrontend(frontendName); return this; @@ -170,7 +170,7 @@ public LoadBalancerInboundNatRuleImpl fromNewPublicIPAddress(String leafDnsLabel @Override public LoadBalancerInboundNatRuleImpl fromNewPublicIPAddress(Creatable pipDefinition) { - String frontendName = this.parent().manager().sdkContext().randomResourceName("fe", 20); + String frontendName = this.parent().manager().resourceManager().sdkContext().randomResourceName("fe", 20); this.parent().withNewPublicIPAddress(pipDefinition, frontendName); this.fromFrontend(frontendName); return this; @@ -178,7 +178,7 @@ public LoadBalancerInboundNatRuleImpl fromNewPublicIPAddress(Creatable pipDefinition) { - String frontendName = this.parent().manager().sdkContext().randomResourceName("fe", 20); + String frontendName = this.parent().manager().resourceManager().sdkContext().randomResourceName("fe", 20); this.parent().withNewPublicIPAddress(pipDefinition, frontendName); return fromFrontend(frontendName); } @Override public LoadBalancingRuleImpl fromNewPublicIPAddress() { - String dnsLabel = this.parent().manager().sdkContext().randomResourceName("fe", 20); + String dnsLabel = this.parent().manager().resourceManager().sdkContext().randomResourceName("fe", 20); return this.fromNewPublicIPAddress(dnsLabel); } diff --git a/sdk/resourcemanager/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/NetworkImpl.java b/sdk/resourcemanager/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/NetworkImpl.java index a582f46f5a5e7..578c1711c5208 100644 --- a/sdk/resourcemanager/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/NetworkImpl.java +++ b/sdk/resourcemanager/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/NetworkImpl.java @@ -291,7 +291,7 @@ public NetworkImpl withNewDdosProtectionPlan() { DdosProtectionPlan.DefinitionStages.WithGroup ddosProtectionPlanWithGroup = manager() .ddosProtectionPlans() - .define(this.manager().sdkContext().randomResourceName(name(), 20)) + .define(this.manager().resourceManager().sdkContext().randomResourceName(name(), 20)) .withRegion(region()); if (super.creatableGroup != null && isInCreateMode()) { ddosProtectionPlanCreatable = ddosProtectionPlanWithGroup.withNewResourceGroup(super.creatableGroup); diff --git a/sdk/resourcemanager/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/NetworkInterfaceImpl.java b/sdk/resourcemanager/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/NetworkInterfaceImpl.java index 350597a7ee2df..1b1378b02534b 100644 --- a/sdk/resourcemanager/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/NetworkInterfaceImpl.java +++ b/sdk/resourcemanager/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/NetworkInterfaceImpl.java @@ -58,7 +58,7 @@ class NetworkInterfaceImpl NetworkInterfaceImpl(String name, NetworkInterfaceInner innerModel, final NetworkManager networkManager) { super(name, innerModel, networkManager); this.nicName = name; - this.namer = this.manager().sdkContext().createIdentifierProvider(this.nicName); + this.namer = this.manager().resourceManager().sdkContext().createIdentifierProvider(this.nicName); initializeChildrenFromInner(); } diff --git a/sdk/resourcemanager/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/NetworkPeeringImpl.java b/sdk/resourcemanager/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/NetworkPeeringImpl.java index ee8ee6c4a2c3d..110105b43865e 100644 --- a/sdk/resourcemanager/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/NetworkPeeringImpl.java +++ b/sdk/resourcemanager/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/NetworkPeeringImpl.java @@ -374,7 +374,8 @@ protected Mono createChildResourceAsync() { .defer( () -> { // No matching remote peering, so create one on the remote network - String peeringName = this.manager().sdkContext().randomResourceName("peer", 15); + String peeringName = this.manager().resourceManager().sdkContext() + .randomResourceName("peer", 15); WithCreate remotePeeringDefinition = remoteNetwork diff --git a/sdk/resourcemanager/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/VirtualNetworkGatewayImpl.java b/sdk/resourcemanager/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/VirtualNetworkGatewayImpl.java index 176bee924ef35..a4b0d9bf57671 100644 --- a/sdk/resourcemanager/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/VirtualNetworkGatewayImpl.java +++ b/sdk/resourcemanager/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/VirtualNetworkGatewayImpl.java @@ -111,7 +111,9 @@ public VirtualNetworkGatewayImpl withNewNetwork(String name, String addressSpace @Override public VirtualNetworkGatewayImpl withNewNetwork(String addressSpaceCidr, String subnetAddressSpaceCidr) { withNewNetwork( - this.manager().sdkContext().randomResourceName("vnet", 8), addressSpaceCidr, subnetAddressSpaceCidr); + this.manager().resourceManager().sdkContext().randomResourceName("vnet", 8), + addressSpaceCidr, + subnetAddressSpaceCidr); return this; } @@ -141,7 +143,7 @@ public VirtualNetworkGatewayImpl withNewPublicIpAddress(Creatable ensureDefaultPipDefinition() { if (this.creatablePip == null) { - final String pipName = this.manager().sdkContext().randomResourceName("pip", 9); + final String pipName = this.manager().resourceManager().sdkContext().randomResourceName("pip", 9); this.creatablePip = this .manager() diff --git a/sdk/resourcemanager/azure-resourcemanager-network/src/test/java/com/azure/resourcemanager/network/NetworkManagementTest.java b/sdk/resourcemanager/azure-resourcemanager-network/src/test/java/com/azure/resourcemanager/network/NetworkManagementTest.java index 2ae87b6a38298..9b83b91fcaa18 100644 --- a/sdk/resourcemanager/azure-resourcemanager-network/src/test/java/com/azure/resourcemanager/network/NetworkManagementTest.java +++ b/sdk/resourcemanager/azure-resourcemanager-network/src/test/java/com/azure/resourcemanager/network/NetworkManagementTest.java @@ -55,9 +55,10 @@ protected void initializeClients(HttpPipeline httpPipeline, AzureProfile profile rgName = generateRandomResourceName("javanwmrg", 15); resourceManager = ResourceManager.authenticate(httpPipeline, profile).withDefaultSubscription(); - networkManager = NetworkManager.authenticate(httpPipeline, profile, sdkContext); + networkManager = NetworkManager.authenticate(httpPipeline, profile); keyVaultManager = KeyVaultManager.authenticate(httpPipeline, profile); msiManager = MSIManager.authenticate(httpPipeline, profile); + setSdkContext(sdkContext, networkManager); } @Override diff --git a/sdk/resourcemanager/azure-resourcemanager-privatedns/src/main/java/com/azure/resourcemanager/privatedns/PrivateDnsZoneManager.java b/sdk/resourcemanager/azure-resourcemanager-privatedns/src/main/java/com/azure/resourcemanager/privatedns/PrivateDnsZoneManager.java index cbe58448800dc..4f500fa30f2f5 100644 --- a/sdk/resourcemanager/azure-resourcemanager-privatedns/src/main/java/com/azure/resourcemanager/privatedns/PrivateDnsZoneManager.java +++ b/sdk/resourcemanager/azure-resourcemanager-privatedns/src/main/java/com/azure/resourcemanager/privatedns/PrivateDnsZoneManager.java @@ -13,7 +13,6 @@ import com.azure.resourcemanager.resources.fluentcore.arm.Manager; import com.azure.core.management.profile.AzureProfile; import com.azure.resourcemanager.resources.fluentcore.utils.HttpPipelineProvider; -import com.azure.resourcemanager.resources.fluentcore.utils.SdkContext; /** Entry point to Azure private DNS zone management. */ public final class PrivateDnsZoneManager extends Manager { @@ -48,20 +47,7 @@ public static PrivateDnsZoneManager authenticate(TokenCredential credential, Azu * @return the PrivateDnsZoneManager */ public static PrivateDnsZoneManager authenticate(HttpPipeline httpPipeline, AzureProfile profile) { - return new PrivateDnsZoneManager(httpPipeline, profile, new SdkContext()); - } - - /** - * Creates an instance of PrivateDnsZoneManager that exposes private DNS zone management API entry points. - * - * @param httpPipeline the HttpPipeline to be used for API calls. - * @param profile the profile to use - * @param sdkContext the sdk context - * @return the PrivateDnsZoneManager - */ - public static PrivateDnsZoneManager authenticate( - HttpPipeline httpPipeline, AzureProfile profile, SdkContext sdkContext) { - return new PrivateDnsZoneManager(httpPipeline, profile, sdkContext); + return new PrivateDnsZoneManager(httpPipeline, profile); } /** The interface allowing configurations to be set. */ @@ -83,7 +69,7 @@ public PrivateDnsZoneManager authenticate(TokenCredential credential, AzureProfi } } - private PrivateDnsZoneManager(HttpPipeline httpPipeline, AzureProfile profile, SdkContext sdkContext) { + private PrivateDnsZoneManager(HttpPipeline httpPipeline, AzureProfile profile) { super( httpPipeline, profile, @@ -91,9 +77,7 @@ private PrivateDnsZoneManager(HttpPipeline httpPipeline, AzureProfile profile, S .pipeline(httpPipeline) .endpoint(profile.getEnvironment().getResourceManagerEndpoint()) .subscriptionId(profile.getSubscriptionId()) - .buildClient(), - sdkContext - ); + .buildClient()); } /** diff --git a/sdk/resourcemanager/azure-resourcemanager-redis/src/main/java/com/azure/resourcemanager/redis/RedisManager.java b/sdk/resourcemanager/azure-resourcemanager-redis/src/main/java/com/azure/resourcemanager/redis/RedisManager.java index 16b39c060d6e5..53ea0a1bdda22 100644 --- a/sdk/resourcemanager/azure-resourcemanager-redis/src/main/java/com/azure/resourcemanager/redis/RedisManager.java +++ b/sdk/resourcemanager/azure-resourcemanager-redis/src/main/java/com/azure/resourcemanager/redis/RedisManager.java @@ -14,7 +14,6 @@ import com.azure.resourcemanager.resources.fluentcore.arm.Manager; import com.azure.core.management.profile.AzureProfile; import com.azure.resourcemanager.resources.fluentcore.utils.HttpPipelineProvider; -import com.azure.resourcemanager.resources.fluentcore.utils.SdkContext; /** Entry point to Azure redis resource management. */ public final class RedisManager extends Manager { @@ -49,19 +48,7 @@ public static RedisManager authenticate(TokenCredential credential, AzureProfile * @return the RedisManager */ public static RedisManager authenticate(HttpPipeline httpPipeline, AzureProfile profile) { - return authenticate(httpPipeline, profile, new SdkContext()); - } - - /** - * Creates an instance of RedisManager that exposes Redis resource management API entry points. - * - * @param httpPipeline the HttpPipeline to be used for API calls. - * @param profile the profile to use - * @param sdkContext the sdk context - * @return the RedisManager - */ - public static RedisManager authenticate(HttpPipeline httpPipeline, AzureProfile profile, SdkContext sdkContext) { - return new RedisManager(httpPipeline, profile, sdkContext); + return new RedisManager(httpPipeline, profile); } /** The interface allowing configurations to be set. */ @@ -84,7 +71,7 @@ public RedisManager authenticate(TokenCredential credential, AzureProfile profil } } - private RedisManager(HttpPipeline httpPipeline, AzureProfile profile, SdkContext sdkContext) { + private RedisManager(HttpPipeline httpPipeline, AzureProfile profile) { super( httpPipeline, profile, @@ -92,8 +79,7 @@ private RedisManager(HttpPipeline httpPipeline, AzureProfile profile, SdkContext .pipeline(httpPipeline) .endpoint(profile.getEnvironment().getResourceManagerEndpoint()) .subscriptionId(profile.getSubscriptionId()) - .buildClient(), - sdkContext); + .buildClient()); } /** @return the Redis Cache management API entry point */ diff --git a/sdk/resourcemanager/azure-resourcemanager-resources/src/main/java/com/azure/resourcemanager/resources/ResourceManager.java b/sdk/resourcemanager/azure-resourcemanager-resources/src/main/java/com/azure/resourcemanager/resources/ResourceManager.java index 98a449d9fcf40..e0e2d3cbc478e 100644 --- a/sdk/resourcemanager/azure-resourcemanager-resources/src/main/java/com/azure/resourcemanager/resources/ResourceManager.java +++ b/sdk/resourcemanager/azure-resourcemanager-resources/src/main/java/com/azure/resourcemanager/resources/ResourceManager.java @@ -59,6 +59,7 @@ public final class ResourceManager extends Manager { private PolicyAssignments policyAssignments; private Subscriptions subscriptions; private Tenants tenants; + private SdkContext sdkContext; /** * Creates an instance of ResourceManager that exposes resource management API entry points. @@ -128,14 +129,6 @@ public interface Authenticated { */ Subscriptions subscriptions(); - /** - * Specifies sdk context for resource manager. - * - * @param sdkContext the sdk context - * @return the authenticated itself for chaining - */ - Authenticated withSdkContext(SdkContext sdkContext); - /** * Specifies a subscription to expose resource management API entry points that work in a subscription. * @@ -160,7 +153,6 @@ public interface Authenticated { private static final class AuthenticatedImpl implements Authenticated { private final HttpPipeline httpPipeline; private AzureProfile profile; - private SdkContext sdkContext; private final SubscriptionClient subscriptionClient; // The subscription less collections private Subscriptions subscriptions; @@ -169,7 +161,6 @@ private static final class AuthenticatedImpl implements Authenticated { AuthenticatedImpl(HttpPipeline httpPipeline, AzureProfile profile) { this.httpPipeline = httpPipeline; this.profile = profile; - this.sdkContext = new SdkContext(); this.subscriptionClient = new SubscriptionClientBuilder() .pipeline(httpPipeline) .endpoint(profile.getEnvironment().getResourceManagerEndpoint()) @@ -190,17 +181,11 @@ public Tenants tenants() { return tenants; } - @Override - public AuthenticatedImpl withSdkContext(SdkContext sdkContext) { - this.sdkContext = sdkContext; - return this; - } - @Override public ResourceManager withSubscription(String subscriptionId) { Objects.requireNonNull(subscriptionId); profile = new AzureProfile(profile.getTenantId(), subscriptionId, profile.getEnvironment()); - return new ResourceManager(httpPipeline, profile, sdkContext); + return new ResourceManager(httpPipeline, profile); } @Override @@ -209,11 +194,11 @@ public ResourceManager withDefaultSubscription() { String subscriptionId = ResourceManagerUtils.getDefaultSubscription(this.subscriptions().list()); profile = new AzureProfile(profile.getTenantId(), subscriptionId, profile.getEnvironment()); } - return new ResourceManager(httpPipeline, profile, sdkContext); + return new ResourceManager(httpPipeline, profile); } } - private ResourceManager(HttpPipeline httpPipeline, AzureProfile profile, SdkContext sdkContext) { + private ResourceManager(HttpPipeline httpPipeline, AzureProfile profile) { super( null, profile, @@ -221,8 +206,7 @@ private ResourceManager(HttpPipeline httpPipeline, AzureProfile profile, SdkCont .pipeline(httpPipeline) .endpoint(profile.getEnvironment().getResourceManagerEndpoint()) .subscriptionId(profile.getSubscriptionId()) - .buildClient(), - sdkContext); + .buildClient()); super.withResourceManager(this); this.featureClient = new FeatureClientBuilder() @@ -356,4 +340,14 @@ public Tenants tenants() { } return tenants; } + + /** + * @return the {@link SdkContext} associated with this manager + */ + public SdkContext sdkContext() { + if (sdkContext == null) { + sdkContext = new SdkContext(); + } + return this.sdkContext; + } } diff --git a/sdk/resourcemanager/azure-resourcemanager-resources/src/main/java/com/azure/resourcemanager/resources/fluentcore/arm/Manager.java b/sdk/resourcemanager/azure-resourcemanager-resources/src/main/java/com/azure/resourcemanager/resources/fluentcore/arm/Manager.java index 87eaebdea9724..172ff92ed05d2 100644 --- a/sdk/resourcemanager/azure-resourcemanager-resources/src/main/java/com/azure/resourcemanager/resources/fluentcore/arm/Manager.java +++ b/sdk/resourcemanager/azure-resourcemanager-resources/src/main/java/com/azure/resourcemanager/resources/fluentcore/arm/Manager.java @@ -8,7 +8,6 @@ import com.azure.core.management.profile.AzureProfile; import com.azure.resourcemanager.resources.ResourceManager; import com.azure.resourcemanager.resources.fluentcore.model.HasServiceClient; -import com.azure.resourcemanager.resources.fluentcore.utils.SdkContext; /** * Generic base class for Azure resource managers. @@ -20,21 +19,17 @@ public abstract class Manager implements HasServiceClient { private final String subscriptionId; private final AzureEnvironment environment; private final HttpPipeline httpPipeline; - private final SdkContext sdkContext; private final InnerT innerManagementClient; - protected Manager(HttpPipeline httpPipeline, AzureProfile profile, - InnerT innerManagementClient, SdkContext sdkContext) { + protected Manager(HttpPipeline httpPipeline, AzureProfile profile, InnerT innerManagementClient) { this.httpPipeline = httpPipeline; if (httpPipeline != null) { this.resourceManager = ResourceManager.authenticate(httpPipeline, profile) - .withSdkContext(sdkContext) .withDefaultSubscription(); } this.subscriptionId = profile.getSubscriptionId(); this.environment = profile.getEnvironment(); - this.sdkContext = sdkContext; this.innerManagementClient = innerManagementClient; } @@ -74,11 +69,4 @@ public ResourceManager resourceManager() { public HttpPipeline httpPipeline() { return this.httpPipeline; } - - /** - * @return the {@link SdkContext} associated with this manager - */ - public SdkContext sdkContext() { - return this.sdkContext; - } } 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 9007e2044a643..6940a665d23a5 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.sdkContext().randomResourceName("rg", 24); - final String serviceName = azureResourceManager.sdkContext().randomResourceName("service", 24); + final String rgName = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("rg", 24); + final String serviceName = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("service", 24); final Region region = Region.US_EAST; - final String domainName = azureResourceManager.sdkContext().randomResourceName("jsdkdemo-", 20) + ".com"; - final String certOrderName = azureResourceManager.sdkContext().randomResourceName("cert", 15); - final String vaultName = azureResourceManager.sdkContext().randomResourceName("vault", 15); - final String certName = azureResourceManager.sdkContext().randomResourceName("cert", 15); + final String domainName = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("jsdkdemo-", 20) + ".com"; + final String certOrderName = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("cert", 15); + final String vaultName = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("vault", 15); + final String certName = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("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 0a61590833ac3..3aca11a87dce7 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.sdkContext().randomResourceName("webapp1-", 20); - final String app2Name = azureResourceManager.sdkContext().randomResourceName("webapp2-", 20); - final String app3Name = azureResourceManager.sdkContext().randomResourceName("webapp3-", 20); - final String rg1Name = azureResourceManager.sdkContext().randomResourceName("rg1NEMV_", 24); - final String rg2Name = azureResourceManager.sdkContext().randomResourceName("rg2NEMV_", 24); + final String app1Name = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("webapp1-", 20); + final String app2Name = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("webapp2-", 20); + final String app3Name = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("webapp3-", 20); + final String rg1Name = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("rg1NEMV_", 24); + final String rg2Name = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("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 fe46f69baf884..1650b6ce24c89 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 @@ -40,9 +40,9 @@ public final class ManageFunctionAppLogs { public static boolean runSample(AzureResourceManager azureResourceManager) throws IOException { // New resources final String suffix = ".azurewebsites.net"; - final String appName = azureResourceManager.sdkContext().randomResourceName("webapp1-", 20); + final String appName = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("webapp1-", 20); final String appUrl = appName + suffix; - final String rgName = azureResourceManager.sdkContext().randomResourceName("rg1NEMV_", 24); + final String rgName = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("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 0578839ae8b72..2ec92c1796996 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 @@ -44,19 +44,19 @@ public final class ManageFunctionAppSourceControl { public static boolean runSample(AzureResourceManager azureResourceManager) throws GitAPIException { // New resources final String suffix = ".azurewebsites.net"; - final String app1Name = azureResourceManager.sdkContext().randomResourceName("webapp1-", 20); - final String app2Name = azureResourceManager.sdkContext().randomResourceName("webapp2-", 20); - final String app3Name = azureResourceManager.sdkContext().randomResourceName("webapp3-", 20); - final String app4Name = azureResourceManager.sdkContext().randomResourceName("webapp4-", 20); - final String app5Name = azureResourceManager.sdkContext().randomResourceName("webapp5-", 20); - final String app6Name = azureResourceManager.sdkContext().randomResourceName("webapp6-", 20); + final String app1Name = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("webapp1-", 20); + final String app2Name = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("webapp2-", 20); + final String app3Name = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("webapp3-", 20); + final String app4Name = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("webapp4-", 20); + final String app5Name = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("webapp5-", 20); + final String app6Name = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("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.sdkContext().randomResourceName("rg1NEMV_", 24); + final String rgName = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("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 ddde875e5112f..d094e9d0d9abe 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 @@ -47,13 +47,13 @@ public final class ManageFunctionAppWithAuthentication { public static boolean runSample(AzureResourceManager azureResourceManager) throws GitAPIException { // New resources final String suffix = ".azurewebsites.net"; - final String app1Name = azureResourceManager.sdkContext().randomResourceName("webapp1-", 20); - final String app2Name = azureResourceManager.sdkContext().randomResourceName("webapp2-", 20); - final String app3Name = azureResourceManager.sdkContext().randomResourceName("webapp3-", 20); + final String app1Name = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("webapp1-", 20); + final String app2Name = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("webapp2-", 20); + final String app3Name = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("webapp3-", 20); final String app1Url = app1Name + suffix; final String app2Url = app2Name + suffix; final String app3Url = app3Name + suffix; - final String rgName = azureResourceManager.sdkContext().randomResourceName("rg1NEMV_", 24); + final String rgName = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("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 df10171d7ce9c..d9572036cc86b 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 @@ -41,10 +41,10 @@ public final class ManageFunctionAppWithDomainSsl { */ public static boolean runSample(AzureResourceManager azureResourceManager) throws IOException { // New resources - final String app1Name = azureResourceManager.sdkContext().randomResourceName("webapp1-", 20); - final String app2Name = azureResourceManager.sdkContext().randomResourceName("webapp2-", 20); - final String rgName = azureResourceManager.sdkContext().randomResourceName("rgNEMV_", 24); - final String domainName = azureResourceManager.sdkContext().randomResourceName("jsdkdemo-", 20) + ".com"; + final String app1Name = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("webapp1-", 20); + final String app2Name = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("webapp2-", 20); + final String rgName = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("rgNEMV_", 24); + final String domainName = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("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 f153051fe5e75..d061b108ba082 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 @@ -36,14 +36,14 @@ public class ManageLinuxFunctionAppSourceControl { */ public static boolean runSample(AzureResourceManager azureResourceManager) { final String suffix = ".azurewebsites.net"; - final String app1Name = azureResourceManager.sdkContext().randomResourceName("webapp1-", 20); - final String app2Name = azureResourceManager.sdkContext().randomResourceName("webapp2-", 20); + final String app1Name = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("webapp1-", 20); + final String app2Name = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("webapp2-", 20); final String app1Url = app1Name + suffix; final String app2Url = app2Name + suffix; - final String plan1Name = azureResourceManager.sdkContext().randomResourceName("plan1-", 20); - final String plan2Name = azureResourceManager.sdkContext().randomResourceName("plan2-", 20); - final String storage1Name = azureResourceManager.sdkContext().randomResourceName("storage1", 20); - final String rgName = azureResourceManager.sdkContext().randomResourceName("rg1NEMV_", 24); + final String plan1Name = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("plan1-", 20); + final String plan2Name = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("plan2-", 20); + final String storage1Name = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("storage1", 20); + final String rgName = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("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 d7d04d1df7c46..7ab9654e09cf1 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.sdkContext().randomResourceName("webapp1-", 20); - final String app2Name = azureResourceManager.sdkContext().randomResourceName("webapp2-", 20); - final String app3Name = azureResourceManager.sdkContext().randomResourceName("webapp3-", 20); - final String rg1Name = azureResourceManager.sdkContext().randomResourceName("rg1NEMV_", 24); - final String rg2Name = azureResourceManager.sdkContext().randomResourceName("rg2NEMV_", 24); + final String app1Name = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("webapp1-", 20); + final String app2Name = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("webapp2-", 20); + final String app3Name = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("webapp3-", 20); + final String rg1Name = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("rg1NEMV_", 24); + final String rg2Name = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("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 479dac54e3664..a2eb4b253d531 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 @@ -44,15 +44,15 @@ public final class ManageLinuxWebAppSourceControl { public static boolean runSample(AzureResourceManager azureResourceManager) throws GitAPIException { // New resources final String suffix = ".azurewebsites.net"; - final String app1Name = azureResourceManager.sdkContext().randomResourceName("webapp1-", 20); - final String app2Name = azureResourceManager.sdkContext().randomResourceName("webapp2-", 20); - final String app3Name = azureResourceManager.sdkContext().randomResourceName("webapp3-", 20); - final String app4Name = azureResourceManager.sdkContext().randomResourceName("webapp4-", 20); + final String app1Name = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("webapp1-", 20); + final String app2Name = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("webapp2-", 20); + final String app3Name = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("webapp3-", 20); + final String app4Name = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("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.sdkContext().randomResourceName("rg1NEMV_", 24); + final String rgName = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("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 0d8adcdb57223..15cad833889b7 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.sdkContext().randomResourceName("webapp1-", 20); + final String appName = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("webapp1-", 20); final String appUrl = appName + suffix; - final String sqlServerName = azureResourceManager.sdkContext().randomResourceName("jsdkserver", 20); - final String sqlDbName = azureResourceManager.sdkContext().randomResourceName("jsdkdb", 20); + final String sqlServerName = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("jsdkserver", 20); + final String sqlDbName = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("jsdkdb", 20); final String admin = "jsdkadmin"; final String password = Utils.password(); - final String rgName = azureResourceManager.sdkContext().randomResourceName("rg1NEMV_", 24); + final String rgName = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("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 a5ff23a86fc45..20053b1ffb30e 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 @@ -50,11 +50,11 @@ public final class ManageLinuxWebAppStorageAccountConnection { public static boolean runSample(AzureResourceManager azureResourceManager) { // New resources final String suffix = ".azurewebsites.net"; - final String app1Name = azureResourceManager.sdkContext().randomResourceName("webapp1-", 20); + final String app1Name = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("webapp1-", 20); final String app1Url = app1Name + suffix; - final String storageName = azureResourceManager.sdkContext().randomResourceName("jsdkstore", 20); - final String containerName = azureResourceManager.sdkContext().randomResourceName("jcontainer", 20); - final String rgName = azureResourceManager.sdkContext().randomResourceName("rg1NEMV_", 24); + final String storageName = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("jsdkstore", 20); + final String containerName = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("jcontainer", 20); + final String rgName = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("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 15e2d0d9d7e9b..afc70670a0f49 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 @@ -49,9 +49,9 @@ public class ManageLinuxWebAppWithContainerRegistry { * @return true if sample runs successfully */ public static boolean runSample(AzureResourceManager azureResourceManager) throws IOException, InterruptedException { - final String rgName = azureResourceManager.sdkContext().randomResourceName("rgACR", 15); - final String acrName = azureResourceManager.sdkContext().randomResourceName("acrsample", 20); - final String appName = azureResourceManager.sdkContext().randomResourceName("webapp", 20); + final String rgName = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("rgACR", 15); + final String acrName = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("acrsample", 20); + final String appName = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("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 6b0a3b95e9b79..e36a881db19d1 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 @@ -44,10 +44,10 @@ public final class ManageLinuxWebAppWithDomainSsl { */ public static boolean runSample(AzureResourceManager azureResourceManager) throws IOException { // New resources - final String app1Name = azureResourceManager.sdkContext().randomResourceName("webapp1-", 20); - final String app2Name = azureResourceManager.sdkContext().randomResourceName("webapp2-", 20); - final String rgName = azureResourceManager.sdkContext().randomResourceName("rgNEMV_", 24); - final String domainName = azureResourceManager.sdkContext().randomResourceName("jsdkdemo-", 20) + ".com"; + final String app1Name = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("webapp1-", 20); + final String app2Name = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("webapp2-", 20); + final String rgName = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("rgNEMV_", 24); + final String domainName = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("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 9dee954f18833..97bf418855458 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 @@ -52,23 +52,23 @@ public final class ManageLinuxWebAppWithTrafficManager { * @return true if sample runs successfully */ public static boolean runSample(AzureResourceManager azureResourceManager) throws IOException { - rgName = azureResourceManager.sdkContext().randomResourceName("rgNEMV_", 24); + rgName = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("rgNEMV_", 24); if (ManageLinuxWebAppWithTrafficManager.azureResourceManager == null) { ManageLinuxWebAppWithTrafficManager.azureResourceManager = azureResourceManager; } // New resources - final String app1Name = azureResourceManager.sdkContext().randomResourceName("webapp1-", 20); - final String app2Name = azureResourceManager.sdkContext().randomResourceName("webapp2-", 20); - final String app3Name = azureResourceManager.sdkContext().randomResourceName("webapp3-", 20); - final String app4Name = azureResourceManager.sdkContext().randomResourceName("webapp4-", 20); - final String app5Name = azureResourceManager.sdkContext().randomResourceName("webapp5-", 20); - final String plan1Name = azureResourceManager.sdkContext().randomResourceName("jplan1_", 15); - final String plan2Name = azureResourceManager.sdkContext().randomResourceName("jplan2_", 15); - final String plan3Name = azureResourceManager.sdkContext().randomResourceName("jplan3_", 15); - final String domainName = azureResourceManager.sdkContext().randomResourceName("jsdkdemo-", 20) + ".com"; - final String tmName = azureResourceManager.sdkContext().randomResourceName("jsdktm-", 20); + final String app1Name = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("webapp1-", 20); + final String app2Name = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("webapp2-", 20); + final String app3Name = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("webapp3-", 20); + final String app4Name = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("webapp4-", 20); + final String app5Name = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("webapp5-", 20); + final String plan1Name = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("jplan1_", 15); + final String plan2Name = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("jplan2_", 15); + final String plan3Name = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("jplan3_", 15); + final String domainName = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("jsdkdemo-", 20) + ".com"; + final String tmName = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("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 0584328dcd588..6328ac6d188f7 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.sdkContext().randomResourceName("webapp1-", 20); - final String app2Name = azureResourceManager.sdkContext().randomResourceName("webapp2-", 20); - final String app3Name = azureResourceManager.sdkContext().randomResourceName("webapp3-", 20); - final String rg1Name = azureResourceManager.sdkContext().randomResourceName("rg1NEMV_", 24); - final String rg2Name = azureResourceManager.sdkContext().randomResourceName("rg2NEMV_", 24); + final String app1Name = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("webapp1-", 20); + final String app2Name = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("webapp2-", 20); + final String app3Name = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("webapp3-", 20); + final String rg1Name = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("rg1NEMV_", 24); + final String rg2Name = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("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 9eb124faf814b..42471229f4de8 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 @@ -45,10 +45,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.sdkContext().randomResourceName("webapp1-", 20); - final String rgName = azureResourceManager.sdkContext().randomResourceName("rg1NEMV_", 24); - final String vaultName = azureResourceManager.sdkContext().randomResourceName("vault", 20); - final String cosmosName = azureResourceManager.sdkContext().randomResourceName("cosmosdb", 20); + final String appName = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("webapp1-", 20); + final String rgName = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("rg1NEMV_", 24); + final String vaultName = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("vault", 20); + final String cosmosName = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("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 cf50a32e10187..d816eca0df435 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 @@ -41,10 +41,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.sdkContext().randomResourceName("webapp1-", 20); - final String rgName = azureResourceManager.sdkContext().randomResourceName("rg1NEMV_", 24); - final String vaultName = azureResourceManager.sdkContext().randomResourceName("vault", 20); - final String cosmosName = azureResourceManager.sdkContext().randomResourceName("cosmosdb", 20); + final String appName = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("webapp1-", 20); + final String rgName = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("rg1NEMV_", 24); + final String vaultName = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("vault", 20); + final String cosmosName = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("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 b00adeceb8c97..812d0220532fd 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 @@ -44,9 +44,9 @@ public final class ManageWebAppLogs { public static boolean runSample(AzureResourceManager azureResourceManager) throws IOException { // New resources final String suffix = ".azurewebsites.net"; - final String appName = azureResourceManager.sdkContext().randomResourceName("webapp1-", 20); + final String appName = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("webapp1-", 20); final String appUrl = appName + suffix; - final String rgName = azureResourceManager.sdkContext().randomResourceName("rg1NEMV_", 24); + final String rgName = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("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 f13f360bed707..3a8ca82b63ba0 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.sdkContext().randomResourceName("rg", 24); - final String app1Name = azureResourceManager.sdkContext().randomResourceName("webapp1-", 20); - final String app2Name = azureResourceManager.sdkContext().randomResourceName("webapp2-", 20); - final String app3Name = azureResourceManager.sdkContext().randomResourceName("webapp3-", 20); + final String resourceGroupName = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("rg", 24); + final String app1Name = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("webapp1-", 20); + final String app2Name = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("webapp2-", 20); + final String app3Name = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("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 2dd092cf5152a..fb1e19f234175 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 @@ -49,13 +49,13 @@ public final class ManageWebAppSourceControl { public static boolean runSample(AzureResourceManager azureResourceManager) throws GitAPIException { // New resources final String suffix = ".azurewebsites.net"; - final String app1Name = azureResourceManager.sdkContext().randomResourceName("webapp1-", 20); - final String app2Name = azureResourceManager.sdkContext().randomResourceName("webapp2-", 20); - final String app3Name = azureResourceManager.sdkContext().randomResourceName("webapp3-", 20); - final String app4Name = azureResourceManager.sdkContext().randomResourceName("webapp4-", 20); - final String app5Name = azureResourceManager.sdkContext().randomResourceName("webapp5-", 20); - final String app6Name = azureResourceManager.sdkContext().randomResourceName("webapp6-", 20); - final String app7Name = azureResourceManager.sdkContext().randomResourceName("webapp7-", 20); + final String app1Name = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("webapp1-", 20); + final String app2Name = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("webapp2-", 20); + final String app3Name = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("webapp3-", 20); + final String app4Name = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("webapp4-", 20); + final String app5Name = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("webapp5-", 20); + final String app6Name = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("webapp6-", 20); + final String app7Name = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("webapp7-", 20); final String app1Url = app1Name + suffix; final String app2Url = app2Name + suffix; final String app3Url = app3Name + suffix; @@ -63,8 +63,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.sdkContext().randomResourceName("rg1NEMV_", 24); - final String rg7Name = azureResourceManager.sdkContext().randomResourceName("rg7NEMV_", 24); + final String rgName = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("rg1NEMV_", 24); + final String rg7Name = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("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 0b291b5ea64e8..b9343fdb1f46e 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 @@ -43,16 +43,16 @@ public final class ManageWebAppSourceControlAsync { public static boolean runSample(final AzureResourceManager azureResourceManager) { // New resources final String suffix = ".azurewebsites.net"; - final String app1Name = azureResourceManager.sdkContext().randomResourceName("webapp1-", 20); - final String app2Name = azureResourceManager.sdkContext().randomResourceName("webapp2-", 20); - final String app3Name = azureResourceManager.sdkContext().randomResourceName("webapp3-", 20); - final String app4Name = azureResourceManager.sdkContext().randomResourceName("webapp4-", 20); + final String app1Name = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("webapp1-", 20); + final String app2Name = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("webapp2-", 20); + final String app3Name = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("webapp3-", 20); + final String app4Name = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("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.sdkContext().randomResourceName("jplan_", 15); - final String rgName = azureResourceManager.sdkContext().randomResourceName("rg1NEMV_", 24); + final String planName = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("jplan_", 15); + final String rgName = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("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 eadc1e1768a4e..51935f1b34820 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.sdkContext().randomResourceName("webapp1-", 20); + final String appName = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("webapp1-", 20); final String appUrl = appName + suffix; - final String sqlServerName = azureResourceManager.sdkContext().randomResourceName("jsdkserver", 20); - final String sqlDbName = azureResourceManager.sdkContext().randomResourceName("jsdkdb", 20); + final String sqlServerName = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("jsdkserver", 20); + final String sqlDbName = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("jsdkdb", 20); final String admin = "jsdkadmin"; final String password = Utils.password(); - final String rgName = azureResourceManager.sdkContext().randomResourceName("rg1NEMV_", 24); + final String rgName = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("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 33d6985813c3a..bea7ae9c3344f 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 @@ -51,11 +51,11 @@ public final class ManageWebAppStorageAccountConnection { public static boolean runSample(AzureResourceManager azureResourceManager) { // New resources final String suffix = ".azurewebsites.net"; - final String app1Name = azureResourceManager.sdkContext().randomResourceName("webapp1-", 20); + final String app1Name = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("webapp1-", 20); final String app1Url = app1Name + suffix; - final String storageName = azureResourceManager.sdkContext().randomResourceName("jsdkstore", 20); - final String containerName = azureResourceManager.sdkContext().randomResourceName("jcontainer", 20); - final String rgName = azureResourceManager.sdkContext().randomResourceName("rg1NEMV_", 24); + final String storageName = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("jsdkstore", 20); + final String containerName = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("jcontainer", 20); + final String rgName = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("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 4fbb8af243cc5..261fbbb37c0fe 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.sdkContext().randomResourceName("webapp1-", 20); - final String app2Name = azureResourceManager.sdkContext().randomResourceName("webapp2-", 20); - final String app3Name = azureResourceManager.sdkContext().randomResourceName("webapp3-", 20); - final String app4Name = azureResourceManager.sdkContext().randomResourceName("webapp4-", 20); + final String app1Name = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("webapp1-", 20); + final String app2Name = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("webapp2-", 20); + final String app3Name = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("webapp3-", 20); + final String app4Name = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("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.sdkContext().randomResourceName("rg1NEMV_", 24); + final String rgName = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("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 df023dcfd7f08..40dc909c34f09 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 @@ -43,10 +43,10 @@ public final class ManageWebAppWithDomainSsl { */ public static boolean runSample(AzureResourceManager azureResourceManager) throws IOException { // New resources - final String app1Name = azureResourceManager.sdkContext().randomResourceName("webapp1-", 20); - final String app2Name = azureResourceManager.sdkContext().randomResourceName("webapp2-", 20); - final String rgName = azureResourceManager.sdkContext().randomResourceName("rgNEMV_", 24); - final String domainName = azureResourceManager.sdkContext().randomResourceName("jsdkdemo-", 20) + ".com"; + final String app1Name = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("webapp1-", 20); + final String app2Name = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("webapp2-", 20); + final String rgName = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("rgNEMV_", 24); + final String domainName = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("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 8ae4020da7018..1981bab39810f 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 @@ -50,23 +50,23 @@ public final class ManageWebAppWithTrafficManager { * @return true if sample runs successfully */ public static boolean runSample(AzureResourceManager azureResourceManager) throws IOException { - rgName = azureResourceManager.sdkContext().randomResourceName("rgNEMV_", 24); + rgName = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("rgNEMV_", 24); if (ManageWebAppWithTrafficManager.azureResourceManager == null) { ManageWebAppWithTrafficManager.azureResourceManager = azureResourceManager; } // New resources - final String app1Name = azureResourceManager.sdkContext().randomResourceName("webapp1-", 20); - final String app2Name = azureResourceManager.sdkContext().randomResourceName("webapp2-", 20); - final String app3Name = azureResourceManager.sdkContext().randomResourceName("webapp3-", 20); - final String app4Name = azureResourceManager.sdkContext().randomResourceName("webapp4-", 20); - final String app5Name = azureResourceManager.sdkContext().randomResourceName("webapp5-", 20); - final String plan1Name = azureResourceManager.sdkContext().randomResourceName("jplan1_", 15); - final String plan2Name = azureResourceManager.sdkContext().randomResourceName("jplan2_", 15); - final String plan3Name = azureResourceManager.sdkContext().randomResourceName("jplan3_", 15); - final String domainName = azureResourceManager.sdkContext().randomResourceName("jsdkdemo-", 20) + ".com"; - final String tmName = azureResourceManager.sdkContext().randomResourceName("jsdktm-", 20); + final String app1Name = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("webapp1-", 20); + final String app2Name = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("webapp2-", 20); + final String app3Name = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("webapp3-", 20); + final String app4Name = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("webapp4-", 20); + final String app5Name = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("webapp5-", 20); + final String plan1Name = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("jplan1_", 15); + final String plan2Name = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("jplan2_", 15); + final String plan3Name = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("jplan3_", 15); + final String domainName = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("jsdkdemo-", 20) + ".com"; + final String tmName = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("jsdktm-", 20); try { 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 0e00b89dfbc7a..0a26ec8f8e826 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.sdkContext().randomResourceName("sp", 20); - final String appName = authenticated.sdkContext().randomResourceName("app", 20); + final String spName = authenticated.roleAssignments().manager().sdkContext().randomResourceName("sp", 20); + final String appName = authenticated.roleAssignments().manager().sdkContext().randomResourceName("app", 20); final String appUrl = "https://" + appName; - final String passwordName1 = authenticated.sdkContext().randomResourceName("password", 20); + final String passwordName1 = authenticated.roleAssignments().manager().sdkContext().randomResourceName("password", 20); final String password1 = "P@ssw0rd"; - final String passwordName2 = authenticated.sdkContext().randomResourceName("password", 20); + final String passwordName2 = authenticated.roleAssignments().manager().sdkContext().randomResourceName("password", 20); final String password2 = "StrongP@ss!12"; - final String certName1 = authenticated.sdkContext().randomResourceName("cert", 20); - final String raName = authenticated.sdkContext().randomUuid(); + final String certName1 = authenticated.roleAssignments().manager().sdkContext().randomResourceName("cert", 20); + final String raName = authenticated.roleAssignments().manager().sdkContext().randomUuid(); 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 49ee8a63bc9be..53337fd9b372d 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 @@ -38,13 +38,13 @@ public final class ManageUsersGroupsAndRoles { * @return true if sample runs successfully */ public static boolean runSample(AzureResourceManager.Authenticated authenticated, AzureProfile profile) { - final String userEmail = authenticated.sdkContext().randomResourceName("test", 15); + final String userEmail = authenticated.roleAssignments().manager().sdkContext().randomResourceName("test", 15); final String userName = userEmail.replace("test", "Test "); - final String spName = authenticated.sdkContext().randomResourceName("sp", 15); - final String raName1 = authenticated.sdkContext().randomUuid(); - final String raName2 = authenticated.sdkContext().randomUuid(); - final String groupEmail1 = authenticated.sdkContext().randomResourceName("group1", 15); - final String groupEmail2 = authenticated.sdkContext().randomResourceName("group2", 15); + final String spName = authenticated.roleAssignments().manager().sdkContext().randomResourceName("sp", 15); + final String raName1 = authenticated.roleAssignments().manager().sdkContext().randomUuid(); + final String raName2 = authenticated.roleAssignments().manager().sdkContext().randomUuid(); + final String groupEmail1 = authenticated.roleAssignments().manager().sdkContext().randomResourceName("group1", 15); + final String groupEmail2 = authenticated.roleAssignments().manager().sdkContext().randomResourceName("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/cdn/samples/ManageCdnProfileWithCustomDomain.java b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/cdn/samples/ManageCdnProfileWithCustomDomain.java index 36179d7452a90..13ccf938af051 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 @@ -35,10 +35,10 @@ public class ManageCdnProfileWithCustomDomain { * @return true if sample runs successfully */ public static boolean runSample(AzureResourceManager azureResourceManager) { - final String rgName = azureResourceManager.sdkContext().randomResourceName("rgNEMV", 24); - final String domainName = azureResourceManager.sdkContext().randomResourceName("jsdkcdn", 15) + ".com"; - final String cdnProfileName = azureResourceManager.sdkContext().randomResourceName("jsdkcdnp", 24); - final String cdnEndpointName = azureResourceManager.sdkContext().randomResourceName("jsdkcdne", 24); + final String rgName = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("rgNEMV", 24); + final String domainName = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("jsdkcdn", 15) + ".com"; + final String cdnProfileName = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("jsdkcdnp", 24); + final String cdnEndpointName = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("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 bdd106d4bd259..3cee04aed599b 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.sdkContext().randomResourceName("rg", 20); - final String cdnProfileName = azureResourceManager.sdkContext().randomResourceName("cdnStandardProfile", 20); + final String resourceGroupName = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("rg", 20); + final String cdnProfileName = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("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.sdkContext().randomResourceName("webapp" + (i + 1) + "-", 20); + appNames[i] = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("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 7c63b7d6d81e1..26b5526812632 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.sdkContext().randomResourceName("VM1", 15); - final String rgName = azureResourceManager.sdkContext().randomResourceName("rgCOMV", 15); + final String linuxVMName = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("VM1", 15); + final String rgName = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("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 816cd410c7bdd..ec7767ad1f25c 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.sdkContext().randomResourceName("VM1", 10); - final String linuxVMName2 = azureResourceManager.sdkContext().randomResourceName("VM2", 10); - final String linuxVMName3 = azureResourceManager.sdkContext().randomResourceName("VM3", 10); - final String customImageName = azureResourceManager.sdkContext().randomResourceName("img", 10); - final String rgName = azureResourceManager.sdkContext().randomResourceName("rgCOMV", 15); - final String publicIPDnsLabel = azureResourceManager.sdkContext().randomResourceName("pip", 10); + final String linuxVMName1 = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("VM1", 10); + final String linuxVMName2 = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("VM2", 10); + final String linuxVMName3 = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("VM3", 10); + final String customImageName = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("img", 10); + final String rgName = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("rgCOMV", 15); + final String publicIPDnsLabel = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("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 d165dc85b876b..4d97d132609a6 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.sdkContext().randomResourceName("VM1", 15); - final String linuxVMName2 = azureResourceManager.sdkContext().randomResourceName("VM2", 15); - final String linuxVMName3 = azureResourceManager.sdkContext().randomResourceName("VM3", 15); - final String customImageName = azureResourceManager.sdkContext().randomResourceName("img", 15); - final String rgName = azureResourceManager.sdkContext().randomResourceName("rgCOMV", 15); - final String publicIpDnsLabel = azureResourceManager.sdkContext().randomResourceName("pip", 15); + final String linuxVMName1 = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("VM1", 15); + final String linuxVMName2 = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("VM2", 15); + final String linuxVMName3 = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("VM3", 15); + final String customImageName = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("img", 15); + final String rgName = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("rgCOMV", 15); + final String publicIpDnsLabel = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("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 755655da0e562..0370cac6505cf 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.sdkContext().randomResourceName("VM1", 15); - final String linuxVMName2 = azureResourceManager.sdkContext().randomResourceName("VM2", 15); - final String managedOSSnapshotName = azureResourceManager.sdkContext().randomResourceName("ss-os-", 15); - final String managedDataDiskSnapshotPrefix = azureResourceManager.sdkContext().randomResourceName("ss-data-", 15); - final String managedNewOSDiskName = azureResourceManager.sdkContext().randomResourceName("ds-os-nw-", 15); - final String managedNewDataDiskNamePrefix = azureResourceManager.sdkContext().randomResourceName("ds-data-nw-", 15); - - final String rgName = azureResourceManager.sdkContext().randomResourceName("rgCOMV", 15); - final String publicIpDnsLabel = azureResourceManager.sdkContext().randomResourceName("pip", 15); + final String linuxVMName1 = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("VM1", 15); + final String linuxVMName2 = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("VM2", 15); + final String managedOSSnapshotName = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("ss-os-", 15); + final String managedDataDiskSnapshotPrefix = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("ss-data-", 15); + final String managedNewOSDiskName = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("ds-os-nw-", 15); + final String managedNewDataDiskNamePrefix = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("ds-data-nw-", 15); + + final String rgName = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("rgCOMV", 15); + final String publicIpDnsLabel = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("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 aa04c0c176298..139cfb6368641 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.sdkContext().randomResourceName("VM1", 15); - final String linuxVMName2 = azureResourceManager.sdkContext().randomResourceName("VM2", 15); - final String managedOSDiskName = azureResourceManager.sdkContext().randomResourceName("ds-os-", 15); - final String managedDataDiskNamePrefix = azureResourceManager.sdkContext().randomResourceName("ds-data-", 15); - final String rgName = azureResourceManager.sdkContext().randomResourceName("rgCOMV", 15); - final String publicIpDnsLabel = azureResourceManager.sdkContext().randomResourceName("pip", 15); - final String storageAccountName = azureResourceManager.sdkContext().randomResourceName("stg", 15); + final String linuxVMName1 = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("VM1", 15); + final String linuxVMName2 = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("VM2", 15); + final String managedOSDiskName = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("ds-os-", 15); + final String managedDataDiskNamePrefix = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("ds-data-", 15); + final String rgName = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("rgCOMV", 15); + final String publicIpDnsLabel = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("pip", 15); + final String storageAccountName = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("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 a78bdfd2048f0..97b9fe712d449 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.sdkContext().randomResourceName("rg", 15); + final String resourceGroupName = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("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.sdkContext().randomResourceName("net", 14); + String networkName = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("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.sdkContext().randomResourceName("pip", 14); + String pipName = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("pip", 14); Creatable pipDefinition = azureResourceManager.publicIpAddresses().define(pipName) .withRegion(region) .withExistingResourceGroup(resourceGroup); relatedDefinitions.add(pipDefinition); // Define a NIC for each VM - String nicName = azureResourceManager.sdkContext().randomResourceName("nic", 14); + String nicName = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("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.sdkContext().randomResourceName("as", 14); + String availabilitySetName = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("as", 14); Creatable availabilitySetDefinition = azureResourceManager.availabilitySets().define(availabilitySetName) .withRegion(region) .withExistingResourceGroup(resourceGroup); relatedDefinitions.add(availabilitySetDefinition); - String vmName = azureResourceManager.sdkContext().randomResourceName("vm", 14); + String vmName = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("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 5a0870fad16f3..d3c0ece614b19 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 @@ -37,7 +37,7 @@ public final class CreateVirtualMachinesInParallel { * @return true if sample runs successfully */ public static boolean runSample(AzureResourceManager azureResourceManager) { - final String rgName = azureResourceManager.sdkContext().randomResourceName("rgCOPD", 24); + final String rgName = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("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 +87,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.sdkContext().randomResourceName("vnetCOPD-", 20); + String networkName = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("vnetCOPD-", 20); Creatable networkCreatable = azureResourceManager.networks().define(networkName) .withRegion(region) .withExistingResourceGroup(resourceGroup) @@ -96,12 +96,12 @@ public static boolean runSample(AzureResourceManager azureResourceManager) { //============================================================= // Create 1 storage creatable per region (For storing VMs disk) // - String storageAccountName = azureResourceManager.sdkContext().randomResourceName("stgcopd", 20); + String storageAccountName = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("stgcopd", 20); Creatable storageAccountCreatable = azureResourceManager.storageAccounts().define(storageAccountName) .withRegion(region) .withExistingResourceGroup(resourceGroup); - String linuxVMNamePrefix = azureResourceManager.sdkContext().randomResourceName("vm-", 15); + String linuxVMNamePrefix = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("vm-", 15); for (int i = 1; i <= vmCount; i++) { //============================================================= @@ -111,7 +111,7 @@ public static boolean runSample(AzureResourceManager azureResourceManager) { .define(String.format("%s-%d", linuxVMNamePrefix, i)) .withRegion(region) .withExistingResourceGroup(resourceGroup) - .withLeafDomainLabel(azureResourceManager.sdkContext().randomResourceName("pip", 10)); + .withLeafDomainLabel(azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("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 9ca9812b23089..589ebf80cd466 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.sdkContext().randomResourceName("VM1", 15); - final String linuxVMName2 = azureResourceManager.sdkContext().randomResourceName("VM2", 15); - final String linuxVMName3 = azureResourceManager.sdkContext().randomResourceName("VM3", 15); - final String rgName = azureResourceManager.sdkContext().randomResourceName("rgCOMV", 15); - final String publicIPDnsLabel = azureResourceManager.sdkContext().randomResourceName("pip", 15); + final String linuxVMName1 = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("VM1", 15); + final String linuxVMName2 = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("VM2", 15); + final String linuxVMName3 = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("VM3", 15); + final String rgName = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("rgCOMV", 15); + final String publicIPDnsLabel = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("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 c6838ddcffa57..f9c014671300b 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.sdkContext().randomResourceName("rgCOMA", 15); - final String availSetName1 = azureResourceManager.sdkContext().randomResourceName("av1", 15); - final String availSetName2 = azureResourceManager.sdkContext().randomResourceName("av2", 15); - final String vm1Name = azureResourceManager.sdkContext().randomResourceName("vm1", 15); - final String vm2Name = azureResourceManager.sdkContext().randomResourceName("vm2", 15); - final String vnetName = azureResourceManager.sdkContext().randomResourceName("vnet", 15); + final String rgName = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("rgCOMA", 15); + final String availSetName1 = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("av1", 15); + final String availSetName2 = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("av2", 15); + final String vm1Name = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("vm1", 15); + final String vm2Name = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("vm2", 15); + final String vnetName = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("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 5ed9958df085b..eff3aec5493f8 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.sdkContext().randomResourceName("rgCOMV", 15); + final String rgName = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("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.sdkContext().randomResourceName("vm" + "-", 18); - final String linuxVM1Pip = azureResourceManager.sdkContext().randomResourceName("pip" + "-", 18); + final String linuxVM1Name = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("vm" + "-", 18); + final String linuxVM1Pip = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("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.sdkContext().randomResourceName("vmss" + "-", 18); + final String vmScaleSetName = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("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.sdkContext().randomResourceName("dsk" + "-", 18); + final String diskName = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("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.sdkContext().randomResourceName("vm" + "-", 10); - final String linuxVM2Pip = azureResourceManager.sdkContext().randomResourceName("pip" + "-", 18); + final String linuxVM2Name = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("vm" + "-", 10); + final String linuxVM2Pip = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("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.sdkContext().randomResourceName("cimg" + "-", 10); + final String customImageName = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("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.sdkContext().randomResourceName("vm" + "-", 10); + final String linuxVM3Name = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("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.sdkContext().randomResourceName("vm" + "-", 10); + final String linuxVMName4 = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("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.sdkContext().randomResourceName("snp" + "-", 10); + final String managedOSSnapshotName = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("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.sdkContext().randomResourceName("dsk" + "-", 10); + final String managedNewOSDiskName = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("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.sdkContext().randomResourceName("dsk" + "-", 10); + final String managedDataDiskSnapshotName = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("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.sdkContext().randomResourceName("dsk" + "-", 10); + final String managedNewDataDiskName = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("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.sdkContext().randomResourceName("vm" + "-", 10); + final String linuxVM6Name = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("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.sdkContext().randomResourceName("vm" + "-", 10); - final String linuxVM7Pip = azureResourceManager.sdkContext().randomResourceName("pip" + "-", 18); + final String linuxVM7Name = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("vm" + "-", 10); + final String linuxVM7Pip = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("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.sdkContext().randomResourceName("vm" + "-", 10); - final String publicIpDnsLabel = azureResourceManager.sdkContext().randomResourceName("pip" + "-", 20); + final String linuxVMName1 = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("vm" + "-", 10); + final String publicIpDnsLabel = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("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.sdkContext().randomResourceName("vm" + "-", 10); - final String publicIPDnsLabel = azureResourceManager.sdkContext().randomResourceName("pip" + "-", 20); + final String linuxVMName1 = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("vm" + "-", 10); + final String publicIPDnsLabel = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("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.sdkContext().randomResourceName("vnet", 24); + final String vnetName = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("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.sdkContext().randomResourceName("intlb" + "-", 18); + final String loadBalancerName1 = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("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 1c748cf6934c9..b8311320c76fd 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 @@ -43,11 +43,11 @@ public final class ManageResourceFromMSIEnabledVirtualMachineBelongsToAADGroup { * @return true if sample runs successfully */ public static boolean runSample(AzureResourceManager azureResourceManager) { - String groupName = azureResourceManager.sdkContext().randomResourceName("group", 15); - final String rgName = azureResourceManager.sdkContext().randomResourceName("rgCOMV", 15); - String roleAssignmentName = azureResourceManager.sdkContext().randomUuid(); - final String linuxVMName = azureResourceManager.sdkContext().randomResourceName("VM1", 15); - final String pipName = azureResourceManager.sdkContext().randomResourceName("pip1", 15); + String groupName = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("group", 15); + final String rgName = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("rgCOMV", 15); + String roleAssignmentName = azureResourceManager.resourceGroups().manager().sdkContext().randomUuid(); + final String linuxVMName = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("VM1", 15); + final String pipName = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("pip1", 15); final String userName = "tirekicker"; final String password = Utils.password(); final Region region = Region.US_SOUTH_CENTRAL; @@ -132,7 +132,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.sdkContext().randomResourceName("st44", 15); + final String stgName = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("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/ManageScaleSetUserAssignedMSIFromServicePrincipal.java b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/compute/samples/ManageScaleSetUserAssignedMSIFromServicePrincipal.java index da0aae2a3188b..cd5dc67f8db59 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 @@ -41,11 +41,11 @@ public final class ManageScaleSetUserAssignedMSIFromServicePrincipal { */ public static boolean runSample(AzureResourceManager.Authenticated authenticated) { Region region = Region.US_WEST_CENTRAL; - String vmssName = authenticated.sdkContext().randomResourceName("vmss", 15); - String spName1 = authenticated.sdkContext().randomResourceName("sp1", 21); - String rgName = authenticated.sdkContext().randomResourceName("rg", 22); - String identityName1 = authenticated.sdkContext().randomResourceName("msi-id1", 15); - String identityName2 = authenticated.sdkContext().randomResourceName("msi-id1", 15); + String vmssName = authenticated.roleAssignments().manager().sdkContext().randomResourceName("vmss", 15); + String spName1 = authenticated.roleAssignments().manager().sdkContext().randomResourceName("sp1", 21); + String rgName = authenticated.roleAssignments().manager().sdkContext().randomResourceName("rg", 22); + String identityName1 = authenticated.roleAssignments().manager().sdkContext().randomResourceName("msi-id1", 15); + String identityName2 = authenticated.roleAssignments().manager().sdkContext().randomResourceName("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/compute/samples/ManageStorageFromMSIEnabledVirtualMachine.java b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/compute/samples/ManageStorageFromMSIEnabledVirtualMachine.java index a0e25ce9c4fbe..3574c656b75f0 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.sdkContext().randomResourceName("VM1", 15); - final String rgName = azureResourceManager.sdkContext().randomResourceName("rgCOMV", 15); - final String pipName = azureResourceManager.sdkContext().randomResourceName("pip1", 15); + final String linuxVMName = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("VM1", 15); + final String rgName = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("rgCOMV", 15); + final String pipName = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("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.sdkContext().randomResourceName("st44", 15); + final String stgName = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("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 ed1a5550971e2..57824618740a9 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.sdkContext().randomResourceName("uamsi-rg-1", 15); - final String rgName2 = azureResourceManager.sdkContext().randomResourceName("uamsi-rg-2", 15); - final String identityName = azureResourceManager.sdkContext().randomResourceName("id", 15); - final String linuxVMName = azureResourceManager.sdkContext().randomResourceName("VM1", 15); - final String pipName = azureResourceManager.sdkContext().randomResourceName("pip1", 15); + final String rgName1 = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("uamsi-rg-1", 15); + final String rgName2 = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("uamsi-rg-2", 15); + final String identityName = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("id", 15); + final String linuxVMName = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("VM1", 15); + final String pipName = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("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 73fa0415744b6..9f5621fc9203c 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.sdkContext().randomResourceName("wVM", 15); - final String linuxVMName = azureResourceManager.sdkContext().randomResourceName("lVM", 15); - final String rgName = azureResourceManager.sdkContext().randomResourceName("rgCOMV", 15); + final String windowsVMName = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("wVM", 15); + final String linuxVMName = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("lVM", 15); + final String rgName = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("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.sdkContext().randomResourceName("dsk-", 15)) + Creatable dataDiskCreatable = azureResourceManager.disks().define(azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("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.sdkContext().randomResourceName("dsk-", 15)) + .define(azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("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 ed29ef8ffacd8..837d2ea821a71 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.sdkContext().randomResourceName("wVM", 15); - final String linuxVMName = azureResourceManager.sdkContext().randomResourceName("lVM", 15); - final String rgName = azureResourceManager.sdkContext().randomResourceName("rgCOMV", 15); + final String windowsVMName = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("wVM", 15); + final String linuxVMName = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("lVM", 15); + final String rgName = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("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.sdkContext().randomResourceName("dsk-", 15)) + final Creatable dataDiskCreatable = azureResourceManager.disks().define(azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("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.sdkContext().randomResourceName("dsk-", 15)) + Mono dataDiskMono = azureResourceManager.disks().define(azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("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.sdkContext().randomResourceName("nic", 20)) + Mono nicMono = azureResourceManager.networkInterfaces().define(azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("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 b98f4c12b655b..12ebf81bee1cf 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.sdkContext().randomResourceName("lVM", 10); - final String windowsVMName = azureResourceManager.sdkContext().randomResourceName("wVM", 10); - final String rgName = azureResourceManager.sdkContext().randomResourceName("rgCOVE", 15); - final String pipDnsLabelLinuxVM = azureResourceManager.sdkContext().randomResourceName("rgPip1", 25); - final String pipDnsLabelWindowsVM = azureResourceManager.sdkContext().randomResourceName("rgPip2", 25); + final String linuxVMName = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("lVM", 10); + final String windowsVMName = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("wVM", 10); + final String rgName = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("rgCOVE", 15); + final String pipDnsLabelLinuxVM = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("rgPip1", 25); + final String pipDnsLabelWindowsVM = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("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 08116e086c27b..f923860cf0d2a 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.sdkContext().randomResourceName("rgCOVS", 15); - final String vnetName = azureResourceManager.sdkContext().randomResourceName("vnet", 24); - final String loadBalancerName1 = azureResourceManager.sdkContext().randomResourceName("intlb" + "-", 18); + final String rgName = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("rgCOVS", 15); + final String vnetName = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("vnet", 24); + final String loadBalancerName1 = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("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.sdkContext().randomResourceName("vmss", 24); + final String vmssName = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("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 e31a0726064ef..a859cdc93e1a5 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.sdkContext().randomResourceName("rgCOVS", 15); - final String vnetName = azureResourceManager.sdkContext().randomResourceName("vnet", 24); - final String loadBalancerName1 = azureResourceManager.sdkContext().randomResourceName("intlb" + "-", 18); + final String rgName = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("rgCOVS", 15); + final String vnetName = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("vnet", 24); + final String loadBalancerName1 = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("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.sdkContext().randomResourceName("vmss", 24); + final String vmssName = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("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 4d3d4848f2101..7cd564704a3cd 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.sdkContext().randomResourceName("rgCOVS", 15); - final String vnetName = azureResourceManager.sdkContext().randomResourceName("vnet", 24); - final String loadBalancerName1 = azureResourceManager.sdkContext().randomResourceName("intlb" + "-", 18); + final String rgName = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("rgCOVS", 15); + final String vnetName = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("vnet", 24); + final String loadBalancerName1 = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("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.sdkContext().randomResourceName("vmss", 24); - final String storageAccountName1 = azureResourceManager.sdkContext().randomResourceName("stg1", 24); - final String storageAccountName2 = azureResourceManager.sdkContext().randomResourceName("stg2", 24); - final String storageAccountName3 = azureResourceManager.sdkContext().randomResourceName("stg3", 24); + final String vmssName = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("vmss", 24); + final String storageAccountName1 = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("stg1", 24); + final String storageAccountName2 = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("stg2", 24); + final String storageAccountName3 = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("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 44492eda8c517..598be23828c80 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.sdkContext().randomResourceName("VM1", 15); - final String rgName = azureResourceManager.sdkContext().randomResourceName("rgCOMV", 15); - final String publicIPDnsLabel = azureResourceManager.sdkContext().randomResourceName("pip", 15); + final String linuxVMName1 = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("VM1", 15); + final String rgName = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("rgCOMV", 15); + final String publicIPDnsLabel = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("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.sdkContext().randomResourceName("dsk-", 15)) + Disk dataDisk1 = azureResourceManager.disks().define(azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("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.sdkContext().randomResourceName("dsk-", 15)) + Creatable dataDiskCreatable1 = azureResourceManager.disks().define(azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("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.sdkContext().randomResourceName("dsk-", 15)) + Creatable dataDiskCreatable2 = azureResourceManager.disks().define(azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("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 aff7b3c77088d..5713102321975 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.sdkContext().randomResourceName("wVM", 15); - final String linuxVMName = azureResourceManager.sdkContext().randomResourceName("lVM", 15); - final String rgName = azureResourceManager.sdkContext().randomResourceName("rgCOMV", 15); + final String windowsVMName = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("wVM", 15); + final String linuxVMName = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("lVM", 15); + final String rgName = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("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 b36e0701d4a98..1d5d7b2a4e7a2 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.sdkContext().randomResourceName("rgCOPP", 24); - final String networkName = azureResourceManager.sdkContext().randomResourceName("vnetCOMV", 24); - final String storageAccountName = azureResourceManager.sdkContext().randomResourceName("stgCOMV", 20); + final String rgName = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("rgCOPP", 24); + final String networkName = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("vnetCOMV", 24); + final String storageAccountName = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("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 83c9c26b97806..88bebff1638ba 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.sdkContext().randomResourceName("rgCOMV", 15); - final String vmName1 = azureResourceManager.sdkContext().randomResourceName("lVM1", 15); - final String vmName2 = azureResourceManager.sdkContext().randomResourceName("lVM2", 15); - final String pipName1 = azureResourceManager.sdkContext().randomResourceName("pip1", 15); - final String pipName2 = azureResourceManager.sdkContext().randomResourceName("pip2", 15); - final String diskName = azureResourceManager.sdkContext().randomResourceName("ds", 15); + final String rgName = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("rgCOMV", 15); + final String vmName1 = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("lVM1", 15); + final String vmName2 = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("lVM2", 15); + final String pipName1 = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("pip1", 15); + final String pipName2 = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("pip2", 15); + final String diskName = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("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 c1a09bea776c0..52527e7c38713 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.sdkContext().randomResourceName("rgCOMV", 15); - final String loadBalancerName = azureResourceManager.sdkContext().randomResourceName("extlb", 15); + final String rgName = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("rgCOMV", 15); + final String loadBalancerName = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("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.sdkContext().randomResourceName("vmss1", 15); - final String vmssName2 = azureResourceManager.sdkContext().randomResourceName("vmss2", 15); + final String vmssName1 = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("vmss1", 15); + final String vmssName2 = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("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 6b6c0e126ff15..88bac063fbc83 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 @@ -33,9 +33,9 @@ public class ManageContainerInstanceWithAzureFileShareMount { * @return true if sample runs successfully */ public static boolean runSample(AzureResourceManager azureResourceManager) { - final String rgName = azureResourceManager.sdkContext().randomResourceName("rgACI", 15); - final String aciName = azureResourceManager.sdkContext().randomResourceName("acisample", 20); - final String shareName = azureResourceManager.sdkContext().randomResourceName("fileshare", 20); + final String rgName = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("rgACI", 15); + final String aciName = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("acisample", 20); + final String shareName = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("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 e2aacf3b43f40..e3323b24f254e 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 @@ -35,10 +35,10 @@ public class ManageContainerInstanceWithManualAzureFileShareMountCreation { * @return true if sample runs successfully */ public static boolean runSample(AzureResourceManager azureResourceManager) { - final String rgName = azureResourceManager.sdkContext().randomResourceName("rgACI", 15); - final String aciName = azureResourceManager.sdkContext().randomResourceName("acisample", 20); - final String saName = azureResourceManager.sdkContext().randomResourceName("sa", 20); - final String shareName = azureResourceManager.sdkContext().randomResourceName("fileshare", 20); + final String rgName = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("rgACI", 15); + final String aciName = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("acisample", 20); + final String saName = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("sa", 20); + final String shareName = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("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 ff663ec319ef6..9e953fe91d61c 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 @@ -31,8 +31,8 @@ public class ManageContainerInstanceWithMultipleContainerImages { * @return true if sample runs successfully */ public static boolean runSample(AzureResourceManager azureResourceManager) { - final String rgName = azureResourceManager.sdkContext().randomResourceName("rgACI", 15); - final String aciName = azureResourceManager.sdkContext().randomResourceName("acisample", 20); + final String rgName = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("rgACI", 15); + final String aciName = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("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 e4faa93405a7c..a86ea6fa53ae1 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 @@ -88,17 +88,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.sdkContext().randomResourceName("rgaci", 15); + final String rgName = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("rgaci", 15); final Region region = Region.US_EAST2; - final String acrName = azureResourceManager.sdkContext().randomResourceName("acr", 20); + final String acrName = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("acr", 20); - final String aciName = azureResourceManager.sdkContext().randomResourceName("acisample", 20); + final String aciName = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("acisample", 20); final String containerImageName = "microsoft/aci-helloworld"; final String containerImageTag = "latest"; final String dockerContainerName = "sample-hello"; - final String acsName = azureResourceManager.sdkContext().randomResourceName("acssample", 30); + final String acsName = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("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 fc4e72fdfda5d..4267555d6452e 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.sdkContext().randomResourceName("rgACR", 15); - final String acrName = azureResourceManager.sdkContext().randomResourceName("acrsample", 20); + final String rgName = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("rgACR", 15); + final String acrName = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("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 3f84cc588f1fa..d1f51093175b4 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.sdkContext().randomResourceName("rgACR", 15); - final String acrName = azureResourceManager.sdkContext().randomResourceName("acrsample", 20); + final String rgName = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("rgACR", 15); + final String acrName = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("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 edfd55b2f09c6..6bbef78f73a80 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.sdkContext().randomResourceName("cosmosdb", 15); - final String rgName = azureResourceManager.sdkContext().randomResourceName("rgcosmosdb", 24); - final String vnetName = azureResourceManager.sdkContext().randomResourceName("vnetcosmosdb", 20); + final String docDBName = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("cosmosdb", 15); + final String rgName = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("rgcosmosdb", 24); + final String vnetName = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("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 5179f923a3442..d0f3a2fbb69de 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.sdkContext().randomResourceName("docDb", 10); - final String rgName = azureResourceManager.sdkContext().randomResourceName("rgNEMV", 24); + final String docDBName = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("docDb", 10); + final String rgName = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("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 216ca9210fdfe..b5d6480e848fd 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.sdkContext().randomResourceName("docDb", 10); - final String rgName = azureResourceManager.sdkContext().randomResourceName("rgNEMV", 24); + final String docDBName = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("docDb", 10); + final String rgName = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("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 867ca38a6fb86..8bcf8b295ea9b 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.sdkContext().randomResourceName("docDb", 10); - final String rgName = azureResourceManager.sdkContext().randomResourceName("rgNEMV", 24); + final String docDBName = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("docDb", 10); + final String rgName = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("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 f26ad40be7031..6ba9fa8c325b1 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.sdkContext().randomResourceName("docDb", 10); - final String rgName = azureResourceManager.sdkContext().randomResourceName("rgNEMV", 24); + final String docDBName = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("docDb", 10); + final String rgName = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("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 b2705f00d3ee6..3eab67fac6655 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 @@ -50,8 +50,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.sdkContext().randomResourceName("rgNEMV_", 24); - final String webAppName = azureResourceManager.sdkContext().randomResourceName("webapp1-", 20); + final String rgName = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("rgNEMV_", 24); + final String webAppName = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("webapp1-", 20); try { ResourceGroup resourceGroup = azureResourceManager.resourceGroups().define(rgName) @@ -133,12 +133,12 @@ public static boolean runSample(AzureResourceManager azureResourceManager) throw System.out.println("Creating a virtual machine with public IP..."); VirtualMachine virtualMachine1 = azureResourceManager.virtualMachines() - .define(azureResourceManager.sdkContext().randomResourceName("employeesvm-", 20)) + .define(azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("employeesvm-", 20)) .withRegion(Region.US_EAST) .withExistingResourceGroup(resourceGroup) .withNewPrimaryNetwork("10.0.0.0/28") .withPrimaryPrivateIPAddressDynamic() - .withNewPrimaryPublicIPAddress(azureResourceManager.sdkContext().randomResourceName("empip-", 20)) + .withNewPrimaryPublicIPAddress(azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("empip-", 20)) .withPopularWindowsImage(KnownWindowsVirtualMachineImage.WINDOWS_SERVER_2012_R2_DATACENTER) .withAdminUsername("testuser") .withAdminPassword("12NewPA$$w0rd!") @@ -215,12 +215,12 @@ public static boolean runSample(AzureResourceManager azureResourceManager) throw System.out.println("Creating a virtual machine with public IP..."); VirtualMachine virtualMachine2 = azureResourceManager.virtualMachines() - .define(azureResourceManager.sdkContext().randomResourceName("partnersvm-", 20)) + .define(azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("partnersvm-", 20)) .withRegion(Region.US_EAST) .withExistingResourceGroup(resourceGroup) .withNewPrimaryNetwork("10.0.0.0/28") .withPrimaryPrivateIPAddressDynamic() - .withNewPrimaryPublicIPAddress(azureResourceManager.sdkContext().randomResourceName("ptnerpip-", 20)) + .withNewPrimaryPublicIPAddress(azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("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 4e64f5de8f94b..46762c5e20cd7 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.sdkContext().randomResourceName("rgNEMV_", 24); - final String namespaceName1 = azureResourceManager.sdkContext().randomResourceName("ns", 14); - final String namespaceName2 = azureResourceManager.sdkContext().randomResourceName("ns", 14); - final String storageAccountName = azureResourceManager.sdkContext().randomResourceName("stg", 14); - final String eventHubName1 = azureResourceManager.sdkContext().randomResourceName("eh", 14); - final String eventHubName2 = azureResourceManager.sdkContext().randomResourceName("eh", 14); + final String rgName = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("rgNEMV_", 24); + final String namespaceName1 = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("ns", 14); + final String namespaceName2 = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("ns", 14); + final String storageAccountName = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("stg", 14); + final String eventHubName1 = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("eh", 14); + final String eventHubName2 = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("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 dd5c7708b0b2b..63607629c6fd5 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.sdkContext().randomResourceName("rgEvHb", 24); - final String namespaceName = azureResourceManager.sdkContext().randomResourceName("ns", 24); + final String rgName = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("rgEvHb", 24); + final String namespaceName = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("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 ddd0e7c8a508f..9f20f5ab62aa7 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 @@ -35,11 +35,11 @@ public class ManageEventHubGeoDisasterRecovery { * @return true if sample runs successfully */ public static boolean runSample(AzureResourceManager azureResourceManager) { - final String rgName = azureResourceManager.sdkContext().randomResourceName("rgNEMV_", 24); - final String primaryNamespaceName = azureResourceManager.sdkContext().randomResourceName("ns", 14); - final String secondaryNamespaceName = azureResourceManager.sdkContext().randomResourceName("ns", 14); - final String geoDRName = azureResourceManager.sdkContext().randomResourceName("geodr", 14); - final String eventHubName = azureResourceManager.sdkContext().randomResourceName("eh", 14); + final String rgName = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("rgNEMV_", 24); + final String primaryNamespaceName = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("ns", 14); + final String secondaryNamespaceName = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("ns", 14); + final String geoDRName = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("geodr", 14); + final String eventHubName = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("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 07e8c0ef59a91..e1e8ad958da3e 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.sdkContext().randomResourceName("vault1", 20); - final String vaultName2 = azureResourceManager.sdkContext().randomResourceName("vault2", 20); - final String rgName = azureResourceManager.sdkContext().randomResourceName("rgNEMV", 24); + final String vaultName1 = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("vault1", 20); + final String vaultName2 = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("vault2", 20); + final String rgName = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("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 55ec7e70a9b9f..03bfa5f8e6e8b 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 @@ -79,9 +79,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.sdkContext().randomResourceName("rgaks", 15); - final String acrName = azureResourceManager.sdkContext().randomResourceName("acrsample", 20); - final String aksName = azureResourceManager.sdkContext().randomResourceName("akssample", 30); + final String rgName = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("rgaks", 15); + final String acrName = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("acrsample", 20); + final String aksName = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("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 f1307dd1c2291..d0152ec0a5d56 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.sdkContext().randomResourceName("rgaks", 15); - final String aksName = azureResourceManager.sdkContext().randomResourceName("akssample", 30); + final String rgName = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("rgaks", 15); + final String aksName = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("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 b513d94314307..c64102a65a651 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.sdkContext().randomResourceName("rgaks", 15); - final String vnetName = azureResourceManager.sdkContext().randomResourceName("vnetaks", 20); - final String aksName = azureResourceManager.sdkContext().randomResourceName("akssample", 30); + final String rgName = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("rgaks", 15); + final String vnetName = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("vnetaks", 20); + final String aksName = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("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 64fd846067d58..dc0f89b57181d 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.sdkContext().randomResourceName("MyTestScaleWebApp", 20); - final String autoscaleSettingsName = azureResourceManager.sdkContext().randomResourceName("autoscalename1", 20); - final String rgName = azureResourceManager.sdkContext().randomResourceName("myResourceGroup", 20); + final String webappName = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("MyTestScaleWebApp", 20); + final String autoscaleSettingsName = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("autoscalename1", 20); + final String rgName = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("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 05e0f5b9366b3..c8445893bba94 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.sdkContext().randomResourceName("saMonitor", 20); - final String rgName = azureResourceManager.sdkContext().randomResourceName("rgMonitor", 20); + final String storageAccountName = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("saMonitor", 20); + final String rgName = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("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 7907ab60af784..2235a8c7dd480 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 @@ -37,8 +37,8 @@ public final class SecurityBreachOrRiskActivityLogAlerts { * @return true if sample runs successfully */ public static boolean runSample(AzureResourceManager azureResourceManager) { - final String storageAccountName = azureResourceManager.sdkContext().randomResourceName("saMonitor", 20); - final String rgName = azureResourceManager.sdkContext().randomResourceName("rgMonitor", 20); + final String storageAccountName = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("saMonitor", 20); + final String rgName = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("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 0e9771680e13c..221528480e5fa 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.sdkContext().randomResourceName("rgMonitor", 20); + final String rgName = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("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 4259ce39dd8ea..1959697004b8a 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.sdkContext().randomResourceName("rg", 15); - final String vnetName = azureResourceManager.sdkContext().randomResourceName("vnet", 24); - final String loadBalancerName = azureResourceManager.sdkContext().randomResourceName("lb" + "-", 18); - final String publicIpName = azureResourceManager.sdkContext().randomResourceName("pip", 18); + final String resourceGroupName = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("rg", 15); + final String vnetName = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("vnet", 24); + final String loadBalancerName = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("lb" + "-", 18); + final String publicIpName = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("pip", 18); final String httpLoadBalancingRule = "httpRule"; - final String availabilitySetName = azureResourceManager.sdkContext().randomResourceName("av", 24); + final String availabilitySetName = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("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.sdkContext().randomResourceName("vm", 24)) + azureResourceManager.virtualMachines().define(azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("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 109a7162d6631..44a827c2a9819 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.sdkContext().randomResourceName("rgNEAG", 15); - final String pipName = azureResourceManager.sdkContext().randomResourceName("pip" + "-", 18); + final String rgName = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("rgNEAG", 15); + final String pipName = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("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.sdkContext().randomResourceName("vnetNEAG-", 20); + String networkName = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("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.sdkContext().randomResourceName("stgneag", 20); + String storageAccountName = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("stgneag", 20); Creatable storageAccountCreatable = azureResourceManager.storageAccounts().define(storageAccountName) .withRegion(regions[i]) .withExistingResourceGroup(resourceGroup); - String linuxVMNamePrefix = azureResourceManager.sdkContext().randomResourceName("vm-", 15); + String linuxVMNamePrefix = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("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 e601d32139bfa..328b8ed0b9dbf 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 @@ -35,11 +35,11 @@ public final class ManageExpressRoute { */ public static boolean runSample(AzureResourceManager azureResourceManager) { final Region region = Region.US_NORTH_CENTRAL; - final String rgName = azureResourceManager.sdkContext().randomResourceName("rg", 20); - final String ercName = azureResourceManager.sdkContext().randomResourceName("erc", 20); - final String gatewayName = azureResourceManager.sdkContext().randomResourceName("gtw", 20); - final String connectionName = azureResourceManager.sdkContext().randomResourceName("con", 20); - final String vnetName = azureResourceManager.sdkContext().randomResourceName("vnet", 20); + final String rgName = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("rg", 20); + final String ercName = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("erc", 20); + final String gatewayName = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("gtw", 20); + final String connectionName = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("con", 20); + final String vnetName = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("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 426f1110ed1d3..e61ea5f3ede8a 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.sdkContext().randomResourceName("pip1", 20); - final String publicIPAddressName2 = azureResourceManager.sdkContext().randomResourceName("pip2", 20); - final String publicIPAddressLeafDNS1 = azureResourceManager.sdkContext().randomResourceName("pip1", 20); - final String publicIPAddressLeafDNS2 = azureResourceManager.sdkContext().randomResourceName("pip2", 20); - final String vmName = azureResourceManager.sdkContext().randomResourceName("vm", 8); - final String rgName = azureResourceManager.sdkContext().randomResourceName("rgNEMP", 24); + final String publicIPAddressName1 = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("pip1", 20); + final String publicIPAddressName2 = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("pip2", 20); + final String publicIPAddressLeafDNS1 = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("pip1", 20); + final String publicIPAddressLeafDNS2 = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("pip2", 20); + final String vmName = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("vm", 8); + final String rgName = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("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 7f264ce51a94c..192d33ca98b55 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.sdkContext().randomResourceName("rgNEML", 15); + final String rgName = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("rgNEML", 15); - final String vnetName = azureResourceManager.sdkContext().randomResourceName("vnet", 24); + final String vnetName = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("vnet", 24); - final String loadBalancerName3 = azureResourceManager.sdkContext().randomResourceName("intlb3" + "-", 18); - final String loadBalancerName4 = azureResourceManager.sdkContext().randomResourceName("intlb4" + "-", 18); + final String loadBalancerName3 = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("intlb3" + "-", 18); + final String loadBalancerName4 = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("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.sdkContext().randomResourceName("nic3", 24); - final String networkInterfaceName4 = azureResourceManager.sdkContext().randomResourceName("nic4", 24); + final String networkInterfaceName3 = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("nic3", 24); + final String networkInterfaceName4 = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("nic4", 24); - final String availSetName = azureResourceManager.sdkContext().randomResourceName("av2", 24); - final String vmName3 = azureResourceManager.sdkContext().randomResourceName("lVM3", 24); - final String vmName4 = azureResourceManager.sdkContext().randomResourceName("lVM4", 24); + final String availSetName = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("av2", 24); + final String vmName3 = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("lVM3", 24); + final String vmName4 = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("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 5acf427532c5e..afacb01b169b7 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.sdkContext().randomResourceName("rgNEML", 15); + final String rgName = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("rgNEML", 15); - final String vnetName = azureResourceManager.sdkContext().randomResourceName("vnet", 24); + final String vnetName = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("vnet", 24); - final String loadBalancerName1 = azureResourceManager.sdkContext().randomResourceName("intlb1" + "-", 18); - final String loadBalancerName2 = azureResourceManager.sdkContext().randomResourceName("intlb2" + "-", 18); + final String loadBalancerName1 = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("intlb1" + "-", 18); + final String loadBalancerName2 = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("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.sdkContext().randomResourceName("nic1", 24); - final String networkInterfaceName2 = azureResourceManager.sdkContext().randomResourceName("nic2", 24); + final String networkInterfaceName1 = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("nic1", 24); + final String networkInterfaceName2 = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("nic2", 24); - final String availSetName = azureResourceManager.sdkContext().randomResourceName("av", 24); + final String availSetName = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("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.sdkContext().randomResourceName("lVM1", 24)) + virtualMachineCreateables1.add(azureResourceManager.virtualMachines().define(azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("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 bab087717fabb..883c8bbb6d36b 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.sdkContext().randomResourceName("vnet", 24); - final String networkInterfaceName1 = azureResourceManager.sdkContext().randomResourceName("nic1", 24); - final String networkInterfaceName2 = azureResourceManager.sdkContext().randomResourceName("nic2", 24); - final String networkInterfaceName3 = azureResourceManager.sdkContext().randomResourceName("nic3", 24); - final String publicIPAddressLeafDNS1 = azureResourceManager.sdkContext().randomResourceName("pip1", 24); - final String publicIPAddressLeafDNS2 = azureResourceManager.sdkContext().randomResourceName("pip2", 24); + final String vnetName = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("vnet", 24); + final String networkInterfaceName1 = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("nic1", 24); + final String networkInterfaceName2 = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("nic2", 24); + final String networkInterfaceName3 = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("nic3", 24); + final String publicIPAddressLeafDNS1 = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("pip1", 24); + final String publicIPAddressLeafDNS2 = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("pip2", 24); // TODO: adjust the length of vm name from 8 to 24 - final String vmName = azureResourceManager.sdkContext().randomResourceName("vm", 8); - final String rgName = azureResourceManager.sdkContext().randomResourceName("rgNEMI", 24); + final String vmName = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("vm", 8); + final String rgName = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("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 4e4842f1fa603..a674b2c3e8c94 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.sdkContext().randomResourceName("rg", 15); - final String vnetAName = azureResourceManager.sdkContext().randomResourceName("net", 15); - final String vnetBName = azureResourceManager.sdkContext().randomResourceName("net", 15); - final String peeringABName = azureResourceManager.sdkContext().randomResourceName("peer", 15); + final String resourceGroupName = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("rg", 15); + final String vnetAName = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("net", 15); + final String vnetBName = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("net", 15); + final String peeringABName = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("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 91cb457143afa..affa47ebdbf95 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.sdkContext().randomResourceName("fensg", 24); - final String backEndNSGName = azureResourceManager.sdkContext().randomResourceName("bensg", 24); - final String rgName = azureResourceManager.sdkContext().randomResourceName("rgNEMS", 24); - final String vnetName = azureResourceManager.sdkContext().randomResourceName("vnet", 24); - final String networkInterfaceName1 = azureResourceManager.sdkContext().randomResourceName("nic1", 24); - final String networkInterfaceName2 = azureResourceManager.sdkContext().randomResourceName("nic2", 24); - final String publicIPAddressLeafDNS1 = azureResourceManager.sdkContext().randomResourceName("pip1", 24); - final String frontEndVMName = azureResourceManager.sdkContext().randomResourceName("fevm", 24); - final String backEndVMName = azureResourceManager.sdkContext().randomResourceName("bevm", 24); + final String frontEndNSGName = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("fensg", 24); + final String backEndNSGName = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("bensg", 24); + final String rgName = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("rgNEMS", 24); + final String vnetName = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("vnet", 24); + final String networkInterfaceName1 = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("nic1", 24); + final String networkInterfaceName2 = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("nic2", 24); + final String publicIPAddressLeafDNS1 = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("pip1", 24); + final String frontEndVMName = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("fevm", 24); + final String backEndVMName = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("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 0f408519b751a..bc739252e8276 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 @@ -70,17 +70,17 @@ public final class ManageNetworkWatcher { */ public static boolean runSample(AzureResourceManager azureResourceManager) { final Region region = Region.US_NORTH_CENTRAL; - final String nwName = azureResourceManager.sdkContext().randomResourceName("nw", 8); + final String nwName = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("nw", 8); final String userName = "tirekicker"; - final String vnetName = azureResourceManager.sdkContext().randomResourceName("vnet", 20); - final String dnsLabel = azureResourceManager.sdkContext().randomResourceName("pipdns", 20); + final String vnetName = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("vnet", 20); + final String dnsLabel = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("pipdns", 20); final String subnetName = "subnet1"; - final String nsgName = azureResourceManager.sdkContext().randomResourceName("nsg", 20); - final String rgName = azureResourceManager.sdkContext().randomResourceName("rg", 24); - final String saName = azureResourceManager.sdkContext().randomResourceName("sa", 24); - final String vmName = azureResourceManager.sdkContext().randomResourceName("vm", 24); - final String packetCaptureName = azureResourceManager.sdkContext().randomResourceName("pc", 8); + final String nsgName = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("nsg", 20); + final String rgName = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("rg", 24); + final String saName = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("sa", 24); + final String vmName = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("vm", 24); + final String packetCaptureName = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("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 8c47ba18f71c2..feb9574a57d93 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.sdkContext().randomResourceName("rgNEAGS", 15); + final String rgName = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("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 745d53c946396..020b5516ad6a9 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.sdkContext().randomResourceName("rgNEPP", 24); - final String frontEndNsgName = azureResourceManager.sdkContext().randomResourceName("fensg", 24); - final String backEndNsgName = azureResourceManager.sdkContext().randomResourceName("bensg", 24); - final String networkName = azureResourceManager.sdkContext().randomResourceName("vnetCOMV", 24); - final String storageAccountName = azureResourceManager.sdkContext().randomResourceName("stgCOMV", 20); + final String rgName = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("rgNEPP", 24); + final String frontEndNsgName = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("fensg", 24); + final String backEndNsgName = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("bensg", 24); + final String networkName = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("vnetCOMV", 24); + final String storageAccountName = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("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 667e70c1bed10..36def53f4b365 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.sdkContext().randomResourceName("vnet1", 20); - final String vnetName2 = azureResourceManager.sdkContext().randomResourceName("vnet2", 20); + final String vnetName1 = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("vnet1", 20); + final String vnetName2 = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("vnet2", 20); final String vnet1FrontEndSubnetName = "frontend"; final String vnet1BackEndSubnetName = "backend"; final String vnet1FrontEndSubnetNsgName = "frontendnsg"; final String vnet1BackEndSubnetNsgName = "backendnsg"; - final String frontEndVMName = azureResourceManager.sdkContext().randomResourceName("fevm", 24); - final String backEndVMName = azureResourceManager.sdkContext().randomResourceName("bevm", 24); - final String publicIPAddressLeafDnsForFrontEndVM = azureResourceManager.sdkContext().randomResourceName("pip1", 24); + final String frontEndVMName = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("fevm", 24); + final String backEndVMName = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("bevm", 24); + final String publicIPAddressLeafDnsForFrontEndVM = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("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.sdkContext().randomResourceName("rgNEMV", 24); + final String rgName = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("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 15fb96ee058e0..699dbaa5b590a 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.sdkContext().randomResourceName("vnet1", 20); - final String vnetName2 = azureResourceManager.sdkContext().randomResourceName("vnet2", 20); + final String vnetName1 = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("vnet1", 20); + final String vnetName2 = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("vnet2", 20); final String vnet1FrontEndSubnetName = "frontend"; final String vnet1BackEndSubnetName = "backend"; final String vnet1FrontEndSubnetNsgName = "frontendnsg"; final String vnet1BackEndSubnetNsgName = "backendnsg"; - final String frontEndVMName = azureResourceManager.sdkContext().randomResourceName("fevm", 24); - final String backEndVMName = azureResourceManager.sdkContext().randomResourceName("bevm", 24); - final String publicIPAddressLeafDnsForFrontEndVM = azureResourceManager.sdkContext().randomResourceName("pip1", 24); + final String frontEndVMName = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("fevm", 24); + final String backEndVMName = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("bevm", 24); + final String publicIPAddressLeafDnsForFrontEndVM = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("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.sdkContext().randomResourceName("rgNEMV", 24); + final String rgName = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("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 1893a56163cc0..86c4d523cfcec 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.sdkContext().randomResourceName("rg", 20); - final String vnetName = azureResourceManager.sdkContext().randomResourceName("vnet", 20); - final String vpnGatewayName = azureResourceManager.sdkContext().randomResourceName("vngw", 20); + final String rgName = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("rg", 20); + final String vnetName = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("vnet", 20); + final String vpnGatewayName = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("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 649b0fa37efff..59fac3fbd10cb 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.sdkContext().randomResourceName("rg", 20); - final String vnetName = azureResourceManager.sdkContext().randomResourceName("vnet", 20); - final String vpnGatewayName = azureResourceManager.sdkContext().randomResourceName("vngw", 20); - final String localGatewayName = azureResourceManager.sdkContext().randomResourceName("lngw", 20); - final String connectionName = azureResourceManager.sdkContext().randomResourceName("con", 20); + final String rgName = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("rg", 20); + final String vnetName = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("vnet", 20); + final String vpnGatewayName = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("vngw", 20); + final String localGatewayName = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("lngw", 20); + final String connectionName = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("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 50abf5b73c113..d0e3d7e24540b 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 @@ -54,18 +54,18 @@ public final class ManageVpnGatewayVNet2VNetConnection { */ public static boolean runSample(AzureResourceManager azureResourceManager) { final Region region = Region.US_WEST2; - final String rgName = azureResourceManager.sdkContext().randomResourceName("rg", 20); - final String vnetName = azureResourceManager.sdkContext().randomResourceName("vnet", 20); - final String vnet2Name = azureResourceManager.sdkContext().randomResourceName("vnet", 20); - final String vpnGatewayName = azureResourceManager.sdkContext().randomResourceName("vngw", 20); - final String vpnGateway2Name = azureResourceManager.sdkContext().randomResourceName("vngw2", 20); - final String connectionName = azureResourceManager.sdkContext().randomResourceName("con", 20); - final String connection2Name = azureResourceManager.sdkContext().randomResourceName("con2", 20); - final String nwName = azureResourceManager.sdkContext().randomResourceName("nw", 20); - final String vm1Name = azureResourceManager.sdkContext().randomResourceName("vm1", 20); - final String vm2Name = azureResourceManager.sdkContext().randomResourceName("vm2", 20); + final String rgName = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("rg", 20); + final String vnetName = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("vnet", 20); + final String vnet2Name = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("vnet", 20); + final String vpnGatewayName = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("vngw", 20); + final String vpnGateway2Name = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("vngw2", 20); + final String connectionName = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("con", 20); + final String connection2Name = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("con2", 20); + final String nwName = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("nw", 20); + final String vm1Name = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("vm1", 20); + final String vm2Name = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("vm2", 20); final String rootname = "tirekicker"; - final String password = azureResourceManager.sdkContext().randomResourceName("pWd!", 15); + final String password = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("pWd!", 15); final String storageContainerName = "results"; try { @@ -131,7 +131,7 @@ public static boolean runSample(AzureResourceManager azureResourceManager) { .withExistingResourceGroup(rgName) .create(); // Create storage account to store troubleshooting information - StorageAccount storageAccount = azureResourceManager.storageAccounts().define("sa" + azureResourceManager.sdkContext().randomResourceName("", 8)) + StorageAccount storageAccount = azureResourceManager.storageAccounts().define("sa" + azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("", 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 2558ecdd33b08..c07b7ab44cddc 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.sdkContext().randomResourceName("rg", 15); - final String vnetAName = azureResourceManager.sdkContext().randomResourceName("net", 15); - final String vnetBName = azureResourceManager.sdkContext().randomResourceName("net", 15); + final String resourceGroupName = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("rg", 15); + final String vnetAName = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("net", 15); + final String vnetBName = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("net", 15); - final String[] vmNames = azureResourceManager.sdkContext().randomResourceNames("vm", 15, 2); + final String[] vmNames = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceNames("vm", 15, 2); final String[] vmIPAddresses = new String[]{ /* within subnetA */ "10.0.0.8", /* within subnetB */ "10.1.0.8" }; - final String peeringABName = azureResourceManager.sdkContext().randomResourceName("peer", 15); + final String peeringABName = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("peer", 15); final String rootname = "tirekicker"; - final String password = azureResourceManager.sdkContext().randomResourceName("pWd!", 15); - final String networkWatcherName = azureResourceManager.sdkContext().randomResourceName("netwch", 20); + final String password = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("pWd!", 15); + final String networkWatcherName = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("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 c65c42da2a169..c5be1f23a5a5b 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.sdkContext().randomResourceName("rgNEMV", 24); - final String vnetName = azureResourceManager.sdkContext().randomResourceName("vnetwork-1", 24); - final String subnetName = azureResourceManager.sdkContext().randomResourceName("subnet-1", 24); - final String linkName = azureResourceManager.sdkContext().randomResourceName("vnlink-1", 24); - final String vm1Name = azureResourceManager.sdkContext().randomResourceName("vm1-", 24); - final String vm2Name = azureResourceManager.sdkContext().randomResourceName("vm2-", 24); - final String rsName = azureResourceManager.sdkContext().randomResourceName("recordset1-", 24); + final String rgName = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("rgNEMV", 24); + final String vnetName = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("vnetwork-1", 24); + final String subnetName = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("subnet-1", 24); + final String linkName = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("vnlink-1", 24); + final String vm1Name = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("vm1-", 24); + final String vm2Name = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("vm2-", 24); + final String rsName = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("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 4d97bdc505807..22e58e4fbb856 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.sdkContext().randomResourceName("rc1", 20); - final String redisCacheName2 = azureResourceManager.sdkContext().randomResourceName("rc2", 20); - final String redisCacheName3 = azureResourceManager.sdkContext().randomResourceName("rc3", 20); - final String rgName = azureResourceManager.sdkContext().randomResourceName("rgRCMC", 20); + final String redisCacheName1 = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("rc1", 20); + final String redisCacheName2 = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("rc2", 20); + final String redisCacheName3 = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("rc3", 20); + final String rgName = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("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 254351716d646..2d5d0266268db 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 @@ -35,8 +35,8 @@ public final class DeployUsingARMTemplate { * @return true if sample runs successfully */ public static boolean runSample(AzureResourceManager azureResourceManager) throws IOException, IllegalAccessException { - final String rgName = azureResourceManager.sdkContext().randomResourceName("rgRSAT", 24); - final String deploymentName = azureResourceManager.sdkContext().randomResourceName("dpRSAT", 24); + final String rgName = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("rgRSAT", 24); + final String deploymentName = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("dpRSAT", 24); try { String templateJson = DeployUsingARMTemplate.getTemplate(azureResourceManager); @@ -137,8 +137,8 @@ public static void main(String[] args) { } private static String getTemplate(AzureResourceManager azureResourceManager) throws IllegalAccessException, JsonProcessingException, IOException { - final String hostingPlanName = azureResourceManager.sdkContext().randomResourceName("hpRSAT", 24); - final String webappName = azureResourceManager.sdkContext().randomResourceName("wnRSAT", 24); + final String hostingPlanName = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("hpRSAT", 24); + final String webappName = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("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 c447075a0028c..d1acf7db905f7 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 @@ -38,8 +38,8 @@ public final class DeployUsingARMTemplateAsync { * @return true if sample runs successfully */ public static boolean runSample(final AzureResourceManager azureResourceManager) throws InterruptedException { - final String rgPrefix = azureResourceManager.sdkContext().randomResourceName("rgJavaTest", 16); - final String deploymentPrefix = azureResourceManager.sdkContext().randomResourceName("javaTest", 16); + final String rgPrefix = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("rgJavaTest", 16); + final String deploymentPrefix = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("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 30df131e87b46..cbbf319c853d1 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 @@ -41,8 +41,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.sdkContext().randomResourceName("rgJavaTest", 16); - final String deploymentPrefix = azureResourceManager.sdkContext().randomResourceName("javaTest", 16); + final String rgPrefix = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("rgJavaTest", 16); + final String deploymentPrefix = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("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 3ebf840721d6d..a7b34aeba4650 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 @@ -35,8 +35,8 @@ public final class DeployUsingARMTemplateWithProgress { * @return true if sample runs successfully */ public static boolean runSample(AzureResourceManager azureResourceManager) throws IOException, IllegalAccessException { - final String rgName = azureResourceManager.sdkContext().randomResourceName("rgRSAP", 24); - final String deploymentName = azureResourceManager.sdkContext().randomResourceName("dpRSAP", 24); + final String rgName = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("rgRSAP", 24); + final String deploymentName = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("dpRSAP", 24); try { String templateJson = DeployUsingARMTemplateWithProgress.getTemplate(azureResourceManager); @@ -122,8 +122,8 @@ public static void main(String[] args) { } private static String getTemplate(AzureResourceManager azureResourceManager) throws IllegalAccessException, JsonProcessingException, IOException { - final String hostingPlanName = azureResourceManager.sdkContext().randomResourceName("hpRSAT", 24); - final String webappName = azureResourceManager.sdkContext().randomResourceName("wnRSAT", 24); + final String hostingPlanName = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("hpRSAT", 24); + final String webappName = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("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 738874d465669..df3a26843b51b 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 @@ -39,8 +39,8 @@ public final class DeployUsingARMTemplateWithTags { * @return true if sample runs successfully */ public static boolean runSample(AzureResourceManager azureResourceManager) throws IOException, IllegalAccessException { - final String rgName = azureResourceManager.sdkContext().randomResourceName("rgRSAT", 24); - final String deploymentName = azureResourceManager.sdkContext().randomResourceName("dpRSAT", 24); + final String rgName = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("rgRSAT", 24); + final String deploymentName = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("dpRSAT", 24); try { String templateJson = getTemplate(azureResourceManager); @@ -140,8 +140,8 @@ public static void main(String[] args) { } private static String getTemplate(AzureResourceManager azureResourceManager) throws IllegalAccessException, JsonProcessingException, IOException { - final String hostingPlanName = azureResourceManager.sdkContext().randomResourceName("hpRSAT", 24); - final String webappName = azureResourceManager.sdkContext().randomResourceName("wnRSAT", 24); + final String hostingPlanName = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("hpRSAT", 24); + final String webappName = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("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 35ffec208928f..1f9f0af6cd76b 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 @@ -33,8 +33,8 @@ public class DeployVirtualMachineUsingARMTemplate { * @return true if sample runs successfully */ public static boolean runSample(AzureResourceManager azureResourceManager) throws IOException, IllegalAccessException { - final String rgName = azureResourceManager.sdkContext().randomResourceName("rgRSAT", 24); - final String deploymentName = azureResourceManager.sdkContext().randomResourceName("dpRSAT", 24); + final String rgName = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("rgRSAT", 24); + final String deploymentName = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("dpRSAT", 24); try { String templateJson = DeployVirtualMachineUsingARMTemplate.getTemplate(azureResourceManager); @@ -123,7 +123,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.sdkContext().randomResourceName("osdisk-", 24); + final String osDiskName = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("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 8837f567aa5a0..805b0a9b59b2e 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 @@ -31,9 +31,9 @@ public final class ManageResource { * @return true if sample runs successfully */ public static boolean runSample(AzureResourceManager azureResourceManager) { - final String rgName = azureResourceManager.sdkContext().randomResourceName("rgRSMR", 24); - final String resourceName1 = azureResourceManager.sdkContext().randomResourceName("rn1", 24); - final String resourceName2 = azureResourceManager.sdkContext().randomResourceName("rn2", 24); + final String rgName = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("rgRSMR", 24); + final String resourceName1 = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("rn1", 24); + final String resourceName2 = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("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 48d1dc037a101..88d97f488e5a3 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 @@ -29,10 +29,10 @@ public final class ManageResourceGroup { * @return true if sample runs successfully */ public static boolean runSample(AzureResourceManager azureResourceManager) { - final String rgName = azureResourceManager.sdkContext().randomResourceName("rgRSMA", 24); - final String rgName2 = azureResourceManager.sdkContext().randomResourceName("rgRSMA", 24); - final String resourceTagName = azureResourceManager.sdkContext().randomResourceName("rgRSTN", 24); - final String resourceTagValue = azureResourceManager.sdkContext().randomResourceName("rgRSTV", 24); + final String rgName = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("rgRSMA", 24); + final String rgName2 = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("rgRSMA", 24); + final String resourceTagName = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("rgRSTN", 24); + final String resourceTagValue = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("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 931b01d7e4212..9643858e19413 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 @@ -189,8 +189,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.sdkContext().randomResourceName("dockervm", 15); - final String publicIPDnsLabel = azureResourceManager.sdkContext().randomResourceName("pip", 10); + final String dockerVMName = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("dockervm", 15); + final String publicIPDnsLabel = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("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/servicebus/samples/ServiceBusPublishSubscribeAdvanceFeatures.java b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/servicebus/samples/ServiceBusPublishSubscribeAdvanceFeatures.java index 3d2cec59e0a60..7afb8aabae160 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.sdkContext().randomResourceName("rgSB04_", 24); - final String namespaceName = azureResourceManager.sdkContext().randomResourceName("namespace", 20); - final String topic1Name = azureResourceManager.sdkContext().randomResourceName("topic1_", 24); - final String topic2Name = azureResourceManager.sdkContext().randomResourceName("topic2_", 24); - final String subscription1Name = azureResourceManager.sdkContext().randomResourceName("subs_", 24); - final String subscription2Name = azureResourceManager.sdkContext().randomResourceName("subs_", 24); - final String subscription3Name = azureResourceManager.sdkContext().randomResourceName("subs_", 24); + final String rgName = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("rgSB04_", 24); + final String namespaceName = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("namespace", 20); + final String topic1Name = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("topic1_", 24); + final String topic2Name = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("topic2_", 24); + final String subscription1Name = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("subs_", 24); + final String subscription2Name = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("subs_", 24); + final String subscription3Name = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("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 8510872b03ca9..e9de2072fca53 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.sdkContext().randomResourceName("rgSB02_", 24); - final String namespaceName = azureResourceManager.sdkContext().randomResourceName("namespace", 20); - final String topicName = azureResourceManager.sdkContext().randomResourceName("topic_", 24); - final String subscription1Name = azureResourceManager.sdkContext().randomResourceName("sub1_", 24); - final String subscription2Name = azureResourceManager.sdkContext().randomResourceName("sub2_", 24); + final String rgName = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("rgSB02_", 24); + final String namespaceName = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("namespace", 20); + final String topicName = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("topic_", 24); + final String subscription1Name = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("sub1_", 24); + final String subscription2Name = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("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 fc260535d0a44..c38dc5c1a4d54 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.sdkContext().randomResourceName("rgSB04_", 24); - final String namespaceName = azureResourceManager.sdkContext().randomResourceName("namespace", 20); - final String queue1Name = azureResourceManager.sdkContext().randomResourceName("queue1_", 24); - final String queue2Name = azureResourceManager.sdkContext().randomResourceName("queue2_", 24); + final String rgName = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("rgSB04_", 24); + final String namespaceName = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("namespace", 20); + final String queue1Name = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("queue1_", 24); + final String queue2Name = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("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 916dcc02ef99d..5d6936aba5ad3 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.sdkContext().randomResourceName("rgSB01_", 24); - final String namespaceName = azureResourceManager.sdkContext().randomResourceName("namespace", 20); - final String queue1Name = azureResourceManager.sdkContext().randomResourceName("queue1_", 24); - final String queue2Name = azureResourceManager.sdkContext().randomResourceName("queue2_", 24); + final String rgName = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("rgSB01_", 24); + final String namespaceName = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("namespace", 20); + final String queue1Name = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("queue1_", 24); + final String queue2Name = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("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 c9f2ef9c422dd..422581b17a53d 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.sdkContext().randomResourceName("rgSB03_", 24); - final String namespaceName = azureResourceManager.sdkContext().randomResourceName("namespace", 20); - final String queueName = azureResourceManager.sdkContext().randomResourceName("queue1_", 24); - final String topicName = azureResourceManager.sdkContext().randomResourceName("topic_", 24); - final String subscription1Name = azureResourceManager.sdkContext().randomResourceName("sub1_", 24); - final String subscription2Name = azureResourceManager.sdkContext().randomResourceName("sub2_", 24); + final String rgName = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("rgSB03_", 24); + final String namespaceName = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("namespace", 20); + final String queueName = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("queue1_", 24); + final String topicName = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("topic_", 24); + final String subscription1Name = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("sub1_", 24); + final String subscription2Name = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("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 fd1dca76724d9..f323013f053de 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.sdkContext().randomResourceName("sqltest", 20); + final String sqlServerName = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("sqltest", 20); final String dbName = "dbSample"; final String epName = "epSample"; - final String rgName = azureResourceManager.sdkContext().randomResourceName("rgsql", 20); + final String rgName = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("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 0bac81b6cebea..19176792de9a1 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.sdkContext().randomResourceName("sqlserver", 20); - final String rgName = azureResourceManager.sdkContext().randomResourceName("rgRSDSI", 20); + final String sqlServerName = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("sqlserver", 20); + final String rgName = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("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 444784dffba2e..54d08b14a2103 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.sdkContext().randomResourceName("sqlserver", 20); - final String rgName = azureResourceManager.sdkContext().randomResourceName("rgRSSDEP", 20); + final String sqlServerName = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("sqlserver", 20); + final String rgName = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("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 c06c0244d0cbe..be159bf0a488b 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.sdkContext().randomResourceName("sqlserver", 20); - final String rgName = azureResourceManager.sdkContext().randomResourceName("rgRSSDRE", 20); + final String sqlServerName = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("sqlserver", 20); + final String rgName = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("rgRSSDRE", 20); final String administratorLogin = "sqladmin3423"; final String administratorPassword = Utils.password(); - final String slaveSqlServer1Name = azureResourceManager.sdkContext().randomResourceName("slave1sql", 20); - final String slaveSqlServer2Name = azureResourceManager.sdkContext().randomResourceName("slave2sql", 20); + final String slaveSqlServer1Name = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("slave1sql", 20); + final String slaveSqlServer2Name = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("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.sdkContext().randomResourceName(networkPrefix, 20)) + creatableNetworks.add(azureResourceManager.networks().define(azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName(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.sdkContext().randomResourceName(virtualMachinePrefix, 20); + String virtualMachineName = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName(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 29e5639e8ba22..75f7555f9ec43 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 @@ -33,10 +33,10 @@ public class ManageSqlFailoverGroups { * @return true if sample runs successfully */ public static boolean runSample(AzureResourceManager azureResourceManager) { - final String sqlPrimaryServerName = azureResourceManager.sdkContext().randomResourceName("sqlpri", 20); - final String sqlSecondaryServerName = azureResourceManager.sdkContext().randomResourceName("sqlsec", 20); - final String rgName = azureResourceManager.sdkContext().randomResourceName("rgsql", 20); - final String failoverGroupName = azureResourceManager.sdkContext().randomResourceName("fog", 20); + final String sqlPrimaryServerName = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("sqlpri", 20); + final String sqlSecondaryServerName = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("sqlsec", 20); + final String rgName = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("rgsql", 20); + final String failoverGroupName = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("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 0ce6458b77aed..c6d9559a46d6e 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.sdkContext().randomResourceName("sqlserver", 20); - final String rgName = azureResourceManager.sdkContext().randomResourceName("rgRSSDFW", 20); + final String sqlServerName = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("sqlserver", 20); + final String rgName = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("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 d326edb9dc059..9372a13adb0b3 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.sdkContext().randomResourceName("sqlserver", 20); - final String rgName = azureResourceManager.sdkContext().randomResourceName("rgsql", 20); - String storageName = azureResourceManager.sdkContext().randomResourceName(sqlServerName, 23); + final String sqlServerName = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("sqlserver", 20); + final String rgName = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("rgsql", 20); + String storageName = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName(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 9888feb763731..5182d58ace78a 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 @@ -39,11 +39,11 @@ public class ManageSqlServerDnsAliases { * @return true if sample runs successfully */ public static boolean runSample(AzureResourceManager azureResourceManager) throws ClassNotFoundException, SQLException { - final String sqlServerForTestName = azureResourceManager.sdkContext().randomResourceName("sqltest", 20); - final String sqlServerForProdName = azureResourceManager.sdkContext().randomResourceName("sqlprod", 20); - final String sqlServerDnsAlias = azureResourceManager.sdkContext().randomResourceName("sqlserver", 20); + final String sqlServerForTestName = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("sqltest", 20); + final String sqlServerForProdName = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("sqlprod", 20); + final String sqlServerDnsAlias = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("sqlserver", 20); final String dbName = "dbSample"; - final String rgName = azureResourceManager.sdkContext().randomResourceName("rgRSSDFW", 20); + final String rgName = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("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 d8f18be0ed17c..707c96d56ed3f 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 @@ -42,10 +42,10 @@ public class ManageSqlServerKeysWithAzureKeyVaultKey { * @return true if sample runs successfully */ public static boolean runSample(AzureResourceManager azureResourceManager, String objectId) { - final String sqlServerName = azureResourceManager.sdkContext().randomResourceName("sqlsrv", 20); - final String rgName = azureResourceManager.sdkContext().randomResourceName("rgsql", 20); - final String vaultName = azureResourceManager.sdkContext().randomResourceName("sqlkv", 20); - final String keyName = azureResourceManager.sdkContext().randomResourceName("sqlkey", 20); + final String sqlServerName = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("sqlsrv", 20); + final String rgName = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("rgsql", 20); + final String vaultName = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("sqlkv", 20); + final String keyName = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("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 b507252f000e8..68f5c45cf2a17 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.sdkContext().randomResourceName("sql", 20); - final String storageAccountName = azureResourceManager.sdkContext().randomResourceName("sqlsa", 20); - final String rgName = azureResourceManager.sdkContext().randomResourceName("rgsql", 20); + final String sqlServerName = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("sql", 20); + final String storageAccountName = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("sqlsa", 20); + final String rgName = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("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 844dc1c7e91d8..6a725637cf6de 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.sdkContext().randomResourceName("sqlserver", 20); - final String rgName = azureResourceManager.sdkContext().randomResourceName("rgRSSDFW", 20); + final String sqlServerName = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("sqlserver", 20); + final String rgName = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("rgRSSDFW", 20); final String administratorLogin = "sqladmin3423"; final String administratorPassword = Utils.password(); - final String vnetName = azureResourceManager.sdkContext().randomResourceName("vnetsql", 20); + final String vnetName = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("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 e94476dd5e2cc..8be85c23ffeed 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 @@ -36,8 +36,8 @@ public final class ManageSqlWithRecoveredOrRestoredDatabase { * @return true if sample runs successfully */ public static boolean runSample(AzureResourceManager azureResourceManager) { - final String sqlServerName = azureResourceManager.sdkContext().randomResourceName("sqlserver", 20); - final String rgName = azureResourceManager.sdkContext().randomResourceName("rgsql", 20); + final String sqlServerName = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("sqlserver", 20); + final String rgName = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("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 db607edeeffa2..c78775900f148 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.sdkContext().randomResourceName("sa", 8); - final String storageAccountName2 = azureResourceManager.sdkContext().randomResourceName("sa2", 8); - final String storageAccountName3 = azureResourceManager.sdkContext().randomResourceName("sa3", 8); - final String rgName = azureResourceManager.sdkContext().randomResourceName("rgSTMS", 8); + final String storageAccountName = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("sa", 8); + final String storageAccountName2 = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("sa2", 8); + final String storageAccountName3 = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("sa3", 8); + final String rgName = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("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 8f4aca8cd21c7..42a96684e57aa 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.sdkContext().randomResourceName("sa", 8); - final String storageAccountName2 = azureResourceManager.sdkContext().randomResourceName("sa2", 8); - final String rgName = azureResourceManager.sdkContext().randomResourceName("rgSTMS", 8); + final String storageAccountName = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("sa", 8); + final String storageAccountName2 = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("sa2", 8); + final String rgName = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("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 92335b0600152..4b77746b12999 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.sdkContext().randomResourceName("rgSTMS", 8); - final String networkName = azureResourceManager.sdkContext().randomResourceName("nw", 8); + final String rgName = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("rgSTMS", 8); + final String networkName = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("nw", 8); final String subnetName = "subnetA"; - final String storageAccountName = azureResourceManager.sdkContext().randomResourceName("sa", 8); - final String publicIpName = azureResourceManager.sdkContext().randomResourceName("pip", 8); - final String vmName = azureResourceManager.sdkContext().randomResourceName("vm", 8); + final String storageAccountName = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("sa", 8); + final String publicIpName = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("pip", 8); + final String vmName = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("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 a9c765e00dfa1..cacea0e3f9afa 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 @@ -39,7 +39,7 @@ public final class ManageSimpleTrafficManager { * @return true if sample runs successfully */ public static boolean runSample(AzureResourceManager azureResourceManager) { - final String rgName = azureResourceManager.sdkContext().randomResourceName("rgCOPD", 24); + final String rgName = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("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 +64,7 @@ public static boolean runSample(AzureResourceManager azureResourceManager) { List> creatableVirtualMachines = new ArrayList<>(); for (Region region : regions) { - String linuxVMNamePrefix = azureResourceManager.sdkContext().randomResourceName("vm", 15); + String linuxVMNamePrefix = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("vm", 15); for (int i = 0; i < vmCountPerRegion; i++) { //============================================================= // Create a virtual machine in its own virtual network @@ -99,7 +99,7 @@ public static boolean runSample(AzureResourceManager azureResourceManager) { //============================================================= // Create 1 traffic manager profile // - String trafficManagerName = azureResourceManager.sdkContext().randomResourceName("tra", 15); + String trafficManagerName = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("tra", 15); TrafficManagerProfile.DefinitionStages.WithEndpoint profileWithEndpoint = azureResourceManager.trafficManagerProfiles() .define(trafficManagerName) .withExistingResourceGroup(resourceGroup) @@ -109,7 +109,7 @@ public static boolean runSample(AzureResourceManager azureResourceManager) { TrafficManagerProfile.DefinitionStages.WithCreate profileWithCreate = null; int routingPriority = 1; for (VirtualMachine vm : virtualMachines) { - String endpointName = azureResourceManager.sdkContext().randomResourceName("ep", 15); + String endpointName = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("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 f2e5afe01ee35..3180e5a72391b 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 @@ -50,13 +50,13 @@ public final class ManageTrafficManager { * @return true if sample runs successfully */ public static boolean runSample(AzureResourceManager azureResourceManager) throws IOException { - final String rgName = azureResourceManager.sdkContext().randomResourceName("rgNEMV_", 24); - final String domainName = azureResourceManager.sdkContext().randomResourceName("jsdkdemo-", 20) + ".com"; + final String rgName = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("rgNEMV_", 24); + final String domainName = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("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.sdkContext().randomResourceName("jplan1_", 15); - final String webAppNamePrefix = azureResourceManager.sdkContext().randomResourceName("webapp1-", 20); - final String tmName = azureResourceManager.sdkContext().randomResourceName("jsdktm-", 20); + final String appServicePlanNamePrefix = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("jplan1_", 15); + final String webAppNamePrefix = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("webapp1-", 20); + final String tmName = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("jsdktm-", 20); final List regions = new ArrayList<>(); // The regions in which web app needs to be created // diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/test/java/com/azure/resourcemanager/samples/SamplesTestBase.java b/sdk/resourcemanager/azure-resourcemanager-samples/src/test/java/com/azure/resourcemanager/samples/SamplesTestBase.java index 47923655e9cf3..8b67430fe9cc0 100644 --- a/sdk/resourcemanager/azure-resourcemanager-samples/src/test/java/com/azure/resourcemanager/samples/SamplesTestBase.java +++ b/sdk/resourcemanager/azure-resourcemanager-samples/src/test/java/com/azure/resourcemanager/samples/SamplesTestBase.java @@ -48,8 +48,8 @@ protected void initializeClients(HttpPipeline httpPipeline, AzureProfile profile sdkContext.setIdentifierFunction(name -> new TestIdentifierProvider(testResourceNamer)); azureResourceManager = AzureResourceManager .authenticate(httpPipeline, profile) - .withSdkContext(sdkContext) .withDefaultSubscription(); + setSdkContext(sdkContext, azureResourceManager); } @Override diff --git a/sdk/resourcemanager/azure-resourcemanager-servicebus/src/main/java/com/azure/resourcemanager/servicebus/ServiceBusManager.java b/sdk/resourcemanager/azure-resourcemanager-servicebus/src/main/java/com/azure/resourcemanager/servicebus/ServiceBusManager.java index 296a45f575cd7..8295a887f1219 100644 --- a/sdk/resourcemanager/azure-resourcemanager-servicebus/src/main/java/com/azure/resourcemanager/servicebus/ServiceBusManager.java +++ b/sdk/resourcemanager/azure-resourcemanager-servicebus/src/main/java/com/azure/resourcemanager/servicebus/ServiceBusManager.java @@ -10,7 +10,6 @@ import com.azure.resourcemanager.resources.fluentcore.arm.Manager; import com.azure.resourcemanager.resources.fluentcore.arm.implementation.AzureConfigurableImpl; import com.azure.resourcemanager.resources.fluentcore.utils.HttpPipelineProvider; -import com.azure.resourcemanager.resources.fluentcore.utils.SdkContext; import com.azure.resourcemanager.servicebus.fluent.ServiceBusManagementClient; import com.azure.resourcemanager.servicebus.fluent.ServiceBusManagementClientBuilder; import com.azure.resourcemanager.servicebus.implementation.ServiceBusNamespacesImpl; @@ -51,20 +50,7 @@ public static ServiceBusManager authenticate(TokenCredential credential, AzurePr * @return the ServiceBusManager */ public static ServiceBusManager authenticate(HttpPipeline httpPipeline, AzureProfile profile) { - return authenticate(httpPipeline, profile, new SdkContext()); - } - - /** - * Creates an instance of ServiceBusManager that exposes servicebus management API entry points. - * - * @param httpPipeline the HttpPipeline to be used for API calls. - * @param profile the profile to use - * @param sdkContext the sdk context - * @return the ServiceBusManager - */ - public static ServiceBusManager authenticate( - HttpPipeline httpPipeline, AzureProfile profile, SdkContext sdkContext) { - return new ServiceBusManager(httpPipeline, profile, sdkContext); + return new ServiceBusManager(httpPipeline, profile); } /** @@ -93,7 +79,7 @@ public ServiceBusManager authenticate(TokenCredential credential, AzureProfile p } } - private ServiceBusManager(HttpPipeline httpPipeline, AzureProfile profile, SdkContext sdkContext) { + private ServiceBusManager(HttpPipeline httpPipeline, AzureProfile profile) { super( httpPipeline, profile, @@ -101,9 +87,7 @@ private ServiceBusManager(HttpPipeline httpPipeline, AzureProfile profile, SdkCo .pipeline(httpPipeline) .endpoint(profile.getEnvironment().getResourceManagerEndpoint()) .subscriptionId(profile.getSubscriptionId()) - .buildClient(), - sdkContext - ); + .buildClient()); } /** diff --git a/sdk/resourcemanager/azure-resourcemanager-sql/pom.xml b/sdk/resourcemanager/azure-resourcemanager-sql/pom.xml index d55fe85eeb173..d81edce88041b 100644 --- a/sdk/resourcemanager/azure-resourcemanager-sql/pom.xml +++ b/sdk/resourcemanager/azure-resourcemanager-sql/pom.xml @@ -101,6 +101,29 @@ + + java-lts + + [11,) + + + + + org.apache.maven.plugins + maven-surefire-plugin + 3.0.0-M3 + + + + --add-opens com.azure.resourcemanager.sql/com.azure.resourcemanager.sql=ALL-UNNAMED + --add-opens com.azure.resourcemanager.resources/com.azure.resourcemanager.resources=ALL-UNNAMED + --add-opens com.azure.resourcemanager.resources/com.azure.resourcemanager.resources.fluentcore.arm=ALL-UNNAMED + + + + + + diff --git a/sdk/resourcemanager/azure-resourcemanager-sql/src/main/java/com/azure/resourcemanager/sql/SqlServerManager.java b/sdk/resourcemanager/azure-resourcemanager-sql/src/main/java/com/azure/resourcemanager/sql/SqlServerManager.java index 7dff54552573c..6538655f1f940 100644 --- a/sdk/resourcemanager/azure-resourcemanager-sql/src/main/java/com/azure/resourcemanager/sql/SqlServerManager.java +++ b/sdk/resourcemanager/azure-resourcemanager-sql/src/main/java/com/azure/resourcemanager/sql/SqlServerManager.java @@ -10,7 +10,6 @@ import com.azure.resourcemanager.resources.fluentcore.arm.Manager; import com.azure.core.management.profile.AzureProfile; import com.azure.resourcemanager.resources.fluentcore.utils.HttpPipelineProvider; -import com.azure.resourcemanager.resources.fluentcore.utils.SdkContext; import com.azure.resourcemanager.sql.fluent.SqlManagementClient; import com.azure.resourcemanager.sql.fluent.SqlManagementClientBuilder; import com.azure.resourcemanager.sql.implementation.SqlServersImpl; @@ -24,7 +23,7 @@ public class SqlServerManager extends Manager { private final StorageManager storageManager; - protected SqlServerManager(HttpPipeline httpPipeline, AzureProfile profile, SdkContext sdkContext) { + protected SqlServerManager(HttpPipeline httpPipeline, AzureProfile profile) { super( httpPipeline, profile, @@ -32,8 +31,7 @@ protected SqlServerManager(HttpPipeline httpPipeline, AzureProfile profile, SdkC .pipeline(httpPipeline) .subscriptionId(profile.getSubscriptionId()) .endpoint(profile.getEnvironment().getResourceManagerEndpoint()) - .buildClient(), - sdkContext); + .buildClient()); this.storageManager = StorageManager.authenticate(httpPipeline, profile); this.tenantId = profile.getTenantId(); } @@ -71,20 +69,7 @@ public static SqlServerManager authenticate(TokenCredential credential, AzurePro * @return the SqlServer */ public static SqlServerManager authenticate(HttpPipeline httpPipeline, AzureProfile profile) { - return authenticate(httpPipeline, profile, new SdkContext()); - } - - /** - * Creates an instance of SqlServer that exposes Compute resource management API entry points. - * - * @param httpPipeline the HttpPipeline to be used for API calls. - * @param profile the profile to use - * @param sdkContext the sdk context - * @return the SqlServer - */ - public static SqlServerManager authenticate( - HttpPipeline httpPipeline, AzureProfile profile, SdkContext sdkContext) { - return new SqlServerManager(httpPipeline, profile, sdkContext); + return new SqlServerManager(httpPipeline, profile); } /** The interface allowing configurations to be set. */ diff --git a/sdk/resourcemanager/azure-resourcemanager-sql/src/main/java/com/azure/resourcemanager/sql/implementation/SqlServerImpl.java b/sdk/resourcemanager/azure-resourcemanager-sql/src/main/java/com/azure/resourcemanager/sql/implementation/SqlServerImpl.java index 3b26af245092c..e9c5992697d8f 100644 --- a/sdk/resourcemanager/azure-resourcemanager-sql/src/main/java/com/azure/resourcemanager/sql/implementation/SqlServerImpl.java +++ b/sdk/resourcemanager/azure-resourcemanager-sql/src/main/java/com/azure/resourcemanager/sql/implementation/SqlServerImpl.java @@ -457,7 +457,9 @@ public SqlServerImpl withNewFirewallRule(String ipAddress) { public SqlServerImpl withNewFirewallRule(String startIPAddress, String endIPAddress) { return this .withNewFirewallRule( - startIPAddress, endIPAddress, this.manager().sdkContext().randomResourceName("firewall_", 15)); + startIPAddress, + endIPAddress, + this.manager().resourceManager().sdkContext().randomResourceName("firewall_", 15)); } @Override diff --git a/sdk/resourcemanager/azure-resourcemanager-sql/src/test/java/com/azure/resourcemanager/sql/SqlServerTest.java b/sdk/resourcemanager/azure-resourcemanager-sql/src/test/java/com/azure/resourcemanager/sql/SqlServerTest.java index c86aeab0f7a13..5bd0f05de9478 100644 --- a/sdk/resourcemanager/azure-resourcemanager-sql/src/test/java/com/azure/resourcemanager/sql/SqlServerTest.java +++ b/sdk/resourcemanager/azure-resourcemanager-sql/src/test/java/com/azure/resourcemanager/sql/SqlServerTest.java @@ -55,8 +55,9 @@ protected void initializeClients(HttpPipeline httpPipeline, AzureProfile profile sdkContext.setIdentifierFunction(name -> new TestIdentifierProvider(testResourceNamer)); resourceManager = ResourceManager.authenticate(httpPipeline, profile).withDefaultSubscription(); - sqlServerManager = SqlServerManager.authenticate(httpPipeline, profile, sdkContext); + sqlServerManager = SqlServerManager.authenticate(httpPipeline, profile); storageManager = StorageManager.authenticate(httpPipeline, profile); + setSdkContext(sdkContext, sqlServerManager); } @Override diff --git a/sdk/resourcemanager/azure-resourcemanager-storage/src/main/java/com/azure/resourcemanager/storage/StorageManager.java b/sdk/resourcemanager/azure-resourcemanager-storage/src/main/java/com/azure/resourcemanager/storage/StorageManager.java index 424f4759728be..4be7467fc095e 100644 --- a/sdk/resourcemanager/azure-resourcemanager-storage/src/main/java/com/azure/resourcemanager/storage/StorageManager.java +++ b/sdk/resourcemanager/azure-resourcemanager-storage/src/main/java/com/azure/resourcemanager/storage/StorageManager.java @@ -10,7 +10,6 @@ import com.azure.resourcemanager.resources.fluentcore.arm.Manager; import com.azure.core.management.profile.AzureProfile; import com.azure.resourcemanager.resources.fluentcore.utils.HttpPipelineProvider; -import com.azure.resourcemanager.resources.fluentcore.utils.SdkContext; import com.azure.resourcemanager.storage.fluent.StorageManagementClient; import com.azure.resourcemanager.storage.fluent.StorageManagementClientBuilder; import com.azure.resourcemanager.storage.implementation.BlobContainersImpl; @@ -64,19 +63,7 @@ public static StorageManager authenticate(TokenCredential credential, AzureProfi * @return the StorageManager */ public static StorageManager authenticate(HttpPipeline httpPipeline, AzureProfile profile) { - return authenticate(httpPipeline, profile, new SdkContext()); - } - - /** - * Creates an instance of StorageManager that exposes storage resource management API entry points. - * - * @param httpPipeline the RestClient to be used for API calls. - * @param profile the profile to use - * @param sdkContext the sdk context - * @return the StorageManager - */ - public static StorageManager authenticate(HttpPipeline httpPipeline, AzureProfile profile, SdkContext sdkContext) { - return new StorageManager(httpPipeline, profile, sdkContext); + return new StorageManager(httpPipeline, profile); } /** The interface allowing configurations to be set. */ @@ -98,7 +85,7 @@ public StorageManager authenticate(TokenCredential credential, AzureProfile prof } } - private StorageManager(HttpPipeline httpPipeline, AzureProfile profile, SdkContext sdkContext) { + private StorageManager(HttpPipeline httpPipeline, AzureProfile profile) { super( httpPipeline, profile, @@ -106,8 +93,7 @@ private StorageManager(HttpPipeline httpPipeline, AzureProfile profile, SdkConte .pipeline(httpPipeline) .endpoint(profile.getEnvironment().getResourceManagerEndpoint()) .subscriptionId(profile.getSubscriptionId()) - .buildClient(), - sdkContext); + .buildClient()); } /** @return the storage account management API entry point */ diff --git a/sdk/resourcemanager/azure-resourcemanager-test/src/main/java/com/azure/resourcemanager/test/ResourceManagerTestBase.java b/sdk/resourcemanager/azure-resourcemanager-test/src/main/java/com/azure/resourcemanager/test/ResourceManagerTestBase.java index 7b02626b9a0c5..9c597ed7133b3 100644 --- a/sdk/resourcemanager/azure-resourcemanager-test/src/main/java/com/azure/resourcemanager/test/ResourceManagerTestBase.java +++ b/sdk/resourcemanager/azure-resourcemanager-test/src/main/java/com/azure/resourcemanager/test/ResourceManagerTestBase.java @@ -28,12 +28,15 @@ import java.io.OutputStream; import java.io.PrintStream; import java.io.UnsupportedEncodingException; +import java.lang.reflect.Field; import java.net.InetSocketAddress; import java.net.Proxy; import java.net.ProxySelector; import java.net.URI; import java.net.URISyntaxException; import java.nio.charset.Charset; +import java.security.AccessController; +import java.security.PrivilegedAction; import java.time.Duration; import java.util.ArrayList; import java.util.HashMap; @@ -273,6 +276,49 @@ private void addTextReplacementRules(Map rules) { } } + /** + * Sets sdk context when running the tests + * + * @param sdkContext the sdkContext + * @param objects the manager classes to change sdkContext + * @param the type of sdk context + * @throws RuntimeException when field cannot be found or set. + */ + protected void setSdkContext(SdkContext sdkContext, Object... objects) { + try { + for (Object obj : objects) { + for (final Field field : obj.getClass().getSuperclass().getDeclaredFields()) { + if (field.getName().equals("resourceManager")) { + setAccessible(field); + Field context = field.get(obj).getClass().getDeclaredField("sdkContext"); + setAccessible(context); + context.set(field.get(obj), sdkContext); + } + } + for (Field field : obj.getClass().getDeclaredFields()) { + if (field.getName().equals("sdkContext")) { + setAccessible(field); + field.set(obj, sdkContext); + } else if (field.getName().contains("Manager")) { + setAccessible(field); + setSdkContext(sdkContext, field.get(obj)); + } + } + } + } catch (IllegalAccessException ex) { + throw logger.logExceptionAsError(new RuntimeException(ex)); + } catch (NoSuchFieldException ex) { + throw logger.logExceptionAsError(new RuntimeException(ex)); + } + } + + private void setAccessible(final Field field) { + AccessController.doPrivileged((PrivilegedAction) () -> { + field.setAccessible(true); + return null; + }); + } + protected abstract HttpPipeline buildHttpPipeline( TokenCredential credential, AzureProfile profile, diff --git a/sdk/resourcemanager/azure-resourcemanager-trafficmanager/src/main/java/com/azure/resourcemanager/trafficmanager/TrafficManager.java b/sdk/resourcemanager/azure-resourcemanager-trafficmanager/src/main/java/com/azure/resourcemanager/trafficmanager/TrafficManager.java index 2d3f1c0e35f6e..92b3bedcb20ac 100644 --- a/sdk/resourcemanager/azure-resourcemanager-trafficmanager/src/main/java/com/azure/resourcemanager/trafficmanager/TrafficManager.java +++ b/sdk/resourcemanager/azure-resourcemanager-trafficmanager/src/main/java/com/azure/resourcemanager/trafficmanager/TrafficManager.java @@ -10,7 +10,6 @@ import com.azure.resourcemanager.resources.fluentcore.arm.implementation.AzureConfigurableImpl; import com.azure.resourcemanager.resources.fluentcore.arm.Manager; import com.azure.resourcemanager.resources.fluentcore.utils.HttpPipelineProvider; -import com.azure.resourcemanager.resources.fluentcore.utils.SdkContext; import com.azure.resourcemanager.trafficmanager.fluent.TrafficManagerManagementClient; import com.azure.resourcemanager.trafficmanager.fluent.TrafficManagerManagementClientBuilder; import com.azure.resourcemanager.trafficmanager.implementation.TrafficManagerProfilesImpl; @@ -49,19 +48,7 @@ public static TrafficManager authenticate(TokenCredential credential, AzureProfi * @return the TrafficManager */ public static TrafficManager authenticate(HttpPipeline httpPipeline, AzureProfile profile) { - return authenticate(httpPipeline, profile, new SdkContext()); - } - - /** - * Creates an instance of TrafficManager that exposes traffic manager resource management API entry points. - * - * @param httpPipeline the RestClient to be used for API calls. - * @param profile the profile to use - * @param sdkContext the sdk context - * @return the TrafficManager - */ - public static TrafficManager authenticate(HttpPipeline httpPipeline, AzureProfile profile, SdkContext sdkContext) { - return new TrafficManager(httpPipeline, profile, sdkContext); + return new TrafficManager(httpPipeline, profile); } /** The interface allowing configurations to be set. */ @@ -83,7 +70,7 @@ public TrafficManager authenticate(TokenCredential credential, AzureProfile prof } } - private TrafficManager(HttpPipeline httpPipeline, AzureProfile profile, SdkContext sdkContext) { + private TrafficManager(HttpPipeline httpPipeline, AzureProfile profile) { super( httpPipeline, profile, @@ -91,8 +78,7 @@ private TrafficManager(HttpPipeline httpPipeline, AzureProfile profile, SdkConte .pipeline(httpPipeline) .endpoint(profile.getEnvironment().getResourceManagerEndpoint()) .subscriptionId(profile.getSubscriptionId()) - .buildClient(), - sdkContext); + .buildClient()); } /** @return entry point to traffic manager profile management */ diff --git a/sdk/resourcemanager/azure-resourcemanager/pom.xml b/sdk/resourcemanager/azure-resourcemanager/pom.xml index d061cd06f892b..2697444cc4a8e 100644 --- a/sdk/resourcemanager/azure-resourcemanager/pom.xml +++ b/sdk/resourcemanager/azure-resourcemanager/pom.xml @@ -214,6 +214,38 @@ + + java-lts + + [11,) + + + + + org.apache.maven.plugins + maven-surefire-plugin + 3.0.0-M3 + + + + --add-opens com.azure.resourcemanager/com.azure.resourcemanager=ALL-UNNAMED + --add-opens com.azure.resourcemanager.appservice/com.azure.resourcemanager.appservice=ALL-UNNAMED + --add-opens com.azure.resourcemanager.authorization/com.azure.resourcemanager.authorization=ALL-UNNAMED + --add-opens com.azure.resourcemanager.compute/com.azure.resourcemanager.compute=ALL-UNNAMED + --add-opens com.azure.resourcemanager.containerinstance/com.azure.resourcemanager.containerinstance=ALL-UNNAMED + --add-opens com.azure.resourcemanager.containerregistry/com.azure.resourcemanager.containerregistry=ALL-UNNAMED + --add-opens com.azure.resourcemanager.eventhubs/com.azure.resourcemanager.eventhubs=ALL-UNNAMED + --add-opens com.azure.resourcemanager.keyvault/com.azure.resourcemanager.keyvault=ALL-UNNAMED + --add-opens com.azure.resourcemanager.msi/com.azure.resourcemanager.msi=ALL-UNNAMED + --add-opens com.azure.resourcemanager.resources/com.azure.resourcemanager.resources=ALL-UNNAMED + --add-opens com.azure.resourcemanager.resources/com.azure.resourcemanager.resources.fluentcore.arm=ALL-UNNAMED + --add-opens com.azure.resourcemanager.sql/com.azure.resourcemanager.sql=ALL-UNNAMED + + + + + + diff --git a/sdk/resourcemanager/azure-resourcemanager/src/main/java/com/azure/resourcemanager/AzureResourceManager.java b/sdk/resourcemanager/azure-resourcemanager/src/main/java/com/azure/resourcemanager/AzureResourceManager.java index e11eee42d45a9..bbc91407c5bfd 100644 --- a/sdk/resourcemanager/azure-resourcemanager/src/main/java/com/azure/resourcemanager/AzureResourceManager.java +++ b/sdk/resourcemanager/azure-resourcemanager/src/main/java/com/azure/resourcemanager/AzureResourceManager.java @@ -92,7 +92,6 @@ import com.azure.core.management.profile.AzureProfile; import com.azure.resourcemanager.resources.fluentcore.utils.HttpPipelineProvider; import com.azure.resourcemanager.resources.fluentcore.utils.ResourceManagerUtils; -import com.azure.resourcemanager.resources.fluentcore.utils.SdkContext; import com.azure.resourcemanager.resources.models.Deployments; import com.azure.resourcemanager.resources.models.Features; import com.azure.resourcemanager.resources.models.GenericResources; @@ -148,7 +147,6 @@ public final class AzureResourceManager { private final Authenticated authenticated; private final String subscriptionId; private final String tenantId; - private final SdkContext sdkContext; /** * Authenticate to Azure using an Azure credential object. @@ -208,9 +206,6 @@ public interface Authenticated extends AccessManagement { /** @return the currently selected tenant ID this client is authenticated to work with */ String tenantId(); - /** @return the sdk context in authenticated */ - SdkContext sdkContext(); - /** * Entry point to subscription management APIs. * @@ -225,14 +220,6 @@ public interface Authenticated extends AccessManagement { */ Tenants tenants(); - /** - * Specifies sdk context for azure. - * - * @param sdkContext the sdk context - * @return the authenticated itself for chaining - */ - Authenticated withSdkContext(SdkContext sdkContext); - /** * Specifies a specific tenant for azure. * @@ -271,7 +258,6 @@ private static final class AuthenticatedImpl implements Authenticated { private final HttpPipeline httpPipeline; private final ResourceManager.Authenticated resourceManagerAuthenticated; private AuthorizationManager authorizationManager; - private SdkContext sdkContext; private String tenantId; private String subscriptionId; private final AzureEnvironment environment; @@ -283,7 +269,6 @@ private AuthenticatedImpl(HttpPipeline httpPipeline, AzureProfile profile) { this.tenantId = profile.getTenantId(); this.subscriptionId = profile.getSubscriptionId(); this.environment = profile.getEnvironment(); - this.sdkContext = new SdkContext(); } @Override @@ -331,25 +316,12 @@ public RoleAssignments roleAssignments() { return authorizationManager.roleAssignments(); } - @Override - public Authenticated withSdkContext(SdkContext sdkContext) { - this.sdkContext = sdkContext; - this.authorizationManager = AuthorizationManager.authenticate( - httpPipeline, new AzureProfile(tenantId, subscriptionId, environment), sdkContext); - return this; - } - - @Override - public SdkContext sdkContext() { - return this.sdkContext; - } - @Override public Authenticated withTenantId(String tenantId) { Objects.requireNonNull(tenantId); this.tenantId = tenantId; this.authorizationManager = AuthorizationManager.authenticate( - httpPipeline, new AzureProfile(tenantId, subscriptionId, environment), sdkContext); + httpPipeline, new AzureProfile(tenantId, subscriptionId, environment)); return this; } @@ -370,42 +342,36 @@ public AzureResourceManager withDefaultSubscription() { } private AzureResourceManager(HttpPipeline httpPipeline, AzureProfile profile, Authenticated authenticated) { - this.sdkContext = authenticated.sdkContext(); this.resourceManager = - ResourceManager.authenticate(httpPipeline, profile).withSdkContext(sdkContext).withDefaultSubscription(); - this.storageManager = StorageManager.authenticate(httpPipeline, profile, sdkContext); - this.computeManager = ComputeManager.authenticate(httpPipeline, profile, sdkContext); - this.networkManager = NetworkManager.authenticate(httpPipeline, profile, sdkContext); - this.keyVaultManager = KeyVaultManager.authenticate(httpPipeline, profile, sdkContext); + ResourceManager.authenticate(httpPipeline, profile).withDefaultSubscription(); + this.storageManager = StorageManager.authenticate(httpPipeline, profile); + this.computeManager = ComputeManager.authenticate(httpPipeline, profile); + this.networkManager = NetworkManager.authenticate(httpPipeline, profile); + this.keyVaultManager = KeyVaultManager.authenticate(httpPipeline, profile); // this.batchManager = BatchManager.authenticate(restClient, subscriptionId, sdkContext); - this.trafficManager = TrafficManager.authenticate(httpPipeline, profile, sdkContext); - this.redisManager = RedisManager.authenticate(httpPipeline, profile, sdkContext); - this.cdnManager = CdnManager.authenticate(httpPipeline, profile, sdkContext); - this.dnsZoneManager = DnsZoneManager.authenticate(httpPipeline, profile, sdkContext); - this.appServiceManager = AppServiceManager.authenticate(httpPipeline, profile, sdkContext); - this.sqlServerManager = SqlServerManager.authenticate(httpPipeline, profile, sdkContext); - this.serviceBusManager = ServiceBusManager.authenticate(httpPipeline, profile, sdkContext); - this.containerInstanceManager = ContainerInstanceManager.authenticate(httpPipeline, profile, sdkContext); - this.containerRegistryManager = ContainerRegistryManager.authenticate(httpPipeline, profile, sdkContext); - this.containerServiceManager = ContainerServiceManager.authenticate(httpPipeline, profile, sdkContext); - this.cosmosManager = CosmosManager.authenticate(httpPipeline, profile, sdkContext); + this.trafficManager = TrafficManager.authenticate(httpPipeline, profile); + this.redisManager = RedisManager.authenticate(httpPipeline, profile); + this.cdnManager = CdnManager.authenticate(httpPipeline, profile); + this.dnsZoneManager = DnsZoneManager.authenticate(httpPipeline, profile); + this.appServiceManager = AppServiceManager.authenticate(httpPipeline, profile); + this.sqlServerManager = SqlServerManager.authenticate(httpPipeline, profile); + this.serviceBusManager = ServiceBusManager.authenticate(httpPipeline, profile); + this.containerInstanceManager = ContainerInstanceManager.authenticate(httpPipeline, profile); + this.containerRegistryManager = ContainerRegistryManager.authenticate(httpPipeline, profile); + this.containerServiceManager = ContainerServiceManager.authenticate(httpPipeline, profile); + this.cosmosManager = CosmosManager.authenticate(httpPipeline, profile); // this.searchServiceManager = SearchServiceManager.authenticate(restClient, subscriptionId, sdkContext); // this.authorizationManager = AuthorizationManager.authenticate(restClient, subscriptionId, sdkContext); - this.msiManager = MSIManager.authenticate(httpPipeline, profile, sdkContext); - this.monitorManager = MonitorManager.authenticate(httpPipeline, profile, sdkContext); - this.eventHubsManager = EventHubsManager.authenticate(httpPipeline, profile, sdkContext); - this.appPlatformManager = AppPlatformManager.authenticate(httpPipeline, profile, sdkContext); - this.privateDnsZoneManager = PrivateDnsZoneManager.authenticate(httpPipeline, profile, sdkContext); + this.msiManager = MSIManager.authenticate(httpPipeline, profile); + this.monitorManager = MonitorManager.authenticate(httpPipeline, profile); + this.eventHubsManager = EventHubsManager.authenticate(httpPipeline, profile); + this.appPlatformManager = AppPlatformManager.authenticate(httpPipeline, profile); + this.privateDnsZoneManager = PrivateDnsZoneManager.authenticate(httpPipeline, profile); this.authenticated = authenticated; this.subscriptionId = profile.getSubscriptionId(); this.tenantId = profile.getTenantId(); } - /** @return the currently selected subscription ID this client is authenticated to work with */ - public SdkContext sdkContext() { - return this.sdkContext; - } - /** @return the currently selected subscription ID this client is authenticated to work with */ public String subscriptionId() { return this.subscriptionId; diff --git a/sdk/resourcemanager/azure-resourcemanager/src/test/java/com/azure/resourcemanager/ApplicationGatewayTests.java b/sdk/resourcemanager/azure-resourcemanager/src/test/java/com/azure/resourcemanager/ApplicationGatewayTests.java index 419d5952d0965..c69728c4399e0 100644 --- a/sdk/resourcemanager/azure-resourcemanager/src/test/java/com/azure/resourcemanager/ApplicationGatewayTests.java +++ b/sdk/resourcemanager/azure-resourcemanager/src/test/java/com/azure/resourcemanager/ApplicationGatewayTests.java @@ -67,8 +67,9 @@ protected void initializeClients(HttpPipeline httpPipeline, AzureProfile profile SdkContext sdkContext = new SdkContext(); sdkContext.setIdentifierFunction(name -> new TestIdentifierProvider(testResourceNamer)); AzureResourceManager.Authenticated azureAuthed = - AzureResourceManager.authenticate(httpPipeline, profile).withSdkContext(sdkContext); + AzureResourceManager.authenticate(httpPipeline, profile); azureResourceManager = azureAuthed.withDefaultSubscription(); + setSdkContext(sdkContext, azureResourceManager); } @Override @@ -82,7 +83,7 @@ protected void cleanUpResources() { */ @Test public void testAppGatewaysInternalComplex() throws Exception { - new TestApplicationGateway().new PrivateComplex(azureResourceManager.sdkContext()) + new TestApplicationGateway().new PrivateComplex(azureResourceManager.resourceGroups().manager().sdkContext()) .runTest(azureResourceManager.applicationGateways(), azureResourceManager.resourceGroups()); } @@ -93,16 +94,16 @@ public void testAppGatewaysInternalComplex() throws Exception { */ @Test public void testAppGatewaysPublicUrlPathBased() throws Exception { - new TestApplicationGateway().new UrlPathBased(azureResourceManager.sdkContext()) + new TestApplicationGateway().new UrlPathBased(azureResourceManager.resourceGroups().manager().sdkContext()) .runTest(azureResourceManager.applicationGateways(), azureResourceManager.resourceGroups()); } @Test public void testAppGatewayBackendHealthCheck() throws Exception { - String testId = azureResourceManager.applicationGateways().manager().sdkContext().randomResourceName("", 15); + String testId = azureResourceManager.applicationGateways().manager().resourceManager().sdkContext().randomResourceName("", 15); String name = "ag" + testId; Region region = Region.US_EAST; - String password = azureResourceManager.applicationGateways().manager().sdkContext().randomResourceName("Abc.123", 12); + String password = azureResourceManager.applicationGateways().manager().resourceManager().sdkContext().randomResourceName("Abc.123", 12); String vnetName = "net" + testId; String rgName = "rg" + testId; @@ -273,15 +274,15 @@ public void testAppGatewayBackendHealthCheck() throws Exception { */ @Test public void testAppGatewaysInternalMinimal() throws Exception { - new TestApplicationGateway().new PrivateMinimal(azureResourceManager.sdkContext()) + new TestApplicationGateway().new PrivateMinimal(azureResourceManager.resourceGroups().manager().sdkContext()) .runTest(azureResourceManager.applicationGateways(), azureResourceManager.resourceGroups()); } @Test public void testAppGatewaysStartStop() throws Exception { - String rgName = azureResourceManager.sdkContext().randomResourceName("rg", 13); + String rgName = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("rg", 13); Region region = Region.US_EAST; - String name = azureResourceManager.sdkContext().randomResourceName("ag", 15); + String name = azureResourceManager.resourceGroups().manager().sdkContext().randomResourceName("ag", 15); ApplicationGateway appGateway = azureResourceManager .applicationGateways() @@ -310,7 +311,7 @@ public void testAppGatewaysStartStop() throws Exception { @Test public void testApplicationGatewaysInParallel() throws Exception { - String rgName = azureResourceManager.applicationGateways().manager().sdkContext().randomResourceName("rg", 13); + String rgName = azureResourceManager.applicationGateways().manager().resourceManager().sdkContext().randomResourceName("rg", 13); Region region = Region.US_EAST; Creatable resourceGroup = azureResourceManager.resourceGroups().define(rgName).withRegion(region); List> agCreatables = new ArrayList<>(); @@ -319,7 +320,7 @@ public void testApplicationGatewaysInParallel() throws Exception { .add( azureResourceManager .applicationGateways() - .define(azureResourceManager.applicationGateways().manager().sdkContext().randomResourceName("ag", 13)) + .define(azureResourceManager.applicationGateways().manager().resourceManager().sdkContext().randomResourceName("ag", 13)) .withRegion(Region.US_EAST) .withNewResourceGroup(resourceGroup) .defineRequestRoutingRule("rule1") @@ -334,7 +335,7 @@ public void testApplicationGatewaysInParallel() throws Exception { .add( azureResourceManager .applicationGateways() - .define(azureResourceManager.applicationGateways().manager().sdkContext().randomResourceName("ag", 13)) + .define(azureResourceManager.applicationGateways().manager().resourceManager().sdkContext().randomResourceName("ag", 13)) .withRegion(Region.US_EAST) .withNewResourceGroup(resourceGroup) .defineRequestRoutingRule("rule1") @@ -387,7 +388,7 @@ public void testApplicationGatewaysInParallel() throws Exception { */ @Test public void testAppGatewaysInternetFacingMinimal() throws Exception { - new TestApplicationGateway().new PublicMinimal(azureResourceManager.sdkContext()) + new TestApplicationGateway().new PublicMinimal(azureResourceManager.resourceGroups().manager().sdkContext()) .runTest(azureResourceManager.applicationGateways(), azureResourceManager.resourceGroups()); } @@ -398,7 +399,7 @@ public void testAppGatewaysInternetFacingMinimal() throws Exception { */ @Test public void testAppGatewaysInternetFacingComplex() throws Exception { - new TestApplicationGateway().new PublicComplex(azureResourceManager.sdkContext()) + new TestApplicationGateway().new PublicComplex(azureResourceManager.resourceGroups().manager().sdkContext()) .runTest(azureResourceManager.applicationGateways(), azureResourceManager.resourceGroups()); } } diff --git a/sdk/resourcemanager/azure-resourcemanager/src/test/java/com/azure/resourcemanager/AzureResourceManagerTests.java b/sdk/resourcemanager/azure-resourcemanager/src/test/java/com/azure/resourcemanager/AzureResourceManagerTests.java index ea3b359feb7af..ef883c2ff2c03 100644 --- a/sdk/resourcemanager/azure-resourcemanager/src/test/java/com/azure/resourcemanager/AzureResourceManagerTests.java +++ b/sdk/resourcemanager/azure-resourcemanager/src/test/java/com/azure/resourcemanager/AzureResourceManagerTests.java @@ -108,9 +108,10 @@ protected void initializeClients(HttpPipeline httpPipeline, AzureProfile profile SdkContext.setDelayProvider(new TestDelayProvider(!isPlaybackMode())); SdkContext sdkContext = new SdkContext(); sdkContext.setIdentifierFunction(name -> new TestIdentifierProvider(testResourceNamer)); - AzureResourceManager.Authenticated azureAuthed = AzureResourceManager.authenticate(httpPipeline, profile).withSdkContext(sdkContext); + AzureResourceManager.Authenticated azureAuthed = AzureResourceManager.authenticate(httpPipeline, profile); azureResourceManager = azureAuthed.withDefaultSubscription(); - this.msiManager = MSIManager.authenticate(httpPipeline, profile, sdkContext); + this.msiManager = MSIManager.authenticate(httpPipeline, profile); + setSdkContext(sdkContext, azureResourceManager, msiManager); } @Override @@ -228,7 +229,7 @@ public void run() { */ @Test public void testDeployments() throws Exception { - String testId = azureResourceManager.deployments().manager().sdkContext().randomResourceName("", 8); + String testId = azureResourceManager.deployments().manager().resourceManager().sdkContext().randomResourceName("", 8); PagedIterable deployments = azureResourceManager.deployments().list(); System.out.println("Deployments: " + TestUtilities.getSize(deployments)); Deployment deployment = @@ -260,13 +261,13 @@ public void testGenericResources() throws Exception { NetworkSecurityGroup nsg = azureResourceManager .networkSecurityGroups() - .define(azureResourceManager.networkSecurityGroups().manager().sdkContext().randomResourceName("nsg", 13)) + .define(azureResourceManager.networkSecurityGroups().manager().resourceManager().sdkContext().randomResourceName("nsg", 13)) .withRegion(Region.US_EAST) .withNewResourceGroup() .create(); azureResourceManager .publicIpAddresses() - .define(azureResourceManager.networkSecurityGroups().manager().sdkContext().randomResourceName("pip", 13)) + .define(azureResourceManager.networkSecurityGroups().manager().resourceManager().sdkContext().randomResourceName("pip", 13)) .withRegion(Region.US_EAST) .withExistingResourceGroup(nsg.resourceGroupName()) .create(); @@ -603,7 +604,7 @@ public void testLoadBalancersInternalWithAvailabilityZone() throws Exception { @Test public void testManagedDiskVMUpdate() throws Exception { - SdkContext context = azureResourceManager.disks().manager().sdkContext(); + SdkContext context = azureResourceManager.disks().manager().resourceManager().sdkContext(); final String rgName = context.randomResourceName("rg", 13); final String linuxVM2Name = context.randomResourceName("vm" + "-", 10); final String linuxVM2Pip = context.randomResourceName("pip" + "-", 18); diff --git a/sdk/resourcemanager/azure-resourcemanager/src/test/java/com/azure/resourcemanager/TestAvailabilitySet.java b/sdk/resourcemanager/azure-resourcemanager/src/test/java/com/azure/resourcemanager/TestAvailabilitySet.java index 738f0b53f9cda..d726ff3271f5e 100644 --- a/sdk/resourcemanager/azure-resourcemanager/src/test/java/com/azure/resourcemanager/TestAvailabilitySet.java +++ b/sdk/resourcemanager/azure-resourcemanager/src/test/java/com/azure/resourcemanager/TestAvailabilitySet.java @@ -13,7 +13,7 @@ public class TestAvailabilitySet extends TestTemplate { @Override public AvailabilitySet createResource(AvailabilitySets availabilitySets) throws Exception { - final String newName = availabilitySets.manager().sdkContext().randomResourceName("as", 10); + final String newName = availabilitySets.manager().resourceManager().sdkContext().randomResourceName("as", 10); AvailabilitySet aset = availabilitySets .define(newName) diff --git a/sdk/resourcemanager/azure-resourcemanager/src/test/java/com/azure/resourcemanager/TestContainerInstanceWithPrivateIpAddress.java b/sdk/resourcemanager/azure-resourcemanager/src/test/java/com/azure/resourcemanager/TestContainerInstanceWithPrivateIpAddress.java index 6a5a5e3c8114d..a9b86e8318581 100644 --- a/sdk/resourcemanager/azure-resourcemanager/src/test/java/com/azure/resourcemanager/TestContainerInstanceWithPrivateIpAddress.java +++ b/sdk/resourcemanager/azure-resourcemanager/src/test/java/com/azure/resourcemanager/TestContainerInstanceWithPrivateIpAddress.java @@ -26,8 +26,8 @@ public class TestContainerInstanceWithPrivateIpAddress extends TestTemplate dnsServers = new ArrayList(); dnsServers.add("dnsServer1"); diff --git a/sdk/resourcemanager/azure-resourcemanager/src/test/java/com/azure/resourcemanager/TestContainerRegistry.java b/sdk/resourcemanager/azure-resourcemanager/src/test/java/com/azure/resourcemanager/TestContainerRegistry.java index fc1dff32fdd9e..d8adc8d5fab3e 100644 --- a/sdk/resourcemanager/azure-resourcemanager/src/test/java/com/azure/resourcemanager/TestContainerRegistry.java +++ b/sdk/resourcemanager/azure-resourcemanager/src/test/java/com/azure/resourcemanager/TestContainerRegistry.java @@ -15,7 +15,7 @@ public class TestContainerRegistry extends TestTemplate { @Override public Registry createResource(Registries registries) throws Exception { - final String testId = registries.manager().sdkContext().randomResourceName("", 8); + final String testId = registries.manager().resourceManager().sdkContext().randomResourceName("", 8); final String newName = "acr" + testId; final String rgName = "rgacr" + testId; Registry registry = diff --git a/sdk/resourcemanager/azure-resourcemanager/src/test/java/com/azure/resourcemanager/TestCosmosDB.java b/sdk/resourcemanager/azure-resourcemanager/src/test/java/com/azure/resourcemanager/TestCosmosDB.java index 87318bd783588..96867ce4282d8 100644 --- a/sdk/resourcemanager/azure-resourcemanager/src/test/java/com/azure/resourcemanager/TestCosmosDB.java +++ b/sdk/resourcemanager/azure-resourcemanager/src/test/java/com/azure/resourcemanager/TestCosmosDB.java @@ -13,7 +13,7 @@ public class TestCosmosDB extends TestTemplate { @Override public DnsZone createResource(DnsZones dnsZones) throws Exception { final Region region = Region.US_EAST; - final String testId = dnsZones.manager().sdkContext().randomResourceName("", 8); + final String testId = dnsZones.manager().resourceManager().sdkContext().randomResourceName("", 8); final String groupName = "rg" + testId; final String topLevelDomain = "www.contoso" + testId + ".com"; diff --git a/sdk/resourcemanager/azure-resourcemanager/src/test/java/com/azure/resourcemanager/TestExpressRouteCircuit.java b/sdk/resourcemanager/azure-resourcemanager/src/test/java/com/azure/resourcemanager/TestExpressRouteCircuit.java index 0553c7f0a1488..013c5401a9e24 100644 --- a/sdk/resourcemanager/azure-resourcemanager/src/test/java/com/azure/resourcemanager/TestExpressRouteCircuit.java +++ b/sdk/resourcemanager/azure-resourcemanager/src/test/java/com/azure/resourcemanager/TestExpressRouteCircuit.java @@ -26,7 +26,7 @@ private void initializeResourceNames(SdkContext sdkContext) { public class Basic extends TestTemplate { @Override public ExpressRouteCircuit createResource(ExpressRouteCircuits expressRouteCircuits) throws Exception { - initializeResourceNames(expressRouteCircuits.manager().sdkContext()); + initializeResourceNames(expressRouteCircuits.manager().resourceManager().sdkContext()); // create Express Route Circuit ExpressRouteCircuit erc = @@ -78,7 +78,7 @@ public void print(ExpressRouteCircuit resource) { public class ExpressRouteCircuitPeering extends TestTemplate { @Override public ExpressRouteCircuit createResource(ExpressRouteCircuits expressRouteCircuits) throws Exception { - initializeResourceNames(expressRouteCircuits.manager().sdkContext()); + initializeResourceNames(expressRouteCircuits.manager().resourceManager().sdkContext()); // create Express Route Circuit ExpressRouteCircuit erc = diff --git a/sdk/resourcemanager/azure-resourcemanager/src/test/java/com/azure/resourcemanager/TestKubernetesCluster.java b/sdk/resourcemanager/azure-resourcemanager/src/test/java/com/azure/resourcemanager/TestKubernetesCluster.java index aa1dd1f4f379e..6539d3454a374 100644 --- a/sdk/resourcemanager/azure-resourcemanager/src/test/java/com/azure/resourcemanager/TestKubernetesCluster.java +++ b/sdk/resourcemanager/azure-resourcemanager/src/test/java/com/azure/resourcemanager/TestKubernetesCluster.java @@ -30,7 +30,7 @@ public class TestKubernetesCluster extends TestTemplate { * @param computeManager compute manager */ public InternetNatOnly(ComputeManager computeManager) { - initializeResourceNames(computeManager.sdkContext()); + initializeResourceNames(computeManager.resourceManager().sdkContext()); this.computeManager = computeManager; } @@ -562,7 +562,7 @@ public class InternetMinimal extends TestTemplate { * @param computeManager compute manager */ public InternetMinimal(ComputeManager computeManager) { - initializeResourceNames(computeManager.sdkContext()); + initializeResourceNames(computeManager.resourceManager().sdkContext()); this.computeManager = computeManager; } @@ -574,7 +574,7 @@ public void print(LoadBalancer resource) { @Override public LoadBalancer createResource(LoadBalancers resources) throws Exception { VirtualMachine[] existingVMs = ensureVMs(resources.manager().networks(), this.computeManager, 2); - String pipDnsLabel = resources.manager().sdkContext().randomResourceName("pip", 20); + String pipDnsLabel = resources.manager().resourceManager().sdkContext().randomResourceName("pip", 20); // Create a load balancer LoadBalancer lb = @@ -736,7 +736,7 @@ public class InternalMinimal extends TestTemplate { * @param computeManager compute manager */ public InternalMinimal(ComputeManager computeManager) { - initializeResourceNames(computeManager.sdkContext()); + initializeResourceNames(computeManager.resourceManager().sdkContext()); this.computeManager = computeManager; } @@ -916,7 +916,7 @@ public class InternalWithZone extends TestTemplate */ public InternalWithZone(ComputeManager computeManager) { region = Region.US_EAST2; - initializeResourceNames(computeManager.sdkContext()); + initializeResourceNames(computeManager.resourceManager().sdkContext()); this.computeManager = computeManager; } @@ -1052,7 +1052,7 @@ private VirtualMachine[] ensureVMs(Networks networks, ComputeManager computeMana String userName = "testuser" + testId; List> vmDefinitions = new ArrayList<>(); for (int i = 0; i < count; i++) { - String vmName = computeManager.sdkContext().randomResourceName("vm", 15); + String vmName = computeManager.resourceManager().sdkContext().randomResourceName("vm", 15); Creatable vm = computeManager diff --git a/sdk/resourcemanager/azure-resourcemanager/src/test/java/com/azure/resourcemanager/TestLocalNetworkGateway.java b/sdk/resourcemanager/azure-resourcemanager/src/test/java/com/azure/resourcemanager/TestLocalNetworkGateway.java index a0dcbfdaf7f2d..0c78a1c9ba44e 100644 --- a/sdk/resourcemanager/azure-resourcemanager/src/test/java/com/azure/resourcemanager/TestLocalNetworkGateway.java +++ b/sdk/resourcemanager/azure-resourcemanager/src/test/java/com/azure/resourcemanager/TestLocalNetworkGateway.java @@ -23,7 +23,7 @@ private void initializeResourceNames(SdkContext sdkContext) { @Override public LocalNetworkGateway createResource(LocalNetworkGateways localNetworkGateways) throws Exception { - initializeResourceNames(localNetworkGateways.manager().sdkContext()); + initializeResourceNames(localNetworkGateways.manager().resourceManager().sdkContext()); LocalNetworkGateway gateway = localNetworkGateways .define(lngwName) diff --git a/sdk/resourcemanager/azure-resourcemanager/src/test/java/com/azure/resourcemanager/TestNSG.java b/sdk/resourcemanager/azure-resourcemanager/src/test/java/com/azure/resourcemanager/TestNSG.java index 0d0ac365a242b..1fb8c9e496b34 100644 --- a/sdk/resourcemanager/azure-resourcemanager/src/test/java/com/azure/resourcemanager/TestNSG.java +++ b/sdk/resourcemanager/azure-resourcemanager/src/test/java/com/azure/resourcemanager/TestNSG.java @@ -20,11 +20,11 @@ public class TestNSG extends TestTemplate { @Override public NetworkSecurityGroup createResource(NetworkSecurityGroups nsgs) throws Exception { - String postFix = nsgs.manager().sdkContext().randomResourceName("", 8); + String postFix = nsgs.manager().resourceManager().sdkContext().randomResourceName("", 8); final String newName = "nsg" + postFix; final String resourceGroupName = "rg" + postFix; final String nicName = "nic" + postFix; - final String asgName = nsgs.manager().sdkContext().randomResourceName("asg", 8); + final String asgName = nsgs.manager().resourceManager().sdkContext().randomResourceName("asg", 8); final Region region = Region.US_WEST; final SettableFuture nsgFuture = SettableFuture.create(); diff --git a/sdk/resourcemanager/azure-resourcemanager/src/test/java/com/azure/resourcemanager/TestNetwork.java b/sdk/resourcemanager/azure-resourcemanager/src/test/java/com/azure/resourcemanager/TestNetwork.java index 2bbfb6f2390fe..6bfa1fdc1cd3b 100644 --- a/sdk/resourcemanager/azure-resourcemanager/src/test/java/com/azure/resourcemanager/TestNetwork.java +++ b/sdk/resourcemanager/azure-resourcemanager/src/test/java/com/azure/resourcemanager/TestNetwork.java @@ -28,7 +28,7 @@ public class WithSubnets extends TestTemplate { @Override public Network createResource(Networks networks) throws Exception { - String postFix = networks.manager().sdkContext().randomResourceName("", 8); + String postFix = networks.manager().resourceManager().sdkContext().randomResourceName("", 8); final String newName = "net" + postFix; Region region = Region.US_WEST; String groupName = "rg" + postFix; @@ -91,7 +91,7 @@ public Network updateResource(Network resource) throws Exception { resource .manager() .networkSecurityGroups() - .define(resource.manager().sdkContext().randomResourceName("nsgB", 10)) + .define(resource.manager().resourceManager().sdkContext().randomResourceName("nsgB", 10)) .withRegion(resource.region()) .withExistingResourceGroup(resource.resourceGroupName()) .create(); @@ -153,7 +153,7 @@ public class WithAccessFromServiceToSubnet extends TestTemplate { @Override public Network createResource(Networks networks) throws Exception { Region region = Region.US_EAST; - String groupName = networks.manager().sdkContext().randomResourceName("rg", 10); + String groupName = networks.manager().resourceManager().sdkContext().randomResourceName("rg", 10); - String networkName = networks.manager().sdkContext().randomResourceName("net", 15); - String networkName2 = networks.manager().sdkContext().randomResourceName("net", 15); + String networkName = networks.manager().resourceManager().sdkContext().randomResourceName("net", 15); + String networkName2 = networks.manager().resourceManager().sdkContext().randomResourceName("net", 15); Creatable remoteNetworkDefinition = networks @@ -374,9 +374,9 @@ public class WithDDosProtectionPlanAndVmProtection extends TestTemplate { @Override public Network createResource(Networks networks) throws Exception { Region region = Region.US_SOUTH_CENTRAL; - String groupName = networks.manager().sdkContext().randomResourceName("rg", 10); + String groupName = networks.manager().resourceManager().sdkContext().randomResourceName("rg", 10); - String networkName = networks.manager().sdkContext().randomResourceName("net", 15); + String networkName = networks.manager().resourceManager().sdkContext().randomResourceName("net", 15); Network network = networks diff --git a/sdk/resourcemanager/azure-resourcemanager/src/test/java/com/azure/resourcemanager/TestNetworkInterface.java b/sdk/resourcemanager/azure-resourcemanager/src/test/java/com/azure/resourcemanager/TestNetworkInterface.java index 5bbc371c17a7c..72ed22dfb95da 100644 --- a/sdk/resourcemanager/azure-resourcemanager/src/test/java/com/azure/resourcemanager/TestNetworkInterface.java +++ b/sdk/resourcemanager/azure-resourcemanager/src/test/java/com/azure/resourcemanager/TestNetworkInterface.java @@ -18,7 +18,7 @@ public class TestNetworkInterface extends TestTemplate nwList = networkWatchers.list(); @@ -113,7 +113,7 @@ VirtualMachine[] ensureNetwork(Networks networks, VirtualMachines vms, NetworkIn Creatable vm1 = vms - .define(networks.manager().sdkContext().randomResourceName("vm", 15)) + .define(networks.manager().resourceManager().sdkContext().randomResourceName("vm", 15)) .withRegion(REGION) .withExistingResourceGroup(groupName) .withExistingPrimaryNetworkInterface(nic) @@ -128,7 +128,7 @@ VirtualMachine[] ensureNetwork(Networks networks, VirtualMachines vms, NetworkIn .withMinorVersionAutoUpgrade() .attach(); - String vmName = networks.manager().sdkContext().randomResourceName("vm", 15); + String vmName = networks.manager().resourceManager().sdkContext().randomResourceName("vm", 15); Creatable vm2 = vms diff --git a/sdk/resourcemanager/azure-resourcemanager/src/test/java/com/azure/resourcemanager/TestPrivateDns.java b/sdk/resourcemanager/azure-resourcemanager/src/test/java/com/azure/resourcemanager/TestPrivateDns.java index ef16aeee0e03b..676275d796fb0 100644 --- a/sdk/resourcemanager/azure-resourcemanager/src/test/java/com/azure/resourcemanager/TestPrivateDns.java +++ b/sdk/resourcemanager/azure-resourcemanager/src/test/java/com/azure/resourcemanager/TestPrivateDns.java @@ -35,7 +35,7 @@ public class TestPrivateDns extends TestTemplate { @Override public PublicIpAddress createResource(PublicIpAddresses pips) throws Exception { - final String newPipName = pips.manager().sdkContext().randomResourceName("pip", 10); + final String newPipName = pips.manager().resourceManager().sdkContext().randomResourceName("pip", 10); PublicIpAddress pip = pips diff --git a/sdk/resourcemanager/azure-resourcemanager/src/test/java/com/azure/resourcemanager/TestPublicIPPrefix.java b/sdk/resourcemanager/azure-resourcemanager/src/test/java/com/azure/resourcemanager/TestPublicIPPrefix.java index cf88a09258bd6..e26a52181bf59 100644 --- a/sdk/resourcemanager/azure-resourcemanager/src/test/java/com/azure/resourcemanager/TestPublicIPPrefix.java +++ b/sdk/resourcemanager/azure-resourcemanager/src/test/java/com/azure/resourcemanager/TestPublicIPPrefix.java @@ -15,7 +15,7 @@ public class TestPublicIPPrefix extends TestTemplate { @Override public PublicIpPrefix createResource(PublicIpPrefixes pips) throws Exception { - final String newPipName = pips.manager().sdkContext().randomResourceName("pip", 10); + final String newPipName = pips.manager().resourceManager().sdkContext().randomResourceName("pip", 10); PublicIpPrefix pip = pips.define(newPipName) .withRegion(Region.US_WEST) diff --git a/sdk/resourcemanager/azure-resourcemanager/src/test/java/com/azure/resourcemanager/TestRedis.java b/sdk/resourcemanager/azure-resourcemanager/src/test/java/com/azure/resourcemanager/TestRedis.java index 132ee022ef90b..e3be8c816c539 100644 --- a/sdk/resourcemanager/azure-resourcemanager/src/test/java/com/azure/resourcemanager/TestRedis.java +++ b/sdk/resourcemanager/azure-resourcemanager/src/test/java/com/azure/resourcemanager/TestRedis.java @@ -13,7 +13,7 @@ public class TestRedis extends TestTemplate { @Override public RedisCache createResource(RedisCaches resources) throws Exception { - final String redisName = resources.manager().sdkContext().randomResourceName("redis", 10); + final String redisName = resources.manager().resourceManager().sdkContext().randomResourceName("redis", 10); final RedisCache[] redisCaches = new RedisCache[1]; final SettableFuture future = SettableFuture.create(); diff --git a/sdk/resourcemanager/azure-resourcemanager/src/test/java/com/azure/resourcemanager/TestResourceStreaming.java b/sdk/resourcemanager/azure-resourcemanager/src/test/java/com/azure/resourcemanager/TestResourceStreaming.java index 311a490628de8..ac3bcdfbf3e36 100644 --- a/sdk/resourcemanager/azure-resourcemanager/src/test/java/com/azure/resourcemanager/TestResourceStreaming.java +++ b/sdk/resourcemanager/azure-resourcemanager/src/test/java/com/azure/resourcemanager/TestResourceStreaming.java @@ -24,7 +24,7 @@ public TestResourceStreaming(StorageAccounts storageAccounts) { @Override public VirtualMachine createResource(VirtualMachines virtualMachines) throws Exception { - final String vmName = virtualMachines.manager().sdkContext().randomResourceName("vm", 10); + final String vmName = virtualMachines.manager().resourceManager().sdkContext().randomResourceName("vm", 10); System.out.println("In createResource \n\n\n"); @@ -33,13 +33,13 @@ public VirtualMachine createResource(VirtualMachines virtualMachines) throws Exc .manager() .resourceManager() .resourceGroups() - .define(virtualMachines.manager().sdkContext().randomResourceName("rg" + vmName, 20)) + .define(virtualMachines.manager().resourceManager().sdkContext().randomResourceName("rg" + vmName, 20)) .withRegion(Region.US_EAST); Creatable storageCreatable = this .storageAccounts - .define(virtualMachines.manager().sdkContext().randomResourceName("stg", 20)) + .define(virtualMachines.manager().resourceManager().sdkContext().randomResourceName("stg", 20)) .withRegion(Region.US_EAST) .withNewResourceGroup(rgCreatable); @@ -51,13 +51,13 @@ public VirtualMachine createResource(VirtualMachines virtualMachines) throws Exc .withNewPrimaryNetwork("10.0.0.0/28") .withPrimaryPrivateIPAddressDynamic() .withNewPrimaryPublicIPAddress( - virtualMachines.manager().sdkContext().randomResourceName("pip", 20)) + virtualMachines.manager().resourceManager().sdkContext().randomResourceName("pip", 20)) .withPopularWindowsImage(KnownWindowsVirtualMachineImage.WINDOWS_SERVER_2012_R2_DATACENTER) .withAdminUsername("testuser") .withAdminPassword("12NewPA$$w0rd!") .withSize(VirtualMachineSizeTypes.STANDARD_D1_V2) .withNewStorageAccount(storageCreatable) - .withNewAvailabilitySet(virtualMachines.manager().sdkContext().randomResourceName("avset", 10)) + .withNewAvailabilitySet(virtualMachines.manager().resourceManager().sdkContext().randomResourceName("avset", 10)) .createAsync() .block(); diff --git a/sdk/resourcemanager/azure-resourcemanager/src/test/java/com/azure/resourcemanager/TestRouteTables.java b/sdk/resourcemanager/azure-resourcemanager/src/test/java/com/azure/resourcemanager/TestRouteTables.java index da3f9f80bfe82..ae310fc22d020 100644 --- a/sdk/resourcemanager/azure-resourcemanager/src/test/java/com/azure/resourcemanager/TestRouteTables.java +++ b/sdk/resourcemanager/azure-resourcemanager/src/test/java/com/azure/resourcemanager/TestRouteTables.java @@ -26,11 +26,11 @@ public class Minimal extends TestTemplate { @Override public RouteTable createResource(RouteTables routeTables) throws Exception { - netName = routeTables.manager().sdkContext().randomResourceName("net", 10); - final String newName = routeTables.manager().sdkContext().randomResourceName("rt", 10); + netName = routeTables.manager().resourceManager().sdkContext().randomResourceName("net", 10); + final String newName = routeTables.manager().resourceManager().sdkContext().randomResourceName("rt", 10); Region region = Region.US_WEST; - String groupName = routeTables.manager().sdkContext().randomResourceName("rg", 10); + String groupName = routeTables.manager().resourceManager().sdkContext().randomResourceName("rg", 10); final String route1AddressPrefix = "10.0.1.0/29"; final String route2AddressPrefix = "10.0.0.0/29"; diff --git a/sdk/resourcemanager/azure-resourcemanager/src/test/java/com/azure/resourcemanager/TestSql.java b/sdk/resourcemanager/azure-resourcemanager/src/test/java/com/azure/resourcemanager/TestSql.java index 23f9585c1026a..7412fe21d7676 100644 --- a/sdk/resourcemanager/azure-resourcemanager/src/test/java/com/azure/resourcemanager/TestSql.java +++ b/sdk/resourcemanager/azure-resourcemanager/src/test/java/com/azure/resourcemanager/TestSql.java @@ -14,7 +14,7 @@ public class TestSql extends TestTemplate { @Override public SqlServer createResource(SqlServers resources) throws Exception { - final String sqlServerName = resources.manager().sdkContext().randomResourceName("sql", 10); + final String sqlServerName = resources.manager().resourceManager().sdkContext().randomResourceName("sql", 10); final SqlServer[] sqlServers = new SqlServer[1]; final SettableFuture future = SettableFuture.create(); Mono resourceStream = diff --git a/sdk/resourcemanager/azure-resourcemanager/src/test/java/com/azure/resourcemanager/TestTrafficManager.java b/sdk/resourcemanager/azure-resourcemanager/src/test/java/com/azure/resourcemanager/TestTrafficManager.java index c3b89a82213c5..d0d923bebc7fc 100644 --- a/sdk/resourcemanager/azure-resourcemanager/src/test/java/com/azure/resourcemanager/TestTrafficManager.java +++ b/sdk/resourcemanager/azure-resourcemanager/src/test/java/com/azure/resourcemanager/TestTrafficManager.java @@ -40,15 +40,15 @@ public TestTrafficManager(PublicIpAddresses publicIpAddresses) { @Override public TrafficManagerProfile createResource(TrafficManagerProfiles profiles) throws Exception { final Region region = Region.US_EAST; - final String groupName = profiles.manager().sdkContext().randomResourceName("rg", 10); + final String groupName = profiles.manager().resourceManager().sdkContext().randomResourceName("rg", 10); - final String pipName = profiles.manager().sdkContext().randomResourceName("pip", 10); - final String pipDnsLabel = profiles.manager().sdkContext().randomResourceName("contoso", 15); + final String pipName = profiles.manager().resourceManager().sdkContext().randomResourceName("pip", 10); + final String pipDnsLabel = profiles.manager().resourceManager().sdkContext().randomResourceName("contoso", 15); - final String tmProfileName = profiles.manager().sdkContext().randomResourceName("tm", 10); + final String tmProfileName = profiles.manager().resourceManager().sdkContext().randomResourceName("tm", 10); final String nestedTmProfileName = "nested" + tmProfileName; - final String tmProfileDnsLabel = profiles.manager().sdkContext().randomResourceName("tmdns", 10); + final String tmProfileDnsLabel = profiles.manager().resourceManager().sdkContext().randomResourceName("tmdns", 10); final String nestedTmProfileDnsLabel = "nested" + tmProfileDnsLabel; ResourceGroup.DefinitionStages.WithCreate rgCreatable = diff --git a/sdk/resourcemanager/azure-resourcemanager/src/test/java/com/azure/resourcemanager/TestVirtualMachine.java b/sdk/resourcemanager/azure-resourcemanager/src/test/java/com/azure/resourcemanager/TestVirtualMachine.java index 275c3304ceabe..7f3fb3755a103 100644 --- a/sdk/resourcemanager/azure-resourcemanager/src/test/java/com/azure/resourcemanager/TestVirtualMachine.java +++ b/sdk/resourcemanager/azure-resourcemanager/src/test/java/com/azure/resourcemanager/TestVirtualMachine.java @@ -18,7 +18,7 @@ public class TestVirtualMachine extends TestTemplate { @Override public VirtualMachine createResource(VirtualMachines virtualMachines) throws Exception { - final String vmName = virtualMachines.manager().sdkContext().randomResourceName("vm", 10); + final String vmName = virtualMachines.manager().resourceManager().sdkContext().randomResourceName("vm", 10); final VirtualMachine[] vms = new VirtualMachine[1]; final SettableFuture future = SettableFuture.create(); diff --git a/sdk/resourcemanager/azure-resourcemanager/src/test/java/com/azure/resourcemanager/TestVirtualMachineCustomData.java b/sdk/resourcemanager/azure-resourcemanager/src/test/java/com/azure/resourcemanager/TestVirtualMachineCustomData.java index 692c624a7e678..8811307748a75 100644 --- a/sdk/resourcemanager/azure-resourcemanager/src/test/java/com/azure/resourcemanager/TestVirtualMachineCustomData.java +++ b/sdk/resourcemanager/azure-resourcemanager/src/test/java/com/azure/resourcemanager/TestVirtualMachineCustomData.java @@ -29,8 +29,8 @@ public TestVirtualMachineCustomData(PublicIpAddresses pips) { @Override public VirtualMachine createResource(VirtualMachines virtualMachines) throws Exception { - final String vmName = virtualMachines.manager().sdkContext().randomResourceName("vm", 10); - final String publicIpDnsLabel = virtualMachines.manager().sdkContext().randomResourceName("abc", 16); + final String vmName = virtualMachines.manager().resourceManager().sdkContext().randomResourceName("vm", 10); + final String publicIpDnsLabel = virtualMachines.manager().resourceManager().sdkContext().randomResourceName("abc", 16); // Prepare the custom data // diff --git a/sdk/resourcemanager/azure-resourcemanager/src/test/java/com/azure/resourcemanager/TestVirtualMachineDataDisk.java b/sdk/resourcemanager/azure-resourcemanager/src/test/java/com/azure/resourcemanager/TestVirtualMachineDataDisk.java index f9132fe4673e7..d24fa9ea97e56 100644 --- a/sdk/resourcemanager/azure-resourcemanager/src/test/java/com/azure/resourcemanager/TestVirtualMachineDataDisk.java +++ b/sdk/resourcemanager/azure-resourcemanager/src/test/java/com/azure/resourcemanager/TestVirtualMachineDataDisk.java @@ -15,7 +15,7 @@ public class TestVirtualMachineDataDisk extends TestTemplate { @Override public VirtualMachine createResource(VirtualMachines virtualMachines) throws Exception { - final String vmName = virtualMachines.manager().sdkContext().randomResourceName("vm", 10); + final String vmName = virtualMachines.manager().resourceManager().sdkContext().randomResourceName("vm", 10); VirtualMachine virtualMachine = virtualMachines .define(vmName) diff --git a/sdk/resourcemanager/azure-resourcemanager/src/test/java/com/azure/resourcemanager/TestVirtualMachineInAvailabilitySet.java b/sdk/resourcemanager/azure-resourcemanager/src/test/java/com/azure/resourcemanager/TestVirtualMachineInAvailabilitySet.java index ce0530fcb5d4a..2e6bbbd30708a 100644 --- a/sdk/resourcemanager/azure-resourcemanager/src/test/java/com/azure/resourcemanager/TestVirtualMachineInAvailabilitySet.java +++ b/sdk/resourcemanager/azure-resourcemanager/src/test/java/com/azure/resourcemanager/TestVirtualMachineInAvailabilitySet.java @@ -13,9 +13,9 @@ public class TestVirtualMachineInAvailabilitySet extends TestTemplate { @Override public VirtualMachine createResource(VirtualMachines virtualMachines) throws Exception { - final String vmName = virtualMachines.manager().sdkContext().randomResourceName("vm", 10); - final String newRgName = virtualMachines.manager().sdkContext().randomResourceName("rgVmInAvail", 10); - final String newAvailSetName = virtualMachines.manager().sdkContext().randomResourceName("avai", 10); + final String vmName = virtualMachines.manager().resourceManager().sdkContext().randomResourceName("vm", 10); + final String newRgName = virtualMachines.manager().resourceManager().sdkContext().randomResourceName("rgVmInAvail", 10); + final String newAvailSetName = virtualMachines.manager().resourceManager().sdkContext().randomResourceName("avai", 10); VirtualMachine vm = virtualMachines diff --git a/sdk/resourcemanager/azure-resourcemanager/src/test/java/com/azure/resourcemanager/TestVirtualMachineNics.java b/sdk/resourcemanager/azure-resourcemanager/src/test/java/com/azure/resourcemanager/TestVirtualMachineNics.java index 4c6ad9f1d4faa..352e361596462 100644 --- a/sdk/resourcemanager/azure-resourcemanager/src/test/java/com/azure/resourcemanager/TestVirtualMachineNics.java +++ b/sdk/resourcemanager/azure-resourcemanager/src/test/java/com/azure/resourcemanager/TestVirtualMachineNics.java @@ -27,13 +27,13 @@ public TestVirtualMachineNics(NetworkManager networkManager) { @Override public VirtualMachine createResource(VirtualMachines virtualMachines) throws Exception { // Prepare the resource group definition - final String rgName = virtualMachines.manager().sdkContext().randomResourceName("rg", 10); + final String rgName = virtualMachines.manager().resourceManager().sdkContext().randomResourceName("rg", 10); Creatable resourceGroupCreatable = virtualMachines.manager().resourceManager().resourceGroups().define(rgName).withRegion(Region.US_EAST); // Prepare the virtual network definition [shared by primary and secondary network interfaces] - final String vnetName = virtualMachines.manager().sdkContext().randomResourceName("vnet", 10); + final String vnetName = virtualMachines.manager().resourceManager().sdkContext().randomResourceName("vnet", 10); Creatable networkCreatable = this @@ -45,7 +45,7 @@ public VirtualMachine createResource(VirtualMachines virtualMachines) throws Exc .withAddressSpace("10.0.0.0/28"); // Prepare the secondary network interface definition - secondaryNicName = virtualMachines.manager().sdkContext().randomResourceName("nic", 10); + secondaryNicName = virtualMachines.manager().resourceManager().sdkContext().randomResourceName("nic", 10); Creatable secondaryNetworkInterfaceCreatable = this @@ -60,7 +60,7 @@ public VirtualMachine createResource(VirtualMachines virtualMachines) throws Exc // [Secondary NIC cannot have PublicIP - Only primary network interface can reference a public IP address] // Prepare the secondary network interface definition - final String secondaryNicName2 = virtualMachines.manager().sdkContext().randomResourceName("nic2", 10); + final String secondaryNicName2 = virtualMachines.manager().resourceManager().sdkContext().randomResourceName("nic2", 10); Creatable secondaryNetworkInterfaceCreatable2 = this @@ -73,7 +73,7 @@ public VirtualMachine createResource(VirtualMachines virtualMachines) throws Exc .withPrimaryPrivateIPAddressStatic("10.0.0.6"); // Create Virtual Machine - final String vmName = virtualMachines.manager().sdkContext().randomResourceName("vm", 10); + final String vmName = virtualMachines.manager().resourceManager().sdkContext().randomResourceName("vm", 10); final String primaryPipName = "pip" + vmName; VirtualMachine virtualMachine = diff --git a/sdk/resourcemanager/azure-resourcemanager/src/test/java/com/azure/resourcemanager/TestVirtualMachineSizes.java b/sdk/resourcemanager/azure-resourcemanager/src/test/java/com/azure/resourcemanager/TestVirtualMachineSizes.java index 457762cc5d0e2..825883f26a3a1 100644 --- a/sdk/resourcemanager/azure-resourcemanager/src/test/java/com/azure/resourcemanager/TestVirtualMachineSizes.java +++ b/sdk/resourcemanager/azure-resourcemanager/src/test/java/com/azure/resourcemanager/TestVirtualMachineSizes.java @@ -19,7 +19,7 @@ public VirtualMachine createResource(VirtualMachines virtualMachines) throws Exc Assertions.assertTrue(TestUtilities.getSize(availableSizes) > 0); VirtualMachineSize availableSize = availableSizes.iterator().next(); System.out.println("VM Sizes: " + availableSizes); - final String vmName = virtualMachines.manager().sdkContext().randomResourceName("vm", 10); + final String vmName = virtualMachines.manager().resourceManager().sdkContext().randomResourceName("vm", 10); VirtualMachine vm = virtualMachines .define(vmName) diff --git a/sdk/resourcemanager/azure-resourcemanager/src/test/java/com/azure/resourcemanager/TestVirtualMachineSsh.java b/sdk/resourcemanager/azure-resourcemanager/src/test/java/com/azure/resourcemanager/TestVirtualMachineSsh.java index 40746ec5f8fc1..6d848d38b6d6b 100644 --- a/sdk/resourcemanager/azure-resourcemanager/src/test/java/com/azure/resourcemanager/TestVirtualMachineSsh.java +++ b/sdk/resourcemanager/azure-resourcemanager/src/test/java/com/azure/resourcemanager/TestVirtualMachineSsh.java @@ -23,7 +23,7 @@ public TestVirtualMachineSsh(PublicIpAddresses pips) { @Override public VirtualMachine createResource(VirtualMachines virtualMachines) throws Exception { - final String vmName = virtualMachines.manager().sdkContext().randomResourceName("vm", 10); + final String vmName = virtualMachines.manager().resourceManager().sdkContext().randomResourceName("vm", 10); final String sshKey = "ssh-rsa" diff --git a/sdk/resourcemanager/azure-resourcemanager/src/test/java/com/azure/resourcemanager/TestVirtualMachineSyncPoller.java b/sdk/resourcemanager/azure-resourcemanager/src/test/java/com/azure/resourcemanager/TestVirtualMachineSyncPoller.java index e2992d124cfb9..4b6757ed19a01 100644 --- a/sdk/resourcemanager/azure-resourcemanager/src/test/java/com/azure/resourcemanager/TestVirtualMachineSyncPoller.java +++ b/sdk/resourcemanager/azure-resourcemanager/src/test/java/com/azure/resourcemanager/TestVirtualMachineSyncPoller.java @@ -38,13 +38,13 @@ public TestVirtualMachineSyncPoller(NetworkManager networkManager) { @Override public VirtualMachine createResource(VirtualMachines virtualMachines) throws Exception { - final String rgName = virtualMachines.manager().sdkContext().randomResourceName("rg", 10); - final String vnetName = virtualMachines.manager().sdkContext().randomResourceName("vnet", 10); - final String nicName = virtualMachines.manager().sdkContext().randomResourceName("nic", 10); + final String rgName = virtualMachines.manager().resourceManager().sdkContext().randomResourceName("rg", 10); + final String vnetName = virtualMachines.manager().resourceManager().sdkContext().randomResourceName("vnet", 10); + final String nicName = virtualMachines.manager().resourceManager().sdkContext().randomResourceName("nic", 10); final String subnetName = "default"; - final String diskName = virtualMachines.manager().sdkContext().randomResourceName("disk", 10); - final String ipName = virtualMachines.manager().sdkContext().randomResourceName("ip", 10); - final String vmName = virtualMachines.manager().sdkContext().randomResourceName("vm", 10); + final String diskName = virtualMachines.manager().resourceManager().sdkContext().randomResourceName("disk", 10); + final String ipName = virtualMachines.manager().resourceManager().sdkContext().randomResourceName("ip", 10); + final String vmName = virtualMachines.manager().resourceManager().sdkContext().randomResourceName("vm", 10); final Region region = Region.US_EAST; // network diff --git a/sdk/resourcemanager/azure-resourcemanager/src/test/java/com/azure/resourcemanager/TestVirtualNetworkGateway.java b/sdk/resourcemanager/azure-resourcemanager/src/test/java/com/azure/resourcemanager/TestVirtualNetworkGateway.java index 1e3619b37142d..0df8bb35b1d78 100644 --- a/sdk/resourcemanager/azure-resourcemanager/src/test/java/com/azure/resourcemanager/TestVirtualNetworkGateway.java +++ b/sdk/resourcemanager/azure-resourcemanager/src/test/java/com/azure/resourcemanager/TestVirtualNetworkGateway.java @@ -48,7 +48,7 @@ private void initializeResourceNames(SdkContext sdkContext) { public class Basic extends TestTemplate { public Basic(NetworkManager networkManager) { - initializeResourceNames(networkManager.sdkContext()); + initializeResourceNames(networkManager.resourceManager().sdkContext()); } @Override @@ -96,7 +96,7 @@ public VirtualNetworkGateway updateResource(VirtualNetworkGateway resource) thro /** Test Site-To-Site Virtual Network Gateway Connection. */ public class SiteToSite extends TestTemplate { public SiteToSite(NetworkManager networkManager) { - initializeResourceNames(networkManager.sdkContext()); + initializeResourceNames(networkManager.resourceManager().sdkContext()); } @Override @@ -108,7 +108,7 @@ public void print(VirtualNetworkGateway resource) { public VirtualNetworkGateway createResource(VirtualNetworkGateways gateways) throws Exception { // Create virtual network gateway - initializeResourceNames(gateways.manager().sdkContext()); + initializeResourceNames(gateways.manager().resourceManager().sdkContext()); VirtualNetworkGateway vngw = gateways .define(gatewayName1) @@ -185,7 +185,7 @@ public VirtualNetworkGateway updateResource(VirtualNetworkGateway resource) thro public class VNetToVNet extends TestTemplate { public VNetToVNet(NetworkManager networkManager) { - initializeResourceNames(networkManager.sdkContext()); + initializeResourceNames(networkManager.resourceManager().sdkContext()); } @Override @@ -267,7 +267,7 @@ public VirtualNetworkGateway updateResource(VirtualNetworkGateway resource) thro public class PointToSite extends TestTemplate { public PointToSite(NetworkManager networkManager) { - initializeResourceNames(networkManager.sdkContext()); + initializeResourceNames(networkManager.resourceManager().sdkContext()); } @Override @@ -279,7 +279,7 @@ public void print(VirtualNetworkGateway resource) { public VirtualNetworkGateway createResource(final VirtualNetworkGateways gateways) throws Exception { // Create virtual network gateway - initializeResourceNames(gateways.manager().sdkContext()); + initializeResourceNames(gateways.manager().resourceManager().sdkContext()); Network network = gateways diff --git a/sdk/resourcemanager/azure-resourcemanager/src/test/java/com/azure/resourcemanager/VirtualNetworkGatewayTests.java b/sdk/resourcemanager/azure-resourcemanager/src/test/java/com/azure/resourcemanager/VirtualNetworkGatewayTests.java index ea36d6393790b..6fc88c7c35aeb 100644 --- a/sdk/resourcemanager/azure-resourcemanager/src/test/java/com/azure/resourcemanager/VirtualNetworkGatewayTests.java +++ b/sdk/resourcemanager/azure-resourcemanager/src/test/java/com/azure/resourcemanager/VirtualNetworkGatewayTests.java @@ -56,8 +56,9 @@ protected void initializeClients(HttpPipeline httpPipeline, AzureProfile profile SdkContext sdkContext = new SdkContext(); sdkContext.setIdentifierFunction(name -> new TestIdentifierProvider(testResourceNamer)); AzureResourceManager.Authenticated azureAuthed = - AzureResourceManager.authenticate(httpPipeline, profile).withSdkContext(sdkContext); + AzureResourceManager.authenticate(httpPipeline, profile); azureResourceManager = azureAuthed.withDefaultSubscription(); + setSdkContext(sdkContext, azureResourceManager); } @Override