mgmt appplatform support enterprise tier deployment (Azure#28439)

* support enterprise tier deployment

* source code deployment

remove redundant deployment activation

nit, comments

* deployment config file patterns

* changelog

* session records

* nit, comment

* nit, change config repository uri

* add configuration service binding to customer service

* support cpu and memory in string

* nit

* nit, javadoc and renaming

* new waitforbuild pattern

* add timeout

* add buildId to error log

Author: XiaofeiCao

sdk/resourcemanager/azure-resourcemanager-appplatform/.gitignore

@@ -1,2 +1,3 @@
 /piggymetrics.tar.gz
+/petclinic.tar.gz
 # folder created in unit test

sdk/resourcemanager/azure-resourcemanager-appplatform/CHANGELOG.md

@@ -7,6 +7,7 @@
 - Supported Enterprise Tier `Configuration Service`.
 - Supported Enterprise Tier `Build Service`.
 - Supported Enterprise Tier binding `Spring App` to `Configuration Service`.
+- Supported Enterprise Tier `Spring App Deployment` with `Jar` and `Maven Source Code`.
 
 ### Breaking Changes
 

sdk/resourcemanager/azure-resourcemanager-appplatform/src/main/java/com/azure/resourcemanager/appplatform/implementation/Constants.java

@@ -8,4 +8,5 @@ class Constants {
     public static final String DEFAULT_TANZU_COMPONENT_NAME = "default";
     public static final String APPLICATION_CONFIGURATION_SERVICE_KEY = "applicationConfigurationService";
     public static final String BINDING_RESOURCE_ID = "resourceId";
+    public static final String CONFIG_FILE_PATTERNS_KEY = "configFilePatterns";
 }

sdk/resourcemanager/azure-resourcemanager-appplatform/src/main/java/com/azure/resourcemanager/appplatform/implementation/SpringAppDeploymentImpl.java

@@ -70,6 +70,9 @@ public interface SpringAppDeployment
     /** @return the log file url of the deployment */
     Mono<String> getLogFileUrlAsync();
 
+    /** @return (Enterprise Tier Only) config file patterns */
+    List<String> configFilePatterns();
+
     /**
      * Container interface for all the definitions that need to be implemented.
      * @param <ParentT> the stage of the parent definition to return to after attaching this definition
@@ -97,6 +100,18 @@ interface WithSource<T> {
              */
             T withJarFile(File jar);
 
+            /**
+             * (Enterprise Tier Only)
+             * Specifies the jar package for the deployment.
+             * @param jar the file of the jar
+             * @param configFilePatterns config file patterns to decide which patterns of Application Configuration Service will be used
+             *                           (App has to have a binding to the Configuration Service first in order to read the config files
+             *                           {@link com.azure.resourcemanager.appplatform.models.SpringApp.DefinitionStages.WithConfigurationServiceBinding}),
+             *                           use null or empty list to clear existing configurations
+             * @return the next stage of deployment definition
+             */
+            T withJarFile(File jar, List<String> configFilePatterns);
+
             // Remove compression first due to tar.gz needs extern dependency
             // /**
             //  * Specifies the source code for the deployment.
@@ -112,6 +127,18 @@ interface WithSource<T> {
              */
             WithModule<T> withSourceCodeTarGzFile(File sourceCodeTarGz);
 
+            /**
+             * (Enterprise Tier Only)
+             * Specifies the source code for the deployment.
+             * @param sourceCodeTarGz a tar.gz file of the source code
+             * @param configFilePatterns config file patterns to decide which patterns of Application Configuration Service will be used
+             *                           (App has to have a binding to the Configuration Service first in order to read the config files
+             *                           {@link com.azure.resourcemanager.appplatform.models.SpringApp.DefinitionStages.WithConfigurationServiceBinding}),
+             *                           use null or empty list to clear existing configurations.
+             * @return the next stage of deployment definition
+             */
+            WithModule<T> withSourceCodeTarGzFile(File sourceCodeTarGz, List<String> configFilePatterns);
+
             /**
              * Specifies the a existing source in the cloud storage.
              * @param type the source type in previous upload
@@ -153,13 +180,27 @@ interface WithSettings<T> {
              */
             T withCpu(int cpuCount);
 
+            /**
+             * Specifies the cpu number of the deployment.
+             * @param cpuCount the number of the cpu, 1 core can be represented by 1 or 1000m
+             * @return the next stage of deployment definition
+             */
+            T withCpu(String cpuCount);
+
             /**
              * Specifies the memory of the deployment.
              * @param sizeInGB the size of the memory in GB
              * @return the next stage of deployment definition
              */
             T withMemory(int sizeInGB);
 
+            /**
+             * Specifies the memory of the deployment.
+             * @param size the size of the memory, 1 GB can be represented by 1Gi or 1024Mi
+             * @return the next stage of deployment definition
+             */
+            T withMemory(String size);
+
             /**
              * Specifies the runtime version of the deployment.
              * @param version the runtime version of Java
@@ -194,6 +235,14 @@ interface WithSettings<T> {
              * @return the next stage of deployment definition
              */
             T withActivation();
+
+            /**
+             * Specifies the config file patterns for the deployment.
+             * @param configFilePatterns Config file patterns to decide which patterns of Application Configuration Service will be used.
+             *                           Use null or empty list to clear existing configurations.
+             * @return the next stage of deployment definition
+             */
+            T withConfigFilePatterns(List<String> configFilePatterns);
         }
 
         /**
@@ -237,13 +286,27 @@ interface WithSettings {
              */
             Update withCpu(int cpuCount);
 
+            /**
+             * Specifies the cpu number of the deployment.
+             * @param cpuCount the number of the cpu, 1 core can be represented by 1 or 1000m
+             * @return the next stage of deployment update
+             */
+            Update withCpu(String cpuCount);
+
             /**
              * Specifies the memory of the deployment.
              * @param sizeInGB the size of the memory in GB
              * @return the next stage of deployment update
              */
             Update withMemory(int sizeInGB);
 
+            /**
+             * Specifies the memory of the deployment.
+             * @param size the size of the memory, 1 GB can be represented by 1Gi or 1024Mi
+             * @return the next stage of deployment update
+             */
+            Update withMemory(String size);
+
             /**
              * Specifies the runtime version of the deployment.
              * @param version the runtime version of Java
@@ -285,6 +348,14 @@ interface WithSettings {
              * @return the next stage of deployment update
              */
             Update withActivation();
+
+            /**
+             * Specifies the config file patterns for the deployment.
+             * @param configFilePatterns Config file patterns to decide which patterns of Application Configuration Service will be used.
+             *                           Use null or empty list to clear existing configurations.
+             * @return the next stage of deployment update
+             */
+            Update withConfigFilePatterns(List<String> configFilePatterns);
         }
 
         /** The stage of a deployment update allowing to specify the source code or package. */
