Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Preconditions Script Checks Billing Account Format #117

Merged
merged 6 commits into from
Jan 23, 2019
Merged

Preconditions Script Checks Billing Account Format #117

Changes from 3 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
2b08f11
Replace json.dumps with json.dump for result output
trotttrotttrott Jan 17, 2019
9f874c6
Preconditions checks billing account is in correct format
trotttrotttrott Jan 17, 2019
d835563
Merge branch 'master' into feature/preconditions-checks-billing-acct-fmt
morgante Jan 17, 2019
7e04096
Merge branch 'master' into feature/preconditions-checks-billing-acct-fmt
morgante Jan 19, 2019
d9a948d
Merge branch 'master' into feature/preconditions-checks-billing-acct-fmt
trotttrotttrott Jan 22, 2019
71814f5
Merge branch 'master' into feature/preconditions-checks-billing-acct-fmt
adrienthebo Jan 23, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 11 additions & 3 deletions modules/core_project_factory/scripts/preconditions/preconditions.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
import argparse
import json
import logging
import re
import sys
import os

Expand Down Expand Up @@ -301,6 +302,13 @@ def validate(self, credentials):

return req.asdict()

@classmethod
def argument_type(cls, string, pat=re.compile(r"[A-Z0-9]{6}-[A-Z0-9]{6}-[A-Z0-9]{6}")):
if not pat.match(string):
msg = "%r is not a valid billing account ID format" % string
raise argparse.ArgumentTypeError(msg)
return string


def setup():
logging.basicConfig()
Expand Down Expand Up @@ -347,7 +355,8 @@ def argparser():
)
parser.add_argument(
'--billing_account', required=True,
help='The billing account to be associated with a new project'
help='The billing account to be associated with a new project',
type=BillingAccount.argument_type
)
parser.add_argument(
'--org_id', required=True, action=EmptyStrAction,
Expand Down Expand Up @@ -411,8 +420,7 @@ def main(argv):
retcode = 1

if retcode == 1 or opts.verbose:
s = json.dumps(results, sys.stdout, indent=4)
print(s)
json.dump(results, sys.stdout, indent=4)
except FileNotFoundError as error:
print(error)
retcode = 1
Expand Down