Skip to content

Commit

Permalink
fix: corrected naems in github actions, updated readme
Browse files Browse the repository at this point in the history
  • Loading branch information
drew-viles authored Jul 5, 2023
1 parent 5884c1e commit 4e2e40e
Show file tree
Hide file tree
Showing 5 changed files with 17 additions and 10 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/pull_request.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ jobs:
packages: write
id-token: write
steps:
- name: Build Local Container
- name: Build Local Image
uses: eschercloudai/container-security-action@v0.0.1-beta.2
if: github.event_name != 'pull_request'
id: build-and-scan
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/push.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ jobs:
packages: write
id-token: write
steps:
- name: Build Local Container
- name: Build Local Image
uses: eschercloudai/container-security-action@v0.0.1-beta.2
if: github.event_name != 'pull_request'
id: build-and-scan
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/tag.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ jobs:
packages: write
id-token: write
steps:
- name: Build Local Container
- name: Build Image
uses: eschercloudai/container-security-action@v0.0.1-beta.2
if: github.event_name != 'pull_request'
id: build-and-scan
Expand Down
7 changes: 7 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,13 @@ In the [example config](baski-example.yaml), not all fields are required and any
blank - unless the fields are enabled by a bool, for example in the Nvidia options where none are required
if `enable-nvidia-support` is set to false,

The following are valid locations for the `baski.yaml` config file are:
```shell
/tmp/
/etc/baski/
$HOME/.baski/
```

### More info

For more flags and more info, run `baski --help`
Expand Down
14 changes: 7 additions & 7 deletions pkg/trivy/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -80,19 +80,19 @@ func fetchTrivyFileFromS3(endpoint string, accessKey string, secretKey string, b
s3 := simples3.New("us-east-1", accessKey, secretKey)
s3.SetEndpoint(endpoint)

// You can also download the file.
file, _ := s3.FileDownload(simples3.DownloadInput{
// Download the file.
file, err := s3.FileDownload(simples3.DownloadInput{
Bucket: bucket,
ObjectKey: key,
})

data, err := io.ReadAll(file)
if err != nil {
return nil, err
return nil, fmt.Errorf("failed to download file from S3: %v", err)
}
err = file.Close()
defer file.Close()

data, err := io.ReadAll(file)
if err != nil {
return nil, err
return nil, fmt.Errorf("failed to read file contents: %v", err)
}

return data, nil
Expand Down

0 comments on commit 4e2e40e

Please sign in to comment.