Skip to content

Commit 1189d53

Browse files
authored
Merge pull request #295 from tschmidtb51/build-require-go-1.19.1
Build require go 1.19.1
2 parents 3e09094 + 6b9ecea commit 1189d53

8 files changed

Lines changed: 13 additions & 333 deletions

File tree

.github/workflows/go.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
- name: Set up Go
1515
uses: actions/setup-go@v2
1616
with:
17-
go-version: 1.17
17+
go-version: 1.19.1
1818

1919
- name: Build
2020
run: go build -v ./cmd/...

.github/workflows/itest.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ jobs:
99
- name: Set up Go
1010
uses: actions/setup-go@v2
1111
with:
12-
go-version: 1.17
12+
go-version: 1.19.1
1313

1414
- name: Checkout
1515
uses: actions/checkout@v3

.github/workflows/release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
- name: Set up Go
1616
uses: actions/setup-go@v3
1717
with:
18-
go-version: '^1.18.2'
18+
go-version: '^1.19.1'
1919

2020
- name: Build
2121
run: make dist

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ Download the binaries from the most recent release assets on Github.
3434

3535
### Build from sources
3636

37-
- A recent version of **Go** (1.17+) should be installed. [Go installation](https://go.dev/doc/install)
37+
- A recent version of **Go** (1.19.1+) should be installed. [Go installation](https://go.dev/doc/install)
3838

3939
- Clone the repository `git clone https://github.com/csaf-poc/csaf_distribution.git `
4040

cmd/csaf_checker/processor.go

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -392,7 +392,7 @@ func (p *processor) integrity(
392392
if u.IsAbs() {
393393
return u
394394
}
395-
return util.JoinURLPath(b, u.String())
395+
return b.JoinPath(u.String())
396396
}
397397

398398
for _, f := range files {
@@ -715,7 +715,7 @@ func (p *processor) checkIndex(base string, mask whereType) error {
715715
return err
716716
}
717717

718-
index := util.JoinURLPath(bu, "index.txt").String()
718+
index := bu.JoinPath("index.txt").String()
719719

720720
p.checkTLS(index)
721721

@@ -773,7 +773,7 @@ func (p *processor) checkChanges(base string, mask whereType) error {
773773
if err != nil {
774774
return err
775775
}
776-
changes := util.JoinURLPath(bu, "changes.csv").String()
776+
changes := bu.JoinPath("changes.csv").String()
777777

778778
p.checkTLS(changes)
779779

@@ -1195,11 +1195,12 @@ func (p *processor) checkWellknown(domain string) string {
11951195
// 1. checks if the provider-metadata.json file is
11961196
// available under the /.well-known/csaf/ directory.
11971197
// 2. Then it checks the security.txt file by making HTTP request to fetch it.
1198-
// 3. After that it checks the existence of the CSAF field in the file
1199-
// content and tries to fetch the value of this field.
1198+
// 3. After that it checks the existence of the CSAF field in the file
1199+
// content and tries to fetch the value of this field.
12001200
// 4. Finally it checks if the "csaf.data.security.domain.tld" DNS record
12011201
// is available and serves the "provider-metadata.json".
1202-
///
1202+
//
1203+
// /
12031204
// If all three checks fail, errors are given,
12041205
// otherwise warnings for all failed checks.
12051206
// The function returns nil, unless errors outside the checks were found.

csaf/advisories.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -198,7 +198,7 @@ func (afp *AdvisoryFileProcessor) loadIndex(
198198
return nil, err
199199
}
200200

201-
indexURL := util.JoinURLPath(base, "index.txt").String()
201+
indexURL := base.JoinPath("index.txt").String()
202202
resp, err := afp.client.Get(indexURL)
203203
if err != nil {
204204
return nil, err
@@ -215,7 +215,7 @@ func (afp *AdvisoryFileProcessor) loadIndex(
215215
continue
216216
}
217217
files = append(files,
218-
PlainAdvisoryFile(util.JoinURLPath(base, u).String()))
218+
PlainAdvisoryFile(base.JoinPath(u).String()))
219219
}
220220

221221
if err := scanner.Err(); err != nil {

util/joinpath.go

Lines changed: 0 additions & 301 deletions
This file was deleted.

0 commit comments

Comments
 (0)