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

[SM-891] Include Secrets Manager in organization license for self-hosting #3222

Merged
merged 11 commits into from
Oct 16, 2023

Conversation

Thomas-Avery
Copy link
Contributor

Type of change

- [ ] Bug fix
- [X] New feature development
- [ ] Tech debt (refactoring, code cleanup, dependency upgrades, etc)
- [ ] Build/deploy pipeline (DevOps)
- [ ] Other

Objective

The purpose of this PR is to enable Secrets Manager for self-hosting.
This requires adding Secrets Manager properties into the organization license.

Client PR bitwarden/clients#6088

Code changes

  • src/Api/SecretsManager/Controllers/AccessPoliciesController.cs:
    src/Api/SecretsManager/Controllers/ProjectsController.cs:
    src/Api/SecretsManager/Controllers/SecretsController.cs:
    src/Api/SecretsManager/Controllers/SecretsManagerPortingController.cs:
    src/Api/SecretsManager/Controllers/SecretsTrashController.cs:
    src/Api/SecretsManager/Controllers/ServiceAccountsController.cs:
    Removing self-hosted restriction from SM endpoints.

  • src/Core/Entities/Organization.cs:
    Adding Secrets Manager properties in the UpdateFromLicense method.

  • src/Core/Models/Business/OrganizationLicense.cs:
    Adding Secrets Manager properties to the OrganizationLicense.
    Incrementing CURRENT_LICENSE_FILE_VERSION as directed in the summary.
    Updating GetDataBytes method with new version.
    Updating VerifyData method with new version. I noticed version 12 is missing from this method.

  • src/Core/Services/Implementations/OrganizationService.cs:
    Add SM properties in the SignUpAsync method.

Before you submit

  • Please check for formatting errors (dotnet format --verify-no-changes) (required)
  • If making database changes - make sure you also update Entity Framework queries and/or migrations
  • Please add unit tests where it makes sense to do so (encouraged but not required)
  • If this change requires a documentation update - notify the documentation team
  • If this change has particular deployment requirements - notify the DevOps team

@bitwarden-bot
Copy link

bitwarden-bot commented Aug 22, 2023

Logo
Checkmarx One – Scan Summary & Detailsfcca51d2-409f-43ed-a7e8-f18d0a93c6ba

No New Or Fixed Issues Found

@Thomas-Avery Thomas-Avery marked this pull request as ready for review August 23, 2023 15:27
@Thomas-Avery Thomas-Avery requested a review from a team as a code owner August 23, 2023 15:27
@Thomas-Avery Thomas-Avery requested a review from a team August 23, 2023 15:27
Copy link
Contributor

@cturnbull-bitwarden cturnbull-bitwarden left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nice! Looks good to me

Copy link
Contributor

@cd-bitwarden cd-bitwarden left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good 😄

@Thomas-Avery Thomas-Avery requested a review from a team as a code owner October 9, 2023 20:22
Copy link
Contributor

@cturnbull-bitwarden cturnbull-bitwarden left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍 Changes look good! Thanks for taking care of this

@bitwarden-devops-bot bitwarden-devops-bot temporarily deployed to EU-QA Cloud October 16, 2023 16:30 Inactive
@Thomas-Avery Thomas-Avery merged commit 69529d3 into master Oct 16, 2023
40 of 41 checks passed
@Thomas-Avery Thomas-Avery deleted the sm/sm-891 branch October 16, 2023 20:47
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.

5 participants