Skip to content

Commit f9cf449

Browse files
authored
fix: support http as asp url (#303)
* fix asp url * replicate fix on covenant client * upgrade to go 1.23.1
1 parent 9d2e84c commit f9cf449

File tree

3 files changed

+11
-9
lines changed

3 files changed

+11
-9
lines changed

.github/workflows/ark.unit.yaml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,15 @@ name: ci_unit
33
on:
44
push:
55
paths:
6-
- "server/**"
7-
- "pkg/client-sdk/**"
6+
- 'server/**'
7+
- 'pkg/client-sdk/**'
88
branches: [master]
99
pull_request:
1010
branches:
1111
- master
1212
paths:
13-
- "server/**"
14-
- "pkg/client-sdk/**"
13+
- 'server/**'
14+
- 'pkg/client-sdk/**'
1515

1616
jobs:
1717
check-go-sync:
@@ -22,7 +22,7 @@ jobs:
2222
- name: Set up Go
2323
uses: actions/setup-go@v4
2424
with:
25-
go-version: '>=1.22.6'
25+
go-version: '>=1.23.1'
2626

2727
- name: Run go work sync
2828
run: go work sync
@@ -44,7 +44,7 @@ jobs:
4444
steps:
4545
- uses: actions/setup-go@v4
4646
with:
47-
go-version: '>=1.22.6'
47+
go-version: '>=1.23.1'
4848
- uses: actions/checkout@v3
4949
- name: check linting
5050
uses: golangci/golangci-lint-action@v6
@@ -55,7 +55,7 @@ jobs:
5555
- name: check code integrity
5656
uses: securego/gosec@master
5757
with:
58-
args: "-severity high -quiet -exclude=G115 ./..."
58+
args: '-severity high -quiet -exclude=G115 ./...'
5959
- run: go get -v -t -d ./...
6060
- name: unit testing
6161
run: make test
@@ -69,7 +69,7 @@ jobs:
6969
steps:
7070
- uses: actions/setup-go@v4
7171
with:
72-
go-version: '>=1.22.6'
72+
go-version: '>=1.23.1'
7373
- uses: actions/checkout@v3
7474
- name: check linting
7575
uses: golangci/golangci-lint-action@v6
@@ -80,7 +80,7 @@ jobs:
8080
- name: check code integrity
8181
uses: securego/gosec@master
8282
with:
83-
args: "-severity high -quiet -exclude=G115 ./..."
83+
args: '-severity high -quiet -exclude=G115 ./...'
8484
- run: go get -v -t -d ./...
8585
- name: unit testing
8686
run: make test

client/covenant/client.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -104,6 +104,7 @@ func getClientFromState(ctx *cli.Context) (arkv1.ArkServiceClient, func(), error
104104
func getClient(addr string) (arkv1.ArkServiceClient, func(), error) {
105105
creds := insecure.NewCredentials()
106106
port := 80
107+
addr = strings.TrimPrefix(addr, "http://")
107108
if strings.HasPrefix(addr, "https://") {
108109
addr = strings.TrimPrefix(addr, "https://")
109110
creds = credentials.NewTLS(nil)

client/covenantless/client.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -106,6 +106,7 @@ func getClientFromState(ctx *cli.Context) (arkv1.ArkServiceClient, func(), error
106106
func getClient(addr string) (arkv1.ArkServiceClient, func(), error) {
107107
creds := insecure.NewCredentials()
108108
port := 80
109+
addr = strings.TrimPrefix(addr, "http://")
109110
if strings.HasPrefix(addr, "https://") {
110111
addr = strings.TrimPrefix(addr, "https://")
111112
creds = credentials.NewTLS(nil)

0 commit comments

Comments
 (0)