konsthol/SecDep
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Removed the 2gb .hprof file from git history

Browse Source
This commit is contained in:
konsthol
2023-03-24 17:02:09 +02:00
parent 6ab6f113e8
commit 18a0816199
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
secdep.py
View File

@@ -680,7 +680,7 @@ def choose_from_list(listFromlistFunction,listName):
elif listName == "azureSize": elif listName == "azureSize":
printFormat = "{}) {}\n\nRam: {}\nDisk: {}\nPrice: {}\n" printFormat = "{}) {}\n\nRam: {}\nDisk: {}\nPrice: {}\n"
printstring = "print(printFormat.format(count, item.name, item.ram, item.disk, item.price))" printstring = "print(printFormat.format(count, item.name, item.ram, item.disk, item.price))"
elif listName == "awsImage" or listName == "azureImage" or listName == "awsRegion": elif listName == "awsImage" or listName == "azureImage" or listName == "awsRegion" or listName == "aws_region":
printFormat = "{}) {}" printFormat = "{}) {}"
printstring = "print(printFormat.format(count, item))" printstring = "print(printFormat.format(count, item))"
elif listName == "gceImage": elif listName == "gceImage":
@@ -1227,8 +1227,8 @@ def list_all_nodes(provider, filterIn=None, awsRegion=None):
elif provider == "aws": elif provider == "aws":
if SECDEP_AWS_ACCESS_KEY != "": if SECDEP_AWS_ACCESS_KEY != "":
print("Getting AWS nodes...") print("Getting AWS nodes...")
if awsRegion is None:
awsLocations = ["ap-northeast-1", "ap-northeast-2", "ap-northeast-3", "ap-south-1", "ap-southeast-1", "ap-southeast-2", "ca-central-1", "eu-central-1", "eu-north-1", "eu-west-1", "eu-west-2", "eu-west-3", "sa-east-1", "us-east-1", "us-east-2", "us-west-1", "us-west-2"] awsLocations = ["ap-northeast-1", "ap-northeast-2", "ap-northeast-3", "ap-south-1", "ap-southeast-1", "ap-southeast-2", "ca-central-1", "eu-central-1", "eu-north-1", "eu-west-1", "eu-west-2", "eu-west-3", "sa-east-1", "us-east-1", "us-east-2", "us-west-1", "us-west-2"]
if awsRegion is None:
for region in awsLocations: for region in awsLocations:
driver3 = get_driver(Provider.EC2)(SECDEP_AWS_ACCESS_KEY, SECDEP_AWS_SECRET_KEY, region=region) driver3 = get_driver(Provider.EC2)(SECDEP_AWS_ACCESS_KEY, SECDEP_AWS_SECRET_KEY, region=region)
# make it so it tries all drivers # make it so it tries all drivers
@@ -1237,6 +1237,10 @@ def list_all_nodes(provider, filterIn=None, awsRegion=None):
for node in awsNodes: for node in awsNodes:
nodes.append(node) nodes.append(node)
else: else:
if awsRegion not in awsLocations:
print("Invalid region")
awsRegion = choose_from_list(listAWSregions(awsLocations),"aws_region")
assert awsRegion is not None, "You chose an invalid aws region so we can't continue unless you choose a corect one"
driver3 = get_driver(Provider.EC2)(SECDEP_AWS_ACCESS_KEY, SECDEP_AWS_SECRET_KEY, region=awsRegion) driver3 = get_driver(Provider.EC2)(SECDEP_AWS_ACCESS_KEY, SECDEP_AWS_SECRET_KEY, region=awsRegion)
awsNodes = driver3.list_nodes() awsNodes = driver3.list_nodes()
if len(awsNodes) > 0: if len(awsNodes) > 0: