hashicorp
diff --git a/‎.github/workflows/ce-merge-trigger.yml‎
Lines changed: 1 addition & 1 deletion b/‎.github/workflows/ce-merge-trigger.yml‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎api/oss_test.go‎ ‎api/ce_test.go‎api/oss_test.go renamed to api/ce_test.go
Lines changed: 2 additions & 2 deletions b/‎api/oss_test.go‎ ‎api/ce_test.go‎api/oss_test.go renamed to api/ce_test.go
Lines changed: 2 additions & 2 deletions
diff --git a/‎command/acl/token/formatter_ce_test.go‎
Lines changed: 1 addition & 1 deletion b/‎command/acl/token/formatter_ce_test.go‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎…ormatTokenExpanded/oss/basic.json.golden‎ ‎…FormatTokenExpanded/ce/basic.json.golden‎command/acl/token/testdata/FormatTokenExpanded/oss/basic.json.golden renamed to command/acl/token/testdata/FormatTokenExpanded/ce/basic.json.golden b/‎…ormatTokenExpanded/oss/basic.json.golden‎ ‎…FormatTokenExpanded/ce/basic.json.golden‎command/acl/token/testdata/FormatTokenExpanded/oss/basic.json.golden renamed to command/acl/token/testdata/FormatTokenExpanded/ce/basic.json.golden
diff --git a/‎…kenExpanded/oss/basic.pretty-meta.golden‎ ‎…okenExpanded/ce/basic.pretty-meta.golden‎command/acl/token/testdata/FormatTokenExpanded/oss/basic.pretty-meta.golden renamed to command/acl/token/testdata/FormatTokenExpanded/ce/basic.pretty-meta.golden b/‎…kenExpanded/oss/basic.pretty-meta.golden‎ ‎…okenExpanded/ce/basic.pretty-meta.golden‎command/acl/token/testdata/FormatTokenExpanded/oss/basic.pretty-meta.golden renamed to command/acl/token/testdata/FormatTokenExpanded/ce/basic.pretty-meta.golden
diff --git a/‎…matTokenExpanded/oss/basic.pretty.golden‎ ‎…rmatTokenExpanded/ce/basic.pretty.golden‎command/acl/token/testdata/FormatTokenExpanded/oss/basic.pretty.golden renamed to command/acl/token/testdata/FormatTokenExpanded/ce/basic.pretty.golden b/‎…matTokenExpanded/oss/basic.pretty.golden‎ ‎…rmatTokenExpanded/ce/basic.pretty.golden‎command/acl/token/testdata/FormatTokenExpanded/oss/basic.pretty.golden renamed to command/acl/token/testdata/FormatTokenExpanded/ce/basic.pretty.golden
diff --git a/‎…matTokenExpanded/oss/complex.json.golden‎ ‎…rmatTokenExpanded/ce/complex.json.golden‎command/acl/token/testdata/FormatTokenExpanded/oss/complex.json.golden renamed to command/acl/token/testdata/FormatTokenExpanded/ce/complex.json.golden b/‎…matTokenExpanded/oss/complex.json.golden‎ ‎…rmatTokenExpanded/ce/complex.json.golden‎command/acl/token/testdata/FormatTokenExpanded/oss/complex.json.golden renamed to command/acl/token/testdata/FormatTokenExpanded/ce/complex.json.golden
diff --git a/‎…nExpanded/oss/complex.pretty-meta.golden‎ ‎…enExpanded/ce/complex.pretty-meta.golden‎command/acl/token/testdata/FormatTokenExpanded/oss/complex.pretty-meta.golden renamed to command/acl/token/testdata/FormatTokenExpanded/ce/complex.pretty-meta.golden b/‎…nExpanded/oss/complex.pretty-meta.golden‎ ‎…enExpanded/ce/complex.pretty-meta.golden‎command/acl/token/testdata/FormatTokenExpanded/oss/complex.pretty-meta.golden renamed to command/acl/token/testdata/FormatTokenExpanded/ce/complex.pretty-meta.golden
diff --git a/‎…tTokenExpanded/oss/complex.pretty.golden‎ ‎…atTokenExpanded/ce/complex.pretty.golden‎command/acl/token/testdata/FormatTokenExpanded/oss/complex.pretty.golden renamed to command/acl/token/testdata/FormatTokenExpanded/ce/complex.pretty.golden b/‎…tTokenExpanded/oss/complex.pretty.golden‎ ‎…atTokenExpanded/ce/complex.pretty.golden‎command/acl/token/testdata/FormatTokenExpanded/oss/complex.pretty.golden renamed to command/acl/token/testdata/FormatTokenExpanded/ce/complex.pretty.golden
diff --git a/‎command/operator/autopilot/state/operator_autopilot_state_test.go‎
Lines changed: 1 addition & 1 deletion b/‎command/operator/autopilot/state/operator_autopilot_state_test.go‎
Lines changed: 1 addition & 1 deletion
@@ -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:
 
@@ -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 = ""
@@ -11,5 +11,5 @@ import (
 )
 
 func TestFormatTokenExpanded(t *testing.T) {
-	testFormatTokenExpanded(t, "FormatTokenExpanded/oss")
+	testFormatTokenExpanded(t, "FormatTokenExpanded/ce")
 }
@@ -107,7 +107,7 @@ func TestStateCommand_JSON(t *testing.T) {
 
 func TestStateCommand_Formatter(t *testing.T) {
 	cases := []string{
-		"oss",
+		"ce",
 		"enterprise",
 	}
Original file line number	Diff line number	Diff line change
`@@ -11,5 +11,5 @@ import (`
`11`	`11`	`)`
`12`	`12`
`13`	`13`	`func TestFormatTokenExpanded(t *testing.T) {`
`14`		`- testFormatTokenExpanded(t, "FormatTokenExpanded/oss")`
	`14`	`+ testFormatTokenExpanded(t, "FormatTokenExpanded/ce")`
`15`	`15`	`}`
Original file line number	Diff line number	Diff line change
`@@ -107,7 +107,7 @@ func TestStateCommand_JSON(t *testing.T) {`
`107`	`107`
`108`	`108`	`func TestStateCommand_Formatter(t *testing.T) {`
`109`	`109`	`cases := []string{`
`110`		`- "oss",`
	`110`	`+ "ce",`
`111`	`111`	`"enterprise",`
`112`	`112`	`}`
`113`	`113`