Skip to content

[WIP][MQ Goals] ARM template for Storage #6459

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

Closed
sadasant wants to merge 24 commits into from
Closed

[WIP][MQ Goals] ARM template for Storage #6459

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
2996995
[MQ Goals] ARM template for Storage Blob
sadasant Dec 6, 2019
36d43e2
feedback
sadasant Dec 9, 2019
8b2dbea
wrong path here
sadasant Dec 9, 2019
3a3e73e
all of the tests.yml for storage
sadasant Dec 9, 2019
7f157c6
fixed the paths
sadasant Dec 9, 2019
21e2552
added provisionerTenantId
sadasant Dec 9, 2019
934da58
using ../archetype-sdk-tests-storage.yml again
sadasant Dec 9, 2019
b68b540
optimization on the env variables
sadasant Dec 9, 2019
5168155
optimizations on ResourceFileLocation
sadasant Dec 9, 2019
4f641fa
lowercase string
sadasant Dec 9, 2019
e691a9f
variables('storageApiVersion')
sadasant Dec 9, 2019
3a34461
tenantId resources shouldnt be necessary
sadasant Dec 9, 2019
2199aaf
removed provisionerTenantId and uppercased the env variables
sadasant Dec 10, 2019
24dc731
moved the ARM specific parameters to variables
sadasant Dec 10, 2019
0fa6244
this is closer to work
sadasant Dec 10, 2019
7a8fdd7
update
sadasant Dec 10, 2019
7cb744e
storage-blob updated tests.yml
sadasant Dec 20, 2019
a04574e
seems like the archetype file needed to change
sadasant Dec 20, 2019
231b286
seems like the template is invalid somehow. Trying this
sadasant Dec 20, 2019
8f6a3aa
tweaks, to see if things change
sadasant Dec 20, 2019
fff1d66
this should work now
sadasant Dec 20, 2019
0f598fc
ResourceServiceDirectory can be optimized
sadasant Dec 20, 2019
9f22435
Merge branch 'master' of https://github.com/Azure/azure-sdk-for-js in…
HarshaNalluru Jan 15, 2020
5962852
add AAD secret references in the ENV vars for the resource creation -…
HarshaNalluru Jan 15, 2020
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
12 changes: 8 additions & 4 deletions sdk/storage/archetype-sdk-tests-storage.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,14 @@
parameters:
PackageName: ""
ResourceServiceDirectory: storage
EnvVars:
ACCOUNT_NAME: $(js-storage-test-account-name)
ACCOUNT_KEY: $(js-storage-test-account-key)
ACCOUNT_SAS: $(js-storage-test-account-sas)
STORAGE_CONNECTION_STRING: $(js-storage-test-connection-string)
AZURE_CLIENT_ID: $(aad-azure-sdk-test-client-id)
AZURE_TENANT_ID: $(aad-azure-sdk-test-tenant-id)
AZURE_CLIENT_SECRET: $(aad-azure-sdk-test-client-secret)
ACCOUNT_NAME: $(STORAGE_ACCOUNT_NAME)
ACCOUNT_KEY: $(STORAGE_ACCOUNT_KEY)
ACCOUNT_SAS: $(STORAGE_ACCOUNT_SAS)
STORAGE_CONNECTION_STRING: $(STORAGE_CONNECTION_STRING)
Matrix:
Linux_Node8:
OSVmImage: "ubuntu-16.04"
Expand Down
2 changes: 1 addition & 1 deletion sdk/storage/storage-blob/tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,4 @@ resources:
jobs:
- template: ../archetype-sdk-tests-storage.yml
parameters:
PackageName: "@azure/storage-blob"
PackageName: "@azure/storage-blob"
2 changes: 1 addition & 1 deletion sdk/storage/storage-file-datalake/tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,4 @@ resources:
jobs:
- template: ../archetype-sdk-tests-storage.yml
parameters:
PackageName: "@azure/storage-file-datalake"
PackageName: "@azure/storage-file-datalake"
2 changes: 1 addition & 1 deletion sdk/storage/storage-file-share/tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,4 @@ resources:
jobs:
- template: ../archetype-sdk-tests-storage.yml
parameters:
PackageName: "@azure/storage-file-share"
PackageName: "@azure/storage-file-share"
2 changes: 1 addition & 1 deletion sdk/storage/storage-queue/tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,4 @@ resources:
jobs:
- template: ../archetype-sdk-tests-storage.yml
parameters:
PackageName: "@azure/storage-queue"
PackageName: "@azure/storage-queue"
196 changes: 196 additions & 0 deletions sdk/storage/test-resources.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,196 @@
{
"$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#",
"contentVersion": "1.0.0.0",
"parameters": {
"baseName": {
"type": "string",
"defaultValue": "[resourceGroup().name]",
"metadata": {
"description": "The base resource name."
}
}
},
"variables": {
"storageApiVersion": "2019-04-01",
"location": "[resourceGroup().location]",
"accountName": "[parameters('baseName')]",
"datalakeAccountName": "[concat('datalake', parameters('baseName'))]",
"accountNameTidy": "[toLower(trim(variables('accountName')))]",
"blobEndPoint": "[concat('https://',variables('accountNameTidy'),'.blob.core.windows.net/')]",
"endpointSuffix": "core.windows.net",
"accountSasProperties": {
"signedServices": "b",
"signedPermission": "rl",
"signedResourceTypes": "sco",
"keyToSign": "key2",
"signedExpiry": "2022-01-01T23:59:00Z"
}
},
"resources": [
{
"type": "Microsoft.Storage/storageAccounts",
"apiVersion": "[variables('storageApiVersion')]",
"name": "[variables('accountName')]",
"location": "[variables('location')]",
"sku": {
"name": "Standard_RAGRS",
"tier": "Standard"
},
"kind": "StorageV2",
"properties": {
"cors": {
"corsRules": [
{
"allowedOrigins": ["example.com"],
"allowedMethods": ["GET"],
"maxAgeInSeconds": 8888,
"exposedHeaders": ["*"],
"allowedHeaders": ["*"]
},
{
"allowedOrigins": ["*"],
"allowedMethods": ["DELETE", "GET", "HEAD", "MERGE", "POST", "OPTIONS", "PUT"],
"maxAgeInSeconds": 86400,
"exposedHeaders": ["*"],
"allowedHeaders": ["*"]
},
{
"allowedOrigins": ["example.com"],
"allowedMethods": ["GET"],
"maxAgeInSeconds": 8888,
"exposedHeaders": ["*"],
"allowedHeaders": ["*"]
},
{
"allowedOrigins": ["example.com"],
"allowedMethods": ["GET"],
"maxAgeInSeconds": 8888,
"exposedHeaders": ["*"],
"allowedHeaders": ["*"]
},
{
"allowedOrigins": ["example.com"],
"allowedMethods": ["GET"],
"maxAgeInSeconds": 8888,
"exposedHeaders": ["*"],
"allowedHeaders": ["*"]
}
]
},
"networkAcls": {
"bypass": "AzureServices",
"virtualNetworkRules": [],
"ipRules": [],
"defaultAction": "Allow"
},
"supportsHttpsTrafficOnly": true,
"encryption": {
"services": {
"file": {
"enabled": true
},
"blob": {
"enabled": true
}
},
"keySource": "Microsoft.Storage"
},
"accessTier": "Hot"
}
},
{
"type": "Microsoft.Storage/storageAccounts",
"apiVersion": "[variables('storageApiVersion')]",
"name": "[variables('datalakeAccountName')]",
"location": "[variables('location')]",
"sku": {
"name": "Standard_RAGRS",
"tier": "Standard"
},
"kind": "StorageV2",
"properties": {
"isHnsEnabled": true,
"cors": {
"corsRules": [
{
"allowedOrigins": ["example.com"],
"allowedMethods": ["GET"],
"maxAgeInSeconds": 8888,
"exposedHeaders": ["*"],
"allowedHeaders": ["*"]
},
{
"allowedOrigins": ["*"],
"allowedMethods": ["DELETE", "GET", "HEAD", "MERGE", "POST", "OPTIONS", "PUT"],
"maxAgeInSeconds": 86400,
"exposedHeaders": ["*"],
"allowedHeaders": ["*"]
},
{
"allowedOrigins": ["example.com"],
"allowedMethods": ["GET"],
"maxAgeInSeconds": 8888,
"exposedHeaders": ["*"],
"allowedHeaders": ["*"]
},
{
"allowedOrigins": ["example.com"],
"allowedMethods": ["GET"],
"maxAgeInSeconds": 8888,
"exposedHeaders": ["*"],
"allowedHeaders": ["*"]
},
{
"allowedOrigins": ["example.com"],
"allowedMethods": ["GET"],
"maxAgeInSeconds": 8888,
"exposedHeaders": ["*"],
"allowedHeaders": ["*"]
}
]
},
"networkAcls": {
"bypass": "AzureServices",
"virtualNetworkRules": [],
"ipRules": [],
"defaultAction": "Allow"
},
"supportsHttpsTrafficOnly": true,
"encryption": {
"services": {
"file": {
"enabled": true
},
"blob": {
"enabled": true
}
},
"keySource": "Microsoft.Storage"
},
"accessTier": "Hot"
}
}
],
"outputs": {
"STORAGE_ACCOUNT_NAME": {
"type": "string",
"value": "[variables('accountName')]"
},
"STORAGE_DATALAKE_ACCOUNT_NAME": {
"type": "string",
"value": "[variables('datalakeAccountName')]"
},
"STORAGE_ACCOUNT_KEY": {
"type": "string",
"value": "[listKeys(resourceId('Microsoft.Storage/storageAccounts', variables('accountName')), variables('storageApiVersion')).keys[0].value]"
},
"STORAGE_ACCOUNT_SAS": {
"type": "string",
"value": "[concat('BlobEndpoint=',variables('blobEndPoint'),';SharedAccessSignature=', listAccountSas(variables('accountNameTidy'), variables('storageApiVersion'), variables('accountSasProperties')).accountSasToken)]"
},
"STORAGE_CONNECTION_STRING": {
"type": "string",
"value": "[concat('DefaultEndpointsProtocol=https;AccountName=', variables('accountName'), ';AccountKey=', listKeys(resourceId('Microsoft.Storage/storageAccounts', variables('accountName')), variables('storageApiVersion')).keys[0].value, ';EndpointSuffix=', 'core.windows.net')]"
}
}
}