Merge pull request #369 from aztfmod/sql-msi-script

Added set -e for mssql_database module script
aztfmod · Apr 8, 2021 · 930cc15 · 930cc15
2 parents 1038871 + 8618993
commit 930cc15
Show file tree

Hide file tree

Showing 16 changed files with 41 additions and 25 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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:

diff --git 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_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

diff --git 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
@@ -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
@@ -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)
 }