Skip to content

fix: route icon upload by app type in updateIcon #506

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
srtaalej wants to merge 3 commits into
base: main
Choose a base branch
from
Open

fix: route icon upload by app type in updateIcon #506

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e7676db
fix: route icon upload by app type in updateIcon
srtaalej Apr 20, 2026
26dddee
Merge branch 'main' into ale-update-icon
zimeg Apr 20, 2026
3c51014
Merge branch 'main' into ale-update-icon
srtaalej Apr 20, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 6 additions & 4 deletions internal/pkg/apps/install.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -226,7 +226,7 @@ func Install(ctx context.Context, clients *shared.ClientFactory, auth types.Slac
}
}
if iconPath != "" {
err = updateIcon(ctx, clients, iconPath, app.AppID, token)
err = updateIcon(ctx, clients, iconPath, app.AppID, token, manifest.IsFunctionRuntimeSlackHosted())
if err != nil {
clients.IO.PrintDebug(ctx, "icon error: %s", err)
_, _ = clients.IO.WriteOut().Write([]byte(style.SectionSecondaryf("Error updating app icon: %s", err)))
Expand Down Expand Up @@ -651,18 +651,20 @@ func appendLocalToDisplayName(manifest *types.AppManifest) {
}

// updateIcon will upload the new icon to the Slack API
func updateIcon(ctx context.Context, clients *shared.ClientFactory, iconPath, appID string, token string) error {
func updateIcon(ctx context.Context, clients *shared.ClientFactory, iconPath, appID string, token string, isHosted bool) error {
var span opentracing.Span
span, ctx = opentracing.StartSpanFromContext(ctx, "updateIcon")
defer span.Finish()

clients.IO.PrintDebug(ctx, "uploading icon")

var err error
if clients.Config.WithExperimentOn(experiment.SetIcon) {
if isHosted {
_, err = clients.API().Icon(ctx, clients.Fs, token, appID, iconPath)
} else if clients.Config.WithExperimentOn(experiment.SetIcon) {
_, err = clients.API().IconSet(ctx, clients.Fs, token, appID, iconPath)
} else {
_, err = clients.API().Icon(ctx, clients.Fs, token, appID, iconPath)
return nil
}
Comment on lines -662 to 666
Copy link
Copy Markdown
Member

@zimeg zimeg Apr 20, 2026

Choose a reason for hiding this comment

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

🪬 question: Are we hoping to have all uploads use apps.icon.set? I find this works as expected for hosted apps at the moment and am unsure that we need to change this.

Copy link
Copy Markdown
Contributor Author

@srtaalej srtaalej Apr 20, 2026

Choose a reason for hiding this comment

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

hmm agreed - i guess i was unsure whether or not we were completely dropping apps.hosted.icon support 🤔 should the experiment only work with apps.icon.set then?

Copy link
Copy Markdown
Member

@zimeg zimeg Apr 20, 2026

Choose a reason for hiding this comment

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

@srtaalej I understand apps.icon.set to be the replacement and preferred method for updating an app icon now! Please correct me if this is wrong, but we should use that while the experiment is active if so 🧪

if err != nil {
// TODO: separate the icon upload into a different function because if an error is returned
Expand Down
Loading