Add Noncurrent Version expiration to ilm policy #526

ndejesus · 2023-10-11T14:03:49Z

Add Noncurrent Version expiration to ilm policy

This PR implements the following changes:

Adds noncurrentversionexpiration to minio_ilm_policy to support this option:
Minio-go

New parameters will look like this:

resource "minio_ilm_policy" "bucket-lifecycle-rules" {
  bucket = minio_s3_bucket.bucket.bucket

  rule {
    id = "expire-noncurrentversion-7d"
    noncurrent_version_expiration_days = "7"
  }
}

Actually expired objects on versioned buckets are never deleted

Closing issues

Closes: Add NonCurrentVersionExpiration to Lifecycle Management Rules #523

pjsier

Thanks for the PR! This is looking good, I mostly had a note to simplify it by specifying expiration days as an integer

docs/resources/ilm_policy.md

minio/resource_minio_ilm_policy.go

ndejesus · 2023-10-19T08:21:16Z

Hi @pjsier, i take your remark into account.
Please let me know if it's ok.

minio/resource_minio_ilm_policy_test.go

pjsier

This looks great, thanks! @felladrin if you have a chance to take a look I think this is good to merge

felladrin · 2023-10-24T11:28:37Z

That's great! Thanks for this addition, @ndejesus! And thanks, @pjsier, for reviewing it!

Co-authored-by: Nicolas De Jesus <[email protected]>

Co-authored-by: Nicolas De Jesus <[email protected]> (cherry picked from commit f031109)

