Skip to content

Commit 165e153

Browse files
authored
Use GCP acronym for Google Cloud Platform (cookiecutter#2081)
Use GCP acronym for Google Cloud Platform
2 parents 1c5392d + 9a3a796 commit 165e153

File tree

7 files changed

+13
-13
lines changed

7 files changed

+13
-13
lines changed

README.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -181,7 +181,7 @@ Answer the prompts with your own desired options_. For example::
181181
Choose from 1, 2 [1]: 1
182182
Select cloud_provider:
183183
1 - AWS
184-
2 - GCS
184+
2 - GCP
185185
3 - None
186186
Choose from 1, 2, 3 [1]: 1
187187
custom_bootstrap_compilation [n]: n

cookiecutter.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
],
3131
"cloud_provider": [
3232
"AWS",
33-
"GCE",
33+
"GCP",
3434
"None"
3535
],
3636
"custom_bootstrap_compilation": "n",

docs/project-generation-options.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ cloud_provider:
6565
Select a cloud provider for static & media files. The choices are:
6666

6767
1. AWS_
68-
2. GCS_
68+
2. GCP_
6969
3. None
7070

7171
Note that if you choose no cloud provider, media files won't work.
@@ -123,7 +123,7 @@ debug:
123123
.. _Gulp: https://github.com/gulpjs/gulp
124124

125125
.. _AWS: https://aws.amazon.com/s3/
126-
.. _GCS: https://cloud.google.com/storage/
126+
.. _GCP: https://cloud.google.com/storage/
127127

128128
.. _Django Compressor: https://github.com/django-compressor/django-compressor
129129

docs/settings.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ DJANGO_AWS_ACCESS_KEY_ID AWS_ACCESS_KEY_ID n/a
4545
DJANGO_AWS_SECRET_ACCESS_KEY AWS_SECRET_ACCESS_KEY n/a raises error
4646
DJANGO_AWS_STORAGE_BUCKET_NAME AWS_STORAGE_BUCKET_NAME n/a raises error
4747
DJANGO_AWS_S3_REGION_NAME AWS_S3_REGION_NAME n/a None
48-
DJANGO_GCE_STORAGE_BUCKET_NAME GS_BUCKET_NAME n/a raises error
48+
DJANGO_GCP_STORAGE_BUCKET_NAME GS_BUCKET_NAME n/a raises error
4949
GOOGLE_APPLICATION_CREDENTIALS n/a n/a raises error
5050
SENTRY_DSN SENTRY_DSN n/a raises error
5151
DJANGO_SENTRY_LOG_LEVEL SENTRY_LOG_LEVEL n/a logging.INFO

{{cookiecutter.project_slug}}/.envs/.production/.django

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,11 @@ MAILGUN_DOMAIN=
2222
DJANGO_AWS_ACCESS_KEY_ID=
2323
DJANGO_AWS_SECRET_ACCESS_KEY=
2424
DJANGO_AWS_STORAGE_BUCKET_NAME=
25-
{% elif cookiecutter.cloud_provider == 'GCE' %}
26-
# GCE
25+
{% elif cookiecutter.cloud_provider == 'GCP' %}
26+
# GCP
2727
# ------------------------------------------------------------------------------
2828
GOOGLE_APPLICATION_CREDENTIALS=
29-
DJANGO_GCE_STORAGE_BUCKET_NAME=
29+
DJANGO_GCP_STORAGE_BUCKET_NAME=
3030
{% endif %}
3131
# django-allauth
3232
# ------------------------------------------------------------------------------

{{cookiecutter.project_slug}}/config/settings/production.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -91,9 +91,9 @@
9191
AWS_DEFAULT_ACL = None
9292
# https://django-storages.readthedocs.io/en/latest/backends/amazon-S3.html#settings
9393
AWS_S3_REGION_NAME = env("DJANGO_AWS_S3_REGION_NAME", default=None)
94-
{% elif cookiecutter.cloud_provider == 'GCE' %}
94+
{% elif cookiecutter.cloud_provider == 'GCP' %}
9595
DEFAULT_FILE_STORAGE = "storages.backends.gcloud.GoogleCloudStorage"
96-
GS_BUCKET_NAME = env("DJANGO_GCE_STORAGE_BUCKET_NAME")
96+
GS_BUCKET_NAME = env("DJANGO_GCP_STORAGE_BUCKET_NAME")
9797
GS_DEFAULT_ACL = "publicRead"
9898
{% endif -%}
9999

@@ -106,7 +106,7 @@
106106
{% elif cookiecutter.cloud_provider == 'AWS' -%}
107107
STATICFILES_STORAGE = "config.settings.production.StaticRootS3Boto3Storage"
108108
STATIC_URL = f"https://{AWS_STORAGE_BUCKET_NAME}.s3.amazonaws.com/static/"
109-
{% elif cookiecutter.cloud_provider == 'GCE' -%}
109+
{% elif cookiecutter.cloud_provider == 'GCP' -%}
110110
STATIC_URL = f"https://storage.googleapis.com/{GS_BUCKET_NAME}/static/"
111111
{% endif -%}
112112

@@ -131,7 +131,7 @@ class MediaRootS3Boto3Storage(S3Boto3Storage):
131131
# endregion
132132
DEFAULT_FILE_STORAGE = "config.settings.production.MediaRootS3Boto3Storage"
133133
MEDIA_URL = f"https://{AWS_STORAGE_BUCKET_NAME}.s3.amazonaws.com/media/"
134-
{%- elif cookiecutter.cloud_provider == 'GCE' %}
134+
{%- elif cookiecutter.cloud_provider == 'GCP' %}
135135
MEDIA_URL = f"https://storage.googleapis.com/{GS_BUCKET_NAME}/media/"
136136
MEDIA_ROOT = f"https://storage.googleapis.com/{GS_BUCKET_NAME}/media/"
137137
{%- endif %}

{{cookiecutter.project_slug}}/requirements/production.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ sentry-sdk==0.8.0 # https://github.com/getsentry/sentry-python
1515
# ------------------------------------------------------------------------------
1616
{%- if cookiecutter.cloud_provider == 'AWS' %}
1717
django-storages[boto3]==1.7.1 # https://github.com/jschneier/django-storages
18-
{%- elif cookiecutter.cloud_provider == 'GCE' %}
18+
{%- elif cookiecutter.cloud_provider == 'GCP' %}
1919
django-storages[google]==1.7.1 # https://github.com/jschneier/django-storages
2020
{%- endif %}
2121
django-anymail[mailgun]==6.0.1 # https://github.com/anymail/django-anymail

0 commit comments

Comments
 (0)