Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Support managed identity for connecting to storage #87

Merged
merged 14 commits into from
Feb 4, 2021
Merged

Support managed identity for connecting to storage #87

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
3b400d4
method to prefix metric name
wi-y Aug 28, 2020
8449e3a
Merge branch 'master' of https://github.com/microsoft/iomt-fhir
wi-y Sep 29, 2020
ad66e1f
Merge branch 'master' of https://github.com/microsoft/iomt-fhir
wi-y Nov 11, 2020
e3e14f9
Merge branch 'master' of https://github.com/microsoft/iomt-fhir
wi-y Jan 20, 2021
ec42e41
support managed identity for storage
wi-y Jan 26, 2021
544ac7f
use subscriptionResourceId
wi-y Jan 31, 2021
eb954cb
pass in storage uri
wi-y Jan 31, 2021
d99d4fd
inject storage credentials
wi-y Jan 31, 2021
ebcef71
arm template version for role assignments
wi-y Jan 31, 2021
17febba
use factory to create blob clients
wi-y Feb 4, 2021
84a8dd8
add common project reference
wi-y Feb 4, 2021
396646a
add storage files
wi-y Feb 4, 2021
597e69e
make factory non-static
wi-y Feb 4, 2021
5aa1aa4
add null check
wi-y Feb 4, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions deploy/templates/consumption-azuredeploy.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -179,8 +179,8 @@
"key_vault_name": "[parameters('ServiceName')]",
"app_service_resource_id": "[resourceId('Microsoft.Web/sites', variables('app_service_name'))]",
"deploy_source_code": "[and(not(empty(parameters('repositoryUrl'))),not(empty(parameters('repositoryBranch'))))]",
"sender_role": "[concat('/subscriptions/', subscription().subscriptionId, '/providers/Microsoft.Authorization/roleDefinitions/', '2b629674-e913-4c01-ae53-ef4638d8f975')]",
"receiver_role": "[concat('/subscriptions/', subscription().subscriptionId, '/providers/Microsoft.Authorization/roleDefinitions/', 'a638d3c7-ab3a-418d-83e6-5f17a39d4fde')]",
"sender_role": "[subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '2b629674-e913-4c01-ae53-ef4638d8f975')]",
"receiver_role": "[subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'a638d3c7-ab3a-418d-83e6-5f17a39d4fde')]",
"iomt_fhir_connector_name": "[concat('ResourceIdentity', ':', parameters('ResourceIdentityResolutionType'))]"
},
"resources": [
Expand Down
58 changes: 33 additions & 25 deletions deploy/templates/default-azuredeploy-webjobs.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -190,6 +190,13 @@
"metadata": {
"description": "Default system to use when searching for device identities. If empty system is not used in the search."
}
},
"StorageAccountDomain": {
"type": "string",
"defaultValue": "blob.core.windows.net",
"metadata": {
"description": "The domain of the Azure Storage Account."
}
}
},
"variables": {
Expand All @@ -198,14 +205,17 @@
"normalizeddata_eventhub_name": "[concat(variables('eventhub_namespace_name'), '/normalizeddata')]",
"devicedata_eventhub_name": "[concat(variables('eventhub_namespace_name'), '/devicedata')]",
"storage_account_name": "[parameters('ServiceName')]",
"checkpoint_storage_uri": "[concat('https://', parameters('ServiceName'), '.', parameters('StorageAccountDomain'), '/checkpoint')]",
"template_storage_uri": "[concat('https://', parameters('ServiceName'), '.', parameters('StorageAccountDomain'), '/template')]",
"app_plan_name": "[concat(parameters('ServiceName'), 'plan')]",
"app_service_name": "[parameters('ServiceName')]",
"app_insights_name": "[parameters('ServiceName')]",
"key_vault_name": "[parameters('ServiceName')]",
"app_service_resource_id": "[resourceId('Microsoft.Web/sites', variables('app_service_name'))]",
"deploy_source_code": "[and(not(empty(parameters('repositoryUrl'))),not(empty(parameters('repositoryBranch'))))]",
"sender_role": "[concat('/subscriptions/', subscription().subscriptionId, '/providers/Microsoft.Authorization/roleDefinitions/', '2b629674-e913-4c01-ae53-ef4638d8f975')]",
"receiver_role": "[concat('/subscriptions/', subscription().subscriptionId, '/providers/Microsoft.Authorization/roleDefinitions/', 'a638d3c7-ab3a-418d-83e6-5f17a39d4fde')]"
"sender_role": "[subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '2b629674-e913-4c01-ae53-ef4638d8f975')]",
"receiver_role": "[subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'a638d3c7-ab3a-418d-83e6-5f17a39d4fde')]",
"storage_blob_contributor_role": "[subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'ba92f5b4-2d11-453d-a403-e96b0029c9fe')]"
},
"resources": [
{
Expand Down Expand Up @@ -410,7 +420,21 @@
"keySource": "Microsoft.Storage"
},
"accessTier": "Hot"
}
},
"resources": [
{
"type": "Microsoft.Storage/storageAccounts/providers/roleAssignments",
"apiVersion": "2018-07-01",
"name": "[concat(variables('storage_account_name'), '/Microsoft.Authorization/', guid(uniqueString(variables('storage_account_name'))))]",
"dependsOn": [
"[resourceId('Microsoft.Storage/storageAccounts', variables('storage_account_name'))]"
],
"properties": {
"roleDefinitionId": "[variables('storage_blob_contributor_role')]",
"principalId": "[reference(variables('app_service_resource_id'), '2015-08-01', 'Full').Identity.principalId]"
wi-y marked this conversation as resolved.
Show resolved Hide resolved
}
}
]
},
{
"type": "Microsoft.Storage/storageAccounts/blobServices",
Expand Down Expand Up @@ -478,6 +502,9 @@
"type": "Microsoft.Web/sites",
"apiVersion": "2018-11-01",
"name": "[variables('app_service_name')]",
"dependsOn": [
"[resourceId('Microsoft.Web/serverfarms', variables('app_plan_name'))]"
],
"location": "[parameters('ResourceLocation')]",
"kind": "app",
"identity": {
Expand All @@ -502,7 +529,7 @@
"isXenon": false,
"hyperV": false,
"siteConfig": {
"alwaysOn": true
"alwaysOn": true
},
"scmSiteAlsoStopped": false,
"clientAffinityEnabled": true,
Expand All @@ -529,12 +556,10 @@
"properties": {
"EventBatching:FlushTimespan": "[parameters('JobWindowMagnitude')]",
"EventBatching:MaxEvents": "[parameters('JobMaxEvents')]",
"Storage:BlobStorageConnectionString": "[concat('@Microsoft.KeyVault(SecretUri=', reference(resourceId('Microsoft.KeyVault/vaults/secrets', variables('key_vault_name'),'blob-storage-cs'), '2018-02-14').secretUriWithVersion, ')')]",
"Storage:BlobContainerName": "checkpoint",
"Storage:BlobStorageContainerUri": "[variables('checkpoint_storage_uri')]",
"Storage:BlobPrefix": "",
"Storage:CheckpointBatchCount": 5,
"TemplateStorage:BlobStorageConnectionString": "[concat('@Microsoft.KeyVault(SecretUri=', reference(resourceId('Microsoft.KeyVault/vaults/secrets', variables('key_vault_name'),'blob-storage-cs'), '2018-02-14').secretUriWithVersion, ')')]",
"TemplateStorage:BlobContainerName": "template",
"TemplateStorage:BlobStorageContainerUri": "[variables('template_storage_uri')]",
"InputEventHub": "[concat('@Microsoft.KeyVault(SecretUri=', reference(resourceId('Microsoft.KeyVault/vaults/secrets', variables('key_vault_name'),'device-input-connection'), '2018-02-14').secretUriWithVersion, ')')]",
"OutputEventHub": "[concat('@Microsoft.KeyVault(SecretUri=', reference(resourceId('Microsoft.KeyVault/vaults/secrets', variables('key_vault_name'),'device-output-connection'), '2018-02-14').secretUriWithVersion, ')')]",
"FhirVersion": "[parameters('FhirVersion')]",
Expand Down Expand Up @@ -605,23 +630,6 @@
"enabledForTemplateDeployment": false
}
},
{
"type": "Microsoft.KeyVault/vaults/secrets",
"apiVersion": "2016-10-01",
"name": "[concat(variables('storage_account_name'), '/blob-storage-cs')]",
"location": "[parameters('ResourceLocation')]",
"dependsOn": [
"[resourceId('Microsoft.KeyVault/vaults', variables('key_vault_name'))]",
"[resourceId('Microsoft.Storage/storageAccounts/blobServices', variables('storage_account_name'), 'default')]"
],
"properties": {
"contentType": "text/plain",
"value": "[concat('DefaultEndpointsProtocol=https;AccountName=', variables('storage_account_name'), ';AccountKey=', listkeys(resourceId('Microsoft.Storage/storageAccounts', variables('storage_account_name')), '2019-04-01').keys[0].value)]",
"attributes": {
"enabled": true
}
}
},
{
"type": "Microsoft.KeyVault/vaults/secrets",
"apiVersion": "2016-10-01",
Expand Down
4 changes: 2 additions & 2 deletions deploy/templates/default-azuredeploy.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -200,8 +200,8 @@
"key_vault_name": "[parameters('ServiceName')]",
"app_service_resource_id": "[resourceId('Microsoft.Web/sites', variables('app_service_name'))]",
"deploy_source_code": "[and(not(empty(parameters('repositoryUrl'))),not(empty(parameters('repositoryBranch'))))]",
"sender_role": "[concat('/subscriptions/', subscription().subscriptionId, '/providers/Microsoft.Authorization/roleDefinitions/', '2b629674-e913-4c01-ae53-ef4638d8f975')]",
"receiver_role": "[concat('/subscriptions/', subscription().subscriptionId, '/providers/Microsoft.Authorization/roleDefinitions/', 'a638d3c7-ab3a-418d-83e6-5f17a39d4fde')]",
"sender_role": "[subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '2b629674-e913-4c01-ae53-ef4638d8f975')]",
"receiver_role": "[subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'a638d3c7-ab3a-418d-83e6-5f17a39d4fde')]",
"iomt_fhir_connector_name": "[concat('ResourceIdentity', ':', parameters('ResourceIdentityResolutionType'))]"
},
"resources": [
Expand Down
4 changes: 2 additions & 2 deletions deploy/templates/managed-identity-azuredeploy.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -186,8 +186,8 @@
"key_vault_name": "[parameters('ServiceName')]",
"app_service_resource_id": "[resourceId('Microsoft.Web/sites', variables('app_service_name'))]",
"deploy_source_code": "[and(not(empty(parameters('repositoryUrl'))),not(empty(parameters('repositoryBranch'))))]",
"sender_role": "[concat('/subscriptions/', subscription().subscriptionId, '/providers/Microsoft.Authorization/roleDefinitions/', '2b629674-e913-4c01-ae53-ef4638d8f975')]",
"receiver_role": "[concat('/subscriptions/', subscription().subscriptionId, '/providers/Microsoft.Authorization/roleDefinitions/', 'a638d3c7-ab3a-418d-83e6-5f17a39d4fde')]",
"sender_role": "[subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '2b629674-e913-4c01-ae53-ef4638d8f975')]",
"receiver_role": "[subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'a638d3c7-ab3a-418d-83e6-5f17a39d4fde')]",
"iomt_fhir_connector_name": "[concat('ResourceIdentity', ':', parameters('ResourceIdentityResolutionType'))]",
"fhir_service_audience": "[if(or(equals(parameters('FhirServiceAudience'), json('null')), equals(parameters('FhirServiceAudience'), '')), parameters('FhirServiceUrl'), parameters('FhirServiceAudience'))]"
},
Expand Down
4 changes: 2 additions & 2 deletions deploy/templates/premium-azuredeploy.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -179,8 +179,8 @@
"key_vault_name": "[parameters('ServiceName')]",
"app_service_resource_id": "[resourceId('Microsoft.Web/sites', variables('app_service_name'))]",
"deploy_source_code": "[and(not(empty(parameters('repositoryUrl'))),not(empty(parameters('repositoryBranch'))))]",
"sender_role": "[concat('/subscriptions/', subscription().subscriptionId, '/providers/Microsoft.Authorization/roleDefinitions/', '2b629674-e913-4c01-ae53-ef4638d8f975')]",
"receiver_role": "[concat('/subscriptions/', subscription().subscriptionId, '/providers/Microsoft.Authorization/roleDefinitions/', 'a638d3c7-ab3a-418d-83e6-5f17a39d4fde')]",
"sender_role": "[subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '2b629674-e913-4c01-ae53-ef4638d8f975')]",
"receiver_role": "[subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'a638d3c7-ab3a-418d-83e6-5f17a39d4fde')]",
"iomt_fhir_connector_name": "[concat('ResourceIdentity', ':', parameters('ResourceIdentityResolutionType'))]"
},
"resources": [
Expand Down
34 changes: 0 additions & 34 deletions src/console/IomtLogger.cs
View file
Open in desktop

This file was deleted.

55 changes: 27 additions & 28 deletions src/console/Microsoft.Health.Fhir.Ingest.Console.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,31 +1,30 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>netcoreapp3.1</TargetFramework>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.Mvc.Abstractions" Version="2.2.0" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.Core" Version="2.2.5" />
<PackageReference Include="Microsoft.Azure.WebJobs.Extensions.Storage" Version="4.0.3" />
<PackageReference Include="Microsoft.Extensions.Hosting" Version="2.2.0" />
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>netcoreapp3.1</TargetFramework>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Azure.WebJobs.Extensions.Storage" Version="4.0.3" />
<PackageReference Include="Microsoft.Extensions.Hosting" Version="2.2.0" />
<PackageReference Include="Microsoft.Net.Compilers.Toolset" Version="3.8.0">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\lib\Microsoft.Health.Events\Microsoft.Health.Events.csproj" />
<ProjectReference Include="..\lib\Microsoft.Health.Fhir.Ingest\Microsoft.Health.Fhir.Ingest.csproj" />
<ProjectReference Include="..\lib\Microsoft.Health.Fhir.R4.Ingest\Microsoft.Health.Fhir.R4.Ingest.csproj" />
</ItemGroup>

<ItemGroup>
<None Update="appsettings.json">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
</ItemGroup>

</Project>
</PackageReference>
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\lib\Microsoft.Health.Common\Microsoft.Health.Common.csproj" />
<ProjectReference Include="..\lib\Microsoft.Health.Events\Microsoft.Health.Events.csproj" />
<ProjectReference Include="..\lib\Microsoft.Health.Fhir.Ingest\Microsoft.Health.Fhir.Ingest.csproj" />
<ProjectReference Include="..\lib\Microsoft.Health.Fhir.R4.Ingest\Microsoft.Health.Fhir.R4.Ingest.csproj" />
</ItemGroup>

<ItemGroup>
<None Update="appsettings.json">
<CopyToOutputDirectory>Never</CopyToOutputDirectory>
</None>
</ItemGroup>

</Project>
Loading