Feat: edge handlers deploy #1244

erezrokah · 2020-09-16T17:11:51Z

- Summary

Fixes #1236

This is a draft PR not to be reviewed yet (needs some cleanup and tests).
Opening for visibility.

Depends on netlify/js-client#155 and branched out from #1240

The flow is:

Create the deploy (used to be in js-client)
Upload Edge Handlers if .netlify/edge-handlers exists or passed as an argument via --edgeHandlers
Run deploy from js-client with the created deployId

Will add comments after #1240 is merged and I do a rebase.

- Test plan

Going to add dedicated tests for the deploy command (similar to addons and env).

- Description for the changelog

Support deploying Edge Handlers as a part of the deploy command.

- A picture of a cute animal (not mandatory but encouraged)

🐻

erezrokah · 2020-09-17T08:47:07Z

src/commands/deploy.js

@@ -16,8 +14,8 @@ const isObject = require('lodash.isobject')
 const SitesCreateCommand = require('./sites/create')
 const LinkCommand = require('./link')
 const { NETLIFYDEV, NETLIFYDEVLOG, NETLIFYDEVERR } = require('../utils/logo')
-
-const statAsync = promisify(fs.stat)
+const { statAsync } = require('../lib/fs')


We have a few places in the code that we used promisify with fs.
Moved those to a shared lib

erezrokah · 2020-09-17T08:52:44Z

src/commands/deploy.js

@@ -170,15 +168,27 @@ const runDeploy = async ({
      log('Deploying to draft URL...')
    }

+    const draft = !deployToProduction && !alias


We first create the deploy, then upload edge handlers and finally let js-client finalise the deploy and upload files and functions.

erezrokah · 2020-09-17T09:06:27Z

src/commands/deploy.js

@@ -212,7 +222,6 @@ const runDeploy = async ({
  const logsUrl = `${get(results, 'deploy.admin_url')}/deploys/${get(results, 'deploy.id')}`

  return {
-    name: results.deploy.deployId,


results.deploy.deployId is always undefined, this should be either results.deploy.id or results.deployId.
Since name was never printed, and deployId is already part of the result, I chose to remove the line entirely.

erezrokah · 2020-09-17T09:08:09Z

@ehmicky, going to add some tests, but this is ready to review.

erezrokah · 2020-09-17T09:23:29Z

src/utils/edge-handlers.js

+    } catch (e) {
+      updateProgress(spinner, `Failed deploying Edge Handlers: ${e.message}`, logSymbols.error)
+      try {
+        await api.cancelSiteDeploy({ deploy_id: deployId })


This cleanup can also be moved to the main deploy function if that makes more sense

ehmicky

We are moving super fast on this! 🎉

src/utils/edge-handlers.js

src/commands/deploy.js

src/utils/gitignore.js

src/utils/edge-handlers.js

src/commands/deploy.js

src/utils/edge-handlers.js

erezrokah · 2020-09-17T14:51:53Z

src/utils/command.js

@@ -179,21 +197,7 @@ class BaseCommand extends Command {
   * @return {[string, string]} - tokenValue & location of resolved Netlify API token
   */
  getConfigToken(tokenFromFlag) {


Can't remove this since it's used in child classes

erezrokah · 2020-09-17T14:52:12Z

src/utils/command.js

@@ -291,4 +295,5 @@ BaseCommand.flags = {
  }),
 }

+BaseCommand.getToken = getToken


Used in the tests

erezrokah · 2020-09-17T14:53:19Z

tests/command.addons.test.js


-const siteName =


Moved most of the site creating logic into './utils/createLiveTestSite'

ehmicky · 2020-09-17T20:52:56Z

src/lib/spinner.js

+  if (!spinner) {
+    return
+  }
+  const symbol = error ? logSymbols.error : logSymbols.success


Nice touch :)
(Hiding logSymbols behind an error property)

ehmicky

🎉

github-actions bot added the type: feature code contributing to the implementation of a feature and/or user facing functionality label Sep 16, 2020

erezrokah force-pushed the feat/edge_handlers_deploy branch 2 times, most recently from e4ba7b7 to d6b994d Compare September 17, 2020 08:46

erezrokah commented Sep 17, 2020

View reviewed changes

erezrokah marked this pull request as ready for review September 17, 2020 09:07

erezrokah requested a review from ehmicky September 17, 2020 09:07

erezrokah commented Sep 17, 2020

View reviewed changes

erezrokah mentioned this pull request Sep 17, 2020

Feature: consider moving js-client deploy logic to the CLI netlify/js-client#157

Closed

ehmicky suggested changes Sep 17, 2020

View reviewed changes

erezrokah force-pushed the feat/edge_handlers_deploy branch from 69db45f to 2385078 Compare September 17, 2020 13:22

erezrokah mentioned this pull request Sep 17, 2020

Feat: remove edge handlers hidden flag once out of beta #1249

Closed

erezrokah commented Sep 17, 2020

View reviewed changes

tests/command.addons.test.js

const siteName =

Copy link

Contributor Author

erezrokah Sep 17, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Moved most of the site creating logic into './utils/createLiveTestSite'

ehmicky reviewed Sep 17, 2020

View reviewed changes

This was referenced Sep 20, 2020

Add build.edge_handlers configuration property netlify/build#1828

Merged

Add constants.EDGE_HANDLERS_DIST netlify/build#1822

Closed

erezrokah force-pushed the feat/edge_handlers_deploy branch from 005d808 to a64ae73 Compare September 20, 2020 18:12

erezrokah mentioned this pull request Sep 20, 2020

Chore: replace direct API usage for edge handlers with js-client #1255

Closed

erezrokah added 8 commits September 21, 2020 16:20

feat(command-deploy): support edge-handlers deploy

1a5f324

refactor: extract edge handlers code

0611298

refactor: extract progress reporting code

4f73001

fix: cancel failed deploy

3b44c48

refactor: cleanup tests code

b4fdb36

refactor: throw errors in createLiveTestSite

60dd709

test(command-deploy): add tests

d49400d

refactor: use async/await instead of promise chain

6d50343

erezrokah added 6 commits September 21, 2020 16:20

fix: use site root instead of cwd

77326d6

refactor: extract spinner code into a lib

40371d4

test: fix tests on windows and node 8

031e465

test: fix tests

096ff71

refactor: remove edge handlers plugin dependency

19af283

fix: remove edge handlers flag

f057acf

erezrokah force-pushed the feat/edge_handlers_deploy branch from a64ae73 to f057acf Compare September 21, 2020 14:45

ehmicky approved these changes Sep 21, 2020

View reviewed changes

erezrokah merged commit a0d983a into master Sep 21, 2020

erezrokah deleted the feat/edge_handlers_deploy branch September 21, 2020 17:59

South-Paw mentioned this pull request Jun 14, 2021

deploy has been removed from netlify/js-client@7.0.0 South-Paw/action-netlify-deploy#21

Open

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Feat: edge handlers deploy #1244

Feat: edge handlers deploy #1244

erezrokah commented Sep 16, 2020 •

edited

Loading

erezrokah Sep 17, 2020

erezrokah Sep 17, 2020

erezrokah Sep 17, 2020

erezrokah commented Sep 17, 2020

erezrokah Sep 17, 2020 •

edited

Loading

ehmicky left a comment

erezrokah Sep 17, 2020 •

edited

Loading

erezrokah Sep 17, 2020

erezrokah Sep 17, 2020

ehmicky Sep 17, 2020 •

edited

Loading

ehmicky left a comment

Feat: edge handlers deploy #1244

Feat: edge handlers deploy #1244

Conversation

erezrokah commented Sep 16, 2020 • edited Loading

erezrokah Sep 17, 2020

Choose a reason for hiding this comment

erezrokah Sep 17, 2020

Choose a reason for hiding this comment

erezrokah Sep 17, 2020

Choose a reason for hiding this comment

erezrokah commented Sep 17, 2020

erezrokah Sep 17, 2020 • edited Loading

Choose a reason for hiding this comment

ehmicky left a comment

Choose a reason for hiding this comment

erezrokah Sep 17, 2020 • edited Loading

Choose a reason for hiding this comment

erezrokah Sep 17, 2020

Choose a reason for hiding this comment

erezrokah Sep 17, 2020

Choose a reason for hiding this comment

ehmicky Sep 17, 2020 • edited Loading

Choose a reason for hiding this comment

ehmicky left a comment

Choose a reason for hiding this comment

erezrokah commented Sep 16, 2020 •

edited

Loading

erezrokah Sep 17, 2020 •

edited

Loading

erezrokah Sep 17, 2020 •

edited

Loading

ehmicky Sep 17, 2020 •

edited

Loading