Skip to content

Commit 0faa94c

Browse files
committed
Stop erroring CLI when using API key to authenticate
1 parent 328fd6f commit 0faa94c

File tree

2 files changed

+17
-3
lines changed

2 files changed

+17
-3
lines changed

connectors/cli/connector.py

+9-3
Original file line numberDiff line numberDiff line change
@@ -100,11 +100,17 @@ async def __create_connector(
100100
index_name, language
101101
)
102102

103-
api_key = await self.__create_api_key(index_name)
103+
try:
104+
api_key = await self.__create_api_key(index_name)
105+
api_key_id = api_key["id"]
106+
api_key_encoded = api_key["encoded"]
107+
except:
108+
api_key_id = None
109+
api_key_encoded = None
104110

105111
# TODO features still required
106112
doc = {
107-
"api_key_id": api_key["id"],
113+
"api_key_id": api_key_id,
108114
"configuration": configuration,
109115
"index_name": index_name,
110116
"service_type": service_type,
@@ -135,7 +141,7 @@ async def __create_connector(
135141
}
136142

137143
connector = await self.connector_index.index(doc)
138-
return {"id": connector["_id"], "api_key": api_key["encoded"]}
144+
return {"id": connector["_id"], "api_key": api_key_encoded}
139145
finally:
140146
await self.connector_index.close()
141147

connectors/connectors_cli.py

+8
Original file line numberDiff line numberDiff line change
@@ -292,6 +292,14 @@ def prompt():
292292
from_index=from_index,
293293
)
294294

295+
if result["api_key"] is None:
296+
click.echo(
297+
click.style(
298+
"Failed to create a connector-specific API key. API keys cannot be created when authenticating to Elasticsearch with an API key. Consider using username/password to authenticate, or create a connector-specific API key through Kibana.",
299+
fg="yellow",
300+
)
301+
)
302+
295303
click.echo(
296304
"Connector (name: "
297305
+ click.style(index_name, fg="green")

0 commit comments

Comments
 (0)