Add ensure parameter and make content parameter toggleable for entry API config file

Author: willaerk

manifests/uitdatabank/entry_api/deployment.pp

@@ -2,27 +2,26 @@
   String                    $config_source,
   String                    $admin_permissions_source,
   String                    $client_permissions_source,
-  String                    $api_keys_matched_to_client_ids_source,
   String                    $movie_fetcher_config_source,
   String                    $completeness_source,
   String                    $externalid_mapping_organizer_source,
   String                    $externalid_mapping_place_source,
   String                    $pubkey_uitidv1_source,
   String                    $pubkey_keycloak_source,
-  String                    $version                             = 'latest',
-  String                    $repository                          = 'uitdatabank-entry-api',
-  Enum['present', 'absent'] $amqp_listener_uitpas                = 'present',
-  Enum['present', 'absent'] $bulk_label_offer_worker             = 'present',
-  Enum['present', 'absent'] $mail_worker                         = 'present',
-  Integer[0]                $event_export_worker_count           = 1,
-  Optional[String]          $puppetdb_url                        = lookup('data::puppet::puppetdb::url', Optional[String], 'first', undef)
+  String                    $version                               = 'latest',
+  String                    $repository                            = 'uitdatabank-entry-api',
+  Optional[String]          $api_keys_matched_to_client_ids_source = undef,
+  Enum['present', 'absent'] $amqp_listener_uitpas                  = 'present',
+  Enum['present', 'absent'] $bulk_label_offer_worker               = 'present',
+  Enum['present', 'absent'] $mail_worker                           = 'present',
+  Integer[0]                $event_export_worker_count             = 1,
+  Optional[String]          $puppetdb_url                          = lookup('data::puppet::puppetdb::url', Optional[String], 'first', undef)
 ) inherits ::profiles {
 
   $basedir                 = '/var/www/udb3-backend'
   $secrets                 = lookup('vault:uitdatabank/udb3-backend')
   $mount_target_dns_name   = lookup('terraform::efs::mount_target_dns_name', Optional[String], 'first', undef)
   $file_default_attributes = {
-                               ensure  => 'file',
                                owner   => 'www-data',
                                group   => 'www-data',
                                require => [Group['www-data'], User['www-data'], Package['uitdatabank-entry-api']],
@@ -50,60 +49,76 @@
   }
 
   file { 'uitdatabank-entry-api-config':
+    ensure  => 'file',
     path    => "${basedir}/config.php",
     content => template($config_source),
     *       => $file_default_attributes
   }
 
   file { 'uitdatabank-entry-api-admin-permissions':
+    ensure  => 'file',
     path    => "${basedir}/config.allow_all.php",
     content => template($admin_permissions_source),
     *       => $file_default_attributes
   }
 
   file { 'uitdatabank-entry-api-client-permissions':
+    ensure  => 'file',
     path    => "${basedir}/config.client_permissions.php",
     content => template($client_permissions_source),
     *       => $file_default_attributes
   }
 
   file { 'uitdatabank-entry-api-api-keys-matched-to-client-ids':
+    ensure  => $api_keys_matched_to_client_ids_source ? {
+                 undef   => 'absent',
+                 default => 'file'
+               },
     path    => "${basedir}/config.api_keys_matched_to_client_ids.php",
-    content => template($api_keys_matched_to_client_ids_source),
+    content => $api_keys_matched_to_client_ids_source ? {
+                 undef   => undef,
+                 default => template($api_keys_matched_to_client_ids_source),
+               },
     *       => $file_default_attributes
   }
 
   file { 'uitdatabank-entry-api-movie-fetcher-config':
+    ensure  => 'file',
     path    => "${basedir}/config.kinepolis.php",
     content => template($movie_fetcher_config_source),
     *       => $file_default_attributes
   }
 
   file { 'uitdatabank-entry-api-completeness':
+    ensure  => 'file',
     path    => "${basedir}/config.completeness.php",
     content => template($completeness_source),
     *       => $file_default_attributes
   }
 
   file { 'uitdatabank-entry-api-externalid-mapping-organizer':
+    ensure  => 'file',
     path    => "${basedir}/config.external_id_mapping_organizer.php",
     content => template($externalid_mapping_organizer_source),
     *       => $file_default_attributes
   }
 
   file { 'uitdatabank-entry-api-externalid-mapping-place':
+    ensure  => 'file',
     path    => "${basedir}/config.external_id_mapping_place.php",
     content => template($externalid_mapping_place_source),
     *       => $file_default_attributes
   }
 
   file { 'uitdatabank-entry-api-pubkey-uitidv1':
+    ensure  => 'file',
     path    => "${basedir}/public.pem",
     content => template($pubkey_uitidv1_source),
     *       => $file_default_attributes
   }
 
   file { 'uitdatabank-entry-api-pubkey-keycloak':
+    ensure  => 'file',
     path    => "${basedir}/public-keycloak.pem",
     content => template($pubkey_keycloak_source),
     *       => $file_default_attributes

spec/classes/uitdatabank/entry_api/deployment_spec.rb

@@ -305,7 +305,7 @@
           'config_source'                                          => 'appconfig/uitdatabank/udb3-backend/my.config.php',
           'admin_permissions_source'                               => 'appconfig/uitdatabank/udb3-backend/config.my.allow_all.php',
           'client_permissions_source'                              => 'appconfig/uitdatabank/udb3-backend/config.my.client_permissions.php',
-          'api_keys_matched_to_client_ids_source_source'           => 'appconfig/uitdatabank/udb3-backend/config.my.api_keys_matched_to_client_ids_source.php',
+          'api_keys_matched_to_client_ids_source'                  => 'appconfig/uitdatabank/udb3-backend/config.my.api_keys_matched_to_client_ids.php',
           'movie_fetcher_config_source'                            => 'appconfig/uitdatabank/udb3-backend/config.my.kinepolis.php',
           'completeness_source'                                    => 'appconfig/uitdatabank/udb3-backend/config.my.completeness.php',
           'externalid_mapping_organizer_source'                    => 'appconfig/uitdatabank/udb3-backend/config.my.external_id_mapping_organizer.php',
@@ -365,7 +365,6 @@
         it { expect { catalogue }.to raise_error(Puppet::ParseError, /expects a value for parameter 'config_source'/) }
         it { expect { catalogue }.to raise_error(Puppet::ParseError, /expects a value for parameter 'admin_permissions_source'/) }
         it { expect { catalogue }.to raise_error(Puppet::ParseError, /expects a value for parameter 'client_permissions_source'/) }
-        it { expect { catalogue }.to raise_error(Puppet::ParseError, /expects a value for parameter 'api_keys_matched_to_client_ids_source'/) }
         it { expect { catalogue }.to raise_error(Puppet::ParseError, /expects a value for parameter 'movie_fetcher_config_source'/) }
         it { expect { catalogue }.to raise_error(Puppet::ParseError, /expects a value for parameter 'completeness_source'/) }
         it { expect { catalogue }.to raise_error(Puppet::ParseError, /expects a value for parameter 'externalid_mapping_place_source'/) }