Merge pull request #11304 from howbazaar/2.7-charm-profile

#11304 The 2.7.3 release changed where the instance mutator got its lxd profile from, but did not guard against a nil struct return which old charms will have.
juju · Mar 10, 2020 · 6d3cc3c · 6d3cc3c
2 parents 52a7a9c + be8d130
commit 6d3cc3c
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/apiserver/facades/agent/instancemutater/shim.go b/apiserver/facades/agent/instancemutater/shim.go
@@ -90,6 +90,9 @@ type charmShim struct {
 
 func (s *charmShim) LXDProfile() lxdprofile.Profile {
 	profile := s.Charm.LXDProfile()
+	if profile == nil {
+		return lxdprofile.Profile{}
+	}
 	return lxdprofile.Profile{
 		Config:      profile.Config,
 		Description: profile.Description,