fix lint issues minus the disable ones

uturunku1 · uturunku1 · commit 11e07db8c1a3 · 2022-02-24T15:20:29.000-08:00
diff --git a/.golangci.yml b/.golangci.yml
@@ -15,9 +15,9 @@ linters:
     - stylecheck #https://github.com/dominikh/go-tools/tree/master/stylecheck
     - revive #golint is deprecated and golangci-lint recommends to use revive instead https://github.com/mgechev/revive
     #other deprecated lint libraries: maligned, scopelint, interfacer
-    - gocritic
-    - unparam
-    - misspell
+    - gocritic #https://github.com/go-critic/go-critic
+    - unparam #https://github.com/mvdan/unparam
+    - misspell #https://github.com/client9/misspell
 issues:
   exclude-rules:
   - path: _test\.go
@@ -38,6 +38,11 @@ linters-settings:
       - diagnostic
       - opinionated
       - performance
+    disabled-checks:
+      - unnamedResult
+      - hugeParam
+      - singleCaseSwitch
+      - ifElseChain
   revive:
     # see https://github.com/mgechev/revive#available-rules for details.
     ignore-generated-header: false #recommended in their configuration
diff --git a/admin_organization.go b/admin_organization.go
@@ -102,8 +102,8 @@ type AdminOrganizationID struct {
 
 // List all the organizations visible to the current user.
 func (s *adminOrganizations) List(ctx context.Context, options *AdminOrganizationListOptions) (*AdminOrganizationList, error) {
-	url := "admin/organizations"
-	req, err := s.client.newRequest("GET", url, options)
+	u := "admin/organizations"
+	req, err := s.client.newRequest("GET", u, options)
 	if err != nil {
 		return nil, err
 	}
@@ -122,9 +122,9 @@ func (s *adminOrganizations) ListModuleConsumers(ctx context.Context, organizati
 		return nil, ErrInvalidOrg
 	}
 
-	url := fmt.Sprintf("admin/organizations/%s/relationships/module-consumers", url.QueryEscape(organization))
+	u := fmt.Sprintf("admin/organizations/%s/relationships/module-consumers", url.QueryEscape(organization))
 
-	req, err := s.client.newRequest("GET", url, nil)
+	req, err := s.client.newRequest("GET", u, nil)
 	if err != nil {
 		return nil, err
 	}
@@ -183,7 +183,7 @@ func (s *adminOrganizations) UpdateModuleConsumers(ctx context.Context, organiza
 		return ErrInvalidOrg
 	}
 
-	url := fmt.Sprintf("admin/organizations/%s/relationships/module-consumers", url.QueryEscape(organization))
+	u := fmt.Sprintf("admin/organizations/%s/relationships/module-consumers", url.QueryEscape(organization))
 
 	var organizations []*AdminOrganizationID
 	for _, id := range consumerOrganizationIDs {
@@ -193,7 +193,7 @@ func (s *adminOrganizations) UpdateModuleConsumers(ctx context.Context, organiza
 		organizations = append(organizations, &AdminOrganizationID{ID: id})
 	}
 
-	req, err := s.client.newRequest("PATCH", url, organizations)
+	req, err := s.client.newRequest("PATCH", u, organizations)
 	if err != nil {
 		return err
 	}
diff --git a/admin_user.go b/admin_user.go
@@ -27,10 +27,10 @@ type AdminUsers interface {
 	// Unsuspend a user by its ID.
 	Unsuspend(ctx context.Context, userID string) (*AdminUser, error)
 
-	// GrantAdmin grants admin privilages to a user by its ID.
+	// GrantAdmin grants admin privileges to a user by its ID.
 	GrantAdmin(ctx context.Context, userID string) (*AdminUser, error)
 
-	// RevokeAdmin revokees admin privilages to a user by its ID.
+	// RevokeAdmin revokees admin privileges to a user by its ID.
 	RevokeAdmin(ctx context.Context, userID string) (*AdminUser, error)
 
 	// Disable2FA disables a user's two-factor authentication in the situation
@@ -163,7 +163,7 @@ func (a *adminUsers) Unsuspend(ctx context.Context, userID string) (*AdminUser,
 	return au, nil
 }
 
-// GrantAdmin grants admin privilages to a user by its ID.
+// GrantAdmin grants admin privileges to a user by its ID.
 func (a *adminUsers) GrantAdmin(ctx context.Context, userID string) (*AdminUser, error) {
 	if !validStringID(&userID) {
 		return nil, ErrInvalidUserValue
@@ -184,7 +184,7 @@ func (a *adminUsers) GrantAdmin(ctx context.Context, userID string) (*AdminUser,
 	return au, nil
 }
 
-// RevokeAdmin revokes admin privilages to a user by its ID.
+// RevokeAdmin revokes admin privileges to a user by its ID.
 func (a *adminUsers) RevokeAdmin(ctx context.Context, userID string) (*AdminUser, error) {
 	if !validStringID(&userID) {
 		return nil, ErrInvalidUserValue
diff --git a/apply.go b/apply.go
@@ -31,7 +31,7 @@ type applies struct {
 // ApplyStatus represents an apply state.
 type ApplyStatus string
 
-//List all available apply statuses.
+// List all available apply statuses.
 const (
 	ApplyCanceled    ApplyStatus = "canceled"
 	ApplyCreated     ApplyStatus = "created"
diff --git a/configuration_version.go b/configuration_version.go
@@ -47,7 +47,7 @@ type configurationVersions struct {
 // ConfigurationStatus represents a configuration version status.
 type ConfigurationStatus string
 
-//List all available configuration version statuses.
+// List all available configuration version statuses.
 const (
 	ConfigurationErrored  ConfigurationStatus = "errored"
 	ConfigurationPending  ConfigurationStatus = "pending"
@@ -234,7 +234,7 @@ func (s *configurationVersions) ReadWithOptions(ctx context.Context, cvID string
 // Upload packages and uploads Terraform configuration files. It requires the
 // upload URL from a configuration version and the path to the configuration
 // files on disk.
-func (s *configurationVersions) Upload(ctx context.Context, url, path string) error {
+func (s *configurationVersions) Upload(ctx context.Context, u, path string) error {
 	file, err := os.Stat(path)
 	if err != nil {
 		return err
@@ -250,7 +250,7 @@ func (s *configurationVersions) Upload(ctx context.Context, url, path string) er
 		return err
 	}
 
-	req, err := s.client.newRequest("PUT", url, body)
+	req, err := s.client.newRequest("PUT", u, body)
 	if err != nil {
 		return err
 	}
diff --git a/helper_test.go b/helper_test.go
@@ -23,7 +23,7 @@ var _testAccountDetails *TestAccountDetails
 
 func testClient(t *testing.T) *Client {
 	client, err := NewClient(nil)
-	client.RetryServerErrors(true) // because ocasionally we get a 500 internal when deleting an organization's workspace
+	client.RetryServerErrors(true) // because occasionally we get a 500 internal when deleting an organization's workspace
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -457,7 +457,7 @@ func createOrganizationToken(t *testing.T, client *Client, org *Organization) (*
 	}
 }
 
-func createRunTrigger(t *testing.T, client *Client, w *Workspace, sourceable *Workspace) (*RunTrigger, func()) {
+func createRunTrigger(t *testing.T, client *Client, w, sourceable *Workspace) (*RunTrigger, func()) {
 	var wCleanup func()
 	var sourceableCleanup func()
 
diff --git a/organization_tags_integration_test.go b/organization_tags_integration_test.go
@@ -122,7 +122,7 @@ func TestOrganizationTagsDelete(t *testing.T) {
 		})
 		require.NoError(t, err)
 
-		//sanity check ensure tags were deleted from the organization
+		// sanity check ensure tags were deleted from the organization
 		tags, err = client.OrganizationTags.List(ctx, orgTest.Name, nil)
 		require.NoError(t, err)
 
@@ -175,7 +175,7 @@ func TestOrganizationTagsAddWorkspace(t *testing.T) {
 		})
 		require.NoError(t, err)
 
-		//Ensure the tag was properly associated with the workspaces
+		// Ensure the tag was properly associated with the workspaces
 		fetched, err := client.Workspaces.ListTags(ctx, workspaceToAdd1.ID, nil)
 		require.NoError(t, err)
 		assert.Equal(t, fetched.Items[0].ID, tagID)
diff --git a/plan.go b/plan.go
@@ -35,7 +35,7 @@ type plans struct {
 // PlanStatus represents a plan state.
 type PlanStatus string
 
-//List all available plan statuses.
+// List all available plan statuses.
 const (
 	PlanCanceled    PlanStatus = "canceled"
 	PlanCreated     PlanStatus = "created"
diff --git a/policy_check.go b/policy_check.go
@@ -48,7 +48,7 @@ const (
 // PolicyStatus represents a policy check state.
 type PolicyStatus string
 
-//List all available policy check statuses.
+// List all available policy check statuses.
 const (
 	PolicyCanceled    PolicyStatus = "canceled"
 	PolicyErrored     PolicyStatus = "errored"
diff --git a/policy_set.go b/policy_set.go
@@ -236,7 +236,7 @@ type PolicySetUpdateOptions struct {
 	// https://jsonapi.org/format/#crud-creating
 	Type string `jsonapi:"primary,policy-sets"`
 
-	/// The name of the policy set.
+	// The name of the policy set.
 	Name *string `jsonapi:"attr,name,omitempty"`
 
 	// The description of the policy set.
@@ -293,7 +293,7 @@ func (s *policySets) Update(ctx context.Context, policySetID string, options Pol
 // PolicySetAddPoliciesOptions represents the options for adding policies
 // to a policy set.
 type PolicySetAddPoliciesOptions struct {
-	/// The policies to add to the policy set.
+	// The policies to add to the policy set.
 	Policies []*Policy
 }
 
@@ -328,7 +328,7 @@ func (s *policySets) AddPolicies(ctx context.Context, policySetID string, option
 // PolicySetRemovePoliciesOptions represents the options for removing
 // policies from a policy set.
 type PolicySetRemovePoliciesOptions struct {
-	/// The policies to remove from the policy set.
+	// The policies to remove from the policy set.
 	Policies []*Policy
 }
 
@@ -363,7 +363,7 @@ func (s *policySets) RemovePolicies(ctx context.Context, policySetID string, opt
 // PolicySetAddWorkspacesOptions represents the options for adding workspaces
 // to a policy set.
 type PolicySetAddWorkspacesOptions struct {
-	/// The workspaces to add to the policy set.
+	// The workspaces to add to the policy set.
 	Workspaces []*Workspace
 }
 
@@ -398,7 +398,7 @@ func (s *policySets) AddWorkspaces(ctx context.Context, policySetID string, opti
 // PolicySetRemoveWorkspacesOptions represents the options for removing
 // workspaces from a policy set.
 type PolicySetRemoveWorkspacesOptions struct {
-	/// The workspaces to remove from the policy set.
+	// The workspaces to remove from the policy set.
 	Workspaces []*Workspace
 }
 
diff --git a/policy_set_parameter.go b/policy_set_parameter.go
@@ -138,7 +138,7 @@ func (s *policySetParameters) Create(ctx context.Context, policySetID string, op
 }
 
 // Read a parameter by its ID.
-func (s *policySetParameters) Read(ctx context.Context, policySetID string, parameterID string) (*PolicySetParameter, error) {
+func (s *policySetParameters) Read(ctx context.Context, policySetID, parameterID string) (*PolicySetParameter, error) {
 	if !validStringID(&policySetID) {
 		return nil, ErrInvalidPolicySetID
 	}
@@ -180,7 +180,7 @@ type PolicySetParameterUpdateOptions struct {
 }
 
 // Update values of an existing parameter.
-func (s *policySetParameters) Update(ctx context.Context, policySetID string, parameterID string, options PolicySetParameterUpdateOptions) (*PolicySetParameter, error) {
+func (s *policySetParameters) Update(ctx context.Context, policySetID, parameterID string, options PolicySetParameterUpdateOptions) (*PolicySetParameter, error) {
 	if !validStringID(&policySetID) {
 		return nil, ErrInvalidPolicySetID
 	}
@@ -204,7 +204,7 @@ func (s *policySetParameters) Update(ctx context.Context, policySetID string, pa
 }
 
 // Delete a parameter by its ID.
-func (s *policySetParameters) Delete(ctx context.Context, policySetID string, parameterID string) error {
+func (s *policySetParameters) Delete(ctx context.Context, policySetID, parameterID string) error {
 	if !validStringID(&policySetID) {
 		return ErrInvalidPolicySetID
 	}
diff --git a/policy_set_version.go b/policy_set_version.go
@@ -47,7 +47,7 @@ const (
 // PolicySetVersionStatus represents a policy set version status.
 type PolicySetVersionStatus string
 
-//List all available policy set version statuses.
+// List all available policy set version statuses.
 const (
 	PolicySetVersionErrored    PolicySetVersionStatus = "errored"
 	PolicySetVersionIngressing PolicySetVersionStatus = "ingressing"
diff --git a/registry_module.go b/registry_module.go
@@ -214,7 +214,7 @@ func (o RegistryModuleCreateVersionOptions) valid() error {
 }
 
 // Create a new registry module version
-func (r *registryModules) CreateVersion(ctx context.Context, organization string, name string, provider string, options RegistryModuleCreateVersionOptions) (*RegistryModuleVersion, error) {
+func (r *registryModules) CreateVersion(ctx context.Context, organization, name, provider string, options RegistryModuleCreateVersionOptions) (*RegistryModuleVersion, error) {
 	if !validStringID(&organization) {
 		return nil, ErrInvalidOrg
 	}
@@ -313,7 +313,7 @@ func (r *registryModules) CreateWithVCSConnection(ctx context.Context, options R
 }
 
 // Read a specific registry module
-func (r *registryModules) Read(ctx context.Context, organization string, name string, provider string) (*RegistryModule, error) {
+func (r *registryModules) Read(ctx context.Context, organization, name, provider string) (*RegistryModule, error) {
 	if !validStringID(&organization) {
 		return nil, ErrInvalidOrg
 	}
@@ -351,7 +351,7 @@ func (r *registryModules) Read(ctx context.Context, organization string, name st
 }
 
 // Delete is used to delete the entire registry module
-func (r *registryModules) Delete(ctx context.Context, organization string, name string) error {
+func (r *registryModules) Delete(ctx context.Context, organization, name string) error {
 	if !validStringID(&organization) {
 		return ErrInvalidOrg
 	}
@@ -376,7 +376,7 @@ func (r *registryModules) Delete(ctx context.Context, organization string, name
 }
 
 // DeleteProvider is used to delete the specific registry module provider
-func (r *registryModules) DeleteProvider(ctx context.Context, organization string, name string, provider string) error {
+func (r *registryModules) DeleteProvider(ctx context.Context, organization, name, provider string) error {
 	if !validStringID(&organization) {
 		return ErrInvalidOrg
 	}
@@ -408,7 +408,7 @@ func (r *registryModules) DeleteProvider(ctx context.Context, organization strin
 }
 
 // DeleteVersion is used to delete the specific registry module version
-func (r *registryModules) DeleteVersion(ctx context.Context, organization string, name string, provider string, version string) error {
+func (r *registryModules) DeleteVersion(ctx context.Context, organization, name, provider, version string) error {
 	if !validStringID(&organization) {
 		return ErrInvalidOrg
 	}
diff --git a/run.go b/run.go
@@ -48,7 +48,7 @@ type runs struct {
 // RunStatus represents a run state.
 type RunStatus string
 
-//List all available run statuses.
+// List all available run statuses.
 const (
 	RunApplied            RunStatus = "applied"
 	RunApplyQueued        RunStatus = "apply_queued"
diff --git a/run_task.go b/run_task.go
@@ -267,7 +267,7 @@ func (s *runTasks) Delete(ctx context.Context, runTaskID string) error {
 }
 
 // Convenient method to attach a run task to a workspace. See: WorkspaceRunTasks.Create()
-func (s *runTasks) AttachToWorkspace(ctx context.Context, workspaceID string, runTaskID string, enforcement TaskEnforcementLevel) (*WorkspaceRunTask, error) {
+func (s *runTasks) AttachToWorkspace(ctx context.Context, workspaceID, runTaskID string, enforcement TaskEnforcementLevel) (*WorkspaceRunTask, error) {
 	return s.client.WorkspaceRunTasks.Create(ctx, workspaceID, WorkspaceRunTaskCreateOptions{
 		EnforcementLevel: enforcement,
 		RunTask:          &RunTask{ID: runTaskID},
diff --git a/state_version.go b/state_version.go
@@ -74,7 +74,6 @@ type StateVersionListOptions struct {
 	Workspace    string `url:"filter[workspace][name]"`
 }
 
-//check that StateVersionListOptions fields had valid values
 func (o *StateVersionListOptions) valid() error {
 	if o == nil {
 		return ErrRequiredStateVerListOps
@@ -247,8 +246,8 @@ func (s *stateVersions) ReadCurrent(ctx context.Context, workspaceID string) (*S
 }
 
 // Download retrieves the actual stored state of a state version
-func (s *stateVersions) Download(ctx context.Context, url string) ([]byte, error) {
-	req, err := s.client.newRequest("GET", url, nil)
+func (s *stateVersions) Download(ctx context.Context, u string) ([]byte, error) {
+	req, err := s.client.newRequest("GET", u, nil)
 	if err != nil {
 		return nil, err
 	}
diff --git a/state_version_output.go b/state_version_output.go
@@ -9,9 +9,9 @@ import (
 // Compile-time proof of interface implementation.
 var _ StateVersionOutputs = (*stateVersionOutputs)(nil)
 
-//State version outputs are the output values from a Terraform state file.
-//They include the name and value of the output, as well as a sensitive boolean
-//if the value should be hidden by default in UIs.
+// State version outputs are the output values from a Terraform state file.
+// They include the name and value of the output, as well as a sensitive boolean
+// if the value should be hidden by default in UIs.
 //
 // TFE API docs: https://www.terraform.io/docs/cloud/api/state-version-outputs.html
 type StateVersionOutputs interface {
diff --git a/task_result.go b/task_result.go
@@ -21,10 +21,10 @@ type taskResults struct {
 	client *Client
 }
 
-//TaskResultStatus is an enum that represents all possible statuses for a task result
+// TaskResultStatus is an enum that represents all possible statuses for a task result
 type TaskResultStatus string
 
-//TaskEnforcementLevel is an enum that describes the enforcement levels for a run task
+// TaskEnforcementLevel is an enum that describes the enforcement levels for a run task
 type TaskEnforcementLevel string
 
 const (
diff --git a/team_access.go b/team_access.go
@@ -106,7 +106,7 @@ type TeamAccessListOptions struct {
 	WorkspaceID string `url:"filter[workspace][id]"`
 }
 
-//check that workspaceID field has a valid value
+// check that workspaceID field has a valid value
 func (o *TeamAccessListOptions) valid() error {
 	if o == nil {
 		return ErrRequiredTeamAccessListOps
diff --git a/team_member.go b/team_member.go
diff --git a/tfe.go b/tfe.go
diff --git a/validations.go b/validations.go
diff --git a/variable.go b/variable.go
diff --git a/workspace.go b/workspace.go
diff --git a/workspace_run_task.go b/workspace_run_task.go

Original file line number	Diff line number	Diff line change
`@@ -102,8 +102,8 @@ type AdminOrganizationID struct {`
`102`	`102`
`103`	`103`	`// List all the organizations visible to the current user.`
`104`	`104`	`func (s adminOrganizations) List(ctx context.Context, options AdminOrganizationListOptions) (*AdminOrganizationList, error) {`
`105`		`- url := "admin/organizations"`
`106`		`- req, err := s.client.newRequest("GET", url, options)`
	`105`	`+ u := "admin/organizations"`
	`106`	`+ req, err := s.client.newRequest("GET", u, options)`
`107`	`107`	`if err != nil {`
`108`	`108`	`return nil, err`
`109`	`109`	`}`
`@@ -122,9 +122,9 @@ func (s *adminOrganizations) ListModuleConsumers(ctx context.Context, organizati`
`122`	`122`	`return nil, ErrInvalidOrg`
`123`	`123`	`}`
`124`	`124`
`125`		`- url := fmt.Sprintf("admin/organizations/%s/relationships/module-consumers", url.QueryEscape(organization))`
	`125`	`+ u := fmt.Sprintf("admin/organizations/%s/relationships/module-consumers", url.QueryEscape(organization))`
`126`	`126`
`127`		`- req, err := s.client.newRequest("GET", url, nil)`
	`127`	`+ req, err := s.client.newRequest("GET", u, nil)`
`128`	`128`	`if err != nil {`
`129`	`129`	`return nil, err`
`130`	`130`	`}`
`@@ -183,7 +183,7 @@ func (s *adminOrganizations) UpdateModuleConsumers(ctx context.Context, organiza`
`183`	`183`	`return ErrInvalidOrg`
`184`	`184`	`}`
`185`	`185`
`186`		`- url := fmt.Sprintf("admin/organizations/%s/relationships/module-consumers", url.QueryEscape(organization))`
	`186`	`+ u := fmt.Sprintf("admin/organizations/%s/relationships/module-consumers", url.QueryEscape(organization))`
`187`	`187`
`188`	`188`	`var organizations []*AdminOrganizationID`
`189`	`189`	`for _, id := range consumerOrganizationIDs {`
`@@ -193,7 +193,7 @@ func (s *adminOrganizations) UpdateModuleConsumers(ctx context.Context, organiza`
`193`	`193`	`organizations = append(organizations, &AdminOrganizationID{ID: id})`
`194`	`194`	`}`
`195`	`195`
`196`		`- req, err := s.client.newRequest("PATCH", url, organizations)`
	`196`	`+ req, err := s.client.newRequest("PATCH", u, organizations)`
`197`	`197`	`if err != nil {`
`198`	`198`	`return err`
`199`	`199`	`}`
Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@ var _testAccountDetails *TestAccountDetails`
`23`	`23`
`24`	`24`	`func testClient(t testing.T) Client {`
`25`	`25`	`client, err := NewClient(nil)`
`26`		`- client.RetryServerErrors(true) // because ocasionally we get a 500 internal when deleting an organization's workspace`
	`26`	`+ client.RetryServerErrors(true) // because occasionally we get a 500 internal when deleting an organization's workspace`
`27`	`27`	`if err != nil {`
`28`	`28`	`t.Fatal(err)`
`29`	`29`	`}`
`@@ -457,7 +457,7 @@ func createOrganizationToken(t testing.T, client Client, org Organization) (`
`457`	`457`	`}`
`458`	`458`	`}`
`459`	`459`
`460`		`-func createRunTrigger(t testing.T, client Client, w Workspace, sourceable Workspace) (*RunTrigger, func()) {`
	`460`	`+func createRunTrigger(t testing.T, client Client, w, sourceable Workspace) (RunTrigger, func()) {`
`461`	`461`	`var wCleanup func()`
`462`	`462`	`var sourceableCleanup func()`
`463`	`463`
Original file line number	Diff line number	Diff line change
`@@ -138,7 +138,7 @@ func (s *policySetParameters) Create(ctx context.Context, policySetID string, op`
`138`	`138`	`}`
`139`	`139`
`140`	`140`	`// Read a parameter by its ID.`
`141`		`-func (s policySetParameters) Read(ctx context.Context, policySetID string, parameterID string) (PolicySetParameter, error) {`
	`141`	`+func (s policySetParameters) Read(ctx context.Context, policySetID, parameterID string) (PolicySetParameter, error) {`
`142`	`142`	`if !validStringID(&policySetID) {`
`143`	`143`	`return nil, ErrInvalidPolicySetID`
`144`	`144`	`}`
`@@ -180,7 +180,7 @@ type PolicySetParameterUpdateOptions struct {`
`180`	`180`	`}`
`181`	`181`
`182`	`182`	`// Update values of an existing parameter.`
`183`		`-func (s policySetParameters) Update(ctx context.Context, policySetID string, parameterID string, options PolicySetParameterUpdateOptions) (PolicySetParameter, error) {`
	`183`	`+func (s policySetParameters) Update(ctx context.Context, policySetID, parameterID string, options PolicySetParameterUpdateOptions) (PolicySetParameter, error) {`
`184`	`184`	`if !validStringID(&policySetID) {`
`185`	`185`	`return nil, ErrInvalidPolicySetID`
`186`	`186`	`}`
`@@ -204,7 +204,7 @@ func (s *policySetParameters) Update(ctx context.Context, policySetID string, pa`
`204`	`204`	`}`
`205`	`205`
`206`	`206`	`// Delete a parameter by its ID.`
`207`		`-func (s *policySetParameters) Delete(ctx context.Context, policySetID string, parameterID string) error {`
	`207`	`+func (s *policySetParameters) Delete(ctx context.Context, policySetID, parameterID string) error {`
`208`	`208`	`if !validStringID(&policySetID) {`
`209`	`209`	`return ErrInvalidPolicySetID`
`210`	`210`	`}`
Original file line number	Diff line number	Diff line change
`@@ -214,7 +214,7 @@ func (o RegistryModuleCreateVersionOptions) valid() error {`
`214`	`214`	`}`
`215`	`215`
`216`	`216`	`// Create a new registry module version`
`217`		`-func (r registryModules) CreateVersion(ctx context.Context, organization string, name string, provider string, options RegistryModuleCreateVersionOptions) (RegistryModuleVersion, error) {`
	`217`	`+func (r registryModules) CreateVersion(ctx context.Context, organization, name, provider string, options RegistryModuleCreateVersionOptions) (RegistryModuleVersion, error) {`
`218`	`218`	`if !validStringID(&organization) {`
`219`	`219`	`return nil, ErrInvalidOrg`
`220`	`220`	`}`
`@@ -313,7 +313,7 @@ func (r *registryModules) CreateWithVCSConnection(ctx context.Context, options R`
`313`	`313`	`}`
`314`	`314`
`315`	`315`	`// Read a specific registry module`
`316`		`-func (r registryModules) Read(ctx context.Context, organization string, name string, provider string) (RegistryModule, error) {`
	`316`	`+func (r registryModules) Read(ctx context.Context, organization, name, provider string) (RegistryModule, error) {`
`317`	`317`	`if !validStringID(&organization) {`
`318`	`318`	`return nil, ErrInvalidOrg`
`319`	`319`	`}`
`@@ -351,7 +351,7 @@ func (r *registryModules) Read(ctx context.Context, organization string, name st`
`351`	`351`	`}`
`352`	`352`
`353`	`353`	`// Delete is used to delete the entire registry module`
`354`		`-func (r *registryModules) Delete(ctx context.Context, organization string, name string) error {`
	`354`	`+func (r *registryModules) Delete(ctx context.Context, organization, name string) error {`
`355`	`355`	`if !validStringID(&organization) {`
`356`	`356`	`return ErrInvalidOrg`
`357`	`357`	`}`
`@@ -376,7 +376,7 @@ func (r *registryModules) Delete(ctx context.Context, organization string, name`
`376`	`376`	`}`
`377`	`377`
`378`	`378`	`// DeleteProvider is used to delete the specific registry module provider`
`379`		`-func (r *registryModules) DeleteProvider(ctx context.Context, organization string, name string, provider string) error {`
	`379`	`+func (r *registryModules) DeleteProvider(ctx context.Context, organization, name, provider string) error {`
`380`	`380`	`if !validStringID(&organization) {`
`381`	`381`	`return ErrInvalidOrg`
`382`	`382`	`}`
`@@ -408,7 +408,7 @@ func (r *registryModules) DeleteProvider(ctx context.Context, organization strin`
`408`	`408`	`}`
`409`	`409`
`410`	`410`	`// DeleteVersion is used to delete the specific registry module version`
`411`		`-func (r *registryModules) DeleteVersion(ctx context.Context, organization string, name string, provider string, version string) error {`
	`411`	`+func (r *registryModules) DeleteVersion(ctx context.Context, organization, name, provider, version string) error {`
`412`	`412`	`if !validStringID(&organization) {`
`413`	`413`	`return ErrInvalidOrg`
`414`	`414`	`}`
Original file line number	Diff line number	Diff line change
`@@ -267,7 +267,7 @@ func (s *runTasks) Delete(ctx context.Context, runTaskID string) error {`
`267`	`267`	`}`
`268`	`268`
`269`	`269`	`// Convenient method to attach a run task to a workspace. See: WorkspaceRunTasks.Create()`
`270`		`-func (s runTasks) AttachToWorkspace(ctx context.Context, workspaceID string, runTaskID string, enforcement TaskEnforcementLevel) (WorkspaceRunTask, error) {`
	`270`	`+func (s runTasks) AttachToWorkspace(ctx context.Context, workspaceID, runTaskID string, enforcement TaskEnforcementLevel) (WorkspaceRunTask, error) {`
`271`	`271`	`return s.client.WorkspaceRunTasks.Create(ctx, workspaceID, WorkspaceRunTaskCreateOptions{`
`272`	`272`	`EnforcementLevel: enforcement,`
`273`	`273`	`RunTask: &RunTask{ID: runTaskID},`
Original file line number	Diff line number	Diff line change
`@@ -74,7 +74,6 @@ type StateVersionListOptions struct {`
`74`	`74`	Workspace string `url:"filter[workspace][name]"`
`75`	`75`	`}`
`76`	`76`
`77`		`-//check that StateVersionListOptions fields had valid values`
`78`	`77`	`func (o *StateVersionListOptions) valid() error {`
`79`	`78`	`if o == nil {`
`80`	`79`	`return ErrRequiredStateVerListOps`
`@@ -247,8 +246,8 @@ func (s stateVersions) ReadCurrent(ctx context.Context, workspaceID string) (S`
`247`	`246`	`}`
`248`	`247`
`249`	`248`	`// Download retrieves the actual stored state of a state version`
`250`		`-func (s *stateVersions) Download(ctx context.Context, url string) ([]byte, error) {`
`251`		`- req, err := s.client.newRequest("GET", url, nil)`
	`249`	`+func (s *stateVersions) Download(ctx context.Context, u string) ([]byte, error) {`
	`250`	`+ req, err := s.client.newRequest("GET", u, nil)`
`252`	`251`	`if err != nil {`
`253`	`252`	`return nil, err`
`254`	`253`	`}`
Original file line number	Diff line number	Diff line change
`@@ -106,7 +106,7 @@ type TeamAccessListOptions struct {`
`106`	`106`	WorkspaceID string `url:"filter[workspace][id]"`
`107`	`107`	`}`
`108`	`108`
`109`		`-//check that workspaceID field has a valid value`
	`109`	`+// check that workspaceID field has a valid value`
`110`	`110`	`func (o *TeamAccessListOptions) valid() error {`
`111`	`111`	`if o == nil {`
`112`	`112`	`return ErrRequiredTeamAccessListOps`