summaryrefslogtreecommitdiffstats
path: root/docs/submodules/sdc.git
AgeCommit message (Collapse)AuthorFilesLines
2020-05-11Update git submodulesNeil Derraugh1-0/+0
* Update docs/submodules/sdc.git from branch 'master' to 88af509e836976b545e071cfe562bf70258c6c70 - Fix security issues in SecurityUtil - Removed hard coded key - Specified mode and padding to address risky algorithm Issue-ID: SDC-3017 Signed-off-by: Neil Derraugh <neil.derraugh@yoppworks.com> Change-Id: I6c21174003fcb5669de49158d8dd6bf9907f50c6
2020-05-11Update git submodulesFrancis Toth1-0/+0
* Update docs/submodules/sdc.git from branch 'master' to 5a5edfe3f6a304e3f856e618e66d71a258b2c44f - Refactor CsarUtil::writeComponentInterface Signed-off-by: Francis Toth <francis.toth@yoppworks.com> Change-Id: I6a40119540c18469db44e218984b4d4b92d3f4af Issue-ID: SDC-2812
2020-05-11Update git submodulesFrancis Toth1-0/+0
* Update docs/submodules/sdc.git from branch 'master' to ae0f64936f9798b17b313754d643977b7567af17 - Refactor ArtifactsBusinessLogic::generateToscaArtifact This commit aims to refactor how Either is used in ArtifactsBusinessLogic::generateToscaArtifact. In order to keep the refactoring relatively small, we evalute its result at the call site. Change-Id: I669b30b44e9c69d1b3968fd719c5340b2dff83f5 Signed-off-by: Francis Toth <francis.toth@yoppworks.com> Issue-ID: SDC-2812
2020-05-10Update git submodulesChris André1-0/+0
* Update docs/submodules/sdc.git from branch 'master' to a7bd374357e0737e419d196a16ff09a644417f97 - Refactor to remove false positives from Sonar - change `updateResourceInstancesNames` to account for case where `preparedResource` is null - change `findInputByName` to return an Either<InputDefinition, RuntimeException> in order to make exceptions explicit - create `rollbackWithEither` (+ tests) to make exceptions more explicit Issue-ID: SDC-2992 Signed-off-by: Chris Andre <chris.andre@yoppworks.com> Change-Id: I487994a3f9e88b0a2b14d2679c3587d85d8aa12d
2020-05-10Update git submodulesFrancis Toth1-0/+0
* Update docs/submodules/sdc.git from branch 'master' to 2048043bb4c66efa28063fc1e591c0297850a6e6 - Refactor ArtifactsBusinessLogic::handleDelete and ArtifactsBusinessLogic::deleteArtifactByInterface Signed-off-by: Francis Toth <francis.toth@yoppworks.com> Change-Id: I89f12c70f388375ed13554edf62bf6a442c9036a Issue-ID: SDC-2812
2020-05-10Update git submodulesandre.schmid1-0/+0
* Update docs/submodules/sdc.git from branch 'master' to 8e27d0fcbdf46eb2b15e0b3856a8e485a83079d4 - Allow any extension to WORKFLOW artifact type Allow any extension to WORKFLOW artifact as it was before the artifact type configuration change SDC-2754. Change-Id: I6c497cd83e36fe4df0cc800b9301010c22aa79f7 Issue-ID: SDC-3019 Signed-off-by: andre.schmid <andre.schmid@est.tech>
2020-05-10Update git submodulesRodrigo Lima1-0/+0
* Update docs/submodules/sdc.git from branch 'master' to 212bd7fc47b17d954f917b66dfb9f295c99e7f12 - Remove powermock from ComponentProcessesImplTest - Remove powermock from ComponentProcessesImplTest and add new constructor to ComponentProcessesImpl Issue-ID: SDC-3042 Signed-off-by: Rodrigo Lima <rodrigo.lima@yoppworks.com> Change-Id: I1766371a42a65d6b11c9b7b6783a312db2ed723e
2020-05-10Update git submodulesRodrigo Lima1-0/+0
* Update docs/submodules/sdc.git from branch 'master' to 254a7df768167685b835b87a54d04596b570e38a - Remove powermock from NicsImplTest - Remove powermock from NicsImplTest and add new constructor to NicsImpl Issue-ID: SDC-3043 Signed-off-by: Rodrigo Lima <rodrigo.lima@yoppworks.com> Change-Id: Iec9343a403278f7db41d1654960c1060c3e75a99
2020-05-10Update git submodulesRodrigo Lima1-0/+0
* Update docs/submodules/sdc.git from branch 'master' to de9fa5a0053b1348b56daf4cbd1039fe8bdd956f - Remove powermock from ImagesImplTest - Remove powermock from ImagesImplTest and add new constructor to ImagesImpl Issue-ID: SDC-3038 Signed-off-by: Rodrigo Lima <rodrigo.lima@yoppworks.com> Change-Id: I6439a90a71d9de94c2233f8b64fed9da4860dd2e
2020-05-10Update git submodulesRodrigo Lima1-0/+0
* Update docs/submodules/sdc.git from branch 'master' to 3502173f27ae1b8d43fd654c6f5ed1f25d885a1d - Remove powermock from ComponentDependenciesImplTest - Remove powermock from ComponentDependenciesImplTest and add new constructor to ComponentDependenciesImpl Issue-ID: SDC-3027 Signed-off-by: Rodrigo Lima <rodrigo.lima@yoppworks.com> Change-Id: I045e268230d94d4f52c4b85069eddade7678edee
2020-05-10Update git submodulesRodrigo Lima1-0/+0
* Update docs/submodules/sdc.git from branch 'master' to cdadb774cce59454fc217ac34edb9ac7130a06b2 - Remove porwermock from ComponentImplTest - Remove power mock from ComponentImplTest - Add new constructor to ComponentsImpl Issue-ID: SDC-3026 Signed-off-by: Rodrigo Lima <rodrigo.lima@yoppworks.com> Change-Id: I919fdb55990d813f4ac2950e3950b28e4686acbc
2020-05-10Update git submodulesRodrigo Lima1-0/+0
* Update docs/submodules/sdc.git from branch 'master' to 2fcd69426559f3464840309444596a3978d5f8e6 - Remove powermock from ComponentMonitoringUploadsImplTest - Remove powermock from ComponentMonitoringUploadsImplTest. - Add new constructor to ComponentMonitoringUploadsImpl. Issue-ID: SDC-3024 Signed-off-by: Rodrigo Lima <rodrigo.lima@yoppworks.com> Change-Id: Ic8583db9c459c4d39258129a3b70cc108b30d7de
2020-05-10Update git submodulesFrancis Toth1-0/+0
* Update docs/submodules/sdc.git from branch 'master' to feb112c63e395bd682b09a43d6a03d13eb29dcd4 - Moved ArtifactsBusinessLogic::buildJsonStringForCsarVfcArtifact to JsonUtils Signed-off-by: Francis Toth <francis.toth@yoppworks.com> Change-Id: Ia3bb9fe9f97e1759e4e5b70eb5e5396ed87d716d Issue-ID: SDC-2961
2020-05-10Update git submodulesRodrigo Lima1-0/+0
* Update docs/submodules/sdc.git from branch 'master' to 4a98c7efa0e8103b4e14c1d521b7963d095495e0 - Remove powermock from ComputeImplTest - Remove powermock from ComputeImplTest and add new constructor to ComputeImpl Issue-ID: SDC-3046 Signed-off-by: Rodrigo Lima <rodrigo.lima@yoppworks.com> Change-Id: Idf3e67c52f1d65e059bbcfcda5a477e2398b0a3e
2020-05-10Update git submodulesRodrigo Lima1-0/+0
* Update docs/submodules/sdc.git from branch 'master' to 35a3b49ea659fbaf88000ba933b5f9a6b37c917d - Remove powermock from DeploymentFlavorsImplTest - Remove powermock from DeploymentFlavorsImplTest and add new constructor to DeploymentFlavorsImpl Issue-ID: SDC-3050 Signed-off-by: Rodrigo Lima <rodrigo.lima@yoppworks.com> Change-Id: Ib66937932c58c684de5e6a65fbcfb251c0b55c8e
2020-05-08Update git submodulesFrancis Toth1-0/+0
* Update docs/submodules/sdc.git from branch 'master' to 87fc08f6bb131248dbb861d178dd8faddb7412ba - Refactor CsarUtil::addComponentToCache Signed-off-by: Francis Toth <francis.toth@yoppworks.com> Change-Id: Ib78be78780a97c873e710d805dd26273159d5354 Issue-ID: SDC-2812
2020-05-08Update git submodulesandre.schmid1-0/+0
* Update docs/submodules/sdc.git from branch 'master' to 75dd0bbc0e78c8e41de9792123fafed466f8ecbe - Clean normatives file during mvn clean The configuration to clean the normatives.tar.gz was incorrect, so the file was not being cleaned up during mvn clean, which could create an inconsistent sdc-backend-init docker image. Change-Id: I15e3f4c49f404c147532c88c50f131cb61aea9c0 Issue-ID: SDC-3041 Signed-off-by: andre.schmid <andre.schmid@est.tech>
2020-05-07Update git submodulesvasraz1-0/+0
* Update docs/submodules/sdc.git from branch 'master' to a1bd235fffc7c0685800b6f3d8289d143baa87d6 - Reduce scope from 'compile' to 'test' for 'junit-vintage-engine' Change-Id: I39b0be6ba6650c9a7215acf359f3d74e0a24e553 Signed-off-by: Vasyl Razinkov <vasyl.razinkov@est.tech> Issue-ID: SDC-2844 Issue-ID: SDC-2983
2020-05-07Update git submodulesvasraz1-0/+0
* Update docs/submodules/sdc.git from branch 'master' to cea494370afa9feb589d1f813850fbdabc1df578 - Support functions in TOSCA Simple Profile in YAML This commit aim to generalize usage of ToscaFunctions enum Change-Id: Iab3529e101f75db5f856778334a852afb532cdb6 Signed-off-by: Vasyl Razinkov <vasyl.razinkov@est.tech> Issue-ID: SDC-2982
2020-05-07Update git submodulesMichaelMorris1-0/+0
* Update docs/submodules/sdc.git from branch 'master' to f8bc4f94da584d5861827df7ee2107c33f514a55 - Support configuring of tosca type for categories Signed-off-by: MichaelMorris <michael.morris@est.tech> Issue-ID: SDC-2877 Change-Id: I3160c5089979757628f31a44b01836236563b770
2020-05-06Update git submodulesvasraz1-0/+0
* Update docs/submodules/sdc.git from branch 'master' to a36531c38fe1a9234b8dbeaed5505cf3ca48de26 - Prepare for Junit5 Remove unused/duplicated dependencies Change-Id: Iee0d9510ffbe3e2e14574e22ba965d6829fd568b Signed-off-by: Vasyl Razinkov <vasyl.razinkov@est.tech> Issue-ID: SDC-2844 Issue-ID: SDC-2983
2020-05-06Update git submodulesChris André1-0/+0
* Update docs/submodules/sdc.git from branch 'master' to 5be1289bdded95df10c900d2d6f7596904287c91 - Make `collectNewCapabilities` return an empty Map - Made `collectNewCapabilities` return an empty HashMap instead of a null value Issue-ID: SDC-2924 Signed-off-by: Chris Andre <chris.andre@yoppworks.com> Change-Id: I58c35135be5a2614c3daeafbd766d53f401f917b
2020-05-06Update git submodulesvasraz1-0/+0
* Update docs/submodules/sdc.git from branch 'master' to 3b343466b5b4c7ca383d0ee281d158639f4eab2f - Increase test coverage - openecomp-sdc-vendor-software-product-lib Change-Id: Id51ce6f488efd6db02aad479ff419b58436be27c Signed-off-by: Vasyl Razinkov <vasyl.razinkov@est.tech> Issue-ID: SDC-3001
2020-05-06Update git submodulesvasraz1-0/+0
* Update docs/submodules/sdc.git from branch 'master' to cb24c730a254818db9f3a703ef5933e769cefe98 - Increase test coverage - openecomp-sdc-tosca-generator-api Change-Id: I1537d71b11ee440cb01bdee49350336f074ea36d Signed-off-by: Vasyl Razinkov <vasyl.razinkov@est.tech> Issue-ID: SDC-3001
2020-05-06Update git submodulesNeil Derraugh1-0/+0
* Update docs/submodules/sdc.git from branch 'master' to 1ac24708cf920efe3189203cfdf330402048381b - Remove unused ES code and unneeded ES health check Remove the ES health check since ES was removed. Issue-ID: SDC-3022 Signed-off-by: neil.derraugh@yoppworks.com Change-Id: I918212de39d7b53959ac400975b3c47f889252c1
2020-05-06Update git submodulesYuli Shlosberg1-0/+0
* Update docs/submodules/sdc.git from branch 'master' to c88bd6c5b1ba9628711eb84deeef862120b6ddad - fix bug - Error 500 while adding an Operation Change-Id: I7def95b3688877acbc9332cf4174c9d92226f2e2 Issue-ID: SDC-2953 Signed-off-by: Yuli Shlosberg <ys9693@att.com>
2020-05-06Update git submodulesYuli Shlosberg1-0/+0
* Update docs/submodules/sdc.git from branch 'master' to a02add03b465de2adf8f5b05cf9d428af914287f - fix bug - Unable to link CSAR artifact Change-Id: I586637f988b84b3b858e2c8d567c6844be38322b Issue-ID: SDC-2972 Signed-off-by: Yuli Shlosberg <ys9693@att.com>
2020-05-06Update git submodulesRodrigo Lima1-0/+0
* Update docs/submodules/sdc.git from branch 'master' to 339d29c714f60de6e4e50b883259fc1a9a16ee84 - Remove powermockito from OrchestrationTemplateCandidateImplTest - Remove powermockito from OrchestrationTemplateCandidateImplTest. Add new constructor to OrchestrationTemplateCandidateImpl Issue-ID: SDC-3007 Signed-off-by: Rodrigo Lima <rodrigo.lima@yoppworks.com> Change-Id: I5f0a2061796e8410a5b225c43baa70d7e0269684
2020-05-06Update git submodulesChris André1-0/+0
* Update docs/submodules/sdc.git from branch 'master' to 57ac9cec55b6470da859330a0fcab70e35422b3c - Handle null case in `addCalculatedCapabilitiesWithPropertiesToComponent` - Change code to handle a null value for `groupDefinitions` as if it was an empty List Issue-ID: SDC-2910 Signed-off-by: Chris Andre <chris.andre@yoppworks.com> Change-Id: I5fca0ab76886e5f6a73a8f05ec35d38848f96dd8
2020-05-06Update git submodulesChris André1-0/+0
* Update docs/submodules/sdc.git from branch 'master' to c9c7f88f77c9cab341485c27e1e67f6294a0b1c2 - Work around potential NullPointerExceptions in `ToscaOperationFacade` - Add tests in `getToscaElementByOperation` and `updateToscaElement` for null values - rewrite `getLatestCertifiedByToscaResourceName` in a more functional way - Rewrite some other usages of Either in a more functional way Issue-ID: SDC-2922 Signed-off-by: Chris Andre <chris.andre@yoppworks.com> Change-Id: I52b294ec91faf9e1054af572dcca4060e62fe571
2020-05-05Update git submodulesilanap1-0/+0
* Update docs/submodules/sdc.git from branch 'master' to 5facedd4291181fb2668ea3e945687c04fe62cb1 - Setting default store types when not defined in configuration for init of https client Issue-ID: SDC-2962 Signed-off-by: ilanap <ilanap@amdocs.com> Change-Id: I9d88031c7d20951a4a77138340b1ddc26f47c0b6 Signed-off-by: ilanap <ilanap@amdocs.com>
2020-05-05Update git submodulesChris André1-0/+0
* Update docs/submodules/sdc.git from branch 'master' to 8e039ab3f81af2d1452f1b2db06588883529a428 - Add tests for the presence of Optional values Issue-ID: SDC-3012 Signed-off-by: Chris Andre <chris.andre@yoppworks.com> Change-Id: I56cbf7fb5bd04ad2fbc496231d6abe72066124fe
2020-05-05Update git submodulesChris André1-0/+0
* Update docs/submodules/sdc.git from branch 'master' to efec7c5f7abb24da6d8ab93a71ee725e1c1f438f - UnifiedCompositionService - Refactor code to handle Optional value Issue-ID: SDC-3015 Signed-off-by: Chris Andre <chris.andre@yoppworks.com> Change-Id: I1d15d20e9c603ff894c7c4be46b26d60745cb7e5
2020-05-05Update git submodulesNeil Derraugh1-0/+0
* Update docs/submodules/sdc.git from branch 'master' to 45d6bf5520f9c70e57e473b109870b8ad0eb7251 - Replace hashCode and equals methods to cleanup NPE warning Replace hashCode() and equals() with Lombok @EqualsAndHashCode(callSuper = true) Issue-ID: SDC-2925 Signed-off-by: neil.derraugh <neil.derraugh@yoppworks.com> Change-Id: I51056103dc7df953508b2e465a535b46c63e2667
2020-05-05Update git submodulesChris André1-0/+0
* Update docs/submodules/sdc.git from branch 'master' to 722eed1c46361a2d8136f1fac528a96749f5dbbd - Remove call to `get` on Optional variables - Made multiple variables Optional Issue-ID: SDC-2991 Signed-off-by: Chris Andre <chris.andre@yoppworks.com> Change-Id: If3dbfd37e933d10698ad1a93b6762c84e30f69b8
2020-05-05Update git submodulesFrancis Toth1-0/+0
* Update docs/submodules/sdc.git from branch 'master' to 908793f04e9a595734a6e0e189b846ed062bfc7d - Refactor CsarUtil::getLatestSchemaFilesFromCassandra Signed-off-by: Francis Toth <francis.toth@yoppworks.com> Change-Id: I3f96d76a07fd32bdbd8b59beb5409eab0b0f3aa8 Issue-ID: SDC-2812
2020-05-05Update git submodulesFrancis Toth1-0/+0
* Update docs/submodules/sdc.git from branch 'master' to 06b84593bea8b963266f8d2a8a62dce9feeb2181 - Refactor CsarUtil::getFromCassandra Signed-off-by: Francis Toth <francis.toth@yoppworks.com> Change-Id: I510d1d7fb4f4a7d7152fd5ea6d4d5ff61deea23a Issue-ID: SDC-2812
2020-05-05Update git submodulesFrancis Toth1-0/+0
* Update docs/submodules/sdc.git from branch 'master' to 762a1a320d92ca7415265066dbe4dfd7df91c2ec - Refactor CsarUtils::collectComponentTypeArtifacts This commit is a minor refactoring required to refactor CsarUtils::collectComponentInstanceArtifacts. In order to keep this commit small, we only focused CsarUtils::collectComponentTypeArtifacts, and removed any output that is not reflected by the function's result type. Modifying an argument is a actually a bad practice as explained in Clean Code by Robert Martin (cf. "Output arguments should be avoided"). This commit aims to enforce this aspect. Change-Id: Ice4d6c9a78e7706c639dd60bc272253e298bc7be Signed-off-by: Francis Toth <francis.toth@yoppworks.com> Issue-ID: SDC-2812
2020-05-05Update git submodulesvasraz1-0/+0
* Update docs/submodules/sdc.git from branch 'master' to 8394fae8e6fca37ad8f3e10ade82d8d2507585d1 - Remove all thrift's dependencies Remove unused/duplicated dependencies Change-Id: Ic2239acc5ddde1d0874b5139c228934ec1e61cd0 Signed-off-by: Vasyl Razinkov <vasyl.razinkov@est.tech> Issue-ID: SDC-2985
2020-05-05Update git submodulesRodrigo Lima1-0/+0
* Update docs/submodules/sdc.git from branch 'master' to 5dbe45d88a8372343ed77504220b50b815b1b7f9 - Add Autowired annotation to the constructor instead of param in ExternalTestingImpl Issue-ID: SDC-3003 Signed-off-by: Rodrigo Lima <rodrigo.lima@yoppworks.com> Change-Id: I720c6cf271a1444a584f42cdca2a7e4f2c59a85d
2020-05-03Update git submodulesFrancis Toth1-0/+0
* Update docs/submodules/sdc.git from branch 'master' to 43a1a1714aa08bf632faffd72f1791d59f02e59c - Refactor CsarUtils::createCsar Signed-off-by: Francis Toth <francis.toth@yoppworks.com> Change-Id: I41994c98515844030eed1d6f2756c9779e864cff Issue-ID: SDC-2812
2020-05-03Update git submodulesFrancis Toth1-0/+0
* Update docs/submodules/sdc.git from branch 'master' to f52d4072ccb95b3a69b8f17b87ee44513167029e - Extract ArtifactOperationInfo from ArtifactsBusinessLogic This commit only intends to extract the inner static class ArtifactOperationInfo from the ArtifactsBusinessLogic class. In addition, getters have been added to get the artifactOperationEnum field's state (this allowed to reduce some boilerplate). Change-Id: Ib79a75893ef11ba0d25e0578d7e95f60284589d0 Signed-off-by: Francis Toth <francis.toth@yoppworks.com> Issue-ID: SDC-2961
2020-05-03Update git submodulesFrancis Toth1-0/+0
* Update docs/submodules/sdc.git from branch 'master' to 789d5c745e2d1a6add6dbbc065296ce4254b3046 - Remove powermockito from NetworksImplTest This commit aims to remove the Powermockito dependency from NetworksImplTest. Signed-off-by: Francis Toth <francis.toth@yoppworks.com> Change-Id: I7eecb877f86a64514609e11fd9501f3fb972a866 Issue-ID: SDC-2984
2020-05-03Update git submodulesRodrigo Lima1-0/+0
* Update docs/submodules/sdc.git from branch 'master' to 5f8087fc96f07c771a9c4cf7c687c4e91be7fddc - Remove powermockito from ApiTest - Remove powermockit from ApiTest. Add new constructor to ExternalTestingImpl in order to pass vendorSoftwareProductManager param. Issue-ID: SDC-3003 Signed-off-by: Rodrigo Lima <rodrigo.lima@yoppworks.com> Change-Id: Ibdaa12a986557dbf1d4cdf6d4c1952ba642582cf
2020-05-03Update git submodulesvasraz1-0/+0
* Update docs/submodules/sdc.git from branch 'master' to d51e3d82c1ac720367c55b279ac0c7593308be2e - Increase test coverage - openecomp-sdc-model-lib Change-Id: I86e4935fd418bb01971f21ae32351be6044a2566 Signed-off-by: Vasyl Razinkov <vasyl.razinkov@est.tech> Issue-ID: SDC-3001
2020-05-03Update git submodulesvasraz1-0/+0
* Update docs/submodules/sdc.git from branch 'master' to 4d285142900d64fa097b37f52538c3c2875024df - Increase test coverage - openecomp-sdc-vendor-software-product-api Change-Id: Ifaaf73998ee0f7df66082fdc4963b4c05678e5c1 Signed-off-by: Vasyl Razinkov <vasyl.razinkov@est.tech> Issue-ID: SDC-3001
2020-05-03Update git submodulesFrancis Toth1-0/+0
* Update docs/submodules/sdc.git from branch 'master' to 9a27b8bb9716ea3f8af5b381dc301bc6eefd9bf2 - Refactor CsarUtils::validateNonMetaArtifact This commit aims to refactor the CsarUtils::validateNonMetaArtifact function and make it up to standards regarding how fj.Either should be used. Signed-off-by: Francis Toth <francis.toth@yoppworks.com> Change-Id: Icadfce7229839e53bd09926b6865f2872c39d1a5 Issue-ID: SDC-2812
2020-05-03Update git submodulesandre.schmid1-0/+0
* Update docs/submodules/sdc.git from branch 'master' to b0982c12cc9fa0d8e642f4475ec293c7b6512c08 - Fix sdc-FE /onboarding war listing It creates a index.html page that will end up in the onboarding-FE .war file. When the /onboarding context is accessed, a blank page will show up instead of the contents of the .war. Change-Id: I0fb4be28e193e6e6bbd58c1af9a49d5750981b7e Issue-ID: SDC-3000 Signed-off-by: andre.schmid <andre.schmid@est.tech>
2020-04-30Update git submodulesBen David, Elad (eb7504)1-0/+0
* Update docs/submodules/sdc.git from branch 'master' to 31c64b3443fb1a76d1cfc7afc0db1e51f1ffda79 - HEAT to TOSCA VM Consolidation Change-Id: I00c9cf90d7486af33955acae7dfe653e14ceebdc Issue-ID: SDC-2997 Signed-off-by: Ben David, Elad (eb7504) <eb7504@intl.att.com>
2020-04-30Update git submodulesChris André1-0/+0
* Update docs/submodules/sdc.git from branch 'master' to 8c5a1d6591d0faf2bdd0de528f42863ae1594c4f - Replace call to `get` with a call to `ifPresent` Issue-ID: SDC-2989 Signed-off-by: Chris Andre <chris.andre@yoppworks.com> Change-Id: I7fe273d869035f8852dbc398de60cc49dec2ce6e