diff --git a/CHANGELOG.md b/CHANGELOG.md index 94fa68e2d..c03754910 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,7 @@ ## Deprecations +* The beta `ForceCancel` endpoint has been removed from `QueryRuns`, by @sebasslash [#1223](https://github.com/hashicorp/go-tfe/pull/1223) * The beta `StackDeployments`, `StackPlan`, `StackPlanOperation`, and `StackSource` resources have been removed, by @sahar-azizighannad [#1205](https://github.com/hashicorp/go-tfe/pull/1205) # v1.92.0 @@ -50,7 +51,7 @@ * Fixes issue [1061](https://github.com/hashicorp/go-tfe/issues/1061), validation accepts all RunStatus including `"cost_estimated"` by @KenCox-Hashicorp [#1171](https://github.com/hashicorp/go-tfe/pull/1171) ## Enhancements -* Add support for querying and filtering private registry modules based on a search query, `provider`, `registry_name` and `organization_name`, by @gautambaghel [#1179](https://github.com/hashicorp/go-tfe/pull/1179) +* Add support for querying and filtering private registry modules based on a search query, `provider`, `registry_name` and `organization_name`, by @gautambaghel [#1179](https://github.com/hashicorp/go-tfe/pull/1179) * Adds support for `RegistryModule` VCS source_directory and tag_prefix options, by @jillrami [#1154] (https://github.com/hashicorp/go-tfe/pull/1154) * Adds endpoint for reruning a stack deployment by @hwatkins05-hashicorp/@Maed223 [#1176](https://github.com/hashicorp/go-tfe/pull/1176) * Adds `ReadByName` for `StackDeploymentGroup` by @Maed223 [#1181](https://github.com/hashicorp/go-tfe/pull/1181) diff --git a/mocks/admin_opa_version_mocks.go b/mocks/admin_opa_version_mocks.go index a807c43ab..0f80ace70 100644 --- a/mocks/admin_opa_version_mocks.go +++ b/mocks/admin_opa_version_mocks.go @@ -21,6 +21,7 @@ import ( type MockAdminOPAVersions struct { ctrl *gomock.Controller recorder *MockAdminOPAVersionsMockRecorder + isgomock struct{} } // MockAdminOPAVersionsMockRecorder is the mock recorder for MockAdminOPAVersions. diff --git a/mocks/admin_organization_mocks.go b/mocks/admin_organization_mocks.go index f911f52fc..5aba7ab7d 100644 --- a/mocks/admin_organization_mocks.go +++ b/mocks/admin_organization_mocks.go @@ -21,6 +21,7 @@ import ( type MockAdminOrganizations struct { ctrl *gomock.Controller recorder *MockAdminOrganizationsMockRecorder + isgomock struct{} } // MockAdminOrganizationsMockRecorder is the mock recorder for MockAdminOrganizations. diff --git a/mocks/admin_run_mocks.go b/mocks/admin_run_mocks.go index 04ff0266c..233b356d5 100644 --- a/mocks/admin_run_mocks.go +++ b/mocks/admin_run_mocks.go @@ -21,6 +21,7 @@ import ( type MockAdminRuns struct { ctrl *gomock.Controller recorder *MockAdminRunsMockRecorder + isgomock struct{} } // MockAdminRunsMockRecorder is the mock recorder for MockAdminRuns. diff --git a/mocks/admin_sentinel_version_mocks.go b/mocks/admin_sentinel_version_mocks.go index a759068e8..5219999d7 100644 --- a/mocks/admin_sentinel_version_mocks.go +++ b/mocks/admin_sentinel_version_mocks.go @@ -21,6 +21,7 @@ import ( type MockAdminSentinelVersions struct { ctrl *gomock.Controller recorder *MockAdminSentinelVersionsMockRecorder + isgomock struct{} } // MockAdminSentinelVersionsMockRecorder is the mock recorder for MockAdminSentinelVersions. diff --git a/mocks/admin_setting_cost_estimation_mocks.go b/mocks/admin_setting_cost_estimation_mocks.go index bae2e6e6b..aaa922000 100644 --- a/mocks/admin_setting_cost_estimation_mocks.go +++ b/mocks/admin_setting_cost_estimation_mocks.go @@ -21,6 +21,7 @@ import ( type MockCostEstimationSettings struct { ctrl *gomock.Controller recorder *MockCostEstimationSettingsMockRecorder + isgomock struct{} } // MockCostEstimationSettingsMockRecorder is the mock recorder for MockCostEstimationSettings. diff --git a/mocks/admin_setting_customization_mocks.go b/mocks/admin_setting_customization_mocks.go index 1858d7cdb..84acc459f 100644 --- a/mocks/admin_setting_customization_mocks.go +++ b/mocks/admin_setting_customization_mocks.go @@ -21,6 +21,7 @@ import ( type MockCustomizationSettings struct { ctrl *gomock.Controller recorder *MockCustomizationSettingsMockRecorder + isgomock struct{} } // MockCustomizationSettingsMockRecorder is the mock recorder for MockCustomizationSettings. diff --git a/mocks/admin_setting_general_mocks.go b/mocks/admin_setting_general_mocks.go index 3f60052a1..5e9848a1f 100644 --- a/mocks/admin_setting_general_mocks.go +++ b/mocks/admin_setting_general_mocks.go @@ -21,6 +21,7 @@ import ( type MockGeneralSettings struct { ctrl *gomock.Controller recorder *MockGeneralSettingsMockRecorder + isgomock struct{} } // MockGeneralSettingsMockRecorder is the mock recorder for MockGeneralSettings. diff --git a/mocks/admin_setting_oidc_mocks.go b/mocks/admin_setting_oidc_mocks.go index fcfdf7075..f95877d77 100644 --- a/mocks/admin_setting_oidc_mocks.go +++ b/mocks/admin_setting_oidc_mocks.go @@ -20,6 +20,7 @@ import ( type MockOIDCSettings struct { ctrl *gomock.Controller recorder *MockOIDCSettingsMockRecorder + isgomock struct{} } // MockOIDCSettingsMockRecorder is the mock recorder for MockOIDCSettings. diff --git a/mocks/admin_setting_saml_mocks.go b/mocks/admin_setting_saml_mocks.go index f73292a12..2d1713391 100644 --- a/mocks/admin_setting_saml_mocks.go +++ b/mocks/admin_setting_saml_mocks.go @@ -21,6 +21,7 @@ import ( type MockSAMLSettings struct { ctrl *gomock.Controller recorder *MockSAMLSettingsMockRecorder + isgomock struct{} } // MockSAMLSettingsMockRecorder is the mock recorder for MockSAMLSettings. diff --git a/mocks/admin_setting_smtp_mocks.go b/mocks/admin_setting_smtp_mocks.go index 04a4fd65e..4b0d9b3d0 100644 --- a/mocks/admin_setting_smtp_mocks.go +++ b/mocks/admin_setting_smtp_mocks.go @@ -21,6 +21,7 @@ import ( type MockSMTPSettings struct { ctrl *gomock.Controller recorder *MockSMTPSettingsMockRecorder + isgomock struct{} } // MockSMTPSettingsMockRecorder is the mock recorder for MockSMTPSettings. diff --git a/mocks/admin_setting_twilio_mocks.go b/mocks/admin_setting_twilio_mocks.go index 9948ce01b..122bdeb43 100644 --- a/mocks/admin_setting_twilio_mocks.go +++ b/mocks/admin_setting_twilio_mocks.go @@ -21,6 +21,7 @@ import ( type MockTwilioSettings struct { ctrl *gomock.Controller recorder *MockTwilioSettingsMockRecorder + isgomock struct{} } // MockTwilioSettingsMockRecorder is the mock recorder for MockTwilioSettings. diff --git a/mocks/admin_terraform_version_mocks.go b/mocks/admin_terraform_version_mocks.go index 86c3c0ef0..015084379 100644 --- a/mocks/admin_terraform_version_mocks.go +++ b/mocks/admin_terraform_version_mocks.go @@ -21,6 +21,7 @@ import ( type MockAdminTerraformVersions struct { ctrl *gomock.Controller recorder *MockAdminTerraformVersionsMockRecorder + isgomock struct{} } // MockAdminTerraformVersionsMockRecorder is the mock recorder for MockAdminTerraformVersions. diff --git a/mocks/admin_user_mocks.go b/mocks/admin_user_mocks.go index cc32a7e1e..b8a46c3d0 100644 --- a/mocks/admin_user_mocks.go +++ b/mocks/admin_user_mocks.go @@ -21,6 +21,7 @@ import ( type MockAdminUsers struct { ctrl *gomock.Controller recorder *MockAdminUsersMockRecorder + isgomock struct{} } // MockAdminUsersMockRecorder is the mock recorder for MockAdminUsers. diff --git a/mocks/admin_workspace_mocks.go b/mocks/admin_workspace_mocks.go index 0161960af..5e42374d8 100644 --- a/mocks/admin_workspace_mocks.go +++ b/mocks/admin_workspace_mocks.go @@ -21,6 +21,7 @@ import ( type MockAdminWorkspaces struct { ctrl *gomock.Controller recorder *MockAdminWorkspacesMockRecorder + isgomock struct{} } // MockAdminWorkspacesMockRecorder is the mock recorder for MockAdminWorkspaces. diff --git a/mocks/agent_pool_mocks.go b/mocks/agent_pool_mocks.go index d13e7d169..dcad1db50 100644 --- a/mocks/agent_pool_mocks.go +++ b/mocks/agent_pool_mocks.go @@ -21,6 +21,7 @@ import ( type MockAgentPools struct { ctrl *gomock.Controller recorder *MockAgentPoolsMockRecorder + isgomock struct{} } // MockAgentPoolsMockRecorder is the mock recorder for MockAgentPools. diff --git a/mocks/agent_token_mocks.go b/mocks/agent_token_mocks.go index 0b0c346c9..02a3a3201 100644 --- a/mocks/agent_token_mocks.go +++ b/mocks/agent_token_mocks.go @@ -21,6 +21,7 @@ import ( type MockAgentTokens struct { ctrl *gomock.Controller recorder *MockAgentTokensMockRecorder + isgomock struct{} } // MockAgentTokensMockRecorder is the mock recorder for MockAgentTokens. diff --git a/mocks/agents.go b/mocks/agents.go index c15926b25..15f08acad 100644 --- a/mocks/agents.go +++ b/mocks/agents.go @@ -21,6 +21,7 @@ import ( type MockAgents struct { ctrl *gomock.Controller recorder *MockAgentsMockRecorder + isgomock struct{} } // MockAgentsMockRecorder is the mock recorder for MockAgents. diff --git a/mocks/apply_mocks.go b/mocks/apply_mocks.go index 99356e373..269d2939d 100644 --- a/mocks/apply_mocks.go +++ b/mocks/apply_mocks.go @@ -22,6 +22,7 @@ import ( type MockApplies struct { ctrl *gomock.Controller recorder *MockAppliesMockRecorder + isgomock struct{} } // MockAppliesMockRecorder is the mock recorder for MockApplies. diff --git a/mocks/audit_trail_mocks.go b/mocks/audit_trail_mocks.go index a04e64ed5..24d1afb06 100644 --- a/mocks/audit_trail_mocks.go +++ b/mocks/audit_trail_mocks.go @@ -21,6 +21,7 @@ import ( type MockAuditTrails struct { ctrl *gomock.Controller recorder *MockAuditTrailsMockRecorder + isgomock struct{} } // MockAuditTrailsMockRecorder is the mock recorder for MockAuditTrails. diff --git a/mocks/comment_mocks.go b/mocks/comment_mocks.go index 2052c5ea8..9b985dcb0 100644 --- a/mocks/comment_mocks.go +++ b/mocks/comment_mocks.go @@ -21,6 +21,7 @@ import ( type MockComments struct { ctrl *gomock.Controller recorder *MockCommentsMockRecorder + isgomock struct{} } // MockCommentsMockRecorder is the mock recorder for MockComments. diff --git a/mocks/configuration_version_mocks.go b/mocks/configuration_version_mocks.go index 42f6f78e9..466611551 100644 --- a/mocks/configuration_version_mocks.go +++ b/mocks/configuration_version_mocks.go @@ -22,6 +22,7 @@ import ( type MockConfigurationVersions struct { ctrl *gomock.Controller recorder *MockConfigurationVersionsMockRecorder + isgomock struct{} } // MockConfigurationVersionsMockRecorder is the mock recorder for MockConfigurationVersions. diff --git a/mocks/cost_estimate_mocks.go b/mocks/cost_estimate_mocks.go index 026cd977b..f2f66f54b 100644 --- a/mocks/cost_estimate_mocks.go +++ b/mocks/cost_estimate_mocks.go @@ -22,6 +22,7 @@ import ( type MockCostEstimates struct { ctrl *gomock.Controller recorder *MockCostEstimatesMockRecorder + isgomock struct{} } // MockCostEstimatesMockRecorder is the mock recorder for MockCostEstimates. diff --git a/mocks/github_app_installation_mocks.go b/mocks/github_app_installation_mocks.go index bff44add4..1c5d1e028 100644 --- a/mocks/github_app_installation_mocks.go +++ b/mocks/github_app_installation_mocks.go @@ -21,6 +21,7 @@ import ( type MockGHAInstallations struct { ctrl *gomock.Controller recorder *MockGHAInstallationsMockRecorder + isgomock struct{} } // MockGHAInstallationsMockRecorder is the mock recorder for MockGHAInstallations. diff --git a/mocks/gpg_key_mocks.go b/mocks/gpg_key_mocks.go index 0b55c2dac..c4ad9a3b2 100644 --- a/mocks/gpg_key_mocks.go +++ b/mocks/gpg_key_mocks.go @@ -21,6 +21,7 @@ import ( type MockGPGKeys struct { ctrl *gomock.Controller recorder *MockGPGKeysMockRecorder + isgomock struct{} } // MockGPGKeysMockRecorder is the mock recorder for MockGPGKeys. diff --git a/mocks/ip_ranges_mocks.go b/mocks/ip_ranges_mocks.go index 6090d5cf2..5d6aa320b 100644 --- a/mocks/ip_ranges_mocks.go +++ b/mocks/ip_ranges_mocks.go @@ -21,6 +21,7 @@ import ( type MockIPRanges struct { ctrl *gomock.Controller recorder *MockIPRangesMockRecorder + isgomock struct{} } // MockIPRangesMockRecorder is the mock recorder for MockIPRanges. diff --git a/mocks/notification_configuration_mocks.go b/mocks/notification_configuration_mocks.go index 5fb999a40..aefe215e6 100644 --- a/mocks/notification_configuration_mocks.go +++ b/mocks/notification_configuration_mocks.go @@ -21,6 +21,7 @@ import ( type MockNotificationConfigurations struct { ctrl *gomock.Controller recorder *MockNotificationConfigurationsMockRecorder + isgomock struct{} } // MockNotificationConfigurationsMockRecorder is the mock recorder for MockNotificationConfigurations. diff --git a/mocks/oauth_client_mocks.go b/mocks/oauth_client_mocks.go index 4f4454568..7eaa29e20 100644 --- a/mocks/oauth_client_mocks.go +++ b/mocks/oauth_client_mocks.go @@ -21,6 +21,7 @@ import ( type MockOAuthClients struct { ctrl *gomock.Controller recorder *MockOAuthClientsMockRecorder + isgomock struct{} } // MockOAuthClientsMockRecorder is the mock recorder for MockOAuthClients. diff --git a/mocks/oauth_token_mocks.go b/mocks/oauth_token_mocks.go index aaf3e29cb..ff3eab2ea 100644 --- a/mocks/oauth_token_mocks.go +++ b/mocks/oauth_token_mocks.go @@ -21,6 +21,7 @@ import ( type MockOAuthTokens struct { ctrl *gomock.Controller recorder *MockOAuthTokensMockRecorder + isgomock struct{} } // MockOAuthTokensMockRecorder is the mock recorder for MockOAuthTokens. diff --git a/mocks/organization_membership_mocks.go b/mocks/organization_membership_mocks.go index 0ee5f3312..c6baaedbd 100644 --- a/mocks/organization_membership_mocks.go +++ b/mocks/organization_membership_mocks.go @@ -21,6 +21,7 @@ import ( type MockOrganizationMemberships struct { ctrl *gomock.Controller recorder *MockOrganizationMembershipsMockRecorder + isgomock struct{} } // MockOrganizationMembershipsMockRecorder is the mock recorder for MockOrganizationMemberships. diff --git a/mocks/organization_mocks.go b/mocks/organization_mocks.go index 0ca1fdb52..18c1f047a 100644 --- a/mocks/organization_mocks.go +++ b/mocks/organization_mocks.go @@ -21,6 +21,7 @@ import ( type MockOrganizations struct { ctrl *gomock.Controller recorder *MockOrganizationsMockRecorder + isgomock struct{} } // MockOrganizationsMockRecorder is the mock recorder for MockOrganizations. diff --git a/mocks/organization_token_mocks.go b/mocks/organization_token_mocks.go index 65bef252e..92c66f730 100644 --- a/mocks/organization_token_mocks.go +++ b/mocks/organization_token_mocks.go @@ -21,6 +21,7 @@ import ( type MockOrganizationTokens struct { ctrl *gomock.Controller recorder *MockOrganizationTokensMockRecorder + isgomock struct{} } // MockOrganizationTokensMockRecorder is the mock recorder for MockOrganizationTokens. diff --git a/mocks/plan_export_mocks.go b/mocks/plan_export_mocks.go index 515e2893e..5d02dc13f 100644 --- a/mocks/plan_export_mocks.go +++ b/mocks/plan_export_mocks.go @@ -21,6 +21,7 @@ import ( type MockPlanExports struct { ctrl *gomock.Controller recorder *MockPlanExportsMockRecorder + isgomock struct{} } // MockPlanExportsMockRecorder is the mock recorder for MockPlanExports. diff --git a/mocks/plan_mocks.go b/mocks/plan_mocks.go index a619df0a4..264620205 100644 --- a/mocks/plan_mocks.go +++ b/mocks/plan_mocks.go @@ -22,6 +22,7 @@ import ( type MockPlans struct { ctrl *gomock.Controller recorder *MockPlansMockRecorder + isgomock struct{} } // MockPlansMockRecorder is the mock recorder for MockPlans. diff --git a/mocks/policy_check_mocks.go b/mocks/policy_check_mocks.go index fdf94b720..856c8ef19 100644 --- a/mocks/policy_check_mocks.go +++ b/mocks/policy_check_mocks.go @@ -22,6 +22,7 @@ import ( type MockPolicyChecks struct { ctrl *gomock.Controller recorder *MockPolicyChecksMockRecorder + isgomock struct{} } // MockPolicyChecksMockRecorder is the mock recorder for MockPolicyChecks. diff --git a/mocks/policy_evaluation.go b/mocks/policy_evaluation.go index 8f6769d59..88d1c88e6 100644 --- a/mocks/policy_evaluation.go +++ b/mocks/policy_evaluation.go @@ -21,6 +21,7 @@ import ( type MockPolicyEvaluations struct { ctrl *gomock.Controller recorder *MockPolicyEvaluationsMockRecorder + isgomock struct{} } // MockPolicyEvaluationsMockRecorder is the mock recorder for MockPolicyEvaluations. @@ -59,6 +60,7 @@ func (mr *MockPolicyEvaluationsMockRecorder) List(ctx, taskStageID, options any) type MockPolicySetOutcomes struct { ctrl *gomock.Controller recorder *MockPolicySetOutcomesMockRecorder + isgomock struct{} } // MockPolicySetOutcomesMockRecorder is the mock recorder for MockPolicySetOutcomes. diff --git a/mocks/policy_mocks.go b/mocks/policy_mocks.go index 58783c469..dc332667d 100644 --- a/mocks/policy_mocks.go +++ b/mocks/policy_mocks.go @@ -21,6 +21,7 @@ import ( type MockPolicies struct { ctrl *gomock.Controller recorder *MockPoliciesMockRecorder + isgomock struct{} } // MockPoliciesMockRecorder is the mock recorder for MockPolicies. diff --git a/mocks/policy_set_mocks.go b/mocks/policy_set_mocks.go index 5ab611144..75fb331d2 100644 --- a/mocks/policy_set_mocks.go +++ b/mocks/policy_set_mocks.go @@ -21,6 +21,7 @@ import ( type MockPolicySets struct { ctrl *gomock.Controller recorder *MockPolicySetsMockRecorder + isgomock struct{} } // MockPolicySetsMockRecorder is the mock recorder for MockPolicySets. diff --git a/mocks/policy_set_parameter_mocks.go b/mocks/policy_set_parameter_mocks.go index a339f13e3..c6f29e673 100644 --- a/mocks/policy_set_parameter_mocks.go +++ b/mocks/policy_set_parameter_mocks.go @@ -21,6 +21,7 @@ import ( type MockPolicySetParameters struct { ctrl *gomock.Controller recorder *MockPolicySetParametersMockRecorder + isgomock struct{} } // MockPolicySetParametersMockRecorder is the mock recorder for MockPolicySetParameters. diff --git a/mocks/policy_set_version_mocks.go b/mocks/policy_set_version_mocks.go index 2c73b2ade..543d93669 100644 --- a/mocks/policy_set_version_mocks.go +++ b/mocks/policy_set_version_mocks.go @@ -21,6 +21,7 @@ import ( type MockPolicySetVersions struct { ctrl *gomock.Controller recorder *MockPolicySetVersionsMockRecorder + isgomock struct{} } // MockPolicySetVersionsMockRecorder is the mock recorder for MockPolicySetVersions. diff --git a/mocks/project_mocks.go b/mocks/project_mocks.go index aab5472a2..30fe1d529 100644 --- a/mocks/project_mocks.go +++ b/mocks/project_mocks.go @@ -21,6 +21,7 @@ import ( type MockProjects struct { ctrl *gomock.Controller recorder *MockProjectsMockRecorder + isgomock struct{} } // MockProjectsMockRecorder is the mock recorder for MockProjects. diff --git a/mocks/query_runs_mocks.go b/mocks/query_runs_mocks.go index d1739c3df..c3045561c 100644 --- a/mocks/query_runs_mocks.go +++ b/mocks/query_runs_mocks.go @@ -22,6 +22,7 @@ import ( type MockQueryRuns struct { ctrl *gomock.Controller recorder *MockQueryRunsMockRecorder + isgomock struct{} } // MockQueryRunsMockRecorder is the mock recorder for MockQueryRuns. @@ -70,20 +71,6 @@ func (mr *MockQueryRunsMockRecorder) Create(ctx, options any) *gomock.Call { return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Create", reflect.TypeOf((*MockQueryRuns)(nil).Create), ctx, options) } -// ForceCancel mocks base method. -func (m *MockQueryRuns) ForceCancel(ctx context.Context, runID string) error { - m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "ForceCancel", ctx, runID) - ret0, _ := ret[0].(error) - return ret0 -} - -// ForceCancel indicates an expected call of ForceCancel. -func (mr *MockQueryRunsMockRecorder) ForceCancel(ctx, runID any) *gomock.Call { - mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ForceCancel", reflect.TypeOf((*MockQueryRuns)(nil).ForceCancel), ctx, runID) -} - // List mocks base method. func (m *MockQueryRuns) List(ctx context.Context, workspaceID string, options *tfe.QueryRunListOptions) (*tfe.QueryRunList, error) { m.ctrl.T.Helper() diff --git a/mocks/registry_module_mocks.go b/mocks/registry_module_mocks.go index 5fe7a56ad..a2564ed14 100644 --- a/mocks/registry_module_mocks.go +++ b/mocks/registry_module_mocks.go @@ -22,6 +22,7 @@ import ( type MockRegistryModules struct { ctrl *gomock.Controller recorder *MockRegistryModulesMockRecorder + isgomock struct{} } // MockRegistryModulesMockRecorder is the mock recorder for MockRegistryModules. diff --git a/mocks/registry_no_code_module_mocks.go b/mocks/registry_no_code_module_mocks.go index d2a4052b7..0a2b0ec71 100644 --- a/mocks/registry_no_code_module_mocks.go +++ b/mocks/registry_no_code_module_mocks.go @@ -21,6 +21,7 @@ import ( type MockRegistryNoCodeModules struct { ctrl *gomock.Controller recorder *MockRegistryNoCodeModulesMockRecorder + isgomock struct{} } // MockRegistryNoCodeModulesMockRecorder is the mock recorder for MockRegistryNoCodeModules. diff --git a/mocks/registry_provider_mocks.go b/mocks/registry_provider_mocks.go index 0974fc875..3a671cdca 100644 --- a/mocks/registry_provider_mocks.go +++ b/mocks/registry_provider_mocks.go @@ -21,6 +21,7 @@ import ( type MockRegistryProviders struct { ctrl *gomock.Controller recorder *MockRegistryProvidersMockRecorder + isgomock struct{} } // MockRegistryProvidersMockRecorder is the mock recorder for MockRegistryProviders. diff --git a/mocks/registry_provider_platform_mocks.go b/mocks/registry_provider_platform_mocks.go index aaac3beeb..011f98c8a 100644 --- a/mocks/registry_provider_platform_mocks.go +++ b/mocks/registry_provider_platform_mocks.go @@ -21,6 +21,7 @@ import ( type MockRegistryProviderPlatforms struct { ctrl *gomock.Controller recorder *MockRegistryProviderPlatformsMockRecorder + isgomock struct{} } // MockRegistryProviderPlatformsMockRecorder is the mock recorder for MockRegistryProviderPlatforms. diff --git a/mocks/registry_provider_version_mocks.go b/mocks/registry_provider_version_mocks.go index cf51c4c57..d81a83534 100644 --- a/mocks/registry_provider_version_mocks.go +++ b/mocks/registry_provider_version_mocks.go @@ -21,6 +21,7 @@ import ( type MockRegistryProviderVersions struct { ctrl *gomock.Controller recorder *MockRegistryProviderVersionsMockRecorder + isgomock struct{} } // MockRegistryProviderVersionsMockRecorder is the mock recorder for MockRegistryProviderVersions. diff --git a/mocks/run_events_mocks.go b/mocks/run_events_mocks.go index 3af0ac41a..3b88ae8b6 100644 --- a/mocks/run_events_mocks.go +++ b/mocks/run_events_mocks.go @@ -21,6 +21,7 @@ import ( type MockRunEvents struct { ctrl *gomock.Controller recorder *MockRunEventsMockRecorder + isgomock struct{} } // MockRunEventsMockRecorder is the mock recorder for MockRunEvents. diff --git a/mocks/run_mocks.go b/mocks/run_mocks.go index c4414c3df..7a66a702f 100644 --- a/mocks/run_mocks.go +++ b/mocks/run_mocks.go @@ -21,6 +21,7 @@ import ( type MockRuns struct { ctrl *gomock.Controller recorder *MockRunsMockRecorder + isgomock struct{} } // MockRunsMockRecorder is the mock recorder for MockRuns. diff --git a/mocks/run_tasks_mocks.go b/mocks/run_tasks_mocks.go index 3038e2426..073e5a701 100644 --- a/mocks/run_tasks_mocks.go +++ b/mocks/run_tasks_mocks.go @@ -21,6 +21,7 @@ import ( type MockRunTasks struct { ctrl *gomock.Controller recorder *MockRunTasksMockRecorder + isgomock struct{} } // MockRunTasksMockRecorder is the mock recorder for MockRunTasks. diff --git a/mocks/run_trigger_mocks.go b/mocks/run_trigger_mocks.go index 1668f9632..07335968c 100644 --- a/mocks/run_trigger_mocks.go +++ b/mocks/run_trigger_mocks.go @@ -21,6 +21,7 @@ import ( type MockRunTriggers struct { ctrl *gomock.Controller recorder *MockRunTriggersMockRecorder + isgomock struct{} } // MockRunTriggersMockRecorder is the mock recorder for MockRunTriggers. diff --git a/mocks/ssh_key_mocks.go b/mocks/ssh_key_mocks.go index f1e4fcd66..4d8d85d88 100644 --- a/mocks/ssh_key_mocks.go +++ b/mocks/ssh_key_mocks.go @@ -21,6 +21,7 @@ import ( type MockSSHKeys struct { ctrl *gomock.Controller recorder *MockSSHKeysMockRecorder + isgomock struct{} } // MockSSHKeysMockRecorder is the mock recorder for MockSSHKeys. diff --git a/mocks/state_version_mocks.go b/mocks/state_version_mocks.go index cb8073cfd..397add0f3 100644 --- a/mocks/state_version_mocks.go +++ b/mocks/state_version_mocks.go @@ -21,6 +21,7 @@ import ( type MockStateVersions struct { ctrl *gomock.Controller recorder *MockStateVersionsMockRecorder + isgomock struct{} } // MockStateVersionsMockRecorder is the mock recorder for MockStateVersions. diff --git a/mocks/state_version_output_mocks.go b/mocks/state_version_output_mocks.go index c2db9b478..f1ef82b07 100644 --- a/mocks/state_version_output_mocks.go +++ b/mocks/state_version_output_mocks.go @@ -21,6 +21,7 @@ import ( type MockStateVersionOutputs struct { ctrl *gomock.Controller recorder *MockStateVersionOutputsMockRecorder + isgomock struct{} } // MockStateVersionOutputsMockRecorder is the mock recorder for MockStateVersionOutputs. diff --git a/mocks/task_result_mocks.go b/mocks/task_result_mocks.go index fc1231a04..ec75cd3ed 100644 --- a/mocks/task_result_mocks.go +++ b/mocks/task_result_mocks.go @@ -21,6 +21,7 @@ import ( type MockTaskResults struct { ctrl *gomock.Controller recorder *MockTaskResultsMockRecorder + isgomock struct{} } // MockTaskResultsMockRecorder is the mock recorder for MockTaskResults. diff --git a/mocks/task_stages_mocks.go b/mocks/task_stages_mocks.go index e1271c706..f78eeaf47 100644 --- a/mocks/task_stages_mocks.go +++ b/mocks/task_stages_mocks.go @@ -21,6 +21,7 @@ import ( type MockTaskStages struct { ctrl *gomock.Controller recorder *MockTaskStagesMockRecorder + isgomock struct{} } // MockTaskStagesMockRecorder is the mock recorder for MockTaskStages. diff --git a/mocks/team_access_mocks.go b/mocks/team_access_mocks.go index 45387dc71..4612af28a 100644 --- a/mocks/team_access_mocks.go +++ b/mocks/team_access_mocks.go @@ -21,6 +21,7 @@ import ( type MockTeamAccesses struct { ctrl *gomock.Controller recorder *MockTeamAccessesMockRecorder + isgomock struct{} } // MockTeamAccessesMockRecorder is the mock recorder for MockTeamAccesses. diff --git a/mocks/team_member_mocks.go b/mocks/team_member_mocks.go index 2b823b7b6..6bc1ca4aa 100644 --- a/mocks/team_member_mocks.go +++ b/mocks/team_member_mocks.go @@ -21,6 +21,7 @@ import ( type MockTeamMembers struct { ctrl *gomock.Controller recorder *MockTeamMembersMockRecorder + isgomock struct{} } // MockTeamMembersMockRecorder is the mock recorder for MockTeamMembers. diff --git a/mocks/team_mocks.go b/mocks/team_mocks.go index e3b13008a..753588bc8 100644 --- a/mocks/team_mocks.go +++ b/mocks/team_mocks.go @@ -21,6 +21,7 @@ import ( type MockTeams struct { ctrl *gomock.Controller recorder *MockTeamsMockRecorder + isgomock struct{} } // MockTeamsMockRecorder is the mock recorder for MockTeams. diff --git a/mocks/team_project_access_mocks.go b/mocks/team_project_access_mocks.go index 946e52f38..d193f8873 100644 --- a/mocks/team_project_access_mocks.go +++ b/mocks/team_project_access_mocks.go @@ -21,6 +21,7 @@ import ( type MockTeamProjectAccesses struct { ctrl *gomock.Controller recorder *MockTeamProjectAccessesMockRecorder + isgomock struct{} } // MockTeamProjectAccessesMockRecorder is the mock recorder for MockTeamProjectAccesses. diff --git a/mocks/team_token_mocks.go b/mocks/team_token_mocks.go index 55e57d6ff..449aa07e7 100644 --- a/mocks/team_token_mocks.go +++ b/mocks/team_token_mocks.go @@ -21,6 +21,7 @@ import ( type MockTeamTokens struct { ctrl *gomock.Controller recorder *MockTeamTokensMockRecorder + isgomock struct{} } // MockTeamTokensMockRecorder is the mock recorder for MockTeamTokens. diff --git a/mocks/test_run_mocks.go b/mocks/test_run_mocks.go index b989e256f..5942e9b7b 100644 --- a/mocks/test_run_mocks.go +++ b/mocks/test_run_mocks.go @@ -22,6 +22,7 @@ import ( type MockTestRuns struct { ctrl *gomock.Controller recorder *MockTestRunsMockRecorder + isgomock struct{} } // MockTestRunsMockRecorder is the mock recorder for MockTestRuns. diff --git a/mocks/test_variables_mocks.go b/mocks/test_variables_mocks.go index 26c57b93c..e32ee7f0b 100644 --- a/mocks/test_variables_mocks.go +++ b/mocks/test_variables_mocks.go @@ -21,6 +21,7 @@ import ( type MockTestVariables struct { ctrl *gomock.Controller recorder *MockTestVariablesMockRecorder + isgomock struct{} } // MockTestVariablesMockRecorder is the mock recorder for MockTestVariables. diff --git a/mocks/user_mocks.go b/mocks/user_mocks.go index 08ae2b8a9..5f9dbbefb 100644 --- a/mocks/user_mocks.go +++ b/mocks/user_mocks.go @@ -21,6 +21,7 @@ import ( type MockUsers struct { ctrl *gomock.Controller recorder *MockUsersMockRecorder + isgomock struct{} } // MockUsersMockRecorder is the mock recorder for MockUsers. diff --git a/mocks/user_token_mocks.go b/mocks/user_token_mocks.go index 747617ec3..c41447006 100644 --- a/mocks/user_token_mocks.go +++ b/mocks/user_token_mocks.go @@ -21,6 +21,7 @@ import ( type MockUserTokens struct { ctrl *gomock.Controller recorder *MockUserTokensMockRecorder + isgomock struct{} } // MockUserTokensMockRecorder is the mock recorder for MockUserTokens. diff --git a/mocks/variable_mocks.go b/mocks/variable_mocks.go index 1e6882857..70771bf30 100644 --- a/mocks/variable_mocks.go +++ b/mocks/variable_mocks.go @@ -21,6 +21,7 @@ import ( type MockVariables struct { ctrl *gomock.Controller recorder *MockVariablesMockRecorder + isgomock struct{} } // MockVariablesMockRecorder is the mock recorder for MockVariables. diff --git a/mocks/variable_set_mocks.go b/mocks/variable_set_mocks.go index 0179072a0..fbe0ceaa6 100644 --- a/mocks/variable_set_mocks.go +++ b/mocks/variable_set_mocks.go @@ -21,6 +21,7 @@ import ( type MockVariableSets struct { ctrl *gomock.Controller recorder *MockVariableSetsMockRecorder + isgomock struct{} } // MockVariableSetsMockRecorder is the mock recorder for MockVariableSets. diff --git a/mocks/variable_set_variable_mocks.go b/mocks/variable_set_variable_mocks.go index 651586990..890b013d7 100644 --- a/mocks/variable_set_variable_mocks.go +++ b/mocks/variable_set_variable_mocks.go @@ -21,6 +21,7 @@ import ( type MockVariableSetVariables struct { ctrl *gomock.Controller recorder *MockVariableSetVariablesMockRecorder + isgomock struct{} } // MockVariableSetVariablesMockRecorder is the mock recorder for MockVariableSetVariables. diff --git a/mocks/workspace_mocks.go b/mocks/workspace_mocks.go index 537ad370d..dff5fe216 100644 --- a/mocks/workspace_mocks.go +++ b/mocks/workspace_mocks.go @@ -22,6 +22,7 @@ import ( type MockWorkspaces struct { ctrl *gomock.Controller recorder *MockWorkspacesMockRecorder + isgomock struct{} } // MockWorkspacesMockRecorder is the mock recorder for MockWorkspaces. diff --git a/mocks/workspace_resources.go b/mocks/workspace_resources.go index b39f8c9ed..81c4c0368 100644 --- a/mocks/workspace_resources.go +++ b/mocks/workspace_resources.go @@ -21,6 +21,7 @@ import ( type MockWorkspaceResources struct { ctrl *gomock.Controller recorder *MockWorkspaceResourcesMockRecorder + isgomock struct{} } // MockWorkspaceResourcesMockRecorder is the mock recorder for MockWorkspaceResources. diff --git a/mocks/workspace_run_tasks_mocks.go b/mocks/workspace_run_tasks_mocks.go index 23a58fb49..78bba40af 100644 --- a/mocks/workspace_run_tasks_mocks.go +++ b/mocks/workspace_run_tasks_mocks.go @@ -21,6 +21,7 @@ import ( type MockWorkspaceRunTasks struct { ctrl *gomock.Controller recorder *MockWorkspaceRunTasksMockRecorder + isgomock struct{} } // MockWorkspaceRunTasksMockRecorder is the mock recorder for MockWorkspaceRunTasks. diff --git a/query_runs.go b/query_runs.go index 42d74884c..545e1eb53 100644 --- a/query_runs.go +++ b/query_runs.go @@ -37,9 +37,6 @@ type QueryRuns interface { // Cancel a query run by its ID. Cancel(ctx context.Context, runID string) error - - // Force-cancel a query run by its ID. - ForceCancel(ctx context.Context, runID string) error } // QueryRunCreateOptions represents the options for creating a new run. @@ -279,17 +276,3 @@ func (r *queryRuns) Cancel(ctx context.Context, queryRunID string) error { return req.Do(ctx, nil) } - -func (r *queryRuns) ForceCancel(ctx context.Context, queryRunID string) error { - if queryRunID == "" { - return ErrInvalidQueryRunID - } - - u := fmt.Sprintf("queries/%s/actions/force-cancel", url.PathEscape(queryRunID)) - req, err := r.client.NewRequest("POST", u, nil) - if err != nil { - return err - } - - return req.Do(ctx, nil) -} diff --git a/query_runs_integration_test.go b/query_runs_integration_test.go index 71f75e7de..408d40a01 100644 --- a/query_runs_integration_test.go +++ b/query_runs_integration_test.go @@ -286,36 +286,3 @@ func TestQueryRunsLogs(t *testing.T) { assert.NotEmpty(t, logs, "some logs should be returned") }) } - -func TestQueryRunsForceCancel(t *testing.T) { - skipUnlessBeta(t) - client := testClient(t) - ctx := context.Background() - - wTest, wTestCleanup := createWorkspace(t, client, nil) - defer wTestCleanup() - - _ = createQueryRun(t, client, wTest) - qrTest2 := createQueryRun(t, client, wTest) - - // A force-cancel is not needed in any normal circumstance. - // We can't easily get a query run into a state where it can be force-canceled. - // So we'll just test the negative paths. - - t.Run("when the query run is not in a force-cancelable state", func(t *testing.T) { - // This will likely return an error, but we are testing that the call can be made. - // The API should return a 409 Conflict in this case. - err := client.QueryRuns.ForceCancel(ctx, qrTest2.ID) - assert.Error(t, err) - }) - - t.Run("when the query run does not exist", func(t *testing.T) { - err := client.QueryRuns.ForceCancel(ctx, "nonexisting") - assert.Equal(t, err, ErrResourceNotFound) - }) - - t.Run("with invalid query run ID", func(t *testing.T) { - err := client.QueryRuns.ForceCancel(ctx, badIdentifier) - assert.EqualError(t, err, ErrResourceNotFound.Error()) - }) -}