Skip to content

Commit 805fdaf

Browse files
srtaalejsrtaalej
committed
merge: resolve conflicts with main after #509 squash merge
Take main's canonical versions of icon.go, icon_test.go, and slack_yaml.go. Keep resolveIconPath wrapper in install.go that adds SLACK_CLI_APP_ICON_PATH env var priority on top of icon.ResolveIconPath.
2 parents 3a8c3e5 + 59d720d commit 805fdaf

37 files changed

Lines changed: 317 additions & 307 deletions

‎.circleci/config.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ jobs:
113113
default: "dev-build"
114114
docker: # run the steps with Docker
115115
# CircleCI Go images available at: https://hub.docker.com/r/circleci/golang/
116-
- image: cimg/go:1.26.2
116+
- image: cimg/go:1.26.3
117117
steps: # steps that comprise the `build` job
118118
- checkout # check out source code to working directory
119119
- restore_cache: # restores saved cache if no changes are detected since last run

‎.github/STYLE_GUIDE.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ The square brackets surrounding command arguments hint that these are optional:
3131

3232
```
3333
USAGE
34-
$ slack env add [name] [value] [flags]
34+
$ slack env set [name] [value] [flags]
3535
```
3636

3737
The angled brackets around arguments hint that these are required:

‎.github/workflows/tests.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
- name: Set up Go
2626
uses: actions/setup-go@4a3601121dd01d1626a1e23e37211e3254c1c06c # v6.4.0
2727
with:
28-
go-version: "1.26.2"
28+
go-version: "1.26.3"
2929
- name: Lint
3030
run: go tool golangci-lint run --timeout=5m
3131
- name: Unit Tests
@@ -54,7 +54,7 @@ jobs:
5454
- name: Set up Go
5555
uses: actions/setup-go@4a3601121dd01d1626a1e23e37211e3254c1c06c # v6.4.0
5656
with:
57-
go-version: "1.26.2"
57+
go-version: "1.26.3"
5858
- name: Report health score
5959
uses: slackapi/slack-health-score@d58a419f15cdaff97e9aa7f09f95772830ab66f7 # v0.1.1
6060
with:

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
[![tests](https://github.com/slackapi/slack-cli/actions/workflows/tests.yml/badge.svg?branch=main)](https://github.com/slackapi/slack-cli/actions/workflows/tests.yml)
44
[![codecov](https://codecov.io/gh/slackapi/slack-cli/branch/main/graph/badge.svg?token=G5TU59IV9I)](https://codecov.io/gh/slackapi/slack-cli)
5-
[![circleci](https://dl.circleci.com/status-badge/img/gh/slackapi/slack-cli/tree/main.svg?style=svg)](https://dl.circleci.com/status-badge/redirect/gh/slackapi/slack-cli/tree/main)
5+
[![CircleCI](https://dl.circleci.com/status-badge/img/gh/slackapi/slack-cli/tree/main.svg?style=shield&circle-token=CCIPRJ_K7pGxh2PtW5AurUdJTKWpb_2845116e5a6f641726a73654f618e450b0c4e95b)](https://dl.circleci.com/status-badge/redirect/gh/slackapi/slack-cli/tree/main)
66

77
> Command-line interface for building apps on the Slack Platform.
88

‎cmd/env/unset.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ func runEnvUnsetCommandFunc(clients *shared.ClientFactory, cmd *cobra.Command, a
112112
Emoji: "evergreen_tree",
113113
Text: "Environment Unset",
114114
Secondary: []string{
115-
"The app has no environment variables to remove",
115+
"The app has no environment variables to unset",
116116
},
117117
}))
118118
return nil
@@ -141,7 +141,7 @@ func runEnvUnsetCommandFunc(clients *shared.ClientFactory, cmd *cobra.Command, a
141141
Emoji: "evergreen_tree",
142142
Text: "Environment Unset",
143143
Secondary: []string{
144-
"The project has no environment variables to remove",
144+
"The project has no environment variables to unset",
145145
},
146146
}))
147147
return nil

‎cmd/env/unset_test.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ func Test_Env_RemoveCommand(t *testing.T) {
7979
cm.API.AssertNotCalled(t, "RemoveVariable")
8080
},
8181
ExpectedStdoutOutputs: []string{
82-
"The project has no environment variables to remove",
82+
"The project has no environment variables to unset",
8383
},
8484
},
8585
"exit without errors when hosted app has zero variables": {
@@ -94,7 +94,7 @@ func Test_Env_RemoveCommand(t *testing.T) {
9494
cm.API.AssertNotCalled(t, "RemoveVariable")
9595
},
9696
ExpectedStdoutOutputs: []string{
97-
"The app has no environment variables to remove",
97+
"The app has no environment variables to unset",
9898
},
9999
},
100100
"remove a hosted variable using arguments": {

‎cmd/root.go‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -247,6 +247,11 @@ func InitConfig(ctx context.Context, clients *shared.ClientFactory, rootCmd *cob
247247
clients.Config.SystemConfig.SetCustomConfigDirPath(clients.Config.ConfigDirFlag)
248248
}
249249

250+
// Accessible mode implies no-color
251+
if clients.Config.AccessibleFlag {
252+
clients.Config.NoColor = true
253+
}
254+
250255
// Init color and formatting
251256
style.ToggleStyles(clients.IO.IsTTY() && !clients.Config.NoColor)
252257
style.ToggleSpinner(clients.IO.IsTTY() && !clients.Config.NoColor && !clients.Config.DebugEnabled)

‎go.mod‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module github.com/slackapi/slack-cli
22

3-
go 1.26.2
3+
go 1.26.3
44

55
require (
66
charm.land/bubbletea/v2 v2.0.6
@@ -11,7 +11,6 @@ require (
1111
github.com/cli/safeexec v1.0.1
1212
github.com/google/uuid v1.6.0
1313
github.com/gorilla/websocket v1.5.3
14-
github.com/hashicorp/go-version v1.9.0
1514
github.com/joho/godotenv v1.5.1
1615
github.com/kyokomi/emoji/v2 v2.2.13
1716
github.com/logrusorgru/aurora/v4 v4.0.0
@@ -26,9 +25,9 @@ require (
2625
github.com/spf13/cobra v1.10.2
2726
github.com/stretchr/testify v1.11.1
2827
github.com/uber/jaeger-client-go v2.30.0+incompatible
29-
golang.org/x/mod v0.35.0
30-
golang.org/x/sys v0.43.0
31-
golang.org/x/text v0.36.0
28+
golang.org/x/mod v0.36.0
29+
golang.org/x/sys v0.44.0
30+
golang.org/x/text v0.37.0
3231
gopkg.in/yaml.v2 v2.4.0
3332
)
3433

@@ -222,7 +221,7 @@ require (
222221
github.com/go-critic/go-critic v0.14.3 // indirect
223222
github.com/go-fed/httpsig v1.1.0 // indirect
224223
github.com/go-git/gcfg v1.5.1-0.20230307220236-3a3c6141e376 // indirect
225-
github.com/go-git/go-billy/v5 v5.8.0 // indirect
224+
github.com/go-git/go-billy/v5 v5.9.0 // indirect
226225
github.com/go-jose/go-jose/v4 v4.1.4 // indirect
227226
github.com/go-logr/logr v1.4.3 // indirect
228227
github.com/go-logr/stdr v1.2.2 // indirect
@@ -303,12 +302,13 @@ require (
303302
github.com/hashicorp/go-immutable-radix/v2 v2.1.0 // indirect
304303
github.com/hashicorp/go-multierror v1.1.1 // indirect
305304
github.com/hashicorp/go-retryablehttp v0.7.8 // indirect
305+
github.com/hashicorp/go-version v1.9.0 // indirect
306306
github.com/hashicorp/golang-lru v1.0.2 // indirect
307307
github.com/hashicorp/golang-lru/v2 v2.0.7 // indirect
308308
github.com/hexops/gotextdiff v1.0.3 // indirect
309309
github.com/huandu/xstrings v1.5.0 // indirect
310310
github.com/in-toto/attestation v1.1.2 // indirect
311-
github.com/in-toto/in-toto-golang v0.10.0 // indirect
311+
github.com/in-toto/in-toto-golang v0.11.0 // indirect
312312
github.com/invopop/jsonschema v0.13.0 // indirect
313313
github.com/ipfs/bbloom v0.0.4 // indirect
314314
github.com/ipfs/go-block-format v0.2.0 // indirect
@@ -390,7 +390,7 @@ require (
390390
github.com/opencontainers/go-digest v1.0.0 // indirect
391391
github.com/opencontainers/image-spec v1.1.1 // indirect
392392
github.com/pelletier/go-toml v1.9.5 // indirect
393-
github.com/pjbgf/sha1cd v0.5.0 // indirect
393+
github.com/pjbgf/sha1cd v0.6.0 // indirect
394394
github.com/planetscale/vtprotobuf v0.6.1-0.20240319094008-0393e58bdf10 // indirect
395395
github.com/polydawn/refmt v0.89.1-0.20221221234430-40501e09de1f // indirect
396396
github.com/prometheus/client_golang v1.23.2 // indirect
@@ -517,7 +517,7 @@ require (
517517
require (
518518
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
519519
github.com/fatih/color v1.19.0 // indirect
520-
github.com/go-git/go-git/v5 v5.18.0
520+
github.com/go-git/go-git/v5 v5.19.0
521521
github.com/inconshreveable/mousetrap v1.1.0 // indirect
522522
github.com/kubescape/go-git-url v0.0.31
523523
github.com/mattn/go-colorable v0.1.14 // indirect

‎go.sum‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -504,12 +504,12 @@ github.com/go-fed/httpsig v1.1.0 h1:9M+hb0jkEICD8/cAiNqEB66R87tTINszBRTjwjQzWcI=
504504
github.com/go-fed/httpsig v1.1.0/go.mod h1:RCMrTZvN1bJYtofsG4rd5NaO5obxQ5xBkdiS7xsT7bM=
505505
github.com/go-git/gcfg v1.5.1-0.20230307220236-3a3c6141e376 h1:+zs/tPmkDkHx3U66DAb0lQFJrpS6731Oaa12ikc+DiI=
506506
github.com/go-git/gcfg v1.5.1-0.20230307220236-3a3c6141e376/go.mod h1:an3vInlBmSxCcxctByoQdvwPiA7DTK7jaaFDBTtu0ic=
507-
github.com/go-git/go-billy/v5 v5.8.0 h1:I8hjc3LbBlXTtVuFNJuwYuMiHvQJDq1AT6u4DwDzZG0=
508-
github.com/go-git/go-billy/v5 v5.8.0/go.mod h1:RpvI/rw4Vr5QA+Z60c6d6LXH0rYJo0uD5SqfmrrheCY=
507+
github.com/go-git/go-billy/v5 v5.9.0 h1:jItGXszUDRtR/AlferWPTMN4j38BQ88XnXKbilmmBPA=
508+
github.com/go-git/go-billy/v5 v5.9.0/go.mod h1:jCnQMLj9eUgGU7+ludSTYoZL/GGmii14RxKFj7ROgHw=
509509
github.com/go-git/go-git-fixtures/v4 v4.3.2-0.20231010084843-55a94097c399 h1:eMje31YglSBqCdIqdhKBW8lokaMrL3uTkpGYlE2OOT4=
510510
github.com/go-git/go-git-fixtures/v4 v4.3.2-0.20231010084843-55a94097c399/go.mod h1:1OCfN199q1Jm3HZlxleg+Dw/mwps2Wbk9frAWm+4FII=
511-
github.com/go-git/go-git/v5 v5.18.0 h1:O831KI+0PR51hM2kep6T8k+w0/LIAD490gvqMCvL5hM=
512-
github.com/go-git/go-git/v5 v5.18.0/go.mod h1:pW/VmeqkanRFqR6AljLcs7EA7FbZaN5MQqO7oZADXpo=
511+
github.com/go-git/go-git/v5 v5.19.0 h1:+WkVUQZSy/F1Gb13udrMKjIM2PrzsNfDKFSfo5tkMtc=
512+
github.com/go-git/go-git/v5 v5.19.0/go.mod h1:Pb1v0c7/g8aGQJwx9Us09W85yGoyvSwuhEGMH7zjDKQ=
513513
github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU=
514514
github.com/go-jose/go-jose/v4 v4.1.4 h1:moDMcTHmvE6Groj34emNPLs/qtYXRVcd6S7NHbHz3kA=
515515
github.com/go-jose/go-jose/v4 v4.1.4/go.mod h1:x4oUasVrzR7071A4TnHLGSPpNOm2a21K9Kf04k1rs08=
@@ -773,8 +773,8 @@ github.com/huandu/xstrings v1.5.0 h1:2ag3IFq9ZDANvthTwTiqSSZLjDc+BedvHPAp5tJy2TI
773773
github.com/huandu/xstrings v1.5.0/go.mod h1:y5/lhBue+AyNmUVz9RLU9xbLR0o4KIIExikq4ovT0aE=
774774
github.com/in-toto/attestation v1.1.2 h1:MBFn6lsMq6dptQZJBhalXTcWMb/aJy3V+GX3VYj/V1E=
775775
github.com/in-toto/attestation v1.1.2/go.mod h1:gYFddHMZj3DiQ0b62ltNi1Vj5rC879bTmBbrv9CRHpM=
776-
github.com/in-toto/in-toto-golang v0.10.0 h1:+s2eZQSK3WmWfYV85qXVSBfqgawi/5L02MaqA4o/tpM=
777-
github.com/in-toto/in-toto-golang v0.10.0/go.mod h1:wjT4RiyFlLWCmLUJjwB8oZcjaq7HA390aMJcD3xXgmg=
776+
github.com/in-toto/in-toto-golang v0.11.0 h1:nfidMYBFx+E0lnmX5KUnN2Pdm8zdNKal1ayjJuzzRoA=
777+
github.com/in-toto/in-toto-golang v0.11.0/go.mod h1:u3PjTnwFKjp5a1YCcw8SJg0G+tMeKfVoWsWeFMDCMtw=
778778
github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2s0bqwp9tc8=
779779
github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw=
780780
github.com/invopop/jsonschema v0.13.0 h1:KvpoAJWEjR3uD9Kbm2HWJmqsEaHt8lBUpd0qHcIi21E=
@@ -1021,8 +1021,8 @@ github.com/pelletier/go-toml v1.9.5 h1:4yBQzkHv+7BHq2PQUZF3Mx0IYxG7LsP222s7Agd3v
10211021
github.com/pelletier/go-toml v1.9.5/go.mod h1:u1nR/EPcESfeI/szUZKdtJ0xRNbUoANCkoOuaOx1Y+c=
10221022
github.com/pelletier/go-toml/v2 v2.3.1 h1:MYEvvGnQjeNkRF1qUuGolNtNExTDwct51yp7olPtrEc=
10231023
github.com/pelletier/go-toml/v2 v2.3.1/go.mod h1:2gIqNv+qfxSVS7cM2xJQKtLSTLUE9V8t9Stt+h56mCY=
1024-
github.com/pjbgf/sha1cd v0.5.0 h1:a+UkboSi1znleCDUNT3M5YxjOnN1fz2FhN48FlwCxs0=
1025-
github.com/pjbgf/sha1cd v0.5.0/go.mod h1:lhpGlyHLpQZoxMv8HcgXvZEhcGs0PG/vsZnEJ7H0iCM=
1024+
github.com/pjbgf/sha1cd v0.6.0 h1:3WJ8Wz8gvDz29quX1OcEmkAlUg9diU4GxJHqs0/XiwU=
1025+
github.com/pjbgf/sha1cd v0.6.0/go.mod h1:lhpGlyHLpQZoxMv8HcgXvZEhcGs0PG/vsZnEJ7H0iCM=
10261026
github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c h1:+mdjkGKdHQG3305AYmdv1U2eRNDiU2ErMBj1gwrq8eQ=
10271027
github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c/go.mod h1:7rwL4CYBLnjLxUqIJNnCWiEdr3bn6IUYi15bNlnbCCU=
10281028
github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
@@ -1397,8 +1397,8 @@ golang.org/x/exp v0.0.0-20180807140117-3d87b88a115f/go.mod h1:CJ0aWSM057203Lf6IL
13971397
golang.org/x/exp v0.0.0-20190125153040-c74c464bbbf2/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
13981398
golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
13991399
golang.org/x/exp v0.0.0-20191030013958-a1ab85dbe136/go.mod h1:JXzH8nQsPlswgeRAPE3MuO9GYsAcnJvJ4vnMwN/5qkY=
1400-
golang.org/x/exp v0.0.0-20251209150349-8475f28825e9 h1:MDfG8Cvcqlt9XXrmEiD4epKn7VJHZO84hejP9Jmp0MM=
1401-
golang.org/x/exp v0.0.0-20251209150349-8475f28825e9/go.mod h1:EPRbTFwzwjXj9NpYyyrvenVh9Y+GFeEvMNh7Xuz7xgU=
1400+
golang.org/x/exp v0.0.0-20260410095643-746e56fc9e2f h1:W3F4c+6OLc6H2lb//N1q4WpJkhzJCK5J6kUi1NTVXfM=
1401+
golang.org/x/exp v0.0.0-20260410095643-746e56fc9e2f/go.mod h1:J1xhfL/vlindoeF/aINzNzt2Bket5bjo9sdOYzOsU80=
14021402
golang.org/x/exp/typeparams v0.0.0-20220428152302-39d4317da171/go.mod h1:AbB0pIl9nAr9wVwH+Z2ZpaocVmF5I4GyWCDIsVjR0bk=
14031403
golang.org/x/exp/typeparams v0.0.0-20230203172020-98cc5a0785f9/go.mod h1:AbB0pIl9nAr9wVwH+Z2ZpaocVmF5I4GyWCDIsVjR0bk=
14041404
golang.org/x/exp/typeparams v0.0.0-20260209203927-2842357ff358 h1:qWFG1Dj7TBjOjOvhEOkmyGPVoquqUKnIU0lEVLp8xyk=
@@ -1419,8 +1419,8 @@ golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91
14191419
golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
14201420
golang.org/x/mod v0.12.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
14211421
golang.org/x/mod v0.13.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
1422-
golang.org/x/mod v0.35.0 h1:Ww1D637e6Pg+Zb2KrWfHQUnH2dQRLBQyAtpr/haaJeM=
1423-
golang.org/x/mod v0.35.0/go.mod h1:+GwiRhIInF8wPm+4AoT6L0FA1QWAad3OMdTRx4tFYlU=
1422+
golang.org/x/mod v0.36.0 h1:JJjpVx6myfUsUdAzZuOSTTmRE0PfZeNWzzvKrP7amb4=
1423+
golang.org/x/mod v0.36.0/go.mod h1:moc6ELqsWcOw5Ef3xVprK5ul/MvtVvkIXLziUOICjUQ=
14241424
golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
14251425
golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
14261426
golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
@@ -1477,8 +1477,8 @@ golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
14771477
golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
14781478
golang.org/x/sys v0.13.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
14791479
golang.org/x/sys v0.15.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
1480-
golang.org/x/sys v0.43.0 h1:Rlag2XtaFTxp19wS8MXlJwTvoh8ArU6ezoyFsMyCTNI=
1481-
golang.org/x/sys v0.43.0/go.mod h1:4GL1E5IUh+htKOUEOaiffhrAeqysfVGipDYzABqnCmw=
1480+
golang.org/x/sys v0.44.0 h1:ildZl3J4uzeKP07r2F++Op7E9B29JRUy+a27EibtBTQ=
1481+
golang.org/x/sys v0.44.0/go.mod h1:4GL1E5IUh+htKOUEOaiffhrAeqysfVGipDYzABqnCmw=
14821482
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
14831483
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
14841484
golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k=
@@ -1497,8 +1497,8 @@ golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
14971497
golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8=
14981498
golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE=
14991499
golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
1500-
golang.org/x/text v0.36.0 h1:JfKh3XmcRPqZPKevfXVpI1wXPTqbkE5f7JA92a55Yxg=
1501-
golang.org/x/text v0.36.0/go.mod h1:NIdBknypM8iqVmPiuco0Dh6P5Jcdk8lJL0CUebqK164=
1500+
golang.org/x/text v0.37.0 h1:Cqjiwd9eSg8e0QAkyCaQTNHFIIzWtidPahFWR83rTrc=
1501+
golang.org/x/text v0.37.0/go.mod h1:a5sjxXGs9hsn/AJVwuElvCAo9v8QYLzvavO5z2PiM38=
15021502
golang.org/x/time v0.15.0 h1:bbrp8t3bGUeFOx08pvsMYRTCVSMk89u4tKbNOZbp88U=
15031503
golang.org/x/time v0.15.0/go.mod h1:Y4YMaQmXwGQZoFaVFk4YpCt4FLQMYKZe9oeV/f4MSno=
15041504
golang.org/x/tools v0.0.0-20180525024113-a5b4c53f6e8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=

‎internal/api/s3_upload.go‎

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,6 @@ package api
1717
import (
1818
"bytes"
1919
"context"
20-
"crypto/md5"
21-
"encoding/base64"
2220
"fmt"
2321
"io"
2422
"mime/multipart"
@@ -76,13 +74,6 @@ func (c *Client) UploadPackageToS3(ctx context.Context, fs afero.Fs, appID strin
7674
}
7775
}
7876

79-
md5hash := md5.New()
80-
if _, err := io.Copy(md5hash, archive); err != nil {
81-
return fileName, err
82-
}
83-
84-
md5s := base64.StdEncoding.EncodeToString(md5hash.Sum(nil))
85-
8677
var part io.Writer
8778
h := make(textproto.MIMEHeader)
8879
h.Set("Content-Disposition", fmt.Sprintf(`form-data; name="%s"; filename="%s"`, "file", fileName))
@@ -105,7 +96,6 @@ func (c *Client) UploadPackageToS3(ctx context.Context, fs afero.Fs, appID strin
10596
return fileName, err
10697
}
10798
request.Header.Add("Content-Type", writer.FormDataContentType())
108-
request.Header.Add("Content-MD5", md5s)
10999
cliVersion, err := slackcontext.Version(ctx)
110100
if err != nil {
111101
return fileName, err

0 commit comments

Comments
 (0)