Skip to content

Commit 1feb05c

Browse files
author
Douglas Curtis
authored
Merge pull request #2574 from project-koku/rc-2021.01.07
Rc 2021.01.07
2 parents e979404 + a219f5f commit 1feb05c

File tree

89 files changed

+5071
-1166
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

89 files changed

+5071
-1166
lines changed

‎Makefile

+8-4
Original file line numberDiff line numberDiff line change
@@ -363,10 +363,11 @@ docker-iqe-vortex-tests: docker-reinitdb _set-test-dir-permissions clear-testing
363363

364364
docker-metastore-setup:
365365
@cp -fr deploy/metastore/ testing/metastore/
366-
@chmod -R o+rwx ./testing/metastore
366+
find ./testing/metastore -type d -exec chmod a+rwx {} \;
367367
@[[ ! -d ./testing/metastore/db-data ]] && mkdir -p -m a+rwx ./testing/metastore/db-data || chmod a+rwx ./testing/metastore/db-data
368368
@cp -fr deploy/hadoop/ testing/hadoop/
369-
@chmod o+rwx ./testing/hadoop
369+
# @[[ ! -d ./testing/hadoop/hadoop-logs ]] && mkdir -p -m a+rwx ./hadoop/hadoop-logs || chmod a+rwx ./hadoop/hadoop-logs
370+
find ./testing/hadoop -type d -exec chmod a+rwx {} \;
370371
@$(SED_IN_PLACE) -e 's/s3path/$(shell echo $(or $(S3_BUCKET_NAME),metastore))/g' testing/hadoop/hadoop-config/core-site.xml
371372
@$(SED_IN_PLACE) -e 's/s3path/$(shell echo $(or $(S3_BUCKET_NAME),metastore))/g' testing/metastore/hive-config/hive-site.xml
372373
@$(SED_IN_PLACE) -e 's%s3endpoint%$(shell echo $(or $(S3_ENDPOINT),localhost))%g' testing/metastore/hive-config/hive-site.xml
@@ -375,9 +376,9 @@ docker-metastore-setup:
375376

376377
docker-presto-setup:
377378
@cp -fr deploy/presto/ testing/presto/
378-
@chmod o+rwx ./testing/presto
379+
find ./testing/presto -type d -exec chmod a+rwx {} \;
379380
@cp -fr deploy/hadoop/ testing/hadoop/
380-
@chmod o+rwx ./testing/hadoop
381+
find ./testing/hadoop -type d -exec chmod a+rwx {} \;
381382
@[[ ! -d ./testing/parquet_data ]] && mkdir -p -m a+rwx ./testing/parquet_data || chmod a+rwx ./testing/parquet_data
382383
@$(SED_IN_PLACE) -e 's/s3path/$(shell echo $(or $(S3_BUCKET_NAME),metastore))/g' testing/hadoop/hadoop-config/core-site.xml
383384
@$(SED_IN_PLACE) -e 's/DATABASE_NAME/$(shell echo $(or $(DATABASE_NAME),postgres))/g' testing/presto/presto-catalog-config/postgres.properties
@@ -391,6 +392,9 @@ docker-presto-cleanup:
391392
docker-presto-up: docker-metastore-setup docker-presto-setup
392393
docker-compose -f ./testing/compose_files/docker-compose-presto.yml up -d
393394

395+
docker-presto-ps:
396+
docker-compose -f ./testing/compose_files/docker-compose-presto.yml ps
397+
394398
docker-presto-down:
395399
docker-compose -f ./testing/compose_files/docker-compose-presto.yml down -v
396400
make docker-presto-cleanup

‎Pipfile.lock

+519-521
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎deploy/metastore/hive-scripts/entrypoint.sh

+3-4
Original file line numberDiff line numberDiff line change
@@ -65,9 +65,9 @@ ln -s -f /hive-config/hive-exec-log4j2.properties $HIVE_HOME/conf/hive-exec-log4
6565

