Merge branch 'cloudtools:main' into main

.github/workflows/maintenance.yaml

@@ -5,19 +5,23 @@ jobs:
   job:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
-      - uses: actions/setup-python@v4
+      - uses: actions/checkout@v4
+      - uses: actions/setup-python@v5
         with:
           python-version: "3.10"
       - run: |
+          npm install
+          npx pyright --version
           python -m pip install -r requirements-dev.txt
           make spec
           make regen
+          make test
+          make lint
       - name: Set spec version variable
         id: vars
         run: |
           echo "pr_title=Updates from spec version $(jq -r .ResourceSpecificationVersion CloudFormationResourceSpecification.json)" >> $GITHUB_OUTPUT
-      - uses: peter-evans/create-pull-request@v4
+      - uses: peter-evans/create-pull-request@v6
         with:
           commit-message: |
             ${{ steps.vars.outputs.pr_title }}

.github/workflows/tests.yml

@@ -19,16 +19,16 @@ jobs:
         os: [ubuntu-latest]
     runs-on: ${{ matrix.os }}
     steps:
-      - uses: actions/checkout@v3
-      - uses: actions/setup-python@v4
+      - uses: actions/checkout@v4
+      - uses: actions/setup-python@v5
         with:
           python-version: ${{ matrix.python-version }}
       - name: Install Node
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
-          node-version: '17'
+          node-version: '22'
       - name: Pip Cache (Linux)
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         if: runner.os == 'Linux'
         with:
           path: ~/.cache/pip
@@ -49,8 +49,8 @@ jobs:
     name: Spec Generation & Formatting Fixups
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
-      - uses: actions/setup-python@v4
+      - uses: actions/checkout@v4
+      - uses: actions/setup-python@v5
         with:
           python-version: "3.10"
       - name: Install Python Dependencies

.pre-commit-config.yaml

@@ -1,10 +1,10 @@
 repos:
 - repo: https://github.com/psf/black
-  rev: '22.3.0'
+  rev: '24.4.2'
   hooks:
     - id: black
 
 - repo: https://github.com/timothycrosley/isort
-  rev: '5.12.0'
+  rev: '5.13.2'
   hooks:
     - id: isort

.readthedocs.yaml

@@ -1,9 +1,15 @@
+version: 2
+
+build:
+  os: ubuntu-22.04
+  tools:
+    python: "3.11"
+
 # Build from the docs/ directory with Sphinx
 sphinx:
   configuration: docs/conf.py
 
-# Explicitly set the version of Python and its requirements
+# Specify the dependencies
 python:
-  version: 3.8
   install:
     - requirements: docs/requirements.txt

CHANGELOG.rst

