From 700132a1630bdc34372972e101e0cd7c95987b56 Mon Sep 17 00:00:00 2001 From: ansgarz Date: Fri, 30 Jun 2023 11:19:07 +0200 Subject: [PATCH] remove install MS Teams as teams now only available per PWA and not as package anymore --- README.md | 1 - .../provs/desktop/domain/DesktopOnlyModule.kt | 2 +- .../provs/desktop/domain/DesktopService.kt | 9 --------- .../provs/desktop/infrastructure/MsTeams.kt | 12 ------------ .../application/CliArgumentsParserTest.kt | 9 --------- .../desktop/infrastructure/MsTeamsKtTest.kt | 18 ------------------ 6 files changed, 1 insertion(+), 50 deletions(-) delete mode 100644 src/main/kotlin/org/domaindrivenarchitecture/provs/desktop/infrastructure/MsTeams.kt delete mode 100644 src/test/kotlin/org/domaindrivenarchitecture/provs/desktop/infrastructure/MsTeamsKtTest.kt diff --git a/README.md b/README.md index 48e3228..d6dcf35 100644 --- a/README.md +++ b/README.md @@ -60,7 +60,6 @@ After having installed `provs-desktop.jar` (see prerequisites) execute: * `-o` for only executing one action, e.g. * `-o verify` for verifying your installation * `-o firefox` to install firefox from apt on ubuntu - * `-o teams` to install MS-Teams #### Example diff --git a/src/main/kotlin/org/domaindrivenarchitecture/provs/desktop/domain/DesktopOnlyModule.kt b/src/main/kotlin/org/domaindrivenarchitecture/provs/desktop/domain/DesktopOnlyModule.kt index f4b7dcd..87aced7 100644 --- a/src/main/kotlin/org/domaindrivenarchitecture/provs/desktop/domain/DesktopOnlyModule.kt +++ b/src/main/kotlin/org/domaindrivenarchitecture/provs/desktop/domain/DesktopOnlyModule.kt @@ -1,5 +1,5 @@ package org.domaindrivenarchitecture.provs.desktop.domain enum class DesktopOnlyModule { - TEAMS, FIREFOX, VERIFY + FIREFOX, VERIFY } \ No newline at end of file diff --git a/src/main/kotlin/org/domaindrivenarchitecture/provs/desktop/domain/DesktopService.kt b/src/main/kotlin/org/domaindrivenarchitecture/provs/desktop/domain/DesktopService.kt index ea0a4df..1080535 100644 --- a/src/main/kotlin/org/domaindrivenarchitecture/provs/desktop/domain/DesktopService.kt +++ b/src/main/kotlin/org/domaindrivenarchitecture/provs/desktop/domain/DesktopService.kt @@ -90,15 +90,6 @@ fun Prov.provisionIdeDesktop(onlyModules: List? = null) { } } -@Suppress("unused") // used in other projects -fun Prov.provisionMSDesktop(onlyModules: List?) { - if (onlyModules == null) { - installMsTeams() - } else if (onlyModules.contains(DesktopOnlyModule.TEAMS.name.lowercase())) { - installMsTeams() - } -} - fun Prov.provisionOfficeDesktop(onlyModules: List? = null) { if (onlyModules == null) { aptInstall(ZIP_UTILS) diff --git a/src/main/kotlin/org/domaindrivenarchitecture/provs/desktop/infrastructure/MsTeams.kt b/src/main/kotlin/org/domaindrivenarchitecture/provs/desktop/infrastructure/MsTeams.kt deleted file mode 100644 index f46d518..0000000 --- a/src/main/kotlin/org/domaindrivenarchitecture/provs/desktop/infrastructure/MsTeams.kt +++ /dev/null @@ -1,12 +0,0 @@ -package org.domaindrivenarchitecture.provs.desktop.infrastructure - -import org.domaindrivenarchitecture.provs.framework.core.Prov -import org.domaindrivenarchitecture.provs.framework.ubuntu.install.base.aptInstall - -fun Prov.installMsTeams() = task { - aptInstall("curl gnupg2") - cmd("curl -sSL https://packages.microsoft.com/keys/microsoft.asc | sudo apt-key add -") - cmd("sudo sh -c 'echo \"deb [arch=amd64] https://packages.microsoft.com/repos/ms-teams stable main\" > /etc/apt/sources.list.d/teams.list'") - cmd("sudo apt-get update") // apt needs update - aptInstall("teams") -} \ No newline at end of file diff --git a/src/test/kotlin/org/domaindrivenarchitecture/provs/desktop/application/CliArgumentsParserTest.kt b/src/test/kotlin/org/domaindrivenarchitecture/provs/desktop/application/CliArgumentsParserTest.kt index 691b21a..35e4a32 100644 --- a/src/test/kotlin/org/domaindrivenarchitecture/provs/desktop/application/CliArgumentsParserTest.kt +++ b/src/test/kotlin/org/domaindrivenarchitecture/provs/desktop/application/CliArgumentsParserTest.kt @@ -14,13 +14,4 @@ internal class CliArgumentsParserTest { assertEquals(null, cli.configFile) assertEquals(true, cli.target.isValidLocalhost()) } - - @Test - fun parse_cliCommand_with_onlyModule_teams_and_local_target() { - val cli = CliArgumentsParser("test").parseCommand(args = arrayOf("ide", "local", "-o", "teams")) - - assertTrue(cli.isValid()) - assertEquals(true, cli.target.isValidLocalhost()) - assertEquals(true, cli.onlyModules?.contains("teams")) - } } \ No newline at end of file diff --git a/src/test/kotlin/org/domaindrivenarchitecture/provs/desktop/infrastructure/MsTeamsKtTest.kt b/src/test/kotlin/org/domaindrivenarchitecture/provs/desktop/infrastructure/MsTeamsKtTest.kt deleted file mode 100644 index 8cc3fc3..0000000 --- a/src/test/kotlin/org/domaindrivenarchitecture/provs/desktop/infrastructure/MsTeamsKtTest.kt +++ /dev/null @@ -1,18 +0,0 @@ -package org.domaindrivenarchitecture.provs.desktop.infrastructure - -import org.domaindrivenarchitecture.provs.test.defaultTestContainer -import org.domaindrivenarchitecture.provs.test.tags.ExtensiveContainerTest -import org.junit.jupiter.api.Assertions.assertTrue - -class MsTeamsKtTest { - - @ExtensiveContainerTest - fun installMsTeams() { - // given - val a = defaultTestContainer() - // when - val res = a.task { installMsTeams() } - // then - assertTrue(res.success) - } -} \ No newline at end of file