rename X509Chain to CertificateAuthorityChain (Azure#26272)

christothes · web-flow · commit 7c051b8f3ca5 · 2022-01-11T20:31:21.000-06:00
diff --git a/sdk/core/Azure.Core/api/Azure.Core.net461.cs b/sdk/core/Azure.Core/api/Azure.Core.net461.cs
@@ -922,10 +922,10 @@ public HttpPipelineTransportOptions() { }
     }
     public partial class ServerCertificateCustomValidationArgs
     {
-        public ServerCertificateCustomValidationArgs(System.Security.Cryptography.X509Certificates.X509Certificate2? certificate, System.Security.Cryptography.X509Certificates.X509Chain? x509Chain, System.Net.Security.SslPolicyErrors sslPolicyErrors) { }
+        public ServerCertificateCustomValidationArgs(System.Security.Cryptography.X509Certificates.X509Certificate2? certificate, System.Security.Cryptography.X509Certificates.X509Chain? certificateAuthorityChain, System.Net.Security.SslPolicyErrors sslPolicyErrors) { }
         public System.Security.Cryptography.X509Certificates.X509Certificate2? Certificate { get { throw null; } }
+        public System.Security.Cryptography.X509Certificates.X509Chain? CertificateAuthorityChain { get { throw null; } }
         public System.Net.Security.SslPolicyErrors SslPolicyErrors { get { throw null; } }
-        public System.Security.Cryptography.X509Certificates.X509Chain? X509Chain { get { throw null; } }
     }
 }
 namespace Azure.Core.Serialization
diff --git a/sdk/core/Azure.Core/api/Azure.Core.net5.0.cs b/sdk/core/Azure.Core/api/Azure.Core.net5.0.cs
@@ -922,10 +922,10 @@ public HttpPipelineTransportOptions() { }
     }
     public partial class ServerCertificateCustomValidationArgs
     {
-        public ServerCertificateCustomValidationArgs(System.Security.Cryptography.X509Certificates.X509Certificate2? certificate, System.Security.Cryptography.X509Certificates.X509Chain? x509Chain, System.Net.Security.SslPolicyErrors sslPolicyErrors) { }
+        public ServerCertificateCustomValidationArgs(System.Security.Cryptography.X509Certificates.X509Certificate2? certificate, System.Security.Cryptography.X509Certificates.X509Chain? certificateAuthorityChain, System.Net.Security.SslPolicyErrors sslPolicyErrors) { }
         public System.Security.Cryptography.X509Certificates.X509Certificate2? Certificate { get { throw null; } }
+        public System.Security.Cryptography.X509Certificates.X509Chain? CertificateAuthorityChain { get { throw null; } }
         public System.Net.Security.SslPolicyErrors SslPolicyErrors { get { throw null; } }
-        public System.Security.Cryptography.X509Certificates.X509Chain? X509Chain { get { throw null; } }
     }
 }
 namespace Azure.Core.Serialization
diff --git a/sdk/core/Azure.Core/api/Azure.Core.netcoreapp2.1.cs b/sdk/core/Azure.Core/api/Azure.Core.netcoreapp2.1.cs
@@ -922,10 +922,10 @@ public HttpPipelineTransportOptions() { }
     }
     public partial class ServerCertificateCustomValidationArgs
     {
-        public ServerCertificateCustomValidationArgs(System.Security.Cryptography.X509Certificates.X509Certificate2? certificate, System.Security.Cryptography.X509Certificates.X509Chain? x509Chain, System.Net.Security.SslPolicyErrors sslPolicyErrors) { }
+        public ServerCertificateCustomValidationArgs(System.Security.Cryptography.X509Certificates.X509Certificate2? certificate, System.Security.Cryptography.X509Certificates.X509Chain? certificateAuthorityChain, System.Net.Security.SslPolicyErrors sslPolicyErrors) { }
         public System.Security.Cryptography.X509Certificates.X509Certificate2? Certificate { get { throw null; } }
+        public System.Security.Cryptography.X509Certificates.X509Chain? CertificateAuthorityChain { get { throw null; } }
         public System.Net.Security.SslPolicyErrors SslPolicyErrors { get { throw null; } }
-        public System.Security.Cryptography.X509Certificates.X509Chain? X509Chain { get { throw null; } }
     }
 }
 namespace Azure.Core.Serialization
diff --git a/sdk/core/Azure.Core/api/Azure.Core.netstandard2.0.cs b/sdk/core/Azure.Core/api/Azure.Core.netstandard2.0.cs
@@ -922,10 +922,10 @@ public HttpPipelineTransportOptions() { }
     }
     public partial class ServerCertificateCustomValidationArgs
     {
-        public ServerCertificateCustomValidationArgs(System.Security.Cryptography.X509Certificates.X509Certificate2? certificate, System.Security.Cryptography.X509Certificates.X509Chain? x509Chain, System.Net.Security.SslPolicyErrors sslPolicyErrors) { }
+        public ServerCertificateCustomValidationArgs(System.Security.Cryptography.X509Certificates.X509Certificate2? certificate, System.Security.Cryptography.X509Certificates.X509Chain? certificateAuthorityChain, System.Net.Security.SslPolicyErrors sslPolicyErrors) { }
         public System.Security.Cryptography.X509Certificates.X509Certificate2? Certificate { get { throw null; } }
+        public System.Security.Cryptography.X509Certificates.X509Chain? CertificateAuthorityChain { get { throw null; } }
         public System.Net.Security.SslPolicyErrors SslPolicyErrors { get { throw null; } }
-        public System.Security.Cryptography.X509Certificates.X509Chain? X509Chain { get { throw null; } }
     }
 }
 namespace Azure.Core.Serialization
