regen config classes + version -> 1.2.0-RC2 (#1037)

mhowlett · web-flow · commit 82380f3c62f1 · 2019-08-23T11:43:19.000-07:00
* regen config classes + version -&gt; 1.2.0-RC2

* replace escaped pipe with pipe
diff --git a/README.md b/README.md
@@ -42,13 +42,13 @@ confluent-kafka-dotnet is distributed via NuGet. We provide three packages:
 To install Confluent.Kafka from within Visual Studio, search for Confluent.Kafka in the NuGet Package Manager UI, or run the following command in the Package Manager Console:
 
 ```
-Install-Package Confluent.Kafka -Version 1.2.0-RC1
+Install-Package Confluent.Kafka -Version 1.2.0-RC2
 ```
 
 To add a reference to a dotnet core project, execute the following at the command line:
 
 ```
-dotnet add package -v 1.2.0-RC1 Confluent.Kafka
+dotnet add package -v 1.2.0-RC2 Confluent.Kafka
 ```
 
 
diff --git a/examples/AdminClient/AdminClient.csproj b/examples/AdminClient/AdminClient.csproj
@@ -9,7 +9,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <!-- nuget package reference: <PackageReference Include="Confluent.Kafka" Version="1.2.0-RC1" /> -->
+    <!-- nuget package reference: <PackageReference Include="Confluent.Kafka" Version="1.2.0-RC2" /> -->
     <ProjectReference Include="../../src/Confluent.Kafka/Confluent.Kafka.csproj" />
   </ItemGroup>
 
diff --git a/examples/AvroBlogExamples/AvroBlogExamples.csproj b/examples/AvroBlogExamples/AvroBlogExamples.csproj
@@ -8,7 +8,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <!-- nuget package reference: <PackageReference Include="Confluent.SchemaRegistry.Serdes" Version="1.2.0-RC1" /> -->
+    <!-- nuget package reference: <PackageReference Include="Confluent.SchemaRegistry.Serdes" Version="1.2.0-RC2" /> -->
     <ProjectReference Include="../../src/Confluent.SchemaRegistry.Serdes/Confluent.SchemaRegistry.Serdes.csproj" />
   </ItemGroup>
 
diff --git a/examples/AvroGeneric/AvroGeneric.csproj b/examples/AvroGeneric/AvroGeneric.csproj
@@ -9,7 +9,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <!-- nuget package reference: <PackageReference Include="Confluent.SchemaRegistry.Serdes" Version="1.2.0-RC1" /> -->
+    <!-- nuget package reference: <PackageReference Include="Confluent.SchemaRegistry.Serdes" Version="1.2.0-RC2" /> -->
     <ProjectReference Include="../../src/Confluent.SchemaRegistry.Serdes/Confluent.SchemaRegistry.Serdes.csproj" />
   </ItemGroup>
 
diff --git a/examples/AvroSpecific/AvroSpecific.csproj b/examples/AvroSpecific/AvroSpecific.csproj
@@ -9,7 +9,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <!-- nuget package reference: <PackageReference Include="Confluent.SchemaRegistry.Serdes" Version="1.2.0-RC1" /> -->
+    <!-- nuget package reference: <PackageReference Include="Confluent.SchemaRegistry.Serdes" Version="1.2.0-RC2" /> -->
     <ProjectReference Include="../../src/Confluent.SchemaRegistry.Serdes/Confluent.SchemaRegistry.Serdes.csproj" />
   </ItemGroup>
 
diff --git a/examples/ConfluentCloud/ConfluentCloud.csproj b/examples/ConfluentCloud/ConfluentCloud.csproj
@@ -7,7 +7,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <!-- nuget package reference: <PackageReference Include="Confluent.Kafka" Version="1.2.0-RC1" /> -->
+    <!-- nuget package reference: <PackageReference Include="Confluent.Kafka" Version="1.2.0-RC2" /> -->
     <ProjectReference Include="../../src/Confluent.Kafka/Confluent.Kafka.csproj" />
   </ItemGroup>
 
diff --git a/examples/Consumer/Consumer.csproj b/examples/Consumer/Consumer.csproj
@@ -8,7 +8,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <!-- nuget package reference: <PackageReference Include="Confluent.Kafka" Version="1.2.0-RC1" /> -->
+    <!-- nuget package reference: <PackageReference Include="Confluent.Kafka" Version="1.2.0-RC2" /> -->
     <ProjectReference Include="../../src/Confluent.Kafka/Confluent.Kafka.csproj" />
   </ItemGroup>
 
diff --git a/examples/MultiProducer/MultiProducer.csproj b/examples/MultiProducer/MultiProducer.csproj
@@ -8,7 +8,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <!-- nuget package reference: <PackageReference Include="Confluent.Kafka" Version="1.2.0-RC1" /> -->
+    <!-- nuget package reference: <PackageReference Include="Confluent.Kafka" Version="1.2.0-RC2" /> -->
     <ProjectReference Include="../../src/Confluent.Kafka/Confluent.Kafka.csproj" />
   </ItemGroup>
 
diff --git a/examples/Producer/Producer.csproj b/examples/Producer/Producer.csproj
@@ -9,7 +9,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <!-- nuget package reference: <PackageReference Include="Confluent.Kafka" Version="1.2.0-RC1" /> -->
+    <!-- nuget package reference: <PackageReference Include="Confluent.Kafka" Version="1.2.0-RC2" /> -->
     <ProjectReference Include="../../src/Confluent.Kafka/Confluent.Kafka.csproj" />
   </ItemGroup>
   
diff --git a/examples/Protobuf/Protobuf.csproj b/examples/Protobuf/Protobuf.csproj
@@ -9,7 +9,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <!-- nuget package reference: <PackageReference Include="Confluent.Kafka" Version="1.2.0-RC1" /> -->
+    <!-- nuget package reference: <PackageReference Include="Confluent.Kafka" Version="1.2.0-RC2" /> -->
     <ProjectReference Include="../../src/Confluent.Kafka/Confluent.Kafka.csproj" />
     <PackageReference Include="Grpc.Tools" Version="1.16.0" />
     <PackageReference Include="Google.Protobuf" Version="3.6.1" />
diff --git a/src/ConfigGen/Program.cs b/src/ConfigGen/Program.cs
@@ -246,6 +246,7 @@ static string parseType(string type)
             if (type == "enum value") { return "enum"; }
             if (type == "CSV flags") { return "string"; }
             if (type == "pattern list") { return "string"; }
+            if (type == "float") { return "double"; }
             if (type == "pointer") { return "pointer"; }
             if (type == "") { return "pointer"; }
             throw new Exception($"unknown type '{type}'");
@@ -303,7 +304,9 @@ static string ConfigNameToDotnetName(string configName)
             { "sasl_ssl", "SaslSsl" },
             { "consistent_random", "ConsistentRandom" },
             { "murmur2_random", "Murmur2Random"},
-            { "roundrobin", "RoundRobin" }
+            { "roundrobin", "RoundRobin" },
+            { "read_uncommitted", "ReadUncommitted" },
+            { "read_committed", "ReadCommitted" }
         };
 
         static string EnumNameToDotnetName(string enumName)
