twindb · akuzminsky · Sep 24, 2024 · Aug 27, 2024 · Aug 27, 2024 · Aug 29, 2024
diff --git a/.gitignore b/.gitignore
@@ -64,3 +64,13 @@ target/
 /vagrant/README.html
 /.pytest_cache/
 /.venv/
+
+# asdf
+.envrc
+.tool-versions
+
+# vscode
+.vscode/
+
+# environment
+.env
diff --git a/Makefile b/Makefile
@@ -117,12 +117,6 @@ lint: ## check style with pylint
 test: ## Run tests quickly with the default Python and generate code coverage report
 	pytest -xv --cov-report term-missing --cov-report xml --cov=./twindb_backup tests/unit
 
-test-including-azure-blob: ## Like 'make test' but includes tests for azure blob destination
-	coverage run --source=twindb_backup -m pytest -xv tests/unit
-	coverage run -a --source=twindb_backup -m unittest -cvf --locals tests/unittests/azblob_testing/environment_access_tests/test_remote_data_generation.py
-	coverage run -a --source=twindb_backup -m unittest -cvf --locals tests/unittests/azblob_testing/destination_tests/test_AzureBlob_functions.py
-	coverage report
-
 test-integration: ## Run integration tests. Must be run in vagrant
 	py.test -xsv tests/integration/
 
@@ -174,6 +168,9 @@ endif
 ifeq ($(OS_VERSION),7)
         PLATFORM = centos
 endif
+ifeq ($(OS_VERSION),8)
+        PLATFORM = centos
+endif
 
 package: ## Build package - OS_VERSION must be one of: jammy, focal.
 	@docker run \

diff --git a/README.rst b/README.rst
@@ -25,8 +25,8 @@ TwinDB Backup
     :alt: Updates
 
 TwinDB Backup is a multipurpose tool for backing up MySQL database and regular files/directories on the file system.
-It can store backup copies on a remote SSH server, Amazon S3 or
-Google Cloud Storage.
+It can store backup copies on a remote SSH server, Amazon S3, Azure Blob Storage,
+or Google Cloud Storage.
 
 TwinDB Backup accepts a backup copy stream from any of supported sources
 (MySQL Server, Percona Server, Percona XtraDB Cluster, or file system)
@@ -53,6 +53,7 @@ After the stream passed all modifiers it is sent to one of the configured
 backup destination. It can be:
 
 - Amazon S3 bucket
+- Azure Blob Storage account
 - Google Cloud Storage bucket
 - Any server with SSH demon
 
@@ -92,6 +93,7 @@ Features
 **TwinDB Backup** storage options:
 
 - Amazon S3
+- Azure Blob Storage
 - Google Cloud Storage
 - Remote SSH server
 - Optional local copy
@@ -147,6 +149,7 @@ Possible ``OS_VERSION`` values:
  * jammy
  * focal
  * 7 (for CentOS 7)
+ * 8 (for CentOS 8)
 
 .. code-block:: console
 
@@ -182,6 +185,7 @@ Credits
   * `Arda Beyazoğlu <https://github.com/ardabeyazoglu>`_
   * `Egor Lyutov <https://github.com/el4v>`_
   * `fonthead <https://github.com/fonthead>`_
+  * `James Salzman <https://github.com/Jsalz2000>`_
   * `Maksym Kryva <https://github.com/mkryva>`_
   * `Manjot Singh <https://github.com/ManjotS>`_
   * `Michael Rikmas <https://github.com/catyellow>`_

diff --git a/docs/conf.py b/docs/conf.py
@@ -13,8 +13,8 @@
 # All configuration values have a default; values that are commented out
 # serve to show the default.
 
-import sys
 import os
+import sys
 
 # If extensions (or modules to document with autodoc) are in another
 # directory, add these directories to sys.path here. If the directory is
@@ -40,23 +40,23 @@
 
 # Add any Sphinx extension module names here, as strings. They can be
 # extensions coming with Sphinx (named 'sphinx.ext.*') or your custom ones.
-extensions = ['sphinx.ext.autodoc', 'sphinx.ext.viewcode']
+extensions = ["sphinx.ext.autodoc", "sphinx.ext.viewcode"]
 
 # Add any paths that contain templates here, relative to this directory.
-templates_path = ['_templates']
+templates_path = ["_templates"]
 
 # The suffix of source filenames.
-source_suffix = '.rst'
+source_suffix = ".rst"
 
 # The encoding of source files.
 # source_encoding = 'utf-8-sig'
 
 # The master toctree document.
