Skip to content

Commit 695a8ca

Browse files
author
Matt Primrose
committed
Merge branch 'main' into cira
2 parents 806a644 + c91532b commit 695a8ca

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

47 files changed

+1298
-537
lines changed

.github/workflows/api-test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
with:
2020
egress-policy: audit
2121

22-
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
22+
- uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
2323
- run: cp .env.example .env
2424
- run: docker compose up -d --build
2525

.github/workflows/ci.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
egress-policy: audit
1818

1919
- name: Check out code into the Go module directory
20-
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332
20+
uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938
2121
- name: Format
2222
run: if [ "$(gofmt -s -l . | wc -l)" -gt 0 ]; then exit 1; fi
2323
- name: Run go vet
@@ -33,7 +33,7 @@ jobs:
3333
egress-policy: audit
3434

3535
- name: Check out code into the Go module directory
36-
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332
36+
uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938
3737
- name: golangci-lint
3838
uses: reviewdog/action-golangci-lint@7708105983c614f7a2725e2172908b7709d1c3e4 # v2.6.2
3939
with:
@@ -49,7 +49,7 @@ jobs:
4949
with:
5050
egress-policy: audit
5151

52-
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332
52+
- uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938
5353
- uses: reviewdog/action-yamllint@e09f07780388032a624e9eb44a23fd1bbb4052cc # v1.19.0
5454
with:
5555
fail_on_error: true
@@ -65,7 +65,7 @@ jobs:
6565
with:
6666
egress-policy: audit
6767

68-
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332
68+
- uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938
6969
- uses: dotenv-linter/action-dotenv-linter@9c9a09ba60235ae0b92b2e2ed8f4268ac76d075f # v2.23.0
7070
with:
7171
reporter: github-pr-review
@@ -79,7 +79,7 @@ jobs:
7979
with:
8080
egress-policy: audit
8181

82-
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332
82+
- uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938
8383
- uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32
8484
- name: WriteGoList
8585
run: go list -json -m all > go.list
@@ -105,7 +105,7 @@ jobs:
105105
with:
106106
egress-policy: audit
107107

108-
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332
108+
- uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938
109109
- uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32
110110
with:
111111
go-version: ${{ matrix.go-version }}
@@ -121,7 +121,7 @@ jobs:
121121
cat test_output.txt | go-junit-report -set-exit-code > junit-${{matrix.os}}-${{matrix.go-version}}-${{github.run_attempt}}.xml
122122
if grep -q "FAIL" test_output.txt; then exit 1; fi
123123
- name: Upload Coverage Results
124-
uses: codecov/codecov-action@e28ff129e5465c2c0dcc6f003fc735cb6ae0c673 # v4.5.0
124+
uses: codecov/codecov-action@b9fd7d16f6d7d1b5d2bec1a2887e65ceed900238 # v4.6.0
125125
with:
126126
token: ${{ secrets.CODECOV_TOKEN }}
127127
- name: GitHub Upload Release Artifacts

.github/workflows/codeql-analysis.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -47,11 +47,11 @@ jobs:
4747
egress-policy: audit
4848

4949
- name: Checkout repository
50-
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.0.0
50+
uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.0.0
5151

5252
# Initializes the CodeQL tools for scanning.
5353
- name: Initialize CodeQL
54-
uses: github/codeql-action/init@294a9d92911152fe08befb9ec03e240add280cb3 # v3.26.8
54+
uses: github/codeql-action/init@6db8d6351fd0be61f9ed8ebd12ccd35dcec51fea # v3.26.11
5555
with:
5656
languages: ${{ matrix.language }}
5757
# If you wish to specify custom queries, you can do so here or in a config file.
@@ -62,7 +62,7 @@ jobs:
6262
# Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
6363
# If this step fails, then you should remove it and run the build manually (see below)
6464
- name: Autobuild
65-
uses: github/codeql-action/autobuild@294a9d92911152fe08befb9ec03e240add280cb3 # v3.26.8
65+
uses: github/codeql-action/autobuild@6db8d6351fd0be61f9ed8ebd12ccd35dcec51fea # v3.26.11
6666

6767
# ℹ️ Command-line programs to run using the OS shell.
6868
# 📚 https://git.io/JvXDl
@@ -76,7 +76,7 @@ jobs:
7676
# make release
7777

7878
- name: Perform CodeQL Analysis
79-
uses: github/codeql-action/analyze@294a9d92911152fe08befb9ec03e240add280cb3 # v3.26.8
79+
uses: github/codeql-action/analyze@6db8d6351fd0be61f9ed8ebd12ccd35dcec51fea # v3.26.11
8080
- name: Generate Security Report
8181
continue-on-error: true
8282
uses: rsdmike/github-security-report-action@544ffd6318f4982cb6fe21197e93bebae5ec217e # v3.0.4

.github/workflows/docker-build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
with:
1919
egress-policy: audit
2020

