Skip to content

Commit a1fa6ca

Browse files
authored
Merge pull request #152 from yangcao77/update-registry-support-version
update registry-library version
2 parents f1de9b5 + f54bf6e commit a1fa6ca

3 files changed

Lines changed: 18 additions & 14 deletions

File tree

go.mod

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,7 @@ go 1.15
44

55
require (
66
github.com/devfile/api/v2 v2.2.0
7-
github.com/devfile/registry-support/index/generator v0.0.0-20220527155645-8328a8a883be // indirect
8-
github.com/devfile/registry-support/registry-library v0.0.0-20220627163229-4aa39fcb0c0a
7+
github.com/devfile/registry-support/registry-library v0.0.0-20221018213054-47b3ffaeadba
98
github.com/fatih/color v1.7.0
109
github.com/fsnotify/fsnotify v1.4.9
1110
github.com/go-git/go-git/v5 v5.4.2

go.sum

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -296,11 +296,14 @@ github.com/devfile/api/v2 v2.2.0/go.mod h1:dN7xFrOVG+iPqn4UKGibXLd5oVsdE8XyK9OEb
296296
github.com/devfile/library v1.2.1-0.20211104222135-49d635cb492f/go.mod h1:uFZZdTuRqA68FVe/JoJHP92CgINyQkyWnM2Qyiim+50=
297297
github.com/devfile/library v1.2.1-0.20220308191614-f0f7e11b17de h1:jImHtiAxjyul1UkPmf6C3EMS5wqNz+k84LKkCXkeqws=
298298
github.com/devfile/library v1.2.1-0.20220308191614-f0f7e11b17de/go.mod h1:GSPfJaBg0+bBjBHbwBE5aerJLH6tWGQu2q2rHYd9czM=
299+
github.com/devfile/library/v2 v2.0.1/go.mod h1:paJ0PARAVy0br13VpBEQ4fO3rZVDxWtooQ29+23PNBk=
299300
github.com/devfile/registry-support/index/generator v0.0.0-20220222194908-7a90a4214f3e/go.mod h1:iRPBxs+ZjfLEduVXpCCIOzdD2588Zv9OCs/CcXMcCCY=
300-
github.com/devfile/registry-support/index/generator v0.0.0-20220527155645-8328a8a883be h1:tCdIUbJ1eZV/jRa1gjs3dPZsbTjRibDqwRqIK4HCI9k=
301301
github.com/devfile/registry-support/index/generator v0.0.0-20220527155645-8328a8a883be/go.mod h1:1fyDJL+fPHtcrYA6yjSVWeLmXmjCNth0d5Rq1rvtryc=
302-
github.com/devfile/registry-support/registry-library v0.0.0-20220627163229-4aa39fcb0c0a h1:nBOmXUYleKlyYnzbbAgYEaYn4V3ZgXEQ3PN7NlZ8f2k=
302+
github.com/devfile/registry-support/index/generator v0.0.0-20221018203505-df96d34d4273 h1:DXENQSRTEDsk9com38njPg5511DD12HPIgzyFUErnpM=
303+
github.com/devfile/registry-support/index/generator v0.0.0-20221018203505-df96d34d4273/go.mod h1:ZJnaSLjTKCvGJhWmYgQoQ1O3g78qBe4Va6ZugLmi4dE=
303304
github.com/devfile/registry-support/registry-library v0.0.0-20220627163229-4aa39fcb0c0a/go.mod h1:kmEjH5oO465vh36kcYdZLYeG8edVD6N/ZgzyLs1x7qs=
305+
github.com/devfile/registry-support/registry-library v0.0.0-20221018213054-47b3ffaeadba h1:7Ag9guD3qOSzg3PcbSMqTVHDjqZojqb5JoIIonjRjDQ=
306+
github.com/devfile/registry-support/registry-library v0.0.0-20221018213054-47b3ffaeadba/go.mod h1:NOtmnbozFn15w/DPD/Urc+KDlNRP4JH5m+KC5GZoAWA=
304307
github.com/dgrijalva/jwt-go v0.0.0-20170104182250-a601269ab70c/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ=
305308
github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ=
306309
github.com/dgryski/go-sip13 v0.0.0-20181026042036-e10d5fee7954/go.mod h1:vAd38F8PWV+bWy6jNmig1y/TA+kYO4g3RSRF0IAv0no=
@@ -693,6 +696,7 @@ github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f/go.mod h1:qRW
693696
github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f/go.mod h1:ZdcZmHo+o7JKHSa8/e818NopupXU1YMK5fe1lsApnBw=
694697
github.com/ncw/swift v1.0.47/go.mod h1:23YIA4yWVnGwv2dQlN4bB7egfYX6YLn0Yo/S6zZO/ZM=
695698
github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno=
699+
github.com/nsf/jsondiff v0.0.0-20210926074059-1e845ec5d249/go.mod h1:mpRZBD8SJ55OIICQ3iWH0Yz3cjzA61JdqMLoWXeB2+8=
696700
github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A=
697701
github.com/nxadm/tail v1.4.8 h1:nPr65rt6Y5JFSKQO7qToXr7pePgD6Gwiw05lkbyAQTE=
698702
github.com/nxadm/tail v1.4.8/go.mod h1:+ncqLTQzXmGhMZNUePPaPqPvBxHAIsmXswZKocGu+AU=

pkg/devfile/parser/parse_test.go

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,16 @@ package parser
1818
import (
1919
"context"
2020
"fmt"
21+
"io/ioutil"
22+
"net"
23+
"net/http"
24+
"net/http/httptest"
25+
"os"
26+
"path"
27+
"reflect"
28+
"strings"
29+
"testing"
30+
2131
v1 "github.com/devfile/api/v2/pkg/apis/workspaces/v1alpha2"
2232
"github.com/devfile/api/v2/pkg/attributes"
2333
devfilepkg "github.com/devfile/api/v2/pkg/devfile"
@@ -28,17 +38,8 @@ import (
2838
"github.com/devfile/library/v2/pkg/testingutil"
2939
"github.com/kylelemons/godebug/pretty"
3040
"github.com/stretchr/testify/assert"
31-
"io/ioutil"
3241
kubev1 "k8s.io/apimachinery/pkg/apis/meta/v1"
33-
"net"
34-
"net/http"
35-
"net/http/httptest"
36-
"os"
37-
"path"
38-
"reflect"
3942
"sigs.k8s.io/yaml"
40-
"strings"
41-
"testing"
4243
)
4344

4445
const schemaVersion = string(data.APISchemaVersion220)
@@ -3987,7 +3988,7 @@ func Test_parseFromRegistry(t *testing.T) {
39873988
ImportReferenceUnion: v1.ImportReferenceUnion{
39883989
Id: registryId,
39893990
},
3990-
Version: "2.0.0",
3991+
Version: "2.0.1",
39913992
RegistryUrl: stagingRegistry,
39923993
},
39933994
},

0 commit comments

Comments
 (0)