Remove deprecated features, bump version to 6.0.0 (#5326)

* Bump version to 6.0.0.

* sender option is now required.

* Default of want_proxmox_nodes_ansible_host changed from true to false.

* username is now an alias of user, and no longer of workspace.

* Remove deprecated return values in favor of end_state.

* Remove debug option.

* Change default of ignore_volatile_options from true to false.

* gitlab_group must now always contain the full path.

* Change default of norc from false to ture.

* Remove deprecated property.

* Add PR URL.

* Adjust bitbucket unit tests.

* Adjust module_helper integration test.
This commit is contained in:
Felix Fontein 2022-10-25 08:07:21 +02:00 committed by GitHub
commit 2830a3452d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
28 changed files with 70 additions and 243 deletions

View file

@ -25,10 +25,6 @@ options:
c:
description: cccc
type: str
trigger_depr_attr:
description: tries to access VarDict
type: bool
default: false
state:
description: test states
type: str
@ -50,15 +46,12 @@ class MState(StateModuleHelper):
a=dict(type='int', required=True),
b=dict(type='str'),
c=dict(type='str'),
trigger_depr_attr=dict(type='bool', default=False),
state=dict(type='str', choices=['join', 'b_x_a', 'c_x_a', 'both_x_a', 'nop'], default='join'),
),
)
def __init_module__(self):
self.vars.set('result', "abc", diff=True)
if self.vars.trigger_depr_attr:
dummy = self.VarDict
def state_join(self):
self.vars['result'] = "".join([str(self.vars.a), str(self.vars.b), str(self.vars.c)])

View file

@ -70,25 +70,9 @@
a: 5
b: foo
c: bar
trigger_depr_attr: true
state: both_x_a
register: state5
- ansible.builtin.set_fact:
vardict_gt29:
msg: >-
ModuleHelper.VarDict attribute is deprecated, use VarDict from the
ansible_collections.community.general.plugins.module_utils.mh.mixins.vars
module instead
version: 6.0.0
collection_name: community.general
vardict_29:
msg: >-
ModuleHelper.VarDict attribute is deprecated, use VarDict from the
ansible_collections.community.general.plugins.module_utils.mh.mixins.vars
module instead
version: 6.0.0
- name: assert state5
assert:
that:
@ -97,6 +81,3 @@
- state5.c == "bar"
- state5.result == "foobarfoobarfoobarfoobarfoobar"
- state5 is changed
- vardict_depr in state5.deprecations
vars:
vardict_depr: '{{ (ansible_version.major == 2 and ansible_version.minor == 9) | ternary(vardict_29, vardict_gt29) }}'

View file

@ -12,7 +12,6 @@ plugins/modules/cloud/rackspace/rax_files.py validate-modules:parameter-state-in
plugins/modules/cloud/rackspace/rax_files_objects.py use-argspec-type-path
plugins/modules/cloud/rackspace/rax_scaling_group.py use-argspec-type-path # fix needed, expanduser() applied to dict values
plugins/modules/cloud/scaleway/scaleway_organization_info.py validate-modules:return-syntax-error
plugins/modules/cloud/smartos/vmadm.py validate-modules:parameter-type-not-in-doc # unused param - removed in 6.0.0
plugins/modules/cloud/spotinst/spotinst_aws_elastigroup.py validate-modules:parameter-list-no-elements
plugins/modules/cloud/spotinst/spotinst_aws_elastigroup.py validate-modules:parameter-type-not-in-doc
plugins/modules/cloud/spotinst/spotinst_aws_elastigroup.py validate-modules:undocumented-parameter

View file

@ -7,7 +7,6 @@ plugins/modules/cloud/rackspace/rax_files.py validate-modules:parameter-state-in
plugins/modules/cloud/rackspace/rax_files_objects.py use-argspec-type-path
plugins/modules/cloud/rackspace/rax_scaling_group.py use-argspec-type-path # fix needed, expanduser() applied to dict values
plugins/modules/cloud/scaleway/scaleway_organization_info.py validate-modules:return-syntax-error
plugins/modules/cloud/smartos/vmadm.py validate-modules:parameter-type-not-in-doc # unused param - removed in 6.0.0
plugins/modules/cloud/spotinst/spotinst_aws_elastigroup.py validate-modules:parameter-list-no-elements
plugins/modules/cloud/spotinst/spotinst_aws_elastigroup.py validate-modules:parameter-type-not-in-doc
plugins/modules/cloud/spotinst/spotinst_aws_elastigroup.py validate-modules:undocumented-parameter

View file

