зеркало из https://github.com/Azure/ARO-RP.git
Fix the TenantID for AppLens (#9)
* Change to using the environment AppLens tenant ID Add the tenant ID values for the clouds * Remove the blank line Co-authored-by: Nont <nthanonchai@microsoft.com>
This commit is contained in:
Родитель
b9e6f332f5
Коммит
e7c3a0649a
|
@ -61,7 +61,7 @@ func NewAzureActions(log *logrus.Entry, env env.Interface, oc *api.OpenShiftClus
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
|
|
||||||
fpClientCertCred, err := env.FPNewClientCertificateCredential(subscriptionDoc.Subscription.Properties.TenantID)
|
fpClientCertCred, err := env.FPNewClientCertificateCredential(env.Environment().AppLensTenantID)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
|
|
|
@ -19,6 +19,7 @@ type AROEnvironment struct {
|
||||||
AppSuffix string
|
AppSuffix string
|
||||||
AppLensEndpoint string
|
AppLensEndpoint string
|
||||||
AppLensScope string
|
AppLensScope string
|
||||||
|
AppLensTenantID string
|
||||||
azidentity.AuthorityHost
|
azidentity.AuthorityHost
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -31,6 +32,7 @@ var (
|
||||||
AppSuffix: "aro.azure.com",
|
AppSuffix: "aro.azure.com",
|
||||||
AppLensEndpoint: "https://diag-runtimehost-prod.trafficmanager.net/api/invoke",
|
AppLensEndpoint: "https://diag-runtimehost-prod.trafficmanager.net/api/invoke",
|
||||||
AppLensScope: "b9a1efcd-32ee-4330-834c-c04eb00f4b33",
|
AppLensScope: "b9a1efcd-32ee-4330-834c-c04eb00f4b33",
|
||||||
|
AppLensTenantID: "72f988bf-86f1-41af-91ab-2d7cd011db47",
|
||||||
AuthorityHost: azidentity.AzurePublicCloud,
|
AuthorityHost: azidentity.AzurePublicCloud,
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -42,6 +44,7 @@ var (
|
||||||
AppSuffix: "aro.azure.us",
|
AppSuffix: "aro.azure.us",
|
||||||
AppLensEndpoint: "https://diag-runtimehost-prod-bn1-001.azurewebsites.us/api/invoke",
|
AppLensEndpoint: "https://diag-runtimehost-prod-bn1-001.azurewebsites.us/api/invoke",
|
||||||
AppLensScope: "https://microsoft.onmicrosoft.com/runtimehost",
|
AppLensScope: "https://microsoft.onmicrosoft.com/runtimehost",
|
||||||
|
AppLensTenantID: "cab8a31a-1906-4287-a0d8-4eef66b95f6e",
|
||||||
AuthorityHost: azidentity.AzureGovernment,
|
AuthorityHost: azidentity.AzureGovernment,
|
||||||
}
|
}
|
||||||
)
|
)
|
||||||
|
|
Загрузка…
Ссылка в новой задаче