fix: during publish, do not copy project into a build folder #6729

benbrown · 2021-04-06T22:24:48Z

Description

This PR removes the step that copies the runtime and project files into a temporary build folder, and instead performs the build and publish directly in the folder.

Do not copy the files
Ensure that, for JS apps, we do not leave a modified appsettings.json post-publish
Ensure that manifest files, etc are in the correct location.

Task Item

Fixes #6531

* instead, append it to the zip file directly

…/BotFramework-Composer into benbrown/nomoveproject

coveralls · 2021-04-07T16:24:55Z

Coverage decreased (-0.02%) to 51.614% when pulling 2f17f1a on benbrown/nomoveproject into 9f6c16e on main.

…/BotFramework-Composer into benbrown/nomoveproject

benbrown · 2021-04-07T16:56:37Z

extensions/azurePublish/src/node/deploy.ts

@@ -157,12 +170,15 @@ export class BotProjectDeploy {
          .glob('**/*', {
            cwd: source,
            dot: true,
-            ignore: ['**/code.zip'], // , 'node_modules/**/*'
+            ignore: ['**/code.zip', '**/settings/appsettings.json'],


this is where the magic happens as we exclude appsettings from the zip...

benbrown · 2021-04-07T16:56:49Z

extensions/azurePublish/src/node/deploy.ts

          })
          .on('error', (err) => reject(err))
          .pipe(stream);

        stream.on('close', () => resolve());
+
+        // write the merged settings to the deploy artifact
+        archive.append(JSON.stringify(settings, null, 2), { name: 'settings/appsettings.json' });


and then write it directly into the zip here!

benbrown · 2021-04-07T16:57:20Z

extensions/azurePublish/src/node/index.ts

-     * @param srcTemplate
-     * @param resourcekey
-     */
-    private init = async (project: any, srcTemplate: string, resourcekey: string, runtime: any) => {


This section of code is where we set up the temporary folders for handling non-ejected bots. BYE!

benbrown · 2021-04-07T16:57:40Z

extensions/runtimes/src/index.ts

@@ -316,13 +316,6 @@ export default async (composer: any): Promise<void> => {
      }
      throw new Error(`Runtime already exists at ${destPath}`);
    },
-    setSkillManifest: async (


all of this work is now done as a standard part of the azure deploy

cwhitten · 2021-04-07T23:01:41Z

extensions/azurePublish/src/node/deploy.ts

@@ -114,13 +116,24 @@ export class BotProjectDeploy {
      // this returns a pathToArtifacts where the deployable version lives.
      const pathToArtifacts = await this.runtime.buildDeploy(this.projPath, project, settings, profileName);

+      // COPY MANIFESTS TO wwwroot/manifests


@luhan2017 FYI for the skill manifest scenarios you are working on

…/BotFramework-Composer into benbrown/nomoveproject

* wenyluo/skill: (30 commits) Force refresh of fluent List via slice (#6810) fix: Telemetry for Orchestrator R13 (#6689) fix: Fixed broken tenant ID on save (#6809) feat: Add devops and app insights to get started (#6790) fix: check for node on app start on users machine and notify if not installed (#6578) feat: Expose default search query, pre-release flag and type for each feed. (#6781) fix: do not provision an endpoint key (#6791) remove folder if project fails to create (#6793) Removed preview from publish type names (#6795) fix: Fixing deep link for QNA and Luis (#6743) Make LUIS, QNA and Speech blocking modals so they cannot be dismiessed while active (#6788) Added workerRuntime value (#6784) fix: apply publishing profile to new runtime during publish (#6719) fix: during publish, do not copy project into a build folder (#6729) chore: Adapters: copy the 'type' passed in the adapter config to fully support adapter schemas (#6697) polish UI remove trigger when remove skill, fix bugs fix orchestractor modal not show fix skill not added after add remote skill remove allowedCaller when remove skill ...

* main: fix: make composer support https proxy (#6766) Force refresh of fluent List via slice (#6810) fix: Telemetry for Orchestrator R13 (#6689) fix: Fixed broken tenant ID on save (#6809) feat: Add devops and app insights to get started (#6790) fix: check for node on app start on users machine and notify if not installed (#6578) feat: Expose default search query, pre-release flag and type for each feed. (#6781) fix: do not provision an endpoint key (#6791) remove folder if project fails to create (#6793) Removed preview from publish type names (#6795) fix: Fixing deep link for QNA and Luis (#6743) Make LUIS, QNA and Speech blocking modals so they cannot be dismiessed while active (#6788) Added workerRuntime value (#6784) fix: apply publishing profile to new runtime during publish (#6719) fix: during publish, do not copy project into a build folder (#6729) chore: Adapters: copy the 'type' passed in the adapter config to fully support adapter schemas (#6697)

* wenyluo/skill: (30 commits) Force refresh of fluent List via slice (microsoft#6810) fix: Telemetry for Orchestrator R13 (microsoft#6689) fix: Fixed broken tenant ID on save (microsoft#6809) feat: Add devops and app insights to get started (microsoft#6790) fix: check for node on app start on users machine and notify if not installed (microsoft#6578) feat: Expose default search query, pre-release flag and type for each feed. (microsoft#6781) fix: do not provision an endpoint key (microsoft#6791) remove folder if project fails to create (microsoft#6793) Removed preview from publish type names (microsoft#6795) fix: Fixing deep link for QNA and Luis (microsoft#6743) Make LUIS, QNA and Speech blocking modals so they cannot be dismiessed while active (microsoft#6788) Added workerRuntime value (microsoft#6784) fix: apply publishing profile to new runtime during publish (microsoft#6719) fix: during publish, do not copy project into a build folder (microsoft#6729) chore: Adapters: copy the 'type' passed in the adapter config to fully support adapter schemas (microsoft#6697) polish UI remove trigger when remove skill, fix bugs fix orchestractor modal not show fix skill not added after add remote skill remove allowedCaller when remove skill ...

* main: fix: make composer support https proxy (microsoft#6766) Force refresh of fluent List via slice (microsoft#6810) fix: Telemetry for Orchestrator R13 (microsoft#6689) fix: Fixed broken tenant ID on save (microsoft#6809) feat: Add devops and app insights to get started (microsoft#6790) fix: check for node on app start on users machine and notify if not installed (microsoft#6578) feat: Expose default search query, pre-release flag and type for each feed. (microsoft#6781) fix: do not provision an endpoint key (microsoft#6791) remove folder if project fails to create (microsoft#6793) Removed preview from publish type names (microsoft#6795) fix: Fixing deep link for QNA and Luis (microsoft#6743) Make LUIS, QNA and Speech blocking modals so they cannot be dismiessed while active (microsoft#6788) Added workerRuntime value (microsoft#6784) fix: apply publishing profile to new runtime during publish (microsoft#6719) fix: during publish, do not copy project into a build folder (microsoft#6729) chore: Adapters: copy the 'type' passed in the adapter config to fully support adapter schemas (microsoft#6697)

* wenyluo/skill: (30 commits) Force refresh of fluent List via slice (#6810) fix: Telemetry for Orchestrator R13 (#6689) fix: Fixed broken tenant ID on save (#6809) feat: Add devops and app insights to get started (#6790) fix: check for node on app start on users machine and notify if not installed (#6578) feat: Expose default search query, pre-release flag and type for each feed. (#6781) fix: do not provision an endpoint key (#6791) remove folder if project fails to create (#6793) Removed preview from publish type names (#6795) fix: Fixing deep link for QNA and Luis (#6743) Make LUIS, QNA and Speech blocking modals so they cannot be dismiessed while active (#6788) Added workerRuntime value (#6784) fix: apply publishing profile to new runtime during publish (#6719) fix: during publish, do not copy project into a build folder (#6729) chore: Adapters: copy the 'type' passed in the adapter config to fully support adapter schemas (#6697) polish UI remove trigger when remove skill, fix bugs fix orchestractor modal not show fix skill not added after add remote skill remove allowedCaller when remove skill ...

* main: fix: make composer support https proxy (#6766) Force refresh of fluent List via slice (#6810) fix: Telemetry for Orchestrator R13 (#6689) fix: Fixed broken tenant ID on save (#6809) feat: Add devops and app insights to get started (#6790) fix: check for node on app start on users machine and notify if not installed (#6578) feat: Expose default search query, pre-release flag and type for each feed. (#6781) fix: do not provision an endpoint key (#6791) remove folder if project fails to create (#6793) Removed preview from publish type names (#6795) fix: Fixing deep link for QNA and Luis (#6743) Make LUIS, QNA and Speech blocking modals so they cannot be dismiessed while active (#6788) Added workerRuntime value (#6784) fix: apply publishing profile to new runtime during publish (#6719) fix: during publish, do not copy project into a build folder (#6729) chore: Adapters: copy the 'type' passed in the adapter config to fully support adapter schemas (#6697)

…ft#6729) * do not copy project into a build folder * * during publish, do NOT write the settings file to disk * instead, append it to the zip file directly * clean out code used for doing builds in temp folders * Copy manifests into wwwroot/manifests as part of publish process * fix lint Co-authored-by: Chris Whitten <[email protected]>

benbrown added 6 commits April 6, 2021 16:23

do not copy project into a build folder

49de3cf

Merge branch 'main' into benbrown/nomoveproject

839df65

* during publish, do NOT write the settings file to disk

381d2e2

* instead, append it to the zip file directly

Merge branch 'benbrown/nomoveproject' of https://github.com/microsoft…

1750e5e

…/BotFramework-Composer into benbrown/nomoveproject

Merge branch 'main' into benbrown/nomoveproject

8e1b7b4

clean out code used for doing builds in temp folders

84d37b0

benbrown added 2 commits April 7, 2021 11:51

Copy manifests into wwwroot/manifests as part of publish process

5043e98

Merge branch 'benbrown/nomoveproject' of https://github.com/microsoft…

139261f

…/BotFramework-Composer into benbrown/nomoveproject

benbrown marked this pull request as ready for review April 7, 2021 16:54

benbrown requested review from a-b-r-o-w-n, boydc2014, cwhitten, GeoffCoxMSFT, hatpick and tonyanziano as code owners April 7, 2021 16:54

Merge branch 'main' into benbrown/nomoveproject

b0b31d2

benbrown commented Apr 7, 2021

View reviewed changes

benbrown added 3 commits April 7, 2021 13:00

Merge branch 'main' into benbrown/nomoveproject

d7103df

Merge branch 'main' into benbrown/nomoveproject

2f17f1a

Merge branch 'main' into benbrown/nomoveproject

7c21d14

cwhitten added this to the R13 milestone Apr 7, 2021

cwhitten reviewed Apr 7, 2021

View reviewed changes

github-actions bot assigned cwhitten Apr 7, 2021

cwhitten previously approved these changes Apr 7, 2021

View reviewed changes

cwhitten and others added 2 commits April 7, 2021 16:02

Merge branch 'main' into benbrown/nomoveproject

fd08641

Merge branch 'main' into benbrown/nomoveproject

2ad27b3

benbrown added 2 commits April 8, 2021 09:15

fix lint

56d6dd7

Merge branch 'benbrown/nomoveproject' of https://github.com/microsoft…

2718fe4

…/BotFramework-Composer into benbrown/nomoveproject

benbrown dismissed cwhitten’s stale review via 2718fe4 April 8, 2021 14:16

Merge branch 'main' into benbrown/nomoveproject

e40000f

cwhitten approved these changes Apr 8, 2021

View reviewed changes

benbrown merged commit be57182 into main Apr 8, 2021

benbrown deleted the benbrown/nomoveproject branch April 8, 2021 17:57

cwhitten mentioned this pull request May 20, 2021

release: 2.0.0 #7871

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

fix: during publish, do not copy project into a build folder #6729

fix: during publish, do not copy project into a build folder #6729

benbrown commented Apr 6, 2021 •

edited

Loading

coveralls commented Apr 7, 2021 •

edited

Loading

benbrown Apr 7, 2021

benbrown Apr 7, 2021

benbrown Apr 7, 2021

benbrown Apr 7, 2021

cwhitten Apr 7, 2021

fix: during publish, do not copy project into a build folder #6729

fix: during publish, do not copy project into a build folder #6729

Conversation

benbrown commented Apr 6, 2021 • edited Loading

Description

Task Item

coveralls commented Apr 7, 2021 • edited Loading

benbrown Apr 7, 2021

Choose a reason for hiding this comment

benbrown Apr 7, 2021

Choose a reason for hiding this comment

benbrown Apr 7, 2021

Choose a reason for hiding this comment

benbrown Apr 7, 2021

Choose a reason for hiding this comment

cwhitten Apr 7, 2021

Choose a reason for hiding this comment

benbrown commented Apr 6, 2021 •

edited

Loading

coveralls commented Apr 7, 2021 •

edited

Loading