Explorar o código

Renamed Login method specific to tests, to make things more explicit

Guillaume Tardif %!s(int64=5) %!d(string=hai) anos
pai
achega
2268f0c598
Modificáronse 2 ficheiros con 4 adicións e 4 borrados
  1. 3 2
      azure/login/login.go
  2. 1 2
      tests/aci-e2e/e2e-aci_test.go

+ 3 - 2
azure/login/login.go

@@ -94,8 +94,9 @@ func newAzureLoginServiceFromPath(tokenStorePath string, helper apiHelper) (Azur
 	}, nil
 }
 
-// LoginFromServicePrincipal login with clientId / clientSecret from a previously created service principal
-func (login AzureLoginService) LoginFromServicePrincipal(clientID string, clientSecret string, tenantID string) error {
+// TestLoginFromServicePrincipal login with clientId / clientSecret from a previously created service principal.
+// The resulting token does not include a refresh token, used for tests only
+func (login AzureLoginService) TestLoginFromServicePrincipal(clientID string, clientSecret string, tenantID string) error {
 	// Tried with auth2.NewUsernamePasswordConfig() but could not make this work with username / password, setting this for CI with clientID / clientSecret
 	creds := auth2.NewClientCredentialsConfig(clientID, clientSecret, tenantID)
 

+ 1 - 2
tests/aci-e2e/e2e-aci_test.go

@@ -71,7 +71,6 @@ func (s *E2eACISuite) TestContextDefault() {
 }
 
 func (s *E2eACISuite) TestACIBackend() {
-
 	It("Logs in azure using service principal credentials", func() {
 		login, err := login.NewAzureLoginService()
 		Expect(err).To(BeNil())
@@ -79,7 +78,7 @@ func (s *E2eACISuite) TestACIBackend() {
 		clientID := os.Getenv("AZURE_CLIENT_ID")
 		clientSecret := os.Getenv("AZURE_CLIENT_SECRET")
 		tenantID := os.Getenv("AZURE_TENANT_ID")
-		err = login.LoginFromServicePrincipal(clientID, clientSecret, tenantID)
+		err = login.TestLoginFromServicePrincipal(clientID, clientSecret, tenantID)
 		Expect(err).To(BeNil())
 	})