@ -7,7 +7,6 @@ plugins/modules/cloud/rackspace/rax_files.py validate-modules:parameter-state-in
plugins/modules/cloud/rackspace/rax_files_objects.py use-argspec-type-path
plugins/modules/cloud/rackspace/rax_scaling_group.py use-argspec-type-path # fix needed, expanduser() applied to dict values
plugins/modules/cloud/scaleway/scaleway_organization_info.py validate-modules:return-syntax-error
plugins/modules/cloud/smartos/vmadm.py validate-modules:parameter-type-not-in-doc # unused param - removed in 6.0.0
plugins/modules/cloud/spotinst/spotinst_aws_elastigroup.py validate-modules:parameter-list-no-elements
plugins/modules/cloud/spotinst/spotinst_aws_elastigroup.py validate-modules:parameter-type-not-in-doc
plugins/modules/cloud/spotinst/spotinst_aws_elastigroup.py validate-modules:undocumented-parameter

View file

@ -7,7 +7,6 @@ plugins/modules/cloud/rackspace/rax_files.py validate-modules:parameter-state-in
plugins/modules/cloud/rackspace/rax_files_objects.py use-argspec-type-path
plugins/modules/cloud/rackspace/rax_scaling_group.py use-argspec-type-path # fix needed, expanduser() applied to dict values
plugins/modules/cloud/scaleway/scaleway_organization_info.py validate-modules:return-syntax-error
plugins/modules/cloud/smartos/vmadm.py validate-modules:parameter-type-not-in-doc # unused param - removed in 6.0.0
plugins/modules/cloud/spotinst/spotinst_aws_elastigroup.py validate-modules:parameter-list-no-elements
plugins/modules/cloud/spotinst/spotinst_aws_elastigroup.py validate-modules:parameter-type-not-in-doc
plugins/modules/cloud/spotinst/spotinst_aws_elastigroup.py validate-modules:undocumented-parameter

View file

@ -7,7 +7,6 @@ plugins/modules/cloud/rackspace/rax_files.py validate-modules:parameter-state-in
plugins/modules/cloud/rackspace/rax_files_objects.py use-argspec-type-path
plugins/modules/cloud/rackspace/rax_scaling_group.py use-argspec-type-path # fix needed, expanduser() applied to dict values
plugins/modules/cloud/scaleway/scaleway_organization_info.py validate-modules:return-syntax-error
plugins/modules/cloud/smartos/vmadm.py validate-modules:parameter-type-not-in-doc # unused param - removed in 6.0.0
plugins/modules/cloud/spotinst/spotinst_aws_elastigroup.py validate-modules:parameter-list-no-elements
plugins/modules/cloud/spotinst/spotinst_aws_elastigroup.py validate-modules:parameter-type-not-in-doc
plugins/modules/cloud/spotinst/spotinst_aws_elastigroup.py validate-modules:undocumented-parameter

View file

