mirror of
https://github.com/turbot/steampipe.git
synced 2025-12-19 18:12:43 -05:00
chore: remove repetitive words (#4247)
Signed-off-by: momantech <cuimoman@qq.com>
This commit is contained in:
@@ -20,7 +20,7 @@ type Query struct {}
|
|||||||
// Only add keys which are not nil
|
// Only add keys which are not nil
|
||||||
func (t *Query) ConfigMap() map[string]interface{} {}
|
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
|
// i.e. if a property is set in otherOptions, it takes precedence
|
||||||
func (t *Query) Merge(otherOptions Options) {
|
func (t *Query) Merge(otherOptions Options) {
|
||||||
// make sure this is the type we want
|
// make sure this is the type we want
|
||||||
|
|||||||
@@ -22,7 +22,7 @@ func writePasswordFile(password string) error {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// readPasswordFile reads the password file and returns it contents.
|
// 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
|
// password and writes it to the password file, before returning it
|
||||||
func readPasswordFile() (string, error) {
|
func readPasswordFile() (string, error) {
|
||||||
if !filehelpers.FileExists(filepaths.GetPasswordFileLocation()) {
|
if !filehelpers.FileExists(filepaths.GetPasswordFileLocation()) {
|
||||||
|
|||||||
@@ -57,7 +57,7 @@ func (t *Check) ConfigMap() map[string]interface{} {
|
|||||||
return res
|
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
|
// i.e. if a property is set in otherOptions, it takes precedence
|
||||||
func (t *Check) Merge(otherOptions Options) {
|
func (t *Check) Merge(otherOptions Options) {
|
||||||
switch o := otherOptions.(type) {
|
switch o := otherOptions.(type) {
|
||||||
|
|||||||
@@ -41,7 +41,7 @@ func (d *WorkspaceProfileDashboard) ConfigMap() map[string]interface{} {
|
|||||||
return res
|
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
|
// i.e. if a property is set in otherOptions, it takes precedence
|
||||||
func (d *WorkspaceProfileDashboard) Merge(otherOptions Options) {
|
func (d *WorkspaceProfileDashboard) Merge(otherOptions Options) {
|
||||||
if _, ok := otherOptions.(*WorkspaceProfileDashboard); !ok {
|
if _, ok := otherOptions.(*WorkspaceProfileDashboard); !ok {
|
||||||
@@ -86,7 +86,7 @@ func (d *GlobalDashboard) ConfigMap() map[string]interface{} {
|
|||||||
return res
|
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
|
// i.e. if a property is set in otherOptions, it takes precedence
|
||||||
func (d *GlobalDashboard) Merge(otherOptions Options) {
|
func (d *GlobalDashboard) Merge(otherOptions Options) {
|
||||||
switch o := otherOptions.(type) {
|
switch o := otherOptions.(type) {
|
||||||
|
|||||||
@@ -54,7 +54,7 @@ func (d *Database) ConfigMap() map[string]interface{} {
|
|||||||
return res
|
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
|
// i.e. if a property is set in otherOptions, it takes precedence
|
||||||
func (d *Database) Merge(otherOptions Options) {
|
func (d *Database) Merge(otherOptions Options) {
|
||||||
switch o := otherOptions.(type) {
|
switch o := otherOptions.(type) {
|
||||||
|
|||||||
@@ -70,7 +70,7 @@ func (t *Query) ConfigMap() map[string]interface{} {
|
|||||||
return res
|
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
|
// i.e. if a property is set in otherOptions, it takes precedence
|
||||||
func (t *Query) Merge(otherOptions Options) {
|
func (t *Query) Merge(otherOptions Options) {
|
||||||
if _, ok := otherOptions.(*Query); !ok {
|
if _, ok := otherOptions.(*Query); !ok {
|
||||||
|
|||||||
@@ -55,7 +55,7 @@ func (t *Terminal) ConfigMap() map[string]interface{} {
|
|||||||
return res
|
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
|
// i.e. if a property is set in otherOptions, it takes precedence
|
||||||
func (t *Terminal) Merge(otherOptions Options) {
|
func (t *Terminal) Merge(otherOptions Options) {
|
||||||
switch o := otherOptions.(type) {
|
switch o := otherOptions.(type) {
|
||||||
|
|||||||
Reference in New Issue
Block a user