Commit c9291761 authored by Daniel Scholl's avatar Daniel Scholl
Browse files

Merge branch 'fix-context-path-entitlement' into 'master'

Azure - (1/4) - Adding missing context path for entitlements

See merge request !11
parents 4173a41b 6a08eca9
Pipeline #3575 passed with stages
in 28 minutes and 35 seconds
......@@ -39,6 +39,7 @@ az keyvault secret show --vault-name $KEY_VAULT_NAME --name $KEY_VAULT_SECRET_NA
| name | value | description | sensitive? | source |
| --- | --- | --- | --- | --- |
| `server.servlet.contextPath` | `/entitlements/v1/` | Servlet context path | no | - |
| `service_domain_name` | ex `contoso.com` | The name of the domain for which the service will run | no | -- |
| `aad_client_id` | `********` | AAD client application ID | yes | output of infrastructure deployment |
| `azure.activedirectory.AppIdUri` | `api://${azure.activedirectory.client-id}` | URI for AAD Application | no | -- |
......
......@@ -34,7 +34,7 @@ pr:
autoCancel: false
branches:
include:
- '*'
- "*"
exclude:
- master
paths:
......@@ -44,12 +44,11 @@ pr:
- images/
variables:
- group: 'Azure Common Secrets'
- group: 'Azure - Common'
- group: "Azure Common Secrets"
- group: "Azure - Common"
- name: serviceName
value: 'entitlements'
value: "entitlements"
resources:
repositories:
......@@ -64,13 +63,13 @@ stages:
pom.xml
maven/settings.xml
target/*.jar
copyFileContentsToFlatten: ''
mavenOptions: ''
copyFileContentsToFlatten: ""
mavenOptions: ""
serviceBase: ${{ variables.serviceName }}
testingRootFolder: 'integration-tests'
testingRootFolder: "integration-tests"
- template: devops/service-pipelines/deploy-stages.yml@osdu-infrastructure
parameters:
serviceName: ${{ variables.serviceName }}
providers:
- name: Azure
environments: ['test']
- name: Azure
environments: ["test"]
......@@ -14,6 +14,7 @@
# limitations under the License.
#
LOG_PREFIX=entitlements
server.servlet.contextPath=/entitlements/v1/
service.domain.name=${service_domain_name}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment