SpringCloud/spring-cloud-release-tools
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixing tests

Browse Source
This commit is contained in:
Ryan Baxter
2024-11-13 15:02:14 -05:00
parent 3285998cfd
commit bd25555287
4 changed files with 16 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
releaser-core/src/main/java/releaser/internal/commercial/ReleaseBundleCreator.java
View File

@@ -91,9 +91,10 @@ public class ReleaseBundleCreator {
log.info("Creating release bundle with JSON [{}]", json);
ArtifactoryRequest aqlRequest = new ArtifactoryRequestImpl().method(ArtifactoryRequest.Method.POST)
.apiUrl("lifecycle/api/v2/release_bundle").addQueryParam("project", "spring").addQueryParam("async", "false")
.addHeader("X-JFrog-Signing-Key-Name", "packagesKey").requestType(ArtifactoryRequest.ContentType.JSON)
.responseType(ArtifactoryRequest.ContentType.JSON).requestBody(json);
.apiUrl("lifecycle/api/v2/release_bundle").addQueryParam("project", "spring")
.addQueryParam("async", "false").addHeader("X-JFrog-Signing-Key-Name", "packagesKey")
.requestType(ArtifactoryRequest.ContentType.JSON).responseType(ArtifactoryRequest.ContentType.JSON)
.requestBody(json);
return makeArtifactoryRequest(aqlRequest);
}

15
releaser-core/src/main/java/releaser/internal/sagan/SaganUpdater.java
View File

@@ -211,11 +211,16 @@ public class SaganUpdater {
if (version.isSnapshot()) {
antoraVersions += "-SNAPSHOT";
}
//TODO uncomment the below line and remove the logic above once Contentful "Antora Version" checkbox
// bug is fixed. Currently the checkbox is not being saved and is always unchecked when using the REST API
// and this results in the version now being computed propertly by Contentful. Therefore we compute the version
// in the documentation URL ourselves instead of using the {version} placeholder and letting Contentful compute the
// version. NOTE: Tests in {@link SaganUpdaterTests} will need to be updated as well once the fix is in place.
// TODO uncomment the below line and remove the logic above once Contentful
// "Antora Version" checkbox
// bug is fixed. Currently the checkbox is not being saved and is always unchecked
// when using the REST API
// and this results in the version now being computed propertly by Contentful.
// Therefore we compute the version
// in the documentation URL ourselves instead of using the {version} placeholder
// and letting Contentful compute the
// version. NOTE: Tests in {@link SaganUpdaterTests} will need to be updated as
// well once the fix is in place.
// return "https://docs.spring.io/" + version.projectName +
// "/reference/{version}/";
return "https://docs.spring.io/" + version.projectName + "/reference/" + antoraVersions + "/";

2
releaser-core/src/test/resources/mappings/commercial/create_porject_release_bundle.json → releaser-core/src/test/resources/mappings/commercial/create_project_release_bundle.json
View File

@@ -2,7 +2,7 @@
"id" : "0b389dc6-1b73-487d-8122-41f1c974647f",
"name" : "create_project_release_bundle_mapping",
"request" : {
"url" : "/lifecycle/api/v2/release_bundle?project=spring",
"url" : "/lifecycle/api/v2/release_bundle?async=false&project=spring",
"method" : "POST",
"bodyPatterns" : [ {
"equalToJson" : "{\"release_bundle_version\":\"4.0.7\",\"release_bundle_name\":\"TNZ-spring-cloud-build-commercial\",\"source_type\":\"aql\",\"source\":{\"aql\":\"items.find({\\\"repo\\\":{\\\"$eq\\\":\\\"spring-enterprise-maven-prod-local\\\"},\\\"$or\\\":[{\\\"path\\\":{\\\"$match\\\":\\\"org/springframework/cloud/spring-cloud-build*/4.0.7\\\"}},{\\\"path\\\":{\\\"$match\\\":\\\"org/springframework/cloud/spring-cloud-starter-build*/4.0.7\\\"}},{\\\"path\\\":{\\\"$match\\\":\\\"org/springframework/cloud/spring-cloud-dependencies-parent*/4.0.7\\\"}}]}).sort({\\\"$asc\\\":[\\\"path\\\",\\\"name\\\"]})\"}}",

2
releaser-core/src/test/resources/mappings/commercial/create_release_train_source_bundle.json
View File

@@ -2,7 +2,7 @@
"id" : "0b389dc6-1b73-487d-8122-41f1c974647f",
"name" : "create_release_train_source_bundle_mapping",
"request" : {
"url" : "/lifecycle/api/v2/release_bundle?project=spring",
"url" : "/lifecycle/api/v2/release_bundle?async=false&project=spring",
"method" : "POST",
"bodyPatterns" : [ {
"equalToJson" : "{\"release_bundle_name\": \"TNZ-spring-cloud-commercial-release\",\"release_bundle_version\": \"2022.0.7\",\"skip_docker_manifest_resolution\": false,\"source_type\": \"release_bundles\",\"source\": {\"release_bundles\": [{\"project_key\": \"spring\",\"repository_key\": \"spring-release-bundles-v2\",\"release_bundle_name\": \"TNZ-spring-cloud-build-commercial\",\"release_bundle_version\": \"4.0.8\"},{\"project_key\": \"spring\",\"repository_key\": \"spring-release-bundles-v2\",\"release_bundle_name\": \"TNZ-spring-cloud-config-commercial\",\"release_bundle_version\": \"4.0.7\"},{\"project_key\": \"spring\",\"repository_key\": \"spring-release-bundles-v2\",\"release_bundle_name\": \"TNZ-spring-cloud-starter-commercial\",\"release_bundle_version\": \"2022.0.7\"},{\"project_key\": \"spring\",\"repository_key\": \"spring-release-bundles-v2\",\"release_bundle_name\": \"TNZ-spring-cloud-vault-commercial\",\"release_bundle_version\": \"4.0.7\"}]}}",