Skip to content

Commit 9ff8071

Browse files
channingdongchanningdong
authored
Revert the PR-3216 that's not prod ready yet (#3222)
1 parent 23c4e25 commit 9ff8071

17 files changed

+74
-169
lines changed

‎cmd/lint/main.go‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -212,7 +212,6 @@ var vocabWords = []string{
212212
"aws",
213213
"azureml",
214214
"azureopenai",
215-
"a2a",
216215
"backoff",
217216
"base64",
218217
"bedrock",

‎pkg/flink/utils.go‎

Lines changed: 9 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
11
package flink
22

33
var (
4-
ConnectionTypes = []string{"openai", "azureml", "azureopenai", "a2a", "bedrock", "sagemaker", "googleai", "vertexai", "mongodb", "elastic", "pinecone", "couchbase", "confluent_jdbc", "rest", "mcp_server"}
4+
ConnectionTypes = []string{"openai", "azureml", "azureopenai", "bedrock", "sagemaker", "googleai", "vertexai", "mongodb", "elastic", "pinecone", "couchbase", "confluent_jdbc", "rest", "mcp_server"}
55
ConnectionTypeSecretMapping = map[string][]string{
66
"openai": {"api-key"},
77
"azureml": {"api-key"},
88
"azureopenai": {"api-key"},
9-
"a2a": {"username", "password", "api-key", "token", "token-endpoint", "client-id", "client-secret", "scope"},
109
"bedrock": {"aws-access-key", "aws-secret-key", "aws-session-token"},
1110
"sagemaker": {"aws-access-key", "aws-secret-key", "aws-session-token"},
1211
"googleai": {"api-key"},
@@ -21,18 +20,18 @@ var (
2120
}
2221

2322
ConnectionSecretTypeMapping = map[string][]string{
24-
"api-key": {"openai", "azureml", "azureopenai", "googleai", "elastic", "pinecone", "a2a", "mcp_server"},
23+
"api-key": {"openai", "azureml", "azureopenai", "googleai", "elastic", "pinecone", "mcp_server"},
2524
"aws-access-key": {"bedrock", "sagemaker"},
2625
"aws-secret-key": {"bedrock", "sagemaker"},
2726
"aws-session-token": {"bedrock", "sagemaker"},
2827
"service-key": {"vertexai"},
29-
"username": {"mongodb", "couchbase", "confluent_jdbc", "a2a", "rest"},
30-
"password": {"mongodb", "couchbase", "confluent_jdbc", "a2a", "rest"},
31-
"token": {"a2a", "rest", "mcp_server"},
32-
"token-endpoint": {"a2a", "rest", "mcp_server"},
33-
"client-id": {"a2a", "rest", "mcp_server"},
34-
"client-secret": {"a2a", "rest", "mcp_server"},
35-
"scope": {"a2a", "rest", "mcp_server"},
28+
"username": {"mongodb", "couchbase", "confluent_jdbc", "rest"},
29+
"password": {"mongodb", "couchbase", "confluent_jdbc", "rest"},
30+
"token": {"rest", "mcp_server"},
31+
"token-endpoint": {"rest", "mcp_server"},
32+
"client-id": {"rest", "mcp_server"},
33+
"client-secret": {"rest", "mcp_server"},
34+
"scope": {"rest", "mcp_server"},
3635
"sse-endpoint": {"mcp_server"},
3736
"transport-type": {"mcp_server"},
3837
}
@@ -50,13 +49,11 @@ var (
5049
"pinecone": {"api-key"},
5150
"couchbase": {"username", "password"},
5251
"confluent_jdbc": {"username", "password"},
53-
"a2a": {},
5452
"rest": {},
5553
"mcp_server": {},
5654
}
5755

5856
ConnectionOneOfRequiredSecretsMapping = map[string][][]string{
59-
"a2a": {{"api-key"}, {"username", "password"}, {"token"}, {"token-endpoint", "client-id", "client-secret", "scope"}},
6057
"rest": {{"username", "password"}, {"token"}, {"token-endpoint", "client-id", "client-secret", "scope"}},
6158
"mcp_server": {{"api-key"}, {"token"}, {"token-endpoint", "client-id", "client-secret", "scope"}},
6259
}

‎test/fixtures/output/flink/connection/create-help.golden‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -11,20 +11,20 @@ Create Flink connection "my-connection" in AWS us-west-2 for OpenAPI with endpoi
1111
Flags:
1212
--cloud string REQUIRED: Specify the cloud provider as "aws", "azure", or "gcp".
1313
--region string REQUIRED: Cloud region for Flink (use "confluent flink region list" to see all).
14-
--type string REQUIRED: Specify the connection type as "openai", "azureml", "azureopenai", "a2a", "bedrock", "sagemaker", "googleai", "vertexai", "mongodb", "elastic", "pinecone", "couchbase", "confluent_jdbc", "rest", or "mcp_server".
14+
--type string REQUIRED: Specify the connection type as "openai", "azureml", "azureopenai", "bedrock", "sagemaker", "googleai", "vertexai", "mongodb", "elastic", "pinecone", "couchbase", "confluent_jdbc", "rest", or "mcp_server".
1515
--endpoint string REQUIRED: Specify endpoint for the connection.
16-
--api-key string Specify API key for the type: "openai", "azureml", "azureopenai", "googleai", "elastic", "pinecone", "a2a", or "mcp_server".
16+
--api-key string Specify API key for the type: "openai", "azureml", "azureopenai", "googleai", "elastic", "pinecone", or "mcp_server".
1717
--aws-access-key string Specify access key for the type: "bedrock" or "sagemaker".
1818
--aws-secret-key string Specify secret key for the type: "bedrock" or "sagemaker".
1919
--aws-session-token string Specify session token for the type: "bedrock" or "sagemaker".
2020
--service-key string Specify service key for the type: "vertexai".
21-
--username string Specify username for the type: "mongodb", "couchbase", "confluent_jdbc", "a2a", or "rest".
22-
--password string Specify password for the type: "mongodb", "couchbase", "confluent_jdbc", "a2a", or "rest".
23-
--token string Specify bearer token for the type: "a2a", "rest", or "mcp_server".
24-
--token-endpoint string Specify OAuth2 token endpoint for the type: "a2a", "rest", or "mcp_server".
25-
--client-id string Specify OAuth2 client ID for the type: "a2a", "rest", or "mcp_server".
26-
--client-secret string Specify OAuth2 client secret for the type: "a2a", "rest", or "mcp_server".
27-
--scope string Specify OAuth2 scope for the type: "a2a", "rest", or "mcp_server".
21+
--username string Specify username for the type: "mongodb", "couchbase", "confluent_jdbc", or "rest".
22+
--password string Specify password for the type: "mongodb", "couchbase", "confluent_jdbc", or "rest".
23+
--token string Specify bearer token for the type: "rest" or "mcp_server".
24+
--token-endpoint string Specify OAuth2 token endpoint for the type: "rest" or "mcp_server".
25+
--client-id string Specify OAuth2 client ID for the type: "rest" or "mcp_server".
26+
--client-secret string Specify OAuth2 client secret for the type: "rest" or "mcp_server".
27+
--scope string Specify OAuth2 scope for the type: "rest" or "mcp_server".
2828
--sse-endpoint string Specify SSE endpoint for the type: "mcp_server".
2929
--transport-type string Specify transport type for the type: "mcp_server". Default: SSE.
3030
--environment string Environment ID.

‎test/fixtures/output/flink/connection/create/create-a2a-missing-required-secret.golden‎

Lines changed: 0 additions & 36 deletions
This file was deleted.

‎test/fixtures/output/flink/connection/create/create-a2a-mutually-exclusive-secret.golden‎

Lines changed: 0 additions & 36 deletions
This file was deleted.

‎test/fixtures/output/flink/connection/create/create-a2a-no-secret.golden‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎test/fixtures/output/flink/connection/create/create-a2a.golden‎

Lines changed: 0 additions & 11 deletions
This file was deleted.

‎test/fixtures/output/flink/connection/create/create-mcp_server-missing-required-secret.golden‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -10,20 +10,20 @@ Create Flink connection "my-connection" in AWS us-west-2 for OpenAPI with endpoi
1010
Flags:
1111
--cloud string REQUIRED: Specify the cloud provider as "aws", "azure", or "gcp".
1212
--region string REQUIRED: Cloud region for Flink (use "confluent flink region list" to see all).
13-
--type string REQUIRED: Specify the connection type as "openai", "azureml", "azureopenai", "a2a", "bedrock", "sagemaker", "googleai", "vertexai", "mongodb", "elastic", "pinecone", "couchbase", "confluent_jdbc", "rest", or "mcp_server".
13+
--type string REQUIRED: Specify the connection type as "openai", "azureml", "azureopenai", "bedrock", "sagemaker", "googleai", "vertexai", "mongodb", "elastic", "pinecone", "couchbase", "confluent_jdbc", "rest", or "mcp_server".
1414
--endpoint string REQUIRED: Specify endpoint for the connection.
15-
--api-key string Specify API key for the type: "openai", "azureml", "azureopenai", "googleai", "elastic", "pinecone", "a2a", or "mcp_server".
15+
--api-key string Specify API key for the type: "openai", "azureml", "azureopenai", "googleai", "elastic", "pinecone", or "mcp_server".
1616
--aws-access-key string Specify access key for the type: "bedrock" or "sagemaker".
1717
--aws-secret-key string Specify secret key for the type: "bedrock" or "sagemaker".
1818
--aws-session-token string Specify session token for the type: "bedrock" or "sagemaker".
1919
--service-key string Specify service key for the type: "vertexai".
20-
--username string Specify username for the type: "mongodb", "couchbase", "confluent_jdbc", "a2a", or "rest".
21-
--password string Specify password for the type: "mongodb", "couchbase", "confluent_jdbc", "a2a", or "rest".
22-
--token string Specify bearer token for the type: "a2a", "rest", or "mcp_server".
23-
--token-endpoint string Specify OAuth2 token endpoint for the type: "a2a", "rest", or "mcp_server".
24-
--client-id string Specify OAuth2 client ID for the type: "a2a", "rest", or "mcp_server".
25-
--client-secret string Specify OAuth2 client secret for the type: "a2a", "rest", or "mcp_server".
26-
--scope string Specify OAuth2 scope for the type: "a2a", "rest", or "mcp_server".
20+
--username string Specify username for the type: "mongodb", "couchbase", "confluent_jdbc", or "rest".
21+
--password string Specify password for the type: "mongodb", "couchbase", "confluent_jdbc", or "rest".
22+
--token string Specify bearer token for the type: "rest" or "mcp_server".
23+
--token-endpoint string Specify OAuth2 token endpoint for the type: "rest" or "mcp_server".
24+
--client-id string Specify OAuth2 client ID for the type: "rest" or "mcp_server".
25+
--client-secret string Specify OAuth2 client secret for the type: "rest" or "mcp_server".
26+
--scope string Specify OAuth2 scope for the type: "rest" or "mcp_server".
2727
--sse-endpoint string Specify SSE endpoint for the type: "mcp_server".
2828
--transport-type string Specify transport type for the type: "mcp_server". Default: SSE.
2929
--environment string Environment ID.

‎test/fixtures/output/flink/connection/create/create-mcp_server-mutually-exclusive-secret.golden‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -10,20 +10,20 @@ Create Flink connection "my-connection" in AWS us-west-2 for OpenAPI with endpoi
1010
Flags:
1111
--cloud string REQUIRED: Specify the cloud provider as "aws", "azure", or "gcp".
1212
--region string REQUIRED: Cloud region for Flink (use "confluent flink region list" to see all).
13-
--type string REQUIRED: Specify the connection type as "openai", "azureml", "azureopenai", "a2a", "bedrock", "sagemaker", "googleai", "vertexai", "mongodb", "elastic", "pinecone", "couchbase", "confluent_jdbc", "rest", or "mcp_server".
13+
--type string REQUIRED: Specify the connection type as "openai", "azureml", "azureopenai", "bedrock", "sagemaker", "googleai", "vertexai", "mongodb", "elastic", "pinecone", "couchbase", "confluent_jdbc", "rest", or "mcp_server".
1414
--endpoint string REQUIRED: Specify endpoint for the connection.
15-
--api-key string Specify API key for the type: "openai", "azureml", "azureopenai", "googleai", "elastic", "pinecone", "a2a", or "mcp_server".
15+
--api-key string Specify API key for the type: "openai", "azureml", "azureopenai", "googleai", "elastic", "pinecone", or "mcp_server".
1616
--aws-access-key string Specify access key for the type: "bedrock" or "sagemaker".
1717
--aws-secret-key string Specify secret key for the type: "bedrock" or "sagemaker".
1818
--aws-session-token string Specify session token for the type: "bedrock" or "sagemaker".
1919
--service-key string Specify service key for the type: "vertexai".
20-
--username string Specify username for the type: "mongodb", "couchbase", "confluent_jdbc", "a2a", or "rest".
21-
--password string Specify password for the type: "mongodb", "couchbase", "confluent_jdbc", "a2a", or "rest".
22-
--token string Specify bearer token for the type: "a2a", "rest", or "mcp_server".
23-
--token-endpoint string Specify OAuth2 token endpoint for the type: "a2a", "rest", or "mcp_server".
24-
--client-id string Specify OAuth2 client ID for the type: "a2a", "rest", or "mcp_server".
25-
--client-secret string Specify OAuth2 client secret for the type: "a2a", "rest", or "mcp_server".
26-
--scope string Specify OAuth2 scope for the type: "a2a", "rest", or "mcp_server".
20+
--username string Specify username for the type: "mongodb", "couchbase", "confluent_jdbc", or "rest".
21+
--password string Specify password for the type: "mongodb", "couchbase", "confluent_jdbc", or "rest".
22+
--token string Specify bearer token for the type: "rest" or "mcp_server".
23+
--token-endpoint string Specify OAuth2 token endpoint for the type: "rest" or "mcp_server".
24+
--client-id string Specify OAuth2 client ID for the type: "rest" or "mcp_server".
25+
--client-secret string Specify OAuth2 client secret for the type: "rest" or "mcp_server".
26+
--scope string Specify OAuth2 scope for the type: "rest" or "mcp_server".
2727
--sse-endpoint string Specify SSE endpoint for the type: "mcp_server".
2828
--transport-type string Specify transport type for the type: "mcp_server". Default: SSE.
2929
--environment string Environment ID.

0 commit comments

Comments
 (0)