Skip to content

Commit 8bcb86d

Browse files
itayskitaysk
committed
?
1 parent a645ba0 commit 8bcb86d

File tree

8 files changed

+26
-26
lines changed

8 files changed

+26
-26
lines changed

‎pkg/commands/artifact/run.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -340,7 +340,7 @@ func Run(ctx context.Context, opts flag.Options, targetKind TargetKind) (err err
340340

341341
defer func() {
342342
if errors.Is(err, context.DeadlineExceeded) {
343-
// e.g. https://aquasecurity.github.io/trivy/latest/docs/configuration/
343+
// e.g. https://trivy.dev/latest/docs/configuration/
344344
log.WarnContext(ctx, fmt.Sprintf("Provide a higher timeout value, see %s", doc.URL("/docs/configuration/", "")))
345345
}
346346
}()
@@ -529,7 +529,7 @@ func (r *runner) initScannerConfig(ctx context.Context, opts flag.Options) (Scan
529529
logger := log.WithPrefix(log.PrefixSecret)
530530
logger.Info("Secret scanning is enabled")
531531
logger.Info("If your scanning is slow, please try '--scanners vuln' to disable secret scanning")
532-
// e.g. https://aquasecurity.github.io/trivy/latest/docs/scanner/secret/#recommendation
532+
// e.g. https://trivy.dev/latest/docs/scanner/secret/#recommendation
533533
logger.Info(fmt.Sprintf("Please see also %s for faster secret detection", doc.URL("/docs/scanner/secret/", "recommendation")))
534534
} else {
535535
opts.SecretConfigPath = ""

‎pkg/dependency/parser/java/pom/artifact.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ var (
2020
varRegexp = regexp.MustCompile(`\${(\S+?)}`)
2121
emptyVersionWarn = sync.OnceFunc(func() {
2222
log.WithPrefix("pom").Warn("Dependency version cannot be determined. Child dependencies will not be found.",
23-
// e.g. https://aquasecurity.github.io/trivy/latest/docs/coverage/language/java/#empty-dependency-version
23+
// e.g. https://trivy.dev/latest/docs/coverage/language/java/#empty-dependency-version
2424
log.String("details", doc.URL("/docs/coverage/language/java/", "empty-dependency-version")))
2525
})
2626
)

‎pkg/fanal/analyzer/language/conda/environment/environment.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ func (*parser) Parse(r xio.ReadSeekerAt) ([]types.Package, []types.Dependency, e
4343
if err != nil {
4444
// Show log once per file
4545
once.Do(func() {
46-
// e.g. https://aquasecurity.github.io/trivy/latest/docs/coverage/os/conda/#license_1
46+
// e.g. https://trivy.dev/latest/docs/coverage/os/conda/#license_1
4747
log.WithPrefix("conda").Debug(fmt.Sprintf("License not found. See %s for details.", doc.URL("docs/coverage/os/conda/", "license_1")),
4848
log.String("pkg", pkg.Name), log.Err(err))
4949
})

‎pkg/k8s/commands/run.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ func Run(ctx context.Context, args []string, opts flag.Options) error {
4141
defer func() {
4242
cancel()
4343
if errors.Is(err, context.DeadlineExceeded) {
44-
// e.g. https://aquasecurity.github.io/trivy/latest/docs/configuration
44+
// e.g. https://trivy.dev/latest/docs/configuration
4545
log.WarnContext(ctx, fmt.Sprintf("Provide a higher timeout value, see %s", doc.URL("/docs/configuration/", "")))
4646
}
4747
}()

‎pkg/oci/artifact.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -256,7 +256,7 @@ func shouldTryOtherRepo(err error) bool {
256256
for _, diagnostic := range terr.Errors {
257257
// For better user experience
258258
if diagnostic.Code == transport.DeniedErrorCode || diagnostic.Code == transport.UnauthorizedErrorCode {
259-
// e.g. https://aquasecurity.github.io/trivy/latest/docs/references/troubleshooting/#db
259+
// e.g. https://trivy.dev/latest/docs/references/troubleshooting/#db
260260
log.Warnf("See %s", doc.URL("/docs/references/troubleshooting/", "db"))
261261
break
262262
}

‎pkg/sbom/spdx/marshal_test.go

+8-8
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,7 @@ func TestMarshaler_Marshal(t *testing.T) {
170170
DataLicense: spdx.DataLicense,
171171
SPDXIdentifier: "DOCUMENT",
172172
DocumentName: "rails:latest",
173-
DocumentNamespace: "http://aquasecurity.github.io/trivy/container_image/rails:latest-3ff14136-e09f-4df9-80ea-000000000009",
173+
DocumentNamespace: "http://trivy.dev/container_image/rails:latest-3ff14136-e09f-4df9-80ea-000000000009",
174174
CreationInfo: &spdx.CreationInfo{
175175
Creators: []common.Creator{
176176
{
@@ -492,7 +492,7 @@ func TestMarshaler_Marshal(t *testing.T) {
492492
DataLicense: spdx.DataLicense,
493493
SPDXIdentifier: "DOCUMENT",
494494
DocumentName: "centos:latest",
495-
DocumentNamespace: "http://aquasecurity.github.io/trivy/container_image/centos:latest-3ff14136-e09f-4df9-80ea-000000000006",
495+
DocumentNamespace: "http://trivy.dev/container_image/centos:latest-3ff14136-e09f-4df9-80ea-000000000006",
496496
CreationInfo: &spdx.CreationInfo{
497497
Creators: []common.Creator{
498498
{
@@ -725,7 +725,7 @@ func TestMarshaler_Marshal(t *testing.T) {
725725
DataLicense: spdx.DataLicense,
726726
SPDXIdentifier: "DOCUMENT",
727727
DocumentName: "masahiro331/CVE-2021-41098",
728-
DocumentNamespace: "http://aquasecurity.github.io/trivy/filesystem/masahiro331/CVE-2021-41098-3ff14136-e09f-4df9-80ea-000000000006",
728+
DocumentNamespace: "http://trivy.dev/filesystem/masahiro331/CVE-2021-41098-3ff14136-e09f-4df9-80ea-000000000006",
729729
CreationInfo: &spdx.CreationInfo{
730730
Creators: []common.Creator{
731731
{
@@ -1026,7 +1026,7 @@ func TestMarshaler_Marshal(t *testing.T) {
10261026
DataLicense: spdx.DataLicense,
10271027
SPDXIdentifier: "DOCUMENT",
10281028
DocumentName: "log4j-core-2.17.0.jar",
1029-
DocumentNamespace: "http://aquasecurity.github.io/trivy/filesystem/log4j-core-2.17.0.jar-3ff14136-e09f-4df9-80ea-000000000003",
1029+
DocumentNamespace: "http://trivy.dev/filesystem/log4j-core-2.17.0.jar-3ff14136-e09f-4df9-80ea-000000000003",
10301030
CreationInfo: &spdx.CreationInfo{
10311031
Creators: []common.Creator{
10321032
{
@@ -1128,7 +1128,7 @@ func TestMarshaler_Marshal(t *testing.T) {
11281128
DataLicense: spdx.DataLicense,
11291129
SPDXIdentifier: "DOCUMENT",
11301130
DocumentName: "http://test-aggregate",
1131-
DocumentNamespace: "http://aquasecurity.github.io/trivy/repository/test-aggregate-3ff14136-e09f-4df9-80ea-000000000003",
1131+
DocumentNamespace: "http://trivy.dev/repository/test-aggregate-3ff14136-e09f-4df9-80ea-000000000003",
11321132
CreationInfo: &spdx.CreationInfo{
11331133
Creators: []common.Creator{
11341134
{
@@ -1222,7 +1222,7 @@ func TestMarshaler_Marshal(t *testing.T) {
12221222
DataLicense: spdx.DataLicense,
12231223
SPDXIdentifier: "DOCUMENT",
12241224
DocumentName: "empty/path",
1225-
DocumentNamespace: "http://aquasecurity.github.io/trivy/filesystem/empty/path-3ff14136-e09f-4df9-80ea-000000000002",
1225+
DocumentNamespace: "http://trivy.dev/filesystem/empty/path-3ff14136-e09f-4df9-80ea-000000000002",
12261226

12271227
CreationInfo: &spdx.CreationInfo{
12281228
Creators: []common.Creator{
@@ -1285,7 +1285,7 @@ func TestMarshaler_Marshal(t *testing.T) {
12851285
DataLicense: spdx.DataLicense,
12861286
SPDXIdentifier: "DOCUMENT",
12871287
DocumentName: "secret",
1288-
DocumentNamespace: "http://aquasecurity.github.io/trivy/filesystem/secret-3ff14136-e09f-4df9-80ea-000000000002",
1288+
DocumentNamespace: "http://trivy.dev/filesystem/secret-3ff14136-e09f-4df9-80ea-000000000002",
12891289
CreationInfo: &spdx.CreationInfo{
12901290
Creators: []common.Creator{
12911291
{
@@ -1357,7 +1357,7 @@ func TestMarshaler_Marshal(t *testing.T) {
13571357
DataLicense: spdx.DataLicense,
13581358
SPDXIdentifier: "DOCUMENT",
13591359
DocumentName: "go-artifact",
1360-
DocumentNamespace: "http://aquasecurity.github.io/trivy/filesystem/go-artifact-3ff14136-e09f-4df9-80ea-000000000005",
1360+
DocumentNamespace: "http://trivy.dev/filesystem/go-artifact-3ff14136-e09f-4df9-80ea-000000000005",
13611361
CreationInfo: &spdx.CreationInfo{
13621362
Creators: []common.Creator{
13631363
{

‎pkg/version/doc/doc_test.go

+11-11
Original file line numberDiff line numberDiff line change
@@ -17,32 +17,32 @@ func TestBaseURL(t *testing.T) {
1717
{
1818
name: "dev",
1919
ver: "dev",
20-
want: "https://aquasecurity.github.io/trivy/dev",
20+
want: "https://trivy.dev/dev",
2121
},
2222
{
2323
name: "semver",
2424
ver: "0.52.0",
25-
want: "https://aquasecurity.github.io/trivy/v0.52",
25+
want: "https://trivy.dev/v0.52",
2626
},
2727
{
2828
name: "with v prefix",
2929
ver: "v0.52.0",
30-
want: "https://aquasecurity.github.io/trivy/v0.52",
30+
want: "https://trivy.dev/v0.52",
3131
},
3232
{
3333
name: "pre-release",
3434
ver: "0.52.0-beta1",
35-
want: "https://aquasecurity.github.io/trivy/dev",
35+
want: "https://trivy.dev/dev",
3636
},
3737
{
3838
name: "non-semver",
3939
ver: "1",
40-
want: "https://aquasecurity.github.io/trivy/dev",
40+
want: "https://trivy.dev/dev",
4141
},
4242
{
4343
name: "empty",
4444
ver: "",
45-
want: "https://aquasecurity.github.io/trivy/dev",
45+
want: "https://trivy.dev/dev",
4646
},
4747
}
4848
for _, tt := range tests {
@@ -63,28 +63,28 @@ func TestURL(t *testing.T) {
6363
{
6464
name: "path without slash",
6565
rawPath: "foo",
66-
want: "https://aquasecurity.github.io/trivy/dev/foo",
66+
want: "https://trivy.dev/dev/foo",
6767
},
6868
{
6969
name: "path with leading slash",
7070
rawPath: "/foo",
71-
want: "https://aquasecurity.github.io/trivy/dev/foo",
71+
want: "https://trivy.dev/dev/foo",
7272
},
7373
{
7474
name: "path with slash",
7575
rawPath: "foo/bar",
76-
want: "https://aquasecurity.github.io/trivy/dev/foo/bar",
76+
want: "https://trivy.dev/dev/foo/bar",
7777
},
7878
{
7979
name: "path with fragment",
8080
rawPath: "foo",
8181
fragment: "bar",
82-
want: "https://aquasecurity.github.io/trivy/dev/foo#bar",
82+
want: "https://trivy.dev/dev/foo#bar",
8383
},
8484
{
8585
name: "empty",
8686
rawPath: "",
87-
want: "https://aquasecurity.github.io/trivy/dev",
87+
want: "https://trivy.dev/dev",
8888
},
8989
}
9090
for _, tt := range tests {

‎pkg/vulnerability/vulnerability.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ var SuperSet = wire.NewSet(
5252
// Show warning if we use severity from another vendor
5353
// cf. https://github.com/aquasecurity/trivy/issues/6714
5454
var onceWarn = sync.OnceFunc(func() {
55-
// e.g. https://aquasecurity.github.io/trivy/latest/docs/scanner/vulnerability/#severity-selection
55+
// e.g. https://trivy.dev/latest/docs/scanner/vulnerability/#severity-selection
5656
log.Warnf("Using severities from other vendors for some vulnerabilities. Read %s for details.", doc.URL("/docs/scanner/vulnerability/", "severity-selection"))
5757
})
5858

0 commit comments

Comments
 (0)