Merge remote-tracking branch 'origin/main' into SP-990

# Conflicts:
#	.go-version
#	go.mod

Author: thllwg

.gitignore

@@ -170,6 +170,9 @@ http-client.private.env.json
 .idea/.cache/.Apifox_Helper
 .idea/ApifoxUploaderProjectSetting.xml
 
+# Github Copilot persisted session migrations, see: https://github.com/microsoft/copilot-intellij-feedback/issues/712#issuecomment-3322062215
+.idea/**/copilot.data.migration.*.xml
+
 #
 # Global/Vim Gitignore
 #

.go-version

@@ -1 +1 @@
-1.24.7
+1.24.9

.semaphore/semaphore.yml

@@ -97,8 +97,8 @@ after_pipeline:
       - name: Report SonarQube Results
         commands:
           - checkout
-          - sem-version java 11
-          - emit-sonarqube-data -a coverage.txt
+          - sem-version java 17
+          - emit-sonarqube-data -a coverage.txt --enable_sonarqube_enterprise
 
 promotions:
   - name: "Run macOS builds (manual)"

CONTRIBUTING.md

@@ -295,7 +295,7 @@ This is not an exhaustive list. Always consider the potential user impact of any
 Note: For the `confluent local services` command, which interacts with Confluent Platform, we should avoid breaking changes for all supported versions of Confluent Platform.
 
 The following may seem like breaking changes, but *aren't*:
-* Renaming a non-serialized, human readable field name
+* Renaming a non-serialized, human-readable field name
 * Hiding a deprecated flag (as long as users can still use the flag!)
 
 These criteria apply to commands, flags, or any functionality in the LA (Limited Availability) or GA (General Availability) lifecycle stages, which should have a stable interface.

cmd/confluent/main.go

@@ -8,6 +8,7 @@ import (
 
 	"github.com/confluentinc/cli/v4/internal"
 	"github.com/confluentinc/cli/v4/pkg/config"
+	_ "github.com/confluentinc/cli/v4/pkg/fips"
 	pversion "github.com/confluentinc/cli/v4/pkg/version"
 )
 

cmd/docs/main.go

@@ -6,11 +6,13 @@ import (
 	"path/filepath"
 	"regexp"
 	"strings"
+	"testing"
 
 	"github.com/confluentinc/cli/v4/internal"
 	"github.com/confluentinc/cli/v4/pkg/config"
 	"github.com/confluentinc/cli/v4/pkg/docs"
 	pversion "github.com/confluentinc/cli/v4/pkg/version"
+	testserver "github.com/confluentinc/cli/v4/test/test-server"
 )
 
 // Auto-generate documentation files for all CLI commands. Documentation uses reStructured Text (ReST) format, and is
