(MODULES-8553) Further cleanup for package tag issues

Helen Campbell · Helen Campbell · commit facd625e2ad3 · 2019-02-06T10:39:42.000Z
diff --git a/manifests/client.pp b/manifests/client.pp
@@ -10,7 +10,7 @@
     package { 'postgresql-client':
       ensure => $package_ensure,
       name   => $package_name,
-      tag    => 'postgresql',
+      tag    => 'puppetlabs-postgresql',
     }
   }
 
diff --git a/manifests/lib/devel.pp b/manifests/lib/devel.pp
@@ -13,7 +13,7 @@
   package { 'postgresql-devel':
     ensure => $package_ensure,
     name   => $package_name,
-    tag    => 'postgresql',
+    tag    => 'puppetlabs-postgresql',
   }
 
   if $link_pg_config {
diff --git a/manifests/lib/docs.pp b/manifests/lib/docs.pp
@@ -8,7 +8,7 @@
   package { 'postgresql-docs':
     ensure => $package_ensure,
     name   => $package_name,
-    tag    => 'postgresql',
+    tag    => 'puppetlabs-postgresql',
   }
 
 }
diff --git a/manifests/lib/java.pp b/manifests/lib/java.pp
@@ -8,7 +8,7 @@
   package { 'postgresql-jdbc':
     ensure => $package_ensure,
     name   => $package_name,
-    tag    => 'postgresql',
+    tag    => 'puppetlabs-postgresql',
   }
 
 }
diff --git a/manifests/lib/perl.pp b/manifests/lib/perl.pp
@@ -8,6 +8,7 @@
   package { 'perl-DBD-Pg':
     ensure => $package_ensure,
     name   => $package_name,
+    tag    => 'puppetlabs-postgresql',
   }
 
 }
diff --git a/manifests/lib/python.pp b/manifests/lib/python.pp
@@ -8,6 +8,7 @@
   package { 'python-psycopg2':
     ensure => $package_ensure,
     name   => $package_name,
+    tag    => 'puppetlabs-postgresql',
   }
 
 }
diff --git a/manifests/repo/apt_postgresql_org.pp b/manifests/repo/apt_postgresql_org.pp
@@ -28,5 +28,5 @@
   }
 
   Apt::Source['apt.postgresql.org']->Package<|tag == 'puppetlabs-postgresql'|>
-  Class['Apt::Update'] -> Package<|tag == 'postgresql'|>
+  Class['Apt::Update'] -> Package<|tag == 'puppetlabs-postgresql'|>
 }
diff --git a/manifests/repo/yum_postgresql_org.pp b/manifests/repo/yum_postgresql_org.pp
@@ -32,5 +32,5 @@
     proxy    => $postgresql::repo::proxy,
   }
 
-  Yumrepo['yum.postgresql.org'] -> Package<|tag == 'postgresql'|>
+  Yumrepo['yum.postgresql.org'] -> Package<|tag == 'puppetlabs-postgresql'|>
 }
diff --git a/manifests/server/contrib.pp b/manifests/server/contrib.pp
@@ -11,7 +11,7 @@
   package { 'postgresql-contrib':
     ensure => $package_ensure,
     name   => $package_name,
-    tag    => 'postgresql',
+    tag    => 'puppetlabs-postgresql',
   }
 
   anchor { 'postgresql::server::contrib::start': }
diff --git a/manifests/server/extension.pp b/manifests/server/extension.pp
@@ -87,7 +87,7 @@
 
     ensure_packages($package_name, {
       ensure  => $_package_ensure,
-      tag     => 'postgresql',
+      tag     => 'puppetlabs-postgresql',
       require => $package_require,
       before  => $package_before,
     })
diff --git a/manifests/server/install.pp b/manifests/server/install.pp
@@ -16,7 +16,7 @@
 
     # This is searched for to create relationships with the package repos, be
     # careful about its removal
-    tag    => 'postgresql',
+    tag    => 'puppetlabs-postgresql',
   }
 
 }
diff --git a/manifests/server/plperl.pp b/manifests/server/plperl.pp
@@ -7,7 +7,7 @@
   package { 'postgresql-plperl':
     ensure => $package_ensure,
     name   => $package_name,
-    tag    => 'postgresql',
+    tag    => 'puppetlabs-postgresql',
   }
 
   anchor { 'postgresql::server::plperl::start': }
diff --git a/manifests/server/plpython.pp b/manifests/server/plpython.pp
@@ -7,7 +7,7 @@
   package { 'postgresql-plpython':
     ensure => $package_ensure,
     name   => $package_name,
-    tag    => 'postgresql',
+    tag    => 'puppetlabs-postgresql',
   }
 
   anchor { 'postgresql::server::plpython::start': }
