Implement executive order M-21-31 (#6070) #6900
Open
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
dsotirho-ucsc
added
the
deploy:shared
dsotirho-ucsc
force-pushed
the
issues/dsotirho-ucsc/6070-log-durations-3
branch
3 times, most recently
from
c8ae3d0 to
da38dea
Compare
Codecov ReportAll modified and coverable lines are covered by tests ✅
Additional details and impacted files@@ Coverage Diff @@
## develop #6900 +/- ##
========================================
Coverage 85.68% 85.68%
========================================
Files 148 148
Lines 21562 21562
========================================
Hits 18475 18475
Misses 3087 3087 ☔ View full report in Codecov by Sentry. 🚀 New features to boost your workflow:
|
dsotirho-ucsc
force-pushed
the
issues/dsotirho-ucsc/6070-log-durations-3
branch
2 times, most recently
from
0fcfb0d to
cb3f959
Compare
![github-advanced-security[bot]](https://avatars.githubusercontent.com/in/57789?s=60&v=4){kind=small}
dsotirho-ucsc
force-pushed
the
issues/dsotirho-ucsc/6070-log-durations-3
branch
9 times, most recently
from
3f0dfeb to
4dddcfa
Compare
|
|
achave11-ucsc
requested changes
Feb 22, 2025
There was a problem hiding this comment.
Changes look good, a pair of considerations + CL item unchecked.
- The FIXMEs might be more distinguishable if they stand alone as commits, your call.
- Something in the import script indiscriminately tries to run the Terraform import command on a log group that exists (for an old and now non-existent Lambda) but isn't managed by Terraform. Perhaps as intended?
2025-02-21 15:36:11,921 INFO MainThread azul.terraform: Running ['terraform', 'import', 'aws_cloudwatch_log_group.indexer_contribute_redrive_lambda', '/aws/lambda/azul-indexer-abrahamsc-contribute_redrive'] Error: resource address "aws_cloudwatch_log_group.indexer_contribute_redrive_lambda" does not exist in the configuration. Before importing this resource, please create its configuration in the root module. For example: resource "aws_cloudwatch_log_group" "indexer_contribute_redrive_lambda" { # (resource arguments) } Traceback (most recent call last): File "/Users/achave11/Pycharm/Azul/azul.sc/scripts/import_cloudwatch_log_groups.py", line 78, in <module> main() File "/Users/achave11/Pycharm/Azul/azul.sc/scripts/import_cloudwatch_log_groups.py", line 73, in main terraform.run('import', resource_name, log_group) File "/Users/achave11/Pycharm/Azul/azul.sc/src/azul/terraform.py", line 101, in run cmd = subprocess.run(args, ^^^^^^^^^^^^^^^^^^^^ File "/Users/achave11/.pyenv/versions/3.12.8/lib/python3.12/subprocess.py", line 571, in run raise CalledProcessError(retcode, process.args, subprocess.CalledProcessError: Command '['terraform', 'import', 'aws_cloudwatch_log_group.indexer_contribute_redrive_lambda', '/aws/lambda/azul-indexer-abrahamsc-contribute_redrive']' returned non-zero exit status 1. make: *** [import_resources] Error 1 - I noticed the changes and IT (from provided logs) were tested on the
tempdevdeployment, was this also tested in a personal deployment?
dsotirho-ucsc
force-pushed
the
issues/dsotirho-ucsc/6070-log-durations-3
branch
from
4dddcfa to
2fa8f70
Compare
Commits separated.
Not as intended. Thank you for catching this. I've reworked the import script to only import the intended resources.
Previously only on |
Deploy to tempdev.sharedNote import of Redeploy to tempdev.sharedNote skipped import of Deploy to tempdevNote rename and import of aws_cloudwatch_log_groups. Also note that the import was skipped for log groups that do not exist (yet) on tempdev. Redeploy to tempdevNote skipped import of aws_cloudwatch_log_group resources Deploy to daniel.localRedeploy to daniel.local |
Deploy tempdev.sharedRedeploy tempdev.sharedDeploy tempdevRedploy tempdevDeploy to personal deploymentRedeploy to personal deployment |
hannes-ucsc
requested changes
Mar 1, 2025
| with open(tf_path, 'r') as f: | ||
| tf_json = json.load(f) | ||
| for resources in tf_json['resource']: | ||
| resource_type = one(list(resources.keys())) |
| for resources in tf_json['resource']: | ||
| resource_type = one(list(resources.keys())) | ||
| if resource_type == 'aws_lambda_function': | ||
| for resource in resources[resource_type]: |
There was a problem hiding this comment.
Avoid the lookup by using one(….items()) and tuple assignment
Comment on lines
73
to
77
| log.info('Skipping import of %r, resource already imported.', resource_name) | ||
| elif log_group not in existing_log_groups: | ||
| log.info('Skipping import of %r, resource does not exist.', resource_name) | ||
| else: | ||
| log.info('Importing resource %r.', resource_name) |
There was a problem hiding this comment.
Suggested change
| log.info('Skipping import of %r, resource already imported.', resource_name) | |
| elif log_group not in existing_log_groups: | |
| log.info('Skipping import of %r, resource does not exist.', resource_name) | |
| else: | |
| log.info('Importing resource %r.', resource_name) | |
| log.info('Skipping import of %r, resource already imported', resource_name) | |
| elif log_group not in existing_log_groups: | |
| log.info('Skipping import of %r, resource does not exist', resource_name) | |
| else: | |
| log.info('Importing resource %r', resource_name) |
See contributing guide, under logging.
hannes-ucsc
added
2 reviews
dsotirho-ucsc
force-pushed
the
issues/dsotirho-ucsc/6070-log-durations-3
branch
from
6038d3e to
1cd7641
Compare
nadove-ucsc
requested changes
Mar 5, 2025
dsotirho-ucsc
force-pushed
the
issues/dsotirho-ucsc/6070-log-durations-3
branch
from
1cd7641 to
2529e55
Compare
nadove-ucsc
approved these changes
Mar 5, 2025
There was a problem hiding this comment.
LGTM but I'd like to wait for @hannes-ucsc's review before merging
nadove-ucsc
added
the
hold warm
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Connected issues: #6070
Checklist
Author
developissues/<GitHub handle of author>/<issue#>-<slug>1 when the issue title describes a problem, the corresponding PR
title is
Fix:followed by the issue titleAuthor (partiality)
ptag to titles of partial commitspartialor completely resolves all connected issuespartiallabelAuthor (chains)
baseor this PR is not chained to another PRchainedor is not chained to another PRAuthor (reindex, API changes)
rtag to commit title or the changes introduced by this PR will not require reindexing of any deploymentreindex:devor the changes introduced by it will not require reindexing ofdevreindex:anvildevor the changes introduced by it will not require reindexing ofanvildevreindex:anvilprodor the changes introduced by it will not require reindexing ofanvilprodreindex:prodor the changes introduced by it will not require reindexing ofprodreindex:partialand its description documents the specific reindexing procedure fordev,anvildev,anvilprodandprodor requires a full reindex or carries none of the labelsreindex:dev,reindex:anvildev,reindex:anvilprodandreindex:prodAPIor this PR does not modify a REST APIa(A) tag to commit title for backwards (in)compatible changes or this PR does not modify a REST APIapp.pyor this PR does not modify a REST APIAuthor (upgrading deployments)
make docker_images.jsonand committed the resulting changes or this PR does not modifyazul_docker_images, or any other variables referenced in the definition of that variableutag to commit title or this PR does not require upgrading deploymentsupgradeor does not require upgrading deploymentsdeploy:sharedor does not modifydocker_images.json, and does not require deploying thesharedcomponent for any other reasondeploy:gitlabor does not require deploying thegitlabcomponentdeploy:runneror does not require deploying therunnerimageAuthor (hotfixes)
Ftag to main commit title or this PR does not include permanent fix for a temporary hotfixanvilprodandprod) have temporary hotfixes for any of the issues connected to this PRAuthor (before every review)
develop, squashed old fixupsmake requirements_updateor this PR does not modifyrequirements*.txt,common.mk,MakefileandDockerfileRtag to commit title or this PR does not modifyrequirements*.txtreqsor does not modifyrequirements*.txtmake integration_testpasses in personal deployment or this PR does not modify functionality that could affect the IT outcomePeer reviewer (after approval)
System administrator (after approval)
demoorno demono demono sandboxN reviewslabel is accurateOperator (before pushing merge the commit)
reindex:…labels andrcommit title tagno demodevelop_select dev.shared && CI_COMMIT_REF_NAME=develop make -C terraform/shared apply_keep_unusedor this PR is not labeleddeploy:shared_select dev.gitlab && CI_COMMIT_REF_NAME=develop make -C terraform/gitlab applyor this PR is not labeleddeploy:gitlab_select anvildev.shared && CI_COMMIT_REF_NAME=develop make -C terraform/shared apply_keep_unusedor this PR is not labeleddeploy:shared_select anvildev.gitlab && CI_COMMIT_REF_NAME=develop make -C terraform/gitlab applyor this PR is not labeleddeploy:gitlabdeploy:gitlabdeploy:gitlabSystem administrator
dev.gitlabare complete or this PR is not labeleddeploy:gitlabanvildev.gitlabare complete or this PR is not labeleddeploy:gitlabOperator (before pushing merge the commit)
_select dev.gitlab && make -C terraform/gitlab/runneror this PR is not labeleddeploy:runner_select anvildev.gitlab && make -C terraform/gitlab/runneror this PR is not labeleddeploy:runnersandboxlabel or PR is labeledno sandboxdevor PR is labeledno sandboxanvildevor PR is labeledno sandboxsandboxdeployment or PR is labeledno sandboxanvilboxdeployment or PR is labeledno sandboxsandboxdeployment or PR is labeledno sandboxanvilboxdeployment or PR is labeledno sandboxsandboxor this PR does not remove catalogs or otherwise causes unreferenced indices indevanvilboxor this PR does not remove catalogs or otherwise causes unreferenced indices inanvildevsandboxor this PR is not labeledreindex:devanvilboxor this PR is not labeledreindex:anvildevsandboxor this PR is not labeledreindex:devanvilboxor this PR is not labeledreindex:anvildevpif the PR is also labeledpartialOperator (chain shortening)
developor this PR is not labeledbasechainedlabel from the blocked PR or this PR is not labeledbasebasebaselabel from this PR or this PR is not labeledbaseOperator (after pushing the merge commit)
devanvildevdevdevanvildevanvildev_select dev.shared && make -C terraform/shared applyor this PR is not labeleddeploy:shared_select anvildev.shared && make -C terraform/shared applyor this PR is not labeleddeploy:shareddevanvildevOperator (reindex)
devor this PR is neither labeledreindex:partialnorreindex:devanvildevor this PR is neither labeledreindex:partialnorreindex:anvildevdevor this PR is neither labeledreindex:partialnorreindex:devanvildevor this PR is neither labeledreindex:partialnorreindex:anvildevdevor this PR is neither labeledreindex:partialnorreindex:devanvildevor this PR is neither labeledreindex:partialnorreindex:anvildevdevor this PR does not require reindexingdevanvildevor this PR does not require reindexinganvildevdevor this PR does not require reindexingdevanvildevor this PR does not require reindexinganvildevdevor this PR does not require reindexingdevanvildevor this PR does not require reindexinganvildevdevor this PR does not require reindexingdevdevor this PR does not require reindexingdevdeploy_browserjob in the GitLab pipeline for this PR indevor this PR does not require reindexingdevanvildevor this PR does not require reindexinganvildevdeploy_browserjob in the GitLab pipeline for this PR inanvildevor this PR does not require reindexinganvildevOperator
deploy:shared,deploy:gitlab,deploy:runner,API,reindex:partial,reindex:anvilprodandreindex:prodlabels to the next promotion PRs or this PR carries none of these labelsdeploy:shared,deploy:gitlab,deploy:runner,API,reindex:partial,reindex:anvilprodandreindex:prodlabels, from the description of this PR to that of the next promotion PRs or this PR carries none of these labelsShorthand for review comments
Lline is too longWline wrapping is wrongQbad quotesFother formatting problem