Skip to content

Commit f1a9056

Browse files
committed
feat(gws): add logging statements for scubagoggles version and input bucket
1 parent 8c26409 commit f1a9056

1 file changed

Lines changed: 5 additions & 1 deletion

File tree

gws/image/main.py

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88

99
import yaml
1010
from scubagoggles.scuba_constants import API_SCOPES
11+
from scubagoggles import __version__ as goggles_version
1112

1213
from google.auth import default, iam
1314
from google.auth.transport.requests import Request
@@ -64,9 +65,11 @@ def get_token(impersonate: str) -> str:
6465

6566

6667
if __name__ == '__main__':
68+
logging.info(f"ScubaGoggles v{goggles_version}")
6769
logging.info(f"run type: {RUN_TYPE}")
6870
os.makedirs(f"input/{RUN_TYPE}", exist_ok=True)
6971

72+
logging.info(f"Reading files from: {INPUT_BUCKET}/{RUN_TYPE}")
7073
config_blobs = storage.Client().list_blobs(INPUT_BUCKET, prefix=RUN_TYPE)
7174
for config in config_blobs:
7275
if config.name.endswith("/"):
@@ -86,6 +89,7 @@ def get_token(impersonate: str) -> str:
8689
logging.error(f"file {config} missing 'subjectemail' field")
8790
continue
8891
subject_email = contents["subjectemail"]
92+
8993
cmd = "scubagoggles gws " + SCUBA_GWS_ARGS.format(org, config, get_token(subject_email))
9094
result = subprocess.run(shlex.split(cmd), check=True, capture_output=True, text=True)
9195
if result.stderr is not None and len(result.stderr) > 0:
@@ -123,7 +127,7 @@ def get_token(impersonate: str) -> str:
123127
file_str = file_parts[-1]
124128
blob = out_bucket.blob(f"{date_str}{dir_str}{file_str}")
125129
blob.upload_from_filename(local_file)
126-
logging.info(f"Uploaded {blob.id}")
130+
logging.info(f"Uploaded: {blob.id}")
127131
transferred += 1
128132
logging.info(f"Finished. Successes: {successes}/{len(config_files)}. Transferred {transferred} files.")
129133
log_client.close()

0 commit comments

Comments
 (0)