add clear tag work around back for updating web app issue in sdk (#281)

microsoft · Jul 25, 2018 · f8a4e47 · f8a4e47
1 parent 59077c9
commit f8a4e47
Show file tree

Hide file tree

Showing 8 changed files with 23 additions and 0 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
@@ -161,4 +161,17 @@ public static RuntimeStack getLinuxRunTimeStack(String imageName) throws MojoExe
         }
         throw new MojoExecutionException(IMAGE_NOT_GIVEN);
     }
+
+    /**
+     * 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
@@ -34,6 +34,7 @@ public WithCreate defineAppWithRuntime() throws Exception {
     @Override
     public Update updateAppRuntime(final WebApp app) throws Exception {
         WebAppUtils.assureWindowsWebApp(app);
+        WebAppUtils.clearTags(app);
 
         final Update update = app.update();
         update.withJavaVersion(mojo.getJavaVersion())

diff --git a/...ugin/src/main/java/com/microsoft/azure/maven/webapp/handlers/LinuxRuntimeHandlerImpl.java b/...ugin/src/main/java/com/microsoft/azure/maven/webapp/handlers/LinuxRuntimeHandlerImpl.java
@@ -34,6 +34,7 @@ public WebApp.DefinitionStages.WithCreate defineAppWithRuntime() throws Exceptio
     @Override
     public Update updateAppRuntime(WebApp app) throws Exception {
         WebAppUtils.assureLinuxWebApp(app);
+        WebAppUtils.clearTags(app);
 
         return app.update().withBuiltInImage(getLinuxRunTimeStack(mojo.getLinuxRuntime()));
     }

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
@@ -9,6 +9,7 @@
 import com.microsoft.azure.management.appservice.WebApp;
 import com.microsoft.azure.management.appservice.WebApp.DefinitionStages.WithCreate;
 import com.microsoft.azure.management.appservice.WebApp.Update;
+import com.microsoft.azure.maven.webapp.WebAppUtils;
 import org.apache.maven.plugin.MojoExecutionException;
 
 public class NullRuntimeHandlerImpl implements RuntimeHandler {
@@ -22,6 +23,8 @@ public WithCreate defineAppWithRuntime() throws Exception {
 
     @Override
     public Update updateAppRuntime(final WebApp app) throws Exception {
+        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
@@ -43,6 +43,7 @@ public WithCreate defineAppWithRuntime() throws Exception {
     @Override
     public WebApp.Update updateAppRuntime(final WebApp app) throws Exception {
         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
@@ -44,6 +44,7 @@ public WithCreate defineAppWithRuntime() throws Exception {
     @Override
     public Update updateAppRuntime(final WebApp app) throws Exception {
         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
@@ -33,6 +33,7 @@ public WithCreate defineAppWithRuntime() throws Exception {
     @Override
     public Update updateAppRuntime(final WebApp app) throws Exception {
         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
@@ -46,6 +46,8 @@ public void updateAppRuntime() throws Exception {
         final WebApp app = mock(WebApp.class);
         final Update update = mock(Update.class);
         doReturn(update).when(app).update();
+        final SiteInner siteInner = mock(SiteInner.class);
+        doReturn(siteInner).when(app).inner();
 
         assertSame(update, handler.updateAppRuntime(app));
     }