Skip to content

Commit

Permalink
Merge branch 'main' into #35-overwrite-images
Browse files Browse the repository at this point in the history
  • Loading branch information
wolfganghuse authored Nov 7, 2022
2 parents ecad8de + bf659ad commit 795b64a
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 40 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/integration.yml
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ jobs:
run: make build

- name: Trivy scan
uses: aquasecurity/trivy-action@0.7.1
uses: aquasecurity/trivy-action@0.8.0
with:
scan-type: "fs"
ignore-unfixed: true
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/trivy-scan.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
uses: actions/checkout@v3

- name: Run Trivy vulnerability scanner
uses: aquasecurity/trivy-action@0.7.1
uses: aquasecurity/trivy-action@0.8.0
with:
scan-type: "fs"
format: "sarif"
Expand Down
6 changes: 3 additions & 3 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
module github.com/nutanix-cloud-native/packer-plugin-nutanix

go 1.17
go 1.19

replace (
github.com/hashicorp/consul => github.com/hashicorp/consul v1.10.4
github.com/hashicorp/vault => github.com/hashicorp/vault v1.4.2
)

require (
github.com/hashicorp/hcl/v2 v2.14.0
github.com/hashicorp/hcl/v2 v2.14.1
github.com/hashicorp/packer-plugin-sdk v0.3.2
github.com/nutanix-cloud-native/prism-go-client v0.2.0
github.com/zclconf/go-cty v1.10.0
Expand Down Expand Up @@ -94,7 +94,7 @@ require (
golang.org/x/oauth2 v0.0.0-20210819190943-2bc19b11175f // indirect
golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10 // indirect
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 // indirect
golang.org/x/text v0.3.7 // indirect
golang.org/x/text v0.4.0 // indirect
golang.org/x/time v0.0.0-20210723032227-1f47c861a9ac // indirect
google.golang.org/api v0.56.0 // indirect
google.golang.org/appengine v1.6.7 // indirect
Expand Down
Loading

0 comments on commit 795b64a

Please sign in to comment.