Skip to content

Commit

Permalink
* release v0.2.0 preparation and minor ad module bug fixing
Browse files Browse the repository at this point in the history
  • Loading branch information
haiyuazhang authored and haiyuazhang committed Jul 3, 2020
1 parent ddefb3d commit 57c6057
Show file tree
Hide file tree
Showing 12 changed files with 30 additions and 47 deletions.
2 changes: 0 additions & 2 deletions .idea/.gitignore

This file was deleted.

10 changes: 0 additions & 10 deletions .idea/azure.iml

This file was deleted.

6 changes: 0 additions & 6 deletions .idea/inspectionProfiles/profiles_settings.xml

This file was deleted.

4 changes: 0 additions & 4 deletions .idea/misc.xml

This file was deleted.

8 changes: 0 additions & 8 deletions .idea/modules.xml

This file was deleted.

6 changes: 0 additions & 6 deletions .idea/vcs.xml

This file was deleted.

21 changes: 21 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -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
Expand Down
3 changes: 1 addition & 2 deletions galaxy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -18,7 +18,6 @@ readme: README.md
# @nicks:irc/im.site#channel'
authors:
- Microsoft <haiyzhan@microsoft.com>
- Microsoft <jieshe@microsoft.com>


### OPTIONAL but strongly recommended
Expand Down
12 changes: 6 additions & 6 deletions plugins/modules/azure_rm_adpassword.py
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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),
Expand All @@ -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
Expand Down Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion plugins/modules/azure_rm_adpassword_info.py
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
1 change: 0 additions & 1 deletion src/ansible_collections/azure/azcollection/plugins

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -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 }}"
Expand Down

0 comments on commit 57c6057

Please sign in to comment.