Merge pull request ansible-collections#439 from GomathiselviS/gha_fix

Cleanup tox.ini and GHA
mariolenz · Nov 11, 2023 · a244297 · a244297
2 parents 79e8a98 + db38f3b
commit a244297
Show file tree

Hide file tree

Showing 151 changed files with 1,278 additions and 553 deletions.
diff --git a/.ansible-lint b/.ansible-lint
@@ -0,0 +1,10 @@
+---
+profile: production
+
+exclude_paths:
+  - tests/integration
+  - tests/sanity
+  - modules.yaml
+
+skip_list:
+ - yaml[indentation]
diff --git a/.github/workflows/changelog.yml → .github/workflows/changelog.yaml b/.github/workflows/changelog.yml → .github/workflows/changelog.yaml
@@ -1,8 +1,8 @@
 ---
-name: CI
+name: Changelog
 
 concurrency:
-  group: '${{ github.workflow }} @ ${{ github.sha }}'
+  group: ${{ github.workflow }}-${{ github.ref }}
   cancel-in-progress: true
 
 on:

diff --git a/.github/workflows/linters.yml → .github/workflows/linters.yaml b/.github/workflows/linters.yml → .github/workflows/linters.yaml
@@ -1,15 +1,13 @@
 name: Linters
 concurrency:
-  group: ${{ github.head_ref }}
+  group: ${{ github.workflow }}-${{ github.ref }}
   cancel-in-progress: true
 
 on:
   pull_request:
     types:
       - opened
       - reopened
-      - labeled
-      - unlabeled
       - synchronize
     branches:
       - main
@@ -20,3 +18,10 @@ on:
 jobs:
   linters:
     uses: ansible-network/github_actions/.github/workflows/tox-linters.yml@main
+  ansible-lint:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: ansible-network/github_actions/.github/actions/checkout_dependency@main
+
+      - name: Run ansible-lint
+        uses: ansible/[email protected]
diff --git a/.github/workflows/ansible-test.yml → .github/workflows/sanity-tests.yaml b/.github/workflows/ansible-test.yml → .github/workflows/sanity-tests.yaml
@@ -30,7 +30,7 @@
 #    it has to adhere to Python compatibility and CI testing requirements described in
 #    https://docs.ansible.com/ansible/latest/community/collection_contributors/collection_requirements.html.
 
-name: CI
+name: Sanity tests
 on:
   # Run CI against all pushes (direct commits, also merged PRs), Pull Requests
   push:
@@ -75,12 +75,11 @@ jobs:
           # Add new versions announced in
           # https://github.com/ansible-collections/news-for-maintainers in a timely manner,
           # consider dropping testing against EOL versions and versions you don't support.
-          - stable-2.13
           - stable-2.14
           - stable-2.15
-        # - stable-2.16
-        # - devel
-        # - milestone
+          - stable-2.16
+          # - devel
+          # - milestone
     # Ansible-test on various stable branches does not yet work well with cgroups v2.
     # Since ubuntu-latest now uses Ubuntu 22.04, we need to fall back to the ubuntu-20.04
     # image for these stable branches. The list of branches where this is necessary will

diff --git a/changelogs/fragments/gha_cleanup_version_update.yaml b/changelogs/fragments/gha_cleanup_version_update.yaml
@@ -0,0 +1,6 @@
+---
+breaking_changes:
+- "Remove support for ansible-core < 2.14"
+trivial:
+- "Organize GitHub workflows"
+- "ansible-lint and isort fixes"
diff --git a/galaxy.yml b/galaxy.yml
@@ -1,20 +1,20 @@
+---
 namespace: vmware
 name: vmware_rest
 readme: README.md
-version: null
+version: 3.0.0
 authors:
