Skip to content

mgmt update azure profile #11424

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
xseeseesee merged 2 commits into from
May 27, 2020
Merged

mgmt update azure profile #11424

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8f7ec06
update AzureProfile
xseeseesee May 26, 2020
851fb13
update samples for profile change
xseeseesee May 26, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 16 additions & 9 deletions sdk/management/azure/src/main/java/com/azure/management/Azure.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@

import com.azure.core.credential.TokenCredential;
import com.azure.core.http.HttpPipeline;
import com.azure.core.management.AzureEnvironment;
import com.azure.management.appservice.AppServiceCertificateOrders;
import com.azure.management.appservice.AppServiceCertificates;
import com.azure.management.appservice.AppServiceDomains;
Expand Down Expand Up @@ -96,6 +97,8 @@
import com.azure.management.storage.Usages;
import com.azure.management.storage.implementation.StorageManager;

import java.util.Objects;

/** The entry point for accessing resource management APIs in Azure. */
public final class Azure {
private final ResourceManager resourceManager;
Expand Down Expand Up @@ -243,22 +246,26 @@ public interface Authenticated extends AccessManagement {
/** The implementation for the Authenticated interface. */
private static final class AuthenticatedImpl implements Authenticated {
private final HttpPipeline httpPipeline;
private final AzureProfile profile;
private final ResourceManager.Authenticated resourceManagerAuthenticated;
private final GraphRbacManager graphRbacManager;
private SdkContext sdkContext;
private String tenantId;
private String subscriptionId;
private final AzureEnvironment environment;

private AuthenticatedImpl(HttpPipeline httpPipeline, AzureProfile profile) {
this.resourceManagerAuthenticated = ResourceManager.authenticate(httpPipeline, profile);
this.graphRbacManager = GraphRbacManager.authenticate(httpPipeline, profile);
this.httpPipeline = httpPipeline;
this.profile = profile;
this.tenantId = profile.tenantId();
this.subscriptionId = profile.subscriptionId();
this.environment = profile.environment();
this.sdkContext = new SdkContext();
}

@Override
public String tenantId() {
return profile.tenantId();
return this.tenantId;
}

@Override
Expand Down Expand Up @@ -314,22 +321,22 @@ public SdkContext sdkContext() {

@Override
public Authenticated withTenantId(String tenantId) {
profile.withTenantId(tenantId);
Objects.requireNonNull(tenantId);
this.tenantId = tenantId;
return this;
}

@Override
public Azure withSubscription(String subscriptionId) {
profile.withSubscriptionId(subscriptionId);
return new Azure(httpPipeline, profile, this);
return new Azure(httpPipeline, new AzureProfile(tenantId, subscriptionId, environment), this);
}

@Override
public Azure withDefaultSubscription() {
if (profile.subscriptionId() == null) {
profile.withSubscriptionId(Utils.defaultSubscription(this.subscriptions().list()));
if (subscriptionId == null) {
subscriptionId = Utils.defaultSubscription(this.subscriptions().list());
}
return new Azure(httpPipeline, profile, this);
return new Azure(httpPipeline, new AzureProfile(tenantId, subscriptionId, environment), this);
}
}

Expand Down
2 changes: 1 addition & 1 deletion ...samples/src/main/java/com/azure/management/appservice/samples/ManageFunctionAppBasic.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,7 @@ public static void main(String[] args) {
//=============================================================
// Authenticate

final AzureProfile profile = new AzureProfile(AzureEnvironment.AZURE, true);
final AzureProfile profile = new AzureProfile(AzureEnvironment.AZURE);
final TokenCredential credential = new DefaultAzureCredentialBuilder()
.authorityHost(profile.environment().getActiveDirectoryEndpoint())
.build();
Expand Down
2 changes: 1 addition & 1 deletion .../samples/src/main/java/com/azure/management/appservice/samples/ManageFunctionAppLogs.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,7 @@ public static void main(String[] args) {
//=============================================================
// Authenticate

final AzureProfile profile = new AzureProfile(AzureEnvironment.AZURE, true);
final AzureProfile profile = new AzureProfile(AzureEnvironment.AZURE);
final TokenCredential credential = new DefaultAzureCredentialBuilder()
.authorityHost(profile.environment().getActiveDirectoryEndpoint())
.build();
Expand Down
2 changes: 1 addition & 1 deletion ...src/main/java/com/azure/management/appservice/samples/ManageFunctionAppSourceControl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -269,7 +269,7 @@ public static void main(String[] args) {
//=============================================================
// Authenticate

final AzureProfile profile = new AzureProfile(AzureEnvironment.AZURE, true);
final AzureProfile profile = new AzureProfile(AzureEnvironment.AZURE);
final TokenCredential credential = new DefaultAzureCredentialBuilder()
.authorityHost(profile.environment().getActiveDirectoryEndpoint())
.build();
Expand Down
2 changes: 1 addition & 1 deletion ...ain/java/com/azure/management/appservice/samples/ManageFunctionAppWithAuthentication.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -219,7 +219,7 @@ public static void main(String[] args) {
//=============================================================
// Authenticate

final AzureProfile profile = new AzureProfile(AzureEnvironment.AZURE, true);
final AzureProfile profile = new AzureProfile(AzureEnvironment.AZURE);
final TokenCredential credential = new DefaultAzureCredentialBuilder()
.authorityHost(profile.environment().getActiveDirectoryEndpoint())
.build();
Expand Down
2 changes: 1 addition & 1 deletion ...src/main/java/com/azure/management/appservice/samples/ManageFunctionAppWithDomainSsl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -187,7 +187,7 @@ public static void main(String[] args) {
//=============================================================
// Authenticate

final AzureProfile profile = new AzureProfile(AzureEnvironment.AZURE, true);
final AzureProfile profile = new AzureProfile(AzureEnvironment.AZURE);
final TokenCredential credential = new DefaultAzureCredentialBuilder()
.authorityHost(profile.environment().getActiveDirectoryEndpoint())
.build();
Expand Down
2 changes: 1 addition & 1 deletion ...ain/java/com/azure/management/appservice/samples/ManageLinuxFunctionAppSourceControl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@ public static void main(String[] args) {
//=============================================================
// Authenticate

final AzureProfile profile = new AzureProfile(AzureEnvironment.AZURE, true);
final AzureProfile profile = new AzureProfile(AzureEnvironment.AZURE);
final TokenCredential credential = new DefaultAzureCredentialBuilder()
.authorityHost(profile.environment().getActiveDirectoryEndpoint())
.build();
Expand Down
2 changes: 1 addition & 1 deletion ...samples/src/main/java/com/azure/management/appservice/samples/ManageLinuxWebAppBasic.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,7 +172,7 @@ public static void main(String[] args) {
//=============================================================
// Authenticate

final AzureProfile profile = new AzureProfile(AzureEnvironment.AZURE, true);
final AzureProfile profile = new AzureProfile(AzureEnvironment.AZURE);
final TokenCredential credential = new DefaultAzureCredentialBuilder()
.authorityHost(profile.environment().getActiveDirectoryEndpoint())
.build();
Expand Down
2 changes: 1 addition & 1 deletion ...src/main/java/com/azure/management/appservice/samples/ManageLinuxWebAppCosmosDbByMsi.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -194,7 +194,7 @@ public static void main(String[] args) {
//=============================================================
// Authenticate

final AzureProfile profile = new AzureProfile(AzureEnvironment.AZURE, true);
final AzureProfile profile = new AzureProfile(AzureEnvironment.AZURE);
final TokenCredential credential = new DefaultAzureCredentialBuilder()
.authorityHost(profile.environment().getActiveDirectoryEndpoint())
.build();
Expand Down
2 changes: 1 addition & 1 deletion ...src/main/java/com/azure/management/appservice/samples/ManageLinuxWebAppSourceControl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -210,7 +210,7 @@ public static void main(String[] args) {
//=============================================================
// Authenticate

final AzureProfile profile = new AzureProfile(AzureEnvironment.AZURE, true);
final AzureProfile profile = new AzureProfile(AzureEnvironment.AZURE);
final TokenCredential credential = new DefaultAzureCredentialBuilder()
.authorityHost(profile.environment().getActiveDirectoryEndpoint())
.build();
Expand Down
2 changes: 1 addition & 1 deletion ...src/main/java/com/azure/management/appservice/samples/ManageLinuxWebAppSqlConnection.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@ public static void main(String[] args) {
//=============================================================
// Authenticate

final AzureProfile profile = new AzureProfile(AzureEnvironment.AZURE, true);
final AzureProfile profile = new AzureProfile(AzureEnvironment.AZURE);
final TokenCredential credential = new DefaultAzureCredentialBuilder()
.authorityHost(profile.environment().getActiveDirectoryEndpoint())
.build();
Expand Down
2 changes: 1 addition & 1 deletion ...va/com/azure/management/appservice/samples/ManageLinuxWebAppStorageAccountConnection.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@ public static void main(String[] args) {
//=============================================================
// Authenticate

final AzureProfile profile = new AzureProfile(AzureEnvironment.AZURE, true);
final AzureProfile profile = new AzureProfile(AzureEnvironment.AZURE);
final TokenCredential credential = new DefaultAzureCredentialBuilder()
.authorityHost(profile.environment().getActiveDirectoryEndpoint())
.build();
Expand Down
2 changes: 1 addition & 1 deletion .../java/com/azure/management/appservice/samples/ManageLinuxWebAppWithContainerRegistry.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -182,7 +182,7 @@ public static void main(String[] args) {
//=============================================================
// Authenticate

final AzureProfile profile = new AzureProfile(AzureEnvironment.AZURE, true);
final AzureProfile profile = new AzureProfile(AzureEnvironment.AZURE);
final TokenCredential credential = new DefaultAzureCredentialBuilder()
.authorityHost(profile.environment().getActiveDirectoryEndpoint())
.build();
Expand Down
2 changes: 1 addition & 1 deletion ...src/main/java/com/azure/management/appservice/samples/ManageLinuxWebAppWithDomainSsl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -194,7 +194,7 @@ public static void main(String[] args) {
//=============================================================
// Authenticate

final AzureProfile profile = new AzureProfile(AzureEnvironment.AZURE, true);
final AzureProfile profile = new AzureProfile(AzureEnvironment.AZURE);
final TokenCredential credential = new DefaultAzureCredentialBuilder()
.authorityHost(profile.environment().getActiveDirectoryEndpoint())
.build();
Expand Down
2 changes: 1 addition & 1 deletion ...ment/samples/src/main/java/com/azure/management/appservice/samples/ManageWebAppBasic.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,7 @@ public static void main(String[] args) {
//=============================================================
// Authenticate

final AzureProfile profile = new AzureProfile(AzureEnvironment.AZURE, true);
final AzureProfile profile = new AzureProfile(AzureEnvironment.AZURE);
final TokenCredential credential = new DefaultAzureCredentialBuilder()
.authorityHost(profile.environment().getActiveDirectoryEndpoint())
.build();
Expand Down
2 changes: 1 addition & 1 deletion ...ples/src/main/java/com/azure/management/appservice/samples/ManageWebAppCosmosDbByMsi.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,7 +172,7 @@ public static void main(String[] args) {
//=============================================================
// Authenticate

final AzureProfile profile = new AzureProfile(AzureEnvironment.AZURE, true);
final AzureProfile profile = new AzureProfile(AzureEnvironment.AZURE);
final TokenCredential credential = new DefaultAzureCredentialBuilder()
.authorityHost(profile.environment().getActiveDirectoryEndpoint())
.build();
Expand Down
2 changes: 1 addition & 1 deletion ...ain/java/com/azure/management/appservice/samples/ManageWebAppCosmosDbThroughKeyVault.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,7 @@ public static void main(String[] args) {
//=============================================================
// Authenticate

final AzureProfile profile = new AzureProfile(AzureEnvironment.AZURE, true);
final AzureProfile profile = new AzureProfile(AzureEnvironment.AZURE);
final TokenCredential credential = new DefaultAzureCredentialBuilder()
.authorityHost(profile.environment().getActiveDirectoryEndpoint())
.build();
Expand Down
2 changes: 1 addition & 1 deletion ...ement/samples/src/main/java/com/azure/management/appservice/samples/ManageWebAppLogs.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -179,7 +179,7 @@ public static void main(String[] args) {
//=============================================================
// Authenticate

final AzureProfile profile = new AzureProfile(AzureEnvironment.AZURE, true);
final AzureProfile profile = new AzureProfile(AzureEnvironment.AZURE);
final TokenCredential credential = new DefaultAzureCredentialBuilder()
.authorityHost(profile.environment().getActiveDirectoryEndpoint())
.build();
Expand Down
2 changes: 1 addition & 1 deletion ...ment/samples/src/main/java/com/azure/management/appservice/samples/ManageWebAppSlots.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ public static void main(String[] args) {
//=============================================================
// Authenticate

final AzureProfile profile = new AzureProfile(AzureEnvironment.AZURE, true);
final AzureProfile profile = new AzureProfile(AzureEnvironment.AZURE);
final TokenCredential credential = new DefaultAzureCredentialBuilder()
.authorityHost(profile.environment().getActiveDirectoryEndpoint())
.build();
Expand Down
2 changes: 1 addition & 1 deletion ...ples/src/main/java/com/azure/management/appservice/samples/ManageWebAppSourceControl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -344,7 +344,7 @@ public static void main(String[] args) {
//=============================================================
// Authenticate

final AzureProfile profile = new AzureProfile(AzureEnvironment.AZURE, true);
final AzureProfile profile = new AzureProfile(AzureEnvironment.AZURE);
final TokenCredential credential = new DefaultAzureCredentialBuilder()
.authorityHost(profile.environment().getActiveDirectoryEndpoint())
.build();
Expand Down
2 changes: 1 addition & 1 deletion ...src/main/java/com/azure/management/appservice/samples/ManageWebAppSourceControlAsync.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -211,7 +211,7 @@ public static void main(String[] args) {
//=============================================================
// Authenticate

final AzureProfile profile = new AzureProfile(AzureEnvironment.AZURE, true);
final AzureProfile profile = new AzureProfile(AzureEnvironment.AZURE);
final TokenCredential credential = new DefaultAzureCredentialBuilder()
.authorityHost(profile.environment().getActiveDirectoryEndpoint())
.build();
Expand Down
2 changes: 1 addition & 1 deletion ...ples/src/main/java/com/azure/management/appservice/samples/ManageWebAppSqlConnection.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@ public static void main(String[] args) {
//=============================================================
// Authenticate

final AzureProfile profile = new AzureProfile(AzureEnvironment.AZURE, true);
final AzureProfile profile = new AzureProfile(AzureEnvironment.AZURE);
final TokenCredential credential = new DefaultAzureCredentialBuilder()
.authorityHost(profile.environment().getActiveDirectoryEndpoint())
.build();
Expand Down
2 changes: 1 addition & 1 deletion ...in/java/com/azure/management/appservice/samples/ManageWebAppStorageAccountConnection.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,7 @@ public static void main(String[] args) {
//=============================================================
// Authenticate

final AzureProfile profile = new AzureProfile(AzureEnvironment.AZURE, true);
final AzureProfile profile = new AzureProfile(AzureEnvironment.AZURE);
final TokenCredential credential = new DefaultAzureCredentialBuilder()
.authorityHost(profile.environment().getActiveDirectoryEndpoint())
.build();
Expand Down
2 changes: 1 addition & 1 deletion ...src/main/java/com/azure/management/appservice/samples/ManageWebAppWithAuthentication.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -223,7 +223,7 @@ public static void main(String[] args) {
//=============================================================
// Authenticate

final AzureProfile profile = new AzureProfile(AzureEnvironment.AZURE, true);
final AzureProfile profile = new AzureProfile(AzureEnvironment.AZURE);
final TokenCredential credential = new DefaultAzureCredentialBuilder()
.authorityHost(profile.environment().getActiveDirectoryEndpoint())
.build();
Expand Down
2 changes: 1 addition & 1 deletion ...ples/src/main/java/com/azure/management/appservice/samples/ManageWebAppWithDomainSsl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -190,7 +190,7 @@ public static void main(String[] args) {
//=============================================================
// Authenticate

final AzureProfile profile = new AzureProfile(AzureEnvironment.AZURE, true);
final AzureProfile profile = new AzureProfile(AzureEnvironment.AZURE);
final TokenCredential credential = new DefaultAzureCredentialBuilder()
.authorityHost(profile.environment().getActiveDirectoryEndpoint())
.build();
Expand Down
2 changes: 1 addition & 1 deletion ...c/main/java/com/azure/management/compute/samples/ConvertVirtualMachineToManagedDisks.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ public static void main(String[] args) {
//=============================================================
// Authenticate

final AzureProfile profile = new AzureProfile(AzureEnvironment.AZURE, true);
final AzureProfile profile = new AzureProfile(AzureEnvironment.AZURE);
final TokenCredential credential = new DefaultAzureCredentialBuilder()
.authorityHost(profile.environment().getActiveDirectoryEndpoint())
.build();
Expand Down
2 changes: 1 addition & 1 deletion ...ava/com/azure/management/compute/samples/CreateVirtualMachineUsingCustomImageFromVHD.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -254,7 +254,7 @@ public static void main(String[] args) {
//=============================================================
// Authenticate

final AzureProfile profile = new AzureProfile(AzureEnvironment.AZURE, true);
final AzureProfile profile = new AzureProfile(AzureEnvironment.AZURE);
final TokenCredential credential = new DefaultAzureCredentialBuilder()
.authorityHost(profile.environment().getActiveDirectoryEndpoint())
.build();
Expand Down
2 changes: 1 addition & 1 deletion ...java/com/azure/management/compute/samples/CreateVirtualMachineUsingCustomImageFromVM.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -237,7 +237,7 @@ public static void main(String[] args) {
//=============================================================
// Authenticate

final AzureProfile profile = new AzureProfile(AzureEnvironment.AZURE, true);
final AzureProfile profile = new AzureProfile(AzureEnvironment.AZURE);
final TokenCredential credential = new DefaultAzureCredentialBuilder()
.authorityHost(profile.environment().getActiveDirectoryEndpoint())
.build();
Expand Down
2 changes: 1 addition & 1 deletion ...zure/management/compute/samples/CreateVirtualMachineUsingSpecializedDiskFromSnapshot.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -268,7 +268,7 @@ public static void main(String[] args) {
//=============================================================
// Authenticate

final AzureProfile profile = new AzureProfile(AzureEnvironment.AZURE, true);
final AzureProfile profile = new AzureProfile(AzureEnvironment.AZURE);
final TokenCredential credential = new DefaultAzureCredentialBuilder()
.authorityHost(profile.environment().getActiveDirectoryEndpoint())
.build();
Expand Down
2 changes: 1 addition & 1 deletion ...com/azure/management/compute/samples/CreateVirtualMachineUsingSpecializedDiskFromVhd.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -222,7 +222,7 @@ public static void main(String[] args) {
//=============================================================
// Authenticate

final AzureProfile profile = new AzureProfile(AzureEnvironment.AZURE, true);
final AzureProfile profile = new AzureProfile(AzureEnvironment.AZURE);
final TokenCredential credential = new DefaultAzureCredentialBuilder()
.authorityHost(profile.environment().getActiveDirectoryEndpoint())
.build();
Expand Down
2 changes: 1 addition & 1 deletion .../azure/management/compute/samples/CreateVirtualMachinesAsyncTrackingRelatedResources.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -284,7 +284,7 @@ public static void main(String[] args) {
//=============================================================
// Authenticate
//
final AzureProfile profile = new AzureProfile(AzureEnvironment.AZURE, true);
final AzureProfile profile = new AzureProfile(AzureEnvironment.AZURE);
final TokenCredential credential = new DefaultAzureCredentialBuilder()
.authorityHost(profile.environment().getActiveDirectoryEndpoint())
.build();
Expand Down
2 changes: 1 addition & 1 deletion ...s/src/main/java/com/azure/management/compute/samples/CreateVirtualMachinesInParallel.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -225,7 +225,7 @@ public static void main(String[] args) {
//=============================================================
// Authenticate
//
final AzureProfile profile = new AzureProfile(AzureEnvironment.AZURE, true);
final AzureProfile profile = new AzureProfile(AzureEnvironment.AZURE);
final TokenCredential credential = new DefaultAzureCredentialBuilder()
.authorityHost(profile.environment().getActiveDirectoryEndpoint())
.build();
Expand Down
2 changes: 1 addition & 1 deletion ...ure/management/compute/samples/CreateVirtualMachinesUsingCustomImageOrSpecializedVHD.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -192,7 +192,7 @@ public static void main(String[] args) {
//=============================================================
// Authenticate

final AzureProfile profile = new AzureProfile(AzureEnvironment.AZURE, true);
final AzureProfile profile = new AzureProfile(AzureEnvironment.AZURE);
final TokenCredential credential = new DefaultAzureCredentialBuilder()
.authorityHost(profile.environment().getActiveDirectoryEndpoint())
.build();
Expand Down
Loading