@backstage/plugin-search-backend-module-elasticsearch
Advanced tools
Comparing version 0.0.1 to 0.0.2
@@ -78,28 +78,33 @@ /* | ||
*/ | ||
auth?: { | ||
username?: string; | ||
auth?: | ||
| { | ||
username: string; | ||
/** | ||
* @visibility secret | ||
*/ | ||
password?: string; | ||
/** | ||
* @visibility secret | ||
*/ | ||
password: string; | ||
} | ||
| { | ||
/** | ||
* Base64 Encoded API key to be used to connect to the cluster. | ||
* See: https://www.elastic.co/guide/en/elasticsearch/reference/current/security-api-create-api-key.html | ||
* | ||
* @visibility secret | ||
*/ | ||
apiKey: string; | ||
}; | ||
/* TODO(kuangp): unsupported until @elastic/elasticsearch@7.14 is released | ||
| { | ||
/** | ||
* Base64 Encoded API key to be used to connect to the cluster. | ||
* See: https://www.elastic.co/guide/en/elasticsearch/reference/current/security-api-create-api-key.html | ||
* | ||
* @visibility secret | ||
*/ | ||
apiKey?: string; | ||
/** | ||
* Bearer authentication token to connect to the cluster. | ||
* See: https://www.elastic.co/guide/en/elasticsearch/reference/current/security-api-create-service-token.html | ||
* | ||
* @visibility secret | ||
*/ | ||
bearer?: string; | ||
}; | ||
/** | ||
* Bearer authentication token to connect to the cluster. | ||
* See: https://www.elastic.co/guide/en/elasticsearch/reference/current/security-api-create-service-token.html | ||
* | ||
* @visibility secret | ||
* | ||
bearer: string; | ||
};*/ | ||
}; | ||
}; | ||
} |
@@ -44,2 +44,3 @@ 'use strict'; | ||
logger.info("Initializing Elastic.co ElasticSearch search engine."); | ||
const authConfig2 = config.getConfig("auth"); | ||
return new elasticsearch.Client({ | ||
@@ -49,3 +50,6 @@ cloud: { | ||
}, | ||
auth: config.get("auth") | ||
auth: { | ||
username: authConfig2.getString("username"), | ||
password: authConfig2.getString("password") | ||
} | ||
}); | ||
@@ -63,5 +67,12 @@ } | ||
logger.info("Initializing ElasticSearch search engine."); | ||
const authConfig = config.getOptionalConfig("auth"); | ||
const auth = authConfig && (authConfig.has("apiKey") ? { | ||
apiKey: authConfig.getString("apiKey") | ||
} : { | ||
username: authConfig.getString("username"), | ||
password: authConfig.getString("password") | ||
}); | ||
return new elasticsearch.Client({ | ||
node: config.getString("node"), | ||
auth: config.get("auth") | ||
auth | ||
}); | ||
@@ -68,0 +79,0 @@ } |
{ | ||
"name": "@backstage/plugin-search-backend-module-elasticsearch", | ||
"version": "0.0.1", | ||
"version": "0.0.2", | ||
"main": "dist/index.cjs.js", | ||
@@ -32,4 +32,4 @@ "types": "dist/index.d.ts", | ||
"devDependencies": { | ||
"@backstage/backend-common": "^0.8.6", | ||
"@backstage/cli": "^0.7.4", | ||
"@backstage/backend-common": "^0.8.9", | ||
"@backstage/cli": "^0.7.8", | ||
"@elastic/elasticsearch-mock": "^0.3.0" | ||
@@ -45,3 +45,3 @@ }, | ||
"configSchema": "config.d.ts", | ||
"gitHead": "4f3c36bf42205f5a9181437630721f980d68105a" | ||
"gitHead": "90439d524d1228d1d1660ac5568e9f4d1af1832c" | ||
} |
@@ -9,2 +9,2 @@ # search-backend-module-elasticsearch | ||
See [Backstage documentation](https://backstage.io/docs/features/search/getting-started) for details on how to install and configure ElasticSearch for your Backstage instance. | ||
See [Backstage documentation](https://backstage.io/docs/features/search/search-engines#elasticsearch) for details on how to install and configure ElasticSearch for your Backstage instance. |
Sorry, the diff of this file is not supported yet
37226
8
311