From c00e4bb69809d7318ffa9491435044845d43dba8 Mon Sep 17 00:00:00 2001 From: Trevor Finn <104657098+trevor-fauna@users.noreply.github.com> Date: Tue, 19 Jul 2022 16:57:07 -0400 Subject: [PATCH 1/4] Fix export issue in with-fauna example --- examples/with-fauna/scripts/setup.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/examples/with-fauna/scripts/setup.js b/examples/with-fauna/scripts/setup.js index c32dce56c487c..b8f52ed29645d 100644 --- a/examples/with-fauna/scripts/setup.js +++ b/examples/with-fauna/scripts/setup.js @@ -190,6 +190,8 @@ const main = async () => { console.log('- Created .env.local file with secret') } +exports.resolveDbDomain = resolveDbDomain; + main().catch((err) => { console.error(err) process.exit(1) From 73dc195eaac1ec0fbd47f0037725df96a0c089de Mon Sep 17 00:00:00 2001 From: Trevor Finn Date: Tue, 19 Jul 2022 18:42:57 -0400 Subject: [PATCH 2/4] lint fix --- examples/with-fauna/scripts/setup.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/with-fauna/scripts/setup.js b/examples/with-fauna/scripts/setup.js index b8f52ed29645d..f0c6b6ae7bc54 100644 --- a/examples/with-fauna/scripts/setup.js +++ b/examples/with-fauna/scripts/setup.js @@ -190,7 +190,7 @@ const main = async () => { console.log('- Created .env.local file with secret') } -exports.resolveDbDomain = resolveDbDomain; +exports.resolveDbDomain = resolveDbDomain main().catch((err) => { console.error(err) From 422eb3fcac317af69a335c4ec78c131d55e26c3c Mon Sep 17 00:00:00 2001 From: JJ Kasper Date: Tue, 19 Jul 2022 19:04:01 -0500 Subject: [PATCH 3/4] Apply suggestions from code review --- examples/with-fauna/lib/constants.js | 7 +++++++ examples/with-fauna/lib/fauna.js | 2 +- examples/with-fauna/scripts/setup.js | 5 +---- 3 files changed, 9 insertions(+), 5 deletions(-) create mode 100644 examples/with-fauna/lib/constants.js diff --git a/examples/with-fauna/lib/constants.js b/examples/with-fauna/lib/constants.js new file mode 100644 index 0000000000000..061fd3df8390c --- /dev/null +++ b/examples/with-fauna/lib/constants.js @@ -0,0 +1,7 @@ +const resolveDbDomain = () => { + return process.env.FAUNA_DB_DOMAIN ?? 'db.fauna.com' +} + +module.exports = { + resolveDbDomain, +} diff --git a/examples/with-fauna/lib/fauna.js b/examples/with-fauna/lib/fauna.js index 1859f1eb07d3b..d8e184b09f20c 100644 --- a/examples/with-fauna/lib/fauna.js +++ b/examples/with-fauna/lib/fauna.js @@ -1,5 +1,5 @@ import { GraphQLClient, gql } from 'graphql-request' -import { resolveDbDomain } from '../scripts/setup' +import { resolveDbDomain } from './constants' const CLIENT_SECRET = process.env.FAUNA_ADMIN_KEY || process.env.FAUNA_CLIENT_SECRET diff --git a/examples/with-fauna/scripts/setup.js b/examples/with-fauna/scripts/setup.js index f0c6b6ae7bc54..b23621d39e058 100644 --- a/examples/with-fauna/scripts/setup.js +++ b/examples/with-fauna/scripts/setup.js @@ -5,6 +5,7 @@ const readline = require('readline') const request = require('request') const { Client, query: Q } = require('faunadb') const streamToPromise = require('stream-to-promise') +const { resolveDbDomain } = require('../lib/constants') const MakeLatestEntriesIndex = () => Q.CreateIndex({ @@ -114,10 +115,6 @@ const resolveAdminKey = () => { }) } -const resolveDbDomain = () => { - return process.env.FAUNA_DB_DOMAIN ?? 'db.fauna.com' -} - const importSchema = (adminKey) => { let domain = resolveDbDomain().replace('db', 'graphql') return streamToPromise( From 05d8bb087fd31c600b040e8fe706340395e8f68f Mon Sep 17 00:00:00 2001 From: JJ Kasper Date: Tue, 19 Jul 2022 19:06:57 -0500 Subject: [PATCH 4/4] update --- examples/with-fauna/scripts/setup.js | 2 -- 1 file changed, 2 deletions(-) diff --git a/examples/with-fauna/scripts/setup.js b/examples/with-fauna/scripts/setup.js index b23621d39e058..d83d334a21ce0 100644 --- a/examples/with-fauna/scripts/setup.js +++ b/examples/with-fauna/scripts/setup.js @@ -187,8 +187,6 @@ const main = async () => { console.log('- Created .env.local file with secret') } -exports.resolveDbDomain = resolveDbDomain - main().catch((err) => { console.error(err) process.exit(1)