6666
export HADOOP_LOG_DIR="${HADOOP_HOME}/logs"
6767
# Set garbage collection settings
68-
export GC_SETTINGS="-XX:+UseG1GC -XX:G1HeapRegionSize=32M -XX:+UseGCOverheadLimit -XX:+ExplicitGCInvokesConcurrent -XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=${HADOOP_LOG_DIR}/heap_dump.bin -XX:+ExitOnOutOfMemoryError -XX:ErrorFile=${HADOOP_LOG_DIR}/java_error%p.log"
68+
#export GC_SETTINGS="-XX:+UseG1GC -XX:G1HeapRegionSize=32M -XX:+UseGCOverheadLimit -XX:+ExplicitGCInvokesConcurrent -XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=${HADOOP_LOG_DIR}/heap_dump.bin -XX:+ExitOnOutOfMemoryError -XX:ErrorFile=${HADOOP_LOG_DIR}/java_error%p.log"
6969

70-
export VM_OPTIONS="$VM_OPTIONS -XX:+UseContainerSupport"
70+
export VM_OPTIONS="$VM_OPTIONS -XX:+UseContainerSupport -XX:ErrorFile=${HADOOP_LOG_DIR}/java_error%p.log"
7171

7272
if [ -n "$JVM_INITIAL_RAM_PERCENTAGE" ]; then
7373
VM_OPTIONS="$VM_OPTIONS -XX:InitialRAMPercentage=$JVM_INITIAL_RAM_PERCENTAGE"
@@ -83,8 +83,7 @@ fi
8383
export JMX_OPTIONS="-javaagent:/opt/jmx_exporter/jmx_exporter.jar=8082:/opt/jmx_exporter/config/config.yml -Dcom.sun.management.jmxremote -Dcom.sun.management.jmxremote.local.only=false -Dcom.sun.management.jmxremote.ssl=false -Dcom.sun.management.jmxremote.authenticate=false -Dcom.sun.management.jmxremote.port=8081 -Dcom.sun.management.jmxremote.rmi.port=8081 -Djava.rmi.server.hostname=127.0.0.1"
8484

8585
# Set garbage collection logs
86-
GC_SETTINGS="${GC_SETTINGS} -verbose:gc -XX:+PrintGCDetails -XX:+PrintGCTimeStamps -XX:+PrintGCDateStamps -Xloggc:${HADOOP_LOG_DIR}/gc.log"
87-
GC_SETTINGS="${GC_SETTINGS} -XX:+UseGCLogFileRotation -XX:NumberOfGCLogFiles=5 -XX:GCLogFileSize=3M"
86+
export GC_SETTINGS="${GC_SETTINGS} -verbose:gc -Xlog:gc*:${HADOOP_LOG_DIR}/gc.log"
8887

8988
export HIVE_LOGLEVEL="${HIVE_LOGLEVEL:-INFO}"
9089
export HADOOP_OPTS="${HADOOP_OPTS} ${VM_OPTIONS} ${GC_SETTINGS} ${JMX_OPTIONS}"

‎deploy/presto/presto-coordinator-config/jvm.config

+1-13
Original file line numberDiff line numberDiff line change
@@ -22,19 +22,7 @@
2222

2323
-verbose:gc
2424

25-
-Xloggc:/var/presto/logs/gc.log
26-
27-
-XX:+PrintGCDetails
28-
29-
-XX:+PrintGCTimeStamps
30-
31-
-XX:+PrintGCDateStamps
32-
33-
-XX:+UseGCLogFileRotation
34-
35-
-XX:NumberOfGCLogFiles=5
36-
37-
-XX:GCLogFileSize=3M
25+
-Xlog:gc*:/var/presto/logs/gc.log
3826

3927
-javaagent:/opt/jmx_exporter/jmx_exporter.jar=8082:/opt/jmx_exporter/config/config.yml
4028

‎docs/rtd_requirements.txt

