chore: merge w main

zimeg · zimeg · commit 6bde33d9fc93 · 2025-04-18T11:53:34.000-07:00
diff --git a/.github/workflows/delete-pr-build-on-close.yml b/.github/workflows/delete-pr-build-on-close.yml
@@ -1,11 +1,21 @@
 name: Delete pre-release when a branch is deleted
-# Runs when PRs are merged or closed.
+# This workflow action deletes pre-releases when a PR is merged or closed.
+#
+# The CircleCI configuration builds CLI binaries when a PR is opened.
+# These are uploaded to the upstream project as GitHub (pre-)releases.
+#
+# The release tag matches one of the following patterns:
+#  - v1.2.3-example-branch-placeholder  # Branches on upstream
+#  - v1.2.3-pull-12-head                # Branches from forks
+#
+# A "pull_request_target" event is used to delete pre-releases upstream.
+#
 # See https://docs.github.com/en/actions/using-workflows/events-that-trigger-workflows#running-your-pull_request-workflow-when-a-pull-request-merges
-# The circleci config builds CLI binaries when a PR is opened and hosts them under a GitHub (pre-)release named after the PR branch
-# This workflow action deletes that pre-release when a PR is merged or closed.
+# See https://docs.github.com/en/actions/writing-workflows/choosing-when-your-workflow-runs/events-that-trigger-workflows#pull_request_target
 on:
-  delete:
-    branches:
+  pull_request_target:
+    types:
+      - closed
 
 jobs:
   delete-pre-release:
@@ -17,8 +27,15 @@ jobs:
           GH_TOKEN: ${{ github.token }}
         shell: bash
         run: |
+          # Use either an upstream or fork PR branch
+          if [[ "${{ github.event.pull_request.head.repo.full_name }}" != "${{ github.repository }}" ]]; then
+            BRANCH="pull/${{ github.event.pull_request.number }}/head"
+          else
+            BRANCH="${{ github.event.pull_request.head.ref }}"
+          fi
+
           # Escape tags to create a semantic version
-          REF=$(echo "${{ github.event.ref }}" | sed 's/\//-/g')
+          REF=$(echo "${BRANCH}" | sed 's/\//-/g')
           RELEASE_FOUND=1
 
           # Delete tags matching the pull request branch from forks
diff --git a/ci/circleci/runner/src/circlerunner.py b/ci/circleci/runner/src/circlerunner.py
@@ -116,7 +116,7 @@ def security_validation(self, file_path):
     """validate file security for runner execution, besides file existence,
     the file needs to pass the following validation:
     1. it needs to be owned by root
-    2. it needs to be only readable (and optionaly executable)
+    2. it needs to be only readable (and optionally executable)
       by owner(root) (mode 500 or 400)
     """
     self.logger.debug(f"validating script file {file_path}")
diff --git a/ci/circleci/runner/src/macrunner.py b/ci/circleci/runner/src/macrunner.py
@@ -90,7 +90,7 @@ def do_the_job(self, job_name, job_params):
       for local_path in files:
         self.upload_file_to_s3(source_file_path=local_path, s3_path=s3_path)
     else:
-      raise Exception(f"unknow job to execute {job_name}")
+      raise Exception(f"unknown job to execute {job_name}")
 
 if __name__ == "__main__":
   parser = optparse.OptionParser()
diff --git a/cmd/auth/login_test.go b/cmd/auth/login_test.go
@@ -40,7 +40,7 @@ var mockOrgAuth = types.SlackAuth{
 }
 var mockOrgAuthURL = "https://url.com"
 
