Merging upstream version 9.4.0+dfsg.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

8 files changed, 99 insertions, 52 deletions

diff --git a/ansible_collections/netapp/azure/.github/workflows/codeql-analysis.yml b/ansible_collections/netapp/azure/.github/workflows/codeql-analysis.yml
new file mode 100644
index 000000000..eea54a872
--- /dev/null
+++ b/ansible_collections/netapp/azure/.github/workflows/codeql-analysis.yml
@@ -0,0 +1,71 @@
+# For most projects, this workflow file will not need changing; you simply need
+# to commit it to your repository.
+#
+# You may wish to alter this file to override the set of languages analyzed,
+# or to provide custom queries or build logic.
+#
+# ******** NOTE ********
+# We have attempted to detect the languages in your repository. Please check
+# the `language` matrix defined below to confirm you have the correct set of
+# supported CodeQL languages.
+#
+name: "CodeQL"
+
+on:
+  push:
+    branches: [ main ]
+  pull_request:
+    # The branches below must be a subset of the branches above
+    branches: [ main ]
+  schedule:
+    - cron: '34 20 * * 6'
+
+jobs:
+  analyze:
+    name: Analyze
+    runs-on: ubuntu-latest
+    permissions:
+      actions: read
+      contents: read
+      security-events: write
+
+    strategy:
+      fail-fast: false
+      matrix:
+        language: [ 'python' ]
+        # CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python' ]
+        # Learn more:
+        # https://docs.github.com/en/free-pro-team@latest/github/finding-security-vulnerabilities-and-errors-in-your-code/configuring-code-scanning#changing-the-languages-that-are-analyzed
+
+    steps:
+    - name: Checkout repository
+      uses: actions/checkout@v2
+
+    # Initializes the CodeQL tools for scanning.
+    - name: Initialize CodeQL
+      uses: github/codeql-action/init@v1
+      with:
+        languages: ${{ matrix.language }}
+        # If you wish to specify custom queries, you can do so here or in a config file.
+        # By default, queries listed here will override any specified in a config file.
+        # Prefix the list here with "+" to use these queries and those in the config file.
+        # queries: ./path/to/local/query, your-org/your-repo/queries@main
+
+    # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
+    # If this step fails, then you should remove it and run the build manually (see below)
+    - name: Autobuild
+      uses: github/codeql-action/autobuild@v1
+
+    # ℹ️ Command-line programs to run using the OS shell.
+    # 📚 https://git.io/JvXDl
+
+    # ✏️ If the Autobuild fails above, remove it and uncomment the following three lines
+    #    and modify them (or add more) to build your code if your project
+    #    uses a compiled language
+
+    #- run: |
+    #   make bootstrap
+    #   make release
+
+    - name: Perform CodeQL Analysis
+      uses: github/codeql-action/analyze@v1
diff --git a/ansible_collections/netapp/azure/.github/workflows/main.yml b/ansible_collections/netapp/azure/.github/workflows/main.yml
index 7786df5a7..37408fb67 100644
--- a/ansible_collections/netapp/azure/.github/workflows/main.yml
+++ b/ansible_collections/netapp/azure/.github/workflows/main.yml
@@ -11,12 +11,14 @@ jobs:
     name: Sanity (${{ matrix.ansible }} on Azure ANF)
     runs-on: ubuntu-latest
     strategy:
+      fail-fast: false
       matrix:
         ansible:
           - stable-2.9
           - stable-2.10
           - stable-2.11
           - stable-2.12
+          - stable-2.13
           - devel
         collection: [azure]
 
@@ -27,7 +29,8 @@ jobs:
       - name: Set up Python
         uses: actions/setup-python@v2
         with:
-          python-version: 3.8
+          # Ansible 2.14 requires 3.9 as a minimum
+          python-version: 3.9
 
       - name: Install ansible (${{ matrix.ansible }})
         run: pip install https://github.com/ansible/ansible/archive/${{ matrix.ansible }}.tar.gz --disable-pip-version-check
diff --git a/ansible_collections/netapp/azure/FILES.json b/ansible_collections/netapp/azure/FILES.json
index cbba60ea2..b91cf6173 100644
--- a/ansible_collections/netapp/azure/FILES.json
+++ b/ansible_collections/netapp/azure/FILES.json
@@ -60,7 +60,7 @@
    "name": "plugins/module_utils/azure_rm_netapp_common.py",
    "ftype": "file",
    "chksum_type": "sha256",
