Skip to content

Commit

Permalink
updated testing to take into account commented out portions of iks.py
Browse files Browse the repository at this point in the history
  • Loading branch information
Michael-Hilborn committed Aug 4, 2021
1 parent 86524f2 commit 761a606
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 42 deletions.
6 changes: 1 addition & 5 deletions src/iks/iks.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -126,10 +126,6 @@ def iks(args):
delete_dns = None
delete_workspaces = None
work_creator = None
user_DNS = None
user_edge_cert = None
user_ACL = None
user_cert = None
user_ingress = None

UserInfo = handle_args(args)
Expand Down Expand Up @@ -213,4 +209,4 @@ def iks(args):

healthCheck(hostUrl)

return delete_dns, delete_workspaces, work_creator, user_DNS, user_edge_cert, user_ACL, user_cert, user_ingress
return delete_dns, delete_workspaces, work_creator, user_ingress
49 changes: 12 additions & 37 deletions tests/test_iks.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ def __init__(self, terraform, verbose, delete, iks_cluster_id, cis_domain, resou


class MockIntegrationInfoObj():
def set_attr(self, terraform, verbose, delete, iks_cluster_id, cis_domain, resource_group, name, crn, zone_id, namespace, service_name, service_port, vpc_name):
def set_attr(self, terraform, verbose, delete, iks_cluster_id, cis_domain, resource_group, name, crn, zone_id, namespace, service_name, service_port, vpc_name, iks_master_url):
self.crn = crn
self.zone_id = zone_id
self.api_endpoint = 'https://api.cis.cloud.ibm.com'
Expand All @@ -59,6 +59,7 @@ def set_attr(self, terraform, verbose, delete, iks_cluster_id, cis_domain, resou
self.service_name = service_name
self.service_port = service_port
self.vpc_name = vpc_name
self.iks_master_url = iks_master_url

def get_cms(arg):
return "123456789"
Expand All @@ -85,22 +86,22 @@ def get_no_crn_and_zone(self):

def mock_handle_args_delete_terr(args):
integration_info = MockIntegrationInfoObj()
integration_info.set_attr(True, True, True, "fake_cluster_id", "fake_cis_domain", "fake_resource_group", "fake_name", "fake_crn", "fake_zone_id", "fake_namespace", "fake_service_name", "fake_service_port", "fake_vpc")
integration_info.set_attr(True, True, True, "fake_cluster_id", "fake_cis_domain", "fake_resource_group", "fake_name", "fake_crn", "fake_zone_id", "fake_namespace", "fake_service_name", "fake_service_port", "fake_vpc", "fake_master_url")
return integration_info

def mock_handle_args_delete_not_terr(args):
integration_info = MockIntegrationInfoObj()
integration_info.set_attr(False, True, True, "fake_cluster_id", "fake_cis_domain", "fake_resource_group", "fake_name", "fake_crn", "fake_zone_id", "fake_namespace", "fake_service_name", "fake_service_port", "fake_vpc")
integration_info.set_attr(False, True, True, "fake_cluster_id", "fake_cis_domain", "fake_resource_group", "fake_name", "fake_crn", "fake_zone_id", "fake_namespace", "fake_service_name", "fake_service_port", "fake_vpc", "fake_master_url")
return integration_info

def mock_handle_args_terr(args):
integration_info = MockIntegrationInfoObj()
integration_info.set_attr(True, True, False, "fake_cluster_id", "fake_cis_domain", "fake_resource_group", "fake_name", "fake_crn", "fake_zone_id", "fake_namespace", "fake_service_name", "fake_service_port", "fake_vpc")
integration_info.set_attr(True, True, False, "fake_cluster_id", "fake_cis_domain", "fake_resource_group", "fake_name", "fake_crn", "fake_zone_id", "fake_namespace", "fake_service_name", "fake_service_port", "fake_vpc", "fake_master_url")
return integration_info

def mock_handle_args_reg(args):
integration_info = MockIntegrationInfoObj()
integration_info.set_attr(False, False, False, "fake_cluster_id", "fake_cis_domain", "fake_resource_group", "fake_name", "fake_crn", "fake_zone_id", "fake_namespace", "fake_service_name", "fake_service_port", "fake_vpc")
integration_info.set_attr(False, False, False, "fake_cluster_id", "fake_cis_domain", "fake_resource_group", "fake_name", "fake_crn", "fake_zone_id", "fake_namespace", "fake_service_name", "fake_service_port", "fake_vpc", "fake_master_url")
return integration_info

def mock_delete_dns(arg):
Expand Down Expand Up @@ -282,13 +283,9 @@ def test_iks_delete_terr(monkeypatch):

with patch("src.common.delete_dns.DeleteDNS.delete_dns", mock_delete_dns):
with patch("src.ce.delete_workspaces.DeleteWorkspace.delete_workspace", mock_delete_workspace):
delete_dns, delete_workspaces, work_creator, user_DNS, user_edge_cert, user_ACL, user_cert, user_ingress = iks(args)
delete_dns, delete_workspaces, work_creator, user_ingress = iks(args)

assert work_creator == None
assert user_DNS == None
assert user_edge_cert == None
assert user_ACL == None
assert user_cert == None
assert user_ingress == None
assert delete_dns == None
assert delete_workspaces.crn == "fake_crn"
Expand All @@ -309,15 +306,11 @@ def test_iks_delete_not_terr(monkeypatch):

with patch("src.common.delete_dns.DeleteDNS.delete_dns", mock_delete_dns):
with patch("src.ce.delete_workspaces.DeleteWorkspace.delete_workspace", mock_delete_workspace):
delete_dns, delete_workspaces, work_creator, user_DNS, user_edge_cert, user_ACL, user_cert, user_ingress = iks(args)
delete_dns, delete_workspaces, work_creator, user_ingress = iks(args)


assert delete_workspaces == None
assert work_creator == None
assert user_DNS == None
assert user_edge_cert == None
assert user_ACL == None
assert user_cert == None
assert user_ingress == None
assert delete_dns.crn == "fake_crn"
assert delete_dns.zone_id == "fake_zone_id"
Expand All @@ -333,7 +326,7 @@ def test_iks_terraform(monkeypatch):

with patch("src.iks.create_terraform_workspace.WorkspaceCreator.create_terraform_workspace", mock_create_terraform_workspace):
with patch("src.ce.delete_workspaces.DeleteWorkspace.delete_workspace", mock_delete_workspace):
delete_dns, delete_workspaces, work_creator, user_DNS, user_edge_cert, user_ACL, user_cert, user_ingress = iks(args)
delete_dns, delete_workspaces, work_creator, user_ingress = iks(args)

assert work_creator.cis_api_key == "fake_key"
assert work_creator.schematics_url == 'https://us.schematics.cloud.ibm.com'
Expand All @@ -343,10 +336,7 @@ def test_iks_terraform(monkeypatch):
assert work_creator.cluster_id == "fake_cluster_id"
assert work_creator.token == {"access_token": "123456789",
"refresh_token": "testingRefresh"}
assert user_DNS == None
assert user_edge_cert == None
assert user_ACL == None
assert user_cert == None

assert user_ingress == None
assert delete_dns == None
assert delete_workspaces == None
Expand All @@ -365,25 +355,9 @@ def test_iks_regular(monkeypatch):
with patch("src.ce.delete_workspaces.DeleteWorkspace.delete_workspace", mock_delete_workspace):
with patch("src.iks.create_ingress.IngressCreator.create_ingress", mock_create_ingress):
with patch("src.iks.create_acl_rules.AclRuleCreator.check_network_acl", mock_check_network_acl):
delete_dns, delete_workspaces, work_creator, user_DNS, user_edge_cert, user_ACL, user_cert, user_ingress = iks(args)
delete_dns, delete_workspaces, work_creator, user_ingress = iks(args)

assert work_creator == None
assert user_DNS.crn == "fake_crn"
assert user_DNS.zone_id == "fake_zone_id"
assert user_DNS.endpoint == 'https://api.cis.cloud.ibm.com'
assert user_DNS.content == "test_url"
assert user_edge_cert.crn == "fake_crn"
assert user_edge_cert.zone_id == "fake_zone_id"
assert user_edge_cert.endpoint == 'https://api.cis.cloud.ibm.com'
assert user_edge_cert.hostNames == ["fake_cis_domain", "*."+"fake_cis_domain"]
assert user_ACL.vpc_name == "fake_vpc"
assert user_ACL.api_key == "fake_key"
assert user_cert.cis_crn == "fake_crn"
assert user_cert.cluster_id == "fake_cluster_id"
assert user_cert.cis_domain == "fake_cis_domain"
assert user_cert.cert_manager_crn == "123456789"
assert user_cert.token == "123456789"
assert user_cert.cert_name == "cis-cert"
assert user_ingress.clusterNameOrID == "fake_cluster_id"
assert user_ingress.resourceGroupID == "fake_resource_group"
assert user_ingress.namespace == "fake_namespace"
Expand All @@ -393,5 +367,6 @@ def test_iks_regular(monkeypatch):
assert user_ingress.accessToken == "123456789"
assert user_ingress.refreshToken == "testingRefresh"
assert user_ingress.ingressSubdomain == "test_url"
assert user_ingress.iks_master_url == "fake_master_url"
assert delete_dns == None
assert delete_workspaces == None

0 comments on commit 761a606

Please sign in to comment.