Skip to content

Commit

Permalink
Merge branch 'main' into create-pull-request/maintenance-v1
Browse files Browse the repository at this point in the history
  • Loading branch information
kddejong authored May 3, 2024
2 parents 11f1c86 + 5e9617e commit 41eb258
Show file tree
Hide file tree
Showing 6 changed files with 16 additions and 9 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/ci-branch.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ jobs:
strategy:
matrix:
os: [ubuntu-latest, macos-latest, windows-latest]
python: [ 3.8, 3.9, "3.10", "3.11", "3.12" ]
python: [ "3.8", "3.9", "3.10", "3.11", "3.12" ]

steps:
- uses: actions/checkout@v4
Expand Down Expand Up @@ -38,7 +38,7 @@ jobs:
strategy:
matrix:
os: [ubuntu-latest, macos-latest, windows-latest]
python: [3.8]
python: ["3.10"]
steps:
- uses: actions/checkout@v4
- name: Setup Python
Expand All @@ -57,7 +57,7 @@ jobs:
strategy:
matrix:
os: [ubuntu-latest]
python: [3.8]
python: ["3.10"]
steps:
- uses: actions/checkout@v4
- name: Setup Python
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/ci-pr.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ jobs:
strategy:
matrix:
os: [ubuntu-latest, macos-latest, windows-latest]
python: [ 3.8, 3.9, "3.10", "3.11", "3.12" ]
python: [ "3.8", "3.9", "3.10", "3.11", "3.12" ]

steps:
- uses: actions/checkout@v4
Expand Down Expand Up @@ -45,7 +45,7 @@ jobs:
strategy:
matrix:
os: [ubuntu-latest, macos-latest, windows-latest]
python: [3.8]
python: ["3.10"]
steps:
- uses: actions/checkout@v4
- name: Setup Python
Expand All @@ -64,7 +64,7 @@ jobs:
strategy:
matrix:
os: [ubuntu-latest]
python: [3.8]
python: ["3.10"]
steps:
- uses: actions/checkout@v4
- name: Setup Python
Expand Down
3 changes: 2 additions & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ name = "cfn-lint"
description = "Checks CloudFormation templates for practices and behaviour that could potentially be improved"
requires-python = ">=3.8"
license = {text = "MIT no attribution"}
keywords = ["aws", "lint"]
keywords = ["aws", "cloudformation", "lint"]
authors = [
{email = "[email protected]"},
{name = "Kevin DeJong"},
Expand All @@ -32,6 +32,7 @@ classifiers = [
"Programming Language :: Python :: 3.9",
"Programming Language :: Python :: 3.10",
"Programming Language :: Python :: 3.11",
"Programming Language :: Python :: 3.12",
]
dynamic = ["version", "readme"]
dependencies = [
Expand Down
1 change: 0 additions & 1 deletion src/cfnlint/maintenance.py
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,6 @@ def update_documentation(rules):
cfnlint.rules.TransformError(),
cfnlint.rules.RuleError(),
] + sorted_rules:
print(rule)
rule_source_code_file = (
"../"
+ subprocess.check_output(
Expand Down
2 changes: 1 addition & 1 deletion src/cfnlint/rules/resources/properties/StringLength.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ class StringLength(CloudFormationLintRule):
id = "E3033"
shortdesc = "Check if a string has between min and max number of values specified"
description = "Check strings for its length between the minimum and maximum"
source_url = "https://github.com/aws-cloudformation/cfn-lint/blob/v1/docs/cfn-schema-specification.md#length"
source_url = "https://github.com/aws-cloudformation/cfn-lint/blob/main/docs/cfn-schema-specification.md#length"
tags = ["resources", "property", "string", "size"]

def _serialize_date(self, obj):
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -152,6 +152,13 @@
"description": "A reference to the Tags property in the schema.",
"$ref": "http://json-schema.org/draft-07/schema#/properties/$ref",
"default": "/properties/Tags"
},
"permissions": {
"type": "array",
"items": {
"type": "string"
},
"additionalItems": false
}
},
"required": [
Expand Down

0 comments on commit 41eb258

Please sign in to comment.