Add One Lake Datalake support (#228)

Author: fivetran-aleksandrboldyrev

CHANGELOG.md

@@ -5,7 +5,14 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
-## [Unreleased](https://github.com/fivetran/terraform-provider-fivetran/compare/v1.1.3...HEAD)
+## [Unreleased](https://github.com/fivetran/terraform-provider-fivetran/compare/v1.1.4...HEAD)
+
+## [1.1.4](https://github.com/fivetran/terraform-provider-fivetran/compare/v1.1.3...v1.1.4)
+
+## Added
+- Resource `fivetran_destination` updates:
+    - Added field `fivetran_destination.config.workspace_name` for OneLake.
+    - Added field `fivetran_destination.config.lakehouse_name` for OneLake.
 
 ## [1.1.3](https://github.com/fivetran/terraform-provider-fivetran/compare/v1.1.2...1.1.3)
 

docs/data-sources/destination.md

@@ -55,6 +55,7 @@ Optional:
 - `host` (String) Server name
 - `http_path` (String) HTTP path
 - `is_private_key_encrypted` (String) Indicates that a private key is encrypted. The default value: `false`. The field can be specified if authentication type is `KEY_PAIR`.
+- `lakehouse_name` (String, Sensitive) OneLake lakehouse name
 - `passphrase` (String, Sensitive) In case private key is encrypted, you are required to enter passphrase that was used to encrypt the private key. The field can be specified if authentication type is `KEY_PAIR`.
 - `password` (String, Sensitive) Database user password
 - `personal_access_token` (String, Sensitive) Personal access token
@@ -74,6 +75,7 @@ Optional:
 - `tunnel_port` (String) SSH server port name. Must be populated if `connection_type` is set to `SshTunnel`.
 - `tunnel_user` (String) SSH user name. Must be populated if `connection_type` is set to `SshTunnel`.
 - `user` (String) Database user name
+- `workspace_name` (String, Sensitive) OneLake workspace name
 
 Read-Only:
 

docs/index.md

@@ -16,7 +16,7 @@ description: |-
 terraform {
   required_providers {
     fivetran = {
-        version = "1.1.2"                            
+        version = "1.1.4"                            
         source = "fivetran/fivetran"
     }
   }

docs/resources/destination.md

@@ -75,6 +75,7 @@ Optional:
 - `host` (String) Server name
 - `http_path` (String) HTTP path
 - `is_private_key_encrypted` (String) Indicates that a private key is encrypted. The default value: `false`. The field can be specified if authentication type is `KEY_PAIR`.
+- `lakehouse_name` (String, Sensitive) OneLake lakehouse name
 - `passphrase` (String, Sensitive) In case private key is encrypted, you are required to enter passphrase that was used to encrypt the private key. The field can be specified if authentication type is `KEY_PAIR`.
 - `password` (String, Sensitive) Database user password
 - `personal_access_token` (String, Sensitive) Personal access token
@@ -94,6 +95,7 @@ Optional:
 - `tunnel_port` (String) SSH server port name. Must be populated if `connection_type` is set to `SshTunnel`.
 - `tunnel_user` (String) SSH user name. Must be populated if `connection_type` is set to `SshTunnel`.
 - `user` (String) Database user name
+- `workspace_name` (String, Sensitive) OneLake workspace name
 
 Read-Only:
 

fivetran/data_source_destination.go

@@ -251,6 +251,18 @@ func dataSourceDestinationSchemaConfig() *schema.Schema {
 					Sensitive:   true,
 					Description: "Secret Value of your Azure Data Lake Storage",
 				},
+				"workspace_name": {
+					Type:        schema.TypeString,
+					Optional:    true,
+					Sensitive:   true,
+					Description: "OneLake workspace name",
+				},
+				"lakehouse_name": {
+					Type:        schema.TypeString,
+					Optional:    true,
+					Sensitive:   true,
+					Description: "OneLake lakehouse name",
+				},
 			},
 		},
 	}
@@ -346,6 +358,8 @@ func dataSourceDestinationConfig(resp *destinations.DestinationDetailsResponse)
 	c["tenant_id"] = resp.Data.Config.TenantId
 	c["client_id"] = resp.Data.Config.ClientId
 	c["secret_value"] = resp.Data.Config.SecretValue
+	c["workspace_name"] = resp.Data.Config.WorkspaceName
+	c["lakehouse_name"] = resp.Data.Config.LakehouseName
 
 	config = append(config, c)
 

fivetran/provider.go

@@ -10,7 +10,7 @@ import (
 )
 
 var limit = 1000        // REST API response objects limit per HTTP request
-const Version = "1.1.3" // Current provider version
+const Version = "1.1.4" // Current provider version
 
 func Provider() *schema.Provider {
 	var resourceMap = map[string]*schema.Resource{

fivetran/resource_destination.go

@@ -280,6 +280,18 @@ func resourceDestinationSchemaConfig() *schema.Schema {
 					Sensitive:   true,
 					Description: "Secret Value of your Azure Data Lake Storage",
 				},
+				"workspace_name": {
+					Type:        schema.TypeString,
+					Optional:    true,
+					Sensitive:   true,
+					Description: "OneLake workspace name",
+				},
+				"lakehouse_name": {
+					Type:        schema.TypeString,
+					Optional:    true,
+					Sensitive:   true,
+					Description: "OneLake lakehouse name",
+				},
 			},
 		},
 	}
