WIP

Author: jhoblitt

.fixtures.yml

@@ -4,4 +4,5 @@
 fixtures:
   forge_modules:
     stdlib: "puppetlabs/stdlib"
+    quadlets: "puppet/quadlets"
     systemd: "puppet/systemd"

REFERENCE.md

@@ -6,50 +6,29 @@
 
 ### Classes
 
-* [`smee`](#smee): Manages the smee.io webhook proxy service client
+* [`smee`](#smee)
 
 ## Classes
 
 ### <a name="smee"></a>`smee`
 
-Manages the smee.io webhook proxy service client
+The smee class.
 
 #### Parameters
 
 The following parameters are available in the `smee` class:
 
 * [`url`](#-smee--url)
-* [`packages`](#-smee--packages)
-* [`binary`](#-smee--binary)
-* [`exec_start`](#-smee--exec_start)
 * [`path`](#-smee--path)
 * [`port`](#-smee--port)
-* [`version`](#-smee--version)
+* [`image`](#-smee--image)
 
 ##### <a name="-smee--url"></a>`url`
 
 Data type: `Stdlib::HTTPSUrl`
 
 URL to the smee topic to watch for webhook events.
 
-##### <a name="-smee--packages"></a>`packages`
-
-Data type: `Array[String]`
-
-URL to the smee topic to watch for webhook events.
-
-##### <a name="-smee--binary"></a>`binary`
-
-Data type: `Stdlib::Absolutepath`
-
-Path to smee client binary.
-
-##### <a name="-smee--exec_start"></a>`exec_start`
-
-Data type: `Stdlib::Absolutepath`
-
-Systemd `ExecStart` string.
-
 ##### <a name="-smee--path"></a>`path`
 
 Data type: `String`
@@ -66,11 +45,9 @@ Local HTTP server port.
 
 Default value: `3000`
 
-##### <a name="-smee--version"></a>`version`
+##### <a name="-smee--image"></a>`image`
 
-Data type: `String`
+Data type: `String[1]`
 
-Version of the smee-client package to install.
 
-Default value: `'2.0.0'`
 

data/common.yaml

@@ -1 +1,2 @@
---- {}
+---
+smee::image: ghcr.io/lsst-it/smee-client:4.3.1

data/osfamily/RedHat/major/7.yaml

@@ -0,0 +1,5 @@
+class { 'smee':
+  url  => 'https://foo.example.org',
+  path => '/payload',
+  port => 1234,
+}

data/osfamily/RedHat/major/8.yaml

@@ -1,91 +1,47 @@
 # @summary
 #   Manages the smee.io webhook proxy service client
 #
+# @param image
+#   The OCI image to use for the service.
+
 # @param url
 #   URL to the smee topic to watch for webhook events.
 #
-# @param packages
-#   URL to the smee topic to watch for webhook events.
-#
-# @param binary
-#   Path to smee client binary.
-#
-# @param exec_start
-#   Systemd `ExecStart` string.
-#
 # @param path
 #   URL path to post proxied requests to.
 #
 # @param port
 #   Local HTTP server port.
 #
-# @param version
-#   Version of the smee-client package to install.
-#
 class smee (
+  String[1] $image,
   Stdlib::HTTPSUrl $url,
-  Array[String] $packages,
-  Stdlib::Absolutepath $binary,
-  Stdlib::Absolutepath $exec_start,
   String $path = '/',
   Integer $port = 3000,
-  String $version = '2.0.0',
 ) {
-  stdlib::ensure_packages($packages)
-
-  group { 'smee':
-    ensure => present,
-    system => true,
-  }
-  -> user { 'smee':
-    ensure     => present,
-    gid        => 'smee',
-    home       => '/',
-    managehome => false,
-    shell      => '/sbin/nologin',
-    system     => true,
-  }
-
-  exec { 'install-smee':
-    creates   => $binary,
-    command   => "npm install --global smee-client@${version}",
-    subscribe => Package[$packages],
-    path      => [
-      '/opt/rh/rh-nodejs10/root/usr/bin',  # needed for EL7
-      '/usr/sbin',
-      '/usr/bin',
-    ],
-  }
-
-  $service_unit = @("EOT")
-    [Unit]
-    Description=smee.io webhook daemon
-
-    [Service]
-    Type=simple
-    User=smee
-    Group=smee
-    ExecStart=${exec_start} \
-      --url ${url} \
-      -P ${path} \
-      -p ${port}
-    Restart=on-failure
-    RestartSec=10
-    PrivateTmp=yes
-    PrivateDevices=yes
-    ProtectSystem=yes
-    ProtectHome=yes
-
-    [Install]
-    WantedBy=default.target
-    | EOT
+  $nobody = 65534
 
-  systemd::unit_file { 'smee.service':
-    ensure    => 'present',
-    active    => true,
-    content   => $service_unit,
-    enable    => true,
-    subscribe => Exec['install-smee'],
-    require   => User['smee'],
+  quadlets::quadlet { 'smee.container':
+    ensure          => present,
+    active          => true,
+    unit_entry      => {
+      'Description' => 'smee.io webhook proxy client',
+      'Requires'    => 'network-online.target',
+      'After'       => 'network-online.target',
+    },
+    container_entry => {
+      'Image'   => $image,
+      'Exec'    => "--url '${url}' --path '${path}' --port '${port}'",
+      'Network' => 'host',
+      'User'    => $nobody,
+      'Group'   => $nobody,
+      'Tmpfs'   => ['/run'],
+    },
+    service_entry   => {
+      'Restart' => 'always',
+    },
+    install_entry   => {
+      'WantedBy' => 'default.target',
+    },
   }
 }

data/osfamily/RedHat/major/9.yaml

@@ -5,14 +5,19 @@
   "summary": "Manages the smee.io webhook proxy service client",
   "license": "Apache-2.0",
   "source": "https://github.com/lsst-it/puppet-smee",
+  "tags": [
+    "proxy",
+    "smee",
+    "webhook"
+  ],
   "dependencies": [
     {
       "name": "puppetlabs/stdlib",
       "version_requirement": ">= 9.0.0 < 10.0.0"
     },
     {
-      "name": "puppet/systemd",
-      "version_requirement": ">= 3.0.0 < 9.0.0"
+      "name": "puppet/quadlets",
+      "version_requirement": ">= 2.0.0 < 3.0.0"
     }
   ],
   "operatingsystem_support": [

examples/smee.pp

@@ -3,30 +3,26 @@
 require 'spec_helper_acceptance'
 
 describe 'smee class' do
-  context 'with url' do
-    let(:manifest) do
-      <<-PP
-        class { smee:
-          url  => 'https://foo.example.org',
-          path => '/payload',
-          port => 1234,
-        }
-      PP
-    end
+  shell('dnf install -y podman-docker') # used by serverspec
 
-    it_behaves_like 'an idempotent resource'
+  include_examples 'the example', 'smee.pp'
 
-    describe service('smee') do
-      it { is_expected.to be_enabled }
-      it { is_expected.to be_running }
-    end
+  it_behaves_like 'an idempotent resource'
 
-    describe process('node') do
-      its(:user) { is_expected.to eq 'smee' }
-      its(:group) { is_expected.to eq 'smee' }
-      its(:args) { is_expected.to match %r{--url https://foo.example.org} }
-      its(:args) { is_expected.to match %r{-P /payload} }
-      its(:args) { is_expected.to match %r{-p 1234} }
-    end
+  describe service('smee') do
+    it { is_expected.to be_enabled }
+    it { is_expected.to be_running }
+  end
+
+  describe docker_container('systemd-smee') do
+    its(['Config.Image']) { is_expected.to eq 'ghcr.io/lsst-it/smee-client:4.3.1' }
+    its(['Config.User']) { is_expected.to eq '65534:65534' }
+    its(['HostConfig.NetworkMode']) { is_expected.to eq 'host' }
+    its(['Args']) { is_expected.to include('--url') }
+    its(['Args']) { is_expected.to include('https://foo.example.org') }
+    its(['Args']) { is_expected.to include('--path') }
+    its(['Args']) { is_expected.to include('/payload') }
+    its(['Args']) { is_expected.to include('--port') }
+    its(['Args']) { is_expected.to include('1234') }
   end
 end