Versionless Repo Resolver additions and Error handling #29058

cbridgha · 2024-07-13T01:37:48Z

This PR uses the resolution Result object to start gathering additional results that could occur in versionless scenarios.
Primarily two main scenarios where messages have been added to the install commands (#29060). Platform can't be found, or platform can't be determined from the set of versionless/versioned features passed.

A few additions to the Repository to handle querying the platform header info now stored in the ESA's.

Started adding install tests, but will be exploring how to test for features not yet part of the public repo.

cbridgha · 2024-07-13T01:58:27Z

#build

LibbyBot · 2024-07-13T08:36:34Z

Code analysis and actions

DO NOT DELETE THIS COMMENT.

5 product code files were changed.
Please describe in a separate comment how you tested your changes.

LibbyBot · 2024-07-13T08:46:49Z

Your personal build request is at https://wasrtc.hursley.ibm.com:9443/jazz/resource/itemOid/com.ibm.team.build.BuildResult/_D76ycEDsEe-Hn95lLM_tGQ

Target locations of links might be accessible only to IBM employees.

LibbyBot · 2024-07-13T08:46:55Z

Your personal pipeline request is at https://libh-proxy1.fyre.ibm.com/cognitive/pipelineAnalysis.html?uuid=cfc87762-a5c7-488a-b3ad-c363329f95b1

Target locations of links might be accessible only to IBM employees.

LibbyBot · 2024-07-13T21:28:11Z

https://libh-proxy1.fyre.ibm.com/cognitive/pipelineAnalysis.html?uuid=cfc87762-a5c7-488a-b3ad-c363329f95b1 has errors/failures.

cbridgha · 2024-07-13T23:31:51Z

#build

LibbyBot · 2024-07-13T23:32:05Z

Your personal build request is at https://wasrtc.hursley.ibm.com:9443/jazz/resource/itemOid/com.ibm.team.build.BuildResult/_uvx5gEFnEe-F88sHKWQ5jw

Target locations of links might be accessible only to IBM employees.

LibbyBot · 2024-07-13T23:32:05Z

Your personal pipeline request is at https://libh-proxy1.fyre.ibm.com/cognitive/pipelineAnalysis.html?uuid=16e920e3-68e5-4d09-bd64-db62938010fa

Target locations of links might be accessible only to IBM employees.

LibbyBot · 2024-07-14T01:32:58Z

The build cbridgha-29058-20240713-0155
https://wasrtc.hursley.ibm.com:9443/jazz/resource/itemOid/com.ibm.team.build.BuildResult/_D76ycEDsEe-Hn95lLM_tGQ
completed and has errors or failures.

For help analyzing your personal build, go to https://libh-proxy1.fyre.ibm.com/cognitive/buildAnalysis.html?uuid=_D76ycEDsEe-Hn95lLM_tGQ

LibbyBot · 2024-07-14T10:43:11Z

https://libh-proxy1.fyre.ibm.com/cognitive/pipelineAnalysis.html?uuid=16e920e3-68e5-4d09-bd64-db62938010fa has errors/failures.

LibbyBot · 2024-07-14T17:53:29Z

The build cbridgha-29058-20240713-1640
https://wasrtc.hursley.ibm.com:9443/jazz/resource/itemOid/com.ibm.team.build.BuildResult/_uvx5gEFnEe-F88sHKWQ5jw
completed and has errors or failures.

For help analyzing your personal build, go to https://libh-proxy1.fyre.ibm.com/cognitive/buildAnalysis.html?uuid=_uvx5gEFnEe-F88sHKWQ5jw

dev/com.ibm.ws.repository.resolver/src/com/ibm/ws/repository/resolver/RepositoryResolver.java

...epository.resolver/src/com/ibm/ws/repository/resolver/internal/kernel/KernelResolverEsa.java

pnickoll · 2024-07-15T12:02:31Z

...ry.resolver/src/com/ibm/ws/repository/resolver/internal/kernel/KernelResolverRepository.java

+            for (FeatureResource versionedFeature : feature.getConstituents(SubsystemContentType.FEATURE_TYPE)) {
+                //Find the right public feature (should only be one) - set the result
+                ProvisioningFeatureDefinition versionedFeatureDef = getFeature(versionedFeature.getSymbolicName());
+                if (versionedFeatureDef.getVisibility() != Visibility.PUBLIC) {


If there is only one result expected we will still keep iterating over the list, worth considering reversing the check to

if (versionedFeatureDef.getVisibility() == Visibility.PUBLIC) {
return versionedFeatureDef;
// OR
result = versionedFeatureDef;
break;
}

thanks will do

cbridgha · 2024-07-15T16:55:59Z

#build

pnickoll · 2024-07-15T19:14:42Z

...ry.resolver/src/com/ibm/ws/repository/resolver/internal/kernel/KernelResolverRepository.java

+                if (versionedFeatureDef.getVisibility() == Visibility.PUBLIC) {
+                    return versionedFeatureDef;
+                }
+                result = versionedFeatureDef;


not sure on the logic here, if a public feature is found return that feature, but if one isn't it still sets the result to the feature, I am assuming that this line (and the break) are not needed or it will just look at the first feature and return it regardless of whether it is public

no longer create a "result" variable - makes no sense... - added the possiblibilty of returning null in javadoc

pnickoll · 2024-07-15T19:14:45Z

...ry.resolver/src/com/ibm/ws/repository/resolver/internal/kernel/KernelResolverRepository.java

+                break;
+            }
+        }
+        return result;


If we get to this point then we have not found a public feature, is this an error case?

not an error but return null

LibbyBot · 2024-07-15T22:58:38Z

Your personal build request is at https://wasrtc.hursley.ibm.com:9443/jazz/resource/itemOid/com.ibm.team.build.BuildResult/_ZBYEgEL1Ee-F88sHKWQ5jw

Target locations of links might be accessible only to IBM employees.

LibbyBot · 2024-07-15T22:58:40Z

Your personal pipeline request is at https://libh-proxy1.fyre.ibm.com/cognitive/pipelineAnalysis.html?uuid=dffbf0e8-1c24-4520-ba1d-58e2ff30dcda

Target locations of links might be accessible only to IBM employees.

LibbyBot · 2024-07-16T01:56:54Z

https://libh-proxy1.fyre.ibm.com/cognitive/pipelineAnalysis.html?uuid=dffbf0e8-1c24-4520-ba1d-58e2ff30dcda has errors/failures.

dev/com.ibm.ws.repository.resolver/src/com/ibm/ws/repository/resolver/RepositoryResolver.java

...epository.resolver/src/com/ibm/ws/repository/resolver/internal/kernel/KernelResolverEsa.java

pnickoll · 2024-07-16T13:55:26Z

...ry.resolver/src/com/ibm/ws/repository/resolver/internal/kernel/KernelResolverRepository.java

+     * @return ProvisioningFeatureDefinition
+     */
+    private ProvisioningFeatureDefinition getVersionedFeature(String versionlessLinkingFeatureName) {
+        ProvisioningFeatureDefinition result = null;


result is never used is it (now the method returns null at the end)?

removed result

pnickoll · 2024-07-16T13:58:25Z

dev/com.ibm.ws.repository.resolver/src/com/ibm/ws/repository/resolver/RepositoryResolver.java

+            ProvisioningFeatureDefinition feature = resolverRepository.getFeature(name);
+            if (feature != null && feature.isVersionless()) {
+                ProvisioningFeatureDefinition firstChild = resolverRepository.findAllPossibleVersions(feature).get(0);
+                String plat = firstChild.getPlatformName();


do we need to null check firstChild?

If we do, we need to check whether the list is empty before calling get(0) because that will throw an exception.

Agreed made changes to check

cbridgha · 2024-07-16T14:15:46Z

Build with latest from last night..... https://wasrtc.hursley.ibm.com:9443/jazz/web/projects/WS-CD#action=com.ibm.team.build.viewResult&id=_nP9sUEMEEe-F88sHKWQ5jw&tab=com.ibm.team.build.web.ui.internal.editors.result.test.TestProvider

dev/com.ibm.ws.repository.resolver/src/com/ibm/ws/repository/resolver/RepositoryResolver.java

Azquelt · 2024-07-16T14:29:41Z

...ws.repository.resolver/src/com/ibm/ws/repository/resolver/RepositoryResolutionException.java

+    /**
+     * @return the resolvedPlatforms
+     */
+    public Set<String> getResolvedPlatforms() {
+        return resolvedPlatforms;
+    }
+
+    /**
+     * @return the missingPlatforms
+     */
+    public Set<String> getMissingPlatforms() {
+        return missingPlatforms;
+    }
+
+    /**
+     * @return the missingBasePlatforms
+     */
+    public List<String> getMissingBasePlatforms() {
+        return missingBasePlatforms;
+    }


Please add more documentation about what each of these fields means and what data it contains.

These fields look like they are used in other places, but here seems like the most logical place to document them.

There's a little bit of doc on the constructor and it sounds like missingPlaforms and missingBasePlatforms are completely different? That could do with a better explanation and possibly missingBasePlatforms should be renamed.

yes tried to add javadoc - one is simply a missspelling of a platform name - one is related to a base name like MP or jakarta realted to a versionless feature - if they can't be derived up front - its an error, and the reason the feature isn't resolved.

Azquelt · 2024-07-16T14:32:31Z

dev/com.ibm.ws.repository.resolver/src/com/ibm/ws/repository/resolver/RepositoryResolver.java

+    /**
+     * List of all the missing platforms after resolution
+     */
+    Set<String> missingPlatforms;


What does it mean for a platform to be "missing"?

Will a platform name only be in this set if the user requested it explicitly?

dev/com.ibm.ws.repository.resolver/src/com/ibm/ws/repository/resolver/RepositoryResolver.java

...ws.repository.resolver/src/com/ibm/ws/repository/resolver/RepositoryResolutionException.java

LibbyBot · 2024-07-16T16:44:03Z

The build cbridgha-29058-20240715-1755
https://wasrtc.hursley.ibm.com:9443/jazz/resource/itemOid/com.ibm.team.build.BuildResult/_nP9sUEMEEe-F88sHKWQ5jw
completed successfully!

LibbyBot · 2024-07-17T11:11:52Z

The build cbridgha-29058-20240716-1034
https://wasrtc.hursley.ibm.com:9443/jazz/resource/itemOid/com.ibm.team.build.BuildResult/_Kal94EOQEe-F88sHKWQ5jw
completed and has errors or failures.

For help analyzing your personal build, go to https://libh-proxy1.fyre.ibm.com/cognitive/buildAnalysis.html?uuid=_Kal94EOQEe-F88sHKWQ5jw

cbridgha force-pushed the VersionlessRepoPesolver branch 2 times, most recently from 31282d3 to 0b4724f Compare July 13, 2024 01:47

cbridgha self-assigned this Jul 13, 2024

cbridgha added the Versionless label Jul 13, 2024

LibbyBot added the CLA Signed label Jul 13, 2024

pnickoll reviewed Jul 15, 2024

View reviewed changes

cbridgha added 6 commits July 15, 2024 15:03

Resolver passing platforms

d036e52

Install now passing platforms

f6dc278

Implmenting ESA feature apis

54d7361

Gather and pass error states from Result

190620c

Forwarding Result data

b25aec3

Add fixes from suggestions, and cleanup comments

eb96f63

pnickoll reviewed Jul 15, 2024

View reviewed changes

restructure,check for null

c8e60d8

cbridgha force-pushed the VersionlessRepoPesolver branch from 88eb15a to c8e60d8 Compare July 16, 2024 00:46