-func TestLoginCommmand(t *testing.T) {
+func TestLoginCommand(t *testing.T) {
 	testutil.TableTestCommand(t, testutil.CommandTests{
 		"errors when the challenge flag is provided without the ticket flag": {
 			CmdArgs:              []string{"--challenge=achallengestring"},
diff --git a/cmd/datastore/query_test.go b/cmd/datastore/query_test.go
@@ -278,7 +278,7 @@ func TestQueryCommand(t *testing.T) {
 					Option: "status",
 					Index:  0,
 				}, nil)
-				clientsMock.IO.On("SelectPrompt", mock.Anything, "Slect an attribute for '#task_id'", mock.Anything, iostreams.MatchPromptConfig(iostreams.SelectPromptConfig{
+				clientsMock.IO.On("SelectPrompt", mock.Anything, "Select an attribute for '#task_id'", mock.Anything, iostreams.MatchPromptConfig(iostreams.SelectPromptConfig{
 					Flag: clientsMock.Config.Flags.Lookup("attributes"),
 				})).Return(iostreams.SelectPromptResponse{
 					Prompt: true,
diff --git a/cmd/manifest/validate.go b/cmd/manifest/validate.go
@@ -124,7 +124,7 @@ func newValidateLogger(clients *shared.ClientFactory, cmd *cobra.Command) *logge
 	)
 }
 
-// gatherAuthenticationToken returns some user token and configures authenication
+// gatherAuthenticationToken returns some user token and configures authentication
 // internals for API use
 func gatherAuthenticationToken(ctx context.Context, clients *shared.ClientFactory) (auth types.SlackAuth, err error) {
 	defer func() {
diff --git a/cmd/project/create_samples.go b/cmd/project/create_samples.go
@@ -74,7 +74,7 @@ func filterRepos(sampleRepos []create.GithubRepo, projectType string) []create.G
 	return filteredRepos
 }
 
-// sortRepos sorts the provided repostiories by the
+// sortRepos sorts the provided repositories by the
 // StargazersCount field in descending order
 func sortRepos(sampleRepos []create.GithubRepo) []create.GithubRepo {
 	sortedRepos := sampleRepos
diff --git a/cmd/triggers/create.go b/cmd/triggers/create.go
@@ -116,7 +116,7 @@ func runCreateCommand(clients *shared.ClientFactory, cmd *cobra.Command) error {
 		app = _app
 	}
 
-	err = validateCreateCmdFlags(clients, &createFlags)
+	err = validateCreateCmdFlags(ctx, clients, &createFlags)
 	if err != nil {
 		return err
 	}
diff --git a/cmd/triggers/create_test.go b/cmd/triggers/create_test.go
@@ -653,8 +653,8 @@ func TestTriggersCreateCommand_promptShouldDisplayTriggerDefinitionFiles(t *test
 
 	for _, testcase := range testcases {
 		t.Run(testcase.name, func(t *testing.T) {
-
 			// Prepare mocks
+			ctx := slackcontext.MockContext(t.Context())
 			clientsMock := shared.NewClientsMock()
 			testcase.prepareMocks(clientsMock)
 			clients := shared.NewClientFactory(clientsMock.MockClientFactory())
@@ -663,7 +663,7 @@ func TestTriggersCreateCommand_promptShouldDisplayTriggerDefinitionFiles(t *test
 
 			var err error
 			createFlags := createCmdFlags{}
-			err = maybeSetTriggerDefFlag(clients, &createFlags)
+			err = maybeSetTriggerDefFlag(ctx, clients, &createFlags)
 			testcase.check(t, createFlags, err)
 		})
 	}
diff --git a/cmd/triggers/generate.go b/cmd/triggers/generate.go
@@ -78,7 +78,7 @@ func TriggerGenerate(ctx context.Context, clients *shared.ClientFactory, app typ
 		},
 	})))
 
-	triggerFilePaths, err := getFullyQualifiedTriggerFilePaths(clients, triggerPaths)
+	triggerFilePaths, err := getFullyQualifiedTriggerFilePaths(ctx, clients, triggerPaths)
 	if err != nil {
 		return nil, err
 	}
@@ -171,8 +171,7 @@ func getTriggerPaths(sdkCLIConfig *hooks.SDKCLIConfig) []string {
 
 // getFullyQualifiedTriggerFilePaths returns an array of file paths that
 // are validated
-func getFullyQualifiedTriggerFilePaths(clients *shared.ClientFactory, triggerPaths []string) ([]string, error) {
-	ctx := context.Background()
+func getFullyQualifiedTriggerFilePaths(ctx context.Context, clients *shared.ClientFactory, triggerPaths []string) ([]string, error) {
 	projectDir, err := clients.Os.Getwd()
 	if err != nil {
 		return nil, err
@@ -239,7 +238,7 @@ func isValidTriggerFilePath(triggerPath string) bool {
 	return true
 }
 
-func validateCreateCmdFlags(clients *shared.ClientFactory, createFlags *createCmdFlags) error {
+func validateCreateCmdFlags(ctx context.Context, clients *shared.ClientFactory, createFlags *createCmdFlags) error {
 	if createFlags.triggerDef != "" {
 		exists, err := afero.Exists(clients.Fs, createFlags.triggerDef)
 		if err != nil {
@@ -280,7 +279,7 @@ func validateCreateCmdFlags(clients *shared.ClientFactory, createFlags *createCm
 	}
 
 	if createFlags.triggerDef == "" && createFlags.workflow == "" {
-		return maybeSetTriggerDefFlag(clients, createFlags)
+		return maybeSetTriggerDefFlag(ctx, clients, createFlags)
 	}
 
 	if createFlags.description == "" {
@@ -290,16 +289,15 @@ func validateCreateCmdFlags(clients *shared.ClientFactory, createFlags *createCm
 	return nil
 }
 
-func maybeSetTriggerDefFlag(clients *shared.ClientFactory, createFlags *createCmdFlags) error {
-	ctx := context.Background()
+func maybeSetTriggerDefFlag(ctx context.Context, clients *shared.ClientFactory, createFlags *createCmdFlags) error {
 	triggerPaths := getTriggerPaths(&clients.SDKConfig)
 
 	fmt.Printf("%s", style.Sectionf(style.TextSection{
 		Emoji: "zap",
 		Text:  fmt.Sprintf("Searching for trigger definition files under '%s'...", strings.Join(triggerPaths, ", ")),
 	}))
 
-	triggerFilePaths, err := getFullyQualifiedTriggerFilePaths(clients, triggerPaths)
+	triggerFilePaths, err := getFullyQualifiedTriggerFilePaths(ctx, clients, triggerPaths)
 	if err != nil {
 		return err
 	}
diff --git a/cmd/triggers/generate_test.go b/cmd/triggers/generate_test.go
@@ -372,6 +372,7 @@ func Test_TriggerGenerate_MismatchedFlags(t *testing.T) {
 
 	for name, tt := range tests {
 		t.Run(name, func(t *testing.T) {
+			ctx := slackcontext.MockContext(t.Context())
 			clientsMock := shared.NewClientsMock()
 			clientsMock.Os.On("Glob", mock.Anything).Return([]string{definitionFile}, nil)
 			clientsMock.AddDefaultMocks()
@@ -383,7 +384,7 @@ func Test_TriggerGenerate_MismatchedFlags(t *testing.T) {
 			err = afero.WriteFile(clients.Fs, definitionFile, []byte(""), 0600)
 			require.NoError(t, err, "Cant write apps.json")
 
-			err = validateCreateCmdFlags(clients, &tt.flags)
+			err = validateCreateCmdFlags(ctx, clients, &tt.flags)
 			if tt.err != nil {
 				assert.NotNil(t, err)
 				assert.Equal(t, slackerror.ToSlackError(tt.err).Code, slackerror.ToSlackError(err).Code)
diff --git a/cmd/triggers/update.go b/cmd/triggers/update.go
@@ -105,7 +105,7 @@ func runUpdateCommand(clients *shared.ClientFactory, cmd *cobra.Command) error {
 		}
 	}
 
-	err = validateCreateCmdFlags(clients, &updateFlags.createCmdFlags)
+	err = validateCreateCmdFlags(ctx, clients, &updateFlags.createCmdFlags)
 	if err != nil {
 		return err
 	}
diff --git a/internal/api/workflows_test.go b/internal/api/workflows_test.go
@@ -421,8 +421,8 @@ func Test_API_WorkflowTriggersList(t *testing.T) {
 			argsLimit:             4,
 			argsCursor:            "",
 			argsType:              "fake_type",
-			httpResponseJSON:      `{"ok":false,"error":"invaild_arguments"}`,
-			expectedErrorContains: "invaild_arguments",
+			httpResponseJSON:      `{"ok":false,"error":"invalid_arguments"}`,
+			expectedErrorContains: "invalid_arguments",
 		},
 	}
 
diff --git a/internal/app/app.go b/internal/app/app.go
@@ -137,7 +137,7 @@ func regexReplaceAppNameInManifest(src []byte, appName string) []byte {
 	//
 	// Expression explained:
 	// (?m) - Multi-line match that enables the use of ^ and $
-	// #1   - Match $1 captures start of content to the `Manifest({` function with optional whitepsace between the name, bracket `(```, and brace `{`
+	// #1   - Match $1 captures start of content to the `Manifest({` function with optional whitespace between the name, bracket `(```, and brace `{`
 	// #2   - Continue match $1 unless a closing brace `}` is encountered
 	// #3   - Continue match $1 to the `name` key surrounded by optional single or double quotes
 	// #4   - Continue match $1 ignoring whitespace followed by a colon `:` and the opening single or double quotes of the string's value
diff --git a/internal/app/app_client_test.go b/internal/app/app_client_test.go
@@ -638,7 +638,7 @@ func TestAppClient_CleanupSlackFolder(t *testing.T) {
 
 	require.NoError(t, err)
 	assert.False(t, ac.config.ProjectConfig.ProjectConfigJSONFileExists(wd),
-		"an unexepcted config was found")
+		"an unexpected config was found")
 
 	dotSlackFolder := filepath.Dir(pathToAppsJSON)
 	_, err = ac.fs.Stat(dotSlackFolder)
diff --git a/internal/cmdutil/flags.go b/internal/cmdutil/flags.go
@@ -29,7 +29,7 @@ const (
 )
 
 // OrgGrantWorkspaceDescription is the description for for --org-workspace-grant flag in the run, deploy and install commands
-// This vaue is a function so that formatting is applied for the help page (when style is enabled).
+// This value is a function so that formatting is applied for the help page (when style is enabled).
 var OrgGrantWorkspaceDescription = func() string {
 	return fmt.Sprintf("grant access to a specific org workspace ID\n  %s",
 		style.Secondary("(or 'all' for all workspaces in the org)"))
diff --git a/internal/config/manifest_test.go b/internal/config/manifest_test.go
@@ -63,7 +63,7 @@ func Test_Config_ManifestSource_Exists(t *testing.T) {
 			expected: true,
 		},
 		"unknown source exists": {
-			a:        "unknonwn",
+			a:        "unknown",
 			expected: true,
 		},
 		"missing source does not exist": {
diff --git a/internal/config/system_test.go b/internal/config/system_test.go
@@ -575,7 +575,7 @@ func Test_SystemConfig_writeConfigFile(t *testing.T) {
 			wg.Done()
 		}()
 
-		// Step 3) Wait a few seconds to guarantee Step 2) go rountine executes first
+		// Step 3) Wait a few seconds to guarantee Step 2) go routine executes first
 		time.Sleep(50 * time.Millisecond)
 
 		// Step 4) Unlock the file so that Step 2) can stop waiting and write the config file
diff --git a/internal/hooks/script_test.go b/internal/hooks/script_test.go
@@ -89,7 +89,7 @@ func Test_HookScript_Get(t *testing.T) {
 			expectedError:   nil,
 			expectedCommand: "npm start",
 		},
-		"Cmmand does not exist": {
+		"Command does not exist": {
 			hookScript:      &HookScript{Name: "start", Command: ""},
 			expectedError:   slackerror.New(slackerror.ErrSDKHookNotFound).WithMessage("The command for 'start' was not found"),
 			expectedCommand: "",
diff --git a/internal/iostreams/reader.go b/internal/iostreams/reader.go
@@ -18,7 +18,7 @@ import (
 	"io"
 )
 
-// Reader contains implmentations of a Read methods for various inputs methods
+// Reader contains implementations of a Read methods for various inputs methods
 //
 // Only stdin is supported for now
 type Reader interface {
diff --git a/internal/logger/logevent.go b/internal/logger/logevent.go
@@ -30,7 +30,7 @@ type LogEvent struct {
 	Data LogData
 }
 
-// DataToString safetly returns the Data[key] value as a string
+// DataToString safely returns the Data[key] value as a string
 func (l *LogEvent) DataToString(key string) string {
 	var defaultValue string
 
@@ -48,7 +48,7 @@ func (l *LogEvent) DataToString(key string) string {
 	}
 }
 
-// DataToString safetly returns the Data[key] value as a string
+// DataToString safely returns the Data[key] value as a string
 func (l *LogEvent) DataToStringSlice(key string) []string {
 	defaultValue := make([]string, 0)
 
@@ -66,7 +66,7 @@ func (l *LogEvent) DataToStringSlice(key string) []string {
 	}
 }
 
-// DataToBool safetly returns the Data[key] value as a bool
+// DataToBool safely returns the Data[key] value as a bool
 func (l *LogEvent) DataToBool(key string) bool {
 	var defaultValue bool
 
@@ -84,7 +84,7 @@ func (l *LogEvent) DataToBool(key string) bool {
 	}
 }
 
-// DataToBool safetly returns the Data[key] value as a bool
+// DataToBool safely returns the Data[key] value as a bool
 func (l *LogEvent) DataToInt(key string) int {
 	var defaultValue int
 
diff --git a/internal/pkg/apps/install.go b/internal/pkg/apps/install.go
@@ -543,7 +543,7 @@ func InstallLocalApp(ctx context.Context, clients *shared.ClientFactory, orgGran
 // here before installing the application. This includes interactivity and event
 // subscriptions as specified through Run On Slack hosting requirements.
 //
-// The CLI determines the API host from selected credentials during installaion.
+// The CLI determines the API host from selected credentials during installation.
 //
 // Apps without a specified or a "remote" function runtime should ignore this.
 func configureHostedManifest(
diff --git a/internal/pkg/platform/activity_test.go b/internal/pkg/platform/activity_test.go
@@ -271,11 +271,11 @@ func TestPlatformActivity_TriggerExecutedToString(t *testing.T) {
 
 func Test_datastoreRequestResultToString(t *testing.T) {
 	for name, tt := range map[string]struct {
-		activty         api.Activity
+		activity        api.Activity
 		expectedResults []string
 	}{
 		"successful datastore request event log": {
-			activty: api.Activity{
+			activity: api.Activity{
 				Payload: map[string]interface{}{
 					"datastore_name": "MyDatastore",
 					"request_type":   "get",
@@ -285,11 +285,11 @@ func Test_datastoreRequestResultToString(t *testing.T) {
 			expectedResults: []string{"MyDatastore", "get", "succeeded", "f7d1253f-4066-4b83-8330-a483ff555c20"},
 		},
 		"successful datastore request event log with nil payload": {
-			activty:         api.Activity{},
+			activity:        api.Activity{},
 			expectedResults: []string{"succeeded"},
 		},
 		"failed datastore request error log": {
-			activty: api.Activity{
+			activity: api.Activity{
 				Level: "error",
 				Payload: map[string]interface{}{
 					"datastore_name": "MyDatastore",
@@ -301,7 +301,7 @@ func Test_datastoreRequestResultToString(t *testing.T) {
 			expectedResults: []string{"MyDatastore", "query", "failed", "ValidationException", "f7d1253f-4066-4b83-8330-a483ff555c20"},
 		},
 		"failed datastore request without error field": {
-			activty: api.Activity{
+			activity: api.Activity{
 				Level: "error",
 				Payload: map[string]interface{}{
 					"datastore_name": "MyDatastore",
@@ -313,7 +313,7 @@ func Test_datastoreRequestResultToString(t *testing.T) {
 		},
 	} {
 		t.Run(name, func(t *testing.T) {
-			actualResult := datastoreRequestResultToString(tt.activty)
+			actualResult := datastoreRequestResultToString(tt.activity)
 			for _, expectedResult := range tt.expectedResults {
 				require.Contains(t, actualResult, expectedResult)
 			}
diff --git a/internal/prompts/app_select.go b/internal/prompts/app_select.go
@@ -1685,7 +1685,7 @@ func TeamAppSelectPrompt(ctx context.Context, clients *shared.ClientFactory, env
 		WithMessage("No credentials found for team \"%s\"", selectedDomain)
 }
 
-// OrgSelectWorkspacePrompt prompts the user to select a single workspace to grant app access to, or grant all workspaces wihtin the org.
+// OrgSelectWorkspacePrompt prompts the user to select a single workspace to grant app access to, or grant all workspaces within the org.
 func OrgSelectWorkspacePrompt(ctx context.Context, clients *shared.ClientFactory, orgDomain, token string, topOptionAllWorkspaces bool) (string, error) {
 	teams, paginationCursor, err := clients.ApiInterface().AuthTeamsList(ctx, token, api.DefaultAuthTeamsListPageSize)
 	if err != nil {
diff --git a/internal/prompts/app_select_test.go b/internal/prompts/app_select_test.go
diff --git a/internal/slackerror/error.go b/internal/slackerror/error.go
diff --git a/internal/update/autoupdate_test.go b/internal/update/autoupdate_test.go
diff --git a/internal/update/cli_autoupdate.go b/internal/update/cli_autoupdate.go

Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,7 @@ var mockOrgAuth = types.SlackAuth{`
`40`	`40`	`}`
`41`	`41`	`var mockOrgAuthURL = "https://url.com"`
`42`	`42`
`43`		`-func TestLoginCommmand(t *testing.T) {`
	`43`	`+func TestLoginCommand(t *testing.T) {`
`44`	`44`	`testutil.TableTestCommand(t, testutil.CommandTests{`
`45`	`45`	`"errors when the challenge flag is provided without the ticket flag": {`
`46`	`46`	`CmdArgs: []string{"--challenge=achallengestring"},`
Original file line number	Diff line number	Diff line change
`@@ -124,7 +124,7 @@ func newValidateLogger(clients shared.ClientFactory, cmd cobra.Command) *logge`
`124`	`124`	`)`
`125`	`125`	`}`
`126`	`126`
`127`		`-// gatherAuthenticationToken returns some user token and configures authenication`
	`127`	`+// gatherAuthenticationToken returns some user token and configures authentication`
`128`	`128`	`// internals for API use`
`129`	`129`	`func gatherAuthenticationToken(ctx context.Context, clients *shared.ClientFactory) (auth types.SlackAuth, err error) {`
`130`	`130`	`defer func() {`
Original file line number	Diff line number	Diff line change
`@@ -74,7 +74,7 @@ func filterRepos(sampleRepos []create.GithubRepo, projectType string) []create.G`
`74`	`74`	`return filteredRepos`
`75`	`75`	`}`
`76`	`76`
`77`		`-// sortRepos sorts the provided repostiories by the`
	`77`	`+// sortRepos sorts the provided repositories by the`
`78`	`78`	`// StargazersCount field in descending order`
`79`	`79`	`func sortRepos(sampleRepos []create.GithubRepo) []create.GithubRepo {`
`80`	`80`	`sortedRepos := sampleRepos`
Original file line number	Diff line number	Diff line change
`@@ -116,7 +116,7 @@ func runCreateCommand(clients shared.ClientFactory, cmd cobra.Command) error {`
`116`	`116`	`app = _app`
`117`	`117`	`}`
`118`	`118`
`119`		`- err = validateCreateCmdFlags(clients, &createFlags)`
	`119`	`+ err = validateCreateCmdFlags(ctx, clients, &createFlags)`
`120`	`120`	`if err != nil {`
`121`	`121`	`return err`
`122`	`122`	`}`