chore: Refactor and adjust tests

Signed-off-by: imusmanmalik <[email protected]>

Author: imusmanmalik

pkg/config/config.go

@@ -196,8 +196,12 @@ func (gc *Config) AppMinimumSyncPeriod() time.Duration {
 // that do not explicitly specify sync period.
 func (gc *Config) PackageInstallDefaultSyncPeriod() time.Duration {
 	const defaultSyncPeriod = 10 * time.Minute
+	const minDefaultSyncPeriod = 30 * time.Second
 	if gc.data.packageInstallDefaultSyncPeriod != 0 {
-		return gc.data.packageInstallDefaultSyncPeriod
+		if gc.data.packageInstallDefaultSyncPeriod > minDefaultSyncPeriod {
+			return gc.data.packageInstallDefaultSyncPeriod
+		}
+		return minDefaultSyncPeriod
 	}
 	return defaultSyncPeriod
 }

pkg/packageinstall/app.go

@@ -13,7 +13,6 @@ import (
 	pkgingv1alpha1 "github.com/vmware-tanzu/carvel-kapp-controller/pkg/apis/packaging/v1alpha1"
 	datapkgingv1alpha1 "github.com/vmware-tanzu/carvel-kapp-controller/pkg/apiserver/apis/datapackaging/v1alpha1"
 	"github.com/vmware-tanzu/carvel-kapp-controller/pkg/client/clientset/versioned/scheme"
-	"github.com/vmware-tanzu/carvel-kapp-controller/pkg/config"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"sigs.k8s.io/controller-runtime/pkg/controller/controllerutil"
 )
@@ -33,10 +32,6 @@ const (
 	ExtFetchSecretNameAnnKeyFmt = "ext.packaging.carvel.dev/fetch-%d-secret-name"
 )
 
-var (
-	kcConfig config.Config
-)
-
 // NewApp creates a new instance of v1alpha1.App based on the provided parameters.
 // It takes an existingApp, pkgInstall, pkgVersion, and opts, and returns the newly created App.
 func NewApp(existingApp *v1alpha1.App, pkgInstall *pkgingv1alpha1.PackageInstall, pkgVersion datapkgingv1alpha1.Package, opts Opts) (*v1alpha1.App, error) {
@@ -59,11 +54,7 @@ func NewApp(existingApp *v1alpha1.App, pkgInstall *pkgingv1alpha1.PackageInstall
 	desiredApp.Spec = *pkgVersion.Spec.Template.Spec
 	desiredApp.Spec.ServiceAccountName = pkgInstall.Spec.ServiceAccountName
 	if pkgInstall.Spec.SyncPeriod == nil {
-		if opts.DefaultSyncPeriod != 0 {
-			desiredApp.Spec.SyncPeriod = &metav1.Duration{Duration: opts.DefaultSyncPeriod}
-		} else {
-			desiredApp.Spec.SyncPeriod = &metav1.Duration{Duration: kcConfig.PackageInstallDefaultSyncPeriod()}
-		}
+		desiredApp.Spec.SyncPeriod = &metav1.Duration{Duration: opts.DefaultSyncPeriod}
 	} else {
 		desiredApp.Spec.SyncPeriod = pkgInstall.Spec.SyncPeriod
 	}

pkg/packageinstall/app_test.go

@@ -55,7 +55,7 @@ func TestAppExtPathsFromSecretNameAnn(t *testing.T) {
 		},
 	}
 
-	app, err := packageinstall.NewApp(&kcv1alpha1.App{}, ipkg, pkgVersion, packageinstall.Opts{})
+	app, err := packageinstall.NewApp(&kcv1alpha1.App{}, ipkg, pkgVersion, packageinstall.Opts{DefaultSyncPeriod: 10 * time.Minute})
 	if err != nil {
 		t.Fatalf("Expected no err, but was: %s", err)
 	}
@@ -167,7 +167,7 @@ func TestAppHelmOverlaysFromAnn(t *testing.T) {
 		},
 	}
 
-	app, err := packageinstall.NewApp(&kcv1alpha1.App{}, ipkg, pkgVersion, packageinstall.Opts{})
+	app, err := packageinstall.NewApp(&kcv1alpha1.App{}, ipkg, pkgVersion, packageinstall.Opts{DefaultSyncPeriod: 10 * time.Minute})
 	if err != nil {
 		t.Fatalf("Expected no err, but was: %s", err)
 	}
@@ -239,7 +239,7 @@ func TestAppExtYttDataValuesOverlaysAnn(t *testing.T) {
 		},
 	}
 
-	app, err := packageinstall.NewApp(&kcv1alpha1.App{}, ipkg, pkgVersion, packageinstall.Opts{})
+	app, err := packageinstall.NewApp(&kcv1alpha1.App{}, ipkg, pkgVersion, packageinstall.Opts{DefaultSyncPeriod: 10 * time.Minute})
 	if err != nil {
 		t.Fatalf("Expected no err, but was: %s", err)
 	}
@@ -309,7 +309,7 @@ func TestAppYttValues(t *testing.T) {
 		},
 	}
 
-	app, err := packageinstall.NewApp(&kcv1alpha1.App{}, ipkg, pkgVersion, packageinstall.Opts{})
+	app, err := packageinstall.NewApp(&kcv1alpha1.App{}, ipkg, pkgVersion, packageinstall.Opts{DefaultSyncPeriod: 10 * time.Minute})
 	if err != nil {
 		t.Fatalf("Expected no err, but was: %s", err)
 	}
@@ -378,7 +378,7 @@ func TestAppHelmTemplateValues(t *testing.T) {
 		},
 	}
 
-	app, err := packageinstall.NewApp(&kcv1alpha1.App{}, ipkg, pkgVersion, packageinstall.Opts{})
+	app, err := packageinstall.NewApp(&kcv1alpha1.App{}, ipkg, pkgVersion, packageinstall.Opts{DefaultSyncPeriod: 10 * time.Minute})
 	if err != nil {
 		t.Fatalf("Expected no err, but was: %s", err)
 	}
@@ -582,7 +582,7 @@ func TestAppPackageIntallDefaultSyncPeriod(t *testing.T) {
 		},
 	}
 
-	app, err := packageinstall.NewApp(&kcv1alpha1.App{}, ipkg, pkgVersion, packageinstall.Opts{})
+	app, err := packageinstall.NewApp(&kcv1alpha1.App{}, ipkg, pkgVersion, packageinstall.Opts{DefaultSyncPeriod: 10 * time.Minute})
 	require.NoError(t, err)
 
 	// Define the expected app object, with the sync period attribute set to the default value