Bump Editors to 8.4.0 and Kogito Runtime to 1.11.1.Final (#623)

* Bump Editors to 8.4.0 * Update package.json * Use io.quarkus:quarkus-maven-plugin:create instead of kogito-quarkus-archetype * Fix PR * Fix PR 2 * Update version * Fix handling of Save Dialog when file is edited (#39) VSCodeTestHelper now correctly handles the dialog and clicks Don't Save when dialog pops-up. Tests should explicitly confirm the changes if needed. Co-authored-by: Guilherme Caponetto <[email protected]> Co-authored-by: Dominik Hanák <[email protected]>
apache · Sep 20, 2021 · 01bd10d · 01bd10d
1 parent 02ccabf
commit 01bd10d
Show file tree

Hide file tree

Showing 14 changed files with 93 additions and 52 deletions.
diff --git a/package.json b/package.json
@@ -24,11 +24,6 @@
     "prepare": "husky install",
     "postinstall": "patch-package"
   },
-  "dependencies": {
-    "@kogito-tooling/bpmn-editor-unpacked": "^8.3.0",
-    "@kogito-tooling/dmn-editor-unpacked": "^8.3.0",
-    "@kogito-tooling/scesim-editor-unpacked": "^8.3.0"
-  },
   "devDependencies": {
     "@babel/core": "^7.14.0",
     "@babel/preset-env": "^7.14.1",

diff --git a/packages/build-env/index.js b/packages/build-env/index.js
@@ -163,9 +163,14 @@ const ENV_VARS = {
     name: "WEBPACK__mode",
     description: "",
   },
+  QUARKUS_PLATFORM_version: {
+    name: "QUARKUS_PLATFORM_version",
+    default: "2.2.3.Final",
+    description: "",
+  },
   KOGITO_RUNTIME_version: {
     name: "KOGITO_RUNTIME_version",
-    default: "1.10.0.Final",
+    default: "1.11.1.Final",
     description: "",
   },
 };
@@ -266,6 +271,10 @@ module.exports = {
     version: getOrDefault(ENV_VARS.KOGITO_RUNTIME_version),
   },
 
+  quarkusPlatform: {
+    version: getOrDefault(ENV_VARS.QUARKUS_PLATFORM_version),
+  },
+
   examples: {
     chromeExtensionEnvelope: {
       port: 9101,

diff --git a/packages/chrome-extension-pack-kogito-kie-editors/package.json b/packages/chrome-extension-pack-kogito-kie-editors/package.json
@@ -15,7 +15,10 @@
   },
   "devDependencies": {
     "@kogito-tooling/build-env": "0.0.0",
-    "@kogito-tooling/external-assets-base": "0.0.0"
+    "@kogito-tooling/external-assets-base": "0.0.0",
+    "@kogito-tooling/bpmn-editor-unpacked": "^8.4.0",
+    "@kogito-tooling/dmn-editor-unpacked": "^8.4.0",
+    "@kogito-tooling/scesim-editor-unpacked": "^8.4.0"
   },
   "scripts": {
     "lint": "yarn run run-script-if --bool \"$(build-env global.build.lint)\" --then \"yarn eslint ./src --ext .ts,.tsx\"",

diff --git a/packages/desktop/package.json b/packages/desktop/package.json
@@ -22,7 +22,9 @@
   },
   "devDependencies": {
     "@kogito-tooling/build-env": "0.0.0",
-    "@kogito-tooling/external-assets-base": "0.0.0"
+    "@kogito-tooling/external-assets-base": "0.0.0",
+    "@kogito-tooling/bpmn-editor-unpacked": "^8.4.0",
+    "@kogito-tooling/dmn-editor-unpacked": "^8.4.0"
   },
   "scripts": {
     "start": "electron dist --disable-gpu",

diff --git a/packages/dmn-dev-sandbox-deployment-base-image/Dockerfile b/packages/dmn-dev-sandbox-deployment-base-image/Dockerfile
@@ -14,7 +14,7 @@
 
 FROM registry.access.redhat.com/openjdk/openjdk-11-rhel7:1.1
 
-ARG KOGITO_RUNTIME_VERSION
+ARG QUARKUS_PLATFORM_VERSION
 
 RUN mkdir /tmp/kogito/
 
@@ -24,20 +24,19 @@ COPY dist-dev/mvnw mvnw
 COPY dist-dev/.mvn/ .mvn
 COPY dist-dev/dmn-json-schema-generator.jar dmn-json-schema-generator.jar
 
-RUN ./mvnw archetype:generate -B -ntp \
-        -DarchetypeGroupId=org.kie.kogito \
-        -DarchetypeArtifactId=kogito-quarkus-archetype \
-        -DarchetypeVersion=${KOGITO_RUNTIME_VERSION} \
-        -DgroupId=org.kie.kogito \
-        -DartifactId=project \
-    && rm project/src/main/resources/*.bpmn2 \
-    && rm project/src/main/resources/*.dmn \
+RUN ./mvnw io.quarkus:quarkus-maven-plugin:create -B -ntp \
+        -DplatformVersion=${QUARKUS_PLATFORM_VERSION} \
+        -DprojectGroupId=org.kie.kogito \
+        -DprojectArtifactId=project \
+        -DprojectVersion=1.0.0-SNAPSHOT \
+        -Dextensions="dmn,quarkus-smallrye-openapi" \
+    && rm project/src/main/java/org/kie/kogito/*.java \
     && rm project/src/test/java/org/kie/kogito/*.java \
     && mkdir -p project/src/main/resources/META-INF
 
 COPY --chown=185:root dist-dev/dmn-dev-sandbox-form-webapp/ project/src/main/resources/META-INF/resources/
 
-RUN echo -e '\nquarkus.http.cors=true' >> project/src/main/resources/application.properties \
+RUN echo -e '\nquarkus.swagger-ui.always-include=true\nquarkus.http.cors=true\nkogito.service.url=http://localhost:8080' >> project/src/main/resources/application.properties \
     && ./mvnw clean package -B -ntp -f project/pom.xml \
     && cp project/target/quarkus-app/*.jar /deployments/ \
     && cp -R project/target/quarkus-app/lib/ /deployments/ \

diff --git a/packages/dmn-dev-sandbox-deployment-base-image/package.json b/packages/dmn-dev-sandbox-deployment-base-image/package.json
@@ -12,7 +12,7 @@
     "cleanup": "rimraf dist-dev && mkdir dist-dev",
     "copy:assets": "cp ../dmn-json-schema-generator/target/dmn-json-schema-generator.jar ./dist-dev && cp -R ../dmn-dev-sandbox-form-webapp/dist ./dist-dev/dmn-dev-sandbox-form-webapp",
     "install:mvnw": "cd dist-dev/ && mvn -N io.takari:maven:wrapper",
-    "podman:build": "yarn run run-script-if --bool $([ $(command -v podman) ] && echo true || echo false) --then \"podman build $(echo $(build-env dmnDevSandbox.baseImage.buildTags) | xargs printf -- \"-t $(build-env dmnDevSandbox.baseImage.registry)/$(build-env dmnDevSandbox.baseImage.account)/$(build-env dmnDevSandbox.baseImage.name):%s\n\" | xargs echo) --build-arg KOGITO_RUNTIME_VERSION=$(build-env kogitoRuntime.version) .\" --else \"echo Podman not found, skipping image build.\"",
+    "podman:build": "yarn run run-script-if --bool $([ $(command -v podman) ] && echo true || echo false) --then \"podman build $(echo $(build-env dmnDevSandbox.baseImage.buildTags) | xargs printf -- \"-t $(build-env dmnDevSandbox.baseImage.registry)/$(build-env dmnDevSandbox.baseImage.account)/$(build-env dmnDevSandbox.baseImage.name):%s\n\" | xargs echo) --build-arg QUARKUS_PLATFORM_VERSION=$(build-env quarkusPlatform.version) .\" --else \"echo Podman not found, skipping image build.\"",
     "build:dev": "yarn cleanup && yarn install:mvnw && yarn copy:assets",
     "build:prod:win32": "echo \"Build not supported on Windows\"",
     "build:prod:darwin:linux": "yarn run run-script-if --bool \"$(build-env global.build.docker)\" --then \"yarn podman:build\"",

diff --git a/packages/extended-services/package.json b/packages/extended-services/package.json
@@ -29,7 +29,7 @@
     "start": "ENV=dev go run main.go"
   },
   "dependencies": {
-    "@kogito-tooling/jitexecutor-native": "1.10.0-Final"
+    "@kogito-tooling/jitexecutor-native": "1.11.1-Final"
   },
   "devDependencies": {
     "@kogito-tooling/build-env": "0.0.0"

diff --git a/packages/kie-editors-standalone/package.json b/packages/kie-editors-standalone/package.json
@@ -18,7 +18,9 @@
   },
   "devDependencies": {
     "@kogito-tooling/build-env": "0.0.0",
-    "@kogito-tooling/external-assets-base": "0.0.0"
+    "@kogito-tooling/external-assets-base": "0.0.0",
+    "@kogito-tooling/bpmn-editor-unpacked": "^8.4.0",
+    "@kogito-tooling/dmn-editor-unpacked": "^8.4.0"
   },
   "scripts": {
     "lint": "yarn run run-script-if --bool \"$(build-env global.build.lint)\" --then \"yarn eslint ./src --ext .ts,.tsx\"",

diff --git a/packages/online-editor/package.json b/packages/online-editor/package.json
@@ -22,7 +22,9 @@
     "@types/react-router": "^5.1.14",
     "@types/react-router-dom": "^5.1.7",
     "react-router": "^5.2.0",
-    "react-router-dom": "^5.2.0"
+    "react-router-dom": "^5.2.0",
+    "@kogito-tooling/bpmn-editor-unpacked": "^8.4.0",
+    "@kogito-tooling/dmn-editor-unpacked": "^8.4.0"
   },
   "devDependencies": {
     "@kogito-tooling/build-env": "0.0.0",

diff --git a/packages/vscode-extension-bpmn-editor/package.json b/packages/vscode-extension-bpmn-editor/package.json
@@ -25,7 +25,8 @@
     "@kogito-tooling/kie-bc-editors": "0.0.0"
   },
   "devDependencies": {
-    "@kogito-tooling/build-env": "0.0.0"
+    "@kogito-tooling/build-env": "0.0.0",
+    "@kogito-tooling/bpmn-editor-unpacked": "^8.4.0"
   },
   "icon": "icon.png",
   "main": "./dist/extension/extension.js",

diff --git a/packages/vscode-extension-dmn-editor/package.json b/packages/vscode-extension-dmn-editor/package.json
@@ -22,11 +22,12 @@
     "@kie-tooling-core/patternfly-base": "0.0.0",
     "@kie-tooling-core/vscode-extension": "0.0.0",
     "@kogito-tooling/external-assets-base": "0.0.0",
-    "@kogito-tooling/kie-bc-editors": "0.0.0",
-    "@kogito-tooling/scesim-editor-unpacked": "^8.3.0"
+    "@kogito-tooling/kie-bc-editors": "0.0.0"
   },
   "devDependencies": {
-    "@kogito-tooling/build-env": "0.0.0"
+    "@kogito-tooling/build-env": "0.0.0",
+    "@kogito-tooling/dmn-editor-unpacked": "^8.4.0",
+    "@kogito-tooling/scesim-editor-unpacked": "^8.4.0"
   },
   "icon": "icon.png",
   "main": "./dist/extension/extension.js",

diff --git a/packages/vscode-extension-pack-kogito-kie-editors/it-tests/helpers/VSCodeTestHelper.ts b/packages/vscode-extension-pack-kogito-kie-editors/it-tests/helpers/VSCodeTestHelper.ts
@@ -19,6 +19,7 @@ import {
   ActivityBar,
   By,
   InputBox,
+  ModalDialog,
   SideBarView,
   until,
   ViewControl,
@@ -151,6 +152,11 @@ export default class VSCodeTestHelper {
       await this.workbench.getEditorView().closeAllEditors();
     } catch (error) {
       // catch the error when there is nothing to close
+      // or the Save Dialog appears
+      const dialog = new ModalDialog();
+      if (dialog != null && (await dialog.isDisplayed())) {
+        await dialog.pushButton("Don't Save");
+      }
     }
   };
 

diff --git a/packages/vscode-extension-pack-kogito-kie-editors/package.json b/packages/vscode-extension-pack-kogito-kie-editors/package.json
@@ -144,6 +144,9 @@
   },
   "devDependencies": {
     "@kogito-tooling/build-env": "0.0.0",
-    "@kogito-tooling/external-assets-base": "0.0.0"
+    "@kogito-tooling/external-assets-base": "0.0.0",
+    "@kogito-tooling/bpmn-editor-unpacked": "^8.4.0",
+    "@kogito-tooling/dmn-editor-unpacked": "^8.4.0",
+    "@kogito-tooling/scesim-editor-unpacked": "^8.4.0"
   }
 }
diff --git a/yarn.lock b/yarn.lock
@@ -1662,25 +1662,25 @@
     methods "^1.1.2"
     path-to-regexp "^6.1.0"
 
-"@kogito-tooling/bpmn-editor-unpacked@^8.3.0":
-  version "8.3.0"
-  resolved "https://registry.yarnpkg.com/@kogito-tooling/bpmn-editor-unpacked/-/bpmn-editor-unpacked-8.3.0.tgz#ba91bc525a423005142926f4b7541bb4cf1824f4"
-  integrity sha512-AZvDPq/Fl7Ao8FQe+/4DsInb5tp+yRdtTp/soiKSt1Z1BvCuybxs0rXXmgBPKJae/XHN3rJ7oy7zEN3z02VUeA==
+"@kogito-tooling/bpmn-editor-unpacked@^8.4.0":
+  version "8.4.0"
+  resolved "https://registry.yarnpkg.com/@kogito-tooling/bpmn-editor-unpacked/-/bpmn-editor-unpacked-8.4.0.tgz#8c995ac1af552b641ea5d9c26c0b0316a9bc45fa"
+  integrity sha512-8s35FnXFHV+aN/vTrR2/PyXm/092xdUBPC9d6L3pRgAkiISC1zIsZQ/30t5kCrLh970mj8/PzO+1yb6TEmkDoA==
 
-"@kogito-tooling/dmn-editor-unpacked@^8.3.0":
-  version "8.3.0"
-  resolved "https://registry.yarnpkg.com/@kogito-tooling/dmn-editor-unpacked/-/dmn-editor-unpacked-8.3.0.tgz#9aab08c0c3381a4a2ffb188cf82ae34fa7809fd5"
-  integrity sha512-AzXoCrAxg9DVVuqz8mSw7BX6A6w9r3WQ/A3Nha5F1WoB+4tQhKGuwBLn3Ckl54ZqYK/AOpJk9ENWGadKno7OTA==
+"@kogito-tooling/dmn-editor-unpacked@^8.4.0":
+  version "8.4.0"
+  resolved "https://registry.yarnpkg.com/@kogito-tooling/dmn-editor-unpacked/-/dmn-editor-unpacked-8.4.0.tgz#0f2f10af06d22b5132564d64fcb5cc67285306f5"
+  integrity sha512-G9NXmXXAm7qKEYdXvXKNjoQwtdFlzwblfZOQVLg6eagpeOoWhkmZbH2HrSsSR8wCtFdAYIaDwxmIPB9c/i3zqQ==
 
-"@kogito-tooling/jitexecutor-native@1.10.0-Final":
-  version "1.10.0-Final"
-  resolved "https://registry.yarnpkg.com/@kogito-tooling/jitexecutor-native/-/jitexecutor-native-1.10.0-Final.tgz#af29845155fe4bf282e6a6a433d666fd1cc05197"
-  integrity sha512-MjWKrh2/Xi5wmmaPshyRpJ8PFDVrv6AlR5sUU1GcHpd6v8skYKAZtowhHMJxrQIND9/fUrrpjBSd2goiqj4xtA==
+"@kogito-tooling/jitexecutor-native@1.11.1-Final":
+  version "1.11.1-Final"
+  resolved "https://registry.yarnpkg.com/@kogito-tooling/jitexecutor-native/-/jitexecutor-native-1.11.1-Final.tgz#a51fd1d7ee76fbe616388a5cbe356b008d603df6"
+  integrity sha512-KWsI/95HCr7w2tMleAFyv5E4INGE/U9/IBp1FkxWoxRAeWcrC92cJkH0mnv9Fa5jktbvwPKuXfqh3ZLsbSipgw==
 
-"@kogito-tooling/scesim-editor-unpacked@^8.3.0":
-  version "8.3.0"
-  resolved "https://registry.yarnpkg.com/@kogito-tooling/scesim-editor-unpacked/-/scesim-editor-unpacked-8.3.0.tgz#ea7d0d166b0c24fa56fba51c9d0ce9fbc3adc3a1"
-  integrity sha512-ACvTY6L3Hg2JMk0COMiimAth/Ionw7fgpJVD2tDI3tmXA1EmvfihiEL8Uci9ohv+tekrEmx+JG54Z0w8CPu9DA==
+"@kogito-tooling/scesim-editor-unpacked@^8.4.0":
+  version "8.4.0"
+  resolved "https://registry.yarnpkg.com/@kogito-tooling/scesim-editor-unpacked/-/scesim-editor-unpacked-8.4.0.tgz#d54bcb87980f5b7a839e76b953956e0ec505f2bd"
+  integrity sha512-2ysSOVgBeN4BqC1hs0OJcuEdU0TD0nRmAj91XP8szKaFttchFOc0jjSCSakFe6p+npdEcyc0H/VD0cPSb42A3g==
 
 "@lerna/[email protected]":
   version "4.0.0"
@@ -8960,7 +8960,7 @@ hosted-git-info@^2.1.4:
   resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.8.8.tgz#7539bd4bc1e0e0a895815a2e0262420b12858488"
   integrity sha512-f/wzC2QaWBs7t9IYqB4T3sR1xviIViXJRJTWBlx2Gf3g0Xi5vI7Yy4koXQ1c9OYDGHN9sBy1DQ2AB8fqZBWhUg==
 
-hosted-git-info@^4.0.1:
+hosted-git-info@^4.0.1, hosted-git-info@^4.0.2:
   version "4.0.2"
   resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-4.0.2.tgz#5e425507eede4fea846b7262f0838456c4209961"
   integrity sha512-c9OGXbZ3guC/xOlCg1Ci/VgWlwsqDv1yMQL1CWqXDL0hDjXuNcq0zuR4xqPSuasI3kqFDhqSyTjREz5gzq0fXg==
@@ -15030,6 +15030,14 @@ source-map-support@^0.4.15:
   dependencies:
     source-map "^0.5.6"
 
+source-map-support@^0.5.20:
+  version "0.5.20"
+  resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.20.tgz#12166089f8f5e5e8c56926b377633392dd2cb6c9"
+  integrity sha512-n1lZZ8Ve4ksRqizaBQgxXDgKwttHDhyfQjA6YZZn8+AroHbsIz+JjwxQDxbp+7y5OYCI8t1Yk7etjD9CRd2hIw==
+  dependencies:
+    buffer-from "^1.0.0"
+    source-map "^0.6.0"
+
 source-map-support@^0.5.6, source-map-support@~0.5.12:
   version "0.5.16"
   resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.16.tgz#0ae069e7fe3ba7538c64c98515e35339eac5a042"
@@ -15194,13 +15202,21 @@ stack-utils@^1.0.1:
   dependencies:
     escape-string-regexp "^2.0.0"
 
-stack-utils@^2.0.2, stack-utils@^2.0.3:
+stack-utils@^2.0.2:
   version "2.0.3"
   resolved "https://registry.yarnpkg.com/stack-utils/-/stack-utils-2.0.3.tgz#cd5f030126ff116b78ccb3c027fe302713b61277"
   integrity sha512-gL//fkxfWUsIlFL2Tl42Cl6+HFALEaB1FU76I/Fy+oZjRreP7OPMXFlGbxM7NQsI0ZpUfw76sHnv0WNYuTb7Iw==
   dependencies:
     escape-string-regexp "^2.0.0"
 
+stack-utils@^2.0.3:
+  version "2.0.4"
+  resolved "https://registry.yarnpkg.com/stack-utils/-/stack-utils-2.0.4.tgz#bf967ae2813d3d2d1e1f59a4408676495c8112ab"
+  integrity sha512-ERg+H//lSSYlZhBIUu+wJnqg30AbyBbpZlIhcshpn7BNzpoRODZgfyr9J+8ERf3ooC6af3u7Lcl01nleau7MrA==
+  dependencies:
+    escape-string-regexp "^2.0.0"
+    source-map-support "^0.5.20"
+
 start-server-and-test@^1.12.1:
   version "1.12.1"
   resolved "https://registry.yarnpkg.com/start-server-and-test/-/start-server-and-test-1.12.1.tgz#bf84eb5c5a4c8a98b93ed36519035b3f76179f0e"
@@ -16726,16 +16742,17 @@ vsce@^1.96.0:
     yazl "^2.2.2"
 
 vsce@^1.96.1:
-  version "1.96.1"
-  resolved "https://registry.yarnpkg.com/vsce/-/vsce-1.96.1.tgz#782eb094001f14ce9abecb5d3a1d8586a14bac4b"
-  integrity sha512-KnEVqjfc1dXrpZsbJ8J7B9VQ7GAAx8o5RqBNk42Srv1KF9+e2/aXchQHe9QZxeUs/FiliHoMGpGvnHTXwKIT2A==
+  version "1.99.0"
+  resolved "https://registry.yarnpkg.com/vsce/-/vsce-1.99.0.tgz#ae27e32cb16a4eaa38adf431003f75c7ef0fefdc"
+  integrity sha512-fyzOLcmcgBmA+CYg0NyYU3JMmcOBcf94ZzZZYi83mIoXBRU391mYByoJEPnkl8xZGa3/OW5lH438/JOThlYPNA==
   dependencies:
     azure-devops-node-api "^11.0.1"
     chalk "^2.4.2"
     cheerio "^1.0.0-rc.9"
     commander "^6.1.0"
     denodeify "^1.2.1"
     glob "^7.0.6"
+    hosted-git-info "^4.0.2"
     leven "^3.1.0"
     lodash "^4.17.15"
     markdown-it "^10.0.0"
@@ -16748,6 +16765,7 @@ vsce@^1.96.1:
     tmp "^0.2.1"
     typed-rest-client "^1.8.4"
     url-join "^1.1.0"
+    xml2js "^0.4.23"
     yauzl "^2.3.1"
     yazl "^2.2.2"
 
@@ -17254,9 +17272,9 @@ ws@^7.3.1:
   integrity sha512-Qm8k8ojNQIMx7S+Zp8u/uHOx7Qazv3Yv4q68MiWWWOJhiwG5W3x7iqmRtJo8xxrciZUY4vRxUTJCKuRnF28ZZw==
 
 ws@^7.4.6:
-  version "7.5.3"
-  resolved "https://registry.yarnpkg.com/ws/-/ws-7.5.3.tgz#160835b63c7d97bfab418fc1b8a9fced2ac01a74"
-  integrity sha512-kQ/dHIzuLrS6Je9+uv81ueZomEwH0qVYstcAQ4/Z93K8zeko9gtAbttJWzoC5ukqXY1PpoouV3+VSOqEAFt5wg==
+  version "7.5.5"
+  resolved "https://registry.yarnpkg.com/ws/-/ws-7.5.5.tgz#8b4bc4af518cfabd0473ae4f99144287b33eb881"
+  integrity sha512-BAkMFcAzl8as1G/hArkxOxq3G7pjUqQ3gzYbLL0/5zNkph70e+lCoxBGnm6AW1+/aiNeV4fnKqZ8m4GZewmH2w==
 
 xml-js@^1.6.11:
   version "1.6.11"
@@ -17270,7 +17288,7 @@ xml-name-validator@^3.0.0:
   resolved "https://registry.yarnpkg.com/xml-name-validator/-/xml-name-validator-3.0.0.tgz#6ae73e06de4d8c6e47f9fb181f78d648ad457c6a"
   integrity sha512-A5CUptxDsvxKJEU3yO6DuWBSJz/qizqzJKOMIfUJHETbBw/sFaDxgd6fxm1ewUaM0jZ444Fc5vC5ROYurg/4Pw==
 
-xml2js@^0.4.17:
+xml2js@^0.4.17, xml2js@^0.4.23:
   version "0.4.23"
   resolved "https://registry.yarnpkg.com/xml2js/-/xml2js-0.4.23.tgz#a0c69516752421eb2ac758ee4d4ccf58843eac66"
   integrity sha512-ySPiMjM0+pLDftHgXY4By0uswI3SPKLDw/i3UXbnO8M/p28zqexCUoPmQFrYD+/1BzhGJSs2i1ERWKJAtiLrug==