use tls stuff in uri

Author: anandsyncs

docs/search/03-search-query-usage/code_snippets/03_0420_import_movies_mflix_database.sh

@@ -1,29 +1,16 @@
-# Restore sample_mflix database with TLS (auto-detect modern vs legacy flags)
+# Restore sample_mflix database. Provide any TLS parameters directly within MDB_CONNECTION_STRING.
 kubectl exec -n "${MDB_NS}" --context "${K8S_CTX}" \
   mongodb-tools-pod -- env MDB_CONNECTION_STRING="${MDB_CONNECTION_STRING}" /bin/bash -eu -c "$(cat <<'EOF'
 set -o pipefail
 echo "Downloading sample database archive..."
 curl -fSL https://atlas-education.s3.amazonaws.com/sample_mflix.archive -o /tmp/sample_mflix.archive
 
-echo "Detecting mongorestore TLS flag support..."
-if mongorestore --help 2>&1 | grep -q -- '--tlsCAFile'; then
-  TLS_FLAG="--tls"
-  CA_FLAG="--tlsCAFile"
-else
-  TLS_FLAG="--ssl"
-  CA_FLAG="--sslCAFile"
-fi
-
-echo "Using $TLS_FLAG with $CA_FLAG"
-
-echo "Restoring sample database with TLS"
+echo "Restoring sample database"
 mongorestore \
   --archive=/tmp/sample_mflix.archive \
   --verbose=1 \
   --drop \
   --nsInclude 'sample_mflix.*' \
-  "$TLS_FLAG" \
-  "$CA_FLAG" /tls/ca.crt \
   --uri="${MDB_CONNECTION_STRING}"
 EOF
 )"

docs/search/03-search-query-usage/code_snippets/03_0430_create_search_index.sh

@@ -1,4 +1,4 @@
 kubectl exec --context "${K8S_CTX}" -n "${MDB_NS}" mongodb-tools-pod -- \
-  mongosh --quiet --tls --tlsCAFile /tls/ca.crt "${MDB_CONNECTION_STRING}" \
+  mongosh --quiet "${MDB_CONNECTION_STRING}" \
     --eval "use sample_mflix" \
     --eval 'db.movies.createSearchIndex("default", { mappings: { dynamic: true } });'

docs/search/03-search-query-usage/code_snippets/03_0435_create_vector_search_index.sh

@@ -1,5 +1,5 @@
 kubectl exec --context "${K8S_CTX}" -n "${MDB_NS}" mongodb-tools-pod -- \