+34-35
Original file line numberDiff line numberDiff line change
@@ -1,55 +1,54 @@
1-
-i http://localhost:3141/root/pypi/+simple/
2-
--trusted-host localhost:3141
1+
-i https://pypi.python.org/simple
32
adal==1.2.5
43
amqp==2.6.1; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4'
5-
asgiref==3.3.0; python_version >= '3.5'
6-
azure-common==1.1.25
7-
azure-core==1.8.2
8-
azure-mgmt-core==1.2.1
4+
asgiref==3.3.1; python_version >= '3.5'
5+
azure-common==1.1.26
6+
azure-core==1.9.0
7+
azure-mgmt-core==1.2.2
98
azure-mgmt-costmanagement==0.2.0
109
azure-mgmt-resource==15.0.0
1110
azure-mgmt-storage==11.2.0
12-
azure-storage-blob==12.5.0
11+
azure-storage-blob==12.6.0
1312
beautifulsoup4==4.9.3
1413
billiard==3.6.3.0
15-
boto3==1.16.10
16-
botocore==1.19.10
14+
boto3==1.16.35
15+
botocore==1.19.35
1716
bs4==0.0.1
18-
cachetools==4.1.1
17+
cachetools==4.2.0
1918
celery-prometheus-exporter==1.7.0
2019
celery==4.4.7
21-
certifi==2020.6.20
22-
cffi==1.14.3
20+
certifi==2020.12.5
21+
cffi==1.14.4
2322
chardet==3.0.4
2423
ciso8601==2.1.3
2524
click==7.1.2; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4'
2625
confluent-kafka==1.5.0
27-
cryptography==3.2.1; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4'
28-
django-cors-headers==3.5.0
26+
cryptography==3.3.1; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4, 3.5'
27+
django-cors-headers==3.6.0
2928
django-environ==0.4.5
30-
django-extensions==3.0.9
29+
django-extensions==3.1.0
3130
django-filter==2.4.0
3231
django-prometheus==2.1.0
3332
django-redis==4.12.1
3433
django-tenant-schemas==1.10.0
35-
django==3.1.3
34+
django==3.1.4
3635
djangorestframework-csv==2.1.0
37-
djangorestframework==3.12.1
36+
djangorestframework==3.12.2
3837
flake8==3.8.4
3938
google-api-core[grpc]==1.23.0; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'
40-
google-api-python-client==1.12.5
39+
google-api-python-client==1.12.8
4140
google-auth-httplib2==0.0.4
42-
google-auth==1.23.0
43-
google-cloud-bigquery==2.2.0
44-
google-cloud-core==1.4.3; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'
41+
google-auth==1.24.0
42+
google-cloud-bigquery==2.6.1
43+
google-cloud-core==1.4.4; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'
4544
google-crc32c==1.0.0; python_version >= '3.5'
46-
google-resumable-media==1.1.0; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'
45+
google-resumable-media==1.1.0; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4'
4746
googleapis-common-protos==1.52.0; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'
48-
grpcio==1.33.2
47+
grpcio==1.34.0
4948
gunicorn==20.0.4
5049
httplib2==0.18.1
5150
idna==2.10; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'
52-
importlib-metadata==2.0.0
51+
importlib-metadata==3.3.0
5352
isodate==0.6.0
5453
jinja2==2.11.2; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4'
5554
jinjasql==0.1.8
@@ -63,14 +62,14 @@ msrestazure==0.6.4
6362
numpy==1.19.4; python_version >= '3.6'
6463
oauthlib==3.1.0; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'
6564
ordered-set==4.0.2; python_version >= '3.5'
66-
packaging==20.4; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'
67-
pandas==1.1.4
65+
packaging==20.8; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'
66+
pandas==1.1.5
6867
patsy==0.5.1
6968
pint==0.16.1
7069
presto-python-client==0.7.0
71-
prometheus-client==0.8.0
72-
proto-plus==1.11.0
73-
protobuf==3.13.0
70+
prometheus-client==0.9.0
71+
proto-plus==1.13.0; python_version >= '3.6'
72+
protobuf==3.14.0
7473
psutil==5.7.3
7574
psycopg2-binary==2.8.6; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'
7675
pyarrow==2.0.0
@@ -86,19 +85,19 @@ pytz==2020.4
8685
querystring-parser==1.2.4
8786
redis==3.5.3; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4'
8887
requests-oauthlib==1.3.0
89-
requests==2.24.0
90-
rsa==4.6; python_version >= '3.5'
88+
requests==2.25.0
89+
rsa==4.6; python_version >= '3.6'
9190
s3transfer==0.3.3
92-
scipy==1.5.3
93-
sentry-sdk==0.19.2
91+
scipy==1.5.4; python_version >= '3.6'
92+
sentry-sdk==0.19.5
9493
six==1.15.0; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'
95-
soupsieve==2.0.1; python_version >= '3.0'
94+
soupsieve==2.1; python_version >= '3.0'
9695
sqlparse==0.4.1; python_version >= '3.5'
9796
statsmodels==0.12.1
9897
ujson==4.0.1
9998
unicodecsv==0.14.1
10099
uritemplate==3.0.1; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'
101-
urllib3==1.25.11; python_version != '3.4'
100+
urllib3==1.26.2; python_version != '3.4'
102101
vine==1.3.0; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'
103102
watchtower==1.0.0
104103
whitenoise==5.2.0

