Skip to content

Commit

Permalink
Mgmt: GA azure, remove non-GA packages (#16499)
Browse files Browse the repository at this point in the history
* Remove non GA package in azure

* update module-info

* remove test

* Remove samples

* GA azure

* update pom version

* update README

* add change log

* add dns
  • Loading branch information
ChenTanyi authored Oct 19, 2020
1 parent 2bbbb75 commit 2756f50
Show file tree
Hide file tree
Showing 73 changed files with 11,892 additions and 12,123 deletions.
2 changes: 1 addition & 1 deletion eng/jacoco-test-coverage/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -275,7 +275,7 @@
<dependency>
<groupId>com.azure.resourcemanager</groupId>
<artifactId>azure-resourcemanager</artifactId>
<version>2.0.0-beta.5</version> <!-- {x-version-update;com.azure.resourcemanager:azure-resourcemanager;current} -->
<version>2.0.0</version> <!-- {x-version-update;com.azure.resourcemanager:azure-resourcemanager;current} -->
</dependency>
<dependency>
<groupId>com.azure.resourcemanager</groupId>
Expand Down
2 changes: 1 addition & 1 deletion eng/versioning/version_client.txt
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ com.azure.spring:azure-spring-cloud-test-eventhubs;1.0.0;1.0.0
com.azure.spring:azure-spring-cloud-test-storage;1.0.0;1.0.0
com.microsoft.azure:spring-cloud-starter-azure-appconfiguration-config-test;1.2.8-beta.1;1.2.8-beta.1
com.azure:opentelemetry-exporters-azuremonitor;1.0.0-beta.1;1.0.0-beta.2
com.azure.resourcemanager:azure-resourcemanager;2.0.0-beta.4;2.0.0-beta.5
com.azure.resourcemanager:azure-resourcemanager;2.0.0-beta.4;2.0.0
com.azure.resourcemanager:azure-resourcemanager-appplatform;2.0.0-beta.4;2.0.0-beta.5
com.azure.resourcemanager:azure-resourcemanager-appservice;2.0.0-beta.4;2.0.0
com.azure.resourcemanager:azure-resourcemanager-authorization;2.0.0-beta.4;2.0.0
Expand Down
2 changes: 1 addition & 1 deletion sdk/resourcemanager/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ If you are an existing user of the older version of Azure management library for
<dependency>
<groupId>com.azure.resourcemanager</groupId>
<artifactId>azure-resourcemanager</artifactId>
<version>2.0.0-beta.5</version>
<version>2.0.0</version>
</dependency>
```
[//]: # ({x-version-update-end})
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ For documentation on how to use this package, please see [Azure Management Libra
<dependency>
<groupId>com.azure.resourcemanager</groupId>
<artifactId>azure-resourcemanager</artifactId>
<version>2.0.0-beta.5</version>
<version>2.0.0</version>
</dependency>
```
[//]: # ({x-version-update-end})
Expand Down
2 changes: 1 addition & 1 deletion sdk/resourcemanager/azure-resourcemanager-samples/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
<dependency>
<groupId>com.azure.resourcemanager</groupId>
<artifactId>azure-resourcemanager</artifactId>
<version>2.0.0-beta.5</version> <!-- {x-version-update;com.azure.resourcemanager:azure-resourcemanager;current} -->
<version>2.0.0</version> <!-- {x-version-update;com.azure.resourcemanager:azure-resourcemanager;current} -->
</dependency>
<dependency>
<groupId>com.azure</groupId>
Expand Down

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
@@ -1,161 +1,161 @@
// 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.PricingTier;
import com.azure.resourcemanager.appservice.models.RuntimeStack;
import com.azure.resourcemanager.appservice.models.WebApp;
import com.azure.core.management.Region;
import com.azure.core.management.profile.AzureProfile;
import com.azure.resourcemanager.samples.Utils;
import com.azure.resourcemanager.sql.models.SqlDatabase;
import com.azure.resourcemanager.sql.models.SqlServer;
import com.azure.core.http.policy.HttpLogDetailLevel;

import java.io.IOException;

/**
* Azure App Service basic sample for managing web apps.
* - Create a SQL database in a new SQL server
* - Create a web app deployed with Project Nami (WordPress's SQL Server variant)
* that contains the app settings to connect to the SQL database
* - Update the SQL server's firewall rules to allow the web app to access
* - Clean up
*/
public final class ManageLinuxWebAppSqlConnection {

/**
* Main function which runs the actual sample.
*
* @param azureResourceManager instance of the azure client
* @return true if sample runs successfully
*/
public static boolean runSample(AzureResourceManager azureResourceManager) throws IOException {
// New resources
final String suffix = ".azurewebsites.net";
final String appName = Utils.randomResourceName(azureResourceManager, "webapp1-", 20);
final String appUrl = appName + suffix;
final String sqlServerName = Utils.randomResourceName(azureResourceManager, "jsdkserver", 20);
final String sqlDbName = Utils.randomResourceName(azureResourceManager, "jsdkdb", 20);
final String admin = "jsdkadmin";
final String password = Utils.password();
final String rgName = Utils.randomResourceName(azureResourceManager, "rg1NEMV_", 24);

try {


//============================================================
// Create a sql server

System.out.println("Creating SQL server " + sqlServerName + "...");

SqlServer server = azureResourceManager.sqlServers().define(sqlServerName)
.withRegion(Region.US_WEST)
.withNewResourceGroup(rgName)
.withAdministratorLogin(admin)
.withAdministratorPassword(password)
.create();

System.out.println("Created SQL server " + server.name());

//============================================================
// Create a sql database for the web app to use

System.out.println("Creating SQL database " + sqlDbName + "...");

SqlDatabase db = server.databases().define(sqlDbName).create();

System.out.println("Created SQL database " + db.name());

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

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

WebApp app = azureResourceManager.webApps().define(appName)
.withRegion(Region.US_WEST)
.withExistingResourceGroup(rgName)
.withNewLinuxPlan(PricingTier.STANDARD_S1)
.withBuiltInImage(RuntimeStack.PHP_7_2)
.defineSourceControl()
.withPublicGitRepository("https://github.com/ProjectNami/projectnami")
.withBranch("master")
.attach()
.withAppSetting("ProjectNami.DBHost", server.fullyQualifiedDomainName())
.withAppSetting("ProjectNami.DBName", db.name())
.withAppSetting("ProjectNami.DBUser", admin)
.withAppSetting("ProjectNami.DBPass", password)
.create();

System.out.println("Created web app " + app.name());
Utils.print(app);

//============================================================
// Allow web app to access the SQL server

System.out.println("Allowing web app " + appName + " to access SQL server...");

SqlServer.Update update = server.update();
for (String ip : app.outboundIPAddresses()) {
update = update.defineFirewallRule("filewallRule1").withIpAddress(ip).attach();
}
server = update.apply();

System.out.println("Firewall rules added for web app " + appName);
Utils.print(server);

System.out.println("Your WordPress app is ready.");
System.out.println("Please navigate to http://" + appUrl + " to finish the GUI setup. Press enter to exit.");
System.in.read();

return true;
} finally {
try {
System.out.println("Deleting Resource Group: " + 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();
}
}
}

/**
* Main entry point.
*
* @param args the parameters
*/
public static void main(String[] args) {
try {

//=============================================================
// Authenticate

final AzureProfile profile = new AzureProfile(AzureEnvironment.AZURE);
final TokenCredential credential = new DefaultAzureCredentialBuilder()
.authorityHost(profile.getEnvironment().getActiveDirectoryEndpoint())
.build();

AzureResourceManager azureResourceManager = AzureResourceManager
.configure()
.withLogLevel(HttpLogDetailLevel.BASIC)
.authenticate(credential, profile)
.withDefaultSubscription();

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

runSample(azureResourceManager);
} catch (Exception e) {
System.out.println(e.getMessage());
e.printStackTrace();
}
}
}
//
//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.PricingTier;
//import com.azure.resourcemanager.appservice.models.RuntimeStack;
//import com.azure.resourcemanager.appservice.models.WebApp;
//import com.azure.core.management.Region;
//import com.azure.core.management.profile.AzureProfile;
//import com.azure.resourcemanager.samples.Utils;
//import com.azure.resourcemanager.sql.models.SqlDatabase;
//import com.azure.resourcemanager.sql.models.SqlServer;
//import com.azure.core.http.policy.HttpLogDetailLevel;
//
//import java.io.IOException;
//
///**
// * Azure App Service basic sample for managing web apps.
// * - Create a SQL database in a new SQL server
// * - Create a web app deployed with Project Nami (WordPress's SQL Server variant)
// * that contains the app settings to connect to the SQL database
// * - Update the SQL server's firewall rules to allow the web app to access
// * - Clean up
// */
//public final class ManageLinuxWebAppSqlConnection {
//
// /**
// * Main function which runs the actual sample.
// *
// * @param azureResourceManager instance of the azure client
// * @return true if sample runs successfully
// */
// public static boolean runSample(AzureResourceManager azureResourceManager) throws IOException {
// // New resources
// final String suffix = ".azurewebsites.net";
// final String appName = Utils.randomResourceName(azureResourceManager, "webapp1-", 20);
// final String appUrl = appName + suffix;
// final String sqlServerName = Utils.randomResourceName(azureResourceManager, "jsdkserver", 20);
// final String sqlDbName = Utils.randomResourceName(azureResourceManager, "jsdkdb", 20);
// final String admin = "jsdkadmin";
// final String password = Utils.password();
// final String rgName = Utils.randomResourceName(azureResourceManager, "rg1NEMV_", 24);
//
// try {
//
//
// //============================================================
// // Create a sql server
//
// System.out.println("Creating SQL server " + sqlServerName + "...");
//
// SqlServer server = azureResourceManager.sqlServers().define(sqlServerName)
// .withRegion(Region.US_WEST)
// .withNewResourceGroup(rgName)
// .withAdministratorLogin(admin)
// .withAdministratorPassword(password)
// .create();
//
// System.out.println("Created SQL server " + server.name());
//
// //============================================================
// // Create a sql database for the web app to use
//
// System.out.println("Creating SQL database " + sqlDbName + "...");
//
// SqlDatabase db = server.databases().define(sqlDbName).create();
//
// System.out.println("Created SQL database " + db.name());
//
// //============================================================
// // Create a web app with a new app service plan
//
// System.out.println("Creating web app " + appName + "...");
//
// WebApp app = azureResourceManager.webApps().define(appName)
// .withRegion(Region.US_WEST)
// .withExistingResourceGroup(rgName)
// .withNewLinuxPlan(PricingTier.STANDARD_S1)
// .withBuiltInImage(RuntimeStack.PHP_7_2)
// .defineSourceControl()
// .withPublicGitRepository("https://github.com/ProjectNami/projectnami")
// .withBranch("master")
// .attach()
// .withAppSetting("ProjectNami.DBHost", server.fullyQualifiedDomainName())
// .withAppSetting("ProjectNami.DBName", db.name())
// .withAppSetting("ProjectNami.DBUser", admin)
// .withAppSetting("ProjectNami.DBPass", password)
// .create();
//
// System.out.println("Created web app " + app.name());
// Utils.print(app);
//
// //============================================================
// // Allow web app to access the SQL server
//
// System.out.println("Allowing web app " + appName + " to access SQL server...");
//
// SqlServer.Update update = server.update();
// for (String ip : app.outboundIPAddresses()) {
// update = update.defineFirewallRule("filewallRule1").withIpAddress(ip).attach();
// }
// server = update.apply();
//
// System.out.println("Firewall rules added for web app " + appName);
// Utils.print(server);
//
// System.out.println("Your WordPress app is ready.");
// System.out.println("Please navigate to http://" + appUrl + " to finish the GUI setup. Press enter to exit.");
// System.in.read();
//
// return true;
// } finally {
// try {
// System.out.println("Deleting Resource Group: " + 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();
// }
// }
// }
//
// /**
// * Main entry point.
// *
// * @param args the parameters
// */
// public static void main(String[] args) {
// try {
//
// //=============================================================
// // Authenticate
//
// final AzureProfile profile = new AzureProfile(AzureEnvironment.AZURE);
// final TokenCredential credential = new DefaultAzureCredentialBuilder()
// .authorityHost(profile.getEnvironment().getActiveDirectoryEndpoint())
// .build();
//
// AzureResourceManager azureResourceManager = AzureResourceManager
// .configure()
// .withLogLevel(HttpLogDetailLevel.BASIC)
// .authenticate(credential, profile)
// .withDefaultSubscription();
//
// // Print selected subscription
// System.out.println("Selected subscription: " + azureResourceManager.subscriptionId());
//
// runSample(azureResourceManager);
// } catch (Exception e) {
// System.out.println(e.getMessage());
// e.printStackTrace();
// }
// }
//}
Loading

0 comments on commit 2756f50

Please sign in to comment.