From e9cb45d9a6fd08da650f9749dcd0990b93d0ed5c Mon Sep 17 00:00:00 2001 From: Jor Seng Date: Thu, 8 Apr 2021 04:04:05 +0000 Subject: [PATCH 1/3] added set -e for mssql_databaes module script --- modules/databases/mssql_database/scripts/set_db_permissions.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/databases/mssql_database/scripts/set_db_permissions.sh b/modules/databases/mssql_database/scripts/set_db_permissions.sh index 3d03ebe06a..b12de469f4 100644 --- a/modules/databases/mssql_database/scripts/set_db_permissions.sh +++ b/modules/databases/mssql_database/scripts/set_db_permissions.sh @@ -1,7 +1,7 @@ #!/bin/bash # update rover with odbcinst.ini > sql odbc driver to 17.7.2 / 17.6 - +set -e echo "[SQLSERVER] Driver = ODBC Driver 17 for SQL Server Server = tcp:${SQLCMDSERVER},1433 From 893292be23fec1d69ea2acd657325948d8707d29 Mon Sep 17 00:00:00 2001 From: Arnaud Lheureux Date: Thu, 8 Apr 2021 04:59:06 +0000 Subject: [PATCH 2/3] Update rover --- .devcontainer/docker-compose.yml | 2 +- .github/workflows/master-100-tf13.yaml | 6 +++--- .github/workflows/master-100-tf14.yaml | 6 +++--- .github/workflows/master-100-tf15.yaml | 6 +++--- .github/workflows/master-sql-mi-tf13.yaml | 6 +++--- .github/workflows/master-sql-mi-tf14.yaml | 4 ++-- .github/workflows/master-sql-mi-tf15.yaml | 6 +++--- .github/workflows/master-standalone-tf13.yaml | 2 +- .github/workflows/master-standalone-tf14.yaml | 2 +- .github/workflows/master-standalone-tf15.yaml | 2 +- .github/workflows/purge_protection_enabled.yaml | 6 +++--- 11 files changed, 24 insertions(+), 24 deletions(-) diff --git a/.devcontainer/docker-compose.yml b/.devcontainer/docker-compose.yml index 436a2642cf..192c7fd775 100755 --- a/.devcontainer/docker-compose.yml +++ b/.devcontainer/docker-compose.yml @@ -6,7 +6,7 @@ version: '3.7' services: rover: - image: aztfmod/rover:0.14.9-2103.3107 + image: aztfmod/rover:0.14.10-2104.0803 user: vscode labels: diff --git a/.github/workflows/master-100-tf13.yaml b/.github/workflows/master-100-tf13.yaml index 94136d062a..6924d94e56 100755 --- a/.github/workflows/master-100-tf13.yaml +++ b/.github/workflows/master-100-tf13.yaml @@ -31,7 +31,7 @@ jobs: random_length: ['5'] container: - image: aztfmod/rover:0.13.6-2103.3107 + image: aztfmod/rover:0.13.6-2104.0803 options: --user 0 steps: @@ -162,7 +162,7 @@ jobs: ] container: - image: aztfmod/rover:0.13.6-2103.3107 + image: aztfmod/rover:0.13.6-2104.0803 options: --user 0 steps: @@ -213,7 +213,7 @@ jobs: region: ["southeastasia"] container: - image: aztfmod/rover:0.13.6-2103.3107 + image: aztfmod/rover:0.13.6-2104.0803 options: --user 0 steps: diff --git a/.github/workflows/master-100-tf14.yaml b/.github/workflows/master-100-tf14.yaml index 35034f88aa..b55862a0b5 100755 --- a/.github/workflows/master-100-tf14.yaml +++ b/.github/workflows/master-100-tf14.yaml @@ -43,7 +43,7 @@ jobs: random_length: ['5'] container: - image: aztfmod/rover:0.14.9-2103.3107 + image: aztfmod/rover:0.14.10-2104.0803 options: --user 0 steps: @@ -174,7 +174,7 @@ jobs: ] container: - image: aztfmod/rover:0.14.9-2103.3107 + image: aztfmod/rover:0.14.10-2104.0803 options: --user 0 steps: @@ -225,7 +225,7 @@ jobs: region: ["southeastasia"] container: - image: aztfmod/rover:0.14.9-2103.3107 + image: aztfmod/rover:0.14.10-2104.0803 options: --user 0 steps: diff --git a/.github/workflows/master-100-tf15.yaml b/.github/workflows/master-100-tf15.yaml index 0206530c0c..cdf22a40b0 100755 --- a/.github/workflows/master-100-tf15.yaml +++ b/.github/workflows/master-100-tf15.yaml @@ -31,7 +31,7 @@ jobs: random_length: ['5'] container: - image: aztfmod/rover:0.15.0-beta2-2103.3107 + image: aztfmod/rover:0.15.0-rc2-2104.0803 options: --user 0 steps: @@ -153,7 +153,7 @@ jobs: ] container: - image: aztfmod/rover:0.15.0-beta2-2103.3107 + image: aztfmod/rover:0.15.0-rc2-2104.0803 options: --user 0 steps: @@ -204,7 +204,7 @@ jobs: region: ["southeastasia"] container: - image: aztfmod/rover:0.15.0-beta2-2103.3107 + image: aztfmod/rover:0.15.0-rc2-2104.0803 options: --user 0 steps: diff --git a/.github/workflows/master-sql-mi-tf13.yaml b/.github/workflows/master-sql-mi-tf13.yaml index 6e21b0dc84..5831b291b9 100644 --- a/.github/workflows/master-sql-mi-tf13.yaml +++ b/.github/workflows/master-sql-mi-tf13.yaml @@ -31,7 +31,7 @@ jobs: random_length: ['5'] container: - image: aztfmod/rover:0.13.6-2103.3107 + image: aztfmod/rover:0.13.6-2104.0803 options: --user 0 steps: @@ -78,7 +78,7 @@ jobs: ] container: - image: aztfmod/rover:0.13.6-2103.3107 + image: aztfmod/rover:0.13.6-2104.0803 options: --user 0 steps: @@ -126,7 +126,7 @@ jobs: region: ["southeastasia"] container: - image: aztfmod/rover:0.13.6-2103.3107 + image: aztfmod/rover:0.13.6-2104.0803 options: --user 0 steps: diff --git a/.github/workflows/master-sql-mi-tf14.yaml b/.github/workflows/master-sql-mi-tf14.yaml index 6eda719049..e5b6e64f62 100755 --- a/.github/workflows/master-sql-mi-tf14.yaml +++ b/.github/workflows/master-sql-mi-tf14.yaml @@ -37,7 +37,7 @@ jobs: random_length: ['5'] container: - image: aztfmod/rover:0.14.9-2103.3107 + image: aztfmod/rover:0.14.10-2104.0803 options: --user 0 steps: @@ -84,7 +84,7 @@ jobs: ] container: - image: aztfmod/rover:0.14.9-2103.3107 + image: aztfmod/rover:0.14.10-2104.0803 options: --user 0 steps: diff --git a/.github/workflows/master-sql-mi-tf15.yaml b/.github/workflows/master-sql-mi-tf15.yaml index 018113e057..5ab42628c7 100644 --- a/.github/workflows/master-sql-mi-tf15.yaml +++ b/.github/workflows/master-sql-mi-tf15.yaml @@ -31,7 +31,7 @@ jobs: random_length: ['5'] container: - image: aztfmod/rover:0.15.0-beta2-2103.3107 + image: aztfmod/rover:0.15.0-rc2-2104.0803 options: --user 0 steps: @@ -78,7 +78,7 @@ jobs: ] container: - image: aztfmod/rover:0.15.0-beta2-2103.3107 + image: aztfmod/rover:0.15.0-rc2-2104.0803 options: --user 0 steps: @@ -126,7 +126,7 @@ jobs: region: ["southeastasia"] container: - image: aztfmod/rover:0.15.0-beta2-2103.3107 + image: aztfmod/rover:0.15.0-rc2-2104.0803 options: --user 0 steps: diff --git a/.github/workflows/master-standalone-tf13.yaml b/.github/workflows/master-standalone-tf13.yaml index 41691b59e4..e5817edb76 100755 --- a/.github/workflows/master-standalone-tf13.yaml +++ b/.github/workflows/master-standalone-tf13.yaml @@ -123,7 +123,7 @@ jobs: ] container: - image: aztfmod/rover:0.13.6-2103.3107 + image: aztfmod/rover:0.13.6-2104.0803 options: --user 0 steps: diff --git a/.github/workflows/master-standalone-tf14.yaml b/.github/workflows/master-standalone-tf14.yaml index 8062249746..7c3e0dc66c 100755 --- a/.github/workflows/master-standalone-tf14.yaml +++ b/.github/workflows/master-standalone-tf14.yaml @@ -132,7 +132,7 @@ jobs: ] container: - image: aztfmod/rover:0.14.9-2103.3107 + image: aztfmod/rover:0.14.10-2104.0803 options: --user 0 steps: diff --git a/.github/workflows/master-standalone-tf15.yaml b/.github/workflows/master-standalone-tf15.yaml index 871d968024..b142ed189f 100755 --- a/.github/workflows/master-standalone-tf15.yaml +++ b/.github/workflows/master-standalone-tf15.yaml @@ -109,7 +109,7 @@ jobs: ] container: - image: aztfmod/rover:0.15.0-beta2-2103.3107 + image: aztfmod/rover:0.15.0-rc2-2104.0803 options: --user 0 steps: diff --git a/.github/workflows/purge_protection_enabled.yaml b/.github/workflows/purge_protection_enabled.yaml index 957128909e..1bb26bbdc6 100644 --- a/.github/workflows/purge_protection_enabled.yaml +++ b/.github/workflows/purge_protection_enabled.yaml @@ -35,7 +35,7 @@ jobs: random_length: ['5'] container: - image: aztfmod/rover:0.14.9-2103.3107 + image: aztfmod/rover:0.14.10-2104.0803 options: --user 0 steps: @@ -86,7 +86,7 @@ jobs: ] container: - image: aztfmod/rover:0.14.9-2103.3107 + image: aztfmod/rover:0.14.10-2104.0803 options: --user 0 steps: @@ -125,7 +125,7 @@ jobs: region: ["southeastasia"] container: - image: aztfmod/rover:0.14.9-2103.3107 + image: aztfmod/rover:0.14.10-2104.0803 options: --user 0 steps: From 861899343f0fb790d35190d0e988965da6e8f63c Mon Sep 17 00:00:00 2001 From: Arnaud Lheureux Date: Thu, 8 Apr 2021 05:23:20 +0000 Subject: [PATCH 3/3] Adding fqdn for db outputs --- modules/databases/mariadb_server/output.tf | 4 ++++ modules/databases/mssql_server/output.tf | 4 ++++ modules/databases/mysql_server/output.tf | 4 ++++ modules/databases/postgresql_server/output.tf | 4 ++++ 4 files changed, 16 insertions(+) diff --git a/modules/databases/mariadb_server/output.tf b/modules/databases/mariadb_server/output.tf index bf56601953..4648bea69f 100755 --- a/modules/databases/mariadb_server/output.tf +++ b/modules/databases/mariadb_server/output.tf @@ -2,6 +2,10 @@ output "id" { value = azurerm_mariadb_server.mariadb.id } +output "fqdn" { + value = azurerm_mariadb_server.mariadb.fqdn +} + output "name" { value = azurecaf_name.mariadb.result } diff --git a/modules/databases/mssql_server/output.tf b/modules/databases/mssql_server/output.tf index b57722c40b..1141b9d32c 100755 --- a/modules/databases/mssql_server/output.tf +++ b/modules/databases/mssql_server/output.tf @@ -2,6 +2,10 @@ output "id" { value = azurerm_mssql_server.mssql.id } +output "fully_qualified_domain_name" { + value = azurerm_mssql_server.mssql.fully_qualified_domain_name +} + output "rbac_id" { value = try(azurerm_mssql_server.mssql.identity[0].principal_id, null) } diff --git a/modules/databases/mysql_server/output.tf b/modules/databases/mysql_server/output.tf index b2e2bc6f40..d23dfdb6e6 100755 --- a/modules/databases/mysql_server/output.tf +++ b/modules/databases/mysql_server/output.tf @@ -2,6 +2,10 @@ output "id" { value = azurerm_mysql_server.mysql.id } +output "fqdn" { + value = azurerm_mysql_server.mysql.fqdn +} + output "rbac_id" { value = try(azurerm_mysql_server.mysql.identity[0].principal_id, null) } diff --git a/modules/databases/postgresql_server/output.tf b/modules/databases/postgresql_server/output.tf index b1510db7ab..65e65db100 100755 --- a/modules/databases/postgresql_server/output.tf +++ b/modules/databases/postgresql_server/output.tf @@ -2,6 +2,10 @@ output "id" { value = azurerm_postgresql_server.postgresql.id } +output "fqdn" { + value = azurerm_postgresql_server.postgresql.fqdn +} + output "rbac_id" { value = try(azurerm_postgresql_server.postgresql.identity[0].principal_id, null) }