Merge pull request #295 from dylanratcliffe/MODULES-8685-removing-instances-doesnt-work

(MODULES-8685) Changed END to be in the same conditional as BEGIN

Author: Erick Banks

CHANGELOG.md

@@ -9,6 +9,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) a
 ### Fixed
 
 - Cannot manage a role with the same name on two instances or two databases ([MODULES-8677](https://tickets.puppetlabs.com/browse/MODULES-8677)) (Thanks [Dylan Ratcliffe](https://github.com/dylanratcliffe))
+- Removing a SQL Login via `ensure => absent` in a sqlserver::login resource is not idempotent. ([MODULES-8685](https://tickets.puppetlabs.com/browse/MODULES-8685)) (Thanks [Dylan Ratcliffe](https://github.com/dylanratcliffe))
 
 ## [2.3.0] - 2019-01-22
 

spec/acceptance/sqlserver_login_spec.rb

@@ -352,6 +352,12 @@ def create_login_manifest (testcase,login_name,login_password,options = {})
           ensure_manifest_execute(pp)
         end
 
+        it "remove a #{testcase} should be idempotent", :tier_low => true do
+          options = { 'ensure' => 'absent' }
+          pp = create_login_manifest(testcase,@login_under_test,@login_passwd,options)
+          execute_manifest(pp, :catch_changes => true)
+        end
+
         it "should not exist in the principals table after deletion", :tier_low => true do
           query = "SELECT principal_id FROM SYS.server_principals WHERE name = '#{@login_under_test}' AND [type] = '#{@sql_principal_type}'";
           run_sql_query(host, run_sql_query_opts_as_sa(query, expected_row_count = 0))

templates/query/login_exists.sql.erb

@@ -61,6 +61,6 @@ END
 			THROW 51000, 'ERROR: a role is not correct for <%= role %>', 10
 <% end %>
 
-<% end %>
 END
+<% end %>