Merge pull request juju#1684 from howbazaar/mess-to-jes

Rename the MESS feature flag. MESS is dead. Long live JES. (Review request: http://reviews.vapour.ws/r/1012/)
zhatin · Feb 25, 2015 · 7d501dc · 7d501dc
2 parents 60e8779 + d9a360c
commit 7d501dc
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git a/api/environmentmanager/environmentmanager_test.go b/api/environmentmanager/environmentmanager_test.go
@@ -37,7 +37,7 @@ func (s *environmentmanagerSuite) OpenAPI(c *gc.C) *environmentmanager.Client {
 }
 
 func (s *environmentmanagerSuite) TestConfigSkeleton(c *gc.C) {
-	s.SetFeatureFlags(feature.MESS)
+	s.SetFeatureFlags(feature.JES)
 	envManager := s.OpenAPI(c)
 	result, err := envManager.ConfigSkeleton("", "")
 	c.Assert(err, jc.ErrorIsNil)
@@ -70,14 +70,14 @@ func (s *environmentmanagerSuite) TestCreateEnvironmentFeatureNotEnabled(c *gc.C
 }
 
 func (s *environmentmanagerSuite) TestCreateEnvironmentMissingConfig(c *gc.C) {
-	s.SetFeatureFlags(feature.MESS)
+	s.SetFeatureFlags(feature.JES)
 	envManager := s.OpenAPI(c)
 	_, err := envManager.CreateEnvironment("owner", nil, nil)
 	c.Assert(err, gc.ErrorMatches, `creating config from values failed: name: expected string, got nothing`)
 }
 
 func (s *environmentmanagerSuite) TestCreateEnvironment(c *gc.C) {
-	s.SetFeatureFlags(feature.MESS)
+	s.SetFeatureFlags(feature.JES)
 	envManager := s.OpenAPI(c)
 	user := s.Factory.MakeUser(c, nil)
 	owner := user.UserTag().Username()
@@ -100,7 +100,7 @@ func (s *environmentmanagerSuite) TestListEnvironmentsBadUser(c *gc.C) {
 }
 
 func (s *environmentmanagerSuite) TestListEnvironments(c *gc.C) {
-	s.SetFeatureFlags(feature.MESS)
+	s.SetFeatureFlags(feature.JES)
 	owner := names.NewUserTag("user@remote")
 	s.Factory.MakeEnvironment(c, &factory.EnvParams{
 		Name: "first", Owner: owner}).Close()

diff --git a/api/facadeversions_test.go b/api/facadeversions_test.go
@@ -23,7 +23,7 @@ var _ = gc.Suite(&facadeVersionSuite{})
 
 func (s *facadeVersionSuite) TestFacadeVersionsMatchServerVersions(c *gc.C) {
 	// Enable feature flags so we can see them all.
-	devFeatures := []string{feature.MESS, feature.Storage}
+	devFeatures := []string{feature.JES, feature.Storage}
 	s.SetFeatureFlags(strings.Join(devFeatures, ","))
 	// The client side code doesn't want to directly import the server side
 	// code just to list out what versions are available. However, we do

diff --git a/apiserver/environmentmanager/environmentmanager.go b/apiserver/environmentmanager/environmentmanager.go
@@ -23,7 +23,7 @@ import (
 var logger = loggo.GetLogger("juju.apiserver.environmentmanager")
 
 func init() {
-	common.RegisterStandardFacadeForFeature("EnvironmentManager", 1, NewEnvironmentManagerAPI, feature.MESS)
+	common.RegisterStandardFacadeForFeature("EnvironmentManager", 1, NewEnvironmentManagerAPI, feature.JES)
 }
 
 // EnvironmentManager defines the methods on the environmentmanager API end

diff --git a/feature/flags.go b/feature/flags.go
@@ -7,9 +7,9 @@ package feature
 // Actions is the name of the feature to enable action commands.
 const Actions = "action"
 
-// MESS stands for Multi-Environment State Server and controls access
+// JES stands for Juju Environment Server and controls access
 // to the apiserver endpoints, api client and CLI commands.
-const MESS = "mess"
+const JES = "jes"
 
 // Storage is the name of the feature to enable storage commands
 // and server-side functionality.