From 3929cfea85cf2569e28cb545e2f6ee0f384266ed Mon Sep 17 00:00:00 2001
From: Zim Kalinowski <zikalino@microsoft.com>
Date: Mon, 10 Sep 2018 15:31:01 +0800
Subject: [PATCH] merged change

---
 changelogs/fragments/45378-fix-sql-tags.yml                | 2 ++
 lib/ansible/modules/cloud/azure/azure_rm_sqlserver.py      | 5 +++++
 test/integration/targets/azure_rm_sqlserver/tasks/main.yml | 2 ++
 3 files changed, 9 insertions(+)
 create mode 100644 changelogs/fragments/45378-fix-sql-tags.yml

diff --git a/changelogs/fragments/45378-fix-sql-tags.yml b/changelogs/fragments/45378-fix-sql-tags.yml
new file mode 100644
index 00000000000..14e78eeef62
--- /dev/null
+++ b/changelogs/fragments/45378-fix-sql-tags.yml
@@ -0,0 +1,2 @@
+bugfixes:
+- azure_rm_sqlserver - fix for tags support
diff --git a/lib/ansible/modules/cloud/azure/azure_rm_sqlserver.py b/lib/ansible/modules/cloud/azure/azure_rm_sqlserver.py
index fa74d286b0b..b6dcca3c421 100644
--- a/lib/ansible/modules/cloud/azure/azure_rm_sqlserver.py
+++ b/lib/ansible/modules/cloud/azure/azure_rm_sqlserver.py
@@ -163,6 +163,7 @@ class AzureRMServers(AzureRMModuleBase):
         self.resource_group = None
         self.name = None
         self.parameters = dict()
+        self.tags = None
 
         self.results = dict(changed=False)
         self.state = None
@@ -213,6 +214,9 @@ class AzureRMServers(AzureRMModuleBase):
                 self.to_do = Actions.Delete
             elif self.state == 'present':
                 self.log("Need to check if SQL Server instance has to be deleted or may be updated")
+                update_tags, newtags = self.update_tags(old_response.get('tags', dict()))
+                if update_tags:
+                    self.tags = newtags
                 self.to_do = Actions.Update
 
         if (self.to_do == Actions.Create) or (self.to_do == Actions.Update):
@@ -222,6 +226,7 @@ class AzureRMServers(AzureRMModuleBase):
                 self.results['changed'] = True
                 return self.results
 
+            self.parameters['tags'] = self.tags
             response = self.create_update_sqlserver()
             response.pop('administrator_login_password', None)
 
diff --git a/test/integration/targets/azure_rm_sqlserver/tasks/main.yml b/test/integration/targets/azure_rm_sqlserver/tasks/main.yml
index 1e574240100..3daa7a82ca4 100644
--- a/test/integration/targets/azure_rm_sqlserver/tasks/main.yml
+++ b/test/integration/targets/azure_rm_sqlserver/tasks/main.yml
@@ -24,6 +24,8 @@
     location: eastus
     admin_username: mylogin
     admin_password: Testpasswordxyz12!
+    tags:
+      aaa: bbb
   register: output
 - name: Assert the resource instance is well created
   assert: