Merge branch 'release/0.3.0' into main

.github/CODEOWNERS

@@ -0,0 +1,10 @@
+backend/ @airyhq/codeowners-backend
+docs/ @airyhq/codeowners-backend @airyhq/codeowners-frontend @airyhq/codeowners-infrastructure
+frontend/ @airyhq/codeowners-frontend
+infrastructure/ @airyhq/codeowners-infrastructure
+lib/go/ @airyhq/codeowners-infrastructure
+lib/java/ @airyhq/codeowners-backend
+lib/typescript/ @airyhq/codeowners-frontend
+scripts/ @airyhq/codeowners-infrastructure
+*.bzl @lucapette @chrismatix
+BUILD @lucapette @chrismatix

.github/pr-labeler.yml

@@ -1,4 +1,4 @@
 feature: ['feature/*', 'feat/*']
 fix: ['bug/*', 'fix/*', 'hotfix/*']
-chore: chore/*
+chore: ['chore/*', 'dependabot/*']
 docs: ['docs/*', 'doc/*']

.prettierrc.json

@@ -11,6 +11,14 @@
       "options": {
         "parser": "typescript"
       }
+    },
+    {
+      "files": "*.md",
+      "options": {
+        "singleQuote": false,
+        "quoteProps": "preserve",
+        "trailingComma": "none"
+      }
     }
   ]
 }

BUILD

@@ -1,11 +1,17 @@
 load("@rules_java//java:defs.bzl", "java_library", "java_plugin")
 load("@io_bazel_rules_docker//container:container.bzl", "container_image")
+load("@com_github_atlassian_bazel_tools//multirun:def.bzl", "multirun")
+load("@bazel_gazelle//:def.bzl", "gazelle")
 
 package(default_visibility = ["//visibility:public"])
 
-alias(
+multirun(
     name = "fix",
-    actual = "//tools/code-format:fix",
+    commands = [
+        "@com_github_airyhq_bazel_tools//code-format:fix_prettier",
+        "@com_github_airyhq_bazel_tools//code-format:fix_buildifier",
+    ],
+    visibility = ["//visibility:public"],
 )
 
 container_image(
@@ -158,6 +164,9 @@ exports_files(
         ".prettierrc.json",
         "yarn.lock",
         "tsconfig.json",
-        "checkstyle.xml",
     ],
 )
+
+# gazelle:build_file_name BUILD
+# gazelle:prefix
+gazelle(name = "gazelle")

CONTRIBUTING.md

@@ -1,9 +1,9 @@
 # Contributing
 
-We love every form of contribution. By participating to this project, you
+We love every form of contribution. By participating in this project, you
 agree to abide to the `Airy` [code of conduct](/code_of_conduct.md).
 
-Please read to our [contribuing guide](/docs/docs/contributing.md) to
+Please read our [contributing guide](/docs/docs/guides/contributing.md) to
 learn how to develop with the `Airy Core Platform` and what conventions we
 follow.
 

README.md

@@ -25,8 +25,8 @@ $ AIRY_VERSION=beta ./scripts/bootstrap.sh
 The bootstrap installation requires
 [Vagrant](https://www.vagrantup.com/downloads) and
 [VirtualBox](https://www.virtualbox.org/wiki/Downloads). If they are not
-found, the script will attempt to install them for you. Check out our [user
-guide](/docs/docs/user-guide.md) for detailed information.
+found, the script will attempt to install them for you. Check out our [test
+deployment guide](/docs/docs/guides/airy-core-in-test-env.md) for detailed information.
 
 ## Components
 
@@ -97,7 +97,7 @@ read more about it [here](/docs/docs/guidelines/design-principles.md)
 We welcome (and love) every form of contribution! Good entry points to the
 project are:
 
-- Our [contributing guidelines](/docs/docs/guidelines/contributing.md)
+- Our [contributing guide](/docs/docs/guides/contributing.md)
 - Issues with the tag
   [gardening](https://github.com/airyhq/airy/issues?q=is%3Aissue+is%3Aopen+label%3Agardening)
 - Issues with the tag [good first

VERSION

@@ -1 +1 @@
-0.2.0
+0.3.0

WORKSPACE

@@ -6,43 +6,31 @@ workspace(
 load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
 load("@bazel_tools//tools/build_defs/repo:git.bzl", "git_repository")
 
-http_archive(
-    name = "bazel_skylib",
-    sha256 = "1c531376ac7e5a180e0237938a2536de0c54d93f5c278634818e0efc952dd56c",
-    urls = [
-        "https://github.com/bazelbuild/bazel-skylib/releases/download/1.0.3/bazel-skylib-1.0.3.tar.gz",
-        "https://mirror.bazel.build/github.com/bazelbuild/bazel-skylib/releases/download/1.0.3/bazel-skylib-1.0.3.tar.gz",
-    ],
+# Airy Bazel tools
+
+git_repository(
+    name = "com_github_airyhq_bazel_tools",
+    commit = "fd79bd3344b9c95a09eaa94597a49069f943e089",
+    remote = "https://github.com/airyhq/bazel-tools.git",
+    shallow_since = "1607079534 +0100",
 )
 
-load("@bazel_skylib//:workspace.bzl", "bazel_skylib_workspace")
+load("@com_github_airyhq_bazel_tools//:repositories.bzl", "airy_bazel_tools_dependencies", "airy_jvm_deps")
 
-bazel_skylib_workspace()
+airy_bazel_tools_dependencies()
 
 ### Java tooling
 
-RULES_JVM_EXTERNAL_TAG = "3.2"
-
-RULES_JVM_EXTERNAL_SHA = "82262ff4223c5fda6fb7ff8bd63db8131b51b413d26eb49e3131037e79e324af"
-
-http_archive(
-    name = "rules_jvm_external",
-    sha256 = RULES_JVM_EXTERNAL_SHA,
-    strip_prefix = "rules_jvm_external-%s" % RULES_JVM_EXTERNAL_TAG,
-    url = "https://github.com/bazelbuild/rules_jvm_external/archive/%s.zip" % RULES_JVM_EXTERNAL_TAG,
-)
-
 load("@rules_jvm_external//:defs.bzl", "maven_install")
 
 maven_install(
-    artifacts = [
+    artifacts = airy_jvm_deps + [
         "com.fasterxml.jackson.core:jackson-annotations:2.10.0",
         "com.fasterxml.jackson.core:jackson-core:2.10.0",
         "com.fasterxml.jackson.core:jackson-databind:2.10.0",
         "com.fasterxml.jackson.module:jackson-module-afterburner:2.10.0",
         "com.google.auth:google-auth-library-oauth2-http:0.20.0",
         "com.jayway.jsonpath:json-path:2.4.0",
-        "com.puppycrawl.tools:checkstyle:8.37",
         "com.twilio.sdk:twilio:7.51.0",
         "cz.habarta.typescript-generator:typescript-generator-core:2.26.723",
         "io.confluent:kafka-avro-serializer:5.5.1",
@@ -60,15 +48,18 @@ maven_install(
         "org.apache.logging.log4j:log4j-core:2.12.1",
         "org.apache.logging.log4j:log4j-slf4j-impl:2.12.1",
         "org.slf4j:slf4j-api:1.7.29",
-        "org.apache.avro:avro-tools:1.9.1",
-        "org.apache.avro:avro:1.9.1",
+        "org.apache.avro:avro-tools:1.10.0",
+        "org.apache.avro:avro:1.10.0",
         "org.apache.curator:curator-test:4.2.0",
         "org.apache.kafka:connect-api:2.5.1",
         "org.apache.kafka:connect-transforms:2.5.1",
         "org.apache.kafka:kafka-clients:2.5.1",
         "org.apache.kafka:kafka-clients:jar:test:2.5.1",
         "org.apache.kafka:kafka-streams:2.5.1",
         "org.apache.kafka:kafka_2.12:2.5.1",
+        "org.apache.lucene:lucene-queryparser:8.7.0",
+        "org.apache.lucene:lucene-analyzers-common:8.7.0",
+        "org.apache.lucene:lucene-core:8.7.0",
         "org.bouncycastle:bcpkix-jdk15on:1.63",
         "org.flywaydb:flyway-core:5.2.4",
         "org.hamcrest:hamcrest-library:2.1",
@@ -124,15 +115,13 @@ load("@maven//:defs.bzl", "pinned_maven_install")
 pinned_maven_install()
 
 ### Golang tooling
-
 # This needs to come before any rules_docker usage as it brings its own version of Gazelle
-
 http_archive(
-    name = "io_bazel_rules_go",
-    sha256 = "a8d6b1b354d371a646d2f7927319974e0f9e52f73a2452d2b3877118169eb6bb",
+    name = "bazel_gazelle",
+    sha256 = "b85f48fa105c4403326e9525ad2b2cc437babaa6e15a3fc0b1dbab0ab064bc7c",
     urls = [
-        "https://mirror.bazel.build/github.com/bazelbuild/rules_go/releases/download/v0.23.3/rules_go-v0.23.3.tar.gz",
-        "https://github.com/bazelbuild/rules_go/releases/download/v0.23.3/rules_go-v0.23.3.tar.gz",
+        "https://mirror.bazel.build/github.com/bazelbuild/bazel-gazelle/releases/download/v0.22.2/bazel-gazelle-v0.22.2.tar.gz",
+        "https://github.com/bazelbuild/bazel-gazelle/releases/download/v0.22.2/bazel-gazelle-v0.22.2.tar.gz",
     ],
 )
 
@@ -142,6 +131,10 @@ go_rules_dependencies()
 
 go_register_toolchains()
 
+load("@bazel_gazelle//:deps.bzl", "gazelle_dependencies")
+
+gazelle_dependencies()
+
 git_repository(
     name = "com_google_protobuf",
     commit = "09745575a923640154bcf307fba8aedff47f240a",
@@ -207,12 +200,6 @@ _go_image_repos()
 
 ### Frontend build tooling
 
-http_archive(
-    name = "build_bazel_rules_nodejs",
-    sha256 = "f9e7b9f42ae202cc2d2ce6d698ccb49a9f7f7ea572a78fd451696d03ef2ee116",
-    urls = ["https://github.com/bazelbuild/rules_nodejs/releases/download/1.6.0/rules_nodejs-1.6.0.tar.gz"],
-)
-
 load("@build_bazel_rules_nodejs//:index.bzl", "node_repositories", "yarn_install")
 
 node_repositories()
@@ -233,12 +220,6 @@ ts_setup_workspace()
 
 ### Bazel tooling
 
-http_archive(
-    name = "com_github_bazelbuild_buildtools",
-    strip_prefix = "buildtools-master",
-    url = "https://github.com/bazelbuild/buildtools/archive/master.zip",
-)
-
 git_repository(
     name = "com_github_atlassian_bazel_tools",
     commit = "dc5e715035b6b17f24f1d40a7eac08f8f2ac8a11",

backend/BUILD

@@ -9,8 +9,8 @@ java_library(
         "//:lombok",
         "//:spring",
         "//:springboot",
-        "//backend/lib/log",
-        "//backend/lib/spring/core:spring-core",
+        "//lib/java/log",
+        "//lib/java/spring/core:spring-core",
     ],
 )
 
@@ -19,54 +19,54 @@ java_library(
     exports = [
         "//:junit",
         "//:springboot_test",
-        "//backend/lib/test",
+        "//lib/java/test",
     ],
 )
 
 java_library(
     name = "channel",
     exports = [
         "//backend/avro/communication:channel",
-        "//backend/lib/kafka/schema:application-communication-channels",
+        "//lib/java/kafka/schema:application-communication-channels",
     ],
 )
 
 java_library(
     name = "message",
     exports = [
         "//backend/avro/communication:message",
-        "//backend/lib/kafka/schema:application-communication-messages",
+        "//lib/java/kafka/schema:application-communication-messages",
     ],
 )
 
 java_library(
     name = "metadata",
     exports = [
         "//backend/avro/communication:metadata-action",
-        "//backend/lib/kafka/schema:application-communication-metadata",
+        "//lib/java/kafka/schema:application-communication-metadata",
     ],
 )
 
 java_library(
     name = "read-receipt",
     exports = [
         "//backend/avro/communication:read-receipt",
-        "//backend/lib/kafka/schema:application-communication-read-receipts",
+        "//lib/java/kafka/schema:application-communication-read-receipts",
     ],
 )
 
 java_library(
     name = "tag",
     exports = [
         "//backend/avro/communication:tag",
-        "//backend/lib/kafka/schema:application-communication-tags",
+        "//lib/java/kafka/schema:application-communication-tags",
     ],
 )
 
 java_library(
     name = "webhook",
     exports = [
         "//backend/avro/communication:webhook",
-        "//backend/lib/kafka/schema:application-communication-webhooks",
+        "//lib/java/kafka/schema:application-communication-webhooks",
     ],
 )

backend/api/admin/BUILD

@@ -8,12 +8,12 @@ app_deps = [
     "//backend:channel",
     "//backend:tag",
     "//backend:webhook",
-    "//backend/lib/payload",
-    "//backend/lib/uuid",
-    "//backend/lib/spring/auth:spring-auth",
-    "//backend/lib/spring/web:spring-web",
-    "//backend/lib/spring/kafka/core:spring-kafka-core",
-    "//backend/lib/spring/kafka/streams:spring-kafka-streams",
+    "//lib/java/payload",
+    "//lib/java/uuid",
+    "//lib/java/spring/auth:spring-auth",
+    "//lib/java/spring/web:spring-web",
+    "//lib/java/spring/kafka/core:spring-kafka-core",
+    "//lib/java/spring/kafka/streams:spring-kafka-streams",
 ]
 
 springboot(
@@ -31,8 +31,8 @@ springboot(
         deps = [
             ":app",
             "//backend:base_test",
-            "//backend/lib/kafka/test:kafka-test",
-            "//backend/lib/spring/test:spring-test",
+            "//lib/java/kafka/test:kafka-test",
+            "//lib/java/spring/test:spring-test",
         ] + app_deps,
     )
     for file in glob(["src/test/java/**/*Test.java"])

