puppet 7.4.1-x64-mingw32 → 7.5.0-x64-mingw32

data/spec/unit/file_system_spec.rb

@@ -999,6 +999,15 @@ describe "Puppet::FileSystem" do
             Puppet::FileSystem.replace_file(dest, 0755) { |_| }
           }.to raise_error(ArgumentError, /Only modes 0644, 0640, 0660, and 0440 are allowed/)
         end
+
+        it 'falls back to fully qualified user name when sid retrieval fails' do
+          current_user_sid = Puppet::Util::Windows::SID.name_to_sid(Puppet::Util::Windows::ADSI::User.current_user_name)
+          allow(Puppet::Util::Windows::SID).to receive(:name_to_sid).with(Puppet::Util::Windows::ADSI::User.current_user_name).and_return(nil, current_user_sid)
+          allow(Puppet::Util::Windows::SID).to receive(:name_to_sid).with(Puppet::Util::Windows::ADSI::User.current_sam_compatible_user_name).and_call_original
+
+          Puppet::FileSystem.replace_file(dest, 0644) { |f| f.write(content) }
+          expects_public_file(dest)
+        end
       end
     end
 

data/spec/unit/http/factory_spec.rb

@@ -138,4 +138,23 @@ describe Puppet::HTTP::Factory do
       expect(conn.local_host).to eq('127.0.0.1')
     end
   end
+
+  context 'tls' do
+    it "sets the minimum version to TLS 1.0", if: RUBY_VERSION.to_f >= 2.5 do
+      conn = create_connection(site)
+      expect(conn.min_version).to eq(OpenSSL::SSL::TLS1_VERSION)
+    end
+
+    it "defaults to ciphersuites providing 128 bits of security or greater" do
+      conn = create_connection(site)
+      expect(conn.ciphers).to eq("ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-CHACHA20-POLY1305:ECDHE-RSA-CHACHA20-POLY1305:DHE-RSA-AES128-GCM-SHA256:DHE-RSA-AES256-GCM-SHA384:DHE-RSA-CHACHA20-POLY1305:ECDHE-ECDSA-AES128-SHA256:ECDHE-RSA-AES128-SHA256:ECDHE-ECDSA-AES128-SHA:ECDHE-RSA-AES128-SHA:ECDHE-ECDSA-AES256-SHA384:ECDHE-RSA-AES256-SHA384:ECDHE-ECDSA-AES256-SHA:ECDHE-RSA-AES256-SHA:DHE-RSA-AES128-SHA256:DHE-RSA-AES256-SHA256:AES128-GCM-SHA256:AES256-GCM-SHA384:AES128-SHA256:AES256-SHA256")
+    end
+
+    it "can be restricted to TLSv1.3 ciphers" do
+      tls13_ciphers = "TLS_AES_128_GCM_SHA256:TLS_AES_256_GCM_SHA384:TLS_CHACHA20_POLY1305_SHA256"
+      Puppet[:ciphers] = tls13_ciphers
+      conn = create_connection(site)
+      expect(conn.ciphers).to eq(tls13_ciphers)
+    end
+  end
 end

data/spec/unit/network/http/api/master_spec.rb

@@ -0,0 +1,38 @@
+# Tests the backwards compatibility of our master -> server changes
+# in the HTTP API
+# This may be removed in Puppet 8
+require 'spec_helper'
+
+require 'puppet/network/http'
+require 'puppet_spec/network'
+
+describe Puppet::Network::HTTP::API::Master::V3 do
+  include PuppetSpec::Network
+
+  let(:response) { Puppet::Network::HTTP::MemoryResponse.new }
+  let(:server_url_prefix) { "#{Puppet::Network::HTTP::MASTER_URL_PREFIX}/v3" }
+  let(:server_routes) {
+    Puppet::Network::HTTP::Route.
+        path(Regexp.new("#{Puppet::Network::HTTP::MASTER_URL_PREFIX}/")).
+        any.
+        chain(Puppet::Network::HTTP::API::Master::V3.routes)
+  }
+
+  # simulate puppetserver registering its authconfigloader class
+  around :each do |example|
+    Puppet::Network::Authorization.authconfigloader_class = Object
+    begin
+      example.run
+    ensure
+      Puppet::Network::Authorization.authconfigloader_class = nil
+    end
+  end
+
+  it "mounts the environments endpoint" do
+    request = Puppet::Network::HTTP::Request.from_hash(:path => "#{server_url_prefix}/environments")
+    server_routes.process(request, response)
+
+    expect(response.code).to eq(200)
+  end
+end
+

