diff --git a/design/adding_to_workspace_profile.md b/design/adding_to_workspace_profile.md index e36377871..afd753775 100644 --- a/design/adding_to_workspace_profile.md +++ b/design/adding_to_workspace_profile.md @@ -20,7 +20,7 @@ type Query struct {} // Only add keys which are not nil func (t *Query) ConfigMap() map[string]interface{} {} -// Merge :: merge other options over the the top of this options object +// Merge :: merge other options over the top of this options object // i.e. if a property is set in otherOptions, it takes precedence func (t *Query) Merge(otherOptions Options) { // make sure this is the type we want diff --git a/pkg/db/db_local/password.go b/pkg/db/db_local/password.go index a528ee027..bfc5e0d04 100644 --- a/pkg/db/db_local/password.go +++ b/pkg/db/db_local/password.go @@ -22,7 +22,7 @@ func writePasswordFile(password string) error { } // readPasswordFile reads the password file and returns it contents. -// the the password file could not be found, then it generates a new +// the password file could not be found, then it generates a new // password and writes it to the password file, before returning it func readPasswordFile() (string, error) { if !filehelpers.FileExists(filepaths.GetPasswordFileLocation()) { diff --git a/pkg/steampipeconfig/options/check.go b/pkg/steampipeconfig/options/check.go index 0c3402040..80d5ee727 100644 --- a/pkg/steampipeconfig/options/check.go +++ b/pkg/steampipeconfig/options/check.go @@ -57,7 +57,7 @@ func (t *Check) ConfigMap() map[string]interface{} { return res } -// Merge :: merge other options over the the top of this options object +// Merge :: merge other options over the top of this options object // i.e. if a property is set in otherOptions, it takes precedence func (t *Check) Merge(otherOptions Options) { switch o := otherOptions.(type) { diff --git a/pkg/steampipeconfig/options/dashboard.go b/pkg/steampipeconfig/options/dashboard.go index cace46bf1..bde3d8f26 100644 --- a/pkg/steampipeconfig/options/dashboard.go +++ b/pkg/steampipeconfig/options/dashboard.go @@ -41,7 +41,7 @@ func (d *WorkspaceProfileDashboard) ConfigMap() map[string]interface{} { return res } -// Merge :: merge other options over the the top of this options object +// Merge :: merge other options over the top of this options object // i.e. if a property is set in otherOptions, it takes precedence func (d *WorkspaceProfileDashboard) Merge(otherOptions Options) { if _, ok := otherOptions.(*WorkspaceProfileDashboard); !ok { @@ -86,7 +86,7 @@ func (d *GlobalDashboard) ConfigMap() map[string]interface{} { return res } -// Merge :: merge other options over the the top of this options object +// Merge :: merge other options over the top of this options object // i.e. if a property is set in otherOptions, it takes precedence func (d *GlobalDashboard) Merge(otherOptions Options) { switch o := otherOptions.(type) { diff --git a/pkg/steampipeconfig/options/database.go b/pkg/steampipeconfig/options/database.go index 8b757b169..e94ad1a47 100644 --- a/pkg/steampipeconfig/options/database.go +++ b/pkg/steampipeconfig/options/database.go @@ -54,7 +54,7 @@ func (d *Database) ConfigMap() map[string]interface{} { return res } -// Merge :: merge other options over the the top of this options object +// Merge :: merge other options over the top of this options object // i.e. if a property is set in otherOptions, it takes precedence func (d *Database) Merge(otherOptions Options) { switch o := otherOptions.(type) { diff --git a/pkg/steampipeconfig/options/query.go b/pkg/steampipeconfig/options/query.go index 88d02e7eb..1d6186c02 100644 --- a/pkg/steampipeconfig/options/query.go +++ b/pkg/steampipeconfig/options/query.go @@ -70,7 +70,7 @@ func (t *Query) ConfigMap() map[string]interface{} { return res } -// Merge :: merge other options over the the top of this options object +// Merge :: merge other options over the top of this options object // i.e. if a property is set in otherOptions, it takes precedence func (t *Query) Merge(otherOptions Options) { if _, ok := otherOptions.(*Query); !ok { diff --git a/pkg/steampipeconfig/options/terminal.go b/pkg/steampipeconfig/options/terminal.go index 0ccd8b2a7..293c7f2a0 100644 --- a/pkg/steampipeconfig/options/terminal.go +++ b/pkg/steampipeconfig/options/terminal.go @@ -55,7 +55,7 @@ func (t *Terminal) ConfigMap() map[string]interface{} { return res } -// merge other options over the the top of this options object +// merge other options over the top of this options object // i.e. if a property is set in otherOptions, it takes precedence func (t *Terminal) Merge(otherOptions Options) { switch o := otherOptions.(type) {