clear tags to work around messed-up tags in mgmt SDK (#30)

microsoft · Aug 9, 2017 · b39ff58 · b39ff58
1 parent 5197b58
commit b39ff58
Show file tree

Hide file tree

Showing 7 changed files with 25 additions and 2 deletions.
diff --git a/azure-webapp-maven-plugin/src/main/java/com/microsoft/azure/maven/webapp/WebAppUtils.java b/azure-webapp-maven-plugin/src/main/java/com/microsoft/azure/maven/webapp/WebAppUtils.java
@@ -62,4 +62,17 @@ public static boolean isPrivateRegistryImage(final ContainerSetting containerSet
         return StringUtils.isNotEmpty(containerSetting.getServerId()) &&
                 StringUtils.isNotEmpty(containerSetting.getRegistryUrl());
     }
+
+    /**
+     * Work Around:
+     * When a web app is created from Azure Portal, there are hidden tags associated with the app.
+     * It will be messed up when calling "update" API.
+     * An issue is logged at https://github.com/Azure/azure-sdk-for-java/issues/1755 .
+     * Remove all tags here to make it work.
+     *
+     * @param app
+     */
+    public static void clearTags(final WebApp app) {
+        app.inner().withTags(null);
+    }
 }
diff --git a/...lugin/src/main/java/com/microsoft/azure/maven/webapp/handlers/JavaRuntimeHandlerImpl.java b/...lugin/src/main/java/com/microsoft/azure/maven/webapp/handlers/JavaRuntimeHandlerImpl.java
@@ -32,6 +32,7 @@ public WebApp.DefinitionStages.WithCreate defineAppWithRunTime() throws MojoExec
     public WebApp.Update updateAppRuntime() throws MojoExecutionException {
         final WebApp app = mojo.getWebApp();
         WebAppUtils.assureWindowsWebApp(app);
+        WebAppUtils.clearTags(app);
 
         final WebApp.Update update = app.update();
         update.withJavaVersion(mojo.getJavaVersion())

diff --git a/...lugin/src/main/java/com/microsoft/azure/maven/webapp/handlers/NullRuntimeHandlerImpl.java b/...lugin/src/main/java/com/microsoft/azure/maven/webapp/handlers/NullRuntimeHandlerImpl.java
@@ -8,6 +8,7 @@
 
 import com.microsoft.azure.management.appservice.WebApp;
 import com.microsoft.azure.maven.webapp.AbstractWebAppMojo;
+import com.microsoft.azure.maven.webapp.WebAppUtils;
 import org.apache.maven.plugin.MojoExecutionException;
 
 public class NullRuntimeHandlerImpl implements RuntimeHandler {
@@ -26,6 +27,8 @@ public WebApp.DefinitionStages.WithCreate defineAppWithRunTime() throws MojoExec
 
     @Override
     public WebApp.Update updateAppRuntime() throws MojoExecutionException {
-        return mojo.getWebApp().update();
+        final WebApp app = mojo.getWebApp();
+        WebAppUtils.clearTags(app);
+        return app.update();
     }
 }
diff --git a/...in/java/com/microsoft/azure/maven/webapp/handlers/PrivateDockerHubRuntimeHandlerImpl.java b/...in/java/com/microsoft/azure/maven/webapp/handlers/PrivateDockerHubRuntimeHandlerImpl.java
@@ -40,6 +40,7 @@ public WebApp.DefinitionStages.WithCreate defineAppWithRunTime() throws MojoExec
     public WebApp.Update updateAppRuntime() throws MojoExecutionException {
         final WebApp app = mojo.getWebApp();
         WebAppUtils.assureLinuxWebApp(app);
+        WebAppUtils.clearTags(app);
 
         final ContainerSetting containerSetting = mojo.getContainerSettings();
         final Server server = Utils.getServer(mojo.getSettings(), containerSetting.getServerId());

diff --git a/...ain/java/com/microsoft/azure/maven/webapp/handlers/PrivateRegistryRuntimeHandlerImpl.java b/...ain/java/com/microsoft/azure/maven/webapp/handlers/PrivateRegistryRuntimeHandlerImpl.java
@@ -40,6 +40,7 @@ public WebApp.DefinitionStages.WithCreate defineAppWithRunTime() throws MojoExec
     public WebApp.Update updateAppRuntime() throws MojoExecutionException {
         final WebApp app = mojo.getWebApp();
         WebAppUtils.assureLinuxWebApp(app);
+        WebAppUtils.clearTags(app);
 
         final ContainerSetting containerSetting = mojo.getContainerSettings();
         final Server server = Utils.getServer(mojo.getSettings(), containerSetting.getServerId());

diff --git a/...ain/java/com/microsoft/azure/maven/webapp/handlers/PublicDockerHubRuntimeHandlerImpl.java b/...ain/java/com/microsoft/azure/maven/webapp/handlers/PublicDockerHubRuntimeHandlerImpl.java
@@ -30,6 +30,7 @@ public WebApp.DefinitionStages.WithCreate defineAppWithRunTime() throws MojoExec
     public WebApp.Update updateAppRuntime() throws MojoExecutionException {
         final WebApp app = mojo.getWebApp();
         WebAppUtils.assureLinuxWebApp(app);
+        WebAppUtils.clearTags(app);
 
         final ContainerSetting containerSetting = mojo.getContainerSettings();
         return app.update().withPublicDockerHubImage(containerSetting.getImageName());

diff --git a/...n/src/test/java/com/microsoft/azure/maven/webapp/handlers/NullRuntimeHandlerImplTest.java b/...n/src/test/java/com/microsoft/azure/maven/webapp/handlers/NullRuntimeHandlerImplTest.java
@@ -7,6 +7,7 @@
 package com.microsoft.azure.maven.webapp.handlers;
 
 import com.microsoft.azure.management.appservice.WebApp;
+import com.microsoft.azure.management.appservice.implementation.SiteInner;
 import com.microsoft.azure.maven.webapp.AbstractWebAppMojo;
 import org.apache.maven.plugin.MojoExecutionException;
 import org.junit.Before;
@@ -47,9 +48,11 @@ public void defineAppWithRunTime() throws Exception {
 
     @Test
     public void updateAppRuntime() throws Exception {
-        final WebApp.Update update = mock(WebApp.Update.class);
         final WebApp app = mock(WebApp.class);
+        final WebApp.Update update = mock(WebApp.Update.class);
         when(app.update()).thenReturn(update);
+        final SiteInner siteInner = mock(SiteInner.class);
+        when(app.inner()).thenReturn(siteInner);
         when(mojo.getWebApp()).thenReturn(app);
 
         assertSame(update, handler.updateAppRuntime());