From 4c2318cc4c0a7eb96faff2a8515997f9af182f66 Mon Sep 17 00:00:00 2001 From: thepetk Date: Tue, 7 Mar 2023 12:18:31 +0000 Subject: [PATCH 01/16] Add iconUrl check upon index component validation Signed-off-by: thepetk --- index/generator/library/library.go | 35 +++++++++++++++++++ .../index/generator/library/library.go | 35 +++++++++++++++++++ 2 files changed, 70 insertions(+) diff --git a/index/generator/library/library.go b/index/generator/library/library.go index 3987220ca..02399fee8 100644 --- a/index/generator/library/library.go +++ b/index/generator/library/library.go @@ -19,9 +19,11 @@ import ( "encoding/json" "fmt" "io/ioutil" + "net/http" "os" "path" "path/filepath" + "strings" devfileParser "github.com/devfile/library/v2/pkg/devfile" "github.com/devfile/library/v2/pkg/devfile/parser" @@ -35,6 +37,7 @@ const ( extraDevfileEntries = "extraDevfileEntries.yaml" stackYaml = "stack.yaml" ownersFile = "OWNERS" + imageHeaderKeyword = "image/" ) // MissingArchError is an error if the architecture list is empty @@ -64,6 +67,14 @@ func (e *MissingSupportUrlError) Error() string { return fmt.Sprintf("the %s devfile has no supportUrl mentioned\n", e.devfile) } +type IconUrlBrokenError struct { + devfile string +} + +func (e *IconUrlBrokenError) Error() string { + return fmt.Sprintf("Devfile %s has broken or not existing icon\n", e.devfile) +} + // GenerateIndexStruct parses registry then generates index struct according to the schema func GenerateIndexStruct(registryDirPath string, force bool) ([]schema.Schema, error) { // Parse devfile registry then populate index struct @@ -170,6 +181,9 @@ func validateIndexComponent(indexComponent schema.Schema, componentType schema.D } // Fields to be validated for both stacks and samples + if !iconExists(indexComponent.Icon) { + return &IconUrlBrokenError{devfile: indexComponent.Name} + } if indexComponent.Provider == "" { return &MissingProviderError{devfile: indexComponent.Name} } @@ -202,6 +216,27 @@ func dirExists(dirpath string) error { return nil } +func iconExists(iconUrl string) bool { + resp, err := http.Get(iconUrl) + if err != nil { + return false + } + + if resp.StatusCode != 200 { + return false + } + + // Ensure that the content of response is image related + headers := resp.Header["Content-Type"] + for _, header := range headers { + if strings.Contains(header, imageHeaderKeyword) { + return true + } + } + + return false +} + func parseDevfileRegistry(registryDirPath string, force bool) ([]schema.Schema, error) { var index []schema.Schema diff --git a/index/server/vendor/github.com/devfile/registry-support/index/generator/library/library.go b/index/server/vendor/github.com/devfile/registry-support/index/generator/library/library.go index 3987220ca..02399fee8 100644 --- a/index/server/vendor/github.com/devfile/registry-support/index/generator/library/library.go +++ b/index/server/vendor/github.com/devfile/registry-support/index/generator/library/library.go @@ -19,9 +19,11 @@ import ( "encoding/json" "fmt" "io/ioutil" + "net/http" "os" "path" "path/filepath" + "strings" devfileParser "github.com/devfile/library/v2/pkg/devfile" "github.com/devfile/library/v2/pkg/devfile/parser" @@ -35,6 +37,7 @@ const ( extraDevfileEntries = "extraDevfileEntries.yaml" stackYaml = "stack.yaml" ownersFile = "OWNERS" + imageHeaderKeyword = "image/" ) // MissingArchError is an error if the architecture list is empty @@ -64,6 +67,14 @@ func (e *MissingSupportUrlError) Error() string { return fmt.Sprintf("the %s devfile has no supportUrl mentioned\n", e.devfile) } +type IconUrlBrokenError struct { + devfile string +} + +func (e *IconUrlBrokenError) Error() string { + return fmt.Sprintf("Devfile %s has broken or not existing icon\n", e.devfile) +} + // GenerateIndexStruct parses registry then generates index struct according to the schema func GenerateIndexStruct(registryDirPath string, force bool) ([]schema.Schema, error) { // Parse devfile registry then populate index struct @@ -170,6 +181,9 @@ func validateIndexComponent(indexComponent schema.Schema, componentType schema.D } // Fields to be validated for both stacks and samples + if !iconExists(indexComponent.Icon) { + return &IconUrlBrokenError{devfile: indexComponent.Name} + } if indexComponent.Provider == "" { return &MissingProviderError{devfile: indexComponent.Name} } @@ -202,6 +216,27 @@ func dirExists(dirpath string) error { return nil } +func iconExists(iconUrl string) bool { + resp, err := http.Get(iconUrl) + if err != nil { + return false + } + + if resp.StatusCode != 200 { + return false + } + + // Ensure that the content of response is image related + headers := resp.Header["Content-Type"] + for _, header := range headers { + if strings.Contains(header, imageHeaderKeyword) { + return true + } + } + + return false +} + func parseDevfileRegistry(registryDirPath string, force bool) ([]schema.Schema, error) { var index []schema.Schema From 20def1c1726df661d6b4a4252d2ac837ebdbb05c Mon Sep 17 00:00:00 2001 From: thepetk Date: Tue, 7 Mar 2023 14:32:15 +0000 Subject: [PATCH 02/16] Update test cases for validateIndexComponent Signed-off-by: thepetk --- index/generator/library/library_test.go | 51 +++++++++++++++++++++++++ 1 file changed, 51 insertions(+) diff --git a/index/generator/library/library_test.go b/index/generator/library/library_test.go index 544f97123..c6c27d5d5 100644 --- a/index/generator/library/library_test.go +++ b/index/generator/library/library_test.go @@ -46,6 +46,7 @@ func TestValidateIndexComponent(t *testing.T) { noVersionErr := ".*no version specified.*" schemaVersionEmptyErr := ".*schema version is empty.*" multipleVersionErr := ".*has multiple default versions.*" + iconUrlBrokenErr := ".*has broken or not existing icon.*" tests := []struct { name string @@ -112,6 +113,7 @@ func TestValidateIndexComponent(t *testing.T) { "Case 5: test happy path for for stack component", schema.Schema{ Name: "nodejs", + Icon: "https://raw.githubusercontent.com/devfile-samples/devfile-stack-icons/main/java-maven.jpg", Architectures: []string{ "amd64", }, @@ -148,6 +150,7 @@ func TestValidateIndexComponent(t *testing.T) { "Case 6: test happy path for for sample component with old struct", schema.Schema{ Name: "nodejs", + Icon: "https://raw.githubusercontent.com/devfile-samples/devfile-stack-icons/main/java-maven.jpg", Git: &schema.Git{ Remotes: map[string]string{ "origin": "https://github.com/redhat-developer/devfile-sample", @@ -176,10 +179,12 @@ func TestValidateIndexComponent(t *testing.T) { schema.SampleDevfileType, &multipleRemotesErr, }, + { "Case 8: check for missing arch", schema.Schema{ Name: "nodejs", + Icon: "https://nodejs.org/static/images/logos/nodejs-new-pantone-black.svg", Git: &schema.Git{ Remotes: map[string]string{ "origin": "https://github.com/redhat-developer/devfile-sample", @@ -195,6 +200,7 @@ func TestValidateIndexComponent(t *testing.T) { "Case 9: check for missing provider", schema.Schema{ Name: "nodejs", + Icon: "https://nodejs.org/static/images/logos/nodejs-new-pantone-black.svg", Versions: []schema.Version{ { Version: "1.0.0", @@ -220,6 +226,7 @@ func TestValidateIndexComponent(t *testing.T) { "Case 10: check for missing supportUrl", schema.Schema{ Name: "nodejs", + Icon: "https://nodejs.org/static/images/logos/nodejs-new-pantone-black.svg", Versions: []schema.Version{ { Version: "1.0.0", @@ -354,6 +361,7 @@ func TestValidateIndexComponent(t *testing.T) { "Case 16: test happy path for for sample component with new struct", schema.Schema{ Name: "nodejs", + Icon: "https://nodejs.org/static/images/logos/nodejs-new-pantone-black.svg", Versions: []schema.Version{ { Version: "1.0.0", @@ -479,6 +487,49 @@ func TestValidateIndexComponent(t *testing.T) { schema.SampleDevfileType, &multipleVersionErr, }, + { + "Case 21: test stack component missing iconUrl", + schema.Schema{ + Name: "nodejs", + Versions: []schema.Version{ + { + Version: "1.0.0", + SchemaVersion: "2.0.0", + Default: true, + Links: map[string]string{ + "self": "devfile-catalog/java-maven:latest", + }, + Resources: []string{ + "devfile.yaml", + }, + }, + }, + }, + schema.StackDevfileType, + &iconUrlBrokenErr, + }, + { + "Case 22: test stack component has wrong iconUrl", + schema.Schema{ + Name: "nodejs", + Icon: "https://github.com/" + Versions: []schema.Version{ + { + Version: "1.0.0", + SchemaVersion: "2.0.0", + Default: true, + Links: map[string]string{ + "self": "devfile-catalog/java-maven:latest", + }, + Resources: []string{ + "devfile.yaml", + }, + }, + }, + }, + schema.StackDevfileType, + &iconUrlBrokenErr, + }, } for _, tt := range tests { From 04c314504b39d17f6d7315ef3722c0136fed12c0 Mon Sep 17 00:00:00 2001 From: thepetk Date: Tue, 7 Mar 2023 14:35:17 +0000 Subject: [PATCH 03/16] Fix issue with missing comma Signed-off-by: thepetk --- index/generator/library/library_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/index/generator/library/library_test.go b/index/generator/library/library_test.go index c6c27d5d5..0758b4dc3 100644 --- a/index/generator/library/library_test.go +++ b/index/generator/library/library_test.go @@ -512,7 +512,7 @@ func TestValidateIndexComponent(t *testing.T) { "Case 22: test stack component has wrong iconUrl", schema.Schema{ Name: "nodejs", - Icon: "https://github.com/" + Icon: "https://github.com/", Versions: []schema.Version{ { Version: "1.0.0", From dbfab6700cd980ec9abea14dc0a34af23e5e93a0 Mon Sep 17 00:00:00 2001 From: thepetk Date: Tue, 7 Mar 2023 15:36:54 +0000 Subject: [PATCH 04/16] Add icons to test index_registry.json Signed-off-by: thepetk --- .../server/tests/registry/index_registry.json | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/index/server/tests/registry/index_registry.json b/index/server/tests/registry/index_registry.json index f0050be0b..aaf193b45 100644 --- a/index/server/tests/registry/index_registry.json +++ b/index/server/tests/registry/index_registry.json @@ -54,6 +54,7 @@ }, { "name": "java-maven", + "icon": "https://raw.githubusercontent.com/devfile-samples/devfile-stack-icons/main/java-maven.jpg", "displayName": "Maven Java", "description": "Upstream Maven and OpenJDK 11", "type": "stack", @@ -68,6 +69,7 @@ { "version": "1.1.0", "schemaVersion": "2.2.0", + "icon": "https://raw.githubusercontent.com/devfile-samples/devfile-stack-icons/main/java-maven.jpg", "default": true, "description": "Upstream Maven and OpenJDK 11", "tags": [ @@ -88,6 +90,7 @@ }, { "name": "java-openliberty", + "icon":"https://raw.githubusercontent.com/OpenLiberty/logos/7fbb132949b9b2589e18c8d5665c1b107028a21d/logomark/svg/OL_logomark.svg", "displayName": "Open Liberty", "description": "Java application stack using Open Liberty runtime", "type": "stack", @@ -98,6 +101,7 @@ { "version": "0.5.0", "schemaVersion": "2.2.0", + "icon":"https://raw.githubusercontent.com/OpenLiberty/logos/7fbb132949b9b2589e18c8d5665c1b107028a21d/logomark/svg/OL_logomark.svg", "default": true, "description": "Java application stack using Open Liberty runtime", "links": { @@ -115,6 +119,7 @@ { "name": "java-quarkus", "displayName": "Quarkus Java", + "icon": "https://design.jboss.org/quarkus/logo/final/SVG/quarkus_icon_rgb_default.svg", "description": "Upstream Quarkus with Java+GraalVM", "type": "stack", "tags": [ @@ -128,6 +133,7 @@ { "version": "1.1.0", "schemaVersion": "2.2.0", + "icon": "https://design.jboss.org/quarkus/logo/final/SVG/quarkus_icon_rgb_default.svg", "default": true, "description": "Upstream Quarkus with Java+GraalVM", "tags": [ @@ -184,6 +190,7 @@ }, { "name": "java-vertx", + "icon": "https://raw.githubusercontent.com/vertx-web-site/vertx-logo/master/vertx-logo.svg", "displayName": "Vert.x Java", "description": "Upstream Vert.x using Java", "type": "stack", @@ -198,6 +205,7 @@ "version": "1.1.0", "schemaVersion": "2.2.0", "default": true, + "icon": "https://raw.githubusercontent.com/vertx-web-site/vertx-logo/master/vertx-logo.svg", "description": "Upstream Vert.x using Java", "tags": [ "Java", @@ -235,6 +243,7 @@ }, { "name": "java-wildfly", + "icon": "https://design.jboss.org/wildfly/logo/final/wildfly_logomark.svg", "displayName": "WildFly Java", "description": "Upstream WildFly", "type": "stack", @@ -249,6 +258,7 @@ "version": "1.0.0", "schemaVersion": "2.2.0", "default": true, + "icon": "https://design.jboss.org/wildfly/logo/final/wildfly_logomark.svg", "description": "Upstream WildFly", "tags": [ "Java", @@ -275,6 +285,7 @@ }, { "name": "java-wildfly-bootable-jar", + "icon": "https://design.jboss.org/wildfly/logo/final/wildfly_logomark.svg", "displayName": "WildFly Bootable Jar", "description": "Java stack with WildFly in bootable Jar mode, OpenJDK 11 and Maven 3.5", "type": "stack", @@ -294,6 +305,7 @@ "version": "1.0.0", "schemaVersion": "2.2.0", "default": true, + "icon": "https://design.jboss.org/wildfly/logo/final/wildfly_logomark.svg", "description": "Java stack with WildFly in bootable Jar mode, OpenJDK 11 and Maven 3.5", "tags": [ "RHEL8", @@ -325,6 +337,7 @@ }, { "name": "nodejs", + "icon": "https://nodejs.org/static/images/logos/nodejs-new-pantone-black.svg", "displayName": "NodeJS Runtime", "description": "Stack with NodeJS 12", "type": "stack", @@ -340,6 +353,7 @@ "version": "1.0.0", "schemaVersion": "2.2.0", "default": true, + "icon": "https://nodejs.org/static/images/logos/nodejs-new-pantone-black.svg", "description": "Stack with NodeJS 12", "tags": [ "NodeJS", @@ -361,6 +375,7 @@ }, { "name": "python", + "icon": "https://raw.githubusercontent.com/devfile-samples/devfile-stack-icons/main/python.svg", "displayName": "Python", "description": "Python Stack with Python 3.7", "type": "stack", @@ -375,6 +390,7 @@ "version": "1.0.0", "schemaVersion": "2.2.0", "default": true, + "icon": "https://raw.githubusercontent.com/devfile-samples/devfile-stack-icons/main/python.svg", "description": "Python Stack with Python 3.7", "tags": [ "Python", @@ -394,6 +410,7 @@ }, { "name": "python-django", + "icon": "https://static.djangoproject.com/img/logos/django-logo-positive.svg", "displayName": "Django", "description": "Python3.7 with Django", "type": "stack", @@ -409,6 +426,7 @@ "version": "1.0.0", "schemaVersion": "2.2.0", "default": true, + "icon": "https://static.djangoproject.com/img/logos/django-logo-positive.svg", "description": "Python3.7 with Django", "tags": [ "Python", From 9c68f5ee271c87b38f48e4df320c82592e30e6e3 Mon Sep 17 00:00:00 2001 From: thepetk Date: Tue, 7 Mar 2023 17:05:36 +0000 Subject: [PATCH 05/16] Add iconUrls to test stacks, jsons and samples Signed-off-by: thepetk --- .../generator/tests/registry/index_extra.json | 2 +- .../generator/tests/registry/index_main.json | 19 ++++++++++++++++++- .../code-with-quarkus/1.1.0/devfile.yaml | 1 + .../samples/nodejs-basic/1.0.0/devfile.yaml | 1 + .../samples/nodejs-basic/1.0.1/devfile.yaml | 1 + .../registry/stacks/java-maven/devfile.yaml | 1 + .../stacks/java-openliberty/devfile.yaml | 1 + .../registry/stacks/java-quarkus/devfile.yaml | 1 + .../registry/stacks/java-vertx/devfile.yaml | 1 + .../java-wildfly-bootable-jar/devfile.yaml | 1 + .../registry/stacks/java-wildfly/devfile.yaml | 1 + .../tests/registry/stacks/nodejs/devfile.yaml | 1 + .../stacks/python-django/devfile.yaml | 1 + .../tests/registry/stacks/python/devfile.yaml | 1 + 14 files changed, 31 insertions(+), 2 deletions(-) diff --git a/index/generator/tests/registry/index_extra.json b/index/generator/tests/registry/index_extra.json index a605f4c9b..c21021aff 100644 --- a/index/generator/tests/registry/index_extra.json +++ b/index/generator/tests/registry/index_extra.json @@ -8,7 +8,7 @@ "NodeJS", "Express" ], - "icon": "nodejsIcon.svg", + "icon": "https://nodejs.org/static/images/logos/nodejs-new-pantone-black.svg", "projectType": "nodejs", "language": "nodejs", "versions": [ diff --git a/index/generator/tests/registry/index_main.json b/index/generator/tests/registry/index_main.json index 92937ebd3..6deeda671 100644 --- a/index/generator/tests/registry/index_main.json +++ b/index/generator/tests/registry/index_main.json @@ -53,6 +53,7 @@ }, { "name": "java-maven", + "icon": "https://raw.githubusercontent.com/devfile-samples/devfile-stack-icons/main/java-maven.jpg", "displayName": "Maven Java", "description": "Upstream Maven and OpenJDK 11", "type": "stack", @@ -65,6 +66,7 @@ "version": "1.1.0", "schemaVersion": "2.2.0", "default": true, + "icon": "https://raw.githubusercontent.com/devfile-samples/devfile-stack-icons/main/java-maven.jpg", "description": "Upstream Maven and OpenJDK 11", "tags": ["Java", "Maven"], "links": { @@ -84,6 +86,7 @@ }, { "name": "java-openliberty", + "icon": "https://raw.githubusercontent.com/OpenLiberty/logos/7fbb132949b9b2589e18c8d5665c1b107028a21d/logomark/svg/OL_logomark.svg", "displayName": "Open Liberty", "description": "Java application stack using Open Liberty runtime", "type": "stack", @@ -95,6 +98,7 @@ "version": "0.5.0", "schemaVersion": "2.2.0", "default": true, + "icon": "https://raw.githubusercontent.com/OpenLiberty/logos/7fbb132949b9b2589e18c8d5665c1b107028a21d/logomark/svg/OL_logomark.svg", "description": "Java application stack using Open Liberty runtime", "links": { "self": "devfile-catalog/java-openliberty:0.5.0" @@ -113,6 +117,7 @@ }, { "name": "java-quarkus", + "icon": "https://design.jboss.org/quarkus/logo/final/SVG/quarkus_icon_rgb_default.svg", "displayName": "Quarkus Java", "description": "Upstream Quarkus with Java+GraalVM", "type": "stack", @@ -125,6 +130,7 @@ "version": "1.1.0", "schemaVersion": "2.2.0", "default": true, + "icon": "https://design.jboss.org/quarkus/logo/final/SVG/quarkus_icon_rgb_default.svg", "description": "Upstream Quarkus with Java+GraalVM", "tags": ["Java", "Quarkus"], "links": { @@ -178,6 +184,7 @@ "name": "java-vertx", "displayName": "Vert.x Java", "description": "Upstream Vert.x using Java", + "icon": "https://raw.githubusercontent.com/vertx-web-site/vertx-logo/master/vertx-logo.svg", "type": "stack", "tags": ["Java", "Vert.x"], "projectType": "vertx", @@ -187,6 +194,7 @@ "version": "1.1.0", "schemaVersion": "2.2.0", "default": true, + "icon": "https://raw.githubusercontent.com/vertx-web-site/vertx-logo/master/vertx-logo.svg", "description": "Upstream Vert.x using Java", "tags": ["Java", "Vert.x"], "links": { @@ -226,6 +234,7 @@ }, { "name": "java-wildfly", + "icon": "https://design.jboss.org/wildfly/logo/final/wildfly_logomark.svg", "displayName": "WildFly Java", "description": "Upstream WildFly", "type": "stack", @@ -265,6 +274,7 @@ }, { "name": "java-wildfly-bootable-jar", + "icon": "https://design.jboss.org/wildfly/logo/final/wildfly_logomark.svg", "displayName": "WildFly Bootable Jar", "description": "Java stack with WildFly in bootable Jar mode, OpenJDK 11 and Maven 3.5", "type": "stack", @@ -276,6 +286,7 @@ "version": "1.0.0", "schemaVersion": "2.2.0", "default": true, + "icon": "https://design.jboss.org/wildfly/logo/final/wildfly_logomark.svg", "description": "Java stack with WildFly in bootable Jar mode, OpenJDK 11 and Maven 3.5", "tags": [ "RHEL8", @@ -312,6 +323,7 @@ }, { "name": "nodejs", + "icon": "https://nodejs.org/static/images/logos/nodejs-new-pantone-black.svg", "displayName": "NodeJS Runtime", "description": "Stack with NodeJS 12", "type": "stack", @@ -323,6 +335,7 @@ "version": "1.0.0", "schemaVersion": "2.2.0", "default": true, + "icon": "https://nodejs.org/static/images/logos/nodejs-new-pantone-black.svg", "description": "Stack with NodeJS 12", "tags": ["NodeJS", "Express", "ubi8"], "links": { @@ -342,6 +355,7 @@ }, { "name": "python", + "icon": "https://raw.githubusercontent.com/devfile-samples/devfile-stack-icons/main/python.svg", "displayName": "Python", "description": "Python Stack with Python 3.7", "type": "stack", @@ -353,6 +367,7 @@ "version": "1.0.0", "schemaVersion": "2.2.0", "default": true, + "icon": "https://raw.githubusercontent.com/devfile-samples/devfile-stack-icons/main/python.svg", "description": "Python Stack with Python 3.7", "tags": ["Python", "pip"], "links": { @@ -373,6 +388,7 @@ { "name": "python-django", "displayName": "Django", + "icon": "https://static.djangoproject.com/img/logos/django-logo-positive.svg", "description": "Python3.7 with Django", "type": "stack", "tags": ["Python", "pip", "Django"], @@ -383,6 +399,7 @@ "version": "1.0.0", "schemaVersion": "2.2.0", "default": true, + "icon": "https://static.djangoproject.com/img/logos/django-logo-positive.svg", "description": "Python3.7 with Django", "tags": ["Python", "pip", "Django"], "links": { @@ -406,7 +423,7 @@ "description": "A simple Hello World application", "type": "sample", "tags": ["NodeJS", "Express"], - "icon": "nodejsIcon.svg", + "icon": "icon: https://nodejs.org/static/images/logos/nodejs-new-pantone-black.svg", "projectType": "nodejs", "language": "nodejs", "versions": [ diff --git a/index/generator/tests/registry/samples/code-with-quarkus/1.1.0/devfile.yaml b/index/generator/tests/registry/samples/code-with-quarkus/1.1.0/devfile.yaml index a77942058..d4e3d94b6 100644 --- a/index/generator/tests/registry/samples/code-with-quarkus/1.1.0/devfile.yaml +++ b/index/generator/tests/registry/samples/code-with-quarkus/1.1.0/devfile.yaml @@ -1,6 +1,7 @@ schemaVersion: 2.0.0 metadata: name: java-quarkus + icon: https://design.jboss.org/quarkus/logo/final/SVG/quarkus_icon_rgb_default.svg version: 1.1.0 attributes: alpha.build-context: . diff --git a/index/generator/tests/registry/samples/nodejs-basic/1.0.0/devfile.yaml b/index/generator/tests/registry/samples/nodejs-basic/1.0.0/devfile.yaml index 5fa08e605..8be376200 100644 --- a/index/generator/tests/registry/samples/nodejs-basic/1.0.0/devfile.yaml +++ b/index/generator/tests/registry/samples/nodejs-basic/1.0.0/devfile.yaml @@ -1,6 +1,7 @@ schemaVersion: 2.0.0 metadata: name: nodejs + icon: https://nodejs.org/static/images/logos/nodejs-new-pantone-black.svg version: 1.0.1 displayName: Node.js Runtime description: Stack with Node.js 14 diff --git a/index/generator/tests/registry/samples/nodejs-basic/1.0.1/devfile.yaml b/index/generator/tests/registry/samples/nodejs-basic/1.0.1/devfile.yaml index 77164e36f..fd494e290 100644 --- a/index/generator/tests/registry/samples/nodejs-basic/1.0.1/devfile.yaml +++ b/index/generator/tests/registry/samples/nodejs-basic/1.0.1/devfile.yaml @@ -1,6 +1,7 @@ schemaVersion: 2.2.0 metadata: name: nodejs + icon: https://nodejs.org/static/images/logos/nodejs-new-pantone-black.svg version: 1.0.1 displayName: Node.js Runtime description: Stack with Node.js 14 diff --git a/index/generator/tests/registry/stacks/java-maven/devfile.yaml b/index/generator/tests/registry/stacks/java-maven/devfile.yaml index 744702fff..b5e7f2676 100644 --- a/index/generator/tests/registry/stacks/java-maven/devfile.yaml +++ b/index/generator/tests/registry/stacks/java-maven/devfile.yaml @@ -1,6 +1,7 @@ schemaVersion: 2.2.0 metadata: name: java-maven + icon: https://raw.githubusercontent.com/devfile-samples/devfile-stack-icons/main/java-maven.jpg version: 1.1.0 displayName: Maven Java description: Upstream Maven and OpenJDK 11 diff --git a/index/generator/tests/registry/stacks/java-openliberty/devfile.yaml b/index/generator/tests/registry/stacks/java-openliberty/devfile.yaml index 9b16a26ef..07b6b7d5d 100644 --- a/index/generator/tests/registry/stacks/java-openliberty/devfile.yaml +++ b/index/generator/tests/registry/stacks/java-openliberty/devfile.yaml @@ -17,6 +17,7 @@ schemaVersion: 2.2.0 metadata: name: java-openliberty + icon: https://raw.githubusercontent.com/OpenLiberty/logos/7fbb132949b9b2589e18c8d5665c1b107028a21d/logomark/svg/OL_logomark.svg version: 0.5.0 description: Java application stack using Open Liberty runtime displayName: "Open Liberty" diff --git a/index/generator/tests/registry/stacks/java-quarkus/devfile.yaml b/index/generator/tests/registry/stacks/java-quarkus/devfile.yaml index b7746e290..6534d9023 100644 --- a/index/generator/tests/registry/stacks/java-quarkus/devfile.yaml +++ b/index/generator/tests/registry/stacks/java-quarkus/devfile.yaml @@ -1,6 +1,7 @@ schemaVersion: 2.2.0 metadata: name: java-quarkus + icon: https://design.jboss.org/quarkus/logo/final/SVG/quarkus_icon_rgb_default.svg version: 1.1.0 website: https://quarkus.io displayName: Quarkus Java diff --git a/index/generator/tests/registry/stacks/java-vertx/devfile.yaml b/index/generator/tests/registry/stacks/java-vertx/devfile.yaml index a3bd188c1..431e1c0c1 100644 --- a/index/generator/tests/registry/stacks/java-vertx/devfile.yaml +++ b/index/generator/tests/registry/stacks/java-vertx/devfile.yaml @@ -1,6 +1,7 @@ schemaVersion: 2.2.0 metadata: name: java-vertx + icon: https://raw.githubusercontent.com/vertx-web-site/vertx-logo/master/vertx-logo.svg version: 1.1.0 displayName: Vert.x Java description: Upstream Vert.x using Java diff --git a/index/generator/tests/registry/stacks/java-wildfly-bootable-jar/devfile.yaml b/index/generator/tests/registry/stacks/java-wildfly-bootable-jar/devfile.yaml index 4b6094da4..6bddf008e 100644 --- a/index/generator/tests/registry/stacks/java-wildfly-bootable-jar/devfile.yaml +++ b/index/generator/tests/registry/stacks/java-wildfly-bootable-jar/devfile.yaml @@ -1,6 +1,7 @@ schemaVersion: 2.2.0 metadata: name: java-wildfly-bootable-jar + icon: https://design.jboss.org/wildfly/logo/final/wildfly_logomark.svg version: 1.0.0 website: https://docs.wildfly.org/bootablejar/ displayName: WildFly Bootable Jar diff --git a/index/generator/tests/registry/stacks/java-wildfly/devfile.yaml b/index/generator/tests/registry/stacks/java-wildfly/devfile.yaml index 9e95e503d..03a1498b3 100644 --- a/index/generator/tests/registry/stacks/java-wildfly/devfile.yaml +++ b/index/generator/tests/registry/stacks/java-wildfly/devfile.yaml @@ -1,6 +1,7 @@ schemaVersion: 2.2.0 metadata: name: java-wildfly + icon: https://design.jboss.org/wildfly/logo/final/wildfly_logomark.svg version: 1.0.0 website: https://wildfly.org displayName: WildFly Java diff --git a/index/generator/tests/registry/stacks/nodejs/devfile.yaml b/index/generator/tests/registry/stacks/nodejs/devfile.yaml index 10a813347..35190eec8 100644 --- a/index/generator/tests/registry/stacks/nodejs/devfile.yaml +++ b/index/generator/tests/registry/stacks/nodejs/devfile.yaml @@ -1,6 +1,7 @@ schemaVersion: 2.2.0 metadata: name: nodejs + icon: https://nodejs.org/static/images/logos/nodejs-new-pantone-black.svg version: 1.0.0 displayName: NodeJS Runtime description: Stack with NodeJS 12 diff --git a/index/generator/tests/registry/stacks/python-django/devfile.yaml b/index/generator/tests/registry/stacks/python-django/devfile.yaml index cccebc8d2..127c45c22 100644 --- a/index/generator/tests/registry/stacks/python-django/devfile.yaml +++ b/index/generator/tests/registry/stacks/python-django/devfile.yaml @@ -1,6 +1,7 @@ schemaVersion: 2.2.0 metadata: name: python-django + icon: https://static.djangoproject.com/img/logos/django-logo-positive.svg version: 1.0.0 displayName: Django description: Python3.7 with Django diff --git a/index/generator/tests/registry/stacks/python/devfile.yaml b/index/generator/tests/registry/stacks/python/devfile.yaml index 59db96483..d39ddf1a9 100644 --- a/index/generator/tests/registry/stacks/python/devfile.yaml +++ b/index/generator/tests/registry/stacks/python/devfile.yaml @@ -1,6 +1,7 @@ schemaVersion: 2.2.0 metadata: name: python + icon: https://raw.githubusercontent.com/devfile-samples/devfile-stack-icons/main/python.svg version: 1.0.0 displayName: Python description: Python Stack with Python 3.7 From bfe10c5bb460f59ead86a9703973a21d7e7fdc37 Mon Sep 17 00:00:00 2001 From: thepetk Date: Tue, 7 Mar 2023 17:24:14 +0000 Subject: [PATCH 06/16] Fix syntax error on string Signed-off-by: thepetk --- index/generator/tests/registry/index_main.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/index/generator/tests/registry/index_main.json b/index/generator/tests/registry/index_main.json index 6deeda671..4037eba9a 100644 --- a/index/generator/tests/registry/index_main.json +++ b/index/generator/tests/registry/index_main.json @@ -423,7 +423,7 @@ "description": "A simple Hello World application", "type": "sample", "tags": ["NodeJS", "Express"], - "icon": "icon: https://nodejs.org/static/images/logos/nodejs-new-pantone-black.svg", + "icon": "https://nodejs.org/static/images/logos/nodejs-new-pantone-black.svg", "projectType": "nodejs", "language": "nodejs", "versions": [ From 4f2e3d0ea58aed4f068bf9dbbf9269f226993b3e Mon Sep 17 00:00:00 2001 From: thepetk Date: Wed, 8 Mar 2023 14:08:31 +0000 Subject: [PATCH 07/16] Add icon urls to index generator test resources Signed-off-by: thepetk --- .../tests/registry/extraDevfileEntries.yaml | 2 +- .../generator/tests/registry/index_main.json | 23 ++++++++++--------- .../tests/registry/index_registry.json | 22 ++++++++++++++++-- 3 files changed, 33 insertions(+), 14 deletions(-) diff --git a/index/generator/tests/registry/extraDevfileEntries.yaml b/index/generator/tests/registry/extraDevfileEntries.yaml index a11a5cb84..d54ecbbde 100644 --- a/index/generator/tests/registry/extraDevfileEntries.yaml +++ b/index/generator/tests/registry/extraDevfileEntries.yaml @@ -3,7 +3,7 @@ samples: - name: nodejs-basic displayName: Basic NodeJS description: A simple Hello World application - icon: nodejsIcon.svg + icon: https://nodejs.org/static/images/logos/nodejs-new-pantone-black.svg tags: ["NodeJS", "Express"] projectType: nodejs language: nodejs diff --git a/index/generator/tests/registry/index_main.json b/index/generator/tests/registry/index_main.json index 4037eba9a..1c7db1634 100644 --- a/index/generator/tests/registry/index_main.json +++ b/index/generator/tests/registry/index_main.json @@ -14,8 +14,8 @@ "version": "1.2.0", "schemaVersion": "2.1.0", "description": "Stack with the latest Go version with devfile v2.1.0 schema version", - "tags": ["testtag"], "icon": "https://raw.githubusercontent.com/devfile-samples/devfile-stack-icons/main/golang.svg", + "tags": ["testtag"], "links": { "self": "devfile-catalog/go:1.2.0" }, @@ -34,8 +34,8 @@ "schemaVersion": "2.0.0", "default": true, "description": "Stack with the latest Go version with devfile v2.0.0 schema version", - "tags": ["Go"], "icon": "https://raw.githubusercontent.com/devfile-samples/devfile-stack-icons/main/golang.svg", + "tags": ["Go"], "links": { "self": "devfile-catalog/go:1.1.0" }, @@ -66,8 +66,8 @@ "version": "1.1.0", "schemaVersion": "2.2.0", "default": true, - "icon": "https://raw.githubusercontent.com/devfile-samples/devfile-stack-icons/main/java-maven.jpg", "description": "Upstream Maven and OpenJDK 11", + "icon": "https://raw.githubusercontent.com/devfile-samples/devfile-stack-icons/main/java-maven.jpg", "tags": ["Java", "Maven"], "links": { "self": "devfile-catalog/java-maven:1.1.0" @@ -98,8 +98,8 @@ "version": "0.5.0", "schemaVersion": "2.2.0", "default": true, - "icon": "https://raw.githubusercontent.com/OpenLiberty/logos/7fbb132949b9b2589e18c8d5665c1b107028a21d/logomark/svg/OL_logomark.svg", "description": "Java application stack using Open Liberty runtime", + "icon": "https://raw.githubusercontent.com/OpenLiberty/logos/7fbb132949b9b2589e18c8d5665c1b107028a21d/logomark/svg/OL_logomark.svg", "links": { "self": "devfile-catalog/java-openliberty:0.5.0" }, @@ -130,8 +130,8 @@ "version": "1.1.0", "schemaVersion": "2.2.0", "default": true, - "icon": "https://design.jboss.org/quarkus/logo/final/SVG/quarkus_icon_rgb_default.svg", "description": "Upstream Quarkus with Java+GraalVM", + "icon": "https://design.jboss.org/quarkus/logo/final/SVG/quarkus_icon_rgb_default.svg", "tags": ["Java", "Quarkus"], "links": { "self": "devfile-catalog/java-quarkus:1.1.0" @@ -163,8 +163,8 @@ "schemaVersion": "2.2.0", "default": true, "description": "Spring Boot® using Java", - "tags": ["Java", "Spring"], "icon": "https://www.eclipse.org/che/images/logo-eclipseche.svg", + "tags": ["Java", "Spring"], "links": { "self": "devfile-catalog/java-springboot:1.1.0" }, @@ -194,8 +194,8 @@ "version": "1.1.0", "schemaVersion": "2.2.0", "default": true, - "icon": "https://raw.githubusercontent.com/vertx-web-site/vertx-logo/master/vertx-logo.svg", "description": "Upstream Vert.x using Java", + "icon": "https://raw.githubusercontent.com/vertx-web-site/vertx-logo/master/vertx-logo.svg", "tags": ["Java", "Vert.x"], "links": { "self": "devfile-catalog/java-vertx:1.1.0" @@ -247,6 +247,7 @@ "schemaVersion": "2.2.0", "default": true, "description": "Upstream WildFly", + "icon": "https://design.jboss.org/wildfly/logo/final/wildfly_logomark.svg", "tags": ["Java", "WildFly"], "links": { "self": "devfile-catalog/java-wildfly:1.0.0" @@ -286,8 +287,8 @@ "version": "1.0.0", "schemaVersion": "2.2.0", "default": true, - "icon": "https://design.jboss.org/wildfly/logo/final/wildfly_logomark.svg", "description": "Java stack with WildFly in bootable Jar mode, OpenJDK 11 and Maven 3.5", + "icon": "https://design.jboss.org/wildfly/logo/final/wildfly_logomark.svg", "tags": [ "RHEL8", "Java", @@ -335,8 +336,8 @@ "version": "1.0.0", "schemaVersion": "2.2.0", "default": true, - "icon": "https://nodejs.org/static/images/logos/nodejs-new-pantone-black.svg", "description": "Stack with NodeJS 12", + "icon": "https://nodejs.org/static/images/logos/nodejs-new-pantone-black.svg", "tags": ["NodeJS", "Express", "ubi8"], "links": { "self": "devfile-catalog/nodejs:1.0.0" @@ -367,8 +368,8 @@ "version": "1.0.0", "schemaVersion": "2.2.0", "default": true, - "icon": "https://raw.githubusercontent.com/devfile-samples/devfile-stack-icons/main/python.svg", "description": "Python Stack with Python 3.7", + "icon": "https://raw.githubusercontent.com/devfile-samples/devfile-stack-icons/main/python.svg", "tags": ["Python", "pip"], "links": { "self": "devfile-catalog/python:1.0.0" @@ -399,8 +400,8 @@ "version": "1.0.0", "schemaVersion": "2.2.0", "default": true, - "icon": "https://static.djangoproject.com/img/logos/django-logo-positive.svg", "description": "Python3.7 with Django", + "icon": "https://static.djangoproject.com/img/logos/django-logo-positive.svg", "tags": ["Python", "pip", "Django"], "links": { "self": "devfile-catalog/python-django:1.0.0" diff --git a/index/generator/tests/registry/index_registry.json b/index/generator/tests/registry/index_registry.json index 506b4d8f2..d28046533 100644 --- a/index/generator/tests/registry/index_registry.json +++ b/index/generator/tests/registry/index_registry.json @@ -14,8 +14,8 @@ "version": "1.2.0", "schemaVersion": "2.1.0", "description": "Stack with the latest Go version with devfile v2.1.0 schema version", - "tags": ["testtag"], "icon": "https://raw.githubusercontent.com/devfile-samples/devfile-stack-icons/main/golang.svg", + "tags": ["testtag"], "links": { "self": "devfile-catalog/go:1.2.0" }, @@ -34,8 +34,8 @@ "schemaVersion": "2.0.0", "default": true, "description": "Stack with the latest Go version with devfile v2.0.0 schema version", - "tags": ["Go"], "icon": "https://raw.githubusercontent.com/devfile-samples/devfile-stack-icons/main/golang.svg", + "tags": ["Go"], "links": { "self": "devfile-catalog/go:1.1.0" }, @@ -54,6 +54,7 @@ { "name": "java-maven", "displayName": "Maven Java", + "icon": "https://raw.githubusercontent.com/devfile-samples/devfile-stack-icons/main/java-maven.jpg", "description": "Upstream Maven and OpenJDK 11", "type": "stack", "tags": ["Java", "Maven"], @@ -65,6 +66,7 @@ "version": "1.1.0", "schemaVersion": "2.2.0", "default": true, + "icon": "https://raw.githubusercontent.com/devfile-samples/devfile-stack-icons/main/java-maven.jpg", "description": "Upstream Maven and OpenJDK 11", "tags": ["Java", "Maven"], "links": { @@ -85,6 +87,7 @@ { "name": "java-openliberty", "displayName": "Open Liberty", + "icon": "https://raw.githubusercontent.com/OpenLiberty/logos/7fbb132949b9b2589e18c8d5665c1b107028a21d/logomark/svg/OL_logomark.svg", "description": "Java application stack using Open Liberty runtime", "type": "stack", "projectType": "docker", @@ -96,6 +99,7 @@ "schemaVersion": "2.2.0", "default": true, "description": "Java application stack using Open Liberty runtime", + "icon": "https://raw.githubusercontent.com/OpenLiberty/logos/7fbb132949b9b2589e18c8d5665c1b107028a21d/logomark/svg/OL_logomark.svg", "links": { "self": "devfile-catalog/java-openliberty:0.5.0" }, @@ -114,6 +118,7 @@ { "name": "java-quarkus", "displayName": "Quarkus Java", + "icon": "https://design.jboss.org/quarkus/logo/final/SVG/quarkus_icon_rgb_default.svg", "description": "Upstream Quarkus with Java+GraalVM", "type": "stack", "tags": ["Java", "Quarkus"], @@ -126,6 +131,7 @@ "schemaVersion": "2.2.0", "default": true, "description": "Upstream Quarkus with Java+GraalVM", + "icon": "https://design.jboss.org/quarkus/logo/final/SVG/quarkus_icon_rgb_default.svg", "tags": ["Java", "Quarkus"], "links": { "self": "devfile-catalog/java-quarkus:1.1.0" @@ -178,6 +184,7 @@ "name": "java-vertx", "displayName": "Vert.x Java", "description": "Upstream Vert.x using Java", + "icon": "https://raw.githubusercontent.com/vertx-web-site/vertx-logo/master/vertx-logo.svg", "type": "stack", "tags": ["Java", "Vert.x"], "projectType": "vertx", @@ -188,6 +195,7 @@ "schemaVersion": "2.2.0", "default": true, "description": "Upstream Vert.x using Java", + "icon": "https://raw.githubusercontent.com/vertx-web-site/vertx-logo/master/vertx-logo.svg", "tags": ["Java", "Vert.x"], "links": { "self": "devfile-catalog/java-vertx:1.1.0" @@ -228,6 +236,7 @@ "name": "java-wildfly", "displayName": "WildFly Java", "description": "Upstream WildFly", + "icon": "https://design.jboss.org/wildfly/logo/final/wildfly_logomark.svg", "type": "stack", "tags": ["Java", "WildFly"], "projectType": "wildfly", @@ -238,6 +247,7 @@ "schemaVersion": "2.2.0", "default": true, "description": "Upstream WildFly", + "icon": "https://design.jboss.org/wildfly/logo/final/wildfly_logomark.svg", "tags": ["Java", "WildFly"], "links": { "self": "devfile-catalog/java-wildfly:1.0.0" @@ -266,6 +276,7 @@ { "name": "java-wildfly-bootable-jar", "displayName": "WildFly Bootable Jar", + "icon": "https://design.jboss.org/wildfly/logo/final/wildfly_logomark.svg", "description": "Java stack with WildFly in bootable Jar mode, OpenJDK 11 and Maven 3.5", "type": "stack", "tags": ["RHEL8", "Java", "OpenJDK", "Maven", "WildFly", "Microprofile", "WildFly Bootable"], @@ -277,6 +288,7 @@ "schemaVersion": "2.2.0", "default": true, "description": "Java stack with WildFly in bootable Jar mode, OpenJDK 11 and Maven 3.5", + "icon": "https://design.jboss.org/wildfly/logo/final/wildfly_logomark.svg", "tags": [ "RHEL8", "Java", @@ -313,6 +325,7 @@ { "name": "nodejs", "displayName": "NodeJS Runtime", + "icon": "https://nodejs.org/static/images/logos/nodejs-new-pantone-black.svg", "description": "Stack with NodeJS 12", "type": "stack", "tags": ["NodeJS", "Express", "ubi8"], @@ -324,6 +337,7 @@ "schemaVersion": "2.2.0", "default": true, "description": "Stack with NodeJS 12", + "icon": "https://nodejs.org/static/images/logos/nodejs-new-pantone-black.svg", "tags": ["NodeJS", "Express", "ubi8"], "links": { "self": "devfile-catalog/nodejs:1.0.0" @@ -343,6 +357,7 @@ { "name": "python", "displayName": "Python", + "icon": "https://raw.githubusercontent.com/devfile-samples/devfile-stack-icons/main/python.svg", "description": "Python Stack with Python 3.7", "type": "stack", "tags": ["Python", "pip"], @@ -354,6 +369,7 @@ "schemaVersion": "2.2.0", "default": true, "description": "Python Stack with Python 3.7", + "icon": "https://raw.githubusercontent.com/devfile-samples/devfile-stack-icons/main/python.svg", "tags": ["Python", "pip"], "links": { "self": "devfile-catalog/python:1.0.0" @@ -373,6 +389,7 @@ { "name": "python-django", "displayName": "Django", + "icon": "https://static.djangoproject.com/img/logos/django-logo-positive.svg", "description": "Python3.7 with Django", "type": "stack", "tags": ["Python", "pip", "Django"], @@ -384,6 +401,7 @@ "schemaVersion": "2.2.0", "default": true, "description": "Python3.7 with Django", + "icon": "https://static.djangoproject.com/img/logos/django-logo-positive.svg", "tags": ["Python", "pip", "Django"], "links": { "self": "devfile-catalog/python-django:1.0.0" From 60f7a365fa09a8bda79bbfe291d6e0a6da9055e9 Mon Sep 17 00:00:00 2001 From: thepetk Date: Wed, 8 Mar 2023 14:09:13 +0000 Subject: [PATCH 08/16] Add icon urls to all index server test resources Signed-off-by: thepetk --- index/server/pkg/util/index.json | 11 +++++++++- .../tests/registry/extraDevfileEntries.yaml | 2 +- index/server/tests/registry/index_extra.json | 2 +- index/server/tests/registry/index_main.json | 22 +++++++++++++++++-- .../server/tests/registry/index_registry.json | 20 ++++++++--------- .../tests/resources/newIndexStruct.json | 15 ++++++++++--- .../tests/resources/oldIndexStruct.json | 3 +++ 7 files changed, 57 insertions(+), 18 deletions(-) diff --git a/index/server/pkg/util/index.json b/index/server/pkg/util/index.json index 93429ce8c..43e77faa2 100644 --- a/index/server/pkg/util/index.json +++ b/index/server/pkg/util/index.json @@ -27,6 +27,7 @@ "version": "1.1.0", "displayName": "Maven Java", "description": "Upstream Maven and OpenJDK 11", + "icon": "https://raw.githubusercontent.com/devfile-samples/devfile-stack-icons/main/java-maven.jpg", "type": "stack", "tags": [ "Java", @@ -50,6 +51,7 @@ "version": "0.5.0", "displayName": "Open Liberty", "description": "Java application stack using Open Liberty runtime", + "icon": "https://raw.githubusercontent.com/OpenLiberty/logos/7fbb132949b9b2589e18c8d5665c1b107028a21d/logomark/svg/OL_logomark.svg", "type": "stack", "projectType": "docker", "language": "java", @@ -69,6 +71,7 @@ "version": "1.1.0", "displayName": "Quarkus Java", "description": "Upstream Quarkus with Java+GraalVM", + "icon": "https://design.jboss.org/quarkus/logo/final/SVG/quarkus_icon_rgb_default.svg", "type": "stack", "tags": [ "Java", @@ -116,6 +119,7 @@ "version": "1.1.0", "displayName": "Vert.x Java", "description": "Upstream Vert.x using Java", + "icon": "https://raw.githubusercontent.com/vertx-web-site/vertx-logo/master/vertx-logo.svg", "type": "stack", "tags": [ "Java", @@ -156,6 +160,7 @@ "version": "1.0.0", "displayName": "WildFly Java", "description": "Upstream WildFly", + "icon": "https://design.jboss.org/wildfly/logo/final/wildfly_logomark.svg", "type": "stack", "tags": [ "Java", @@ -184,6 +189,7 @@ "name": "java-wildfly-bootable-jar", "version": "1.0.0", "displayName": "WildFly Bootable Jar", + "icon": "https://design.jboss.org/wildfly/logo/final/wildfly_logomark.svg", "description": "Java stack with WildFly in bootable Jar mode, OpenJDK 11 and Maven 3.5", "type": "stack", "tags": [ @@ -219,6 +225,7 @@ "version": "1.0.0", "displayName": "NodeJS Runtime", "description": "Stack with NodeJS 12", + "icon": "https://nodejs.org/static/images/logos/nodejs-new-pantone-black.svg", "type": "stack", "tags": [ "NodeJS", @@ -243,6 +250,7 @@ "version": "1.0.0", "displayName": "Python", "description": "Python Stack with Python 3.7", + "icon": "https://raw.githubusercontent.com/devfile-samples/devfile-stack-icons/main/python.svg", "type": "stack", "tags": [ "Python", @@ -265,6 +273,7 @@ "version": "1.0.0", "displayName": "Django", "description": "Python3.7 with Django", + "icon": "https://static.djangoproject.com/img/logos/django-logo-positive.svg", "type": "stack", "tags": [ "Python", @@ -288,8 +297,8 @@ "version": "1.0.1", "displayName": "Basic NodeJS", "description": "A simple Hello World application", + "icon": "https://nodejs.org/static/images/logos/nodejs-new-pantone-black.svg", "type": "sample", - "icon": "nodejsIcon.svg", "projectType": "nodejs", "language": "nodejs" }, diff --git a/index/server/tests/registry/extraDevfileEntries.yaml b/index/server/tests/registry/extraDevfileEntries.yaml index a11a5cb84..d54ecbbde 100644 --- a/index/server/tests/registry/extraDevfileEntries.yaml +++ b/index/server/tests/registry/extraDevfileEntries.yaml @@ -3,7 +3,7 @@ samples: - name: nodejs-basic displayName: Basic NodeJS description: A simple Hello World application - icon: nodejsIcon.svg + icon: https://nodejs.org/static/images/logos/nodejs-new-pantone-black.svg tags: ["NodeJS", "Express"] projectType: nodejs language: nodejs diff --git a/index/server/tests/registry/index_extra.json b/index/server/tests/registry/index_extra.json index a605f4c9b..c21021aff 100644 --- a/index/server/tests/registry/index_extra.json +++ b/index/server/tests/registry/index_extra.json @@ -8,7 +8,7 @@ "NodeJS", "Express" ], - "icon": "nodejsIcon.svg", + "icon": "https://nodejs.org/static/images/logos/nodejs-new-pantone-black.svg", "projectType": "nodejs", "language": "nodejs", "versions": [ diff --git a/index/server/tests/registry/index_main.json b/index/server/tests/registry/index_main.json index 64363af21..ba588a21a 100644 --- a/index/server/tests/registry/index_main.json +++ b/index/server/tests/registry/index_main.json @@ -54,6 +54,7 @@ }, { "name": "java-maven", + "icon": "https://raw.githubusercontent.com/devfile-samples/devfile-stack-icons/main/java-maven.jpg", "displayName": "Maven Java", "description": "Upstream Maven and OpenJDK 11", "type": "stack", @@ -70,6 +71,7 @@ "schemaVersion": "2.2.0", "default": true, "description": "Upstream Maven and OpenJDK 11", + "icon": "https://raw.githubusercontent.com/devfile-samples/devfile-stack-icons/main/java-maven.jpg", "tags": [ "Java", "Maven" @@ -88,6 +90,7 @@ }, { "name": "java-openliberty", + "icon": "https://raw.githubusercontent.com/OpenLiberty/logos/7fbb132949b9b2589e18c8d5665c1b107028a21d/logomark/svg/OL_logomark.svg", "displayName": "Open Liberty", "description": "Java application stack using Open Liberty runtime", "type": "stack", @@ -100,6 +103,7 @@ "schemaVersion": "2.2.0", "default": true, "description": "Java application stack using Open Liberty runtime", + "icon": "https://raw.githubusercontent.com/OpenLiberty/logos/7fbb132949b9b2589e18c8d5665c1b107028a21d/logomark/svg/OL_logomark.svg", "links": { "self": "devfile-catalog/java-openliberty:0.5.0" }, @@ -114,6 +118,7 @@ }, { "name": "java-quarkus", + "icon": "https://design.jboss.org/quarkus/logo/final/SVG/quarkus_icon_rgb_default.svg", "displayName": "Quarkus Java", "description": "Upstream Quarkus with Java+GraalVM", "type": "stack", @@ -130,6 +135,7 @@ "schemaVersion": "2.2.0", "default": true, "description": "Upstream Quarkus with Java+GraalVM", + "icon": "https://design.jboss.org/quarkus/logo/final/SVG/quarkus_icon_rgb_default.svg", "tags": [ "Java", "Quarkus" @@ -165,11 +171,11 @@ "schemaVersion": "2.2.0", "default": true, "description": "Spring Boot® using Java", + "icon": "https://www.eclipse.org/che/images/logo-eclipseche.svg", "tags": [ "Java", "Spring" ], - "icon": "https://www.eclipse.org/che/images/logo-eclipseche.svg", "links": { "self": "devfile-catalog/java-springboot:1.1.0" }, @@ -186,6 +192,7 @@ "name": "java-vertx", "displayName": "Vert.x Java", "description": "Upstream Vert.x using Java", + "icon": "https://raw.githubusercontent.com/vertx-web-site/vertx-logo/master/vertx-logo.svg", "type": "stack", "tags": [ "Java", @@ -199,6 +206,7 @@ "schemaVersion": "2.2.0", "default": true, "description": "Upstream Vert.x using Java", + "icon": "https://raw.githubusercontent.com/vertx-web-site/vertx-logo/master/vertx-logo.svg", "tags": [ "Java", "Vert.x" @@ -235,6 +243,7 @@ }, { "name": "java-wildfly", + "icon": "https://design.jboss.org/wildfly/logo/final/wildfly_logomark.svg", "displayName": "WildFly Java", "description": "Upstream WildFly", "type": "stack", @@ -250,6 +259,7 @@ "schemaVersion": "2.2.0", "default": true, "description": "Upstream WildFly", + "icon": "https://design.jboss.org/wildfly/logo/final/wildfly_logomark.svg", "tags": [ "Java", "WildFly" @@ -275,6 +285,7 @@ }, { "name": "java-wildfly-bootable-jar", + "icon": "https://design.jboss.org/wildfly/logo/final/wildfly_logomark.svg", "displayName": "WildFly Bootable Jar", "description": "Java stack with WildFly in bootable Jar mode, OpenJDK 11 and Maven 3.5", "type": "stack", @@ -295,6 +306,7 @@ "schemaVersion": "2.2.0", "default": true, "description": "Java stack with WildFly in bootable Jar mode, OpenJDK 11 and Maven 3.5", + "icon": "https://design.jboss.org/wildfly/logo/final/wildfly_logomark.svg", "tags": [ "RHEL8", "Java", @@ -325,6 +337,7 @@ }, { "name": "nodejs", + "icon": "https://nodejs.org/static/images/logos/nodejs-new-pantone-black.svg", "displayName": "NodeJS Runtime", "description": "Stack with NodeJS 12", "type": "stack", @@ -341,6 +354,7 @@ "schemaVersion": "2.2.0", "default": true, "description": "Stack with NodeJS 12", + "icon": "https://nodejs.org/static/images/logos/nodejs-new-pantone-black.svg", "tags": [ "NodeJS", "Express", @@ -361,6 +375,7 @@ }, { "name": "python", + "icon": "https://raw.githubusercontent.com/devfile-samples/devfile-stack-icons/main/python.svg", "displayName": "Python", "description": "Python Stack with Python 3.7", "type": "stack", @@ -376,6 +391,7 @@ "schemaVersion": "2.2.0", "default": true, "description": "Python Stack with Python 3.7", + "icon": "https://raw.githubusercontent.com/devfile-samples/devfile-stack-icons/main/python.svg", "tags": [ "Python", "pip" @@ -395,6 +411,7 @@ { "name": "python-django", "displayName": "Django", + "icon": "https://static.djangoproject.com/img/logos/django-logo-positive.svg", "description": "Python3.7 with Django", "type": "stack", "tags": [ @@ -410,6 +427,7 @@ "schemaVersion": "2.2.0", "default": true, "description": "Python3.7 with Django", + "icon": "https://static.djangoproject.com/img/logos/django-logo-positive.svg", "tags": [ "Python", "pip", @@ -436,7 +454,7 @@ "NodeJS", "Express" ], - "icon": "nodejsIcon.svg", + "icon": "https://nodejs.org/static/images/logos/nodejs-new-pantone-black.svg", "projectType": "nodejs", "language": "nodejs", "versions": [ diff --git a/index/server/tests/registry/index_registry.json b/index/server/tests/registry/index_registry.json index aaf193b45..1f7b160d8 100644 --- a/index/server/tests/registry/index_registry.json +++ b/index/server/tests/registry/index_registry.json @@ -69,9 +69,9 @@ { "version": "1.1.0", "schemaVersion": "2.2.0", - "icon": "https://raw.githubusercontent.com/devfile-samples/devfile-stack-icons/main/java-maven.jpg", "default": true, "description": "Upstream Maven and OpenJDK 11", + "icon": "https://raw.githubusercontent.com/devfile-samples/devfile-stack-icons/main/java-maven.jpg", "tags": [ "Java", "Maven" @@ -101,8 +101,8 @@ { "version": "0.5.0", "schemaVersion": "2.2.0", - "icon":"https://raw.githubusercontent.com/OpenLiberty/logos/7fbb132949b9b2589e18c8d5665c1b107028a21d/logomark/svg/OL_logomark.svg", "default": true, + "icon":"https://raw.githubusercontent.com/OpenLiberty/logos/7fbb132949b9b2589e18c8d5665c1b107028a21d/logomark/svg/OL_logomark.svg", "description": "Java application stack using Open Liberty runtime", "links": { "self": "devfile-catalog/java-openliberty:0.5.0" @@ -133,9 +133,9 @@ { "version": "1.1.0", "schemaVersion": "2.2.0", - "icon": "https://design.jboss.org/quarkus/logo/final/SVG/quarkus_icon_rgb_default.svg", "default": true, "description": "Upstream Quarkus with Java+GraalVM", + "icon": "https://design.jboss.org/quarkus/logo/final/SVG/quarkus_icon_rgb_default.svg", "tags": [ "Java", "Quarkus" @@ -171,11 +171,11 @@ "schemaVersion": "2.2.0", "default": true, "description": "Spring Boot® using Java", + "icon": "https://www.eclipse.org/che/images/logo-eclipseche.svg", "tags": [ "Java", "Spring" ], - "icon": "https://www.eclipse.org/che/images/logo-eclipseche.svg", "links": { "self": "devfile-catalog/java-springboot:1.1.0" }, @@ -205,8 +205,8 @@ "version": "1.1.0", "schemaVersion": "2.2.0", "default": true, - "icon": "https://raw.githubusercontent.com/vertx-web-site/vertx-logo/master/vertx-logo.svg", "description": "Upstream Vert.x using Java", + "icon": "https://raw.githubusercontent.com/vertx-web-site/vertx-logo/master/vertx-logo.svg", "tags": [ "Java", "Vert.x" @@ -258,8 +258,8 @@ "version": "1.0.0", "schemaVersion": "2.2.0", "default": true, - "icon": "https://design.jboss.org/wildfly/logo/final/wildfly_logomark.svg", "description": "Upstream WildFly", + "icon": "https://design.jboss.org/wildfly/logo/final/wildfly_logomark.svg", "tags": [ "Java", "WildFly" @@ -305,8 +305,8 @@ "version": "1.0.0", "schemaVersion": "2.2.0", "default": true, - "icon": "https://design.jboss.org/wildfly/logo/final/wildfly_logomark.svg", "description": "Java stack with WildFly in bootable Jar mode, OpenJDK 11 and Maven 3.5", + "icon": "https://design.jboss.org/wildfly/logo/final/wildfly_logomark.svg", "tags": [ "RHEL8", "Java", @@ -353,8 +353,8 @@ "version": "1.0.0", "schemaVersion": "2.2.0", "default": true, - "icon": "https://nodejs.org/static/images/logos/nodejs-new-pantone-black.svg", "description": "Stack with NodeJS 12", + "icon": "https://nodejs.org/static/images/logos/nodejs-new-pantone-black.svg", "tags": [ "NodeJS", "Express", @@ -390,8 +390,8 @@ "version": "1.0.0", "schemaVersion": "2.2.0", "default": true, - "icon": "https://raw.githubusercontent.com/devfile-samples/devfile-stack-icons/main/python.svg", "description": "Python Stack with Python 3.7", + "icon": "https://raw.githubusercontent.com/devfile-samples/devfile-stack-icons/main/python.svg", "tags": [ "Python", "pip" @@ -426,8 +426,8 @@ "version": "1.0.0", "schemaVersion": "2.2.0", "default": true, - "icon": "https://static.djangoproject.com/img/logos/django-logo-positive.svg", "description": "Python3.7 with Django", + "icon": "https://static.djangoproject.com/img/logos/django-logo-positive.svg", "tags": [ "Python", "pip", diff --git a/index/server/tests/resources/newIndexStruct.json b/index/server/tests/resources/newIndexStruct.json index 87efeb801..040e478bc 100644 --- a/index/server/tests/resources/newIndexStruct.json +++ b/index/server/tests/resources/newIndexStruct.json @@ -56,6 +56,7 @@ "name": "java-maven", "displayName": "Maven Java", "description": "Upstream Maven and OpenJDK 11", + "icon": "https://raw.githubusercontent.com/devfile-samples/devfile-stack-icons/main/java-maven.jpg", "type": "stack", "tags": [ "Java", @@ -74,6 +75,7 @@ "schemaVersion": "2.1.0", "default": true, "description": "Upstream Maven and OpenJDK 11", + "icon": "https://raw.githubusercontent.com/devfile-samples/devfile-stack-icons/main/java-maven.jpg", "tags": [ "Java", "Maven" @@ -99,6 +101,7 @@ "name": "java-quarkus", "displayName": "Quarkus Java", "description": "Quarkus with Java", + "icon": "https://design.jboss.org/quarkus/logo/final/SVG/quarkus_icon_rgb_default.svg", "type": "stack", "tags": [ "Java", @@ -115,6 +118,7 @@ "schemaVersion": "2.0.0", "default": true, "description": "Quarkus with Java", + "icon": "https://design.jboss.org/quarkus/logo/final/SVG/quarkus_icon_rgb_default.svg", "tags": [ "Java", "Quarkus" @@ -139,6 +143,7 @@ "name": "nodejs", "displayName": "NodeJS Runtime", "description": "Stack with NodeJS 12", + "icon": "https://nodejs.org/static/images/logos/nodejs-new-pantone-black.svg", "type": "stack", "tags": [ "NodeJS", @@ -159,6 +164,7 @@ "schemaVersion": "2.0.0", "default": true, "description": "Stack with NodeJS 12", + "icon": "https://nodejs.org/static/images/logos/nodejs-new-pantone-black.svg", "tags": [ "NodeJS", "Express", @@ -202,7 +208,8 @@ "origin": "https://github.com/nodeshift-starters/devfile-sample.git" } }, - "description": "nodejs with devfile v2.2.0" + "description": "nodejs with devfile v2.2.0", + "icon": "https://nodejs.org/static/images/logos/nodejs-new-pantone-black.svg" } ] }, @@ -228,7 +235,8 @@ "origin": "https://github.com/devfile-samples/devfile-sample-code-with-quarkus.git" } }, - "description": "java quarkus with devfile v2.2.0" + "description": "java quarkus with devfile v2.2.0", + "icon": "https://design.jboss.org/quarkus/logo/final/SVG/quarkus_icon_rgb_default.svg" }, { "version": "1.0.0", @@ -238,7 +246,8 @@ "origin": "https://github.com/elsony/devfile-sample-code-with-quarkus.git" } }, - "description": "java quarkus with devfile v2.0.0" + "description": "java quarkus with devfile v2.0.0", + "icon": "https://design.jboss.org/quarkus/logo/final/SVG/quarkus_icon_rgb_default.svg" } ] }, diff --git a/index/server/tests/resources/oldIndexStruct.json b/index/server/tests/resources/oldIndexStruct.json index e6a76b901..4d7052564 100644 --- a/index/server/tests/resources/oldIndexStruct.json +++ b/index/server/tests/resources/oldIndexStruct.json @@ -27,6 +27,7 @@ "version": "1.1.0", "displayName": "Maven Java", "description": "Upstream Maven and OpenJDK 11", + "icon": "https://raw.githubusercontent.com/devfile-samples/devfile-stack-icons/main/java-maven.jpg", "type": "stack", "tags": [ "Java", @@ -54,6 +55,7 @@ "version": "1.1.0", "displayName": "Quarkus Java", "description": "Quarkus with Java", + "icon": "https://design.jboss.org/quarkus/logo/final/SVG/quarkus_icon_rgb_default.svg", "type": "stack", "tags": [ "Java", @@ -80,6 +82,7 @@ "version": "1.0.0", "displayName": "NodeJS Runtime", "description": "Stack with NodeJS 12", + "icon": "https://nodejs.org/static/images/logos/nodejs-new-pantone-black.svg", "type": "stack", "tags": [ "NodeJS", From 0c91e23161f45a2329583fb3742af29ffca93d8a Mon Sep 17 00:00:00 2001 From: thepetk Date: Wed, 8 Mar 2023 15:39:00 +0000 Subject: [PATCH 09/16] Add icon url to all server index test stacks and samples Signed-off-by: thepetk --- .../tests/registry/samples/code-with-quarkus/1.1.0/devfile.yaml | 1 + .../tests/registry/samples/nodejs-basic/1.0.0/devfile.yaml | 1 + .../tests/registry/samples/nodejs-basic/1.0.1/devfile.yaml | 1 + index/server/tests/registry/stacks/java-maven/devfile.yaml | 1 + index/server/tests/registry/stacks/java-openliberty/devfile.yaml | 1 + index/server/tests/registry/stacks/java-quarkus/devfile.yaml | 1 + index/server/tests/registry/stacks/java-vertx/devfile.yaml | 1 + .../tests/registry/stacks/java-wildfly-bootable-jar/devfile.yaml | 1 + index/server/tests/registry/stacks/java-wildfly/devfile.yaml | 1 + index/server/tests/registry/stacks/nodejs/devfile.yaml | 1 + index/server/tests/registry/stacks/python-django/devfile.yaml | 1 + index/server/tests/registry/stacks/python/devfile.yaml | 1 + tests/registry/stacks/java-maven/devfile.yaml | 1 + tests/registry/stacks/java-quarkus/devfile.yaml | 1 + tests/registry/stacks/nodejs/devfile.yaml | 1 + 15 files changed, 15 insertions(+) diff --git a/index/server/tests/registry/samples/code-with-quarkus/1.1.0/devfile.yaml b/index/server/tests/registry/samples/code-with-quarkus/1.1.0/devfile.yaml index a77942058..d4e3d94b6 100644 --- a/index/server/tests/registry/samples/code-with-quarkus/1.1.0/devfile.yaml +++ b/index/server/tests/registry/samples/code-with-quarkus/1.1.0/devfile.yaml @@ -1,6 +1,7 @@ schemaVersion: 2.0.0 metadata: name: java-quarkus + icon: https://design.jboss.org/quarkus/logo/final/SVG/quarkus_icon_rgb_default.svg version: 1.1.0 attributes: alpha.build-context: . diff --git a/index/server/tests/registry/samples/nodejs-basic/1.0.0/devfile.yaml b/index/server/tests/registry/samples/nodejs-basic/1.0.0/devfile.yaml index 5fa08e605..8be376200 100644 --- a/index/server/tests/registry/samples/nodejs-basic/1.0.0/devfile.yaml +++ b/index/server/tests/registry/samples/nodejs-basic/1.0.0/devfile.yaml @@ -1,6 +1,7 @@ schemaVersion: 2.0.0 metadata: name: nodejs + icon: https://nodejs.org/static/images/logos/nodejs-new-pantone-black.svg version: 1.0.1 displayName: Node.js Runtime description: Stack with Node.js 14 diff --git a/index/server/tests/registry/samples/nodejs-basic/1.0.1/devfile.yaml b/index/server/tests/registry/samples/nodejs-basic/1.0.1/devfile.yaml index 77164e36f..fd494e290 100644 --- a/index/server/tests/registry/samples/nodejs-basic/1.0.1/devfile.yaml +++ b/index/server/tests/registry/samples/nodejs-basic/1.0.1/devfile.yaml @@ -1,6 +1,7 @@ schemaVersion: 2.2.0 metadata: name: nodejs + icon: https://nodejs.org/static/images/logos/nodejs-new-pantone-black.svg version: 1.0.1 displayName: Node.js Runtime description: Stack with Node.js 14 diff --git a/index/server/tests/registry/stacks/java-maven/devfile.yaml b/index/server/tests/registry/stacks/java-maven/devfile.yaml index 744702fff..b5e7f2676 100644 --- a/index/server/tests/registry/stacks/java-maven/devfile.yaml +++ b/index/server/tests/registry/stacks/java-maven/devfile.yaml @@ -1,6 +1,7 @@ schemaVersion: 2.2.0 metadata: name: java-maven + icon: https://raw.githubusercontent.com/devfile-samples/devfile-stack-icons/main/java-maven.jpg version: 1.1.0 displayName: Maven Java description: Upstream Maven and OpenJDK 11 diff --git a/index/server/tests/registry/stacks/java-openliberty/devfile.yaml b/index/server/tests/registry/stacks/java-openliberty/devfile.yaml index 9b16a26ef..07b6b7d5d 100644 --- a/index/server/tests/registry/stacks/java-openliberty/devfile.yaml +++ b/index/server/tests/registry/stacks/java-openliberty/devfile.yaml @@ -17,6 +17,7 @@ schemaVersion: 2.2.0 metadata: name: java-openliberty + icon: https://raw.githubusercontent.com/OpenLiberty/logos/7fbb132949b9b2589e18c8d5665c1b107028a21d/logomark/svg/OL_logomark.svg version: 0.5.0 description: Java application stack using Open Liberty runtime displayName: "Open Liberty" diff --git a/index/server/tests/registry/stacks/java-quarkus/devfile.yaml b/index/server/tests/registry/stacks/java-quarkus/devfile.yaml index b7746e290..6534d9023 100644 --- a/index/server/tests/registry/stacks/java-quarkus/devfile.yaml +++ b/index/server/tests/registry/stacks/java-quarkus/devfile.yaml @@ -1,6 +1,7 @@ schemaVersion: 2.2.0 metadata: name: java-quarkus + icon: https://design.jboss.org/quarkus/logo/final/SVG/quarkus_icon_rgb_default.svg version: 1.1.0 website: https://quarkus.io displayName: Quarkus Java diff --git a/index/server/tests/registry/stacks/java-vertx/devfile.yaml b/index/server/tests/registry/stacks/java-vertx/devfile.yaml index a3bd188c1..431e1c0c1 100644 --- a/index/server/tests/registry/stacks/java-vertx/devfile.yaml +++ b/index/server/tests/registry/stacks/java-vertx/devfile.yaml @@ -1,6 +1,7 @@ schemaVersion: 2.2.0 metadata: name: java-vertx + icon: https://raw.githubusercontent.com/vertx-web-site/vertx-logo/master/vertx-logo.svg version: 1.1.0 displayName: Vert.x Java description: Upstream Vert.x using Java diff --git a/index/server/tests/registry/stacks/java-wildfly-bootable-jar/devfile.yaml b/index/server/tests/registry/stacks/java-wildfly-bootable-jar/devfile.yaml index 4b6094da4..6bddf008e 100644 --- a/index/server/tests/registry/stacks/java-wildfly-bootable-jar/devfile.yaml +++ b/index/server/tests/registry/stacks/java-wildfly-bootable-jar/devfile.yaml @@ -1,6 +1,7 @@ schemaVersion: 2.2.0 metadata: name: java-wildfly-bootable-jar + icon: https://design.jboss.org/wildfly/logo/final/wildfly_logomark.svg version: 1.0.0 website: https://docs.wildfly.org/bootablejar/ displayName: WildFly Bootable Jar diff --git a/index/server/tests/registry/stacks/java-wildfly/devfile.yaml b/index/server/tests/registry/stacks/java-wildfly/devfile.yaml index 9e95e503d..03a1498b3 100644 --- a/index/server/tests/registry/stacks/java-wildfly/devfile.yaml +++ b/index/server/tests/registry/stacks/java-wildfly/devfile.yaml @@ -1,6 +1,7 @@ schemaVersion: 2.2.0 metadata: name: java-wildfly + icon: https://design.jboss.org/wildfly/logo/final/wildfly_logomark.svg version: 1.0.0 website: https://wildfly.org displayName: WildFly Java diff --git a/index/server/tests/registry/stacks/nodejs/devfile.yaml b/index/server/tests/registry/stacks/nodejs/devfile.yaml index 10a813347..35190eec8 100644 --- a/index/server/tests/registry/stacks/nodejs/devfile.yaml +++ b/index/server/tests/registry/stacks/nodejs/devfile.yaml @@ -1,6 +1,7 @@ schemaVersion: 2.2.0 metadata: name: nodejs + icon: https://nodejs.org/static/images/logos/nodejs-new-pantone-black.svg version: 1.0.0 displayName: NodeJS Runtime description: Stack with NodeJS 12 diff --git a/index/server/tests/registry/stacks/python-django/devfile.yaml b/index/server/tests/registry/stacks/python-django/devfile.yaml index cccebc8d2..127c45c22 100644 --- a/index/server/tests/registry/stacks/python-django/devfile.yaml +++ b/index/server/tests/registry/stacks/python-django/devfile.yaml @@ -1,6 +1,7 @@ schemaVersion: 2.2.0 metadata: name: python-django + icon: https://static.djangoproject.com/img/logos/django-logo-positive.svg version: 1.0.0 displayName: Django description: Python3.7 with Django diff --git a/index/server/tests/registry/stacks/python/devfile.yaml b/index/server/tests/registry/stacks/python/devfile.yaml index 59db96483..d39ddf1a9 100644 --- a/index/server/tests/registry/stacks/python/devfile.yaml +++ b/index/server/tests/registry/stacks/python/devfile.yaml @@ -1,6 +1,7 @@ schemaVersion: 2.2.0 metadata: name: python + icon: https://raw.githubusercontent.com/devfile-samples/devfile-stack-icons/main/python.svg version: 1.0.0 displayName: Python description: Python Stack with Python 3.7 diff --git a/tests/registry/stacks/java-maven/devfile.yaml b/tests/registry/stacks/java-maven/devfile.yaml index ee80996bf..417a1b662 100644 --- a/tests/registry/stacks/java-maven/devfile.yaml +++ b/tests/registry/stacks/java-maven/devfile.yaml @@ -1,6 +1,7 @@ schemaVersion: 2.1.0 metadata: name: java-maven + icon: https://raw.githubusercontent.com/devfile-samples/devfile-stack-icons/main/java-maven.jpg version: 1.1.0 displayName: Maven Java description: Upstream Maven and OpenJDK 11 diff --git a/tests/registry/stacks/java-quarkus/devfile.yaml b/tests/registry/stacks/java-quarkus/devfile.yaml index 786562b6e..ca69f3d27 100644 --- a/tests/registry/stacks/java-quarkus/devfile.yaml +++ b/tests/registry/stacks/java-quarkus/devfile.yaml @@ -1,6 +1,7 @@ schemaVersion: 2.0.0 metadata: name: java-quarkus + icon: https://design.jboss.org/quarkus/logo/final/SVG/quarkus_icon_rgb_default.svg version: 1.1.0 website: https://quarkus.io displayName: Quarkus Java diff --git a/tests/registry/stacks/nodejs/devfile.yaml b/tests/registry/stacks/nodejs/devfile.yaml index bf3865e8e..8d604e407 100644 --- a/tests/registry/stacks/nodejs/devfile.yaml +++ b/tests/registry/stacks/nodejs/devfile.yaml @@ -1,6 +1,7 @@ schemaVersion: 2.0.0 metadata: name: nodejs + icon: https://nodejs.org/static/images/logos/nodejs-new-pantone-black.svg version: 1.0.0 displayName: NodeJS Runtime description: Stack with NodeJS 12 From 1cbea76577baa18e1c361a193757d8420a8c0557 Mon Sep 17 00:00:00 2001 From: thepetk Date: Thu, 9 Mar 2023 15:26:31 +0000 Subject: [PATCH 10/16] Replace non-existing springboot url icon Signed-off-by: thepetk --- index/server/registry-REST-API.adoc | 2 +- index/server/tests/resources/newIndexStruct.json | 2 +- index/server/tests/resources/oldIndexStruct.json | 2 +- tests/registry/extraDevfileEntries.yaml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/index/server/registry-REST-API.adoc b/index/server/registry-REST-API.adoc index d2303ebf5..ce2109c9d 100644 --- a/index/server/registry-REST-API.adoc +++ b/index/server/registry-REST-API.adoc @@ -1627,7 +1627,7 @@ curl http://devfile-registry.192.168.1.1.nip.io/v2index/all "Java", "Spring" ], - "icon": "https://spring.io/images/projects/spring-edf462fec682b9d48cf628eaf9e19521.svg", + "icon": "https://raw.githubusercontent.com/devfile-samples/devfile-stack-icons/main/spring.svg", "projectType": "springboot", "language": "java", "git": { diff --git a/index/server/tests/resources/newIndexStruct.json b/index/server/tests/resources/newIndexStruct.json index 040e478bc..60b0e51d2 100644 --- a/index/server/tests/resources/newIndexStruct.json +++ b/index/server/tests/resources/newIndexStruct.json @@ -260,7 +260,7 @@ "Java", "Spring" ], - "icon": "https://spring.io/images/projects/spring-edf462fec682b9d48cf628eaf9e19521.svg", + "icon": "https://raw.githubusercontent.com/devfile-samples/devfile-stack-icons/main/spring.svg", "projectType": "springboot", "language": "java", "git": { diff --git a/index/server/tests/resources/oldIndexStruct.json b/index/server/tests/resources/oldIndexStruct.json index 4d7052564..5d061bcbe 100644 --- a/index/server/tests/resources/oldIndexStruct.json +++ b/index/server/tests/resources/oldIndexStruct.json @@ -152,7 +152,7 @@ "Java", "Spring" ], - "icon": "https://spring.io/images/projects/spring-edf462fec682b9d48cf628eaf9e19521.svg", + "icon": "https://raw.githubusercontent.com/devfile-samples/devfile-stack-icons/main/spring.svg", "projectType": "springboot", "language": "java", "git": { diff --git a/tests/registry/extraDevfileEntries.yaml b/tests/registry/extraDevfileEntries.yaml index c450eafa4..79bd603fb 100644 --- a/tests/registry/extraDevfileEntries.yaml +++ b/tests/registry/extraDevfileEntries.yaml @@ -39,7 +39,7 @@ samples: - name: java-springboot-basic displayName: Basic Spring Boot description: A simple Hello World Java Spring Boot application using Maven - icon: https://spring.io/images/projects/spring-edf462fec682b9d48cf628eaf9e19521.svg + icon: https://raw.githubusercontent.com/devfile-samples/devfile-stack-icons/main/spring.svg tags: ["Java", "Spring"] projectType: springboot language: java From 4717fd82ad813ee3aaf58ab7e0b150073831ed43 Mon Sep 17 00:00:00 2001 From: Theofanis Petkos Date: Thu, 9 Mar 2023 16:10:31 +0000 Subject: [PATCH 11/16] Fix security alert Co-authored-by: Michael Valdron Signed-off-by: thepetk --- index/generator/library/library.go | 1 + 1 file changed, 1 insertion(+) diff --git a/index/generator/library/library.go b/index/generator/library/library.go index 02399fee8..c40c73333 100644 --- a/index/generator/library/library.go +++ b/index/generator/library/library.go @@ -217,6 +217,7 @@ func dirExists(dirpath string) error { } func iconExists(iconUrl string) bool { + /* #nosec G107 -- iconUrl is taken from the index file. Stacks / Samples with URLs to a devfile icon should be vetted beforehand */ resp, err := http.Get(iconUrl) if err != nil { return false From f72bde2fe18aeecfb90bb5332676ebf7e18b544c Mon Sep 17 00:00:00 2001 From: thepetk Date: Fri, 10 Mar 2023 15:29:30 +0000 Subject: [PATCH 12/16] Revert "Add icon url to all server index test stacks and samples" This reverts commit e2c1383432338d91afd1ea0bbfa30a53bce76c87. Signed-off-by: thepetk --- .../tests/registry/samples/code-with-quarkus/1.1.0/devfile.yaml | 1 - .../tests/registry/samples/nodejs-basic/1.0.0/devfile.yaml | 1 - .../tests/registry/samples/nodejs-basic/1.0.1/devfile.yaml | 1 - index/server/tests/registry/stacks/java-maven/devfile.yaml | 1 - index/server/tests/registry/stacks/java-openliberty/devfile.yaml | 1 - index/server/tests/registry/stacks/java-quarkus/devfile.yaml | 1 - index/server/tests/registry/stacks/java-vertx/devfile.yaml | 1 - .../tests/registry/stacks/java-wildfly-bootable-jar/devfile.yaml | 1 - index/server/tests/registry/stacks/java-wildfly/devfile.yaml | 1 - index/server/tests/registry/stacks/nodejs/devfile.yaml | 1 - index/server/tests/registry/stacks/python-django/devfile.yaml | 1 - index/server/tests/registry/stacks/python/devfile.yaml | 1 - tests/registry/stacks/java-maven/devfile.yaml | 1 - tests/registry/stacks/java-quarkus/devfile.yaml | 1 - tests/registry/stacks/nodejs/devfile.yaml | 1 - 15 files changed, 15 deletions(-) diff --git a/index/server/tests/registry/samples/code-with-quarkus/1.1.0/devfile.yaml b/index/server/tests/registry/samples/code-with-quarkus/1.1.0/devfile.yaml index d4e3d94b6..a77942058 100644 --- a/index/server/tests/registry/samples/code-with-quarkus/1.1.0/devfile.yaml +++ b/index/server/tests/registry/samples/code-with-quarkus/1.1.0/devfile.yaml @@ -1,7 +1,6 @@ schemaVersion: 2.0.0 metadata: name: java-quarkus - icon: https://design.jboss.org/quarkus/logo/final/SVG/quarkus_icon_rgb_default.svg version: 1.1.0 attributes: alpha.build-context: . diff --git a/index/server/tests/registry/samples/nodejs-basic/1.0.0/devfile.yaml b/index/server/tests/registry/samples/nodejs-basic/1.0.0/devfile.yaml index 8be376200..5fa08e605 100644 --- a/index/server/tests/registry/samples/nodejs-basic/1.0.0/devfile.yaml +++ b/index/server/tests/registry/samples/nodejs-basic/1.0.0/devfile.yaml @@ -1,7 +1,6 @@ schemaVersion: 2.0.0 metadata: name: nodejs - icon: https://nodejs.org/static/images/logos/nodejs-new-pantone-black.svg version: 1.0.1 displayName: Node.js Runtime description: Stack with Node.js 14 diff --git a/index/server/tests/registry/samples/nodejs-basic/1.0.1/devfile.yaml b/index/server/tests/registry/samples/nodejs-basic/1.0.1/devfile.yaml index fd494e290..77164e36f 100644 --- a/index/server/tests/registry/samples/nodejs-basic/1.0.1/devfile.yaml +++ b/index/server/tests/registry/samples/nodejs-basic/1.0.1/devfile.yaml @@ -1,7 +1,6 @@ schemaVersion: 2.2.0 metadata: name: nodejs - icon: https://nodejs.org/static/images/logos/nodejs-new-pantone-black.svg version: 1.0.1 displayName: Node.js Runtime description: Stack with Node.js 14 diff --git a/index/server/tests/registry/stacks/java-maven/devfile.yaml b/index/server/tests/registry/stacks/java-maven/devfile.yaml index b5e7f2676..744702fff 100644 --- a/index/server/tests/registry/stacks/java-maven/devfile.yaml +++ b/index/server/tests/registry/stacks/java-maven/devfile.yaml @@ -1,7 +1,6 @@ schemaVersion: 2.2.0 metadata: name: java-maven - icon: https://raw.githubusercontent.com/devfile-samples/devfile-stack-icons/main/java-maven.jpg version: 1.1.0 displayName: Maven Java description: Upstream Maven and OpenJDK 11 diff --git a/index/server/tests/registry/stacks/java-openliberty/devfile.yaml b/index/server/tests/registry/stacks/java-openliberty/devfile.yaml index 07b6b7d5d..9b16a26ef 100644 --- a/index/server/tests/registry/stacks/java-openliberty/devfile.yaml +++ b/index/server/tests/registry/stacks/java-openliberty/devfile.yaml @@ -17,7 +17,6 @@ schemaVersion: 2.2.0 metadata: name: java-openliberty - icon: https://raw.githubusercontent.com/OpenLiberty/logos/7fbb132949b9b2589e18c8d5665c1b107028a21d/logomark/svg/OL_logomark.svg version: 0.5.0 description: Java application stack using Open Liberty runtime displayName: "Open Liberty" diff --git a/index/server/tests/registry/stacks/java-quarkus/devfile.yaml b/index/server/tests/registry/stacks/java-quarkus/devfile.yaml index 6534d9023..b7746e290 100644 --- a/index/server/tests/registry/stacks/java-quarkus/devfile.yaml +++ b/index/server/tests/registry/stacks/java-quarkus/devfile.yaml @@ -1,7 +1,6 @@ schemaVersion: 2.2.0 metadata: name: java-quarkus - icon: https://design.jboss.org/quarkus/logo/final/SVG/quarkus_icon_rgb_default.svg version: 1.1.0 website: https://quarkus.io displayName: Quarkus Java diff --git a/index/server/tests/registry/stacks/java-vertx/devfile.yaml b/index/server/tests/registry/stacks/java-vertx/devfile.yaml index 431e1c0c1..a3bd188c1 100644 --- a/index/server/tests/registry/stacks/java-vertx/devfile.yaml +++ b/index/server/tests/registry/stacks/java-vertx/devfile.yaml @@ -1,7 +1,6 @@ schemaVersion: 2.2.0 metadata: name: java-vertx - icon: https://raw.githubusercontent.com/vertx-web-site/vertx-logo/master/vertx-logo.svg version: 1.1.0 displayName: Vert.x Java description: Upstream Vert.x using Java diff --git a/index/server/tests/registry/stacks/java-wildfly-bootable-jar/devfile.yaml b/index/server/tests/registry/stacks/java-wildfly-bootable-jar/devfile.yaml index 6bddf008e..4b6094da4 100644 --- a/index/server/tests/registry/stacks/java-wildfly-bootable-jar/devfile.yaml +++ b/index/server/tests/registry/stacks/java-wildfly-bootable-jar/devfile.yaml @@ -1,7 +1,6 @@ schemaVersion: 2.2.0 metadata: name: java-wildfly-bootable-jar - icon: https://design.jboss.org/wildfly/logo/final/wildfly_logomark.svg version: 1.0.0 website: https://docs.wildfly.org/bootablejar/ displayName: WildFly Bootable Jar diff --git a/index/server/tests/registry/stacks/java-wildfly/devfile.yaml b/index/server/tests/registry/stacks/java-wildfly/devfile.yaml index 03a1498b3..9e95e503d 100644 --- a/index/server/tests/registry/stacks/java-wildfly/devfile.yaml +++ b/index/server/tests/registry/stacks/java-wildfly/devfile.yaml @@ -1,7 +1,6 @@ schemaVersion: 2.2.0 metadata: name: java-wildfly - icon: https://design.jboss.org/wildfly/logo/final/wildfly_logomark.svg version: 1.0.0 website: https://wildfly.org displayName: WildFly Java diff --git a/index/server/tests/registry/stacks/nodejs/devfile.yaml b/index/server/tests/registry/stacks/nodejs/devfile.yaml index 35190eec8..10a813347 100644 --- a/index/server/tests/registry/stacks/nodejs/devfile.yaml +++ b/index/server/tests/registry/stacks/nodejs/devfile.yaml @@ -1,7 +1,6 @@ schemaVersion: 2.2.0 metadata: name: nodejs - icon: https://nodejs.org/static/images/logos/nodejs-new-pantone-black.svg version: 1.0.0 displayName: NodeJS Runtime description: Stack with NodeJS 12 diff --git a/index/server/tests/registry/stacks/python-django/devfile.yaml b/index/server/tests/registry/stacks/python-django/devfile.yaml index 127c45c22..cccebc8d2 100644 --- a/index/server/tests/registry/stacks/python-django/devfile.yaml +++ b/index/server/tests/registry/stacks/python-django/devfile.yaml @@ -1,7 +1,6 @@ schemaVersion: 2.2.0 metadata: name: python-django - icon: https://static.djangoproject.com/img/logos/django-logo-positive.svg version: 1.0.0 displayName: Django description: Python3.7 with Django diff --git a/index/server/tests/registry/stacks/python/devfile.yaml b/index/server/tests/registry/stacks/python/devfile.yaml index d39ddf1a9..59db96483 100644 --- a/index/server/tests/registry/stacks/python/devfile.yaml +++ b/index/server/tests/registry/stacks/python/devfile.yaml @@ -1,7 +1,6 @@ schemaVersion: 2.2.0 metadata: name: python - icon: https://raw.githubusercontent.com/devfile-samples/devfile-stack-icons/main/python.svg version: 1.0.0 displayName: Python description: Python Stack with Python 3.7 diff --git a/tests/registry/stacks/java-maven/devfile.yaml b/tests/registry/stacks/java-maven/devfile.yaml index 417a1b662..ee80996bf 100644 --- a/tests/registry/stacks/java-maven/devfile.yaml +++ b/tests/registry/stacks/java-maven/devfile.yaml @@ -1,7 +1,6 @@ schemaVersion: 2.1.0 metadata: name: java-maven - icon: https://raw.githubusercontent.com/devfile-samples/devfile-stack-icons/main/java-maven.jpg version: 1.1.0 displayName: Maven Java description: Upstream Maven and OpenJDK 11 diff --git a/tests/registry/stacks/java-quarkus/devfile.yaml b/tests/registry/stacks/java-quarkus/devfile.yaml index ca69f3d27..786562b6e 100644 --- a/tests/registry/stacks/java-quarkus/devfile.yaml +++ b/tests/registry/stacks/java-quarkus/devfile.yaml @@ -1,7 +1,6 @@ schemaVersion: 2.0.0 metadata: name: java-quarkus - icon: https://design.jboss.org/quarkus/logo/final/SVG/quarkus_icon_rgb_default.svg version: 1.1.0 website: https://quarkus.io displayName: Quarkus Java diff --git a/tests/registry/stacks/nodejs/devfile.yaml b/tests/registry/stacks/nodejs/devfile.yaml index 8d604e407..bf3865e8e 100644 --- a/tests/registry/stacks/nodejs/devfile.yaml +++ b/tests/registry/stacks/nodejs/devfile.yaml @@ -1,7 +1,6 @@ schemaVersion: 2.0.0 metadata: name: nodejs - icon: https://nodejs.org/static/images/logos/nodejs-new-pantone-black.svg version: 1.0.0 displayName: NodeJS Runtime description: Stack with NodeJS 12 From 924b182659719ad1e045e8dca349ddc8f54ef9a1 Mon Sep 17 00:00:00 2001 From: thepetk Date: Fri, 10 Mar 2023 15:42:21 +0000 Subject: [PATCH 13/16] Revert "Replace non-existing springboot url icon" This reverts commit ae9393d07dcf62376904c388fc5b8f3627295bb8. Signed-off-by: thepetk --- index/server/registry-REST-API.adoc | 2 +- index/server/tests/resources/newIndexStruct.json | 2 +- index/server/tests/resources/oldIndexStruct.json | 2 +- tests/registry/extraDevfileEntries.yaml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/index/server/registry-REST-API.adoc b/index/server/registry-REST-API.adoc index ce2109c9d..d2303ebf5 100644 --- a/index/server/registry-REST-API.adoc +++ b/index/server/registry-REST-API.adoc @@ -1627,7 +1627,7 @@ curl http://devfile-registry.192.168.1.1.nip.io/v2index/all "Java", "Spring" ], - "icon": "https://raw.githubusercontent.com/devfile-samples/devfile-stack-icons/main/spring.svg", + "icon": "https://spring.io/images/projects/spring-edf462fec682b9d48cf628eaf9e19521.svg", "projectType": "springboot", "language": "java", "git": { diff --git a/index/server/tests/resources/newIndexStruct.json b/index/server/tests/resources/newIndexStruct.json index 60b0e51d2..040e478bc 100644 --- a/index/server/tests/resources/newIndexStruct.json +++ b/index/server/tests/resources/newIndexStruct.json @@ -260,7 +260,7 @@ "Java", "Spring" ], - "icon": "https://raw.githubusercontent.com/devfile-samples/devfile-stack-icons/main/spring.svg", + "icon": "https://spring.io/images/projects/spring-edf462fec682b9d48cf628eaf9e19521.svg", "projectType": "springboot", "language": "java", "git": { diff --git a/index/server/tests/resources/oldIndexStruct.json b/index/server/tests/resources/oldIndexStruct.json index 5d061bcbe..4d7052564 100644 --- a/index/server/tests/resources/oldIndexStruct.json +++ b/index/server/tests/resources/oldIndexStruct.json @@ -152,7 +152,7 @@ "Java", "Spring" ], - "icon": "https://raw.githubusercontent.com/devfile-samples/devfile-stack-icons/main/spring.svg", + "icon": "https://spring.io/images/projects/spring-edf462fec682b9d48cf628eaf9e19521.svg", "projectType": "springboot", "language": "java", "git": { diff --git a/tests/registry/extraDevfileEntries.yaml b/tests/registry/extraDevfileEntries.yaml index 79bd603fb..c450eafa4 100644 --- a/tests/registry/extraDevfileEntries.yaml +++ b/tests/registry/extraDevfileEntries.yaml @@ -39,7 +39,7 @@ samples: - name: java-springboot-basic displayName: Basic Spring Boot description: A simple Hello World Java Spring Boot application using Maven - icon: https://raw.githubusercontent.com/devfile-samples/devfile-stack-icons/main/spring.svg + icon: https://spring.io/images/projects/spring-edf462fec682b9d48cf628eaf9e19521.svg tags: ["Java", "Spring"] projectType: springboot language: java From 04b5581aee2229c200c2d381b5728ca3f7ddc9d7 Mon Sep 17 00:00:00 2001 From: thepetk Date: Fri, 10 Mar 2023 15:51:51 +0000 Subject: [PATCH 14/16] Add icon urls to all root test registry stacks Signed-off-by: thepetk --- tests/registry/stacks/java-maven/devfile.yaml | 1 + tests/registry/stacks/java-quarkus/devfile.yaml | 1 + tests/registry/stacks/nodejs/devfile.yaml | 1 + 3 files changed, 3 insertions(+) diff --git a/tests/registry/stacks/java-maven/devfile.yaml b/tests/registry/stacks/java-maven/devfile.yaml index ee80996bf..3cb9bc27d 100644 --- a/tests/registry/stacks/java-maven/devfile.yaml +++ b/tests/registry/stacks/java-maven/devfile.yaml @@ -4,6 +4,7 @@ metadata: version: 1.1.0 displayName: Maven Java description: Upstream Maven and OpenJDK 11 + icon: https://raw.githubusercontent.com/devfile-samples/devfile-stack-icons/main/java-maven.jpg tags: ["Java", "Maven"] projectType: "maven" language: "java" diff --git a/tests/registry/stacks/java-quarkus/devfile.yaml b/tests/registry/stacks/java-quarkus/devfile.yaml index 786562b6e..cddd87526 100644 --- a/tests/registry/stacks/java-quarkus/devfile.yaml +++ b/tests/registry/stacks/java-quarkus/devfile.yaml @@ -5,6 +5,7 @@ metadata: website: https://quarkus.io displayName: Quarkus Java description: Quarkus with Java + icon: https://design.jboss.org/quarkus/logo/final/SVG/quarkus_icon_rgb_default.svg tags: ["Java", "Quarkus"] projectType: "quarkus" language: "java" diff --git a/tests/registry/stacks/nodejs/devfile.yaml b/tests/registry/stacks/nodejs/devfile.yaml index bf3865e8e..68dd2075b 100644 --- a/tests/registry/stacks/nodejs/devfile.yaml +++ b/tests/registry/stacks/nodejs/devfile.yaml @@ -4,6 +4,7 @@ metadata: version: 1.0.0 displayName: NodeJS Runtime description: Stack with NodeJS 12 + icon: https://nodejs.org/static/images/logos/nodejs-new-pantone-black.svg tags: ["NodeJS", "Express", "ubi8"] projectType: "nodejs" language: "nodejs" From 182a8dfcf5e9a88d56928a7349613c84f96faad2 Mon Sep 17 00:00:00 2001 From: thepetk Date: Fri, 10 Mar 2023 16:10:44 +0000 Subject: [PATCH 15/16] Fix issue with non existing icon Signed-off-by: thepetk --- tests/registry/extraDevfileEntries.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/registry/extraDevfileEntries.yaml b/tests/registry/extraDevfileEntries.yaml index c450eafa4..383e19f37 100644 --- a/tests/registry/extraDevfileEntries.yaml +++ b/tests/registry/extraDevfileEntries.yaml @@ -39,7 +39,7 @@ samples: - name: java-springboot-basic displayName: Basic Spring Boot description: A simple Hello World Java Spring Boot application using Maven - icon: https://spring.io/images/projects/spring-edf462fec682b9d48cf628eaf9e19521.svg + icon: https://www.eclipse.org/che/images/logo-eclipseche.svg tags: ["Java", "Spring"] projectType: springboot language: java From e0484d8bd0701ae30298d3e50381414db4988b51 Mon Sep 17 00:00:00 2001 From: thepetk Date: Wed, 22 Mar 2023 15:42:30 +0000 Subject: [PATCH 16/16] Update icon url for spring sample Signed-off-by: thepetk --- tests/registry/extraDevfileEntries.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/registry/extraDevfileEntries.yaml b/tests/registry/extraDevfileEntries.yaml index 383e19f37..79bd603fb 100644 --- a/tests/registry/extraDevfileEntries.yaml +++ b/tests/registry/extraDevfileEntries.yaml @@ -39,7 +39,7 @@ samples: - name: java-springboot-basic displayName: Basic Spring Boot description: A simple Hello World Java Spring Boot application using Maven - icon: https://www.eclipse.org/che/images/logo-eclipseche.svg + icon: https://raw.githubusercontent.com/devfile-samples/devfile-stack-icons/main/spring.svg tags: ["Java", "Spring"] projectType: springboot language: java