-master_doc = 'index'
+master_doc = "index"
 
 # General information about the project.
-project = u'TwinDB Backup'
-copyright = u"2016-2019, TwinDB Development Team"
+project = "TwinDB Backup"
+copyright = "2016-2019, TwinDB Development Team"
 
 # The version info for the project you're documenting, acts as replacement
 # for |version| and |release|, also used in various other places throughout
@@ -79,7 +79,7 @@
 
 # List of patterns, relative to source directory, that match files and
 # directories to ignore when looking for source files.
-exclude_patterns = ['_build']
+exclude_patterns = ["_build"]
 
 # The reST default role (used for this markup: `text`) to use for all
 # documents.
@@ -97,7 +97,7 @@
 # show_authors = False
 
 # The name of the Pygments (syntax highlighting) style to use.
-pygments_style = 'sphinx'
+pygments_style = "sphinx"
 
 # A list of ignored prefixes for module index sorting.
 # modindex_common_prefix = []
@@ -111,7 +111,7 @@
 
 # The theme to use for HTML and HTML Help pages.  See the documentation for
 # a list of builtin themes.
-html_theme = 'default'
+html_theme = "default"
 
 # Theme options are theme-specific and customize the look and feel of a
 # theme further.  For a list of options available for each theme, see the
@@ -131,18 +131,18 @@
 
 # The name of an image file (relative to this directory) to place at the
 # top of the sidebar.
-html_logo = '_static/logo.png'
+html_logo = "_static/logo.png"
 
 # The name of an image file (within the static path) to use as favicon
 # of the docs.  This file should be a Windows icon file (.ico) being
 # 16x16 or 32x32 pixels large.
-html_favicon = '_static/favicon.png'
+html_favicon = "_static/favicon.png"
 
 # Add any paths that contain custom static files (such as style sheets)
 # here, relative to this directory. They are copied after the builtin
 # static files, so a file named "default.css" will overwrite the builtin
 # "default.css".
-html_static_path = ['_static']
+html_static_path = ["_static"]
 
 # If not '', a 'Last updated on:' timestamp is inserted at every page
 # bottom, using the given strftime format.
@@ -188,18 +188,16 @@
 # html_file_suffix = None
 
 # Output file base name for HTML help builder.
-htmlhelp_basename = 'twindb_backupdoc'
+htmlhelp_basename = "twindb_backupdoc"
 
 
 # -- Options for LaTeX output ------------------------------------------
 
 latex_elements = {
     # The paper size ('letterpaper' or 'a4paper').
     # 'papersize': 'letterpaper',
-
     # The font size ('10pt', '11pt' or '12pt').
     # 'pointsize': '10pt',
-
     # Additional stuff for the LaTeX preamble.
     # 'preamble': '',
 }
@@ -208,9 +206,7 @@
 # (source start file, target name, title, author, documentclass
 # [howto/manual]).
 latex_documents = [
-    ('index', 'twindb_backup.tex',
-     u'TwinDB Backup Documentation',
-     u'TwinDB Development Team', 'manual'),
+    ("index", "twindb_backup.tex", "TwinDB Backup Documentation", "TwinDB Development Team", "manual"),
 ]
 
 # The name of an image file (relative to this directory) to place at
@@ -238,11 +234,7 @@
 
 # One entry per manual page. List of tuples
 # (source start file, name, description, authors, manual section).
-man_pages = [
-    ('index', 'twindb_backup',
-     u'TwinDB Backup Documentation',
-     [u'TwinDB Development Team'], 1)
-]
+man_pages = [("index", "twindb_backup", "TwinDB Backup Documentation", ["TwinDB Development Team"], 1)]
 
 # If true, show URL addresses after external links.
 # man_show_urls = False
@@ -254,12 +246,15 @@
 # (source start file, target name, title, author,
 #  dir menu entry, description, category)
 texinfo_documents = [
-    ('index', 'twindb_backup',
-     u'TwinDB Backup Documentation',
-     u'TwinDB Development Team',
-     'twindb_backup',
-     'One line description of project.',
-     'Miscellaneous'),
+    (
+        "index",
+        "twindb_backup",
+        "TwinDB Backup Documentation",
+        "TwinDB Development Team",
+        "twindb_backup",
+        "One line description of project.",
+        "Miscellaneous",
+    ),
 ]
 
 # Documents to append as an appendix to all manuals.