@@ -535,10 +538,10 @@ static List<PropertySpecification> extractAll(string configDoc)
                 prop.Name = columns[0];
                 prop.CPorA = columns[1];
                 prop.Range = columns[2];
-                prop.Default = columns[3];
+                prop.Default = columns[3].Replace("\\|", "|");
                 prop.Importance = columns[4];
 
-                var desc = columns[5];
+                var desc = columns[5].Replace("\\|", "|");
                 bool isAlias = desc.StartsWith("Alias");
                 if (isAlias)
                 {
diff --git a/src/Confluent.Kafka/Config_gen.cs b/src/Confluent.Kafka/Config_gen.cs
@@ -1,4 +1,4 @@
-// *** Auto-generated from librdkafka v1.0.0 *** - do not modify manually.
+// *** Auto-generated from librdkafka 7632802d315b1a10f27e957400a3ec74f12ffbe8 *** - do not modify manually.
 //
 // Copyright 2018 Confluent Inc.
 //
@@ -123,6 +123,22 @@ public enum SecurityProtocol
         SaslSsl
     }
 
+    /// <summary>
+    ///     SslEndpointIdentificationAlgorithm enum values
+    /// </summary>
+    public enum SslEndpointIdentificationAlgorithm
+    {
+        /// <summary>
+        ///     None
+        /// </summary>
+        None,
+
+        /// <summary>
+        ///     Https
+        /// </summary>
+        Https
+    }
+
     /// <summary>
     ///     PartitionAssignmentStrategy enum values
     /// </summary>
