diff --git a/analysis/pkg.go b/analysis/pkg.go index 333cac09..6ee3665c 100644 --- a/analysis/pkg.go +++ b/analysis/pkg.go @@ -101,7 +101,7 @@ func DumpTags(t *testing.T, tc TC, app api.Application) { fmt.Printf("## GOT TAGS FOR \"%s\":", tc.Name) fmt.Printf("\n[]api.Tag{\n") for _, tag := range tags { - fmt.Printf(" {Name: \"%s\", Category: api.Ref{Name: \"%s\")},\n", tag.Name, tag.Category.Name) + fmt.Printf(" {Name: \"%s\", Category: api.Ref{Name: \"%s\"}},\n", tag.Name, tag.Category.Name) } fmt.Printf("}\n") } diff --git a/analysis/tc_acmeair_webapp_upload_binary.go b/analysis/tc_acmeair_webapp_upload_binary.go index b4358885..f4f7bb98 100644 --- a/analysis/tc_acmeair_webapp_upload_binary.go +++ b/analysis/tc_acmeair_webapp_upload_binary.go @@ -6,7 +6,7 @@ import ( "github.com/konveyor/tackle2-hub/api" ) -var AcmeairWebapp = TC{ +var AcmeairWebappBinary = TC{ Name: "acmeair-webapp", Application: data.UploadBinary, Task: Analyze, diff --git a/analysis/tc_administracion_efectivo_upload_binary.go b/analysis/tc_administracion_efectivo_upload_binary.go index 6929a617..fd63e3da 100644 --- a/analysis/tc_administracion_efectivo_upload_binary.go +++ b/analysis/tc_administracion_efectivo_upload_binary.go @@ -6,7 +6,7 @@ import ( "github.com/konveyor/tackle2-hub/api" ) -var AdministracionEfectivo = TC{ +var AdministracionEfectivoBinary = TC{ Name: "administracion-efectivo", Application: data.UploadBinary, Task: Analyze, diff --git a/analysis/tc_tackle_testapp_public_binary.go b/analysis/tc_tackle_testapp_public_binary.go index 396047d2..aac252cc 100644 --- a/analysis/tc_tackle_testapp_public_binary.go +++ b/analysis/tc_tackle_testapp_public_binary.go @@ -9,9 +9,9 @@ import ( var TackleTestappPublicBinary = TC{ Name: "tackle-testapp-binary", - Application: data.TackleTestappPublic, + Application: data.TackleTestappPublicBinary, Identities: []api.Identity{ - identity.MavenPublic, + identity.TackleTestappPublicMaven, }, Task: Analyze, Labels: addon.Labels{ @@ -21,22 +21,8 @@ var TackleTestappPublicBinary = TC{ }, Binary: true, Analysis: api.Analysis{ - Effort: 15, + Effort: 1, Issues: []api.Issue{ - { - Category: "mandatory", - Description: "Java native libraries (JNI, JNA)", - Effort: 7, - RuleSet: "cloud-readiness", - Rule: "jni-native-code-00000", - Incidents: []api.Incident{ - { - File: "/shared/bin/maven/java-project/src/main/java/io/konveyor/demo/config/ApplicationConfiguration.java", - Line: 17, - Message: "Java native libraries might not run in a cloud or container environment.", - }, - }, - }, { Category: "mandatory", Description: "File system - Java IO", @@ -45,43 +31,8 @@ var TackleTestappPublicBinary = TC{ Rule: "local-storage-00001", Incidents: []api.Incident{ { - File: "/shared/bin/maven/java-project/src/main/java/io/konveyor/demo/config/ApplicationConfiguration.java", - Line: 8, - Message: "An application running inside a container could lose access to a file in local storage.", - }, - { - File: "/shared/bin/maven/java-project/src/main/java/io/konveyor/demo/ordermanagement/config/PersistenceConfig.java", - Line: 39, - Message: "An application running inside a container could lose access to a file in local storage.", - }, - { - File: "/shared/bin/maven/java-project/src/main/java/io/konveyor/demo/ordermanagement/config/PersistenceConfig.java", - Line: 40, - Message: "An application running inside a container could lose access to a file in local storage.", - }, - { - File: "/shared/bin/maven/java-project/src/main/java/io/konveyor/demo/ordermanagement/config/PersistenceConfig.java", - Line: 41, - Message: "An application running inside a container could lose access to a file in local storage.", - }, - { - File: "/shared/bin/maven/java-project/src/main/java/io/konveyor/demo/ordermanagement/config/PersistenceConfig.java", - Line: 42, - Message: "An application running inside a container could lose access to a file in local storage.", - }, - { - File: "/shared/bin/maven/java-project/src/main/java/io/konveyor/demo/ordermanagement/config/PersistenceConfig.java", - Line: 61, - Message: "An application running inside a container could lose access to a file in local storage.", - }, - { - File: "/shared/bin/maven/java-project/src/main/java/io/konveyor/demo/ordermanagement/config/PersistenceConfig.java", - Line: 62, - Message: "An application running inside a container could lose access to a file in local storage.", - }, - { - File: "/shared/bin/maven/java-project/src/main/java/io/konveyor/demo/ordermanagement/exception/handler/ExceptionHandlingController.java", - Line: 20, + File: "/shared/bin/java-project/src/main/java/io/konveyor/demo/config/ApplicationConfiguration.java", + Line: 14, Message: "An application running inside a container could lose access to a file in local storage.", }, }, @@ -89,14 +40,14 @@ var TackleTestappPublicBinary = TC{ }, }, AnalysisTags: []api.Tag{ + {Name: "EJB XML", Category: api.Ref{Name: "Bean"}}, {Name: "Servlet", Category: api.Ref{Name: "HTTP"}}, - {Name: "JNI", Category: api.Ref{Name: "Other"}}, - {Name: "Servlet", Category: api.Ref{Name: "Connect"}}, - {Name: "JNI", Category: api.Ref{Name: "Connect"}}, - {Name: "Servlet", Category: api.Ref{Name: "Java EE"}}, - {Name: "JNI", Category: api.Ref{Name: "Java EE"}}, {Name: "JPA named queries", Category: api.Ref{Name: "Persistence"}}, + {Name: "EJB XML", Category: api.Ref{Name: "Connect"}}, + {Name: "EJB XML", Category: api.Ref{Name: "Java EE"}}, {Name: "JPA named queries", Category: api.Ref{Name: "Java EE"}}, + {Name: "Servlet", Category: api.Ref{Name: "Java EE"}}, + {Name: "Servlet", Category: api.Ref{Name: "Connect"}}, {Name: "JPA named queries", Category: api.Ref{Name: "Store"}}, }, } diff --git a/analysis/tc_tackle_testapp_public_deps.go b/analysis/tc_tackle_testapp_public_deps.go index ad799c46..54988760 100644 --- a/analysis/tc_tackle_testapp_public_deps.go +++ b/analysis/tc_tackle_testapp_public_deps.go @@ -19,7 +19,7 @@ var TackleTestappPublicWithDeps = TC{ }, }, Identities: []api.Identity{ - identity.MavenPublic, + identity.TackleTestappPublicMaven, }, Analysis: api.Analysis{ Effort: 2, diff --git a/analysis/test_cases.go b/analysis/test_cases.go index d9e1957d..edf9fa28 100644 --- a/analysis/test_cases.go +++ b/analysis/test_cases.go @@ -5,9 +5,10 @@ package analysis var Tier0TestCases = []TC{ TackleTestappPublicWithDeps, TackleTestappPublicPackageFilter, - AcmeairWebapp, Tomcat, - AdministracionEfectivo, + AcmeairWebappBinary, // Binary upload + AdministracionEfectivoBinary, // Binary upload + TackleTestappPublicBinary, // Binary fetched from tackle-testapp-public maven registry } // Tier 1 Analysis test cases - should work. diff --git a/data/application.go b/data/application.go index 3c6844c2..67de4c66 100644 --- a/data/application.go +++ b/data/application.go @@ -10,6 +10,8 @@ var ( Minimal = api.Application{ Name: "Minimal application", } + + // Repository-based applications PathfinderGit = api.Application{ Name: "Pathfinder", Description: "Tackle Pathfinder application.", @@ -32,10 +34,6 @@ var ( Kind: "git", URL: "https://github.com/konveyor/tackle-testapp-public", }, - Binary: "io.konveyor.demo:customers-tomcat:0.0.1-SNAPSHOT:war", - } - UploadBinary = api.Application{ - Name: "upload-binary", } CustomerTomcatLegacy = api.Application{ Name: "Customer Tomcat Legacy", @@ -45,5 +43,15 @@ var ( Path: "example-1", }, } - ApplicationSamples = []api.Application{Minimal, PathfinderGit, BookServer, TackleTestappPublic, UploadBinary, CustomerTomcatLegacy} + + // Binary applications + TackleTestappPublicBinary = api.Application{ + Name: "Tackle Testapp public binary", + Binary: "mvn://io.konveyor.demo:customers-tomcat:0.0.1-SNAPSHOT:war", // To be downloaded from maven repository + } + UploadBinary = api.Application{ + Name: "upload-binary", // The file itself to be uploaded during the test + } + + ApplicationSamples = []api.Application{Minimal, PathfinderGit, BookServer, TackleTestappPublic, CustomerTomcatLegacy, TackleTestappPublicBinary, UploadBinary} ) diff --git a/data/identity/identity.go b/data/identity/identity.go deleted file mode 100644 index 998a8aa5..00000000 --- a/data/identity/identity.go +++ /dev/null @@ -1,66 +0,0 @@ -package identity - -import ( - "github.com/konveyor/tackle2-hub/api" - "github.com/konveyor/tackle2-hub/test/api/identity" -) - -// Tackle Testapp public Maven registry expects MAVEN_TESTAPP_USER and MAVEN_TESTAPP_TOKEN env variables. -// For more information, see: https://github.com/konveyor/tackle-testapp-public?tab=readme-ov-file#building-the-application -var MavenPublic = identity.Mvn - - -var TackleTestappPrivateMaven = api.Identity{ - Kind: "maven", - Name: "maven-creds", - Settings: ` - - - - - - - - - - - - tackle-testapp - GITHUB_USER - GITHUB_TOKEN - - - - - maven-default-http-blocker - external:http:* - Pseudo repository to mirror external repositories initially using HTTP. - http://0.0.0.0/ - true - - - - - github - - - central - https://repo1.maven.org/maven2 - - - tackle-testapp - https://maven.pkg.github.com/konveyor/tackle-testapp - - true - - - - - - - github - - `, -} diff --git a/data/identity/maven.go b/data/identity/maven.go new file mode 100644 index 00000000..2434f7c3 --- /dev/null +++ b/data/identity/maven.go @@ -0,0 +1,115 @@ +package identity + +import ( + "github.com/konveyor/tackle2-hub/api" +) + +var TackleTestappPrivateMaven = api.Identity{ + Kind: "maven", + Name: "maven-creds", + Settings: ` + + + + + + + + + + + + tackle-testapp + GITHUB_USER + GITHUB_TOKEN + + + + + maven-default-http-blocker + external:http:* + Pseudo repository to mirror external repositories initially using HTTP. + http://0.0.0.0/ + true + + + + + github + + + central + https://repo1.maven.org/maven2 + + + tackle-testapp + https://maven.pkg.github.com/konveyor/tackle-testapp + + true + + + + + + + github + + `, +} + +var TackleTestappPublicMaven = api.Identity{ + Kind: "maven", + Name: "maven-testapp-public-creds", + Settings: ` + + + + + + + + + + + + tackle-testapp-public + GITHUB_USER + GITHUB_TOKEN + + + + + maven-default-http-blocker + external:http:* + Pseudo repository to mirror external repositories initially using HTTP. + http://0.0.0.0/ + true + + + + + github + + + central + https://repo1.maven.org/maven2 + + + tackle-testapp-public + https://maven.pkg.github.com/konveyor/tackle-testapp-public + + true + + + + + + + github + +`, +}