Adding support to run CI against opensearch and cluster

Signed-off-by: Aditya Jindal <[email protected]>

.ci/DockerFile.Repository

@@ -23,9 +23,9 @@ COPY Cargo.toml ./Cargo.toml
 COPY Makefile.toml ./Makefile.toml
 COPY README.md ./README.md
 COPY api_generator ./api_generator
-COPY elasticsearch/Cargo.toml ./elasticsearch/Cargo.toml
-COPY elasticsearch/src ./elasticsearch/src
-COPY elasticsearch/build.rs ./elasticsearch/build.rs
+COPY opensearch/Cargo.toml ./opensearch/Cargo.toml
+COPY opensearch/src ./opensearch/src
+COPY opensearch/build.rs ./opensearch/build.rs
 COPY yaml_test_runner ./yaml_test_runner
 
 RUN cargo build --tests

.github/workflows/test-integrations.yml

@@ -1,4 +1,4 @@
-name: Integration tests against Opensearch and Opendistro Cluster
+name: Integration tests against OpenSearch and Opendistro Cluster
 
 on:
   pull_request:

Cargo.toml

@@ -1,6 +1,6 @@
 [workspace]
 members = [
     "api_generator",
-    "elasticsearch",
+    "opensearch",
     "yaml_test_runner"
 ]

api_generator/src/bin/run.rs

