Commit 1b4da3a4 authored by Spencer Sutton's avatar Spencer Sutton
Browse files

Merge branch 'aws-update' into 'master'

Aws update

See merge request osdu/platform/data-flow/ingestion/energistics-osdu-integration!28
parents 20d0d0e3 1373b569
Pipeline #61991 passed with stages
in 2 minutes and 28 seconds
File added
......@@ -16,10 +16,12 @@ ARG docker_builder_image
FROM ${docker_builder_image}
ENV HOME="/home/witsml_parser"
ENV CI_COMMIT_TAG=v0.0.8
WORKDIR $HOME
ENV CLOUD_PROVIDER="aws"
COPY "build/providers/${CLOUD_PROVIDER}/kill_istio.py" ./
COPY "build/providers/${CLOUD_PROVIDER}/requirements.txt" ./
RUN pip install -r "requirements.txt"
COPY build/providers/aws/osdu_api.ini ./
......@@ -21,6 +21,9 @@ env:
DOCKER_USERNAME: /osdu/devops/docker_credentials:username
DOCKER_PASSWORD: /osdu/devops/docker_credentials:password
variables:
CI_COMMIT_TAG: v0.0.8
phases:
install:
commands:
......@@ -49,9 +52,9 @@ phases:
--region us-east-1 \
--format pypi \
--package osdu-api \
--package-version 0.0.5 \
--asset osdu_api-0.0.5.tar.gz \
./build/osdu_api-0.0.5.tar.gz
--package-version 0.0.8 \
--asset osdu_api-0.0.8.tar.gz \
./build/osdu_api-0.0.8.tar.gz
- echo "Logging into Docker Hub as ${DOCKER_USERNAME}..."
- docker login -u ${DOCKER_USERNAME} -p ${DOCKER_PASSWORD}
......
import requests
r = requests.post("http://127.0.0.1:15020/quitquitquit")
print("Killing istio result: ")
print(r.status_code, r.reason)
\ No newline at end of file
......@@ -13,14 +13,15 @@
[environment]
data_partition_id=osdu
storage_url=%(API_BASE_URL)s/api/storage/v2
search_url=%(API_BASE_URL)s/api/search/v2
legal_url=%(API_BASE_URL)s/api/legal/v1
data_workflow_url=%(API_BASE_URL)s/api/data-workflow/v1
file_dms_url=%(API_BASE_URL)s/api/filedms/v2
dataset_url=%(API_BASE_URL)s/api/dataset/v1
entitlements_url=%(API_BASE_URL)s/api/entitlements/v1
schema_url=%(API_BASE_URL)s/api/schema-service/v1
storage_url=%(STORAGE_BASE_URL)s/api/storage/v2
search_url=%(SEARCH_BASE_URL)s/api/search/v2
legal_url=%(LEGAL_BASE_URL)s/api/legal/v1
data_workflow_url=deprecated
file_dms_url=%(FILE_DMS_BASE_URL)s/api/filedms/v2
dataset_url=%(DATASET_BASE_URL)s/api/dataset/v1
entitlements_url=%(ENTITLEMENTS_BASE_URL)s/api/entitlements/v1
schema_url=%(SCHEMA_BASE_URL)s/api/schema-service/v1
ingestion_workflow_url=%(INGESTION_WORKFLOW_BASE_URL)s/api/workflow/v1
use_service_principal=True
[provider]
......
......@@ -27,7 +27,7 @@ from osdu_api.libs.context import Context
from osdu_api.libs.handle_file import FileHandler
from osdu_api.libs.utils import remove_trailing_colon
from osdu_api.clients.dataset.dataset_dms_client import DatasetDmsClient
from osdu_api.configuration.config_manager import DefaultConfigManager
from energistics.libs.energistics_parsers import parse_witsml_file, FileInfo
RETRIES = 3
......@@ -228,7 +228,7 @@ class EnergisticsManifestCreator:
download_signed_url = ""
if execution_context["Context"].get("dataset_id"):
dataset_dms_client = DatasetDmsClient()
dataset_dms_client = DatasetDmsClient(DefaultConfigManager(), self.payload_context.data_partition_id)
retrieval_instructions_response = dataset_dms_client.get_retrieval_instructions(record_id=execution_context["Context"]["dataset_id"])
# logger.info(f"Dataset retrieval response code: {retrieval_instructions_response.status_code}")
......@@ -239,7 +239,7 @@ class EnergisticsManifestCreator:
print(f"Dataset retrieval response body: {retrieval_instructions_response.content}")
if len(retrieval_instructions["delivery"]) > 0:
download_signed_url = retrieval_instructions["delivery"][0]["retrievalProperties"]["signedUrl"]
file_source = retrieval_instructions["delivery"][0]["retrievalProperties"]["unsignedUrl"]
else:
preload_file_path = execution_context["Context"]["preload_file_path"]
......
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