-  mongosh --quiet --tls --tlsCAFile /tls/ca.crt "${MDB_CONNECTION_STRING}" \
+  mongosh --quiet "${MDB_CONNECTION_STRING}" \
     --eval "use sample_mflix" \
     --eval 'db.embedded_movies.createSearchIndex("vector_index", "vectorSearch",
     { "fields": [ {

docs/search/03-search-query-usage/code_snippets/03_0444_list_search_indexes.sh

@@ -1,4 +1,4 @@
 kubectl exec --context "${K8S_CTX}" -n "${MDB_NS}" mongodb-tools-pod -- \
-  mongosh --quiet --tls --tlsCAFile /tls/ca.crt "${MDB_CONNECTION_STRING}" \
+  mongosh --quiet "${MDB_CONNECTION_STRING}" \
     --eval "use sample_mflix" \
     --eval 'db.runCommand({"listSearchIndexes": "movies"});'

docs/search/03-search-query-usage/code_snippets/03_0445_list_vector_search_indexes.sh

@@ -1,4 +1,4 @@
 kubectl exec --context "${K8S_CTX}" -n "${MDB_NS}" mongodb-tools-pod -- \
-  mongosh --quiet --tls --tlsCAFile /tls/ca.crt "${MDB_CONNECTION_STRING}" \
+  mongosh --quiet "${MDB_CONNECTION_STRING}" \
     --eval "use sample_mflix" \
     --eval 'db.runCommand({"listSearchIndexes": "embedded_movies"});'

docs/search/03-search-query-usage/code_snippets/03_0450_execute_search_query.sh

@@ -41,6 +41,6 @@ EOF
 kubectl exec --context "${K8S_CTX}" -n "${MDB_NS}" \
   mongodb-tools-pod -- /bin/bash -eu -c "$(cat <<EOF
 echo '${mdb_script}' > /tmp/mdb_script.js
-mongosh --quiet --tls --tlsCAFile /tls/ca.crt "${MDB_CONNECTION_STRING}" < /tmp/mdb_script.js
+mongosh --quiet "${MDB_CONNECTION_STRING}" < /tmp/mdb_script.js
 EOF
 )"

docs/search/03-search-query-usage/code_snippets/03_0455_execute_vector_search_query.sh

@@ -25,6 +25,6 @@ EOF
 
 kubectl exec --context "${K8S_CTX}" -n "${MDB_NS}" mongodb-tools-pod -- /bin/bash -eu -c "$(cat <<EOF
 echo '${mdb_script}' > /tmp/mdb_script.js
-mongosh --quiet --tls --tlsCAFile /tls/ca.crt "${MDB_CONNECTION_STRING}" < /tmp/mdb_script.js
+mongosh --quiet "${MDB_CONNECTION_STRING}" < /tmp/mdb_script.js
 EOF
 )"

docs/search/03-search-query-usage/env_variables.sh

@@ -15,11 +15,14 @@
 # user only for the connection string in MDB_CONNECTION_STRING env var below
 #export MDB_RESOURCE_NAME="mdbc-rs"
 
-# TLS-related secret names used by the snippets in this module
+# TLS-related resources used by the snippets in this module
 #export MDB_TLS_CA_SECRET_NAME="${MDB_RESOURCE_NAME}-ca"
+#export MDB_TLS_CA_CONFIGMAP="${MDB_RESOURCE_NAME}-ca-configmap"
 #export MDB_TLS_SERVER_CERT_SECRET_NAME="${MDB_RESOURCE_NAME}-tls"
 #export MDB_SEARCH_TLS_SECRET_NAME="${MDB_RESOURCE_NAME}-search-tls"
 
 # default connection string if MongoDB database is deployed using the operator
 #export MDB_CONNECTION_STRING="mongodb://mdb-user:${MDB_USER_PASSWORD}@${MDB_RESOURCE_NAME}-0.${MDB_RESOURCE_NAME}-svc.${MDB_NS}.svc.cluster.local:27017/?replicaSet=${MDB_RESOURCE_NAME}"
+# To enable TLS for the shared snippets, append driver options directly to the connection string, for example:
+#export MDB_CONNECTION_STRING="mongodb://mdb-user:${MDB_USER_PASSWORD}@${MDB_RESOURCE_NAME}-0.${MDB_RESOURCE_NAME}-svc.${MDB_NS}.svc.cluster.local:27017/?replicaSet=${MDB_RESOURCE_NAME}&tls=true&tlsCAFile=%2Ftls%2Fca.crt"
 

scripts/code_snippets/tests/test_kind_search_community_snippets.sh

@@ -31,7 +31,6 @@ echo "Sourcing env variables for ${CODE_SNIPPETS_FLAVOR} flavor"
 test -f "${test_dir}/env_variables_${CODE_SNIPPETS_FLAVOR}.sh" && source "${test_dir}/env_variables_${CODE_SNIPPETS_FLAVOR}.sh"
 
 export MDB_RESOURCE_NAME="mdbc-rs"
-export MDB_CONNECTION_STRING="mongodb://mdb-user:${MDB_USER_PASSWORD}@${MDB_RESOURCE_NAME}-0.${MDB_RESOURCE_NAME}-svc.${MDB_NS}.svc.cluster.local:27017/?replicaSet=${MDB_RESOURCE_NAME}"
+export MDB_CONNECTION_STRING="mongodb://mdb-user:${MDB_USER_PASSWORD}@${MDB_RESOURCE_NAME}-0.${MDB_RESOURCE_NAME}-svc.${MDB_NS}.svc.cluster.local:27017/?replicaSet=${MDB_RESOURCE_NAME}&tls=true&tlsCAFile=/tls/ca.crt"
 
 ${test_dir}/test.sh
-

scripts/code_snippets/tests/test_kind_search_enterprise_snippets.sh

@@ -30,6 +30,6 @@ echo "Sourcing env variables for ${CODE_SNIPPETS_FLAVOR} flavor"
 # shellcheck disable=SC1090
 test -f "${test_dir}/env_variables_${CODE_SNIPPETS_FLAVOR}.sh" && source "${test_dir}/env_variables_${CODE_SNIPPETS_FLAVOR}.sh"
 
-export MDB_CONNECTION_STRING="mongodb://mdb-user:${MDB_USER_PASSWORD}@${MDB_RESOURCE_NAME}-0.${MDB_RESOURCE_NAME}-svc.${MDB_NS}.svc.cluster.local:27017/?replicaSet=${MDB_RESOURCE_NAME}"
+export MDB_CONNECTION_STRING="mongodb://mdb-user:${MDB_USER_PASSWORD}@${MDB_RESOURCE_NAME}-0.${MDB_RESOURCE_NAME}-svc.${MDB_NS}.svc.cluster.local:27017/?replicaSet=${MDB_RESOURCE_NAME}&tls=true&tlsCAFile=/tls/ca.crt"
 
 ${test_dir}/test.sh