Skip to content

Commit

Permalink
release 1.0.0 (#22)
Browse files Browse the repository at this point in the history
* Fix some issues coming from changes in `phpypam`

As the parameters for methods of `phpypam.api` had changed we need to do
some adjustances here too.
For this reason we need to use `phpypam` from version 1.0.0 or above
from now.

* Publish workflow

Add github workflow to auto publish new versions to ansible galaxy.
Rename requirements to be consistent with other projects of `codeaffen`.

* Adapt documentation to meet dependencies

Add requirement of version for `phpypam` to documentation.

* prepare release
  • Loading branch information
cmeissner authored Oct 30, 2020
1 parent d2577cf commit 4af4fbf
Show file tree
Hide file tree
Showing 17 changed files with 60 additions and 15 deletions.
26 changes: 26 additions & 0 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
name: Release Ansible collection

on:
push:
tags:
- v[0-9]+\.[0-9]+\.[0-9]+

jobs:
deploy:

runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v2
- name: Set up Python
uses: actions/setup-python@v2
with:
python-version: '3.x'
- name: Install dependencies
run: |
python -m pip install --upgrade pip
pip install -r requirements-dev.txt
- name: Build and publish
env:
GALAXY_API_KEY: ${{ secrets.GALAXY_API_KEY }}
run: make publish
10 changes: 10 additions & 0 deletions CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,16 @@ codeaffen.phpipam Release Notes
.. contents:: Topics


v1.0.0
======

Major Changes
-------------

- Adapt documentation to reflect the final requirements
- Running tests against the new version and do some changes to work as expected
- Switch to stable version of `phpypam` module

v0.5.0
======

Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ OPTIONS (= is mandatory):
type: str


REQUIREMENTS: inflection, ipaddress, phpypam
REQUIREMENTS: inflection, ipaddress, phpypam>=1.0.0

AUTHOR: Christian Meißner (@cmeissner)
METADATA:
Expand Down Expand Up @@ -161,4 +161,4 @@ The following dependencies have to be fulfiled by the Ansible controller.

* inflection
* ipaddress
* phpypam
* phpypam>=1.0.0
9 changes: 9 additions & 0 deletions changelogs/changelog.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -35,3 +35,12 @@ releases:
name: device_type
namespace: ''
release_date: '2020-10-29'
1.0.0:
changes:
major_changes:
- Adapt documentation to reflect the final requirements
- Running tests against the new version and do some changes to work as expected
- Switch to stable version of `phpypam` module
fragments:
- finally_go_stabel.yml
release_date: '2020-10-30'
2 changes: 1 addition & 1 deletion docs/plugins/address_module.rst
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ The below requirements are needed on the host that executes this module.

- inflection
- ipaddress
- phpypam
- phpypam>=1.0.0


.. Options
Expand Down
2 changes: 1 addition & 1 deletion docs/plugins/device_module.rst
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ The below requirements are needed on the host that executes this module.

- inflection
- ipaddress
- phpypam
- phpypam>=1.0.0


.. Options
Expand Down
2 changes: 1 addition & 1 deletion docs/plugins/device_type_module.rst
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ The below requirements are needed on the host that executes this module.

- inflection
- ipaddress
- phpypam
- phpypam>=1.0.0


.. Options
Expand Down
2 changes: 1 addition & 1 deletion docs/plugins/domain_module.rst
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ The below requirements are needed on the host that executes this module.

- inflection
- ipaddress
- phpypam
- phpypam>=1.0.0


.. Options
Expand Down
2 changes: 1 addition & 1 deletion docs/plugins/nameserver_module.rst
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ The below requirements are needed on the host that executes this module.

- inflection
- ipaddress
- phpypam
- phpypam>=1.0.0


.. Options
Expand Down
2 changes: 1 addition & 1 deletion docs/plugins/section_module.rst
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ The below requirements are needed on the host that executes this module.

- inflection
- ipaddress
- phpypam
- phpypam>=1.0.0


.. Options
Expand Down
2 changes: 1 addition & 1 deletion docs/plugins/subnet_module.rst
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ The below requirements are needed on the host that executes this module.

- inflection
- ipaddress
- phpypam
- phpypam>=1.0.0


.. Options
Expand Down
2 changes: 1 addition & 1 deletion docs/plugins/vlan_module.rst
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ The below requirements are needed on the host that executes this module.

- inflection
- ipaddress
- phpypam
- phpypam>=1.0.0


.. Options
Expand Down
2 changes: 1 addition & 1 deletion docs/plugins/vrf_module.rst
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ The below requirements are needed on the host that executes this module.

- inflection
- ipaddress
- phpypam
- phpypam>=1.0.0


.. Options
Expand Down
2 changes: 1 addition & 1 deletion galaxy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: "phpipam"
description: Ansible Modules to manage phpIPAM installations
authors:
- "Christian Meißner <[email protected]>"
version: "0.5.0"
version: "1.0.0"
license:
- "GPL-3.0-or-later"
tags:
Expand Down
2 changes: 1 addition & 1 deletion plugins/doc_fragments/phpipam.py
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ class ModuleDocFragment(object):
requirements:
- inflection
- ipaddress
- phpypam
- phpypam>=1.0.0
options:
server_url:
description: URL of the phpIPAM server
Expand Down
4 changes: 2 additions & 2 deletions plugins/module_utils/phpipam_helper.py
Original file line number Diff line number Diff line change
Expand Up @@ -323,7 +323,7 @@ def _sanitize_entity(self, entity):
def _create_entity(self, desired_entity):

try:
self.phpipamapi.create_entity(self.controller_uri, desired_entity)
self.phpipamapi.create_entity(self.controller_uri, data=desired_entity)
self.set_changed()
entity = self.find_current_entity()
except PHPyPAMEntityNotFoundException:
Expand Down Expand Up @@ -359,7 +359,7 @@ def _update_entity(self, desired_entity, current_entity):
else:
update_path = '/'

self.phpipamapi.update_entity(self.controller_uri, updated_entity, controller_path=update_path)
self.phpipamapi.update_entity(self.controller_uri, update_path, updated_entity)

try:
entity = self.find_current_entity()
Expand Down
File renamed without changes.

0 comments on commit 4af4fbf

Please sign in to comment.