CI: remove un-used configuration from BWATs

The Bosh Windows Acceptance Tests (BWATs) previously supported earlier
versions of Windows OS. This commit removes configuration values which
are no longer variable in windows-2019.

Author: aramprice

acceptance_test/README.md

@@ -24,8 +24,6 @@ You can create a `config.json` file, eg:
   "vm_extensions": "<comma separated string of options, e.g. 50GB_ephemeral_disk>",
   "network": "<network from bosh cloud config>",
   "skip_cleanup": "<skip cleanup - if this is false all unused stemcells are deleted>"
-  "ssh_disabled_by_default": "check ssh daemon default startup type - if true then it checks that the startup type is DISABLED. If false or missing, checks startup type is AUTOMATIC",
-  "security_compliance_applied": "check that Microsoft Baseline policies have been applied"
 }
 ```
 

acceptance_test/assets/bwats-release/jobs/check-system/spec

@@ -17,12 +17,6 @@ packages:
 - lgpo
 
 properties:
-  ssh.disabled_by_default:
-    description: Used when ssh is disabled by default and should be tested as such
-    default: false
-  security_compliance.expected_to_comply:
-    description: Determines whether stemcell being tested is expected to comply with Microsofts Windows Security Compliance Policies
-    default: false
   password.default_username:
     description: Username of default profile on the stemcell whose password should be randomized
     default: "Administrator"

acceptance_test/assets/bwats-release/jobs/check-system/templates/config.json.erb

@@ -1,7 +1,5 @@
 <%=
 {
-  ssh_disabled_by_default: "#{p('ssh.disabled_by_default')}",
-  security_compliance_expected_to_comply: "#{p('security_compliance.expected_to_comply')}",
   default_username: "#{p('password.default_username')}",
   default_password: "#{p('password.default_password')}",
 }.to_json

acceptance_test/assets/bwats-release/jobs/check-system/templates/run.ps1

@@ -156,25 +156,22 @@ function Verify-Acls {
 }
 
 function Verify-Services {
-  $config = Get-Config
-  $SSH_Disabled = if ($config.ssh_disabled_by_default -eq "true") { $True } else { $False }
-
   If ( (Get-Service WinRM).Status -ne "Stopped") {
     $msg = "WinRM is not Stopped. It is {0}" -f $(Get-Service WinRM).Status
     Write-Error $msg
     Exit 1
   }
 
-  $startype = If ($SSH_DISABLED) {"Disabled"} Else {"Automatic"}
+  $ssh_startype = "Automatic"
 
-  If ( (Get-Service sshd).StartType -ne $startype) {
-    $msg = "sshd service start type is not ${startype}. It is {0}" -f $(Get-Service sshd).StartType
+  If ( (Get-Service sshd).StartType -ne $ssh_startype) {
+    $msg = "sshd service start type is not ${ssh_startype}. It is {0}" -f $(Get-Service sshd).StartType
     Write-Error $msg
     Exit 1
   }
 
-  If ( (Get-Service ssh-agent).StartType -ne $startype) {
-    $msg = "ssh-agent service start type is not ${startype}. It is {0}" -f $(Get-Service ssh-agent).StartType
+  If ( (Get-Service ssh-agent).StartType -ne $ssh_startype) {
+    $msg = "ssh-agent service start type is not ${ssh_startype}. It is {0}" -f $(Get-Service ssh-agent).StartType
     Write-Error $msg
     Exit 1
   }
@@ -428,17 +425,11 @@ Verify-PSVersion5
 Verify-VersionFile
 Verify-TimeZone
 
-$config = Get-Config
-$validatePolicies = if ($config.security_compliance_expected_to_comply -eq "true") { $True } else { $False }
-
-if ( $validatePolicies )
+Import-Module C:\var\vcap\packages\pester\Pester\Pester.psd1
+$pesterResults = Invoke-Pester $PSScriptRoot/AuditPolicies.Tests.ps1 -PassThru
+if ($pesterResults.FailedCount -gt 0)
 {
-  Import-Module C:\var\vcap\packages\pester\Pester\Pester.psd1
-  $pesterResults = Invoke-Pester $PSScriptRoot/AuditPolicies.Tests.ps1 -PassThru
-  if ($pesterResults.FailedCount -gt 0)
-  {
-    Exit 1
-  }
+  Exit 1
 }
 
 Exit 0

acceptance_test/assets/bwats-release/jobs/ephemeral-disk/spec

@@ -4,13 +4,9 @@ name: ephemeral-disk
 description: "This errand verifies ephemeral disk mounting"
 
 templates:
-  config.json.erb: bin/config.json
   run.ps1: bin/run.ps1
 
 packages:
 - golang-windows
 
 properties:
-  run_test.enabled:
-    description: "Run tests for ephemeral disk"
-    default: false

acceptance_test/assets/bwats-release/jobs/ephemeral-disk/templates/config.json.erb

@@ -1,14 +1,6 @@
 $ErrorActionPreference = "Stop"
 trap { $host.SetShouldExit(1) }
 
-function Get-Config {
-  $configPath = Join-Path $PSScriptRoot "config.json"
-  Write-Host "Loading '$configPath'"
-  $config = Get-Content $configPath -raw | ConvertFrom-Json
-  Write-Host "Loaded '$configPath'"
-  return $config
-}
-
 function New-RandomFile {
     param (
         [Parameter(Mandatory = $false)]
@@ -43,52 +35,42 @@ function New-RandomFile {
     }
 }
 
-$config = Get-Config
-
-if ($config.run_test_enabled -eq "true") {
-    # Note no trailing slash. Important! Trailing slashes on non-symlink folders will return their own path as the target
-    # eg (get-item "C:\var\vcap\data\").target -> c:\var\vcap\data
+# Note no trailing slash. Important! Trailing slashes on non-symlink folders will return their own path as the target
+# eg (get-item "C:\var\vcap\data\").target -> c:\var\vcap\data
 
-    $dataTarget = (get-item "C:\var\vcap\data").Target
-    if ($dataTarget -eq $null) {
-        Write-Error "Data partition should be created: target is $dataTarget"
-        Exit 1
-    }
+$dataTarget = (get-item "C:\var\vcap\data").Target
+if ($null -eq $dataTarget) {
+    Write-Error "Data partition should be created: target is $dataTarget"
+    Exit 1
+}
 
-    $targetDriveLetter = $dataTarget.substring(0,1)
-    $dataPartition = get-partition -driveLetter $targetDriveLetter
+$targetDriveLetter = $dataTarget.substring(0,1)
+$dataPartition = get-partition -driveLetter $targetDriveLetter
 
-    $randFileSize = 2gb
+$randFileSize = 2gb
 
-    $ephemeralDiskSpaceBeforeFill = (Get-Volume -Partition $dataPartition).SizeRemaining
-    $rootDiskSpaceBeforeFill = (Get-Volume -DriveLetter C).SizeRemaining
+$ephemeralDiskSpaceBeforeFill = (Get-Volume -Partition $dataPartition).SizeRemaining
+$rootDiskSpaceBeforeFill = (Get-Volume -DriveLetter C).SizeRemaining
 
-    New-RandomFile -Size $randFileSize
+New-RandomFile -Size $randFileSize
 
-    $rootDiskSpaceAfterFill = (Get-Volume -DriveLetter C).SizeRemaining
-    $ephemeralDiskSpaceAfterFill = (Get-Volume -Partition $dataPartition).SizeRemaining
+$rootDiskSpaceAfterFill = (Get-Volume -DriveLetter C).SizeRemaining
+$ephemeralDiskSpaceAfterFill = (Get-Volume -Partition $dataPartition).SizeRemaining
 
-    $rootDiskDelta = $rootDiskSpaceBeforeFill - $rootDiskSpaceAfterFill
-    $ephemeralDiskDelta = $ephemeralDiskSpaceBeforeFill - $ephemeralDiskSpaceAfterFill
+$rootDiskDelta = $rootDiskSpaceBeforeFill - $rootDiskSpaceAfterFill
+$ephemeralDiskDelta = $ephemeralDiskSpaceBeforeFill - $ephemeralDiskSpaceAfterFill
 
-    Write-Host "Delta: $rootDiskDelta"
-    Write-Host "Ephemeral Delta: $ephemeralDiskDelta"
+Write-Host "Delta: $rootDiskDelta"
+Write-Host "Ephemeral Delta: $ephemeralDiskDelta"
 
-    if ($rootDiskDelta -ge $randFileSize) {
-      Write-Error "Ephemeral disk was not properly mounted to data path. Delta : $rootDiskDelta"
-      Exit 1
-    }
+if ($rootDiskDelta -ge $randFileSize) {
+    Write-Error "Ephemeral disk was not properly mounted to data path. Delta : $rootDiskDelta"
+    Exit 1
+}
 
-    if ($ephemeralDiskDelta -lt $randFileSize -or $ephemeralDiskDelta -gt 2 * $randFileSize) {
-      Write-Error "Ephemeral disk was not properly mounted to data path. Ephemeral Delta : $ephemeralDiskDelta"
-      Exit 1
-    }
-} else {
-    $dataTarget = (get-item "C:\var\vcap\data").target
-    if ($dataTarget -ne $null) {
-      Write-Error "Data partition should not be created"
-      Exit 1
-    }
+if ($ephemeralDiskDelta -lt $randFileSize -or $ephemeralDiskDelta -gt 2 * $randFileSize) {
+    Write-Error "Ephemeral disk was not properly mounted to data path. Ephemeral Delta : $ephemeralDiskDelta"
+    Exit 1
 }
 
 Exit 0

acceptance_test/assets/bwats-release/jobs/ephemeral-disk/templates/run.ps1

@@ -31,20 +31,13 @@ instance_groups:
       - name: check-system
         release: ((ReleaseName))
         properties:
-          ssh:
-            disabled_by_default: ((SSHDisabledByDefault))
-          security_compliance:
-            expected_to_comply: ((SecurityComplianceApplied))
           password:
             default_username: ((DefaultUsername))
             default_password: ((DefaultPassword))
       - name: check-wu-certs
         release: ((ReleaseName))
       - name: ephemeral-disk
         release: ((ReleaseName))
-        properties:
-          run_test:
-            enabled: ((MountEphemeralDisk))
       - name: check-ssh
         release: ((ReleaseName))
   - name: check-updates

acceptance_test/assets/manifest.yml

@@ -214,19 +214,16 @@ type TestConfig struct {
 		ClientSecret string `json:"client_secret"`
 		Target       string `json:"target"`
 	} `json:"bosh"`
-	StemcellPath              string `json:"stemcell_path"`
-	StemcellOs                string `json:"stemcell_os"`
-	Az                        string `json:"az"`
-	VmType                    string `json:"vm_type"`
-	RootEphemeralVmType       string `json:"root_ephemeral_vm_type"`
-	VmExtensions              string `json:"vm_extensions"`
-	Network                   string `json:"network"`
-	DefaultUsername           string `json:"default_username"`
-	DefaultPassword           string `json:"default_password"`
-	SkipCleanup               bool   `json:"skip_cleanup"`
-	MountEphemeralDisk        bool   `json:"mount_ephemeral_disk"`
-	SSHDisabledByDefault      bool   `json:"ssh_disabled_by_default"`
-	SecurityComplianceApplied bool   `json:"security_compliance_applied"`
+	StemcellPath        string `json:"stemcell_path"`
+	StemcellOs          string `json:"stemcell_os"`
+	Az                  string `json:"az"`
+	VmType              string `json:"vm_type"`
+	RootEphemeralVmType string `json:"root_ephemeral_vm_type"`
+	VmExtensions        string `json:"vm_extensions"`
+	Network             string `json:"network"`
+	DefaultUsername     string `json:"default_username"`
+	DefaultPassword     string `json:"default_password"`
+	SkipCleanup         bool   `json:"skip_cleanup"`
 }
 
 type StemcellYML struct {
@@ -448,41 +445,29 @@ func createBwatsRelease(bosh *BoshCommand) string {
 }
 
 type ManifestProperties struct {
-	DeploymentName            string
-	ReleaseName               string
-	AZ                        string
-	VmType                    string
-	RootEphemeralVmType       string
-	VmExtensions              string
-	Network                   string
-	StemcellOs                string
-	StemcellVersion           string
-	ReleaseVersion            string
-	DefaultUsername           string
-	DefaultPassword           string
-	MountEphemeralDisk        bool
-	SSHDisabledByDefault      bool
-	SecurityComplianceApplied bool
+	DeploymentName      string
+	ReleaseName         string
+	AZ                  string
+	VmType              string
+	RootEphemeralVmType string
+	VmExtensions        string
+	Network             string
+	StemcellOs          string
+	StemcellVersion     string
+	ReleaseVersion      string
+	DefaultUsername     string
+	DefaultPassword     string
 }
 
 func (m ManifestProperties) toVarsFlags() []string {
-	const stringVarFmt = `--var=%s="%s"`
-	const boolVarFmt = "--var=%s=%t"
-
 	var varFlags []string
 
 	for k, v := range m.toMap() {
 		if v != "" {
-			varFlags = append(varFlags, fmt.Sprintf(stringVarFmt, k, v))
+			varFlags = append(varFlags, fmt.Sprintf(`--var=%s="%s"`, k, v))
 		}
 	}
 
-	varFlags = append(varFlags,
-		fmt.Sprintf(boolVarFmt, "MountEphemeralDisk", m.MountEphemeralDisk),
-		fmt.Sprintf(boolVarFmt, "SSHDisabledByDefault", m.SSHDisabledByDefault),
-		fmt.Sprintf(boolVarFmt, "SecurityComplianceApplied", m.SecurityComplianceApplied),
-	)
-
 	return varFlags
 }
 
@@ -552,21 +537,18 @@ func downloadFile(prefix, sourceUrl string) (string, error) {
 func (c *TestConfig) deployWithManifest(bosh *BoshCommand, deploymentName string, stemcellVersion string,
 	bwatsVersion string, manifestPath string, opsFiles ...string) error {
 	manifestProperties := ManifestProperties{
-		DeploymentName:            deploymentName,
-		ReleaseName:               "bwats-release",
-		AZ:                        c.Az,
-		VmType:                    c.VmType,
-		RootEphemeralVmType:       c.RootEphemeralVmType,
-		VmExtensions:              c.VmExtensions,
-		Network:                   c.Network,
-		DefaultUsername:           c.DefaultUsername,
-		DefaultPassword:           c.DefaultPassword,
-		StemcellOs:                c.StemcellOs,
-		StemcellVersion:           stemcellVersion,
-		ReleaseVersion:            bwatsVersion,
-		MountEphemeralDisk:        c.MountEphemeralDisk,
-		SSHDisabledByDefault:      c.SSHDisabledByDefault,
-		SecurityComplianceApplied: c.SecurityComplianceApplied,
+		DeploymentName:      deploymentName,
+		ReleaseName:         "bwats-release",
+		AZ:                  c.Az,
+		VmType:              c.VmType,
+		RootEphemeralVmType: c.RootEphemeralVmType,
+		VmExtensions:        c.VmExtensions,
+		Network:             c.Network,
+		DefaultUsername:     c.DefaultUsername,
+		DefaultPassword:     c.DefaultPassword,
+		StemcellOs:          c.StemcellOs,
+		StemcellVersion:     stemcellVersion,
+		ReleaseVersion:      bwatsVersion,
 	}
 
 	var opsFileArgs strings.Builder