Merge pull request #7 from newcastleuniversity/3_implement_prod_channel

Calculate real release from distro codename in Apt source management; fixes #3

.github/workflows/main.yml

@@ -25,26 +25,6 @@ jobs:
       # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
       - uses: actions/checkout@v3
 
-      - name: action-pdk-validate
-        # You may pin to the exact commit or the version.
-        # uses: puppets-epic-show-theatre/action-pdk-validate@31b5407676af16b690b2b8c54c0767af72fcc34f
-        uses: puppets-epic-show-theatre/action-pdk-validate@v1
-        with:
-          # A string indicating the Puppet version to validate against, such as "5.4.2" or "5.5".
-          puppet-version: 7.21.0
-          # A string indicating the PE version to validate against, such as "2017.3.5" or "2018.1".
-          pe-version: # optional
-
-      - name: action-pdk-test-unit
-        # You may pin to the exact commit or the version.
-        # uses: puppets-epic-show-theatre/action-pdk-test-unit@193987acba9977d1825fefbcbaf8d02d6af78106
-        uses: puppets-epic-show-theatre/action-pdk-test-unit@v1
-        with:
-          # A string indicating the Puppet version to validate against, such as "5.4.2" or "5.5".
-          puppet-version: 7.21.0
-          # A string indicating the PE version to validate against, such as "2017.3.5" or "2018.1".
-          pe-version: # optional
-
       - name: action-pdk-validate
         # You may pin to the exact commit or the version.
         # uses: puppets-epic-show-theatre/action-pdk-validate@31b5407676af16b690b2b8c54c0767af72fcc34f

manifests/init.pp

@@ -17,11 +17,11 @@
   # Automatic parameter lookup never works for me so I used lookup(), which also lets me do these very obvious defaults-with-overrides.
   Stdlib::Filesource $onboarding_json_file,
   # If default_distro isn't in the module Hiera, compilation should fail
-  Optional[String] $distro                                        = lookup('microsoft_defender_atp_agent::default_distro'),
-  Optional[String] $version                                       = $::facts['os']['release']['major'],
-  Optional[Enum['prod','insiders-fast','insiders-slow']] $channel = lookup('microsoft_defender_atp_agent::default_channel'), # prod
-  Optional[Boolean] $manage_sources                               = lookup('microsoft_defender_atp_agent::default_manage_sources'), # true
-  Optional[String] $keyserver                                     = lookup('microsoft_defender_atp_agent::default_keyserver') # hkps://keyserver.ubuntu.com:443
+  Optional[String] $distro                                                            = lookup('microsoft_defender_atp_agent::default_distro'),
+  Optional[String] $version                                                           = $::facts['os']['release']['major'],
+  Optional[Enum['prod','insiders-fast','insiders-slow','nightly','testing']] $channel = lookup('microsoft_defender_atp_agent::default_channel'), # prod
+  Optional[Boolean] $manage_sources                                                   = lookup('microsoft_defender_atp_agent::default_manage_sources'), # true
+  Optional[String] $keyserver                                                         = lookup('microsoft_defender_atp_agent::default_keyserver') # hkps://keyserver.ubuntu.com:443
 ) {
 
   # I run a lot of armhf Pis and this endpoint agent won't work on them because the

manifests/sources.pp

@@ -11,11 +11,20 @@
 
     /(debian|ubuntu)/: {
 
+      case $microsoft_defender_atp_agent::channel {
+        'prod': {
+          $real_channel = $::facts['os']['distro']['codename']
+        }
+        default: {
+          $real_channel = $microsoft_defender_atp_agent::channel
+        }
+      }
+
       include apt
 
       apt::source { 'microsoftpackages' :
         location => "https://packages.microsoft.com/${microsoft_defender_atp_agent::distro}/${microsoft_defender_atp_agent::version}/prod",
-        release  => $microsoft_defender_atp_agent::channel,
+        release  => $real_channel,
         repos    => 'main',
         key      => {
           'id'     => 'BC528686B50D79E339D3721CEB3E94ADBE1229CF',

spec/classes/sources_spec.rb

@@ -29,7 +29,7 @@
       supported_os: [
         {
           'operatingsystem'        => 'Ubuntu',
-          'operatingsystemrelease' => ['18.04', '20.04'],
+          'operatingsystemrelease' => ['18.04', '20.04', '22.04'],
         },
       ],
     }
@@ -40,7 +40,6 @@
       it {
         is_expected.to contain_apt__source('microsoftpackages').with(
           'location' => %r{ubuntu},
-          'release'  => 'prod',
           'key'      => {
             'server' => 'hkps://keyserver.ubuntu.com:443',
             'id'     => 'BC528686B50D79E339D3721CEB3E94ADBE1229CF',
@@ -50,12 +49,29 @@
     end
   end
 
+  context 'Ubuntu 22.02 tests' do
+    ubuntu22 = {
+      supported_os: [
+        {
+          'operatingsystem'        => 'Ubuntu',
+          'operatingsystemrelease' => ['22.04'],
+        },
+      ],
+    }
+
+    on_supported_os(ubuntu22).each do |_os, os_facts|
+      let(:facts) { os_facts }
+
+      it { is_expected.to contain_apt__source('microsoftpackages').with('release' => 'jammy') }
+    end
+  end
+
   context 'Debian tests' do
     debian = {
       supported_os: [
         {
           'operatingsystem'        => 'Debian',
-          'operatingsystemrelease' => ['9', '10'],
+          'operatingsystemrelease' => ['9', '10', '11'],
         },
       ],
     }
@@ -66,7 +82,6 @@
       it {
         is_expected.to contain_apt__source('microsoftpackages').with(
           'location' => %r{debian},
-          'release'  => 'prod',
           'key'      => {
             'server' => 'hkps://keyserver.ubuntu.com:443',
             'id'     => 'BC528686B50D79E339D3721CEB3E94ADBE1229CF',