From 14ed7215672d9ee257aca062b93d232f3a5e3ab6 Mon Sep 17 00:00:00 2001 From: Steve Traylen Date: Thu, 28 Mar 2024 09:50:08 +0100 Subject: [PATCH] Quadlet not Quadret --- REFERENCE.md | 6 +++--- manifests/manage_container.pp | 3 +-- ...t_container_spec.rb => podman_quadlet_container_spec.rb} | 2 +- types/{quadret => quadlet}/container.pp | 2 +- 4 files changed, 6 insertions(+), 7 deletions(-) rename spec/type_aliases/{podman_quadret_container_spec.rb => podman_quadlet_container_spec.rb} (84%) rename types/{quadret => quadlet}/container.pp (98%) diff --git a/REFERENCE.md b/REFERENCE.md index 8d8dd24..4315f33 100644 --- a/REFERENCE.md +++ b/REFERENCE.md @@ -31,7 +31,7 @@ ### Data types -* [`Podman::Quadret::Container`](#Podman--Quadret--Container): custom datatype for container entries of podman container quadlet +* [`Podman::Quadlet::Container`](#Podman--Quadlet--Container): custom datatype for container entries of podman container quadlet ## Classes @@ -630,7 +630,7 @@ Default value: `undef` ##### `container_entry` -Data type: `Optional[Podman::Quadret::Container]` +Data type: `Optional[Podman::Quadlet::Container]` The `[Container]` section defintion. @@ -1054,7 +1054,7 @@ Default value: `undef` ## Data types -### `Podman::Quadret::Container` +### `Podman::Quadlet::Container` custom datatype for container entries of podman container quadlet diff --git a/manifests/manage_container.pp b/manifests/manage_container.pp index 4185b4b..71a1f5f 100644 --- a/manifests/manage_container.pp +++ b/manifests/manage_container.pp @@ -44,7 +44,7 @@ Optional[Systemd::Unit::Install] $install_entry = undef, Optional[Systemd::Unit::Unit] $unit_entry = undef, Optional[Systemd::Unit::Service] $service_entry = undef, - Optional[Podman::Quadret::Container] $container_entry = undef, + Optional[Podman::Quadlet::Container] $container_entry = undef, ) { assert_type(Pattern[/[a-zA-Z\-_+]+\.container/], $name) @@ -69,7 +69,6 @@ } if $active != undef { - $_service = regsubst($name,'(.+)\\.container','\\1.service') service { $_service: diff --git a/spec/type_aliases/podman_quadret_container_spec.rb b/spec/type_aliases/podman_quadlet_container_spec.rb similarity index 84% rename from spec/type_aliases/podman_quadret_container_spec.rb rename to spec/type_aliases/podman_quadlet_container_spec.rb index 6010c1f..871133c 100644 --- a/spec/type_aliases/podman_quadret_container_spec.rb +++ b/spec/type_aliases/podman_quadlet_container_spec.rb @@ -1,6 +1,6 @@ require 'spec_helper' -describe 'Podman::Quadret::Container' do +describe 'Podman::Quadlet::Container' do it { is_expected.to allow_value({ 'Image' => 'busybox' }) } it { is_expected.to allow_value({ 'Exec' => '/bin/bash' }) } it { is_expected.to allow_value({ 'Exec' => './entrypoint.sh' }) } diff --git a/types/quadret/container.pp b/types/quadlet/container.pp similarity index 98% rename from types/quadret/container.pp rename to types/quadlet/container.pp index c6a6cbd..79c7b08 100644 --- a/types/quadret/container.pp +++ b/types/quadlet/container.pp @@ -1,6 +1,6 @@ # @summary custom datatype for container entries of podman container quadlet # @see https://docs.podman.io/en/latest/markdown/podman-systemd.unit.5.html -type Podman::Quadret::Container = Struct[ +type Podman::Quadlet::Container = Struct[ Optional['AddCapability'] => Array[String[1],1], Optional['Annotation'] => Array[String[1],1], Optional['AutoUpdate'] => Enum['registry','local'],