Use Rubocop to inspect rspec files (#601)

Author: deric

.devcontainer/devcontainer.json

@@ -5,7 +5,7 @@
 	"settings": {
 		"terminal.integrated.profiles.linux": {
 			"bash": {
-				"path": "bash",
+				"path": "bash"
 			}
 		}
 	},

.rubocop.yml

@@ -4,7 +4,7 @@ require:
 - rubocop-rspec
 AllCops:
   DisplayCopNames: true
-  TargetRubyVersion: '2.4'
+  TargetRubyVersion: '2.5'
   Include:
   - "**/*.rb"
   Exclude:
@@ -20,10 +20,7 @@ AllCops:
   - "**/Guardfile"
   - tooling/kube_tool/*
   - tooling/*
-  - spec/defines/*
-  - spec/classes/*
   - spec/*
-  - spec/acceptance/*
   - rakelib/*
   - plans/*.pp
   - tasks/*

.sync.yml

@@ -36,14 +36,11 @@ Rakefile:
     strict:
       configs:
         AllCops:
-          TargetRubyVersion: '2.4'
+          TargetRubyVersion: '2.5'
           Exclude:
           - tooling/kube_tool/*
           - tooling/*
-          - spec/defines/*
-          - spec/classes/*
           - spec/*
-          - spec/acceptance/*
           - rakelib/*
           - plans/*.pp
           - tasks/*

metadata.json

@@ -68,7 +68,7 @@
       "version_requirement": ">= 6.24.0 < 8.0.0"
     }
   ],
-  "pdk-version": "2.6.0",
+  "pdk-version": "2.6.1",
   "template-url": "https://github.com/puppetlabs/pdk-templates.git#main",
-  "template-ref": "heads/main-0-g434e063"
+  "template-ref": "heads/main-0-g383f471"
 }

spec/acceptance/integration_kubernetes_spec.rb

@@ -10,7 +10,7 @@
     describe 'set up controller' do
       it 'sets up the controller' do
         run_shell('puppet agent --test', expect_failures: true) do |r|
-          expect(r.exit_code.to_s).to match(/0|2/)
+          expect(r.exit_code.to_s).to match(%r{0|2})
         end
       end
     end
@@ -21,7 +21,7 @@
     describe 'set up worker' do
       it 'sets up the worker' do
         run_shell('puppet agent --test', expect_failures: true) do |r|
-          expect(r.exit_code.to_s).to match(/0|2/)
+          expect(r.exit_code.to_s).to match(%r{0|2})
         end
       end
     end
@@ -32,24 +32,24 @@
     describe 'set up worker' do
       it 'sets up the worker' do
         run_shell('puppet agent --test', expect_failures: true) do |r|
-          expect(r.exit_code.to_s).to match(/0|2/)
+          expect(r.exit_code.to_s).to match(%r{0|2})
         end
       end
     end
   end
   context 'verify the k8 nodes' do
     before(:all) { change_target_host('controller') }
-    hostname1, ipaddr1, int_ipaddr1 =  fetch_ip_hostname_by_role('controller')
-    hostname2, ipaddr2, int_ipaddr2 =  fetch_ip_hostname_by_role('worker1')
-    hostname3, ipaddr3, int_ipaddr3 =  fetch_ip_hostname_by_role('worker2')
+    hostname1, _ipaddr1, =  fetch_ip_hostname_by_role('controller')
+    hostname2, _ipaddr2, =  fetch_ip_hostname_by_role('worker1')
+    hostname3, _ipaddr3, =  fetch_ip_hostname_by_role('worker2')
     after(:all) { reset_target_host }
     describe 'verify the k8 nodes' do
       it 'verify the k8 nodes' do
         run_shell('sleep 20')
         run_shell('KUBECONFIG=/etc/kubernetes/admin.conf kubectl get nodes') do |r|
-          expect(r.stdout).to match(/#{hostname1}(\s)+Ready(\s)+control-plane,master/)
-          expect(r.stdout).to match(/#{hostname2}(\s)+Ready/)
-          expect(r.stdout).to match(/#{hostname3}(\s)+Ready/)
+          expect(r.stdout).to match(%r{#{hostname1}(\s)+Ready(\s)+control-plane,master})
+          expect(r.stdout).to match(%r{#{hostname2}(\s)+Ready})
+          expect(r.stdout).to match(%r{#{hostname3}(\s)+Ready})
         end
       end
     end

spec/acceptance/kubernetes_spec.rb

@@ -6,7 +6,6 @@
     end
 
     describe 'kubernetes class', :integration do
-
       context 'it should install the module and run' do
         before(:all) { change_target_host('controller') }
         after(:all) { reset_target_host }
@@ -35,15 +34,15 @@ class {'kubernetes':
           }
     MANIFEST
 
-        it 'should run' do
+        it 'runs' do
           apply_manifest(pp)
         end
 
-        it 'should install kubectl' do
+        it 'installs kubectl' do
           run_shell('kubectl')
         end
 
-        it 'should install kube-dns' do
+        it 'installs kube-dns' do
           run_shell('KUBECONFIG=/etc/kubernetes/admin.conf kubectl get deploy --namespace kube-system coredns')
         end
       end
@@ -53,22 +52,22 @@ class {'kubernetes':
         after(:all) { reset_target_host }
         it 'can deploy an application into a namespace and expose it' do
           run_shell('KUBECONFIG=/etc/kubernetes/admin.conf kubectl create -f /tmp/nginx.yml') do |r|
-            expect(r.stdout).to match(/my-nginx created\nservice\/my-nginx created\n/)
+            expect(r.stdout).to match(%r{my-nginx created\nservice/my-nginx created\n})
           end
         end
 
         it 'can access the deployed service' do
           run_shell('sleep 60')
           run_shell('curl --retry 10 --retry-delay 15 -s 10.96.188.5') do |r|
-            expect(r.stdout).to match (/Welcome to nginx!/)
+            expect(r.stdout).to match(%r{Welcome to nginx!})
           end
         end
 
         it 'can delete a deployment' do
           run_shell('KUBECONFIG=/etc/kubernetes/admin.conf kubectl delete -f /tmp/nginx.yml') do |r|
-            expect(r.stdout).to match(/deployment.apps "my-nginx" deleted\nservice "my-nginx" deleted/)
+            expect(r.stdout).to match(%r{deployment.apps "my-nginx" deleted\nservice "my-nginx" deleted})
           end
-          run_shell('KUBECONFIG=/etc/kubernetes/admin.conf kubectl get deploy --all-namespaces | grep nginx', :expect_failures => true)
+          run_shell('KUBECONFIG=/etc/kubernetes/admin.conf kubectl get deploy --all-namespaces | grep nginx', expect_failures: true)
         end
       end
     end

spec/classes/cluster_roles_spec.rb

@@ -1,46 +1,48 @@
 require 'spec_helper'
 describe 'kubernetes::cluster_roles', :type => :class do
-  let(:facts) do {
-    :kernel => 'Linux',
-    :networking => {
-      :hostname => 'foo',
+  let(:facts) do
+    {
+      kernel: 'Linux',
+    networking: {
+      hostname: 'foo',
     },
-    :os => {
-      :family => "Debian",
-      :name => 'Ubuntu',
-      :release => {
-        :full => '16.04',
+    os: {
+      family: 'Debian',
+      name: 'Ubuntu',
+      release: {
+        full: '16.04',
       },
-      :distro => {
-        :codename => "xenial",
+      distro: {
+        codename: 'xenial',
       },
     },
-    :ec2_metadata => {
-      :hostname => 'ip-10-10-10-1.ec2.internal',
+    ec2_metadata: {
+      hostname: 'ip-10-10-10-1.ec2.internal',
     },
-  } end
+    }
+  end
 
   context 'with controller => true' do
     let(:pre_condition) { 'include kubernetes' }
-    let(:params) do 
-        { 
-          'controller' => true, 
-          'worker' => false,
-        } 
+    let(:params) do
+      {
+        'controller' => true,
+        'worker' => false,
+      }
     end
 
-    it { should contain_kubernetes__kubeadm_init('foo') }
+    it { is_expected.to contain_kubernetes__kubeadm_init('foo') }
   end
 
   context 'with worker => true' do
     let(:pre_condition) { 'include kubernetes' }
-    let(:params) do 
-        { 
-          'controller' => false, 
-          'worker' => true,
-        } 
+    let(:params) do
+      {
+        'controller' => false,
+        'worker' => true,
+      }
     end
 
-    it { should contain_kubernetes__kubeadm_join('foo') }
+    it { is_expected.to contain_kubernetes__kubeadm_join('foo') }
   end
 end