diff --git a/manifests/server/postgis.pp b/manifests/server/postgis.pp
@@ -7,7 +7,7 @@
   package { 'postgresql-postgis':
     ensure => $package_ensure,
     name   => $package_name,
-    tag    => 'postgresql',
+    tag    => 'puppetlabs-postgresql',
   }
 
   anchor { 'postgresql::server::postgis::start': }
diff --git a/spec/unit/classes/client_spec.rb b/spec/unit/classes/client_spec.rb
@@ -22,7 +22,7 @@
     it 'modifies package' do
       is_expected.to contain_package('postgresql-client').with(ensure: 'absent',
                                                                name: 'mypackage',
-                                                               tag: 'postgresql')
+                                                               tag: 'puppetlabs-postgresql')
     end
 
     it 'has specified validate connexion' do
@@ -35,7 +35,7 @@
 
   describe 'with no parameters' do
     it 'creates package with postgresql tag' do
-      is_expected.to contain_package('postgresql-client').with(tag: 'postgresql')
+      is_expected.to contain_package('postgresql-client').with(tag: 'puppetlabs-postgresql')
     end
   end
 
diff --git a/spec/unit/classes/lib/java_spec.rb b/spec/unit/classes/lib/java_spec.rb
@@ -14,7 +14,7 @@
       is_expected.to contain_package('postgresql-jdbc').with(
         name: 'libpostgresql-jdbc-java',
         ensure: 'present',
-        tag: 'postgresql',
+        tag: 'puppetlabs-postgresql',
       )
     }
   end
@@ -32,7 +32,7 @@
       is_expected.to contain_package('postgresql-jdbc').with(
         name: 'postgresql-jdbc',
         ensure: 'present',
-        tag: 'postgresql',
+        tag: 'puppetlabs-postgresql',
       )
     }
     describe 'when parameters are supplied' do
@@ -44,7 +44,7 @@
         is_expected.to contain_package('postgresql-jdbc').with(
           name: 'somepackage',
           ensure: 'latest',
-          tag: 'postgresql',
+          tag: 'puppetlabs-postgresql',
         )
       }
     end
diff --git a/spec/unit/classes/lib/pgdocs_spec.rb b/spec/unit/classes/lib/pgdocs_spec.rb
@@ -14,7 +14,7 @@
       is_expected.to contain_package('postgresql-docs').with(
         name: 'postgresql-docs',
         ensure: 'present',
-        tag: 'postgresql',
+        tag: 'puppetlabs-postgresql',
       )
     }
     describe 'when parameters are supplied' do
@@ -26,7 +26,7 @@
         is_expected.to contain_package('postgresql-docs').with(
           name: 'somepackage',
           ensure: 'latest',
-          tag: 'postgresql',
+          tag: 'puppetlabs-postgresql',
         )
       }
     end
diff --git a/spec/unit/classes/server/contrib_spec.rb b/spec/unit/classes/server/contrib_spec.rb
@@ -28,13 +28,13 @@
     it 'creates package with correct params' do
       is_expected.to contain_package('postgresql-contrib').with(ensure: 'absent',
                                                                 name: 'mypackage',
-                                                                tag: 'postgresql')
+                                                                tag: 'puppetlabs-postgresql')
     end
   end
 
   describe 'with no parameters' do
     it 'creates package with postgresql tag' do
-      is_expected.to contain_package('postgresql-contrib').with(tag: 'postgresql')
+      is_expected.to contain_package('postgresql-contrib').with(tag: 'puppetlabs-postgresql')
     end
   end
 
diff --git a/spec/unit/classes/server/plperl_spec.rb b/spec/unit/classes/server/plperl_spec.rb
@@ -21,7 +21,7 @@
     it { is_expected.to contain_class('postgresql::server::plperl') }
     it 'creates package' do
       is_expected.to contain_package('postgresql-plperl').with(ensure: 'present',
-                                                               tag: 'postgresql')
+                                                               tag: 'puppetlabs-postgresql')
     end
   end
 
@@ -37,7 +37,7 @@
     it 'creates package with correct params' do
       is_expected.to contain_package('postgresql-plperl').with(ensure: 'absent',
                                                                name: 'mypackage',
-                                                               tag: 'postgresql')
+                                                               tag: 'puppetlabs-postgresql')
     end
   end
 end
diff --git a/spec/unit/classes/server/plpython_spec.rb b/spec/unit/classes/server/plpython_spec.rb
@@ -22,7 +22,7 @@
     it { is_expected.to contain_class('postgresql::server::plpython') }
     it 'creates package' do
       is_expected.to contain_package('postgresql-plpython').with(ensure: 'present',
-                                                                 tag: 'postgresql')
+                                                                 tag: 'puppetlabs-postgresql')
     end
   end
 
