Skip to content

feat: Azure KeyVault support #388

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.

Sign up for GitHub

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

Merged
merged 4 commits into from
Oct 16, 2023
Merged

feat: Azure KeyVault support #388

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0815b6a
feat: Azure KeyVault support
migmartri Oct 12, 2023
e66fc39
chore: add tests
migmartri Oct 13, 2023
53cda36
chore: add tests
migmartri Oct 13, 2023
8a11aff
chore: add tests
migmartri Oct 13, 2023
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
6 changes: 6 additions & 0 deletions app/artifact-cas/configs/samples/config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,12 @@ credentials_service:
# project_id: 522312304548
# auth_key: "./configs/gcp_auth_key.json"

# azure_key_vault:
# tenant_id: AD-tenant-id
# client_id: Service Principal ID
# client_secret: Service Principal Secret
# vault_uri: https://myvault.vault.azure.net/

observability:
sentry:
dsn: "http://sentryDomain"
Expand Down
8 changes: 7 additions & 1 deletion app/controlplane/configs/samples/config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,4 +40,10 @@ credentials_service:

# gcp_secret_manager:
# project_id: 522312304548
# auth_key: "./configs/gcp_auth_key.json"
# auth_key: "./configs/gcp_auth_key.json"

# azure_key_vault:
# tenant_id: AD-tenant-id
# client_id: Service Principal ID
# client_secret: Service Principal Secret
# vault_uri: https://myvault.vault.azure.net/
2 changes: 1 addition & 1 deletion app/controlplane/internal/biz/casbackend.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -386,7 +386,7 @@ func (uc *CASBackendUseCase) Delete(ctx context.Context, id string) error {
uc.logger.Infow("msg", "deleting CAS backend external secrets", "ID", id, "secretName", backend.SecretName)
// Delete the secret in the external secrets manager
if err := uc.credsRW.DeleteCredentials(ctx, backend.SecretName); err != nil {
return fmt.Errorf("deleting the credentials: %w", err)
uc.logger.Errorw("msg", "deleting CAS backend external secrets", "ID", id, "secretName", backend.SecretName, "error", err)
}

uc.logger.Infow("msg", "CAS Backend deleted", "ID", id)
Expand Down
17 changes: 7 additions & 10 deletions app/controlplane/internal/biz/organization.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ package biz

import (
"context"
"fmt"
"time"

"github.com/go-kratos/kratos/v2/log"
Expand Down Expand Up @@ -101,18 +102,14 @@ func (uc *OrganizationUseCase) Delete(ctx context.Context, id string) error {
}
}

// Delete the associated repository
// Currently there is only one repository per organization
Copy link
Member Author

Choose a reason for hiding this comment

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

this is a bug we had that affected user offboarding. We only deleted the main cas backend instead all of them.

ociRepository, err := uc.casBackendUseCase.FindDefaultBackend(ctx, org.ID)
if err != nil && !IsNotFound(err) {
return err
backends, err := uc.casBackendUseCase.List(ctx, org.ID)
if err != nil {
return fmt.Errorf("failed to list backends: %w", err)
}

if ociRepository != nil {
// We make sure to call the OCI repository use case to delete the repository
// including the external secret
if err := uc.casBackendUseCase.Delete(ctx, ociRepository.ID.String()); err != nil {
return err
for _, b := range backends {
if err := uc.casBackendUseCase.Delete(ctx, b.ID.String()); err != nil {
return fmt.Errorf("failed to delete backend: %w", err)
}
}

Expand Down
2 changes: 2 additions & 0 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,7 @@ require (
cloud.google.com/go/pubsub v1.33.0 // indirect
dario.cat/mergo v1.0.0 // indirect
github.com/Azure/azure-sdk-for-go/sdk/internal v1.3.0 // indirect
github.com/Azure/azure-sdk-for-go/sdk/keyvault/internal v0.7.1 // indirect
github.com/AzureAD/microsoft-authentication-library-for-go v1.0.0 // indirect
github.com/acomagu/bufpipe v1.0.4 // indirect
github.com/anchore/go-struct-converter v0.0.0-20230627203149-c72ef8859ca9 // indirect
Expand Down Expand Up @@ -123,6 +124,7 @@ require (
cloud.google.com/go/compute v1.23.0 // indirect
cloud.google.com/go/compute/metadata v0.2.3 // indirect
cloud.google.com/go/iam v1.1.2 // indirect
github.com/Azure/azure-sdk-for-go/sdk/keyvault/azsecrets v0.12.0
github.com/Azure/go-ansiterm v0.0.0-20230124172434-306776ec8161 // indirect
github.com/Microsoft/go-winio v0.6.1 // indirect
github.com/ProtonMail/go-crypto v0.0.0-20230828082145-3c4c8a2d2371 // indirect
Expand Down
4 changes: 4 additions & 0 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,10 @@ github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.3.0 h1:vcYCAze6p19qBW7MhZybI
github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.3.0/go.mod h1:OQeznEEkTZ9OrhHJoDD8ZDq51FHgXjqtP9z6bEwBq9U=
github.com/Azure/azure-sdk-for-go/sdk/internal v1.3.0 h1:sXr+ck84g/ZlZUOZiNELInmMgOsuGwdjjVkEIde0OtY=
github.com/Azure/azure-sdk-for-go/sdk/internal v1.3.0/go.mod h1:okt5dMMTOFjX/aovMlrjvvXoPMBVSPzk9185BT0+eZM=
github.com/Azure/azure-sdk-for-go/sdk/keyvault/azsecrets v0.12.0 h1:xnO4sFyG8UH2fElBkcqLTOZsAajvKfnSlgBBW8dXYjw=
github.com/Azure/azure-sdk-for-go/sdk/keyvault/azsecrets v0.12.0/go.mod h1:XD3DIOOVgBCO03OleB1fHjgktVRFxlT++KwKgIOewdM=
github.com/Azure/azure-sdk-for-go/sdk/keyvault/internal v0.7.1 h1:FbH3BbSb4bvGluTesZZ+ttN/MDsnMmQP36OSnDuSXqw=
github.com/Azure/azure-sdk-for-go/sdk/keyvault/internal v0.7.1/go.mod h1:9V2j0jn9jDEkCkv8w/bKTNppX/d0FVA1ud77xCIP4KA=
github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/storage/armstorage v1.2.0 h1:Ma67P/GGprNwsslzEH6+Kb8nybI8jpDTm4Wmzu2ReK8=
github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/storage/armstorage v1.2.0/go.mod h1:c+Lifp3EDEamAkPVzMooRNOK6CZjNSdEnf1A7jsI9u4=
github.com/Azure/azure-sdk-for-go/sdk/security/keyvault/azkeys v1.0.0 h1:yfJe15aSwEQ6Oo6J+gdfdulPNoZ3TEhmbhLIoxZcA+U=
Expand Down
Loading