moved AWS acct ID to repo variable

heremaps · Sep 6, 2023 · 7c16bf3 · 7c16bf3
2 parents 87f14af + f5e9119
commit 7c16bf3
Show file tree

Hide file tree

Showing 9 changed files with 106 additions and 54 deletions.
diff --git 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:

diff --git a/pom.xml b/pom.xml
@@ -41,7 +41,7 @@
 
   <groupId>com.here.xyz</groupId>
   <artifactId>xyz-hub</artifactId>
-  <version>1.1.1</version>
+  <version>1.1.2-SNAPSHOT</version>
   <packaging>pom</packaging>
 
   <modules>

diff --git a/test-scripts/xyz-api-maptask-suite.jmx b/test-scripts/xyz-api-maptask-suite.jmx
@@ -499,6 +499,58 @@
         </collectionProp>
       </Arguments>
       <hashTree/>
+      <Arguments guiclass="ArgumentsPanel" testclass="Arguments" testname="Env variables - PRD Demo" enabled="false">
+        <collectionProp name="Arguments.arguments">
+          <elementProp name="XYZ_API_PROTOCOL" elementType="Argument">
+            <stringProp name="Argument.name">XYZ_API_PROTOCOL</stringProp>
+            <stringProp name="Argument.value">https</stringProp>
+            <stringProp name="Argument.metadata">=</stringProp>
+          </elementProp>
+          <elementProp name="XYZ_HOST_URL" elementType="Argument">
+            <stringProp name="Argument.name">XYZ_HOST_URL</stringProp>
+            <stringProp name="Argument.value">naksha.ext.mapcreator.here.com</stringProp>
+            <stringProp name="Argument.metadata">=</stringProp>
+          </elementProp>
+          <elementProp name="XYZ_URI_PREFIX" elementType="Argument">
+            <stringProp name="Argument.name">XYZ_URI_PREFIX</stringProp>
+            <stringProp name="Argument.value">/hub</stringProp>
+            <stringProp name="Argument.metadata">=</stringProp>
+          </elementProp>
+          <elementProp name="XYZ_PORT" elementType="Argument">
+            <stringProp name="Argument.name">XYZ_PORT</stringProp>
+            <stringProp name="Argument.value">443</stringProp>
+            <stringProp name="Argument.metadata">=</stringProp>
+          </elementProp>
+          <elementProp name="SPACE_ID" elementType="Argument">
+            <stringProp name="Argument.name">SPACE_ID</stringProp>
+            <stringProp name="Argument.value">demo:foo</stringProp>
+            <stringProp name="Argument.metadata">=</stringProp>
+          </elementProp>
+          <elementProp name="WR_API_KEY" elementType="Argument">
+            <stringProp name="Argument.name">WR_API_KEY</stringProp>
+            <stringProp name="Argument.value">upm.r1fShJdsyGi6RguH</stringProp>
+            <stringProp name="Argument.metadata">=</stringProp>
+          </elementProp>
+          <elementProp name="RD_API_KEY" elementType="Argument">
+            <stringProp name="Argument.name">RD_API_KEY</stringProp>
+            <stringProp name="Argument.value">upm.gZanIQd74nyAMWXu</stringProp>
+            <stringProp name="Argument.metadata">=</stringProp>
+          </elementProp>
+          <elementProp name="CONN_API_KEY" elementType="Argument">
+            <stringProp name="Argument.name">CONN_API_KEY</stringProp>
+            <stringProp name="Argument.value">upm.4sgpBJ2aWbxrD365</stringProp>
+            <stringProp name="Argument.desc">Manage Connector API Key</stringProp>
+            <stringProp name="Argument.metadata">=</stringProp>
+          </elementProp>
+          <elementProp name="SPACE_API_KEY" elementType="Argument">
+            <stringProp name="Argument.name">SPACE_API_KEY</stringProp>
+            <stringProp name="Argument.value">upm.WAlD2bvzczVvYGZv</stringProp>
+            <stringProp name="Argument.desc">Manage Space API Key</stringProp>
+            <stringProp name="Argument.metadata">=</stringProp>
+          </elementProp>
+        </collectionProp>
+      </Arguments>
+      <hashTree/>
       <ConfigTestElement guiclass="HttpDefaultsGui" testclass="ConfigTestElement" testname="HTTP Request - Defaults" enabled="true">
         <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" testname="User Defined Variables" enabled="true">
           <collectionProp name="Arguments.arguments"/>
