Skip to content

Resolve IoT Analytics merge conflict#10141

Closed
Songblade wants to merge 98 commits intoaws:feature/completion-backfillfrom
Songblade:fix/resolve-merge-conflict
Closed

Resolve IoT Analytics merge conflict#10141
Songblade wants to merge 98 commits intoaws:feature/completion-backfillfrom
Songblade:fix/resolve-merge-conflict

Conversation

@Songblade
Copy link
Copy Markdown

Issue #, if available:

Description of changes: Fixed a merge conflict caused by the removal of IoT Analytics by removing its completion file.

By submitting this pull request, I confirm that you can use, modify, copy, and redistribute this contribution, under the terms of your choice.

* Add backfill digest file validation for CloudTrail validate-logs

* fall back to supported libraries for v2

* Merge branch 'v2' into cloudtrail-validate-logs-backfill-v2 and resolve conflict in validation.py from PR aws#9933

* Add a change log entry to the cloudtrail validate logs backfill support

---------

Co-authored-by: Ian Lee <ianleeyt@amazon.com>
Co-authored-by: Andrew Asseily <nyandrew@amazon.com>
* Set cli_history database file permissions to 0o600

* Set autoprompt history file permissions to 0o600

* Protect WAL/SHM files and improve error messages

* Show warning when history database cannot be opened

* Declutter debug logs
[v2] Remove evidently client following the deprecation of the service
[v2] Remove iotanalytics client following the deprecation of the service
@Songblade Songblade closed this Mar 17, 2026
@Songblade Songblade deleted the fix/resolve-merge-conflict branch March 17, 2026 19:41
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.