Changed gitignore to use patterns. Removed binary tarball. Changed console error messages to reference neptune-type. Changed logic which determines neptune-type from endpoint to examine the host only.

Author: andreachild

.gitignore

@@ -1,18 +1,6 @@
-output/**
 package-lock.json
 .vscode/launch.json
-node_modules/**
-templates/Lambda4AppSyncHTTP/node_modules/**
-templates/Lambda4AppSyncSDK/node_modules/**
-templates/Lambda4AppSyncGraphSDK/node_modules/**
+**/node_modules/
 coverage/**
-test/node_modules/**
-test/TestCases/Case01/output/**
-test/TestCases/Case01/output/**
-test/TestCases/Case02/output/**
-test/TestCases/Case03/output/**
-test/TestCases/Case04/output/**
-test/TestCases/Case05/output/**
-test/TestCases/Case06/output/**
-test/TestCases/Case07/output/**
+**/output/
 *.iml

aws-neptune-for-graphql-1.1.0.tgz

@@ -14,10 +14,11 @@ import axios from "axios";
 import { aws4Interceptor } from "aws4-axios";
 import { fromNodeProviderChain  } from "@aws-sdk/credential-providers";
 import { NeptunedataClient, ExecuteOpenCypherQueryCommand } from "@aws-sdk/client-neptunedata";
-import { parseNeptuneDomain, parseNeptuneGraphName } from "./util.js";
+import { parseNeptuneDomainFromHost, parseNeptuneGraphName } from "./util.js";
 import { ExecuteQueryCommand, GetGraphSummaryCommand, NeptuneGraphClient } from "@aws-sdk/client-neptune-graph";
 
 const NEPTUNE_DB = 'neptune-db';
+const NEPTUNE_GRAPH = 'neptune-graph';
 const NEPTUNE_GRAPH_PROTOCOL = 'https';
 const HTTP_LANGUAGE = 'openCypher';
 const NEPTUNE_GRAPH_LANGUAGE = 'OPEN_CYPHER';
@@ -120,7 +121,7 @@ async function queryNeptuneDbSDK(query, params = '{}') {
         return response;
 
     } catch (error) {
-        console.error("Neptune db SDK query request failed: ", error.message);
+        console.error(NEPTUNE_DB + ' SDK query request failed: ', error.message);
         process.exit(1);
     }
 }
@@ -140,7 +141,7 @@ async function queryNeptuneGraphSDK(query, params = '{}') {
         const response = await client.send(command);
         return await new Response(response.payload).json();
     } catch (error) {
-        console.error('Neptune graph SDK query request failed:' + JSON.stringify(error));
+        console.error(NEPTUNE_GRAPH + ' SDK query request failed:' + JSON.stringify(error));
         process.exit(1);
     }
 }
