stragglers

analogue · analogue · commit 246fe35a4e2a · 2023-08-18T12:23:24.000-05:00
diff --git a/agent/consul/enterprise_server_ce.go b/agent/consul/enterprise_server_ce.go
@@ -89,7 +89,7 @@ func (s *Server) validateEnterpriseIntentionNamespace(ns string, _ bool) error {
 		return nil
 	}
 
-	// No special handling for wildcard namespaces as they are pointless in OSS.
+	// No special handling for wildcard namespaces as they are pointless in CE.
 
 	return errors.New("Namespaces is a Consul Enterprise feature")
 }
diff --git a/test/integration/consul-container/libs/utils/version.go b/test/integration/consul-container/libs/utils/version.go
@@ -25,7 +25,7 @@ var (
 )
 
 const (
-	DefaultImageNameOSS   = "hashicorp/consul"
+	DefaultImageNameCE    = "hashicorp/consul"
 	DefaultImageNameENT   = "hashicorp/consul-enterprise"
 	ImageVersionSuffixENT = "-ent"
 )
@@ -65,7 +65,7 @@ func TargetImages() topology.Images {
 		}
 	} else {
 		return topology.Images{
-			ConsulOSS: img,
+			ConsulCE: img,
 		}
 	}
 }
diff --git a/testing/deployer/topology/images.go b/testing/deployer/topology/images.go
@@ -9,7 +9,7 @@ import (
 
 type Images struct {
 	Consul           string `json:",omitempty"`
-	ConsulOSS        string `json:",omitempty"`
+	ConsulCE         string `json:",omitempty"`
 	ConsulEnterprise string `json:",omitempty"`
 	Envoy            string
 	Dataplane        string
@@ -85,19 +85,19 @@ func (i Images) ChooseConsul(enterprise bool) Images {
 	if enterprise {
 		i.Consul = i.ConsulEnterprise
 	} else {
-		i.Consul = i.ConsulOSS
+		i.Consul = i.ConsulCE
 	}
 	i.ConsulEnterprise = ""
-	i.ConsulOSS = ""
+	i.ConsulCE = ""
 	return i
 }
 
 func (i Images) OverrideWith(i2 Images) Images {
 	if i2.Consul != "" {
 		i.Consul = i2.Consul
 	}
-	if i2.ConsulOSS != "" {
-		i.ConsulOSS = i2.ConsulOSS
+	if i2.ConsulCE != "" {
+		i.ConsulCE = i2.ConsulCE
 	}
 	if i2.ConsulEnterprise != "" {
 		i.ConsulEnterprise = i2.ConsulEnterprise
@@ -118,7 +118,7 @@ func (i Images) OverrideWith(i2 Images) Images {
 func DefaultImages() Images {
 	return Images{
 		Consul:           "",
-		ConsulOSS:        DefaultConsulImage,
+		ConsulCE:         DefaultConsulImage,
 		ConsulEnterprise: DefaultConsulEnterpriseImage,
 		Envoy:            DefaultEnvoyImage,
 		Dataplane:        DefaultDataplaneImage,

Original file line number	Diff line number	Diff line change
`@@ -89,7 +89,7 @@ func (s *Server) validateEnterpriseIntentionNamespace(ns string, _ bool) error {`
`89`	`89`	`return nil`
`90`	`90`	`}`
`91`	`91`
`92`		`- // No special handling for wildcard namespaces as they are pointless in OSS.`
	`92`	`+ // No special handling for wildcard namespaces as they are pointless in CE.`
`93`	`93`
`94`	`94`	`return errors.New("Namespaces is a Consul Enterprise feature")`
`95`	`95`	`}`
Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ var (`
`25`	`25`	`)`
`26`	`26`
`27`	`27`	`const (`
`28`		`- DefaultImageNameOSS = "hashicorp/consul"`
	`28`	`+ DefaultImageNameCE = "hashicorp/consul"`
`29`	`29`	`DefaultImageNameENT = "hashicorp/consul-enterprise"`
`30`	`30`	`ImageVersionSuffixENT = "-ent"`
`31`	`31`	`)`
`@@ -65,7 +65,7 @@ func TargetImages() topology.Images {`
`65`	`65`	`}`
`66`	`66`	`} else {`
`67`	`67`	`return topology.Images{`
`68`		`- ConsulOSS: img,`
	`68`	`+ ConsulCE: img,`
`69`	`69`	`}`
`70`	`70`	`}`
`71`	`71`	`}`