From f5fc52e8beed88ea5286f2405bfaf76ba0d9d80f Mon Sep 17 00:00:00 2001 From: Andrey Date: Wed, 16 Nov 2022 15:10:08 +0200 Subject: [PATCH 1/2] Add public queries access token. --- crawlers/mooncrawl/mooncrawl/settings.py | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/crawlers/mooncrawl/mooncrawl/settings.py b/crawlers/mooncrawl/mooncrawl/settings.py index 66e50dd6..dd69968f 100644 --- a/crawlers/mooncrawl/mooncrawl/settings.py +++ b/crawlers/mooncrawl/mooncrawl/settings.py @@ -210,3 +210,13 @@ if MOONSTREAM_S3_PUBLIC_DATA_BUCKET == "": MOONSTREAM_S3_PUBLIC_DATA_BUCKET_PREFIX = os.environ.get( "MOONSTREAM_S3_PUBLIC_DATA_BUCKET_PREFIX", "dev" ) + + +MOONSTREAM_PUBLIC_QUERIES_DATA_ACCESS_TOKEN = os.environ.get( + "MOONSTREAM_PUBLIC_QUERIES_DATA_ACCESS_TOKEN", "" +) + +if MOONSTREAM_PUBLIC_QUERIES_DATA_ACCESS_TOKEN == "": + raise ValueError( + "MOONSTREAM_PUBLIC_QUERIES_DATA_ACCESS_TOKEN environment variable must be set" + ) From aae3b9bd3eb4b584a3b9a6973e67b9d312db8664 Mon Sep 17 00:00:00 2001 From: Andrey Date: Wed, 16 Nov 2022 15:20:05 +0200 Subject: [PATCH 2/2] Add MOONSTREAM_PUBLIC_QUERIES_DATA_ACCESS_TOKEN for run queries for public dashboard. --- .../deploy/polygon-cu-reports-tokenonomics.service | 2 +- crawlers/mooncrawl/mooncrawl/settings.py | 10 ---------- crawlers/mooncrawl/sample.env | 3 ++- 3 files changed, 3 insertions(+), 12 deletions(-) diff --git a/crawlers/deploy/polygon-cu-reports-tokenonomics.service b/crawlers/deploy/polygon-cu-reports-tokenonomics.service index 0393062e..9ce4d82d 100644 --- a/crawlers/deploy/polygon-cu-reports-tokenonomics.service +++ b/crawlers/deploy/polygon-cu-reports-tokenonomics.service @@ -8,6 +8,6 @@ User=ubuntu Group=www-data WorkingDirectory=/home/ubuntu/moonstream/crawlers/mooncrawl EnvironmentFile=/home/ubuntu/moonstream-secrets/app.env -ExecStart=/home/ubuntu/moonstream-env/bin/python -m mooncrawl.custom-crawler cu-reports --moonstream-token "${MOONSTREAM_ADMIN_ACCESS_TOKEN}" queries run-tokenonomics +ExecStart=/home/ubuntu/moonstream-env/bin/python -m mooncrawl.custom-crawler cu-reports --moonstream-token "${MOONSTREAM_PUBLIC_QUERIES_DATA_ACCESS_TOKEN}" queries run-tokenonomics CPUWeight=60 SyslogIdentifier=polygon-cu-reports-tokenonomics diff --git a/crawlers/mooncrawl/mooncrawl/settings.py b/crawlers/mooncrawl/mooncrawl/settings.py index dd69968f..66e50dd6 100644 --- a/crawlers/mooncrawl/mooncrawl/settings.py +++ b/crawlers/mooncrawl/mooncrawl/settings.py @@ -210,13 +210,3 @@ if MOONSTREAM_S3_PUBLIC_DATA_BUCKET == "": MOONSTREAM_S3_PUBLIC_DATA_BUCKET_PREFIX = os.environ.get( "MOONSTREAM_S3_PUBLIC_DATA_BUCKET_PREFIX", "dev" ) - - -MOONSTREAM_PUBLIC_QUERIES_DATA_ACCESS_TOKEN = os.environ.get( - "MOONSTREAM_PUBLIC_QUERIES_DATA_ACCESS_TOKEN", "" -) - -if MOONSTREAM_PUBLIC_QUERIES_DATA_ACCESS_TOKEN == "": - raise ValueError( - "MOONSTREAM_PUBLIC_QUERIES_DATA_ACCESS_TOKEN environment variable must be set" - ) diff --git a/crawlers/mooncrawl/sample.env b/crawlers/mooncrawl/sample.env index 1b28a874..5e7e8980 100644 --- a/crawlers/mooncrawl/sample.env +++ b/crawlers/mooncrawl/sample.env @@ -35,4 +35,5 @@ export COINMARKETCAP_API_KEY="" # Custom crawler export MOONSTREAM_S3_PUBLIC_DATA_BUCKET="" -export MOONSTREAM_S3_PUBLIC_DATA_BUCKET_PREFIX="dev" \ No newline at end of file +export MOONSTREAM_S3_PUBLIC_DATA_BUCKET_PREFIX="dev" +export MOONSTREAM_PUBLIC_QUERIES_DATA_ACCESS_TOKEN="" \ No newline at end of file