From f927d5a668972155f00fbc1a79bd968395f12d1c Mon Sep 17 00:00:00 2001 From: MarianKijewski Date: Wed, 16 Apr 2025 16:48:08 +0200 Subject: [PATCH 01/16] feat: add Ktlint #WPB-17130 --- .editorconfig | 29 +++++++++++++++++++++++++++++ build.gradle.kts | 19 +++++++++++++++++++ 2 files changed, 48 insertions(+) create mode 100644 .editorconfig diff --git a/.editorconfig b/.editorconfig new file mode 100644 index 0000000..a8232df --- /dev/null +++ b/.editorconfig @@ -0,0 +1,29 @@ +root = true + +[*] +charset = utf-8 +end_of_line = lf +max_line_length = 100 +indent_size = 4 +indent_style = space +insert_final_newline = true +tab_width = 4 +ij_continuation_indent_size = 8 +ij_formatter_off_tag = @formatter:off +ij_formatter_on_tag = @formatter:on +ij_formatter_tags_enabled = false +ij_smart_tabs = false +ij_visual_guides = none +ij_wrap_on_typing = false + +# Specific settings for YAML files +[{*.yml,*.yaml}] +indent_size = 2 + +[*.{kt,kts}] +ktlint_standard_annotation = disabled +ij_kotlin_allow_trailing_comma = false +ij_kotlin_allow_trailing_comma_on_call_site = false +ktlint_standard_multiline-expression-wrapping = disabled +ktlint_standard_string-template-indent = disabled +ktlint_standard_import-ordering = disabled diff --git a/build.gradle.kts b/build.gradle.kts index fdd6482..8c3921f 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,7 +1,10 @@ +import org.jlleitschuh.gradle.ktlint.reporter.ReporterType + plugins { kotlin("jvm") version "1.5.30" application distribution + id("org.jlleitschuh.gradle.ktlint") version "12.2.0" id("net.nemerosa.versioning") version "3.1.0" } @@ -69,6 +72,22 @@ dependencies { implementation("org.flywaydb", "flyway-core", "7.8.2") } +ktlint { + verbose.set(true) + outputToConsole.set(true) + coloredOutput.set(true) + reporters { + reporter(ReporterType.CHECKSTYLE) + reporter(ReporterType.JSON) + reporter(ReporterType.HTML) + } + filter { + exclude { element -> + element.file.path.contains("generated/") + } + } +} + tasks { val jvmTarget = "1.8" compileKotlin { From a640ab7afb06e1d62359edb8b4d9f52769e88a1c Mon Sep 17 00:00:00 2001 From: MarianKijewski Date: Wed, 16 Apr 2025 17:00:36 +0200 Subject: [PATCH 02/16] feat: add Detekt #WPB-17130 --- build.gradle.kts | 12 +- config/detekt/baseline.xml | 6 + config/detekt/detekt.yml | 783 +++++++++++++++++++++++++++++++++++++ 3 files changed, 800 insertions(+), 1 deletion(-) create mode 100644 config/detekt/baseline.xml create mode 100644 config/detekt/detekt.yml diff --git a/build.gradle.kts b/build.gradle.kts index 8c3921f..9ffc896 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,10 +1,11 @@ import org.jlleitschuh.gradle.ktlint.reporter.ReporterType plugins { - kotlin("jvm") version "1.5.30" + kotlin("jvm") version "2.1.20" application distribution id("org.jlleitschuh.gradle.ktlint") version "12.2.0" + id("io.gitlab.arturbosch.detekt") version "1.23.7" id("net.nemerosa.versioning") version "3.1.0" } @@ -88,6 +89,15 @@ ktlint { } } +detekt { + toolVersion = "1.23.7" + config.setFrom(file("$rootDir/config/detekt/detekt.yml")) + baseline = file("$rootDir/config/detekt/baseline.xml") + parallel = true + buildUponDefaultConfig = true + source.setFrom("src/main/kotlin") +} + tasks { val jvmTarget = "1.8" compileKotlin { diff --git a/config/detekt/baseline.xml b/config/detekt/baseline.xml new file mode 100644 index 0000000..5703cad --- /dev/null +++ b/config/detekt/baseline.xml @@ -0,0 +1,6 @@ + + + + + + diff --git a/config/detekt/detekt.yml b/config/detekt/detekt.yml new file mode 100644 index 0000000..ae69534 --- /dev/null +++ b/config/detekt/detekt.yml @@ -0,0 +1,783 @@ +build: + maxIssues: 0 + excludeCorrectable: false + weights: + # complexity: 2 + # LongParameterList: 1 + # style: 1 + # comments: 1 + +config: + validation: true + warningsAsErrors: false + checkExhaustiveness: false + # when writing own rules with new properties, exclude the property path e.g.: 'my_rule_set,.*>.*>[my_property]' + excludes: '' + +processors: + active: true + exclude: + - 'DetektProgressListener' + # - 'KtFileCountProcessor' + # - 'PackageCountProcessor' + # - 'ClassCountProcessor' + # - 'FunctionCountProcessor' + # - 'PropertyCountProcessor' + # - 'ProjectComplexityProcessor' + # - 'ProjectCognitiveComplexityProcessor' + # - 'ProjectLLOCProcessor' + # - 'ProjectCLOCProcessor' + # - 'ProjectLOCProcessor' + # - 'ProjectSLOCProcessor' + # - 'LicenseHeaderLoaderExtension' + +console-reports: + active: true + exclude: + - 'ProjectStatisticsReport' + - 'ComplexityReport' + - 'NotificationReport' + - 'FindingsReport' + - 'FileBasedFindingsReport' + # - 'LiteFindingsReport' + +output-reports: + active: true + exclude: + # - 'TxtOutputReport' + # - 'XmlOutputReport' + # - 'HtmlOutputReport' + # - 'MdOutputReport' + # - 'SarifOutputReport' + +comments: + active: true + AbsentOrWrongFileLicense: + active: false + licenseTemplateFile: 'license.template' + licenseTemplateIsRegex: false + CommentOverPrivateFunction: + active: false + CommentOverPrivateProperty: + active: false + DeprecatedBlockTag: + active: false + EndOfSentenceFormat: + active: false + endOfSentenceFormat: '([.?!][ \t\n\r\f<])|([.?!:]$)' + KDocReferencesNonPublicProperty: + active: false + excludes: ['**/test/**', '**/androidTest/**', '**/commonTest/**', '**/jvmTest/**', '**/androidUnitTest/**', '**/androidInstrumentedTest/**', '**/jsTest/**', '**/iosTest/**'] + OutdatedDocumentation: + active: false + matchTypeParameters: true + matchDeclarationsOrder: true + allowParamOnConstructorProperties: false + UndocumentedPublicClass: + active: false + excludes: ['**/test/**', '**/androidTest/**', '**/commonTest/**', '**/jvmTest/**', '**/androidUnitTest/**', '**/androidInstrumentedTest/**', '**/jsTest/**', '**/iosTest/**'] + searchInNestedClass: true + searchInInnerClass: true + searchInInnerObject: true + searchInInnerInterface: true + searchInProtectedClass: false + UndocumentedPublicFunction: + active: false + excludes: ['**/test/**', '**/androidTest/**', '**/commonTest/**', '**/jvmTest/**', '**/androidUnitTest/**', '**/androidInstrumentedTest/**', '**/jsTest/**', '**/iosTest/**'] + searchProtectedFunction: false + UndocumentedPublicProperty: + active: false + excludes: ['**/test/**', '**/androidTest/**', '**/commonTest/**', '**/jvmTest/**', '**/androidUnitTest/**', '**/androidInstrumentedTest/**', '**/jsTest/**', '**/iosTest/**'] + searchProtectedProperty: false + +complexity: + active: true + CognitiveComplexMethod: + active: false + threshold: 15 + ComplexCondition: + active: true + threshold: 4 + ComplexInterface: + active: false + threshold: 10 + includeStaticDeclarations: false + includePrivateDeclarations: false + ignoreOverloaded: false + CyclomaticComplexMethod: + active: true + threshold: 15 + ignoreSingleWhenExpression: false + ignoreSimpleWhenEntries: false + ignoreNestingFunctions: false + nestingFunctions: + - 'also' + - 'apply' + - 'forEach' + - 'isNotNull' + - 'ifNull' + - 'let' + - 'run' + - 'use' + - 'with' + LabeledExpression: + active: false + ignoredLabels: [] + LargeClass: + active: true + threshold: 600 + LongMethod: + active: true + threshold: 60 + LongParameterList: + active: true + functionThreshold: 6 + constructorThreshold: 7 + ignoreDefaultParameters: false + ignoreDataClasses: true + ignoreAnnotatedParameter: [] + MethodOverloading: + active: false + threshold: 6 + NamedArguments: + active: false + threshold: 3 + ignoreArgumentsMatchingNames: false + NestedBlockDepth: + active: true + threshold: 4 + NestedScopeFunctions: + active: false + threshold: 1 + functions: + - 'kotlin.apply' + - 'kotlin.run' + - 'kotlin.with' + - 'kotlin.let' + - 'kotlin.also' + ReplaceSafeCallChainWithRun: + active: false + StringLiteralDuplication: + active: false + excludes: ['**/test/**', '**/androidTest/**', '**/commonTest/**', '**/jvmTest/**', '**/androidUnitTest/**', '**/androidInstrumentedTest/**', '**/jsTest/**', '**/iosTest/**'] + threshold: 3 + ignoreAnnotation: true + excludeStringsWithLessThan5Characters: true + ignoreStringsRegex: '$^' + TooManyFunctions: + active: true + excludes: ['**/test/**', '**/androidTest/**', '**/commonTest/**', '**/jvmTest/**', '**/androidUnitTest/**', '**/androidInstrumentedTest/**', '**/jsTest/**', '**/iosTest/**'] + thresholdInFiles: 11 + thresholdInClasses: 11 + thresholdInInterfaces: 11 + thresholdInObjects: 11 + thresholdInEnums: 11 + ignoreDeprecated: false + ignorePrivate: false + ignoreOverridden: false + ignoreAnnotatedFunctions: [] + +coroutines: + active: true + GlobalCoroutineUsage: + active: false + InjectDispatcher: + active: true + dispatcherNames: + - 'IO' + - 'Default' + - 'Unconfined' + RedundantSuspendModifier: + active: true + SleepInsteadOfDelay: + active: true + SuspendFunSwallowedCancellation: + active: false + SuspendFunWithCoroutineScopeReceiver: + active: false + SuspendFunWithFlowReturnType: + active: true + +empty-blocks: + active: true + EmptyCatchBlock: + active: true + allowedExceptionNameRegex: '_|(ignore|expected).*' + EmptyClassBlock: + active: true + EmptyDefaultConstructor: + active: true + EmptyDoWhileBlock: + active: true + EmptyElseBlock: + active: true + EmptyFinallyBlock: + active: true + EmptyForBlock: + active: true + EmptyFunctionBlock: + active: true + ignoreOverridden: false + EmptyIfBlock: + active: true + EmptyInitBlock: + active: true + EmptyKtFile: + active: true + EmptySecondaryConstructor: + active: true + EmptyTryBlock: + active: true + EmptyWhenBlock: + active: true + EmptyWhileBlock: + active: true + +exceptions: + active: true + ExceptionRaisedInUnexpectedLocation: + active: true + methodNames: + - 'equals' + - 'finalize' + - 'hashCode' + - 'toString' + InstanceOfCheckForException: + active: true + excludes: ['**/test/**', '**/androidTest/**', '**/commonTest/**', '**/jvmTest/**', '**/androidUnitTest/**', '**/androidInstrumentedTest/**', '**/jsTest/**', '**/iosTest/**'] + NotImplementedDeclaration: + active: false + ObjectExtendsThrowable: + active: false + PrintStackTrace: + active: true + RethrowCaughtException: + active: true + ReturnFromFinally: + active: true + ignoreLabeled: false + SwallowedException: + active: true + ignoredExceptionTypes: + - 'InterruptedException' + - 'MalformedURLException' + - 'NumberFormatException' + - 'ParseException' + allowedExceptionNameRegex: '_|(ignore|expected).*' + ThrowingExceptionFromFinally: + active: true + ThrowingExceptionInMain: + active: false + ThrowingExceptionsWithoutMessageOrCause: + active: true + excludes: ['**/test/**', '**/androidTest/**', '**/commonTest/**', '**/jvmTest/**', '**/androidUnitTest/**', '**/androidInstrumentedTest/**', '**/jsTest/**', '**/iosTest/**'] + exceptions: + - 'ArrayIndexOutOfBoundsException' + - 'Exception' + - 'IllegalArgumentException' + - 'IllegalMonitorStateException' + - 'IllegalStateException' + - 'IndexOutOfBoundsException' + - 'NullPointerException' + - 'RuntimeException' + - 'Throwable' + ThrowingNewInstanceOfSameException: + active: true + TooGenericExceptionCaught: + active: true + excludes: ['**/test/**', '**/androidTest/**', '**/commonTest/**', '**/jvmTest/**', '**/androidUnitTest/**', '**/androidInstrumentedTest/**', '**/jsTest/**', '**/iosTest/**'] + exceptionNames: + - 'ArrayIndexOutOfBoundsException' + - 'Error' + - 'Exception' + - 'IllegalMonitorStateException' + - 'IndexOutOfBoundsException' + - 'NullPointerException' + - 'RuntimeException' + - 'Throwable' + allowedExceptionNameRegex: '_|(ignore|expected).*' + TooGenericExceptionThrown: + active: true + exceptionNames: + - 'Error' + - 'Exception' + - 'RuntimeException' + - 'Throwable' + +naming: + active: true + BooleanPropertyNaming: + active: false + allowedPattern: '^(is|has|are)' + ClassNaming: + active: true + classPattern: '[A-Z][a-zA-Z0-9]*' + ConstructorParameterNaming: + active: true + parameterPattern: '[a-z][A-Za-z0-9]*' + privateParameterPattern: '[a-z][A-Za-z0-9]*' + excludeClassPattern: '$^' + EnumNaming: + active: true + enumEntryPattern: '[A-Z][_a-zA-Z0-9]*' + ForbiddenClassName: + active: false + forbiddenName: [] + FunctionMaxLength: + active: false + maximumFunctionNameLength: 30 + FunctionMinLength: + active: false + minimumFunctionNameLength: 3 + FunctionNaming: + active: true + excludes: ['**/test/**', '**/androidTest/**', '**/commonTest/**', '**/jvmTest/**', '**/androidUnitTest/**', '**/androidInstrumentedTest/**', '**/jsTest/**', '**/iosTest/**'] + functionPattern: '[a-z][a-zA-Z0-9]*' + excludeClassPattern: '$^' + FunctionParameterNaming: + active: true + parameterPattern: '[a-z][A-Za-z0-9]*' + excludeClassPattern: '$^' + InvalidPackageDeclaration: + active: true + rootPackage: '' + requireRootInDeclaration: false + LambdaParameterNaming: + active: false + parameterPattern: '[a-z][A-Za-z0-9]*|_' + MatchingDeclarationName: + active: true + mustBeFirst: true + MemberNameEqualsClassName: + active: true + ignoreOverridden: true + NoNameShadowing: + active: true + NonBooleanPropertyPrefixedWithIs: + active: false + ObjectPropertyNaming: + active: true + constantPattern: '[A-Za-z][_A-Za-z0-9]*' + propertyPattern: '[A-Za-z][_A-Za-z0-9]*' + privatePropertyPattern: '(_)?[A-Za-z][_A-Za-z0-9]*' + PackageNaming: + active: true + packagePattern: '[a-z]+(\.[a-z][A-Za-z0-9]*)*' + TopLevelPropertyNaming: + active: true + constantPattern: '[A-Z][_A-Z0-9]*' + propertyPattern: '[A-Za-z][_A-Za-z0-9]*' + privatePropertyPattern: '_?[A-Za-z][_A-Za-z0-9]*' + VariableMaxLength: + active: false + maximumVariableNameLength: 64 + VariableMinLength: + active: false + minimumVariableNameLength: 1 + VariableNaming: + active: true + variablePattern: '[a-z][A-Za-z0-9]*' + privateVariablePattern: '(_)?[a-z][A-Za-z0-9]*' + excludeClassPattern: '$^' + +performance: + active: true + ArrayPrimitive: + active: true + CouldBeSequence: + active: false + threshold: 3 + ForEachOnRange: + active: true + excludes: ['**/test/**', '**/androidTest/**', '**/commonTest/**', '**/jvmTest/**', '**/androidUnitTest/**', '**/androidInstrumentedTest/**', '**/jsTest/**', '**/iosTest/**'] + SpreadOperator: + active: true + excludes: ['**/test/**', '**/androidTest/**', '**/commonTest/**', '**/jvmTest/**', '**/androidUnitTest/**', '**/androidInstrumentedTest/**', '**/jsTest/**', '**/iosTest/**'] + UnnecessaryPartOfBinaryExpression: + active: false + UnnecessaryTemporaryInstantiation: + active: true + +potential-bugs: + active: true + AvoidReferentialEquality: + active: true + forbiddenTypePatterns: + - 'kotlin.String' + CastNullableToNonNullableType: + active: false + CastToNullableType: + active: false + Deprecation: + active: false + DontDowncastCollectionTypes: + active: false + DoubleMutabilityForCollection: + active: true + mutableTypes: + - 'kotlin.collections.MutableList' + - 'kotlin.collections.MutableMap' + - 'kotlin.collections.MutableSet' + - 'java.util.ArrayList' + - 'java.util.LinkedHashSet' + - 'java.util.HashSet' + - 'java.util.LinkedHashMap' + - 'java.util.HashMap' + ElseCaseInsteadOfExhaustiveWhen: + active: false + ignoredSubjectTypes: [] + EqualsAlwaysReturnsTrueOrFalse: + active: true + EqualsWithHashCodeExist: + active: true + ExitOutsideMain: + active: false + ExplicitGarbageCollectionCall: + active: true + HasPlatformType: + active: true + IgnoredReturnValue: + active: true + restrictToConfig: true + returnValueAnnotations: + - 'CheckResult' + - '*.CheckResult' + - 'CheckReturnValue' + - '*.CheckReturnValue' + ignoreReturnValueAnnotations: + - 'CanIgnoreReturnValue' + - '*.CanIgnoreReturnValue' + returnValueTypes: + - 'kotlin.sequences.Sequence' + - 'kotlinx.coroutines.flow.*Flow' + - 'java.util.stream.*Stream' + ignoreFunctionCall: [] + ImplicitDefaultLocale: + active: true + ImplicitUnitReturnType: + active: false + allowExplicitReturnType: true + InvalidRange: + active: true + IteratorHasNextCallsNextMethod: + active: true + IteratorNotThrowingNoSuchElementException: + active: true + LateinitUsage: + active: false + excludes: ['**/test/**', '**/androidTest/**', '**/commonTest/**', '**/jvmTest/**', '**/androidUnitTest/**', '**/androidInstrumentedTest/**', '**/jsTest/**', '**/iosTest/**'] + ignoreOnClassesPattern: '' + MapGetWithNotNullAssertionOperator: + active: true + MissingPackageDeclaration: + active: false + excludes: ['**/*.kts'] + NullCheckOnMutableProperty: + active: false + NullableToStringCall: + active: false + PropertyUsedBeforeDeclaration: + active: false + UnconditionalJumpStatementInLoop: + active: false + UnnecessaryNotNullCheck: + active: false + UnnecessaryNotNullOperator: + active: true + UnnecessarySafeCall: + active: true + UnreachableCatchBlock: + active: true + UnreachableCode: + active: true + UnsafeCallOnNullableType: + active: true + excludes: ['**/test/**', '**/androidTest/**', '**/commonTest/**', '**/jvmTest/**', '**/androidUnitTest/**', '**/androidInstrumentedTest/**', '**/jsTest/**', '**/iosTest/**'] + UnsafeCast: + active: true + UnusedUnaryOperator: + active: true + UselessPostfixExpression: + active: true + WrongEqualsTypeParameter: + active: true + +style: + active: true + AlsoCouldBeApply: + active: false + BracesOnIfStatements: + active: false + singleLine: 'never' + multiLine: 'always' + BracesOnWhenStatements: + active: false + singleLine: 'necessary' + multiLine: 'consistent' + CanBeNonNullable: + active: false + CascadingCallWrapping: + active: false + includeElvis: true + ClassOrdering: + active: false + CollapsibleIfStatements: + active: false + DataClassContainsFunctions: + active: false + conversionFunctionPrefix: + - 'to' + allowOperators: false + DataClassShouldBeImmutable: + active: false + DestructuringDeclarationWithTooManyEntries: + active: true + maxDestructuringEntries: 3 + DoubleNegativeLambda: + active: false + negativeFunctions: + - reason: 'Use `takeIf` instead.' + value: 'takeUnless' + - reason: 'Use `all` instead.' + value: 'none' + negativeFunctionNameParts: + - 'not' + - 'non' + EqualsNullCall: + active: true + EqualsOnSignatureLine: + active: false + ExplicitCollectionElementAccessMethod: + active: false + ExplicitItLambdaParameter: + active: true + ExpressionBodySyntax: + active: false + includeLineWrapping: false + ForbiddenAnnotation: + active: false + annotations: + - reason: 'it is a java annotation. Use `Suppress` instead.' + value: 'java.lang.SuppressWarnings' + - reason: 'it is a java annotation. Use `kotlin.Deprecated` instead.' + value: 'java.lang.Deprecated' + - reason: 'it is a java annotation. Use `kotlin.annotation.MustBeDocumented` instead.' + value: 'java.lang.annotation.Documented' + - reason: 'it is a java annotation. Use `kotlin.annotation.Target` instead.' + value: 'java.lang.annotation.Target' + - reason: 'it is a java annotation. Use `kotlin.annotation.Retention` instead.' + value: 'java.lang.annotation.Retention' + - reason: 'it is a java annotation. Use `kotlin.annotation.Repeatable` instead.' + value: 'java.lang.annotation.Repeatable' + - reason: 'Kotlin does not support @Inherited annotation, see https://youtrack.jetbrains.com/issue/KT-22265' + value: 'java.lang.annotation.Inherited' + ForbiddenComment: + active: false + comments: + - reason: 'Forbidden FIXME todo marker in comment, please fix the problem.' + value: 'FIXME:' + - reason: 'Forbidden STOPSHIP todo marker in comment, please address the problem before shipping the code.' + value: 'STOPSHIP:' + allowedPatterns: '' + ForbiddenImport: + active: false + imports: [] + forbiddenPatterns: '' + ForbiddenMethodCall: + active: false + methods: + - reason: 'print does not allow you to configure the output stream. Use a logger instead.' + value: 'kotlin.io.print' + - reason: 'println does not allow you to configure the output stream. Use a logger instead.' + value: 'kotlin.io.println' + ForbiddenSuppress: + active: false + rules: [] + ForbiddenVoid: + active: true + ignoreOverridden: false + ignoreUsageInGenerics: false + FunctionOnlyReturningConstant: + active: true + ignoreOverridableFunction: true + ignoreActualFunction: true + excludedFunctions: [] + LoopWithTooManyJumpStatements: + active: true + maxJumpCount: 1 + MagicNumber: + active: true + excludes: ['**/test/**', '**/commonTest/**', '**/jvmTest/**', '**/*.kts'] + ignoreNumbers: + - '-1' + - '0' + - '1' + - '2' + ignoreHashCodeFunction: true + ignorePropertyDeclaration: false + ignoreLocalVariableDeclaration: false + ignoreConstantDeclaration: true + ignoreCompanionObjectPropertyDeclaration: true + ignoreAnnotation: false + ignoreNamedArgument: true + ignoreEnums: false + ignoreRanges: false + ignoreExtensionFunctions: true + MandatoryBracesLoops: + active: false + MaxChainedCallsOnSameLine: + active: false + maxChainedCalls: 5 + MaxLineLength: + active: true + maxLineLength: 120 + excludePackageStatements: true + excludeImportStatements: true + excludeCommentStatements: false + excludeRawStrings: true + MayBeConst: + active: true + ModifierOrder: + active: true + MultilineLambdaItParameter: + active: false + MultilineRawStringIndentation: + active: false + indentSize: 4 + trimmingMethods: + - 'trimIndent' + - 'trimMargin' + NestedClassesVisibility: + active: true + NewLineAtEndOfFile: + active: true + NoTabs: + active: false + NullableBooleanCheck: + active: false + ObjectLiteralToLambda: + active: true + OptionalAbstractKeyword: + active: true + OptionalUnit: + active: false + PreferToOverPairSyntax: + active: false + ProtectedMemberInFinalClass: + active: true + RedundantExplicitType: + active: false + RedundantHigherOrderMapUsage: + active: true + RedundantVisibilityModifierRule: + active: false + ReturnCount: + active: true + max: 2 + excludedFunctions: + - 'equals' + excludeLabeled: false + excludeReturnFromLambda: true + excludeGuardClauses: false + SafeCast: + active: true + SerialVersionUIDInSerializableClass: + active: true + SpacingBetweenPackageAndImports: + active: false + StringShouldBeRawString: + active: false + maxEscapedCharacterCount: 2 + ignoredCharacters: [] + ThrowsCount: + active: true + max: 2 + excludeGuardClauses: false + TrailingWhitespace: + active: false + TrimMultilineRawString: + active: false + trimmingMethods: + - 'trimIndent' + - 'trimMargin' + UnderscoresInNumericLiterals: + active: false + acceptableLength: 4 + allowNonStandardGrouping: false + UnnecessaryAbstractClass: + active: true + UnnecessaryAnnotationUseSiteTarget: + active: false + UnnecessaryApply: + active: true + UnnecessaryBackticks: + active: false + UnnecessaryBracesAroundTrailingLambda: + active: false + UnnecessaryFilter: + active: true + UnnecessaryInheritance: + active: true + UnnecessaryInnerClass: + active: false + UnnecessaryLet: + active: false + UnnecessaryParentheses: + active: false + allowForUnclearPrecedence: false + UntilInsteadOfRangeTo: + active: false + UnusedImports: + active: false + UnusedParameter: + active: true + allowedNames: 'ignored|expected' + UnusedPrivateClass: + active: true + UnusedPrivateMember: + active: true + allowedNames: '' + UnusedPrivateProperty: + active: true + allowedNames: '_|ignored|expected|serialVersionUID' + UseAnyOrNoneInsteadOfFind: + active: true + UseArrayLiteralsInAnnotations: + active: true + UseCheckNotNull: + active: true + UseCheckOrError: + active: true + UseDataClass: + active: false + allowVars: false + UseEmptyCounterpart: + active: false + UseIfEmptyOrIfBlank: + active: false + UseIfInsteadOfWhen: + active: false + ignoreWhenContainingVariableDeclaration: false + UseIsNullOrEmpty: + active: true + UseLet: + active: false + UseOrEmpty: + active: true + UseRequire: + active: true + UseRequireNotNull: + active: true + UseSumOfInsteadOfFlatMapSize: + active: false + UselessCallOnNotNull: + active: true + UtilityClassWithPublicConstructor: + active: true + VarCouldBeVal: + active: true + ignoreLateinitVar: false + WildcardImport: + active: true + excludeImports: + - 'java.util.*' From 5cdec99565bda3556f86eca120b84949ec0fa9ed Mon Sep 17 00:00:00 2001 From: MarianKijewski Date: Wed, 16 Apr 2025 17:05:03 +0200 Subject: [PATCH 03/16] fix: update Gradle version #WPB-17130 the newly added plugins require higher version --- gradle/wrapper/gradle-wrapper.jar | Bin 59203 -> 59536 bytes gradle/wrapper/gradle-wrapper.properties | 2 +- gradlew | 257 ++++++++++++++--------- 3 files changed, 154 insertions(+), 105 deletions(-) diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index e708b1c023ec8b20f512888fe07c5bd3ff77bb8f..7454180f2ae8848c63b8b4dea2cb829da983f2fa 100644 GIT binary patch delta 18435 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 B8dv}T delta 17845 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 X49Luk)baa85H9$5YCsTPT`SVRWMtMW diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index ffed3a2..d6e308a 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew index 4f906e0..1b6c787 100755 --- a/gradlew +++ b/gradlew @@ -1,7 +1,7 @@ -#!/usr/bin/env sh +#!/bin/sh # -# Copyright 2015 the original author or authors. +# Copyright © 2015-2021 the original authors. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -17,67 +17,101 @@ # ############################################################################## -## -## Gradle start up script for UN*X -## +# +# Gradle start up script for POSIX generated by Gradle. +# +# Important for running: +# +# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is +# noncompliant, but you have some other compliant shell such as ksh or +# bash, then to run this script, type that shell name before the whole +# command line, like: +# +# ksh Gradle +# +# Busybox and similar reduced shells will NOT work, because this script +# requires all of these POSIX shell features: +# * functions; +# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», +# «${var#prefix}», «${var%suffix}», and «$( cmd )»; +# * compound commands having a testable exit status, especially «case»; +# * various built-in commands including «command», «set», and «ulimit». +# +# Important for patching: +# +# (2) This script targets any POSIX shell, so it avoids extensions provided +# by Bash, Ksh, etc; in particular arrays are avoided. +# +# The "traditional" practice of packing multiple parameters into a +# space-separated string is a well documented source of bugs and security +# problems, so this is (mostly) avoided, by progressively accumulating +# options in "$@", and eventually passing that to Java. +# +# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, +# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; +# see the in-line comments for details. +# +# There are tweaks for specific operating systems such as AIX, CygWin, +# Darwin, MinGW, and NonStop. +# +# (3) This script is generated from the Groovy template +# https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# within the Gradle project. +# +# You can find Gradle at https://github.com/gradle/gradle/. +# ############################################################################## # Attempt to set APP_HOME + # Resolve links: $0 may be a link -PRG="$0" -# Need this for relative symlinks. -while [ -h "$PRG" ] ; do - ls=`ls -ld "$PRG"` - link=`expr "$ls" : '.*-> \(.*\)$'` - if expr "$link" : '/.*' > /dev/null; then - PRG="$link" - else - PRG=`dirname "$PRG"`"/$link" - fi +app_path=$0 + +# Need this for daisy-chained symlinks. +while + APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path + [ -h "$app_path" ] +do + ls=$( ls -ld "$app_path" ) + link=${ls#*' -> '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac done -SAVED="`pwd`" -cd "`dirname \"$PRG\"`/" >/dev/null -APP_HOME="`pwd -P`" -cd "$SAVED" >/dev/null + +APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit APP_NAME="Gradle" -APP_BASE_NAME=`basename "$0"` +APP_BASE_NAME=${0##*/} # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' # Use the maximum available, or set MAX_FD != -1 to use that value. -MAX_FD="maximum" +MAX_FD=maximum warn () { echo "$*" -} +} >&2 die () { echo echo "$*" echo exit 1 -} +} >&2 # OS specific support (must be 'true' or 'false'). cygwin=false msys=false darwin=false nonstop=false -case "`uname`" in - CYGWIN* ) - cygwin=true - ;; - Darwin* ) - darwin=true - ;; - MINGW* ) - msys=true - ;; - NONSTOP* ) - nonstop=true - ;; +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; esac CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar @@ -87,9 +121,9 @@ CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar if [ -n "$JAVA_HOME" ] ; then if [ -x "$JAVA_HOME/jre/sh/java" ] ; then # IBM's JDK on AIX uses strange locations for the executables - JAVACMD="$JAVA_HOME/jre/sh/java" + JAVACMD=$JAVA_HOME/jre/sh/java else - JAVACMD="$JAVA_HOME/bin/java" + JAVACMD=$JAVA_HOME/bin/java fi if [ ! -x "$JAVACMD" ] ; then die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME @@ -98,7 +132,7 @@ Please set the JAVA_HOME variable in your environment to match the location of your Java installation." fi else - JAVACMD="java" + JAVACMD=java which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. Please set the JAVA_HOME variable in your environment to match the @@ -106,80 +140,95 @@ location of your Java installation." fi # Increase the maximum file descriptors if we can. -if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then - MAX_FD_LIMIT=`ulimit -H -n` - if [ $? -eq 0 ] ; then - if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then - MAX_FD="$MAX_FD_LIMIT" - fi - ulimit -n $MAX_FD - if [ $? -ne 0 ] ; then - warn "Could not set maximum file descriptor limit: $MAX_FD" - fi - else - warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" - fi +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" + esac fi -# For Darwin, add options to specify how the application appears in the dock -if $darwin; then - GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" -fi +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. # For Cygwin or MSYS, switch paths to Windows format before running java -if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then - APP_HOME=`cygpath --path --mixed "$APP_HOME"` - CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` - - JAVACMD=`cygpath --unix "$JAVACMD"` - - # We build the pattern for arguments to be converted via cygpath - ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` - SEP="" - for dir in $ROOTDIRSRAW ; do - ROOTDIRS="$ROOTDIRS$SEP$dir" - SEP="|" - done - OURCYGPATTERN="(^($ROOTDIRS))" - # Add a user-defined pattern to the cygpath arguments - if [ "$GRADLE_CYGPATTERN" != "" ] ; then - OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" - fi +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) + # Now convert the arguments - kludge to limit ourselves to /bin/sh - i=0 - for arg in "$@" ; do - CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` - CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option - - if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition - eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` - else - eval `echo args$i`="\"$arg\"" + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) fi - i=`expr $i + 1` + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg done - case $i in - 0) set -- ;; - 1) set -- "$args0" ;; - 2) set -- "$args0" "$args1" ;; - 3) set -- "$args0" "$args1" "$args2" ;; - 4) set -- "$args0" "$args1" "$args2" "$args3" ;; - 5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; - 6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; - 7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; - 8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; - 9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; - esac fi -# Escape application args -save () { - for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done - echo " " -} -APP_ARGS=`save "$@"` +# Collect all arguments for the java command; +# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of +# shell script including quotes and variable substitutions, so put them in +# double quotes to make sure that they get re-expanded; and +# * put everything else in single quotes, so that it's not re-expanded. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + org.gradle.wrapper.GradleWrapperMain \ + "$@" + +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# -# Collect all arguments for the java command, following the shell quoting and substitution rules -eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' exec "$JAVACMD" "$@" From 628610c9970b716b08922d363c57dc5cebbcb117 Mon Sep 17 00:00:00 2001 From: MarianKijewski Date: Wed, 16 Apr 2025 17:07:19 +0200 Subject: [PATCH 04/16] CODEOWNERS --- .github/CODEOWNERS | 1 + 1 file changed, 1 insertion(+) create mode 100644 .github/CODEOWNERS diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS new file mode 100644 index 0000000..42a03ab --- /dev/null +++ b/.github/CODEOWNERS @@ -0,0 +1 @@ +* @wireapp/integrations \ No newline at end of file From 76632e3d78423636d803d39b3f216d4fe7be5eeb Mon Sep 17 00:00:00 2001 From: MarianKijewski Date: Thu, 17 Apr 2025 14:04:33 +0200 Subject: [PATCH 05/16] fix: remove deprecated kotlinOptions #WPB-17130 --- build.gradle.kts | 61 ++++++++++++++++++------------------------------ 1 file changed, 23 insertions(+), 38 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 9ffc896..1f276fe 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -98,48 +98,33 @@ detekt { source.setFrom("src/main/kotlin") } -tasks { - val jvmTarget = "1.8" - compileKotlin { - kotlinOptions.jvmTarget = jvmTarget - } - compileJava { - targetCompatibility = jvmTarget - } - compileTestKotlin { - kotlinOptions.jvmTarget = jvmTarget - } - compileTestJava { - targetCompatibility = jvmTarget - } +kotlin { + jvmToolchain(17) +} - distTar { - archiveFileName.set("app.tar") - } +tasks.distTar { + archiveFileName.set("app.tar") +} - withType { - useJUnitPlatform() - } +tasks.test { + useJUnitPlatform() +} - register("fatJar") { - manifest { - attributes["Main-Class"] = mClass - } - duplicatesStrategy = DuplicatesStrategy.EXCLUDE - archiveFileName.set("polls.jar") - from(configurations.runtimeClasspath.get().map { if (it.isDirectory) it else zipTree(it) }) - from(sourceSets.main.get().output) +tasks.register("fatJar") { + manifest { + attributes["Main-Class"] = mClass } + duplicatesStrategy = DuplicatesStrategy.EXCLUDE + archiveFileName.set("polls.jar") + from(configurations.runtimeClasspath.get().map { if (it.isDirectory) it else zipTree(it) }) + from(sourceSets.main.get().output) +} - register("resolveDependencies") { - doLast { - project.allprojects.forEach { subProject -> - with(subProject) { - buildscript.configurations.forEach { if (it.isCanBeResolved) it.resolve() } - configurations.compileClasspath.get().resolve() - configurations.testCompileClasspath.get().resolve() - } - } - } + +tasks.register("resolveDependencies") { + doLast { + buildscript.configurations.forEach { if (it.isCanBeResolved) it.resolve() } + configurations.compileClasspath.get().resolve() + configurations.testCompileClasspath.get().resolve() } } From 67e52f9694b68c7f77c17ed4ab58cc295af7d62c Mon Sep 17 00:00:00 2001 From: MarianKijewski Date: Thu, 17 Apr 2025 14:11:50 +0200 Subject: [PATCH 06/16] refactor: apply automatic linter #WPB-17130 --- build.gradle.kts | 1 - settings.gradle.kts | 1 - .../com/wire/bots/polls/dao/DatabaseSetup.kt | 16 +-- .../com/wire/bots/polls/dao/PollOptions.kt | 1 - .../com/wire/bots/polls/dao/PollRepository.kt | 126 +++++++++-------- .../kotlin/com/wire/bots/polls/dao/Polls.kt | 2 - .../com/wire/bots/polls/dto/PollAction.kt | 6 +- .../com/wire/bots/polls/dto/UsersInput.kt | 2 +- .../com/wire/bots/polls/dto/bot/BotMessage.kt | 1 - .../com/wire/bots/polls/dto/bot/Factories.kt | 82 +++++++---- .../com/wire/bots/polls/dto/bot/NewPoll.kt | 1 - .../com/wire/bots/polls/dto/bot/PollVote.kt | 1 - .../com/wire/bots/polls/dto/roman/Message.kt | 23 +--- .../com/wire/bots/polls/parser/InputParser.kt | 7 +- .../com/wire/bots/polls/parser/PollFactory.kt | 8 +- .../wire/bots/polls/parser/PollValidation.kt | 21 ++- .../wire/bots/polls/services/AuthService.kt | 12 +- .../polls/services/ConversationService.kt | 6 +- .../polls/services/MessagesHandlingService.kt | 94 ++++++++++--- .../wire/bots/polls/services/PollService.kt | 127 ++++++++++++------ .../bots/polls/services/ProxySenderService.kt | 50 ++++--- .../polls/services/StatsFormattingService.kt | 40 ++++-- .../services/UserCommunicationService.kt | 4 +- .../setup/ConfigurationDependencyInjection.kt | 7 +- .../bots/polls/setup/DependencyInjection.kt | 19 ++- .../wire/bots/polls/setup/KtorInstallation.kt | 15 ++- .../polls/setup/errors/ExceptionHandling.kt | 9 +- .../polls/setup/logging/JsonLoggingLayout.kt | 20 +-- .../bots/polls/utils/ClientRequestMetric.kt | 29 ++-- .../com/wire/bots/polls/utils/Extensions.kt | 14 +- .../bots/polls/utils/PrometheusExtensions.kt | 15 ++- 31 files changed, 485 insertions(+), 275 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 1f276fe..87db778 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -120,7 +120,6 @@ tasks.register("fatJar") { from(sourceSets.main.get().output) } - tasks.register("resolveDependencies") { doLast { buildscript.configurations.forEach { if (it.isCanBeResolved) it.resolve() } diff --git a/settings.gradle.kts b/settings.gradle.kts index a3ce49f..7e45544 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -1,2 +1 @@ rootProject.name = "polls" - diff --git a/src/main/kotlin/com/wire/bots/polls/dao/DatabaseSetup.kt b/src/main/kotlin/com/wire/bots/polls/dao/DatabaseSetup.kt index 89c99aa..4ad7026 100644 --- a/src/main/kotlin/com/wire/bots/polls/dao/DatabaseSetup.kt +++ b/src/main/kotlin/com/wire/bots/polls/dao/DatabaseSetup.kt @@ -8,7 +8,6 @@ import org.jetbrains.exposed.sql.transactions.transaction * Object with methods for managing the database. */ object DatabaseSetup { - /** * Connect bot to the database via provided credentials. * @@ -25,11 +24,12 @@ object DatabaseSetup { /** * Returns true if the bot is connected to database */ - fun isConnected() = runCatching { - // execute simple query to verify whether the db is connected - // if the transaction throws exception, database is not connected - transaction { - this.connection.isClosed - } - }.isSuccess + fun isConnected() = + runCatching { + // execute simple query to verify whether the db is connected + // if the transaction throws exception, database is not connected + transaction { + this.connection.isClosed + } + }.isSuccess } diff --git a/src/main/kotlin/com/wire/bots/polls/dao/PollOptions.kt b/src/main/kotlin/com/wire/bots/polls/dao/PollOptions.kt index d68db3f..f42561b 100644 --- a/src/main/kotlin/com/wire/bots/polls/dao/PollOptions.kt +++ b/src/main/kotlin/com/wire/bots/polls/dao/PollOptions.kt @@ -7,7 +7,6 @@ import org.jetbrains.exposed.sql.Table * Poll options. */ object PollOptions : Table("poll_option") { - /** * Id of the poll this option is for. UUID. */ diff --git a/src/main/kotlin/com/wire/bots/polls/dao/PollRepository.kt b/src/main/kotlin/com/wire/bots/polls/dao/PollRepository.kt index 0df80d7..74fe043 100644 --- a/src/main/kotlin/com/wire/bots/polls/dao/PollRepository.kt +++ b/src/main/kotlin/com/wire/bots/polls/dao/PollRepository.kt @@ -19,14 +19,18 @@ import pw.forst.katlib.mapToSet * Simple repository for handling database transactions on one place. */ class PollRepository { - private companion object : KLogging() /** * Saves given poll to database and returns its id (same as the [pollId] parameter, * but this design supports fluent style in the services. */ - suspend fun savePoll(poll: PollDto, pollId: String, userId: String, botSelfId: String) = newSuspendedTransaction { + suspend fun savePoll( + poll: PollDto, + pollId: String, + userId: String, + botSelfId: String + ) = newSuspendedTransaction { Polls.insert { it[id] = pollId it[ownerId] = userId @@ -56,78 +60,90 @@ class PollRepository { /** * Returns question for given poll Id. If the poll does not exist, null is returned. */ - suspend fun getPollQuestion(pollId: String) = newSuspendedTransaction { - (Polls leftJoin Mentions) - .select { Polls.id eq pollId } - .groupBy( - { it[Polls.body] }, - { - if (it.getOrNull(Mentions.userId) != null) { - Mention( - userId = it[Mentions.userId], - offset = it[Mentions.offset], - length = it[Mentions.length] - ) - } else { - null + suspend fun getPollQuestion(pollId: String) = + newSuspendedTransaction { + (Polls leftJoin Mentions) + .select { Polls.id eq pollId } + .groupBy( + { it[Polls.body] }, + { + if (it.getOrNull(Mentions.userId) != null) { + Mention( + userId = it[Mentions.userId], + offset = it[Mentions.offset], + length = it[Mentions.length] + ) + } else { + null + } } - } - ).map { (pollBody, mentions) -> - Question(body = pollBody, mentions = mentions.filterNotNull()) - }.singleOrNull() - } + ).map { (pollBody, mentions) -> + Question(body = pollBody, mentions = mentions.filterNotNull()) + }.singleOrNull() + } /** * Register new vote to the poll. If the poll with provided pollId does not exist, * database contains foreign key to an option and poll so the SQL exception is thrown. */ - suspend fun vote(pollAction: PollAction) = newSuspendedTransaction { - Votes.insertOrUpdate(Votes.pollId, Votes.userId) { - it[pollId] = pollAction.pollId - it[pollOption] = pollAction.optionId - it[userId] = pollAction.userId + suspend fun vote(pollAction: PollAction) = + newSuspendedTransaction { + Votes.insertOrUpdate(Votes.pollId, Votes.userId) { + it[pollId] = pollAction.pollId + it[pollOption] = pollAction.optionId + it[userId] = pollAction.userId + } } - } /** * Retrieves stats for given pollId. * * Offset/option/button content as keys and count of the votes as values. */ - suspend fun stats(pollId: String) = newSuspendedTransaction { - PollOptions.join(Votes, JoinType.LEFT, - additionalConstraint = { - (Votes.pollId eq PollOptions.pollId) and (Votes.pollOption eq PollOptions.optionOrder) - } - ).slice(PollOptions.optionOrder, PollOptions.optionContent, Votes.userId) - .select { PollOptions.pollId eq pollId } - // left join so userId can be null - .groupBy({ it[PollOptions.optionOrder] to it[PollOptions.optionContent] }, { it.getOrNull(Votes.userId) }) - .mapValues { (_, votingUsers) -> votingUsers.count { !it.isNullOrBlank() } } - } + suspend fun stats(pollId: String) = + newSuspendedTransaction { + PollOptions + .join( + Votes, + JoinType.LEFT, + additionalConstraint = { + (Votes.pollId eq PollOptions.pollId) and + (Votes.pollOption eq PollOptions.optionOrder) + } + ).slice(PollOptions.optionOrder, PollOptions.optionContent, Votes.userId) + .select { PollOptions.pollId eq pollId } + // left join so userId can be null + .groupBy({ + it[PollOptions.optionOrder] to it[PollOptions.optionContent] + }, { it.getOrNull(Votes.userId) }) + .mapValues { (_, votingUsers) -> votingUsers.count { !it.isNullOrBlank() } } + } /** * Returns set of user ids that voted in the poll with given pollId. */ - suspend fun votingUsers(pollId: String) = newSuspendedTransaction { - Votes - .slice(Votes.userId) - .select { Votes.pollId eq pollId } - .mapToSet { it[Votes.userId] } - } + suspend fun votingUsers(pollId: String) = + newSuspendedTransaction { + Votes + .slice(Votes.userId) + .select { Votes.pollId eq pollId } + .mapToSet { it[Votes.userId] } + } /** * Returns set of user ids that voted in the poll with given pollId. */ - suspend fun getLatestForBot(botId: String) = newSuspendedTransaction { - Polls.slice(Polls.id) - // it must be for single bot - .select { Polls.botId eq botId } - // such as latest is on top - .orderBy(Polls.created to SortOrder.DESC) - // select just one - .limit(1) - .singleOrNull() - ?.get(Polls.id) - } + suspend fun getLatestForBot(botId: String) = + newSuspendedTransaction { + Polls + .slice(Polls.id) + // it must be for single bot + .select { Polls.botId eq botId } + // such as latest is on top + .orderBy(Polls.created to SortOrder.DESC) + // select just one + .limit(1) + .singleOrNull() + ?.get(Polls.id) + } } diff --git a/src/main/kotlin/com/wire/bots/polls/dao/Polls.kt b/src/main/kotlin/com/wire/bots/polls/dao/Polls.kt index 049e23c..894b5b1 100644 --- a/src/main/kotlin/com/wire/bots/polls/dao/Polls.kt +++ b/src/main/kotlin/com/wire/bots/polls/dao/Polls.kt @@ -19,13 +19,11 @@ object Polls : Table("polls") { */ val ownerId: Column = varchar("owner_id", 36) - /** * Id of the bot that created this poll. UUID. */ val botId: Column = varchar("bot_id", 36) - /** * Determines whether is the pool active and whether new votes should be accepted. */ diff --git a/src/main/kotlin/com/wire/bots/polls/dto/PollAction.kt b/src/main/kotlin/com/wire/bots/polls/dto/PollAction.kt index 5e0695a..dad595b 100644 --- a/src/main/kotlin/com/wire/bots/polls/dto/PollAction.kt +++ b/src/main/kotlin/com/wire/bots/polls/dto/PollAction.kt @@ -3,4 +3,8 @@ package com.wire.bots.polls.dto /** * Represents poll vote from the user. */ -data class PollAction(val pollId: String, val optionId: Int, val userId: String) +data class PollAction( + val pollId: String, + val optionId: Int, + val userId: String +) diff --git a/src/main/kotlin/com/wire/bots/polls/dto/UsersInput.kt b/src/main/kotlin/com/wire/bots/polls/dto/UsersInput.kt index cd91fde..2939d20 100644 --- a/src/main/kotlin/com/wire/bots/polls/dto/UsersInput.kt +++ b/src/main/kotlin/com/wire/bots/polls/dto/UsersInput.kt @@ -21,6 +21,6 @@ data class UsersInput( */ val mentions: List ) { - //TODO modify this in the future - because we do not want to print decrypted users text to the log + // TODO modify this in the future - because we do not want to print decrypted users text to the log override fun toString(): String = "User: $userId wrote $input" } diff --git a/src/main/kotlin/com/wire/bots/polls/dto/bot/BotMessage.kt b/src/main/kotlin/com/wire/bots/polls/dto/bot/BotMessage.kt index 9ca6c09..cdd08d3 100644 --- a/src/main/kotlin/com/wire/bots/polls/dto/bot/BotMessage.kt +++ b/src/main/kotlin/com/wire/bots/polls/dto/bot/BotMessage.kt @@ -9,4 +9,3 @@ interface BotMessage { */ val type: String } - diff --git a/src/main/kotlin/com/wire/bots/polls/dto/bot/Factories.kt b/src/main/kotlin/com/wire/bots/polls/dto/bot/Factories.kt index 23233d1..6af14ea 100644 --- a/src/main/kotlin/com/wire/bots/polls/dto/bot/Factories.kt +++ b/src/main/kotlin/com/wire/bots/polls/dto/bot/Factories.kt @@ -3,67 +3,97 @@ package com.wire.bots.polls.dto.bot import com.wire.bots.polls.dto.common.Mention import com.wire.bots.polls.dto.common.Text - /** * Creates message for poll. */ -fun newPoll(id: String, body: String, buttons: List, mentions: List = emptyList()): BotMessage = NewPoll( - text = Text(body, mentions), - poll = NewPoll.Poll( - id = id, - buttons = buttons +fun newPoll( + id: String, + body: String, + buttons: List, + mentions: List = emptyList() +): BotMessage = + NewPoll( + text = Text(body, mentions), + poll = NewPoll.Poll( + id = id, + buttons = buttons + ) ) -) /** * Creates message for vote confirmation. */ -fun confirmVote(pollId: String, userId: String, offset: Int): BotMessage = PollVote( - poll = PollVote.Poll( - id = pollId, - userId = userId, - offset = offset +fun confirmVote( + pollId: String, + userId: String, + offset: Int +): BotMessage = + PollVote( + poll = PollVote.Poll( + id = pollId, + userId = userId, + offset = offset + ) ) -) - /** * Creates message which greets the users in the conversation. */ -fun greeting(text: String, mentions: List = emptyList()): BotMessage = text(text, mentions) - +fun greeting( + text: String, + mentions: List = emptyList() +): BotMessage = text(text, mentions) /** * Creates stats (result of the poll) message. */ -fun statsMessage(text: String, mentions: List = emptyList()): BotMessage = text(text, mentions) +fun statsMessage( + text: String, + mentions: List = emptyList() +): BotMessage = text(text, mentions) /** * Creates message notifying user about wrongly used command. */ -fun fallBackMessage(text: String, mentions: List = emptyList()): BotMessage = text(text, mentions) +fun fallBackMessage( + text: String, + mentions: List = emptyList() +): BotMessage = text(text, mentions) /** * Creates good bot message. */ -fun goodBotMessage(text: String, mentions: List = emptyList()): BotMessage = text(text, mentions) +fun goodBotMessage( + text: String, + mentions: List = emptyList() +): BotMessage = text(text, mentions) /** * Creates version message. */ -fun versionMessage(text: String, mentions: List = emptyList()): BotMessage = text(text, mentions) +fun versionMessage( + text: String, + mentions: List = emptyList() +): BotMessage = text(text, mentions) /** * Creates message with help. */ -fun helpMessage(text: String, mentions: List = emptyList()): BotMessage = text(text, mentions) +fun helpMessage( + text: String, + mentions: List = emptyList() +): BotMessage = text(text, mentions) /** * Creates text message. */ -private fun text(text: String, mentions: List): BotMessage = TextMessage( - text = Text( - data = text, - mentions = mentions +private fun text( + text: String, + mentions: List +): BotMessage = + TextMessage( + text = Text( + data = text, + mentions = mentions + ) ) -) diff --git a/src/main/kotlin/com/wire/bots/polls/dto/bot/NewPoll.kt b/src/main/kotlin/com/wire/bots/polls/dto/bot/NewPoll.kt index 275832d..5f16f18 100644 --- a/src/main/kotlin/com/wire/bots/polls/dto/bot/NewPoll.kt +++ b/src/main/kotlin/com/wire/bots/polls/dto/bot/NewPoll.kt @@ -7,7 +7,6 @@ internal data class NewPoll( val poll: Poll, override val type: String = "poll" ) : BotMessage { - internal data class Poll( val id: String, val buttons: List, diff --git a/src/main/kotlin/com/wire/bots/polls/dto/bot/PollVote.kt b/src/main/kotlin/com/wire/bots/polls/dto/bot/PollVote.kt index 767dfd0..f906abb 100644 --- a/src/main/kotlin/com/wire/bots/polls/dto/bot/PollVote.kt +++ b/src/main/kotlin/com/wire/bots/polls/dto/bot/PollVote.kt @@ -4,7 +4,6 @@ internal data class PollVote( val poll: Poll, override val type: String = "poll" ) : BotMessage { - internal data class Poll( val id: String, val offset: Int, diff --git a/src/main/kotlin/com/wire/bots/polls/dto/roman/Message.kt b/src/main/kotlin/com/wire/bots/polls/dto/roman/Message.kt index b93b0e7..b098089 100644 --- a/src/main/kotlin/com/wire/bots/polls/dto/roman/Message.kt +++ b/src/main/kotlin/com/wire/bots/polls/dto/roman/Message.kt @@ -18,12 +18,10 @@ data class Message( * User who sent a message. */ val userId: String?, - /** * Id of the conversation. */ val conversationId: String?, - /** * Type of the message. */ @@ -64,21 +62,16 @@ data class Message( * Poll object. */ val poll: PollObjectMessage?, - /** * Type of the file */ - val mimeType: String?, - + val mimeType: String? ) { data class Text( val data: String, val mentions: List? - ) { - override fun toString(): String { - return "Text(mentions=$mentions)" - } + override fun toString(): String = "Text(mentions=$mentions)" } /** @@ -93,28 +86,24 @@ data class Message( * Body of the poll - the question. */ val body: String?, - /** * Ordered list of buttons. Position in the list is the ID / offset. */ val buttons: List?, - /** * Id of the button when it was clicked on. */ val offset: Int? ) { - override fun toString(): String { - return "PollObjectMessage(id='$id', buttons=$buttons, offset=$offset)" - } + override fun toString(): String = + "PollObjectMessage(id='$id', buttons=$buttons, offset=$offset)" } /** * Avoid printing out the token by mistake if object is printed. */ - override fun toString(): String { - return "Message(botId='$botId', userId=$userId, conversationId=$conversationId, type='$type', messageId=$messageId, text=$text, refMessageId=$refMessageId, reaction=$reaction, image=$image, handle=$handle, locale=$locale, poll=$poll, mimeType=$mimeType)" - } + override fun toString(): String = + "Message(botId='$botId', userId=$userId, conversationId=$conversationId, type='$type', messageId=$messageId, text=$text, refMessageId=$refMessageId, reaction=$reaction, image=$image, handle=$handle, locale=$locale, poll=$poll, mimeType=$mimeType)" } /* JSON from the swagger diff --git a/src/main/kotlin/com/wire/bots/polls/parser/InputParser.kt b/src/main/kotlin/com/wire/bots/polls/parser/InputParser.kt index c3a4771..7f1a737 100644 --- a/src/main/kotlin/com/wire/bots/polls/parser/InputParser.kt +++ b/src/main/kotlin/com/wire/bots/polls/parser/InputParser.kt @@ -7,7 +7,6 @@ import com.wire.bots.polls.dto.common.Mention import mu.KLogging class InputParser { - private companion object : KLogging() { val delimiters = charArrayOf('\"', '“') @@ -15,7 +14,7 @@ class InputParser { } fun parsePoll(userInput: UsersInput): PollDto? { - //TODO currently not supporting char " in the strings + // TODO currently not supporting char " in the strings val inputs = userInput.input .substringAfter("/poll", "") .substringBeforeLast("\"") @@ -37,10 +36,10 @@ class InputParser { ) } - private fun shiftMentions(usersInput: UsersInput): List { val delimiterIndex = usersInput.input.indexOfFirst { delimitersSet.contains(it) } - val emptyCharsInQuestion = usersInput.input.substringAfter(usersInput.input[delimiterIndex]) + val emptyCharsInQuestion = usersInput.input + .substringAfter(usersInput.input[delimiterIndex]) .takeWhile { it == ' ' } .count() diff --git a/src/main/kotlin/com/wire/bots/polls/parser/PollFactory.kt b/src/main/kotlin/com/wire/bots/polls/parser/PollFactory.kt index 6320c09..005fb78 100644 --- a/src/main/kotlin/com/wire/bots/polls/parser/PollFactory.kt +++ b/src/main/kotlin/com/wire/bots/polls/parser/PollFactory.kt @@ -9,8 +9,10 @@ import pw.forst.katlib.whenNull /** * Class used for creating the polls from the text. Parsing and creating the poll objects. */ -class PollFactory(private val inputParser: InputParser, private val pollValidation: PollValidation) { - +class PollFactory( + private val inputParser: InputParser, + private val pollValidation: PollValidation +) { private companion object : KLogging() /** @@ -29,7 +31,7 @@ class PollFactory(private val inputParser: InputParser, private val pollValidati } else { logger.warn { "It was not possible to create poll for user input: $usersInput due to errors listed bellow:" + - "$newLine${errors.joinToString(newLine)}" + "$newLine${errors.joinToString(newLine)}" } null } diff --git a/src/main/kotlin/com/wire/bots/polls/parser/PollValidation.kt b/src/main/kotlin/com/wire/bots/polls/parser/PollValidation.kt index 87e027b..96a6ae3 100644 --- a/src/main/kotlin/com/wire/bots/polls/parser/PollValidation.kt +++ b/src/main/kotlin/com/wire/bots/polls/parser/PollValidation.kt @@ -13,16 +13,22 @@ private typealias PollRule = (PollDto) -> String? * Class validating the polls. */ class PollValidation { - private companion object : KLogging() private val questionRules = - listOf { question -> if (question.body.isNotBlank()) null else "The question must not be empty!" } + listOf { question -> + if (question.body.isNotBlank()) null else "The question must not be empty!" + } - private val optionRules = listOf { option -> if (option.isNotBlank()) null else "The option must not be empty!" } + private val optionRules = + listOf { option -> + if (option.isNotBlank()) null else "The option must not be empty!" + } private val pollRules = - listOf { poll -> if (poll.options.isNotEmpty()) null else "There must be at least one option for answering the poll." } + listOf { poll -> + if (poll.options.isNotEmpty()) null else "There must be at least one option for answering the poll." + } /** * Validates given poll, returns pair when the boolean signalizes whether the poll is valid or not. @@ -34,6 +40,11 @@ class PollValidation { val questionValidation = questionRules.mapNotNull { it(poll.question) } val optionsValidation = optionRules.flatMap { poll.options.mapNotNull(it) } - return (pollValidation.isEmpty() && questionValidation.isEmpty() && optionsValidation.isEmpty()) to pollValidation + questionValidation + optionsValidation + return ( + pollValidation.isEmpty() && + questionValidation.isEmpty() && + optionsValidation.isEmpty() + ) to + pollValidation + questionValidation + optionsValidation } } diff --git a/src/main/kotlin/com/wire/bots/polls/services/AuthService.kt b/src/main/kotlin/com/wire/bots/polls/services/AuthService.kt index 4a364c0..84ee7fe 100644 --- a/src/main/kotlin/com/wire/bots/polls/services/AuthService.kt +++ b/src/main/kotlin/com/wire/bots/polls/services/AuthService.kt @@ -7,8 +7,9 @@ import pw.forst.katlib.whenNull /** * Authentication service. */ -class AuthService(private val proxyToken: String) { - +class AuthService( + private val proxyToken: String +) { private companion object : KLogging() { const val authHeader = "Authorization" const val bearerPrefix = "Bearer " @@ -17,7 +18,8 @@ class AuthService(private val proxyToken: String) { /** * Validates token. */ - fun isTokenValid(headersGet: () -> Headers) = runCatching { isTokenValid(headersGet()) }.getOrNull() ?: false + fun isTokenValid(headersGet: () -> Headers) = + runCatching { isTokenValid(headersGet()) }.getOrNull() ?: false private fun isTokenValid(headers: Headers): Boolean { val header = headers[authHeader].whenNull { @@ -26,6 +28,8 @@ class AuthService(private val proxyToken: String) { return if (!header.startsWith(bearerPrefix)) { false - } else header.substringAfter(bearerPrefix) == proxyToken + } else { + header.substringAfter(bearerPrefix) == proxyToken + } } } diff --git a/src/main/kotlin/com/wire/bots/polls/services/ConversationService.kt b/src/main/kotlin/com/wire/bots/polls/services/ConversationService.kt index 43076ff..7a21fc5 100644 --- a/src/main/kotlin/com/wire/bots/polls/services/ConversationService.kt +++ b/src/main/kotlin/com/wire/bots/polls/services/ConversationService.kt @@ -11,8 +11,10 @@ import mu.KLogging /** * Provides possibility to check the conversation details. */ -class ConversationService(private val client: HttpClient, config: ProxyConfiguration) { - +class ConversationService( + private val client: HttpClient, + config: ProxyConfiguration +) { private companion object : KLogging() { const val conversationPath = "/conversation" } diff --git a/src/main/kotlin/com/wire/bots/polls/services/MessagesHandlingService.kt b/src/main/kotlin/com/wire/bots/polls/services/MessagesHandlingService.kt index b821ed1..fc50667 100644 --- a/src/main/kotlin/com/wire/bots/polls/services/MessagesHandlingService.kt +++ b/src/main/kotlin/com/wire/bots/polls/services/MessagesHandlingService.kt @@ -10,7 +10,6 @@ class MessagesHandlingService( private val pollService: PollService, private val userCommunicationService: UserCommunicationService ) { - private companion object : KLogging() suspend fun handle(message: Message) { @@ -18,22 +17,35 @@ class MessagesHandlingService( logger.trace { "Message: $message" } val handled = when (message.type) { - "conversation.bot_request" -> false.also { logger.debug { "Bot was added to conversation." } } - "conversation.bot_removed" -> false.also { logger.debug { "Bot was removed from the conversation." } } + "conversation.bot_request" -> false.also { + logger.debug { "Bot was added to conversation." } + } + "conversation.bot_removed" -> false.also { + logger.debug { "Bot was removed from the conversation." } + } else -> { logger.debug { "Handling type: ${message.type}" } when { message.token != null -> tokenAwareHandle(message.token, message) - else -> false.also { logger.warn { "Proxy didn't send token along side the message with type ${message.type}. Message:$message" } } + else -> false.also { + logger.warn { + "Proxy didn't send token along side the message with type ${message.type}. Message:$message" + } + } } } } - logger.debug { if (handled) "Bot reacted to the message" else "Bot didn't react to the message." } + logger.debug { + if (handled) "Bot reacted to the message" else "Bot didn't react to the message." + } logger.debug { "Message handled." } } - private suspend fun tokenAwareHandle(token: String, message: Message): Boolean { + private suspend fun tokenAwareHandle( + token: String, + message: Message + ): Boolean { logger.debug { "Message contains token." } return runCatching { when (message.type) { @@ -46,35 +58,53 @@ class MessagesHandlingService( logger.debug { "New text message received." } handleText(token, message) } - "conversation.new_image" -> true.also { logger.debug { "New image posted to conversation, ignoring." } } + "conversation.new_image" -> true.also { + logger.debug { "New image posted to conversation, ignoring." } + } "conversation.reaction" -> { logger.debug { "Reaction message" } pollService.sendStats( token = token, - pollId = requireNotNull(message.refMessageId) { "Reaction must contain refMessageId" } + pollId = requireNotNull( + message.refMessageId + ) { "Reaction must contain refMessageId" } ) true } "conversation.poll.action" -> { - val poll = requireNotNull(message.poll) { "Reaction to a poll, poll object must be set!" } + val poll = + requireNotNull( + message.poll + ) { "Reaction to a poll, poll object must be set!" } pollService.pollAction( token, PollAction( pollId = poll.id, - optionId = requireNotNull(poll.offset) { "Offset/Option id must be set!" }, - userId = requireNotNull(message.userId) { "UserId of user who sent the message must be set." } + optionId = requireNotNull( + poll.offset + ) { "Offset/Option id must be set!" }, + userId = requireNotNull( + message.userId + ) { "UserId of user who sent the message must be set." } ) ) true } - else -> false.also { logger.warn { "Unknown message type of ${message.type}. Ignoring." } } + else -> false.also { + logger.warn { "Unknown message type of ${message.type}. Ignoring." } + } } }.onFailure { - logger.error(it) { "Exception during handling the message: $message with token $token." } + logger.error( + it + ) { "Exception during handling the message: $message with token $token." } }.getOrThrow() } - private suspend fun handleText(token: String, message: Message): Boolean { + private suspend fun handleText( + token: String, + message: Message + ): Boolean { var handled = true fun ignore(reason: () -> String) { @@ -88,9 +118,16 @@ class MessagesHandlingService( // it is a reply on something refMessageId != null && text != null -> when { // request for stats - text.data.trim().startsWith("/stats") -> pollService.sendStats(token, refMessageId) + text.data.trim().startsWith( + "/stats" + ) -> pollService.sendStats(token, refMessageId) // integer vote where the text contains offset - text.data.trim().toIntOrNull() != null -> vote(token, userId, refMessageId, text.data) + text.data.trim().toIntOrNull() != null -> vote( + token, + userId, + refMessageId, + text.data + ) else -> ignore { "Ignoring the message as it is reply unrelated to the bot" } } // text message with just text @@ -99,11 +136,21 @@ class MessagesHandlingService( when { // poll request trimmed.startsWith("/poll") -> - pollService.createPoll(token, UsersInput(userId, trimmed, text.mentions ?: emptyList()), botId) + pollService.createPoll( + token, + UsersInput( + userId, + trimmed, + text.mentions ?: emptyList() + ), + botId + ) // stats request trimmed.startsWith("/stats") -> pollService.sendStatsForLatest(token, botId) // send version when asked - trimmed.startsWith("/version") -> userCommunicationService.sendVersion(token) + trimmed.startsWith( + "/version" + ) -> userCommunicationService.sendVersion(token) // send version when asked trimmed.startsWith("/help") -> userCommunicationService.sendHelp(token) // easter egg, good bot is good @@ -117,11 +164,18 @@ class MessagesHandlingService( return handled } - private suspend fun vote(token: String, userId: String, refMessageId: String, text: String) = pollService.pollAction( + private suspend fun vote( + token: String, + userId: String, + refMessageId: String, + text: String + ) = pollService.pollAction( token, PollAction( pollId = refMessageId, - optionId = requireNotNull(text.toIntOrNull()) { "Text message must be a valid integer." }, + optionId = requireNotNull( + text.toIntOrNull() + ) { "Text message must be a valid integer." }, userId = userId ) ) diff --git a/src/main/kotlin/com/wire/bots/polls/services/PollService.kt b/src/main/kotlin/com/wire/bots/polls/services/PollService.kt index b2b3109..d9c1724 100644 --- a/src/main/kotlin/com/wire/bots/polls/services/PollService.kt +++ b/src/main/kotlin/com/wire/bots/polls/services/PollService.kt @@ -22,74 +22,96 @@ class PollService( private val userCommunicationService: UserCommunicationService, private val statsFormattingService: StatsFormattingService ) { - private companion object : KLogging() /** * Create poll. */ - suspend fun createPoll(token: String, usersInput: UsersInput, botId: String): String? { - val poll = factory.forUserInput(usersInput) + suspend fun createPoll( + token: String, + usersInput: UsersInput, + botId: String + ): String? { + val poll = factory + .forUserInput(usersInput) .whenNull { logger.warn { "It was not possible to create poll." } pollNotParsedFallback(token, usersInput) } ?: return null - val pollId = repository.savePoll(poll, pollId = UUID.randomUUID().toString(), userId = usersInput.userId, botSelfId = botId) + val pollId = repository.savePoll( + poll, + pollId = UUID.randomUUID().toString(), + userId = usersInput.userId, + botSelfId = botId + ) logger.info { "Poll successfully created with id: $pollId" } - proxySenderService.send( - token, - message = newPoll( - id = pollId, - body = poll.question.body, - buttons = poll.options, - mentions = poll.question.mentions - ) - ).whenNull { - logger.error { "It was not possible to send the poll to the Roman!" } - }?.also { (messageId) -> - logger.info { "Poll successfully created with id: $messageId" } - } + proxySenderService + .send( + token, + message = newPoll( + id = pollId, + body = poll.question.body, + buttons = poll.options, + mentions = poll.question.mentions + ) + ).whenNull { + logger.error { "It was not possible to send the poll to the Roman!" } + }?.also { (messageId) -> + logger.info { "Poll successfully created with id: $messageId" } + } return pollId } - - private suspend fun pollNotParsedFallback(token: String, usersInput: UsersInput) { + private suspend fun pollNotParsedFallback( + token: String, + usersInput: UsersInput + ) { usersInput.input.startsWith("/poll").whenTrue { logger.info { "Command started with /poll, sending usage to user." } userCommunicationService.reactionToWrongCommand(token) } - } /** * Record that the user voted. */ - suspend fun pollAction(token: String, pollAction: PollAction) { + suspend fun pollAction( + token: String, + pollAction: PollAction + ) { logger.info { "User voted" } repository.vote(pollAction) logger.info { "Vote registered." } - proxySenderService.send( - token = token, - message = confirmVote( - pollId = pollAction.pollId, - offset = pollAction.optionId, - userId = pollAction.userId - ) - ).whenNull { - logger.error { "It was not possible to send response to vote." } - }?.also { (messageId) -> - logger.info { "Proxy received confirmation for vote under id: $messageId" } - sendStatsIfAllVoted(token, pollAction.pollId) - } + proxySenderService + .send( + token = token, + message = confirmVote( + pollId = pollAction.pollId, + offset = pollAction.optionId, + userId = pollAction.userId + ) + ).whenNull { + logger.error { "It was not possible to send response to vote." } + }?.also { (messageId) -> + logger.info { "Proxy received confirmation for vote under id: $messageId" } + sendStatsIfAllVoted(token, pollAction.pollId) + } } - private suspend fun sendStatsIfAllVoted(token: String, pollId: String) { - val conversationMembersCount = conversationService.getNumberOfConversationMembers(token) - .whenNull { logger.warn { "It was not possible to determine number of conversation members!" } } ?: return + private suspend fun sendStatsIfAllVoted( + token: String, + pollId: String + ) { + val conversationMembersCount = conversationService + .getNumberOfConversationMembers(token) + .whenNull { + logger.warn { "It was not possible to determine number of conversation members!" } + } + ?: return val votedSize = repository.votingUsers(pollId).size @@ -97,21 +119,35 @@ class PollService( logger.info { "All users voted, sending statistics to the conversation." } sendStats(token, pollId, conversationMembersCount) } else { - logger.info { "Users voted: $votedSize, members of conversation: $conversationMembersCount" } + logger.info { + "Users voted: $votedSize, members of conversation: $conversationMembersCount" + } } } /** * Sends statistics about the poll to the proxy. */ - suspend fun sendStats(token: String, pollId: String, conversationMembers: Int? = null) { + suspend fun sendStats( + token: String, + pollId: String, + conversationMembers: Int? = null + ) { logger.debug { "Sending stats for poll $pollId" } - val conversationMembersCount = conversationMembers ?: conversationService.getNumberOfConversationMembers(token) - .whenNull { logger.warn { "It was not possible to determine number of conversation members!" } } + val conversationMembersCount = + conversationMembers ?: conversationService + .getNumberOfConversationMembers(token) + .whenNull { + logger.warn { + "It was not possible to determine number of conversation members!" + } + } logger.debug { "Conversation members: $conversationMembersCount" } - val stats = statsFormattingService.formatStats(pollId, conversationMembersCount) - .whenNull { logger.warn { "It was not possible to format stats for poll $pollId" } } ?: return + val stats = statsFormattingService + .formatStats(pollId, conversationMembersCount) + .whenNull { logger.warn { "It was not possible to format stats for poll $pollId" } } + ?: return proxySenderService.send(token, stats) } @@ -119,7 +155,10 @@ class PollService( /** * Sends stats for latest poll. */ - suspend fun sendStatsForLatest(token: String, botId: String) { + suspend fun sendStatsForLatest( + token: String, + botId: String + ) { logger.debug { "Sending latest stats for bot $botId" } val latest = repository.getLatestForBot(botId).whenNull { diff --git a/src/main/kotlin/com/wire/bots/polls/services/ProxySenderService.kt b/src/main/kotlin/com/wire/bots/polls/services/ProxySenderService.kt index a500b75..372d452 100644 --- a/src/main/kotlin/com/wire/bots/polls/services/ProxySenderService.kt +++ b/src/main/kotlin/com/wire/bots/polls/services/ProxySenderService.kt @@ -20,8 +20,10 @@ import java.nio.charset.Charset /** * Service responsible for sending requests to the proxy service Roman. */ -class ProxySenderService(private val client: HttpClient, config: ProxyConfiguration) { - +class ProxySenderService( + private val client: HttpClient, + config: ProxyConfiguration +) { private companion object : KLogging() { const val conversationPath = "/conversation" } @@ -31,32 +33,40 @@ class ProxySenderService(private val client: HttpClient, config: ProxyConfigurat /** * Send given message with provided token. */ - suspend fun send(token: String, message: BotMessage): Response? { + suspend fun send( + token: String, + message: BotMessage + ): Response? { logger.debug { "Sending: ${createJson(message)}" } - return client.post(body = message) { - url(conversationEndpoint) - contentType(ContentType.Application.Json) - header("Authorization", "Bearer $token") - }.execute { - logger.debug { "Message sent." } - when { - it.status.isSuccess() -> { - it.receive().also { - logger.info { "Message sent successfully: message id: ${it.messageId}" } + return client + .post(body = message) { + url(conversationEndpoint) + contentType(ContentType.Application.Json) + header("Authorization", "Bearer $token") + }.execute { + logger.debug { "Message sent." } + when { + it.status.isSuccess() -> { + it.receive().also { + logger.info { "Message sent successfully: message id: ${it.messageId}" } + } + } + else -> { + val body = it.readText(Charset.defaultCharset()) + logger.error { + "Error in communication with proxy. Status: ${it.status}, body: $body." + } + null } - } - else -> { - val body = it.readText(Charset.defaultCharset()) - logger.error { "Error in communication with proxy. Status: ${it.status}, body: $body." } - null } } - } } } /** * Configuration used to connect to the proxy. */ -data class ProxyConfiguration(val baseUrl: String) +data class ProxyConfiguration( + val baseUrl: String +) diff --git a/src/main/kotlin/com/wire/bots/polls/services/StatsFormattingService.kt b/src/main/kotlin/com/wire/bots/polls/services/StatsFormattingService.kt index 2f65ac9..f4f07a8 100644 --- a/src/main/kotlin/com/wire/bots/polls/services/StatsFormattingService.kt +++ b/src/main/kotlin/com/wire/bots/polls/services/StatsFormattingService.kt @@ -24,7 +24,10 @@ class StatsFormattingService( * Prepares message with statistics about the poll to the proxy. * When conversationMembers is null, stats are formatted according to the max votes per option. */ - suspend fun formatStats(pollId: String, conversationMembers: Int?): BotMessage? { + suspend fun formatStats( + pollId: String, + conversationMembers: Int? + ): BotMessage? { val pollQuestion = repository.getPollQuestion(pollId).whenNull { logger.warn { "No poll $pollId exists." } } ?: return null @@ -39,7 +42,11 @@ class StatsFormattingService( val options = formatVotes(stats, conversationMembers) return statsMessage( text = "$title$newLine$options", - mentions = pollQuestion.mentions.map { it.copy(offset = it.offset + titlePrefix.length) } + mentions = pollQuestion.mentions.map { + it.copy( + offset = it.offset + titlePrefix.length + ) + } ) } @@ -63,9 +70,13 @@ class StatsFormattingService( * - ⬛⬛⬛ A (3) * - ⬜⬜⬜ B (1) */ - private fun formatVotes(stats: Map, Int>, conversationMembers: Int?): String { + private fun formatVotes( + stats: Map, Int>, + conversationMembers: Int? + ): String { // we can use assert as the result size is checked - val mostPopularOptionVoteCount = requireNotNull(stats.values.maxOrNull()) { "There were no stats!" } + val mostPopularOptionVoteCount = + requireNotNull(stats.values.maxOrNull()) { "There were no stats!" } val maximumSize = min( conversationMembers ?: Integer.MAX_VALUE, @@ -74,21 +85,33 @@ class StatsFormattingService( return stats .map { (option, votingUsers) -> - VotingOption(if (votingUsers == mostPopularOptionVoteCount) "**" else "*", option.second, votingUsers) + VotingOption( + if (votingUsers == + mostPopularOptionVoteCount + ) { + "**" + } else { + "*" + }, + option.second, + votingUsers + ) }.let { votes -> votes.joinToString(newLine) { it.toString(maximumSize) } } } private fun prepareTitle(body: String) = "$titlePrefix${body}\"*" - } /** * Class used for formatting voting objects. */ -private data class VotingOption(val style: String, val option: String, val votingUsers: Int) { - +private data class VotingOption( + val style: String, + val option: String, + val votingUsers: Int +) { private companion object { const val notVote = "⚪" const val vote = "🟢" @@ -100,4 +123,3 @@ private data class VotingOption(val style: String, val option: String, val votin return "$votes$missingVotes $style$option$style ($votingUsers)" } } - diff --git a/src/main/kotlin/com/wire/bots/polls/services/UserCommunicationService.kt b/src/main/kotlin/com/wire/bots/polls/services/UserCommunicationService.kt index b9dfe2f..c96f043 100644 --- a/src/main/kotlin/com/wire/bots/polls/services/UserCommunicationService.kt +++ b/src/main/kotlin/com/wire/bots/polls/services/UserCommunicationService.kt @@ -15,7 +15,6 @@ class UserCommunicationService( private val proxySenderService: ProxySenderService, private val version: String ) { - private companion object : KLogging() { const val usage = "To create poll please text: `/poll \"Question\" \"Option 1\" \"Option 2\"`. To display usage write `/help`" val commands = """ @@ -34,7 +33,8 @@ class UserCommunicationService( /** * Sends message with help. */ - suspend fun reactionToWrongCommand(token: String) = fallBackMessage("I couldn't recognize your command. $usage").send(token) + suspend fun reactionToWrongCommand(token: String) = + fallBackMessage("I couldn't recognize your command. $usage").send(token) /** * Sends message containing help diff --git a/src/main/kotlin/com/wire/bots/polls/setup/ConfigurationDependencyInjection.kt b/src/main/kotlin/com/wire/bots/polls/setup/ConfigurationDependencyInjection.kt index dd61764..cf61eed 100644 --- a/src/main/kotlin/com/wire/bots/polls/setup/ConfigurationDependencyInjection.kt +++ b/src/main/kotlin/com/wire/bots/polls/setup/ConfigurationDependencyInjection.kt @@ -17,11 +17,13 @@ import java.io.File private val logger = createLogger("EnvironmentLoaderLogger") -private fun getEnvOrLogDefault(env: String, defaultValue: String) = getEnv(env).whenNull { +private fun getEnvOrLogDefault( + env: String, + defaultValue: String +) = getEnv(env).whenNull { logger.warn { "Env variable $env not set! Using default value - $defaultValue" } } ?: defaultValue - @Suppress("SameParameterValue") // we don't care... private fun loadVersion(defaultVersion: String): String = runCatching { getEnv("RELEASE_FILE_PATH") @@ -34,7 +36,6 @@ private fun loadVersion(defaultVersion: String): String = runCatching { */ // TODO load all config from the file and then allow the replacement with env variables fun DI.MainBuilder.bindConfiguration() { - // The default values used in this configuration are for the local development. bind() with singleton { diff --git a/src/main/kotlin/com/wire/bots/polls/setup/DependencyInjection.kt b/src/main/kotlin/com/wire/bots/polls/setup/DependencyInjection.kt index 62b3e1a..b1a7d86 100644 --- a/src/main/kotlin/com/wire/bots/polls/setup/DependencyInjection.kt +++ b/src/main/kotlin/com/wire/bots/polls/setup/DependencyInjection.kt @@ -22,7 +22,6 @@ import org.kodein.di.instance import org.kodein.di.singleton fun DI.MainBuilder.configureContainer() { - bind() with singleton { PollValidation() } bind() with singleton { createHttpClient(instance()) } @@ -48,13 +47,25 @@ fun DI.MainBuilder.configureContainer() { bind() with singleton { PollRepository() } - bind() with singleton { PollService(instance(), instance(), instance(), instance(), instance(), instance()) } + bind() with + singleton { + PollService( + instance(), + instance(), + instance(), + instance(), + instance(), + instance() + ) + } - bind() with singleton { UserCommunicationService(instance(), instance("version")) } + bind() with + singleton { UserCommunicationService(instance(), instance("version")) } bind() with singleton { ConversationService(instance(), instance()) } - bind() with singleton { MessagesHandlingService(instance(), instance()) } + bind() with + singleton { MessagesHandlingService(instance(), instance()) } bind() with singleton { AuthService(proxyToken = instance("proxy-auth")) diff --git a/src/main/kotlin/com/wire/bots/polls/setup/KtorInstallation.kt b/src/main/kotlin/com/wire/bots/polls/setup/KtorInstallation.kt index ae91a62..e20ad35 100644 --- a/src/main/kotlin/com/wire/bots/polls/setup/KtorInstallation.kt +++ b/src/main/kotlin/com/wire/bots/polls/setup/KtorInstallation.kt @@ -23,7 +23,6 @@ import org.slf4j.event.Level import java.text.DateFormat import java.util.* - private val installationLogger = createLogger("ApplicationSetup") /** @@ -59,7 +58,9 @@ fun Application.connectDatabase() { migrateDatabase(dbConfig) } else { // TODO verify handling, maybe exit the App? - installationLogger.error { "It was not possible to connect to db database! The application will start but it won't work." } + installationLogger.error { + "It was not possible to connect to db database! The application will start but it won't work." + } } } @@ -75,8 +76,11 @@ fun migrateDatabase(dbConfig: DatabaseConfiguration) { .migrate() installationLogger.info { - if (migrateResult.migrationsExecuted == 0) "No migrations necessary." - else "Applied ${migrateResult.migrationsExecuted} migrations." + if (migrateResult.migrationsExecuted == 0) { + "No migrations necessary." + } else { + "Applied ${migrateResult.migrationsExecuted} migrations." + } } } @@ -125,7 +129,8 @@ fun Application.installFrameworks() { val prometheusRegistry by closestDI().instance() install(MicrometerMetrics) { registry = prometheusRegistry - distributionStatisticConfig = DistributionStatisticConfig.Builder() + distributionStatisticConfig = DistributionStatisticConfig + .Builder() .percentilesHistogram(true) .build() } diff --git a/src/main/kotlin/com/wire/bots/polls/setup/errors/ExceptionHandling.kt b/src/main/kotlin/com/wire/bots/polls/setup/errors/ExceptionHandling.kt index a34bba9..eff670a 100644 --- a/src/main/kotlin/com/wire/bots/polls/setup/errors/ExceptionHandling.kt +++ b/src/main/kotlin/com/wire/bots/polls/setup/errors/ExceptionHandling.kt @@ -26,13 +26,18 @@ fun Application.registerExceptionHandlers() { } exception { cause -> - logger.error(cause) { "Error in communication with Roman. Status: ${cause.status}, body: ${cause.body}." } + logger.error(cause) { + "Error in communication with Roman. Status: ${cause.status}, body: ${cause.body}." + } call.errorResponse(HttpStatusCode.ServiceUnavailable, cause.message) registry.countException(cause) } } } -suspend inline fun ApplicationCall.errorResponse(statusCode: HttpStatusCode, message: String?) { +suspend inline fun ApplicationCall.errorResponse( + statusCode: HttpStatusCode, + message: String? +) { respond(status = statusCode, message = mapOf("message" to (message ?: "No details specified"))) } diff --git a/src/main/kotlin/com/wire/bots/polls/setup/logging/JsonLoggingLayout.kt b/src/main/kotlin/com/wire/bots/polls/setup/logging/JsonLoggingLayout.kt index 2f476ae..e74efbb 100644 --- a/src/main/kotlin/com/wire/bots/polls/setup/logging/JsonLoggingLayout.kt +++ b/src/main/kotlin/com/wire/bots/polls/setup/logging/JsonLoggingLayout.kt @@ -1,6 +1,5 @@ package com.wire.bots.polls.setup.logging - import ch.qos.logback.classic.spi.ILoggingEvent import ch.qos.logback.classic.spi.IThrowableProxy import ch.qos.logback.classic.spi.ThrowableProxyUtil @@ -11,12 +10,10 @@ import java.time.Instant import java.time.ZoneOffset import java.time.format.DateTimeFormatter - /** * Layout logging into jsons. */ class JsonLoggingLayout : LayoutBase() { - private companion object { val dateTimeFormatter: DateTimeFormatter = DateTimeFormatter.ISO_DATE_TIME @@ -44,15 +41,20 @@ class JsonLoggingLayout : LayoutBase() { return createJson(finalMap) + CoreConstants.LINE_SEPARATOR } - private fun MutableMap.includeMdc(event: ILoggingEvent, mdcKey: String, mapKey: String = mdcKey) { + private fun MutableMap.includeMdc( + event: ILoggingEvent, + mdcKey: String, + mapKey: String = mdcKey + ) { event.mdcPropertyMap[mdcKey]?.also { mdcValue -> this[mapKey] = mdcValue } } - private fun exception(proxy: IThrowableProxy) = mapOf( - "message" to proxy.message, - "class" to proxy.className, - "stacktrace" to ThrowableProxyUtil.asString(proxy) - ) + private fun exception(proxy: IThrowableProxy) = + mapOf( + "message" to proxy.message, + "class" to proxy.className, + "stacktrace" to ThrowableProxyUtil.asString(proxy) + ) private fun formatTime(event: ILoggingEvent): String = dateTimeFormatter.format(Instant.ofEpochMilli(event.timeStamp)) diff --git a/src/main/kotlin/com/wire/bots/polls/utils/ClientRequestMetric.kt b/src/main/kotlin/com/wire/bots/polls/utils/ClientRequestMetric.kt index 0bd22f0..8369d23 100644 --- a/src/main/kotlin/com/wire/bots/polls/utils/ClientRequestMetric.kt +++ b/src/main/kotlin/com/wire/bots/polls/utils/ClientRequestMetric.kt @@ -13,12 +13,12 @@ import mu.KLogging */ typealias RequestMetricHandler = suspend (RequestMetric) -> Unit - /** * Enables callback after HttpClient sends a request with [RequestMetric]. */ -class ClientRequestMetric(private val metricHandler: RequestMetricHandler) { - +class ClientRequestMetric( + private val metricHandler: RequestMetricHandler +) { class Config { internal var metricHandler: RequestMetricHandler = {} @@ -31,14 +31,16 @@ class ClientRequestMetric(private val metricHandler: RequestMetricHandler) { } companion object Feature : HttpClientFeature, KLogging() { - override val key: AttributeKey = AttributeKey("ClientRequestMetric") override fun prepare(block: Config.() -> Unit) = ClientRequestMetric(Config().apply(block).metricHandler) - override fun install(feature: ClientRequestMetric, scope: HttpClient) { + override fun install( + feature: ClientRequestMetric, + scope: HttpClient + ) { // synchronous response pipeline hook // instead of ResponseObserver - which spawns a new coroutine scope.receivePipeline.intercept(HttpReceivePipeline.After) { response -> @@ -50,17 +52,17 @@ class ClientRequestMetric(private val metricHandler: RequestMetricHandler) { } // does not touch the content - private fun HttpResponse.toRequestMetric() = RequestMetric( - requestTime = requestTime.timestamp, - responseTime = responseTime.timestamp, - method = request.method.value, - url = request.url.toString(), - responseCode = status.value - ) + private fun HttpResponse.toRequestMetric() = + RequestMetric( + requestTime = requestTime.timestamp, + responseTime = responseTime.timestamp, + method = request.method.value, + url = request.url.toString(), + responseCode = status.value + ) } } - data class RequestMetric( // number of epoch milliseconds val requestTime: Long, @@ -69,4 +71,3 @@ data class RequestMetric( val url: String, val responseCode: Int ) - diff --git a/src/main/kotlin/com/wire/bots/polls/utils/Extensions.kt b/src/main/kotlin/com/wire/bots/polls/utils/Extensions.kt index 727a721..f5043b2 100644 --- a/src/main/kotlin/com/wire/bots/polls/utils/Extensions.kt +++ b/src/main/kotlin/com/wire/bots/polls/utils/Extensions.kt @@ -6,23 +6,29 @@ import org.slf4j.MDC /** * Creates URL from [this] as base and [path] as path */ -infix fun String.appendPath(path: String) = "${dropLastWhile { it == '/' }}/${path.dropWhile { it == '/' }}" +infix fun String.appendPath(path: String) = + "${dropLastWhile { it == '/' }}/${path.dropWhile { it == '/' }}" /** * Creates logger with given name. */ fun createLogger(name: String) = KLogging().logger("com.wire.$name") - /** * Includes value to current MDC under the key. */ -inline fun mdc(key: String, value: () -> String?) = mdc(key, value()) +inline fun mdc( + key: String, + value: () -> String? +) = mdc(key, value()) /** * Includes value to current MDC under the key if the key is not null. */ -fun mdc(key: String, value: String?) { +fun mdc( + key: String, + value: String? +) { if (value != null) { MDC.put(key, value) } diff --git a/src/main/kotlin/com/wire/bots/polls/utils/PrometheusExtensions.kt b/src/main/kotlin/com/wire/bots/polls/utils/PrometheusExtensions.kt index 95cc3b7..f62925d 100644 --- a/src/main/kotlin/com/wire/bots/polls/utils/PrometheusExtensions.kt +++ b/src/main/kotlin/com/wire/bots/polls/utils/PrometheusExtensions.kt @@ -7,7 +7,10 @@ import java.util.concurrent.TimeUnit /** * Registers exception in the prometheus metrics. */ -fun MeterRegistry.countException(exception: Throwable, additionalTags: Map = emptyMap()) { +fun MeterRegistry.countException( + exception: Throwable, + additionalTags: Map = emptyMap() +) { val baseTags = mapOf( "type" to exception.javaClass.name, "message" to (exception.message ?: "No message.") @@ -16,7 +19,6 @@ fun MeterRegistry.countException(exception: Throwable, additionalTags: Map.toTags() = - map { (key, value) -> Tag(key, value) } +private fun Map.toTags() = map { (key, value) -> Tag(key, value) } /** * Because original implementation is not handy. */ -private data class Tag(private val k: String, private val v: String) : Tag { +private data class Tag( + private val k: String, + private val v: String +) : Tag { override fun getKey(): String = k + override fun getValue(): String = v } From 3ae501c46e2960367f6387b614730a3e1deaa6a3 Mon Sep 17 00:00:00 2001 From: MarianKijewski Date: Thu, 17 Apr 2025 14:50:10 +0200 Subject: [PATCH 07/16] refactor: remove wildcard imports #WPB-17130 --- .../kotlin/com/wire/bots/polls/PollBot.kt | 6 +++--- .../wire/bots/polls/routing/MessagesRoute.kt | 11 +++++----- .../com/wire/bots/polls/routing/Routing.kt | 2 +- .../wire/bots/polls/routing/ServiceRoutes.kt | 10 ++++++---- .../wire/bots/polls/services/AuthService.kt | 2 +- .../polls/services/MessagesHandlingService.kt | 2 +- .../bots/polls/services/ProxySenderService.kt | 2 +- .../com/wire/bots/polls/setup/HttpClient.kt | 11 ++++++---- .../com/wire/bots/polls/setup/KodeinSetup.kt | 2 +- .../wire/bots/polls/setup/KtorInstallation.kt | 20 ++++++++++++------- .../polls/setup/errors/ExceptionHandling.kt | 11 ++++++---- .../bots/polls/setup/errors/Exceptions.kt | 2 +- .../bots/polls/utils/ClientRequestMetric.kt | 2 +- 13 files changed, 49 insertions(+), 34 deletions(-) diff --git a/src/main/kotlin/com/wire/bots/polls/PollBot.kt b/src/main/kotlin/com/wire/bots/polls/PollBot.kt index cf1f9fe..c982309 100644 --- a/src/main/kotlin/com/wire/bots/polls/PollBot.kt +++ b/src/main/kotlin/com/wire/bots/polls/PollBot.kt @@ -1,9 +1,9 @@ package com.wire.bots.polls import com.wire.bots.polls.setup.init -import io.ktor.application.* -import io.ktor.server.engine.* -import io.ktor.server.netty.* +import io.ktor.application.Application +import io.ktor.server.engine.embeddedServer +import io.ktor.server.netty.Netty fun main() { embeddedServer(Netty, 8080, module = Application::init).start() diff --git a/src/main/kotlin/com/wire/bots/polls/routing/MessagesRoute.kt b/src/main/kotlin/com/wire/bots/polls/routing/MessagesRoute.kt index 52db64d..b5d5ed2 100644 --- a/src/main/kotlin/com/wire/bots/polls/routing/MessagesRoute.kt +++ b/src/main/kotlin/com/wire/bots/polls/routing/MessagesRoute.kt @@ -5,11 +5,12 @@ import com.wire.bots.polls.services.AuthService import com.wire.bots.polls.services.MessagesHandlingService import com.wire.bots.polls.setup.logging.USER_ID import com.wire.bots.polls.utils.mdc -import io.ktor.application.* -import io.ktor.http.* -import io.ktor.request.* -import io.ktor.response.* -import io.ktor.routing.* +import io.ktor.application.call +import io.ktor.http.HttpStatusCode +import io.ktor.request.receive +import io.ktor.response.respond +import io.ktor.routing.Routing +import io.ktor.routing.post import org.kodein.di.instance import org.kodein.di.ktor.closestDI diff --git a/src/main/kotlin/com/wire/bots/polls/routing/Routing.kt b/src/main/kotlin/com/wire/bots/polls/routing/Routing.kt index f2bcde8..2ff9f08 100644 --- a/src/main/kotlin/com/wire/bots/polls/routing/Routing.kt +++ b/src/main/kotlin/com/wire/bots/polls/routing/Routing.kt @@ -1,7 +1,7 @@ package com.wire.bots.polls.routing import com.wire.bots.polls.utils.createLogger -import io.ktor.routing.* +import io.ktor.routing.Routing internal val routingLogger by lazy { createLogger("RoutingLogger") } diff --git a/src/main/kotlin/com/wire/bots/polls/routing/ServiceRoutes.kt b/src/main/kotlin/com/wire/bots/polls/routing/ServiceRoutes.kt index 17c8268..2d5dfc2 100644 --- a/src/main/kotlin/com/wire/bots/polls/routing/ServiceRoutes.kt +++ b/src/main/kotlin/com/wire/bots/polls/routing/ServiceRoutes.kt @@ -1,10 +1,12 @@ package com.wire.bots.polls.routing import com.wire.bots.polls.dao.DatabaseSetup -import io.ktor.application.* -import io.ktor.http.* -import io.ktor.response.* -import io.ktor.routing.* +import io.ktor.application.call +import io.ktor.http.HttpStatusCode +import io.ktor.response.respond +import io.ktor.routing.Routing +import io.ktor.routing.get +import io.ktor.response.respondTextWriter import io.micrometer.prometheus.PrometheusMeterRegistry import org.kodein.di.instance import org.kodein.di.ktor.closestDI diff --git a/src/main/kotlin/com/wire/bots/polls/services/AuthService.kt b/src/main/kotlin/com/wire/bots/polls/services/AuthService.kt index 84ee7fe..88be613 100644 --- a/src/main/kotlin/com/wire/bots/polls/services/AuthService.kt +++ b/src/main/kotlin/com/wire/bots/polls/services/AuthService.kt @@ -1,6 +1,6 @@ package com.wire.bots.polls.services -import io.ktor.http.* +import io.ktor.http.Headers import mu.KLogging import pw.forst.katlib.whenNull diff --git a/src/main/kotlin/com/wire/bots/polls/services/MessagesHandlingService.kt b/src/main/kotlin/com/wire/bots/polls/services/MessagesHandlingService.kt index fc50667..63be638 100644 --- a/src/main/kotlin/com/wire/bots/polls/services/MessagesHandlingService.kt +++ b/src/main/kotlin/com/wire/bots/polls/services/MessagesHandlingService.kt @@ -3,7 +3,7 @@ package com.wire.bots.polls.services import com.wire.bots.polls.dto.PollAction import com.wire.bots.polls.dto.UsersInput import com.wire.bots.polls.dto.roman.Message -import io.ktor.features.* +import io.ktor.features.BadRequestException import mu.KLogging class MessagesHandlingService( diff --git a/src/main/kotlin/com/wire/bots/polls/services/ProxySenderService.kt b/src/main/kotlin/com/wire/bots/polls/services/ProxySenderService.kt index 372d452..25ad4b8 100644 --- a/src/main/kotlin/com/wire/bots/polls/services/ProxySenderService.kt +++ b/src/main/kotlin/com/wire/bots/polls/services/ProxySenderService.kt @@ -10,8 +10,8 @@ import io.ktor.client.request.post import io.ktor.client.request.url import io.ktor.client.statement.HttpStatement import io.ktor.client.statement.readText -import io.ktor.http.* import io.ktor.http.contentType +import io.ktor.http.ContentType import io.ktor.http.isSuccess import mu.KLogging import pw.forst.katlib.createJson diff --git a/src/main/kotlin/com/wire/bots/polls/setup/HttpClient.kt b/src/main/kotlin/com/wire/bots/polls/setup/HttpClient.kt index 958df2b..8714b5a 100644 --- a/src/main/kotlin/com/wire/bots/polls/setup/HttpClient.kt +++ b/src/main/kotlin/com/wire/bots/polls/setup/HttpClient.kt @@ -3,10 +3,13 @@ package com.wire.bots.polls.setup import com.wire.bots.polls.utils.ClientRequestMetric import com.wire.bots.polls.utils.createLogger import com.wire.bots.polls.utils.httpCall -import io.ktor.client.* -import io.ktor.client.engine.apache.* -import io.ktor.client.features.json.* -import io.ktor.client.features.logging.* +import io.ktor.client.HttpClient +import io.ktor.client.engine.apache.Apache +import io.ktor.client.features.json.JsonFeature +import io.ktor.client.features.json.JacksonSerializer +import io.ktor.client.features.logging.Logger +import io.ktor.client.features.logging.Logging +import io.ktor.client.features.logging.LogLevel import io.micrometer.core.instrument.MeterRegistry fun createHttpClient(meterRegistry: MeterRegistry) = diff --git a/src/main/kotlin/com/wire/bots/polls/setup/KodeinSetup.kt b/src/main/kotlin/com/wire/bots/polls/setup/KodeinSetup.kt index 5975bbc..91896cb 100644 --- a/src/main/kotlin/com/wire/bots/polls/setup/KodeinSetup.kt +++ b/src/main/kotlin/com/wire/bots/polls/setup/KodeinSetup.kt @@ -1,7 +1,7 @@ package com.wire.bots.polls.setup -import io.ktor.application.* import org.kodein.di.ktor.di +import io.ktor.application.Application /** * Inits and sets up DI container. diff --git a/src/main/kotlin/com/wire/bots/polls/setup/KtorInstallation.kt b/src/main/kotlin/com/wire/bots/polls/setup/KtorInstallation.kt index e20ad35..0dffedc 100644 --- a/src/main/kotlin/com/wire/bots/polls/setup/KtorInstallation.kt +++ b/src/main/kotlin/com/wire/bots/polls/setup/KtorInstallation.kt @@ -8,12 +8,18 @@ import com.wire.bots.polls.setup.errors.registerExceptionHandlers import com.wire.bots.polls.setup.logging.APP_REQUEST import com.wire.bots.polls.setup.logging.INFRA_REQUEST import com.wire.bots.polls.utils.createLogger -import io.ktor.application.* -import io.ktor.features.* -import io.ktor.jackson.* -import io.ktor.metrics.micrometer.* -import io.ktor.request.* -import io.ktor.routing.* +import io.ktor.application.Application +import io.ktor.application.install +import io.ktor.features.ContentNegotiation +import io.ktor.features.DefaultHeaders +import io.ktor.features.CallLogging +import io.ktor.features.CallId +import io.ktor.features.callId +import io.ktor.jackson.jackson +import io.ktor.metrics.micrometer.MicrometerMetrics +import io.ktor.request.header +import io.ktor.request.uri +import io.ktor.routing.routing import io.micrometer.core.instrument.distribution.DistributionStatisticConfig import io.micrometer.prometheus.PrometheusMeterRegistry import org.flywaydb.core.Flyway @@ -21,7 +27,7 @@ import org.kodein.di.instance import org.kodein.di.ktor.closestDI import org.slf4j.event.Level import java.text.DateFormat -import java.util.* +import java.util.UUID private val installationLogger = createLogger("ApplicationSetup") diff --git a/src/main/kotlin/com/wire/bots/polls/setup/errors/ExceptionHandling.kt b/src/main/kotlin/com/wire/bots/polls/setup/errors/ExceptionHandling.kt index eff670a..7e95a9a 100644 --- a/src/main/kotlin/com/wire/bots/polls/setup/errors/ExceptionHandling.kt +++ b/src/main/kotlin/com/wire/bots/polls/setup/errors/ExceptionHandling.kt @@ -2,10 +2,13 @@ package com.wire.bots.polls.setup.errors import com.wire.bots.polls.utils.countException import com.wire.bots.polls.utils.createLogger -import io.ktor.application.* -import io.ktor.features.* -import io.ktor.http.* -import io.ktor.response.* +import io.ktor.application.Application +import io.ktor.application.install +import io.ktor.application.call +import io.ktor.application.ApplicationCall +import io.ktor.features.StatusPages +import io.ktor.http.HttpStatusCode +import io.ktor.response.respond import io.micrometer.prometheus.PrometheusMeterRegistry import org.kodein.di.instance import org.kodein.di.ktor.closestDI diff --git a/src/main/kotlin/com/wire/bots/polls/setup/errors/Exceptions.kt b/src/main/kotlin/com/wire/bots/polls/setup/errors/Exceptions.kt index 8caa646..ec3d261 100644 --- a/src/main/kotlin/com/wire/bots/polls/setup/errors/Exceptions.kt +++ b/src/main/kotlin/com/wire/bots/polls/setup/errors/Exceptions.kt @@ -1,6 +1,6 @@ package com.wire.bots.polls.setup.errors -import io.ktor.http.* +import io.ktor.http.HttpStatusCode data class RomanUnavailableException( val status: HttpStatusCode, diff --git a/src/main/kotlin/com/wire/bots/polls/utils/ClientRequestMetric.kt b/src/main/kotlin/com/wire/bots/polls/utils/ClientRequestMetric.kt index 8369d23..3a7aa4c 100644 --- a/src/main/kotlin/com/wire/bots/polls/utils/ClientRequestMetric.kt +++ b/src/main/kotlin/com/wire/bots/polls/utils/ClientRequestMetric.kt @@ -5,7 +5,7 @@ import io.ktor.client.features.HttpClientFeature import io.ktor.client.statement.HttpReceivePipeline import io.ktor.client.statement.HttpResponse import io.ktor.client.statement.request -import io.ktor.util.* +import io.ktor.util.AttributeKey import mu.KLogging /** From f6da98110bdc86e12dd36c4cc66e5fdf9d6ef9ea Mon Sep 17 00:00:00 2001 From: MarianKijewski Date: Thu, 17 Apr 2025 15:48:03 +0200 Subject: [PATCH 08/16] refactor: remove magic numbers #WPB-17130 --- src/main/kotlin/com/wire/bots/polls/PollBot.kt | 2 +- src/main/kotlin/com/wire/bots/polls/dao/DaoConstants.kt | 5 +++++ src/main/kotlin/com/wire/bots/polls/dao/Mentions.kt | 4 ++-- src/main/kotlin/com/wire/bots/polls/dao/PollOptions.kt | 4 ++-- src/main/kotlin/com/wire/bots/polls/dao/Polls.kt | 6 +++--- src/main/kotlin/com/wire/bots/polls/dao/Votes.kt | 4 ++-- 6 files changed, 15 insertions(+), 10 deletions(-) create mode 100644 src/main/kotlin/com/wire/bots/polls/dao/DaoConstants.kt diff --git a/src/main/kotlin/com/wire/bots/polls/PollBot.kt b/src/main/kotlin/com/wire/bots/polls/PollBot.kt index c982309..1d3185a 100644 --- a/src/main/kotlin/com/wire/bots/polls/PollBot.kt +++ b/src/main/kotlin/com/wire/bots/polls/PollBot.kt @@ -6,5 +6,5 @@ import io.ktor.server.engine.embeddedServer import io.ktor.server.netty.Netty fun main() { - embeddedServer(Netty, 8080, module = Application::init).start() + embeddedServer(Netty, port = 8080, module = Application::init).start() } diff --git a/src/main/kotlin/com/wire/bots/polls/dao/DaoConstants.kt b/src/main/kotlin/com/wire/bots/polls/dao/DaoConstants.kt new file mode 100644 index 0000000..7ebca41 --- /dev/null +++ b/src/main/kotlin/com/wire/bots/polls/dao/DaoConstants.kt @@ -0,0 +1,5 @@ +package com.wire.bots.polls.dao + +const val UUID_LENGTH = 36 + +const val OPTION_LENGTH = 256 diff --git a/src/main/kotlin/com/wire/bots/polls/dao/Mentions.kt b/src/main/kotlin/com/wire/bots/polls/dao/Mentions.kt index b970f9a..8f8adcb 100644 --- a/src/main/kotlin/com/wire/bots/polls/dao/Mentions.kt +++ b/src/main/kotlin/com/wire/bots/polls/dao/Mentions.kt @@ -10,12 +10,12 @@ object Mentions : IntIdTable("mentions") { /** * Id of the poll. */ - val pollId: Column = varchar("poll_id", 36) references Polls.id + val pollId: Column = varchar("poll_id", UUID_LENGTH) references Polls.id /** * If of user that is mentioned. */ - val userId: Column = varchar("user_id", 36) + val userId: Column = varchar("user_id", UUID_LENGTH) /** * Where mention begins. diff --git a/src/main/kotlin/com/wire/bots/polls/dao/PollOptions.kt b/src/main/kotlin/com/wire/bots/polls/dao/PollOptions.kt index f42561b..ff1380d 100644 --- a/src/main/kotlin/com/wire/bots/polls/dao/PollOptions.kt +++ b/src/main/kotlin/com/wire/bots/polls/dao/PollOptions.kt @@ -10,7 +10,7 @@ object PollOptions : Table("poll_option") { /** * Id of the poll this option is for. UUID. */ - val pollId: Column = varchar("poll_id", 36) references Polls.id + val pollId: Column = varchar("poll_id", UUID_LENGTH) references Polls.id /** * Option order or option id. @@ -20,7 +20,7 @@ object PollOptions : Table("poll_option") { /** * Option content, the text inside the button/choice. */ - val optionContent: Column = varchar("option_content", 256) + val optionContent: Column = varchar("option_content", OPTION_LENGTH) override val primaryKey: PrimaryKey get() = PrimaryKey(pollId, optionOrder) diff --git a/src/main/kotlin/com/wire/bots/polls/dao/Polls.kt b/src/main/kotlin/com/wire/bots/polls/dao/Polls.kt index 894b5b1..5617aea 100644 --- a/src/main/kotlin/com/wire/bots/polls/dao/Polls.kt +++ b/src/main/kotlin/com/wire/bots/polls/dao/Polls.kt @@ -12,17 +12,17 @@ object Polls : Table("polls") { /** * Id of the poll. UUID. */ - val id: Column = varchar("id", 36).uniqueIndex() + val id: Column = varchar("id", UUID_LENGTH).uniqueIndex() /** * Id of the user who created this poll. UUID. */ - val ownerId: Column = varchar("owner_id", 36) + val ownerId: Column = varchar("owner_id", UUID_LENGTH) /** * Id of the bot that created this poll. UUID. */ - val botId: Column = varchar("bot_id", 36) + val botId: Column = varchar("bot_id", UUID_LENGTH) /** * Determines whether is the pool active and whether new votes should be accepted. diff --git a/src/main/kotlin/com/wire/bots/polls/dao/Votes.kt b/src/main/kotlin/com/wire/bots/polls/dao/Votes.kt index 71e9323..efd74f9 100644 --- a/src/main/kotlin/com/wire/bots/polls/dao/Votes.kt +++ b/src/main/kotlin/com/wire/bots/polls/dao/Votes.kt @@ -10,7 +10,7 @@ object Votes : Table("votes") { /** * Id of the poll. */ - val pollId: Column = varchar("poll_id", 36) + val pollId: Column = varchar("poll_id", UUID_LENGTH) /** * Id of the option. @@ -20,7 +20,7 @@ object Votes : Table("votes") { /** * User who voted for this option. */ - val userId: Column = varchar("user_id", 36) + val userId: Column = varchar("user_id", UUID_LENGTH) override val primaryKey: PrimaryKey get() = PrimaryKey(pollId, userId) From d61197cbc7bf8e8cafc58c6cf2b38b662724fe1e Mon Sep 17 00:00:00 2001 From: MarianKijewski Date: Thu, 17 Apr 2025 15:48:33 +0200 Subject: [PATCH 09/16] refactor: remove too long lines #WPB-17130 --- src/main/kotlin/com/wire/bots/polls/dto/roman/Message.kt | 4 +++- .../wire/bots/polls/services/UserCommunicationService.kt | 7 ++++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/src/main/kotlin/com/wire/bots/polls/dto/roman/Message.kt b/src/main/kotlin/com/wire/bots/polls/dto/roman/Message.kt index b098089..a93039e 100644 --- a/src/main/kotlin/com/wire/bots/polls/dto/roman/Message.kt +++ b/src/main/kotlin/com/wire/bots/polls/dto/roman/Message.kt @@ -103,7 +103,9 @@ data class Message( * Avoid printing out the token by mistake if object is printed. */ override fun toString(): String = - "Message(botId='$botId', userId=$userId, conversationId=$conversationId, type='$type', messageId=$messageId, text=$text, refMessageId=$refMessageId, reaction=$reaction, image=$image, handle=$handle, locale=$locale, poll=$poll, mimeType=$mimeType)" + "Message(botId='$botId', userId=$userId, conversationId=$conversationId, type='$type', " + + "messageId=$messageId, text=$text, refMessageId=$refMessageId, reaction=$reaction, " + + "image=$image, handle=$handle, locale=$locale, poll=$poll, mimeType=$mimeType)" } /* JSON from the swagger diff --git a/src/main/kotlin/com/wire/bots/polls/services/UserCommunicationService.kt b/src/main/kotlin/com/wire/bots/polls/services/UserCommunicationService.kt index c96f043..a733b58 100644 --- a/src/main/kotlin/com/wire/bots/polls/services/UserCommunicationService.kt +++ b/src/main/kotlin/com/wire/bots/polls/services/UserCommunicationService.kt @@ -16,7 +16,8 @@ class UserCommunicationService( private val version: String ) { private companion object : KLogging() { - const val usage = "To create poll please text: `/poll \"Question\" \"Option 1\" \"Option 2\"`. To display usage write `/help`" + const val USAGE = "To create poll please text: " + + "`/poll \"Question\" \"Option 1\" \"Option 2\"`. To display usage write `/help`" val commands = """ Following commands are available: `/poll "Question" "Option 1" "Option 2"` will create poll @@ -28,13 +29,13 @@ class UserCommunicationService( /** * Sends hello message with instructions to the conversation. */ - suspend fun sayHello(token: String) = greeting("Hello, I'm Poll Bot. $usage").send(token) + suspend fun sayHello(token: String) = greeting("Hello, I'm Poll Bot. $USAGE").send(token) /** * Sends message with help. */ suspend fun reactionToWrongCommand(token: String) = - fallBackMessage("I couldn't recognize your command. $usage").send(token) + fallBackMessage("I couldn't recognize your command. $USAGE").send(token) /** * Sends message containing help From 533e88a39f30f9198c3ec7adcb3c2dd380892c92 Mon Sep 17 00:00:00 2001 From: MarianKijewski Date: Thu, 17 Apr 2025 16:46:12 +0200 Subject: [PATCH 10/16] refactor: remove third return statement #WPB-17130 --- .../polls/services/StatsFormattingService.kt | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/src/main/kotlin/com/wire/bots/polls/services/StatsFormattingService.kt b/src/main/kotlin/com/wire/bots/polls/services/StatsFormattingService.kt index f4f07a8..ca6d64c 100644 --- a/src/main/kotlin/com/wire/bots/polls/services/StatsFormattingService.kt +++ b/src/main/kotlin/com/wire/bots/polls/services/StatsFormattingService.kt @@ -12,7 +12,7 @@ class StatsFormattingService( private val repository: PollRepository ) { private companion object : KLogging() { - const val titlePrefix = "**Results** for poll *\"" + const val TITLE_PREFIX = "**Results** for poll *\"" /** * Maximum number of trailing vote slots to be displayed, considered the most voted option. @@ -30,11 +30,11 @@ class StatsFormattingService( ): BotMessage? { val pollQuestion = repository.getPollQuestion(pollId).whenNull { logger.warn { "No poll $pollId exists." } - } ?: return null + } val stats = repository.stats(pollId) - if (stats.isEmpty()) { - logger.info { "There are no data for given pollId." } + stats.ifEmpty { logger.info { "There are no data for given pollId." } } + if (pollQuestion == null || stats.isEmpty()) { return null } @@ -44,7 +44,7 @@ class StatsFormattingService( text = "$title$newLine$options", mentions = pollQuestion.mentions.map { it.copy( - offset = it.offset + titlePrefix.length + offset = it.offset + TITLE_PREFIX.length ) } ) @@ -101,7 +101,7 @@ class StatsFormattingService( } } - private fun prepareTitle(body: String) = "$titlePrefix${body}\"*" + private fun prepareTitle(body: String) = "$TITLE_PREFIX${body}\"*" } /** @@ -113,13 +113,13 @@ private data class VotingOption( val votingUsers: Int ) { private companion object { - const val notVote = "⚪" - const val vote = "🟢" + const val NOT_VOTE = "⚪" + const val VOTE = "🟢" } fun toString(max: Int): String { - val missingVotes = (0 until max - votingUsers).joinToString("") { notVote } - val votes = (0 until votingUsers).joinToString("") { vote } + val missingVotes = (0 until max - votingUsers).joinToString("") { NOT_VOTE } + val votes = (0 until votingUsers).joinToString("") { VOTE } return "$votes$missingVotes $style$option$style ($votingUsers)" } } From c1ba80cd85076467428c1870fef1ee56cef9fbf7 Mon Sep 17 00:00:00 2001 From: MarianKijewski Date: Thu, 17 Apr 2025 16:46:33 +0200 Subject: [PATCH 11/16] refactor: rename exception file #WPB-17130 --- .../setup/errors/{Exceptions.kt => RomanUnavailableException.kt} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename src/main/kotlin/com/wire/bots/polls/setup/errors/{Exceptions.kt => RomanUnavailableException.kt} (100%) diff --git a/src/main/kotlin/com/wire/bots/polls/setup/errors/Exceptions.kt b/src/main/kotlin/com/wire/bots/polls/setup/errors/RomanUnavailableException.kt similarity index 100% rename from src/main/kotlin/com/wire/bots/polls/setup/errors/Exceptions.kt rename to src/main/kotlin/com/wire/bots/polls/setup/errors/RomanUnavailableException.kt From c2a9b50719c133f5dc036eca8806e9e086ccb510 Mon Sep 17 00:00:00 2001 From: MarianKijewski Date: Thu, 17 Apr 2025 16:48:28 +0200 Subject: [PATCH 12/16] refactor: suppress spread operator detekt problem #WPB-17130 the array contains only few delimiters, and it doesn't affect the performance --- config/detekt/baseline.xml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/config/detekt/baseline.xml b/config/detekt/baseline.xml index 5703cad..7b86f29 100644 --- a/config/detekt/baseline.xml +++ b/config/detekt/baseline.xml @@ -1,6 +1,7 @@ - + - + + SpreadOperator:InputParser.kt$InputParser$(*delimiters) From f2070bc2b0ea1963c8b70b461db48a14c52ed073 Mon Sep 17 00:00:00 2001 From: MarianKijewski Date: Fri, 18 Apr 2025 09:48:58 +0200 Subject: [PATCH 13/16] refactor: add uppercase names for const and cut long lines #WPB-17130 --- config/detekt/baseline.xml | 2 +- .../com/wire/bots/polls/parser/PollFactory.kt | 3 ++- .../com/wire/bots/polls/parser/PollValidation.kt | 6 +++++- .../com/wire/bots/polls/services/AuthService.kt | 10 +++++----- .../bots/polls/services/ConversationService.kt | 4 ++-- .../polls/services/MessagesHandlingService.kt | 15 ++++++++------- .../com/wire/bots/polls/services/PollService.kt | 2 +- .../bots/polls/services/ProxySenderService.kt | 4 ++-- .../setup/ConfigurationDependencyInjection.kt | 3 ++- .../com/wire/bots/polls/setup/KtorInstallation.kt | 3 ++- 10 files changed, 30 insertions(+), 22 deletions(-) diff --git a/config/detekt/baseline.xml b/config/detekt/baseline.xml index 7b86f29..37a3f83 100644 --- a/config/detekt/baseline.xml +++ b/config/detekt/baseline.xml @@ -1,6 +1,6 @@ - + SpreadOperator:InputParser.kt$InputParser$(*delimiters) diff --git a/src/main/kotlin/com/wire/bots/polls/parser/PollFactory.kt b/src/main/kotlin/com/wire/bots/polls/parser/PollFactory.kt index 005fb78..8c24c2e 100644 --- a/src/main/kotlin/com/wire/bots/polls/parser/PollFactory.kt +++ b/src/main/kotlin/com/wire/bots/polls/parser/PollFactory.kt @@ -30,7 +30,8 @@ class PollFactory( poll } else { logger.warn { - "It was not possible to create poll for user input: $usersInput due to errors listed bellow:" + + "It was not possible to create poll for user input: " + + "$usersInput due to errors listed bellow:" + "$newLine${errors.joinToString(newLine)}" } null diff --git a/src/main/kotlin/com/wire/bots/polls/parser/PollValidation.kt b/src/main/kotlin/com/wire/bots/polls/parser/PollValidation.kt index 96a6ae3..33da111 100644 --- a/src/main/kotlin/com/wire/bots/polls/parser/PollValidation.kt +++ b/src/main/kotlin/com/wire/bots/polls/parser/PollValidation.kt @@ -27,7 +27,11 @@ class PollValidation { private val pollRules = listOf { poll -> - if (poll.options.isNotEmpty()) null else "There must be at least one option for answering the poll." + if (poll.options.isNotEmpty()) { + null + } else { + "There must be at least one option for answering the poll." + } } /** diff --git a/src/main/kotlin/com/wire/bots/polls/services/AuthService.kt b/src/main/kotlin/com/wire/bots/polls/services/AuthService.kt index 88be613..c301946 100644 --- a/src/main/kotlin/com/wire/bots/polls/services/AuthService.kt +++ b/src/main/kotlin/com/wire/bots/polls/services/AuthService.kt @@ -11,8 +11,8 @@ class AuthService( private val proxyToken: String ) { private companion object : KLogging() { - const val authHeader = "Authorization" - const val bearerPrefix = "Bearer " + const val AUTH_HEADER = "Authorization" + const val BEARER_HEADER = "Bearer " } /** @@ -22,14 +22,14 @@ class AuthService( runCatching { isTokenValid(headersGet()) }.getOrNull() ?: false private fun isTokenValid(headers: Headers): Boolean { - val header = headers[authHeader].whenNull { + val header = headers[AUTH_HEADER].whenNull { logger.info { "Request did not have authorization header." } } ?: return false - return if (!header.startsWith(bearerPrefix)) { + return if (!header.startsWith(BEARER_HEADER)) { false } else { - header.substringAfter(bearerPrefix) == proxyToken + header.substringAfter(BEARER_HEADER) == proxyToken } } } diff --git a/src/main/kotlin/com/wire/bots/polls/services/ConversationService.kt b/src/main/kotlin/com/wire/bots/polls/services/ConversationService.kt index 7a21fc5..5b50d07 100644 --- a/src/main/kotlin/com/wire/bots/polls/services/ConversationService.kt +++ b/src/main/kotlin/com/wire/bots/polls/services/ConversationService.kt @@ -16,10 +16,10 @@ class ConversationService( config: ProxyConfiguration ) { private companion object : KLogging() { - const val conversationPath = "/conversation" + const val CONVERSATION_PATH = "/conversation" } - private val endpoint = config.baseUrl appendPath conversationPath + private val endpoint = config.baseUrl appendPath CONVERSATION_PATH /** * Returns the number of members of conversation. diff --git a/src/main/kotlin/com/wire/bots/polls/services/MessagesHandlingService.kt b/src/main/kotlin/com/wire/bots/polls/services/MessagesHandlingService.kt index 63be638..3147fd3 100644 --- a/src/main/kotlin/com/wire/bots/polls/services/MessagesHandlingService.kt +++ b/src/main/kotlin/com/wire/bots/polls/services/MessagesHandlingService.kt @@ -25,13 +25,14 @@ class MessagesHandlingService( } else -> { logger.debug { "Handling type: ${message.type}" } - when { - message.token != null -> tokenAwareHandle(message.token, message) - else -> false.also { - logger.warn { - "Proxy didn't send token along side the message with type ${message.type}. Message:$message" - } + if (message.token != null) { + tokenAwareHandle(message.token, message) + } else { + logger.warn { + "Proxy didn't send token along side the message " + + "with type ${message.type}. Message:$message" } + false } } } @@ -153,7 +154,7 @@ class MessagesHandlingService( ) -> userCommunicationService.sendVersion(token) // send version when asked trimmed.startsWith("/help") -> userCommunicationService.sendHelp(token) - // easter egg, good bot is good + // Easter egg, good bot is good trimmed == "good bot" -> userCommunicationService.goodBot(token) else -> ignore { "Ignoring the message, unrecognized command." } } diff --git a/src/main/kotlin/com/wire/bots/polls/services/PollService.kt b/src/main/kotlin/com/wire/bots/polls/services/PollService.kt index d9c1724..47bdbdc 100644 --- a/src/main/kotlin/com/wire/bots/polls/services/PollService.kt +++ b/src/main/kotlin/com/wire/bots/polls/services/PollService.kt @@ -9,7 +9,7 @@ import com.wire.bots.polls.parser.PollFactory import mu.KLogging import pw.forst.katlib.whenNull import pw.forst.katlib.whenTrue -import java.util.* +import java.util.UUID /** * Service handling the polls. It communicates with the proxy via [proxySenderService]. diff --git a/src/main/kotlin/com/wire/bots/polls/services/ProxySenderService.kt b/src/main/kotlin/com/wire/bots/polls/services/ProxySenderService.kt index 25ad4b8..8cb3b81 100644 --- a/src/main/kotlin/com/wire/bots/polls/services/ProxySenderService.kt +++ b/src/main/kotlin/com/wire/bots/polls/services/ProxySenderService.kt @@ -25,10 +25,10 @@ class ProxySenderService( config: ProxyConfiguration ) { private companion object : KLogging() { - const val conversationPath = "/conversation" + const val CONVERSATION_PATH = "/conversation" } - private val conversationEndpoint = config.baseUrl appendPath conversationPath + private val conversationEndpoint = config.baseUrl appendPath CONVERSATION_PATH /** * Send given message with provided token. diff --git a/src/main/kotlin/com/wire/bots/polls/setup/ConfigurationDependencyInjection.kt b/src/main/kotlin/com/wire/bots/polls/setup/ConfigurationDependencyInjection.kt index cf61eed..2b3f81d 100644 --- a/src/main/kotlin/com/wire/bots/polls/setup/ConfigurationDependencyInjection.kt +++ b/src/main/kotlin/com/wire/bots/polls/setup/ConfigurationDependencyInjection.kt @@ -31,10 +31,11 @@ private fun loadVersion(defaultVersion: String): String = runCatching { ?: defaultVersion }.getOrNull() ?: defaultVersion +// TODO load all config from the file and then allow the replacement with env variables + /** * Loads the DI container with configuration from the system environment. */ -// TODO load all config from the file and then allow the replacement with env variables fun DI.MainBuilder.bindConfiguration() { // The default values used in this configuration are for the local development. diff --git a/src/main/kotlin/com/wire/bots/polls/setup/KtorInstallation.kt b/src/main/kotlin/com/wire/bots/polls/setup/KtorInstallation.kt index 0dffedc..195cef4 100644 --- a/src/main/kotlin/com/wire/bots/polls/setup/KtorInstallation.kt +++ b/src/main/kotlin/com/wire/bots/polls/setup/KtorInstallation.kt @@ -65,7 +65,8 @@ fun Application.connectDatabase() { } else { // TODO verify handling, maybe exit the App? installationLogger.error { - "It was not possible to connect to db database! The application will start but it won't work." + "It was not possible to connect to db database! " + + "The application will start but it won't work." } } } From 5f4c6dc2db0e2a491daa63edc800193c9ee1cd4d Mon Sep 17 00:00:00 2001 From: MarianKijewski Date: Fri, 18 Apr 2025 11:50:34 +0200 Subject: [PATCH 14/16] refactor: suppress CyclomaticComplex method detekt problem #WPB-17130 --- config/detekt/baseline.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/config/detekt/baseline.xml b/config/detekt/baseline.xml index 37a3f83..f8696c0 100644 --- a/config/detekt/baseline.xml +++ b/config/detekt/baseline.xml @@ -2,6 +2,7 @@ + CyclomaticComplexMethod:MessagesHandlingService.kt$MessagesHandlingService$private suspend fun handleText( token: String, message: Message ): Boolean SpreadOperator:InputParser.kt$InputParser$(*delimiters) From 1ce687e991aea1e1365e0037c4b8cc7859ff7946 Mon Sep 17 00:00:00 2001 From: MarianKijewski Date: Fri, 18 Apr 2025 12:04:03 +0200 Subject: [PATCH 15/16] feat: add CI #WPB-17130 --- .github/workflows/ci.yml | 65 ---------- .github/workflows/prod.yml | 189 ----------------------------- .github/workflows/pull-request.yml | 32 +++++ .github/workflows/quay.yml | 55 --------- .github/workflows/staging.yml | 101 --------------- 5 files changed, 32 insertions(+), 410 deletions(-) delete mode 100644 .github/workflows/ci.yml delete mode 100644 .github/workflows/prod.yml create mode 100644 .github/workflows/pull-request.yml delete mode 100644 .github/workflows/quay.yml delete mode 100644 .github/workflows/staging.yml diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml deleted file mode 100644 index db25aa4..0000000 --- a/.github/workflows/ci.yml +++ /dev/null @@ -1,65 +0,0 @@ -name: CI - -on: - push: - branches-ignore: - - master - - staging - - pull_request: - -jobs: - check: - runs-on: ubuntu-20.04 - steps: - - uses: actions/checkout@v2 - - - name: Setup JDK - uses: actions/setup-java@v1 - with: - java-version: 11.0.6 - - - name: Execute test with gradle - run: ./gradlew test - - # Send webhook to Wire using Slack Bot - - name: Webhook to Wire - uses: 8398a7/action-slack@v2 - with: - status: ${{ job.status }} - author_name: Poll Bot bare metal CI pipeline - env: - SLACK_WEBHOOK_URL: ${{ secrets.WEBHOOK_CI }} - # Send message only if previous step failed - if: failure() - - docker-build: - runs-on: ubuntu-20.04 - steps: - - uses: actions/checkout@v2 - - # setup docker actions https://github.com/docker/build-push-action - - name: Set up QEMU - uses: docker/setup-qemu-action@v1 - - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v1 - - - name: Build image - id: docker_build - uses: docker/build-push-action@v2 - with: - # https://github.com/docker/build-push-action/issues/220 - context: . - tags: wire/ci-test-image - push: false - - # Send webhook to Wire using Slack Bot - - name: Webhook to Wire - uses: 8398a7/action-slack@v2 - with: - status: ${{ job.status }} - author_name: Docker CI pipeline - env: - SLACK_WEBHOOK_URL: ${{ secrets.WEBHOOK_CI }} - # Send message only if previous step failed - if: failure() diff --git a/.github/workflows/prod.yml b/.github/workflows/prod.yml deleted file mode 100644 index 468a0b5..0000000 --- a/.github/workflows/prod.yml +++ /dev/null @@ -1,189 +0,0 @@ -name: Release Pipeline - -on: - release: - types: [ published ] - -env: - DOCKER_IMAGE: wire-bot/poll - SERVICE_NAME: poll - -jobs: - deploy: - name: Build and deploy service - runs-on: ubuntu-20.04 - steps: - - uses: actions/checkout@v2 - - - name: Set Release Version - # use latest tag as release version - run: echo "RELEASE_VERSION=${GITHUB_REF:10}" >> $GITHUB_ENV - - # extract metadata for labels https://github.com/crazy-max/ghaction-docker-meta - - name: Docker meta - id: docker_meta - uses: crazy-max/ghaction-docker-meta@v1 - with: - images: eu.gcr.io/${{ env.DOCKER_IMAGE }} - - # setup docker actions https://github.com/docker/build-push-action - - name: Set up QEMU - uses: docker/setup-qemu-action@v1 - - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v1 - # login to GCR repo - - name: Login to DockerHub - uses: docker/login-action@v1 - with: - registry: eu.gcr.io - username: _json_key - password: ${{ secrets.GCR_ACCESS_JSON }} - - - name: Build and push - id: docker_build - uses: docker/build-push-action@v2 - with: - tags: ${{ steps.docker_meta.outputs.tags }} - labels: ${{ steps.docker_meta.outputs.labels }} - # push only if this is indeed a taged release - push: ${{ startsWith(github.ref, 'refs/tags/') }} - build-args: | - release_version=${{ env.RELEASE_VERSION }} - - # Checkout our Kubernetes configuration - - name: Checkout Rubicon - uses: actions/checkout@v2 - with: - repository: zinfra/rubicon - # currently main branch is develop - ref: develop - path: rubicon - # private repo so use different git token - token: ${{ secrets.RUBICON_GIT_TOKEN }} - - # Update version to the one that was just built - - name: Change Version in Rubicon - env: - IMAGE: ${{ env.DOCKER_IMAGE }} - SERVICE: ${{ env.SERVICE_NAME }} - VERSION: ${{ env.RELEASE_VERSION }} - run: | - # go to directory with configuration - cd "rubicon/prod/services/$SERVICE" - # escape literals for the sed and set output with GCR - export SED_PREPARED=$(echo $IMAGE | awk '{ gsub("/", "\\/", $1); print "eu.gcr.io\\/"$1 }') - # update final yaml - sed -i".bak" "s/image: $SED_PREPARED.*/image: $SED_PREPARED:$VERSION/g" "$SERVICE.yaml" - # delete bakup file - rm "$SERVICE.yaml.bak" - - - name: Enable auth plugin - run: | - echo "USE_GKE_GCLOUD_AUTH_PLUGIN=True" >> $GITHUB_ENV - # Auth to GKE - - name: Authenticate to GKE - uses: google-github-actions/auth@v1 - with: - project_id: wire-bot - credentials_json: ${{ secrets.GKE_SA_KEY }} - service_account: kubernetes-deployment-agent@wire-bot.iam.gserviceaccount.com - - # Setup gcloud CLI - - name: Set up Cloud SDK - uses: google-github-actions/setup-gcloud@v1 - - # Prepare components - - name: Prepare gcloud components - run: | - gcloud components install gke-gcloud-auth-plugin - gcloud components update - gcloud --quiet auth configure-docker - - # Get the GKE credentials so we can deploy to the cluster - - name: Obtain k8s credentials - env: - GKE_CLUSTER: anayotto - GKE_ZONE: europe-west1-c - run: | - gcloud container clusters get-credentials "$GKE_CLUSTER" --zone "$GKE_ZONE" - - # K8s is set up, deploy the app - - name: Deploy the Service - env: - SERVICE: ${{ env.SERVICE_NAME }} - run: | - kubectl apply -f "rubicon/prod/services/$SERVICE/$SERVICE.yaml" - - # Commit all data to Rubicon and open PR - - name: Create Rubicon Pull Request - uses: peter-evans/create-pull-request@v3 - with: - path: rubicon - branch: ${{ env.SERVICE_NAME }}-release - token: ${{ secrets.RUBICON_GIT_TOKEN }} - labels: version-bump, automerge - title: ${{ env.SERVICE_NAME }} release ${{ env.RELEASE_VERSION }} - commit-message: ${{ env.SERVICE_NAME }} version bump to ${{ env.RELEASE_VERSION }} - body: | - This is automatic version bump from the pipeline. - - # Send webhook to Wire using Slack Bot - - name: Webhook to Wire - uses: 8398a7/action-slack@v2 - with: - status: ${{ job.status }} - author_name: ${{ env.SERVICE_NAME }} release pipeline - env: - SLACK_WEBHOOK_URL: ${{ secrets.WEBHOOK_RELEASE }} - # Notify every release - if: always() - - quay_publish: - name: Quay Publish Pipeline - runs-on: ubuntu-20.04 - steps: - - uses: actions/checkout@v2 - - name: Set Release Version - # use latest tag as release version - run: echo "RELEASE_VERSION=${GITHUB_REF:10}" >> $GITHUB_ENV - - # extract metadata for labels https://github.com/crazy-max/ghaction-docker-meta - - name: Docker meta - id: docker_meta - uses: crazy-max/ghaction-docker-meta@v1 - with: - images: quay.io/wire/poll-bot - - # setup docker actions https://github.com/docker/build-push-action - - name: Set up QEMU - uses: docker/setup-qemu-action@v1 - - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v1 - # login to GCR repo - - name: Login to DockerHub - uses: docker/login-action@v1 - with: - registry: quay.io - username: ${{ secrets.QUAY_USERNAME }} - password: ${{ secrets.QUAY_PASSWORD }} - - - name: Build and push - id: docker_build - uses: docker/build-push-action@v2 - with: - tags: ${{ steps.docker_meta.outputs.tags }} - labels: ${{ steps.docker_meta.outputs.labels }} - push: true - build-args: | - release_version=${{ env.RELEASE_VERSION }} - - # Send webhook to Wire using Slack Bot - - name: Webhook to Wire - uses: 8398a7/action-slack@v2 - with: - status: ${{ job.status }} - author_name: ${{ env.SERVICE_NAME }} Quay Production Publish - env: - SLACK_WEBHOOK_URL: ${{ secrets.WEBHOOK_RELEASE }} - # Send message only if previous step failed - if: always() diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml new file mode 100644 index 0000000..0ef1c18 --- /dev/null +++ b/.github/workflows/pull-request.yml @@ -0,0 +1,32 @@ +name: Build + +on: + workflow_dispatch: + pull_request: + +jobs: + tests: + runs-on: ubuntu-22.04 + steps: + - uses: actions/checkout@v4 + - uses: actions/setup-java@v4 + with: + distribution: 'zulu' + java-version: '17' + - name: Lint + run: | + ./gradlew ktlintCheck + - name: Detekt + run: | + ./gradlew detekt + - name: Build + run: | + ./gradlew build --info + - name: Store reports + if: failure() + uses: actions/upload-artifact@v4 + with: + name: reports + path: | + **/build/reports/ + **/build/test-results/ diff --git a/.github/workflows/quay.yml b/.github/workflows/quay.yml deleted file mode 100644 index 0f8d033..0000000 --- a/.github/workflows/quay.yml +++ /dev/null @@ -1,55 +0,0 @@ -name: Quay Deployment - -on: - # manual dispatch - workflow_dispatch: - inputs: - tag: - description: 'Docker image tag.' - required: true -jobs: - publish: - name: Deploy to staging - runs-on: ubuntu-20.04 - steps: - - uses: actions/checkout@v2 - - # extract metadata for labels https://github.com/crazy-max/ghaction-docker-meta - - name: Docker meta - id: docker_meta - uses: crazy-max/ghaction-docker-meta@v1 - with: - images: quay.io/wire/poll-bot - - # setup docker actions https://github.com/docker/build-push-action - - name: Set up QEMU - uses: docker/setup-qemu-action@v1 - - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v1 - # login to GCR repo - - name: Login to DockerHub - uses: docker/login-action@v1 - with: - registry: quay.io - username: ${{ secrets.QUAY_USERNAME }} - password: ${{ secrets.QUAY_PASSWORD }} - - - name: Build and push - id: docker_build - uses: docker/build-push-action@v2 - with: - tags: quay.io/wire/poll-bot:${{ github.event.inputs.tag }} - labels: ${{ steps.docker_meta.outputs.labels }} - push: true - build-args: | - release_version=${{ github.event.inputs.tag }} - # Send webhook to Wire using Slack Bot - - name: Webhook to Wire - uses: 8398a7/action-slack@v2 - with: - status: ${{ job.status }} - author_name: Poll Bot Quay Custom Tag Pipeline - env: - SLACK_WEBHOOK_URL: ${{ secrets.WEBHOOK_CI }} - # Send message only if previous step failed - if: always() diff --git a/.github/workflows/staging.yml b/.github/workflows/staging.yml deleted file mode 100644 index 0eae132..0000000 --- a/.github/workflows/staging.yml +++ /dev/null @@ -1,101 +0,0 @@ -name: Staging Deployment - -on: - push: - branches: - - staging - -env: - DOCKER_IMAGE: wire-bot/poll - SERVICE_NAME: polls - -jobs: - publish: - name: Deploy to staging - runs-on: ubuntu-20.04 - steps: - - uses: actions/checkout@v2 - - # use latest tag as release version in the docker container - - name: Set Release Version - run: echo "RELEASE_VERSION=${GITHUB_SHA}" >> $GITHUB_ENV - - # extract metadata for labels https://github.com/crazy-max/ghaction-docker-meta - - name: Docker meta - id: docker_meta - uses: crazy-max/ghaction-docker-meta@v1 - with: - images: eu.gcr.io/${{ env.DOCKER_IMAGE }} - - # setup docker actions https://github.com/docker/build-push-action - - name: Set up QEMU - uses: docker/setup-qemu-action@v1 - - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v1 - # login to GCR repo - - name: Login to DockerHub - uses: docker/login-action@v1 - with: - registry: eu.gcr.io - username: _json_key - password: ${{ secrets.GCR_ACCESS_JSON }} - - - name: Build and push - id: docker_build - uses: docker/build-push-action@v2 - with: - tags: ${{ steps.docker_meta.outputs.tags }} - labels: ${{ steps.docker_meta.outputs.labels }} - push: true - build-args: | - release_version=${{ env.RELEASE_VERSION }} - - - name: Enable auth plugin - run: | - echo "USE_GKE_GCLOUD_AUTH_PLUGIN=True" >> $GITHUB_ENV - # Auth to GKE - - name: Authenticate to GKE - uses: google-github-actions/auth@v1 - with: - project_id: wire-bot - credentials_json: ${{ secrets.GKE_SA_KEY }} - service_account: kubernetes-deployment-agent@wire-bot.iam.gserviceaccount.com - - # Setup gcloud CLI - - name: Set up Cloud SDK - uses: google-github-actions/setup-gcloud@v1 - - # Prepare components - - name: Prepare gcloud components - run: | - gcloud components install gke-gcloud-auth-plugin - gcloud components update - gcloud --quiet auth configure-docker - - # Get the GKE credentials so we can deploy to the cluster - - name: Obtain k8s credentials - env: - GKE_CLUSTER: dagobah - GKE_ZONE: europe-west1-c - run: | - gcloud container clusters get-credentials "$GKE_CLUSTER" --zone "$GKE_ZONE" - - # K8s is set up, deploy the app - - name: Deploy the Service - env: - SERVICE: ${{ env.SERVICE_NAME }} - run: | - kubectl delete pod -l app=$SERVICE -n staging - kubectl describe pod -l app=$SERVICE -n staging - - # Send webhook to Wire using Slack Bot - - name: Webhook to Wire - uses: 8398a7/action-slack@v2 - with: - status: ${{ job.status }} - author_name: ${{ env.SERVICE_NAME }} staging pipeline - env: - SLACK_WEBHOOK_URL: ${{ secrets.WEBHOOK_CI }} - # Send message only if previous step failed - if: always() - From be865e2cde0ac277f7f6521f27537a65e6d8d619 Mon Sep 17 00:00:00 2001 From: MarianKijewski Date: Fri, 18 Apr 2025 12:04:14 +0200 Subject: [PATCH 16/16] feat: add dependabot #WPB-17130 --- .github/dependabot.yml | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 .github/dependabot.yml diff --git a/.github/dependabot.yml b/.github/dependabot.yml new file mode 100644 index 0000000..2921bf1 --- /dev/null +++ b/.github/dependabot.yml @@ -0,0 +1,18 @@ +# To get started with Dependabot version updates, you'll need to specify which +# package ecosystems to update and where the package manifests are located. +# Please see the documentation for all configuration options: +# https://docs.github.com/github/administering-a-repository/configuration-options-for-dependency-updates + +version: 2 +updates: + # Maven updates + - package-ecosystem: "gradle" + directory: "/" + schedule: + interval: "weekly" + + # Maintain dependencies for GitHub Actions + - package-ecosystem: "github-actions" + directory: "/" + schedule: + interval: "weekly"