Skip to content

Commit

Permalink
Release azure-resourcemanager 2.0.0
Browse files Browse the repository at this point in the history
  • Loading branch information
@Azure-Fluent
Azure-Fluent committed Oct 26, 2020
1 parent 5d616d0 commit 863877d
Show file tree
Hide file tree
Showing 4 changed files with 1,666 additions and 1,433 deletions.
8 changes: 5 additions & 3 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ extensions:

To run this sample:

Set the environment variable `AZURE_AUTH_LOCATION` with the full path for an auth file. See [how to create an auth file](https://github.com/Azure/azure-libraries-for-java/blob/master/AUTH.md).
See [DefaultAzureCredential](https://github.com/Azure/azure-sdk-for-java/tree/master/sdk/identity/azure-identity#defaultazurecredential) and prepare the authentication works best for you. For more details on authentication, please refer to [AUTH.md](https://github.com/Azure/azure-sdk-for-java/blob/master/sdk/resourcemanager/docs/AUTH.md).

git clone https://github.com/Azure-Samples/app-service-java-manage-web-apps-on-linux-with-custom-domains.git

Expand All @@ -36,9 +36,11 @@ Set the environment variable `AZURE_AUTH_LOCATION` with the full path for an aut

## More information ##

[http://azure.com/java](http://azure.com/java)
For general documentation as well as quickstarts on how to use Azure Management Libraries for Java, please see [here](https://aka.ms/azsdk/java/mgmt).

If you don't have a Microsoft Azure subscription you can get a FREE trial account [here](http://go.microsoft.com/fwlink/?LinkId=330212)
Start to develop applications with Java on Azure [here](http://azure.com/java).

If you don't have a Microsoft Azure subscription you can get a FREE trial account [here](http://go.microsoft.com/fwlink/?LinkId=330212).

---

Expand Down
34 changes: 15 additions & 19 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,15 +15,16 @@
<artifactId>exec-maven-plugin</artifactId>
<version>1.4.0</version>
<configuration>
<mainClass>com.microsoft.azure.management.appservice.samples.ManageLinuxWebAppWithDomainSsl</mainClass>
<mainClass>com.azure.resourcemanager.appservice.samples.ManageLinuxWebAppWithDomainSsl</mainClass>
<cleanupDaemonThreads>false</cleanupDaemonThreads>
</configuration>
</plugin>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.0</version>
<version>3.8.1</version>
<configuration>
<source>1.7</source>
<target>1.7</target>
<source>1.8</source>
<target>1.8</target>
</configuration>
</plugin>
<plugin>
Expand All @@ -40,7 +41,7 @@
</descriptorRefs>
<archive>
<manifest>
<mainClass>com.microsoft.azure.management.appservice.samples.ManageLinuxWebAppWithDomainSsl.java</mainClass>
<mainClass>com.azure.resourcemanager.appservice.samples.ManageLinuxWebAppWithDomainSsl.java</mainClass>
</manifest>
</archive>
</configuration>
Expand All @@ -51,24 +52,19 @@
</build>
<dependencies>
<dependency>
<groupId>com.microsoft.azure</groupId>
<artifactId>azure</artifactId>
<version>1.36.3</version>
<groupId>com.azure.resourcemanager</groupId>
<artifactId>azure-resourcemanager</artifactId>
<version>2.0.0</version>
</dependency>
<dependency>
<groupId>commons-net</groupId>
<artifactId>commons-net</artifactId>
<version>3.3</version>
</dependency>
<dependency>
<groupId>commons-lang</groupId>
<artifactId>commons-lang</artifactId>
<version>2.6</version>
<groupId>com.azure</groupId>
<artifactId>azure-identity</artifactId>
<version>1.1.3</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
<version>3.7</version>
<groupId>commons-net</groupId>
<artifactId>commons-net</artifactId>
<version>3.6</version>
</dependency>
</dependencies>
</project>
113 changes: 51 additions & 62 deletions ...mples/ManageLinuxWebAppWithDomainSsl.java → ...mples/ManageLinuxWebAppWithDomainSsl.java
View file
Original file line number Diff line number Diff line change
@@ -1,28 +1,27 @@
/**
* Copyright (c) Microsoft Corporation. All rights reserved.
* Licensed under the MIT License. See License.txt in the project root for
* license information.
*/

package com.microsoft.azure.management.appservice.samples;

import com.microsoft.azure.management.Azure;
import com.microsoft.azure.management.appservice.AppServiceDomain;
import com.microsoft.azure.management.appservice.AppServicePlan;
import com.microsoft.azure.management.appservice.CustomHostNameDnsRecordType;
import com.microsoft.azure.management.appservice.PricingTier;
import com.microsoft.azure.management.appservice.RuntimeStack;
import com.microsoft.azure.management.appservice.WebApp;
import com.microsoft.azure.management.resources.fluentcore.arm.CountryIsoCode;
import com.microsoft.azure.management.resources.fluentcore.arm.CountryPhoneCode;
import com.microsoft.azure.management.resources.fluentcore.arm.Region;
import com.microsoft.azure.management.resources.fluentcore.utils.SdkContext;
import com.microsoft.azure.management.samples.Utils;
import com.microsoft.rest.LogLevel;
import okhttp3.OkHttpClient;
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT License.

package com.azure.resourcemanager.appservice.samples;

import com.azure.core.credential.TokenCredential;
import com.azure.core.management.AzureEnvironment;
import com.azure.identity.DefaultAzureCredentialBuilder;
import com.azure.resourcemanager.AzureResourceManager;
import com.azure.resourcemanager.appservice.models.AppServiceDomain;
import com.azure.resourcemanager.appservice.models.AppServicePlan;
import com.azure.resourcemanager.appservice.models.CustomHostnameDnsRecordType;
import com.azure.resourcemanager.appservice.models.PricingTier;
import com.azure.resourcemanager.appservice.models.RuntimeStack;
import com.azure.resourcemanager.appservice.models.WebApp;
import com.azure.resourcemanager.resources.fluentcore.arm.CountryIsoCode;
import com.azure.resourcemanager.resources.fluentcore.arm.CountryPhoneCode;
import com.azure.core.management.Region;
import com.azure.core.management.profile.AzureProfile;
import com.azure.resourcemanager.samples.Utils;
import com.azure.core.http.policy.HttpLogDetailLevel;

import java.io.File;
import java.util.concurrent.TimeUnit;
import java.io.IOException;

/**
* Azure App Service sample for managing web apps.
Expand All @@ -36,33 +35,30 @@
*/
public final class ManageLinuxWebAppWithDomainSsl {

private static OkHttpClient httpClient;

/**
* Main function which runs the actual sample.
* @param azure instance of the azure client
* @param azureResourceManager instance of the azure client
* @return true if sample runs successfully
*/
public static boolean runSample(Azure azure) {
public static boolean runSample(AzureResourceManager azureResourceManager) throws IOException {
// New resources
final String app1Name = SdkContext.randomResourceName("webapp1-", 20);
final String app2Name = SdkContext.randomResourceName("webapp2-", 20);
final String rgName = SdkContext.randomResourceName("rgNEMV_", 24);
final String domainName = 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 app1Name = Utils.randomResourceName(azureResourceManager, "webapp1-", 20);
final String app2Name = Utils.randomResourceName(azureResourceManager, "webapp2-", 20);
final String rgName = Utils.randomResourceName(azureResourceManager, "rgNEMV_", 24);
final String domainName = Utils.randomResourceName(azureResourceManager, "jsdkdemo-", 20) + ".com";
final String certPassword = Utils.password();

try {
//============================================================
// Create a web app with a new app service plan

System.out.println("Creating web app " + app1Name + "...");

WebApp app1 = azure.webApps().define(app1Name)
WebApp app1 = azureResourceManager.webApps().define(app1Name)
.withRegion(Region.US_WEST)
.withNewResourceGroup(rgName)
.withNewLinuxPlan(PricingTier.STANDARD_S1)
.withBuiltInImage(RuntimeStack.NODEJS_6_9)
.withBuiltInImage(RuntimeStack.NODEJS_10_LTS)
.create();

System.out.println("Created web app " + app1.name());
Expand All @@ -72,11 +68,11 @@ public static boolean runSample(Azure azure) {
// Create a second web app with the same app service plan

System.out.println("Creating another web app " + app2Name + "...");
AppServicePlan plan = azure.appServices().appServicePlans().getById(app1.appServicePlanId());
WebApp app2 = azure.webApps().define(app2Name)
AppServicePlan plan = azureResourceManager.appServicePlans().getById(app1.appServicePlanId());
WebApp app2 = azureResourceManager.webApps().define(app2Name)
.withExistingLinuxPlan(plan)
.withExistingResourceGroup(rgName)
.withBuiltInImage(RuntimeStack.NODEJS_6_9)
.withBuiltInImage(RuntimeStack.NODEJS_10_LTS)
.create();

System.out.println("Created web app " + app2.name());
Expand All @@ -87,7 +83,7 @@ public static boolean runSample(Azure azure) {

System.out.println("Purchasing a domain " + domainName + "...");

AppServiceDomain domain = azure.appServices().domains().define(domainName)
AppServiceDomain domain = azureResourceManager.appServiceDomains().define(domainName)
.withExistingResourceGroup(rgName)
.defineRegistrantContact()
.withFirstName("Jon")
Expand Down Expand Up @@ -116,7 +112,7 @@ public static boolean runSample(Azure azure) {
.defineHostnameBinding()
.withAzureManagedDomain(domain)
.withSubDomain(app1Name)
.withDnsRecordType(CustomHostNameDnsRecordType.CNAME)
.withDnsRecordType(CustomHostnameDnsRecordType.CNAME)
.attach()
.apply();

Expand All @@ -126,8 +122,8 @@ public static boolean runSample(Azure azure) {
//============================================================
// Create a self-singed SSL certificate

String pfxPath = ManageLinuxWebAppWithDomainSsl.class.getResource("/").getPath() + "webapp_" + ManageLinuxWebAppWithDomainSsl.class.getSimpleName().toLowerCase() + ".pfx";
String cerPath = ManageLinuxWebAppWithDomainSsl.class.getResource("/").getPath() + "webapp_" + ManageLinuxWebAppWithDomainSsl.class.getSimpleName().toLowerCase() + ".cer";
String pfxPath = ManageLinuxWebAppWithDomainSsl.class.getResource("/").getPath() + "webapp_" + domainName + ".pfx";
String cerPath = ManageLinuxWebAppWithDomainSsl.class.getResource("/").getPath() + "webapp_" + domainName + ".cer";

System.out.println("Creating a self-signed certificate " + pfxPath + "...");

Expand Down Expand Up @@ -158,7 +154,7 @@ public static boolean runSample(Azure azure) {
.withManagedHostnameBindings(domain, app2Name)
.defineSslBinding()
.forHostname(app2Name + "." + domainName)
.withExistingCertificate(app1.hostNameSslStates().get(app1Name + "." + domainName).thumbprint())
.withExistingCertificate(app1.hostnameSslStates().get(app1Name + "." + domainName).thumbprint())
.withSniBasedSsl()
.attach()
.apply();
Expand All @@ -167,22 +163,17 @@ public static boolean runSample(Azure azure) {
Utils.print(app2);

return true;
} catch (Exception e) {
System.err.println(e.getMessage());
e.printStackTrace();
} finally {
try {
System.out.println("Deleting Resource Group: " + rgName);
azure.resourceGroups().deleteByName(rgName);
azureResourceManager.resourceGroups().beginDeleteByName(rgName);
System.out.println("Deleted Resource Group: " + rgName);
} catch (NullPointerException npe) {
System.out.println("Did not create any resources in Azure. No clean up is necessary");
} catch (Exception g) {
g.printStackTrace();
}
}

return false;
}
/**
* Main entry point.
Expand All @@ -196,27 +187,25 @@ public static void main(String[] args) {
//=============================================================
// Authenticate

final File credFile = new File(System.getenv("AZURE_AUTH_LOCATION"));
final AzureProfile profile = new AzureProfile(AzureEnvironment.AZURE);
final TokenCredential credential = new DefaultAzureCredentialBuilder()
.authorityHost(profile.getEnvironment().getActiveDirectoryEndpoint())
.build();

Azure azure = Azure.configure()
.withLogLevel(LogLevel.BODY_AND_HEADERS)
.authenticate(credFile)
.withDefaultSubscription();
AzureResourceManager azureResourceManager = AzureResourceManager
.configure()
.withLogLevel(HttpLogDetailLevel.BASIC)
.authenticate(credential, profile)
.withDefaultSubscription();

// Print selected subscription
System.out.println("Selected subscription: " + azure.subscriptionId());
System.out.println("Selected subscription: " + azureResourceManager.subscriptionId());

runSample(azure);
runSample(azureResourceManager);

} catch (Exception e) {
System.out.println(e.getMessage());
e.printStackTrace();
}
}

static {
httpClient = new OkHttpClient.Builder().readTimeout(1, TimeUnit.MINUTES).build();
}


}
Loading

0 comments on commit 863877d

Please sign in to comment.