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

Users/sogangul/api&k vfix #288

Merged
merged 9 commits into from
Oct 27, 2021
Merged

Users/sogangul/api&k vfix #288

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
f01854a
Add bug fix to iterate through networkAcls param correctly and remove…
Oct 26, 2021
bc73fae
Updated deploy.bicep with updated existence check for networkAcls var…
Oct 26, 2021
b690356
Merge branch 'main' of https://github.com/SomilGanguly/ResourceModule…
Oct 26, 2021
3d4bd35
Add missing mandatory parameters for API Management service.
Oct 26, 2021
56f4af9
Merge branch 'Azure:main' into users/sogangul/API&KVfix
SomilGanguly Oct 27, 2021
72c351b
Add KV references for APIM ClientId and ClientSecret params.
Oct 27, 2021
873bdde
Update param for AuthorizationServers in APIM and update KV resource …
Oct 27, 2021
37ad12a
Update KV resource name and disable resource removal stage in KV work…
Oct 27, 2021
9e1998b
Update APIM resource name and KV references.
Oct 27, 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
2 changes: 1 addition & 1 deletion .github/workflows/ms.keyvault.vaults.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ on:
removeDeployment:
description: 'Remove deployed module'
required: false
default: 'true'
AlexanderSehr marked this conversation as resolved.
Show resolved Hide resolved
default: 'false'
versioningOption:
description: 'The mode to handle the version increments [major|minor|patch|custom]'
required: false
Expand Down
16 changes: 13 additions & 3 deletions arm/Microsoft.ApiManagement/service/parameters/parameters.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"contentVersion": "1.0.0.0",
"parameters": {
"apiManagementServiceName": {
"value": "sxx-az-am-weu-x-002"
"value": "sxx-az-am-weu-x-001"
},
"publisherEmail": {
"value": "[email protected]"
Expand Down Expand Up @@ -35,10 +35,20 @@
}
},
"identityProviderClientId": {
"value": "test"
"reference": {
"keyVault": {
"id": "/subscriptions/8629be3b-96bc-482d-a04b-ffff597c65a2/resourceGroups/validation-rg/providers/Microsoft.KeyVault/vaults/adp-sxx-az-kv-weu-x-001"
},
"secretName": "apimclientid"
}
},
"identityProviderClientSecret": {
"value": "test"
"reference": {
"keyVault": {
"id": "/subscriptions/8629be3b-96bc-482d-a04b-ffff597c65a2/resourceGroups/validation-rg/providers/Microsoft.KeyVault/vaults/adp-sxx-az-kv-weu-x-001"
},
"secretName": "apimclientsecret"
}
},
"roleAssignments": {
"value": [{
Expand Down
14 changes: 12 additions & 2 deletions arm/Microsoft.ApiManagement/serviceResources/authorizationServers/parameters/parameters.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,20 @@
]
},
"clientId": {
"value": "test"
"reference": {
"keyVault": {
"id": "/subscriptions/8629be3b-96bc-482d-a04b-ffff597c65a2/resourceGroups/validation-rg/providers/Microsoft.KeyVault/vaults/adp-sxx-az-kv-weu-x-001"
},
"secretName": "apimclientid"
}
},
"clientSecret": {
"value": "test"
"reference": {
"keyVault": {
"id": "/subscriptions/8629be3b-96bc-482d-a04b-ffff597c65a2/resourceGroups/validation-rg/providers/Microsoft.KeyVault/vaults/adp-sxx-az-kv-weu-x-001"
},
"secretName": "apimclientsecret"
}
},
"clientRegistrationEndpoint": {
"value": "http://localhost"
Expand Down
16 changes: 7 additions & 9 deletions arm/Microsoft.KeyVault/vaults/parameters/parameters.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"contentVersion": "1.0.0.0",
"parameters": {
"keyVaultName": {
"value": "sxx-az-kv-weu-x-009"
"value": "sxx-az-kv-weu-x-001"
},
"enableSoftDelete": {
"value": true
Expand All @@ -15,14 +15,12 @@
"value": false
},
"roleAssignments": {
"value": [
{
"roleDefinitionIdOrName": "Reader",
"principalIds": [
"5545f7a0-51f4-46af-b3b4-baecf5176a56"
]
}
]
"value": [{
"roleDefinitionIdOrName": "Reader",
"principalIds": [
"5545f7a0-51f4-46af-b3b4-baecf5176a56"
]
}]
}
}
}