Skip to content

Commit

Permalink
Fix syntax highlighting and update options schema #10 #12 (#13)
Browse files Browse the repository at this point in the history
* Fix syntax highlighting #10
* Update PSRule options schema to v0.5.0 #12
* Bump dependency versions
  • Loading branch information
BernieWhite authored Apr 30, 2019
1 parent 758d64b commit a49f4ea
Show file tree
Hide file tree
Showing 8 changed files with 96 additions and 234 deletions.
1 change: 1 addition & 0 deletions .vscodeignore
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
.vscode-test/**
.vscode/**
.github/**
docs/**
typings/**
out/test/**
out/packages/**
Expand Down
5 changes: 3 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@

## Unreleased

- Updated PSRule options schema to v0.4.0. [#9](https://github.com/BernieWhite/PSRule-vscode/issues/9)
- Fixed CI badge not displaying in VSCode extension tab [#8](https://github.com/BernieWhite/PSRule-vscode/issues/8)
- Updated PSRule options schema to v0.5.0. [#12](https://github.com/BernieWhite/PSRule-vscode/issues/12)
- Fixed CI badge not displaying in VSCode extension tab. [#8](https://github.com/BernieWhite/PSRule-vscode/issues/8)
- Fixed syntax highlighting for keywords that are included in comments. [#10](https://github.com/BernieWhite/PSRule-vscode/issues/10)

## v0.1.0

Expand Down
14 changes: 14 additions & 0 deletions docs/example.Rule.ps1
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
#
# Example validation rules
#

# Description: Redis Cache should only accept secure connections
Rule 'redis.NonSslPort' -If { ResourceType 'Microsoft.Cache/Redis' } {
$TargetObject.properties.enableNonSslPort -eq $False
}

# Description: Redis Cache should reject TLS versions older then 1.2
Rule 'redis.MinTLS' -If { ResourceType 'Microsoft.Cache/Redis' } {
# Check that TLS is within range
Within 'properties.minimumTlsVersion' '1.2'
}
4 changes: 4 additions & 0 deletions docs/ps-rule.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@

execution:
languageMode: FullLanguage

125 changes: 42 additions & 83 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

22 changes: 11 additions & 11 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"name": "Bernie White"
},
"engines": {
"vscode": "^1.29.0"
"vscode": "^1.31.0"
},
"license": "SEE LICENSE IN LICENSE",
"homepage": "https://github.com/BernieWhite/PSRule-vscode/blob/master/README.md",
Expand Down Expand Up @@ -68,19 +68,19 @@
],
"yamlValidation": [
{
"fileMatch": "PSRule.yaml",
"fileMatch": "ps-rule.yaml",
"url": "./schemas/PSRule-options.schema.json"
},
{
"fileMatch": "PSRule.yml",
"fileMatch": "ps-rule.yml",
"url": "./schemas/PSRule-options.schema.json"
},
{
"fileMatch": "psrule.yml",
"fileMatch": "psrule.yaml",
"url": "./schemas/PSRule-options.schema.json"
},
{
"fileMatch": "psrule.yaml",
"fileMatch": "psrule.yml",
"url": "./schemas/PSRule-options.schema.json"
}
]
Expand All @@ -91,17 +91,17 @@
"postinstall": "node ./node_modules/vscode/bin/install"
},
"dependencies": {
"vscode-languageclient": "^5.1.1"
"vscode-languageclient": "^5.2.1"
},
"extensionDependencies": [
"vscode.powershell",
"redhat.vscode-yaml"
],
"devDependencies": {
"@types/node": "^8.10.25",
"tslint": "~5.11.0",
"typescript": "^3.1.3",
"vsce": "~1.57.1",
"vscode": "^1.1.30"
"@types/node": "~11.13.8",
"tslint": "~5.16.0",
"typescript": "^3.4.5",
"vsce": "~1.59.0",
"vscode": "^1.1.33"
}
}
Loading

0 comments on commit a49f4ea

Please sign in to comment.