Use consistent provider requirements across all modules and examples (#124)

dspatoulas · DJ Spatoulas · web-flow · commit 5508324c1f6e · 2024-02-24T11:46:25.000+01:00
* Use consistent provider requirements across all modules and examples

* Reduce version restrictions on AWS provider to target version 5

---------

Co-authored-by: DJ Spatoulas &lt;djspatoulas@gmail.com&gt;
diff --git a/examples/adb-private-links/versions.tf b/examples/adb-private-links/versions.tf
@@ -3,7 +3,7 @@ terraform {
   required_providers {
     databricks = {
       source  = "databricks/databricks"
-      version = ">=0.5.1"
+      version = ">=1.13.0"
     }
 
     azurerm = {
diff --git a/examples/adb-splunk/versions.tf b/examples/adb-splunk/versions.tf
@@ -3,7 +3,7 @@ terraform {
   required_providers {
     databricks = {
       source  = "databricks/databricks"
-      version = ">=0.5.1"
+      version = ">=1.13.0"
     }
 
     azurerm = {
diff --git a/examples/adb-vnet-injection/modules/autoscaling_cluster/main.tf b/examples/adb-vnet-injection/modules/autoscaling_cluster/main.tf
@@ -6,7 +6,7 @@ terraform {
     }
     databricks = {
       source  = "databricks/databricks"
-      version = ">=0.5.1"
+      version = ">=1.13.0"
     }
   }
 }
diff --git a/examples/aws-workspace-basic/versions.tf b/examples/aws-workspace-basic/versions.tf
@@ -8,7 +8,7 @@ terraform {
 
     aws = {
       source  = "hashicorp/aws"
-      version = "~> 4.58.0"
+      version = "~> 5.0"
     }
   }
 }
diff --git a/examples/aws-workspace-uc-simple/versions.tf b/examples/aws-workspace-uc-simple/versions.tf
@@ -2,7 +2,7 @@ terraform {
   required_providers {
     aws = {
       source  = "hashicorp/aws"
-      version = "=4.57.0"
+      version = "~> 5.0"
     }
 
     random = {
diff --git a/examples/aws-workspace-with-firewall/versions.tf b/examples/aws-workspace-with-firewall/versions.tf
@@ -8,7 +8,7 @@ terraform {
 
     aws = {
       source  = "hashicorp/aws"
-      version = "~> 4.58.0"
+      version = "~> 5.0"
     }
   }
 }
diff --git a/modules/aws-workspace-basic/versions.tf b/modules/aws-workspace-basic/versions.tf
@@ -3,12 +3,12 @@ terraform {
   required_providers {
     databricks = {
       source  = "databricks/databricks"
-      version = ">=0.5.1"
+      version = ">=1.13.0"
     }
 
     aws = {
       source  = "hashicorp/aws"
-      version = "~> 4.58.0"
+      version = "~> 5.0"
     }
   }
 }
diff --git a/modules/aws-workspace-with-firewall/versions.tf b/modules/aws-workspace-with-firewall/versions.tf
@@ -3,12 +3,12 @@ terraform {
   required_providers {
     databricks = {
       source  = "databricks/databricks"
-      version = ">=0.5.1"
+      version = ">=1.13.0"
     }
 
     aws = {
       source  = "hashicorp/aws"
-      version = "~> 4.58.0"
+      version = "~> 5.0"
     }
   }
 }
diff --git a/modules/aws-workspace-with-firewall/workspace.tf b/modules/aws-workspace-with-firewall/workspace.tf
@@ -21,7 +21,6 @@ resource "time_sleep" "wait" {
 }
 
 resource "databricks_mws_credentials" "this" {
-  account_id       = var.databricks_account_id
   role_arn         = aws_iam_role.cross_account_role.arn
   credentials_name = "${local.prefix}-creds"
   depends_on       = [time_sleep.wait]

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@ terraform {`
`3`	`3`	`required_providers {`
`4`	`4`	`databricks = {`
`5`	`5`	`source = "databricks/databricks"`
`6`		`- version = ">=0.5.1"`
	`6`	`+ version = ">=1.13.0"`
`7`	`7`	`}`
`8`	`8`
`9`	`9`	`azurerm = {`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@ terraform {`
`6`	`6`	`}`
`7`	`7`	`databricks = {`
`8`	`8`	`source = "databricks/databricks"`
`9`		`- version = ">=0.5.1"`
	`9`	`+ version = ">=1.13.0"`
`10`	`10`	`}`
`11`	`11`	`}`
`12`	`12`	`}`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@ terraform {`
`8`	`8`
`9`	`9`	`aws = {`
`10`	`10`	`source = "hashicorp/aws"`
`11`		`- version = "~> 4.58.0"`
	`11`	`+ version = "~> 5.0"`
`12`	`12`	`}`
`13`	`13`	`}`
`14`	`14`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@ terraform {`
`2`	`2`	`required_providers {`
`3`	`3`	`aws = {`
`4`	`4`	`source = "hashicorp/aws"`
`5`		`- version = "=4.57.0"`
	`5`	`+ version = "~> 5.0"`
`6`	`6`	`}`
`7`	`7`
`8`	`8`	`random = {`
Original file line number	Diff line number	Diff line change
`@@ -3,12 +3,12 @@ terraform {`
`3`	`3`	`required_providers {`
`4`	`4`	`databricks = {`
`5`	`5`	`source = "databricks/databricks"`
`6`		`- version = ">=0.5.1"`
	`6`	`+ version = ">=1.13.0"`
`7`	`7`	`}`
`8`	`8`
`9`	`9`	`aws = {`
`10`	`10`	`source = "hashicorp/aws"`
`11`		`- version = "~> 4.58.0"`
	`11`	`+ version = "~> 5.0"`
`12`	`12`	`}`
`13`	`13`	`}`
`14`	`14`	`}`
Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,6 @@ resource "time_sleep" "wait" {`
`21`	`21`	`}`
`22`	`22`
`23`	`23`	`resource "databricks_mws_credentials" "this" {`
`24`		`- account_id = var.databricks_account_id`
`25`	`24`	`role_arn = aws_iam_role.cross_account_role.arn`
`26`	`25`	`credentials_name = "${local.prefix}-creds"`
`27`	`26`	`depends_on = [time_sleep.wait]`