From 3a59966807d50cd925e16c50e1571c2ac6b22a4a Mon Sep 17 00:00:00 2001 From: ljupcovangelski Date: Tue, 28 Sep 2021 14:16:23 +0200 Subject: [PATCH 1/9] Bump version to 0.32.1-alpha --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index f176c94419..d7ae956f48 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -0.31.1 +0.32.1-alpha From 6b4b73db4b207e35bb867093ab668566348b00f5 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 28 Sep 2021 17:48:48 +0200 Subject: [PATCH 2/9] Bump @typescript-eslint/parser from 4.31.0 to 4.31.2 (#2439) Bumps [@typescript-eslint/parser](https://github.com/typescript-eslint/typescript-eslint/tree/HEAD/packages/parser) from 4.31.0 to 4.31.2. - [Release notes](https://github.com/typescript-eslint/typescript-eslint/releases) - [Changelog](https://github.com/typescript-eslint/typescript-eslint/blob/master/packages/parser/CHANGELOG.md) - [Commits](https://github.com/typescript-eslint/typescript-eslint/commits/v4.31.2/packages/parser) --- updated-dependencies: - dependency-name: "@typescript-eslint/parser" dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package.json | 2 +- yarn.lock | 50 ++++++++++++++++++++++++++++++++++++++++++-------- 2 files changed, 43 insertions(+), 9 deletions(-) diff --git a/package.json b/package.json index a777da7039..8eb7298318 100644 --- a/package.json +++ b/package.json @@ -45,7 +45,7 @@ "@types/react-window-infinite-loader": "^1.0.5", "@types/resize-observer-browser": "^0.1.6", "@typescript-eslint/eslint-plugin": "^4.31.0", - "@typescript-eslint/parser": "^4.31.0", + "@typescript-eslint/parser": "^4.31.2", "babel-loader": "^8.0.6", "copy-webpack-plugin": "^9.0.1", "css-loader": "^6.2.0", diff --git a/yarn.lock b/yarn.lock index 7283f9d7f9..fbefe1e378 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1654,14 +1654,14 @@ eslint-scope "^5.1.1" eslint-utils "^3.0.0" -"@typescript-eslint/parser@^4.31.0": - version "4.31.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-4.31.0.tgz#87b7cd16b24b9170c77595d8b1363f8047121e05" - integrity sha512-oWbzvPh5amMuTmKaf1wp0ySxPt2ZXHnFQBN2Szu1O//7LmOvgaKTCIDNLK2NvzpmVd5A2M/1j/rujBqO37hj3w== - dependencies: - "@typescript-eslint/scope-manager" "4.31.0" - "@typescript-eslint/types" "4.31.0" - "@typescript-eslint/typescript-estree" "4.31.0" +"@typescript-eslint/parser@^4.31.2": + version "4.31.2" + resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-4.31.2.tgz#54aa75986e3302d91eff2bbbaa6ecfa8084e9c34" + integrity sha512-EcdO0E7M/sv23S/rLvenHkb58l3XhuSZzKf6DBvLgHqOYdL6YFMYVtreGFWirxaU2mS1GYDby3Lyxco7X5+Vjw== + dependencies: + "@typescript-eslint/scope-manager" "4.31.2" + "@typescript-eslint/types" "4.31.2" + "@typescript-eslint/typescript-estree" "4.31.2" debug "^4.3.1" "@typescript-eslint/scope-manager@4.31.0": @@ -1672,11 +1672,24 @@ "@typescript-eslint/types" "4.31.0" "@typescript-eslint/visitor-keys" "4.31.0" +"@typescript-eslint/scope-manager@4.31.2": + version "4.31.2" + resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-4.31.2.tgz#1d528cb3ed3bcd88019c20a57c18b897b073923a" + integrity sha512-2JGwudpFoR/3Czq6mPpE8zBPYdHWFGL6lUNIGolbKQeSNv4EAiHaR5GVDQaLA0FwgcdcMtRk+SBJbFGL7+La5w== + dependencies: + "@typescript-eslint/types" "4.31.2" + "@typescript-eslint/visitor-keys" "4.31.2" + "@typescript-eslint/types@4.31.0": version "4.31.0" resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-4.31.0.tgz#9a7c86fcc1620189567dc4e46cad7efa07ee8dce" integrity sha512-9XR5q9mk7DCXgXLS7REIVs+BaAswfdHhx91XqlJklmqWpTALGjygWVIb/UnLh4NWhfwhR5wNe1yTyCInxVhLqQ== +"@typescript-eslint/types@4.31.2": + version "4.31.2" + resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-4.31.2.tgz#2aea7177d6d744521a168ed4668eddbd912dfadf" + integrity sha512-kWiTTBCTKEdBGrZKwFvOlGNcAsKGJSBc8xLvSjSppFO88AqGxGNYtF36EuEYG6XZ9vT0xX8RNiHbQUKglbSi1w== + "@typescript-eslint/typescript-estree@4.31.0": version "4.31.0" resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-4.31.0.tgz#4da4cb6274a7ef3b21d53f9e7147cc76f278a078" @@ -1690,6 +1703,19 @@ semver "^7.3.5" tsutils "^3.21.0" +"@typescript-eslint/typescript-estree@4.31.2": + version "4.31.2" + resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-4.31.2.tgz#abfd50594d8056b37e7428df3b2d185ef2d0060c" + integrity sha512-ieBq8U9at6PvaC7/Z6oe8D3czeW5d//Fo1xkF/s9394VR0bg/UaMYPdARiWyKX+lLEjY3w/FNZJxitMsiWv+wA== + dependencies: + "@typescript-eslint/types" "4.31.2" + "@typescript-eslint/visitor-keys" "4.31.2" + debug "^4.3.1" + globby "^11.0.3" + is-glob "^4.0.1" + semver "^7.3.5" + tsutils "^3.21.0" + "@typescript-eslint/visitor-keys@4.31.0": version "4.31.0" resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-4.31.0.tgz#4e87b7761cb4e0e627dc2047021aa693fc76ea2b" @@ -1698,6 +1724,14 @@ "@typescript-eslint/types" "4.31.0" eslint-visitor-keys "^2.0.0" +"@typescript-eslint/visitor-keys@4.31.2": + version "4.31.2" + resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-4.31.2.tgz#7d5b4a4705db7fe59ecffb273c1d082760f635cc" + integrity sha512-PrBId7EQq2Nibns7dd/ch6S6/M4/iwLM9McbgeEbCXfxdwRUNxJ4UNreJ6Gh3fI2GNKNrWnQxKL7oCPmngKBug== + dependencies: + "@typescript-eslint/types" "4.31.2" + eslint-visitor-keys "^2.0.0" + "@webassemblyjs/ast@1.11.1": version "1.11.1" resolved "https://registry.yarnpkg.com/@webassemblyjs/ast/-/ast-1.11.1.tgz#2bfd767eae1a6996f432ff7e8d7fc75679c0b6a7" From df57ab15fb044caa7717b4980b1a1c173115fedc Mon Sep 17 00:00:00 2001 From: Christoph Proeschel Date: Wed, 29 Sep 2021 12:47:29 +0200 Subject: [PATCH 3/9] [#2434] Fix instagram echo ingestion (#2451) --- .../main/java/co/airy/core/sources/facebook/MessageMapper.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/backend/sources/facebook/events-router/src/main/java/co/airy/core/sources/facebook/MessageMapper.java b/backend/sources/facebook/events-router/src/main/java/co/airy/core/sources/facebook/MessageMapper.java index d497d7adde..7b2e3204dd 100644 --- a/backend/sources/facebook/events-router/src/main/java/co/airy/core/sources/facebook/MessageMapper.java +++ b/backend/sources/facebook/events-router/src/main/java/co/airy/core/sources/facebook/MessageMapper.java @@ -73,7 +73,7 @@ public List> getRecords(Event event, } else if (appId != null && !appId.equals(this.facebookAppId)) { // Third party app senderId = appId; - } else if (appId == null && !"instagram".equals(channel.getSource())) { + } else if (appId == null) { // Sent by Facebook moderator via Facebook inbox senderId = getSourceConversationId(rootNode); } else { From 1f08db58df01dd346aa92b491ff39c8c46f5f2b4 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 29 Sep 2021 13:06:51 +0200 Subject: [PATCH 4/9] Bump core-js from 3.17.2 to 3.18.1 (#2438) Bumps [core-js](https://github.com/zloirock/core-js) from 3.17.2 to 3.18.1. - [Release notes](https://github.com/zloirock/core-js/releases) - [Changelog](https://github.com/zloirock/core-js/blob/master/CHANGELOG.md) - [Commits](https://github.com/zloirock/core-js/compare/v3.17.2...v3.18.1) --- updated-dependencies: - dependency-name: core-js dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index 8eb7298318..d2fd9d6904 100644 --- a/package.json +++ b/package.json @@ -12,7 +12,7 @@ "@types/react-redux": "7.1.18", "@types/react-router-dom": "^5.1.8", "camelcase-keys": "^7.0.0", - "core-js": "3.17.2", + "core-js": "3.18.1", "emoji-mart": "3.0.1", "linkifyjs": "^2.1.9", "lodash-es": "^4.17.21", diff --git a/yarn.lock b/yarn.lock index fbefe1e378..388ebf773c 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2792,10 +2792,10 @@ core-js-compat@^3.16.0, core-js-compat@^3.9.1: browserslist "^4.16.6" semver "7.0.0" -core-js@3.17.2: - version "3.17.2" - resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.17.2.tgz#f960eae710dc62c29cca93d5332e3660e289db10" - integrity sha512-XkbXqhcXeMHPRk2ItS+zQYliAMilea2euoMsnpRRdDad6b2VY6CQQcwz1K8AnWesfw4p165RzY0bTnr3UrbYiA== +core-js@3.18.1: + version "3.18.1" + resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.18.1.tgz#289d4be2ce0085d40fc1244c0b1a54c00454622f" + integrity sha512-vJlUi/7YdlCZeL6fXvWNaLUPh/id12WXj3MbkMw5uOyF0PfWPBNOCNbs53YqgrvtujLNlt9JQpruyIKkUZ+PKA== core-util-is@1.0.2, core-util-is@~1.0.0: version "1.0.2" From 8a5f845b9e57f997ae3c2dd9307b87183f5f739d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 29 Sep 2021 13:07:20 +0200 Subject: [PATCH 5/9] Bump webpack from 5.51.1 to 5.54.0 (#2440) Bumps [webpack](https://github.com/webpack/webpack) from 5.51.1 to 5.54.0. - [Release notes](https://github.com/webpack/webpack/releases) - [Commits](https://github.com/webpack/webpack/compare/v5.51.1...v5.54.0) --- updated-dependencies: - dependency-name: webpack dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package.json | 2 +- yarn.lock | 28 ++++++++++++++-------------- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/package.json b/package.json index d2fd9d6904..349547ac23 100644 --- a/package.json +++ b/package.json @@ -63,7 +63,7 @@ "terser-webpack-plugin": "^5.2.4", "typescript": "4.2.4", "url-loader": "^4.1.1", - "webpack": "5.51.1", + "webpack": "5.54.0", "webpack-bundle-analyzer": "^4.4.2", "webpack-cli": "^4.8.0", "webpack-dev-server": "^3.11.2" diff --git a/yarn.lock b/yarn.lock index 388ebf773c..2877469d09 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3268,10 +3268,10 @@ end-of-stream@^1.1.0: dependencies: once "^1.4.0" -enhanced-resolve@^5.8.0: - version "5.8.0" - resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-5.8.0.tgz#d9deae58f9d3773b6a111a5a46831da5be5c9ac0" - integrity sha512-Sl3KRpJA8OpprrtaIswVki3cWPiPKxXuFxJXBp+zNb6s6VwNWwFRUdtmzd2ReUut8n+sCPx7QCtQ7w5wfJhSgQ== +enhanced-resolve@^5.8.3: + version "5.8.3" + resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-5.8.3.tgz#6d552d465cce0423f5b3d718511ea53826a7b2f0" + integrity sha512-EGAbGvH7j7Xt2nc0E7D99La1OiEs8LnyimkRgwExpUMScN6O+3x9tIWs7PLQZVNx4YD+00skHXPXi1yQHpAmZA== dependencies: graceful-fs "^4.2.4" tapable "^2.2.0" @@ -3351,10 +3351,10 @@ es-abstract@^1.18.2: string.prototype.trimstart "^1.0.4" unbox-primitive "^1.0.1" -es-module-lexer@^0.7.1: - version "0.7.1" - resolved "https://registry.yarnpkg.com/es-module-lexer/-/es-module-lexer-0.7.1.tgz#c2c8e0f46f2df06274cdaf0dd3f3b33e0a0b267d" - integrity sha512-MgtWFl5No+4S3TmhDmCz2ObFGm6lEpTnzbQi+Dd+pw4mlTIZTmM2iAs5gRlmx5zS9luzobCSBSI90JM/1/JgOw== +es-module-lexer@^0.9.0: + version "0.9.1" + resolved "https://registry.yarnpkg.com/es-module-lexer/-/es-module-lexer-0.9.1.tgz#f203bf394a630a552d381acf01a17ef08843b140" + integrity sha512-17Ed9misDnpyNBJh63g1OhW3qUFecDgGOivI85JeZY/LGhDum8e+cltukbkSK8pcJnXXEkya56sp4vSS1nzoUw== es-to-primitive@^1.2.1: version "1.2.1" @@ -8004,10 +8004,10 @@ webpack-sources@^3.2.0: resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-3.2.0.tgz#b16973bcf844ebcdb3afde32eda1c04d0b90f89d" integrity sha512-fahN08Et7P9trej8xz/Z7eRu8ltyiygEo/hnRi9KqBUs80KeDcnf96ZJo++ewWd84fEf3xSX9bp4ZS9hbw0OBw== -webpack@5.51.1: - version "5.51.1" - resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.51.1.tgz#41bebf38dccab9a89487b16dbe95c22e147aac57" - integrity sha512-xsn3lwqEKoFvqn4JQggPSRxE4dhsRcysWTqYABAZlmavcoTmwlOb9b1N36Inbt/eIispSkuHa80/FJkDTPos1A== +webpack@5.54.0: + version "5.54.0" + resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.54.0.tgz#629f0cd14c7a4340af758a3c7cef25c50670ae4d" + integrity sha512-MAVKJMsIUotOQKzFOmN8ZkmMlj7BOyjDU6t1lomW9dWOme5WTStzGa3HMLdV1KYD1AiFETGsznL4LMSvj4tukw== dependencies: "@types/eslint-scope" "^3.7.0" "@types/estree" "^0.0.50" @@ -8018,8 +8018,8 @@ webpack@5.51.1: acorn-import-assertions "^1.7.6" browserslist "^4.14.5" chrome-trace-event "^1.0.2" - enhanced-resolve "^5.8.0" - es-module-lexer "^0.7.1" + enhanced-resolve "^5.8.3" + es-module-lexer "^0.9.0" eslint-scope "5.1.1" events "^3.2.0" glob-to-regexp "^0.4.1" From aa920bb0ebe75b16acd28d9031500e8ddd70ada3 Mon Sep 17 00:00:00 2001 From: Ljupco Vangelski Date: Thu, 30 Sep 2021 10:00:03 +0200 Subject: [PATCH 6/9] [#2390] Remove unnecessary annotations (#2452) --- .../helm-chart/charts/ingress-controller/templates/service.yaml | 2 -- 1 file changed, 2 deletions(-) diff --git a/infrastructure/helm-chart/charts/ingress-controller/templates/service.yaml b/infrastructure/helm-chart/charts/ingress-controller/templates/service.yaml index 5874605572..16cbf010b8 100644 --- a/infrastructure/helm-chart/charts/ingress-controller/templates/service.yaml +++ b/infrastructure/helm-chart/charts/ingress-controller/templates/service.yaml @@ -6,8 +6,6 @@ metadata: {{ if eq .Values.global.ingress.httpsTermination "LoadBalancer" }} {{ if .Values.global.ingress.httpsCertificate }} service.beta.kubernetes.io/aws-load-balancer-backend-protocol: http - service.beta.kubernetes.io/aws-load-balancer-connection-idle-timeout: '60' - service.beta.kubernetes.io/aws-load-balancer-cross-zone-load-balancing-enabled: 'true' service.beta.kubernetes.io/aws-load-balancer-ssl-cert: {{ .Values.global.ingress.httpsCertificate }} service.beta.kubernetes.io/aws-load-balancer-ssl-ports: https {{ end }} From 983df9979c470c2e62d4d8dfca79b17ba7a1a157 Mon Sep 17 00:00:00 2001 From: Pascal Holy <54705263+pascal-airy@users.noreply.github.com> Date: Thu, 30 Sep 2021 11:05:41 +0200 Subject: [PATCH 7/9] [#2423] track core installation (#2430) Resolves #2423 --- cli/go.mod | 3 +++ cli/go.sum | 6 +++++ cli/pkg/cmd/create/BUILD | 1 + cli/pkg/cmd/create/create.go | 36 +++++++++++++++++++------- cli/pkg/console/BUILD | 4 +++ cli/pkg/console/segment.go | 25 ++++++++++++++++++ cli/pkg/providers/BUILD | 1 + cli/pkg/providers/aws/BUILD | 1 + cli/pkg/providers/aws/aws.go | 12 +++++++-- cli/pkg/providers/minikube/BUILD | 2 ++ cli/pkg/providers/minikube/minikube.go | 23 +++++++++++++--- cli/pkg/providers/provider.go | 7 ++--- cli/pkg/workspace/airy_yaml.go | 2 -- docs/docs/cli/usage.md | 1 + go.mod | 3 +++ go.sum | 6 +++++ go_repositories.bzl | 18 +++++++++++++ scripts/dev_cli.sh | 2 +- 18 files changed, 131 insertions(+), 22 deletions(-) create mode 100644 cli/pkg/console/segment.go diff --git a/cli/go.mod b/cli/go.mod index 7e4635098d..1d91a1b46e 100644 --- a/cli/go.mod +++ b/cli/go.mod @@ -19,12 +19,15 @@ require ( github.com/kr/pretty v0.2.1 github.com/mitchellh/copystructure v1.1.2 // indirect github.com/mitchellh/go-homedir v1.1.0 + github.com/segmentio/backo-go v0.0.0-20200129164019-23eae7c10bd3 // indirect github.com/spf13/cast v1.3.1 // indirect github.com/spf13/cobra v1.1.1 github.com/spf13/viper v1.7.1 github.com/thanhpk/randstr v1.0.4 github.com/txn2/txeh v1.3.0 + github.com/xtgo/uuid v0.0.0-20140804021211-a0b114877d4c // indirect goji.io v2.0.2+incompatible + gopkg.in/segmentio/analytics-go.v3 v3.1.0 // indirect gopkg.in/yaml.v2 v2.4.0 k8s.io/api v0.19.0 k8s.io/apimachinery v0.19.0 diff --git a/cli/go.sum b/cli/go.sum index b9d07712f6..633adc3c15 100644 --- a/cli/go.sum +++ b/cli/go.sum @@ -285,6 +285,8 @@ github.com/russross/blackfriday v1.5.2/go.mod h1:JO/DiYxRf+HjHt06OyowR9PTA263kcR github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= github.com/ryanuber/columnize v0.0.0-20160712163229-9b3edd62028f/go.mod h1:sm1tb6uqfes/u+d4ooFouqFdy9/2g9QGwK3SQygK0Ts= github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod h1:DxrIzT+xaE7yg65j358z/aeFdxmN0P9QXhEzd20vsDc= +github.com/segmentio/backo-go v0.0.0-20200129164019-23eae7c10bd3 h1:ZuhckGJ10ulaKkdvJtiAqsLTiPrLaXSdnVgXJKJkTxE= +github.com/segmentio/backo-go v0.0.0-20200129164019-23eae7c10bd3/go.mod h1:9/Rh6yILuLysoQnZ2oNooD2g7aBnvM7r/fNVxRNWfBc= github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc= github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo= github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc= @@ -326,6 +328,8 @@ github.com/txn2/txeh v1.3.0/go.mod h1:O7M6gUTPeMF+vsa4c4Ipx3JDkOYrruB1Wry8QRsMcw github.com/ugorji/go/codec v0.0.0-20181204163529-d75b2dcb6bc8/go.mod h1:VFNgLljTbGfSG7qAOspJ7OScBnGdDN/yBr0sguwnwf0= github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod h1:UETIi67q53MR2AWcXfiuqkDkRtnGDLqkBTpCHuJHxtU= github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77/go.mod h1:aYKd//L2LvnjZzWKhF00oedf4jCCReLcmhLdhm1A27Q= +github.com/xtgo/uuid v0.0.0-20140804021211-a0b114877d4c h1:3lbZUMbMiGUW/LMkfsEABsc5zNT9+b1CvsJx47JzJ8g= +github.com/xtgo/uuid v0.0.0-20140804021211-a0b114877d4c/go.mod h1:UrdRz5enIKZ63MEE3IF9l2/ebyx59GyGgPi+tICQdmM= go.etcd.io/bbolt v1.3.2/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU= go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU= go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8= @@ -504,6 +508,8 @@ gopkg.in/inf.v0 v0.9.1/go.mod h1:cWUDdTG/fYaXco+Dcufb5Vnc6Gp2YChqWtbxRZE0mXw= gopkg.in/ini.v1 v1.51.0 h1:AQvPpx3LzTDM0AjnIRlVFwFFGC+npRopjZxLJj6gdno= gopkg.in/ini.v1 v1.51.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= gopkg.in/resty.v1 v1.12.0/go.mod h1:mDo4pnntr5jdWRML875a/NmxYqAlA73dVijT2AXvQQo= +gopkg.in/segmentio/analytics-go.v3 v3.1.0 h1:UzxH1uaGZRpMKDhJyBz0pexz6yUoBU3x8bJsRk/HV6U= +gopkg.in/segmentio/analytics-go.v3 v3.1.0/go.mod h1:4QqqlTlSSpVlWA9/9nDcPw+FkM2yv1NQoYjUbL9/JAw= gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw= gopkg.in/yaml.v2 v2.0.0-20170812160011-eb3733d160e7/go.mod h1:JAlM8MvJe8wmxCU4Bli9HhUf9+ttbYbLASfIpnQbh74= gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= diff --git a/cli/pkg/cmd/create/BUILD b/cli/pkg/cmd/create/BUILD index 83b32bd197..38cc159ade 100644 --- a/cli/pkg/cmd/create/BUILD +++ b/cli/pkg/cmd/create/BUILD @@ -21,6 +21,7 @@ go_library( "@com_github_spf13_cobra//:cobra", "@com_github_spf13_viper//:viper", "@com_github_twinproduction_go_color//:go-color", + "@in_gopkg_segmentio_analytics_go_v3//:analytics-go_v3", "@io_k8s_api//batch/v1:go_default_library", "@io_k8s_api//core/v1:go_default_library", "@io_k8s_api//rbac/v1:go_default_library", diff --git a/cli/pkg/cmd/create/create.go b/cli/pkg/cmd/create/create.go index f364b67d9b..64820e2443 100644 --- a/cli/pkg/cmd/create/create.go +++ b/cli/pkg/cmd/create/create.go @@ -9,20 +9,23 @@ import ( "cli/pkg/workspace" "fmt" "os" + "runtime" "github.com/TwinProduction/go-color" "github.com/spf13/cobra" "github.com/spf13/viper" + "gopkg.in/segmentio/analytics-go.v3" ) var ( - providerName string - providerConfig map[string]string - namespace string - version string - initOnly bool - noApply bool - CreateCmd = &cobra.Command{ + providerName string + providerConfig map[string]string + namespace string + version string + initOnly bool + noApply bool + disableTracking bool + CreateCmd = &cobra.Command{ Use: "create [workspace directory]", Short: "Creates an instance of Airy Core", Long: `Creates a workspace directory (default .) with default configuration and starts an Airy Core instance using the given provider`, @@ -37,6 +40,7 @@ func init() { CreateCmd.Flags().StringVar(&namespace, "namespace", "default", "(optional) Kubernetes namespace that Airy should be installed to.") CreateCmd.Flags().BoolVar(&initOnly, "init-only", false, "Only create the airy workspace directory and exit.") CreateCmd.Flags().BoolVar(&noApply, "no-apply", false, "Don't apply any component configuration found in an existing airy.yaml file after creation.") + CreateCmd.Flags().BoolVar(&disableTracking, "disable-tracking", false, "Disables sending anonymous events to Segment.") CreateCmd.MarkFlagRequired("provider") } @@ -49,7 +53,16 @@ func create(cmd *cobra.Command, args []string) { w := console.GetMiddleware(func(input string) string { return color.Colorize(color.Cyan, "#\t"+input) }) - provider := providers.MustGet(providers.ProviderName(providerName), w) + + var rtm runtime.MemStats + runtime.ReadMemStats(&rtm) + + airyAnalytics := console.NewAiryAnalytics(disableTracking) + airyAnalytics.Track(analytics.Track{ + AnonymousId: "AiryUser", + Event: "installation_started", + }) + provider := providers.MustGet(providers.ProviderName(providerName), w, airyAnalytics) overrides := provider.GetOverrides() overrides.Version = version overrides.Namespace = namespace @@ -58,7 +71,7 @@ func create(cmd *cobra.Command, args []string) { console.Exit("could not initialize Airy workspace directory", err) } fmt.Println("πŸ“ Initialized Airy workspace directory at", dir.GetPath(".")) - if initOnly == true { + if initOnly { os.Exit(0) } @@ -117,11 +130,14 @@ func create(cmd *cobra.Command, args []string) { viper.Set("namespace", namespace) viper.WriteConfig() - if noApply != true { + if !noApply { fmt.Println("βš™οΈ Applying config from airy.yaml") config.ApplyConfig(workspacePath) } + airyAnalytics.Track(analytics.Track{ + AnonymousId: "AiryUser", + Event: "installation_succesful"}) fmt.Printf("πŸ“š For more information about the %s provider visit https://airy.co/docs/core/getting-started/installation/%s", providerName, providerName) fmt.Println() } diff --git a/cli/pkg/console/BUILD b/cli/pkg/console/BUILD index 92bd7d2e7e..eb4ce0bf53 100644 --- a/cli/pkg/console/BUILD +++ b/cli/pkg/console/BUILD @@ -5,7 +5,11 @@ go_library( srcs = [ "failure.go", "output.go", + "segment.go", ], importpath = "cli/pkg/console", visibility = ["//visibility:public"], + deps = [ + "@in_gopkg_segmentio_analytics_go_v3//:analytics-go_v3", + ], ) diff --git a/cli/pkg/console/segment.go b/cli/pkg/console/segment.go new file mode 100644 index 0000000000..c6347d26f9 --- /dev/null +++ b/cli/pkg/console/segment.go @@ -0,0 +1,25 @@ +package console + +import ( + "fmt" + + "gopkg.in/segmentio/analytics-go.v3" +) + +type AiryAnalytics struct { + client analytics.Client + disableTracking bool +} + +func NewAiryAnalytics(disableTracking bool) *AiryAnalytics { + return &AiryAnalytics{client: analytics.New("7OOYJk8lQ2jfmZXKz5jJuvcK50BNDHit"), disableTracking: disableTracking} +} + +func (a *AiryAnalytics) Track(message analytics.Message) { + if !a.disableTracking { + err := a.client.Enqueue(message) + if err != nil { + fmt.Println(err) + } + } +} diff --git a/cli/pkg/providers/BUILD b/cli/pkg/providers/BUILD index 12fdc8eabf..b6a59adcc8 100644 --- a/cli/pkg/providers/BUILD +++ b/cli/pkg/providers/BUILD @@ -6,6 +6,7 @@ go_library( importpath = "cli/pkg/providers", visibility = ["//visibility:public"], deps = [ + "//cli/pkg/console", "//cli/pkg/kube", "//cli/pkg/providers/aws", "//cli/pkg/providers/minikube", diff --git a/cli/pkg/providers/aws/BUILD b/cli/pkg/providers/aws/BUILD index 0f2e9a043e..830b6e2c51 100644 --- a/cli/pkg/providers/aws/BUILD +++ b/cli/pkg/providers/aws/BUILD @@ -26,6 +26,7 @@ go_library( "@com_github_aws_aws_sdk_go_v2_service_iam//:iam", "@com_github_aws_aws_sdk_go_v2_service_iam//types", "@com_github_twinproduction_go_color//:go-color", + "@in_gopkg_segmentio_analytics_go_v3//:analytics-go_v3", "@io_k8s_apimachinery//pkg/apis/meta/v1:go_default_library", ], ) diff --git a/cli/pkg/providers/aws/aws.go b/cli/pkg/providers/aws/aws.go index 71a9ee8cd8..676bc2cb7d 100644 --- a/cli/pkg/providers/aws/aws.go +++ b/cli/pkg/providers/aws/aws.go @@ -14,6 +14,7 @@ import ( "text/template" "time" + "gopkg.in/segmentio/analytics-go.v3" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "github.com/TwinProduction/go-color" @@ -35,11 +36,13 @@ type provider struct { ec2Client *ec2.Client iamClient *iam.Client eksClient *eks.Client + analytics console.AiryAnalytics } -func New(w io.Writer) *provider { +func New(w io.Writer, analytics *console.AiryAnalytics) *provider { return &provider{ - w: w, + w: w, + analytics: *analytics, } } @@ -66,6 +69,11 @@ func (p *provider) Provision(providerConfig map[string]string, dir workspace.Con } id := RandString(8) + p.analytics.Track(analytics.Identify{ + UserId: id, + Traits: analytics.NewTraits(). + Set("provider", "AWS"), + }) name := "Airy-" + id fmt.Fprintf(p.w, "Creating Airy Core instance with id: %s. This might take a while.\n", name) p.iamClient = iam.NewFromConfig(cfg) diff --git a/cli/pkg/providers/minikube/BUILD b/cli/pkg/providers/minikube/BUILD index d01045276f..5c4a40a40f 100644 --- a/cli/pkg/providers/minikube/BUILD +++ b/cli/pkg/providers/minikube/BUILD @@ -9,10 +9,12 @@ go_library( importpath = "cli/pkg/providers/minikube", visibility = ["//visibility:public"], deps = [ + "//cli/pkg/console", "//cli/pkg/kube", "//cli/pkg/workspace", "//cli/pkg/workspace/template", "@com_github_txn2_txeh//:txeh", + "@in_gopkg_segmentio_analytics_go_v3//:analytics-go_v3", "@io_k8s_apimachinery//pkg/apis/meta/v1:go_default_library", "@io_k8s_client_go//util/homedir:go_default_library", ], diff --git a/cli/pkg/providers/minikube/minikube.go b/cli/pkg/providers/minikube/minikube.go index 5acca272bf..67e4204a36 100644 --- a/cli/pkg/providers/minikube/minikube.go +++ b/cli/pkg/providers/minikube/minikube.go @@ -1,6 +1,7 @@ package minikube import ( + "cli/pkg/console" "cli/pkg/kube" "cli/pkg/workspace" "cli/pkg/workspace/template" @@ -9,8 +10,10 @@ import ( "io" "os/exec" "path/filepath" + "runtime" "strings" + "gopkg.in/segmentio/analytics-go.v3" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/client-go/util/homedir" ) @@ -22,13 +25,15 @@ const ( ) type provider struct { - context kube.KubeCtx - w io.Writer + context kube.KubeCtx + w io.Writer + analytics console.AiryAnalytics } -func New(w io.Writer) *provider { +func New(w io.Writer, analytics *console.AiryAnalytics) *provider { return &provider{ - w: w, + w: w, + analytics: *analytics, } } @@ -44,6 +49,7 @@ func (p *provider) Provision(providerConfig map[string]string, dir workspace.Con return kube.KubeCtx{}, err } + if err := p.startCluster(); err != nil { return kube.KubeCtx{}, err } @@ -121,6 +127,15 @@ func (p *provider) PostInstallation(providerConfig map[string]string, dir worksp if err != nil { return err } + + p.analytics.Track(analytics.Identify{ + UserId: coreId, + Traits: analytics.NewTraits(). + Set("provider", "minikube"). + Set("numCpu", runtime.NumCPU()), + }, + ) + ngrokEndpoint := fmt.Sprintf("https://%s.tunnel.airy.co", strings.Trim(coreId, "'")) configMap.Data["NGROK"] = ngrokEndpoint diff --git a/cli/pkg/providers/provider.go b/cli/pkg/providers/provider.go index fd9fe4ff23..a00cba904d 100644 --- a/cli/pkg/providers/provider.go +++ b/cli/pkg/providers/provider.go @@ -1,6 +1,7 @@ package providers import ( + "cli/pkg/console" "cli/pkg/kube" "cli/pkg/providers/aws" "cli/pkg/providers/minikube" @@ -23,13 +24,13 @@ type Provider interface { PostInstallation(providerConfig map[string]string, dir workspace.ConfigDir) error } -func MustGet(providerName ProviderName, w io.Writer) Provider { +func MustGet(providerName ProviderName, w io.Writer, analytics *console.AiryAnalytics) Provider { if providerName == Minikube { - return minikube.New(w) + return minikube.New(w, analytics) } if providerName == Aws { - return aws.New(w) + return aws.New(w, analytics) } panic(fmt.Sprintf("unknown provider \"%v\"", providerName)) diff --git a/cli/pkg/workspace/airy_yaml.go b/cli/pkg/workspace/airy_yaml.go index 4013d4a1b4..edce172ed1 100644 --- a/cli/pkg/workspace/airy_yaml.go +++ b/cli/pkg/workspace/airy_yaml.go @@ -12,8 +12,6 @@ type IngressConf struct { Https bool `yaml:"https,omitempty"` LetsencryptEmail string `yaml:"letsencryptEmail,omitempty"` LoadbalancerAnnotations map[string]string `yaml:"loadbalancerAnnotations,omitempty"` - HttpsTermination string `yaml:"httpsTermination,omitempty"` - HttpsCertificate string `yaml:"httpsCertificate,omitempty"` } type SecurityConf struct { diff --git a/docs/docs/cli/usage.md b/docs/docs/cli/usage.md index d182729a21..a671b93f69 100644 --- a/docs/docs/cli/usage.md +++ b/docs/docs/cli/usage.md @@ -74,6 +74,7 @@ airy create [workspace directory] [flags] #### Options ``` + --disable-tracking Disables sending anonymous events to Segment. -h, --help help for create --init-only Only create the airy workspace directory and exit. --namespace string (optional) Kubernetes namespace that Airy should be installed to. (default "default") diff --git a/go.mod b/go.mod index 09b33dfb8a..008c7bbe30 100644 --- a/go.mod +++ b/go.mod @@ -20,12 +20,15 @@ require ( github.com/kr/pretty v0.2.1 github.com/mitchellh/copystructure v1.1.2 // indirect github.com/mitchellh/go-homedir v1.1.0 + github.com/segmentio/backo-go v0.0.0-20200129164019-23eae7c10bd3 // indirect github.com/spf13/cast v1.3.1 // indirect github.com/spf13/cobra v1.1.1 github.com/spf13/viper v1.7.1 github.com/thanhpk/randstr v1.0.4 github.com/txn2/txeh v1.3.0 + github.com/xtgo/uuid v0.0.0-20140804021211-a0b114877d4c // indirect goji.io v2.0.2+incompatible + gopkg.in/segmentio/analytics-go.v3 v3.1.0 // indirect gopkg.in/yaml.v2 v2.4.0 k8s.io/api v0.19.0 k8s.io/apimachinery v0.19.0 diff --git a/go.sum b/go.sum index 418e387d41..44a59bdc76 100644 --- a/go.sum +++ b/go.sum @@ -474,6 +474,8 @@ github.com/ryanuber/columnize v0.0.0-20160712163229-9b3edd62028f h1:UFr9zpz4xgTn github.com/ryanuber/columnize v0.0.0-20160712163229-9b3edd62028f/go.mod h1:sm1tb6uqfes/u+d4ooFouqFdy9/2g9QGwK3SQygK0Ts= github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529 h1:nn5Wsu0esKSJiIVhscUtVbo7ada43DJhG55ua/hjS5I= github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod h1:DxrIzT+xaE7yg65j358z/aeFdxmN0P9QXhEzd20vsDc= +github.com/segmentio/backo-go v0.0.0-20200129164019-23eae7c10bd3 h1:ZuhckGJ10ulaKkdvJtiAqsLTiPrLaXSdnVgXJKJkTxE= +github.com/segmentio/backo-go v0.0.0-20200129164019-23eae7c10bd3/go.mod h1:9/Rh6yILuLysoQnZ2oNooD2g7aBnvM7r/fNVxRNWfBc= github.com/shurcooL/sanitized_anchor_name v1.0.0 h1:PdmoCO6wvbs+7yrJyMORt4/BmY5IYyJwS/kOiWx8mHo= github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc= github.com/sirupsen/logrus v1.2.0 h1:juTguoYk5qI21pwyTXY3B3Y5cOTH3ZUyZCg1v/mihuo= @@ -533,6 +535,8 @@ github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2 h1:eY9dn8+vbi4tKz5 github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod h1:UETIi67q53MR2AWcXfiuqkDkRtnGDLqkBTpCHuJHxtU= github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77 h1:ESFSdwYZvkeru3RtdrYueztKhOBCSAAzS4Gf+k0tEow= github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77/go.mod h1:aYKd//L2LvnjZzWKhF00oedf4jCCReLcmhLdhm1A27Q= +github.com/xtgo/uuid v0.0.0-20140804021211-a0b114877d4c h1:3lbZUMbMiGUW/LMkfsEABsc5zNT9+b1CvsJx47JzJ8g= +github.com/xtgo/uuid v0.0.0-20140804021211-a0b114877d4c/go.mod h1:UrdRz5enIKZ63MEE3IF9l2/ebyx59GyGgPi+tICQdmM= go.etcd.io/bbolt v1.3.2 h1:Z/90sZLPOeCy2PwprqkFa25PdkusRzaj9P8zm/KNyvk= go.etcd.io/bbolt v1.3.2/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU= go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU= @@ -754,6 +758,8 @@ gopkg.in/ini.v1 v1.51.0 h1:AQvPpx3LzTDM0AjnIRlVFwFFGC+npRopjZxLJj6gdno= gopkg.in/ini.v1 v1.51.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= gopkg.in/resty.v1 v1.12.0 h1:CuXP0Pjfw9rOuY6EP+UvtNvt5DSqHpIxILZKT/quCZI= gopkg.in/resty.v1 v1.12.0/go.mod h1:mDo4pnntr5jdWRML875a/NmxYqAlA73dVijT2AXvQQo= +gopkg.in/segmentio/analytics-go.v3 v3.1.0 h1:UzxH1uaGZRpMKDhJyBz0pexz6yUoBU3x8bJsRk/HV6U= +gopkg.in/segmentio/analytics-go.v3 v3.1.0/go.mod h1:4QqqlTlSSpVlWA9/9nDcPw+FkM2yv1NQoYjUbL9/JAw= gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 h1:uRGJdciOHaEIrze2W8Q3AKkepLTh2hOroT7a+7czfdQ= gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw= gopkg.in/yaml.v2 v2.0.0-20170812160011-eb3733d160e7/go.mod h1:JAlM8MvJe8wmxCU4Bli9HhUf9+ttbYbLASfIpnQbh74= diff --git a/go_repositories.bzl b/go_repositories.bzl index 8ad915bbd1..47e3479ad1 100644 --- a/go_repositories.bzl +++ b/go_repositories.bzl @@ -1079,6 +1079,12 @@ def go_repositories(): sum = "h1:nn5Wsu0esKSJiIVhscUtVbo7ada43DJhG55ua/hjS5I=", version = "v0.0.0-20170313163322-e2103e2c3529", ) + go_repository( + name = "com_github_segmentio_backo_go", + importpath = "github.com/segmentio/backo-go", + sum = "h1:ZuhckGJ10ulaKkdvJtiAqsLTiPrLaXSdnVgXJKJkTxE=", + version = "v0.0.0-20200129164019-23eae7c10bd3", + ) go_repository( name = "com_github_shurcool_sanitized_anchor_name", @@ -1218,6 +1224,12 @@ def go_repositories(): sum = "h1:ESFSdwYZvkeru3RtdrYueztKhOBCSAAzS4Gf+k0tEow=", version = "v0.0.3-0.20170626215501-b2862e3d0a77", ) + go_repository( + name = "com_github_xtgo_uuid", + importpath = "github.com/xtgo/uuid", + sum = "h1:3lbZUMbMiGUW/LMkfsEABsc5zNT9+b1CvsJx47JzJ8g=", + version = "v0.0.0-20140804021211-a0b114877d4c", + ) go_repository( name = "com_google_cloud_go", @@ -1310,6 +1322,12 @@ def go_repositories(): sum = "h1:CuXP0Pjfw9rOuY6EP+UvtNvt5DSqHpIxILZKT/quCZI=", version = "v1.12.0", ) + go_repository( + name = "in_gopkg_segmentio_analytics_go_v3", + importpath = "gopkg.in/segmentio/analytics-go.v3", + sum = "h1:UzxH1uaGZRpMKDhJyBz0pexz6yUoBU3x8bJsRk/HV6U=", + version = "v3.1.0", + ) go_repository( name = "in_gopkg_tomb_v1", diff --git a/scripts/dev_cli.sh b/scripts/dev_cli.sh index 4208b887f6..66940c52e6 100755 --- a/scripts/dev_cli.sh +++ b/scripts/dev_cli.sh @@ -20,4 +20,4 @@ if [[ $1 == "create" && $2 == "--provider=minikube" ]]; then minikube delete -p airy-core fi -$AIRY_BIN "$@" +$AIRY_BIN "$@" --disable-tracking From e7aea2f05100a066e02792bc34b667c12034c1b0 Mon Sep 17 00:00:00 2001 From: Christoph Proeschel Date: Thu, 30 Sep 2021 17:32:26 +0200 Subject: [PATCH 8/9] [#2443] Allow for compatability with mobile login flows (#2444) --- .../auth/src/main/java/co/airy/spring/auth/AuthConfig.java | 7 +++++-- .../main/java/co/airy/spring/auth/session/AuthCookie.java | 1 - lib/java/spring/core/src/main/resources/default.properties | 1 + 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/lib/java/spring/auth/src/main/java/co/airy/spring/auth/AuthConfig.java b/lib/java/spring/auth/src/main/java/co/airy/spring/auth/AuthConfig.java index 0704db5331..9d3370c16c 100644 --- a/lib/java/spring/auth/src/main/java/co/airy/spring/auth/AuthConfig.java +++ b/lib/java/spring/auth/src/main/java/co/airy/spring/auth/AuthConfig.java @@ -43,12 +43,14 @@ public class AuthConfig extends WebSecurityConfigurerAdapter { private final String jwtSecret; private final ConfigProvider configProvider; private final String logoutSuccessUrl; + private final String loginSuccessUrl; public AuthConfig(@Value("${systemToken:#{null}}") String systemToken, @Value("${jwtSecret:#{null}}") String jwtSecret, List ignorePatternBeans, ConfigProvider configProvider, - @Value("${oidc.logoutSuccessUrl:/ui/}") String logoutSuccessUrl + @Value("${oidc.logoutSuccessUrl:/ui/}") String logoutSuccessUrl, + @Value("${oidc.loginSuccessUrl:/ui/}") String loginSuccessUrl ) { this.systemToken = systemToken; this.jwtSecret = jwtSecret; @@ -57,6 +59,7 @@ public AuthConfig(@Value("${systemToken:#{null}}") String systemToken, .toArray(String[]::new); this.configProvider = configProvider; this.logoutSuccessUrl = logoutSuccessUrl; + this.loginSuccessUrl = loginSuccessUrl; } @Override @@ -97,7 +100,7 @@ protected void configure(final HttpSecurity http) throws Exception { .oauth2Login(oauth2 -> oauth2 // Replace the default login page with co.airy.spring.auth.oidc.LoginRedirect .loginPage("/login") - .defaultSuccessUrl("/ui/")) + .defaultSuccessUrl(this.loginSuccessUrl)) .addFilterAfter(new EmailFilter(configProvider), OAuth2LoginAuthenticationFilter.class); } } diff --git a/lib/java/spring/auth/src/main/java/co/airy/spring/auth/session/AuthCookie.java b/lib/java/spring/auth/src/main/java/co/airy/spring/auth/session/AuthCookie.java index 197cfc59cf..0e4bdbf6f6 100644 --- a/lib/java/spring/auth/src/main/java/co/airy/spring/auth/session/AuthCookie.java +++ b/lib/java/spring/auth/src/main/java/co/airy/spring/auth/session/AuthCookie.java @@ -9,6 +9,5 @@ public class AuthCookie extends Cookie { public AuthCookie(String value) { super(NAME, value); this.setPath(PATH); - this.setHttpOnly(true); } } diff --git a/lib/java/spring/core/src/main/resources/default.properties b/lib/java/spring/core/src/main/resources/default.properties index 6503e275a8..ef15e6b84f 100644 --- a/lib/java/spring/core/src/main/resources/default.properties +++ b/lib/java/spring/core/src/main/resources/default.properties @@ -3,3 +3,4 @@ management.endpoints.web.exposure.include=* management.endpoint.metrics.enabled=true management.endpoint.prometheus.enabled=true management.metrics.export.prometheus.enabled=true +server.forward-headers-strategy=NATIVE From 391c4f2677c5e2e30c6387216ceae5e0db4c94bd Mon Sep 17 00:00:00 2001 From: Pascal Holy Date: Tue, 5 Oct 2021 11:15:29 +0200 Subject: [PATCH 9/9] Fixes #2461 --- VERSION | 2 +- docs/docs/changelog.md | 74 ++++++++++++++++-------------------------- 2 files changed, 29 insertions(+), 47 deletions(-) diff --git a/VERSION b/VERSION index d7ae956f48..9eb2aa3f10 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -0.32.1-alpha +0.32.0 diff --git a/docs/docs/changelog.md b/docs/docs/changelog.md index b181511a06..bf4df0bc0c 100644 --- a/docs/docs/changelog.md +++ b/docs/docs/changelog.md @@ -3,6 +3,34 @@ title: Changelog sidebar_label: πŸ“ Changelog --- +## 0.32.0 + +#### Changes + +#### πŸš€ Features + +- [[#2443](https://github.com/airyhq/airy/issues/2443)] Allow for compatability with mobile login flows [[#2444](https://github.com/airyhq/airy/pull/2444)] +- [[#2423](https://github.com/airyhq/airy/issues/2423)] track core installation [[#2430](https://github.com/airyhq/airy/pull/2430)] + +#### πŸ› Bug Fixes + +- [[#2390](https://github.com/airyhq/airy/issues/2390)] Remove unnecessary annotations [[#2452](https://github.com/airyhq/airy/pull/2452)] +- [[#2434](https://github.com/airyhq/airy/issues/2434)] Fix instagram echo ingestion [[#2451](https://github.com/airyhq/airy/pull/2451)] + +#### 🧰 Maintenance + +- Bump webpack from 5.51.1 to 5.54.0 [[#2440](https://github.com/airyhq/airy/pull/2440)] +- Bump core-js from 3.17.2 to 3.18.1 [[#2438](https://github.com/airyhq/airy/pull/2438)] +- Bump @typescript-eslint/parser from 4.31.0 to 4.31.2 [[#2439](https://github.com/airyhq/airy/pull/2439)] + +#### Airy CLI + +You can download the Airy CLI for your operating system from the following links: + +[MacOS](https://airy-core-binaries.s3.amazonaws.com/0.31.2/darwin/amd64/airy) +[Linux](https://airy-core-binaries.s3.amazonaws.com/0.31.2/linux/amd64/airy) +[Windows](https://airy-core-binaries.s3.amazonaws.com/0.31.2/windows/amd64/airy.exe) + ## 0.31.1 #### πŸš€ Features @@ -1220,49 +1248,3 @@ You can download the Airy CLI for your operating system from the following links [Linux](https://airy-core-binaries.s3.amazonaws.com/0.10.0/linux/amd64/airy) [Windows](https://airy-core-binaries.s3.amazonaws.com/0.10.0/windows/amd64/airy.exe) -## 0.9.0 - -#### πŸš€ Features - -- [[#807](https://github.com/airyhq/airy/issues/807)] Introduction to UI docs [[#973](https://github.com/airyhq/airy/pull/973)] -- [[#849](https://github.com/airyhq/airy/issues/849)] Introduce dynamic page titles [[#990](https://github.com/airyhq/airy/pull/990)] -- [[#882](https://github.com/airyhq/airy/issues/882)] New /metadata.upsert API endpoint [[#955](https://github.com/airyhq/airy/pull/955)] -- [[#909](https://github.com/airyhq/airy/issues/909)] Add metadata to conversations API [[#941](https://github.com/airyhq/airy/pull/941)] -- [[#859](https://github.com/airyhq/airy/issues/859)] Add google rich card carousel to render library [[#976](https://github.com/airyhq/airy/pull/976)] -- [[#806](https://github.com/airyhq/airy/issues/806)] Add minimum height and width to UI [[#980](https://github.com/airyhq/airy/pull/980)] -- [[#671](https://github.com/airyhq/airy/issues/671)] Allow any message to be sent to the chat plugin [[#961](https://github.com/airyhq/airy/pull/961)] -- [[#950](https://github.com/airyhq/airy/issues/950)] Add update homebrew formula step to release process [[#959](https://github.com/airyhq/airy/pull/959)] -- [[#309](https://github.com/airyhq/airy/issues/309)] Homebrew cli tap [[#943](https://github.com/airyhq/airy/pull/943)] -- [[#949](https://github.com/airyhq/airy/issues/949)] Improve UI of chatplugin [[#953](https://github.com/airyhq/airy/pull/953)] -- [[#860](https://github.com/airyhq/airy/issues/860)] Render Generic Template Carousel from… [[#951](https://github.com/airyhq/airy/pull/951)] -- [[#675](https://github.com/airyhq/airy/issues/675)] Add Templates Endpoints documentation [[#872](https://github.com/airyhq/airy/pull/872)] -- [[#675](https://github.com/airyhq/airy/issues/675)] Add Templates Endpoints [[#948](https://github.com/airyhq/airy/pull/948)] -- [[#671](https://github.com/airyhq/airy/issues/671)] Render Rich Card (Google Style) on Live… [[#962](https://github.com/airyhq/airy/pull/962)] - -#### πŸ› Bug Fixes - -- [[#992](https://github.com/airyhq/airy/issues/992)] Start frontend components in start.sh [[#993](https://github.com/airyhq/airy/pull/993)] -- [[#960](https://github.com/airyhq/airy/issues/960)] Scope svg styles so that we don't break the sidebar [[#984](https://github.com/airyhq/airy/pull/984)] -- Fix missing annotation in google webhook [[#964](https://github.com/airyhq/airy/pull/964)] -- [[#956](https://github.com/airyhq/airy/issues/956)] Fix side problem in chatplugin source [[#958](https://github.com/airyhq/airy/pull/958)] -- [[#914](https://github.com/airyhq/airy/issues/914)] Add ingress and docs for AKHQ [[#940](https://github.com/airyhq/airy/pull/940)] -- [[#733](https://github.com/airyhq/airy/issues/733)] Hotfix/733 path for docs [[#982](https://github.com/airyhq/airy/pull/982)] - -#### πŸ“š Documentation - -- [[#867](https://github.com/airyhq/airy/issues/867)] Put cobra cmd docs in one file [[#971](https://github.com/airyhq/airy/pull/971)] -- [[#938](https://github.com/airyhq/airy/issues/938)] Buttons, buttons everywhere [[#963](https://github.com/airyhq/airy/pull/963)] - -#### 🧰 Maintenance - -- [[#733](https://github.com/airyhq/airy/issues/733)] Fix Netlify docs previews [[#991](https://github.com/airyhq/airy/pull/991)] -- [[#975](https://github.com/airyhq/airy/issues/975)] Rename Airy Core Platform [[#985](https://github.com/airyhq/airy/pull/985)] - -#### Airy CLI - -You can download the Airy CLI for your operating system from the following links: - -[MacOS](https://airy-core-binaries.s3.amazonaws.com/0.9.0/darwin/amd64/airy) -[Linux](https://airy-core-binaries.s3.amazonaws.com/0.9.0/linux/amd64/airy) -[Windows](https://airy-core-binaries.s3.amazonaws.com/0.9.0/windows/amd64/airy.exe) -