Merge pull request juju#13074 from hpidcock/fix-lxd-remotes

juju#13074 This change fixes lxd cloud and credential discovery with snap lxd. It also fixes credential discovery/matching for builtin lxd clouds. ## QA steps Test localhost/lxd bootstrap ``` snap install lxd juju bootstrap localhost # and lxd ``` Test bootstrapping remote cluster ``` lxc remote add mylxd 10.10.10.10 juju clouds # should show mylxd as a builtin lxd cloud juju bootstrap mylxd ``` ## Documentation changes Updates required to lxd documentation. ## Bug reference N/A
sdg0919 · Jun 16, 2021 · 81b7632 · 81b7632
2 parents 211efbc + 8a61933
commit 81b7632
Show file tree

Hide file tree

Showing 54 changed files with 1,097 additions and 755 deletions.
diff --git a/caas/kubernetes/provider/credentials.go b/caas/kubernetes/provider/credentials.go
@@ -33,7 +33,7 @@ func (environProviderCredentials) CredentialSchemas() map[cloud.AuthType]cloud.C
 }
 
 // DetectCredentials is part of the environs.ProviderCredentials interface.
-func (environProviderCredentials) DetectCredentials() (*cloud.CloudCredential, error) {
+func (environProviderCredentials) DetectCredentials(cloudName string) (*cloud.CloudCredential, error) {
 	clientConfigFunc, err := clientconfig.NewClientConfigReader(constants.CAASProviderType)
 	if err != nil {
 		return nil, errors.Trace(err)

diff --git a/caas/kubernetes/provider/credentials_test.go b/caas/kubernetes/provider/credentials_test.go
@@ -81,7 +81,7 @@ func (s *credentialsSuite) TestDetectCredentials(c *gc.C) {
 		Name: "config",
 		Data: singleConfigYAML,
 	})
-	creds, err := s.provider.DetectCredentials()
+	creds, err := s.provider.DetectCredentials("")
 	c.Assert(err, jc.ErrorIsNil)
 	c.Assert(creds.DefaultRegion, gc.Equals, "")
 	expected := cloud.NewNamedCredential(

diff --git a/cmd/juju/cloud/detectcredentials.go b/cmd/juju/cloud/detectcredentials.go
@@ -252,7 +252,7 @@ func (c *detectCredentialsCommand) Run(ctxt *cmd.Context) error {
 			continue
 		}
 		if detectCredentials, ok := provider.(environs.ProviderCredentials); ok {
-			detected, err := detectCredentials.DetectCredentials()
+			detected, err := detectCredentials.DetectCredentials("")
 			if err != nil && !errors.IsNotFound(err) {
 				logger.Errorf("could not detect credentials for provider %q: %v", providerName, err)
 				continue

diff --git a/cmd/juju/cloud/detectcredentials_test.go b/cmd/juju/cloud/detectcredentials_test.go
@@ -40,7 +40,7 @@ type mockProvider struct {
 	credSchemas   *map[jujucloud.AuthType]jujucloud.CredentialSchema
 }
 
-func (p *mockProvider) DetectCredentials() (*jujucloud.CloudCredential, error) {
+func (p *mockProvider) DetectCredentials(cloudName string) (*jujucloud.CloudCredential, error) {
 	if len(p.detectedCreds.AuthCredentials) == 0 {
 		return nil, errors.NotFoundf("credentials")
 	}

diff --git a/cmd/juju/commands/bootstrap_test.go b/cmd/juju/commands/bootstrap_test.go
@@ -2384,7 +2384,7 @@ func (noCredentialsProvider) DetectRegions() ([]cloud.Region, error) {
 	return []cloud.Region{{Name: "region"}}, nil
 }
 
-func (noCredentialsProvider) DetectCredentials() (*cloud.CloudCredential, error) {
+func (noCredentialsProvider) DetectCredentials(cloudName string) (*cloud.CloudCredential, error) {
 	return nil, errors.NotFoundf("credentials")
 }
 
@@ -2400,7 +2400,7 @@ func (manyCredentialsProvider) DetectRegions() ([]cloud.Region, error) {
 	return []cloud.Region{{Name: "region"}}, nil
 }
 
-func (manyCredentialsProvider) DetectCredentials() (*cloud.CloudCredential, error) {
+func (manyCredentialsProvider) DetectCredentials(cloudName string) (*cloud.CloudCredential, error) {
 	return &cloud.CloudCredential{
 		AuthCredentials: map[string]cloud.Credential{
 			"one": cloud.NewCredential("one", nil),
@@ -2426,7 +2426,7 @@ func (f fileCredentialProvider) DetectRegions() ([]cloud.Region, error) {
 	return []cloud.Region{{Name: "region"}}, nil
 }
 
-func (f fileCredentialProvider) DetectCredentials() (*cloud.CloudCredential, error) {
+func (f fileCredentialProvider) DetectCredentials(cloudName string) (*cloud.CloudCredential, error) {
 	credential := cloud.NewCredential(cloud.JSONFileAuthType,
 		map[string]string{"file": f.testFileName})
 	cc := &cloud.CloudCredential{AuthCredentials: map[string]cloud.Credential{

diff --git a/cmd/juju/common/cloudprovider_mock_test.go b/cmd/juju/common/cloudprovider_mock_test.go
diff --git a/cmd/juju/common/credentialstore_mock_test.go b/cmd/juju/common/credentialstore_mock_test.go
diff --git a/cmd/juju/controller/addmodel_test.go b/cmd/juju/controller/addmodel_test.go
@@ -791,7 +791,7 @@ type fakeProvider struct {
 	detected *cloud.CloudCredential
 }
 
-func (p *fakeProvider) DetectCredentials() (*cloud.CloudCredential, error) {
+func (p *fakeProvider) DetectCredentials(cloudName string) (*cloud.CloudCredential, error) {
 	p.MethodCall(p, "DetectCredentials")
 	return p.detected, p.NextErr()
 }

diff --git a/cmd/modelcmd/base_test.go b/cmd/modelcmd/base_test.go
@@ -252,7 +252,7 @@ type mockEnvironProvider struct {
 	environs.EnvironProvider
 }
 
-func (p *mockEnvironProvider) DetectCredentials() (*cloud.CloudCredential, error) {
+func (p *mockEnvironProvider) DetectCredentials(cloudName string) (*cloud.CloudCredential, error) {
 	return cloud.NewEmptyCloudCredential(), nil
 }