Skip to content

Commit cc29c72

Browse files
Merge pull request #643 from linode/dev
Release v0.34.1
2 parents e5e7e9f + 5309ad0 commit cc29c72

File tree

11 files changed

+37
-30
lines changed

11 files changed

+37
-30
lines changed

.github/workflows/docs.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
- name: setup python 3
2121
uses: actions/setup-python@v5
2222
with:
23-
python-version: '3.x'
23+
python-version: ${{ env.DEFAULT_PYTHON_VERSION }}
2424

2525
- name: install dependencies
2626
run: make deps

.github/workflows/integration-tests-pr.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,14 @@ on:
22
pull_request:
33
workflow_dispatch:
44
inputs:
5-
tests:
6-
description: 'The tests to run.'
5+
test_suite:
6+
description: "Specify test suite to run from the 'tests/integration/targets' directory. Examples: 'domain_basic', 'image_basic', etc. If not provided, all suites are executed"
77
required: false
88
sha:
9-
description: 'The hash value of the commit.'
9+
description: 'Specify commit hash to test. This value is mandatory to ensure the tests run against a specific commit'
1010
required: true
1111
pull_request_number:
12-
description: 'The number of the PR.'
12+
description: 'Specify pull request number associated with the commit. Optional, but recommended when providing a commit hash (sha)'
1313
required: false
1414

1515
name: Integration tests on PR
@@ -26,7 +26,7 @@ jobs:
2626
- uses: actions-ecosystem/action-regex-match@v2
2727
id: disallowed-char-check
2828
with:
29-
text: ${{ inputs.tests }}
29+
text: ${{ inputs.test_suite }}
3030
regex: '[^a-z0-9_]'
3131
flags: gi
3232

@@ -56,7 +56,7 @@ jobs:
5656
- name: replace existing keys
5757
run: rm -rf ~/.ansible/test && mkdir -p ~/.ansible/test && ssh-keygen -m PEM -q -t rsa -N '' -f ~/.ansible/test/id_rsa
5858

59-
- run: make deps && make TEST_ARGS="-v ${{ inputs.tests }}" test
59+
- run: make deps && make TEST_SUITE="${{ inputs.test_suite }}" test-int
6060
if: ${{ steps.disallowed-char-check.outputs.match == '' }}
6161
env:
6262
LINODE_API_TOKEN: ${{ secrets.DX_LINODE_TOKEN }}

.github/workflows/integration-tests.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@ on:
44
workflow_dispatch:
55
inputs:
66
python-version:
7-
description: 'Specify Python version to use'
7+
description: 'Specify the Python version to use for running tests. Leave empty to use the default Python version configured in the environment'
88
required: false
99
run-eol-python-version:
10-
description: 'Run EOL python version?'
10+
description: 'Indicates whether to run tests using an End-of-Life (EOL) Python version. Defaults to "false". Choose "true" to include tests for deprecated Python versions'
1111
required: false
1212
default: 'false'
1313
type: choice
@@ -21,7 +21,7 @@ on:
2121

2222
env:
2323
DEFAULT_PYTHON_VERSION: "3.10"
24-
EOL_PYTHON_VERSION: "3.8"
24+
EOL_PYTHON_VERSION: "3.9"
2525
EXIT_STATUS: 0
2626

2727
jobs:
@@ -92,7 +92,7 @@ jobs:
9292
python-version: '3.x'
9393

9494
- name: Install Python dependencies
95-
run: pip3 install requests wheel boto3
95+
run: pip3 install requests wheel boto3==1.35.99
9696

9797
# Create directory if it doesn't exist
9898
- name: Create output directory

.github/workflows/labeler.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
uses: actions/checkout@v4
2222
-
2323
name: Run Labeler
24-
uses: crazy-max/ghaction-github-labeler@b54af0c25861143e7c8813d7cbbf46d2c341680c
24+
uses: crazy-max/ghaction-github-labeler@31674a3852a9074f2086abcf1c53839d466a47e7
2525
with:
2626
github-token: ${{ secrets.GITHUB_TOKEN }}
2727
yaml-file: .github/labels.yml

.github/workflows/nightly-smoke-tests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ jobs:
4848
- name: Run smoke tests
4949
id: smoke_tests
5050
run: |
51-
make smoketest
51+
make test-smoke
5252
env:
5353
LINODE_API_TOKEN: ${{ secrets.DX_LINODE_TOKEN }}
5454