‎grafana/Dockerfile-grafana

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@ FROM grafana/grafana:latest
22
USER root
33
RUN apk add sqlite
44
USER grafana
5-
COPY --chown=grafana:grafana grafana.db.sql /var/lib/grafana/grafana.db.sql
5+
COPY --chown=grafana:root grafana.db.sql /var/lib/grafana/grafana.db.sql
66
RUN cat /var/lib/grafana/grafana.db.sql | sqlite3 /var/lib/grafana/grafana.db && rm /var/lib/grafana/grafana.db.sql

‎koku-manifest

+31-31
Original file line numberDiff line numberDiff line change
@@ -1,54 +1,54 @@
11
mgmt_services/cost-mgmt:koku/registry.access.redhat.com/ubi8/python-38:latest
22
mgmt_services/cost-mgmt:koku/python-adal:1.2.5.pipfile
33
mgmt_services/cost-mgmt:koku/python-amqp:2.6.1.pipfile
4-
mgmt_services/cost-mgmt:koku/python-asgiref:3.3.0.pipfile
5-
mgmt_services/cost-mgmt:koku/python-azure-common:1.1.25.pipfile
6-
mgmt_services/cost-mgmt:koku/python-azure-core:1.8.2.pipfile
7-
mgmt_services/cost-mgmt:koku/python-azure-mgmt-core:1.2.1.pipfile
4+
mgmt_services/cost-mgmt:koku/python-asgiref:3.3.1.pipfile
5+
mgmt_services/cost-mgmt:koku/python-azure-common:1.1.26.pipfile
6+
mgmt_services/cost-mgmt:koku/python-azure-core:1.9.0.pipfile
7+
mgmt_services/cost-mgmt:koku/python-azure-mgmt-core:1.2.2.pipfile
88
mgmt_services/cost-mgmt:koku/python-azure-mgmt-costmanagement:0.2.0.pipfile
99
mgmt_services/cost-mgmt:koku/python-azure-mgmt-resource:15.0.0.pipfile
1010
mgmt_services/cost-mgmt:koku/python-azure-mgmt-storage:11.2.0.pipfile
11-
mgmt_services/cost-mgmt:koku/python-azure-storage-blob:12.5.0.pipfile
11+
mgmt_services/cost-mgmt:koku/python-azure-storage-blob:12.6.0.pipfile
1212
mgmt_services/cost-mgmt:koku/python-beautifulsoup4:4.9.3.pipfile
1313
mgmt_services/cost-mgmt:koku/python-billiard:3.6.3.0.pipfile
14-
mgmt_services/cost-mgmt:koku/python-boto3:1.16.10.pipfile
15-
mgmt_services/cost-mgmt:koku/python-botocore:1.19.10.pipfile
14+
mgmt_services/cost-mgmt:koku/python-boto3:1.16.35.pipfile
15+
mgmt_services/cost-mgmt:koku/python-botocore:1.19.35.pipfile
1616
mgmt_services/cost-mgmt:koku/python-bs4:0.0.1.pipfile
17-
mgmt_services/cost-mgmt:koku/python-cachetools:4.1.1.pipfile
17+
mgmt_services/cost-mgmt:koku/python-cachetools:4.2.0.pipfile
1818
mgmt_services/cost-mgmt:koku/python-celery:4.4.7.pipfile
1919
mgmt_services/cost-mgmt:koku/python-celery-prometheus-exporter:1.7.0.pipfile
20-
mgmt_services/cost-mgmt:koku/python-certifi:2020.6.20.pipfile
21-
mgmt_services/cost-mgmt:koku/python-cffi:1.14.3.pipfile
20+
mgmt_services/cost-mgmt:koku/python-certifi:2020.12.5.pipfile
21+
mgmt_services/cost-mgmt:koku/python-cffi:1.14.4.pipfile
2222
mgmt_services/cost-mgmt:koku/python-chardet:3.0.4.pipfile
2323
mgmt_services/cost-mgmt:koku/python-ciso8601:2.1.3.pipfile
2424
mgmt_services/cost-mgmt:koku/python-click:7.1.2.pipfile
2525
mgmt_services/cost-mgmt:koku/python-confluent-kafka:1.5.0.pipfile
26-
mgmt_services/cost-mgmt:koku/python-cryptography:3.2.1.pipfile
27-
mgmt_services/cost-mgmt:koku/python-django:3.1.3.pipfile
28-
mgmt_services/cost-mgmt:koku/python-django-cors-headers:3.5.0.pipfile
26+
mgmt_services/cost-mgmt:koku/python-cryptography:3.3.1.pipfile
27+
mgmt_services/cost-mgmt:koku/python-django:3.1.4.pipfile
28+
mgmt_services/cost-mgmt:koku/python-django-cors-headers:3.6.0.pipfile
2929
mgmt_services/cost-mgmt:koku/python-django-environ:0.4.5.pipfile
30-
mgmt_services/cost-mgmt:koku/python-django-extensions:3.0.9.pipfile
30+
mgmt_services/cost-mgmt:koku/python-django-extensions:3.1.0.pipfile
3131
mgmt_services/cost-mgmt:koku/python-django-filter:2.4.0.pipfile
3232
mgmt_services/cost-mgmt:koku/python-django-prometheus:2.1.0.pipfile
3333
mgmt_services/cost-mgmt:koku/python-django-redis:4.12.1.pipfile
3434
mgmt_services/cost-mgmt:koku/python-django-tenant-schemas:1.10.0.pipfile
35-
mgmt_services/cost-mgmt:koku/python-djangorestframework:3.12.1.pipfile
35+
mgmt_services/cost-mgmt:koku/python-djangorestframework:3.12.2.pipfile
3636
mgmt_services/cost-mgmt:koku/python-djangorestframework-csv:2.1.0.pipfile
3737
mgmt_services/cost-mgmt:koku/python-flake8:3.8.4.pipfile
3838
mgmt_services/cost-mgmt:koku/python-google-api-core:1.23.0.pipfile
39-
mgmt_services/cost-mgmt:koku/python-google-api-python-client:1.12.5.pipfile
40-
mgmt_services/cost-mgmt:koku/python-google-auth:1.23.0.pipfile
39+
mgmt_services/cost-mgmt:koku/python-google-api-python-client:1.12.8.pipfile
40+
mgmt_services/cost-mgmt:koku/python-google-auth:1.24.0.pipfile
4141
mgmt_services/cost-mgmt:koku/python-google-auth-httplib2:0.0.4.pipfile
42-
mgmt_services/cost-mgmt:koku/python-google-cloud-bigquery:2.2.0.pipfile
43-
mgmt_services/cost-mgmt:koku/python-google-cloud-core:1.4.3.pipfile
42+
mgmt_services/cost-mgmt:koku/python-google-cloud-bigquery:2.6.1.pipfile
43+
mgmt_services/cost-mgmt:koku/python-google-cloud-core:1.4.4.pipfile
4444
mgmt_services/cost-mgmt:koku/python-google-crc32c:1.0.0.pipfile
4545
mgmt_services/cost-mgmt:koku/python-google-resumable-media:1.1.0.pipfile
4646
mgmt_services/cost-mgmt:koku/python-googleapis-common-protos:1.52.0.pipfile
47-
mgmt_services/cost-mgmt:koku/python-grpcio:1.33.2.pipfile
47+
mgmt_services/cost-mgmt:koku/python-grpcio:1.34.0.pipfile
4848
mgmt_services/cost-mgmt:koku/python-gunicorn:20.0.4.pipfile
4949
mgmt_services/cost-mgmt:koku/python-httplib2:0.18.1.pipfile
5050
mgmt_services/cost-mgmt:koku/python-idna:2.10.pipfile
51-
mgmt_services/cost-mgmt:koku/python-importlib-metadata:2.0.0.pipfile
51+
mgmt_services/cost-mgmt:koku/python-importlib-metadata:3.3.0.pipfile
5252
mgmt_services/cost-mgmt:koku/python-isodate:0.6.0.pipfile
5353
mgmt_services/cost-mgmt:koku/python-jinja2:2.11.2.pipfile
5454
mgmt_services/cost-mgmt:koku/python-jinjasql:0.1.8.pipfile
@@ -62,14 +62,14 @@ mgmt_services/cost-mgmt:koku/python-msrestazure:0.6.4.pipfile
6262
mgmt_services/cost-mgmt:koku/python-numpy:1.19.4.pipfile
6363
mgmt_services/cost-mgmt:koku/python-oauthlib:3.1.0.pipfile
6464
mgmt_services/cost-mgmt:koku/python-ordered-set:4.0.2.pipfile
65-
mgmt_services/cost-mgmt:koku/python-packaging:20.4.pipfile
66-
mgmt_services/cost-mgmt:koku/python-pandas:1.1.4.pipfile
65+
mgmt_services/cost-mgmt:koku/python-packaging:20.8.pipfile
66+
mgmt_services/cost-mgmt:koku/python-pandas:1.1.5.pipfile
6767
mgmt_services/cost-mgmt:koku/python-patsy:0.5.1.pipfile
6868
mgmt_services/cost-mgmt:koku/python-pint:0.16.1.pipfile
6969
mgmt_services/cost-mgmt:koku/python-presto-python-client:0.7.0.pipfile
70-
mgmt_services/cost-mgmt:koku/python-prometheus-client:0.8.0.pipfile
71-
mgmt_services/cost-mgmt:koku/python-proto-plus:1.11.0.pipfile
72-
mgmt_services/cost-mgmt:koku/python-protobuf:3.13.0.pipfile
70+
mgmt_services/cost-mgmt:koku/python-prometheus-client:0.9.0.pipfile
71+
mgmt_services/cost-mgmt:koku/python-proto-plus:1.13.0.pipfile
72+
mgmt_services/cost-mgmt:koku/python-protobuf:3.14.0.pipfile
7373
mgmt_services/cost-mgmt:koku/python-psutil:5.7.3.pipfile
7474
mgmt_services/cost-mgmt:koku/python-psycopg2-binary:2.8.6.pipfile
7575
mgmt_services/cost-mgmt:koku/python-pyarrow:2.0.0.pipfile
@@ -84,20 +84,20 @@ mgmt_services/cost-mgmt:koku/python-python-dateutil:2.8.1.pipfile
8484
mgmt_services/cost-mgmt:koku/python-pytz:2020.4.pipfile
8585
mgmt_services/cost-mgmt:koku/python-querystring-parser:1.2.4.pipfile
8686
mgmt_services/cost-mgmt:koku/python-redis:3.5.3.pipfile
87-
mgmt_services/cost-mgmt:koku/python-requests:2.24.0.pipfile
87+
mgmt_services/cost-mgmt:koku/python-requests:2.25.0.pipfile
8888
mgmt_services/cost-mgmt:koku/python-requests-oauthlib:1.3.0.pipfile
8989
mgmt_services/cost-mgmt:koku/python-rsa:4.6.pipfile
9090
mgmt_services/cost-mgmt:koku/python-s3transfer:0.3.3.pipfile
91-
mgmt_services/cost-mgmt:koku/python-scipy:1.5.3.pipfile
92-
mgmt_services/cost-mgmt:koku/python-sentry-sdk:0.19.2.pipfile
91+
mgmt_services/cost-mgmt:koku/python-scipy:1.5.4.pipfile
92+
mgmt_services/cost-mgmt:koku/python-sentry-sdk:0.19.5.pipfile
9393
mgmt_services/cost-mgmt:koku/python-six:1.15.0.pipfile
94-
mgmt_services/cost-mgmt:koku/python-soupsieve:2.0.1.pipfile
94+
mgmt_services/cost-mgmt:koku/python-soupsieve:2.1.pipfile
9595
mgmt_services/cost-mgmt:koku/python-sqlparse:0.4.1.pipfile
9696
mgmt_services/cost-mgmt:koku/python-statsmodels:0.12.1.pipfile
9797
mgmt_services/cost-mgmt:koku/python-ujson:4.0.1.pipfile
9898
mgmt_services/cost-mgmt:koku/python-unicodecsv:0.14.1.pipfile
9999
mgmt_services/cost-mgmt:koku/python-uritemplate:3.0.1.pipfile
100-
mgmt_services/cost-mgmt:koku/python-urllib3:1.25.11.pipfile
100+
mgmt_services/cost-mgmt:koku/python-urllib3:1.26.2.pipfile
101101
mgmt_services/cost-mgmt:koku/python-vine:1.3.0.pipfile
102102
mgmt_services/cost-mgmt:koku/python-watchtower:1.0.0.pipfile
103103
mgmt_services/cost-mgmt:koku/python-whitenoise:5.2.0.pipfile