@@ -1,3 +1,124 @@
+4.8.2 (2024*09*30)
+-------------------------------
+* Update SSM OperatingSystem validator (#2256)
+* Updates from spec version 180.0.0 (updated)
+* Updates from spec version 182.0.0 (#2257)
+* The APIGateway Integration timeout can now be increased beyond 29,000 milliseconds. Removing upper limit. (#2258)
+* Convert to using pytest instead of "setup.py test"
+* Updates from spec version 183.0.0 (#2259)
+* Allow TZ as a lambda env var
+* Updates from spec version 184.0.0 (#2263)
+* Update ElastiCache instance types (#2262)
+* Fix Chatbot::SlackChannelConfiguration LoggingLevel validation (Fixes #2264)
+* Update node from 17 to 22 for test action
+* Updates from spec version 185.0.0 (#2267)
+* Update kinesisanalyticsv2 VALID_RUNTIME_ENVIRONMENTS (#2266)
+* Updates from spec version 185.0.1 (#2269)
+* Validate the type for Tags (#2270)
+* Add new AWS resources
+
+4.8.1 (2024*06*28)
+-------------------------------
+* Update copyright year in generated files
+* Update black and isort
+* Updates from spec version 172.0.0 (#2241)
+* Updates from spec version 173.0.0 (#2242)
+* Updates from spec version 174.0.0 (#2243)
+* Updates from spec version 175.0.0 (#2244)
+* Add support for GitLab sources in CodeBuild projects (#2246)
+* Add SnapStart to Serverless Function (#2248)
+* Add setuptools as a dev requirement
+* Updates from spec version 176.0.0 (#2249)
+* Update glue ConnectionType validatorto allow SNOWFLAKE (#2247)
+* Updates from spec version 177.0.0 (#2250)
+* Updates from spec version 178.0.0 (#2251)
+* Add LoggingConfig to Serverless::Function (#2253)
+* Updates from spec version 179.0.0 (#2254)
+* Updates from spec version 180.0.0 (#2255)
+
+4.8.0 (2024*04*29)
+-------------------------------
+* Updates from spec version 165.0.0 (#2230)
+* Updates from spec version 166.0.0
+* Updates from spec version 167.0.0
+* Updates from spec version 167.1.0
+* Add syn-nodejs-puppeteer-7.0 as valid Synthetics::Canary runtime (#2234)
+* DLM::LifecyclePolicy CreateRule.Interval: allow 1 as a valid interval (#2238)
+* Add FilterCriteria to Serverless KinesisEvent (#2235)
+* Fix Serverless MQEvent SourceAccessConfigurations property type (#2236)
+* Updates from spec version 168.0.0
+* Updates from spec version 169.0.0
+* Updates from spec version 170.0.0
+* Updates from spec version 171.0.0 (#2240)
+* Update copyright year for generated files
+* Add new AWS resources
+
+4.7.0 (2024*03*10)
+-------------------------------
+* Breaking change: AppConfig::Environment.Monitors was renamed to AppConfig::Environment.Monitor
+* Validate CoreNetworkArn for a valid EC2 Route descriptor
+* Fix RDS validator for gp3 iops/allocated_storage ratio check (#2225)
+* Fix lint issue in recent change to test_rds.py
+* Updates from spec version 158.0.0
+* Updates from spec version 159.0.0
+* Updates from spec version 160.0.0 (#2226)
+* Add syn-nodejs-puppeteer-6.2 as valid canary runtime (#2228)
+* Updates from spec version 161.0.0
+* Updates from spec version 162.0.0
+* Update actions for node 16 => 20
+* Update to peter-evans/create-pull-request@v6
+* Updates from spec version 163.0.0 (#2227)
+* Updates from spec version 164.0.0 (#2229)
+* Add AWS:B2BI
+* Add AWS::DataZone
+* Add AWS::NeptuneGraph
+* Add new AWS services to resource doc
+
+4.6.0 (2024*01*06)
+-------------------------------
+* Emit pyright version on maintenance run
+* Use package.json to install the correct version of pyright
+* Updates from spec version 150.0.0 (#2210)
+* Add AWS::WorkSpacesThinClient
+* Updates from spec version 150.0.0 (#2211)
+* Updates from spec version 151.0.0 (#2212)
+* Updates from spec version 152.0.0
+* Update docs dependency
+* Updates from spec version 153.0.0 (#2214)
+* Allow EVENT for Glue::Trigger.Type (Fixes #2215)
+* Update readthedocs-sphinx-search to 0.3.2
+* Updates from spec version 154.0.0 (#2218)
+* Fix Batch patches for spec version 155.0.0
+* Updates from spec version 155.0.0
+* Add port validator for ElastiCache::ServerlessCache.Endpoint
+* Keep Tags consistent for GuardDuty::Filter
+* Updates from spec version 156.0.0 (#2219)
+* Invert Ipv6CidrBlock Check (#2216)
+* Fix valid Synthetics canary runtime versions (#2221)
+* Updates from spec version 157.0.0 (#2222)
+
+4.5.3 (2023*12*06)
+-------------------------------
+* Upgrade readthedocs config to v2
+* Add tests and lint runs for maintenance action
+* Install correct version of pyright for maintenance action
+* Rename due to conflict: S3::StorageLensGroup.StorageLensFilter
+* Add required Name to GuardDuty.IPSet tests
+* Updates from spec version 149.0.0 (#2207)
+* Add AWS::ARCZonalShift
+* Add AWS::S3Express
+* Add new supported resources to docs
+* Prefer ECS::Service.LoadBalancer (Fixes #2206)
+
+4.5.2 (2023*11*11)
+-------------------------------
+* Updates from spec version 146.0.0 (#2201)
+* Updates from spec version 148.0.0 (#2202)
+* Remove EMRserverless "Configurations" due to recursive reference to ConfigurationObject
+* Move __hash__ to BaseAWSObject to support objects in dictionaries (Fixes #2204)
+* Add missing patch related to EMRserverless Configurations removal
+* Remove Tags from EventBridge.Rule (Fixes #2203)
+
 4.5.1 (2023*10*26)
 -------------------------------
 * Fix __eq__ protocol (#2197)

Makefile

@@ -86,4 +86,4 @@ spec:
 	ln -f CloudFormationResourceSpecification.json .backup/CloudFormationResourceSpecification_$${SPECVERSION}.json
 
 test: ## run tests
-	@python setup.py test
+	@pytest tests

docs/conf.py

@@ -26,7 +26,7 @@
 # The short X.Y version
 version = ""
 # The full version, including alpha/beta/rc tags
-release = "4.5.1"
+release = "4.8.2"
 
 
 # -- General configuration ---------------------------------------------------

docs/requirements.txt

@@ -1,5 +1,6 @@
 awacs>=2.0.0
+cfn_flip>=1.0.2
 myst_parser==2.0.0
 sphinx==6.2.1
 sphinx_rtd_theme==1.2.2
-readthedocs-sphinx-search==0.3.1
+readthedocs-sphinx-search==0.3.2

package.json

@@ -19,7 +19,7 @@
   },
   "homepage": "https://github.com/cloudtools/troposphere#readme",
   "devDependencies": {
-    "pyright": "=1.1.261"
+    "pyright": "^1.1.261"
   },
   "engines": {
     "npm": ">=7.0.0",

requirements-dev.txt

@@ -1,6 +1,8 @@
 # troposphere
 # -------------------------------------
 
+setuptools
+
 # ---- Need libraries installed by setup.py
 cfn_flip>=1.0.2
 awacs>=2.0.0
@@ -26,8 +28,8 @@ pre-commit>=2.16
 pytest>=4.1
 pytest-cov>=2.6
 
-black==23.7.0
+black==24.4.2
 build==0.5.1
 click==8.0.4
-isort==5.12.0
+isort==5.13.2
 tox==3.23.1