fix(cli): correct misspellings and redundant conversion flagged by CI lint

The golangci-lint misspell and unconvert checks flagged the #1325 test
additions (British "cancelled" spellings, error() conversion of
context.Canceled). No behavior change.

Refs #1325

Author: cristim

cmd/multi_service_engine_versions.go

@@ -222,7 +222,7 @@ func queryMajorEngineVersionsWithClient(ctx context.Context, rdsClient RDSMajorV
 			return nil, err
 		}
 		if err := fetchMajorEngineVersionsForEngine(ctx, rdsClient, engine, versionInfo); err != nil {
-			// Cancelled caller context is terminal (issue #1325); check ctx.Err(),
+			// Canceled caller context is terminal (issue #1325); check ctx.Err(),
 			// not the wrapped API error, so SDK-internal timeouts stay warnings.
 			if ctxErr := ctx.Err(); ctxErr != nil {
 				return nil, ctxErr

cmd/multi_service_engine_versions_paginate_test.go

@@ -153,7 +153,7 @@ func TestFetchMajorEngineVersionsForEngine_PaginationCapError(t *testing.T) {
 }
 
 // cancelOnFirstQueryRDSMock cancels the context from inside the first API call
-// and returns the SDK-shaped error a cancelled request produces, so the fan-out
+// and returns the SDK-shaped error a canceled request produces, so the fan-out
 // loop sees both a real ctx cancellation and a wrapped context error.
 type cancelOnFirstQueryRDSMock struct {
 	cancel         context.CancelFunc
@@ -168,15 +168,15 @@ func (m *cancelOnFirstQueryRDSMock) DescribeDBMajorEngineVersions(
 ) (*awsrds.DescribeDBMajorEngineVersionsOutput, error) {
 	m.enginesQueried = append(m.enginesQueried, aws.ToString(params.Engine))
 	m.cancel()
-	err := error(context.Canceled)
+	err := context.Canceled
 	if m.wrap != nil {
 		err = m.wrap(err)
 	}
 	return nil, err
 }
 
 // TestQueryMajorEngineVersionsWithClient_CtxCancelIsTerminal asserts that a
-// cancelled context stops the per-engine fan-out instead of being downgraded to
+// canceled context stops the per-engine fan-out instead of being downgraded to
 // a warning: the loop must return the error and must not keep querying the
 // remaining engines (issue #1325).
 func TestQueryMajorEngineVersionsWithClient_CtxCancelIsTerminal(t *testing.T) {
@@ -205,7 +205,7 @@ func TestQueryMajorEngineVersionsWithClient_CtxCancelIsTerminal(t *testing.T) {
 			result, err := queryMajorEngineVersionsWithClient(ctx, mock)
 
 			require.ErrorIs(t, err, context.Canceled,
-				"a cancelled context must not be reported as a successful query")
+				"a canceled context must not be reported as a successful query")
 			assert.Nil(t, result,
 				"partial version info must not be handed back as if it were complete")
 			assert.Equal(t, []string{"mysql"}, mock.enginesQueried,
@@ -229,10 +229,10 @@ func TestQueryMajorEngineVersionsWithClient_CtxDeadlineIsTerminal(t *testing.T)
 		"an expired deadline must not issue API calls")
 }
 
-// TestQueryMajorEngineVersionsWithClient_CtxAlreadyCancelled asserts that a
-// context cancelled before the call fails fast without spending a single API
+// TestQueryMajorEngineVersionsWithClient_CtxAlreadyCanceled asserts that a
+// context canceled before the call fails fast without spending a single API
 // call (issue #1325).
-func TestQueryMajorEngineVersionsWithClient_CtxAlreadyCancelled(t *testing.T) {
+func TestQueryMajorEngineVersionsWithClient_CtxAlreadyCanceled(t *testing.T) {
 	ctx, cancel := context.WithCancel(context.Background())
 	cancel()
 
@@ -242,5 +242,5 @@ func TestQueryMajorEngineVersionsWithClient_CtxAlreadyCancelled(t *testing.T) {
 
 	require.ErrorIs(t, err, context.Canceled)
 	assert.Empty(t, mock.enginesQueried,
-		"an already-cancelled context must not issue API calls")
+		"an already-canceled context must not issue API calls")
 }