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

Hotfix prod: Make dcp43 default and delete project snapshot cdabcf0b (#6658, #6664) #6659

Merged
merged 2 commits into from
Oct 30, 2024

Conversation

dsotirho-ucsc
Copy link
Contributor

@dsotirho-ucsc dsotirho-ucsc commented Oct 25, 2024

Connected issue: #6658, #6664

Note:

  • Manually deindex the dcp42 and dcp42-it catalogs from the prod deployment
  • Manually deindex snapshot for project cdabcf0b

Checklist

Author

  • Target branch is prod
  • Name of PR branch matches hotfixes/<GitHub handle of author>/<issue#>-<slug>-prod
  • On ZenHub, PR is connected to the issue it hotfixes
  • PR description links to connected issue
  • PR title is Hotfix prod: followed by title of connected issue
  • PR title references the connected issue

Author (hotfixes)

  • Added h tag to commit title or this PR does not include a temporary hotfix
  • Added H tag to commit title or this PR does not include a permanent hotfix
  • Added hotfix label to PR
  • This PR is labeled partial or represents a permanent hotfix

Author (before every review)

  • Rebased PR branch on prod, squashed old fixups
  • Ran make requirements_update or this PR does not modify requirements*.txt, common.mk, Makefile and Dockerfile
  • Added R tag to commit title or this PR does not modify requirements*.txt
  • This PR is labeled reqs or does not modify requirements*.txt

System administrator (after approval)

  • Actually approved the PR
  • Labeled PR as no sandbox
  • A comment to this PR details the completed security design review
  • PR title is appropriate as title of merge commit
  • Moved connected issue to Approved column
  • PR is assigned to only the operator

Operator (before pushing merge the commit)

  • Squashed PR branch and rebased onto prod
  • Sanity-checked history
  • Pushed PR branch to GitHub
  • The title of the merge commit starts with the title of this PR
  • Added PR # reference to merge commit title
  • Collected commit title tags in merge commit title but excluded any p tags
  • Moved connected issue to Merged stable column in ZenHub
  • Pushed merge commit to GitHub

Operator (after pushing the merge commit)

  • Pushed merge commit to GitLab prod
  • Build passes on GitLab prod
  • Reviewed build logs for anomalies on GitLab prod
  • Deleted PR branch from GitHub

Operator (reindex)

  • Deindexed all unreferenced catalogs in prod or this PR is neither labeled reindex:partial nor reindex:prod
  • Deindexed specific sources in prod or this PR is neither labeled reindex:partial nor reindex:prod
  • Indexed specific sources in prod or this PR is neither labeled reindex:partial nor reindex:prod
  • Started reindex in prod or neither this PR nor a failed, prior promotion requires it
  • Checked for, triaged and possibly requeued messages in both fail queues in prod or neither this PR nor a failed, prior promotion requires it
  • Emptied fail queues in prod or neither this PR nor a failed, prior promotion requires it
  • Created backport PR and linked to it in a comment on this PR

Operator

  • PR is assigned to no one

Shorthand for review comments

  • L line is too long
  • W line wrapping is wrong
  • Q bad quotes
  • F other formatting problem

@dsotirho-ucsc dsotirho-ucsc added partial [process] PR is does not completely resolve associated ticket hotfix [process] An PR with an urgent fix for prod reindex:prod [process] PR requires reindexing prod reindex:partial [process] PR allows for (de)indexing a specific source or catalog labels Oct 25, 2024
@github-actions github-actions bot added the orange [process] Done by the Azul team label Oct 25, 2024
Copy link

codecov bot commented Oct 25, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 85.34%. Comparing base (cb2393a) to head (60e5f4c).
Report is 3 commits behind head on prod.

Additional details and impacted files
@@            Coverage Diff             @@
##             prod    #6659      +/-   ##
==========================================
- Coverage   85.36%   85.34%   -0.03%     
==========================================
  Files         155      155              
  Lines       20770    20785      +15     
==========================================
+ Hits        17731    17739       +8     
- Misses       3039     3046       +7     

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@coveralls
Copy link

coveralls commented Oct 25, 2024

Coverage Status

coverage: 85.363%. remained the same
when pulling 60e5f4c on hotfixes/dsotirho-ucsc/6658-default-catalog-dcp43
into ccc785f on develop.

@achave11-ucsc achave11-ucsc force-pushed the hotfixes/dsotirho-ucsc/6658-default-catalog-dcp43 branch from 0867f7c to 60e5f4c Compare October 29, 2024 16:43
@achave11-ucsc achave11-ucsc changed the title Hotfix prod: Make dcp43 the default catalog on prod (#6658) Hotfix prod: Make dcp43 default and delete snapshot cdabcf0b in prod (#6658, #6664) Oct 29, 2024
@achave11-ucsc achave11-ucsc changed the title Hotfix prod: Make dcp43 default and delete snapshot cdabcf0b in prod (#6658, #6664) Hotfix prod: Make dcp43 default and delete project snapshot cdabcf0b (#6658, #6664) Oct 29, 2024
@achave11-ucsc achave11-ucsc removed the partial [process] PR is does not completely resolve associated ticket label Oct 29, 2024
@achave11-ucsc achave11-ucsc changed the base branch from develop to prod October 29, 2024 17:29
@hannes-ucsc hannes-ucsc added the no sandbox [process] PR will not be tested in the sandbox label Oct 29, 2024
@hannes-ucsc
Copy link
Member

Security design review

  • Security design review completed; this PR does not
    • … affect authentication; for example:
      • OAuth 2.0 with the application (API or Swagger UI)
      • Authentication of developers with Google Cloud APIs
      • Authentication of developers with AWS APIs
      • Authentication with a GitLab instance in the system
      • Password and 2FA authentication with GitHub
      • API access token authentication with GitHub
      • Authentication with Terra
    • … affect the permissions of internal users like access to
      • Cloud resources on AWS and GCP
      • GitLab repositories, projects and groups, administration
      • an EC2 instance via SSH
      • GitHub issues, pull requests, commits, commit statuses, wikis, repositories, organizations
    • … affect the permissions of external users like access to
      • TDR snapshots
    • … affect permissions of service or bot accounts
      • Cloud resources on AWS and GCP
    • … affect audit logging in the system, like
      • adding, removing or changing a log message that represents an auditable event
      • changing the routing of log messages through the system
    • … affect monitoring of the system
    • … introduce a new software dependency like
      • Python packages on PYPI
      • Command-line utilities
      • Docker images
      • Terraform providers
    • … add an interface that exposes sensitive or confidential data at the security boundary
    • … affect the encryption of data at rest
    • … require persistence of sensitive or confidential data that might require encryption at rest
    • … require unencrypted transmission of data within the security boundary
    • … affect the network security layer; for example by
      • modifying, adding or removing firewall rules
      • modifying, adding or removing security groups
      • changing or adding a port a service, proxy or load balancer listens on
  • Documentation on any unchecked boxes is provided in comments below

@achave11-ucsc achave11-ucsc merged commit a9d2087 into prod Oct 30, 2024
9 checks passed
@achave11-ucsc achave11-ucsc deleted the hotfixes/dsotirho-ucsc/6658-default-catalog-dcp43 branch October 30, 2024 06:56
@achave11-ucsc
Copy link
Member

achave11-ucsc commented Oct 30, 2024

This caused a regression in the Browser, the default catalog in said repository wasn't bumped to dcp43.

So the previous successful deploy job (prior to introducing the regression) in the GitLab instance was re-ran to resolve the problem, I'm glad I checked, prior to deleting the dcp42 indicies.

@hannes-ucsc
Copy link
Member

I'm glad you caught this. I think the Data Browser has yet to be updated to change the default catalog to dcp43. Let's discuss next steps in PL.

@achave11-ucsc
Copy link
Member

Backport PR: #6655

@achave11-ucsc achave11-ucsc removed their assignment Nov 5, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
hotfix [process] An PR with an urgent fix for prod no sandbox [process] PR will not be tested in the sandbox orange [process] Done by the Azul team reindex:partial [process] PR allows for (de)indexing a specific source or catalog reindex:prod [process] PR requires reindexing prod
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants