Trivial fix typos

Change-Id: I03f468b000a8d648adb83582bfddef5e2ddb5ad6

api-guide/source/secret_metadata.rst

@@ -33,7 +33,7 @@ This should provide a response as follows:
 
     {"metadata_ref": "http://localhost:9311/v1/secrets/2a549393-0710-444b-8aa5-84cf0f85ea79/metadata"}
 
-.. _retreive_secret_metadata:
+.. _retrieve_secret_metadata:
 
 How to Retrieve Secret Metadata
 ###############################

barbican/cmd/functionaltests/test_db_manage.py

@@ -150,7 +150,7 @@ class DBManageTestCase(base.TestCase):
 
     @testcase.attr('positive')
     def test_active_secret_not_deleted(self):
-        """Verify that active secrest are not removed"""
+        """Verify that active secrets are not removed"""
         project_a_secrets = self._create_secret_list(user=admin_a)
         project_b_secrets = self._create_secret_list(user=admin_b)
 
@@ -228,7 +228,7 @@ class DBManageTestCase(base.TestCase):
 
     @testcase.attr('positive')
     def test_no_soft_deleted_secrets_in_db(self):
-        """Test that no soft deleted secrests are in db"""
+        """Test that no soft deleted secrets are in db"""
         os.system("python barbican/cmd/db_manage.py clean -m 0 -p -e")
 
         results = self.conn.execute("select * from secrets where deleted=1")
@@ -287,7 +287,7 @@ class DBManageTestCase(base.TestCase):
             self.assertNotIn(container_uuid, container_list)
 
     @testcase.attr('positive')
-    def test_containers_with_exipred_secrets_are_deleted(self):
+    def test_containers_with_expired_secrets_are_deleted(self):
         """Containers with expired secrets are deleted"""
         current_time = utils.create_timestamp_w_tz_and_offset(seconds=10)
 

barbican/common/exception.py

@@ -373,12 +373,12 @@ class MultipleSecretStoreLookupFailed(BarbicanException):
 
 class MultipleStoreIncorrectGlobalDefault(BarbicanException):
     """Raised when a global default for only one plugin is not set to True."""
-    def __init__(self, occurence):
+    def __init__(self, occurrence):
         msg = None
-        if occurence > 1:
+        if occurrence > 1:
             msg = u._("There are {count} plugins with global default as "
                       "True in service configuration. Only one plugin can have"
-                      " this as True").format(count=occurence)
+                      " this as True").format(count=occurrence)
         else:
             msg = u._("There is no plugin defined with global default as True."
                       " One of plugin must be identified as global default")

barbican/common/hrefs.py

@@ -13,7 +13,7 @@ from barbican.common import utils
 
 
 def convert_resource_id_to_href(resource_slug, resource_id):
-    """Convert the resouce ID to a HATEOAS-style href with resource slug."""
+    """Convert the resource ID to a HATEOAS-style href with resource slug."""
     if resource_id:
         resource = '{slug}/{id}'.format(slug=resource_slug, id=resource_id)
     else:
@@ -125,7 +125,7 @@ def add_nav_hrefs(resources_name, offset, limit,
     :param resources_name: Name of api resource
     :param offset: Element number (ie. index) where current page starts
     :param limit: Max amount of elements listed on current page
-    :param num_elements: Total number of elements
+    :param total_elements: Total number of elements
     :returns: augmented dictionary with next and/or previous hrefs
     """
     if offset > 0:

barbican/model/migration/alembic_migrations/env.py

@@ -30,7 +30,7 @@ except Exception:
 
 # WARNING! The following was autogenerated by Alembic as part of setting up
 #   the initial environment. Unfortunately it also **clobbers** the logging
-#   for the rest of this applicaton, so please do not use it!
+#   for the rest of this application, so please do not use it!
 # Interpret the config file for Python logging.
 # This line sets up loggers basically.
 # fileConfig(config.config_file_name)

barbican/tests/api/controllers/test_containers.py

@@ -315,7 +315,7 @@ class WhenAddingOrRemovingContainerSecretsUsingContainersSecretsResource(
     def test_should_add_container_secret_with_trailing_slash(self):
         resp, container_id = create_container(
             self.app,
-            name='test conatiner name',
+            name='test container name',
             container_type='generic',
         )
         self._assert_successful_container_create(resp, container_id)

barbican/tests/plugin/util/test_mime_types.py

@@ -85,7 +85,7 @@ class WhenTestingAllowBinaryContent(utils.BaseTestCase):
         self.assertFalse(r)
 
     def test_not_allow_with_invalid_content_type(self):
-        r = mime_types.use_binary_content_as_is('invalid_conent_type',
+        r = mime_types.use_binary_content_as_is('invalid_content_type',
                                                 'binary')
         self.assertFalse(r)
 
@@ -214,7 +214,7 @@ class WhenTestingIfContentTypeAndEncodingSupported(utils.BaseTestCase):
         'plaintext_none': ['text/plain', 'base64'],
         'octectstream_no_encoding': ['application/octet-stream', None],
         'pkcs8_no_encoding': ['application/pkcs8', None],
-        'unknown_with_valid_encoding': ['application/uknown-content-type',
+        'unknown_with_valid_encoding': ['application/unknown-content-type',
                                         'base64']
     })
     def test_content_type_encoding_not_supported(self, content_type, encoding):

functionaltests/api/v1/behaviors/container_behaviors.py

@@ -66,7 +66,7 @@ class ContainerBehaviors(base_behaviors.BaseBehaviors):
         :param limit: limits number of returned containers
         :param offset: represents how many records to skip before retrieving
             the list
-        :param name_filter: allows you to filter results based on name
+        :param filter: allows you to filter results based on name
         :param extra_headers: Extra headers used to retrieve a list of
             containers
         :param user_name: The user name used to get the list

releasenotes/notes/multiple-backends-75f5b85c63b930b7.yaml

@@ -1,7 +1,7 @@
 ---
 prelude: >
     Now within a single deployment, multiple secret store plugin backends can
-    be configured and used. With this change, a project adminstrator can
+    be configured and used. With this change, a project administrator can
     pre-define a preferred plugin backend for storing their secrets. New APIs
     are added to manage this project level secret store preference.
 features: