Version 4.0.0a350

couchbaselabs · May 16, 2024 · 5df1b5e · 5df1b5e
1 parent 4444c78
commit 5df1b5e
Show file tree

Hide file tree

Showing 17 changed files with 167 additions and 35 deletions.
diff --git a/couchformation/cli/cloudmgr.py b/couchformation/cli/cloudmgr.py
@@ -53,7 +53,7 @@ def local_args(self):
         command_subparser.add_parser('help', help="Show Supported Options", parents=[opt_parser], add_help=False)
 
     def run(self):
-        if not self.options.json:
+        if not hasattr(self.options, 'json'):
             logger.info(f"Couch Formation v{couchformation.__version__}")
 
         if self.options.show_version:

diff --git a/pyproject.toml b/pyproject.toml
@@ -0,0 +1,118 @@
+[tool.poetry]
+name = "couchformation"
+description = "Couchbase Cloud Automation"
+version = "4.0.0a350"
+readme = "README.md"
+authors = ["Michael Minichino <info@unix.us.com>"]
+classifiers = [
+    "Development Status :: 4 - Beta",
+    "License :: OSI Approved :: Apache Software License",
+    "Intended Audience :: Developers",
+    "Operating System :: OS Independent",
+    "Programming Language :: Python",
+    "Programming Language :: Python :: 3",
+    "Topic :: Database",
+    "Topic :: Software Development :: Libraries",
+    "Topic :: Software Development :: Libraries :: Python Modules"
+]
+keywords = ["couchbase", "devops", "automation"]
+packages = [
+    { include = "couchformation" }
+]
+include = [
+    { path = "couchformation/data/*.yaml", format = ["sdist", "wheel"] }
+]
+
+[tool.poetry.urls]
+"Homepage" = "https://github.com/mminichino/couch-formation-core"
+
+[tool.poetry.scripts]
+cloudmgr = "couchformation.cli.cloudmgr:main"
+dbdump = "couchformation.cli.dbdump:main"
+
+[tool.poetry.dependencies]
+python = "^3.8"
+attrs = "^23.1.0"
+boto3 = "^1.34.17"
+botocore = "^1.34.17"
+cryptography = "^42.0.7"
+dnspython = "^2.1.0"
+google-api-core = "^2.4.0"
+google-api-python-client = "^2.34.0"
+google-auth = "^2.3.3"
+google-auth-httplib2 = "^0.1.0"
+googleapis-common-protos = "^1.54.0"
+google-cloud = "^0.34.0"
+google-cloud-compute = "^1.6.1"
+google-cloud-storage = "^2.10.0"
+google-cloud-dns = "^0.35.0"
+google-cloud-network-management = "^1.5.4"
+Jinja2 = "^3.0.0"
+passlib = "^1.7.4"
+pycryptodome = "^3.20.0"
+pytz = "^2021.3"
+pyvmomi = "^8.0.0.1.1"
+requests = "^2.31.0"
+urllib3 = "^1.26.16"
+azure-common = "^1.1.28"
+azure-core = "^1.29.6"
+azure-mgmt-resource = "^22.0.0"
+azure-identity = "^1.12.0"
+azure-mgmt-network = "^25.3.0"
+azure-mgmt-compute = "^31.0.0"
+azure-mgmt-core = "^1.4.0"
+azure-mgmt-dns = "^8.1.0"
+azure-mgmt-privatedns = "^1.1.0"
+ply = "^3.11"
+sqlite-utils = "^3.11"
+docker = "^5.0.3"
+paramiko = "^3.4.0"
+overrides = "^7.4.0"
+PyYAML = { version = "!=6.0.0,!=5.4.0,!=5.4.1" }
+rsa = "^4.9"
+pywinrm = "^0.4.3"
+aiohttp = "^3.9.3"
+python-certifi-win32 = "^1.6.1"
+certifi = "^2023.5.7"
+pyhostprep = "^1.0.10"
+psutil = "^5.9.5"
+six = "^1.16.0"
+
+[tool.poetry.group.test.dependencies]
+pytest = "^7.4.0"
+pytest-asyncio = "^0.21.1"
+pytest-rerunfailures = "^12.0"
+pytest-order = "^1.2.1"
+
+[tool.poetry.group.dev.dependencies]
+bumpversion = "^0.6.0"
+
+[build-system]
+requires = ["poetry-core"]
+build-backend = "poetry.core.masonry.api"
+
+[tool.pytest.ini_options]
+addopts = "-rE --no-header -v -p no:warnings"
+log_file = "pytest.log"
+log_file_level = "DEBUG"
+pythonpath = [
+    ".",
+    "tests"
+]
+testpaths = [
+    "tests",
+]
+python_classes = [
+    "Test*"
+]
+python_files = [
+    "test_[0-9]*.py"
+]
+markers = [
+    "cf_aws: marks a test as an AWS test",
+    "cf_gcp: marks a test as a GCP test",
+    "cf_azure: marks a test as a Azure test",
+    "cf_docker: marks a test as a Azure test",
+    "cf_capella: marks a test as a Azure test",
+    "cf_windows: marks a test as a Windows safe test",
+]
diff --git a/requirements.txt b/requirements.txt
@@ -1,7 +1,7 @@
-attrs==23.1.0
+attrs>=23.1.0
 boto3>=1.34.17
 botocore>=1.34.17
