Merge pull request #606 from linode/dev

Release v0.31.2
linode · Oct 9, 2024 · eddec39 · eddec39
2 parents 3534c91 + 50724f5
commit eddec39
Show file tree

Hide file tree

Showing 15 changed files with 76 additions and 45 deletions.
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -3,5 +3,8 @@ updates:
   - package-ecosystem: pip
     directory: "/"
     schedule:
-      interval: daily
-    open-pull-requests-limit: 10
+      interval: weekly
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: weekly
diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml
@@ -3,14 +3,14 @@ name: Run Documentation Validation
 on: pull_request
 
 jobs:
-  run-docs-validation:
+  test-templated-docs:
     runs-on: ubuntu-latest
     defaults:
       run:
         working-directory: .ansible/collections/ansible_collections/linode/cloud
     steps:
       - name: checkout repo
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           path: .ansible/collections/ansible_collections/linode/cloud
 
@@ -21,7 +21,7 @@ jobs:
         run: sudo apt-get install -y make
 
       - name: setup python 3
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
           python-version: '3.x'
 
@@ -45,3 +45,31 @@ jobs:
 
       - name: clean up
         run: rm -rf tmp
+
+  test-injected-docs:
+    runs-on: ubuntu-latest
+    defaults:
+      run:
+        working-directory: .ansible/collections/ansible_collections/linode/cloud
+    steps:
+      - name: checkout repo
+        uses: actions/checkout@v4
+        with:
+          path: .ansible/collections/ansible_collections/linode/cloud
+
+      - name: update packages
+        run: sudo apt-get update -y
+
+      - name: install packages
+        run: sudo apt-get install -y make
+
+      - name: setup python 3
+        uses: actions/setup-python@v5
+        with:
+          python-version: '3.x'
+
+      - name: install dependencies
+        run: make deps
+
+      - name: inject and validate new docs
+        run: make inject
diff --git a/.github/workflows/integration-tests-pr.yml b/.github/workflows/integration-tests-pr.yml
@@ -32,7 +32,7 @@ jobs:
 
       # Check out merge commit
       - name: Checkout PR
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           ref: ${{ inputs.sha }}
           path: .ansible/collections/ansible_collections/linode/cloud
@@ -47,7 +47,7 @@ jobs:
         run: sudo apt-get install -y build-essential
 
       - name: setup python 3
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
           python-version: '3.x'
 
@@ -108,7 +108,7 @@ jobs:
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
-      - uses: actions/github-script@v6
+      - uses: actions/github-script@v7
         id: update-check-run
         if: ${{ inputs.pull_request_number != '' && fromJson(steps.commit-hash.outputs.data).repository.pullRequest.headRef.target.oid == inputs.sha }}
         env:

diff --git a/.github/workflows/integration-tests.yml b/.github/workflows/integration-tests.yml
@@ -17,7 +17,7 @@ jobs:
         working-directory: .ansible/collections/ansible_collections/linode/cloud
     steps:
       - name: Checkout repo
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           path: .ansible/collections/ansible_collections/linode/cloud
           fetch-depth: 0
@@ -77,7 +77,7 @@ jobs:
 
   process-upload-report:
     runs-on: ubuntu-latest
-    needs: [run-tests]
+    needs: [integration-tests]
     if: always() && github.repository == 'linode/ansible_linode'
 
     steps:

diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
@@ -7,10 +7,10 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: checkout repo
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: setup python 3
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
           python-version: '3.x'
 

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -14,7 +14,7 @@ jobs:
         working-directory: .ansible/collections/ansible_collections/linode/cloud
     steps:
       - name: checkout repo
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           path: .ansible/collections/ansible_collections/linode/cloud
 
@@ -25,7 +25,7 @@ jobs:
         run: sudo apt-get install -y build-essential
 
       - name: setup python 3
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
           python-version: '3.x'
 

diff --git a/docs/modules/lke_type_list.md b/docs/modules/lke_type_list.md
@@ -61,17 +61,17 @@ List and filter on LKE Types.
                 },
                 "region_prices": [
                     {
-                        "id": "id-cgk"
+                        "id": "id-cgk",
                         "hourly": 0.108,
                         "monthly": 72.0
                     },
                     {
-                        "id": "br-gru"
+                        "id": "br-gru",
                         "hourly": 0.126,
                         "monthly": 84.0
                     }
                 ],
-                "transfer": 0,
+                "transfer": 0
             }
         ]
         ```

diff --git a/docs/modules/network_transfer_prices_list.md b/docs/modules/network_transfer_prices_list.md
@@ -60,7 +60,7 @@ List and filter on Network Transfer Prices.
                     "monthly": null
                 },
                 "region_prices": [],
-                "transfer": 0,
+                "transfer": 0
             }
         ]
         ```

diff --git a/docs/modules/nodebalancer_type_list.md b/docs/modules/nodebalancer_type_list.md
@@ -61,17 +61,17 @@ List and filter on Node Balancer Types.
                 },
                 "region_prices": [
                     {
-                        "id": "id-cgk"
+                        "id": "id-cgk",
                         "hourly": 0.018,
                         "monthly": 12.0
                     },
                     {
-                        "id": "br-gru"
+                        "id": "br-gru",
                         "hourly": 0.021,
                         "monthly": 14.0
                     }
                 ],
