Renaming tls parameter names

fixes #5695 https://pulp.plan.io/issues/5695
pulp · Nov 12, 2019 · 7bac2b1 · 7bac2b1
1 parent 48ee6e3
commit 7bac2b1
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 19 deletions.
diff --git a/pulpcore/app/models/repository.py b/pulpcore/app/models/repository.py
@@ -129,12 +129,12 @@ class Remote(MasterModel):
 
         name (models.CharField): The remote name.
         url (models.TextField): The URL of an external content source.
-        ssl_ca_certificate (models.FileField): A PEM encoded CA certificate used to validate the
+        ca_cert (models.FileField): A PEM encoded CA certificate used to validate the
             server certificate presented by the external source.
-        ssl_client_certificate (models.FileField): A PEM encoded client certificate used
+        client_cert (models.FileField): A PEM encoded client certificate used
             for authentication.
-        ssl_client_key (models.FileField): A PEM encoded private key used for authentication.
-        ssl_validation (models.BooleanField): If True, SSL peer validation must be performed.
+        client_key (models.FileField): A PEM encoded private key used for authentication.
+        tls_validation (models.BooleanField): If True, TLS peer validation must be performed.
         proxy_url (models.TextField): The optional proxy URL.
             Format: scheme://user:password@host:port
         username (models.TextField): The username to be used for authentication when syncing.
@@ -168,10 +168,10 @@ class Remote(MasterModel):
 
     url = models.TextField()
 
-    ssl_ca_certificate = models.TextField(null=True)
-    ssl_client_certificate = models.TextField(null=True)
-    ssl_client_key = models.TextField(null=True)
-    ssl_validation = models.BooleanField(default=True)
+    ca_cert = models.TextField(null=True)
+    client_cert = models.TextField(null=True)
+    client_key = models.TextField(null=True)
+    tls_validation = models.BooleanField(default=True)
 
     username = models.TextField(null=True)
     password = models.TextField(null=True)

diff --git a/pulpcore/app/serializers/repository.py b/pulpcore/app/serializers/repository.py
@@ -50,29 +50,29 @@ class RemoteSerializer(ModelSerializer):
     url = serializers.CharField(
         help_text='The URL of an external content source.',
     )
-    ssl_ca_certificate = SecretCharField(
+    ca_cert = SecretCharField(
         help_text='A string containing the PEM encoded CA certificate used to validate the server '
                   'certificate presented by the remote server. All new line characters must be '
                   'escaped. Returns SHA256 sum on GET.',
         write_only=False,
         required=False,
         allow_null=True,
     )
-    ssl_client_certificate = SecretCharField(
+    client_cert = SecretCharField(
         help_text='A string containing the PEM encoded client certificate used for authentication. '
                   'All new line characters must be escaped. Returns SHA256 sum on GET.',
         write_only=False,
         required=False,
         allow_null=True,
     )
-    ssl_client_key = SecretCharField(
+    client_key = SecretCharField(
         help_text='A PEM encoded private key used for authentication. Returns SHA256 sum on GET.',
         write_only=False,
         required=False,
         allow_null=True,
     )
-    ssl_validation = serializers.BooleanField(
-        help_text='If True, SSL peer validation must be performed.',
+    tls_validation = serializers.BooleanField(
+        help_text='If True, TLS peer validation must be performed.',
         required=False,
     )
     proxy_url = serializers.CharField(
@@ -113,8 +113,8 @@ class Meta:
         abstract = True
         model = models.Remote
         fields = ModelSerializer.Meta.fields + (
-            'name', 'url', 'ssl_ca_certificate', 'ssl_client_certificate', 'ssl_client_key',
-            'ssl_validation', 'proxy_url', 'username', 'password', 'pulp_last_updated',
+            'name', 'url', 'ca_cert', 'client_cert', 'client_key',
+            'tls_validation', 'proxy_url', 'username', 'password', 'pulp_last_updated',
             'download_concurrency', 'policy'
         )
 

diff --git a/pulpcore/download/factory.py b/pulpcore/download/factory.py
@@ -80,9 +80,9 @@ def _make_aiohttp_session_from_remote(self):
         tcp_conn_opts = {'force_close': True}
 
         sslcontext = None
-        if self._remote.ssl_ca_certificate:
-            sslcontext = ssl.create_default_context(cadata=self._remote.ssl_ca_certificate)
-        if self._remote.ssl_client_key and self._remote.ssl_client_certificate:
+        if self._remote.ca_cert:
+            sslcontext = ssl.create_default_context(cadata=self._remote.ca_cert)
+        if self._remote.client_key and self._remote.client_cert:
             if not sslcontext:
                 sslcontext = ssl.create_default_context()
             with NamedTemporaryFile() as key_file:
@@ -95,7 +95,7 @@ def _make_aiohttp_session_from_remote(self):
                         cert_file.name,
                         key_file.name
                     )
-        if not self._remote.ssl_validation:
+        if not self._remote.tls_validation:
             if not sslcontext:
                 sslcontext = ssl.create_default_context()
             sslcontext.check_hostname = False