[MATRIX-1193] Add username/password option for elastic self hosted

pkg/flink/utils.go

@@ -12,7 +12,7 @@ var (
 		"googleai":       {"api-key"},
 		"vertexai":       {"service-key"},
 		"mongodb":        {"username", "password"},
-		"elastic":        {"api-key"},
+		"elastic":        {"api-key", "username", "password"},
 		"pinecone":       {"api-key"},
 		"couchbase":      {"username", "password"},
 		"confluent_jdbc": {"username", "password"},
@@ -26,8 +26,8 @@ var (
 		"aws-secret-key":    {"bedrock", "sagemaker"},
 		"aws-session-token": {"bedrock", "sagemaker"},
 		"service-key":       {"vertexai"},
-		"username":          {"mongodb", "couchbase", "confluent_jdbc", "a2a", "rest", "mcp_server"},
-		"password":          {"mongodb", "couchbase", "confluent_jdbc", "a2a", "rest", "mcp_server"},
+		"username":          {"mongodb", "elastic", "couchbase", "confluent_jdbc", "a2a", "rest", "mcp_server"},
+		"password":          {"mongodb", "elastic", "couchbase", "confluent_jdbc", "a2a", "rest", "mcp_server"},
 		"token":             {"a2a", "rest", "mcp_server"},
 		"token-endpoint":    {"a2a", "rest", "mcp_server"},
 		"client-id":         {"a2a", "rest", "mcp_server"},
@@ -46,7 +46,7 @@ var (
 		"googleai":       {"api-key"},
 		"vertexai":       {"service-key"},
 		"mongodb":        {"username", "password"},
-		"elastic":        {"api-key"},
+		"elastic":        {},
 		"pinecone":       {"api-key"},
 		"couchbase":      {"username", "password"},
 		"confluent_jdbc": {"username", "password"},
@@ -57,6 +57,7 @@ var (
 
 	ConnectionOneOfRequiredSecretsMapping = map[string][][]string{
 		"a2a":        {{"api-key"}, {"username", "password"}, {"token"}, {"token-endpoint", "client-id", "client-secret", "scope"}},
+		"elastic":    {{"api-key"}, {"username", "password"}},
 		"rest":       {{"username", "password"}, {"token"}, {"token-endpoint", "client-id", "client-secret", "scope"}},
 		"mcp_server": {{"api-key"}, {"username", "password"}, {"token"}, {"token-endpoint", "client-id", "client-secret", "scope"}},
 	}

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

@@ -18,8 +18,8 @@ Flags:
       --aws-secret-key string      Specify secret key for the type: "bedrock" or "sagemaker".
       --aws-session-token string   Specify session token for the type: "bedrock" or "sagemaker".
       --service-key string         Specify service key for the type: "vertexai".
-      --username string            Specify username for the type: "mongodb", "couchbase", "confluent_jdbc", "a2a", "rest", or "mcp_server".
-      --password string            Specify password for the type: "mongodb", "couchbase", "confluent_jdbc", "a2a", "rest", or "mcp_server".
+      --username string            Specify username for the type: "mongodb", "elastic", "couchbase", "confluent_jdbc", "a2a", "rest", or "mcp_server".
+      --password string            Specify password for the type: "mongodb", "elastic", "couchbase", "confluent_jdbc", "a2a", "rest", or "mcp_server".
       --token string               Specify bearer token for the type: "a2a", "rest", or "mcp_server".
       --token-endpoint string      Specify OAuth2 token endpoint for the type: "a2a", "rest", or "mcp_server".
       --client-id string           Specify OAuth2 client ID for the type: "a2a", "rest", or "mcp_server".

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

@@ -17,8 +17,8 @@ Flags:
       --aws-secret-key string      Specify secret key for the type: "bedrock" or "sagemaker".
       --aws-session-token string   Specify session token for the type: "bedrock" or "sagemaker".
       --service-key string         Specify service key for the type: "vertexai".
-      --username string            Specify username for the type: "mongodb", "couchbase", "confluent_jdbc", "a2a", "rest", or "mcp_server".
-      --password string            Specify password for the type: "mongodb", "couchbase", "confluent_jdbc", "a2a", "rest", or "mcp_server".
+      --username string            Specify username for the type: "mongodb", "elastic", "couchbase", "confluent_jdbc", "a2a", "rest", or "mcp_server".
+      --password string            Specify password for the type: "mongodb", "elastic", "couchbase", "confluent_jdbc", "a2a", "rest", or "mcp_server".
       --token string               Specify bearer token for the type: "a2a", "rest", or "mcp_server".
       --token-endpoint string      Specify OAuth2 token endpoint for the type: "a2a", "rest", or "mcp_server".
       --client-id string           Specify OAuth2 client ID for the type: "a2a", "rest", or "mcp_server".

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

@@ -17,8 +17,8 @@ Flags:
       --aws-secret-key string      Specify secret key for the type: "bedrock" or "sagemaker".
       --aws-session-token string   Specify session token for the type: "bedrock" or "sagemaker".
       --service-key string         Specify service key for the type: "vertexai".
-      --username string            Specify username for the type: "mongodb", "couchbase", "confluent_jdbc", "a2a", "rest", or "mcp_server".
-      --password string            Specify password for the type: "mongodb", "couchbase", "confluent_jdbc", "a2a", "rest", or "mcp_server".
+      --username string            Specify username for the type: "mongodb", "elastic", "couchbase", "confluent_jdbc", "a2a", "rest", or "mcp_server".
+      --password string            Specify password for the type: "mongodb", "elastic", "couchbase", "confluent_jdbc", "a2a", "rest", or "mcp_server".
       --token string               Specify bearer token for the type: "a2a", "rest", or "mcp_server".
       --token-endpoint string      Specify OAuth2 token endpoint for the type: "a2a", "rest", or "mcp_server".
       --client-id string           Specify OAuth2 client ID for the type: "a2a", "rest", or "mcp_server".

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

@@ -0,0 +1,35 @@
+Error: if any flags in the group [username password] are set they must all be set; missing [password]
+Usage:
+  confluent flink connection create <name> [flags]
+
+Examples:
+Create Flink connection "my-connection" in AWS us-west-2 for OpenAPI with endpoint and API key.
+
+  $ confluent flink connection create my-connection --cloud aws --region us-west-2 --type openai --endpoint https://api.openai.com/v1/chat/completions --api-key 0000000000000000
+
+Flags:
+      --cloud string               REQUIRED: Specify the cloud provider as "aws", "azure", or "gcp".
+      --region string              REQUIRED: Cloud region for Flink (use "confluent flink region list" to see all).
+      --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".
+      --endpoint string            REQUIRED: Specify endpoint for the connection.
+      --api-key string             Specify API key for the type: "openai", "azureml", "azureopenai", "googleai", "elastic", "pinecone", "a2a", or "mcp_server".
+      --aws-access-key string      Specify access key for the type: "bedrock" or "sagemaker".
+      --aws-secret-key string      Specify secret key for the type: "bedrock" or "sagemaker".
+      --aws-session-token string   Specify session token for the type: "bedrock" or "sagemaker".
+      --service-key string         Specify service key for the type: "vertexai".
+      --username string            Specify username for the type: "mongodb", "elastic", "couchbase", "confluent_jdbc", "a2a", "rest", or "mcp_server".
+      --password string            Specify password for the type: "mongodb", "elastic", "couchbase", "confluent_jdbc", "a2a", "rest", or "mcp_server".
+      --token string               Specify bearer token for the type: "a2a", "rest", or "mcp_server".
+      --token-endpoint string      Specify OAuth2 token endpoint for the type: "a2a", "rest", or "mcp_server".
+      --client-id string           Specify OAuth2 client ID for the type: "a2a", "rest", or "mcp_server".
+      --client-secret string       Specify OAuth2 client secret for the type: "a2a", "rest", or "mcp_server".
+      --scope string               Specify OAuth2 scope for the type: "a2a", "rest", or "mcp_server".
+      --sse-endpoint string        Specify SSE endpoint for the type: "mcp_server".
+      --transport-type string      Specify transport type for the type: "mcp_server". Default: SSE.
+      --environment string         Environment ID.
+  -o, --output string              Specify the output format as "human", "json", or "yaml". (default "human")
+
+Global Flags:
+  -h, --help            Show help for this command.
+      --unsafe-trace    Equivalent to -vvvv, but also log HTTP requests and responses which might contain plaintext secrets.
+  -v, --verbose count   Increase verbosity (-v for warn, -vv for info, -vvv for debug, -vvvv for trace).

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

@@ -0,0 +1,35 @@
+Error: if any flags in the group [username password] are set they must all be set; missing [password]
+Usage:
+  confluent flink connection create <name> [flags]
+
+Examples:
+Create Flink connection "my-connection" in AWS us-west-2 for OpenAPI with endpoint and API key.
+
+  $ confluent flink connection create my-connection --cloud aws --region us-west-2 --type openai --endpoint https://api.openai.com/v1/chat/completions --api-key 0000000000000000
+
+Flags:
+      --cloud string               REQUIRED: Specify the cloud provider as "aws", "azure", or "gcp".
+      --region string              REQUIRED: Cloud region for Flink (use "confluent flink region list" to see all).
+      --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".
+      --endpoint string            REQUIRED: Specify endpoint for the connection.
+      --api-key string             Specify API key for the type: "openai", "azureml", "azureopenai", "googleai", "elastic", "pinecone", "a2a", or "mcp_server".
+      --aws-access-key string      Specify access key for the type: "bedrock" or "sagemaker".
+      --aws-secret-key string      Specify secret key for the type: "bedrock" or "sagemaker".
+      --aws-session-token string   Specify session token for the type: "bedrock" or "sagemaker".
+      --service-key string         Specify service key for the type: "vertexai".
+      --username string            Specify username for the type: "mongodb", "elastic", "couchbase", "confluent_jdbc", "a2a", "rest", or "mcp_server".
+      --password string            Specify password for the type: "mongodb", "elastic", "couchbase", "confluent_jdbc", "a2a", "rest", or "mcp_server".
+      --token string               Specify bearer token for the type: "a2a", "rest", or "mcp_server".
+      --token-endpoint string      Specify OAuth2 token endpoint for the type: "a2a", "rest", or "mcp_server".
+      --client-id string           Specify OAuth2 client ID for the type: "a2a", "rest", or "mcp_server".
+      --client-secret string       Specify OAuth2 client secret for the type: "a2a", "rest", or "mcp_server".
+      --scope string               Specify OAuth2 scope for the type: "a2a", "rest", or "mcp_server".
+      --sse-endpoint string        Specify SSE endpoint for the type: "mcp_server".
+      --transport-type string      Specify transport type for the type: "mcp_server". Default: SSE.
+      --environment string         Environment ID.
+  -o, --output string              Specify the output format as "human", "json", or "yaml". (default "human")
+
+Global Flags:
+  -h, --help            Show help for this command.
+      --unsafe-trace    Equivalent to -vvvv, but also log HTTP requests and responses which might contain plaintext secrets.
+  -v, --verbose count   Increase verbosity (-v for warn, -vv for info, -vvv for debug, -vvvv for trace).

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

@@ -0,0 +1 @@
+Error: no secrets provided for type elastic, one of the required secrets "[api-key]" or "[username password]" must be provided

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

@@ -17,8 +17,8 @@ Flags:
       --aws-secret-key string      Specify secret key for the type: "bedrock" or "sagemaker".
       --aws-session-token string   Specify session token for the type: "bedrock" or "sagemaker".
       --service-key string         Specify service key for the type: "vertexai".
-      --username string            Specify username for the type: "mongodb", "couchbase", "confluent_jdbc", "a2a", "rest", or "mcp_server".
-      --password string            Specify password for the type: "mongodb", "couchbase", "confluent_jdbc", "a2a", "rest", or "mcp_server".
+      --username string            Specify username for the type: "mongodb", "elastic", "couchbase", "confluent_jdbc", "a2a", "rest", or "mcp_server".
+      --password string            Specify password for the type: "mongodb", "elastic", "couchbase", "confluent_jdbc", "a2a", "rest", or "mcp_server".
       --token string               Specify bearer token for the type: "a2a", "rest", or "mcp_server".
       --token-endpoint string      Specify OAuth2 token endpoint for the type: "a2a", "rest", or "mcp_server".
       --client-id string           Specify OAuth2 client ID for the type: "a2a", "rest", or "mcp_server".

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

@@ -17,8 +17,8 @@ Flags:
       --aws-secret-key string      Specify secret key for the type: "bedrock" or "sagemaker".
       --aws-session-token string   Specify session token for the type: "bedrock" or "sagemaker".
       --service-key string         Specify service key for the type: "vertexai".
-      --username string            Specify username for the type: "mongodb", "couchbase", "confluent_jdbc", "a2a", "rest", or "mcp_server".
-      --password string            Specify password for the type: "mongodb", "couchbase", "confluent_jdbc", "a2a", "rest", or "mcp_server".
+      --username string            Specify username for the type: "mongodb", "elastic", "couchbase", "confluent_jdbc", "a2a", "rest", or "mcp_server".
+      --password string            Specify password for the type: "mongodb", "elastic", "couchbase", "confluent_jdbc", "a2a", "rest", or "mcp_server".
       --token string               Specify bearer token for the type: "a2a", "rest", or "mcp_server".
       --token-endpoint string      Specify OAuth2 token endpoint for the type: "a2a", "rest", or "mcp_server".
       --client-id string           Specify OAuth2 client ID for the type: "a2a", "rest", or "mcp_server".

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

@@ -17,8 +17,8 @@ Flags:
       --aws-secret-key string      Specify secret key for the type: "bedrock" or "sagemaker".
       --aws-session-token string   Specify session token for the type: "bedrock" or "sagemaker".
       --service-key string         Specify service key for the type: "vertexai".
-      --username string            Specify username for the type: "mongodb", "couchbase", "confluent_jdbc", "a2a", "rest", or "mcp_server".
-      --password string            Specify password for the type: "mongodb", "couchbase", "confluent_jdbc", "a2a", "rest", or "mcp_server".
+      --username string            Specify username for the type: "mongodb", "elastic", "couchbase", "confluent_jdbc", "a2a", "rest", or "mcp_server".
+      --password string            Specify password for the type: "mongodb", "elastic", "couchbase", "confluent_jdbc", "a2a", "rest", or "mcp_server".
       --token string               Specify bearer token for the type: "a2a", "rest", or "mcp_server".
       --token-endpoint string      Specify OAuth2 token endpoint for the type: "a2a", "rest", or "mcp_server".
       --client-id string           Specify OAuth2 client ID for the type: "a2a", "rest", or "mcp_server".

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

@@ -17,8 +17,8 @@ Flags:
       --aws-secret-key string      Specify secret key for the type: "bedrock" or "sagemaker".
       --aws-session-token string   Specify session token for the type: "bedrock" or "sagemaker".
       --service-key string         Specify service key for the type: "vertexai".
-      --username string            Specify username for the type: "mongodb", "couchbase", "confluent_jdbc", "a2a", "rest", or "mcp_server".
-      --password string            Specify password for the type: "mongodb", "couchbase", "confluent_jdbc", "a2a", "rest", or "mcp_server".
+      --username string            Specify username for the type: "mongodb", "elastic", "couchbase", "confluent_jdbc", "a2a", "rest", or "mcp_server".
+      --password string            Specify password for the type: "mongodb", "elastic", "couchbase", "confluent_jdbc", "a2a", "rest", or "mcp_server".
       --token string               Specify bearer token for the type: "a2a", "rest", or "mcp_server".
       --token-endpoint string      Specify OAuth2 token endpoint for the type: "a2a", "rest", or "mcp_server".
       --client-id string           Specify OAuth2 client ID for the type: "a2a", "rest", or "mcp_server".

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

@@ -17,8 +17,8 @@ Flags:
       --aws-secret-key string      Specify secret key for the type: "bedrock" or "sagemaker".
       --aws-session-token string   Specify session token for the type: "bedrock" or "sagemaker".
       --service-key string         Specify service key for the type: "vertexai".
-      --username string            Specify username for the type: "mongodb", "couchbase", "confluent_jdbc", "a2a", "rest", or "mcp_server".
-      --password string            Specify password for the type: "mongodb", "couchbase", "confluent_jdbc", "a2a", "rest", or "mcp_server".
+      --username string            Specify username for the type: "mongodb", "elastic", "couchbase", "confluent_jdbc", "a2a", "rest", or "mcp_server".
+      --password string            Specify password for the type: "mongodb", "elastic", "couchbase", "confluent_jdbc", "a2a", "rest", or "mcp_server".
       --token string               Specify bearer token for the type: "a2a", "rest", or "mcp_server".
       --token-endpoint string      Specify OAuth2 token endpoint for the type: "a2a", "rest", or "mcp_server".
       --client-id string           Specify OAuth2 client ID for the type: "a2a", "rest", or "mcp_server".

test/fixtures/output/flink/connection/update-help.golden

@@ -16,8 +16,8 @@ Flags:
       --aws-secret-key string      Specify secret key for the type: "bedrock" or "sagemaker".
       --aws-session-token string   Specify session token for the type: "bedrock" or "sagemaker".
       --service-key string         Specify service key for the type: "vertexai".
-      --username string            Specify username for the type: "mongodb", "couchbase", "confluent_jdbc", "a2a", "rest", or "mcp_server".
-      --password string            Specify password for the type: "mongodb", "couchbase", "confluent_jdbc", "a2a", "rest", or "mcp_server".
+      --username string            Specify username for the type: "mongodb", "elastic", "couchbase", "confluent_jdbc", "a2a", "rest", or "mcp_server".
+      --password string            Specify password for the type: "mongodb", "elastic", "couchbase", "confluent_jdbc", "a2a", "rest", or "mcp_server".
       --token string               Specify bearer token for the type: "a2a", "rest", or "mcp_server".
       --token-endpoint string      Specify OAuth2 token endpoint for the type: "a2a", "rest", or "mcp_server".
       --client-id string           Specify OAuth2 client ID for the type: "a2a", "rest", or "mcp_server".