backend/api/admin/src/main/java/co/airy/core/api/admin/sources/twilio/TwilioWhatsappSource.java

@@ -1,7 +1,6 @@
 package co.airy.core.api.admin.sources.twilio;
 
 import co.airy.core.api.admin.Source;
-import co.airy.core.api.admin.SourceApiException;
 import co.airy.core.api.admin.dto.ChannelMetadata;
 import org.springframework.stereotype.Service;
 

backend/api/admin/src/main/resources/application.properties

@@ -3,6 +3,6 @@ kafka.schema-registry-url=${KAFKA_SCHEMA_REGISTRY_URL}
 kafka.cleanup=${KAFKA_CLEANUP:false}
 kafka.commit-interval-ms=${KAFKA_COMMIT_INTERVAL_MS:30000}
 
-facebook.app-id=${FB_APP_ID}
-facebook.app-secret=${FB_APP_SECRET}
-auth.jwt-secret=${JWT_SECRET}
+facebook.app-id=${FACEBOOK_APP_ID}
+facebook.app-secret=${FACEBOOK_APP_SECRET}
+auth.jwt-secret=${JWT_SECRET}

backend/api/admin/src/test/java/co/airy/core/api/admin/WebhooksControllerTest.java

@@ -28,7 +28,9 @@
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
 
 @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT, classes = AirySpringBootApplication.class)
