Skip to content

Commit e20715d

Browse files
nicholasbarlownicholasbarlow
committed
Merge branch 'release/4.6.0'
2 parents 43a713e + 81a41dc commit e20715d

File tree

48 files changed

+3423
-1710
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

48 files changed

+3423
-1710
lines changed

‎.editorconfig‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ trim_trailing_whitespace = true
1313
[*.{cs,csx,vb,vbx}]
1414
indent_size = 4
1515
insert_final_newline = true
16-
#charset = utf-8-bom
16+
charset = utf-8
1717

1818
# Xml project files
1919
[*.{csproj,vbproj,vcxproj,vcxproj.filters,proj,projitems,shproj}]
@@ -163,7 +163,7 @@ dotnet_naming_rule.class_naming.symbols = class_symbol
163163
dotnet_naming_rule.class_naming.style = pascal_case_style
164164
dotnet_naming_rule.class_naming.severity = suggestion
165165

166-
dotnet_naming_symbols.class_symbol.applicable_kinds = class, struct, enum, property, method, event, namespace
166+
dotnet_naming_symbols.class_symbol.applicable_kinds = class, struct, enum, property, method, event, namespace, local_function
167167
dotnet_naming_symbols.class_symbol.applicable_accessibilities = *
168168

169169
# Type Parameters

