[patch] Spell superseded correctly (#121)

Co-authored-by: H.E. Pennypacker <115990865+pennypacker-he@users.noreply.github.com>

Author: libops-agent

cmd/component.go

@@ -212,7 +212,7 @@ func init() {
 
 	componentSetCmd.Flags().StringVar(&componentSetPath, "path", "", "Path to the project directory. Defaults to the active context project directory.")
 	componentSetCmd.Flags().StringVar(&componentSetState, "state", "", "State to apply (on, off).")
-	componentSetCmd.Flags().StringVar(&componentSetDisposition, "disposition", "", "Disposition to apply (enabled, disabled, superceded, distributed).")
+	componentSetCmd.Flags().StringVar(&componentSetDisposition, "disposition", "", "Disposition to apply (enabled, disabled, superseded, distributed).")
 	componentSetCmd.Flags().StringVar(&componentSetTLSMode, "tls-mode", "", "TLS mode (http, self-managed, mkcert, letsencrypt).")
 	componentSetCmd.Flags().BoolVar(&componentSetYolo, "yolo", false, "Skip the confirmation prompt.")
 
@@ -498,7 +498,7 @@ USAGE
 
 EXAMPLES
 
-  sitectl component set fcrepo superceded --isle-file-system-uri private
+  sitectl component set fcrepo superseded --isle-file-system-uri private
   sitectl component set iiif triplet
   sitectl component set iiif-topology distributed --iiif-upstream-url https://iiif.example.org
   sitectl component set homarus distributed

cmd/component_test.go

@@ -297,7 +297,7 @@ func TestResolveComponentSetInvocationStripsNamespace(t *testing.T) {
 	cmd := &cobra.Command{Use: "set"}
 	contextName, owner, forwarded, err := resolveComponentSetInvocation(cmd, []string{
 		"isle/fcrepo",
-		"superceded",
+		"superseded",
 		"--isle-file-system-uri",
 		"private",
 	})
@@ -307,7 +307,7 @@ func TestResolveComponentSetInvocationStripsNamespace(t *testing.T) {
 	if contextName != "museum" || owner != "isle" {
 		t.Fatalf("unexpected owner resolution: context=%q owner=%q", contextName, owner)
 	}
-	want := []string{"fcrepo", "superceded", "--isle-file-system-uri", "private"}
+	want := []string{"fcrepo", "superseded", "--isle-file-system-uri", "private"}
 	if !reflect.DeepEqual(forwarded, want) {
 		t.Fatalf("forwarded args = %#v, want %#v", forwarded, want)
 	}

pkg/component/catalog.go

@@ -106,7 +106,7 @@ func writeCatalogGuidance(out io.Writer, def Definition) error {
 	}{
 		{"enabled", def.Guidance.EnabledHelp},
 		{"disabled", def.Guidance.DisabledHelp},
-		{"superceded", def.Guidance.SupersededHelp},
+		{string(DispositionSuperseded), def.Guidance.SupersededHelp},
 		{"distributed", def.Guidance.DistributedHelp},
 	}
 	wrote := false

pkg/component/catalog_test.go

@@ -50,9 +50,9 @@ func TestWriteComponentCatalogIncludesDispositionsAndSetFlags(t *testing.T) {
 	for _, want := range []string{
 		"ISLE components",
 		"fcrepo",
-		"enabled, superceded",
+		"enabled, superseded",
 		"--isle-file-system-uri",
-		"when superceded",
+		"when superseded",
 		"choices: public, private",
 	} {
 		if !strings.Contains(rendered, want) {

pkg/component/manager.go

@@ -26,7 +26,7 @@ type Disposition string
 
 const (
 	DispositionDisabled    Disposition = "disabled"
-	DispositionSuperseded  Disposition = "superceded"
+	DispositionSuperseded  Disposition = "superseded"
 	DispositionEnabled     Disposition = "enabled"
 	DispositionDistributed Disposition = "distributed"
 	DispositionCantaloupe  Disposition = "cantaloupe"
@@ -529,7 +529,7 @@ func normalizeDisposition(disposition Disposition) Disposition {
 		return DispositionDisabled
 	case string(DispositionDisabled):
 		return DispositionDisabled
-	case string(DispositionSuperseded):
+	case string(DispositionSuperseded), "superceded":
 		return DispositionSuperseded
 	case string(DispositionEnabled):
 		return DispositionEnabled

pkg/component/types_test.go

@@ -49,6 +49,20 @@ func TestParseDispositionAcceptsCodebaseLayouts(t *testing.T) {
 	}
 }
 
+func TestParseDispositionCanonicalizesSupersededSpellings(t *testing.T) {
+	t.Parallel()
+
+	for _, value := range []string{"superseded", "superceded", " SUPERSEDED "} {
+		got, err := ParseDisposition(value)
+		if err != nil {
+			t.Fatalf("ParseDisposition(%q) error = %v", value, err)
+		}
+		if got != DispositionSuperseded || string(got) != "superseded" {
+			t.Fatalf("ParseDisposition(%q) = %q, want canonical superseded", value, got)
+		}
+	}
+}
+
 func TestDependenciesDrupalModulesForEnable(t *testing.T) {
 	t.Parallel()
 

pkg/plugin/rpc.go

@@ -356,6 +356,15 @@ func NewComponentReconcileRequest(params ComponentTargetParams, args ...string)
 
 // NewComponentSetRequest creates a typed component.set request.
 func NewComponentSetRequest(params ComponentSetParams, args ...string) (RPCRequest, error) {
+	// RPC v1 originally shipped the misspelled value. Keep the wire spelling so
+	// a corrected host can still drive v1.0.0 plugins; current plugins normalize
+	// both spellings and render the canonical "superseded" form.
+	if strings.EqualFold(strings.TrimSpace(params.Disposition), "superseded") {
+		params.Disposition = "superceded"
+	}
+	if strings.EqualFold(strings.TrimSpace(params.DispositionFlag), "superseded") {
+		params.DispositionFlag = "superceded"
+	}
 	req := NewRPCRequest(MethodComponentSet)
 	req.Args = copyRPCArgs(args)
 	return withRPCParams(req, params)

pkg/plugin/sdk_test.go

@@ -259,6 +259,30 @@ func TestRPCArgvSafetyDoesNotScreenPassthroughArgs(t *testing.T) {
 	}
 }
 
+func TestComponentSetRequestKeepsSupersededRPCV1Compatibility(t *testing.T) {
+	t.Parallel()
+
+	for _, input := range []ComponentSetParams{
+		{Name: "fcrepo", Disposition: "superseded"},
+		{Name: "fcrepo", DispositionFlag: "SUPERSEDED"},
+	} {
+		req, err := NewComponentSetRequest(input)
+		if err != nil {
+			t.Fatalf("NewComponentSetRequest() error = %v", err)
+		}
+		params, err := DecodeRPCParams[ComponentSetParams](req.Params)
+		if err != nil {
+			t.Fatalf("DecodeRPCParams() error = %v", err)
+		}
+		if params.Disposition != "" && params.Disposition != "superceded" {
+			t.Fatalf("RPC v1 positional disposition = %q, want legacy wire spelling", params.Disposition)
+		}
+		if params.DispositionFlag != "" && params.DispositionFlag != "superceded" {
+			t.Fatalf("RPC v1 disposition flag = %q, want legacy wire spelling", params.DispositionFlag)
+		}
+	}
+}
+
 func TestInvokePluginRPCReturnsStderrDetail(t *testing.T) {
 	dir := t.TempDir()
 	path := filepath.Join(dir, "sitectl-broken")