mirror of
https://github.com/aljazceru/ark.git
synced 2026-02-23 12:12:49 +01:00
fix: support http as asp url (#303)
* fix asp url * replicate fix on covenant client * upgrade to go 1.23.1
This commit is contained in:
18
.github/workflows/ark.unit.yaml
vendored
18
.github/workflows/ark.unit.yaml
vendored
@@ -3,15 +3,15 @@ name: ci_unit
|
||||
on:
|
||||
push:
|
||||
paths:
|
||||
- "server/**"
|
||||
- "pkg/client-sdk/**"
|
||||
- 'server/**'
|
||||
- 'pkg/client-sdk/**'
|
||||
branches: [master]
|
||||
pull_request:
|
||||
branches:
|
||||
- master
|
||||
paths:
|
||||
- "server/**"
|
||||
- "pkg/client-sdk/**"
|
||||
- 'server/**'
|
||||
- 'pkg/client-sdk/**'
|
||||
|
||||
jobs:
|
||||
check-go-sync:
|
||||
@@ -22,7 +22,7 @@ jobs:
|
||||
- name: Set up Go
|
||||
uses: actions/setup-go@v4
|
||||
with:
|
||||
go-version: '>=1.22.6'
|
||||
go-version: '>=1.23.1'
|
||||
|
||||
- name: Run go work sync
|
||||
run: go work sync
|
||||
@@ -44,7 +44,7 @@ jobs:
|
||||
steps:
|
||||
- uses: actions/setup-go@v4
|
||||
with:
|
||||
go-version: '>=1.22.6'
|
||||
go-version: '>=1.23.1'
|
||||
- uses: actions/checkout@v3
|
||||
- name: check linting
|
||||
uses: golangci/golangci-lint-action@v6
|
||||
@@ -55,7 +55,7 @@ jobs:
|
||||
- name: check code integrity
|
||||
uses: securego/gosec@master
|
||||
with:
|
||||
args: "-severity high -quiet -exclude=G115 ./..."
|
||||
args: '-severity high -quiet -exclude=G115 ./...'
|
||||
- run: go get -v -t -d ./...
|
||||
- name: unit testing
|
||||
run: make test
|
||||
@@ -69,7 +69,7 @@ jobs:
|
||||
steps:
|
||||
- uses: actions/setup-go@v4
|
||||
with:
|
||||
go-version: '>=1.22.6'
|
||||
go-version: '>=1.23.1'
|
||||
- uses: actions/checkout@v3
|
||||
- name: check linting
|
||||
uses: golangci/golangci-lint-action@v6
|
||||
@@ -80,7 +80,7 @@ jobs:
|
||||
- name: check code integrity
|
||||
uses: securego/gosec@master
|
||||
with:
|
||||
args: "-severity high -quiet -exclude=G115 ./..."
|
||||
args: '-severity high -quiet -exclude=G115 ./...'
|
||||
- run: go get -v -t -d ./...
|
||||
- name: unit testing
|
||||
run: make test
|
||||
|
||||
@@ -104,6 +104,7 @@ func getClientFromState(ctx *cli.Context) (arkv1.ArkServiceClient, func(), error
|
||||
func getClient(addr string) (arkv1.ArkServiceClient, func(), error) {
|
||||
creds := insecure.NewCredentials()
|
||||
port := 80
|
||||
addr = strings.TrimPrefix(addr, "http://")
|
||||
if strings.HasPrefix(addr, "https://") {
|
||||
addr = strings.TrimPrefix(addr, "https://")
|
||||
creds = credentials.NewTLS(nil)
|
||||
|
||||
@@ -106,6 +106,7 @@ func getClientFromState(ctx *cli.Context) (arkv1.ArkServiceClient, func(), error
|
||||
func getClient(addr string) (arkv1.ArkServiceClient, func(), error) {
|
||||
creds := insecure.NewCredentials()
|
||||
port := 80
|
||||
addr = strings.TrimPrefix(addr, "http://")
|
||||
if strings.HasPrefix(addr, "https://") {
|
||||
addr = strings.TrimPrefix(addr, "https://")
|
||||
creds = credentials.NewTLS(nil)
|
||||
|
||||
Reference in New Issue
Block a user