@@ -139,6 +155,22 @@ public enum PartitionAssignmentStrategy
         RoundRobin
     }
 
+    /// <summary>
+    ///     IsolationLevel enum values
+    /// </summary>
+    public enum IsolationLevel
+    {
+        /// <summary>
+        ///     ReadUncommitted
+        /// </summary>
+        ReadUncommitted,
+
+        /// <summary>
+        ///     ReadCommitted
+        /// </summary>
+        ReadCommitted
+    }
+
     /// <summary>
     ///     CompressionType enum values
     /// </summary>
@@ -355,7 +387,7 @@ public Acks? Acks
         public int? MetadataRequestTimeoutMs { get { return GetInt("metadata.request.timeout.ms"); } set { this.SetObject("metadata.request.timeout.ms", value); } }
 
         /// <summary>
-        ///     Topic metadata refresh interval in milliseconds. The metadata is automatically refreshed on error and connect. Use -1 to disable the intervalled refresh.
+        ///     Period of time in milliseconds at which topic and broker metadata is refreshed in order to proactively discover any new brokers, topics, partitions or partition leader changes. Use -1 to disable the intervalled refresh (not recommended). If there are no locally referenced topics (no topic objects created, no messages produced, no subscription or no assignment) then only the broker list will be refreshed every interval but no more often than every 10s.
         ///
         ///     default: 300000
         ///     importance: low
@@ -595,13 +627,21 @@ public Acks? Acks
         public string SslKeyLocation { get { return Get("ssl.key.location"); } set { this.SetObject("ssl.key.location", value); } }
 
         /// <summary>
-        ///     Private key passphrase
+        ///     Private key passphrase (for use with `ssl.key.location` and `set_ssl_cert()`)
         ///
         ///     default: ''
         ///     importance: low
         /// </summary>
         public string SslKeyPassword { get { return Get("ssl.key.password"); } set { this.SetObject("ssl.key.password", value); } }
 
+        /// <summary>
+        ///     Client's private key string (PEM format) used for authentication.
+        ///
+        ///     default: ''
+        ///     importance: low
+        /// </summary>
+        public string SslKeyPem { get { return Get("ssl.key.pem"); } set { this.SetObject("ssl.key.pem", value); } }
+
         /// <summary>
         ///     Path to client's public key (PEM) used for authentication.
         ///
@@ -610,11 +650,19 @@ public Acks? Acks
         /// </summary>
         public string SslCertificateLocation { get { return Get("ssl.certificate.location"); } set { this.SetObject("ssl.certificate.location", value); } }
 
+        /// <summary>
+        ///     Client's public key string (PEM format) used for authentication.
+        ///
+        ///     default: ''
+        ///     importance: low
+        /// </summary>
+        public string SslCertificatePem { get { return Get("ssl.certificate.pem"); } set { this.SetObject("ssl.certificate.pem", value); } }
+
         /// <summary>
         ///     File or directory path to CA certificate(s) for verifying the broker's key.
         ///
         ///     default: ''
-        ///     importance: medium
+        ///     importance: low
         /// </summary>
         public string SslCaLocation { get { return Get("ssl.ca.location"); } set { this.SetObject("ssl.ca.location", value); } }
 
@@ -642,6 +690,22 @@ public Acks? Acks
         /// </summary>
         public string SslKeystorePassword { get { return Get("ssl.keystore.password"); } set { this.SetObject("ssl.keystore.password", value); } }
 
+        /// <summary>
+        ///     Enable OpenSSL's builtin broker (server) certificate verification. This verification can be extended by the application by implementing a certificate_verify_cb.
+        ///
+        ///     default: true
+        ///     importance: low
+        /// </summary>
+        public bool? EnableSslCertificateVerification { get { return GetBool("enable.ssl.certificate.verification"); } set { this.SetObject("enable.ssl.certificate.verification", value); } }
+
+        /// <summary>
+        ///     Endpoint identification algorithm to validate broker hostname using broker certificate. https - Server (broker) hostname verification as specified in RFC2818. none - No endpoint verification. OpenSSL >= 1.0.2 required.
+        ///
+        ///     default: none
+        ///     importance: low
+        /// </summary>
+        public SslEndpointIdentificationAlgorithm? SslEndpointIdentificationAlgorithm { get { return (SslEndpointIdentificationAlgorithm?)GetEnum(typeof(SslEndpointIdentificationAlgorithm), "ssl.endpoint.identification.algorithm"); } set { this.SetObject("ssl.endpoint.identification.algorithm", value); } }
+
         /// <summary>
         ///     Kerberos principal name that Kafka runs as, not including /hostname@REALM
         ///
