YDB support issue. Fix "PEM encoding" -> "PEM encoded"

Author: UgnineSirdis

ydb/apps/dstool/lib/common.py

@@ -159,7 +159,7 @@ def add_host_access_options(self, parser, with_endpoint=True):
         g.add_argument('--mon-port', type=int, default=8765, metavar='PORT', help='HTTP monitoring port for viewer JSON access')
         g.add_argument('--mon-protocol', type=str, metavar='PROTOCOL', choices=('http', 'https'), help='HTTP monitoring protocol for viewer JSON access')
         g.add_argument('--token-file', type=FileType(encoding='ascii'), metavar='PATH', help='Path to token file')
-        g.add_argument('--ca-file', metavar='PATH', dest='cafile', type=str, help='Path to a file containing the PEM encoding of the server root certificates for tls connections.')
+        g.add_argument('--ca-file', metavar='PATH', dest='cafile', type=str, help='Path to a file containing PEM encoded root certificates for tls connections.')
         g.add_argument('--http', action='store_true', help='Use HTTP to connect to blob storage controller instead of GRPC')
         g.add_argument('--http-timeout', type=int, default=5, help='Timeout for blocking socket I/O operations during HTTP(s) queries')
         g.add_argument('--insecure', action='store_true', help='Allow insecure HTTPS fetching')

ydb/core/driver_lib/run/main.cpp

@@ -89,9 +89,9 @@ int MainRun(const TKikimrRunConfig& runConfig, std::shared_ptr<TModuleFactories>
         configParser.SetupGlobalOpts(opts);
         NMsgBusProxy::TMsgBusClientConfig mbusConfig;
         mbusConfig.ConfigureLastGetopt(opts, "mb-");
-        opts.AddLongOption("ca-file", "Path to a file containing the PEM encoding of the server root certificates for tls connections.\n").RequiredArgument("PATH");
-        opts.AddLongOption("client-cert-file", "Path to a file containing the PEM encoding of the client certificate for tls connections.\n").RequiredArgument("PATH");
-        opts.AddLongOption("client-cert-key-file", "Path to a file containing the PEM encoding of the client certificate private key for tls connections.\n").RequiredArgument("PATH");
+        opts.AddLongOption("ca-file", "Path to a file containing PEM encoded root certificates for tls connections.\n").RequiredArgument("PATH");
+        opts.AddLongOption("client-cert-file", "Path to a file containing PEM encoded client certificate for tls connections.\n").RequiredArgument("PATH");
+        opts.AddLongOption("client-cert-key-file", "Path to a file containing PEM encoded client certificate private key for tls connections.\n").RequiredArgument("PATH");
         NDriverClient::HideOptions(opts);
         opts.AddLongOption('s', "server", "Server address to connect (default $KIKIMR_SERVER)").RequiredArgument("ADDR[:NUM]");
         opts.AddLongOption('k', "token", "Security token").RequiredArgument("TOKEN");

ydb/public/lib/ydb_cli/commands/ydb_profile.cpp

@@ -740,13 +740,13 @@ void TCommandProfileCommon::Config(TConfig& config) {
         .RequiredArgument("STR").StoreResult(&IamEndpoint);
     }
     opts.AddLongOption("ca-file",
-        "Path to a file containing the PEM encoding of the server root certificates for tls connections.")
+        "Path to a file containing PEM encoded root certificates for tls connections.")
         .RequiredArgument("PATH").StoreResult(&CaCertsFile);
     opts.AddLongOption("client-cert-file",
-        "Path to a file containing the PEM encoding of the client certificate for tls connections")
+        "Path to a file containing PEM encoded client certificate for tls connections")
         .RequiredArgument("PATH").StoreResult(&ClientCertFile);
     opts.AddLongOption("client-cert-key-file",
-        "Path to a file containing the PEM encoding of the client certificate private key for tls connections")
+        "Path to a file containing PEM encoded client certificate private key for tls connections")
         .RequiredArgument("PATH").StoreResult(&ClientCertPrivateKeyFile);
     if (!IsStdinInteractive()) {
         GetOptionsFromStdin();
@@ -1100,11 +1100,11 @@ void TCommandUpdateProfile::Config(TConfig& config) {
     if (config.UseIamAuth) {
         opts.AddLongOption("no-iam-endpoint", "Delete endpoint of IAM service from the profile").StoreTrue(&NoIamEndpoint);
     }
-    opts.AddLongOption("no-ca-file", "Delete path to file containing the PEM encoding of the "
+    opts.AddLongOption("no-ca-file", "Delete path to file containing PEM encoded "
         "server root certificates for tls connections from the profile").StoreTrue(&NoCaCertsFile);
-    opts.AddLongOption("no-client-cert-file", "Delete path to a file containing the PEM encoding of the "
+    opts.AddLongOption("no-client-cert-file", "Delete path to a file containing PEM encoded "
         "client certificate for tls connections").StoreTrue(&NoClientCertFile);
-    opts.AddLongOption("no-client-cert-key-file", "Delete path to a file containing the PEM encoding of the "
+    opts.AddLongOption("no-client-cert-key-file", "Delete path to a file containing PEM encoded "
         "client certificate private key for tls connections").StoreTrue(&NoClientCertPrivateKeyFile);
 }
 

ydb/public/lib/ydb_cli/common/root.cpp

@@ -22,14 +22,14 @@ void TClientCommandRootBase::Config(TConfig& config) {
     opts.AddLongOption('t', "time", "Show request execution time").NoArgument().SetFlag(&TimeRequests);
     opts.AddLongOption('o', "progress", "Show progress of long requests").NoArgument().SetFlag(&ProgressRequests);
     opts.AddLongOption("ca-file",
-        "Path to a file containing the PEM encoding of the server root certificates for tls connections.\n"
+        "Path to a file containing PEM encoded root certificates for tls connections.\n"
         "If this parameter is empty, the default roots will be used.")
         .RequiredArgument("PATH").StoreResult(&CaCertsFile);
     opts.AddLongOption("client-cert-file",
-        "Path to a file containing the PEM encoding of the client certificate for tls connections")
+        "Path to a file containing PEM encoded client certificate for tls connections")
         .RequiredArgument("PATH").StoreResult(&ClientCertFile);
     opts.AddLongOption("client-cert-key-file",
-        "Path to a file containing the PEM encoding of the client certificate private key for tls connections")
+        "Path to a file containing PEM encoded client certificate private key for tls connections")
         .RequiredArgument("PATH").StoreResult(&ClientCertPrivateKeyFile);
 
     opts.SetCustomUsage(config.ArgV[0]);

ydb/public/sdk/cpp/client/ydb_driver/driver.h

@@ -48,7 +48,7 @@ class TDriverConfig {
     //! default: 0
     TDriverConfig& SetMaxClientQueueSize(size_t sz);
     //! Enable Ssl.
-    //! caCerts  - The buffer containing the PEM encoding of the server root certificates.
+    //! caCerts  - The buffer containing PEM encoded root certificates.
     //!            If this parameter is empty, the default roots will be used.
     TDriverConfig& UseSecureConnection(const TStringType& caCerts = TStringType());
     TDriverConfig& UseClientCertificate(const TStringType& clientCert, const TStringType& clientPrivateKey);