.github/workflows/unit-tests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,4 +33,4 @@ jobs:
3333

3434
- name: Run unit tests
3535
run: |
36-
make unittest
36+
make test-unit

Makefile

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ TEST_API_VERSION ?= v4beta
88
TEST_API_CA ?=
99

1010
TEST_ARGS := -v
11+
TEST_SUITE :=
1112
INTEGRATION_CONFIG := ./tests/integration/integration_config.yml
1213

1314
clean:
@@ -63,7 +64,7 @@ gendocs:
6364
integration-test: create-integration-config create-e2e-firewall
6465
@echo "Running Integration Test(s)..."
6566
{ \
66-
ansible-test integration $(TEST_ARGS); \
67+
ansible-test integration $(TEST_ARGS) $(TEST_SUITE); \
6768
TEST_EXIT_CODE=$$?; \
6869
make delete-e2e-firewall; \
6970
exit $$TEST_EXIT_CODE; \
@@ -95,17 +96,17 @@ delete-e2e-firewall: update-test-submodules
9596
fi
9697

9798
update-test-submodules:
98-
@git submodule update --init
99+
@git submodule update --init --recursive
99100

100-
test: integration-test
101+
test-int: integration-test
101102

102103
testall:
103104
./scripts/test_all.sh
104105

105-
smoketest:
106+
test-smoke:
106107
./scripts/test_basic_smoke.sh
107108

108-
unittest:
109+
test-unit:
109110
ansible-test units --target-python default
110111

111112

docs/inventory/instance.rst

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ Synopsis
1414

1515
Reads instance inventories from Linode.
1616

17-
Uses a YAML configuration file that ends with linode.(yml|yaml).
17+
Uses a YAML configuration file that ends with linode.(yml\|yaml).
1818

1919
Linode labels are used by default as the hostnames.
2020

@@ -76,19 +76,19 @@ Parameters
7676

7777

7878
**parent_group (type=str):**
79-
\• parent group for keyed group.
79+
\• parent group for keyed group
8080

8181

8282
**prefix (type=str):**
83-
\• A keyed group name will start with this prefix.
83+
\• A keyed group name will start with this prefix
8484

8585

8686
**separator (type=str, default=_):**
87-
\• separator used to build the keyed group name.
87+
\• separator used to build the keyed group name
8888

8989

9090
**key (type=str):**
91-
\• The key from input dictionary used to generate groups.
91+
\• The key from input dictionary used to generate groups
9292

9393

9494
**default_value (type=str):**
@@ -98,7 +98,7 @@ Parameters
9898

9999

100100
**trailing_separator (type=bool, default=True):**
101-
\• Set this option to :literal:`false` to omit the :literal:`keyed\_groups[].separator` after the host variable when the value is an empty string.
101+
\• Set this option to :literal:`False` to omit the :literal:`keyed\_groups[].separator` after the host variable when the value is an empty string.
102102

103103
\• This option is mutually exclusive with :literal:`keyed\_groups[].default\_value`.
104104

@@ -109,13 +109,13 @@ Parameters
109109

110110

111111
**leading_separator (type=boolean, default=True):**
112-
\• Use in conjunction with :literal:`keyed\_groups`.
112+
\• Use in conjunction with keyed\_groups.
113113

114114
\• By default, a keyed group that does not have a prefix or a separator provided will have a name that starts with an underscore.
115115

116-
\• This is because the default prefix is :literal:`""` and the default separator is :literal:`"\_"`.
116+
\• This is because the default prefix is "" and the default separator is "\_".
117117

118-
\• Set this option to :literal:`false` to omit the leading underscore (or other separator) if no prefix is given.
118+
\• Set this option to False to omit the leading underscore (or other separator) if no prefix is given.
119119

120120
\• If the group name is derived from a mapping the separator is still used to concatenate the items.
121121

plugins/module_utils/linode_common.py

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,10 @@
2424
)
2525

2626
try:
27-
from linode_api4 import VPC, ApiError
27+
from linode_api4 import (
28+
VPC,
29+
ApiError,
30+
)
2831
from linode_api4 import Base as LinodeAPIType
2932
from linode_api4 import (
3033
Image,

requirements.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
linode-api4>=5.24.0
22
polling==0.3.2
3-
ansible-specdoc>=0.0.15
3+
ansible-specdoc>=0.0.18

0 commit comments

Comments
 (0)