From 9ee078c0f87f6f2032c9303ac897a63d6d4a584e Mon Sep 17 00:00:00 2001
From: Manish Jangid <msjangid@amazon.com>
Date: Fri, 21 Apr 2023 15:18:27 +0000
Subject: [PATCH] Removing resourcePrefix usage
---
devops/aws/chart/values.yaml | 106 ------------------
.../src/main/resources/application.properties | 9 --
.../indexer-test-aws/build-aws/run-tests.sh | 25 ++++-
3 files changed, 23 insertions(+), 117 deletions(-)
diff --git a/devops/aws/chart/values.yaml b/devops/aws/chart/values.yaml
index b2f670ff1..f4717013a 100644
--- a/devops/aws/chart/values.yaml
+++ b/devops/aws/chart/values.yaml
@@ -1,108 +1,2 @@
# Service Config
image: __CONTAINER__
-imagePullPolicy: Always
-service:
- type: ClusterIP
- port: 8080
- apiPath: /api/indexer/v2/
- readinessType: exec
- readinessProbeHttpPath: /api/indexer/v2/liveness_check
- startupProbeHttpPath: /api/indexer/v2/liveness_check
-
-serviceParameters:
-- objectName: "/osdu/{{ .Values.global.resourcePrefix }}/storage/storage-sqs-url"
- objectType: "ssmparameter"
- objectAlias: storage-sqs-url
-- objectName: "/osdu/{{ .Values.global.resourcePrefix }}/indexer/indexer-sns-topic-arn"
- objectType: "ssmparameter"
- objectAlias: indexer-sns-topic-arn
-- objectName: "/osdu/{{ .Values.global.resourcePrefix }}/indexer-queue/indexer-deadletter-queue-sqs-url"
- objectType: "ssmparameter"
- objectAlias: indexer-deadletter-queue-sqs-url
-- objectName: "/osdu/{{ .Values.global.resourcePrefix }}/elasticsearch/end-point"
- objectType: "ssmparameter"
- objectAlias: "elasticsearch_host"
-- objectName: "/osdu/{{ .Values.global.resourcePrefix }}/elasticsearch/end-point-port"
- objectType: "ssmparameter"
- objectAlias: "elasticsearch_port"
-- objectName: "/osdu/{{ .Values.global.resourcePrefix }}/elasticsearch/credentials"
- objectType: "secretsmanager"
- objectAlias: "elasticsearch_credentials"
-- objectName: "/osdu/{{ .Values.global.resourcePrefix }}/redis/redisauthtoken"
- objectType: "secretsmanager"
- objectAlias: "CACHE_CLUSTER_KEY"
-- objectName: "/osdu/{{ .Values.global.resourcePrefix }}/redis-core/end-point"
- objectType: "ssmparameter"
- objectAlias: "CACHE_CLUSTER_ENDPOINT"
-- objectName: "/osdu/{{ .Values.global.resourcePrefix }}/redis-core/end-point-port"
- objectType: "ssmparameter"
- objectAlias: "CACHE_CLUSTER_PORT"
-environmentVariables:
- - name: APPLICATION_PORT
- value: "{{ .Values.service.port }}"
- - name: AWS_REGION
- value: "{{ .Values.global.region }}"
- - name: ENVIRONMENT
- value: "{{ .Values.global.resourcePrefix }}"
- - name: JAVA_OPTS
- value: "-Xms538M -Xmx900M"
- - name: LOG_LEVEL
- value: "{{ default `INFO` .Values.global.logLevel }}"
- - name: SSM_ENABLED
- value: "True"
- - name: SSL_ENABLED
- value: "false"
- - name: ENTITLEMENTS_BASE_URL
- value: "http://os-entitlements:8080"
- - name: PARTITION_BASE_URL
- value: "http://os-partition:8080"
- - name: STORAGE_BASE_URL
- value: "http://os-storage:8080"
- - name: SCHEMA_BASE_URL
- value: "http://os-schema:8080"
- - name: ELASTIC_DISABLE_CERTIFICATE_TRUST
- value: "true"
- - name: PARAMETER_MOUNT_PATH
- value: "/mnt/params"
- - name: TMP_VOLUME_PATH
- value: "/tmp"
-
-# Resource Config
-replicaCount: 1
-resources:
- limits:
- memory: 1200M
- requests:
- cpu: 500m
- memory: 1200M
-autoscaling:
- enabled: true
- minReplicas: 1
- maxReplicas: 100
- targetCPUUtilizationPercentage: 80
- # targetMemoryUtilizationPercentage: 80
-
-# Security Config
-serviceAccountRole: arn:aws:iam::{{ .Values.global.accountID }}:role/osdu-{{ .Values.global.resourcePrefix }}-{{ .Values.global.region }}-{{ include "common.name" . }}
-securityContext:
- runAsUser: 10001
- runAsNonRoot: true
- readOnlyRootFilesystem: true
- allowPrivilegeEscalation: false
- capabilities:
- drop:
- - ALL
-podSecurityContext:
- fsGroup: 1337
- seccompProfile:
- type: RuntimeDefault
-allowedPrincipals:
- - cluster.local/ns/istio-system/sa/istio-ingressgateway
- - cluster.local/ns/{{ .Release.Namespace }}/sa/indexer-queue
- - cluster.local/ns/aws-binary-dms/sa/binary-dms
- - cluster.local/ns/osdu-airflow/sa/airflow-dag-upload
- - cluster.local/ns/osdu-ingest/sa/os-data-workflow
- - cluster.local/ns/osdu-ingest/sa/os-ingestion-workflow
- - cluster.local/ns/osdu-seismic-ddms/sa/os-seismic-store
- - cluster.local/ns/osdu-well-delivery/sa/os-welldelivery
- - cluster.local/ns/osdu-wellbore-ddms/sa/os-wellbore-ddms
diff --git a/provider/indexer-aws/src/main/resources/application.properties b/provider/indexer-aws/src/main/resources/application.properties
index 0fd4d55c6..7ebff5469 100644
--- a/provider/indexer-aws/src/main/resources/application.properties
+++ b/provider/indexer-aws/src/main/resources/application.properties
@@ -5,8 +5,6 @@ AUTHORIZE_API=${ENTITLEMENTS_BASE_URL}/api/entitlements/v2
logging.level.org.springframework.web=${LOG_LEVEL}
server.port=${APPLICATION_PORT}
-aws.environment=${ENVIRONMENT}
-
aws.threads=50
DEFAULT_DATA_COUNTRY=US
CRON_INDEX_CLEANUP_THRESHOLD_DAYS=3
@@ -50,14 +48,7 @@ MAX_CACHE_VALUE_SIZE=1000
## AWS Lambda configuration
#aws.lambda.get-groups-function-name=${ENVIRONMENT}-os-entitlements-GroupsFunction
-
-## Default DynamoDB Settings
-aws.dynamodb.table.prefix=${ENVIRONMENT}-
-aws.dynamodb.endpoint=dynamodb.${AWS_REGION}.amazonaws.com
-
aws.ssm=${SSM_ENABLED}
-aws.ssm.prefix=/osdu/${ENVIRONMENT}
-aws.parameter.prefix=/osdu/${ENVIRONMENT}
server.ssl.enabled=${SSL_ENABLED:true}
server.ssl.key-store-type=PKCS12
diff --git a/testing/indexer-test-aws/build-aws/run-tests.sh b/testing/indexer-test-aws/build-aws/run-tests.sh
index b641359ac..d6260a0a7 100755
--- a/testing/indexer-test-aws/build-aws/run-tests.sh
+++ b/testing/indexer-test-aws/build-aws/run-tests.sh
@@ -28,11 +28,32 @@ export ENTITLEMENTS_DOMAIN=example.com
export OTHER_RELEVANT_DATA_COUNTRIES=US
export STORAGE_HOST=$STORAGE_URL
export HOST=$SCHEMA_URL
-export ELASTIC_HOST=$ELASTIC_HOST
-export ELASTIC_PORT=$ELASTIC_PORT
+export ELASTIC_HOST=localhost
export ELASTIC_PASSWORD=$ELASTIC_PASSWORD
export ELASTIC_USER_NAME=$ELASTIC_USERNAME
+################ Elastic search port forwarding ########
+##Check if port is available
+localPort=$ELASTIC_PORT
+while netstat -an | grep $localPort | grep -i listen ; do
+ echo "$localPort Port in use"
+ ((localPort++))
+done
+echo "Using local port: "$localPort
+
+export KUBECONFIG=/tmp/kubeconfig-int-test$(date +%s).yaml
+aws eks update-kubeconfig --name $EKS_NAME --region $AWS_REGION --role-arn $CLUSTER_MANAGEMENT_ROLE_ARN
+kubectl port-forward -n $TENANT_GROUP_NAME-tenant-$EKS_TENANT_NAME-elasticsearch svc/elasticsearch-es-http $localPort:$ELASTIC_PORT > /dev/null 2>&1 &
+
+export ELASTIC_PORT=$localPort
+pid=$!
+
+trap '{
+ echo killing "Port forward process: "$pid
+ kill $pid
+ rm $KUBECONFIG
+}' EXIT
+
#### RUN INTEGRATION TEST #########################################################################
mvn -ntp test -f "$SCRIPT_SOURCE_DIR"/../pom.xml -Dcucumber.options="--plugin junit:target/junit-report.xml"
--
GitLab