Issue #3408: remove FromCloud from PackageInstall() and RepositoryAdd()

RotherOSS · May 24, 2024 · cc6125c · cc6125c
1 parent f3e2ad7
commit cc6125c
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 27 deletions.
diff --git a/Kernel/Modules/AdminPackageManager.pm b/Kernel/Modules/AdminPackageManager.pm
@@ -2170,13 +2170,6 @@ sub _InstallHandling {
     }
     $RepositoryCloudList //= {};
 
-    # in case Source is present on repository cloud list
-    # the package should be retrieved using the CloudService backend
-    my $FromCloud = 0;
-    if ( $Param{Source} && $RepositoryCloudList->{ $Param{Source} } ) {
-        $FromCloud = 1;
-    }
-
     my %Response = $PackageObject->AnalyzePackageFrameworkRequirements(
         Framework => $Structure{Framework},
         NoLog     => 1,
@@ -2257,8 +2250,7 @@ sub _InstallHandling {
     # install package
     elsif (
         $PackageObject->PackageInstall(
-            String    => $Param{Package},
-            FromCloud => $FromCloud
+            String => $Param{Package},
         )
         )
     {

diff --git a/Kernel/System/Package.pm b/Kernel/System/Package.pm
@@ -330,11 +330,10 @@ sub RepositoryGet {
 
 =head2 RepositoryAdd()
 
-add a package to local repository
+add a package to the local repository, that is the database table I<package_repository>.
 
     $PackageObject->RepositoryAdd(
         String    => $FileString,
-        FromCloud => 0,             # optional 1 or 0, it indicates if package came from Cloud or not
     );
 
 =cut
@@ -351,9 +350,6 @@ sub RepositoryAdd {
         return;
     }
 
-    # get from cloud flag
-    $Param{FromCloud} //= 0;
-
     # get package attributes
     my %Structure = $Self->PackageParse(%Param);
 
@@ -362,6 +358,7 @@ sub RepositoryAdd {
             Priority => 'error',
             Message  => 'Invalid Package!',
         );
+
         return;
     }
     if ( !$Structure{Name} ) {
@@ -479,7 +476,6 @@ installs a package when it is not installed yet. Upgrades a package when it is a
     $PackageObject->PackageInstall(
         String    => $FileString,
         Force     => 1,             # optional 1 or 0, for to install package even if validation fails
-        FromCloud => 1,             # optional 1 or 0, it indicates if package's origin is Cloud or not
     );
 
 =cut
@@ -501,9 +497,6 @@ sub PackageInstall {
     #   during the installation.
     $Self->_RepositoryCacheClear();
 
-    # get from cloud flag
-    my $FromCloud = $Param{FromCloud} || 0;
-
     # conflict check
     my %Structure = $Self->PackageParse(%Param);
 
@@ -595,9 +588,8 @@ sub PackageInstall {
     }
 
     # add package
-    return if !$Self->RepositoryAdd(
-        String    => $Param{String},
-        FromCloud => $FromCloud,
+    return unless $Self->RepositoryAdd(
+        String => $Param{String},
     );
 
     # update package status
@@ -909,7 +901,7 @@ sub PackageUpgrade {
     return if !$Self->RepositoryRemove( Name => $Structure{Name}->{Content} );
 
     # add new package
-    return if !$Self->RepositoryAdd( String => $Param{String} );
+    return unless $Self->RepositoryAdd( String => $Param{String} );
 
     # update package status
     return if !$Kernel::OM->Get('Kernel::System::DB')->Do(
@@ -3253,9 +3245,8 @@ sub PackageUpgradeAll {
 
         if ( !$InstalledVersions{$PackageName} ) {
             my $InstallSuccess = $Self->PackageInstall(
-                String    => $Package,
-                FromCloud => $MetaPackage->{FromCloud},
-                Force     => $Param{Force} || 0,
+                String => $Package,
+                Force  => $Param{Force} || 0,
             );
             if ( !$InstallSuccess ) {
                 $Success = 0;

diff --git a/scripts/test/GenericInterface/Event/ObjectType/Package/DataGet.t b/scripts/test/GenericInterface/Event/ObjectType/Package/DataGet.t
@@ -42,7 +42,6 @@ my $FileString = $MainObject->FileRead(
 my $PackageObject = $Kernel::OM->Get('Kernel::System::Package');
 my $Success       = $PackageObject->RepositoryAdd(
     String    => ${$FileString},
-    FromCloud => 0,
 );
 $Self->True(
     $Success,

diff --git a/scripts/test/SysConfig/ConfigurationCategoriesGet.t b/scripts/test/SysConfig/ConfigurationCategoriesGet.t
@@ -169,7 +169,9 @@ for my $Test (@Tests) {
     );
 
     if ( $Test->{RepositoryAdd} ) {
-        my $RepositoryAdd = $PackageObject->RepositoryAdd( String => $Test->{RepositoryAdd}->{String} );
+        my $RepositoryAdd = $PackageObject->RepositoryAdd(
+            String => $Test->{RepositoryAdd}->{String}
+        );
         $Self->True(
             $RepositoryAdd,
             "RepositoryAdd() $Test->{RepositoryAdd}->{PackageName}",