-   "chksum_sha256": "ad77c0d169b499b3bbff9bfc98607b329da4c0939a30b862523cc238dfa349c8",
+   "chksum_sha256": "7dffba3ae74d685e191305887df483f7bcded81cf80618a920c3609de0828777",
    "format": 1
   },
   {
@@ -459,7 +459,7 @@
    "name": "meta/runtime.yml",
    "ftype": "file",
    "chksum_type": "sha256",
-   "chksum_sha256": "57bdfe68549cbe4f7282f9937425595fee23b756980f10c7c0c2bcb298ac057d",
+   "chksum_sha256": "afa4e7501eb80db02661630c468c0dd0a410da1ddb0297b1cbb74fe23d1b6951",
    "format": 1
   },
   {
@@ -610,13 +610,6 @@
    "format": 1
   },
   {
-   "name": "changelogs/.plugin-cache.yaml",
-   "ftype": "file",
-   "chksum_type": "sha256",
-   "chksum_sha256": "5297a0a490809a3f9e664aebea58cf1b7c48af79e7ac4a9e1be5845359d7d016",
-   "format": 1
-  },
-  {
    "name": "changelogs/changelog.yaml",
    "ftype": "file",
    "chksum_type": "sha256",
@@ -627,7 +620,7 @@
    "name": "README.md",
    "ftype": "file",
    "chksum_type": "sha256",
-   "chksum_sha256": "3cb633ca474a7fb30d6f8c73956c921b1f3043850ff221fcf3d84afe4921696d",
+   "chksum_sha256": "c4071e1bc75bf65da6951045ea60d4bde7036937ac56ff73a32a95764fa9a4a3",
    "format": 1
   },
   {
@@ -659,10 +652,17 @@
    "format": 1
   },
   {
+   "name": ".github/workflows/codeql-analysis.yml",
+   "ftype": "file",
+   "chksum_type": "sha256",
+   "chksum_sha256": "b67ebd724c02ab0bc49f55fe9928691ce9000511f58d1b182245c8ea9fa4bc89",
+   "format": 1
+  },
+  {
    "name": ".github/workflows/main.yml",
    "ftype": "file",
    "chksum_type": "sha256",
-   "chksum_sha256": "b13e2320cd388d55ecad4a6b8785ae58481464d8b44ff6494c39ca04f48c72b5",
+   "chksum_sha256": "217f80de01b8091549fa87f7a89e7936f1d91abc6e0398aed2c85cac6deb0448",
    "format": 1
   },
   {
diff --git a/ansible_collections/netapp/azure/MANIFEST.json b/ansible_collections/netapp/azure/MANIFEST.json
index 4fcd3fa5e..ecfd4c592 100644
--- a/ansible_collections/netapp/azure/MANIFEST.json
+++ b/ansible_collections/netapp/azure/MANIFEST.json
@@ -2,7 +2,7 @@
  "collection_info": {
   "namespace": "netapp",
   "name": "azure",
-  "version": "21.10.0",
+  "version": "21.10.1",
   "authors": [
    "NetApp Ansible Team <ng-ansibleteam@netapp.com>"
   ],
@@ -30,7 +30,7 @@
   "name": "FILES.json",
   "ftype": "file",
   "chksum_type": "sha256",
-  "chksum_sha256": "c2d51ddefb3ce0ffdef8c468f22c2dbb09bc3c9828b31141ec8c85d8f37d0d59",
+  "chksum_sha256": "dac3f17953d3c381c15de48087a8d6d80a112c8f172006ed178a081fef9023c6",
   "format": 1
  },
  "format": 1
diff --git a/ansible_collections/netapp/azure/README.md b/ansible_collections/netapp/azure/README.md
index f56a07ead..05dcdd6dd 100644
--- a/ansible_collections/netapp/azure/README.md
+++ b/ansible_collections/netapp/azure/README.md
@@ -1,6 +1,7 @@
 [![Documentation](https://img.shields.io/badge/docs-brightgreen.svg)](https://docs.ansible.com/ansible/devel/collections/netapp/azure/index.html)
 ![example workflow](https://github.com/ansible-collections/netapp.azure/actions/workflows/main.yml/badge.svg)
 [![codecov](https://codecov.io/gh/ansible-collections/netapp.azure/branch/main/graph/badge.svg?token=weBYkksxSi)](https://codecov.io/gh/ansible-collections/netapp.azure)
+[![Discord](https://img.shields.io/discord/855068651522490400)](https://discord.gg/NetApp)
 =============================================================
 
 netapp.azure
@@ -26,7 +27,7 @@ collections:
 https://docs.ansible.com/ansible/devel/collections/netapp/azure/
 
 # Need help
-Join our Slack Channel at [Netapp.io](http://netapp.io/slack)
+Join our [Discord](https://discord.gg/NetApp) and look for our #ansible channel.
 
 # Requirements
 - python >= 2.7
diff --git a/ansible_collections/netapp/azure/changelogs/.plugin-cache.yaml b/ansible_collections/netapp/azure/changelogs/.plugin-cache.yaml
deleted file mode 100644
index 6e247d8f7..000000000
--- a/ansible_collections/netapp/azure/changelogs/.plugin-cache.yaml
+++ /dev/null
@@ -1,35 +0,0 @@
-plugins:
-  become: {}
-  cache: {}
-  callback: {}
-  cliconf: {}
-  connection: {}
-  httpapi: {}
-  inventory: {}
-  lookup: {}
-  module:
-    azure_rm_netapp_account:
-      description: Manage NetApp Azure Files Account
-      name: azure_rm_netapp_account
-      namespace: private.var.folders.zv.gm9l2n2n30g2k5tdmny65l_r0000gp.T.antsibull-changelogrmmpa_fx.collections.ansible_collections.netapp.azure.plugins.modules
-      version_added: 19.10.0
-    azure_rm_netapp_capacity_pool:
-      description: Manage NetApp Azure Files capacity pool
-      name: azure_rm_netapp_capacity_pool
-      namespace: private.var.folders.zv.gm9l2n2n30g2k5tdmny65l_r0000gp.T.antsibull-changelogrmmpa_fx.collections.ansible_collections.netapp.azure.plugins.modules
-      version_added: 19.10.0
-    azure_rm_netapp_snapshot:
-      description: Manage NetApp Azure Files Snapshot
-      name: azure_rm_netapp_snapshot
-      namespace: private.var.folders.zv.gm9l2n2n30g2k5tdmny65l_r0000gp.T.antsibull-changelogrmmpa_fx.collections.ansible_collections.netapp.azure.plugins.modules
-      version_added: 19.10.0
-    azure_rm_netapp_volume:
-      description: Manage NetApp Azure Files Volume
-      name: azure_rm_netapp_volume
-      namespace: private.var.folders.zv.gm9l2n2n30g2k5tdmny65l_r0000gp.T.antsibull-changelogrmmpa_fx.collections.ansible_collections.netapp.azure.plugins.modules
-      version_added: 19.10.0
-  netconf: {}
-  shell: {}
-  strategy: {}
-  vars: {}
-version: 21.8.0
diff --git a/ansible_collections/netapp/azure/meta/runtime.yml b/ansible_collections/netapp/azure/meta/runtime.yml
index a6ed3542d..fc582847b 100644
--- a/ansible_collections/netapp/azure/meta/runtime.yml
+++ b/ansible_collections/netapp/azure/meta/runtime.yml
@@ -1,5 +1,5 @@
 ---
-requires_ansible: ">=2.9.10"
+requires_ansible: ">=2.13"
 action_groups:
   netapp_azure:
     - azure_rm_netapp_account
diff --git a/ansible_collections/netapp/azure/plugins/module_utils/azure_rm_netapp_common.py b/ansible_collections/netapp/azure/plugins/module_utils/azure_rm_netapp_common.py
index 716e4fb95..166327088 100644
--- a/ansible_collections/netapp/azure/plugins/module_utils/azure_rm_netapp_common.py
+++ b/ansible_collections/netapp/azure/plugins/module_utils/azure_rm_netapp_common.py
@@ -14,7 +14,7 @@ import sys
 
 HAS_AZURE_COLLECTION = True
 NEW_STYLE = None
-COLLECTION_VERSION = "21.10.0"
+COLLECTION_VERSION = "21.10.1"
 IMPORT_ERRORS = []
 SDK_VERSION = "0.0.0"
 
@@ -26,6 +26,11 @@ else:
     except ImportError as exc:
         IMPORT_ERRORS.append(str(exc))
         HAS_AZURE_COLLECTION = False
+
+        class AzureRMModuleBase:
+            def __init__(self, derived_arg_spec, required_if=None, supports_check_mode=False, supports_tags=True, **kwargs):
+                raise ImportError(IMPORT_ERRORS)
+
     except SyntaxError as exc:
         # importing Azure collection fails with python 2.6
         if sys.version_info < (2, 8):
@@ -40,6 +45,8 @@ try:
     NEW_STYLE = True
 except ImportError as exc:
     IMPORT_ERRORS.append(str(exc))
+
+if NEW_STYLE is None:
     try:
         from azure.mgmt.netapp import AzureNetAppFilesManagementClient      # 0.10.0 or older
         NEW_STYLE = False