Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Revert to last know good docker build #668

Open
wants to merge 27 commits into
base: bkou_revert2
Choose a base branch
from
Open
Changes from 1 commit
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
a80713c
GSE-3635: Fix AWSIC logging and status=408 errors (#664)
sfc-gh-afedorov May 14, 2024
a66a817
Update base image to Python 3.8 on Debian bookworm (#665)
sfc-gh-afedorov May 15, 2024
473d573
Revert "Update base image to Python 3.8 on Debian bookworm (#665)" (#…
sfc-gh-gtan May 15, 2024
b7b5126
Revert "GSE-3635: Fix AWSIC logging and status=408 errors (#664)" (#666)
sfc-gh-gtan May 15, 2024
88394be
Update README.md (#669)
sfc-gh-gtan May 15, 2024
3b78ee1
Update Python and pip dependencies & fix tests (#670)
sfc-gh-afedorov May 16, 2024
60b6bd2
[GSE-4024] Tag image with commit SHA after build, and push to reposit…
sfc-gh-gtan May 21, 2024
224a315
missing bash (#672)
sfc-gh-gtan May 21, 2024
f1f0a8f
Reapply "GSE-3635: Fix AWSIC logging and status=408 errors (#664)" (#…
sfc-gh-afedorov Jun 3, 2024
952cbdd
Update Dockerfile.snowalert (#674)
sfc-gh-afedorov Jun 4, 2024
49e91c8
Update Dockerfile.snowalert
sfc-gh-afedorov Jun 4, 2024
90140ea
Bump aioboto3 to 13.0.1
sfc-gh-afedorov Jun 11, 2024
f80416d
Remove iptables Docker installation
sfc-gh-afedorov Jun 12, 2024
6c0d2bd
Move to non-slim Debian
sfc-gh-afedorov Jun 12, 2024
b84705b
Add 5m sleep to Docker file
sfc-gh-afedorov Jun 12, 2024
bad1ab3
Revert "Add 5m sleep to Docker file"
sfc-gh-afedorov Jun 12, 2024
3d883ce
add retry on CredentialRetrievalError
sfc-gh-afedorov Jun 12, 2024
d03de7e
Revert "Move to non-slim Debian"
sfc-gh-afedorov Jun 12, 2024
22daf55
fix retry logic and add log
sfc-gh-afedorov Jun 12, 2024
2ccd242
Update utils.py
sfc-gh-afedorov Jun 12, 2024
8ece469
Update utils.py
sfc-gh-afedorov Jun 12, 2024
b98e37e
Update utils.py
sfc-gh-afedorov Jun 12, 2024
e813aeb
[GSE-4150] Update azure_collect.py to fix `KeyError: 'managedByExtend…
sfc-gh-gtan Jun 17, 2024
1917fea
Reduce AWSIC ingestion speed
sfc-gh-afedorov Jun 25, 2024
ca79c58
Update AWS Collect to reduce batch size
sfc-gh-afedorov Jun 25, 2024
70793e2
Fix AWS Inventory & Configuration Collection (#676)
sfc-gh-afedorov Aug 7, 2024
fee43a5
Move down storage_account_containers
sfc-gh-afedorov Aug 19, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Update utils.py
sfc-gh-afedorov committed Jun 12, 2024
commit 8ece4698e15c1d203b19875c2432a9e5f222b348
10 changes: 6 additions & 4 deletions src/connectors/utils.py
Original file line number Diff line number Diff line change
@@ -92,16 +92,18 @@ def sts_assume_role(src_role_arn, dest_role_arn, dest_external_id=None):


async def aio_sts_assume_role(src_role_arn, dest_role_arn, dest_external_id=None):
for attempt in range(11):
for attempt in range(21):
try:
return await try_aio_sts_assume_role(
src_role_arn, dest_role_arn, dest_external_id
)
except (CredentialRetrievalError, ResponseParserError) as e:
if attempt < 10:
delay = int(1.5**attempt) + random.randint(0, 3)
if attempt < 20:
# attempt 10 has 28.9s wait
# attempt 19 has 597s wait
delay = int(1.4**attempt) + random.randint(0, 3)
await asyncio.sleep(delay)
log.warn('retrying', attempt, 'after', type(e))
log.warn(f'attempt {attempt}: {e}')
else:
raise