diff --git a/docs/twindb_backup.configuration.destinations.rst b/docs/twindb_backup.configuration.destinations.rst
@@ -4,6 +4,14 @@ twindb\_backup.configuration.destinations package
 Submodules
 ----------
 
+twindb\_backup.configuration.destinations.az module
+----------------------------------------------------
+
+.. automodule:: twindb_backup.configuration.destinations.az
+   :members:
+   :undoc-members:
+   :show-inheritance:
+
 twindb\_backup.configuration.destinations.gcs module
 ----------------------------------------------------
 

diff --git a/docs/twindb_backup.destination.rst b/docs/twindb_backup.destination.rst
@@ -4,14 +4,6 @@ twindb\_backup.destination package
 Submodules
 ----------
 
-twindb\_backup.destination.azblob module
-----------------------------------------
-
-.. automodule:: twindb_backup.destination.azblob
-   :members:
-   :undoc-members:
-   :show-inheritance:
-
 twindb\_backup.destination.base\_destination module
 ---------------------------------------------------
 
@@ -28,6 +20,14 @@ twindb\_backup.destination.exceptions module
    :undoc-members:
    :show-inheritance:
 
+twindb\_backup.destination.az module
+-------------------------------------
+
+.. automodule:: twindb_backup.destination.az
+   :members:
+   :undoc-members:
+   :show-inheritance:
+
 twindb\_backup.destination.gcs module
 -------------------------------------
 

diff --git a/docs/usage.rst b/docs/usage.rst
@@ -47,7 +47,7 @@ Backup Destination
 The ``[destination]`` section specifies where to store backup copies.
 
 ``backup_destination`` can be either ``ssh`` (if you want to store backups on a remote SSH server),
-or ``s3`` (if you want to store backups in Amazon S3), or ``gsc`` (if the backup should be stored in Google Cloud).
+``s3`` (if you want to store backups in Amazon S3), ``az`` (if the backup should be stored in Azure Blob Storage), or ``gcs`` (if the backup should be stored in Google Cloud).
 
 In the optional ``keep_local_path`` you can specify a local path where the tool will store a local copy of the backup.
 It's useful if you want to stream a MySQL backup to S3 and would like to keep a local copy as well.
@@ -89,6 +89,20 @@ In the ``[s3]`` section you specify Amazon credentials as well as an S3 bucket w
     AWS_DEFAULT_REGION = us-east-1
     BUCKET = twindb-backups
 
+Azure Blob Storage
+~~~~~~~~~~~~~~~~~~~~
+
+In the ``[az]`` section you specify Azure credentials as well as Azure Blob Storage container where to store backups.
+
+.. code-block:: ini
+
+    [az]
+
+    connection_string = "DefaultEndpointsProtocol=https;AccountName=ACCOUNT_NAME;AccountKey=ACCOUNT_KEY;EndpointSuffix=core.windows.net"
+    container_name = twindb-backups
+    remote_path = /backups/mysql # optional
+
+
 Google Cloud Storage
 ~~~~~~~~~~~~~~~~~~~~
 

diff --git a/requirements.in b/requirements.in
@@ -1,6 +1,6 @@
 #@IgnoreInspection BashAddShebang
 azure-core ~= 1.24
-azure-storage-blob ~= 12.12
+azure-storage-blob ~= 12.19
 Click ~= 8.1
 PyMySQL ~= 1.0
 boto3 ~= 1.7

diff --git a/requirements.txt b/requirements.txt
@@ -8,7 +8,7 @@ azure-core==1.29.4
     # via
     #   -r requirements.in
     #   azure-storage-blob
-azure-storage-blob==12.18.3
+azure-storage-blob==12.22.0
     # via -r requirements.in
 bcrypt==4.0.1
     # via paramiko

diff --git a/requirements_dev.in b/requirements_dev.in
@@ -1,4 +1,5 @@
 #@IgnoreInspection BashAddShebang
+azure-storage-blob ~= 12.19
 black ~= 22.3
 Sphinx ~= 4.5
 bumpversion ~= 0.6

diff --git a/requirements_dev.txt b/requirements_dev.txt
@@ -8,6 +8,8 @@ alabaster==0.7.13
     # via sphinx
 astroid==2.15.8
     # via pylint
+azure-storage-blob==12.22.0
+    # via -r requirements.in
 babel==2.13.0
     # via sphinx
 black==22.12.0

diff --git a/setup.py b/setup.py
@@ -1,7 +1,8 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 import os
-from setuptools import setup, find_packages
+
+from setuptools import find_packages, setup
 
 del os.link