-cryptography>=42.0.5
+cryptography>=42.0.7
 dnspython>=2.1.0
 google-api-core>=2.4.0
 google-api-python-client>=2.34.0
@@ -24,18 +24,17 @@ azure-common>=1.1.28
 azure-core>=1.29.6
 azure-mgmt-resource>=22.0.0
 azure-identity>=1.12.0
-azure.mgmt.network>=25.1.0
-azure.mgmt.compute>=29.0.0
+azure-mgmt-network>=25.3.0
+azure-mgmt-compute>=31.0.0
 azure-mgmt-core>=1.4.0
-azure.mgmt.storage>=21.0.0
 azure-mgmt-dns>=8.1.0
 azure-mgmt-privatedns>=1.1.0
-azure.mgmt.subscription>=3.1.1
 ply>=3.11
-pytest==7.4.0
-pytest-asyncio==0.21.1
-pytest-rerunfailures==12.0
-sqlite-utils~=3.11
+pytest>=7.4.0
+pytest-asyncio>=0.21.1
+pytest-rerunfailures>=12.0
+pytest-order>=1.2.1
+sqlite-utils>=3.11
 docker>=5.0.3
 paramiko==3.4.0
 overrides>=7.4.0
@@ -48,5 +47,4 @@ python-certifi-win32>=1.6.1
 certifi>=2023.5.7
 pyhostprep>=1.0.10
 psutil>=5.9.5
-pycryptodome>=3.20.0
 six>=1.16.0
diff --git a/setup.py b/setup.py
@@ -25,7 +25,7 @@
         "attrs==23.1.0",
         "boto3>=1.34.17",
         "botocore>=1.34.17",
-        "cryptography>=42.0.5",
+        "cryptography>=42.0.7",
         "dnspython>=2.1.0",
         "google-api-core>=2.4.0",
         "google-api-python-client>=2.34.0",
@@ -48,22 +48,16 @@
         "azure-core>=1.26.1",
         "azure-mgmt-resource>=22.0.0",
         "azure-identity>=1.12.0",
-        "azure.mgmt.network>=22.2.0",
-        "azure.mgmt.compute>=29.0.0",
+        "azure-mgmt-network>=25.3.0",
+        "azure-mgmt-compute>=31.0.0",
         "azure-mgmt-core>=1.3.2",
-        "azure.mgmt.storage>=21.0.0",
         "azure-mgmt-dns>=8.1.0",
         "azure-mgmt-privatedns>=1.1.0",
-        "azure.mgmt.subscription>=3.1.1",
         "ply>=3.11",
-        "pytest==7.4.0",
-        "pytest-asyncio==0.21.1",
-        "pytest-rerunfailures==12.0",
         "sqlite-utils~=3.11",
         "docker>=5.0.3",
         "paramiko>=3.4.0",
         "overrides>=7.4.0",
-        "bumpversion>=0.6.0",
         "PyYAML>=5.1",
         "rsa>=4.9",
         "pywinrm>=0.4.3",
@@ -72,7 +66,6 @@
         "certifi>=2023.5.7",
         "pyhostprep>=1.0.10",
         "psutil>=5.9.5",
-        "pycryptodome>=3.20.0",
         "six>=1.16.0"
     ],
     author_email='info@unix.us.com',

diff --git a/tests/test_1.py b/tests/test_1.py
@@ -28,7 +28,9 @@
 from tests.common import ssh_key_path
 
 
