[master] refactor: issue #65604 #65605
Conversation
|
Hi there! Welcome to the Salt Community! Thank you for making your first contribution. We have a lengthy process for issues and PRs. Someone from the Core Team will follow up as soon as possible. In the meantime, here’s some information that may help as you continue your Salt journey.
There are lots of ways to get involved in our community. Every month, there are around a dozen opportunities to meet with other contributors and the Salt Core team and collaborate in real time. The best way to keep track is by subscribing to the Salt Community Events Calendar. |
salt-project-bot-prod-environment
bot
changed the title
|
There's many more instances that should be replaced: $ rg -l datetime.utcnow
setup.py
salt/state.py
salt/client/ssh/__init__.py
salt/modules/win_timezone.py
salt/modules/vsphere.py
salt/beacons/status.py
salt/modules/x509_v2.py
salt/modules/purefb.py
salt/modules/tls.py
salt/modules/x509.py
salt/modules/inspectlib/fsdb.py
salt/modules/system.py
salt/modules/purefa.py
salt/grains/core.py
salt/states/boto_iot.py
salt/states/boto_dynamodb.py
salt/states/x509_v2.py
salt/states/github.py
salt/cloud/clouds/ec2.py
salt/cloud/clouds/joyent.py
salt/utils/aws.py
salt/utils/versions.py
salt/utils/jid.py
salt/utils/x509.py
salt/utils/timeutil.py
salt/utils/event.py
salt/spm/pkgdb/sqlite3.py
tests/pytests/unit/utils/test_aws.py
tests/pytests/functional/modules/test_system.py
tests/unit/modules/test_x509.py
tests/unit/test_fileserver.py
tools/pkg/repo/create.py
tools/changelog.py
tools/utils/repo.py
tools/vm.py |
…() with datetime.now(tz=timezone.utc) Update imports to accomodate this change Resolves issue saltstack#65604
…e.utcnow() with datetime.now(tz=timezone.utc)" This reverts commit 92940db.
|
My apologies, I've realised flaw of my approach - hence the revert. I will update soon. |
…() with datetime.now(tz=timezone.utc) Update imports to accomodate this change Resolves issue saltstack#65604
|
I'm confident this is now done correctly. Thank You for Your time to review my commit. |
|
@azuro0092 Looks like there are conflicts again. Pre-commit and lint also failed. |
|
It seems a lot of the Pre-Commit failures are not related to the changes: - data = __salt__["status.{}".format(func)]()
+ data = __salt__[f"status.{func}"]()Oddly enough, the style-guides that I've found (SaltStack and linked Google guides) show |
| @@ -1374,7 +1374,7 @@ def expires(certificate, days=0): | |||
| """ | |||
| cert = x509util.load_cert(certificate) | |||
| # dates are encoded in UTC/GMT, they are returned as a naive datetime object | |||
| return cert.not_valid_after <= datetime.datetime.utcnow() + datetime.timedelta( | |||
| return cert.not_valid_after <= datetime.now(tz=timezone.utc) + timedelta( | |||
There was a problem hiding this comment.
This will fail because cryptography returns naive datetimes. They should be converted to UTC. Once there is a release with pyca/cryptography#9186, this should be updated to try to use the new endpoints, otherwise fallback to the old one with the mentioned fix.
What does this PR do?
replace deprecated datetime.utcnow() with datetime.now(tz=timezone.utc)
What issues does this PR fix or reference?
Fixes: #65604
Commits signed with GPG?
No
Self comment:
This is my first issue working on someone else's repo. Althou trivial I hope I've followed correct procedure.