tyler.durden
/
compose
mirror of https://github.com/docker/compose.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #700 from gtardif/aci_constants 

Regroup azure constants that might be things to switch in order to provide access to other azure clouds
This commit is contained in:
Ulysses Souza 2020-10-02 17:19:52 +02:00 committed by GitHub
parent ced0eb3912 b514dafa91
commit 863d8ba7a8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
aci/convert/registry_credentials.go
View File

@ -39,11 +39,10 @@ import (
"github.com/docker/compose-cli/aci/login"
)
// Specific username from ACR docs : https://github.com/Azure/acr/blob/master/docs/AAD-OAuth.md#getting-credentials-programatically
const (
tokenUsername = "00000000-0000-0000-0000-000000000000"
dockerHub = "index.docker.io"
acrRegistrySuffix = ".azurecr.io"
// Specific username from ACR docs : https://github.com/Azure/acr/blob/master/docs/AAD-OAuth.md#getting-credentials-programatically
tokenUsername = "00000000-0000-0000-0000-000000000000"
dockerHub = "index.docker.io"
)
type registryHelper interface {
@ -128,7 +127,7 @@ func getUsedRegistries(project compose.Project) (map[string]bool, []string) {
registry = dockerHub
} else if !strings.Contains(registry, ".") {
registry = dockerHub
} else if strings.HasSuffix(registry, acrRegistrySuffix) {
} else if strings.HasSuffix(registry, login.AcrRegistrySuffix) {
acrRegistries = append(acrRegistries, registry)
}
usedRegistries[registry] = true

2
aci/login/helper.go
View File

@ -49,7 +49,7 @@ type azureAPIHelper struct{}
func (helper azureAPIHelper) getDeviceCodeFlowToken() (adal.Token, error) {
deviceconfig := auth.NewDeviceFlowConfig(clientID, "common")
deviceconfig.Resource = "https://management.core.windows.net/"
deviceconfig.Resource = azureManagementURL
spToken, err := deviceconfig.ServicePrincipalToken()
if err != nil {
return adal.Token{}, err

14
aci/login/login.go
View File

@ -38,12 +38,18 @@ import (
//go login process, derived from code sample provided by MS at https://github.com/devigned/go-az-cli-stuff
const (
authorizeFormat = "https://login.microsoftonline.com/organizations/oauth2/v2.0/authorize?response_type=code&client_id=%s&redirect_uri=%s&state=%s&prompt=select_account&response_mode=query&scope=%s"
tokenEndpoint = "https://login.microsoftonline.com/%s/oauth2/v2.0/token"
getTenantURL = "https://management.azure.com/tenants?api-version=2019-11-01"
// AcrRegistrySuffix suffix for ACR registry images
AcrRegistrySuffix = ".azurecr.io"
activeDirectoryURL = "https://login.microsoftonline.com"
azureManagementURL = "https://management.core.windows.net/"
azureResouceManagementURL = "https://management.azure.com/"
authorizeFormat = activeDirectoryURL + "/organizations/oauth2/v2.0/authorize?response_type=code&client_id=%s&redirect_uri=%s&state=%s&prompt=select_account&response_mode=query&scope=%s"
tokenEndpoint = activeDirectoryURL + "/%s/oauth2/v2.0/token"
getTenantURL = azureResouceManagementURL + "tenants?api-version=2019-11-01"
// scopes for a multi-tenant app works for openid, email, other common scopes, but fails when trying to add a token
// v1 scope like "https://management.azure.com/.default" for ARM access
scopes = "offline_access https://management.azure.com/.default"
scopes = "offline_access " + azureResouceManagementURL + ".default"
clientID = "04b07795-8ddb-461a-bbee-02f9e1bf7b46" // Azure CLI client id
)