* Update module github.com/aws/aws-sdk-go to v1.45.6 (#515) (cherry picked from commit 4953af3) * Update crazy-max/ghaction-import-gpg action to v6 (#516) (cherry picked from commit ee28b90) * Handle empty service account policy (#518) (cherry picked from commit 779d356) * Update repository URL (#520) (cherry picked from commit 7a680c7) * Update project to Go v1.20 (#519) (cherry picked from commit be07cf7) * Destroy object versions on bucket force_destroy (#524) (cherry picked from commit a107f61) * Update goreleaser-action to v5 and add permission for the workflow to attach binaries to GitHub Releases (#521) (cherry picked from commit c06ddba) * Add Noncurrent Version expiration to ilm policy (#526) Co-authored-by: Nicolas De Jesus <[email protected]> (cherry picked from commit f031109) * Bump golang.org/x/net from 0.15.0 to 0.17.0 (#530) Bumps [golang.org/x/net](https://github.com/golang/net) from 0.15.0 to 0.17.0. - [Commits](golang/net@v0.15.0...v0.17.0) --- updated-dependencies: - dependency-name: golang.org/x/net dependency-type: indirect ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> (cherry picked from commit ec7f197) * Add service account values to read and import (#525) (cherry picked from commit cf0c88d) * Recreate user if it's not found anymore (#534) Fixes #511 (cherry picked from commit 50bc121) * Bump google.golang.org/grpc from 1.58.0 to 1.58.3 (#535) Bumps [google.golang.org/grpc](https://github.com/grpc/grpc-go) from 1.58.0 to 1.58.3. - [Release notes](https://github.com/grpc/grpc-go/releases) - [Commits](grpc/grpc-go@v1.58.0...v1.58.3) --- updated-dependencies: - dependency-name: google.golang.org/grpc dependency-type: indirect ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> (cherry picked from commit 5fa1a1b) * Revert "Update repository URL (#520)" (#538) This reverts commit 7a680c7. (cherry picked from commit 8a0b114) * Update target branches of GitHub Actions to `v1` branch --------- Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Artem Usenko <[email protected]> Co-authored-by: Jonathan Buch <[email protected]> Co-authored-by: Pat Sier <[email protected]> Co-authored-by: ndejesus <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Tobias Krischer <[email protected]>

This PR contains the following updates: | Package | Type | Update | Change | |---|---|---|---| | [minio](https://registry.terraform.io/providers/aminueza/minio) ([source](https://github.com/aminueza/terraform-provider-minio)) | required_provider | minor | `~> 1.18.0` -> `~> 1.20.0` | --- > ⚠ **Warning** > > Some dependencies could not be looked up. Check the warning logs for more information. --- ### Release Notes <details> <summary>aminueza/terraform-provider-minio (minio)</summary> ### [`v1.20.1`](https://github.com/aminueza/terraform-provider-minio/releases/tag/v1.20.1) [Compare Source](aminueza/terraform-provider-minio@v1.20.0...v1.20.1) #### What's Changed - Fix null expiration date handling by [@pjsier](https://github.com/pjsier) in aminueza/terraform-provider-minio#545 - Update terraform version to 1.5.7 in GitHub Action by [@felladrin](https://github.com/felladrin) in aminueza/terraform-provider-minio#540 **Full Changelog**: aminueza/terraform-provider-minio@v1.20.0...v1.20.1 > **Note** > [v1](https://github.com/aminueza/terraform-provider-minio/tree/v1) of the provider is now under maintenance mode. If you can, it's advised to upgrade to `v2`. ### [`v1.20.0`](https://github.com/aminueza/terraform-provider-minio/releases/tag/v1.20.0) [Compare Source](aminueza/terraform-provider-minio@v1.19.0...v1.20.0) #### What's Changed - Update module github.com/aws/aws-sdk-go to v1.45.6 by [@renovate](https://github.com/renovate) in aminueza/terraform-provider-minio#515 - Update crazy-max/ghaction-import-gpg action to v6 by [@renovate](https://github.com/renovate) in aminueza/terraform-provider-minio#516 - Handle empty service account policy by [@ArataEM](https://github.com/ArataEM) in aminueza/terraform-provider-minio#518 - Go 1.20 by [@BuJo](https://github.com/BuJo) in aminueza/terraform-provider-minio#519 - Destroy object versions on bucket force_destroy by [@pjsier](https://github.com/pjsier) in aminueza/terraform-provider-minio#524 - Update goreleaser-action to v5 and add permission for the workflow to attach binaries to GitHub Releases by [@felladrin](https://github.com/felladrin) in aminueza/terraform-provider-minio#521 - Add Noncurrent Version expiration to ilm policy by [@ndejesus](https://github.com/ndejesus) in aminueza/terraform-provider-minio#526 - Bump golang.org/x/net from 0.15.0 to 0.17.0 by [@dependabot](https://github.com/dependabot) in aminueza/terraform-provider-minio#530 - Add service account values to read and import by [@pjsier](https://github.com/pjsier) in aminueza/terraform-provider-minio#525 - feat: recreate user if not found anymore by [@tobikris](https://github.com/tobikris) in aminueza/terraform-provider-minio#534 - Bump google.golang.org/grpc from 1.58.0 to 1.58.3 by [@dependabot](https://github.com/dependabot) in aminueza/terraform-provider-minio#535 #### New Contributors - [@ndejesus](https://github.com/ndejesus) made their first contribution in aminueza/terraform-provider-minio#526 **Full Changelog**: aminueza/terraform-provider-minio@v1.18.0...v1.20.0 > **Note** > This release replaces v1.18.1 and v1.18.2, which are unavailable on https://registry.terraform.io/providers/aminueza/minio as they were built with an outdated GPG key. It also replaces v1.18.3 and v1.19.0, which couldn't be installed due the issue [#531](aminueza/terraform-provider-minio#531). ### [`v1.19.0`](https://github.com/aminueza/terraform-provider-minio/releases/tag/v1.19.0) [Compare Source](aminueza/terraform-provider-minio@v1.18.3...v1.19.0) Changes on this Release: - Update crazy-max/ghaction-import-gpg action to v6 ([#516](aminueza/terraform-provider-minio#516)) - Handle empty service account policy ([#518](aminueza/terraform-provider-minio#518)) - Update repository URL ([#520](aminueza/terraform-provider-minio#520)) - Destroy object versions on bucket force_destroy ([#524](aminueza/terraform-provider-minio#524)) - Add Noncurrent Version expiration to ilm policy ([#526](aminueza/terraform-provider-minio#526)) **Full Changelog**: aminueza/terraform-provider-minio@v1.18.0...v1.19.0 > **Note** > This release replaces v1.18.1 and v1.18.2, which are unavailable on https://registry.terraform.io/providers/aminueza/minio as they were built with an outdated GPG key. It also replaces v1.18.3, which couldn't be installed due the issue [#531](aminueza/terraform-provider-minio#531). </details> --- ### Configuration 📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Renovate Bot](https://github.com/renovatebot/renovate).  Reviewed-on: https://gitea.eevans.me/shosti/eevans-infra/pulls/10 Co-authored-by: Renovate Bot <[email protected]> Co-committed-by: Renovate Bot <[email protected]>

qs-ndejesus added 2 commits October 11, 2023 15:47

Add Noncurrent Version expiration to ilm policy

217bda5

fix fmt issue

e2d5f96

pjsier reviewed Oct 17, 2023

View reviewed changes

docs/resources/ilm_policy.md Outdated Show resolved Hide resolved

minio/resource_minio_ilm_policy.go Outdated Show resolved Hide resolved

qs-ndejesus added 5 commits October 18, 2023 15:13

append days to noncurrent_version_expiration

e31cb45

use int as noncurrent version expiration

27b375b

use int as noncurrent version expiration

9ee9ba0

Update doc to match renaming and int format

f1a0ef9

Delete unused function

2dc93a6

pjsier reviewed Oct 20, 2023

View reviewed changes

minio/resource_minio_ilm_policy_test.go Show resolved Hide resolved

add test to verify rule is correctly set

0a6f629

pjsier approved these changes Oct 24, 2023

View reviewed changes

felladrin merged commit f031109 into aminueza:master Oct 24, 2023
2 checks passed

ndejesus deleted the fix/523-expire-noncurrent-version branch October 24, 2023 12:18

felladrin pushed a commit that referenced this pull request Nov 4, 2023

Add Noncurrent Version expiration to ilm policy (#526)

ceec923

Co-authored-by: Nicolas De Jesus <[email protected]>

felladrin pushed a commit that referenced this pull request Nov 4, 2023

Add Noncurrent Version expiration to ilm policy (#526)

bc01a72

Co-authored-by: Nicolas De Jesus <[email protected]> (cherry picked from commit f031109)

pjsier mentioned this pull request Nov 7, 2023

Lifecycle rule with noncurrent_version_expiration_days causes a update every plan/apply in 2.0.0 #543

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add Noncurrent Version expiration to ilm policy #526

Add Noncurrent Version expiration to ilm policy #526

ndejesus commented Oct 11, 2023 •

edited

Loading

pjsier left a comment

ndejesus commented Oct 19, 2023

pjsier left a comment

felladrin commented Oct 24, 2023

Add Noncurrent Version expiration to ilm policy #526

Add Noncurrent Version expiration to ilm policy #526

Conversation

ndejesus commented Oct 11, 2023 • edited Loading