New Upstream Release - puppet-module-puppetlabs-apt
Ready changes
Summary
Merged new upstream version: 9.0.2 (was: 9.0.1).
Resulting package
Built on 2023-04-07T20:11 (took 6m20s)
The resulting binary packages can be installed (if you have the apt repository enabled) by running one of:
apt install -t fresh-releases puppet-module-puppetlabs-apt
Lintian Result
Diff
diff --git a/.github/workflows/auto_release.yml b/.github/workflows/auto_release.yml
index f4aed44..f3ee602 100644
--- a/.github/workflows/auto_release.yml
+++ b/.github/workflows/auto_release.yml
@@ -28,13 +28,13 @@ jobs:
echo STEP_START=$(date +%s) >> $GITHUB_ENV
- name: "Checkout Source"
if: ${{ github.repository_owner == 'puppetlabs' }}
- uses: actions/checkout@v2
+ uses: actions/checkout@v3
with:
fetch-depth: 0
persist-credentials: false
- name: "PDK Release prep"
- uses: docker://puppet/iac_release:ci
+ uses: docker://puppet/pdk:2.6.1.0
with:
args: 'release prep --force'
env:
diff --git a/.github/workflows/mend.yml b/.github/workflows/mend.yml
new file mode 100644
index 0000000..b4100a5
--- /dev/null
+++ b/.github/workflows/mend.yml
@@ -0,0 +1,15 @@
+name: "mend"
+
+on:
+ pull_request:
+ branches:
+ - "main"
+ schedule:
+ - cron: "0 0 * * *"
+ workflow_dispatch:
+
+jobs:
+
+ mend:
+ uses: "puppetlabs/cat-github-actions/.github/workflows/mend_ruby.yml@main"
+ secrets: "inherit"
diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
index 42816e7..c5dc1f5 100644
--- a/.github/workflows/nightly.yml
+++ b/.github/workflows/nightly.yml
@@ -31,7 +31,7 @@ jobs:
echo STEP_ID=setup-environment >> $GITHUB_ENV
echo STEP_START=$(date +%s) >> $GITHUB_ENV
- name: Checkout Source
- uses: actions/checkout@v2
+ uses: actions/checkout@v3
if: ${{ github.repository_owner == 'puppetlabs' }}
- name: Activate Ruby 2.7
@@ -102,7 +102,7 @@ jobs:
echo STEP_START=$(date +%s) >> $GITHUB_ENV
- name: Checkout Source
- uses: actions/checkout@v2
+ uses: actions/checkout@v3
- name: Activate Ruby 2.7
uses: ruby/setup-ruby@v1
diff --git a/.github/workflows/pr_test.yml b/.github/workflows/pr_test.yml
index fd310e6..3a0298d 100644
--- a/.github/workflows/pr_test.yml
+++ b/.github/workflows/pr_test.yml
@@ -29,7 +29,7 @@ jobs:
echo STEP_ID=setup-environment >> $GITHUB_ENV
echo STEP_START=$(date +%s) >> $GITHUB_ENV
- name: Checkout Source
- uses: actions/checkout@v2
+ uses: actions/checkout@v3
if: ${{ github.repository_owner == 'puppetlabs' }}
- name: Activate Ruby 2.7
@@ -103,7 +103,7 @@ jobs:
echo STEP_ID=${{ matrix.platforms.image }}-${{ matrix.collection }}-1 >> $GITHUB_ENV
echo STEP_START=$(date +%s) >> $GITHUB_ENV
- name: Checkout Source
- uses: actions/checkout@v2
+ uses: actions/checkout@v3
- name: Activate Ruby 2.7
uses: ruby/setup-ruby@v1
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 1509f6e..d9604ad 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -9,7 +9,7 @@ jobs:
runs-on: ubuntu-20.04
steps:
- name: Checkout code
- uses: actions/checkout@v2
+ uses: actions/checkout@v3
with:
ref: ${{ github.ref }}
clean: true
@@ -33,7 +33,7 @@ jobs:
runs-on: ubuntu-20.04
steps:
- name: Checkout code
- uses: actions/checkout@v2
+ uses: actions/checkout@v3
with:
ref: ${{ github.ref }}
clean: true
diff --git a/.github/workflows/spec.yml b/.github/workflows/spec.yml
index 6c1ae10..6da7484 100644
--- a/.github/workflows/spec.yml
+++ b/.github/workflows/spec.yml
@@ -32,7 +32,7 @@ jobs:
echo STEP_ID=setup-environment >> $GITHUB_ENV
echo STEP_START=$(date +%s) >> $GITHUB_ENV
- name: Checkout Source
- uses: actions/checkout@v2
+ uses: actions/checkout@v3
if: ${{ github.repository_owner == 'puppetlabs' }}
- name: Activate Ruby 2.7
@@ -106,7 +106,7 @@ jobs:
job-status: ${{ job.status }}
matrix-key: ${{ env.SANITIZED_PUPPET_VERSION }}
- name: Checkout Source
- uses: actions/checkout@v2
+ uses: actions/checkout@v3
- name: "Activate Ruby ${{ matrix.ruby_version }}"
uses: ruby/setup-ruby@v1
diff --git a/CHANGELOG.md b/CHANGELOG.md
index e165b1a..19935af 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,7 +2,19 @@
All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) and this project adheres to [Semantic Versioning](http://semver.org).
-## [v9.0.1](https://github.com/puppetlabs/puppetlabs-apt/tree/v9.0.1) (2022-12-20)
+## [v9.0.2](https://github.com/puppetlabs/puppetlabs-apt/tree/v9.0.2) (2023-03-14)
+
+[Full Changelog](https://github.com/puppetlabs/puppetlabs-apt/compare/v9.0.1...v9.0.2)
+
+### Fixed
+
+- Adopt new parameter defaults in template [\#1090](https://github.com/puppetlabs/puppetlabs-apt/pull/1090) ([tuxmea](https://github.com/tuxmea))
+- \(CONT-493\) PPA validation adjustment [\#1085](https://github.com/puppetlabs/puppetlabs-apt/pull/1085) ([LukasAud](https://github.com/LukasAud))
+- fix typo in source.pp [\#1082](https://github.com/puppetlabs/puppetlabs-apt/pull/1082) ([bastelfreak](https://github.com/bastelfreak))
+- fix: remove `apt::` prefix from fact variables [\#1081](https://github.com/puppetlabs/puppetlabs-apt/pull/1081) ([johanfleury](https://github.com/johanfleury))
+- Updated mark as title can contain dot \(fixes \#1074\) [\#1075](https://github.com/puppetlabs/puppetlabs-apt/pull/1075) ([xepa](https://github.com/xepa))
+
+## [v9.0.1](https://github.com/puppetlabs/puppetlabs-apt/tree/v9.0.1) (2022-12-21)
[Full Changelog](https://github.com/puppetlabs/puppetlabs-apt/compare/v9.0.0...v9.0.1)
diff --git a/debian/changelog b/debian/changelog
index ad253ed..29e6a4b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+puppet-module-puppetlabs-apt (9.0.2-1) UNRELEASED; urgency=low
+
+ * New upstream release.
+
+ -- Debian Janitor <janitor@jelmer.uk> Fri, 07 Apr 2023 20:05:56 -0000
+
puppet-module-puppetlabs-apt (9.0.1-1) unstable; urgency=medium
* Team upload.
diff --git a/manifests/mark.pp b/manifests/mark.pp
index 08e396c..b2146b0 100644
--- a/manifests/mark.pp
+++ b/manifests/mark.pp
@@ -8,7 +8,7 @@
define apt::mark (
Enum['auto','manual','hold','unhold'] $setting,
) {
- if $title !~ /^[a-zA-Z0-9\-_]+$/ {
+ if $title !~ /^[a-z0-9][a-z0-9.+\-]+$/ {
fail("Invalid package name: ${title}")
}
diff --git a/manifests/ppa.pp b/manifests/ppa.pp
index 4e5e775..2a5b4a8 100644
--- a/manifests/ppa.pp
+++ b/manifests/ppa.pp
@@ -40,7 +40,7 @@ define apt::ppa (
}
# Validate the resource name
- if $name !~ /^ppa:([a-zA-Z0-9\-_]+)\/([a-zA-z0-9\-_\.]+)$/ {
+ if $name !~ /^ppa:([a-zA-Z0-9\-_.]+)\/([a-zA-z0-9\-_\.]+)$/ {
fail("Invalid PPA name: ${name}")
}
diff --git a/manifests/source.pp b/manifests/source.pp
index b1be300..420d19d 100644
--- a/manifests/source.pp
+++ b/manifests/source.pp
@@ -143,7 +143,7 @@ define apt::source (
'comment' => $comment,
'includes' => $includes,
'options' => delete_undef_values({
- 'arch' => $architecture,
+ 'arch' => $_architecture,
'trusted' => $allow_unsigned ? { true => 'yes', false => undef },
'allow-insecure' => $allow_insecure ? { true => 'yes', false => undef },
'signed-by' => $keyring,
diff --git a/manifests/update.pp b/manifests/update.pp
index ef37f52..a9f2486 100644
--- a/manifests/update.pp
+++ b/manifests/update.pp
@@ -5,7 +5,7 @@
class apt::update {
assert_private()
- #TODO: to catch if $apt_update_last_success has the value of -1 here. If we
+ #TODO: to catch if apt_update_last_success has the value of -1 here. If we
#opt to do this, a info/warn would likely be all you'd need likely to happen
#on the first run, but if it's not run in awhile something is likely borked
#with apt and we'd want to know about it.
@@ -18,8 +18,8 @@ class apt::update {
#compare current date with the apt_update_last_success fact to determine
#if we should kick apt_update.
$daily_threshold = (Integer(Timestamp().strftime('%s')) - 86400)
- if $apt::apt_update_last_success {
- if $apt::apt_update_last_success + 0 < $daily_threshold {
+ if $facts['apt_update_last_success'] {
+ if $facts['apt_update_last_success'] + 0 < $daily_threshold {
$_kick_apt = true
} else {
$_kick_apt = false
@@ -33,8 +33,8 @@ class apt::update {
#compare current date with the apt_update_last_success fact to determine
#if we should kick apt_update.
$weekly_threshold = (Integer(Timestamp().strftime('%s')) - 604800)
- if $apt::apt_update_last_success {
- if ( $apt::apt_update_last_success + 0 < $weekly_threshold ) {
+ if $facts['apt_update_last_success'] {
+ if $facts['apt_update_last_success'] + 0 < $weekly_threshold {
$_kick_apt = true
} else {
$_kick_apt = false
diff --git a/metadata.json b/metadata.json
index ace916f..0565eaa 100644
--- a/metadata.json
+++ b/metadata.json
@@ -1,6 +1,6 @@
{
"name": "puppetlabs-apt",
- "version": "9.0.1",
+ "version": "9.0.2",
"author": "puppetlabs",
"summary": "Provides an interface for managing Apt source, key, and definitions with Puppet",
"license": "Apache-2.0",
@@ -37,6 +37,6 @@
}
],
"template-url": "https://github.com/puppetlabs/pdk-templates.git#main",
- "template-ref": "tags/2.6.0-0-gd0490b9",
- "pdk-version": "2.5.0"
+ "template-ref": "tags/2.7.3-0-g8f110f1",
+ "pdk-version": "2.7.0 (8)"
}
diff --git a/templates/pin.pref.epp b/templates/pin.pref.epp
index 29082e8..96b815c 100644
--- a/templates/pin.pref.epp
+++ b/templates/pin.pref.epp
@@ -3,12 +3,12 @@
$pin =
if $pin_release != '' {
$options = [
- if $release != '' { "a=${release}" },
- if $codename != '' { "n=${codename}" },
- if $release_version != '' { "v=${release_version}"},
- if $component != '' { "c=${component}" },
- if $originator != '' { "o=${originator}" },
- if $label != '' { "l=${label}" },
+ unless $release =~ Undef { "a=${release}" },
+ unless $codename =~ Undef { "n=${codename}" },
+ unless $release_version =~ Undef { "v=${release_version}"},
+ unless $component =~ Undef { "c=${component}" },
+ unless $originator =~ Undef { "o=${originator}" },
+ unless $label =~ Undef { "l=${label}" },
].filter |$x| { $x != undef }
"release ${options.join(', ')}" }
Debdiff
File lists identical (after any substitutions)
No differences were encountered in the control files