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

feat(cli,build): remove deprecated variables GMS_HOST/_PORT #5451

Merged
merged 3 commits into from
Jul 20, 2022
Merged

feat(cli,build): remove deprecated variables GMS_HOST/_PORT #5451

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5166359
feat(cli,build): remove deprecated variables GMS_HOST/_PORT
anshbansal Jul 20, 2022
db97e38
add pr number
anshbansal Jul 20, 2022
fe261ae
add variables to use instead
anshbansal Jul 20, 2022
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
4 changes: 0 additions & 4 deletions docker/datahub-actions/env/docker.env
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,3 @@
# Deprecated
GMS_HOST=datahub-gms
GMS_PORT=8080
# use these instead
DATAHUB_GMS_HOST=datahub-gms
DATAHUB_GMS_PORT=8080

Expand Down
4 changes: 0 additions & 4 deletions docker/datahub-mae-consumer/env/docker-without-neo4j.env
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,3 @@
# Deprecated
GMS_HOST=datahub-gms
GMS_PORT=8080
# use these instead
DATAHUB_GMS_HOST=datahub-gms
DATAHUB_GMS_PORT=8080

Expand Down
4 changes: 0 additions & 4 deletions docker/datahub-mae-consumer/env/docker.env
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,3 @@
# Deprecated
GMS_HOST=datahub-gms
GMS_PORT=8080
# use these instead
DATAHUB_GMS_HOST=datahub-gms
DATAHUB_GMS_PORT=8080

Expand Down
2 changes: 0 additions & 2 deletions docker/datahub-mce-consumer/env/docker.env
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,7 @@ MCE_CONSUMER_ENABLED=true
KAFKA_BOOTSTRAP_SERVER=broker:29092
KAFKA_SCHEMAREGISTRY_URL=http://schema-registry:8081
DATAHUB_GMS_HOST=datahub-gms
GMS_HOST=datahub-gms
DATAHUB_GMS_PORT=8080
GMS_PORT=8080

# Uncomment to configure kafka topic names
# Make sure these names are consistent across the whole deployment
Expand Down
2 changes: 0 additions & 2 deletions docker/quickstart/docker-compose-without-neo4j-m1.quickstart.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,7 @@ services:
- datahub-gms
environment:
- DATAHUB_GMS_HOST=datahub-gms
- GMS_HOST=datahub-gms
- DATAHUB_GMS_PORT=8080
- GMS_PORT=8080
- KAFKA_BOOTSTRAP_SERVER=broker:29092
- SCHEMA_REGISTRY_URL=http://schema-registry:8081
- METADATA_AUDIT_EVENT_NAME=MetadataAuditEvent_v4
Expand Down
2 changes: 0 additions & 2 deletions docker/quickstart/docker-compose-without-neo4j.quickstart.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,6 @@ services:
depends_on:
- datahub-gms
environment:
- GMS_HOST=datahub-gms
- GMS_PORT=8080
- DATAHUB_GMS_HOST=datahub-gms
- DATAHUB_GMS_PORT=8080
- KAFKA_BOOTSTRAP_SERVER=broker:29092
Expand Down
2 changes: 0 additions & 2 deletions docker/quickstart/docker-compose.quickstart.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,6 @@ services:
depends_on:
- datahub-gms
environment:
- GMS_HOST=datahub-gms
- GMS_PORT=8080
- DATAHUB_GMS_HOST=datahub-gms
- DATAHUB_GMS_PORT=8080
- KAFKA_BOOTSTRAP_SERVER=broker:29092
Expand Down
1 change: 1 addition & 0 deletions docs/how/updating-datahub.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ This file documents any backwards-incompatible changes in DataHub and assists pe
## Next

### Breaking Changes
- #5451 `GMS_HOST` and `GMS_PORT` environment variables deprecated in `v0.8.39` have been removed. Use `DATAHUB_GMS_HOST` and `DATAHUB_GMS_PORT` instead.

### Potential Downtime

Expand Down
10 changes: 2 additions & 8 deletions metadata-ingestion/src/datahub/cli/cli_utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,8 +70,6 @@
ENV_METADATA_HOST = "DATAHUB_GMS_HOST"
ENV_METADATA_PORT = "DATAHUB_GMS_PORT"
ENV_METADATA_PROTOCOL = "DATAHUB_GMS_PROTOCOL"
ENV_METADATA_HOST_DEPRECATED = "GMS_HOST"
ENV_METADATA_PORT_DEPRECATED = "GMS_PORT"
ENV_METADATA_TOKEN = "DATAHUB_GMS_TOKEN"
ENV_DATAHUB_SYSTEM_CLIENT_ID = "DATAHUB_SYSTEM_CLIENT_ID"
ENV_DATAHUB_SYSTEM_CLIENT_SECRET = "DATAHUB_SYSTEM_CLIENT_SECRET"
Expand Down Expand Up @@ -144,12 +142,8 @@ def get_details_from_config():


def get_details_from_env() -> Tuple[Optional[str], Optional[str]]:
host = os.environ.get(ENV_METADATA_HOST) or os.environ.get(
ENV_METADATA_HOST_DEPRECATED
)
port = os.environ.get(ENV_METADATA_PORT) or os.environ.get(
ENV_METADATA_PORT_DEPRECATED
)
host = os.environ.get(ENV_METADATA_HOST)
port = os.environ.get(ENV_METADATA_PORT)
token = os.environ.get(ENV_METADATA_TOKEN)
protocol = os.environ.get(ENV_METADATA_PROTOCOL, "http")
url = os.environ.get(ENV_METADATA_HOST_URL)
Expand Down
10 changes: 0 additions & 10 deletions metadata-ingestion/tests/unit/test_cli_utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,13 +59,3 @@ def test_correct_url_when_gms_host_port_url_protocol_set():
)
def test_correct_url_when_url_set():
assert cli_utils.get_details_from_env() == ("https://example.com", None)


@mock.patch.dict(
os.environ,
{
"GMS_HOST": "https://example.com",
},
)
def test_correct_url_when_deprecated_host_env_set():
assert cli_utils.get_details_from_env() == ("https://example.com", None)
4 changes: 2 additions & 2 deletions metadata-service/factories/src/main/resources/application.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,8 +56,8 @@ secretService:
datahub:
serverType: ${DATAHUB_SERVER_TYPE:prod}
gms:
host: ${DATAHUB_GMS_HOST:${GMS_HOST:localhost}}
port: ${DATAHUB_GMS_PORT:${GMS_PORT:8080}}
host: ${DATAHUB_GMS_HOST:localhost}
port: ${DATAHUB_GMS_PORT:8080}
useSSL: ${DATAHUB_GMS_USE_SSL:${GMS_USE_SSL:false}}
sslContext:
protocol: ${DATAHUB_GMS_SSL_PROTOCOL:${GMS_SSL_PROTOCOL:#{null}}}
Expand Down