diff --git a/.env b/.env new file mode 100644 index 0000000..07b2f76 --- /dev/null +++ b/.env @@ -0,0 +1,5 @@ +PROJECT_ID=daring-chess-315909 +PRIVATE_KEY_ID=30b7afd724d1c14787de0737b34169013085b82c +PRIVATE_KEY=-----BEGIN PRIVATE KEY-----\nMIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQDE+z+nCeD+LhEQ\nGuYvZtfq44Gt5eu86ltb5yHxw23Um4+frKvkLixP+0tzmTGJeFl45SCs9wOiwL6Q\nAqSi9AB2EXPUph6tf/29LpTZ6zNVq1QhHJhATbIDbQW6BZE9kM7Edju8F3pFRaqq\n0T5eDPaOvAEDcJWudm9BLEnpI5z1ws2fag4VT0GOp3TYTZc9Gwx24EbeQMgiTX6s\n/U1FyfmX1s4KxyCRabsMjK2CMleHq6+jI1N2pyRWXnTx2Wlfu4U65d8cVkxVa5zN\nhlS2jOYFEZBIzpNeSD+aOlnshVKGSxE+Pl8s/h8Jfbx+RunjFcdCBADyKwIPcjZw\nVsTC8vmrAgMBAAECggEADC1qIHX0YlJPvLqk+040z/ETncAGhE3KqxJNX2hQ/GFH\njjv6/ma6V5F19yYD0XdOtLIZhIfawi9/OGDpc6d49dObYQyJ/fjZI15jVlt7d3LZ\nhxiA8wy6kgql3XuloHQ4zB1xEO40oV6ur9OystbDUUyfFWra3ge1VgaaZR7N/8VY\nz/K3GW4OxmN+Ydu58TQC7GBfe06tbqqAccZ0AYW701QZVORnKQHymwDA98KjSYFR\nMdZ++/dpjVcqs6LyJXDiuljPBnp/y7+g7PMmO8aDjm3jy59VElcV+CPx+KerYcGN\n9MfQlXvZ14fFw1Bch1C/AI326pgwcIZAP9yc84BNiQKBgQD4WhJAj9BmZE3FgEmm\nu5xCBVAffL74Ns+8xoEtmv9hr1L1Yk16Zf18avvQi7Jubr4ncNCHnWHg5RB73EQj\nE3egy7BGgiDNpwuH0bG7H4wgokat63lVt0MHnwB2YNHfHmQ0dsYRFVT+mzzUe9PU\nkBYWjDhxlk/Wf81M3YqoBExEAwKBgQDLDDBnLoqARmt0bojVTvsJ/BSqMnRmyZiK\noFKfv2gYZN7rZLl20Sd1gv4VMq2XY2LzknsvBbJ654M8jF1GBU4F6JaYbR+1s29c\nsgYgZye8cthkVqCL/iUDdYdpXkroDYR/z4pqokOpBAekDAvIip374g8z9LKSGWkG\nodASwQlHOQKBgQCwdC6ruIK1fWbUgMXTtVDch7HZ7WQyL5+B3PhDUvFIkq06s9Gg\nuX5VPB4Wmmr4k65/j2RaNrQoehgwKNwwn9BLau2f6y0rcRh8M7032r5RIXtebwQS\nptb1Pz+w3DHBeXJw5ELuOF3fWKTrw99KE+Xdt1sTOV0YZk2T44R0xDj7yQKBgC6E\nPlqFGQnGGDv2Tra/f1eMPpe3M1+Q87def09FpG1iPoei7bJAvE95kQf+MjKqfDLc\n7geZwIfTngczCPNPp85GuKl25nrT/sE3r5ugxkOv888Y4XLw6D3goQMMrRB4eFBn\nlYhUYDfKSo3UjKaGyya3ZVA70OUTmTIBxA9n1d5RAoGBAKm1hCL0zgzm2mrlKjOa\nstwAplqrcGppPL9eZJiDGmDXrpudCpdfky45HLxeMgnC9RMNZdhF67T10bVX/W6W\nGppIAd30+QbJgKfum1jRq9Lip5bsXk5jphF5cyVDPUq5jX9fwOyfa/sHplVEewaZ\nwJETFg/JJ/kYmY29vhDtulBh\n-----END PRIVATE KEY-----\n +CLIENT_EMAIL=dnstest@daring-chess-315909.iam.gserviceaccount.com +CLIENT_ID=110844357860663711229 diff --git a/CommandLineTool/CommandLineTool/script.py b/CommandLineTool/CommandLineTool/script.py index 475239d..8197a25 100644 --- a/CommandLineTool/CommandLineTool/script.py +++ b/CommandLineTool/CommandLineTool/script.py @@ -6,14 +6,17 @@ from datetime import datetime import time +from dotenv import load_dotenv + +load_dotenv() app_cred_dict = { "type": "service_account", - "project_id": "daring-chess-315909", - "private_key_id": "30b7afd724d1c14787de0737b34169013085b82c", - "private_key": "-----BEGIN PRIVATE KEY-----\nMIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQDE+z+nCeD+LhEQ\nGuYvZtfq44Gt5eu86ltb5yHxw23Um4+frKvkLixP+0tzmTGJeFl45SCs9wOiwL6Q\nAqSi9AB2EXPUph6tf/29LpTZ6zNVq1QhHJhATbIDbQW6BZE9kM7Edju8F3pFRaqq\n0T5eDPaOvAEDcJWudm9BLEnpI5z1ws2fag4VT0GOp3TYTZc9Gwx24EbeQMgiTX6s\n/U1FyfmX1s4KxyCRabsMjK2CMleHq6+jI1N2pyRWXnTx2Wlfu4U65d8cVkxVa5zN\nhlS2jOYFEZBIzpNeSD+aOlnshVKGSxE+Pl8s/h8Jfbx+RunjFcdCBADyKwIPcjZw\nVsTC8vmrAgMBAAECggEADC1qIHX0YlJPvLqk+040z/ETncAGhE3KqxJNX2hQ/GFH\njjv6/ma6V5F19yYD0XdOtLIZhIfawi9/OGDpc6d49dObYQyJ/fjZI15jVlt7d3LZ\nhxiA8wy6kgql3XuloHQ4zB1xEO40oV6ur9OystbDUUyfFWra3ge1VgaaZR7N/8VY\nz/K3GW4OxmN+Ydu58TQC7GBfe06tbqqAccZ0AYW701QZVORnKQHymwDA98KjSYFR\nMdZ++/dpjVcqs6LyJXDiuljPBnp/y7+g7PMmO8aDjm3jy59VElcV+CPx+KerYcGN\n9MfQlXvZ14fFw1Bch1C/AI326pgwcIZAP9yc84BNiQKBgQD4WhJAj9BmZE3FgEmm\nu5xCBVAffL74Ns+8xoEtmv9hr1L1Yk16Zf18avvQi7Jubr4ncNCHnWHg5RB73EQj\nE3egy7BGgiDNpwuH0bG7H4wgokat63lVt0MHnwB2YNHfHmQ0dsYRFVT+mzzUe9PU\nkBYWjDhxlk/Wf81M3YqoBExEAwKBgQDLDDBnLoqARmt0bojVTvsJ/BSqMnRmyZiK\noFKfv2gYZN7rZLl20Sd1gv4VMq2XY2LzknsvBbJ654M8jF1GBU4F6JaYbR+1s29c\nsgYgZye8cthkVqCL/iUDdYdpXkroDYR/z4pqokOpBAekDAvIip374g8z9LKSGWkG\nodASwQlHOQKBgQCwdC6ruIK1fWbUgMXTtVDch7HZ7WQyL5+B3PhDUvFIkq06s9Gg\nuX5VPB4Wmmr4k65/j2RaNrQoehgwKNwwn9BLau2f6y0rcRh8M7032r5RIXtebwQS\nptb1Pz+w3DHBeXJw5ELuOF3fWKTrw99KE+Xdt1sTOV0YZk2T44R0xDj7yQKBgC6E\nPlqFGQnGGDv2Tra/f1eMPpe3M1+Q87def09FpG1iPoei7bJAvE95kQf+MjKqfDLc\n7geZwIfTngczCPNPp85GuKl25nrT/sE3r5ugxkOv888Y4XLw6D3goQMMrRB4eFBn\nlYhUYDfKSo3UjKaGyya3ZVA70OUTmTIBxA9n1d5RAoGBAKm1hCL0zgzm2mrlKjOa\nstwAplqrcGppPL9eZJiDGmDXrpudCpdfky45HLxeMgnC9RMNZdhF67T10bVX/W6W\nGppIAd30+QbJgKfum1jRq9Lip5bsXk5jphF5cyVDPUq5jX9fwOyfa/sHplVEewaZ\nwJETFg/JJ/kYmY29vhDtulBh\n-----END PRIVATE KEY-----\n", - "client_email": "dnstest@daring-chess-315909.iam.gserviceaccount.com", - "client_id": "110844357860663711229", + "project_id": os.getenv('PROJECT_ID'), + "private_key_id": os.getenv('PRIVATE_KEY_ID'), + "private_key": os.getenv('PRIVATE_KEY'), + "client_email": os.getenv('CLIENT_EMAIL'), + "client_id": os.getenv('CLIENT_ID'), "auth_uri": "https://accounts.google.com/o/oauth2/auth", "token_uri": "https://oauth2.googleapis.com/token", "auth_provider_x509_cert_url": "https://www.googleapis.com/oauth2/v1/certs", diff --git a/CommandLineTool/requirements.txt b/CommandLineTool/requirements.txt index 992f322..2a8443d 100644 --- a/CommandLineTool/requirements.txt +++ b/CommandLineTool/requirements.txt @@ -17,6 +17,7 @@ pyasn1==0.4.8 pyasn1-modules==0.2.8 pycparser==2.20 pyparsing==2.4.7 +python-dotenv==0.19.2 pytz==2021.1 requests==2.26.0 rsa==4.7.2 diff --git a/gcs_file_download/GCS_script.py b/gcs_file_download/GCS_script.py index 32b7cd2..529c400 100644 --- a/gcs_file_download/GCS_script.py +++ b/gcs_file_download/GCS_script.py @@ -2,14 +2,17 @@ from google.cloud import storage from google.oauth2 import service_account import os +from dotenv import load_dotenv + +load_dotenv() app_cred_dict = { "type": "service_account", - "project_id": "daring-chess-315909", - "private_key_id": "30b7afd724d1c14787de0737b34169013085b82c", - "private_key": "-----BEGIN PRIVATE KEY-----\nMIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQDE+z+nCeD+LhEQ\nGuYvZtfq44Gt5eu86ltb5yHxw23Um4+frKvkLixP+0tzmTGJeFl45SCs9wOiwL6Q\nAqSi9AB2EXPUph6tf/29LpTZ6zNVq1QhHJhATbIDbQW6BZE9kM7Edju8F3pFRaqq\n0T5eDPaOvAEDcJWudm9BLEnpI5z1ws2fag4VT0GOp3TYTZc9Gwx24EbeQMgiTX6s\n/U1FyfmX1s4KxyCRabsMjK2CMleHq6+jI1N2pyRWXnTx2Wlfu4U65d8cVkxVa5zN\nhlS2jOYFEZBIzpNeSD+aOlnshVKGSxE+Pl8s/h8Jfbx+RunjFcdCBADyKwIPcjZw\nVsTC8vmrAgMBAAECggEADC1qIHX0YlJPvLqk+040z/ETncAGhE3KqxJNX2hQ/GFH\njjv6/ma6V5F19yYD0XdOtLIZhIfawi9/OGDpc6d49dObYQyJ/fjZI15jVlt7d3LZ\nhxiA8wy6kgql3XuloHQ4zB1xEO40oV6ur9OystbDUUyfFWra3ge1VgaaZR7N/8VY\nz/K3GW4OxmN+Ydu58TQC7GBfe06tbqqAccZ0AYW701QZVORnKQHymwDA98KjSYFR\nMdZ++/dpjVcqs6LyJXDiuljPBnp/y7+g7PMmO8aDjm3jy59VElcV+CPx+KerYcGN\n9MfQlXvZ14fFw1Bch1C/AI326pgwcIZAP9yc84BNiQKBgQD4WhJAj9BmZE3FgEmm\nu5xCBVAffL74Ns+8xoEtmv9hr1L1Yk16Zf18avvQi7Jubr4ncNCHnWHg5RB73EQj\nE3egy7BGgiDNpwuH0bG7H4wgokat63lVt0MHnwB2YNHfHmQ0dsYRFVT+mzzUe9PU\nkBYWjDhxlk/Wf81M3YqoBExEAwKBgQDLDDBnLoqARmt0bojVTvsJ/BSqMnRmyZiK\noFKfv2gYZN7rZLl20Sd1gv4VMq2XY2LzknsvBbJ654M8jF1GBU4F6JaYbR+1s29c\nsgYgZye8cthkVqCL/iUDdYdpXkroDYR/z4pqokOpBAekDAvIip374g8z9LKSGWkG\nodASwQlHOQKBgQCwdC6ruIK1fWbUgMXTtVDch7HZ7WQyL5+B3PhDUvFIkq06s9Gg\nuX5VPB4Wmmr4k65/j2RaNrQoehgwKNwwn9BLau2f6y0rcRh8M7032r5RIXtebwQS\nptb1Pz+w3DHBeXJw5ELuOF3fWKTrw99KE+Xdt1sTOV0YZk2T44R0xDj7yQKBgC6E\nPlqFGQnGGDv2Tra/f1eMPpe3M1+Q87def09FpG1iPoei7bJAvE95kQf+MjKqfDLc\n7geZwIfTngczCPNPp85GuKl25nrT/sE3r5ugxkOv888Y4XLw6D3goQMMrRB4eFBn\nlYhUYDfKSo3UjKaGyya3ZVA70OUTmTIBxA9n1d5RAoGBAKm1hCL0zgzm2mrlKjOa\nstwAplqrcGppPL9eZJiDGmDXrpudCpdfky45HLxeMgnC9RMNZdhF67T10bVX/W6W\nGppIAd30+QbJgKfum1jRq9Lip5bsXk5jphF5cyVDPUq5jX9fwOyfa/sHplVEewaZ\nwJETFg/JJ/kYmY29vhDtulBh\n-----END PRIVATE KEY-----\n", - "client_email": "dnstest@daring-chess-315909.iam.gserviceaccount.com", - "client_id": "110844357860663711229", + "project_id": os.getenv('PROJECT_ID'), + "private_key_id": os.getenv('PRIVATE_KEY_ID'), + "private_key": os.getenv('PRIVATE_KEY'), + "client_email": os.getenv('CLIENT_EMAIL'), + "client_id": os.getenv('CLIENT_ID'), "auth_uri": "https://accounts.google.com/o/oauth2/auth", "token_uri": "https://oauth2.googleapis.com/token", "auth_provider_x509_cert_url": "https://www.googleapis.com/oauth2/v1/certs", diff --git a/gcs_file_download/large_file_download.py b/gcs_file_download/large_file_download.py index 83392ca..7d41cf8 100644 --- a/gcs_file_download/large_file_download.py +++ b/gcs_file_download/large_file_download.py @@ -4,11 +4,13 @@ import io import json from concurrent.futures import ProcessPoolExecutor +from dotenv import load_dotenv +load_dotenv() def initialize(): global project_id, storage_credentials - project_id = 'daring-chess-315909' + project_id = os.getenv('PROJECT_ID') with open('./google_app_cred.json') as source: cred_json = json.load(source)