-@TestPropertySource(value = "classpath:test.properties")
+@TestPropertySource(value = "classpath:test.properties", properties = {
+        "ALLOWED_ORIGINS=origin1,origin2",
+})
 @AutoConfigureMockMvc
 @ExtendWith(SpringExtension.class)
 public class WebhooksControllerTest {

backend/api/auth/BUILD

@@ -6,10 +6,10 @@ app_deps = [
     "//backend:base_app",
     "//:springboot_actuator",
     "//:jdbi",
-    "//backend/lib/payload",
-    "//backend/lib/spring/auth:spring-auth",
-    "//backend/lib/spring/web:spring-web",
-    "//backend/lib/pagination",
+    "//lib/java/payload",
+    "//lib/java/spring/auth:spring-auth",
+    "//lib/java/spring/web:spring-web",
+    "//lib/java/pagination",
     "@maven//:org_bouncycastle_bcpkix_jdk15on",
     "@maven//:org_flywaydb_flyway_core",
     "@maven//:org_postgresql_postgresql",
@@ -35,7 +35,7 @@ springboot(
         deps = [
             ":app",
             "//backend:base_test",
-            "//backend/lib/spring/test:spring-test",
+            "//lib/java/spring/test:spring-test",
             "@maven//:io_zonky_test_embedded_database_spring_test",
         ] + app_deps,
     )

backend/api/auth/src/main/java/co/airy/core/api/auth/controllers/UsersController.java

@@ -15,10 +15,10 @@
 import co.airy.core.api.auth.dto.User;
 import co.airy.core.api.auth.services.Mail;
 import co.airy.core.api.auth.services.Password;
+import co.airy.spring.jwt.Jwt;
 import co.airy.payload.response.EmptyResponsePayload;
 import co.airy.payload.response.RequestErrorResponsePayload;
 import co.airy.spring.auth.IgnoreAuthPattern;
-import co.airy.spring.auth.Jwt;
 import org.jdbi.v3.core.statement.UnableToExecuteStatementException;
 import org.springframework.context.annotation.Bean;
 import org.springframework.http.HttpStatus;