-                "transfer": 0,
+                "transfer": 0
             }
         ]
         ```

diff --git a/docs/modules/volume_type_list.md b/docs/modules/volume_type_list.md
@@ -61,17 +61,17 @@ List and filter on Volume Types.
                 },
                 "region_prices": [
                     {
-                        "id": "id-cgk"
+                        "id": "id-cgk",
                         "hourly": 0.00018,
                         "monthly": 0.12
                     },
                     {
-                        "id": "br-gru"
+                        "id": "br-gru",
                         "hourly": 0.00021,
                         "monthly": 0.14
                     }
                 ],
-                "transfer": 0,
+                "transfer": 0
             }
         ]
         ```

diff --git a/plugins/module_utils/doc_fragments/lke_type_list.py b/plugins/module_utils/doc_fragments/lke_type_list.py
@@ -20,16 +20,16 @@
         },
         "region_prices": [
             {
-                "id": "id-cgk"
+                "id": "id-cgk",
                 "hourly": 0.108,
                 "monthly": 72.0
             },
             {
-                "id": "br-gru"
+                "id": "br-gru",
                 "hourly": 0.126,
                 "monthly": 84.0
             }
         ],
-        "transfer": 0,
+        "transfer": 0
     }
 ]''']
diff --git a/plugins/module_utils/doc_fragments/network_transfer_prices_list.py b/plugins/module_utils/doc_fragments/network_transfer_prices_list.py
@@ -19,6 +19,6 @@
             "monthly": null
         },
         "region_prices": [],
-        "transfer": 0,
+        "transfer": 0
     }
 ]''']
diff --git a/plugins/module_utils/doc_fragments/nodebalancer_type_list.py b/plugins/module_utils/doc_fragments/nodebalancer_type_list.py
@@ -20,16 +20,16 @@
         },
         "region_prices": [
             {
-                "id": "id-cgk"
+                "id": "id-cgk",
                 "hourly": 0.018,
                 "monthly": 12.0
             },
             {
-                "id": "br-gru"
+                "id": "br-gru",
                 "hourly": 0.021,
                 "monthly": 14.0
             }
         ],
-        "transfer": 0,
+        "transfer": 0
     }
 ]''']
diff --git a/plugins/module_utils/doc_fragments/volume_type_list.py b/plugins/module_utils/doc_fragments/volume_type_list.py
@@ -20,16 +20,16 @@
         },
         "region_prices": [
             {
-                "id": "id-cgk"
+                "id": "id-cgk",
                 "hourly": 0.00018,
                 "monthly": 0.12
             },
             {
-                "id": "br-gru"
+                "id": "br-gru",
                 "hourly": 0.00021,
                 "monthly": 0.14
             }
         ],
-        "transfer": 0,
+        "transfer": 0
     }
 ]''']
diff --git a/tests/integration/targets/instance_config_disk/tasks/main.yaml b/tests/integration/targets/instance_config_disk/tasks/main.yaml
@@ -12,7 +12,7 @@
         disks:
           - label: test-disk
             filesystem: ext4
-            size: 10
+            size: 100
         configs:
           - label: cool-config
             comments: really cool config
@@ -38,7 +38,7 @@
         that:
           - create.changed
           - create.disks[0].label == 'test-disk'
-          - create.disks[0].size == 10
+          - create.disks[0].size == 100
           - create.disks[0].filesystem == 'ext4'
 
           - create.configs[0].comments == 'really cool config'
@@ -63,7 +63,7 @@
         disks:
           - label: test-disk
             filesystem: ext4
-            size: 10
+            size: 100
         configs:
           - label: cool-config
             comments: really cool config
@@ -97,7 +97,7 @@
         disks:
           - label: test-disk
             filesystem: ext4
-            size: 10
+            size: 100
         configs:
           - label: cool-config
             comments: really cool config but slightly different
@@ -118,7 +118,7 @@
         that:
           - update_config.changed
           - update_config.disks[0].label == 'test-disk'
-          - update_config.disks[0].size == 10
+          - update_config.disks[0].size == 100
           - update_config.disks[0].filesystem == 'ext4'
 
           - update_config.configs[0].comments == 'really cool config but slightly different'
@@ -132,7 +132,7 @@
         booted: false
         disks:
           - label: test-disk
-            size: 11
+            size: 101
         state: present
       register: resize
 
@@ -142,7 +142,7 @@
           - resize.changed
           - resize.configs|length == 0
           - resize.disks[0].label == 'test-disk'
-          - resize.disks[0].size == 11
+          - resize.disks[0].size == 101
 
     - name: Try to update the disk
       linode.cloud.instance:
@@ -152,7 +152,7 @@
         booted: false
         disks:
           - label: test-disk
-            size: 11
+            size: 101
             filesystem: ntfs
         state: present
       register: update_disk_fail
@@ -167,7 +167,7 @@
         booted: false
         disks:
           - label: test-disk
-            size: 11
+            size: 101
         state: present
       register: disk_conflict
       failed_when: '"mutually exclusive" not in disk_conflict.msg'
@@ -180,7 +180,7 @@
         booted: true
         disks:
           - label: test-disk
-            size: 11
+            size: 101
 
           - label: boot-disk
             size: 4096
@@ -203,7 +203,7 @@
           - boot.changed
           - boot.instance.status == 'running'
           - boot.disks[0].label == 'test-disk'
-          - boot.disks[0].size == 11
+          - boot.disks[0].size == 101
           - boot.disks[1].label == 'boot-disk'
           - boot.disks[1].size == 4096
           - boot.configs[0].label == 'boot-config'