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

Validate tools on WSL and MSDN setup

parent 35022828
...@@ -30,17 +30,19 @@ cat << EOF ...@@ -30,17 +30,19 @@ cat << EOF
"PRINCIPAL_SECRET": "$(az keyvault secret show --id https://${ENV_VAULT}.vault.azure.net/secrets/app-dev-sp-password --query value -otsv)", "PRINCIPAL_SECRET": "$(az keyvault secret show --id https://${ENV_VAULT}.vault.azure.net/secrets/app-dev-sp-password --query value -otsv)",
"CLIENT_ID": "$(az keyvault secret show --id https://${ENV_VAULT}.vault.azure.net/secrets/aad-client-id --query value -otsv)", "CLIENT_ID": "$(az keyvault secret show --id https://${ENV_VAULT}.vault.azure.net/secrets/aad-client-id --query value -otsv)",
"CLIENT_SECRET": "$CLIENT_SECRET", "CLIENT_SECRET": "$CLIENT_SECRET",
"OSDU_BASE": "${UNIQUE}", "OSDU_HOST": "",
"REGION": "${TF_VAR_resource_group_location}", "REGION": "${TF_VAR_resource_group_location}",
"ES_HOST": "$(echo $(az keyvault secret show --id https://${ENV_VAULT}.vault.azure.net/secrets/opendes-elastic-endpoint --query value -otsv) \ "ES_HOST": "$(echo $(az keyvault secret show --id https://${ENV_VAULT}.vault.azure.net/secrets/opendes-elastic-endpoint --query value -otsv) \
| sed 's/^.\{8\}//g' | sed 's/.\{5\}$//')", | sed 's/^.\{8\}//g' | sed 's/.\{5\}$//')",
"ES_AUTH_TOKEN": "$(az keyvault secret show --id https://${ENV_VAULT}.vault.azure.net/secrets/opendes-elastic-username --query value -otsv):$(az keyvault secret show --id https://${ENV_VAULT}.vault.azure.net/secrets/opendes-elastic-password --query value -otsv) | base64", "ES_AUTH_TOKEN": "$(echo $(az keyvault secret show --id https://${ENV_VAULT}.vault.azure.net/secrets/opendes-elastic-username --query value -otsv):$(az keyvault secret show --id https://${ENV_VAULT}.vault.azure.net/secrets/opendes-elastic-password --query value -otsv) | base64)",
"INITIAL_TOKEN": "" "INITIAL_TOKEN": ""
} }
} }
EOF EOF
``` ```
__Retrieve Initial Token__ __Retrieve Additional Values__
The `INITIAL_TOKEN` is an open id token. Follow the directions in osduauth to obtain a token and once obtained save the value in settings. The `INITIAL_TOKEN` is an open id token. Follow the directions in osduauth to obtain a token and once obtained save the value in settings.
The `OSDU_HOST` is your FQDN for your osdu environment.
\ No newline at end of file
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
@login_base = login.microsoftonline.com/{{TENANT_ID}} @login_base = login.microsoftonline.com/{{TENANT_ID}}
@oauth_token_host = {{login_base}}/oauth2/v2.0/token @oauth_token_host = {{login_base}}/oauth2/v2.0/token
@scopes = {{CLIENT_ID}}/.default openid profile offline_access @scopes = {{CLIENT_ID}}/.default openid profile offline_access
@AUTH_CODE = @AUTH_CODE =
# ----------------------- # -----------------------
# OAUTH authorization_code # OAUTH authorization_code
......
...@@ -173,13 +173,11 @@ cat > index.html << EOF ...@@ -173,13 +173,11 @@ cat > index.html << EOF
EOF EOF
``` ```
docker run -p 8080:80 --name osduauth -d osdu-auth
docker rm -f osdauth
__Create a docker container__ __Create a docker container__
Bring up osdu auth and access the login page via http://localhost:8080
``` ```
docker build -t osdu-login . docker-compose up
docker run -p 80:80 --name osduauth -d osdu-login
docker rm -f osdauth
``` ```
...@@ -30,9 +30,8 @@ grant_type=client_credentials ...@@ -30,9 +30,8 @@ grant_type=client_credentials
### ###
@access_token = {{login.response.body.access_token}} @access_token = {{login.response.body.access_token}}
@ENDPOINT_LOCAL=http://localhost:8080 @ENDPOINT = https://{{OSDU_HOST}}
@ENDPOINT_R3 = https://osdu-{{OSDU_BASE}}.msft-osdu-test.org @PARTITION_HOST = {{ENDPOINT}}/api/partition/v1
@PARTITION_HOST = {{ENDPOINT_R3}}/api/partition/v1
@data_partition_id = opendes @data_partition_id = opendes
......
Supports Markdown
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