@@ -35,7 +35,7 @@ fn main() -> Result<(), failure::Error> {
 
     // This must be run from the repo root directory, with cargo make generate-api
     let download_dir = fs::canonicalize(PathBuf::from("./api_generator/rest_specs"))?;
-    let generated_dir = fs::canonicalize(PathBuf::from("./elasticsearch/src"))?;
+    let generated_dir = fs::canonicalize(PathBuf::from("./opensearch/src"))?;
     let last_downloaded_version =
         PathBuf::from("./api_generator/rest_specs/last_downloaded_version");
 

api_generator/src/generator/code_gen/mod.rs

@@ -33,7 +33,7 @@ pub fn use_declarations() -> Tokens {
         #![allow(unused_imports)]
 
         use crate::{
-            client::Elasticsearch,
+            client::OpenSearch,
             params::*,
             error::Error,
             http::{

api_generator/src/generator/code_gen/namespace_clients.rs

@@ -110,7 +110,7 @@ pub fn generate(api: &Api, docs_dir: &PathBuf) -> Result<Vec<(String, String)>,
             }
 
             #cfg_attr
-            impl Elasticsearch {
+            impl OpenSearch {
                 #namespace_fn_doc
                 pub fn #namespace_name(&self) -> #namespace_client_name {
                     #namespace_client_name::new(self.transport())

api_generator/src/generator/code_gen/root.rs

@@ -38,7 +38,7 @@ pub fn generate(api: &Api, docs_dir: &PathBuf) -> Result<String, failure::Error>
             let builder_name = name.to_pascal_case();
             RequestBuilder::new(
                 docs_dir,
-                "Elasticsearch",
+                "OpenSearch",
                 name,
                 &builder_name,
                 &api.common_params,
@@ -52,7 +52,7 @@ pub fn generate(api: &Api, docs_dir: &PathBuf) -> Result<String, failure::Error>
     tokens.append(quote!(
         #(#builders)*
 
-        impl Elasticsearch {
+        impl OpenSearch {
             #(#methods)*
         }
     ));

api_generator/src/rest_spec/mod.rs

@@ -33,7 +33,7 @@ pub fn download_specs(branch: &str, download_dir: &PathBuf) -> Result<(), failur
     let mut headers = HeaderMap::new();
     headers.append(
         USER_AGENT,
-        HeaderValue::from_str(&format!("elasticsearch-rs/{}", env!("CARGO_PKG_NAME")))?,
+        HeaderValue::from_str(&format!("opensearch-rs/{}", env!("CARGO_PKG_NAME")))?,
     );
     let client = reqwest::ClientBuilder::new()
         .default_headers(headers)
@@ -46,13 +46,11 @@ pub fn download_specs(branch: &str, download_dir: &PathBuf) -> Result<(), failur
 
     let oss_spec = Glob::new("**/rest-api-spec/src/main/resources/rest-api-spec/api/*.json")?
         .compile_matcher();
-    let xpack_spec = Glob::new("**/x-pack/plugin/src/test/resources/rest-api-spec/api/*.json")?
-        .compile_matcher();
 
     for entry in archive.entries()? {
         let file = entry?;
         let path = file.path()?;
-        if oss_spec.is_match(&path) || xpack_spec.is_match(&path) {
+        if oss_spec.is_match(&path) {
             write_spec_file(download_dir, file)?;
         }
     }

elasticsearch/examples/cat_indices.rs → opensearch/examples/cat_indices.rs

@@ -34,7 +34,7 @@ use elasticsearch::{
     auth::Credentials,
     cat::CatIndicesParts,
     http::transport::{SingleNodeConnectionPool, TransportBuilder},
-    Elasticsearch, Error, DEFAULT_ADDRESS,
+    Error, OpenSearch, DEFAULT_ADDRESS,
 };
 use sysinfo::SystemExt;
 use url::Url;
@@ -55,7 +55,7 @@ pub async fn main() -> Result<(), Box<dyn std::error::Error>> {
     Ok(())
 }
 
-fn create_client() -> Result<Elasticsearch, Error> {
+fn create_client() -> Result<OpenSearch, Error> {
     fn cluster_addr() -> String {
         match std::env::var("OPENSEARCH_URL") {
             Ok(server) => server,
@@ -118,5 +118,5 @@ fn create_client() -> Result<Elasticsearch, Error> {
     }
 
     let transport = builder.build()?;
-    Ok(Elasticsearch::new(transport))
+    Ok(OpenSearch::new(transport))
 }

elasticsearch/examples/index_questions_answers/main.rs → opensearch/examples/index_questions_answers/main.rs

@@ -33,14 +33,14 @@ extern crate serde_json;
 
 use clap::{App, Arg};
 #[cfg(any(feature = "native-tls", feature = "rustls-tls"))]
-use elasticsearch::cert::CertificateValidation;
-use elasticsearch::{
+use opensearch::cert::CertificateValidation;
+use opensearch::{
     auth::Credentials,
     http::transport::{SingleNodeConnectionPool, TransportBuilder},
     indices::{
         IndicesCreateParts, IndicesDeleteParts, IndicesExistsParts, IndicesPutSettingsParts,
     },
-    BulkOperation, BulkParts, Elasticsearch, Error, DEFAULT_ADDRESS,
+    BulkOperation, BulkParts, Error, OpenSearch, DEFAULT_ADDRESS,
 };
 use serde_json::Value;
 use sysinfo::SystemExt;
@@ -157,7 +157,7 @@ pub async fn main() -> Result<(), Box<dyn std::error::Error>> {
     Ok(())
 }
 
-async fn set_refresh_interval(client: &Elasticsearch, interval: Value) -> Result<(), Error> {
+async fn set_refresh_interval(client: &OpenSearch, interval: Value) -> Result<(), Error> {
     let response = client
         .indices()
         .put_settings(IndicesPutSettingsParts::Index(&[POSTS_INDEX]))
@@ -176,7 +176,7 @@ async fn set_refresh_interval(client: &Elasticsearch, interval: Value) -> Result
     Ok(())
 }
 
-async fn index_posts(client: &Elasticsearch, posts: &[Post]) -> Result<(), Error> {
+async fn index_posts(client: &OpenSearch, posts: &[Post]) -> Result<(), Error> {
     let body: Vec<BulkOperation<_>> = posts
         .iter()
         .map(|p| {
@@ -208,7 +208,7 @@ async fn index_posts(client: &Elasticsearch, posts: &[Post]) -> Result<(), Error
     Ok(())
 }
 
-async fn create_index_if_not_exists(client: &Elasticsearch, delete: bool) -> Result<(), Error> {
+async fn create_index_if_not_exists(client: &OpenSearch, delete: bool) -> Result<(), Error> {
     let exists = client
         .indices()
         .exists(IndicesExistsParts::Index(&[POSTS_INDEX]))
@@ -372,7 +372,7 @@ async fn create_index_if_not_exists(client: &Elasticsearch, delete: bool) -> Res
     Ok(())
 }
 
-fn create_client() -> Result<Elasticsearch, Error> {
+fn create_client() -> Result<OpenSearch, Error> {
     fn cluster_addr() -> String {
         match std::env::var("OPENSEARCH_URL") {
             Ok(server) => server,
@@ -435,5 +435,5 @@ fn create_client() -> Result<Elasticsearch, Error> {
     }
 
     let transport = builder.build()?;
-    Ok(Elasticsearch::new(transport))
+    Ok(OpenSearch::new(transport))
 }

elasticsearch/examples/search_questions/main.rs → opensearch/examples/search_questions/main.rs

@@ -33,7 +33,7 @@ use elasticsearch::cert::CertificateValidation;
 use elasticsearch::{
     auth::Credentials,
     http::transport::{SingleNodeConnectionPool, TransportBuilder},
-    Elasticsearch, Error, SearchParts, DEFAULT_ADDRESS,
+    Error, OpenSearch, SearchParts, DEFAULT_ADDRESS,
 };
 use serde_json::{json, Value};
 use std::env;
@@ -122,7 +122,7 @@ pub async fn main() -> Result<(), Box<dyn std::error::Error>> {
     Ok(())
 }
 
-fn create_client() -> Result<Elasticsearch, Error> {
+fn create_client() -> Result<OpenSearch, Error> {
     fn cluster_addr() -> String {
         match std::env::var("OPENSEARCH_URL") {
             Ok(server) => server,
@@ -185,5 +185,5 @@ fn create_client() -> Result<Elasticsearch, Error> {
     }
 
     let transport = builder.build()?;
-    Ok(Elasticsearch::new(transport))
+    Ok(OpenSearch::new(transport))
 }

elasticsearch/examples/search_questions_answers/main.rs → opensearch/examples/search_questions_answers/main.rs

@@ -36,7 +36,7 @@ use elasticsearch::cert::CertificateValidation;
 use elasticsearch::{
     auth::Credentials,
     http::transport::{SingleNodeConnectionPool, TransportBuilder},
-    Elasticsearch, Error, SearchParts, DEFAULT_ADDRESS,
+    Error, OpenSearch, SearchParts, DEFAULT_ADDRESS,
 };
 use serde_json::Value;
 use std::env;
@@ -109,7 +109,7 @@ pub async fn main() -> Result<(), Box<dyn std::error::Error>> {
     Ok(())
 }
 
-fn create_client() -> Result<Elasticsearch, Error> {
+fn create_client() -> Result<OpenSearch, Error> {
     fn cluster_addr() -> String {
         match std::env::var("OPENSEARCH_URL") {
             Ok(server) => server,
@@ -172,5 +172,5 @@ fn create_client() -> Result<Elasticsearch, Error> {
     }
 
     let transport = builder.build()?;
-    Ok(Elasticsearch::new(transport))
+    Ok(OpenSearch::new(transport))
 }

elasticsearch/src/cat.rs → opensearch/src/cat.rs

@@ -36,12 +36,12 @@
 //! and accept headers, returning plain text responses
 //!
 //! ```rust,no_run
-//! # use elasticsearch::{Elasticsearch, Error, SearchParts};
+//! # use elasticsearch::{OpenSearch, Error, SearchParts};
 //! # use url::Url;
 //! # use elasticsearch::auth::Credentials;
 //! # use serde_json::{json, Value};
 //! # async fn doc() -> Result<(), Box<dyn std::error::Error>> {
-//! # let client = Elasticsearch::default();
+//! # let client = OpenSearch::default();
 //! let response = client
 //!     .cat()
 //!     .nodes()
@@ -58,12 +58,12 @@
 //! JSON responses can be returned from Cat APIs either by using `.format("json")`
 //!
 //! ```rust,no_run
-//! # use elasticsearch::{Elasticsearch, Error, SearchParts};
+//! # use elasticsearch::{OpenSearch, Error, SearchParts};
 //! # use url::Url;
 //! # use elasticsearch::auth::Credentials;
 //! # use serde_json::{json, Value};
 //! # async fn doc() -> Result<(), Box<dyn std::error::Error>> {
-//! # let client = Elasticsearch::default();
+//! # let client = OpenSearch::default();
 //! let response = client
 //!     .cat()
 //!     .nodes()
@@ -79,11 +79,11 @@
 //! Or by setting an accept header using `.headers()`
 //!
 //! ```rust,no_run
-//! # use elasticsearch::{Elasticsearch, Error, SearchParts, http::headers::{HeaderValue, DEFAULT_ACCEPT, ACCEPT}};
+//! # use elasticsearch::{OpenSearch, Error, SearchParts, http::headers::{HeaderValue, DEFAULT_ACCEPT, ACCEPT}};
 //! # use url::Url;
 //! # use serde_json::{json, Value};
 //! # async fn doc() -> Result<(), Box<dyn std::error::Error>> {
-//! # let client = Elasticsearch::default();
+//! # let client = OpenSearch::default();
 //! let response = client
 //!     .cat()
 //!     .nodes()
@@ -101,11 +101,11 @@
 //! The column headers to return can be controlled with `.h()`
 //!
 //! ```rust,no_run
-//! # use elasticsearch::{Elasticsearch, Error, SearchParts};
+//! # use elasticsearch::{OpenSearch, Error, SearchParts};
 //! # use url::Url;
 //! # use serde_json::{json, Value};
 //! # async fn doc() -> Result<(), Box<dyn std::error::Error>> {
-//! # let client = Elasticsearch::default();
+//! # let client = OpenSearch::default();
 //! let response = client
 //!     .cat()
 //!     .nodes()
@@ -121,7 +121,7 @@
 
 #![allow(unused_imports)]
 use crate::{
-    client::Elasticsearch,
+    client::OpenSearch,
     error::Error,
     http::{
         headers::{HeaderMap, HeaderName, HeaderValue, ACCEPT, CONTENT_TYPE},
@@ -4058,7 +4058,7 @@ impl<'a> Cat<'a> {
         CatThreadPool::new(self.transport(), parts)
     }
 }
-impl Elasticsearch {
+impl OpenSearch {
     #[doc = "Creates a namespace client for Cat APIs"]
     pub fn cat(&self) -> Cat {
         Cat::new(self.transport())

elasticsearch/src/cert.rs → opensearch/src/cert.rs

@@ -136,7 +136,7 @@ let _response = client.ping().send().await?;
 /// # use elasticsearch::{
 /// #     auth::Credentials,
 /// #     cert::{Certificate,CertificateValidation},
-/// #     Error, Elasticsearch,
+/// #     Error, OpenSearch,
 /// #     http::transport::{TransportBuilder,SingleNodeConnectionPool},
 /// # };
 /// # use std::fs::File;
@@ -148,7 +148,7 @@ let _response = client.ping().send().await?;
 /// let transport = TransportBuilder::new(conn_pool)
 ///     .cert_validation(CertificateValidation::None)
 ///     .build()?;
-/// let client = Elasticsearch::new(transport);
+/// let client = OpenSearch::new(transport);
 /// let _response = client.ping().send().await?;
 /// # Ok(())
 /// # }

elasticsearch/src/client.rs → opensearch/src/client.rs

@@ -67,14 +67,14 @@ where
 
 /// Root client for top level APIs
 #[derive(Clone, Debug, Default)]
-pub struct Elasticsearch {
+pub struct OpenSearch {
     transport: Transport,
 }
 
-impl Elasticsearch {
+impl OpenSearch {
     /// Creates a new instance of the root client
     pub fn new(transport: Transport) -> Self {
-        Elasticsearch { transport }
+        OpenSearch { transport }
     }
 
     /// Gets the transport of the client

elasticsearch/src/cluster.rs → opensearch/src/cluster.rs

@@ -31,7 +31,7 @@
 
 #![allow(unused_imports)]
 use crate::{
-    client::Elasticsearch,
+    client::OpenSearch,
     error::Error,
     http::{
         headers::{HeaderMap, HeaderName, HeaderValue, ACCEPT, CONTENT_TYPE},
@@ -2497,7 +2497,7 @@ impl<'a> Cluster<'a> {
         ClusterStats::new(self.transport(), parts)
     }
 }
-impl Elasticsearch {
+impl OpenSearch {
     #[doc = "Creates a namespace client for Cluster APIs"]
     pub fn cluster(&self) -> Cluster {
         Cluster::new(self.transport())

elasticsearch/src/dangling_indices.rs → opensearch/src/dangling_indices.rs

@@ -35,7 +35,7 @@
 
 #![allow(unused_imports)]
 use crate::{
-    client::Elasticsearch,
+    client::OpenSearch,
     error::Error,
     http::{
         headers::{HeaderMap, HeaderName, HeaderValue, ACCEPT, CONTENT_TYPE},
@@ -516,7 +516,7 @@ impl<'a> DanglingIndices<'a> {
         DanglingIndicesListDanglingIndices::new(self.transport())
     }
 }
-impl Elasticsearch {
+impl OpenSearch {
     #[doc = "Creates a namespace client for DanglingIndices APIs"]
     pub fn dangling_indices(&self) -> DanglingIndices {
         DanglingIndices::new(self.transport())

elasticsearch/src/generated/root.rs → opensearch/src/generated/root.rs

@@ -23,7 +23,7 @@
 // cargo run -p api_generator
 // -----------------------------------------------
 # ! [ allow ( unused_imports ) ]use crate::{
-    client::Elasticsearch,
+    client::OpenSearch,
     error::Error,
     http::{
         headers::{HeaderMap, HeaderName, HeaderValue, ACCEPT, CONTENT_TYPE},