‎koku/api/dataexport/syncer/tests_syncer.py

+1
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,7 @@ def get_expected_filter_calls(self, schema_name, days, months):
8383
self.ocp_on_aws_ocp_provider,
8484
self.ocp_on_azure_ocp_provider,
8585
self.azure_provider,
86+
self.gcp_provider,
8687
]
8788
expected_filter_calls = []
8889

‎koku/api/migrations/0033_sources_name_text.py

+15
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
# Generated by Django 3.1.3 on 2020-12-16 20:12
2+
from django.db import migrations
3+
from django.db import models
4+
5+
6+
class Migration(migrations.Migration):
7+
8+
dependencies = [("api", "0032_presto_delete_log_trigger_func")]
9+
10+
operations = [
11+
migrations.AlterField(model_name="sources", name="account_id", field=models.TextField(null=True)),
12+
migrations.AlterField(model_name="sources", name="koku_uuid", field=models.TextField(null=True, unique=True)),
13+
migrations.AlterField(model_name="sources", name="name", field=models.TextField(null=True)),
14+
migrations.AlterField(model_name="sources", name="source_type", field=models.TextField()),
15+
]

‎koku/api/provider/models.py

+4-4
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,7 @@ class Meta:
182182
source_uuid = models.UUIDField(unique=True, null=True)
183183