@ -22,7 +22,7 @@ class TestBucketAccessKeyModule(ModuleTestCase):
set_module_args({
'client_id': 'ABC',
'client_secret': 'XXX',
'username': 'name',
'workspace': 'name',
'repository': 'repo',
'label': 'key name',
'state': 'present',
@ -57,7 +57,7 @@ class TestBucketAccessKeyModule(ModuleTestCase):
set_module_args({
'client_id': 'ABC',
'client_secret': 'XXX',
'username': 'name',
'workspace': 'name',
'repository': 'repo',
'key': 'public_key',
'label': 'key name',
@ -108,7 +108,7 @@ class TestBucketAccessKeyModule(ModuleTestCase):
set_module_args({
'client_id': 'ABC',
'client_secret': 'XXX',
'username': 'name',
'workspace': 'name',
'repository': 'repo',
'key': 'new public key',
'label': 'mykey',
@ -159,7 +159,7 @@ class TestBucketAccessKeyModule(ModuleTestCase):
set_module_args({
'client_id': 'ABC',
'client_secret': 'XXX',
'username': 'name',
'workspace': 'name',
'repository': 'repo',
'key': 'new public key',
'label': 'mykey',
@ -210,7 +210,7 @@ class TestBucketAccessKeyModule(ModuleTestCase):
set_module_args({
'client_id': 'ABC',
'client_secret': 'XXX',
'username': 'name',
'workspace': 'name',
'repository': 'repo',
'key': 'new public key',
'label': 'mykey',
@ -261,7 +261,7 @@ class TestBucketAccessKeyModule(ModuleTestCase):
set_module_args({
'client_id': 'ABC',
'client_secret': 'XXX',
'username': 'name',
'workspace': 'name',
'repository': 'repo',
'label': 'mykey',
'state': 'absent',
@ -279,7 +279,7 @@ class TestBucketAccessKeyModule(ModuleTestCase):
set_module_args({
'client_id': 'ABC',
'client_secret': 'XXX',
'username': 'name',
'workspace': 'name',
'repository': 'repo',
'label': 'mykey',
'state': 'absent',
@ -327,7 +327,7 @@ class TestBucketAccessKeyModule(ModuleTestCase):
set_module_args({
'client_id': 'ABC',
'client_secret': 'XXX',
'username': 'name',
'workspace': 'name',
'repository': 'repo',
'label': 'mykey',
'state': 'absent',

View file

@ -22,7 +22,7 @@ class TestBucketPipelineKeyPairModule(ModuleTestCase):
set_module_args({
'client_id': 'ABC',
'client_secret': 'XXX',
'username': 'name',
'workspace': 'name',
'repository': 'repo',
'state': 'present',
})
@ -56,7 +56,7 @@ class TestBucketPipelineKeyPairModule(ModuleTestCase):
set_module_args({
'client_id': 'ABC',
'client_secret': 'XXX',
'username': 'name',
'workspace': 'name',
'repository': 'repo',
'public_key': 'public',
'private_key': 'PRIVATE',
@ -79,7 +79,7 @@ class TestBucketPipelineKeyPairModule(ModuleTestCase):
set_module_args({
'client_id': 'ABC',
'client_secret': 'XXX',
'username': 'name',
'workspace': 'name',
'repository': 'repo',
'public_key': 'public',
'private_key': 'PRIVATE',
@ -101,7 +101,7 @@ class TestBucketPipelineKeyPairModule(ModuleTestCase):
set_module_args({
'client_id': 'ABC',
'client_secret': 'XXX',
'username': 'name',
'workspace': 'name',
'repository': 'repo',
'public_key': 'public',
'private_key': 'PRIVATE',
@ -123,7 +123,7 @@ class TestBucketPipelineKeyPairModule(ModuleTestCase):
set_module_args({
'client_id': 'ABC',
'client_secret': 'XXX',
'username': 'name',
'workspace': 'name',
'repository': 'repo',
'public_key': 'public',
'private_key': 'PRIVATE',
@ -146,7 +146,7 @@ class TestBucketPipelineKeyPairModule(ModuleTestCase):
set_module_args({
'client_id': 'ABC',
'client_secret': 'XXX',
'username': 'name',
'workspace': 'name',
'repository': 'repo',
'state': 'absent',
})
@ -163,7 +163,7 @@ class TestBucketPipelineKeyPairModule(ModuleTestCase):
set_module_args({
'client_id': 'ABC',
'client_secret': 'XXX',
'username': 'name',
'workspace': 'name',
'repository': 'repo',
'state': 'absent',
})
@ -183,7 +183,7 @@ class TestBucketPipelineKeyPairModule(ModuleTestCase):
set_module_args({
'client_id': 'ABC',
'client_secret': 'XXX',
'username': 'name',
'workspace': 'name',
'repository': 'repo',
'state': 'absent',
'_ansible_check_mode': True,

View file

@ -29,7 +29,7 @@ class TestBucketPipelineKnownHostModule(ModuleTestCase):
set_module_args({
'client_id': 'ABC',
'client_secret': 'XXX',
'username': 'name',
'workspace': 'name',
'repository': 'repo',
'name': 'bitbucket.org',
'state': 'present',
@ -78,7 +78,7 @@ class TestBucketPipelineKnownHostModule(ModuleTestCase):
set_module_args({
'client_id': 'ABC',
'client_secret': 'XXX',
'username': 'name',
'workspace': 'name',
'repository': 'repo',
'name': 'bitbucket.org',
'state': 'present',
@ -97,7 +97,7 @@ class TestBucketPipelineKnownHostModule(ModuleTestCase):
set_module_args({
'client_id': 'ABC',
'client_secret': 'XXX',
'username': 'name',
'workspace': 'name',
'repository': 'repo',
'name': 'bitbucket.org',
'state': 'present',
@ -128,7 +128,7 @@ class TestBucketPipelineKnownHostModule(ModuleTestCase):
set_module_args({
'client_id': 'ABC',
'client_secret': 'XXX',
'username': 'name',
'workspace': 'name',
'repository': 'repo',
'name': 'bitbucket.org',
'state': 'absent',
@ -147,7 +147,7 @@ class TestBucketPipelineKnownHostModule(ModuleTestCase):
set_module_args({
'client_id': 'ABC',
'client_secret': 'XXX',
'username': 'name',
'workspace': 'name',
'repository': 'repo',
'name': 'bitbucket.org',
'state': 'absent',
@ -177,7 +177,7 @@ class TestBucketPipelineKnownHostModule(ModuleTestCase):
set_module_args({
'client_id': 'ABC',
'client_secret': 'XXX',
'username': 'name',
'workspace': 'name',
'repository': 'repo',
'name': 'bitbucket.org',
'state': 'absent',

View file

@ -20,7 +20,7 @@ class TestBucketPipelineVariableModule(ModuleTestCase):
def test_without_required_parameters(self):
with self.assertRaises(AnsibleFailJson) as exec_info:
set_module_args({
'username': 'name',
'workspace': 'name',
'repository': 'repo',
'name': 'PIPELINE_VAR_NAME',
'state': 'absent',
@ -34,7 +34,7 @@ class TestBucketPipelineVariableModule(ModuleTestCase):
set_module_args({
'client_id': 'ABC',
'client_secret': 'XXX',
'username': 'name',
'workspace': 'name',
'repository': 'repo',
'name': 'PIPELINE_VAR_NAME',
'state': 'present',
@ -52,7 +52,7 @@ class TestBucketPipelineVariableModule(ModuleTestCase):
def test_oauth_env_vars_params(self, *args):
with self.assertRaises(AnsibleExitJson):
set_module_args({
'username': 'name',
'workspace': 'name',
'repository': 'repo',
'name': 'PIPELINE_VAR_NAME',
'state': 'absent',
@ -100,7 +100,7 @@ class TestBucketPipelineVariableModule(ModuleTestCase):
set_module_args({
'client_id': 'ABC',
'client_secret': 'XXX',
'username': 'name',
'workspace': 'name',
'repository': 'repo',
'name': 'PIPELINE_VAR_NAME',
'value': '42',
@ -126,7 +126,7 @@ class TestBucketPipelineVariableModule(ModuleTestCase):
set_module_args({
'client_id': 'ABC',
'client_secret': 'XXX',
'username': 'name',
'workspace': 'name',
'repository': 'repo',
'name': 'PIPELINE_VAR_NAME',
'value': '42',
@ -150,7 +150,7 @@ class TestBucketPipelineVariableModule(ModuleTestCase):
set_module_args({
'client_id': 'ABC',
'client_secret': 'XXX',
'username': 'name',
'workspace': 'name',
'repository': 'repo',
'name': 'PIPELINE_VAR_NAME',
'value': '42',
@ -176,7 +176,7 @@ class TestBucketPipelineVariableModule(ModuleTestCase):
set_module_args({
'client_id': 'ABC',
'client_secret': 'XXX',
'username': 'name',
'workspace': 'name',
'repository': 'repo',
'name': 'PIPELINE_VAR_NAME',
'value': '42',
@ -202,7 +202,7 @@ class TestBucketPipelineVariableModule(ModuleTestCase):
set_module_args({
'client_id': 'ABC',
'client_secret': 'XXX',
'username': 'name',
'workspace': 'name',
'repository': 'repo',
'name': 'PIPELINE_VAR_NAME',
'value': '42',
@ -227,7 +227,7 @@ class TestBucketPipelineVariableModule(ModuleTestCase):
set_module_args({
'client_id': 'ABC',
'client_secret': 'XXX',
'username': 'name',
'workspace': 'name',
'repository': 'repo',
'name': 'PIPELINE_VAR_NAME',
'value': '42',
@ -253,7 +253,7 @@ class TestBucketPipelineVariableModule(ModuleTestCase):
set_module_args({
'client_id': 'ABC',
'client_secret': 'XXX',
'username': 'name',
'workspace': 'name',
'repository': 'repo',
'name': 'PIPELINE_VAR_NAME',
'state': 'absent',
@ -271,7 +271,7 @@ class TestBucketPipelineVariableModule(ModuleTestCase):
set_module_args({
'client_id': 'ABC',
'client_secret': 'XXX',
'username': 'name',
'workspace': 'name',
'repository': 'repo',
'name': 'PIPELINE_VAR_NAME',
'state': 'absent',
@ -295,7 +295,7 @@ class TestBucketPipelineVariableModule(ModuleTestCase):
set_module_args({
'client_id': 'ABC',
'client_secret': 'XXX',
'username': 'name',
'workspace': 'name',
'repository': 'repo',
'name': 'PIPELINE_VAR_NAME',
'state': 'absent',