From cde05a1a5b035d235b12a545afb03a6e87a18e46 Mon Sep 17 00:00:00 2001 From: Josh Soref <2119212+jsoref@users.noreply.github.com> Date: Mon, 2 Oct 2023 00:50:19 -0400 Subject: [PATCH 01/15] spelling: anonymous Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com> --- pkg/credentials/resource_test.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkg/credentials/resource_test.go b/pkg/credentials/resource_test.go index 74ceed55..b66bb2d9 100644 --- a/pkg/credentials/resource_test.go +++ b/pkg/credentials/resource_test.go @@ -55,9 +55,9 @@ func TestResourceWithAnonymousAsJSON(t *testing.T) { name := internal.GetRandomName() selfLink := internal.GetRandomName() - anonymousdAsJSON, err := json.Marshal(anonymous) + anonymousAsJSON, err := json.Marshal(anonymous) require.NoError(t, err) - require.NotNil(t, anonymousdAsJSON) + require.NotNil(t, anonymousAsJSON) resource := credentials.NewResource(name, anonymous) resource.Description = description @@ -72,7 +72,7 @@ func TestResourceWithAnonymousAsJSON(t *testing.T) { "Links": { "Self": "%s" } - }`, description, anonymousdAsJSON, id, name, selfLink) + }`, description, anonymousAsJSON, id, name, selfLink) resourceAsJSON, err := json.Marshal(resource) require.NoError(t, err) From b1f18a1aa4838ede3e4faafec82d7c6d0cb53431 Mon Sep 17 00:00:00 2001 From: Josh Soref <2119212+jsoref@users.noreply.github.com> Date: Fri, 13 Oct 2023 11:31:30 -0400 Subject: [PATCH 02/15] spelling: communication Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com> --- pkg/machines/ssh_endpoint.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkg/machines/ssh_endpoint.go b/pkg/machines/ssh_endpoint.go index b23a7238..eb547065 100644 --- a/pkg/machines/ssh_endpoint.go +++ b/pkg/machines/ssh_endpoint.go @@ -75,7 +75,7 @@ func (s *SSHEndpoint) GetProxyID() string { func (s *SSHEndpoint) MarshalJSON() ([]byte, error) { sshEndpoint := struct { AccountID string `json:"AccountId,omitempty"` - ComunicationStyle string `json:"CommunicationStyle" validate:"required,eq=Ssh"` + CommunicationStyle string `json:"CommunicationStyle" validate:"required,eq=Ssh"` DotNetCorePlatform string Fingerprint string Host string @@ -85,7 +85,7 @@ func (s *SSHEndpoint) MarshalJSON() ([]byte, error) { resources.Resource }{ AccountID: s.AccountID, - ComunicationStyle: s.CommunicationStyle, + CommunicationStyle: s.CommunicationStyle, DotNetCorePlatform: s.DotNetCorePlatform, Fingerprint: s.Fingerprint, Host: s.Host, From 334a6abd8037545a64cf48c64fd1f50bab8fc80b Mon Sep 17 00:00:00 2001 From: Josh Soref <2119212+jsoref@users.noreply.github.com> Date: Mon, 2 Oct 2023 00:50:44 -0400 Subject: [PATCH 03/15] spelling: environments Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com> --- pkg/environments/environment_service.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/environments/environment_service.go b/pkg/environments/environment_service.go index 145c5191..dbdc4ed7 100644 --- a/pkg/environments/environment_service.go +++ b/pkg/environments/environment_service.go @@ -125,7 +125,7 @@ func (s *EnvironmentService) GetByName(name string) ([]*Environment, error) { return services.GetPagedResponse[Environment](s, path) } -// GetByPartialName performs a lookup and returns enironments with a matching +// GetByPartialName performs a lookup and returns environments with a matching // partial name. func (s *EnvironmentService) GetByPartialName(partialName string) ([]*Environment, error) { if internal.IsEmpty(partialName) { From cdfdc013fdc954eb22d0e1feed3ce36b66db78dd Mon Sep 17 00:00:00 2001 From: Josh Soref <2119212+jsoref@users.noreply.github.com> Date: Fri, 13 Oct 2023 06:10:50 -0400 Subject: [PATCH 04/15] spelling: forty Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com> --- pkg/machines/duration_formatter_test.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkg/machines/duration_formatter_test.go b/pkg/machines/duration_formatter_test.go index 9484a95e..1c905f12 100644 --- a/pkg/machines/duration_formatter_test.go +++ b/pkg/machines/duration_formatter_test.go @@ -9,7 +9,7 @@ func TestToTimeSpan(t *testing.T) { halfSecond, _ := time.ParseDuration("0.5s") second, _ := time.ParseDuration("1111ms") twoHours, _ := time.ParseDuration("120m") - fourtySevenHours, _ := time.ParseDuration("47h") + fortySevenHours, _ := time.ParseDuration("47h") twoDays, _ := time.ParseDuration("48h") t.Logf("500ms: %s", ToTimeSpan(halfSecond)) t.Logf("1000ms: %s", ToTimeSpan(second)) @@ -17,7 +17,7 @@ func TestToTimeSpan(t *testing.T) { t.Logf("1m: %s", ToTimeSpan(time.Minute)) t.Logf("1h: %s", ToTimeSpan(time.Hour)) t.Logf("120m: %s", ToTimeSpan(twoHours)) - t.Logf("47h: %s", ToTimeSpan(fourtySevenHours)) + t.Logf("47h: %s", ToTimeSpan(fortySevenHours)) t.Logf("48h: %s", ToTimeSpan(twoDays)) } From fa515345aea4f3381167ab6fd1fe4692f436be88 Mon Sep 17 00:00:00 2001 From: Josh Soref <2119212+jsoref@users.noreply.github.com> Date: Fri, 13 Oct 2023 06:11:33 -0400 Subject: [PATCH 05/15] spelling: internal Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com> --- pkg/events/events_query.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/events/events_query.go b/pkg/events/events_query.go index e10eb644..7c4b40d4 100644 --- a/pkg/events/events_query.go +++ b/pkg/events/events_query.go @@ -12,7 +12,7 @@ type EventsQuery struct { FromAutoID string `uri:"fromAutoId,omitempty" url:"fromAutoId,omitempty"` IDs []string `uri:"ids,omitempty" url:"ids,omitempty"` IncludeSystem bool `uri:"includeSystem,omitempty" url:"includeSystem,omitempty"` - Internal string `uri:"interal,omitempty" url:"interal,omitempty"` + Internal string `uri:"internal,omitempty" url:"internal,omitempty"` Name string `uri:"name,omitempty" url:"name,omitempty"` PartialName string `uri:"partialName,omitempty" url:"partialName,omitempty"` ProjectGroups []string `uri:"projectGroups,omitempty" url:"projectGroups,omitempty"` From 1cc64d4da164b410654d771807d913f730f9638d Mon Sep 17 00:00:00 2001 From: Josh Soref <2119212+jsoref@users.noreply.github.com> Date: Fri, 13 Oct 2023 11:31:54 -0400 Subject: [PATCH 06/15] spelling: interruption Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com> --- test/e2e/interruption_test.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/test/e2e/interruption_test.go b/test/e2e/interruption_test.go index ea66dada..faae3fba 100644 --- a/test/e2e/interruption_test.go +++ b/test/e2e/interruption_test.go @@ -58,7 +58,7 @@ package e2e // require.NoError(t, err) // require.NotNil(t, client) -// interruption, err := getInterruptonFromJSON(interruptionJSON) +// interruption, err := getInterruptionFromJSON(interruptionJSON) // require.NoError(t, err) // require.NotNil(t, interruption) @@ -76,7 +76,7 @@ package e2e // require.NoError(t, err) // require.NotNil(t, client) -// interruption, err := getInterruptonFromJSON(interruptionJSON) +// interruption, err := getInterruptionFromJSON(interruptionJSON) // require.NoError(t, err) // require.NotNil(t, interruption) @@ -95,7 +95,7 @@ package e2e // require.NoError(t, err) // require.NotNil(t, client) -// interruption, err := getInterruptonFromJSON(interruptionJSON) +// interruption, err := getInterruptionFromJSON(interruptionJSON) // require.NoError(t, err) // require.NotNil(t, interruption) @@ -298,7 +298,7 @@ package e2e // } // ` -// func getInterruptonFromJSON(interruptionJSON string) (*interruptions.Interruption, error) { +// func getInterruptionFromJSON(interruptionJSON string) (*interruptions.Interruption, error) { // var interruption interruptions.Interruption // err := json.Unmarshal([]byte(interruptionJSON), &interruption) // return &interruption, err From ff5d503d3371dc9b5425bb9d06690d847432d222 Mon Sep 17 00:00:00 2001 From: Josh Soref <2119212+jsoref@users.noreply.github.com> Date: Fri, 13 Oct 2023 11:32:05 -0400 Subject: [PATCH 07/15] spelling: intervention Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com> --- pkg/interruptions/interruption.go | 2 +- test/e2e/interruption_test.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkg/interruptions/interruption.go b/pkg/interruptions/interruption.go index 690ccd15..e1aaf134 100644 --- a/pkg/interruptions/interruption.go +++ b/pkg/interruptions/interruption.go @@ -30,5 +30,5 @@ func NewInterruption() *Interruption { } } -const ManualInterverventionApprove = "Proceed" +const ManualInterventionApprove = "Proceed" const ManualInterventionDecline = "Abort" diff --git a/test/e2e/interruption_test.go b/test/e2e/interruption_test.go index faae3fba..32d359c5 100644 --- a/test/e2e/interruption_test.go +++ b/test/e2e/interruption_test.go @@ -102,7 +102,7 @@ package e2e // submitRequest := interruptions.InterruptionSubmitRequest{ // Instructions: "Approve The Deployment", // Notes: "", -// Result: interruptions.ManualInterverventionApprove, +// Result: interruptions.ManualInterventionApprove, // } // i, err := client.Interruptions.Submit(interruption, &submitRequest) From 47694de05111c7118d308629a263f260a540279f Mon Sep 17 00:00:00 2001 From: Josh Soref <2119212+jsoref@users.noreply.github.com> Date: Mon, 2 Oct 2023 00:52:59 -0400 Subject: [PATCH 08/15] spelling: logging Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com> --- tests/Create-ApiKey.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/Create-ApiKey.ps1 b/tests/Create-ApiKey.ps1 index 2fe6edd4..22f1132d 100644 --- a/tests/Create-ApiKey.ps1 +++ b/tests/Create-ApiKey.ps1 @@ -10,7 +10,7 @@ $LoginObj = New-Object Octopus.Client.Model.LoginCommand $LoginObj.Username = "admin" $LoginObj.Password = "Password01!" -#Loging in to Octopus +#Logging in to Octopus $repository.Users.SignIn($LoginObj) #Getting current user logged in From 886f9d82c049ab458aa8449edec67d5eb46651df Mon Sep 17 00:00:00 2001 From: Josh Soref <2119212+jsoref@users.noreply.github.com> Date: Mon, 2 Oct 2023 00:51:11 -0400 Subject: [PATCH 09/15] spelling: modifiers Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com> --- uritemplates/uritemplates.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/uritemplates/uritemplates.go b/uritemplates/uritemplates.go index 1bbe16bc..351a02d3 100644 --- a/uritemplates/uritemplates.go +++ b/uritemplates/uritemplates.go @@ -185,7 +185,7 @@ func parseTerm(term string) (result templateTerm, err error) { err = errors.New("not a valid name: " + result.name) } if result.explode && result.truncate > 0 { - err = errors.New("both explode and prefix modifers on same term") + err = errors.New("both explode and prefix modifiers on same term") } return result, err } From d3b025a90b7d8b6ad48830b8de3f002e080533f5 Mon Sep 17 00:00:00 2001 From: Josh Soref <2119212+jsoref@users.noreply.github.com> Date: Mon, 2 Oct 2023 00:51:20 -0400 Subject: [PATCH 10/15] spelling: necessary Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com> --- pkg/newclient/httpsession.go | 2 +- test/testutil.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkg/newclient/httpsession.go b/pkg/newclient/httpsession.go index f378a238..bcb7e083 100644 --- a/pkg/newclient/httpsession.go +++ b/pkg/newclient/httpsession.go @@ -82,7 +82,7 @@ func (h *HttpSession) DoRawJsonRequest(req *http.Request, requestBody any, outpu if resp.StatusCode == http.StatusNoContent || resp.ContentLength == 0 { // TODO the ContentLength check is copied from Sling, but it's valid for servers to stream responses // without a known content length. This won't handle such responses, which would be a bug. The octopus server tends not - // to do this, so we can defer a fix until it becomes neccessary + // to do this, so we can defer a fix until it becomes necessary return resp, nil } diff --git a/test/testutil.go b/test/testutil.go index 20b267de..f4eda2a6 100644 --- a/test/testutil.go +++ b/test/testutil.go @@ -52,7 +52,7 @@ type MockHttpServer struct { Response chan responseOrError // so test code can detect unanswered requests or responses at the end. - // Not strictly neccessary as unanswered req/resp results in a channel deadlock + // Not strictly necessary as unanswered req/resp results in a channel deadlock // and go panics and kills the process, so we find out about it, but this is a bit // less confusing to troubleshoot pendingMsgCount int32 From fb8cd0c8987306b95fa199ec788e962e61d2dc42 Mon Sep 17 00:00:00 2001 From: Josh Soref <2119212+jsoref@users.noreply.github.com> Date: Fri, 13 Oct 2023 11:32:34 -0400 Subject: [PATCH 11/15] spelling: parameter Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com> --- api/spec.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/api/spec.json b/api/spec.json index 7537f156..63498b32 100644 --- a/api/spec.json +++ b/api/spec.json @@ -460,7 +460,7 @@ "enum": [ "Success", "ManualMergeRequired", - "DefaultParamterValueMissing", + "DefaultParameterValueMissing", "RemovedPackageInUse" ], "type": "string" From b5d164e3021295a1dd5566c19602cf328e149b49 Mon Sep 17 00:00:00 2001 From: Josh Soref <2119212+jsoref@users.noreply.github.com> Date: Fri, 13 Oct 2023 06:10:25 -0400 Subject: [PATCH 12/15] spelling: passphrase Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com> --- pkg/accounts/ssh_key_account.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/accounts/ssh_key_account.go b/pkg/accounts/ssh_key_account.go index 26295ecf..d9ac871b 100644 --- a/pkg/accounts/ssh_key_account.go +++ b/pkg/accounts/ssh_key_account.go @@ -54,7 +54,7 @@ func NewSSHKeyAccount(name string, username string, privateKeyFile *core.Sensiti return &account, nil } -// SetPrivateKeyPassphrase sets the private key [assphrase of this SSH key pair account. +// SetPrivateKeyPassphrase sets the private key passphrase of this SSH key pair account. func (s *SSHKeyAccount) SetPrivateKeyPassphrase(privateKeyPassphrase *core.SensitiveValue) { s.PrivateKeyPassphrase = privateKeyPassphrase } From 7b80631dc7f267d3f970df0d9669994b0ba13f82 Mon Sep 17 00:00:00 2001 From: Josh Soref <2119212+jsoref@users.noreply.github.com> Date: Fri, 13 Oct 2023 11:32:50 -0400 Subject: [PATCH 13/15] spelling: promotion Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com> --- api/spec.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/api/spec.json b/api/spec.json index 63498b32..527b39e1 100644 --- a/api/spec.json +++ b/api/spec.json @@ -2551,7 +2551,7 @@ } } }, - "DeploymentPromomotionTenant": { + "DeploymentPromotionTenant": { "type": "object", "properties": { "Id": { @@ -3032,7 +3032,7 @@ "TenantPromotions": { "type": "array", "items": { - "$ref": "#/definitions/DeploymentPromomotionTenant" + "$ref": "#/definitions/DeploymentPromotionTenant" } } } @@ -8122,7 +8122,7 @@ "TenantPromotions": { "type": "array", "items": { - "$ref": "#/definitions/DeploymentPromomotionTenant" + "$ref": "#/definitions/DeploymentPromotionTenant" } } } From ec4dd4ebae99c70190e1f9860add1dec95102e12 Mon Sep 17 00:00:00 2001 From: Josh Soref <2119212+jsoref@users.noreply.github.com> Date: Mon, 2 Oct 2023 00:51:45 -0400 Subject: [PATCH 14/15] spelling: retrieve Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com> --- pkg/accounts/accounts.go | 4 ++-- pkg/resources/resources.go | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkg/accounts/accounts.go b/pkg/accounts/accounts.go index e58e49f8..b35bb1ff 100644 --- a/pkg/accounts/accounts.go +++ b/pkg/accounts/accounts.go @@ -127,7 +127,7 @@ func (a *Accounts) UnmarshalJSON(b []byte) error { return nil } -// GetNextPage retrives the next page from the links collection. If no next page +// GetNextPage retrieves the next page from the links collection. If no next page // exists it will return nill func (r *Accounts) GetNextPage(client *sling.Sling) (*Accounts, error) { if r.Links.PageNext == "" { @@ -140,7 +140,7 @@ func (r *Accounts) GetNextPage(client *sling.Sling) (*Accounts, error) { return ToAccounts(response.(*resources.Resources[*AccountResource])), nil } -// GetAllPages will retrive all remaining next pages in the link collection +// GetAllPages will retrieve all remaining next pages in the link collection // and return the result as list of concatenated Items; Including the items // from the base Resource. func (r *Accounts) GetAllPages(client *sling.Sling) ([]IAccount, error) { diff --git a/pkg/resources/resources.go b/pkg/resources/resources.go index 6757530b..07bb1ff4 100644 --- a/pkg/resources/resources.go +++ b/pkg/resources/resources.go @@ -15,7 +15,7 @@ type Resources[T any] struct { PagedResults } -// GetNextPage retrives the next page from the links collection. If no next page +// GetNextPage retrieves the next page from the links collection. If no next page // exists it will return nill func (r *Resources[T]) GetNextPage(client *sling.Sling) (*Resources[T], error) { if r.Links.PageNext == "" { @@ -28,7 +28,7 @@ func (r *Resources[T]) GetNextPage(client *sling.Sling) (*Resources[T], error) { return response.(*Resources[T]), nil } -// GetAllPages will retrive all remaining next pages in the link collection +// GetAllPages will retrieve all remaining next pages in the link collection // and return the result as list of concatenated Items; Including the items // from the base Resource. func (r *Resources[T]) GetAllPages(client *sling.Sling) ([]T, error) { From 34dbece24d7a51a901f208501af38365805c633e Mon Sep 17 00:00:00 2001 From: Josh Soref <2119212+jsoref@users.noreply.github.com> Date: Fri, 13 Oct 2023 11:33:23 -0400 Subject: [PATCH 15/15] spelling: variable Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com> --- pkg/variables/script_module_service.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkg/variables/script_module_service.go b/pkg/variables/script_module_service.go index 6c3e7984..5bef1a21 100644 --- a/pkg/variables/script_module_service.go +++ b/pkg/variables/script_module_service.go @@ -202,8 +202,8 @@ func (s *ScriptModuleService) Update(scriptModule *ScriptModule) (*ScriptModule, return nil, err } - updatedVriableSet := updatedVariablesResponse.(*VariableSet) - for _, variable := range updatedVriableSet.Variables { + updatedVariableSet := updatedVariablesResponse.(*VariableSet) + for _, variable := range updatedVariableSet.Variables { if strings.HasPrefix(variable.Name, "Octopus.Script.Module[") { scriptModuleResponse.ScriptBody = variable.Value }