@@ -659,23 +723,23 @@ public Acks? Acks
         public string SaslKerberosPrincipal { get { return Get("sasl.kerberos.principal"); } set { this.SetObject("sasl.kerberos.principal", value); } }
 
         /// <summary>
-        ///     Full kerberos kinit command string, %{config.prop.name} is replaced by corresponding config object value, %{broker.name} returns the broker's hostname.
+        ///     Shell command to refresh or acquire the client's Kerberos ticket. This command is executed on client creation and every sasl.kerberos.min.time.before.relogin (0=disable). %{config.prop.name} is replaced by corresponding config object value.
         ///
-        ///     default: kinit -S "%{sasl.kerberos.service.name}/%{broker.name}" -k -t "%{sasl.kerberos.keytab}" %{sasl.kerberos.principal}
+        ///     default: kinit -R -t "%{sasl.kerberos.keytab}" -k %{sasl.kerberos.principal} || kinit -t "%{sasl.kerberos.keytab}" -k %{sasl.kerberos.principal}
         ///     importance: low
         /// </summary>
         public string SaslKerberosKinitCmd { get { return Get("sasl.kerberos.kinit.cmd"); } set { this.SetObject("sasl.kerberos.kinit.cmd", value); } }
 
         /// <summary>
-        ///     Path to Kerberos keytab file. Uses system default if not set.**NOTE**: This is not automatically used but must be added to the template in sasl.kerberos.kinit.cmd as ` ... -t %{sasl.kerberos.keytab}`.
+        ///     Path to Kerberos keytab file. This configuration property is only used as a variable in `sasl.kerberos.kinit.cmd` as ` ... -t "%{sasl.kerberos.keytab}"`.
         ///
         ///     default: ''
         ///     importance: low
         /// </summary>
         public string SaslKerberosKeytab { get { return Get("sasl.kerberos.keytab"); } set { this.SetObject("sasl.kerberos.keytab", value); } }
 
         /// <summary>
-        ///     Minimum time in milliseconds between key refresh attempts.
+        ///     Minimum time in milliseconds between key refresh attempts. Disable automatic key refresh by setting this property to 0.
         ///
         ///     default: 60000
         ///     importance: low
@@ -698,6 +762,22 @@ public Acks? Acks
         /// </summary>
         public string SaslPassword { get { return Get("sasl.password"); } set { this.SetObject("sasl.password", value); } }
 
+        /// <summary>
+        ///     SASL/OAUTHBEARER configuration. The format is implementation-dependent and must be parsed accordingly. The default unsecured token implementation (see https://tools.ietf.org/html/rfc7515#appendix-A.5) recognizes space-separated name=value pairs with valid names including principalClaimName, principal, scopeClaimName, scope, and lifeSeconds. The default value for principalClaimName is "sub", the default value for scopeClaimName is "scope", and the default value for lifeSeconds is 3600. The scope value is CSV format with the default value being no/empty scope. For example: `principalClaimName=azp principal=admin scopeClaimName=roles scope=role1,role2 lifeSeconds=600`. In addition, SASL extensions can be communicated to the broker via `extension_<extensionname>=value`. For example: `principal=admin extension_traceId=123`
+        ///
+        ///     default: ''
+        ///     importance: low
+        /// </summary>
+        public string SaslOauthbearerConfig { get { return Get("sasl.oauthbearer.config"); } set { this.SetObject("sasl.oauthbearer.config", value); } }
+
+        /// <summary>
+        ///     Enable the builtin unsecure JWT OAUTHBEARER token handler if no oauthbearer_refresh_cb has been set. This builtin handler should only be used for development or testing, and not in production.
+        ///
+        ///     default: false
+        ///     importance: low
+        /// </summary>
+        public bool? EnableSaslOauthbearerUnsecureJwt { get { return GetBool("enable.sasl.oauthbearer.unsecure.jwt"); } set { this.SetObject("enable.sasl.oauthbearer.unsecure.jwt", value); } }
+
         /// <summary>
         ///     List of plugin libraries to load (; separated). The library search path is platform dependent (see dlopen(3) for Unix and LoadLibrary() for Windows). If no filename extension is specified the platform-specific extension (such as .dll or .so) will be appended automatically.
         ///
