diff --git a/ImportFromOSDU.md b/ImportFromOSDU.md deleted file mode 100644 index f10b37a903b06b7ad11367439adc90603a0745f0..0000000000000000000000000000000000000000 --- a/ImportFromOSDU.md +++ /dev/null @@ -1,36 +0,0 @@ -#### The following updates need to be made when code is merged from OSDU: -1. Please update the repo names in `devops/azure/pipeline.yml` file: -``` -resources: - repositories: - - repository: FluxRepo - type: git - name: r3-gitops-manifests - - repository: TemplateRepo - type: git - name: r3-infra-azure-provisioning - - repository: security-templates - type: git - name: osdu-delfi/security-infrastructure -``` -2. Update the variable groups in the `devops/azure/pipeline.yml` file: - -``` -variables: - - group: 'R3MVP - Azure - OSDU' - - group: 'R3MVP - Azure - OSDU Secrets' -``` -3. Update the env. names in the `devops/azure/pipeline.yml` file: -``` - providers: - - name: Azure - environments: ['dev'] -``` - -4. Disable AAD filer and use externalized Auth form Istio: remove following two settings if they are present from 'devops/azure/chart/templates/deployment.yaml' -``` - - name: azure_activedirectory_session_stateless - value: "true" - - name: azure_activedirectory_AppIdUri - value: "api://$(aad_client_id)" -``` diff --git a/devops/azure/chart/templates/deployment.yaml b/devops/azure/chart/templates/deployment.yaml index 788491ed0c315deef32d9d4faa6b860567e155ba..eef0d40edf8fcea66be628971e73b16a5afa2cef 100644 --- a/devops/azure/chart/templates/deployment.yaml +++ b/devops/azure/chart/templates/deployment.yaml @@ -106,6 +106,10 @@ spec: value: http://entitlements-azure/entitlements/v1 - name: entitlements_service_api_key value: "OBSOLETE" + - name: schema_service_url + value: http://storage/api/schema-service/v1 + - name: SCHEMA_HOST + value: http://schema-service/api/schema-service/v1/schema - name: storage_service_url value: http://storage/api/storage/v2 - name: STORAGE_SCHEMA_HOST diff --git a/testing/indexer-test-core/pom.xml b/testing/indexer-test-core/pom.xml index 1a31fdd1830f64cf62cbdc471981ad9a36087a23..d61bc6a5bb57e7d89dbeb5b8a13a4db14719daaf 100644 --- a/testing/indexer-test-core/pom.xml +++ b/testing/indexer-test-core/pom.xml @@ -129,5 +129,10 @@ <artifactId>guava</artifactId> <version>27.1-jre</version> </dependency> + <dependency> + <groupId>com.fasterxml.jackson.core</groupId> + <artifactId>jackson-databind</artifactId> + <version>2.11.3</version> + </dependency> </dependencies> </project>