21-
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.0.0
21+
- uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.0.0
2222
- name: Build the Docker image
2323
run: docker build --file Dockerfile --tag vprodemo.azurecr.io/console:latest --tag vprodemo.azurecr.io/console:${{ github.sha }} .
2424
- name: Docker Login

.github/workflows/release.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,11 +27,11 @@ jobs:
2727
egress-policy: audit
2828

2929
- name: Checkout Console
30-
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
30+
uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
3131
with:
3232
persist-credentials: false
3333
- name: Check out Sample Web UI
34-
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # master
34+
uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # master
3535
with:
3636
repository: open-amt-cloud-toolkit/sample-web-ui
3737
ref: main
@@ -50,7 +50,7 @@ jobs:
5050
password: ${{ secrets.DOCKER_PASSWORD }}
5151
logout: true
5252
- name: Semantic Release
53-
uses: cycjimmy/semantic-release-action@cb425203a562475bca039ba4dbf90c7f9ac790f4 # v4.1.0
53+
uses: cycjimmy/semantic-release-action@b1b432f13acb7768e0c8efdec416d363a57546f2 # v4.1.1
5454
with:
5555
semantic_version:
5656
19.0.5 # It is recommended to specify a version range

.github/workflows/scorecards.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ jobs:
3636
egress-policy: audit
3737

3838
- name: "Checkout code"
39-
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.0.0
39+
uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.0.0
4040
with:
4141
persist-credentials: false
4242

@@ -71,6 +71,6 @@ jobs:
7171

7272
# Upload the results to GitHub's code scanning dashboard.
7373
- name: "Upload to code-scanning"
74-
uses: github/codeql-action/upload-sarif@294a9d92911152fe08befb9ec03e240add280cb3 # v3.26.8
74+
uses: github/codeql-action/upload-sarif@6db8d6351fd0be61f9ed8ebd12ccd35dcec51fea # v3.26.11
7575
with:
7676
sarif_file: results.sarif

.github/workflows/semantic.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
with:
1616
egress-policy: audit
1717

18-
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
18+
- uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
1919
with:
2020
fetch-depth: 0
2121
- uses: wagoid/commitlint-github-action@3d28780bbf0365e29b144e272b2121204d5be5f3 # v6.1.2

.github/workflows/trivy-scan.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
with:
2020
egress-policy: audit
2121

22-
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.0.0
22+
- uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.0.0
2323
- name: Build the Docker image
2424

2525
run: docker build . --file Dockerfile --tag app:${{ github.sha }}
@@ -34,7 +34,7 @@ jobs:
3434
vuln-type: "os,library"
3535
severity: "UNKNOWN,LOW,MEDIUM,HIGH,CRITICAL"
3636
- name: Upload Trivy scan results to GitHub Security tab
37-
uses: github/codeql-action/upload-sarif@294a9d92911152fe08befb9ec03e240add280cb3 # v3.26.8
37+
uses: github/codeql-action/upload-sarif@6db8d6351fd0be61f9ed8ebd12ccd35dcec51fea # v3.26.11
3838
if: always()
3939
with:
4040
sarif_file: "trivy-results.sarif"

Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
# Step 1: Modules caching
2-
FROM golang:1.23-alpine3.20@sha256:ac67716dd016429be8d4c2c53a248d7bcdf06d34127d3dc451bda6aa5a87bc06 as modules
2+
FROM golang:1.23-alpine3.20@sha256:9dd2625a1ff2859b8d8b01d8f7822c0f528942fe56cfe7a1e7c38d3b8d72d679 as modules
33
COPY go.mod go.sum /modules/
44
WORKDIR /modules
55
RUN apk add --no-cache git
66
RUN go mod download
77

88
# Step 2: Builder
9-
FROM golang:1.23-alpine3.20@sha256:ac67716dd016429be8d4c2c53a248d7bcdf06d34127d3dc451bda6aa5a87bc06 as builder
9+
FROM golang:1.23-alpine3.20@sha256:9dd2625a1ff2859b8d8b01d8f7822c0f528942fe56cfe7a1e7c38d3b8d72d679 as builder
1010
COPY --from=modules /go/pkg /go/pkg
1111
COPY . /app
1212
WORKDIR /app

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ require (
7070
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
7171
github.com/modern-go/reflect2 v1.0.2 // indirect
7272
github.com/ncruces/go-strftime v0.1.9 // indirect
73-
github.com/open-amt-cloud-toolkit/go-wsman-messages/v2 v2.15.2
73+
github.com/open-amt-cloud-toolkit/go-wsman-messages/v2 v2.15.3
7474
github.com/pelletier/go-toml/v2 v2.2.2 // indirect
7575
github.com/pmezard/go-difflib v1.0.0 // indirect
7676
github.com/prometheus/client_model v0.6.1 // indirect

0 commit comments

Comments
 (0)