@@ -511,6 +523,8 @@ func resourceDestinationReadConfig(resp *destinations.DestinationDetailsResponse
 	c["container_name"] = resp.Data.Config.ContainerName
 	c["tenant_id"] = resp.Data.Config.TenantId
 	c["client_id"] = resp.Data.Config.ClientId
+	c["workspace_name"] = resp.Data.Config.WorkspaceName
+	c["lakehouse_name"] = resp.Data.Config.LakehouseName
 
 	config = append(config, c)
 
@@ -685,5 +699,15 @@ func resourceDestinationCreateConfig(config []interface{}) (*destinations.Destin
 		hasConfig = true
 	}
 
+	if v := c["workspace_name"].(string); v != "" {
+		fivetranConfig.WorkspaceName(v)
+		hasConfig = true
+	}
+
+	if v := c["lakehouse_name"].(string); v != "" {
+		fivetranConfig.LakehouseName(v)
+		hasConfig = true
+	}
+
 	return fivetranConfig, hasConfig
 }

fivetran/tests/mock/datasource_destination_test.go

@@ -83,6 +83,8 @@ func TestDataSourceDestinationConfigMappingMock(t *testing.T) {
 			resource.TestCheckResourceAttr("data.fivetran_destination.test_destintion", "config.0.tenant_id", "tenant_id"),
 			resource.TestCheckResourceAttr("data.fivetran_destination.test_destintion", "config.0.client_id", "client_id"),
 			resource.TestCheckResourceAttr("data.fivetran_destination.test_destintion", "config.0.secret_value", "******"),
+			resource.TestCheckResourceAttr("data.fivetran_destination.test_destintion", "config.0.workspace_name", "workspace_name"),
+			resource.TestCheckResourceAttr("data.fivetran_destination.test_destintion", "config.0.lakehouse_name", "lakehouse_name"),
 		),
 	}
 

fivetran/tests/mock/resource_destination_test.go

@@ -86,8 +86,9 @@ const (
 			"container_name": 			"container_name",
 			"tenant_id": 				"tenant_id",
 			"client_id": 				"client_id",
-			"secret_value":				"******"
-
+			"secret_value":				"******",
+			"workspace_name": 			"workspace_name",
+			"lakehouse_name": 			"lakehouse_name"
         }
 	}
 	`
@@ -147,6 +148,8 @@ func setupMockClientDestinationConfigMapping(t *testing.T) {
 			assertKeyExistsAndHasValue(t, config, "tenant_id", "tenant_id")
 			assertKeyExistsAndHasValue(t, config, "client_id", "client_id")
 			assertKeyExistsAndHasValue(t, config, "secret_value", "secret_value")
+			assertKeyExistsAndHasValue(t, config, "workspace_name", "workspace_name")
+			assertKeyExistsAndHasValue(t, config, "lakehouse_name", "lakehouse_name")
 
 			assertKeyExistsAndHasValue(t, config, "tunnel_port", "123")
 
@@ -216,6 +219,8 @@ func TestResourceDestinationMappingMock(t *testing.T) {
 					tenant_id = "tenant_id"
 					client_id = "client_id"
 					secret_value = "secret_value"
+					workspace_name = "workspace_name"
+					lakehouse_name = "lakehouse_name"
 				}
 			}`,
 

go.mod

@@ -1,7 +1,7 @@
 module github.com/fivetran/terraform-provider-fivetran
 
 require (
-	github.com/fivetran/go-fivetran v0.7.13
+	github.com/fivetran/go-fivetran v0.7.14
 	github.com/hashicorp/terraform-plugin-sdk/v2 v2.29.0
 )
 

go.sum

@@ -23,6 +23,8 @@ github.com/fatih/color v1.13.0 h1:8LOYc1KYPPmyKMuN8QV2DNRWNbLo6LZ0iLs8+mlH53w=
 github.com/fatih/color v1.13.0/go.mod h1:kLAiJbzzSOZDVNGyDpeOxJ47H46qBXwg5ILebYFFOfk=
 github.com/fivetran/go-fivetran v0.7.13 h1:FYb4+5OzAFGnUnrTLDElyA8c0ZmI3WGYv+KuKWsaVPw=
 github.com/fivetran/go-fivetran v0.7.13/go.mod h1:EIy5Uwn1zylQCr/7O+8rrwvmjvhW3PPpzHkQj26ON7Y=
+github.com/fivetran/go-fivetran v0.7.14 h1:EXijYfLl3R1yXVXbYfGrn49MnBPvZQ3N+q3yxk1qq+c=
+github.com/fivetran/go-fivetran v0.7.14/go.mod h1:EIy5Uwn1zylQCr/7O+8rrwvmjvhW3PPpzHkQj26ON7Y=
 github.com/go-git/gcfg v1.5.1-0.20230307220236-3a3c6141e376 h1:+zs/tPmkDkHx3U66DAb0lQFJrpS6731Oaa12ikc+DiI=
 github.com/go-git/go-billy/v5 v5.4.1 h1:Uwp5tDRkPr+l/TnbHOQzp+tmJfLceOlbVucgpTz8ix4=
 github.com/go-git/go-git/v5 v5.8.1 h1:Zo79E4p7TRk0xoRgMq0RShiTHGKcKI4+DI6BfJc/Q+A=

templates/index.md.tmpl

@@ -16,7 +16,7 @@ description: |-
 terraform {
   required_providers {
     fivetran = {
-        version = "1.1.3"                            
+        version = "1.1.4"                            
         source = "fivetran/fivetran"
     }
   }