Skip to content

Commit 1d563eb

Browse files
authored
Prepare for v2.2.2 release (#209)
* update tests to incorporate v2.2.2 var warning changes Signed-off-by: Jordan Dubrick <[email protected]> * prepare for 2.2.2 release Signed-off-by: Jordan Dubrick <[email protected]> * update readme for 2.2.2 Signed-off-by: Jordan Dubrick <[email protected]> * update go mod Signed-off-by: Jordan Dubrick <[email protected]> * update registry library dep to latest commit Signed-off-by: Jordan Dubrick <[email protected]> --------- Signed-off-by: Jordan Dubrick <[email protected]>
1 parent 44ca18d commit 1d563eb

File tree

4 files changed

+107
-87
lines changed

4 files changed

+107
-87
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
## About
1212

1313
The Devfile Parser library is a Golang module that:
14-
1. parses a devfile as specified by the [api](https://devfile.io/docs/2.2.1/devfile-schema) & [schema](https://github.com/devfile/api/tree/main/schemas/latest).
14+
1. parses a devfile as specified by the [api](https://devfile.io/docs/2.2.2/devfile-schema) & [schema](https://github.com/devfile/api/tree/main/schemas/latest).
1515
2. writes to the specified devfile with the updated data.
1616
3. generates Kubernetes objects for the various devfile resources.
1717
4. defines util functions for the devfile.

go.mod

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ module github.com/devfile/library/v2
33
go 1.19
44

55
require (
6-
github.com/devfile/api/v2 v2.2.1
7-
github.com/devfile/registry-support/registry-library v0.0.0-20240311160550-e51ee8934746
6+
github.com/devfile/api/v2 v2.2.2
7+
github.com/devfile/registry-support/registry-library v0.0.0-20240328155806-7c89891a72ce
88
github.com/distribution/distribution/v3 v3.0.0-20221208165359-362910506bc2
99
github.com/fatih/color v1.14.1
1010
github.com/fsnotify/fsnotify v1.7.0

go.sum

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -92,12 +92,12 @@ github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSs
9292
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
9393
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM=
9494
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
95-
github.com/devfile/api/v2 v2.2.1 h1:VSX297YqY4C4j4uhn7M0RdZeBaeWqyVi4NnagzEmxu0=
96-
github.com/devfile/api/v2 v2.2.1/go.mod h1:qp8jcw12y1JdCsxjK/7LJ7uWaJOxcY1s2LUk5PhbkbM=
95+
github.com/devfile/api/v2 v2.2.2 h1:DXRCPWFlZhTIE38Of2jzTRjQHadfbxBC8GS+m+EjoCU=
96+
github.com/devfile/api/v2 v2.2.2/go.mod h1:qp8jcw12y1JdCsxjK/7LJ7uWaJOxcY1s2LUk5PhbkbM=
9797
github.com/devfile/registry-support/index/generator v0.0.0-20240311135803-6215550f93d4 h1:t09mGdy31tC2YBp6kVD7x8m0jq1CyBUSYMUvrF0iaWw=
9898
github.com/devfile/registry-support/index/generator v0.0.0-20240311135803-6215550f93d4/go.mod h1:3Ngbmm12LW03tAEHpDNymM7zryd5H1Xo3ZAGlBpecf8=
99-
github.com/devfile/registry-support/registry-library v0.0.0-20240311160550-e51ee8934746 h1:VQLQguSjxcU1xtUjbqmEW6R9Ehgjk1PzG56vHnzXyEw=
100-
github.com/devfile/registry-support/registry-library v0.0.0-20240311160550-e51ee8934746/go.mod h1:2RRLQaOYuzh8n59euz6Bu60hFoX/LLVM9uzFOFDyOZM=
99+
github.com/devfile/registry-support/registry-library v0.0.0-20240328155806-7c89891a72ce h1:IgUCI7eCq6m0JzRx3+FZuIeJy5e+rUSQYMr3NBzrqyg=
100+
github.com/devfile/registry-support/registry-library v0.0.0-20240328155806-7c89891a72ce/go.mod h1:2RRLQaOYuzh8n59euz6Bu60hFoX/LLVM9uzFOFDyOZM=
101101
github.com/distribution/distribution/v3 v3.0.0-20221208165359-362910506bc2 h1:aBfCb7iqHmDEIp6fBvC/hQUddQfg+3qdYjwzaiP9Hnc=
102102
github.com/distribution/distribution/v3 v3.0.0-20221208165359-362910506bc2/go.mod h1:WHNsWjnIn2V1LYOrME7e8KxSeKunYHsxEm4am0BUtcI=
103103
github.com/distribution/reference v0.5.0 h1:/FUIFXtfc/x2gpa5/VGfiGLuOIdYa1t65IKK2OFGvA0=

pkg/devfile/parse_test.go

Lines changed: 100 additions & 80 deletions
Original file line numberDiff line numberDiff line change
@@ -300,10 +300,11 @@ spec:
300300
"PARAMS": "bar",
301301
},
302302
wantVarWarning: variables.VariableWarning{
303-
Commands: map[string][]string{},
304-
Components: map[string][]string{},
305-
Projects: map[string][]string{},
306-
StarterProjects: map[string][]string{},
303+
Commands: map[string][]string{},
304+
Components: map[string][]string{},
305+
Projects: map[string][]string{},
306+
StarterProjects: map[string][]string{},
307+
DependentProjects: map[string][]string{},
307308
},
308309
wantErrorStr: nil,
309310
},
@@ -325,10 +326,11 @@ spec:
325326
"OTHER": "other",
326327
},
327328
wantVarWarning: variables.VariableWarning{
328-
Commands: map[string][]string{},
329-
Components: map[string][]string{},
330-
Projects: map[string][]string{},
331-
StarterProjects: map[string][]string{},
329+
Commands: map[string][]string{},
330+
Components: map[string][]string{},
331+
Projects: map[string][]string{},
332+
StarterProjects: map[string][]string{},
333+
DependentProjects: map[string][]string{},
332334
},
333335
wantErrorStr: nil,
334336
}, {
@@ -348,10 +350,11 @@ spec:
348350
"PARAMS": "baz",
349351
},
350352
wantVarWarning: variables.VariableWarning{
351-
Commands: map[string][]string{},
352-
Components: map[string][]string{},
353-
Projects: map[string][]string{},
354-
StarterProjects: map[string][]string{},
353+
Commands: map[string][]string{},
354+
Components: map[string][]string{},
355+
Projects: map[string][]string{},
356+
StarterProjects: map[string][]string{},
357+
DependentProjects: map[string][]string{},
355358
},
356359
wantErrorStr: nil,
357360
}, {
@@ -370,10 +373,11 @@ spec:
370373
"PARAMS": "baz",
371374
},
372375
wantVarWarning: variables.VariableWarning{
373-
Commands: map[string][]string{},
374-
Components: map[string][]string{},
375-
Projects: map[string][]string{},
376-
StarterProjects: map[string][]string{},
376+
Commands: map[string][]string{},
377+
Components: map[string][]string{},
378+
Projects: map[string][]string{},
379+
StarterProjects: map[string][]string{},
380+
DependentProjects: map[string][]string{},
377381
},
378382
wantErrorStr: nil,
379383
},
@@ -393,10 +397,11 @@ spec:
393397
"PARAMS": "baz",
394398
},
395399
wantVarWarning: variables.VariableWarning{
396-
Commands: map[string][]string{},
397-
Components: map[string][]string{},
398-
Projects: map[string][]string{},
399-
StarterProjects: map[string][]string{},
400+
Commands: map[string][]string{},
401+
Components: map[string][]string{},
402+
Projects: map[string][]string{},
403+
StarterProjects: map[string][]string{},
404+
DependentProjects: map[string][]string{},
400405
},
401406
wantErrorStr: nil,
402407
},
@@ -416,10 +421,11 @@ spec:
416421
"PARAMS": "baz",
417422
},
418423
wantVarWarning: variables.VariableWarning{
419-
Commands: map[string][]string{},
420-
Components: map[string][]string{},
421-
Projects: map[string][]string{},
422-
StarterProjects: map[string][]string{},
424+
Commands: map[string][]string{},
425+
Components: map[string][]string{},
426+
Projects: map[string][]string{},
427+
StarterProjects: map[string][]string{},
428+
DependentProjects: map[string][]string{},
423429
},
424430
wantErrorStr: nil,
425431
},
@@ -438,10 +444,11 @@ spec:
438444
"PARAMS": "baz",
439445
},
440446
wantVarWarning: variables.VariableWarning{
441-
Commands: map[string][]string{},
442-
Components: map[string][]string{},
443-
Projects: map[string][]string{},
444-
StarterProjects: map[string][]string{},
447+
Commands: map[string][]string{},
448+
Components: map[string][]string{},
449+
Projects: map[string][]string{},
450+
StarterProjects: map[string][]string{},
451+
DependentProjects: map[string][]string{},
445452
},
446453
wantErrorStr: nil,
447454
},
@@ -460,10 +467,11 @@ spec:
460467
"PARAMS": "baz",
461468
},
462469
wantVarWarning: variables.VariableWarning{
463-
Commands: map[string][]string{},
464-
Components: map[string][]string{},
465-
Projects: map[string][]string{},
466-
StarterProjects: map[string][]string{},
470+
Commands: map[string][]string{},
471+
Components: map[string][]string{},
472+
Projects: map[string][]string{},
473+
StarterProjects: map[string][]string{},
474+
DependentProjects: map[string][]string{},
467475
},
468476
wantErrorStr: nil,
469477
},
@@ -482,10 +490,11 @@ spec:
482490
"PARAMS": "baz",
483491
},
484492
wantVarWarning: variables.VariableWarning{
485-
Commands: map[string][]string{},
486-
Components: map[string][]string{},
487-
Projects: map[string][]string{},
488-
StarterProjects: map[string][]string{},
493+
Commands: map[string][]string{},
494+
Components: map[string][]string{},
495+
Projects: map[string][]string{},
496+
StarterProjects: map[string][]string{},
497+
DependentProjects: map[string][]string{},
489498
},
490499
wantErrorStr: nil,
491500
},
@@ -507,10 +516,11 @@ spec:
507516
"PARAMS": "baz",
508517
},
509518
wantVarWarning: variables.VariableWarning{
510-
Commands: map[string][]string{},
511-
Components: map[string][]string{},
512-
Projects: map[string][]string{},
513-
StarterProjects: map[string][]string{},
519+
Commands: map[string][]string{},
520+
Components: map[string][]string{},
521+
Projects: map[string][]string{},
522+
StarterProjects: map[string][]string{},
523+
DependentProjects: map[string][]string{},
514524
},
515525
wantErrorStr: nil,
516526
},
@@ -540,10 +550,11 @@ spec:
540550
"PARAMS": "baz",
541551
},
542552
wantVarWarning: variables.VariableWarning{
543-
Commands: map[string][]string{},
544-
Components: map[string][]string{},
545-
Projects: map[string][]string{},
546-
StarterProjects: map[string][]string{},
553+
Commands: map[string][]string{},
554+
Components: map[string][]string{},
555+
Projects: map[string][]string{},
556+
StarterProjects: map[string][]string{},
557+
DependentProjects: map[string][]string{},
547558
},
548559
wantErrorStr: nil,
549560
},
@@ -562,10 +573,11 @@ spec:
562573
"PARAMS": "from devfile.yaml based on priority",
563574
},
564575
wantVarWarning: variables.VariableWarning{
565-
Commands: map[string][]string{},
566-
Components: map[string][]string{},
567-
Projects: map[string][]string{},
568-
StarterProjects: map[string][]string{},
576+
Commands: map[string][]string{},
577+
Components: map[string][]string{},
578+
Projects: map[string][]string{},
579+
StarterProjects: map[string][]string{},
580+
DependentProjects: map[string][]string{},
569581
},
570582
additionalChecks: func(devfileObj parser.DevfileObj) error {
571583
if devfileObj.Data.GetMetadata().DisplayName != "Go Runtime (devfile.yaml)" {
@@ -591,10 +603,11 @@ spec:
591603
"PARAMS": "from .devfile.yaml based on priority",
592604
},
593605
wantVarWarning: variables.VariableWarning{
594-
Commands: map[string][]string{},
595-
Components: map[string][]string{},
596-
Projects: map[string][]string{},
597-
StarterProjects: map[string][]string{},
606+
Commands: map[string][]string{},
607+
Components: map[string][]string{},
608+
Projects: map[string][]string{},
609+
StarterProjects: map[string][]string{},
610+
DependentProjects: map[string][]string{},
598611
},
599612
additionalChecks: func(devfileObj parser.DevfileObj) error {
600613
if devfileObj.Data.GetMetadata().DisplayName != "Go Runtime (.devfile.yaml)" {
@@ -620,10 +633,11 @@ spec:
620633
"PARAMS": "from devfile.yml based on priority",
621634
},
622635
wantVarWarning: variables.VariableWarning{
623-
Commands: map[string][]string{},
624-
Components: map[string][]string{},
625-
Projects: map[string][]string{},
626-
StarterProjects: map[string][]string{},
636+
Commands: map[string][]string{},
637+
Components: map[string][]string{},
638+
Projects: map[string][]string{},
639+
StarterProjects: map[string][]string{},
640+
DependentProjects: map[string][]string{},
627641
},
628642
additionalChecks: func(devfileObj parser.DevfileObj) error {
629643
if devfileObj.Data.GetMetadata().DisplayName != "Test stack (devfile.yml)" {
@@ -649,10 +663,11 @@ spec:
649663
"PARAMS": "from .devfile.yml based on priority",
650664
},
651665
wantVarWarning: variables.VariableWarning{
652-
Commands: map[string][]string{},
653-
Components: map[string][]string{},
654-
Projects: map[string][]string{},
655-
StarterProjects: map[string][]string{},
666+
Commands: map[string][]string{},
667+
Components: map[string][]string{},
668+
Projects: map[string][]string{},
669+
StarterProjects: map[string][]string{},
670+
DependentProjects: map[string][]string{},
656671
},
657672
additionalChecks: func(devfileObj parser.DevfileObj) error {
658673
if devfileObj.Data.GetMetadata().DisplayName != "Test stack (.devfile.yml)" {
@@ -678,10 +693,11 @@ spec:
678693
"PARAMS": "from devfile.yml",
679694
},
680695
wantVarWarning: variables.VariableWarning{
681-
Commands: map[string][]string{},
682-
Components: map[string][]string{},
683-
Projects: map[string][]string{},
684-
StarterProjects: map[string][]string{},
696+
Commands: map[string][]string{},
697+
Components: map[string][]string{},
698+
Projects: map[string][]string{},
699+
StarterProjects: map[string][]string{},
700+
DependentProjects: map[string][]string{},
685701
},
686702
additionalChecks: func(devfileObj parser.DevfileObj) error {
687703
if devfileObj.Data.GetMetadata().DisplayName != "Test stack (devfile.yml)" {
@@ -707,10 +723,11 @@ spec:
707723
"PARAMS": "from .devfile.yml",
708724
},
709725
wantVarWarning: variables.VariableWarning{
710-
Commands: map[string][]string{},
711-
Components: map[string][]string{},
712-
Projects: map[string][]string{},
713-
StarterProjects: map[string][]string{},
726+
Commands: map[string][]string{},
727+
Components: map[string][]string{},
728+
Projects: map[string][]string{},
729+
StarterProjects: map[string][]string{},
730+
DependentProjects: map[string][]string{},
714731
},
715732
additionalChecks: func(devfileObj parser.DevfileObj) error {
716733
if devfileObj.Data.GetMetadata().DisplayName != "Test stack (.devfile.yml)" {
@@ -736,10 +753,11 @@ spec:
736753
"PARAMS": "from .devfile.yaml",
737754
},
738755
wantVarWarning: variables.VariableWarning{
739-
Commands: map[string][]string{},
740-
Components: map[string][]string{},
741-
Projects: map[string][]string{},
742-
StarterProjects: map[string][]string{},
756+
Commands: map[string][]string{},
757+
Components: map[string][]string{},
758+
Projects: map[string][]string{},
759+
StarterProjects: map[string][]string{},
760+
DependentProjects: map[string][]string{},
743761
},
744762
additionalChecks: func(devfileObj parser.DevfileObj) error {
745763
if devfileObj.Data.GetMetadata().DisplayName != "Go Runtime (.devfile.yaml)" {
@@ -765,10 +783,11 @@ spec:
765783
"PARAMS": "from any valid devfile file",
766784
},
767785
wantVarWarning: variables.VariableWarning{
768-
Commands: map[string][]string{},
769-
Components: map[string][]string{},
770-
Projects: map[string][]string{},
771-
StarterProjects: map[string][]string{},
786+
Commands: map[string][]string{},
787+
Components: map[string][]string{},
788+
Projects: map[string][]string{},
789+
StarterProjects: map[string][]string{},
790+
DependentProjects: map[string][]string{},
772791
},
773792
additionalChecks: func(devfileObj parser.DevfileObj) error {
774793
if devfileObj.Data.GetMetadata().DisplayName != "Test stack (valid-devfile.yaml.txt)" {
@@ -794,10 +813,11 @@ spec:
794813
"PARAMS": "baz",
795814
},
796815
wantVarWarning: variables.VariableWarning{
797-
Commands: map[string][]string{},
798-
Components: map[string][]string{},
799-
Projects: map[string][]string{},
800-
StarterProjects: map[string][]string{},
816+
Commands: map[string][]string{},
817+
Components: map[string][]string{},
818+
Projects: map[string][]string{},
819+
StarterProjects: map[string][]string{},
820+
DependentProjects: map[string][]string{},
801821
},
802822
wantErrorStr: &unsupportedSchemaError,
803823
},

0 commit comments

Comments
 (0)