@@ -4182,16 +4234,45 @@ else {
         <boolProp name="ThreadGroup.same_user_on_next_iteration">true</boolProp>
       </ThreadGroup>
       <hashTree>
-        <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Pos8.1 - GET Connector by Id" enabled="true">
-          <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" testname="User Defined Variables" enabled="true">
-            <collectionProp name="Arguments.arguments"/>
+        <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Pos8.1 - Create Connector" enabled="true">
+          <boolProp name="HTTPSampler.postBodyRaw">true</boolProp>
+          <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
+            <collectionProp name="Arguments.arguments">
+              <elementProp name="" elementType="HTTPArgument">
+                <boolProp name="HTTPArgument.always_encode">false</boolProp>
+                <stringProp name="Argument.value">{&#xd;
+  &quot;id&quot;: &quot;${DUMMY_CONNECTOR}&quot;,&#xd;
+  &quot;owner&quot;: &quot;ANONYMOUS&quot;,&#xd;
+  &quot;active&quot;: true,&#xd;
+  &quot;params&quot;: {&#xd;
+    &quot;ecps&quot;: &quot;3ZAzLlvfz8KV5NMAifpyUC5C/GtUdE+fm3XIdoS4AV+AYD1SvQS/b+A1tWhABe0O0hfDoFZGxuCqS85z6rf8GBYazv1Gu2FmKO9vhWzwGAc/53LTRVmS5Mv+/JSKJq6D8RqSe8Rt5GTFaLYmMuNj7JSEp9Mxib1C5efdVkvQIPcPdIXO9RwkPVsnQVZxMJ6qqgCxXyVsJEG8pmQ4p7V1ezosAWSVcSNED10hSpkoblqHsTGAnunaMgH/I8Vcqq6Pb1CUNK/CHvLmKw/d2D8py7j64U1LOuTGMHijdVui4zDrEXYiBp+W4w==&quot;,&#xd;
+    &quot;connectorId&quot;: &quot;${DUMMY_CONNECTOR}&quot;&#xd;
+  },&#xd;
+  &quot;contactEmails&quot;: [&#xd;
+    &quot;[email protected]&quot;&#xd;
+  ],&#xd;
+  &quot;remoteFunctions&quot;: {&#xd;
+    &quot;local&quot;: {&#xd;
+      &quot;id&quot;: &quot;xyz-psql-local&quot;,&#xd;
+      &quot;env&quot;: {&#xd;
+        &quot;ECPS_PHRASE&quot;: &quot;utm!pa55phr4s3&quot;&#xd;
+      },&#xd;
+      &quot;type&quot;: &quot;Embedded&quot;,&#xd;
+      &quot;className&quot;: &quot;com.here.xyz.psql.PSQLXyzConnector&quot;,&#xd;
+      &quot;timeoutMs&quot;: 0&#xd;
+    }&#xd;
+  }&#xd;
+}</stringProp>
+                <stringProp name="Argument.metadata">=</stringProp>
+              </elementProp>
+            </collectionProp>
           </elementProp>
           <stringProp name="HTTPSampler.domain"></stringProp>
           <stringProp name="HTTPSampler.port"></stringProp>
           <stringProp name="HTTPSampler.protocol"></stringProp>
           <stringProp name="HTTPSampler.contentEncoding"></stringProp>
-          <stringProp name="HTTPSampler.path">${XYZ_URI_PREFIX}/connectors/${DEF_CONNECTOR_ID}?access_token=${CONN_API_KEY}</stringProp>
-          <stringProp name="HTTPSampler.method">GET</stringProp>
+          <stringProp name="HTTPSampler.path">${XYZ_URI_PREFIX}/connectors?access_token=${CONN_API_KEY}</stringProp>
+          <stringProp name="HTTPSampler.method">POST</stringProp>
           <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
           <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
           <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
@@ -4203,15 +4284,15 @@ else {
         <hashTree>
           <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Validate Res Code" enabled="true">
             <collectionProp name="Asserion.test_strings">
-              <stringProp name="49586">200</stringProp>
+              <stringProp name="49587">201</stringProp>
             </collectionProp>
             <stringProp name="Assertion.custom_message"></stringProp>
             <stringProp name="Assertion.test_field">Assertion.response_code</stringProp>
             <boolProp name="Assertion.assume_success">false</boolProp>
             <intProp name="Assertion.test_type">8</intProp>
           </ResponseAssertion>
           <hashTree/>
-          <JSR223PostProcessor guiclass="TestBeanGUI" testclass="JSR223PostProcessor" testname="Validate Res Body" enabled="true">
+          <JSR223PostProcessor guiclass="TestBeanGUI" testclass="JSR223PostProcessor" testname="Validate Res Body" enabled="false">
             <stringProp name="cacheKey">false</stringProp>
             <stringProp name="filename"></stringProp>
             <stringProp name="parameters"></stringProp>
@@ -4222,7 +4303,7 @@ prev.setSuccessful(false);
 // Compare actual v/s expected
 var actualResObj = JSON.parse(prev.getResponseDataAsString());
 var expectedConnectorId = &quot;psql&quot;;
-var actualConnectorId = actualResObj.id;
+var actualConnectorId = actualResObj[0].id;
 
 if ( actualConnectorId == expectedConnectorId ) {
 	prev.setSuccessful(true);
@@ -4238,45 +4319,16 @@ else {
           </JSR223PostProcessor>
           <hashTree/>
         </hashTree>
-        <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Pos8.2 - Create Connector" enabled="true">
-          <boolProp name="HTTPSampler.postBodyRaw">true</boolProp>
-          <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
-            <collectionProp name="Arguments.arguments">
-              <elementProp name="" elementType="HTTPArgument">
-                <boolProp name="HTTPArgument.always_encode">false</boolProp>
-                <stringProp name="Argument.value">{&#xd;
-  &quot;id&quot;: &quot;${DUMMY_CONNECTOR}&quot;,&#xd;
-  &quot;owner&quot;: &quot;ANONYMOUS&quot;,&#xd;
-  &quot;active&quot;: true,&#xd;
-  &quot;params&quot;: {&#xd;
-    &quot;ecps&quot;: &quot;3ZAzLlvfz8KV5NMAifpyUC5C/GtUdE+fm3XIdoS4AV+AYD1SvQS/b+A1tWhABe0O0hfDoFZGxuCqS85z6rf8GBYazv1Gu2FmKO9vhWzwGAc/53LTRVmS5Mv+/JSKJq6D8RqSe8Rt5GTFaLYmMuNj7JSEp9Mxib1C5efdVkvQIPcPdIXO9RwkPVsnQVZxMJ6qqgCxXyVsJEG8pmQ4p7V1ezosAWSVcSNED10hSpkoblqHsTGAnunaMgH/I8Vcqq6Pb1CUNK/CHvLmKw/d2D8py7j64U1LOuTGMHijdVui4zDrEXYiBp+W4w==&quot;,&#xd;
-    &quot;connectorId&quot;: &quot;${DUMMY_CONNECTOR}&quot;&#xd;
-  },&#xd;
-  &quot;contactEmails&quot;: [&#xd;
-    &quot;[email protected]&quot;&#xd;
-  ],&#xd;
-  &quot;remoteFunctions&quot;: {&#xd;
-    &quot;local&quot;: {&#xd;
-      &quot;id&quot;: &quot;xyz-psql-local&quot;,&#xd;
-      &quot;env&quot;: {&#xd;
-        &quot;ECPS_PHRASE&quot;: &quot;utm!pa55phr4s3&quot;&#xd;
-      },&#xd;
-      &quot;type&quot;: &quot;Embedded&quot;,&#xd;
-      &quot;className&quot;: &quot;com.here.xyz.psql.PSQLXyzConnector&quot;,&#xd;
-      &quot;timeoutMs&quot;: 0&#xd;
-    }&#xd;
-  }&#xd;
-}</stringProp>
-                <stringProp name="Argument.metadata">=</stringProp>
-              </elementProp>
-            </collectionProp>
+        <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Pos8.2 - GET Connector by Id" enabled="true">
+          <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" testname="User Defined Variables" enabled="true">
+            <collectionProp name="Arguments.arguments"/>
           </elementProp>
           <stringProp name="HTTPSampler.domain"></stringProp>
           <stringProp name="HTTPSampler.port"></stringProp>
           <stringProp name="HTTPSampler.protocol"></stringProp>
           <stringProp name="HTTPSampler.contentEncoding"></stringProp>
-          <stringProp name="HTTPSampler.path">${XYZ_URI_PREFIX}/connectors?access_token=${CONN_API_KEY}</stringProp>
-          <stringProp name="HTTPSampler.method">POST</stringProp>
+          <stringProp name="HTTPSampler.path">${XYZ_URI_PREFIX}/connectors/${DUMMY_CONNECTOR}?access_token=${CONN_API_KEY}</stringProp>
+          <stringProp name="HTTPSampler.method">GET</stringProp>
           <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
           <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
           <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
@@ -4288,15 +4340,15 @@ else {
         <hashTree>
           <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Validate Res Code" enabled="true">
             <collectionProp name="Asserion.test_strings">
-              <stringProp name="49587">201</stringProp>
+              <stringProp name="49586">200</stringProp>
             </collectionProp>
             <stringProp name="Assertion.custom_message"></stringProp>
             <stringProp name="Assertion.test_field">Assertion.response_code</stringProp>
             <boolProp name="Assertion.assume_success">false</boolProp>
             <intProp name="Assertion.test_type">8</intProp>
           </ResponseAssertion>
           <hashTree/>
-          <JSR223PostProcessor guiclass="TestBeanGUI" testclass="JSR223PostProcessor" testname="Validate Res Body" enabled="false">
+          <JSR223PostProcessor guiclass="TestBeanGUI" testclass="JSR223PostProcessor" testname="Validate Res Body" enabled="true">
             <stringProp name="cacheKey">false</stringProp>
             <stringProp name="filename"></stringProp>
             <stringProp name="parameters"></stringProp>
@@ -4306,8 +4358,8 @@ prev.setSuccessful(false);
 
 // Compare actual v/s expected
 var actualResObj = JSON.parse(prev.getResponseDataAsString());
-var expectedConnectorId = &quot;psql&quot;;
-var actualConnectorId = actualResObj[0].id;
+var expectedConnectorId = &quot;${DUMMY_CONNECTOR}&quot;;
+var actualConnectorId = actualResObj.id;
 
 if ( actualConnectorId == expectedConnectorId ) {
 	prev.setSuccessful(true);

diff --git a/xyz-connectors/pom.xml b/xyz-connectors/pom.xml
@@ -25,7 +25,7 @@
     <groupId>com.here.xyz</groupId>
     <artifactId>xyz-hub</artifactId>
     <relativePath>../</relativePath>
-    <version>1.1.1</version>
+    <version>1.1.2-SNAPSHOT</version>
   </parent>
 
   <licenses>

diff --git a/xyz-hub-service/pom.xml b/xyz-hub-service/pom.xml
@@ -25,7 +25,7 @@
     <groupId>com.here.xyz</groupId>
     <artifactId>xyz-hub</artifactId>
     <relativePath>../pom.xml</relativePath>
-    <version>1.1.1</version>
+    <version>1.1.2-SNAPSHOT</version>
   </parent>
 
   <licenses>

diff --git a/xyz-hub-test/pom.xml b/xyz-hub-test/pom.xml
@@ -25,7 +25,7 @@
     <groupId>com.here.xyz</groupId>
     <artifactId>xyz-hub</artifactId>
     <relativePath>../</relativePath>
-    <version>1.1.1</version>
+    <version>1.1.2-SNAPSHOT</version>
   </parent>
 
   <licenses>

diff --git a/xyz-models/pom.xml b/xyz-models/pom.xml
@@ -25,7 +25,7 @@
     <groupId>com.here.xyz</groupId>
     <artifactId>xyz-hub</artifactId>
     <relativePath>../</relativePath>
-    <version>1.1.1</version>
+    <version>1.1.2-SNAPSHOT</version>
   </parent>
 
   <licenses>

diff --git a/xyz-psql-connector/pom.xml b/xyz-psql-connector/pom.xml
@@ -25,7 +25,7 @@
     <groupId>com.here.xyz</groupId>
     <artifactId>xyz-hub</artifactId>
     <relativePath>../</relativePath>
-    <version>1.1.1</version>
+    <version>1.1.2-SNAPSHOT</version>
   </parent>
 
   <licenses>

diff --git a/xyz-txn-handler/pom.xml b/xyz-txn-handler/pom.xml
@@ -25,7 +25,7 @@
         <groupId>com.here.xyz</groupId>
         <artifactId>xyz-hub</artifactId>
         <relativePath>../</relativePath>
-        <version>1.1.1</version>
+        <version>1.1.2-SNAPSHOT</version>
     </parent>
 
     <licenses>