qontract-reconcile 0.10.1rc1202__py3-none-any.whl → 0.10.2.dev1__py3-none-any.whl

reconcile/test/test_vpc_peerings_validator.py

@@ -1,194 +0,0 @@
-import pytest
-
-from reconcile.gql_definitions.vpc_peerings_validator.vpc_peerings_validator import (
-    AWSVPCV1,
-    ClusterNetworkV1,
-    ClusterPeeringConnectionAccountV1,
-    ClusterPeeringConnectionClusterAccepterV1,
-    ClusterPeeringV1,
-    ClusterSpecV1,
-    ClusterV1,
-    VpcPeeringsValidatorQueryData,
-)
-from reconcile.gql_definitions.vpc_peerings_validator.vpc_peerings_validator_peered_cluster_fragment import (
-    ClusterSpecV1 as PeeredClusterSpec,
-)
-from reconcile.gql_definitions.vpc_peerings_validator.vpc_peerings_validator_peered_cluster_fragment import (
-    VpcPeeringsValidatorPeeredCluster,
-)
-from reconcile.vpc_peerings_validator import (
-    find_cidr_overlap,
-    validate_no_cidr_overlap,
-    validate_no_internal_to_public_peerings,
-    validate_no_public_to_public_peerings,
-)
-
-
-@pytest.fixture
-def query_data_i2p() -> VpcPeeringsValidatorQueryData:
-    return VpcPeeringsValidatorQueryData(
-        clusters=[
-            ClusterV1(
-                name="cluster1",
-                network=ClusterNetworkV1(vpc="192.168.0.0/16"),
-                spec=ClusterSpecV1(private=True),
-                internal=True,
-                peering=ClusterPeeringV1(
-                    connections=[
-                        ClusterPeeringConnectionClusterAccepterV1(
-                            provider="cluster-vpc-accepter",
-                            cluster=VpcPeeringsValidatorPeeredCluster(
-                                name="cluster2",
-                                network=ClusterNetworkV1(vpc="192.168.0.0/16"),
-                                spec=PeeredClusterSpec(private=False),
-                                internal=False,
-                            ),
-                        ),
-                    ],
-                ),
-            ),
-        ],
-    )
-
-
-def test_validate_no_internal_to_public_peerings_invalid(
-    query_data_i2p: VpcPeeringsValidatorQueryData,
-):
-    assert validate_no_internal_to_public_peerings(query_data_i2p) is False
-
-
-def test_validate_no_internal_to_public_peerings_valid_private(
-    query_data_i2p: VpcPeeringsValidatorQueryData,
-):
-    query_data_i2p.clusters[0].peering.connections[0].cluster.spec.private = True  # type: ignore[index,union-attr]
-    assert validate_no_internal_to_public_peerings(query_data_i2p) is True
-
-
-def test_validate_no_internal_to_public_peerings_valid_internal(
-    query_data_i2p: VpcPeeringsValidatorQueryData,
-):
-    assert query_data_i2p.clusters is not None
-    query_data_i2p.clusters[0].peering.connections[0].cluster.internal = True  # type: ignore[union-attr]
-    assert validate_no_internal_to_public_peerings(query_data_i2p) is True
-
-
-@pytest.fixture
-def query_data_p2p() -> VpcPeeringsValidatorQueryData:
-    return VpcPeeringsValidatorQueryData(
-        clusters=[
-            ClusterV1(
-                name="cluster1",
-                spec=ClusterSpecV1(private=False),
-                network=ClusterNetworkV1(vpc="192.168.0.0/16"),
-                internal=False,
-                peering=ClusterPeeringV1(
-                    connections=[
-                        ClusterPeeringConnectionClusterAccepterV1(
-                            provider="cluster-vpc-accepter",
-                            cluster=VpcPeeringsValidatorPeeredCluster(
-                                name="cluster2",
-                                network=ClusterNetworkV1(vpc="192.168.0.0/16"),
-                                spec=PeeredClusterSpec(private=False),
-                                internal=False,
-                            ),
-                        ),
-                    ],
-                ),
-            ),
-        ],
-    )
-
-
-def test_validate_no_public_to_public_peerings_invalid(
-    query_data_p2p: VpcPeeringsValidatorQueryData,
-):
-    assert validate_no_public_to_public_peerings(query_data_p2p) is False
-
-
-def test_validate_no_public_to_public_peerings_valid(
-    query_data_p2p: VpcPeeringsValidatorQueryData,
-):
-    query_data_p2p.clusters[0].peering.connections[0].cluster.spec.private = True  # type: ignore[index,union-attr]
-    assert validate_no_public_to_public_peerings(query_data_p2p) is True
-
-
-def test_validate_validate_cidr_overlap():
-    test_list = [
-        {
-            "provider": "cluster-self-vpc",
-            "vpc_name": "cluster-name",
-            "cidr_block": "10.25.0.0/16",
-        },
-        {
-            "provider": "account-vpc",
-            "vpc_name": "vpc-name-1",
-            "cidr_block": "10.18.0.0/18",
-        },
-        {
-            "provider": "account-vpc",
-            "vpc_name": "vpc-name-2",
-            "cidr_block": "10.18.0.0/18",
-        },
-    ]
-    cluster_name = "cluster-name"
-    assert find_cidr_overlap(cluster_name, test_list) is True
-
-
-def test_validate_validate_no_cidr_overlap():
-    test_list = [
-        {
-            "provider": "cluster-self-vpc",
-            "vpc_name": "cluster-name",
-            "cidr_block": "10.25.0.0/16",
-        },
-        {
-            "provider": "account-vpc",
-            "vpc_name": "vpc-name-1",
-            "cidr_block": "10.18.0.0/18",
-        },
-        {
-            "provider": "account-vpc",
-            "vpc_name": "vpc-name-2",
-            "cidr_block": "10.19.0.0/18",
-        },
-    ]
-    cluster_name = "cluster-name"
-    assert find_cidr_overlap(cluster_name, test_list) is False
-
-
-@pytest.fixture
-def query_data_vpc_cidr_overlap() -> VpcPeeringsValidatorQueryData:
-    return VpcPeeringsValidatorQueryData(
-        clusters=[
-            ClusterV1(
-                name="clustertest",
-                network=ClusterNetworkV1(vpc="10.20.0.0/20"),
-                spec=ClusterSpecV1(private=True),
-                internal=True,
-                peering=ClusterPeeringV1(
-                    connections=[
-                        ClusterPeeringConnectionAccountV1(
-                            provider="account-vpc",
-                            vpc=AWSVPCV1(
-                                cidr_block="192.168.1.0/24",
-                                name="vpc1",
-                            ),
-                        ),
-                        ClusterPeeringConnectionAccountV1(
-                            provider="account-vpc",
-                            vpc=AWSVPCV1(
-                                cidr_block="192.168.1.0/24",
-                                name="vpc2",
-                            ),
-                        ),
-                    ]
-                ),
-            ),
-        ]
-    )
-
-
-def test_create_dict_for_validate_no_cidr_overlap(
-    query_data_vpc_cidr_overlap: VpcPeeringsValidatorQueryData,
-):
-    assert validate_no_cidr_overlap(query_data_vpc_cidr_overlap) is False

reconcile/test/test_wrong_region.py

@@ -1,78 +0,0 @@
-import pytest
-
-from reconcile.utils.aws_api import AWSApi
-from reconcile.utils.terrascript_aws_client import TerrascriptClient
-
-
-@pytest.fixture
-def default_region():
-    return "default-region"
-
-
-@pytest.fixture
-def tf_bucket_region():
-    return "tf-bucket-region"
-
-
-@pytest.fixture
-def accounts(default_region):
-    return [
-        {
-            "name": "some-account",
-            "automationToken": {
-                "path": "path",
-            },
-            "resourcesDefaultRegion": default_region,
-            "supportedDeploymentRegions": [default_region],
-            "providerVersion": "1.2.3",
-            "uid": "123",
-            "terraformState": {},
-        }
-    ]
-
-
-@pytest.fixture
-def secret(tf_bucket_region):
-    return {
-        "aws_access_key_id": "key_id",
-        "aws_secret_access_key": "access_key",
-        "region": tf_bucket_region,
-        "bucket": "tf-bucket-name",
-        "_key": "tf_key.tfstate",
-    }
-
-
-@pytest.fixture
-def aws_api(accounts, secret, mocker):
-    mock_secret_reader = mocker.patch(
-        "reconcile.utils.aws_api.SecretReader", autospec=True
-    )
-    mock_secret_reader.return_value.read_all.return_value = secret
-    return AWSApi(1, accounts, init_users=False)
-
-
-@pytest.fixture
-def terrascript(accounts, secret, mocker):
-    mock_secret_reader = mocker.patch(
-        "reconcile.utils.terrascript_aws_client.SecretReader", autospec=True
-    )
-    mock_secret_reader.return_value.read_all.return_value = secret
-    return TerrascriptClient("", "", 1, accounts)
-
-
-def test_wrong_region_aws_api(aws_api, accounts, default_region):
-    for a in accounts:
-        assert aws_api.sessions[a["name"]].region_name == default_region
-
-
-def test_wrong_region_terrascript(terrascript, accounts, tf_bucket_region):
-    for a in accounts:
-        assert terrascript.configs[a["name"]]["region"] == tf_bucket_region
-
-
-def test_wrong_region_both(
-    aws_api, terrascript, accounts, default_region, tf_bucket_region
-):
-    for a in accounts:
-        assert aws_api.sessions[a["name"]].region_name == default_region
-        assert terrascript.configs[a["name"]]["region"] == tf_bucket_region

