Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

introduce zenpy netloc environment variable for replacing zendesk #2776

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

introduce zenpy netloc environment variable for replacing zendesk #2776

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
05b3bba
introduce zenpy netloc environment variable for replacing zendesk
sekharpanja Sep 20, 2023
a03e984
update env files
sekharpanja Sep 20, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .envs/sample.env
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,7 @@ ZENDESK_TOKEN=abcd
# set to the ZENDESK_SERVIE_FIELD_VALUE when requesting access to datasets zendesk.py
ZENDESK_SERVICE_FIELD_ID=numeric_field_id
ZENDESK_SERVICE_FIELD_VALUE=field_value
ZENDESK_TOKEN=abcd

NOTIFY_API_KEY=notify-token
FERNET_EMAIL_TOKEN_KEY=generate-using-fernet-generate-key
Expand Down
1 change: 1 addition & 0 deletions .envs/test.env
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,7 @@ ZENDESK_SUBDOMAIN=subdomain
ZENDESK_TOKEN=abcd
ZENDESK_SERVICE_FIELD_ID=654321
ZENDESK_SERVICE_FIELD_VALUE=field_value
ZENPY_FORCE_NETLOC=abcd
S3_ASSUME_ROLE_POLICY_DOCUMENT_BASE64=e30=
S3_POLICY_NAME=my-policy
S3_POLICY_DOCUMENT_TEMPLATE_BASE64=e30=
Expand Down
1 change: 1 addition & 0 deletions dataworkspace/dataworkspace/settings/base.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -307,6 +307,7 @@ def aws_fargate_private_ip():
ZENDESK_SERVICE_FIELD_ID = env["ZENDESK_SERVICE_FIELD_ID"]
ZENDESK_SERVICE_FIELD_VALUE = env["ZENDESK_SERVICE_FIELD_VALUE"]

ZENPY_FORCE_NETLOC = env["ZENPY_FORCE_NETLOC"]

NOTIFY_API_KEY = env["NOTIFY_API_KEY"]
FERNET_EMAIL_TOKEN_KEY = env["FERNET_EMAIL_TOKEN_KEY"]
Expand Down
1 change: 1 addition & 0 deletions infra/ecs_main_admin.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,7 @@ locals {
zendesk_token = "${var.zendesk_token}"
zendesk_service_field_id = "${var.zendesk_service_field_id}"
zendesk_service_field_value = "${var.zendesk_service_field_value}"
zenpy_force_netloc = "${var.zenpy_force_netloc}"

prometheus_domain = "${var.prometheus_domain}"
metrics_service_discovery_basic_auth_user = "${var.metrics_service_discovery_basic_auth_user}"
Expand Down
4 changes: 4 additions & 0 deletions infra/ecs_main_admin_container_definitions.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -936,6 +936,10 @@
"name": "ZENDESK_SERVICE_FIELD_VALUE",
"value": "${zendesk_service_field_value}"
},
{
"name": "ZENPY_FORCE_NETLOC",
"value": "${zenpy_force_netloc}"
},
{
"name": "QUICKSIGHT_NAMESPACE",
"value": "${quicksight_namespace}"
Expand Down
1 change: 1 addition & 0 deletions infra/environment-template/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,7 @@ module "jupyterhub" {
zendesk_token = "REPLACE_ME"
zendesk_service_field_id = "REPLACE_ME"
zendesk_service_field_value = "REPLACE_ME"
zenpy_force_netloc = "REPLACE_ME"

prometheus_whitelist = []
metrics_service_discovery_basic_auth_user = "REPLACE_ME"
Expand Down
1 change: 1 addition & 0 deletions infra/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,7 @@ variable zendesk_subdomain {}
variable zendesk_token {}
variable zendesk_service_field_id {}
variable zendesk_service_field_value {}
variable zenpy_force_netloc {}

variable prometheus_whitelist {
type = list
Expand Down