-
Notifications
You must be signed in to change notification settings - Fork 25
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'main' into aamgayle/managedBySPCLabels
- Loading branch information
Showing
20 changed files
with
286 additions
and
72 deletions.
There are no files selected for viewing
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
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
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
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
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
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
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
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
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
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
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
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,58 @@ | ||
| package clients | ||
|
|
||
| import ( | ||
| "context" | ||
| "fmt" | ||
| "time" | ||
|
|
||
| "github.com/Azure/aks-app-routing-operator/pkg/util" | ||
| "github.com/Azure/aks-app-routing-operator/testing/e2e/logger" | ||
| "github.com/Azure/azure-sdk-for-go/sdk/azcore/to" | ||
| msgraphsdk "github.com/microsoftgraph/msgraph-sdk-go" | ||
| graphapplications "github.com/microsoftgraph/msgraph-sdk-go/applications" | ||
| graphmodels "github.com/microsoftgraph/msgraph-sdk-go/models" | ||
| ) | ||
|
|
||
| // GetServicePrincipalOptions populates a new ServicePrincipalOptions struct with fresh credentials and application/client/servicePrincipal object ids | ||
| func GetServicePrincipalOptions(ctx context.Context, applicationObjectID string, credName string) (*ServicePrincipal, error) { | ||
| lgr := logger.FromContext(ctx) | ||
| lgr.Info(fmt.Sprintf("getting application with object id %s", applicationObjectID)) | ||
|
|
||
| cred, err := getAzCred() | ||
| scopes := []string{"https://graph.microsoft.com/.default"} | ||
| graphClient, err := msgraphsdk.NewGraphServiceClientWithCredentials(cred, scopes) | ||
| if err != nil { | ||
| return nil, fmt.Errorf("creating graph client: %w", err) | ||
| } | ||
|
|
||
| getAppResponse, err := graphClient.Applications().ByApplicationId(applicationObjectID).Get(ctx, nil) | ||
| if err != nil { | ||
| return nil, fmt.Errorf("getting application with object id %s: %w", applicationObjectID, err) | ||
| } | ||
|
|
||
| // add new password credential | ||
| addPasswordReq := graphapplications.NewItemAddPasswordPostRequestBody() | ||
| newCreds := graphmodels.NewPasswordCredential() | ||
| newCreds.SetDisplayName(util.StringPtr(credName)) | ||
| newCreds.SetEndDateTime(to.Ptr(time.Now().Add(2 * time.Hour))) | ||
| addPasswordReq.SetPasswordCredential(newCreds) | ||
| addPasswordCredResp, err := graphClient.Applications().ByApplicationId(applicationObjectID).AddPassword().Post(ctx, addPasswordReq, nil) | ||
| if err != nil { | ||
| return nil, fmt.Errorf("adding password to application: %w", err) | ||
| } | ||
| lgr.Info(fmt.Sprintf("added password with display name %s: ", *addPasswordCredResp.GetDisplayName())) | ||
|
|
||
| // get service principal object id | ||
| sp, err := graphClient.ServicePrincipalsWithAppId(getAppResponse.GetAppId()).Get(ctx, nil) | ||
| if err != nil { | ||
| return nil, fmt.Errorf("getting service principal: %w", err) | ||
| } | ||
|
|
||
| spOpt := &ServicePrincipal{ | ||
| ApplicationObjectID: *getAppResponse.GetId(), | ||
| ApplicationClientID: *getAppResponse.GetAppId(), | ||
| ServicePrincipalObjectID: *sp.GetId(), | ||
| ServicePrincipalCredPassword: *addPasswordCredResp.GetSecretText(), | ||
| } | ||
| return spOpt, nil | ||
| } |
Oops, something went wrong.