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

[#1260] Removed DREVOPS_DB_DOWNLOAD_SSH_FILE variable from .env.local.default. #1266

Merged
merged 1 commit into from
Apr 16, 2024
Merged

[#1260] Removed DREVOPS_DB_DOWNLOAD_SSH_FILE variable from .env.local.default. #1266

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
9 changes: 0 additions & 9 deletions .env.local.default
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,15 +55,6 @@ DREVOPS_ACQUIA_SECRET=
#;> ACQUIA
#;> !PROVISION_USE_PROFILE

#;< !PROVISION_USE_PROFILE
#;< LAGOON
# Database dump file sourced from Lagoon.

# SSH key file used to access Lagoon environment to download the database.
# Create an SSH key and add it to your account in the Lagoon Dashboard.
DREVOPS_DB_DOWNLOAD_SSH_FILE=$HOME/.ssh/id_rsa
#;> LAGOON
#;> !PROVISION_USE_PROFILE
#;< !PROVISION_USE_PROFILE
#;< DREVOPS_DB_DOWNLOAD_SOURCE_DOCKER_REGISTRY
# Docker registry credentials to read and write Docker images.
Expand Down
4 changes: 2 additions & 2 deletions .scaffold/docs/content/workflows/variables.mdx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -362,11 +362,11 @@ Defined in: `.env`, `scripts/drevops/download-db.sh`

### `DREVOPS_DB_DOWNLOAD_SSH_FILE`

SSH key file used to access Lagoon environment to download the database.<br />Create an SSH key and add it to your account in the Lagoon Dashboard.
Default SSH file used if custom fingerprint is not provided.

Default value: `HOME/.ssh/id_rsa`

Defined in: `.env.local.default`, `scripts/drevops/download-db-lagoon.sh`
Defined in: `scripts/drevops/download-db-lagoon.sh`

### `DREVOPS_DB_DOWNLOAD_SSH_FINGERPRINT`

Expand Down
3 changes: 0 additions & 3 deletions .scaffold/tests/bats/_helper.bash
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -589,7 +589,6 @@ assert_files_present_provision_use_profile() {
assert_file_not_contains ".env.local.default" "DREVOPS_DB_DOWNLOAD_FTP_PASS"
assert_file_not_contains ".env.local.default" "DREVOPS_ACQUIA_KEY"
assert_file_not_contains ".env.local.default" "DREVOPS_ACQUIA_SECRET"
assert_file_not_contains ".env.local.default" "DREVOPS_DB_DOWNLOAD_SSH_FILE"
assert_file_not_contains ".env.local.default" "DOCKER_USER"
assert_file_not_contains ".env.local.default" "DOCKER_PASS"

Expand Down Expand Up @@ -806,8 +805,6 @@ assert_files_present_no_integration_lagoon() {
assert_file_not_contains "docker-compose.yml" "lagoon.type: solr"
assert_file_not_contains "docker-compose.yml" "lagoon.type: none"

assert_file_not_contains ".env.local.default" "DREVOPS_DB_DOWNLOAD_SSH_FILE="

popd >/dev/null || exit 1
}

Expand Down
7 changes: 0 additions & 7 deletions .scaffold/tests/bats/fixtures/docker-compose.env_local.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,6 @@
"DREVOPS_DB_DOWNLOAD_FTP_PORT": "21",
"DREVOPS_DB_DOWNLOAD_FTP_USER": "",
"DREVOPS_DB_DOWNLOAD_SOURCE": "curl",
"DREVOPS_DB_DOWNLOAD_SSH_FILE": "HOME/.ssh/id_rsa",
"DREVOPS_DB_FILE": "db.sql",
"DREVOPS_DEPLOY_TYPES": "artifact",
"DREVOPS_LAGOON_PRODUCTION_BRANCH": "main",
Expand Down Expand Up @@ -121,7 +120,6 @@
"DREVOPS_DB_DOWNLOAD_FTP_PORT": "21",
"DREVOPS_DB_DOWNLOAD_FTP_USER": "",
"DREVOPS_DB_DOWNLOAD_SOURCE": "curl",
"DREVOPS_DB_DOWNLOAD_SSH_FILE": "HOME/.ssh/id_rsa",
"DREVOPS_DB_FILE": "db.sql",
"DREVOPS_DEPLOY_TYPES": "artifact",
"DREVOPS_LAGOON_PRODUCTION_BRANCH": "main",
Expand Down Expand Up @@ -205,7 +203,6 @@
"DREVOPS_DB_DOWNLOAD_FTP_PORT": "21",
"DREVOPS_DB_DOWNLOAD_FTP_USER": "",
"DREVOPS_DB_DOWNLOAD_SOURCE": "curl",
"DREVOPS_DB_DOWNLOAD_SSH_FILE": "HOME/.ssh/id_rsa",
"DREVOPS_DB_FILE": "db.sql",
"DREVOPS_DEPLOY_TYPES": "artifact",
"DREVOPS_LAGOON_PRODUCTION_BRANCH": "main",
Expand Down Expand Up @@ -296,7 +293,6 @@
"DREVOPS_DB_DOWNLOAD_FTP_PORT": "21",
"DREVOPS_DB_DOWNLOAD_FTP_USER": "",
"DREVOPS_DB_DOWNLOAD_SOURCE": "curl",
"DREVOPS_DB_DOWNLOAD_SSH_FILE": "HOME/.ssh/id_rsa",
"DREVOPS_DB_FILE": "db.sql",
"DREVOPS_DEPLOY_TYPES": "artifact",
"DREVOPS_LAGOON_PRODUCTION_BRANCH": "main",
Expand Down Expand Up @@ -384,7 +380,6 @@
"DREVOPS_DB_DOWNLOAD_FTP_PORT": "21",
"DREVOPS_DB_DOWNLOAD_FTP_USER": "",
"DREVOPS_DB_DOWNLOAD_SOURCE": "curl",
"DREVOPS_DB_DOWNLOAD_SSH_FILE": "HOME/.ssh/id_rsa",
"DREVOPS_DB_FILE": "db.sql",
"DREVOPS_DEPLOY_TYPES": "artifact",
"DREVOPS_LAGOON_PRODUCTION_BRANCH": "main",
Expand Down Expand Up @@ -482,7 +477,6 @@
"DREVOPS_DB_DOWNLOAD_FTP_PORT": "21",
"DREVOPS_DB_DOWNLOAD_FTP_USER": "",
"DREVOPS_DB_DOWNLOAD_SOURCE": "curl",
"DREVOPS_DB_DOWNLOAD_SSH_FILE": "HOME/.ssh/id_rsa",
"DREVOPS_DB_FILE": "db.sql",
"DREVOPS_DEPLOY_TYPES": "artifact",
"DREVOPS_LAGOON_PRODUCTION_BRANCH": "main",
Expand Down Expand Up @@ -590,7 +584,6 @@
"DREVOPS_DB_DOWNLOAD_FTP_PORT": "21",
"DREVOPS_DB_DOWNLOAD_FTP_USER": "",
"DREVOPS_DB_DOWNLOAD_SOURCE": "curl",
"DREVOPS_DB_DOWNLOAD_SSH_FILE": "HOME/.ssh/id_rsa",
"DREVOPS_DB_FILE": "db.sql",
"DREVOPS_DEPLOY_TYPES": "artifact",
"DREVOPS_LAGOON_PRODUCTION_BRANCH": "main",
Expand Down
2 changes: 1 addition & 1 deletion scripts/drevops/download-db-lagoon.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
DREVOPS_DB_DOWNLOAD_SSH_FINGERPRINT="${DREVOPS_DB_DOWNLOAD_SSH_FINGERPRINT:-}"

# Default SSH file used if custom fingerprint is not provided.
DREVOPS_DB_DOWNLOAD_SSH_FILE="${DREVOPS_DB_DOWNLOAD_SSH_FILE:-}"
DREVOPS_DB_DOWNLOAD_SSH_FILE="${DREVOPS_DB_DOWNLOAD_SSH_FILE:-${HOME}/.ssh/id_rsa}"

Check warning on line 50 in scripts/drevops/download-db-lagoon.sh

View check run for this annotation

Codecov / codecov/patch

scripts/drevops/download-db-lagoon.sh#L50 

Added line #L50 was not covered by tests

# The SSH host of the Lagoon environment.
DREVOPS_DB_DOWNLOAD_LAGOON_SSH_HOST="${DREVOPS_DB_DOWNLOAD_LAGOON_SSH_HOST:-ssh.lagoon.amazeeio.cloud}"
Expand Down
Loading