‎CluedIn.Connector.AzureDataLake.sln‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,12 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Connector.AzureAIStudio", "
6161
EndProject
6262
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Connector.FabricOpenMirroring", "src\Connector.FabricOpenMirroring\Connector.FabricOpenMirroring.csproj", "{B6B64EFA-397F-467F-984E-B7FE73ED92A4}"
6363
EndProject
64+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Connector.OneLake.Tests.Integration", "test\integration\Connector.OneLake.Tests.Integration\Connector.OneLake.Tests.Integration.csproj", "{73DB768F-CE2C-3FFE-FBC7-40B241C81F25}"
65+
EndProject
66+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Connector.DataLake.Common.Tests.Integration", "test\integration\Connector.DataLake.Common.Tests.Integration\Connector.DataLake.Common.Tests.Integration.csproj", "{703D64FE-DEEC-4909-A001-D9298C900E8B}"
67+
EndProject
68+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Connector.FabricOpenMirroring.Tests.Integration", "test\integration\Connector.FabricOpenMirroring.Tests.Integration\Connector.FabricOpenMirroring.Tests.Integration.csproj", "{8660C31C-9ACD-2C90-8A6C-4E244D469A8E}"
69+
EndProject
6470
Global
6571
GlobalSection(SolutionConfigurationPlatforms) = preSolution
6672
Debug|Any CPU = Debug|Any CPU
@@ -103,6 +109,18 @@ Global
103109
{B6B64EFA-397F-467F-984E-B7FE73ED92A4}.Debug|Any CPU.Build.0 = Debug|Any CPU
104110
{B6B64EFA-397F-467F-984E-B7FE73ED92A4}.Release|Any CPU.ActiveCfg = Release|Any CPU
105111
{B6B64EFA-397F-467F-984E-B7FE73ED92A4}.Release|Any CPU.Build.0 = Release|Any CPU
112+
{73DB768F-CE2C-3FFE-FBC7-40B241C81F25}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
113+
{73DB768F-CE2C-3FFE-FBC7-40B241C81F25}.Debug|Any CPU.Build.0 = Debug|Any CPU
114+
{73DB768F-CE2C-3FFE-FBC7-40B241C81F25}.Release|Any CPU.ActiveCfg = Release|Any CPU
115+
{73DB768F-CE2C-3FFE-FBC7-40B241C81F25}.Release|Any CPU.Build.0 = Release|Any CPU
116+
{703D64FE-DEEC-4909-A001-D9298C900E8B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
117+
{703D64FE-DEEC-4909-A001-D9298C900E8B}.Debug|Any CPU.Build.0 = Debug|Any CPU
118+
{703D64FE-DEEC-4909-A001-D9298C900E8B}.Release|Any CPU.ActiveCfg = Release|Any CPU
119+
{703D64FE-DEEC-4909-A001-D9298C900E8B}.Release|Any CPU.Build.0 = Release|Any CPU
120+
{8660C31C-9ACD-2C90-8A6C-4E244D469A8E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
121+
{8660C31C-9ACD-2C90-8A6C-4E244D469A8E}.Debug|Any CPU.Build.0 = Debug|Any CPU
122+
{8660C31C-9ACD-2C90-8A6C-4E244D469A8E}.Release|Any CPU.ActiveCfg = Release|Any CPU
123+
{8660C31C-9ACD-2C90-8A6C-4E244D469A8E}.Release|Any CPU.Build.0 = Release|Any CPU
106124
EndGlobalSection
107125
GlobalSection(SolutionProperties) = preSolution
108126
HideSolutionNode = FALSE
@@ -123,6 +141,9 @@ Global
123141
{61607CFA-7A18-4DD6-9512-83B620B288EB} = {5256D9B9-8A1D-480D-A8F0-1A69AFA59B31}
124142
{5F8EDA0E-5F95-4A7A-A7F3-217210674FDE} = {5256D9B9-8A1D-480D-A8F0-1A69AFA59B31}
125143
{B6B64EFA-397F-467F-984E-B7FE73ED92A4} = {5256D9B9-8A1D-480D-A8F0-1A69AFA59B31}
144+
{73DB768F-CE2C-3FFE-FBC7-40B241C81F25} = {9A48CD57-CDE1-454C-AE55-8ABD15908E81}
145+
{703D64FE-DEEC-4909-A001-D9298C900E8B} = {9A48CD57-CDE1-454C-AE55-8ABD15908E81}
146+
{8660C31C-9ACD-2C90-8A6C-4E244D469A8E} = {9A48CD57-CDE1-454C-AE55-8ABD15908E81}
126147
EndGlobalSection
127148
GlobalSection(ExtensibilityGlobals) = postSolution
128149
SolutionGuid = {E6A866CB-824C-4271-8EA6-053B7FC4B134}

‎Packages.props‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project>
22
<PropertyGroup Label="Dependency Versions">
3-
<_CluedIn>4.5.0</_CluedIn>
3+
<_CluedIn>4.6.0</_CluedIn>
44
</PropertyGroup>
55

66
<ItemGroup>

‎build/integration-test.ps1‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,11 @@ function Run-Setup() {
5555
$port = ((docker inspect $containerName | convertfrom-json).NetworkSettings.Ports."1433/tcp" | Where-Object { $_.HostIp -eq '0.0.0.0'}).HostPort
5656
$connectionString = "Data Source=$($databaseHost),$($port);Initial Catalog=$($databaseName);User Id=$($databaseUser);Password=$($databasePassword);connection timeout=0;Max Pool Size=200;Pooling=True;Encrypt=false"
5757
$connectionStringEncoded = [Convert]::ToBase64String([char[]]$connectionString)
58+
5859
Set-Variable "ADL2_STREAMCACHE" $connectionStringEncoded
60+
Set-Variable "ONELAKE_STREAMCACHE" $connectionStringEncoded
61+
Set-Variable "FABRICOPENMIRRORING_STREAMCACHE" $connectionStringEncoded
62+
5963
Write-Host "##[command]docker logs -f $($containerName)"
6064
WaitFor { docker container logs --follow "datalaketest" } "SQL Server is now ready for client connections"
6165

‎docs/4.6.0-release-notes.md‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
### Features
2+
- Add ability to run export immediately via the UI
3+
4+
### Fixes
5+
- Add validation to export target configuration

‎src/Connector.AzureAIStudio/AzureAIStudioConnectorJobData.cs‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,10 @@ public AzureAIStudioConnectorJobData(
2424
public override bool ShouldWriteGuidAsString => true;
2525
public override bool ShouldEscapeVocabularyKeys => true;
2626

27+
public override string FileSystemName => WorkspaceName;
28+
29+
public override string RootDirectoryPath => $"{ItemName}.{ItemType}/{ItemFolder}/";
30+
2731
protected override void AddToHashCode(HashCode hash)
2832
{
2933
hash.Add(WorkspaceName);

‎src/Connector.AzureAIStudio/Connector/AzureAIStudioClient.cs‎

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -24,16 +24,4 @@ protected override DataLakeServiceClient GetDataLakeServiceClient(IDataLakeJobDa
2424
sharedKeyCredential);
2525
return dataLakeServiceClient;
2626
}
27-
28-
protected override string GetDirectory(IDataLakeJobData configuration)
29-
{
30-
var casted = CastJobData<AzureAIStudioConnectorJobData>(configuration);
31-
return $"{casted.ItemName}.{casted.ItemType}/{casted.ItemFolder}/"; //"jlalakehouse.Lakehouse/Files/";
32-
}
33-
34-
protected override string GetFileSystemName(IDataLakeJobData configuration)
35-
{
36-
var casted = CastJobData<AzureAIStudioConnectorJobData>(configuration);
37-
return casted.WorkspaceName;
38-
}
3927
}

‎src/Connector.AzureAIStudio/Connector/AzureAIStudioConnector.cs‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
1-
using CluedIn.Connector.DataLake.Common.Connector;
1+
using System;
2+
3+
using CluedIn.Connector.DataLake.Common.Connector;
24
using CluedIn.Core;
35

46
using Microsoft.Extensions.Logging;
@@ -16,4 +18,6 @@ public AzureAIStudioConnector(
1618
: base(logger, client, constants, dataLakeJobDataFactory, dateTimeOffsetProvider)
1719
{
1820
}
21+
22+
protected override Type ExportJobType => typeof(AzureAIStudioExportEntitiesJob);
1923
}

‎src/Connector.AzureDataLake/AzureDataLakeConnectorJobData.cs‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,9 @@ public AzureDataLakeConnectorJobData(
1717
public string AccountName => GetConfigurationValue(AzureDataLakeConstants.AccountName) as string;
1818
public string AccountKey => GetConfigurationValue(AzureDataLakeConstants.AccountKey) as string;
1919
public string DirectoryName => GetConfigurationValue(AzureDataLakeConstants.DirectoryName) as string;
20-
public string FileSystemName => GetConfigurationValue(AzureDataLakeConstants.FileSystemName) as string;
20+
21+
public override string FileSystemName => GetConfigurationValue(AzureDataLakeConstants.FileSystemName) as string;
22+
public override string RootDirectoryPath => DirectoryName;
2123

2224
protected override void AddToHashCode(HashCode hash)
2325
{
@@ -40,7 +42,7 @@ public bool Equals(AzureDataLakeConnectorJobData other)
4042
AccountName == other.AccountName &&
4143
AccountKey == other.AccountKey &&
4244
FileSystemName == other.FileSystemName &&
43-
DirectoryName == other.DirectoryName &&
45+
RootDirectoryPath == other.RootDirectoryPath &&
4446
base.Equals(other);
4547
}
4648

‎src/Connector.AzureDataLake/Connector.AzureDataLake.csproj‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,10 @@
55
<RootNamespace>CluedIn.Connector.AzureDataLake</RootNamespace>
66
<IsCluedInServerComponent>true</IsCluedInServerComponent>
77
</PropertyGroup>
8+
<ItemGroup>
9+
<InternalsVisibleTo Include="CluedIn.Connector.AzureDataLake.Tests.Integration" />
10+
<InternalsVisibleTo Include="CluedIn.Connector.AzureDataLake.Tests.Unit" />
11+
</ItemGroup>
812
<ItemGroup>
913
<None Remove="Resources\azuredatalake.svg" />
1014
</ItemGroup>

0 commit comments

Comments
 (0)