@@ -19,6 +21,10 @@ import (
 // This code is adapted from https://github.com/spf13/cobra/blob/master/doc/rest_docs.md
 
 func main() {
+	// Set up test server for feature flags called by the code
+	testBackend := testserver.StartTestCloudServer(&testing.T{}, true)
+	defer testBackend.Close()
+
 	// Prevent printing the user's $HOME in docs when generating confluent local services kafka
 	home, err := os.UserHomeDir()
 	if err != nil {

cmd/lint/main.go

@@ -5,13 +5,15 @@ import (
 	"fmt"
 	"os"
 	"strings"
+	"testing"
 
 	"github.com/client9/gospell"
 
 	"github.com/confluentinc/cli/v4/internal"
 	"github.com/confluentinc/cli/v4/pkg/config"
 	"github.com/confluentinc/cli/v4/pkg/linter"
 	pversion "github.com/confluentinc/cli/v4/pkg/version"
+	testserver "github.com/confluentinc/cli/v4/test/test-server"
 )
 
 var commandRules = []linter.CommandRule{
@@ -164,6 +166,7 @@ var properNouns = []string{
 	"CRL",
 	"Data Encryption Key",
 	"DEK",
+	"Databricks",
 	"Flink",
 	"Go",
 	"Groovy",
@@ -211,6 +214,7 @@ var vocabWords = []string{
 	"aws",
 	"azureml",
 	"azureopenai",
+	"a2a",
 	"backoff",
 	"base64",
 	"bedrock",
@@ -241,7 +245,9 @@ var vocabWords = []string{
 	"deregister",
 	"deserializer",
 	"deserializers",
+	"detached-savepoint",
 	"dns",
+	"ecku",
 	"elastic",
 	"env",
 	"eu",
@@ -287,6 +293,8 @@ var vocabWords = []string{
 	"md",
 	"mds",
 	"mongodb",
+	"name1",
+	"name2",
 	"namespace",
 	"nodejs",
 	"oauth",
@@ -310,6 +318,8 @@ var vocabWords = []string{
 	"s3",
 	"sagemaker",
 	"sasl",
+	"savepoint",
+	"savepoints",
 	"scala",
 	"schemas",
 	"server",
@@ -347,6 +357,7 @@ var vocabWords = []string{
 	"vpc",
 	"whitelist",
 	"wikipedia",
+	"workspace",
 	"yaml",
 	"yml",
 	"zstd",
@@ -365,6 +376,10 @@ func init() {
 }
 
 func main() {
+	// Set up test server for feature flags called by the code
+	testBackend := testserver.StartTestCloudServer(&testing.T{}, true)
+	defer testBackend.Close()
+
 	flag.Parse()
 
 	vocab, err := gospell.NewGoSpell(affFile, dicFile)

go.mod

@@ -1,6 +1,6 @@
 module github.com/confluentinc/cli/v4
 
-go 1.24.7
+go 1.24.9
 
 require (
 	github.com/antihax/optional v1.0.0
@@ -35,7 +35,7 @@ require (
 	github.com/confluentinc/ccloud-sdk-go-v2/iam-ip-filtering v0.5.0
 	github.com/confluentinc/ccloud-sdk-go-v2/identity-provider v0.3.0
 	github.com/confluentinc/ccloud-sdk-go-v2/kafka-quotas v0.4.0
-	github.com/confluentinc/ccloud-sdk-go-v2/kafkarest v0.24.0
+	github.com/confluentinc/ccloud-sdk-go-v2/kafkarest v0.0.0-20250909043602-f80bee0eb280
 	github.com/confluentinc/ccloud-sdk-go-v2/ksql v0.2.0
 	github.com/confluentinc/ccloud-sdk-go-v2/mds v0.4.0
 	github.com/confluentinc/ccloud-sdk-go-v2/metrics v0.2.0
@@ -46,22 +46,22 @@ require (
 	github.com/confluentinc/ccloud-sdk-go-v2/networking-ip v0.2.0
 	github.com/confluentinc/ccloud-sdk-go-v2/networking-privatelink v0.3.0
 	github.com/confluentinc/ccloud-sdk-go-v2/org v0.9.0
-	github.com/confluentinc/ccloud-sdk-go-v2/provider-integration v0.1.0
+	github.com/confluentinc/ccloud-sdk-go-v2/provider-integration v0.2.0
 	github.com/confluentinc/ccloud-sdk-go-v2/service-quota v0.2.0
 	github.com/confluentinc/ccloud-sdk-go-v2/srcm v0.7.3
 	github.com/confluentinc/ccloud-sdk-go-v2/sso v0.0.1
-	github.com/confluentinc/ccloud-sdk-go-v2/tableflow v0.4.0
+	github.com/confluentinc/ccloud-sdk-go-v2/tableflow v0.5.0
 	github.com/confluentinc/ccloud-sdk-go-v2/usm v0.1.0
-	github.com/confluentinc/cmf-sdk-go v0.0.4
-	github.com/confluentinc/confluent-kafka-go/v2 v2.8.0
+	github.com/confluentinc/cmf-sdk-go v0.0.5
+	github.com/confluentinc/confluent-kafka-go/v2 v2.12.0
 	github.com/confluentinc/go-editor v0.11.0
 	github.com/confluentinc/go-prompt v0.2.40
 	github.com/confluentinc/go-ps1 v1.0.2
 	github.com/confluentinc/kafka-rest-sdk-go/kafkarestv3 v0.3.18
 	github.com/confluentinc/mds-sdk-go-public/mdsv1 v0.0.0-20240923163156-b922b35891f9
 	github.com/confluentinc/mds-sdk-go-public/mdsv2alpha1 v0.0.0-20240923163156-b922b35891f9
 	github.com/confluentinc/properties v0.0.0-20190814194548-42c10394a787
-	github.com/confluentinc/schema-registry-sdk-go v0.1.0
+	github.com/confluentinc/schema-registry-sdk-go v0.1.1-0.20251021214222-018e0cd35bf9
 	github.com/davecgh/go-spew v1.1.1
 	github.com/dghubble/sling v1.4.2
 	github.com/docker/docker v28.0.0+incompatible
@@ -109,11 +109,11 @@ require (
 	github.com/tidwall/pretty v1.2.1
 	github.com/tidwall/sjson v1.2.5
 	go.uber.org/mock v0.4.0
-	golang.org/x/crypto v0.36.0
+	golang.org/x/crypto v0.45.0
 	golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56
 	golang.org/x/oauth2 v0.27.0
-	golang.org/x/term v0.30.0
-	golang.org/x/text v0.23.0
+	golang.org/x/term v0.37.0
+	golang.org/x/text v0.31.0
 	google.golang.org/protobuf v1.34.2
 	gopkg.in/launchdarkly/go-sdk-common.v2 v2.5.1
 	gopkg.in/yaml.v3 v3.0.1
@@ -202,6 +202,7 @@ require (
 	github.com/hashicorp/go-sockaddr v1.0.6 // indirect
 	github.com/hashicorp/hcl v1.0.0 // indirect
 	github.com/hashicorp/vault/api v1.15.0 // indirect
+	github.com/hashicorp/vault/api/auth/approle v0.8.0 // indirect
 	github.com/inconshreveable/mousetrap v1.1.0 // indirect
 	github.com/invopop/jsonschema v0.12.0 // indirect
 	github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 // indirect
@@ -262,12 +263,12 @@ require (
 	go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.24.0 // indirect
 	go.opentelemetry.io/otel/metric v1.37.0 // indirect
 	go.opentelemetry.io/otel/trace v1.37.0 // indirect
-	golang.org/x/mod v0.19.0 // indirect
-	golang.org/x/net v0.38.0 // indirect
-	golang.org/x/sync v0.12.0 // indirect
-	golang.org/x/sys v0.31.0 // indirect
+	golang.org/x/mod v0.29.0 // indirect
+	golang.org/x/net v0.47.0 // indirect
+	golang.org/x/sync v0.18.0 // indirect
+	golang.org/x/sys v0.38.0 // indirect
 	golang.org/x/time v0.6.0 // indirect
-	golang.org/x/tools v0.23.0 // indirect
+	golang.org/x/tools v0.38.0 // indirect
 	google.golang.org/api v0.191.0 // indirect
 	google.golang.org/genproto v0.0.0-20240730163845-b1a4ccb954bf // indirect
 	google.golang.org/genproto/googleapis/api v0.0.0-20240725223205-93522f1f2a9f // indirect