From 0ee2ed4f25e2c7d551c748b4166554b6c0e51b81 Mon Sep 17 00:00:00 2001 From: Brian Scholer <1260690+briantist@users.noreply.github.com> Date: Sun, 15 Oct 2023 12:00:51 -0400 Subject: [PATCH 01/16] split vault runs, use correct image --- .../actions/docker-image-versions/action.yml | 3 +-- .github/workflows/ansible-test.yml | 21 ++++++------------- 2 files changed, 7 insertions(+), 17 deletions(-) diff --git a/.github/actions/docker-image-versions/action.yml b/.github/actions/docker-image-versions/action.yml index 766067df7..d2503deaa 100644 --- a/.github/actions/docker-image-versions/action.yml +++ b/.github/actions/docker-image-versions/action.yml @@ -8,8 +8,7 @@ outputs: inputs: image: description: The docker image name. - required: false - default: vault + required: true num_major_versions: description: Number of unique major versions to return. required: false diff --git a/.github/workflows/ansible-test.yml b/.github/workflows/ansible-test.yml index 87c1c9f63..a05b79731 100644 --- a/.github/workflows/ansible-test.yml +++ b/.github/workflows/ansible-test.yml @@ -180,7 +180,7 @@ jobs: integration: runs-on: ${{ matrix.runner }} - name: I (Ⓐ${{ matrix.ansible }}+py${{ matrix.python }}) + name: I (Ⓐ${{ matrix.ansible }}+py${{ matrix.python }}+V[-${{ matrix.vault_minus }}]) strategy: fail-fast: false matrix: @@ -188,6 +188,9 @@ jobs: - ubuntu-latest test_container: - default + vault_minus: + - 0 + - 1 ansible: - stable-2.13 - stable-2.14 @@ -256,6 +259,7 @@ jobs: id: vault_versions uses: ./.github/actions/docker-image-versions with: + image: hashicorp/vault num_major_versions: 1 num_minor_versions: 2 num_micro_versions: 1 @@ -271,7 +275,7 @@ jobs: working-directory: ${{ env.COLLECTION_PATH }} ansible-test-invocation: ${{ env.TEST_INVOCATION }} - - name: Set Vault Version (older) + - name: Set Vault Version uses: briantist/ezenv@v1 with: env: VAULT_VERSION=${{ fromJSON(steps.vault_versions.outputs.versions)[1] }} @@ -280,19 +284,6 @@ jobs: run: ./setup.sh -e vault_version=${VAULT_VERSION} working-directory: ${{ env.COLLECTION_INTEGRATION_TARGETS }}/setup_localenv_gha - - name: Run integration test (Vault ${{ env.VAULT_VERSION }}) - run: ansible-test ${{ env.TEST_INVOCATION }} - working-directory: ${{ env.COLLECTION_PATH }} - - - name: Set Vault Version (newer) - uses: briantist/ezenv@v1 - with: - env: VAULT_VERSION=${{ fromJSON(steps.vault_versions.outputs.versions)[0] }} - - - name: Prepare docker dependencies (Vault ${{ env.VAULT_VERSION }}) - run: ./setup.sh -e vault_version=${VAULT_VERSION} - working-directory: ${{ env.COLLECTION_INTEGRATION_TARGETS }}/setup_localenv_gha - - name: Run integration test (Vault ${{ env.VAULT_VERSION }}) run: ansible-test ${{ env.TEST_INVOCATION }} working-directory: ${{ env.COLLECTION_PATH }} From e6330c00b625506aadf9375a083f1434e0eabe57 Mon Sep 17 00:00:00 2001 From: Brian Scholer <1260690+briantist@users.noreply.github.com> Date: Sun, 15 Oct 2023 12:21:27 -0400 Subject: [PATCH 02/16] fix up docker-image-versions action --- .github/actions/docker-image-versions/versions.py | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/.github/actions/docker-image-versions/versions.py b/.github/actions/docker-image-versions/versions.py index 9d7fcea2d..d73680f8c 100755 --- a/.github/actions/docker-image-versions/versions.py +++ b/.github/actions/docker-image-versions/versions.py @@ -21,7 +21,7 @@ from packaging import version -TAG_URI = 'https://registry.hub.docker.com/v2/repositories/library/%s/tags?page_size=1024' +TAG_URI = 'https://registry.hub.docker.com/v2/repositories/%s/%s/tags?page_size=1024' class WarningRetry(Retry): @@ -49,7 +49,7 @@ def main(argv): for opt, arg in opts: if opt == '--image': - image = arg + image = image_name = arg elif opt == '--num_major_versions': num_major_versions = int(arg) elif opt == '--num_minor_versions': @@ -64,7 +64,12 @@ def main(argv): if image is None: raise ValueError('image must be supplied.') - tag_url = TAG_URI % image + if '/' in image: + org, image_name = image.split('/') + else: + org = 'library' + + tag_url = TAG_URI % (org, image_name) sess = requests.Session() retry = WarningRetry(total=5, backoff_factor=0.2, respect_retry_after_header=False) @@ -112,7 +117,7 @@ def main(argv): keep.append(str(ver)) - with open(os.environ['GITHUB_OUTPUT'], 'a') as f: + with open(os.environ.get('GITHUB_OUTPUT', '/dev/stdout'), 'a') as f: f.write('versions=') json.dump(keep, f) From 407c7a9b68cf3fcb11d213b9bc235fe7c3ce2617 Mon Sep 17 00:00:00 2001 From: Brian Scholer <1260690+briantist@users.noreply.github.com> Date: Sun, 15 Oct 2023 12:34:47 -0400 Subject: [PATCH 03/16] use different Vault versions --- .github/workflows/ansible-test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ansible-test.yml b/.github/workflows/ansible-test.yml index a05b79731..16609c521 100644 --- a/.github/workflows/ansible-test.yml +++ b/.github/workflows/ansible-test.yml @@ -278,7 +278,7 @@ jobs: - name: Set Vault Version uses: briantist/ezenv@v1 with: - env: VAULT_VERSION=${{ fromJSON(steps.vault_versions.outputs.versions)[1] }} + env: VAULT_VERSION=${{ fromJSON(steps.vault_versions.outputs.versions)[matrix.vault_minus] }} - name: Prepare docker dependencies (Vault ${{ env.VAULT_VERSION }}) run: ./setup.sh -e vault_version=${VAULT_VERSION} From b71fc57463e6244cf3f311057769d82a0cf6f956 Mon Sep 17 00:00:00 2001 From: Brian Scholer <1260690+briantist@users.noreply.github.com> Date: Sun, 15 Oct 2023 14:37:40 -0400 Subject: [PATCH 04/16] drop core 2.13, add python 3.12 --- .github/workflows/ansible-builder.yml | 2 +- .github/workflows/ansible-test.yml | 32 +++++++++++++-------------- .github/workflows/github-release.yml | 2 +- 3 files changed, 17 insertions(+), 19 deletions(-) diff --git a/.github/workflows/ansible-builder.yml b/.github/workflows/ansible-builder.yml index 10aeb5c2d..253f7936e 100644 --- a/.github/workflows/ansible-builder.yml +++ b/.github/workflows/ansible-builder.yml @@ -31,7 +31,7 @@ jobs: - name: Set up Python uses: actions/setup-python@v4 with: - python-version: 3.9 + python-version: 3.11 - name: Install ansible-builder run: pip install ansible-builder diff --git a/.github/workflows/ansible-test.yml b/.github/workflows/ansible-test.yml index 16609c521..cd1bda631 100644 --- a/.github/workflows/ansible-test.yml +++ b/.github/workflows/ansible-test.yml @@ -37,7 +37,6 @@ jobs: test_container: - default ansible: - - stable-2.13 - stable-2.14 - stable-2.15 - stable-2.16 @@ -66,7 +65,7 @@ jobs: with: # it is just required to run that once as "ansible-test sanity" in the docker image # will run on all python versions it supports. - python-version: '3.10' + python-version: '3.11' # Install the head of the given branch (devel, stable-2.14) - name: Install ansible-base (${{ matrix.ansible }}) @@ -114,7 +113,6 @@ jobs: test_container: - default ansible: - - stable-2.13 - stable-2.14 - stable-2.15 - stable-2.16 @@ -141,7 +139,7 @@ jobs: with: # it is just required to run that once as "ansible-test units" in the docker image # will run on all python versions it supports. - python-version: '3.10' + python-version: '3.11' - name: Install ansible-base (${{ matrix.ansible }}) run: pip install https://github.com/ansible/ansible/archive/${{ matrix.ansible }}.tar.gz --disable-pip-version-check @@ -192,7 +190,6 @@ jobs: - 0 - 1 ansible: - - stable-2.13 - stable-2.14 - stable-2.15 - stable-2.16 @@ -204,11 +201,18 @@ jobs: - '3.9' - '3.10' - '3.11' + - '3.12' exclude: # https://docs.ansible.com/ansible/devel/installation_guide/intro_installation.html#control-node-requirements # https://docs.ansible.com/ansible/devel/reference_appendices/release_and_maintenance.html#ansible-core-support-matrix - - ansible: 'stable-2.13' - python: '3.11' + - ansible: 'devel' + python: '3.6' + - ansible: 'devel' + python: '3.7' + - ansible: 'devel' + python: '3.8' + - ansible: 'devel' + python: '3.9' - ansible: 'stable-2.16' python: '3.6' - ansible: 'stable-2.16' @@ -223,14 +227,8 @@ jobs: python: '3.7' - ansible: 'stable-2.15' python: '3.8' - - ansible: 'devel' - python: '3.6' - - ansible: 'devel' - python: '3.7' - - ansible: 'devel' - python: '3.8' - - ansible: 'devel' - python: '3.9' + - ansible: 'stable-2.14' + python: '3.12' steps: - name: Initialize env vars @@ -253,7 +251,7 @@ jobs: - name: Set up Python uses: actions/setup-python@v4 with: - python-version: '3.10' + python-version: '3.11' - name: Get Vault versions id: vault_versions @@ -313,7 +311,7 @@ jobs: - stable-2.16 - devel python: - - '3.11' + - '3.12' runner: - ubuntu-latest test_container: diff --git a/.github/workflows/github-release.yml b/.github/workflows/github-release.yml index 6fce7d2e6..be2f0b218 100644 --- a/.github/workflows/github-release.yml +++ b/.github/workflows/github-release.yml @@ -20,7 +20,7 @@ jobs: - name: Set up Python uses: actions/setup-python@v4 with: - python-version: 3.9 + python-version: 3.12 - name: Install PyYaml run: pip install pyyaml From f5c21a6647854ec60ad6d6a80b4085062805b780 Mon Sep 17 00:00:00 2001 From: Brian Scholer <1260690+briantist@users.noreply.github.com> Date: Sun, 15 Oct 2023 14:43:48 -0400 Subject: [PATCH 05/16] add changelog fragment --- changelogs/fragments/403-core-vault-python.yml | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 changelogs/fragments/403-core-vault-python.yml diff --git a/changelogs/fragments/403-core-vault-python.yml b/changelogs/fragments/403-core-vault-python.yml new file mode 100644 index 000000000..a51b118a8 --- /dev/null +++ b/changelogs/fragments/403-core-vault-python.yml @@ -0,0 +1,6 @@ +--- +removed_features: + - The minimum supported version of ``ansible-core`` is now ``2.14``, support for ``2.13`` has been dropped (https://github.com/ansible-collections/community.hashi_vault/pull/403). + +trivial: + - The ``docker-image-versions`` action in the collection has been updated to support dockerhub images that are not in the default namespace. The ``image`` input is now required and no longer defaults to ``vault`` which is no longer the current location of Vault images (https://github.com/ansible-collections/community.hashi_vault/pull/403). From 205f1f8aab61a6c04f836169131c41e655bdb2c8 Mon Sep 17 00:00:00 2001 From: Brian Scholer <1260690+briantist@users.noreply.github.com> Date: Sun, 15 Oct 2023 14:45:33 -0400 Subject: [PATCH 06/16] exclude py3.12 from core 2.15 --- .github/workflows/ansible-test.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/ansible-test.yml b/.github/workflows/ansible-test.yml index cd1bda631..e18f013a2 100644 --- a/.github/workflows/ansible-test.yml +++ b/.github/workflows/ansible-test.yml @@ -225,6 +225,8 @@ jobs: python: '3.6' - ansible: 'stable-2.15' python: '3.7' + - ansible: 'stable-2.15' + python: '3.12' - ansible: 'stable-2.15' python: '3.8' - ansible: 'stable-2.14' From 33943161d94f21279ceaa0e77f14c8ebeccc3c1a Mon Sep 17 00:00:00 2001 From: Brian Scholer <1260690+briantist@users.noreply.github.com> Date: Sun, 15 Oct 2023 14:48:40 -0400 Subject: [PATCH 07/16] nit change base to core --- .github/workflows/ansible-test.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ansible-test.yml b/.github/workflows/ansible-test.yml index e18f013a2..915bce5ec 100644 --- a/.github/workflows/ansible-test.yml +++ b/.github/workflows/ansible-test.yml @@ -68,7 +68,7 @@ jobs: python-version: '3.11' # Install the head of the given branch (devel, stable-2.14) - - name: Install ansible-base (${{ matrix.ansible }}) + - name: Install ansible-core (${{ matrix.ansible }}) run: pip install https://github.com/ansible/ansible/archive/${{ matrix.ansible }}.tar.gz --disable-pip-version-check - name: Pull Ansible test images @@ -141,7 +141,7 @@ jobs: # will run on all python versions it supports. python-version: '3.11' - - name: Install ansible-base (${{ matrix.ansible }}) + - name: Install ansible-core (${{ matrix.ansible }}) run: pip install https://github.com/ansible/ansible/archive/${{ matrix.ansible }}.tar.gz --disable-pip-version-check - name: Pull Ansible test images @@ -264,7 +264,7 @@ jobs: num_minor_versions: 2 num_micro_versions: 1 - - name: Install ansible-base (${{ matrix.ansible }}) + - name: Install ansible-core (${{ matrix.ansible }}) run: pip install https://github.com/ansible/ansible/archive/${{ matrix.ansible }}.tar.gz --disable-pip-version-check - name: Pull Ansible test images @@ -342,7 +342,7 @@ jobs: with: python-version: ${{ matrix.python }} - - name: Install ansible-base (${{ matrix.ansible }}) + - name: Install ansible-core (${{ matrix.ansible }}) run: pip install https://github.com/ansible/ansible/archive/${{ matrix.ansible }}.tar.gz --disable-pip-version-check - name: Install community.crypto From d372b58ccbe64461280fd72d3656aa78940aea1e Mon Sep 17 00:00:00 2001 From: Brian Scholer <1260690+briantist@users.noreply.github.com> Date: Sun, 15 Oct 2023 14:58:32 -0400 Subject: [PATCH 08/16] update actions/checkout to v4, disable progress --- .github/workflows/ansible-builder.yml | 3 ++- .github/workflows/ansible-test.yml | 16 +++++++++++----- .github/workflows/github-release.yml | 4 +++- 3 files changed, 16 insertions(+), 7 deletions(-) diff --git a/.github/workflows/ansible-builder.yml b/.github/workflows/ansible-builder.yml index 253f7936e..ed9b15808 100644 --- a/.github/workflows/ansible-builder.yml +++ b/.github/workflows/ansible-builder.yml @@ -24,8 +24,9 @@ jobs: runs-on: ubuntu-latest steps: - name: Check out code - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: + show-progress: false path: ansible_collections/${{ env.NAMESPACE }}/${{ env.COLLECTION_NAME }} - name: Set up Python diff --git a/.github/workflows/ansible-test.yml b/.github/workflows/ansible-test.yml index 915bce5ec..d294c5f8f 100644 --- a/.github/workflows/ansible-test.yml +++ b/.github/workflows/ansible-test.yml @@ -53,8 +53,9 @@ jobs: TEST_INVOCATION="sanity --docker ${{ matrix.test_container }} -v --color ${{ github.event_name != 'schedule' && '--coverage' || '' }}" - name: Check out code - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: + show-progress: false path: ${{ env.COLLECTION_PATH }} - name: Link to .github # easier access to local actions @@ -127,8 +128,9 @@ jobs: TEST_INVOCATION="units --color --docker ${{ matrix.test_container }} ${{ github.event_name != 'schedule' && '--coverage' || '' }}" - name: Check out code - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: + show-progress: false path: ${{ env.COLLECTION_PATH }} - name: Link to .github # easier access to local actions @@ -243,8 +245,9 @@ jobs: TEST_INVOCATION="integration -v --color --retry-on-error --continue-on-error --python ${{ matrix.python }} --docker ${{ matrix.test_container }} ${{ github.event_name != 'schedule' && '--coverage' || '' }} --docker-network hashi_vault_default" - name: Check out code - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: + show-progress: false path: ${{ env.COLLECTION_PATH }} - name: Link to .github # easier access to local actions @@ -330,8 +333,9 @@ jobs: DOCKER_TEST_INVOCATION="integration -v --color --retry-on-error --continue-on-error --controller docker:${{ matrix.test_container }},python=${{ matrix.python }} ${{ github.event_name != 'schedule' && '--coverage' || '' }}" - name: Check out code - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: + show-progress: false path: ${{ env.COLLECTION_PATH }} - name: Link to .github # easier access to local actions @@ -426,7 +430,9 @@ jobs: runs-on: ubuntu-latest steps: - name: Check out code - uses: actions/checkout@v3 + uses: actions/checkout@v4 + with: + show-progress: false - name: Download artifacts uses: actions/download-artifact@v3 diff --git a/.github/workflows/github-release.yml b/.github/workflows/github-release.yml index be2f0b218..39cb8a1e0 100644 --- a/.github/workflows/github-release.yml +++ b/.github/workflows/github-release.yml @@ -15,7 +15,9 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 + with: + show-progress: false - name: Set up Python uses: actions/setup-python@v4 From 1dbe6c61f006083b0f5eab8cf27eb794cb74b74b Mon Sep 17 00:00:00 2001 From: Brian Scholer <1260690+briantist@users.noreply.github.com> Date: Sun, 15 Oct 2023 15:04:42 -0400 Subject: [PATCH 09/16] update galaxy publish verification --- .github/workflows/github-release.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/github-release.yml b/.github/workflows/github-release.yml index 39cb8a1e0..6ffafd00d 100644 --- a/.github/workflows/github-release.yml +++ b/.github/workflows/github-release.yml @@ -25,10 +25,10 @@ jobs: python-version: 3.12 - name: Install PyYaml - run: pip install pyyaml + run: pip install pyyaml ansible-core - name: Validate version is published to Galaxy - run: curl --head -s -f -o /dev/null https://galaxy.ansible.com/download/community-hashi_vault-${{ github.event.inputs.version }}.tar.gz + run: ansible-galaxy collection download -vvv -p /tmp 'community.hashi_vault:==${{ github.event.inputs.version }}'' - name: Build release description shell: python From b61b11a8a05deacd7b00329f32e6f236e147100a Mon Sep 17 00:00:00 2001 From: Brian Scholer <1260690+briantist@users.noreply.github.com> Date: Sun, 15 Oct 2023 15:06:19 -0400 Subject: [PATCH 10/16] see if bigger runners are available --- .github/workflows/ansible-test.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ansible-test.yml b/.github/workflows/ansible-test.yml index d294c5f8f..cfca24ce7 100644 --- a/.github/workflows/ansible-test.yml +++ b/.github/workflows/ansible-test.yml @@ -307,7 +307,8 @@ jobs: retention-days: 1 local_test_invocation: - runs-on: ${{ matrix.runner }} + # runs-on: ${{ matrix.runner }} + runs-on: ubuntu-latest-4-cores name: LI - ${{ matrix.runner }} (Ⓐ${{ matrix.ansible }}+py${{ matrix.python }}) strategy: fail-fast: false From bef329a9d017b2185c17066b6b9954c4ebde6290 Mon Sep 17 00:00:00 2001 From: Brian Scholer <1260690+briantist@users.noreply.github.com> Date: Sun, 15 Oct 2023 15:10:18 -0400 Subject: [PATCH 11/16] revert runner change --- .github/workflows/ansible-test.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/ansible-test.yml b/.github/workflows/ansible-test.yml index cfca24ce7..d294c5f8f 100644 --- a/.github/workflows/ansible-test.yml +++ b/.github/workflows/ansible-test.yml @@ -307,8 +307,7 @@ jobs: retention-days: 1 local_test_invocation: - # runs-on: ${{ matrix.runner }} - runs-on: ubuntu-latest-4-cores + runs-on: ${{ matrix.runner }} name: LI - ${{ matrix.runner }} (Ⓐ${{ matrix.ansible }}+py${{ matrix.python }}) strategy: fail-fast: false From 881f33adbfaf4c664c7fd83228bba8f044ec813c Mon Sep 17 00:00:00 2001 From: Brian Scholer <1260690+briantist@users.noreply.github.com> Date: Sun, 15 Oct 2023 15:25:38 -0400 Subject: [PATCH 12/16] update readme --- README.md | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index 90edff5d8..d80337060 100644 --- a/README.md +++ b/README.md @@ -12,16 +12,16 @@ Browsing the [**devel** collection documentation](https://docs.ansible.com/ansib We also separately publish [**latest commit** collection documentation](https://ansible-collections.github.io/community.hashi_vault/branch/main/) which shows docs for the _latest commit in the `main` branch_. If you use the Ansible package and don't update collections independently, use **latest**, if you install or update this collection directly from Galaxy, use **devel**. If you are looking to contribute, use **latest commit**. + ## Tested with Ansible -* 2.13 -* 2.14 -* 2.15 -* 2.16 -* devel (latest development commit) +Please refer to the [`ansible-core` support matrix](https://docs.ansible.com/ansible/devel/reference_appendices/release_and_maintenance.html#ansible-core-support-matrix) to see which versions of `ansible-core` are still supported or end-of-life. + +Generally, we release a new major version of this collection a little before the release of a new `ansible-core` version, which is around every 6 months. In that release, we will update the CI matrix to drop the core versions that are about to go EoL, and add in new core versions if they have not been added already. + +We also regularly test against the [`devel` branch](https://github.com/ansible/ansible/tree/devel) (latest development commit). See [the CI configuration](https://github.com/ansible-collections/community.hashi_vault/blob/main/.github/workflows/ansible-test.yml) for the most accurate testing information. - ## Tested with Vault @@ -46,6 +46,7 @@ Currently we support and test against Python versions: * 3.9 * 3.10 * 3.11 +* 3.12 Note that for controller-side plugins, only the Python versions supported by the Ansible controller are supported (for example, you cannot use Python 3.7 with Ansible core 2.12). From 53a60f9c34353467a2443ff5cb5568c0529e4f35 Mon Sep 17 00:00:00 2001 From: Brian Scholer <1260690+briantist@users.noreply.github.com> Date: Sun, 15 Oct 2023 15:36:47 -0400 Subject: [PATCH 13/16] bump minimum hvac version --- changelogs/fragments/403-core-vault-python.yml | 3 +++ docs/docsite/rst/user_guide.rst | 2 +- meta/ee-requirements.txt | 2 +- tests/utils/constraints.txt | 2 +- 4 files changed, 6 insertions(+), 3 deletions(-) diff --git a/changelogs/fragments/403-core-vault-python.yml b/changelogs/fragments/403-core-vault-python.yml index a51b118a8..a50bdcf9d 100644 --- a/changelogs/fragments/403-core-vault-python.yml +++ b/changelogs/fragments/403-core-vault-python.yml @@ -4,3 +4,6 @@ removed_features: trivial: - The ``docker-image-versions`` action in the collection has been updated to support dockerhub images that are not in the default namespace. The ``image`` input is now required and no longer defaults to ``vault`` which is no longer the current location of Vault images (https://github.com/ansible-collections/community.hashi_vault/pull/403). + +major_changes: + - The minimum required version of ``hvac`` is now ``1.2.1`` (https://docs.ansible.com/ansible/devel/collections/community/hashi_vault/docsite/user_guide.html#hvac-version-specifics). diff --git a/docs/docsite/rst/user_guide.rst b/docs/docsite/rst/user_guide.rst index ea28c6688..c1876aa6e 100644 --- a/docs/docsite/rst/user_guide.rst +++ b/docs/docsite/rst/user_guide.rst @@ -33,7 +33,7 @@ In general, we recommend using the latest version of ``hvac`` that is supported As of ``community.hashi_vault`` version ``5.0.0`` we are setting a minimum supported version of ``hvac``. -**The current required minimum ``hvac`` version is ``1.1.0``.** +**The current required minimum** ``hvac`` **version is** ``1.2.1``. Other requirements ------------------ diff --git a/meta/ee-requirements.txt b/meta/ee-requirements.txt index 53393fd3e..457af229b 100644 --- a/meta/ee-requirements.txt +++ b/meta/ee-requirements.txt @@ -1,6 +1,6 @@ # ansible-builder doesn't seem to properly handle "; python_version" type of constraints # requirements here are assuming python 3.6 or higher -hvac >=0.10.6 +hvac >= 1.2.1 urllib3 >= 1.15 boto3 # these are only needed if inferring AWS credentials or diff --git a/tests/utils/constraints.txt b/tests/utils/constraints.txt index 15220e827..2fbe5c753 100644 --- a/tests/utils/constraints.txt +++ b/tests/utils/constraints.txt @@ -52,7 +52,7 @@ typed-ast == 1.4.0 # 1.4.0 is required to compile on Python 3.8 wrapt == 1.11.1 # hvac -hvac >= 1.1.0 ; python_version >= '3.6' +hvac >= 1.2.1 ; python_version >= '3.6' # urllib3 # these should be satisfied naturally by the requests versions required by hvac anyway From fcda501b6586bce97e40ade9ac264280b1b3f1dc Mon Sep 17 00:00:00 2001 From: Brian Scholer <1260690+briantist@users.noreply.github.com> Date: Sun, 15 Oct 2023 15:37:07 -0400 Subject: [PATCH 14/16] bump minimum ansible version in runtime.yml --- meta/runtime.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/runtime.yml b/meta/runtime.yml index d0bd286f1..4c59873a4 100644 --- a/meta/runtime.yml +++ b/meta/runtime.yml @@ -1,5 +1,5 @@ --- -requires_ansible: '>=2.13.0' +requires_ansible: '>=2.14.0' action_groups: # let's keep this in alphabetical order vault: From 7432ea375eaf01a95cd20858288b038574b55918 Mon Sep 17 00:00:00 2001 From: Brian Scholer <1260690+briantist@users.noreply.github.com> Date: Sun, 15 Oct 2023 15:43:18 -0400 Subject: [PATCH 15/16] add dependabot.yml --- .github/dependabot.yml | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 .github/dependabot.yml diff --git a/.github/dependabot.yml b/.github/dependabot.yml new file mode 100644 index 000000000..969b36fe0 --- /dev/null +++ b/.github/dependabot.yml @@ -0,0 +1,9 @@ +--- +# https://docs.github.com/github/administering-a-repository/configuration-options-for-dependency-updates + +version: 2 +updates: + - package-ecosystem: "github-actions" + directory: "/" + schedule: + interval: "weekly" From a308a54aa527bfbb8445fb9409338ea4b8ab4e0d Mon Sep 17 00:00:00 2001 From: Brian Scholer <1260690+briantist@users.noreply.github.com> Date: Sun, 15 Oct 2023 16:07:01 -0400 Subject: [PATCH 16/16] Apply suggestions from code review Co-authored-by: Felix Fontein --- changelogs/fragments/403-core-vault-python.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/changelogs/fragments/403-core-vault-python.yml b/changelogs/fragments/403-core-vault-python.yml index a50bdcf9d..f0456ab6e 100644 --- a/changelogs/fragments/403-core-vault-python.yml +++ b/changelogs/fragments/403-core-vault-python.yml @@ -3,7 +3,7 @@ removed_features: - The minimum supported version of ``ansible-core`` is now ``2.14``, support for ``2.13`` has been dropped (https://github.com/ansible-collections/community.hashi_vault/pull/403). trivial: - - The ``docker-image-versions`` action in the collection has been updated to support dockerhub images that are not in the default namespace. The ``image`` input is now required and no longer defaults to ``vault`` which is no longer the current location of Vault images (https://github.com/ansible-collections/community.hashi_vault/pull/403). + - The ``docker-image-versions`` action in the collection has been updated to support Docker Hub images that are not in the default namespace. The ``image`` input is now required and no longer defaults to ``vault`` which is no longer the current location of Vault images (https://github.com/ansible-collections/community.hashi_vault/pull/403). -major_changes: +breaking_changes: - The minimum required version of ``hvac`` is now ``1.2.1`` (https://docs.ansible.com/ansible/devel/collections/community/hashi_vault/docsite/user_guide.html#hvac-version-specifics).