Skip to content

Commit

Permalink
Merge branch 'main' into DEVX-2713-part2
Browse files Browse the repository at this point in the history
  • Loading branch information
Alex Plischke authored Jan 29, 2024
2 parents cd5488c + b9c478e commit 05aad53
Show file tree
Hide file tree
Showing 14 changed files with 53 additions and 53 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/codeql.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,20 +24,20 @@ jobs:
language: ["go"]

steps:
- name: Checkout repository
- name: Checkout
uses: actions/checkout@v4

# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
uses: github/codeql-action/init@v2
uses: github/codeql-action/init@v3
with:
languages: ${{ matrix.language }}

# Autobuild attempts to build any compiled languages (C/C++, C#, Go, or Java).
- name: Autobuild
uses: github/codeql-action/autobuild@v2
uses: github/codeql-action/autobuild@v3

- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@v2
uses: github/codeql-action/analyze@v3
with:
category: "/language:${{matrix.language}}"
2 changes: 1 addition & 1 deletion .github/workflows/docker-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
label: ${{ steps.meta.outputs.labels }}
version: ${{ steps.set_version.outputs.version }}
steps:
- name: Check out the repo
- name: Checkout
uses: actions/checkout@v4
- name: Set Release Version
id: set_version
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
git fetch --prune --unshallow
- name: Set up Go
uses: actions/setup-go@v4
uses: actions/setup-go@v5
with:
go-version: "1.21"

Expand Down
57 changes: 29 additions & 28 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,12 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Setup Go
uses: actions/setup-go@v4
uses: actions/setup-go@v5
with:
go-version: "1.21"
cache: true

- name: Checkout Code
- name: Checkout
uses: actions/checkout@v4

- name: Lint
Expand All @@ -34,11 +35,11 @@ jobs:
test:
runs-on: ubuntu-latest
steps:
- name: Checkout Code
- name: Checkout
uses: actions/checkout@v4

- name: Setup Go
uses: actions/setup-go@v4
uses: actions/setup-go@v5
with:
go-version: "1.21"
cache: true
Expand All @@ -53,7 +54,7 @@ jobs:
check-schema:
runs-on: ubuntu-latest
steps:
- name: Checkout Code
- name: Checkout
uses: actions/checkout@v4

- name: Setup Node.js
Expand Down Expand Up @@ -83,7 +84,7 @@ jobs:
uses: actions/checkout@v4

- name: Setup Go
uses: actions/setup-go@v4
uses: actions/setup-go@v5
with:
go-version: "1.21"
cache: true
Expand All @@ -98,13 +99,13 @@ jobs:
GOOS=windows GOARCH=amd64 go build cmd/saucectl/saucectl.go
- name: Check GoReleaser Config
uses: goreleaser/goreleaser-action@v3
uses: goreleaser/goreleaser-action@v5
with:
version: latest
args: check

- name: Upload Binary
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: saucectlbin
path: |
Expand All @@ -120,7 +121,7 @@ jobs:
uses: actions/checkout@v4

- name: Download saucectl Binary
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: saucectlbin

Expand All @@ -138,11 +139,11 @@ jobs:
runs-on: ubuntu-latest

steps:
- name: Checkout Code
- name: Checkout
uses: actions/checkout@v4

- name: Download saucectl Binary
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: saucectlbin

Expand All @@ -160,11 +161,11 @@ jobs:
runs-on: ubuntu-latest

steps:
- name: Checkout Code
- name: Checkout
uses: actions/checkout@v4

- name: Download saucectl Binary
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: saucectlbin

Expand All @@ -182,11 +183,11 @@ jobs:
runs-on: ubuntu-latest

steps:
- name: Checkout Code
- name: Checkout
uses: actions/checkout@v4

- name: Download saucectl Binary
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: saucectlbin

Expand All @@ -206,7 +207,7 @@ jobs:
uses: actions/checkout@v4

- name: Download saucectl Binary
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: saucectlbin

Expand Down Expand Up @@ -240,7 +241,7 @@ jobs:
uses: actions/checkout@v4

- name: Download saucectl Binary
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: saucectlbin

Expand All @@ -256,11 +257,11 @@ jobs:
BUILD_ENV: GitHub Actions

steps:
- name: Checkout Code
- name: Checkout
uses: actions/checkout@v4

- name: Download saucectl Binary
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: saucectlbin

Expand Down Expand Up @@ -293,7 +294,7 @@ jobs:
uses: actions/checkout@v4

- name: Download saucectl Binary
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: saucectlbin

Expand Down Expand Up @@ -327,11 +328,11 @@ jobs:
BUILD_ENV: GitHub Actions

steps:
- name: Checkout Code
- name: Checkout
uses: actions/checkout@v4

- name: Download saucectl Binary
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: saucectlbin

Expand All @@ -347,11 +348,11 @@ jobs:
runs-on: ubuntu-latest

steps:
- name: Checkout Code
- name: Checkout
uses: actions/checkout@v4

- name: Download saucectl Binary
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: saucectlbin

Expand All @@ -369,11 +370,11 @@ jobs:
runs-on: ubuntu-latest

steps:
- name: Checkout Code
- name: Checkout
uses: actions/checkout@v4

- name: Download saucectl Binary
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: saucectlbin

