|
diff --git a/ecs/restore-dbdump/Dockerfile b/ecs/restore-dbdump/Dockerfile
index 140de9c6..858c3dc9 100644
--- a/ecs/restore-dbdump/Dockerfile
+++ b/ecs/restore-dbdump/Dockerfile
@@ -1,4 +1,4 @@
-FROM python:3.9-bullseye
+FROM python:3.9
ENV TZ="Asia/Tokyo"
diff --git a/ecs/restore-dbdump/Pipfile.lock b/ecs/restore-dbdump/Pipfile.lock
index 58c4d231..02f0cb52 100644
--- a/ecs/restore-dbdump/Pipfile.lock
+++ b/ecs/restore-dbdump/Pipfile.lock
@@ -19,12 +19,11 @@
"develop": {
"autopep8": {
"hashes": [
- "sha256:067959ca4a07b24dbd5345efa8325f5f58da4298dab0dde0443d5ed765de80cb",
- "sha256:2913064abd97b3419d1cc83ea71f042cb821f87e45b9c88cad5ad3c4ea87fe0c"
+ "sha256:1fa8964e4618929488f4ec36795c7ff12924a68b8bf01366c094fc52f770b6e7",
+ "sha256:2bb76888c5edbcafe6aabab3c47ba534f5a2c2d245c2eddced4a30c4b4946357"
],
"index": "pypi",
- "markers": "python_version >= '3.6'",
- "version": "==2.0.4"
+ "version": "==2.1.0"
},
"flake8": {
"hashes": [
@@ -32,7 +31,6 @@
"sha256:a6dfbb75e03252917f2473ea9653f7cd799c3064e54d4c8140044c5c065f53c3"
],
"index": "pypi",
- "markers": "python_full_version >= '3.8.1'",
"version": "==7.0.0"
},
"mccabe": {
diff --git a/lambda/NoticeToSlack/index.js b/lambda/NoticeToSlack/index.js
new file mode 100644
index 00000000..5c0a7226
--- /dev/null
+++ b/lambda/NoticeToSlack/index.js
@@ -0,0 +1,37 @@
+"use-strict";
+
+const request = require("request-promise");
+exports.handler = (event, context, callback) => {
+ const attaches = event.Records.map(evt => {
+ return {
+ "fallback":`Notification from mbj-newdwh2021 AWS: ${evt.EventSubscriptionArn}`,
+ "pretext":`Notification from mbj-newdwh2021 AWS: ${evt.EventSubscriptionArn}`,
+ "color":"#0000D0",
+ "fields":[
+ {
+ "title": `${evt.Sns.Subject}`,
+ "value": `${evt.Sns.Timestamp}: ${evt.Sns.Message} (MessageId: ${evt.Sns.MessageId})`,
+ "short": false
+ }
+ ]
+ };
+ });
+ request({
+ method: "POST",
+ url: process.env.webhookurl,
+ body: {
+ attachments: attaches
+
+ },
+ json: true
+ }).then((body => {
+ callback(null, `Request succeed. ${body}`);
+ })).catch((err) => {
+ callback("failed to request to slack.", {
+ result: "ERROR",
+ event: event,
+ cause: `request failed. ${err}.`
+ });
+ })
+
+};
diff --git a/lambda/NoticeToSlack/mbj-newdwh2021-staging-NoticeToSlack.zip b/lambda/NoticeToSlack/mbj-newdwh2021-staging-NoticeToSlack.zip
new file mode 100644
index 00000000..53f0c160
Binary files /dev/null and b/lambda/NoticeToSlack/mbj-newdwh2021-staging-NoticeToSlack.zip differ
diff --git a/lambda/NoticeToSlack/package.json b/lambda/NoticeToSlack/package.json
new file mode 100644
index 00000000..1495f188
--- /dev/null
+++ b/lambda/NoticeToSlack/package.json
@@ -0,0 +1,15 @@
+{
+ "name": "mbj-newdwh2021-staging-noticetoslack",
+ "version": "1.0.0",
+ "description": "",
+ "main": "index.js",
+ "scripts": {
+ "test": "echo \"Error: no test specified\" && exit 1"
+ },
+ "author": "",
+ "license": "ISC",
+ "dependencies": {
+ "request": "^2.88.2",
+ "request-promise": "^4.2.6"
+ }
+}
diff --git a/lambda/PublishFromLog/index.js b/lambda/PublishFromLog/index.js
new file mode 100644
index 00000000..f0b608f8
--- /dev/null
+++ b/lambda/PublishFromLog/index.js
@@ -0,0 +1,30 @@
+const zlib = require("zlib");
+const aws = require("aws-sdk");
+const sns = new aws.SNS({
+ apiVersion: "2010-03-31",
+ region: 'ap-northeast-1'
+});
+
+exports.handler = function(input, context) {
+ var payload = new Buffer.from(input.awslogs.data, 'base64');
+ zlib.gunzip(payload, function(e, result) {
+ if (e) {
+ context.fail(e);
+ } else {
+ result = JSON.parse(result.toString('UTF-8'));
+ const publishMessage = {
+ Subject: `Detect Error(or Warning) in ${result.logGroup}`,
+ Message: result.logEvents.map((l) => l.message).join('\n'),
+ TopicArn: process.env.topicArn
+ };
+ console.log(publishMessage);
+
+ sns.publish(publishMessage, (err, data) => {
+ console.log(err, data);
+ if(err){
+ context.fail(err);
+ }
+ });
+ }
+ });
+};
\ No newline at end of file
diff --git a/lambda/PublishFromLog/mbj-newdwh2021-staging-PublishFromLog.zip b/lambda/PublishFromLog/mbj-newdwh2021-staging-PublishFromLog.zip
new file mode 100644
index 00000000..6a8526bc
Binary files /dev/null and b/lambda/PublishFromLog/mbj-newdwh2021-staging-PublishFromLog.zip differ
diff --git a/lambda/PublishFromLog/package.json b/lambda/PublishFromLog/package.json
new file mode 100644
index 00000000..1e0d12e7
--- /dev/null
+++ b/lambda/PublishFromLog/package.json
@@ -0,0 +1,15 @@
+{
+ "name": "mbj-newdwh2021-staging-publishfromlog",
+ "version": "1.0.0",
+ "description": "",
+ "main": "index.js",
+ "scripts": {
+ "test": "echo \"Error: no test specified\" && exit 1"
+ },
+ "author": "",
+ "license": "ISC",
+ "dependencies": {
+ "aws-sdk": "^2.1011.0",
+ "zlib": "^1.0.5"
+ }
+}
diff --git a/lambda/check-view-security-option/Pipfile.lock b/lambda/check-view-security-option/Pipfile.lock
index 8f7fdc66..d9e8f1c3 100644
--- a/lambda/check-view-security-option/Pipfile.lock
+++ b/lambda/check-view-security-option/Pipfile.lock
@@ -18,50 +18,48 @@
"default": {
"awslambdaric": {
"hashes": [
- "sha256:038aa61eb897e94a198a1c27213b79848509f43df622238ab2271a20f11d5d39",
- "sha256:05070850dad5af71c911a04ccb6c376dbdb7aed6aaba2fb1d09eaff6ebb26b0d",
- "sha256:09acc9715f74c994e8688436e4d3c496148fc945c4fe1a28ef1e3b9529453133",
- "sha256:173baa4d61cf648d0e580e6e8ebebb212e50e0e0366352ba20daaef63761c9ed",
- "sha256:238cdff033edf6182024305224da1bbdb8bfef1207b04e35816a5d5e5516344a",
- "sha256:2bb5027d7f2c4f480b039f73a015d41c046037ab341dc1dbb55d8494133304a6",
- "sha256:2cb6fa2ad9a34ff9d0a678034fefce286de83f9a55b792af60e79e3ba1d3d71f",
- "sha256:2d12e7f096d6bee43e731b75184abdf10f22765824387f6ae3429a480e696b2b",
- "sha256:39e8e4579e913a76b580bd22b36af8d808c7b4bb8bf5a2b526f0149edd029e4f",
- "sha256:3c3f339f89c6318fe56c1b6d8ef74aadaf486f56746dd1e04f73f83881d32ae5",
- "sha256:42c18fccc0079c96a9bdfd219e7d1e736c41b8a44319de3a75ff960523f24696",
- "sha256:4465a604de74ffd202d4b891c88228fdfac39a306725fee593c76b4377d847c5",
- "sha256:50531d37c4a1737fe3c6540cf0852459cecd4e7a03e4c2791a24bc32db153235",
- "sha256:5414c81e6cf088be51a0024e2202e0faf2e9dba2cc247a55e59f4ffc34369bfb",
- "sha256:5a11cd06dc29459bf3b9da570af612fcf4dca1060bcfd2b78c36c835a37ae5c1",
- "sha256:5eeb3b5294b220d133b569f096ac922e6665811aefefe8e7e4b5d907b1a1bf2b",
- "sha256:665b1849fe46e25589835219dc226f77c13fff6c27fc2f34e9e49cb03cf5019a",
- "sha256:6afbd60e3a78945bcee586eca4924df4aa3c552065b91a85711cc6771e65a138",
- "sha256:6f3ad30165498d4748fffab87b32897fd7f15f67fed7804bfba4ed96a4babf14",
- "sha256:9b97da2fe64fb016fa81a88205f8f5e5a9c4a43344c9771b13d94467fdf85b4e",
- "sha256:a5e9dce5b5b1ccb809d4386b24f7ea971c8abfd84037f43148db06ecf271c4c5",
- "sha256:b62eda8e3a034c692a7b2e589e77bc1d3130121dca2ebb9efea9ce31c14079f6",
- "sha256:e6cdab6054fff4fd16c4a3a33a9c4e5aa18ac39f215d0e3a3345d3036cdc418a"
+ "sha256:04d4d4b63cef0e9aad3adea95a5cf3f81634bccde625f104ff025f764a3e8874",
+ "sha256:0a9922690eb7722417cbac55b913ab070c88444ab83290293debf29d5d9ca371",
+ "sha256:0e55a815caef1258ed7a9b0adad54e5f1b2ca63966d21342dc5da5b55dd471ef",
+ "sha256:2566a9db2c613fddddc22aedb45e74dbcd5c1a044da6992424680be719db80c9",
+ "sha256:34a3e8d27b84ccc9535086487eed50425c0db7a016bf91cf24d8d6cc853faec3",
+ "sha256:403109390f1a9856f8f6d5f0d5e7f2f83bdec99a62d024e433bff50eda2ed373",
+ "sha256:4dbd3e2262d080327a90e1ac9d087d7616e8b5be6da83be9fd3ca1b5ae575173",
+ "sha256:506f004ca08a2f43a898b65dad9d6dd2b2a4910ebe43dcc6682dc5ca0267c24a",
+ "sha256:662b95b6079b563d3e2ef4fda7bcb20e360901eae7a646425612ef2f4e5d6bdf",
+ "sha256:6de8d5ea0fc8cb780e060fc06a84328fda3ed329faf97606db59287814490ade",
+ "sha256:6f298068e2791b0ec5c420ef27cdf8aaba23486dfa5917b6c3067e30c97dde4f",
+ "sha256:7699c822197f98cc22c262af2368c99d69b43a73113099be52545b195c5e0064",
+ "sha256:7b75376d62a294e37d96507a68290dd94ce83f5b1a597c42d29242545e1ee126",
+ "sha256:98b16b4752f16b6a0562cfc1db2e6ce63b2a41ffa97c27e784c3ae5e8c2dc91d",
+ "sha256:bf57203ebeb4d718b34cd168f6b5ef497bfd2481adf848c5252faf38dccd7bf1",
+ "sha256:bf824aeff2cde789db1167c377573f1dbf2bf01e75eeb31651de00786ef09ed0",
+ "sha256:d3438bf0be646d61f8a60fb668c0c3b103963611462f35bf2db11ef50242f54f",
+ "sha256:d530ab882984188436f3869a2fc172086ab6b43a5f7502a86b241347a5441de3",
+ "sha256:e4be962e90035f362511eac65ad5c0242da15f73cfae27716de42b47f9d0a2a8",
+ "sha256:e5145fa63560901d7dbe26c5ee0dd5977f3783ab799fa04f50c50c207be78305",
+ "sha256:eb1a13c130a8a2ffc1c127a2bd581f45b9f10ec32a3892e41b5b1bdc9788b92d",
+ "sha256:ed798ab90f5230fe11079b269c3748bd875bc218c2ad4528ae2b4a04a0cd92b5",
+ "sha256:f55cf42cea67661ccea604b7774ba8cb1e467dadaf3d4c4b7f4e029faf43a46b"
],
"index": "pypi",
- "markers": "python_version >= '3.6'",
- "version": "==2.0.10"
+ "version": "==2.0.11"
},
"boto3": {
"hashes": [
- "sha256:4b40bf2c8494647c9e88c180537dc9fc0c1047a9fffbb1e5b0da6596f1e59b7b",
- "sha256:992e994c7e481a5d3259c699574882b79d631a46f7c369bea350b7ccb0651317"
+ "sha256:7a02f44af32095946587d748ebeb39c3fa15b9d7275307ff612a6760ead47e04",
+ "sha256:91e6343474173e9b82f603076856e1d5b7b68f44247bdd556250857a3f16b37b"
],
"index": "pypi",
- "markers": "python_version >= '3.8'",
- "version": "==1.34.61"
+ "version": "==1.34.84"
},
"botocore": {
"hashes": [
- "sha256:079f3288d38f97fd5656c25c44a94bea0e7090b938abfdeea463eaadb210c4a0",
- "sha256:72df4af7e4e6392552c882d48c74e4be9bf7be4cd8d829711b312fbae13d7034"
+ "sha256:a2b309bf5594f0eb6f63f355ade79ba575ce8bf672e52e91da1a7933caa245e6",
+ "sha256:da1ae0a912e69e10daee2a34dafd6c6c106450d20b8623665feceb2d96c173eb"
],
"markers": "python_version >= '3.8'",
- "version": "==1.34.61"
+ "version": "==1.34.84"
},
"cffi": {
"hashes": [
@@ -157,7 +155,6 @@
"sha256:f8837fe1d6ac4a8052a9a8ddab256bc006242696f03368a4009be7ee3075cdb7"
],
"index": "pypi",
- "markers": "python_version >= '3.7'",
"version": "==42.0.5"
},
"jmespath": {
@@ -170,10 +167,11 @@
},
"pycparser": {
"hashes": [
- "sha256:8ee45429555515e1f6b185e78100aea234072576aa43ab53aefcae078162fca9",
- "sha256:e644fdec12f7872f86c58ff790da456218b10f863970249516d60a5eaca77206"
+ "sha256:491c8be9c040f5390f5bf44a5b07752bd07f56edf992381b05c701439eec10f6",
+ "sha256:c3702b6d3dd8c7abc1afa565d7e63d53a1d0bd86cdc24edd75470f4de499cfcc"
],
- "version": "==2.21"
+ "markers": "python_version >= '3.8'",
+ "version": "==2.22"
},
"pymysql": {
"hashes": [
@@ -181,7 +179,6 @@
"sha256:8969ec6d763c856f7073c4c64662882675702efcb114b4bcbb955aea3a069fa7"
],
"index": "pypi",
- "markers": "python_version >= '3.7'",
"version": "==1.1.0"
},
"python-dateutil": {
@@ -194,62 +191,102 @@
},
"s3transfer": {
"hashes": [
- "sha256:3cdb40f5cfa6966e812209d0994f2a4709b561c88e90cf00c2696d2df4e56b2e",
- "sha256:d0c8bbf672d5eebbe4e57945e23b972d963f07d82f661cabf678a5c88831595b"
+ "sha256:5683916b4c724f799e600f41dd9e10a9ff19871bf87623cc8f491cb4f5fa0a19",
+ "sha256:ceb252b11bcf87080fb7850a224fb6e05c8a776bab8f2b64b7f25b969464839d"
],
"markers": "python_version >= '3.8'",
- "version": "==0.10.0"
+ "version": "==0.10.1"
},
"simplejson": {
"hashes": [
- "sha256:034550078a11664d77bc1a8364c90bb7eef0e44c2dbb1fd0a4d92e3997088667",
- "sha256:05b43d568300c1cd43f95ff4bfcff984bc658aa001be91efb3bb21df9d6288d3",
- "sha256:0dd9d9c738cb008bfc0862c9b8fa6743495c03a0ed543884bf92fb7d30f8d043",
- "sha256:10fc250c3edea4abc15d930d77274ddb8df4803453dde7ad50c2f5565a18a4bb",
- "sha256:2862beabfb9097a745a961426fe7daf66e1714151da8bb9a0c430dde3d59c7c0",
- "sha256:292c2e3f53be314cc59853bd20a35bf1f965f3bc121e007ab6fd526ed412a85d",
- "sha256:2d3eab2c3fe52007d703a26f71cf649a8c771fcdd949a3ae73041ba6797cfcf8",
- "sha256:2e7b57c2c146f8e4dadf84977a83f7ee50da17c8861fd7faf694d55e3274784f",
- "sha256:311f5dc2af07361725033b13cc3d0351de3da8bede3397d45650784c3f21fbcf",
- "sha256:344e2d920a7f27b4023c087ab539877a1e39ce8e3e90b867e0bfa97829824748",
- "sha256:3fabde09af43e0cbdee407555383063f8b45bfb52c361bc5da83fcffdb4fd278",
- "sha256:42b8b8dd0799f78e067e2aaae97e60d58a8f63582939af60abce4c48631a0aa4",
- "sha256:4b3442249d5e3893b90cb9f72c7d6ce4d2ea144d2c0d9f75b9ae1e5460f3121a",
- "sha256:55d65f9cc1b733d85ef95ab11f559cce55c7649a2160da2ac7a078534da676c8",
- "sha256:5c659a0efc80aaaba57fcd878855c8534ecb655a28ac8508885c50648e6e659d",
- "sha256:72d8a3ffca19a901002d6b068cf746be85747571c6a7ba12cbcf427bfb4ed971",
- "sha256:75ecc79f26d99222a084fbdd1ce5aad3ac3a8bd535cd9059528452da38b68841",
- "sha256:76ac9605bf2f6d9b56abf6f9da9047a8782574ad3531c82eae774947ae99cc3f",
- "sha256:7d276f69bfc8c7ba6c717ba8deaf28f9d3c8450ff0aa8713f5a3280e232be16b",
- "sha256:7f10f8ba9c1b1430addc7dd385fc322e221559d3ae49b812aebf57470ce8de45",
- "sha256:8042040af86a494a23c189b5aa0ea9433769cc029707833f261a79c98e3375f9",
- "sha256:813846738277729d7db71b82176204abc7fdae2f566e2d9fcf874f9b6472e3e6",
- "sha256:845a14f6deb124a3bcb98a62def067a67462a000e0508f256f9c18eff5847efc",
- "sha256:869a183c8e44bc03be1b2bbcc9ec4338e37fa8557fc506bf6115887c1d3bb956",
- "sha256:8acf76443cfb5c949b6e781c154278c059b09ac717d2757a830c869ba000cf8d",
- "sha256:8f713ea65958ef40049b6c45c40c206ab363db9591ff5a49d89b448933fa5746",
- "sha256:934115642c8ba9659b402c8bdbdedb48651fb94b576e3b3efd1ccb079609b04a",
- "sha256:9551f23e09300a9a528f7af20e35c9f79686d46d646152a0c8fc41d2d074d9b0",
- "sha256:9a2b7543559f8a1c9ed72724b549d8cc3515da7daf3e79813a15bdc4a769de25",
- "sha256:a55c76254d7cf8d4494bc508e7abb993a82a192d0db4552421e5139235604625",
- "sha256:ad8f41c2357b73bc9e8606d2fa226233bf4d55d85a8982ecdfd55823a6959995",
- "sha256:af4868da7dd53296cd7630687161d53a7ebe2e63814234631445697bd7c29f46",
- "sha256:afebfc3dd3520d37056f641969ce320b071bc7a0800639c71877b90d053e087f",
- "sha256:b59aa298137ca74a744c1e6e22cfc0bf9dca3a2f41f51bc92eb05695155d905a",
- "sha256:bc00d1210567a4cdd215ac6e17dc00cb9893ee521cee701adfd0fa43f7c73139",
- "sha256:c1cb29b1fced01f97e6d5631c3edc2dadb424d1f4421dad079cb13fc97acb42f",
- "sha256:c94dc64b1a389a416fc4218cd4799aa3756f25940cae33530a4f7f2f54f166da",
- "sha256:ceaa28a5bce8a46a130cd223e895080e258a88d51bf6e8de2fc54a6ef7e38c34",
- "sha256:cff6453e25204d3369c47b97dd34783ca820611bd334779d22192da23784194b",
- "sha256:d0b64409df09edb4c365d95004775c988259efe9be39697d7315c42b7a5e7e94",
- "sha256:d4813b30cb62d3b63ccc60dd12f2121780c7a3068db692daeb90f989877aaf04",
- "sha256:da3c55cdc66cfc3fffb607db49a42448785ea2732f055ac1549b69dcb392663b",
- "sha256:e058c7656c44fb494a11443191e381355388443d543f6fc1a245d5d238544396",
- "sha256:fed0f22bf1313ff79c7fc318f7199d6c2f96d4de3234b2f12a1eab350e597c06",
- "sha256:ffd4e4877a78c84d693e491b223385e0271278f5f4e1476a4962dca6824ecfeb"
+ "sha256:01f426ee9e3a2d205aa4c22c3da996b51f2de75c4199ef703258a28b304dea8c",
+ "sha256:03de1ec4ad734f28ca49b0a758b997d752be0d089ed30360157c4e8811999c8f",
+ "sha256:041dd69026284d10f035cefb4a75026d2cfcef31f31e62585eeb2b7776e7e047",
+ "sha256:05a668d4a93816fb8a644e90e7987aa3beeb9d2112ca50a474d41e6acb5bb88a",
+ "sha256:094275b1b8f003afce1167c8a674cd1ee2fd48c566632dac5d149901d5012ff8",
+ "sha256:097e48686e49026836ef384c7c10ca670acc023cb16a976a689c2eb6c1852df4",
+ "sha256:0cc9a47bf8cde85c99db5f4a919bb756e62427ade0f2e875a6ec89ae8492d486",
+ "sha256:0cdb5069870f7d26a34e5adc30672d0a7b26e652720530a023bb3a8d8a42e37f",
+ "sha256:0dcc54e7cfbd9674ec4ca181e26eaa5b038446601faeaa6c83d146ddef2f2652",
+ "sha256:16fbebfc38ad4285c256d2430797fd669b0437d090e985c6d443521d4303b133",
+ "sha256:1844d7782652f859d9648531778582d4842d80cfff8d334eb23bb8da0d22a1b0",
+ "sha256:2362c66d2c633925d90f2f177f05e0570d320d986130d34dff9ad6edbf7be8ac",
+ "sha256:29a86bc9c8a913a4e0ffab85c563a7505cdf4bd13fba05342f8314facc0b7586",
+ "sha256:2a6e5c0e0817fb20dbb880c83caebbd4ef39f1901f6f8e53b73a3c74de4e5172",
+ "sha256:2d1b47f768e1f4c1c8a9457effabed735939401e85c0ddcdf68444c88a9242e6",
+ "sha256:30e381471158290ccb79bd31e7bbda4c8f2cf7e1a5f6b557c1b97d6036ccd05b",
+ "sha256:313dfd911723dc3022fed7050a7b315d5d0681cd56eee08e44e2cbd39fd9ad81",
+ "sha256:32de1672f91a789cc9e1c36c406b2d75457a242d64e9e73a70b9b814ef00095e",
+ "sha256:340b7d085b4a5063aacb8664b1250e4a7426c16e1cc80705c548a229153af147",
+ "sha256:34d95ad8e27754f0d91917600d6ea273e05c82a71021f168c45be48637d9502f",
+ "sha256:3d549efc7e8f9a180c59462b124991b690ff25c235d5cf495c3246c66a7679cd",
+ "sha256:3dbfaa79b1c0efdb768392a19110f1aff793f3e8d43f57e292f46734b8affb45",
+ "sha256:44058bea97429cfa0d6fb1d8eb0736a77022f34a326d5bc64fd6fed8d9304571",
+ "sha256:46b8cc86204b51eddcf157cbaf3c44a20f24393030442af0909eeb961186cb67",
+ "sha256:47509775a5c41ec2a6cd17c9c00fc14965cad8e6670059663872ba5e39332f57",
+ "sha256:4b5df4ee48403885046c6f4fd8adc84c4ac0adec69482f22a17bd4ba52876341",
+ "sha256:544e5607142d66a469ecf78a3154ec0f915834dc3b8cfdb2677a78ca58319ad6",
+ "sha256:56d36f47bc7c7684504f0f18feb161a0b1162546b3622e45aa6155f8285180ac",
+ "sha256:5b217201efc007166e24e9a282007cc208a2d059350a7c5bd0b0303460ad3019",
+ "sha256:5c4f59dd358c3a99efa46d62dc1583be3a1c37171f5240c4cbdc2d5838870902",
+ "sha256:5d45ed9452a42064805143480397b586ea2ea322f4b8b69034c51181e7f38342",
+ "sha256:6197cfebe659ac802a686b5408494115a7062b45cdf37679c4d6a9d4f39649b7",
+ "sha256:65de5876e34780b43f92d9d2539de16ecc56d16f56e56e59b34adfa1cebe064f",
+ "sha256:676e8c182f8079851f12ae1cee2fcebe04def2da2a5703a9d747ab125af47732",
+ "sha256:682b202f56d9d9e1bb22eaca3e37321002223fd5ddef7189b9233e3c14079917",
+ "sha256:695da62e494e4689ab78fae173a78390a175b6a5ccc4292277ce0f8dba3945d5",
+ "sha256:6d65ea4582b47d77e9094c22eb0aeded0ebd96c1df86e988870b40c6514c6e21",
+ "sha256:706a7fc81ceeb321a1040d008b134056012188f95a5c31ad94fb03153b35cc84",
+ "sha256:7339bd6203351555c1e728acd601ba95ebce0f6041ebdb386e025f00af3f1769",
+ "sha256:7701a289d45fdfeb37f1d15cf638801cea439df667a613379443772a86e82936",
+ "sha256:7f27a079cb009ba569983061a50a9270b7e1d35f81e4eeaf0e26f8924027e550",
+ "sha256:827ddc3b3603f7d0421b054388da6face7871d800c4b3bbedeedc8778e4085ea",
+ "sha256:8ccc982197982cdda19e3e5ba4ef7f6ad6bed3eb39bb423bfbf7fa2cd29488ab",
+ "sha256:8f381747c2edebe3c750a571e55103bfcc33b2707a9b91ae033ab9ba718d976a",
+ "sha256:93ba80fbf959b5852554f23201a5f4b30885930c303546ffa883859a435ea3cf",
+ "sha256:9a50a9da1cf93e35f26c4ddee162abf3184a340339ec2d4001c34607b87e71b4",
+ "sha256:a1163bfe5d043c20adeb5c4c8e89dd1dd39b375c8ca6f1c1e35ec537ad7a12e7",
+ "sha256:a2285609b4edbf9957440642493788ebef6583042b3fb96217c2e71f29bc6d80",
+ "sha256:a255d30cda6334ba780eb40a56e8134efd3453948b995d3966e45212e34bf018",
+ "sha256:a3bba99178f1b25878752a8bc6da2f93fbae754ebd4914d2ac4b869b9fb24102",
+ "sha256:a56005332d70b8d02d476d4a85818b27b01e51dac1a21d5c1a1d8a5df2efb4a6",
+ "sha256:a89d7fe994b115f0a792e6673f387af3db812a1760d594abad51e0ea11d3e470",
+ "sha256:a8ac155e3fd3b54a63040df024e57e62c130b15a2fc66eff3c2a946f42beed52",
+ "sha256:ab5941e1fd509fc151258477ef4b663fe14c94f8faf3581827bf4b02080fd4ba",
+ "sha256:ab64f087c5863ac621b42e227e5a43bd9b28de581afe7be12ad96562b9be8203",
+ "sha256:ad37f25fd8dfbed80815c3281b82a165be2a74e663856b9a50099d18789987bc",
+ "sha256:b17026f3f349a6e87818cd3531e3bbb5cc78a6f4b2b6718f574a8e0512d71e08",
+ "sha256:b43d3c2e204d709af955bdb904ae127fe137363ace87fbf7dc8fe6017f7f8449",
+ "sha256:b482d1fdd8f860e743c7de8cd6dfe54fb9fe8cd6ccba29e2966912ac89e17b2f",
+ "sha256:b6c6cfc492710d8f0303705fa1ff7bb3d6a145f523384e45a6f3b13ada37021f",
+ "sha256:b9893852c559998f667e6434d2c2474518d4cdfd1b9cec8e57b3c9d577ba55c1",
+ "sha256:bd694c465cc61fa8e599355e535b6eb561279834d9883aeef08d0e86c44c300c",
+ "sha256:c0444423129df448788edc66a129bc7560ad7d6a661d74f0900959c0b44349a1",
+ "sha256:c37b092d29741096c4723f48924a80b1d3de62ca1de254ce88178fa083dd520c",
+ "sha256:ced906b172bfad62736a27cfafcb6e24bc9938533b0529ff8150f7926fe35b54",
+ "sha256:d0d3b9f7cee233368d92c89746dde74313abafaa3ec1f0c06a3f4f164dc27bcc",
+ "sha256:d5f67bffa6fc68e391b2250e1feb43d534ded64a7b918eb89cf7e3e679759d94",
+ "sha256:d9f0dfde448611f4f818da05f9b544a78f29355dc39151b0dad8e7c65c513e4f",
+ "sha256:da6dc0cb00ef1e1a8daf285074ca8b2bb89591170c42ceab0c37bcdb9adc802c",
+ "sha256:dc74a9ef4d61e18ee6f1886b6ef1fe285b1f432885288afacfb7402f7d469448",
+ "sha256:deb71e6166e4f1264174d78b5b88abd52b14c6649e6eabaf9cf93cb1c7362850",
+ "sha256:e042ae053e05fe193514d51d6b0f0243729961901e9a75f8b596bfaf69522c52",
+ "sha256:e2f87a483c4ab0bb2a9adc9ca09173e7f7cf3696e4fa67bd45a6b33181e57921",
+ "sha256:e2fa1ee5ca34ab2ecfbe3f7a7e952a1ecaebb5b4818f002b5b146324912ac3d5",
+ "sha256:e7d3f7cd57ce0c6a5bb8133f8ed5c3d1be0473a88b7d91a300626298f12d0999",
+ "sha256:edb334cab35dcd90eb563fdacb085f10e5dd0b1acb57fa43f8933308b42a8f88",
+ "sha256:efae49d0148ec68b6e012f1b9e19bd530f4dced378ba919e3e906ae2b829cc31",
+ "sha256:f1085cadec0f7e76377951d7a87744628c90ac6cc634fc97eecce0c4d41ec563",
+ "sha256:f15f56b3119fb71fa57eb4613bcd87eb7df6c2f3547de7d341853d3e50cef97e",
+ "sha256:f1b425a857ce52e651739314e4118fc68bd702ef983148b8fd5cb6f68bb6a020",
+ "sha256:f31e126204ec38f92dee119af87cf881044ef7dea6f7477ef774ed3d84199c24",
+ "sha256:f5e0a03e533313eee9437ccc6c4eab47369f17bc919b57df4a20ccd8bc85d8fd",
+ "sha256:f85d87986ca375b8305b5c4f166783b8db383a6469e8b99b8dba22878388f234",
+ "sha256:fa6fe8fa94a831886ee164ac03514f361e1387a62a1b9da32fde5c0c1f27fa8d",
+ "sha256:fb0f8b35c11fd8e4b924f974d331b20fa54555282451db7f2a3b24bd2d33cc11"
],
"markers": "python_version >= '2.5' and python_version not in '3.0, 3.1, 3.2, 3.3'",
- "version": "==3.17.2"
+ "version": "==3.18.4"
},
"six": {
"hashes": [
@@ -271,12 +308,11 @@
"develop": {
"autopep8": {
"hashes": [
- "sha256:067959ca4a07b24dbd5345efa8325f5f58da4298dab0dde0443d5ed765de80cb",
- "sha256:2913064abd97b3419d1cc83ea71f042cb821f87e45b9c88cad5ad3c4ea87fe0c"
+ "sha256:1fa8964e4618929488f4ec36795c7ff12924a68b8bf01366c094fc52f770b6e7",
+ "sha256:2bb76888c5edbcafe6aabab3c47ba534f5a2c2d245c2eddced4a30c4b4946357"
],
"index": "pypi",
- "markers": "python_version >= '3.6'",
- "version": "==2.0.4"
+ "version": "==2.1.0"
},
"flake8": {
"hashes": [
@@ -284,7 +320,6 @@
"sha256:a6dfbb75e03252917f2473ea9653f7cd799c3064e54d4c8140044c5c065f53c3"
],
"index": "pypi",
- "markers": "python_full_version >= '3.8.1'",
"version": "==7.0.0"
},
"mccabe": {
diff --git a/rds_mysql/stored_procedure/crm_data_sync.sql b/rds_mysql/stored_procedure/crm_data_sync.sql
new file mode 100644
index 00000000..bb3f3354
--- /dev/null
+++ b/rds_mysql/stored_procedure/crm_data_sync.sql
@@ -0,0 +1,48 @@
+-- A5M2で実行時に[SQL] - [スラッシュ(/)のみの行でSQLを区切る]に変えてから実行する
+-- $$から始まる文字は後からREPLACEする文字を示す独自ルール
+-- crm_data_syncストアドプロシージャは、同一セッション内での並列処理を実行することができない
+-- 実行者の権限でストアドプロシージャを実行するために、「SQL SECURITY INVOKER」を付与している
+CREATE PROCEDURE src02.crm_data_sync(target_table VARCHAR(255), target_table_all VARCHAR(255), target_column VARCHAR(255))
+SQL SECURITY INVOKER
+BEGIN
+ -- 例外処理
+ -- エラーが発生した場合に一時テーブルの削除を実施
+ DECLARE EXIT HANDLER FOR SQLEXCEPTION
+ BEGIN
+ GET DIAGNOSTICS CONDITION 1
+ @error_state = RETURNED_SQLSTATE, @error_msg = MESSAGE_TEXT;
+ ROLLBACK;
+ SIGNAL SQLSTATE '45000'
+ SET MYSQL_ERRNO = @error_state, MESSAGE_TEXT = @error_msg;
+ END;
+
+ SET @error_state = NULL, @error_msg = NULL;
+ START TRANSACTION;
+
+ -- ①-1 Salesforce側で物理削除されたデータを検出し更新する
+ SET @update_end_datetime = '
+ UPDATE $$target_table$$ tt
+ SET
+ tt.end_datetime = CURRENT_TIMESTAMP ()
+ , tt.upd_user = CURRENT_USER ()
+ , tt.upd_date = CURRENT_TIMESTAMP ()
+ WHERE
+ tt.end_datetime = "9999-12-31 00:00:00"
+ AND NOT EXISTS (
+ SELECT
+ tta.Id
+ FROM
+ $$target_table_all$$ tta
+ WHERE
+ tt.Id = tta.Id
+ AND tt.$$target_column$$ = tta.$$target_column$$
+ )
+ ';
+ SET @update_end_datetime = REPLACE(@update_end_datetime, "$$target_table$$", target_table);
+ SET @update_end_datetime = REPLACE(@update_end_datetime, "$$target_table_all$$", target_table_all);
+ SET @update_end_datetime = REPLACE(@update_end_datetime, "$$target_column$$", target_column);
+ PREPARE update_end_datetime_stmt from @update_end_datetime;
+ EXECUTE update_end_datetime_stmt;
+
+ COMMIT;
+END
diff --git a/rds_mysql/stored_procedure/crm_history.sql b/rds_mysql/stored_procedure/crm_history.sql
new file mode 100644
index 00000000..cc94bbfb
--- /dev/null
+++ b/rds_mysql/stored_procedure/crm_history.sql
@@ -0,0 +1,95 @@
+-- A5M2で実行時に[SQL] - [スラッシュ(/)のみの行でSQLを区切る]に変えてから実行する
+-- $$から始まり$$で終わる文字は後からREPLACEする文字を示す独自ルール
+-- crm_historyストアドプロシージャは、同一セッション内での並列処理を実行することができない
+-- 実行者の権限でストアドプロシージャを実行するために、「SQL SECURITY INVOKER」を付与している
+CREATE PROCEDURE src02.crm_history(target_table VARCHAR(255), target_column VARCHAR(255))
+SQL SECURITY INVOKER
+BEGIN
+ -- 例外処理
+ -- エラーが発生した場合に一時テーブルの削除を実施
+ DECLARE EXIT HANDLER FOR SQLEXCEPTION
+ BEGIN
+ GET DIAGNOSTICS CONDITION 1
+ @error_state = RETURNED_SQLSTATE, @error_msg = MESSAGE_TEXT;
+ EXECUTE drop_tmp_table_stmt;
+ DEALLOCATE PREPARE drop_tmp_table_stmt;
+ ROLLBACK;
+ SIGNAL SQLSTATE '45000'
+ SET MYSQL_ERRNO = @error_state, MESSAGE_TEXT = @error_msg;
+ END;
+
+ SET @error_state = NULL, @error_msg = NULL;
+ START TRANSACTION;
+
+ -- ②-3で利用する一時テーブル削除のSQLを準備
+ -- 例外処理でも利用するため先に記述
+ SET @drop_tmp_table = '
+ DROP TEMPORARY TABLE IF EXISTS $$target_table$$_make_history_tmp
+ ';
+ SET @drop_tmp_table = REPLACE(@drop_tmp_table, "$$target_table$$", target_table);
+ PREPARE drop_tmp_table_stmt from @drop_tmp_table;
+
+ -- ①-1 Salesforce側で更新されたデータの適用開始日時と適用終了日時を設定する
+ SET @new_history_save = '
+ UPDATE $$target_table$$
+ SET
+ start_datetime = $$target_column$$
+ , end_datetime = "9999-12-31 00:00:00"
+ , upd_user = CURRENT_USER()
+ , upd_date = CURRENT_TIMESTAMP()
+ WHERE
+ start_datetime IS NULL
+ AND end_datetime IS NULL
+ ';
+ SET @new_history_save = REPLACE(@new_history_save, "$$target_table$$", target_table);
+ SET @new_history_save = REPLACE(@new_history_save, "$$target_column$$", target_column);
+ PREPARE new_history_save_stmt from @new_history_save;
+ EXECUTE new_history_save_stmt;
+ DEALLOCATE PREPARE new_history_save_stmt;
+
+ -- ②-1 Salesforce側で更新されたデータを検出用一時テーブルの作成
+ SET @make_history_tmp_create = '
+ CREATE TEMPORARY TABLE $$target_table$$_make_history_tmp
+ SELECT
+ Id
+ , MIN($$target_column$$) AS min_start_datetime
+ , MAX(start_datetime) AS max_start_datetime
+ FROM
+ $$target_table$$
+ WHERE
+ end_datetime = "9999-12-31 00:00:00"
+ GROUP BY
+ Id
+ HAVING
+ count(Id) = 2
+ ';
+ SET @make_history_tmp_create = REPLACE(@make_history_tmp_create, "$$target_table$$", target_table);
+ SET @make_history_tmp_create = REPLACE(@make_history_tmp_create, "$$target_column$$", target_column);
+ PREPARE make_history_tmp_create_stmt from @make_history_tmp_create;
+ EXECUTE make_history_tmp_create_stmt;
+ DEALLOCATE PREPARE make_history_tmp_create_stmt;
+
+ -- ②-2 「②-1」で取得した全件に更新処理を行う
+ SET @update_end_datetime = '
+ UPDATE $$target_table$$ tt
+ INNER JOIN $$target_table$$_make_history_tmp mht
+ ON tt.Id = mht.Id
+ AND tt.start_datetime = mht.min_start_datetime
+ SET
+ end_datetime = mht.max_start_datetime - INTERVAL 1 SECOND
+ , upd_user = CURRENT_USER()
+ , upd_date = CURRENT_TIMESTAMP()
+ ';
+ SET @update_end_datetime = REPLACE(@update_end_datetime, "$$target_table$$", target_table);
+ SET @update_end_datetime = REPLACE(@update_end_datetime, "$$target_column$$", target_column);
+ PREPARE update_end_datetime_stmt from @update_end_datetime;
+ EXECUTE update_end_datetime_stmt;
+ DEALLOCATE PREPARE update_end_datetime_stmt;
+
+ -- ②-3 「②-1」で作成した一時テーブルを削除する
+ EXECUTE drop_tmp_table_stmt;
+ DEALLOCATE PREPARE drop_tmp_table_stmt;
+
+ COMMIT;
+
+END
diff --git a/s3/config/crm/last_fetch_datetime/Medical_Event_vod__c.json b/s3/config/crm/last_fetch_datetime/Medical_Event_vod__c.json
deleted file mode 100644
index 7453dc17..00000000
--- a/s3/config/crm/last_fetch_datetime/Medical_Event_vod__c.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
- "last_fetch_datetime_from": "1900-01-01T00:00:00.000Z",
- "last_fetch_datetime_to": ""
-}
diff --git a/s3/config/crm/object_info/crm_object_list_diff.json b/s3/config/crm/object_info/crm_object_list_diff.json
index e4b17fdd..82a19d57 100644
--- a/s3/config/crm/object_info/crm_object_list_diff.json
+++ b/s3/config/crm/object_info/crm_object_list_diff.json
@@ -781,7 +781,8 @@
"MSJ_CE_SIPAGL_5__c",
"MSJ_CE_SIPAGL_Comment__c",
"MSJ_CE_SIPAGL_1A_date__c",
- "MSJ_CE_SIPAGL_6__c"
+ "MSJ_CE_SIPAGL_6__c",
+ "MSJ_mc_campaign_code__c"
],
"is_skip": false,
"is_update_last_fetch_datetime": true
diff --git a/s3/data/crm/settings/CRM_Medical_Event_vod__c.txt b/s3/data/crm/settings/CRM_Medical_Event_vod__c.txt
index 9fbad221..e5ace5f1 100644
--- a/s3/data/crm/settings/CRM_Medical_Event_vod__c.txt
+++ b/s3/data/crm/settings/CRM_Medical_Event_vod__c.txt
@@ -4,9 +4,9 @@ utf-8
"
CRLF
1
-52
-Id,OwnerId,IsDeleted,Name,RecordTypeId,CreatedDate,CreatedById,LastModifiedDate,LastModifiedById,SystemModstamp,LastActivityDate,MayEdit,IsLocked,LastViewedDate,LastReferencedDate,Primary_Product__c,Description_vod__c,Start_Date_vod__c,Location__c,End_Date_vod__c,Secondary_Product__c,Website__c,Active_vod__c,Event_Type__c,MSJ_Area__c,MSJ_Business_Unit__c,MSJ_Comment__c,MSJ_Company__c,MSJ_Expense_App_No__c,MSJ_Form__c,MSJ_HQ_Area__c,MSJ_Location__c,MSJ_MR__c,MSJ_Number_of_Attendee__c,MSJ_Product__c,MSJ_Site__c,MSJ_Type__c,MSJ_Number_of_Attendee_Auto_Calc__c,MSJ_Number_of_Attendee_Invited__c,Account_vod__c,MSJ_MUID__c,Country_Name_vod__c,MSJ_CE_SIPAGL_Updater__c,MSJ_CE_SIPAGL_1A__c,MSJ_CE_SIPAGL_1B__c,MSJ_CE_SIPAGL_2__c,MSJ_CE_SIPAGL_3__c,MSJ_CE_SIPAGL_4__c,MSJ_CE_SIPAGL_5__c,MSJ_CE_SIPAGL_Comment__c,MSJ_CE_SIPAGL_1A_date__c,MSJ_CE_SIPAGL_6__c
-Id,OwnerId,IsDeleted,Name,RecordTypeId,CreatedDate,CreatedById,LastModifiedDate,LastModifiedById,SystemModstamp,LastActivityDate,MayEdit,IsLocked,LastViewedDate,LastReferencedDate,Primary_Product__c,Description_vod__c,Start_Date_vod__c,Location__c,End_Date_vod__c,Secondary_Product__c,Website__c,Active_vod__c,Event_Type__c,MSJ_Area__c,MSJ_Business_Unit__c,MSJ_Comment__c,MSJ_Company__c,MSJ_Expense_App_No__c,MSJ_Form__c,MSJ_HQ_Area__c,MSJ_Location__c,MSJ_MR__c,MSJ_Number_of_Attendee__c,MSJ_Product__c,MSJ_Site__c,MSJ_Type__c,MSJ_Number_of_Attendee_Auto_Calc__c,MSJ_Number_of_Attendee_Invited__c,Account_vod__c,MSJ_MUID__c,Country_Name_vod__c,MSJ_CE_SIPAGL_Updater__c,MSJ_CE_SIPAGL_1A__c,MSJ_CE_SIPAGL_1B__c,MSJ_CE_SIPAGL_2__c,MSJ_CE_SIPAGL_3__c,MSJ_CE_SIPAGL_4__c,MSJ_CE_SIPAGL_5__c,MSJ_CE_SIPAGL_Comment__c,MSJ_CE_SIPAGL_1A_date__c,MSJ_CE_SIPAGL_6__c
+53
+Id,OwnerId,IsDeleted,Name,RecordTypeId,CreatedDate,CreatedById,LastModifiedDate,LastModifiedById,SystemModstamp,LastActivityDate,MayEdit,IsLocked,LastViewedDate,LastReferencedDate,Primary_Product__c,Description_vod__c,Start_Date_vod__c,Location__c,End_Date_vod__c,Secondary_Product__c,Website__c,Active_vod__c,Event_Type__c,MSJ_Area__c,MSJ_Business_Unit__c,MSJ_Comment__c,MSJ_Company__c,MSJ_Expense_App_No__c,MSJ_Form__c,MSJ_HQ_Area__c,MSJ_Location__c,MSJ_MR__c,MSJ_Number_of_Attendee__c,MSJ_Product__c,MSJ_Site__c,MSJ_Type__c,MSJ_Number_of_Attendee_Auto_Calc__c,MSJ_Number_of_Attendee_Invited__c,Account_vod__c,MSJ_MUID__c,Country_Name_vod__c,MSJ_CE_SIPAGL_Updater__c,MSJ_CE_SIPAGL_1A__c,MSJ_CE_SIPAGL_1B__c,MSJ_CE_SIPAGL_2__c,MSJ_CE_SIPAGL_3__c,MSJ_CE_SIPAGL_4__c,MSJ_CE_SIPAGL_5__c,MSJ_CE_SIPAGL_Comment__c,MSJ_CE_SIPAGL_1A_date__c,MSJ_CE_SIPAGL_6__c,MSJ_mc_campaign_code__c
+Id,OwnerId,IsDeleted,Name,RecordTypeId,CreatedDate,CreatedById,LastModifiedDate,LastModifiedById,SystemModstamp,LastActivityDate,MayEdit,IsLocked,LastViewedDate,LastReferencedDate,Primary_Product__c,Description_vod__c,Start_Date_vod__c,Location__c,End_Date_vod__c,Secondary_Product__c,Website__c,Active_vod__c,Event_Type__c,MSJ_Area__c,MSJ_Business_Unit__c,MSJ_Comment__c,MSJ_Company__c,MSJ_Expense_App_No__c,MSJ_Form__c,MSJ_HQ_Area__c,MSJ_Location__c,MSJ_MR__c,MSJ_Number_of_Attendee__c,MSJ_Product__c,MSJ_Site__c,MSJ_Type__c,MSJ_Number_of_Attendee_Auto_Calc__c,MSJ_Number_of_Attendee_Invited__c,Account_vod__c,MSJ_MUID__c,Country_Name_vod__c,MSJ_CE_SIPAGL_Updater__c,MSJ_CE_SIPAGL_1A__c,MSJ_CE_SIPAGL_1B__c,MSJ_CE_SIPAGL_2__c,MSJ_CE_SIPAGL_3__c,MSJ_CE_SIPAGL_4__c,MSJ_CE_SIPAGL_5__c,MSJ_CE_SIPAGL_Comment__c,MSJ_CE_SIPAGL_1A_date__c,MSJ_CE_SIPAGL_6__c,MSJ_mc_campaign_code__c
src02.crm_Medical_Event_vod__c
org02.crm_Medical_Event_vod__c
|