Merge pull request #3129 from confluentinc/ADD_SSE_ENDPOINT_IN_MCP_SERVER

yanand0909 · web-flow · commit 5619decc433a · 2025-07-22T13:24:35.000-07:00
[MATRIX-1006] added sse endpoint as optional key for MCP_SERVER
diff --git a/cmd/lint/main.go b/cmd/lint/main.go
@@ -306,6 +306,7 @@ var vocabWords = []string{
 	"siv",
 	"springboot",
 	"sql",
+	"sse",
 	"ssl",
 	"sso",
 	"subresource",
diff --git a/internal/flink/command_connection.go b/internal/flink/command_connection.go
@@ -95,6 +95,7 @@ func AddConnectionSecretFlags(cmd *cobra.Command) {
 	cmd.Flags().String("client-id", "", fmt.Sprintf("Specify OAuth2 client ID for the type: %s.", utils.ArrayToCommaDelimitedString(flink.ConnectionSecretTypeMapping["client-id"], "or")))
 	cmd.Flags().String("client-secret", "", fmt.Sprintf("Specify OAuth2 client secret for the type: %s.", utils.ArrayToCommaDelimitedString(flink.ConnectionSecretTypeMapping["client-secret"], "or")))
 	cmd.Flags().String("scope", "", fmt.Sprintf("Specify OAuth2 scope for the type: %s.", utils.ArrayToCommaDelimitedString(flink.ConnectionSecretTypeMapping["scope"], "or")))
+	cmd.Flags().String("sse-endpoint", "", fmt.Sprintf("Specify SSE endpoint for the type: %s.", utils.ArrayToCommaDelimitedString(flink.ConnectionSecretTypeMapping["sse-endpoint"], "or")))
 	cmd.MarkFlagsRequiredTogether("username", "password")
 	cmd.MarkFlagsRequiredTogether("aws-access-key", "aws-secret-key")
 	cmd.MarkFlagsRequiredTogether("token-endpoint", "client-id", "client-secret", "scope")
diff --git a/pkg/flink/utils.go b/pkg/flink/utils.go
@@ -16,7 +16,7 @@ var (
 		"couchbase":      {"username", "password"},
 		"confluent_jdbc": {"username", "password"},
 		"rest":           {"username", "password", "token", "token-endpoint", "client-id", "client-secret", "scope"},
-		"mcp_server":     {"api-key", "token", "token-endpoint", "client-id", "client-secret", "scope"},
+		"mcp_server":     {"api-key", "token", "token-endpoint", "client-id", "client-secret", "scope", "sse-endpoint"},
 	}
 
 	ConnectionSecretTypeMapping = map[string][]string{
@@ -32,6 +32,7 @@ var (
 		"client-id":         {"rest", "mcp_server"},
 		"client-secret":     {"rest", "mcp_server"},
 		"scope":             {"rest", "mcp_server"},
+		"sse-endpoint":      {"mcp_server"},
 	}
 
 	ConnectionRequiredSecretMapping = map[string][]string{
@@ -69,5 +70,6 @@ var (
 		"client-id":         "OAUTH2_CLIENT_ID",
 		"client-secret":     "OAUTH2_CLIENT_SECRET",
 		"scope":             "OAUTH2_SCOPE",
+		"sse-endpoint":      "SSE_ENDPOINT",
 	}
 )
diff --git a/test/fixtures/output/flink/connection/create-help.golden b/test/fixtures/output/flink/connection/create-help.golden
@@ -25,6 +25,7 @@ Flags:
       --client-id string           Specify OAuth2 client ID for the type: "rest" or "mcp_server".
       --client-secret string       Specify OAuth2 client secret for the type: "rest" or "mcp_server".
       --scope string               Specify OAuth2 scope for the type: "rest" or "mcp_server".
+      --sse-endpoint string        Specify SSE endpoint for the type: "mcp_server".
       --environment string         Environment ID.
   -o, --output string              Specify the output format as "human", "json", or "yaml". (default "human")
 
diff --git a/test/fixtures/output/flink/connection/create/create-mcp_server-missing-required-secret.golden b/test/fixtures/output/flink/connection/create/create-mcp_server-missing-required-secret.golden
@@ -24,6 +24,7 @@ Flags:
       --client-id string           Specify OAuth2 client ID for the type: "rest" or "mcp_server".
       --client-secret string       Specify OAuth2 client secret for the type: "rest" or "mcp_server".
       --scope string               Specify OAuth2 scope for the type: "rest" or "mcp_server".
+      --sse-endpoint string        Specify SSE endpoint for the type: "mcp_server".
       --environment string         Environment ID.
   -o, --output string              Specify the output format as "human", "json", or "yaml". (default "human")
 
diff --git a/test/fixtures/output/flink/connection/create/create-mcp_server-mutually-exclusive-secret.golden b/test/fixtures/output/flink/connection/create/create-mcp_server-mutually-exclusive-secret.golden
@@ -24,6 +24,7 @@ Flags:
       --client-id string           Specify OAuth2 client ID for the type: "rest" or "mcp_server".
       --client-secret string       Specify OAuth2 client secret for the type: "rest" or "mcp_server".
       --scope string               Specify OAuth2 scope for the type: "rest" or "mcp_server".
+      --sse-endpoint string        Specify SSE endpoint for the type: "mcp_server".
       --environment string         Environment ID.
   -o, --output string              Specify the output format as "human", "json", or "yaml". (default "human")
 
diff --git a/test/fixtures/output/flink/connection/create/create-missing-required-secret.golden b/test/fixtures/output/flink/connection/create/create-missing-required-secret.golden
@@ -24,6 +24,7 @@ Flags:
       --client-id string           Specify OAuth2 client ID for the type: "rest" or "mcp_server".
       --client-secret string       Specify OAuth2 client secret for the type: "rest" or "mcp_server".
       --scope string               Specify OAuth2 scope for the type: "rest" or "mcp_server".
+      --sse-endpoint string        Specify SSE endpoint for the type: "mcp_server".
       --environment string         Environment ID.
   -o, --output string              Specify the output format as "human", "json", or "yaml". (default "human")
 
diff --git a/test/fixtures/output/flink/connection/create/create-rest-missing-required-secret.golden b/test/fixtures/output/flink/connection/create/create-rest-missing-required-secret.golden
@@ -24,6 +24,7 @@ Flags:
       --client-id string           Specify OAuth2 client ID for the type: "rest" or "mcp_server".
       --client-secret string       Specify OAuth2 client secret for the type: "rest" or "mcp_server".
       --scope string               Specify OAuth2 scope for the type: "rest" or "mcp_server".
+      --sse-endpoint string        Specify SSE endpoint for the type: "mcp_server".
       --environment string         Environment ID.
   -o, --output string              Specify the output format as "human", "json", or "yaml". (default "human")
 
diff --git a/test/fixtures/output/flink/connection/create/create-rest-mutually-exclusive-secret.golden b/test/fixtures/output/flink/connection/create/create-rest-mutually-exclusive-secret.golden
@@ -24,6 +24,7 @@ Flags:
       --client-id string           Specify OAuth2 client ID for the type: "rest" or "mcp_server".
       --client-secret string       Specify OAuth2 client secret for the type: "rest" or "mcp_server".
       --scope string               Specify OAuth2 scope for the type: "rest" or "mcp_server".
+      --sse-endpoint string        Specify SSE endpoint for the type: "mcp_server".
       --environment string         Environment ID.
   -o, --output string              Specify the output format as "human", "json", or "yaml". (default "human")
 
diff --git a/test/fixtures/output/flink/connection/update-help.golden b/test/fixtures/output/flink/connection/update-help.golden
@@ -23,6 +23,7 @@ Flags:
       --client-id string           Specify OAuth2 client ID for the type: "rest" or "mcp_server".
       --client-secret string       Specify OAuth2 client secret for the type: "rest" or "mcp_server".
       --scope string               Specify OAuth2 scope for the type: "rest" or "mcp_server".
+      --sse-endpoint string        Specify SSE endpoint for the type: "mcp_server".
       --environment string         Environment ID.
   -o, --output string              Specify the output format as "human", "json", or "yaml". (default "human")
 
diff --git a/test/flink_test.go b/test/flink_test.go
@@ -173,9 +173,9 @@ func (s *CLITestSuite) TestFlinkConnectionCreateSuccess() {
 		{args: "flink connection create my-connection --cloud aws --region eu-west-1 --type rest --endpoint https://api.example.com --username name --password pass", fixture: "flink/connection/create/create-rest.golden"},
 		{args: "flink connection create my-connection --cloud aws --region eu-west-1 --type rest --endpoint https://api.example.com --token-endpoint https://api.example.com/auth --client-id clientId --client-secret secret --scope test_scope", fixture: "flink/connection/create/create-rest.golden"},
 		{args: "flink connection create my-connection --cloud aws --region eu-west-1 --type rest --endpoint https://api.example.com --token token", fixture: "flink/connection/create/create-rest.golden"},
-		{args: "flink connection create my-connection --cloud aws --region eu-west-1 --type mcp_server --endpoint https://api.example.com --api-key api_key", fixture: "flink/connection/create/create-mcp_server.golden"},
+		{args: "flink connection create my-connection --cloud aws --region eu-west-1 --type mcp_server --endpoint https://api.example.com --api-key api_key --sse-endpoint sse", fixture: "flink/connection/create/create-mcp_server.golden"},
 		{args: "flink connection create my-connection --cloud aws --region eu-west-1 --type mcp_server --endpoint https://api.example.com --token-endpoint https://api.example.com/auth --client-id clientId --client-secret secret --scope test_scope", fixture: "flink/connection/create/create-mcp_server.golden"},
-		{args: "flink connection create my-connection --cloud aws --region eu-west-1 --type mcp_server --endpoint https://api.example.com --token token", fixture: "flink/connection/create/create-mcp_server.golden"},
+		{args: "flink connection create my-connection --cloud aws --region eu-west-1 --type mcp_server --endpoint https://api.example.com --token token --sse-endpoint /sse", fixture: "flink/connection/create/create-mcp_server.golden"},
 	}
 
 	for _, test := range tests {

Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@ var (`
`16`	`16`	`"couchbase": {"username", "password"},`
`17`	`17`	`"confluent_jdbc": {"username", "password"},`
`18`	`18`	`"rest": {"username", "password", "token", "token-endpoint", "client-id", "client-secret", "scope"},`
`19`		`- "mcp_server": {"api-key", "token", "token-endpoint", "client-id", "client-secret", "scope"},`
	`19`	`+ "mcp_server": {"api-key", "token", "token-endpoint", "client-id", "client-secret", "scope", "sse-endpoint"},`
`20`	`20`	`}`
`21`	`21`
`22`	`22`	`ConnectionSecretTypeMapping = map[string][]string{`
`@@ -32,6 +32,7 @@ var (`
`32`	`32`	`"client-id": {"rest", "mcp_server"},`
`33`	`33`	`"client-secret": {"rest", "mcp_server"},`
`34`	`34`	`"scope": {"rest", "mcp_server"},`
	`35`	`+ "sse-endpoint": {"mcp_server"},`
`35`	`36`	`}`
`36`	`37`
`37`	`38`	`ConnectionRequiredSecretMapping = map[string][]string{`
`@@ -69,5 +70,6 @@ var (`
`69`	`70`	`"client-id": "OAUTH2_CLIENT_ID",`
`70`	`71`	`"client-secret": "OAUTH2_CLIENT_SECRET",`
`71`	`72`	`"scope": "OAUTH2_SCOPE",`
	`73`	`+ "sse-endpoint": "SSE_ENDPOINT",`
`72`	`74`	`}`
`73`	`75`	`)`