From 57c6057debcc9a3f65165c513693b854a4e1bb2a Mon Sep 17 00:00:00 2001 From: haiyuazhang Date: Fri, 3 Jul 2020 11:35:27 +0800 Subject: [PATCH] * release v0.2.0 preparation and minor ad module bug fixing --- .idea/.gitignore | 2 -- .idea/azure.iml | 10 --------- .../inspectionProfiles/profiles_settings.xml | 6 ------ .idea/misc.xml | 4 ---- .idea/modules.xml | 8 ------- .idea/vcs.xml | 6 ------ CHANGELOG.md | 21 +++++++++++++++++++ galaxy.yml | 3 +-- plugins/modules/azure_rm_adpassword.py | 12 +++++------ plugins/modules/azure_rm_adpassword_info.py | 2 +- .../azure/azcollection/plugins | 1 - .../azure_rm_adpassword/tasks/main.yml | 2 +- 12 files changed, 30 insertions(+), 47 deletions(-) delete mode 100644 .idea/.gitignore delete mode 100644 .idea/azure.iml delete mode 100644 .idea/inspectionProfiles/profiles_settings.xml delete mode 100644 .idea/misc.xml delete mode 100644 .idea/modules.xml delete mode 100644 .idea/vcs.xml delete mode 120000 src/ansible_collections/azure/azcollection/plugins diff --git a/.idea/.gitignore b/.idea/.gitignore deleted file mode 100644 index 5c98b42884..0000000000 --- a/.idea/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -# Default ignored files -/workspace.xml \ No newline at end of file diff --git a/.idea/azure.iml b/.idea/azure.iml deleted file mode 100644 index 5ec00fe76c..0000000000 --- a/.idea/azure.iml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - \ No newline at end of file diff --git a/.idea/inspectionProfiles/profiles_settings.xml b/.idea/inspectionProfiles/profiles_settings.xml deleted file mode 100644 index 105ce2da2d..0000000000 --- a/.idea/inspectionProfiles/profiles_settings.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml deleted file mode 100644 index 5136e9e1a1..0000000000 --- a/.idea/misc.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml deleted file mode 100644 index 716adf06b7..0000000000 --- a/.idea/modules.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml deleted file mode 100644 index 94a25f7f4c..0000000000 --- a/.idea/vcs.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/CHANGELOG.md b/CHANGELOG.md index c5b4761da7..3e31152ca3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,26 @@ # Change Log +## v0.2.0 (2020-07-03) + +### NEW MODULES + - azure_rm_privatezone module ([#122](https://github.com/ansible-collections/azure/pull/122)) + - azure_rm_adserviceprincipal module ([#179](https://github.com/ansible-collections/azure/pull/179)) + - azure_rm_adserviceprincipal_info module ([#179](https://github.com/ansible-collections/azure/pull/179)) + - azure_rm_adpassword module ([#179](https://github.com/ansible-collections/azure/pull/179)) + - azure_rm_adpassword_info module ([#179](https://github.com/ansible-collections/azure/pull/179)) + +### FEATURE ENHANCEMENT + - add ability to remove all subnet service endpoints ([#148](https://github.com/ansible-collections/azure/pull/148)) + - update network client api version ([#157](https://github.com/ansible-collections/azure/pull/157)) + - add ephemeral os disk support for azure_rm_virualmachinescaleset ([#128](https://github.com/ansible-collections/azure/pull/128)) + - add ephemeral os disk support for azure_rm_virtualmachine ([#124](https://github.com/ansible-collections/azure/pull/124)) + - add FileEndpoint to azure_rm_storageaccount_info ([#102](https://github.com/ansible-collections/azure/pull/102)) + - add support for managing the 'Firewall and virtual networks' settings in azure_rm_storageaccount ([#108](https://github.com/ansible-collections/azure/pull/108)) + +### BUG FIXING + - bug fixing in azure_rm_aks ([#170](https://github.com/ansible-collections/azure/pull/170)) + - migrate missing doc_fragments that went missing ([#115](https://github.com/ansible-collections/azure/pull/115)) + ## v0.1.3 (2020-05-13) - add new parameter in azure_rm_aks diff --git a/galaxy.yml b/galaxy.yml index 02bad7c4cd..281dfb65f4 100644 --- a/galaxy.yml +++ b/galaxy.yml @@ -9,7 +9,7 @@ namespace: azure name: azcollection # The version of the collection. Must be compatible with semantic versioning -version: 0.1.3 +version: 0.2.0 # The path to the Markdown (.md) readme file. This path is relative to the root of the collection readme: README.md @@ -18,7 +18,6 @@ readme: README.md # @nicks:irc/im.site#channel' authors: - Microsoft -- Microsoft ### OPTIONAL but strongly recommended diff --git a/plugins/modules/azure_rm_adpassword.py b/plugins/modules/azure_rm_adpassword.py index a0ee0db102..9b48a32cc8 100644 --- a/plugins/modules/azure_rm_adpassword.py +++ b/plugins/modules/azure_rm_adpassword.py @@ -30,9 +30,9 @@ description: - The application ID. type: str - service_principal_id: + service_principal_object_id: description: - - The service principal ID. + - The service principal object ID. type: str key_id: description: @@ -129,7 +129,7 @@ def __init__(self): self.module_arg_spec = dict( app_id=dict(type='str'), - service_principal_id=dict(type='str'), + service_principal_object_id=dict(type='str'), app_object_id=dict(type='str'), key_id=dict(type='str'), tenant=dict(type='str', required=True), @@ -141,7 +141,7 @@ def __init__(self): self.state = None self.tenant = None self.app_id = None - self.service_principal_id = None + self.service_principal_object_id = None self.app_object_id = None self.key_id = None self.value = None @@ -188,12 +188,12 @@ def resolve_app_obj_id(self): return elif self.app_id or self.service_principal_object_id: if not self.app_id: - sp = self.client.service_principals.get(self.service_principal_id) + sp = self.client.service_principals.get(self.service_principal_object_id) self.app_id = sp.app_id if not self.app_id: self.fail("can't resolve app via service principal object id {0}".format(self.service_principal_object_id)) - result = list(self.client.applications.list(filter="appId eq {0}".format(self.app_id))) + result = list(self.client.applications.list(filter="appId eq '{}'".format(self.app_id))) if result: self.app_object_id = result[0].object_id else: diff --git a/plugins/modules/azure_rm_adpassword_info.py b/plugins/modules/azure_rm_adpassword_info.py index 0520e9864c..e29d53aa19 100644 --- a/plugins/modules/azure_rm_adpassword_info.py +++ b/plugins/modules/azure_rm_adpassword_info.py @@ -179,7 +179,7 @@ def resolve_app_obj_id(self): if not self.app_id: self.fail("can't resolve app via service principal object id {0}".format(self.service_principal_object_id)) - result = list(self.client.applications.list(filter="appId eq {0}".format(self.app_id))) + result = list(self.client.applications.list(filter="appId eq '{}'".format(self.app_id))) if result: self.app_object_id = result[0].object_id else: diff --git a/src/ansible_collections/azure/azcollection/plugins b/src/ansible_collections/azure/azcollection/plugins deleted file mode 120000 index 2cdf59af97..0000000000 --- a/src/ansible_collections/azure/azcollection/plugins +++ /dev/null @@ -1 +0,0 @@ -../../../../plugins \ No newline at end of file diff --git a/tests/integration/targets/azure_rm_adpassword/tasks/main.yml b/tests/integration/targets/azure_rm_adpassword/tasks/main.yml index ba79463771..834c557634 100644 --- a/tests/integration/targets/azure_rm_adpassword/tasks/main.yml +++ b/tests/integration/targets/azure_rm_adpassword/tasks/main.yml @@ -41,7 +41,7 @@ ignore_errors: True - name: Get ad password info - azure_rm_adpasswordinfo: + azure_rm_adpassword_info: app_id: "{{ app_id }}" tenant: "{{ tenant_id }}" key_id: "{{ ad_fact.key_id }}"