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.

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

Jump to bottom

Add ability to update tier credentials for Azure service principal ac… #4975

Merged
merged 2 commits into from
Jul 3, 2024
Merged

Add ability to update tier credentials for Azure service principal ac… #4975

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e3be36f
Add ability to update tier credentials for Azure service principal ac…
marktheunissen Jul 3, 2024
fc32a3f
Merge branch 'master' into spazureedit
harshavardhana Jul 3, 2024
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
30 changes: 28 additions & 2 deletions cmd/ilm-tier-edit.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,21 @@ var adminTierEditFlags = []cli.Flag{
Value: "",
Usage: "Azure Blob Storage account key",
},
cli.StringFlag{
Name: "az-sp-tenant-id",
Value: "",
Usage: "Directory ID for the Azure service principal account",
},
cli.StringFlag{
Name: "az-sp-client-id",
Value: "",
Usage: "The client ID of the Azure service principal account",
},
cli.StringFlag{
Name: "az-sp-client-secret",
Value: "",
Usage: "The client secret of the Azure service principal account",
},
cli.StringFlag{
Name: "credentials-file",
Value: "",
Expand Down Expand Up @@ -114,18 +129,29 @@ func mainAdminTierEdit(ctx *cli.Context) error {
var creds madmin.TierCreds
accessKey := ctx.String("access-key")
secretKey := ctx.String("secret-key")
accountKey := ctx.String("account-key")
credsPath := ctx.String("credentials-file")
useAwsRole := ctx.IsSet("use-aws-role")

// Azure, either account-key or one of the 3 service principal flags are required
accountKey := ctx.String("account-key")
azSPTenantID := ctx.String("az-sp-tenant-id")
azSPClientID := ctx.String("az-sp-client-id")
azSPClientSecret := ctx.String("az-sp-client-secret")

switch {
case accessKey != "" && secretKey != "" && !useAwsRole: // S3 tier
creds.AccessKey = accessKey
creds.SecretKey = secretKey
case useAwsRole:
creds.AWSRole = true
case accountKey != "": // Azure tier
case accountKey != "": // Azure tier, account key given
creds.SecretKey = accountKey
case azSPTenantID != "" || azSPClientID != "" || azSPClientSecret != "": // Azure tier, SP creds given
creds.AzSP = madmin.ServicePrincipalAuth{
TenantID: azSPTenantID,
ClientID: azSPClientID,
ClientSecret: azSPClientSecret,
}
case credsPath != "": // GCS tier
credsBytes, e := os.ReadFile(credsPath)
fatalIf(probe.NewError(e), "Unable to read credentials file at %s", credsPath)
Expand Down
Loading