From 76c731f8e6b4e25c79978f290d6456306acc2ac6 Mon Sep 17 00:00:00 2001 From: Hiren Patel Date: Sat, 2 Sep 2023 22:37:12 +0530 Subject: [PATCH 1/3] Modified pom version to 1.1.2-SNAPSHOT --- pom.xml | 2 +- xyz-connectors/pom.xml | 2 +- xyz-hub-service/pom.xml | 2 +- xyz-hub-test/pom.xml | 2 +- xyz-models/pom.xml | 2 +- xyz-psql-connector/pom.xml | 2 +- xyz-txn-handler/pom.xml | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/pom.xml b/pom.xml index 32df0645d..8e5c0a550 100644 --- a/pom.xml +++ b/pom.xml @@ -41,7 +41,7 @@ com.here.xyz xyz-hub - 1.1.1 + 1.1.2-SNAPSHOT pom diff --git a/xyz-connectors/pom.xml b/xyz-connectors/pom.xml index 13b6f209b..6b9c344e4 100644 --- a/xyz-connectors/pom.xml +++ b/xyz-connectors/pom.xml @@ -25,7 +25,7 @@ com.here.xyz xyz-hub ../ - 1.1.1 + 1.1.2-SNAPSHOT diff --git a/xyz-hub-service/pom.xml b/xyz-hub-service/pom.xml index c4a542f85..ed84822c7 100644 --- a/xyz-hub-service/pom.xml +++ b/xyz-hub-service/pom.xml @@ -25,7 +25,7 @@ com.here.xyz xyz-hub ../pom.xml - 1.1.1 + 1.1.2-SNAPSHOT diff --git a/xyz-hub-test/pom.xml b/xyz-hub-test/pom.xml index 48886ac1c..3f5658fe2 100644 --- a/xyz-hub-test/pom.xml +++ b/xyz-hub-test/pom.xml @@ -25,7 +25,7 @@ com.here.xyz xyz-hub ../ - 1.1.1 + 1.1.2-SNAPSHOT diff --git a/xyz-models/pom.xml b/xyz-models/pom.xml index d09cee79a..81df2187f 100644 --- a/xyz-models/pom.xml +++ b/xyz-models/pom.xml @@ -25,7 +25,7 @@ com.here.xyz xyz-hub ../ - 1.1.1 + 1.1.2-SNAPSHOT diff --git a/xyz-psql-connector/pom.xml b/xyz-psql-connector/pom.xml index 514a7af65..84f9e4216 100644 --- a/xyz-psql-connector/pom.xml +++ b/xyz-psql-connector/pom.xml @@ -25,7 +25,7 @@ com.here.xyz xyz-hub ../ - 1.1.1 + 1.1.2-SNAPSHOT diff --git a/xyz-txn-handler/pom.xml b/xyz-txn-handler/pom.xml index ec77c11f3..93a73454d 100644 --- a/xyz-txn-handler/pom.xml +++ b/xyz-txn-handler/pom.xml @@ -25,7 +25,7 @@ com.here.xyz xyz-hub ../ - 1.1.1 + 1.1.2-SNAPSHOT From c513d608b92ec907a950e23e153efe1ee55f90df Mon Sep 17 00:00:00 2001 From: Hiren Patel Date: Sun, 3 Sep 2023 14:53:08 +0530 Subject: [PATCH 2/3] Updated JMeter with prd sanity tests --- test-scripts/xyz-api-maptask-suite.jmx | 144 +++++++++++++++++-------- 1 file changed, 98 insertions(+), 46 deletions(-) diff --git a/test-scripts/xyz-api-maptask-suite.jmx b/test-scripts/xyz-api-maptask-suite.jmx index 174e07755..01b4e49c0 100644 --- a/test-scripts/xyz-api-maptask-suite.jmx +++ b/test-scripts/xyz-api-maptask-suite.jmx @@ -499,6 +499,58 @@ + + + + XYZ_API_PROTOCOL + https + = + + + XYZ_HOST_URL + naksha.ext.mapcreator.here.com + = + + + XYZ_URI_PREFIX + /hub + = + + + XYZ_PORT + 443 + = + + + SPACE_ID + demo:foo + = + + + WR_API_KEY + upm.r1fShJdsyGi6RguH + = + + + RD_API_KEY + upm.gZanIQd74nyAMWXu + = + + + CONN_API_KEY + upm.4sgpBJ2aWbxrD365 + Manage Connector API Key + = + + + SPACE_API_KEY + upm.WAlD2bvzczVvYGZv + Manage Space API Key + = + + + + @@ -4182,16 +4234,45 @@ else { true - - - + + true + + + + false + { + "id": "${DUMMY_CONNECTOR}", + "owner": "ANONYMOUS", + "active": true, + "params": { + "ecps": "3ZAzLlvfz8KV5NMAifpyUC5C/GtUdE+fm3XIdoS4AV+AYD1SvQS/b+A1tWhABe0O0hfDoFZGxuCqS85z6rf8GBYazv1Gu2FmKO9vhWzwGAc/53LTRVmS5Mv+/JSKJq6D8RqSe8Rt5GTFaLYmMuNj7JSEp9Mxib1C5efdVkvQIPcPdIXO9RwkPVsnQVZxMJ6qqgCxXyVsJEG8pmQ4p7V1ezosAWSVcSNED10hSpkoblqHsTGAnunaMgH/I8Vcqq6Pb1CUNK/CHvLmKw/d2D8py7j64U1LOuTGMHijdVui4zDrEXYiBp+W4w==", + "connectorId": "${DUMMY_CONNECTOR}" + }, + "contactEmails": [ + "hiren.patel@here.com" + ], + "remoteFunctions": { + "local": { + "id": "xyz-psql-local", + "env": { + "ECPS_PHRASE": "utm!pa55phr4s3" + }, + "type": "Embedded", + "className": "com.here.xyz.psql.PSQLXyzConnector", + "timeoutMs": 0 + } + } +} + = + + - ${XYZ_URI_PREFIX}/connectors/${DEF_CONNECTOR_ID}?access_token=${CONN_API_KEY} - GET + ${XYZ_URI_PREFIX}/connectors?access_token=${CONN_API_KEY} + POST true false true @@ -4203,7 +4284,7 @@ else { - 200 + 201 Assertion.response_code @@ -4211,7 +4292,7 @@ else { 8 - + false @@ -4222,7 +4303,7 @@ prev.setSuccessful(false); // Compare actual v/s expected var actualResObj = JSON.parse(prev.getResponseDataAsString()); var expectedConnectorId = "psql"; -var actualConnectorId = actualResObj.id; +var actualConnectorId = actualResObj[0].id; if ( actualConnectorId == expectedConnectorId ) { prev.setSuccessful(true); @@ -4238,45 +4319,16 @@ else { - - true - - - - false - { - "id": "${DUMMY_CONNECTOR}", - "owner": "ANONYMOUS", - "active": true, - "params": { - "ecps": "3ZAzLlvfz8KV5NMAifpyUC5C/GtUdE+fm3XIdoS4AV+AYD1SvQS/b+A1tWhABe0O0hfDoFZGxuCqS85z6rf8GBYazv1Gu2FmKO9vhWzwGAc/53LTRVmS5Mv+/JSKJq6D8RqSe8Rt5GTFaLYmMuNj7JSEp9Mxib1C5efdVkvQIPcPdIXO9RwkPVsnQVZxMJ6qqgCxXyVsJEG8pmQ4p7V1ezosAWSVcSNED10hSpkoblqHsTGAnunaMgH/I8Vcqq6Pb1CUNK/CHvLmKw/d2D8py7j64U1LOuTGMHijdVui4zDrEXYiBp+W4w==", - "connectorId": "${DUMMY_CONNECTOR}" - }, - "contactEmails": [ - "hiren.patel@here.com" - ], - "remoteFunctions": { - "local": { - "id": "xyz-psql-local", - "env": { - "ECPS_PHRASE": "utm!pa55phr4s3" - }, - "type": "Embedded", - "className": "com.here.xyz.psql.PSQLXyzConnector", - "timeoutMs": 0 - } - } -} - = - - + + + - ${XYZ_URI_PREFIX}/connectors?access_token=${CONN_API_KEY} - POST + ${XYZ_URI_PREFIX}/connectors/${DUMMY_CONNECTOR}?access_token=${CONN_API_KEY} + GET true false true @@ -4288,7 +4340,7 @@ else { - 201 + 200 Assertion.response_code @@ -4296,7 +4348,7 @@ else { 8 - + false @@ -4306,8 +4358,8 @@ prev.setSuccessful(false); // Compare actual v/s expected var actualResObj = JSON.parse(prev.getResponseDataAsString()); -var expectedConnectorId = "psql"; -var actualConnectorId = actualResObj[0].id; +var expectedConnectorId = "${DUMMY_CONNECTOR}"; +var actualConnectorId = actualResObj.id; if ( actualConnectorId == expectedConnectorId ) { prev.setSuccessful(true); From a2d39242b71aae882690d5c34ed111b0c6b87808 Mon Sep 17 00:00:00 2001 From: Hiren Patel Date: Wed, 6 Sep 2023 22:50:56 +0530 Subject: [PATCH 3/3] moved AWS acct ID to repo variable --- .github/workflows/main-prd-deploy.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main-prd-deploy.yml b/.github/workflows/main-prd-deploy.yml index e78e16925..d3650de16 100644 --- a/.github/workflows/main-prd-deploy.yml +++ b/.github/workflows/main-prd-deploy.yml @@ -45,7 +45,7 @@ jobs: codedeploy-group-name: ${{ vars.CODEDEPLOY_PRD_GROUP_NAME }} deployment-description: 'Deployment triggered by ${{ github.triggering_actor }} from Github repo [${{ github.repository }}], ${{ github.ref_type }} [${{ github.ref_name }}], commit sha [${{ github.sha }}]' # we use Prod access point (eu-west-1) to fetch deployment artifacts from E2E S3 bucket (us-east-1) - s3-bucket-name: arn:aws:s3:us-east-1:132512433756:accesspoint/naksha-rel + s3-bucket-name: ${{ vars.PRD_RELEASE_S3_BUCKET_NAME }} s3-artifact-path: ${{ needs.S3-CodeDeploy-Release.outputs.s3-artifact-path }} s3-artifact-type: tgz secrets: