refactor: enable linter rule QF1008 for 'Omit embedded fields from selector expression' (#95)

mwbrooks · web-flow · commit 29a9da0274b7 · 2025-05-16T14:13:01.000-07:00
refactor: enable linter QF1008 'Omit embedded fields from selector expression'
diff --git a/.golangci.yml b/.golangci.yml
@@ -38,7 +38,6 @@ linters:
         - '-QF1012' # disable rule 'Use fmt.Fprintf instead of x.Write(fmt.Sprintf(...))'
         - '-QF1003' # disable rule 'Convert if/else-if chain to tagged switch'
         - '-QF1004' # disable rule 'Use strings.ReplaceAll instead of strings.Replace'
-        - '-QF1008' # disable rule 'Omit embedded fields from selector'
       # https://golangci-lint.run/usage/linters/#staticcheck
       # https://staticcheck.dev/docs/configuration/options/#initialisms
       initialisms:
diff --git a/cmd/triggers/update.go b/cmd/triggers/update.go
@@ -139,7 +139,7 @@ func runUpdateCommand(clients *shared.ClientFactory, cmd *cobra.Command) error {
 		// If the user used --workflow and the creation failed because we were missing the interactivity
 		// context, lets prompt and optionally add it
 		if updateFlags.workflow != "" && extendedErr.MissingParameterDetail.Type == "slack#/types/interactivity" {
-			updateRequest.TriggerRequest.Inputs = api.Inputs{
+			updateRequest.Inputs = api.Inputs{
 				extendedErr.MissingParameterDetail.Name: &api.Input{Value: dataInteractivityPayload},
 			}
 			shouldUpdate, innerErr := updatePromptShouldRetryWithInteractivityFunc(cmd, clients.IO, triggerArg)
diff --git a/internal/api/activity.go b/internal/api/activity.go
@@ -124,7 +124,7 @@ func (c *Client) Activity(ctx context.Context, token string, activityRequest typ
 	if !resp.Ok {
 		return ActivityResult{}, slackerror.NewAPIError(resp.Error, resp.Description, resp.Errors, appActivityMethod)
 	}
-	resp.ActivityResult.NextCursor = resp.ResponseMetadata.NextCursor
+	resp.NextCursor = resp.ResponseMetadata.NextCursor
 
 	return resp.ActivityResult, nil
 }
diff --git a/internal/api/app_test.go b/internal/api/app_test.go
@@ -68,7 +68,7 @@ func TestClient_ExportAppManifest_Ok(t *testing.T) {
 	defer teardown()
 	result, err := c.ExportAppManifest(ctx, "token", "A0123456789")
 	require.NoError(t, err)
-	require.Equal(t, "example", result.Manifest.AppManifest.DisplayInformation.Name)
+	require.Equal(t, "example", result.Manifest.DisplayInformation.Name)
 }
 
 func TestClient_ExportAppManifest_CommonErrors(t *testing.T) {
diff --git a/internal/api/auth.go b/internal/api/auth.go
@@ -110,7 +110,7 @@ func (c *Client) ExchangeAuthTicket(ctx context.Context, ticket string, challeng
 	}
 
 	// ExchangeAuthTicketResult must have a token to be valid
-	if resp.ExchangeAuthTicketResult.Token == "" {
+	if resp.Token == "" {
 		return ExchangeAuthTicketResult{}, slackerror.New(fmt.Sprintf("No token returned from the following Slack API method %s. Login can not be completed.", exchangeAuthTicketMethod))
 	}
 
diff --git a/internal/api/datastore.go b/internal/api/datastore.go
@@ -136,8 +136,8 @@ func (c *Client) AppsDatastoreBulkPut(ctx context.Context, token string, request
 		return types.AppDatastoreBulkPutResult{}, slackerror.NewAPIError(resp.Error, resp.Description, resp.Errors, appDatastoreBulkPutMethod)
 	}
 
-	if resp.AppDatastoreBulkPutResult.Datastore == "" {
-		resp.AppDatastoreBulkPutResult.Datastore = request.Datastore
+	if resp.Datastore == "" {
+		resp.Datastore = request.Datastore
 	}
 
 	return resp.AppDatastoreBulkPutResult, nil
@@ -234,7 +234,7 @@ func (c *Client) AppsDatastoreQuery(ctx context.Context, token string, query typ
 		return types.AppDatastoreQueryResult{}, slackerror.NewAPIError(resp.Error, resp.Description, resp.Errors, appDatastoreQueryMethod)
 	}
 
-	resp.AppDatastoreQueryResult.NextCursor = resp.baseResponse.ResponseMetadata.NextCursor
+	resp.NextCursor = resp.ResponseMetadata.NextCursor
 
 	return resp.AppDatastoreQueryResult, nil
 }
@@ -327,11 +327,11 @@ func (c *Client) AppsDatastoreDelete(ctx context.Context, token string, request
 	}
 
 	// the delete API doesn't return id or datastore (yet) so set it if empty
-	if resp.AppDatastoreDeleteResult.ID == "" {
-		resp.AppDatastoreDeleteResult.ID = request.ID
+	if resp.ID == "" {
+		resp.ID = request.ID
 	}
-	if resp.AppDatastoreDeleteResult.Datastore == "" {
-		resp.AppDatastoreDeleteResult.Datastore = request.Datastore
+	if resp.Datastore == "" {
+		resp.Datastore = request.Datastore
 	}
 
 	return resp.AppDatastoreDeleteResult, nil
@@ -377,8 +377,8 @@ func (c *Client) AppsDatastoreBulkDelete(ctx context.Context, token string, requ
 		return types.AppDatastoreBulkDeleteResult{}, slackerror.NewAPIError(resp.Error, resp.Description, resp.Errors, appDatastoreBulkDeleteMethod)
 	}
 
-	if resp.AppDatastoreBulkDeleteResult.Datastore == "" {
-		resp.AppDatastoreBulkDeleteResult.Datastore = request.Datastore
+	if resp.Datastore == "" {
+		resp.Datastore = request.Datastore
 	}
 
 	return resp.AppDatastoreBulkDeleteResult, nil
@@ -467,8 +467,8 @@ func (c *Client) AppsDatastoreBulkGet(ctx context.Context, token string, request
 		return types.AppDatastoreBulkGetResult{}, slackerror.NewAPIError(resp.Error, resp.Description, resp.Errors, appDatastoreBulkGetMethod)
 	}
 
-	if resp.AppDatastoreBulkGetResult.Datastore == "" {
-		resp.AppDatastoreBulkGetResult.Datastore = request.Datastore
+	if resp.Datastore == "" {
+		resp.Datastore = request.Datastore
 	}
 
 	return resp.AppDatastoreBulkGetResult, nil
diff --git a/internal/api/workflows.go b/internal/api/workflows.go
@@ -207,7 +207,7 @@ func (c *Client) workflowsTriggerSave(ctx context.Context, token string, method
 		}
 	}
 
-	serverTrigger := resp.triggerResult.Trigger
+	serverTrigger := resp.Trigger
 
 	return serverTrigger, nil
 }
@@ -217,7 +217,7 @@ func parseMissingParameterErrors(details triggerCreateOrUpdateErrorDetails) ([]s
 	var missingParameterDetail *MissingParameterDetail
 	for _, detail := range details {
 		slackErrorDetails = append(slackErrorDetails, detail.ErrorDetail)
-		if detail.MissingParameterDetail.Name != "" {
+		if detail.Name != "" {
 			missingParameterDetail = &detail.MissingParameterDetail
 		}
 	}
@@ -258,7 +258,7 @@ func (c *Client) WorkflowsTriggersList(ctx context.Context, token string, listAr
 		return []types.DeployedTrigger{}, "", slackerror.NewAPIError(resp.Error, resp.Description, resp.Errors, workflowsTriggersListMethod)
 	}
 
-	return resp.Triggers, resp.extendedBaseResponse.ResponseMetadata.NextCursor, nil
+	return resp.Triggers, resp.ResponseMetadata.NextCursor, nil
 }
 
 // WorkflowsTriggersInfo will retrieve information on an existing trigger
diff --git a/internal/cache/manifest.go b/internal/cache/manifest.go
@@ -78,7 +78,7 @@ func (c *Cache) SetManifestHash(ctx context.Context, appID string, hash Hash) er
 	cache[appID] = ManifestCacheApp{
 		Hash: hash,
 	}
-	c.ManifestCache.Apps = cache
+	c.Apps = cache
 	return c.writeManifestCache(ctx)
 }
 
@@ -112,7 +112,7 @@ func (c *Cache) writeManifestCache(ctx context.Context) error {
 	if err != nil && !os.IsExist(err) {
 		return err
 	}
-	cache, err := json.MarshalIndent(c.ManifestCache.Apps, "", "  ")
+	cache, err := json.MarshalIndent(c.Apps, "", "  ")
 	if err != nil {
 		return err
 	}
diff --git a/internal/cache/manifest_test.go b/internal/cache/manifest_test.go
@@ -52,7 +52,7 @@ func TestCache_Manifest(t *testing.T) {
 			cache := NewCache(fsMock, osMock, projectDirPath)
 			err = cache.SetManifestHash(ctx, tt.mockAppID, tt.mockCache.Hash)
 			require.NoError(t, err)
-			cache.ManifestCache.Apps = map[string]ManifestCacheApp{
+			cache.Apps = map[string]ManifestCacheApp{
 				tt.mockAppID: tt.mockCache,
 			}
 			hash, err := cache.GetManifestHash(ctx, tt.mockAppID)
diff --git a/internal/pkg/apps/install.go b/internal/pkg/apps/install.go
@@ -86,13 +86,13 @@ func Install(ctx context.Context, clients *shared.ClientFactory, log *logger.Log
 		return app, "", err
 	}
 
-	log.Data["appName"] = slackYaml.AppManifest.DisplayInformation.Name
+	log.Data["appName"] = slackYaml.DisplayInformation.Name
 	log.Data["isUpdate"] = app.AppID != ""
 	log.Data["teamName"] = *authSession.TeamName
 	log.Log("INFO", "app_install_manifest")
 
 	manifest := slackYaml.AppManifest
-	if slackYaml.AppManifest.IsFunctionRuntimeSlackHosted() {
+	if slackYaml.IsFunctionRuntimeSlackHosted() {
 		configureHostedManifest(ctx, clients, &manifest)
 	}
 
@@ -370,7 +370,7 @@ func InstallLocalApp(ctx context.Context, clients *shared.ClientFactory, orgGran
 		return app, api.DeveloperAppInstallResult{}, "", err
 	}
 
-	log.Data["appName"] = slackYaml.AppManifest.DisplayInformation.Name
+	log.Data["appName"] = slackYaml.DisplayInformation.Name
 	log.Data["isUpdate"] = app.AppID != ""
 	log.Data["teamName"] = *authSession.TeamName
 	log.Log("INFO", "app_install_manifest")
diff --git a/internal/pkg/platform/deploy.go b/internal/pkg/platform/deploy.go
@@ -80,7 +80,7 @@ func Deploy(ctx context.Context, clients *shared.ClientFactory, showTriggers boo
 	if err != nil {
 		return nil, slackerror.Wrap(err, slackerror.ErrAppManifestAccess)
 	}
-	log.Data["appName"] = manifest.AppManifest.DisplayInformation.Name
+	log.Data["appName"] = manifest.DisplayInformation.Name
 
 	if showTriggers {
 		// Generate an optional trigger when none exist

Original file line number	Diff line number	Diff line change
`@@ -139,7 +139,7 @@ func runUpdateCommand(clients shared.ClientFactory, cmd cobra.Command) error {`
`139`	`139`	`// If the user used --workflow and the creation failed because we were missing the interactivity`
`140`	`140`	`// context, lets prompt and optionally add it`
`141`	`141`	`if updateFlags.workflow != "" && extendedErr.MissingParameterDetail.Type == "slack#/types/interactivity" {`
`142`		`- updateRequest.TriggerRequest.Inputs = api.Inputs{`
	`142`	`+ updateRequest.Inputs = api.Inputs{`
`143`	`143`	`extendedErr.MissingParameterDetail.Name: &api.Input{Value: dataInteractivityPayload},`
`144`	`144`	`}`
`145`	`145`	`shouldUpdate, innerErr := updatePromptShouldRetryWithInteractivityFunc(cmd, clients.IO, triggerArg)`
Original file line number	Diff line number	Diff line change
`@@ -124,7 +124,7 @@ func (c *Client) Activity(ctx context.Context, token string, activityRequest typ`
`124`	`124`	`if !resp.Ok {`
`125`	`125`	`return ActivityResult{}, slackerror.NewAPIError(resp.Error, resp.Description, resp.Errors, appActivityMethod)`
`126`	`126`	`}`
`127`		`- resp.ActivityResult.NextCursor = resp.ResponseMetadata.NextCursor`
	`127`	`+ resp.NextCursor = resp.ResponseMetadata.NextCursor`
`128`	`128`
`129`	`129`	`return resp.ActivityResult, nil`
`130`	`130`	`}`
Original file line number	Diff line number	Diff line change
`@@ -68,7 +68,7 @@ func TestClient_ExportAppManifest_Ok(t *testing.T) {`
`68`	`68`	`defer teardown()`
`69`	`69`	`result, err := c.ExportAppManifest(ctx, "token", "A0123456789")`
`70`	`70`	`require.NoError(t, err)`
`71`		`- require.Equal(t, "example", result.Manifest.AppManifest.DisplayInformation.Name)`
	`71`	`+ require.Equal(t, "example", result.Manifest.DisplayInformation.Name)`
`72`	`72`	`}`
`73`	`73`
`74`	`74`	`func TestClient_ExportAppManifest_CommonErrors(t *testing.T) {`
Original file line number	Diff line number	Diff line change
`@@ -110,7 +110,7 @@ func (c *Client) ExchangeAuthTicket(ctx context.Context, ticket string, challeng`
`110`	`110`	`}`
`111`	`111`
`112`	`112`	`// ExchangeAuthTicketResult must have a token to be valid`
`113`		`- if resp.ExchangeAuthTicketResult.Token == "" {`
	`113`	`+ if resp.Token == "" {`
`114`	`114`	`return ExchangeAuthTicketResult{}, slackerror.New(fmt.Sprintf("No token returned from the following Slack API method %s. Login can not be completed.", exchangeAuthTicketMethod))`
`115`	`115`	`}`
`116`	`116`
Original file line number	Diff line number	Diff line change
`@@ -136,8 +136,8 @@ func (c *Client) AppsDatastoreBulkPut(ctx context.Context, token string, request`
`136`	`136`	`return types.AppDatastoreBulkPutResult{}, slackerror.NewAPIError(resp.Error, resp.Description, resp.Errors, appDatastoreBulkPutMethod)`
`137`	`137`	`}`
`138`	`138`
`139`		`- if resp.AppDatastoreBulkPutResult.Datastore == "" {`
`140`		`- resp.AppDatastoreBulkPutResult.Datastore = request.Datastore`
	`139`	`+ if resp.Datastore == "" {`
	`140`	`+ resp.Datastore = request.Datastore`
`141`	`141`	`}`
`142`	`142`
`143`	`143`	`return resp.AppDatastoreBulkPutResult, nil`
`@@ -234,7 +234,7 @@ func (c *Client) AppsDatastoreQuery(ctx context.Context, token string, query typ`
`234`	`234`	`return types.AppDatastoreQueryResult{}, slackerror.NewAPIError(resp.Error, resp.Description, resp.Errors, appDatastoreQueryMethod)`
`235`	`235`	`}`
`236`	`236`
`237`		`- resp.AppDatastoreQueryResult.NextCursor = resp.baseResponse.ResponseMetadata.NextCursor`
	`237`	`+ resp.NextCursor = resp.ResponseMetadata.NextCursor`
`238`	`238`
`239`	`239`	`return resp.AppDatastoreQueryResult, nil`
`240`	`240`	`}`
`@@ -327,11 +327,11 @@ func (c *Client) AppsDatastoreDelete(ctx context.Context, token string, request`
`327`	`327`	`}`
`328`	`328`
`329`	`329`	`// the delete API doesn't return id or datastore (yet) so set it if empty`
`330`		`- if resp.AppDatastoreDeleteResult.ID == "" {`
`331`		`- resp.AppDatastoreDeleteResult.ID = request.ID`
	`330`	`+ if resp.ID == "" {`
	`331`	`+ resp.ID = request.ID`
`332`	`332`	`}`
`333`		`- if resp.AppDatastoreDeleteResult.Datastore == "" {`
`334`		`- resp.AppDatastoreDeleteResult.Datastore = request.Datastore`
	`333`	`+ if resp.Datastore == "" {`
	`334`	`+ resp.Datastore = request.Datastore`
`335`	`335`	`}`
`336`	`336`
`337`	`337`	`return resp.AppDatastoreDeleteResult, nil`
`@@ -377,8 +377,8 @@ func (c *Client) AppsDatastoreBulkDelete(ctx context.Context, token string, requ`
`377`	`377`	`return types.AppDatastoreBulkDeleteResult{}, slackerror.NewAPIError(resp.Error, resp.Description, resp.Errors, appDatastoreBulkDeleteMethod)`
`378`	`378`	`}`
`379`	`379`
`380`		`- if resp.AppDatastoreBulkDeleteResult.Datastore == "" {`
`381`		`- resp.AppDatastoreBulkDeleteResult.Datastore = request.Datastore`
	`380`	`+ if resp.Datastore == "" {`
	`381`	`+ resp.Datastore = request.Datastore`
`382`	`382`	`}`
`383`	`383`
`384`	`384`	`return resp.AppDatastoreBulkDeleteResult, nil`
`@@ -467,8 +467,8 @@ func (c *Client) AppsDatastoreBulkGet(ctx context.Context, token string, request`
`467`	`467`	`return types.AppDatastoreBulkGetResult{}, slackerror.NewAPIError(resp.Error, resp.Description, resp.Errors, appDatastoreBulkGetMethod)`
`468`	`468`	`}`
`469`	`469`
`470`		`- if resp.AppDatastoreBulkGetResult.Datastore == "" {`
`471`		`- resp.AppDatastoreBulkGetResult.Datastore = request.Datastore`
	`470`	`+ if resp.Datastore == "" {`
	`471`	`+ resp.Datastore = request.Datastore`
`472`	`472`	`}`
`473`	`473`
`474`	`474`	`return resp.AppDatastoreBulkGetResult, nil`
Original file line number	Diff line number	Diff line change
`@@ -207,7 +207,7 @@ func (c *Client) workflowsTriggerSave(ctx context.Context, token string, method`
`207`	`207`	`}`
`208`	`208`	`}`
`209`	`209`
`210`		`- serverTrigger := resp.triggerResult.Trigger`
	`210`	`+ serverTrigger := resp.Trigger`
`211`	`211`
`212`	`212`	`return serverTrigger, nil`
`213`	`213`	`}`
`@@ -217,7 +217,7 @@ func parseMissingParameterErrors(details triggerCreateOrUpdateErrorDetails) ([]s`
`217`	`217`	`var missingParameterDetail *MissingParameterDetail`
`218`	`218`	`for _, detail := range details {`
`219`	`219`	`slackErrorDetails = append(slackErrorDetails, detail.ErrorDetail)`
`220`		`- if detail.MissingParameterDetail.Name != "" {`
	`220`	`+ if detail.Name != "" {`
`221`	`221`	`missingParameterDetail = &detail.MissingParameterDetail`
`222`	`222`	`}`
`223`	`223`	`}`
`@@ -258,7 +258,7 @@ func (c *Client) WorkflowsTriggersList(ctx context.Context, token string, listAr`
`258`	`258`	`return []types.DeployedTrigger{}, "", slackerror.NewAPIError(resp.Error, resp.Description, resp.Errors, workflowsTriggersListMethod)`
`259`	`259`	`}`
`260`	`260`
`261`		`- return resp.Triggers, resp.extendedBaseResponse.ResponseMetadata.NextCursor, nil`
	`261`	`+ return resp.Triggers, resp.ResponseMetadata.NextCursor, nil`
`262`	`262`	`}`
`263`	`263`
`264`	`264`	`// WorkflowsTriggersInfo will retrieve information on an existing trigger`
Original file line number	Diff line number	Diff line change
`@@ -78,7 +78,7 @@ func (c *Cache) SetManifestHash(ctx context.Context, appID string, hash Hash) er`
`78`	`78`	`cache[appID] = ManifestCacheApp{`
`79`	`79`	`Hash: hash,`
`80`	`80`	`}`
`81`		`- c.ManifestCache.Apps = cache`
	`81`	`+ c.Apps = cache`
`82`	`82`	`return c.writeManifestCache(ctx)`
`83`	`83`	`}`
`84`	`84`
`@@ -112,7 +112,7 @@ func (c *Cache) writeManifestCache(ctx context.Context) error {`
`112`	`112`	`if err != nil && !os.IsExist(err) {`
`113`	`113`	`return err`
`114`	`114`	`}`
`115`		`- cache, err := json.MarshalIndent(c.ManifestCache.Apps, "", " ")`
	`115`	`+ cache, err := json.MarshalIndent(c.Apps, "", " ")`
`116`	`116`	`if err != nil {`
`117`	`117`	`return err`
`118`	`118`	`}`
Original file line number	Diff line number	Diff line change
`@@ -52,7 +52,7 @@ func TestCache_Manifest(t *testing.T) {`
`52`	`52`	`cache := NewCache(fsMock, osMock, projectDirPath)`
`53`	`53`	`err = cache.SetManifestHash(ctx, tt.mockAppID, tt.mockCache.Hash)`
`54`	`54`	`require.NoError(t, err)`
`55`		`- cache.ManifestCache.Apps = map[string]ManifestCacheApp{`
	`55`	`+ cache.Apps = map[string]ManifestCacheApp{`
`56`	`56`	`tt.mockAppID: tt.mockCache,`
`57`	`57`	`}`
`58`	`58`	`hash, err := cache.GetManifestHash(ctx, tt.mockAppID)`