diff --git a/sdk/core/Azure.Core/src/Pipeline/ServerCertificateCustomValidationArgs.cs b/sdk/core/Azure.Core/src/Pipeline/ServerCertificateCustomValidationArgs.cs
@@ -19,7 +19,7 @@ public class ServerCertificateCustomValidationArgs
         /// <summary>
         /// The chain of certificate authorities associated with the remote certificate.
         /// </summary>
-        public X509Chain? X509Chain { get; }
+        public X509Chain? CertificateAuthorityChain { get; }
 
         /// <summary>
         /// One or more errors associated with the remote certificate.
@@ -30,12 +30,12 @@ public class ServerCertificateCustomValidationArgs
         /// Initializes an instance of <see cref="ServerCertificateCustomValidationArgs"/>.
         /// </summary>
         /// <param name="certificate">The certificate</param>
-        /// <param name="x509Chain"></param>
+        /// <param name="certificateAuthorityChain"></param>
         /// <param name="sslPolicyErrors"></param>
-        public ServerCertificateCustomValidationArgs(X509Certificate2? certificate, X509Chain? x509Chain, SslPolicyErrors sslPolicyErrors)
+        public ServerCertificateCustomValidationArgs(X509Certificate2? certificate, X509Chain? certificateAuthorityChain, SslPolicyErrors sslPolicyErrors)
         {
             Certificate = certificate;
-            X509Chain = x509Chain;
+            CertificateAuthorityChain = certificateAuthorityChain;
             SslPolicyErrors = sslPolicyErrors;
         }
     }
diff --git a/sdk/core/Azure.Core/tests/TransportFunctionalTests.cs b/sdk/core/Azure.Core/tests/TransportFunctionalTests.cs
@@ -1020,7 +1020,7 @@ public async Task ServerCertificateCustomValidationCallbackIsHonored([Values(tru
                     {
                         certValidationCalled = true;
                         cert = args.Certificate;
-                        chain = args.X509Chain;
+                        chain = args.CertificateAuthorityChain;
                         return isValidCert;
                     };
                 }
@@ -1062,7 +1062,7 @@ public async Task ServerCertificateCustomValidationCallbackIsHonored([Values(tru
                             () =>
                             {
                                 Assert.NotNull(cert, $"{nameof(ServerCertificateCustomValidationArgs)}.{nameof(ServerCertificateCustomValidationArgs.Certificate)} should not be null");
-                                Assert.NotNull(chain, $"{nameof(ServerCertificateCustomValidationArgs)}.{nameof(ServerCertificateCustomValidationArgs.X509Chain)} should not be null");
+                                Assert.NotNull(chain, $"{nameof(ServerCertificateCustomValidationArgs)}.{nameof(ServerCertificateCustomValidationArgs.CertificateAuthorityChain)} should not be null");
                             });
                     }
                 }

Original file line number	Diff line number	Diff line change
`@@ -922,10 +922,10 @@ public HttpPipelineTransportOptions() { }`
`922`	`922`	`}`
`923`	`923`	`public partial class ServerCertificateCustomValidationArgs`
`924`	`924`	`{`
`925`		`- public ServerCertificateCustomValidationArgs(System.Security.Cryptography.X509Certificates.X509Certificate2? certificate, System.Security.Cryptography.X509Certificates.X509Chain? x509Chain, System.Net.Security.SslPolicyErrors sslPolicyErrors) { }`
	`925`	`+ public ServerCertificateCustomValidationArgs(System.Security.Cryptography.X509Certificates.X509Certificate2? certificate, System.Security.Cryptography.X509Certificates.X509Chain? certificateAuthorityChain, System.Net.Security.SslPolicyErrors sslPolicyErrors) { }`
`926`	`926`	`public System.Security.Cryptography.X509Certificates.X509Certificate2? Certificate { get { throw null; } }`
	`927`	`+ public System.Security.Cryptography.X509Certificates.X509Chain? CertificateAuthorityChain { get { throw null; } }`
`927`	`928`	`public System.Net.Security.SslPolicyErrors SslPolicyErrors { get { throw null; } }`
`928`		`- public System.Security.Cryptography.X509Certificates.X509Chain? X509Chain { get { throw null; } }`
`929`	`929`	`}`
`930`	`930`	`}`
`931`	`931`	`namespace Azure.Core.Serialization`
Original file line number	Diff line number	Diff line change
`@@ -1020,7 +1020,7 @@ public async Task ServerCertificateCustomValidationCallbackIsHonored([Values(tru`
`1020`	`1020`	`{`
`1021`	`1021`	`certValidationCalled = true;`
`1022`	`1022`	`cert = args.Certificate;`
`1023`		`- chain = args.X509Chain;`
	`1023`	`+ chain = args.CertificateAuthorityChain;`
`1024`	`1024`	`return isValidCert;`
`1025`	`1025`	`};`
`1026`	`1026`	`}`
`@@ -1062,7 +1062,7 @@ public async Task ServerCertificateCustomValidationCallbackIsHonored([Values(tru`
`1062`	`1062`	`() =>`
`1063`	`1063`	`{`
`1064`	`1064`	`Assert.NotNull(cert, $"{nameof(ServerCertificateCustomValidationArgs)}.{nameof(ServerCertificateCustomValidationArgs.Certificate)} should not be null");`
`1065`		`- Assert.NotNull(chain, $"{nameof(ServerCertificateCustomValidationArgs)}.{nameof(ServerCertificateCustomValidationArgs.X509Chain)} should not be null");`
	`1065`	`+ Assert.NotNull(chain, $"{nameof(ServerCertificateCustomValidationArgs)}.{nameof(ServerCertificateCustomValidationArgs.CertificateAuthorityChain)} should not be null");`
`1066`	`1066`	`});`
`1067`	`1067`	`}`
`1068`	`1068`	`}`