-@pytest.mark.serial
+@pytest.mark.cf_aws
+@pytest.mark.cf_windows
+@pytest.mark.order(1)
 class TestMainAWS(unittest.TestCase):
 
     def setUp(self):

diff --git a/tests/test_10.py b/tests/test_10.py
@@ -43,7 +43,9 @@ def __call__(self, r):
         return r
 
 
-@pytest.mark.serial
+@pytest.mark.cf_aws
+@pytest.mark.cf_windows
+@pytest.mark.order(6)
 class TestMainAWS(unittest.TestCase):
     command = None
 

diff --git a/tests/test_11.py b/tests/test_11.py
@@ -43,7 +43,9 @@ def __call__(self, r):
         return r
 
 
-@pytest.mark.serial
+@pytest.mark.cf_gcp
+@pytest.mark.cf_windows
+@pytest.mark.order(6)
 class TestMainGCP(unittest.TestCase):
     command = None
 

diff --git a/tests/test_12.py b/tests/test_12.py
@@ -43,7 +43,9 @@ def __call__(self, r):
         return r
 
 
-@pytest.mark.serial
+@pytest.mark.cf_azure
+@pytest.mark.cf_windows
+@pytest.mark.order(6)
 class TestMainAzure(unittest.TestCase):
     command = None
 

diff --git a/tests/test_13.py b/tests/test_13.py
@@ -39,7 +39,8 @@ def __call__(self, r):
         return r
 
 
-@pytest.mark.serial
+@pytest.mark.cf_aws
+@pytest.mark.order(7)
 class TestInstallAWS(object):
     container_id = None
     environment = {}

diff --git a/tests/test_2.py b/tests/test_2.py
@@ -26,7 +26,9 @@
 from tests.common import ssh_key_path
 
 
-@pytest.mark.serial
+@pytest.mark.cf_gcp
+@pytest.mark.cf_windows
+@pytest.mark.order(1)
 class TestMainGCP(unittest.TestCase):
 
     def setUp(self):

diff --git a/tests/test_3.py b/tests/test_3.py
@@ -25,7 +25,9 @@
 from tests.common import ssh_key_path
 
 
-@pytest.mark.serial
+@pytest.mark.cf_azure
+@pytest.mark.cf_windows
+@pytest.mark.order(1)
 class TestMainAzure(unittest.TestCase):
 
     def setUp(self):

diff --git a/tests/test_4.py b/tests/test_4.py
@@ -41,7 +41,9 @@ def __call__(self, r):
         return r
 
 
-@pytest.mark.serial
+@pytest.mark.cf_aws
+@pytest.mark.cf_windows
+@pytest.mark.order(2)
 class TestMainAWS(unittest.TestCase):
 
     def setUp(self):

diff --git a/tests/test_5.py b/tests/test_5.py
@@ -41,7 +41,9 @@ def __call__(self, r):
         return r
 
 
-@pytest.mark.serial
+@pytest.mark.cf_gcp
+@pytest.mark.cf_windows
+@pytest.mark.order(2)
 class TestMainGCP(unittest.TestCase):
 
     def setUp(self):

diff --git a/tests/test_6.py b/tests/test_6.py
@@ -41,7 +41,9 @@ def __call__(self, r):
         return r
 
 
-@pytest.mark.serial
+@pytest.mark.cf_azure
+@pytest.mark.cf_windows
+@pytest.mark.order(2)
 class TestMainAzure(unittest.TestCase):
 
     def setUp(self):

diff --git a/tests/test_7.py b/tests/test_7.py
@@ -42,7 +42,9 @@ def __call__(self, r):
         return r
 
 
-@pytest.mark.serial
+@pytest.mark.cf_capella
+@pytest.mark.cf_windows
+@pytest.mark.order(3)
 class TestMainCapella(unittest.TestCase):
 
     def setUp(self):

diff --git a/tests/test_8.py b/tests/test_8.py
@@ -18,7 +18,8 @@
 from couchformation.docker.driver.container import Container
 
 
-@pytest.mark.serial
+@pytest.mark.cf_docker
+@pytest.mark.order(4)
 class TestMainDocker(object):
     parameters = {}
     project = None

diff --git a/tests/test_9.py b/tests/test_9.py
@@ -39,7 +39,8 @@ def __call__(self, r):
         return r
 
 
-@pytest.mark.serial
+@pytest.mark.cf_docker
+@pytest.mark.order(5)
 class TestMainDocker(object):
 
     @classmethod