release/test_version.py

@@ -1,50 +0,0 @@
-import packaging.version as pep440
-
-from reconcile.utils.semver_helper import parse_semver
-from release import version
-
-
-def test_version_semver() -> None:
-    assert version.semver("0.4.0") == "0.4.0"
-    assert version.semver("0.4.0-6-gaaaaaaa") == "0.4.1-6+aaaaaaa"
-
-
-def test_semver_ordering() -> None:
-    # 6 commits after 0.4.0
-    assert parse_semver("0.4.1-6+aaaaaaa") > parse_semver("0.4.0")
-    # prerelease version are lower than release ones
-    assert parse_semver("0.4.0") > parse_semver("0.4.0-6+aaaaaaa")
-    # build info (after '+') don't count in semver comparisons
-    assert parse_semver("0.4.0-6+bbbbbbb") == parse_semver("0.4.0-6+aaaaaa")
-    # 7 commits after 0.4.0 is a higher version than 6 commits after 0.4.0
-    assert parse_semver("0.4.1-7+aaaaaaa") > parse_semver("0.4.1-6+aaaaaaa")
-    # number of commits (prerelease) is treated as a number, not as a string: 50 > 6
-    assert parse_semver("0.4.1-50+aaaaaaa") > parse_semver("0.4.1-6+aaaaaaa")
-
-
-def test_version_pip() -> None:
-    assert version.pip("0.4.0") == "0.4.0"
-    assert version.pip("0.4.0-6-gaaaaaaa") == "0.4.1.pre6"
-    # assert version.pip("0.4.0-6-gaaaaaaa") == "0.4.0.post6"
-
-
-def test_pep440_ordering() -> None:
-    assert pep440.Version("0.4.1") > pep440.Version("0.4.0")
-
-    # using pre-releases
-    assert pep440.Version("0.4.1.pre6") > pep440.Version("0.4.0")
-    assert pep440.Version("0.4.1.pre6") < pep440.Version("0.4.1")
-    assert pep440.Version("0.4.1.pre6") > pep440.Version("0.4.1.pre5")
-    assert pep440.Version("0.4.1.pre50") > pep440.Version("0.4.1.pre6")
-
-    # using post-releases
-    assert pep440.Version("0.4.0.post6") > pep440.Version("0.4.0")
-    assert pep440.Version("0.4.0.post6") < pep440.Version("0.4.1")
-    assert pep440.Version("0.4.0.post6") > pep440.Version("0.4.0.post5")
-    assert pep440.Version("0.4.0.post50") > pep440.Version("0.4.0.post6")
-
-
-def test_version_docker() -> None:
-    assert version.docker("0.4.0") == "0.4.0"
-    assert version.docker("0.4.0-6-gaaaaaaa") == "0.4.1.pre6"
-    # assert version.docker("0.4.0-6-gaaaaaaa") == "0.4.0.post6"

release/version.py