184184
# Source name.
185-
name = models.CharField(max_length=256, null=True)
185+
name = models.TextField(null=True)
186186

187187
# Red Hat identity header. Passed along to Koku API for entitlement and rbac reasons.
188188
auth_header = models.TextField(null=True)
@@ -195,10 +195,10 @@ class Meta:
195195

196196
# Koku Specific data.
197197
# Customer Account ID
198-
account_id = models.CharField(max_length=150, null=True)
198+
account_id = models.TextField(null=True)
199199

200200
# Provider type (i.e. AWS, OCP, AZURE)
201-
source_type = models.CharField(max_length=50, null=False)
201+
source_type = models.TextField(null=False)
202202

203203
# Provider authentication (AWS roleARN, OCP Sources UID, etc.)
204204
authentication = JSONField(null=False, default=dict)
@@ -207,7 +207,7 @@ class Meta:
207207
billing_source = JSONField(null=True, default=dict)
208208

209209
# Unique identifier for koku Provider
210-
koku_uuid = models.CharField(max_length=512, null=True, unique=True)
210+
koku_uuid = models.TextField(null=True, unique=True)
211211

212212
# When source has been deleted on Platform-Sources this is True indicating it hasn't been
213213
# removed on the Koku side yet. Entry is removed entirely once Koku-Provider was successfully

0 commit comments

Comments
 (0)