data/spec/unit/network/http/api/{master → server}/v3/environments_spec.rb

@@ -4,12 +4,12 @@ require 'puppet/node/environment'
 require 'puppet/network/http'
 require 'matchers/json'
 
-describe Puppet::Network::HTTP::API::Master::V3::Environments do
+describe Puppet::Network::HTTP::API::Server::V3::Environments do
   include JSONMatchers
 
   let(:environment) { Puppet::Node::Environment.create(:production, ["/first", "/second"], '/manifests') }
   let(:loader) { Puppet::Environments::Static.new(environment) }
-  let(:handler) { Puppet::Network::HTTP::API::Master::V3::Environments.new(loader) }
+  let(:handler) { Puppet::Network::HTTP::API::Server::V3::Environments.new(loader) }
   let(:request) { Puppet::Network::HTTP::Request.from_hash(:headers => { 'accept' => 'application/json' }) }
   let(:response) { Puppet::Network::HTTP::MemoryResponse.new }
 

data/spec/unit/network/http/api/{master → server}/v3_spec.rb

@@ -3,16 +3,16 @@ require 'spec_helper'
 require 'puppet/network/http'
 require 'puppet_spec/network'
 
-describe Puppet::Network::HTTP::API::Master::V3 do
+describe Puppet::Network::HTTP::API::Server::V3 do
   include PuppetSpec::Network
 
   let(:response) { Puppet::Network::HTTP::MemoryResponse.new }