-- Ansible (https://github.com/ansible)
-description:
-license:
+  - Ansible (https://github.com/ansible)
+description: VMware collection for Ansible
 license_file: LICENSE
 tags:
-- cloud
-- vmware
-- virtualization
+  - cloud
+  - vmware
+  - virtualization
 dependencies:
-  cloud.common: '>=2.0.4,<3.0.0'
+  cloud.common: ">=2.0.4,<3.0.0"
 repository: https://github.com/ansible-collections/vmware.vmware_rest.git
 homepage: https://github.com/ansible-collections/vmware.vmware_rest
 issues: https://github.com/ansible-collections/vmware.vmware_rest/issues?q=is%3Aissue+is%3Aopen+sort%3Aupdated-desc
 build_ignore:
-  - 'config/*'
+  - config/*
diff --git a/meta/runtime.yml b/meta/runtime.yml
@@ -1,2 +1,2 @@
 ---
-requires_ansible: '>=2.9.10'
+requires_ansible: ">=2.14.0"
diff --git a/plugins/lookup/cluster_moid.py b/plugins/lookup/cluster_moid.py
@@ -29,9 +29,9 @@
 - name: set connection info
   ansible.builtin.set_fact:
     connection_args:
-        vcenter_hostname: "vcenter.test"
-        vcenter_username: "[email protected]"
-        vcenter_password: "1234"
+      vcenter_hostname: "vcenter.test"
+      vcenter_username: "[email protected]"
+      vcenter_password: "1234"
 
 - name: lookup MoID of the object
   ansible.builtin.debug: msg="{{ lookup('vmware.vmware_rest.cluster_moid', '/my_dc/host/my_cluster', **connection_args) }}"
@@ -49,13 +49,13 @@
 """
 
 
+from ansible_collections.cloud.common.plugins.plugin_utils.turbo.lookup import (
+    TurboLookupBase as LookupBase,
+)
 from ansible_collections.vmware.vmware_rest.plugins.plugin_utils.lookup import (
     Lookup,
     get_credentials,
 )
-from ansible_collections.cloud.common.plugins.plugin_utils.turbo.lookup import (
-    TurboLookupBase as LookupBase,
-)
 
 
 class LookupModule(LookupBase):

diff --git a/plugins/lookup/datacenter_moid.py b/plugins/lookup/datacenter_moid.py
@@ -49,13 +49,13 @@
 """
 
 
+from ansible_collections.cloud.common.plugins.plugin_utils.turbo.lookup import (
+    TurboLookupBase as LookupBase,
+)
 from ansible_collections.vmware.vmware_rest.plugins.plugin_utils.lookup import (
     Lookup,
     get_credentials,
 )
-from ansible_collections.cloud.common.plugins.plugin_utils.turbo.lookup import (
-    TurboLookupBase as LookupBase,
-)
 
 
 class LookupModule(LookupBase):

diff --git a/plugins/lookup/datastore_moid.py b/plugins/lookup/datastore_moid.py
@@ -49,13 +49,13 @@
 """
 
 
+from ansible_collections.cloud.common.plugins.plugin_utils.turbo.lookup import (
+    TurboLookupBase as LookupBase,
+)
 from ansible_collections.vmware.vmware_rest.plugins.plugin_utils.lookup import (
     Lookup,
     get_credentials,
 )
-from ansible_collections.cloud.common.plugins.plugin_utils.turbo.lookup import (
-    TurboLookupBase as LookupBase,
-)
 
 
 class LookupModule(LookupBase):

diff --git a/plugins/lookup/folder_moid.py b/plugins/lookup/folder_moid.py
@@ -49,13 +49,13 @@
 """
 
 
+from ansible_collections.cloud.common.plugins.plugin_utils.turbo.lookup import (
+    TurboLookupBase as LookupBase,
+)
 from ansible_collections.vmware.vmware_rest.plugins.plugin_utils.lookup import (
     Lookup,
     get_credentials,
 )
-from ansible_collections.cloud.common.plugins.plugin_utils.turbo.lookup import (
-    TurboLookupBase as LookupBase,
-)
 
 
 class LookupModule(LookupBase):

diff --git a/plugins/lookup/host_moid.py b/plugins/lookup/host_moid.py
@@ -49,13 +49,13 @@
 """
 
 
+from ansible_collections.cloud.common.plugins.plugin_utils.turbo.lookup import (
+    TurboLookupBase as LookupBase,
+)
 from ansible_collections.vmware.vmware_rest.plugins.plugin_utils.lookup import (
     Lookup,
     get_credentials,
 )
-from ansible_collections.cloud.common.plugins.plugin_utils.turbo.lookup import (
-    TurboLookupBase as LookupBase,
-)
 
 
 class LookupModule(LookupBase):

diff --git a/plugins/lookup/network_moid.py b/plugins/lookup/network_moid.py
@@ -49,13 +49,13 @@
 """
 
 
+from ansible_collections.cloud.common.plugins.plugin_utils.turbo.lookup import (
+    TurboLookupBase as LookupBase,
+)
 from ansible_collections.vmware.vmware_rest.plugins.plugin_utils.lookup import (
     Lookup,
     get_credentials,
 )
-from ansible_collections.cloud.common.plugins.plugin_utils.turbo.lookup import (
-    TurboLookupBase as LookupBase,
-)
 
 
 class LookupModule(LookupBase):

diff --git a/plugins/lookup/resource_pool_moid.py b/plugins/lookup/resource_pool_moid.py
@@ -49,13 +49,13 @@
 """
 
 
+from ansible_collections.cloud.common.plugins.plugin_utils.turbo.lookup import (
+    TurboLookupBase as LookupBase,
+)
 from ansible_collections.vmware.vmware_rest.plugins.plugin_utils.lookup import (
     Lookup,
     get_credentials,
 )
-from ansible_collections.cloud.common.plugins.plugin_utils.turbo.lookup import (
-    TurboLookupBase as LookupBase,
-)
 
 
 class LookupModule(LookupBase):

diff --git a/plugins/lookup/vm_moid.py b/plugins/lookup/vm_moid.py
@@ -49,13 +49,13 @@
 """
 
 
+from ansible_collections.cloud.common.plugins.plugin_utils.turbo.lookup import (
+    TurboLookupBase as LookupBase,
+)
 from ansible_collections.vmware.vmware_rest.plugins.plugin_utils.lookup import (
     Lookup,
     get_credentials,
 )
-from ansible_collections.cloud.common.plugins.plugin_utils.turbo.lookup import (
-    TurboLookupBase as LookupBase,
-)
 
 
 class LookupModule(LookupBase):

diff --git a/plugins/module_utils/vmware_rest.py b/plugins/module_utils/vmware_rest.py
@@ -32,7 +32,6 @@
 import importlib
 import json
 import re
-
 import urllib.parse
 
 from ansible.module_utils.basic import missing_required_lib
@@ -271,7 +270,7 @@ async def update_changed_flag(data, status, operation):
 
 
 async def list_devices(session, url):
-    existing_entries = []
+    pass
 
     async with session.get(url) as resp:
         _json = await resp.json()

diff --git a/plugins/modules/appliance_access_consolecli.py b/plugins/modules/appliance_access_consolecli.py
@@ -115,24 +115,29 @@
     AnsibleModule.collection_name = "vmware.vmware_rest"
 except ImportError:
     from ansible.module_utils.basic import AnsibleModule
+
 from ansible_collections.vmware.vmware_rest.plugins.module_utils.vmware_rest import (
     exists,
     gen_args,
     get_subdevice_type,
     open_session,
     prepare_payload,
-    update_changed_flag,
     session_timeout,
+    update_changed_flag,
 )
 
 
 def prepare_argument_spec():
     argument_spec = {
         "vcenter_hostname": dict(
-            type="str", required=True, fallback=(env_fallback, ["VMWARE_HOST"]),
+            type="str",
+            required=True,
+            fallback=(env_fallback, ["VMWARE_HOST"]),
         ),
         "vcenter_username": dict(
-            type="str", required=True, fallback=(env_fallback, ["VMWARE_USER"]),
+            type="str",
+            required=True,
+            fallback=(env_fallback, ["VMWARE_USER"]),
         ),
         "vcenter_password": dict(
             type="str",
@@ -199,7 +204,6 @@ def build_url(params):
 
 
 async def entry_point(module, session):
-
     if module.params["state"] == "present":
         if "_create" in globals():
             operation = "create"

diff --git a/plugins/modules/appliance_access_consolecli_info.py b/plugins/modules/appliance_access_consolecli_info.py
@@ -103,21 +103,26 @@
     AnsibleModule.collection_name = "vmware.vmware_rest"
 except ImportError:
     from ansible.module_utils.basic import AnsibleModule
+
 from ansible_collections.vmware.vmware_rest.plugins.module_utils.vmware_rest import (
     gen_args,
     open_session,
-    update_changed_flag,
     session_timeout,
+    update_changed_flag,
 )
 
 
 def prepare_argument_spec():
     argument_spec = {
         "vcenter_hostname": dict(
-            type="str", required=True, fallback=(env_fallback, ["VMWARE_HOST"]),
+            type="str",
+            required=True,
+            fallback=(env_fallback, ["VMWARE_HOST"]),
         ),
         "vcenter_username": dict(
-            type="str", required=True, fallback=(env_fallback, ["VMWARE_USER"]),
+            type="str",
+            required=True,
+            fallback=(env_fallback, ["VMWARE_USER"]),
         ),
         "vcenter_password": dict(
             type="str",

diff --git a/plugins/modules/appliance_access_dcui.py b/plugins/modules/appliance_access_dcui.py
@@ -115,24 +115,29 @@
     AnsibleModule.collection_name = "vmware.vmware_rest"
 except ImportError:
     from ansible.module_utils.basic import AnsibleModule
+
 from ansible_collections.vmware.vmware_rest.plugins.module_utils.vmware_rest import (
     exists,
     gen_args,
     get_subdevice_type,
     open_session,
     prepare_payload,
-    update_changed_flag,
     session_timeout,
+    update_changed_flag,
 )
 
 
 def prepare_argument_spec():
     argument_spec = {
         "vcenter_hostname": dict(
-            type="str", required=True, fallback=(env_fallback, ["VMWARE_HOST"]),
+            type="str",
+            required=True,
+            fallback=(env_fallback, ["VMWARE_HOST"]),
         ),
         "vcenter_username": dict(
-            type="str", required=True, fallback=(env_fallback, ["VMWARE_USER"]),
+            type="str",
+            required=True,
+            fallback=(env_fallback, ["VMWARE_USER"]),
         ),
         "vcenter_password": dict(
             type="str",
@@ -197,7 +202,6 @@ def build_url(params):
 
 
 async def entry_point(module, session):
-
     if module.params["state"] == "present":
         if "_create" in globals():
             operation = "create"