More OSS -> CE

hashicorp · Aug 17, 2023 · dceaaeb · dceaaeb
1 parent 1e16c5e
commit dceaaeb
Show file tree

Hide file tree

Showing 13 changed files with 5 additions and 5 deletions.
diff --git a/.github/workflows/ce-merge-trigger.yml b/.github/workflows/ce-merge-trigger.yml
@@ -12,7 +12,7 @@ on:
 
 jobs:
   trigger-ce-merge:
-    # run this only on merge events in OSS repo
+    # run this only on merge events in CE repo
     if: ${{ github.event.pull_request.merged && github.repository == 'hashicorp/consul' }}
     runs-on: ubuntu-latest
     steps:

diff --git a/api/oss_test.go → api/ce_test.go b/api/oss_test.go → api/ce_test.go
@@ -6,8 +6,8 @@
 
 package api
 
-// The following defaults return "default" in enterprise and "" in OSS.
+// The following defaults return "default" in enterprise and "" in CE.
 // This constant is useful when a default value is needed for an
-// operation that will reject non-empty values in OSS.
+// operation that will reject non-empty values in CE.
 const defaultNamespace = ""
 const defaultPartition = ""
diff --git a/command/acl/token/formatter_ce_test.go b/command/acl/token/formatter_ce_test.go
@@ -11,5 +11,5 @@ import (
 )
 
 func TestFormatTokenExpanded(t *testing.T) {
-	testFormatTokenExpanded(t, "FormatTokenExpanded/oss")
+	testFormatTokenExpanded(t, "FormatTokenExpanded/ce")
 }
diff --git a/...FormatTokenExpanded/oss/basic.json.golden → .../FormatTokenExpanded/ce/basic.json.golden b/...FormatTokenExpanded/oss/basic.json.golden → .../FormatTokenExpanded/ce/basic.json.golden
diff --git a/...okenExpanded/oss/basic.pretty-meta.golden → ...TokenExpanded/ce/basic.pretty-meta.golden b/...okenExpanded/oss/basic.pretty-meta.golden → ...TokenExpanded/ce/basic.pretty-meta.golden
diff --git a/...rmatTokenExpanded/oss/basic.pretty.golden → ...ormatTokenExpanded/ce/basic.pretty.golden b/...rmatTokenExpanded/oss/basic.pretty.golden → ...ormatTokenExpanded/ce/basic.pretty.golden
diff --git a/...rmatTokenExpanded/oss/complex.json.golden → ...ormatTokenExpanded/ce/complex.json.golden b/...rmatTokenExpanded/oss/complex.json.golden → ...ormatTokenExpanded/ce/complex.json.golden
diff --git a/...enExpanded/oss/complex.pretty-meta.golden → ...kenExpanded/ce/complex.pretty-meta.golden b/...enExpanded/oss/complex.pretty-meta.golden → ...kenExpanded/ce/complex.pretty-meta.golden
diff --git a/...atTokenExpanded/oss/complex.pretty.golden → ...matTokenExpanded/ce/complex.pretty.golden b/...atTokenExpanded/oss/complex.pretty.golden → ...matTokenExpanded/ce/complex.pretty.golden
diff --git a/command/operator/autopilot/state/operator_autopilot_state_test.go b/command/operator/autopilot/state/operator_autopilot_state_test.go
@@ -107,7 +107,7 @@ func TestStateCommand_JSON(t *testing.T) {
 
 func TestStateCommand_Formatter(t *testing.T) {
 	cases := []string{
-		"oss",
+		"ce",
 		"enterprise",
 	}
 

diff --git a/.../autopilot/state/testdata/oss/json.golden → ...r/autopilot/state/testdata/ce/json.golden b/.../autopilot/state/testdata/oss/json.golden → ...r/autopilot/state/testdata/ce/json.golden
diff --git a/...utopilot/state/testdata/oss/pretty.golden → ...autopilot/state/testdata/ce/pretty.golden b/...utopilot/state/testdata/oss/pretty.golden → ...autopilot/state/testdata/ce/pretty.golden
diff --git a/...r/autopilot/state/testdata/oss/state.json → ...or/autopilot/state/testdata/ce/state.json b/...r/autopilot/state/testdata/oss/state.json → ...or/autopilot/state/testdata/ce/state.json
-Original file line number
+Diff line change
@@ Expand Up / @@ -107,7 +107,7 @@ func TestStateCommand_JSON(t *testing.T) { @@
     func TestStateCommand_Formatter(t *testing.T) {
     	cases := []string{
-    		"oss",
+    		"ce",
     		"enterprise",
     	}
@@ Expand Down @@