-  let(:master_url_prefix) { "#{Puppet::Network::HTTP::MASTER_URL_PREFIX}/v3" }
-  let(:master_routes) {
+  let(:server_url_prefix) { "#{Puppet::Network::HTTP::SERVER_URL_PREFIX}/v3" }
+  let(:server_routes) {
     Puppet::Network::HTTP::Route.
-        path(Regexp.new("#{Puppet::Network::HTTP::MASTER_URL_PREFIX}/")).
+        path(Regexp.new("#{Puppet::Network::HTTP::SERVER_URL_PREFIX}/")).
         any.
-        chain(Puppet::Network::HTTP::API::Master::V3.routes)
+        chain(Puppet::Network::HTTP::API::Server::V3.routes)
   }
 
   # simulate puppetserver registering its authconfigloader class
@@ -26,53 +26,53 @@ describe Puppet::Network::HTTP::API::Master::V3 do
   end
 
   it "mounts the environments endpoint" do
-    request = Puppet::Network::HTTP::Request.from_hash(:path => "#{master_url_prefix}/environments")
-    master_routes.process(request, response)
+    request = Puppet::Network::HTTP::Request.from_hash(:path => "#{server_url_prefix}/environments")
+    server_routes.process(request, response)
 
     expect(response.code).to eq(200)
   end
 
   it "matches only complete routes" do
-    request = Puppet::Network::HTTP::Request.from_hash(:path => "#{master_url_prefix}/foo/environments")
-    expect { master_routes.process(request, response) }.to raise_error(Puppet::Network::HTTP::Error::HTTPNotFoundError)
+    request = Puppet::Network::HTTP::Request.from_hash(:path => "#{server_url_prefix}/foo/environments")
+    expect { server_routes.process(request, response) }.to raise_error(Puppet::Network::HTTP::Error::HTTPNotFoundError)
 
-    request = Puppet::Network::HTTP::Request.from_hash(:path => "#{master_url_prefix}/foo/environment/production")
-    expect { master_routes.process(request, response) }.to raise_error(Puppet::Network::HTTP::Error::HTTPNotFoundError)
+    request = Puppet::Network::HTTP::Request.from_hash(:path => "#{server_url_prefix}/foo/environment/production")
+    expect { server_routes.process(request, response) }.to raise_error(Puppet::Network::HTTP::Error::HTTPNotFoundError)
   end
 
   it "mounts indirected routes" do
     request = Puppet::Network::HTTP::Request.
-        from_hash(:path => "#{master_url_prefix}/node/foo",
+        from_hash(:path => "#{server_url_prefix}/node/foo",
                   :params => {:environment => "production"},
                   :headers => {"accept" => "application/json"})
-    master_routes.process(request, response)
+    server_routes.process(request, response)
 
     expect(response.code).to eq(200)
   end
 
   it "responds to unknown paths by raising not_found_error" do
-    request = Puppet::Network::HTTP::Request.from_hash(:path => "#{master_url_prefix}/unknown")
+    request = Puppet::Network::HTTP::Request.from_hash(:path => "#{server_url_prefix}/unknown")
 
     expect {
-      master_routes.process(request, response)
+      server_routes.process(request, response)
     }.to raise_error(not_found_error)
   end
 
   it "checks authorization for indirected routes" do
     Puppet::Network::Authorization.authconfigloader_class = nil
 
-    request = Puppet::Network::HTTP::Request.from_hash(:path => "#{master_url_prefix}/catalog/foo")
+    request = Puppet::Network::HTTP::Request.from_hash(:path => "#{server_url_prefix}/catalog/foo")
     expect {
-      master_routes.process(request, response)
+      server_routes.process(request, response)
     }.to raise_error(Puppet::Network::HTTP::Error::HTTPNotAuthorizedError, %r{Not Authorized: Forbidden request: /puppet/v3/catalog/foo \(method GET\)})
   end
 
   it "checks authorization for environments" do
     Puppet::Network::Authorization.authconfigloader_class = nil
 
-    request = Puppet::Network::HTTP::Request.from_hash(:path => "#{master_url_prefix}/environments")
+    request = Puppet::Network::HTTP::Request.from_hash(:path => "#{server_url_prefix}/environments")
     expect {
-      master_routes.process(request, response)
+      server_routes.process(request, response)
     }.to raise_error(Puppet::Network::HTTP::Error::HTTPNotAuthorizedError, %r{Not Authorized: Forbidden request: /puppet/v3/environments \(method GET\)})
   end
 end

data/spec/unit/network/http/api_spec.rb

@@ -36,12 +36,12 @@ describe Puppet::Network::HTTP::API do
   end
 
   describe "Puppet API" do
-    let(:handler) { PuppetSpec::Handler.new(Puppet::Network::HTTP::API.master_routes,
+    let(:handler) { PuppetSpec::Handler.new(Puppet::Network::HTTP::API.server_routes,
                                             Puppet::Network::HTTP::API.not_found_upgrade) }
 
-    let(:master_prefix) { Puppet::Network::HTTP::MASTER_URL_PREFIX }
+    let(:server_prefix) { Puppet::Network::HTTP::SERVER_URL_PREFIX }
 
-    it "raises a not-found error for non-CA or master routes and suggests an upgrade" do
+    it "raises a not-found error for non-CA or server routes and suggests an upgrade" do
       req = Puppet::Network::HTTP::Request.from_hash(:path => "/unknown")
       res = {}
       handler.process(req, res)
@@ -50,13 +50,13 @@ describe Puppet::Network::HTTP::API do
     end
 
     describe "when processing Puppet 3 routes" do
-      it "gives an upgrade message for master routes" do
+      it "gives an upgrade message for server routes" do
         req = Puppet::Network::HTTP::Request.from_hash(:path => "/production/node/foo")
         res = {}
         handler.process(req, res)
         expect(res[:status]).to eq(404)
         expect(res[:body]).to include("Puppet version: #{Puppet.version}")
-        expect(res[:body]).to include("Supported /puppet API versions: #{Puppet::Network::HTTP::MASTER_URL_VERSIONS}")
+        expect(res[:body]).to include("Supported /puppet API versions: #{Puppet::Network::HTTP::SERVER_URL_VERSIONS}")
       end
 
       it "gives an upgrade message for CA routes" do
@@ -65,11 +65,11 @@ describe Puppet::Network::HTTP::API do
         handler.process(req, res)
         expect(res[:status]).to eq(404)
         expect(res[:body]).to include("Puppet version: #{Puppet.version}")
-        expect(res[:body]).to include("Supported /puppet API versions: #{Puppet::Network::HTTP::MASTER_URL_VERSIONS}")
+        expect(res[:body]).to include("Supported /puppet API versions: #{Puppet::Network::HTTP::SERVER_URL_VERSIONS}")
       end
     end
 
-    describe "when processing master routes" do
+    describe "when processing server routes" do
       # simulate puppetserver registering its authconfigloader class
       around :each do |example|
         Puppet::Network::Authorization.authconfigloader_class = Object
@@ -81,7 +81,7 @@ describe Puppet::Network::HTTP::API do
       end
 
       it "responds to v3 indirector requests" do
-        req = Puppet::Network::HTTP::Request.from_hash(:path => "#{master_prefix}/v3/node/foo",
+        req = Puppet::Network::HTTP::Request.from_hash(:path => "#{server_prefix}/v3/node/foo",
                                                        :params => {:environment => "production"},
                                                        :headers => {'accept' => "application/json"})
         res = {}
@@ -90,18 +90,18 @@ describe Puppet::Network::HTTP::API do
       end
 
       it "responds to v3 environments requests" do
-        req = Puppet::Network::HTTP::Request.from_hash(:path => "#{master_prefix}/v3/environments")
+        req = Puppet::Network::HTTP::Request.from_hash(:path => "#{server_prefix}/v3/environments")
         res = {}
         handler.process(req, res)
         expect(res[:status]).to eq(200)
       end
 
       it "responds with a not found error to non-v3 requests and does not suggest an upgrade" do
-        req = Puppet::Network::HTTP::Request.from_hash(:path => "#{master_prefix}/unknown")
+        req = Puppet::Network::HTTP::Request.from_hash(:path => "#{server_prefix}/unknown")
         res = {}
         handler.process(req, res)
         expect(res[:status]).to eq(404)
-        expect(res[:body]).to include("No route for GET #{master_prefix}/unknown")
+        expect(res[:body]).to include("No route for GET #{server_prefix}/unknown")
         expect(res[:body]).not_to include("Puppet version: #{Puppet.version}")
       end
     end

data/spec/unit/pops/parser/lexer2_spec.rb

@@ -94,10 +94,6 @@ describe 'Lexer2' do
     "private"  => :PRIVATE,
     "type"     => :TYPE,
     "attr"     => :ATTR,
-    "application"  => :APPLICATION,
-    "consumes"     => :CONSUMES,
-    "produces"     => :PRODUCES,
-    "site"         => :SITE,
   }.each do |string, name|
     it "should lex a keyword from '#{string}'" do
       expect(tokens_scanned_from(string)).to match_tokens2(name)

data/spec/unit/pops/validator/validator_spec.rb

@@ -344,18 +344,6 @@ describe "validating 4x" do
       end
     end
 
-    it 'produces a syntax error for application' do
-      expect {
-        parse('application test {}')
-      }.to raise_error(Puppet::ParseErrorWithIssue, /Syntax error at 'application'/)
-    end
-
-    it 'produces a syntax error for capability mapping' do
-      expect {
-        parse('Foo produces Sql {}')
-      }.to raise_error(Puppet::ParseErrorWithIssue, /Syntax error at 'produces'/)
-    end
-
     it 'produces an error for collect expressions with virtual query' do
       acceptor = validate(parse("User <| title == 'admin' |>"))
       expect(acceptor.error_count).to eql(1)
@@ -410,12 +398,6 @@ describe "validating 4x" do
       expect(acceptor).to have_issue(Puppet::Pops::Issues::EXPRESSION_NOT_SUPPORTED_WHEN_SCRIPTING)
     end
 
-    it 'produces a syntax error for site definitions' do
-      expect {
-        parse('site {}')
-      }.to raise_error(Puppet::ParseErrorWithIssue, /Syntax error at 'site'/)
-    end
-
     context 'validating apply() blocks' do
       it 'allows empty apply() blocks' do
         acceptor = validate(parse('apply("foo.example.com") { }'))
@@ -468,18 +450,6 @@ describe "validating 4x" do
         expect(acceptor.error_count).to eql(0)
       end
 
-      it 'produces a syntax error for application' do
-        expect {
-          parse('apply("foo.example.com") { application test {} }')
-        }.to raise_error(Puppet::ParseErrorWithIssue, /Syntax error at 'application'/)
-      end
-
-      it 'produces a syntax error for capability mapping' do
-        expect {
-          parse('apply("foo.example.com") { Foo produces Sql {} }')
-        }.to raise_error(Puppet::ParseErrorWithIssue, /Syntax error at 'produces'/)
-      end
-
       it 'produces an error for class expressions' do
         acceptor = validate(parse('apply("foo.example.com") { class test {} }'))
         expect(acceptor.error_count).to eql(1)
@@ -503,12 +473,6 @@ describe "validating 4x" do
         expect(acceptor).to have_issue(Puppet::Pops::Issues::EXPRESSION_NOT_SUPPORTED_WHEN_SCRIPTING)
       end
 
-      it 'produces an error for site definitions' do
-        expect {
-          parse('apply("foo.example.com") { site {} }')
-        }.to raise_error(Puppet::ParseErrorWithIssue, /Syntax error at 'site'/)
-      end
-
       it 'produces an error for apply() inside apply()' do
         acceptor = validate(parse('apply("foo.example.com") { apply("foo.example.com") { } }'))
         expect(acceptor.error_count).to eql(1)
@@ -1010,14 +974,27 @@ describe "validating 4x" do
         expect(acceptor.errors[2].source_pos.line).to eql(5)
       end
     end
-  end
+    [
+      "application",
+      "consumes",
+      "produces",
+      "site",
+    ].each do |kw|
+      it "allow usage of #{kw} keyword (it was reserved in puppet 6.x)" do
+        source = <<-SOURCE
+       class foo (
+         $#{kw},
+       ) {
+         notice $#{kw}
+       }
+
+       class { foo:
+         #{kw} => 'bar'
+       }
+     SOURCE
 
-  context "capability annotations" do
-    ['produces', 'consumes'].each do |word|
-      it "raises a syntax error in #{word} clauses" do
-        expect {
-          parse("foo #{word} Bar {}")
-        }.to raise_error(Puppet::ParseErrorWithIssue, /Syntax error at '#{word}'/)
+        acceptor = validate(parse(source, 'path/foo/manifests/init.pp'))
+        expect(acceptor.error_count).to eql(0)
       end
     end
   end

data/spec/unit/util/windows/sid_spec.rb

@@ -158,6 +158,12 @@ describe "Puppet::Util::Windows::SID", :if => Puppet::Util::Platform.windows? do
       # this works in French Windows, even though the account is really AUTORITE NT\\Syst\u00E8me
       expect(subject.name_to_principal('NT AUTHORITY\SYSTEM').sid).to eq(sid)
     end
+
+    it "should print a debug message on failures" do
+      expect(Puppet).to receive(:debug).with(/Could not retrieve raw SID bytes from 'NonExistingUser'/)
+      expect(Puppet).to receive(:debug).with(/No mapping between account names and security IDs was done/)
+      subject.name_to_principal('NonExistingUser')
+    end
   end
 
   context "#ads_to_principal" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: puppet
 version: !ruby/object:Gem::Version
-  version: 7.4.1
+  version: 7.5.0
 platform: x64-mingw32
 authors:
 - Puppet Labs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-02-11 00:00:00.000000000 Z
+date: 2021-03-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: facter
@@ -740,6 +740,9 @@ files:
 - lib/puppet/network/http/api/master.rb
 - lib/puppet/network/http/api/master/v3.rb
 - lib/puppet/network/http/api/master/v3/environments.rb
+- lib/puppet/network/http/api/server.rb
+- lib/puppet/network/http/api/server/v3.rb
+- lib/puppet/network/http/api/server/v3/environments.rb
 - lib/puppet/network/http/connection.rb
 - lib/puppet/network/http/error.rb
 - lib/puppet/network/http/handler.rb
@@ -1853,10 +1856,8 @@ files:
 - spec/integration/util/windows/user_spec.rb
 - spec/integration/util_spec.rb
 - spec/lib/matchers/containment_matchers.rb
-- spec/lib/matchers/include.rb
 - spec/lib/matchers/include_in_order.rb
 - spec/lib/matchers/include_in_order_spec.rb
-- spec/lib/matchers/include_spec.rb
 - spec/lib/matchers/json.rb
 - spec/lib/matchers/match_tokens2.rb
 - spec/lib/matchers/relationship_graph_matchers.rb
@@ -2181,8 +2182,9 @@ files:
 - spec/unit/network/format_support_spec.rb
 - spec/unit/network/formats_spec.rb
 - spec/unit/network/http/api/indirected_routes_spec.rb
-- spec/unit/network/http/api/master/v3/environments_spec.rb
-- spec/unit/network/http/api/master/v3_spec.rb
+- spec/unit/network/http/api/master_spec.rb
+- spec/unit/network/http/api/server/v3/environments_spec.rb
+- spec/unit/network/http/api/server/v3_spec.rb
 - spec/unit/network/http/api_spec.rb
 - spec/unit/network/http/connection_spec.rb
 - spec/unit/network/http/error_spec.rb
@@ -2276,10 +2278,8 @@ files:
 - spec/unit/pops/parser/evaluating_parser_spec.rb
 - spec/unit/pops/parser/lexer2_spec.rb
 - spec/unit/pops/parser/locator_spec.rb
-- spec/unit/pops/parser/parse_application_spec.rb
 - spec/unit/pops/parser/parse_basic_expressions_spec.rb
 - spec/unit/pops/parser/parse_calls_spec.rb
-- spec/unit/pops/parser/parse_capabilities_spec.rb
 - spec/unit/pops/parser/parse_conditionals_spec.rb
 - spec/unit/pops/parser/parse_containers_spec.rb
 - spec/unit/pops/parser/parse_functions_spec.rb
@@ -2287,7 +2287,6 @@ files:
 - spec/unit/pops/parser/parse_lambda_spec.rb
 - spec/unit/pops/parser/parse_plan_spec.rb
 - spec/unit/pops/parser/parse_resource_spec.rb
-- spec/unit/pops/parser/parse_site_spec.rb
 - spec/unit/pops/parser/parser_rspec_helper.rb
 - spec/unit/pops/parser/parser_spec.rb
 - spec/unit/pops/parser/parsing_typed_parameters_spec.rb
@@ -3093,10 +3092,8 @@ test_files:
 - spec/integration/util/windows/user_spec.rb
 - spec/integration/util_spec.rb
 - spec/lib/matchers/containment_matchers.rb
-- spec/lib/matchers/include.rb
 - spec/lib/matchers/include_in_order.rb
 - spec/lib/matchers/include_in_order_spec.rb
-- spec/lib/matchers/include_spec.rb
 - spec/lib/matchers/json.rb
 - spec/lib/matchers/match_tokens2.rb
 - spec/lib/matchers/relationship_graph_matchers.rb
@@ -3421,8 +3418,9 @@ test_files:
 - spec/unit/network/format_support_spec.rb
 - spec/unit/network/formats_spec.rb
 - spec/unit/network/http/api/indirected_routes_spec.rb
-- spec/unit/network/http/api/master/v3/environments_spec.rb
-- spec/unit/network/http/api/master/v3_spec.rb
+- spec/unit/network/http/api/master_spec.rb
+- spec/unit/network/http/api/server/v3/environments_spec.rb
+- spec/unit/network/http/api/server/v3_spec.rb
 - spec/unit/network/http/api_spec.rb
 - spec/unit/network/http/connection_spec.rb
 - spec/unit/network/http/error_spec.rb
@@ -3516,10 +3514,8 @@ test_files:
 - spec/unit/pops/parser/evaluating_parser_spec.rb
 - spec/unit/pops/parser/lexer2_spec.rb
 - spec/unit/pops/parser/locator_spec.rb
-- spec/unit/pops/parser/parse_application_spec.rb
 - spec/unit/pops/parser/parse_basic_expressions_spec.rb
 - spec/unit/pops/parser/parse_calls_spec.rb
-- spec/unit/pops/parser/parse_capabilities_spec.rb
 - spec/unit/pops/parser/parse_conditionals_spec.rb
 - spec/unit/pops/parser/parse_containers_spec.rb
 - spec/unit/pops/parser/parse_functions_spec.rb
@@ -3527,7 +3523,6 @@ test_files:
 - spec/unit/pops/parser/parse_lambda_spec.rb
 - spec/unit/pops/parser/parse_plan_spec.rb
 - spec/unit/pops/parser/parse_resource_spec.rb
-- spec/unit/pops/parser/parse_site_spec.rb
 - spec/unit/pops/parser/parser_rspec_helper.rb
 - spec/unit/pops/parser/parser_spec.rb
 - spec/unit/pops/parser/parsing_typed_parameters_spec.rb