chore: Rebase config project to develop (aws#5406)

* fix: fix the hardcoded number of stages printed in logs. (aws#5210)

* feat: Linking Authorizers to Lambda functions using the invocation URI (aws#5196)

* Link authorizer to lambda function invoke URI

* Updated doc string

* Updated exception messages back

* Added check for one element in reference list

* Updated empty ref list check to not block

* Updated log message

* Fix long line lint error

---------

Co-authored-by: Mohamed Elasmar <71043312+moelasmar@users.noreply.github.com>

* chore(deps-dev): bump parameterized from 0.8.1 to 0.9.0 in /requirements (aws#5214)

Bumps [parameterized](https://github.com/wolever/parameterized) from 0.8.1 to 0.9.0.
- [Changelog](https://github.com/wolever/parameterized/blob/master/CHANGELOG.txt)
- [Commits](wolever/parameterized@v0.8.1...v0.9.0)

---
updated-dependencies:
- dependency-name: parameterized
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* chore(deps-dev): bump filelock from 3.10.7 to 3.12.0 in /requirements (aws#5213)

Bumps [filelock](https://github.com/tox-dev/py-filelock) from 3.10.7 to 3.12.0.
- [Release notes](https://github.com/tox-dev/py-filelock/releases)
- [Changelog](https://github.com/tox-dev/py-filelock/blob/main/docs/changelog.rst)
- [Commits](tox-dev/filelock@3.10.7...3.12.0)

---
updated-dependencies:
- dependency-name: filelock
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* chore(deps): bump attrs from 22.2.0 to 23.1.0 in /requirements (aws#5212)

Bumps [attrs](https://github.com/python-attrs/attrs) from 22.2.0 to 23.1.0.
- [Release notes](https://github.com/python-attrs/attrs/releases)
- [Changelog](https://github.com/python-attrs/attrs/blob/main/CHANGELOG.md)
- [Commits](python-attrs/attrs@22.2.0...23.1.0)

---
updated-dependencies:
- dependency-name: attrs
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* feat: update SAM CLI with latest App Templates commit hash (aws#5211)

* feat: updating app templates repo hash with (a34f563f067e13df3eb350d36461b99397b6cda6)

* dummy change to trigger checks

* revert dummy commit

---------

Co-authored-by: GitHub Action <action@github.com>
Co-authored-by: Mohamed Elasmar <71043312+moelasmar@users.noreply.github.com>

* fix: fix failing Terraform integration test cases (aws#5218)

* fix: fix the failing terraform integration test cases

* fix: fix the resource address while accessing the module config resources

* fix: fix checking the experimental log integration test cases

* chore: bump version to 1.85.0 (aws#5226)

* chore: use the SAR Application created in testing accounts (aws#5221)

* chore: update aws_lambda_builders to 1.32.0 (aws#5215)

Co-authored-by: GitHub Action <action@github.com>
Co-authored-by: Mohamed Elasmar <71043312+moelasmar@users.noreply.github.com>

* feat: Added linking Gateway Method to Lambda Authorizer (aws#5228)

* Added linking method to authorizer

* Fixed docstring spelling mistake

---------

Co-authored-by: Mohamed Elasmar <71043312+moelasmar@users.noreply.github.com>

* feat: Return early during linking if no destination resources are found (aws#5220)

* Returns during linking if no destination resources are found

* Updated comment to correctly reflect state

* Cleaned extra word

---------

Co-authored-by: Mohamed Elasmar <71043312+moelasmar@users.noreply.github.com>

* chore: Strengthen wording on "no Auth" during deploy (aws#5231)

Co-authored-by: Jacob Fuss <jfuss@users.noreply.github.com>
Co-authored-by: Sriram Madapusi Vasudevan <3770774+sriram-mv@users.noreply.github.com>

* feat: Link Lambda Authorizer to Rest API (aws#5219)

* Link RestApiId property for Lambda Authorizers

* Updated docstring

* Format files

---------

Co-authored-by: Mohamed Elasmar <71043312+moelasmar@users.noreply.github.com>

* feat: updating app templates repo hash with (9ee7db342025a42023882960b23ebfcde1d87422) (aws#5242)

Co-authored-by: GitHub Action <action@github.com>

* fix: handle edge cases with function sync flow in sam sync command (aws#5222)

* fix: handle special cases for function sync flow

* update with unit tests

* add integration tests

* set ADL to false

* fix update file methods

* address comments

* address comments to instantiate FunctionBuildInfo in the beginning

* chore: Upgrade Mac installer to Py3.11 (aws#5223)

* chore: Upgrade Mac installer to Py3.11

* Remove python in mac installer build process

* Update hardcoded python version in build-mac.sh

---------

Co-authored-by: Jacob Fuss <jfuss@users.noreply.github.com>

* feat: updating app templates repo hash with (66f4a230d1c939a0c3f7b5647710c694c3a486f7) (aws#5245)

Co-authored-by: GitHub Action <action@github.com>

* Revert "chore: Upgrade Mac installer to Py3.11 (aws#5223)" (aws#5252)

This reverts commit 5954042.

* fix: add 3.11 to classifiers and upgrade Docker (aws#5225)

* fix: add 3.11 to classifiers

- update dependencies, need to nail down the versions.

* Pin dev dependencies and handle excluding folders for mypy

* Remove unneeded type: ignores

* Fix name-match mypy errors

* Fix empty-body error from mypy

* Fix mypy errors by ignoring and get pytest to run/pass

* Force mypy to not fail hopefully

* Remove unneeded assignment

* Update pinned requirements file

---------

Co-authored-by: Jacob Fuss <jfuss@users.noreply.github.com>
Co-authored-by: Jacob Fuss <32497805+jfuss@users.noreply.github.com>

* fix: fix build and deploy SAR integration test cases (aws#5244)

* fix: fix build SAR integration test cases

* add comments to the UpdatableSARTemplate class usage.

* fix black check

* chore(deps): bump markupsafe from 2.1.2 to 2.1.3 in /requirements (aws#5257)

Bumps [markupsafe](https://github.com/pallets/markupsafe) from 2.1.2 to 2.1.3.
- [Release notes](https://github.com/pallets/markupsafe/releases)
- [Changelog](https://github.com/pallets/markupsafe/blob/main/CHANGES.rst)
- [Commits](pallets/markupsafe@2.1.2...2.1.3)

---
updated-dependencies:
- dependency-name: markupsafe
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* chore(deps): bump pydantic from 1.10.7 to 1.10.8 in /requirements (aws#5258)

Bumps [pydantic](https://github.com/pydantic/pydantic) from 1.10.7 to 1.10.8.
- [Release notes](https://github.com/pydantic/pydantic/releases)
- [Changelog](https://github.com/pydantic/pydantic/blob/v1.10.8/HISTORY.md)
- [Commits](pydantic/pydantic@v1.10.7...v1.10.8)

---
updated-dependencies:
- dependency-name: pydantic
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* feat: Add click command for cloud invoke command (aws#5238)

* Add custom click option for cloud invoke called parameter

* Added more error handling to executors and updated output-format enum to use auto

* Add new CLI command for cloud invoke

* Update samcli/commands/remote_invoke/invoke/cli.py

Co-authored-by: Mehmet Nuri Deveci <5735811+mndeveci@users.noreply.github.com>

* Update samcli/commands/remote_invoke/invoke/cli.py

Co-authored-by: Mehmet Nuri Deveci <5735811+mndeveci@users.noreply.github.com>

* Update samcli/commands/remote_invoke/cloud.py

Co-authored-by: Mehmet Nuri Deveci <5735811+mndeveci@users.noreply.github.com>

* Update samcli/cli/types.py

Co-authored-by: Mehmet Nuri Deveci <5735811+mndeveci@users.noreply.github.com>

* Address feedback

* Moved all command options to be handled by click configuration

* Updated validation function doc-string

* Updated debug logs in types.py

* Changed remote_invoke dir to cloud and updated log level for validation

* Address feedback

---------

Co-authored-by: Mehmet Nuri Deveci <5735811+mndeveci@users.noreply.github.com>

* chore(deps-dev): bump boto3-stubs[apigateway,cloudformation,ecr,iam,lambda,s3,schemas,secretsmanager,signer,stepfunctions,sts,xray] (aws#5256)

Bumps [boto3-stubs[apigateway,cloudformation,ecr,iam,lambda,s3,schemas,secretsmanager,signer,stepfunctions,sts,xray]](https://github.com/youtype/mypy_boto3_builder) from 1.26.131 to 1.26.146.
- [Release notes](https://github.com/youtype/mypy_boto3_builder/releases)
- [Commits](https://github.com/youtype/mypy_boto3_builder/commits)

---
updated-dependencies:
- dependency-name: boto3-stubs[apigateway,cloudformation,ecr,iam,lambda,s3,schemas,secretsmanager,signer,stepfunctions,sts,xray]
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* pin pytest-metadata to avoid its breaking change (aws#5261)

* chore: update aws_lambda_builders to 1.33.0 (aws#5262)

Co-authored-by: GitHub Action <action@github.com>
Co-authored-by: Daniel Mil <84205762+mildaniel@users.noreply.github.com>

* chore: Add python3.11 to canaries (aws#5263)

* chore: Add python3.11 to canaries

* Remove python3.9

* Artifact export for GraphQLApi (aws#5250)

* Artifact export for GraphQLApi

* format

* docstrings

* fix unit tests

* fix mypy issues

* improve search method signature

* chore: bump version to 1.86.0 (aws#5266)

* fix: add constant str for enums to support deepcopy operation (aws#5265)

* fix: add constant str for enums to support deepcopy operation

* add unit tests

* formatting

* update automated updates gha to force restart of status checks (aws#5269)

* integration tests for graphql resource package (aws#5271)

* Revert "fix: add 3.11 to classifiers and upgrade Docker (aws#5225)"

This reverts commit b51d661.

* chore: bump version to 1.86.1

* chore: Upgrade Docker-py/ Support Py3.11 for running tests (aws#5279)

* fix: add 3.11 to classifiers and upgrade Docker (aws#5225)

* fix: add 3.11 to classifiers

- update dependencies, need to nail down the versions.

* Pin dev dependencies and handle excluding folders for mypy

* Remove unneeded type: ignores

* Fix name-match mypy errors

* Fix empty-body error from mypy

* Fix mypy errors by ignoring and get pytest to run/pass

* Force mypy to not fail hopefully

* Remove unneeded assignment

* Update pinned requirements file

---------

Co-authored-by: Jacob Fuss <jfuss@users.noreply.github.com>
Co-authored-by: Jacob Fuss <32497805+jfuss@users.noreply.github.com>

* chore: Force version on docker and allow unit test to run when docker not running

In order for the docker.from_env() not to fail when docker is not installed/running,
we force the min version on client creation. This was the default behavior in 4.X of
docker-py but not longer in the latest version.

---------

Co-authored-by: Sriram Madapusi Vasudevan <3770774+sriram-mv@users.noreply.github.com>
Co-authored-by: Jacob Fuss <jfuss@users.noreply.github.com>

* test: GHA to Execute Test without Docker Running (aws#5290)

* test: Test without Docker running

* Add build test

* Run install

* Remove success condition

* Add continue on error

* Add continue on error

* Separate tests

* Fix test name

* Require new test

* Address comments

* Attempt to parameterize for windows

* Attempt to parameterize for windows

* Attempt to parameterize for windows

* Set samdev in environment

* Move skip to top of test class

* fix: remove ruby3.2 from preview runtimes (aws#5296)

* fix: remove ruby3.2 from preview runtimes

* update {} with set()

* Fix: Force docker version to match 4.2's default version (aws#5305)

Co-authored-by: Jacob Fuss <jfuss@users.noreply.github.com>

* chore: cleanup appveyor definitions for not running jobs which is already run with GHA & add docker info/version commands (aws#5306)

* chore: remove redundant tests and setup from appveyor definitions

* add/update docker info and docker version commands

* add 3.11 and macos to GHAs

* add some explanations to Windows section

* fix: Fix failing tests on Python3.11 (aws#5317)

* chore(deps): bump cryptography from 39.0.2 to 41.0.0 in /requirements (aws#5251)

* chore(deps): bump cryptography from 39.0.2 to 41.0.0 in /requirements

Bumps [cryptography](https://github.com/pyca/cryptography) from 39.0.2 to 41.0.0.
- [Changelog](https://github.com/pyca/cryptography/blob/main/CHANGELOG.rst)
- [Commits](pyca/cryptography@39.0.2...41.0.0)

---
updated-dependencies:
- dependency-name: cryptography
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>

* Bump pyopenssl version to support newer cryptography lib

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Lucas <12496191+lucashuy@users.noreply.github.com>
Co-authored-by: Jacob Fuss <32497805+jfuss@users.noreply.github.com>
Co-authored-by: Mehmet Nuri Deveci <5735811+mndeveci@users.noreply.github.com>

* add sleep between close and reopen (aws#5320)

* GraphQLApi support for `sam deploy` (aws#5294)

* GraphQLApi support for `sam deploy`

* unit tests and format fixes

* fix: Update Arn parsing logic and fix some edge cases/bug fixes for remote invoke (aws#5295)

* Fix some edge cases and bug fixes for remote invoke and update Arn parsing logic

* Address feedback

* Add unit test for s3 with no region/accoint_id provided

* Renamed command to sam remote invoke

* chore: update aws_lambda_builders to 1.34.0 (aws#5343)

* chore: update aws_lambda_builders to 1.34.0

* Update base.txt

---------

Co-authored-by: GitHub Action <action@github.com>
Co-authored-by: Mohamed Elasmar <71043312+moelasmar@users.noreply.github.com>

* test: test building npm and Typescript projects using external manifest file. (aws#5283)

* test: test building npm and Typescript projects using external manifest file.

* fix mypy issues

* remove node 12.x, and add the new node versions

* run make format

* chore(deps-dev): bump ruff from 0.0.261 to 0.0.272 in /requirements (aws#5337)

Bumps [ruff](https://github.com/charliermarsh/ruff) from 0.0.261 to 0.0.272.
- [Release notes](https://github.com/charliermarsh/ruff/releases)
- [Changelog](https://github.com/astral-sh/ruff/blob/main/BREAKING_CHANGES.md)
- [Commits](astral-sh/ruff@v0.0.261...v0.0.272)

---
updated-dependencies:
- dependency-name: ruff
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* chore(deps-dev): bump pytest-cov from 4.0.0 to 4.1.0 in /requirements (aws#5335)

Bumps [pytest-cov](https://github.com/pytest-dev/pytest-cov) from 4.0.0 to 4.1.0.
- [Changelog](https://github.com/pytest-dev/pytest-cov/blob/master/CHANGELOG.rst)
- [Commits](pytest-dev/pytest-cov@v4.0.0...v4.1.0)

---
updated-dependencies:
- dependency-name: pytest-cov
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* feat: add lambda streaming support for remote invoke (aws#5307)

* feat: support response streaming with remote invoke

* add invoker and mappers

* Update output formatting of stream response

* add unit tests

* fix formatting

* Add docs

* address comments

* formatting

* move is_function_invoke_mode_response_stream into lambda invoke executors and add/update string constants

* chore: bump version to 1.87.0

* Revert app templates gha (aws#5356)

* Revert "add sleep between close and reopen (aws#5320)"

This reverts commit 5be690c.

* Revert "update automated updates gha to force restart of status checks (aws#5269)"

This reverts commit deb212b.

* refactor: make remote invoke reactive to display results as soon as they are available (aws#5359)

* refactor: make remote invoke reactive to display results as soon as they are available

* addressed the comments

* refactor init_clients in sam delete (aws#5360)

* refactor init_clients in sam delete

* remove unused line

* use client_provider

* fix broken tests

* Update samcli/commands/delete/delete_context.py

Co-authored-by: Mehmet Nuri Deveci <5735811+mndeveci@users.noreply.github.com>

* add telemetry

* fix format

---------

Co-authored-by: Mehmet Nuri Deveci <5735811+mndeveci@users.noreply.github.com>

* chore: update aws-sam-translator to 1.69.0 (aws#5370)

Co-authored-by: GitHub Action <action@github.com>

* feat: sam remote invoke help text and UX fixes (aws#5366)

* Improve remote invoke help text and fix some UX bugs

* Updated help text for parameter option

* Updated test class name

* Updated test method name

* Updated help text for output-format and event-file

* Address feedback

* Updated help text for parameter option

* Changed --output-format name to output and the values to text/json

* Handle empty event for lambda and read from stdin when - is passed for event-file

* chore: temporary pin python version to 3.7.16 (aws#5384)

* chore: temporary pin python version to 3.7.16

* fix github action syntax error

* Updated cfn-lint to support ruby3.2 in validate (aws#5375)

* Remove unneeded test cases (aws#5374)

* Remove unneeded test cases

* Removing the two integ test cases as there is already coverage in unit test for cases that no region is specified

* feat: updating app templates repo hash with (67f28fd83477e0e15b394f995afb33b2053b4074) (aws#5362)

Co-authored-by: GitHub Action <action@github.com>
Co-authored-by: Mehmet Nuri Deveci <5735811+mndeveci@users.noreply.github.com>

* test: Integration tests for remote invoke on regular lambda functions (aws#5382)

* Created base integ glass for remote invoke tests

* Add integration tests for invoking lambda functions

* make black

* Moved tearDownClass to base class

* Removed tearDown class from inherited classes and updated lambda fn timeout

* Remove the check to skip appveyor tests on master branch

* feat: Make remote invoke command available (aws#5381)

* Enabled remote invoke command and updated docs link

* Created base integ glass for remote invoke tests

* Added end2end integ tests for remote invoke

* make black

* Moved tearDownClass to base class

* Remove the check to skip appveyor tests on master branch

* test: Remote invoke integration tests for response stream configured lambda functions  (aws#5383)

* Created base integ glass for remote invoke tests

* Add integration tests for invoking response streaming lambda fns

* make black

* Moved tearDownClass to base class

* Moved tearDownClass method to base class and removed architectures from template file

* Remove the check to skip appveyor tests on master branch

* chore: bump version to 1.88.0 (aws#5393)

* chore: fix issues with appveyor ubuntu setup aws#5395

* chore: remove deprecated runtime dotnetcore3.1 (aws#5091)

* chore: remove deprecated runtime dotnetcore3.1

* apply pr comments

* fix(invoke): Write in UTF-8 string instead of bytes. (aws#5232)

* fix(invoke): Write in UTF-8 string instead of bytes.

It appears that we were using sys.stdout.buffer to support python2
and python3 at the same time. Switching to just write to sys.stdout
allows us to write a utf-8 encoding string. When using sys.stdout.buffer,
we can only write bytes and I couldn't get the correct UTF8 encoded
string to print correctly.

* Fix ruff errors

* Update log_streamer.py to remove encoding

* More updates to make everything work better in general

* Fix with ruff again

* Explictingly write to stream for building images

* More patching writes

* More patching

* Fix long line

* Use mock over io.string

* More fixing of tests

* Assert mock instead of data directly

* More small edits in test

* Verify through calls instead of value

* run make black

* Fix when we flush to match pervious behavior and output

* add integration tests

* run make black

---------

Co-authored-by: Jacob Fuss <jfuss@users.noreply.github.com>
Co-authored-by: Mehmet Nuri Deveci <5735811+mndeveci@users.noreply.github.com>

* Revert "fix(invoke): Write in UTF-8 string instead of bytes. (aws#5232)" (aws#5401)

This reverts commit 97104ea.

* Add sanity check script and use it in pyinstaller GHA (aws#5400)

* Add sanity check script and use it in pyinstaller GHA

* set pipefail in sanity-check.sh

* Make CI_OVERRIDE a global env var in the GHA workflow

* setup go in GHA

* disable telemetry

* Update script to check binary existence and to fix an issue in go build

* Resolve changes

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: Mohamed Elasmar <71043312+moelasmar@users.noreply.github.com>
Co-authored-by: Lucas <12496191+lucashuy@users.noreply.github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: GitHub Action <action@github.com>
Co-authored-by: Jacob Fuss <32497805+jfuss@users.noreply.github.com>
Co-authored-by: Jacob Fuss <jfuss@users.noreply.github.com>
Co-authored-by: Sriram Madapusi Vasudevan <3770774+sriram-mv@users.noreply.github.com>
Co-authored-by: Mehmet Nuri Deveci <5735811+mndeveci@users.noreply.github.com>
Co-authored-by: Wing Fung Lau <4760060+hawflau@users.noreply.github.com>
Co-authored-by: hnnasit <84355507+hnnasit@users.noreply.github.com>
Co-authored-by: Daniel Mil <84205762+mildaniel@users.noreply.github.com>
Co-authored-by: Slava Senchenko <sencslav@amazon.com>
Co-authored-by: Leonardo Gama <leogama@amazon.com>

.github/workflows/build.yml

@@ -57,9 +57,17 @@ jobs:
           - "3.11"
     steps:
     - uses: actions/checkout@v3
+    # @melasmar
+    # TODO: Revert back to use 3.7 to all operating systems after the regression issue in Python
+    # https://github.com/actions/setup-python/issues/682 in github action got resolved
     - uses: actions/setup-python@v4
+      if: matrix.os != 'macos-latest' || ( matrix.os == 'macos-latest' && matrix.python != '3.7' )
       with:
         python-version: ${{ matrix.python }}
+    - uses: actions/setup-python@v4
+      if: matrix.os == 'macos-latest' && matrix.python == '3.7'
+      with:
+        python-version: "3.7.16"
     - run: test -f "./.github/ISSUE_TEMPLATE/Bug_report.md"  # prevent Bug_report.md from being renamed or deleted
     - run: make init
     - run: make pr

.github/workflows/validate_pyinstaller.yml

@@ -50,7 +50,11 @@ jobs:
         with:
           python-version: "3.7"
       - name: Set up Go
+<<<<<<< HEAD
         uses: actions/setup-go@v4
+=======
+        uses: actions/setup-go@v3
+>>>>>>> 44daa48b (chore: Rebase config project to develop (#5406))
         with:
           go-version: "1.20"
       - name: Build PyInstaller

appveyor-windows.yml

@@ -150,6 +150,13 @@ install:
 
 
 
+  # claim some disk space before starting the tests
+  - "docker system prune -a -f"
+  # activate virtual environment
+  - "venv\\Scripts\\activate"
+
+
+
 # Final clean up no matter success or failure
 on_finish:
   # Upload test reports as artifacts

samcli/__init__.py

@@ -2,4 +2,8 @@
 SAM CLI version
 """
 
+<<<<<<< HEAD
 __version__ = "1.90.0"
+=======
+__version__ = "1.88.0"
+>>>>>>> 44daa48b (chore: Rebase config project to develop (#5406))

samcli/commands/delete/delete_context.py

@@ -9,7 +9,7 @@
 from botocore.exceptions import NoCredentialsError, NoRegionError
 from click import confirm, prompt
 
-from samcli.cli.cli_config_file import TomlProvider
+from samcli.cli.cli_config_file import ConfigProvider
 from samcli.commands.delete.exceptions import CfDeleteFailedStatusError
 from samcli.commands.exceptions import AWSServiceClientError, RegionError
 from samcli.lib.bootstrap.companion_stack.companion_stack_builder import CompanionStack

samcli/commands/remote/invoke/cli.py

@@ -4,7 +4,7 @@
 
 import click
 
-from samcli.cli.cli_config_file import TomlProvider, configuration_option
+from samcli.cli.cli_config_file import ConfigProvider, configuration_option
 from samcli.cli.context import Context
 from samcli.cli.main import aws_creds_options, common_options, pass_context, print_cmdline_args
 from samcli.cli.types import RemoteInvokeOutputFormatType
@@ -42,7 +42,7 @@
     requires_credentials=True,
     context_settings={"max_content_width": 120},
 )
-@configuration_option(provider=TomlProvider(section="parameters"))
+@configuration_option(provider=ConfigProvider(section="parameters"))
 @click.option("--stack-name", required=False, help="Name of the stack to get the resource information from")
 @click.argument("resource-id", required=False)
 @click.option(

samcli/lib/config/file_manager.py

@@ -131,7 +131,7 @@ def write(document: dict, filepath: Path):
         toml_document = TomlFileManager._to_toml(document)
 
         if toml_document.get(COMMENT_KEY, None):  # Remove dunder comments that may be residue from other formats
-            toml_document.add(tomlkit.comment(toml_document[COMMENT_KEY]))
+            toml_document.add(tomlkit.comment(toml_document.get(COMMENT_KEY, "")))
             toml_document.pop(COMMENT_KEY)
 
         filepath.write_text(tomlkit.dumps(toml_document))