@@ -296,6 +367,18 @@ interface WithSource {
              */
             Update withJarFile(File jar);
 
+            /**
+             * (Enterprise Tier Only)
+             * Specifies the jar package for the deployment.
+             * @param jar the file of the jar
+             * @param configFilePatterns config file patterns to decide which patterns of Application Configuration Service will be used
+             *                           (App has to have a binding to the Configuration Service first in order to read the config files
+             *                            {@link com.azure.resourcemanager.appplatform.models.SpringApp.DefinitionStages.WithConfigurationServiceBinding})
+             *                           use null or empty list to clear existing configurations
+             * @return the next stage of deployment update
+             */
+            Update withJarFile(File jar, List<String> configFilePatterns);
+
             // /**
             //  * Specifies the source code for the deployment.
             //  * @param sourceCodeFolder the folder of the source code
@@ -310,6 +393,18 @@ interface WithSource {
              */
             WithModule withSourceCodeTarGzFile(File sourceCodeTarGz);
 
+            /**
+             * (Enterprise Tier Only)
+             * Specifies the source code for the deployment.
+             * @param sourceCodeTarGz a tar.gz file of the source code
+             * @param configFilePatterns config file patterns to decide which patterns of Application Configuration Service will be used
+             *                           (App has to have a binding to the Configuration Service first in order to read the config files
+             *                            {@link com.azure.resourcemanager.appplatform.models.SpringApp.DefinitionStages.WithConfigurationServiceBinding})
+             *                           use null or empty list to clear existing configurations.
+             * @return the next stage of deployment update
+             */
+            WithModule withSourceCodeTarGzFile(File sourceCodeTarGz, List<String> configFilePatterns);
+
             /**
              * Specifies the a existing source in the cloud storage.
              * @param type the source type in previous upload

sdk/resourcemanager/azure-resourcemanager-appplatform/src/main/java/com/azure/resourcemanager/appplatform/models/SpringAppDeployment.java

@@ -5,6 +5,7 @@
 
 import com.azure.core.management.Region;
 import com.azure.core.test.annotation.DoNotRecord;
+import com.azure.core.util.CoreUtils;
 import com.azure.resourcemanager.appplatform.models.RuntimeVersion;
 import com.azure.resourcemanager.appplatform.models.SpringApp;
 import com.azure.resourcemanager.appplatform.models.SpringAppDeployment;
@@ -51,16 +52,15 @@ public class SpringCloudLiveOnlyTest extends AppPlatformTest {
     private static final String PIGGYMETRICS_CONFIG_URL = "https://github.com/Azure-Samples/piggymetrics-config";
     private static final String GATEWAY_JAR_URL = "https://github.com/weidongxu-microsoft/azure-sdk-for-java-management-tests/raw/master/spring-cloud/gateway.jar";
     private static final String PIGGYMETRICS_TAR_GZ_URL = "https://github.com/weidongxu-microsoft/azure-sdk-for-java-management-tests/raw/master/spring-cloud/piggymetrics.tar.gz";
+    private static final String PETCLINIC_CONFIG_URL = "https://github.com/XiaofeiCao/spring-petclinic-microservices-config";
+    private static final String PETCLINIC_GATEWAY_JAR_URL = "https://github.com/weidongxu-microsoft/azure-sdk-for-java-management-tests/tree/master/spring-cloud/api-gateway.jar";
+    private static final String PETCLINIC_TAR_GZ_URL = "https://github.com/weidongxu-microsoft/azure-sdk-for-java-management-tests/tree/master/spring-cloud/petclinic.tar.gz";
 
     private static final String SPRING_CLOUD_SERVICE_OBJECT_ID = "938df8e2-2b9d-40b1-940c-c75c33494239";
 
     @Test
-    @DoNotRecord
+    @DoNotRecord(skipInPlayback = true)
     public void canCRUDDeployment() throws Exception {
-        if (skipInPlayback()) {
-            return;
-        }
-
         allowAllSSL();
 
         String serviceName = generateRandomResourceName("springsvc", 15);
@@ -74,16 +74,7 @@ public void canCRUDDeployment() throws Exception {
             .withNewResourceGroup(rgName)
             .create();
 
-        File jarFile = new File("gateway.jar");
-        if (!jarFile.exists()) {
-            HttpURLConnection connection = (HttpURLConnection) new URL(GATEWAY_JAR_URL).openConnection();
-            connection.connect();
-            try (InputStream inputStream = connection.getInputStream();
-                 OutputStream outputStream = new FileOutputStream(jarFile)) {
-                IOUtils.copy(inputStream, outputStream);
-            }
-            connection.disconnect();
-        }
+        File jarFile = downloadFile(GATEWAY_JAR_URL);
 
         SpringApp app = service.apps().define(appName)
             .defineActiveDeployment(deploymentName)
@@ -109,17 +100,7 @@ public void canCRUDDeployment() throws Exception {
 //        Assertions.assertEquals(RuntimeVersion.JAVA_11, deployment.settings().runtimeVersion());
         Assertions.assertEquals(2, deployment.instances().size());
 
-        File gzFile = new File("piggymetrics.tar.gz");
-        if (!gzFile.exists()) {
-            allowAllSSL();
-            HttpURLConnection connection = (HttpURLConnection) new URL(PIGGYMETRICS_TAR_GZ_URL).openConnection();
-            connection.connect();
-            try (InputStream inputStream = connection.getInputStream();
-                 OutputStream outputStream = new FileOutputStream(gzFile)) {
-                IOUtils.copy(inputStream, outputStream);
-            }
-            connection.disconnect();
-        }
+        File gzFile = downloadFile(PIGGYMETRICS_TAR_GZ_URL);
 
         deployment = app.deployments().define(deploymentName1)
             .withSourceCodeTarGzFile(gzFile)
@@ -144,12 +125,8 @@ public void canCRUDDeployment() throws Exception {
     }
 
     @Test
-    @DoNotRecord
+    @DoNotRecord(skipInPlayback = true)
     public void canCreateCustomDomainWithSsl() throws Exception {
-        if (skipInPlayback()) {
-            return;
-        }
-
         String domainName = generateRandomResourceName("jsdkdemo-", 20) + ".com";
         String certOrderName = generateRandomResourceName("cert", 15);
         String vaultName = generateRandomResourceName("vault", 15);
@@ -254,10 +231,93 @@ public void canCreateCustomDomainWithSsl() throws Exception {
 
         app.update()
             .withHttpsOnly()
+            .withoutCustomDomain(String.format("www.%s", domainName))
             .apply();
         Assertions.assertTrue(checkRedirect(String.format("http://ssl.%s", domainName)));
     }
 
+    @Test
+    @DoNotRecord(skipInPlayback = true)
+    public void canCRUDEnterpriseTierDeployment() throws Exception {
+        allowAllSSL();
+        File tarGzFile = downloadFile(PETCLINIC_TAR_GZ_URL);
+        File jarFile = downloadFile(PETCLINIC_GATEWAY_JAR_URL);
+
+        String serviceName = generateRandomResourceName("springsvc", 15);
+        Region region = Region.US_EAST;
+
+        List<String> configFilePatterns = Arrays.asList("api-gateway", "customers-service");
+        SpringService service = appPlatformManager.springServices().define(serviceName)
+            .withRegion(region)
+            .withNewResourceGroup(rgName)
+            .withEnterpriseTierSku()
+            .withDefaultGitRepository(PETCLINIC_CONFIG_URL, "master", configFilePatterns)
+            .create();
+
+        String deploymentName = generateRandomResourceName("deploy", 15);
+
+        List<String> apiGatewayConfigFilePatterns = Arrays.asList("api-gateway");
+        String appName = "api-gateway";
+        SpringApp app = service.apps().define(appName)
+            .defineActiveDeployment(deploymentName)
+            .withJarFile(jarFile)
+            .withInstance(2)
+            .withCpu("500m")
+            .withMemory("512Mi")
+            .attach()
+            .withDefaultPublicEndpoint()
+            .withConfigurationServiceBinding()
+            .create();
+
+        SpringAppDeployment deployment = app.deployments().getByName(deploymentName);
+        Assertions.assertTrue(CoreUtils.isNullOrEmpty(deployment.configFilePatterns()));
+
+        deployment.update()
+            .withConfigFilePatterns(apiGatewayConfigFilePatterns)
+            .apply();
+
+        deployment.refresh();
+        Assertions.assertFalse(CoreUtils.isNullOrEmpty(deployment.configFilePatterns()));
+
+        Assertions.assertNotNull(app.url());
+        Assertions.assertNotNull(app.activeDeploymentName());
+        Assertions.assertEquals(1, app.deployments().list().stream().count());
+
+        String appName2 = "customers-service";
+        String module = "spring-petclinic-customers-service";
+        List<String> customerServiceConfigFilePatterns = Arrays.asList("customers-service");
+        SpringApp app2 = service.apps().define(appName2)
+            .defineActiveDeployment(deploymentName)
+            .withSourceCodeTarGzFile(tarGzFile, customerServiceConfigFilePatterns)
+            .withTargetModule(module)
+            .attach()
+            .withConfigurationServiceBinding()
+            .create();
+
+        // no public endpoint
+        Assertions.assertNull(app2.url());
+
+        SpringAppDeployment customersDeployment = app2.deployments().getByName(deploymentName);
+        Assertions.assertEquals(customerServiceConfigFilePatterns, customersDeployment.configFilePatterns());
+    }
+
+    private File downloadFile(String remoteFileUrl) throws Exception {
+        String[] split = remoteFileUrl.split("/");
+        String filename = split[split.length - 1];
+        File downloaded = new File(filename);
+        if (!downloaded.exists()) {
+            HttpURLConnection connection = (HttpURLConnection) new URL(remoteFileUrl).openConnection();
+            connection.connect();
+            try (InputStream inputStream = connection.getInputStream();
+                 OutputStream outputStream = new FileOutputStream(downloaded)) {
+                IOUtils.copy(inputStream, outputStream);
+            } finally {
+                connection.disconnect();
+            }
+        }
+        return downloaded;
+    }
+
     private void extraTarGzSource(File folder, URL url) throws IOException {
         HttpURLConnection connection = (HttpURLConnection) url.openConnection();
         connection.connect();