@@ -350,7 +351,7 @@ function getNeptuneGraphClient() {
         console.log('Instantiating NeptuneGraphClient')
         neptuneGraphClient = new NeptuneGraphClient({
             port: PORT,
-            host: parseNeptuneDomain(HOST),
+            host: parseNeptuneDomainFromHost(HOST),
             region: REGION,
             protocol: NEPTUNE_GRAPH_PROTOCOL,
         });
@@ -362,28 +363,28 @@ function getNeptuneGraphClient() {
  * Get a summary of a neptune analytics graph
  */
 async function getNeptuneGraphSummary() {
-    console.log('Retrieving neptune graph summary')
+    console.log('Retrieving ' + NEPTUNE_GRAPH + ' summary')
     const client = getNeptuneGraphClient();
     const command = new GetGraphSummaryCommand({
         graphIdentifier: NAME,
         mode: 'detailed'
     });
     const response = await client.send(command);
-    console.log('Retrieved neptune graph summary')
+    console.log('Retrieved ' + NEPTUNE_GRAPH + ' summary')
     return response.graphSummary;
 }
 
 /**
  * Get a summary of a neptune db graph
  */
 async function getNeptuneDbSummary() {
-    console.log('Retrieving neptune db summary')
+    console.log('Retrieving ' + NEPTUNE_DB + ' summary')
     let response = await axios.get(`https://${HOST}:${PORT}/propertygraph/statistics/summary`, {
         params: {
             mode: 'detailed'
         }
     });
-    console.log('Retrieved neptune db summary')
+    console.log('Retrieved ' + NEPTUNE_DB + ' summary')
     return response.data.payload.graphSummary;
 }
 

src/NeptuneSchema.js

@@ -31,6 +31,7 @@ function yellow(text) {
 // find global installation dir
 import path from 'path';
 import { fileURLToPath } from 'url';
+import { parseNeptuneDomainFromEndpoint } from "./util.js";
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = path.dirname(__filename);
 
@@ -279,9 +280,8 @@ async function main() {
     }
 
     // Check if Neptune target is db or graph
-    if (inputGraphDBSchemaNeptuneEndpoint.includes(NEPTUNE_GRAPH) ||
-        createUpdatePipelineEndpoint.includes(NEPTUNE_GRAPH) ||
-        inputCDKpipelineEnpoint.includes(NEPTUNE_GRAPH)) {
+    const nonEmptyEndpoints = [inputGraphDBSchemaNeptuneEndpoint, createUpdatePipelineEndpoint, inputCDKpipelineEnpoint].filter(endpoint => endpoint !== '');
+    if (nonEmptyEndpoints.length > 0 && parseNeptuneDomainFromEndpoint(nonEmptyEndpoints[0]).includes(NEPTUNE_GRAPH)) {
         neptuneType = NEPTUNE_GRAPH;
         // neptune analytics requires IAM
         console.log("Detected neptune-graph from input endpoint - setting IAM auth to true as it is required for neptune analytics")
@@ -306,7 +306,7 @@ async function main() {
             neptuneRegion = neptuneRegionParts[1];
 
         if (!quiet) console.log('Getting Neptune schema from endpoint: ' + yellow(neptuneHost + ':' + neptunePort));
-        setGetNeptuneSchemaParameters(neptuneHost, neptunePort, neptuneRegion, true);
+        setGetNeptuneSchemaParameters(neptuneHost, neptunePort, neptuneRegion, true, neptuneType);
         let startTime = performance.now();
         inputGraphDBSchema = await getNeptuneSchema(quiet);
         let endTime = performance.now();

src/main.js

@@ -47,7 +47,7 @@ import fs from 'fs';
 import archiver from 'archiver';
 import ora from 'ora';
 import { exit } from "process";
-import { parseNeptuneDomain } from "./util.js";
+import { parseNeptuneDomainFromHost } from "./util.js";
 
 const NEPTUNE_DB = 'neptune-db';
 
@@ -343,7 +343,7 @@ async function createLambdaFunction() {
                 "LOGGING_ENABLED": "false",
                 "NEPTUNE_DB_NAME": NEPTUNE_DB_NAME,
                 "NEPTUNE_REGION": REGION,
-                "NEPTUNE_DOMAIN": parseNeptuneDomain(NEPTUNE_HOST),
+                "NEPTUNE_DOMAIN": parseNeptuneDomainFromHost(NEPTUNE_HOST),
                 "NEPTUNE_TYPE": NEPTUNE_TYPE,
             },
         },

src/pipelineResources.js

@@ -1,15 +1,27 @@
-import {parseNeptuneDomain, parseNeptuneGraphName} from '../util.js';
+import {parseNeptuneDomainFromEndpoint, parseNeptuneDomainFromHost, parseNeptuneGraphName} from '../util.js';
 
 test('parse domain from neptune cluster host', () => {
-    expect(parseNeptuneDomain('db-neptune-abc-def.cluster-xyz.us-west-2.neptune.amazonaws.com')).toBe('neptune.amazonaws.com');
+    expect(parseNeptuneDomainFromHost('db-neptune-abc-def.cluster-xyz.us-west-2.neptune.amazonaws.com')).toBe('neptune.amazonaws.com');
 });
 
 test('parse domain from neptune analytics host', () => {
-    expect(parseNeptuneDomain('g-abcdef.us-west-2.neptune-graph.amazonaws.com')).toBe('neptune-graph.amazonaws.com');
+    expect(parseNeptuneDomainFromHost('g-abcdef.us-west-2.neptune-graph.amazonaws.com')).toBe('neptune-graph.amazonaws.com');
 });
 
 test('parse domain from host without enough parts throws error', () => {
-    expect(() => parseNeptuneDomain('invalid.com')).toThrow('Cannot parse neptune host invalid.com because it has 2 parts but expected at least 5');
+    expect(() => parseNeptuneDomainFromHost('invalid.com')).toThrow('Cannot parse neptune host invalid.com because it has 2 part(s) delimited by . but expected at least 5');
+});
+
+test('parse domain from neptune cluster endpoint', () => {
+    expect(parseNeptuneDomainFromEndpoint('db-neptune-abc-def.cluster-xyz.us-west-2.neptune.amazonaws.com:8182')).toBe('neptune.amazonaws.com');
+});
+
+test('parse domain from neptune analytics endpoint', () => {
+    expect(parseNeptuneDomainFromEndpoint('g-abcdef.us-west-2.neptune-graph.amazonaws.com:8182')).toBe('neptune-graph.amazonaws.com');
+});
+
+test('parse domain from endpoint without enough parts throws error', () => {
+    expect(() => parseNeptuneDomainFromEndpoint('g-abcdef.us-west-2.neptune-graph.amazonaws.com')).toThrow('Cannot parse domain from neptune endpoint g-abcdef.us-west-2.neptune-graph.amazonaws.com because it has 1 part(s) delimited by : but expected 2');
 });
 
 test('parse name from neptune cluster host', () => {
@@ -21,5 +33,5 @@ test('parse name from neptune analytics host', () => {
 });
 
 test('parse name from host without enough parts throws error', () => {
-    expect(() => parseNeptuneGraphName('invalid.com')).toThrow('Cannot parse neptune host invalid.com because it has 2 parts but expected at least 5');
+    expect(() => parseNeptuneGraphName('invalid.com')).toThrow('Cannot parse neptune host invalid.com because it has 2 part(s) delimited by . but expected at least 5');
 });

src/test/util.test.js

@@ -12,17 +12,19 @@ permissions and limitations under the License.
 
 const MIN_HOST_PARTS = 5;
 const NUM_DOMAIN_PARTS = 3;
-const DELIMITER = '.';
+const HOST_DELIMITER = '.';
+const ENDPOINT_DELIMITER = ':';
 
 /**
  * Splits a neptune host into its parts, throwing an Error if there are unexpected number of parts.
  *
  * @param neptuneHost
  */
 function splitHost(neptuneHost) {
-    let parts = neptuneHost.split(DELIMITER);
+    let parts = neptuneHost.split(HOST_DELIMITER);
     if (parts.length < MIN_HOST_PARTS) {
-        throw Error('Cannot parse neptune host ' + neptuneHost + ' because it has ' + parts.length + ' parts but expected at least ' + MIN_HOST_PARTS);
+        throw Error('Cannot parse neptune host ' + neptuneHost + ' because it has ' + parts.length +
+            ' part(s) delimited by ' + HOST_DELIMITER + ' but expected at least ' + MIN_HOST_PARTS);
     }
     return parts;
 }
@@ -35,12 +37,29 @@ function splitHost(neptuneHost) {
  *
  * @param neptuneHost
  */
-function parseNeptuneDomain(neptuneHost) {
+function parseNeptuneDomainFromHost(neptuneHost) {
     let parts = splitHost(neptuneHost);
     // last 3 parts of the host make up the domain
     // ie. neptune.amazonaws.com or neptune-graph.amazonaws.com
     let domainParts = parts.splice(parts.length - NUM_DOMAIN_PARTS, NUM_DOMAIN_PARTS);
-    return domainParts.join(DELIMITER);
+    return domainParts.join(HOST_DELIMITER);
+}
+
+/**
+ * Parses the domain from the given neptune db or neptune analytics endpoint.
+ *
+ * Example: g-abcdef.us-west-2.neptune-graph.amazonaws.com:8182 ==> neptune-graph.amazonaws.com
+ * Example: db-neptune-abc-def.cluster-xyz.us-west-2.neptune.amazonaws.com:8182 ==> neptune.amazonaws.com
+ *
+ * @param neptuneEndpoint
+ */
+function parseNeptuneDomainFromEndpoint(neptuneEndpoint) {
+    let parts = neptuneEndpoint.split(ENDPOINT_DELIMITER);
+    if (parts.length !== 2) {
+        throw Error('Cannot parse domain from neptune endpoint ' + neptuneEndpoint + ' because it has ' +
+            parts.length + ' part(s) delimited by ' + ENDPOINT_DELIMITER + ' but expected 2');
+    }
+    return parseNeptuneDomainFromHost(parts[0]);
 }
 
 /**
@@ -57,4 +76,4 @@ function parseNeptuneGraphName(neptuneHost) {
     return parts[0];
 }
 
-export {parseNeptuneDomain, parseNeptuneGraphName};
+export {parseNeptuneDomainFromHost, parseNeptuneDomainFromEndpoint, parseNeptuneGraphName};

src/util.js

@@ -14,7 +14,7 @@ const { Stack, Duration, App } = require('aws-cdk-lib');
 const lambda  = require( 'aws-cdk-lib/aws-lambda');
 const iam  = require( 'aws-cdk-lib/aws-iam');
 const ec2  = require( 'aws-cdk-lib/aws-ec2');
-const { parseNeptuneDomain } = require('../src/util.js');
+const { parseNeptuneDomainFromHost } = require('../src/util.js');
 const { CfnGraphQLApi, CfnApiKey, CfnGraphQLSchema, CfnDataSource, CfnResolver, CfnFunctionConfiguration }  = require( 'aws-cdk-lib/aws-appsync');
 
 const NAME = '';
@@ -64,7 +64,7 @@ class AppSyncNeptuneStack extends Stack {
            LOGGING_ENABLED: 'false',
            NEPTUNE_DB_NAME: NEPTUNE_DB_NAME,
            NEPTUNE_REGION: REGION,
-           NEPTUNE_DOMAIN: parseNeptuneDomain(NEPTUNE_HOST),
+           NEPTUNE_DOMAIN: parseNeptuneDomainFromHost(NEPTUNE_HOST),
            NEPTUNE_TYPE: NEPTUNE_TYPE,
        };
        if (NEPTUNE_IAM_AUTH) {