@@ -1,104 +0,0 @@
-#!/usr/bin/env python3
-
-import locale
-import os
-import re
-import subprocess
-import sys
-from typing import Optional
-
-GIT_VERSION_FILE = "GIT_VERSION"
-
-
-def git() -> str:
-    """get the version from git. Can be
-    - X.Y.Z if a tag is set on the current HEAD
-    - X.Y.Z-<count>-g<commitid> otherwise where
-        - X.Y.Z is the latest version tag found
-        - <count> is the number of commits since then
-        - <commitid> is the current HEAD commitid
-    """
-    cmd = "git describe --tags --match=[0-9]*.[0-9]*.[0-9]*"
-    try:
-        p = subprocess.run(cmd.split(" "), capture_output=True, check=True)
-        v = p.stdout.decode("utf-8").strip()
-        # tox is running setup.py sdist from the git repo, and then runs again outside
-        # of the git repo. At this second step, we cannot run git commands.
-        # So we save the git version in a file and include it in the source distribution
-        with open(
-            GIT_VERSION_FILE, "w", encoding=locale.getpreferredencoding(False)
-        ) as f:
-            f.write(v)
-        return v
-    except subprocess.CalledProcessError as e:
-        # if we're not in a git repo, try reading out from the GIT_VERSION file
-        if os.path.exists(GIT_VERSION_FILE):
-            with open(
-                GIT_VERSION_FILE, encoding=locale.getpreferredencoding(False)
-            ) as f:
-                return f.read()
-        print(e.stderr)
-        raise e
-
-
-def commit(length: int = 7) -> str:
-    """get the current git commitid"""
-    cmd = f"git rev-parse --short={length} HEAD"
-    p = subprocess.run(cmd.split(" "), capture_output=True, check=True)
-    return p.stdout.decode("utf-8").strip()
-
-
-def semver(git_version: Optional[str] = None) -> str:  # noqa: UP007 - RHEL8 has python 3.8
-    """get a semantic version out of the input git version (see git())
-    - if a X.Y.Z tag is set on the current HEAD, we'll use this
-    - else we'll use X.Y.<Z+1>-<count>+<commitid> to respect semver and version
-      ordering. <count> is the prerelease id, <commitid> is a buildinfo
-    """
-    v = git_version or git()
-    m = re.match(r"(\d+)\.(\d+)\.(\d+)-(\d+)-g(.+)", v)
-    if m:
-        major, minor, patch, prerelease, buildinfo = m.groups()
-        # semver prerelase are supposed to show build increments *prior* to a release.
-        # So we're bumping the patch number to show what the next release would be.
-        # this allows correct version ordering
-        patch = str(int(patch) + 1)
-        # X.Y.Z-<count>-g<commitid> is not a valid as <count>-g<commitid> would be
-        # compared as a string, leading to (count=50) < (count=6)
-        # X.Y.Z-<count>+<commitid> is valid .
-        #   <count> is then the prerelease field, treated as a numeric.
-        #   <commitid> is then a buildinfo string, not used in version comparisons
-        v = f"{major}.{minor}.{patch}-{prerelease}+{buildinfo}"
-    return str(v)
-
-
-def pip(git_version: Optional[str] = None) -> str:  # noqa: UP007 - RHEL8 has python 3.8
-    """get a pip version out of the input git version (see git()),
-    according to https://peps.python.org/pep-0440/
-    - if a X.Y.Z tag is set on the current HEAD, we'll use this
-    - else we'll use X.Y.(Z+1).pre<count>+<commitid> to respect PEP-0440 versioning
-    """
-    return semver(git_version).replace("-", ".pre").split("+", maxsplit=1)[0]
-    # Alternatively, use postreleases
-    # v = git_version or git()
-    # m = re.match(r"(\d+)\.(\d+)\.(\d+)-(\d+)-g(.+)", v)
-    # if m:
-    #     major, minor, patch, count, commitid = m.groups()
-    #     v = f"{major}.{minor}.{patch}.post{count}+{commitid}"
-    # return str(v)
-
-
-def docker(git_version: Optional[str] = None) -> str:  # noqa: UP007 - RHEL8 has python 3.8
-    # docker tags don't like '+' characters, let's remove the buildinfo/commitid
-    return pip(git_version)
-
-
-if __name__ == "__main__":
-    type_param = sys.argv[1] if len(sys.argv) > 1 else "--git"
-    v = {
-        "--git": git(),
-        "--commit": commit(),
-        "--semver": semver(),
-        "--pip": pip(),
-        "--docker": docker(),
-    }[type_param]
-    print(v)