From 10d1266943dd86aeeb7a7bf2a30663c6e76aa88b Mon Sep 17 00:00:00 2001 From: Chris Tessmer Date: Mon, 19 Jul 2021 19:11:32 +0000 Subject: [PATCH] Fix version compare bug in example plan --- CHANGELOG.md | 10 +++------- plans/latest_semver_tags.pp | 7 +++---- 2 files changed, 6 insertions(+), 11 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 77532b7..343ffdf 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,17 +5,13 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). - +* Fixed version comparison bug in example plan + `github_inventory::latest_semver_tags` + ## [0.4.0] diff --git a/plans/latest_semver_tags.pp b/plans/latest_semver_tags.pp index 0f0ead3..8f7cb00 100644 --- a/plans/latest_semver_tags.pp +++ b/plans/latest_semver_tags.pp @@ -55,15 +55,14 @@ Hash($kv_pairs) } - - $repos_latest_tag_data = $tag_resultset.ok_set.map |$r| { # Find highest SemVer-ish (1.2.3, v1.2.3, 1.2.3-4) tag $tag = ($r.value['body'].map |$x| { $x['name'] }).filter |$x| { $x =~ /^v?\d+\.\d+\.\d+(-\d+)?$/ }.max |$a, $b| { - $semver_a = SemVer($a.regsubst(/^v/,'').regsubst(/-\d+$/,'')) # voxpupuli-style `v` - $semver_b = SemVer($a.regsubst(/^v/,'').regsubst(/-\d+$/,'')) # RPM-style `-` + # Normalize voxpupuli-style `v` and RPM-style `-` + $semver_a = SemVer($a.regsubst(/^v/,'').regsubst(/-\d+$/,'')) + $semver_b = SemVer($b.regsubst(/^v/,'').regsubst(/-\d+$/,'')) compare($semver_a, $semver_b) }