@@ -38,7 +38,7 @@
     it 'creates package with correct params' do
       is_expected.to contain_package('postgresql-plpython').with(ensure: 'absent',
                                                                  name: 'mypackage',
-                                                                 tag: 'postgresql')
+                                                                 tag: 'puppetlabs-postgresql')
     end
   end
 end
diff --git a/spec/unit/classes/server/postgis_spec.rb b/spec/unit/classes/server/postgis_spec.rb
@@ -28,13 +28,13 @@
     it 'creates package with correct params' do
       is_expected.to contain_package('postgresql-postgis').with(ensure: 'absent',
                                                                 name: 'mypackage',
-                                                                tag: 'postgresql')
+                                                                tag: 'puppetlabs-postgresql')
     end
   end
 
   describe 'with no parameters' do
     it 'creates package with postgresql tag' do
-      is_expected.to contain_package('postgresql-postgis').with(tag: 'postgresql')
+      is_expected.to contain_package('postgresql-postgis').with(tag: 'puppetlabs-postgresql')
     end
   end
 end

Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@`
`10`	`10`	`package { 'postgresql-client':`
`11`	`11`	`ensure => $package_ensure,`
`12`	`12`	`name => $package_name,`
`13`		`- tag => 'postgresql',`
	`13`	`+ tag => 'puppetlabs-postgresql',`
`14`	`14`	`}`
`15`	`15`	`}`
`16`	`16`
Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@`
`13`	`13`	`package { 'postgresql-devel':`
`14`	`14`	`ensure => $package_ensure,`
`15`	`15`	`name => $package_name,`
`16`		`- tag => 'postgresql',`
	`16`	`+ tag => 'puppetlabs-postgresql',`
`17`	`17`	`}`
`18`	`18`
`19`	`19`	`if $link_pg_config {`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`package { 'postgresql-docs':`
`9`	`9`	`ensure => $package_ensure,`
`10`	`10`	`name => $package_name,`
`11`		`- tag => 'postgresql',`
	`11`	`+ tag => 'puppetlabs-postgresql',`
`12`	`12`	`}`
`13`	`13`
`14`	`14`	`}`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`package { 'postgresql-jdbc':`
`9`	`9`	`ensure => $package_ensure,`
`10`	`10`	`name => $package_name,`
`11`		`- tag => 'postgresql',`
	`11`	`+ tag => 'puppetlabs-postgresql',`
`12`	`12`	`}`
`13`	`13`
`14`	`14`	`}`
Original file line number	Diff line number	Diff line change
`@@ -8,6 +8,7 @@`
`8`	`8`	`package { 'perl-DBD-Pg':`
`9`	`9`	`ensure => $package_ensure,`
`10`	`10`	`name => $package_name,`
	`11`	`+ tag => 'puppetlabs-postgresql',`
`11`	`12`	`}`
`12`	`13`
`13`	`14`	`}`
Original file line number	Diff line number	Diff line change
`@@ -8,6 +8,7 @@`
`8`	`8`	`package { 'python-psycopg2':`
`9`	`9`	`ensure => $package_ensure,`
`10`	`10`	`name => $package_name,`
	`11`	`+ tag => 'puppetlabs-postgresql',`
`11`	`12`	`}`
`12`	`13`
`13`	`14`	`}`
Original file line number	Diff line number	Diff line change
`@@ -28,5 +28,5 @@`
`28`	`28`	`}`
`29`	`29`
`30`	`30`	`Apt::Source['apt.postgresql.org']->Package<\|tag == 'puppetlabs-postgresql'\|>`
`31`		`- Class['Apt::Update'] -> Package<\|tag == 'postgresql'\|>`
	`31`	`+ Class['Apt::Update'] -> Package<\|tag == 'puppetlabs-postgresql'\|>`
`32`	`32`	`}`
Original file line number	Diff line number	Diff line change
`@@ -32,5 +32,5 @@`
`32`	`32`	`proxy => $postgresql::repo::proxy,`
`33`	`33`	`}`
`34`	`34`
`35`		`- Yumrepo['yum.postgresql.org'] -> Package<\|tag == 'postgresql'\|>`
	`35`	`+ Yumrepo['yum.postgresql.org'] -> Package<\|tag == 'puppetlabs-postgresql'\|>`
`36`	`36`	`}`
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@`
`11`	`11`	`package { 'postgresql-contrib':`
`12`	`12`	`ensure => $package_ensure,`
`13`	`13`	`name => $package_name,`
`14`		`- tag => 'postgresql',`
	`14`	`+ tag => 'puppetlabs-postgresql',`
`15`	`15`	`}`
`16`	`16`
`17`	`17`	`anchor { 'postgresql::server::contrib::start': }`