Refactor

Author: igor.grzankowski

pkg/splunk/enterprise/util.go

@@ -1185,25 +1185,17 @@ func handleAppRepoChanges(ctx context.Context, client splcommon.ControllerClient
 }
 
 // isAppExtentionValid checks if an app extention is supported or not
-func isAppExtentionValid(receivedKey string) bool {
-	appExtIdx := strings.LastIndex(receivedKey, ".")
-	if appExtIdx < 0 {
-		return false
-	}
-
-	switch appExt := receivedKey[appExtIdx+1:]; appExt {
-	case "spl":
-		return true
+func isAppExtensionValid(receivedKey string) bool {
+	// List of valid extensions
+	validExtensions := []string{".spl", ".tgz", ".tar.gz"}
 
-	case "tgz":
-		return true
-
-	case "tar.gz":
-		return true
-
-	default:
-		return false
+	// Iterate over the list and check if the receivedKey ends with any valid extension
+	for _, ext := range validExtensions {
+		if strings.HasSuffix(receivedKey, ext) {
+			return true
+		}
 	}
+	return false
 }
 
 // AddOrUpdateAppSrcDeploymentInfoList  modifies the App deployment status as perceived from the remote object listing
@@ -1219,7 +1211,7 @@ func AddOrUpdateAppSrcDeploymentInfoList(ctx context.Context, appSrcDeploymentIn
 
 	for _, remoteObj := range remoteS3ObjList {
 		receivedKey := *remoteObj.Key
-		if !isAppExtentionValid(receivedKey) {
+		if !isAppExtensionValid(receivedKey) {
 			scopedLog.Error(nil, "App name Parsing: Ignoring the key with invalid extension", "receivedKey", receivedKey)
 			continue
 		}

pkg/splunk/enterprise/util_test.go

@@ -1175,12 +1175,12 @@ func TestGetAvailableDiskSpaceShouldFail(t *testing.T) {
 	}
 }
 
-func TestIsAppExtentionValid(t *testing.T) {
-	if !isAppExtentionValid("testapp.spl") || !isAppExtentionValid("testapp.tgz") || !isAppExtentionValid("testapp.tar.gz") {
+func TestIsAppExtensionValid(t *testing.T) {
+	if !isAppExtensionValid("testapp.spl") || !isAppExtensionValid("testapp.tgz") || !isAppExtensionValid("testapp.tar.gz") {
 		t.Errorf("failed to detect valid app extension")
 	}
 
-	if isAppExtentionValid("testapp.aspl") || isAppExtentionValid("testapp.ttgz") {
+	if isAppExtensionValid("testapp.aspl") || isAppExtensionValid("testapp.ttgz") {
 		t.Errorf("failed to detect invalid app extension")
 	}
 }