@@ -860,10 +940,10 @@ public ProducerConfig(IDictionary<string, string> config) : base(config) { }
         /// <summary>
         ///     Delay in milliseconds to wait for messages in the producer queue to accumulate before constructing message batches (MessageSets) to transmit to brokers. A higher value allows larger and more effective (less overhead, improved compression) batches of messages to accumulate at the expense of increased message delivery latency.
         ///
-        ///     default: 0
+        ///     default: 0.5
         ///     importance: high
         /// </summary>
-        public int? LingerMs { get { return GetInt("linger.ms"); } set { this.SetObject("linger.ms", value); } }
+        public double? LingerMs { get { return (double?)GetEnum(typeof(double), "linger.ms"); } set { this.SetObject("linger.ms", value); } }
 
         /// <summary>
         ///     How many times to retry sending a failing Message. **Note:** retrying may cause reordering unless `enable.idempotence` is set to true.
@@ -1091,6 +1171,14 @@ public ConsumerConfig(IDictionary<string, string> config) : base(config) { }
         /// </summary>
         public int? FetchErrorBackoffMs { get { return GetInt("fetch.error.backoff.ms"); } set { this.SetObject("fetch.error.backoff.ms", value); } }
 
+        /// <summary>
+        ///     Controls how to read messages written transactionally: `read_committed` - only return transactional messages which have been committed. `read_uncommitted` - return all messages, even transactional messages which have been aborted.
+        ///
+        ///     default: read_uncommitted
+        ///     importance: high
+        /// </summary>
+        public IsolationLevel? IsolationLevel { get { return (IsolationLevel?)GetEnum(typeof(IsolationLevel), "isolation.level"); } set { this.SetObject("isolation.level", value); } }
+
         /// <summary>
         ///     Emit RD_KAFKA_RESP_ERR__PARTITION_EOF event whenever the consumer reaches the end of a partition.
         ///
diff --git a/src/Confluent.Kafka/Confluent.Kafka.csproj b/src/Confluent.Kafka/Confluent.Kafka.csproj
@@ -12,7 +12,7 @@
     <PackageId>Confluent.Kafka</PackageId>
     <Title>Confluent.Kafka</Title>
     <AssemblyName>Confluent.Kafka</AssemblyName>
-    <VersionPrefix>1.2.0-RC1</VersionPrefix>
+    <VersionPrefix>1.2.0-RC2</VersionPrefix>
     <TargetFrameworks>net45;net46;netcoreapp2.1;netstandard1.3;netstandard2.0</TargetFrameworks>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
diff --git a/src/Confluent.SchemaRegistry.Serdes/Confluent.SchemaRegistry.Serdes.csproj b/src/Confluent.SchemaRegistry.Serdes/Confluent.SchemaRegistry.Serdes.csproj
@@ -13,7 +13,7 @@
     <PackageId>Confluent.SchemaRegistry.Serdes</PackageId>
     <Title>Confluent.SchemaRegistry.Serdes</Title>
     <AssemblyName>Confluent.SchemaRegistry.Serdes</AssemblyName>
-    <VersionPrefix>1.2.0-RC1</VersionPrefix>
+    <VersionPrefix>1.2.0-RC2</VersionPrefix>
     <TargetFrameworks>netstandard2.0;net452;</TargetFrameworks>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
diff --git a/src/Confluent.SchemaRegistry/Confluent.SchemaRegistry.csproj b/src/Confluent.SchemaRegistry/Confluent.SchemaRegistry.csproj
@@ -13,7 +13,7 @@
     <PackageId>Confluent.SchemaRegistry</PackageId>
     <Title>Confluent.SchemaRegistry</Title>
     <AssemblyName>Confluent.SchemaRegistry</AssemblyName>
-    <VersionPrefix>1.2.0-RC1</VersionPrefix>
+    <VersionPrefix>1.2.0-RC2</VersionPrefix>
     <TargetFrameworks>net452;netstandard1.4;netstandard2.0</TargetFrameworks>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
