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

Merge branch 'crs-conversion-documentation' into 'master'

CRS Conversion Documentation

See merge request osdu/platform/deployment-and-operations/infra-azure-provisioning!149
parents 4c076c43 30a0ac4d
......@@ -249,6 +249,11 @@ git clone https://community.opengroup.org/osdu/platform/system/schema-service.gi
git clonehttps://community.opengroup.org/osdu/platform/data-flow/ingestion/ingestion-workflow.git $SRC_DIR/ingestion-workflow
```
__Additional Manual Steps__
Following services require additional steps for manual setup.
- [CRS Catalog Service](https://community.opengroup.org/osdu/platform/deployment-and-operations/infra-azure-provisioning/-/issues/56)
- [CRS Conversion Serice](https://community.opengroup.org/osdu/platform/deployment-and-operations/infra-azure-provisioning/-/issues/65)
- [Unit Service](https://community.opengroup.org/osdu/platform/deployment-and-operations/infra-azure-provisioning/-/issues/55)
__Kubernetes API Access__
......
......@@ -142,6 +142,7 @@ This variable group will be used to hold the specific environment values necessa
| AZURE_MAPPINGS_STORAGE_CONTAINER | `osdu-wks-mappings` |
| AZURE_COSMOS_KEY | `$(opendes-cosmos-primary-key)` This variable will not be required after the data partition changes|
| AZURE_COSMOS_URL | `$(opendes-cosmos-endpoint)` This variable will not be required after the data partition changes|
| SIS_DATA | `$(Pipeline.Workspace)/s/apachesis_setup/SIS_DATA` This variable should point to your SIS_DATA setup|
```bash
DATA_PARTITION_NAME=opendes
......@@ -394,6 +395,33 @@ az pipelines variable-group create \
-ojson
```
__Setup and Configure the ADO Library `Azure Service Release - schema-service`__
This variable group is the service specific variables necessary for testing and deploying the `schema` service.
| Variable | Value |
|----------|-------|
| MAVEN_DEPLOY_POM_FILE_PATH | `drop/provider/schema-azure` |
| MAVEN_INTEGRATION_TEST_OPTIONS | `-DargLine="-DAZURE_AD_TENANT_ID=$(AZURE_TENANT_ID) -DINTEGRATION_TESTER=$(INTEGRATION_TESTER) -DAZURE_AD_APP_RESOURCE_ID=$(AZURE_AD_APP_RESOURCE_ID) -DTESTER_SERVICEPRINCIPAL_SECRET=$(AZURE_TESTER_SERVICEPRINCIPAL_SECRET) -DPRIVATE_TENANT1=$(TENANT_NAME) -DPRIVATE_TENANT2=tenant2 -DSHARED_TENANT=$(TENANT_NAME) -DVENDOR=$(VENDOR) -DHOST=https://$(DNS_HOST)"` |
| MAVEN_INTEGRATION_TEST_POM_FILE_PATH | `drop/deploy/testing/schema-test-core/pom.xml` |
| SERVICE_RESOURCE_NAME | `$(AZURE_SCHEMA_SERVICE_NAME)` |
| AZURE_DEPLOYMENTS_SUBDIR | `drop/deployments/scripts/azure` |
| AZURE_DEPLOYMENTS_SCRIPTS_SUBDIR | `drop/deployments/scripts` |
```bash
az pipelines variable-group create \
--name "Azure Service Release - schema-service" \
--authorize true \
--variables \
MAVEN_DEPLOY_POM_FILE_PATH="drop/provider/schema-azure" \
MAVEN_INTEGRATION_TEST_OPTIONS=`-DargLine="-DAZURE_AD_TENANT_ID=$(AZURE_TENANT_ID) -DINTEGRATION_TESTER=$(INTEGRATION_TESTER) -DAZURE_AD_APP_RESOURCE_ID=$(AZURE_AD_APP_RESOURCE_ID) -DTESTER_SERVICEPRINCIPAL_SECRET=$(AZURE_TESTER_SERVICEPRINCIPAL_SECRET) -DPRIVATE_TENANT1=$(TENANT_NAME) -DPRIVATE_TENANT2=tenant2 -DSHARED_TENANT=$(TENANT_NAME) -DVENDOR=$(VENDOR) -DHOST=https://$(DNS_HOST)"` \
MAVEN_INTEGRATION_TEST_POM_FILE_PATH="drop/deploy/testing/schema-test-core/pom.xml" \
SERVICE_RESOURCE_NAME='$(AZURE_SCHEMA_SERVICE_NAME)' \
AZURE_DEPLOYMENTS_SUBDIR="drop/deployments/scripts/azure" \
AZURE_DEPLOYMENTS_SCRIPTS_SUBDIR="drop/deployments/scripts" \
-ojson
```
__Setup and Configure the ADO Library `Azure Service Release - unit-service`__
This variable group is the service specific variables necessary for testing and deploying the `unit` service.
......@@ -412,6 +440,45 @@ az pipelines variable-group create \
-ojson
```
__Setup and Configure the ADO Library `Azure Service Release - crs-catalog-service`__
This variable group is the service specific variables necessary for testing and deploying the `crs-catalog` service.
| Variable | Value |
|----------|-------|
| MAVEN_DEPLOY_POM_FILE_PATH | `drop/provider/crs-converter-azure/crs-catalog-aks` |
No Test Path is needed since the service has python tests
```bash
az pipelines variable-group create \
--name "Azure Service Release - crs-catalog-service" \
--authorize true \
--variables \
MAVEN_DEPLOY_POM_FILE_PATH="drop/provider/crs-catalog-azure/crs-catalog-aks" \
-ojson
```
__Setup and Configure the ADO Library `Azure Service Release - crs-conversion-service`__
This variable group is the service specific variables necessary for testing and deploying the `crs-conversion` service.
| Variable | Value |
|----------|-------|
| MAVEN_DEPLOY_POM_FILE_PATH | `drop/provider/crs-converter-azure/crs-converter-aks` |
No Test Path is needed since the service has python tests
```bash
az pipelines variable-group create \
--name "Azure Service Release - crs-conversion-service" \
--authorize true \
--variables \
MAVEN_DEPLOY_POM_FILE_PATH="drop/provider/crs-converter-azure/crs-converter-aks" \
-ojson
```
__Setup and Configure the ADO Library `Azure Service Release - register`__
This variable group is the service specific variables necessary for testing and deploying the `register` service.
......@@ -482,34 +549,6 @@ az pipelines variable-group create \
-ojson
```
__Setup and Configure the ADO Library `Azure Service Release - schema-service`__
This variable group is the service specific variables necessary for testing and deploying the `schema` service.
| Variable | Value |
|----------|-------|
| MAVEN_DEPLOY_POM_FILE_PATH | `drop/provider/schema-azure` |
| MAVEN_INTEGRATION_TEST_OPTIONS | `-DargLine="-DAZURE_AD_TENANT_ID=$(AZURE_TENANT_ID) -DINTEGRATION_TESTER=$(INTEGRATION_TESTER) -DAZURE_AD_APP_RESOURCE_ID=$(AZURE_AD_APP_RESOURCE_ID) -DTESTER_SERVICEPRINCIPAL_SECRET=$(AZURE_TESTER_SERVICEPRINCIPAL_SECRET) -DPRIVATE_TENANT1=$(TENANT_NAME) -DPRIVATE_TENANT2=tenant2 -DSHARED_TENANT=$(TENANT_NAME) -DVENDOR=$(VENDOR) -DHOST=https://$(DNS_HOST)"` |
| MAVEN_INTEGRATION_TEST_POM_FILE_PATH | `drop/deploy/testing/schema-test-core/pom.xml` |
| SERVICE_RESOURCE_NAME | `$(AZURE_SCHEMA_SERVICE_NAME)` |
| AZURE_DEPLOYMENTS_SUBDIR | `drop/deployments/scripts/azure` |
| AZURE_DEPLOYMENTS_SCRIPTS_SUBDIR | `drop/deployments/scripts` |
```bash
az pipelines variable-group create \
--name "Azure Service Release - schema-service" \
--authorize true \
--variables \
MAVEN_DEPLOY_POM_FILE_PATH="drop/provider/schema-azure" \
MAVEN_INTEGRATION_TEST_OPTIONS=`-DargLine="-DAZURE_AD_TENANT_ID=$(AZURE_TENANT_ID) -DINTEGRATION_TESTER=$(INTEGRATION_TESTER) -DAZURE_AD_APP_RESOURCE_ID=$(AZURE_AD_APP_RESOURCE_ID) -DTESTER_SERVICEPRINCIPAL_SECRET=$(AZURE_TESTER_SERVICEPRINCIPAL_SECRET) -DPRIVATE_TENANT1=$(TENANT_NAME) -DPRIVATE_TENANT2=tenant2 -DSHARED_TENANT=$(TENANT_NAME) -DVENDOR=$(VENDOR) -DHOST=https://$(DNS_HOST)"` \
MAVEN_INTEGRATION_TEST_POM_FILE_PATH="drop/deploy/testing/schema-test-core/pom.xml" \
SERVICE_RESOURCE_NAME='$(AZURE_SCHEMA_SERVICE_NAME)' \
AZURE_DEPLOYMENTS_SUBDIR="drop/deployments/scripts/azure" \
AZURE_DEPLOYMENTS_SCRIPTS_SUBDIR="drop/deployments/scripts" \
-ojson
```
__Setup and Configure the ADO Library `Azure Service Release - ingestion-workflow`__
This variable group is the service specific variables necessary for testing and deploying the `ingestion-workflow` service.
......@@ -533,6 +572,7 @@ az pipelines variable-group create \
-ojson
```
__Create the Chart Pipelines__
Create the pipelines and run things in this exact order.
......@@ -755,6 +795,22 @@ az pipelines create \
-ojson
```
10. Add a Pipeline for __schema__ to deploy the Schema Service.
_Repo:_ `schema-service`
_Path:_ `/devops/azure/pipeline.yml`
_Validate:_ https://<your_dns_name>/api/schema-service/v1/swagger-ui.html is alive.
```bash
az pipelines create \
--name 'service-schema' \
--repository schema-service \
--branch master \
--repository-type tfsgit \
--yaml-path /devops/azure/pipeline.yml \
-ojson
```
10. Add a Pipeline for __unit__ to deploy the Unit Service.
_Repo:_ `unit-service`
......@@ -771,40 +827,56 @@ az pipelines create \
-ojson
```
11. Add a Pipeline for __crs-catalog-service__ to deploy the Crs Catalog Service.
11. Add a Pipeline for __register__ to deploy the Register Service.
_Repo:_ `crs-catalog-service`
_Path:_ `/devops/azure/pipeline.yml`
_Validate:_ https://<your_dns_name>/api/crs/catalog/swagger-ui.html
_Repo:_ `register`
```bash
az pipelines create \
--name 'service-crs-catalog' \
--repository crs-catalog-service \
--branch master \
--repository-type tfsgit \
--yaml-path /devops/azure/pipeline.yml \
-ojson
```
12. Add a Pipeline for __crs-conversion-service__ to deploy the Crs Conversion Service.
_Repo:_ `crs-conversion-service`
_Path:_ `/devops/azure/pipeline.yml`
_Validate:_ https://<your_dns_name>/api/register/v1/swagger-ui.html is alive.
_Validate:_ https://<your_dns_name>/api/crs/converter/swagger-ui.html
```bash
az pipelines create \
--name 'service-register' \
--repository register \
--name 'service-crs-conversion' \
--repository crs-conversion-service \
--branch master \
--repository-type tfsgit \
--yaml-path /devops/azure/pipeline.yml \
-ojson
```
12. Add a Pipeline for __wks__ to deploy the Wks Service.
_Repo:_ `wks`
13. Add a Pipeline for __register__ to deploy the Register Service.
_Repo:_ `register`
_Path:_ `/devops/azure/pipeline.yml`
_Validate:_ ScaledObject exist in osdu namespace.
_Validate:_ https://<your_dns_name>/api/register/v1/swagger-ui.html is alive.
```bash
az pipelines create \
--name 'service-wks' \
--repository wks \
--name 'service-register' \
--repository register \
--branch master \
--repository-type tfsgit \
--yaml-path /devops/azure/pipeline.yml \
-ojson
```
13. Add a Pipeline for __notification__ to deploy the Notification Service.
14. Add a Pipeline for __notification__ to deploy the Notification Service.
_Repo:_ `notification-service`
_Path:_ `/devops/azure/pipeline.yml`
......@@ -820,22 +892,23 @@ az pipelines create \
-ojson
```
14. Add a Pipeline for __schema__ to deploy the Schema Service.
15. Add a Pipeline for __wks__ to deploy the Wks Service.
_Repo:_ `schema-service`
_Repo:_ `wks`
_Path:_ `/devops/azure/pipeline.yml`
_Validate:_ https://<your_dns_name>/api/schema-service/v1/swagger-ui.html is alive.
_Validate:_ ScaledObject exist in osdu namespace.
```bash
az pipelines create \
--name 'service-schema' \
--repository schema-service \
--name 'service-wks' \
--repository wks \
--branch master \
--repository-type tfsgit \
--yaml-path /devops/azure/pipeline.yml \
-ojson
```
15. Add a Pipeline for __ingestion-workflow__ to deploy the Schema Service.
16. Add a Pipeline for __ingestion-workflow__ to deploy the Schema Service.
_Repo:_ `ingestion-workflow`
_Path:_ `/devops/azure/pipeline.yml`
......
# -------HTTP REST CLIENT -------
# https://marketplace.visualstudio.com/items?itemName=humao.rest-client
## This script provides a few samples for calling crs conversion service.
# -----------------------
# OAUTH (Variables)
# -----------------------
###
@login_base = login.microsoftonline.com/{{TENANT_ID}}
@oauth_token_host = {{login_base}}/oauth2/v2.0/token
@scopes = {{CLIENT_ID}}/.default openid profile offline_access
# -----------------------
# OAUTH refresh_token
# -----------------------
###
# @name refresh
POST https://{{oauth_token_host}} HTTP/1.1
Content-Type: application/x-www-form-urlencoded
grant_type=refresh_token
&client_id={{CLIENT_ID}}
&client_secret={{CLIENT_SECRET}}
&refresh_token={{INITIAL_TOKEN}}
&scope={{scopes}}
# -----------------------
# API (Variables)
# -----------------------
###
@access_token = {{refresh.response.body.access_token}}
@ENDPOINT = https://{{OSDU_HOST}}
@CRS_CONVERSION_HOST = {{ENDPOINT}}/api/crs/converter
@data_partition_id = opendes
@sample_crs_basic = {
"fromCRS": "{\"lateBoundCRS\":{\"wkt\":\"GEOGCS[\\\"GCS_Provisional_S_American_1956\\\",DATUM[\\\"D_Provisional_S_American_1956\\\",SPHEROID[\\\"International_1924\\\",6378388.0,297.0]],PRIMEM[\\\"Greenwich\\\",0.0],UNIT[\\\"Degree\\\",0.0174532925199433],AUTHORITY[\\\"EPSG\\\",4248]]\",\"ver\":\"PE_10_3_1\",\"name\":\"GCS_Provisional_S_American_1956\",\"authCode\":{\"auth\":\"EPSG\",\"code\":\"4248\"},\"type\":\"LBC\"},\"singleCT\":{\"wkt\":\"GEOGTRAN[\\\"PSAD_1956_To_WGS_1984_9\\\",GEOGCS[\\\"GCS_Provisional_S_American_1956\\\",DATUM[\\\"D_Provisional_S_American_1956\\\",SPHEROID[\\\"International_1924\\\",6378388.0,297.0]],PRIMEM[\\\"Greenwich\\\",0.0],UNIT[\\\"Degree\\\",0.0174532925199433]],GEOGCS[\\\"GCS_WGS_1984\\\",DATUM[\\\"D_WGS_1984\\\",SPHEROID[\\\"WGS_1984\\\",6378137.0,298.257223563]],PRIMEM[\\\"Greenwich\\\",0.0],UNIT[\\\"Degree\\\",0.0174532925199433]],METHOD[\\\"Geocentric_Translation\\\"],PARAMETER[\\\"X_Axis_Translation\\\",-295.0],PARAMETER[\\\"Y_Axis_Translation\\\",173.0],PARAMETER[\\\"Z_Axis_Translation\\\",-371.0],AUTHORITY[\\\"EPSG\\\",1209]]\",\"ver\":\"PE_10_3_1\",\"name\":\"PSAD_1956_To_WGS_1984_9\",\"authCode\":{\"auth\":\"EPSG\",\"code\":\"1209\"},\"type\":\"ST\"},\"ver\":\"PE_10_3_1\",\"name\":\"PSAD56 * DMA-Ven [4248,1209]\",\"authCode\":{\"auth\":\"SLB\",\"code\":\"4248009\"},\"type\":\"EBC\"}",
"points": [
{
"x": -61.04340628871454,
"y": 10.673103179456877,
"z": 0
}
],
"toCRS": "{\"lateBoundCRS\":{\"wkt\":\"PROJCS[\\\"Trinidad_1903_Trinidad_Grid\\\",GEOGCS[\\\"GCS_Trinidad_1903\\\",DATUM[\\\"D_Trinidad_1903\\\",SPHEROID[\\\"Clarke_1858\\\",6378293.64520876,294.260676369]],PRIMEM[\\\"Greenwich\\\",0.0],UNIT[\\\"Degree\\\",0.0174532925199433]],PROJECTION[\\\"Cassini\\\"],PARAMETER[\\\"False_Easting\\\",430000.0],PARAMETER[\\\"False_Northing\\\",325000.0],PARAMETER[\\\"Central_Meridian\\\",-61.3333333333333],PARAMETER[\\\"Scale_Factor\\\",1.0],PARAMETER[\\\"Latitude_Of_Origin\\\",10.4416666666667],UNIT[\\\"Link_Clarke\\\",0.201166195164],AUTHORITY[\\\"EPSG\\\",30200]]\",\"ver\":\"PE_10_3_1\",\"name\":\"Trinidad_1903_Trinidad_Grid\",\"authCode\":{\"auth\":\"EPSG\",\"code\":\"30200\"},\"type\":\"LBC\"},\"singleCT\":{\"wkt\":\"GEOGTRAN[\\\"Trinidad_1903_To_WGS_1984_2\\\",GEOGCS[\\\"GCS_Trinidad_1903\\\",DATUM[\\\"D_Trinidad_1903\\\",SPHEROID[\\\"Clarke_1858\\\",6378293.64520876,294.260676369]],PRIMEM[\\\"Greenwich\\\",0.0],UNIT[\\\"Degree\\\",0.0174532925199433]],GEOGCS[\\\"GCS_WGS_1984\\\",DATUM[\\\"D_WGS_1984\\\",SPHEROID[\\\"WGS_1984\\\",6378137.0,298.257223563]],PRIMEM[\\\"Greenwich\\\",0.0],UNIT[\\\"Degree\\\",0.0174532925199433]],METHOD[\\\"Geocentric_Translation\\\"],PARAMETER[\\\"X_Axis_Translation\\\",-61.0],PARAMETER[\\\"Y_Axis_Translation\\\",285.2],PARAMETER[\\\"Z_Axis_Translation\\\",471.6],AUTHORITY[\\\"EPSG\\\",10085]]\",\"ver\":\"PE_10_3_1\",\"name\":\"Trinidad_1903_To_WGS_1984_2\",\"authCode\":{\"auth\":\"EPSG\",\"code\":\"10085\"},\"type\":\"ST\"},\"ver\":\"PE_10_3_1\",\"name\":\"Trinidad 1903 * EOG-Tto Trin / Trinidad Grid [30200,10085]\",\"authCode\":{\"auth\":\"SLB\",\"code\":\"30200002\"},\"type\":\"EBC\"}"
}
@sample_crs_geojson = {
"azimuthReference": "TRUE_NORTH",
"inputKind": "MD_Inclination_Azimuth",
"inputStations": [
{
"md": 0,
"inclination": 0,
"azimuth": 0
},
{
"md": 1000,
"inclination": 0,
"azimuth": 0
},
{
"md": 2000,
"inclination": 90,
"azimuth": 0
},
{
"md": 3000,
"inclination": 90,
"azimuth": 0
},
{
"md": 5000,
"inclination": 90,
"azimuth": 90
},
{
"md": 6000,
"inclination": 90,
"azimuth": 90
}
],
"interpolate": true,
"method": "AzimuthalEquidistant",
"referencePoint": {
"x": -61.04340628871454,
"y": 10.673103179456877,
"z": 0
},
"trajectoryCRS": "{\"wkt\":\"PROJCS[\\\"WGS_1984_UTM_Zone_31N\\\",GEOGCS[\\\"GCS_WGS_1984\\\",DATUM[\\\"D_WGS_1984\\\",SPHEROID[\\\"WGS_1984\\\",6378137.0,298.257223563]],PRIMEM[\\\"Greenwich\\\",0.0],UNIT[\\\"Degree\\\",0.0174532925199433]],PROJECTION[\\\"Transverse_Mercator\\\"],PARAMETER[\\\"False_Easting\\\",500000.0],PARAMETER[\\\"False_Northing\\\",0.0],PARAMETER[\\\"Central_Meridian\\\",3.0],PARAMETER[\\\"Scale_Factor\\\",0.9996],PARAMETER[\\\"Latitude_Of_Origin\\\",0.0],UNIT[\\\"Meter\\\",1.0],AUTHORITY[\\\"EPSG\\\",32631]]\",\"ver\":\"PE_10_3_1\",\"name\":\"WGS_1984_UTM_Zone_31N\",\"authCode\":{\"auth\":\"EPSG\",\"code\":\"32631\"},\"type\":\"LBC\"}",
"unitXY": "{\"scaleOffset\":{\"scale\":1.0,\"offset\":0.0},\"symbol\":\"m\",\"baseMeasurement\":{\"ancestry\":\"Length\",\"type\":\"UM\"},\"type\":\"USO\"}",
"unitZ": "{\"scaleOffset\":{\"scale\":1.0,\"offset\":0.0},\"symbol\":\"m\",\"baseMeasurement\":{\"ancestry\":\"Length\",\"type\":\"UM\"},\"type\":\"USO\"}"
}
# -----------------------
# API: crs-converter
# -----------------------
### CRS Point Conversion
# @name convert
POST {{CRS_CONVERSION_HOST}}/v2/convert
Authorization: Bearer {{access_token}}
Accept: application/json
data-partition-id: {{data_partition_id}}
request: {{sample_crs_basic}}
###
# @name convertGeoJson
POST {{CRS_CONVERSION_HOST}}/v2/convertGeoJson
Authorization: Bearer {{access_token}}
Accept: application/json
data-partition-id: {{data_partition_id}}
request: {{sample_crs_geojson}}
### Trajectory Computation and Conversion
###
# @name convertTrajectory
POST {{CRS_CONVERSION_HOST}}/v2/convertTrajectory
Authorization: Bearer {{access_token}}
Accept: application/json
data-partition-id: {{data_partition_id}}
request: {{sample_crs_geojson}}
......@@ -50,7 +50,7 @@ if [ ! -d $UNIQUE ]; then mkdir $UNIQUE; fi
# LocalHost Run Settings
# ------------------------------------------------------------------------------------------------------
ENTITLEMENTS_URL="https://${ENV_HOST}/entitlements/v1"
SIS_DATA=${SRC_ROOT_DIR}/apachesis_setup/SIS_DATA
SIS_DATA=${SRC_DIR}/apachesis_setup/SIS_DATA
azure_istioauth_enabled="true"
# ------------------------------------------------------------------------------------------------------
......@@ -58,7 +58,7 @@ azure_istioauth_enabled="true"
# ------------------------------------------------------------------------------------------------------
INTEGRATION_TESTER="${ENV_PRINCIPAL_ID}"
TESTER_SERVICEPRINCIPAL_SECRET="${ENV_PRINCIPAL_SECRET}"
AZURE_AD_TENANT_ID="${TENANT_ID}"
AZURE_TENANT_ID="${TENANT_ID}"
AZURE_AD_APP_RESOURCE_ID="${ENV_APP_ID}"
BASE_URL=/api/crs/converter/v2
VIRTUAL_SERVICE_HOST_NAME="localhost:8080"
......@@ -114,13 +114,13 @@ export ENV_ELASTIC_HOST=$ENV_ELASTIC_HOST
export ENV_ELASTIC_PORT=$ENV_ELASTIC_PORT
export ENV_ELASTIC_USERNAME=$ENV_ELASTIC_USERNAME
export ENV_ELASTIC_PASSWORD=$ENV_ELASTIC_PASSWORD
export SRC_ROOT_DIR=$SRC_ROOT_DIR
# ------------------------------------------------------------------------------------------------------
# LocalHost Run Settings
# ------------------------------------------------------------------------------------------------------
export ENTITLEMENTS_URL="https://${ENV_HOST}/entitlements/v1"
export SIS_DATA=${SRC_ROOT_DIR}/apachesis_setup/SIS_DATA
export SIS_DATA=${SRC_DIR}/apachesis_setup/SIS_DATA
export azure_istioauth_enabled="true"
# ------------------------------------------------------------------------------------------------------
......@@ -128,7 +128,7 @@ export azure_istioauth_enabled="true"
# ------------------------------------------------------------------------------------------------------
export INTEGRATION_TESTER="${INTEGRATION_TESTER}"
export TESTER_SERVICEPRINCIPAL_SECRET="${TESTER_SERVICEPRINCIPAL_SECRET}"
export AZURE_AD_TENANT_ID="${AZURE_AD_TENANT_ID}"
export AZURE_TENANT_ID="${AZURE_TENANT_ID}"
export AZURE_AD_APP_RESOURCE_ID="${AZURE_AD_APP_RESOURCE_ID}"
export BASE_URL=/api/crs/converter/v2
export VIRTUAL_SERVICE_HOST_NAME="localhost:8080"
......@@ -148,7 +148,7 @@ LOCALRUN
cat > ${UNIQUE}/${SERVICE}_local_test.yaml <<LOCALTEST
INTEGRATION_TESTER: "${INTEGRATION_TESTER}"
TESTER_SERVICEPRINCIPAL_SECRET: "${TESTER_SERVICEPRINCIPAL_SECRET}"
AZURE_AD_TENANT_ID: "${AZURE_AD_TENANT_ID}"
AZURE_TENANT_ID: "${AZURE_TENANT_ID}"
AZURE_AD_APP_RESOURCE_ID: "${AZURE_AD_APP_RESOURCE_ID}"
BASE_URL: "${BASE_URL}"
VIRTUAL_SERVICE_HOST_NAME: "${VIRTUAL_SERVICE_HOST_NAME}"
......@@ -161,7 +161,7 @@ LOCALTEST
cat > ${UNIQUE}/${SERVICE}_test.yaml <<DEVTEST
INTEGRATION_TESTER: "${INTEGRATION_TESTER}"
TESTER_SERVICEPRINCIPAL_SECRET: "${TESTER_SERVICEPRINCIPAL_SECRET}"
AZURE_AD_TENANT_ID: "${AZURE_AD_TENANT_ID}"
AZURE_TENANT_ID: "${AZURE_TENANT_ID}"
AZURE_AD_APP_RESOURCE_ID: "${AZURE_AD_APP_RESOURCE_ID}"
BASE_URL: "${BASE_URL}"
VIRTUAL_SERVICE_HOST_NAME: "${ENV_HOST}"
......
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