feat(bolt-install): support using 'run' command with remote manifests #111
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -340,8 +340,11 @@ func InstallLocalApp(ctx context.Context, clients *shared.ClientFactory, orgGran | |
| if err != nil { | ||
| return types.App{}, api.DeveloperAppInstallResult{}, "", err | ||
| } | ||
|
|
||
| if !clients.Config.WithExperimentOn(experiment.BoltInstall) { | ||
| if !manifestUpdates && !manifestCreates { | ||
| return app, api.DeveloperAppInstallResult{}, "", nil | ||
| } | ||
| } | ||
|
|
||
| apiInterface := clients.API() | ||
|
|
@@ -365,17 +368,39 @@ func InstallLocalApp(ctx context.Context, clients *shared.ClientFactory, orgGran | |
| clients.EventTracker.SetAuthEnterpriseID(*authSession.EnterpriseID) | ||
| } | ||
|
|
||
| // When the BoltInstall experiment is enabled, we need to get the manifest from the local file | ||
| // if the manifest source is local or if we are creating a new app. Otherwise, we get the manifest | ||
| // from the app settings. | ||
|
||
| var slackManifest types.SlackYaml | ||
| if clients.Config.WithExperimentOn(experiment.BoltInstall) { | ||
| manifestSource, err := clients.Config.ProjectConfig.GetManifestSource(ctx) | ||
| if err != nil { | ||
| return app, api.DeveloperAppInstallResult{}, "", err | ||
| } | ||
| if manifestSource.Equals(config.ManifestSourceLocal) || manifestCreates { | ||
| slackManifest, err = clients.AppClient().Manifest.GetManifestLocal(ctx, clients.SDKConfig, clients.HookExecutor) | ||
| if err != nil { | ||
| return app, api.DeveloperAppInstallResult{}, "", err | ||
| } | ||
| } else { | ||
| slackManifest, err = clients.AppClient().Manifest.GetManifestRemote(ctx, auth.Token, app.AppID) | ||
| if err != nil { | ||
| return app, api.DeveloperAppInstallResult{}, "", err | ||
| } | ||
| } | ||
| } else { | ||
| slackManifest, err = clients.AppClient().Manifest.GetManifestLocal(ctx, clients.SDKConfig, clients.HookExecutor) | ||
| if err != nil { | ||
| return app, api.DeveloperAppInstallResult{}, "", err | ||
| } | ||
| } | ||
|
|
||
| log.Data["appName"] = slackManifest.DisplayInformation.Name | ||
| log.Data["isUpdate"] = app.AppID != "" | ||
| log.Data["teamName"] = *authSession.TeamName | ||
| log.Log("INFO", "app_install_manifest") | ||
|
|
||
| manifest := slackManifest.AppManifest | ||
| appendLocalToDisplayName(&manifest) | ||
| if manifest.IsFunctionRuntimeSlackHosted() { | ||
| configureLocalManifest(ctx, clients, &manifest) | ||
|
|
@@ -468,6 +493,7 @@ func InstallLocalApp(ctx context.Context, clients *shared.ClientFactory, orgGran | |
| log.Info("app_install_start") | ||
| var installState types.InstallState | ||
| result, installState, err := apiInterface.DeveloperAppInstall(ctx, clients.IO, token, app, botScopes, outgoingDomains, orgGrantWorkspaceID, clients.Config.AutoRequestAAAFlag) | ||
|
|
||
| if err != nil { | ||
| err = slackerror.Wrap(err, slackerror.ErrAppInstall) | ||
| return app, api.DeveloperAppInstallResult{}, "", err | ||
|
|
@@ -483,7 +509,7 @@ func InstallLocalApp(ctx context.Context, clients *shared.ClientFactory, orgGran | |
| } | ||
|
|
||
| // | ||
| // TODO: Currently, cannot update the icon if app is not hosted. | ||
| // | ||
| // upload icon, default to icon.png | ||
| // var iconPath = slackYaml.Icon | ||
|
|
@@ -644,6 +670,12 @@ func shouldCreateManifest(ctx context.Context, clients *shared.ClientFactory, ap | |
| if !clients.Config.WithExperimentOn(experiment.BoltFrameworks) { | ||
| return app.AppID == "", nil | ||
| } | ||
|
|
||
| // When the BoltInstall experiment is enabled, apps can always be created with any manifest source. | ||
| if clients.Config.WithExperimentOn(experiment.BoltInstall) { | ||
| return app.AppID == "", nil | ||
| } | ||
|
Comment on lines
+677
to
+680
Member
Author
There was a problem hiding this comment. note:
Member
There was a problem hiding this comment. @mwbrooks This is so good! 🧠 ✨ As later follow up we might want to wrap errors from No blocker for this PR since IMO error handling is another discussion altogether!
Member
There was a problem hiding this comment. Edit: This might be best to note for the conclusion of this experiment to let us streamline some of the logic above and make this case more clear 🤔
Member
Author
There was a problem hiding this comment. This is a really great suggestion! I think it would help developers move forward who don't have a local manifest file. I've made a note to follow-up on this error suggestion. ✏️ |
||
|
|
||
| manifestSource, err := clients.Config.ProjectConfig.GetManifestSource(ctx) | ||
| if err != nil { | ||
| return false, err | ||
|
|
||
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
note:
InstallLocalAppnow continues even with there are no manifest updates or creates. This is because it must still install the app in order to get the tokens.