Expand All @@ -388,11 +389,11 @@ jobs:
runs-on: ubuntu-latest

steps:
- name: Checkout Code
- name: Checkout
uses: actions/checkout@v4

- name: Download saucectl Binary
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: saucectlbin

Expand Down
2 changes: 1 addition & 1 deletion internal/cmd/artifacts/list.go
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@ func renderTable(lst artifacts.List) {
}
t.SuppressEmptyColumns()

println(t.Render())
fmt.Println(t.Render())
}

func renderJSON(val any) error {
Expand Down
2 changes: 1 addition & 1 deletion internal/cmd/artifacts/upload.go
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ func UploadCommand() *cobra.Command {

switch out {
case "text":
println("Success!")
fmt.Println("Success!")
case "json":
if err := renderJSON(filePath); err != nil {
return fmt.Errorf("failed to render output: %w", err)
Expand Down
14 changes: 7 additions & 7 deletions internal/cmd/configure/cmd.go
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ func Command() *cobra.Command {
}

func printCreds(creds iam.Credentials) {
println()
fmt.Println()

labelStyle := color.New(color.Bold)
valueStyle := color.New(color.FgBlue)
Expand All @@ -64,11 +64,11 @@ func printCreds(creds iam.Credentials) {
fmt.Println(labelStyle.Sprint("\t Username:"), valueStyle.Sprint(creds.Username))
fmt.Println(labelStyle.Sprint("\tAccess key:"), valueStyle.Sprint(mask(creds.AccessKey)))

println()
fmt.Println()
fmt.Printf("Collected from: %s", creds.Source)

println()
println()
fmt.Println()
fmt.Println()
}

// interactiveConfiguration expect user to manually type-in its credentials
Expand Down Expand Up @@ -134,11 +134,11 @@ func interactiveConfiguration() (iam.Credentials, error) {
},
}

println() // visual paragraph break
fmt.Println() // visual paragraph break
if err = survey.Ask(qs, &creds); err != nil {
return creds, err
}
println() // visual paragraph break
fmt.Println() // visual paragraph break
}

return creds, nil
Expand Down Expand Up @@ -168,7 +168,7 @@ func Run() error {
if err := credentials.ToFile(creds); err != nil {
return fmt.Errorf("unable to save credentials: %s", err)
}
println("You're all set!")
fmt.Println("You're all set!")
return nil
}

Expand Down
3 changes: 1 addition & 2 deletions internal/cmd/imagerunner/artifacts.go
Original file line number Diff line number Diff line change
Expand Up @@ -194,9 +194,8 @@ func renderTable(lst imagerunner.ArtifactList) {
// the order of values must match the order of the header
t.AppendRow(table.Row{item})
}
t.SuppressEmptyColumns()

println(t.Render())
fmt.Println(t.Render())
}

func renderJSON(val any) error {
Expand Down
4 changes: 2 additions & 2 deletions internal/cmd/ini/common.go
Original file line number Diff line number Diff line change
Expand Up @@ -94,12 +94,12 @@ func saveSauceIgnore(content string) error {
}

func displaySummary(files []string) {
println()
fmt.Println()
color.HiGreen("The following files have been created:")
for _, f := range files {
color.Green(" %s", f)
}
println()
fmt.Println()
}

func displayExtraInfo(framework string) {
Expand Down
4 changes: 2 additions & 2 deletions internal/cmd/ini/imagerunner.go
Original file line number Diff line number Diff line change
Expand Up @@ -82,9 +82,9 @@ func configureImageRunner(cfg *initConfig) interface{} {
}

func displayExtraInfoImageRunner() {
println()
fmt.Println()
color.HiGreen("Before running your tests, you need to set the following environment variables:")
color.Green(" - DOCKER_USERNAME")
color.Green(" - DOCKER_PASSWORD")
println()
fmt.Println()
}
2 changes: 1 addition & 1 deletion internal/cmd/jobs/get.go
Original file line number Diff line number Diff line change
Expand Up @@ -92,5 +92,5 @@ func renderJobTable(job job.Job) {
})
t.SuppressEmptyColumns()

println(t.Render())
fmt.Println(t.Render())
}
2 changes: 1 addition & 1 deletion internal/cmd/jobs/list.go
Original file line number Diff line number Diff line change
Expand Up @@ -189,7 +189,7 @@ func renderTable(lst cjob.List) {
fmt.Sprintf("Size: %d", lst.Size),
})

println(t.Render())
fmt.Println(t.Render())
}

func renderJSON(val any) error {
Expand Down
2 changes: 1 addition & 1 deletion internal/cmd/storage/delete.go
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ func DeleteCommand() *cobra.Command {
return fmt.Errorf("failed to delete file: %v", err)
}

println("File deleted successfully!")
fmt.Println("File deleted successfully!")

return nil
},
Expand Down
2 changes: 1 addition & 1 deletion internal/cmd/storage/list.go
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,7 @@ func renderTable(list storage.List) {
t.AppendRow(table.Row{item.Size, item.Uploaded, item.ID, item.Name})
}

println(t.Render())
fmt.Println(t.Render())

if list.Truncated {
println("\nYour query returned more files than we can display. Please refine your query.")
Expand Down

0 comments on commit 05aad53

Please sign in to comment.