Commit7d0fefd

authored

Merge pull request#944 from SteveL-MSFT/utf8-bom

Fix removing UTF-8 BOM from file

2 parents82b9135 +a7c6f34 commit7d0fefdCopy full SHA for 7d0fefd

File tree

+24

-1

lines changed

+24

-1

lines changed

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -135,3 +135,4 @@ failedToGetParentPath = "Error reading config path parent"`
`135`	`135`	`dscConfigRootAlreadySet ="The current value of DSC_CONFIG_ROOT env var will be overridden"`
`136`	`136`	`settingDscConfigRoot ="Setting DSC_CONFIG_ROOT env var as"`
`137`	`137`	`stdinNotAllowedForBothParametersAndInput ="Cannot read from STDIN for both parameters and input."`
	`138`	`+removingUtf8Bom ="Removing UTF-8 BOM from input"`

Lines changed: 7 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -475,7 +475,13 @@ pub fn get_input(input: Option<&String>, file: Option<&String>, parameters_from_`
`475`	`475`	`}else{`
`476`	`476`	`match std::fs::read_to_string(path){`
`477`	`477`	`Ok(input) =>{`
`478`		`- input`
	`478`	`+// check if it contains UTF-8 BOM and remove it`
	`479`	`+if input.as_bytes().starts_with(&[0xEF,0xBB,0xBF]){`
	`480`	`+info!("{}", t!("util.removingUtf8Bom"));`
	`481`	`+ input[3..].to_string()`
	`482`	`+}else{`
	`483`	`+ input`
	`484`	`+}`
`479`	`485`	`},`
`480`	`486`	`Err(err) =>{`
`481`	`487`	`error!("{}: {err}", t!("util.failedToReadFile"));`

Lines changed: 16 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -262,6 +262,22 @@ resources:`
`262`	`262`	`$stderr\| Should-Match'.?--file.?'`
`263`	`263`	`}`
`264`	`264`
	`265`	`+ It'file containing UTF-8 BOM should be read correctly' {`
	`266`	`+$yaml=@'`
	`267`	`+ $schema: https://aka.ms/dsc/schemas/v3/bundled/config/document.json`
	`268`	`+ resources:`
	`269`	`+ - name: Echo`
	`270`	`+ type: Microsoft.DSC.Debug/Echo`
	`271`	`+ properties:`
	`272`	`+ output: hello`
	`273`	`+'@`
	`274`	`+Set-Content-Path"$TestDrive/utf8bom.yaml"-Value$yaml-Encoding utf8BOM`
	`275`	`+$out= dsc config get--file"$TestDrive/utf8bom.yaml"\|ConvertFrom-Json`
	`276`	`+$LASTEXITCODE\| Should-Be0`
	`277`	`+$out.results[0].type\| Should-BeExactly'Microsoft.DSC.Debug/Echo'`
	`278`	`+$out.results[0].result.actualState.output\| Should-BeExactly'hello'`
	`279`	`+ }`
	`280`	`+`
`265`	`281`	`It'Get operation on the adapter itself should fail' {`
`266`	`282`	`dsc resource get-r Microsoft.DSC/PowerShell2>$TestDrive/tracing.txt`
`267`	`283`	`$LASTEXITCODE\| Should-Be2`

Comments

(0)