From bfc856c1aa14b8d2a29cc65740b6e8dc5075e50a Mon Sep 17 00:00:00 2001 From: cheolwon1994 <32122076+cheolwon1994@users.noreply.github.com> Date: Sun, 5 Nov 2023 21:52:00 +0900 Subject: [PATCH 1/4] Create CODEOWNERS --- CODEOWNERS | 1 + 1 file changed, 1 insertion(+) create mode 100644 CODEOWNERS diff --git a/CODEOWNERS b/CODEOWNERS new file mode 100644 index 0000000..bb7b1da --- /dev/null +++ b/CODEOWNERS @@ -0,0 +1 @@ +*.* @cheolwon1994 @pingu9 @ddnjs @inyoung0215 @HonggeunKwon From aacb01ffc3535724a9bad884086c412dbe3e4986 Mon Sep 17 00:00:00 2001 From: cheolwon1994 Date: Fri, 10 Nov 2023 14:28:38 +0900 Subject: [PATCH 2/4] reset db, kms, ssh values --- src/main/resources/application-dev.properties | 14 ++++++------- .../resources/application-local.properties | 14 ++++++------- src/main/resources/application.properties | 20 ++++++++++++------- 3 files changed, 27 insertions(+), 21 deletions(-) diff --git a/src/main/resources/application-dev.properties b/src/main/resources/application-dev.properties index eee38e3..531f0bc 100644 --- a/src/main/resources/application-dev.properties +++ b/src/main/resources/application-dev.properties @@ -2,19 +2,19 @@ spring.datasource.driver-class-name=org.mariadb.jdbc.Driver ## spring datasource spring.datasource.url=AQICAHg2j0pl3GguoQNkjcreuBPYJqI3OPeLEOelKIkMSzn01AEZqo9kRIKYisZIm0Z0xpuOAAAAiDCBhQYJKoZIhvcNAQcGoHgwdgIBADBxBgkqhkiG9w0BBwEwHgYJYIZIAWUDBAEuMBEEDMoZI5smgDwlG+0kBgIBEIBE1VE7k3neYIx1Pkx6YqUrTf7LEBAxddoUbZVTZxC7HQJpNJKNlwMoaXXyHdPTkBW15dJiCw5jUzuY9CRV7o/vpogIg9Q= -spring.datasource.username=AQICAHg2j0pl3GguoQNkjcreuBPYJqI3OPeLEOelKIkMSzn01AGLdMIjOGdWmBOvj9YZ5685AAAAajBoBgkqhkiG9w0BBwagWzBZAgEAMFQGCSqGSIb3DQEHATAeBglghkgBZQMEAS4wEQQMDgyL4QtIvG2hM9/5AgEQgCdVSGC6ySfTUn8ZyXKzj2x9eFu+05ACK2sP55fJtoGP0hncckeuVmQ= -spring.datasource.password=AQICAHg2j0pl3GguoQNkjcreuBPYJqI3OPeLEOelKIkMSzn01AGVzdO6dwAvzNw42TIj6JZ1AAAAaTBnBgkqhkiG9w0BBwagWjBYAgEAMFMGCSqGSIb3DQEHATAeBglghkgBZQMEAS4wEQQMjonbIr69Og3D+ujOAgEQgCatIXU02fuulW5mm6Bn+X9e/FPMq3Fk/GhOLyYpudTHfSkRtMORQQ== +spring.datasource.username=AQICAHg2j0pl3GguoQNkjcreuBPYJqI3OPeLEOelKIkMSzn01AFDjW/RUZSn5wxJhd1XeZOgAAAAYzBhBgkqhkiG9w0BBwagVDBSAgEAME0GCSqGSIb3DQEHATAeBglghkgBZQMEAS4wEQQM0eyz4OI2Vkkc/uTUAgEQgCAXcQUOKDsI26jXFzQfba7Cv2EHO51213zwOT0hzc0SnQ== +spring.datasource.password=AQICAHg2j0pl3GguoQNkjcreuBPYJqI3OPeLEOelKIkMSzn01AGiM8q8PoYW89muC9gXzZ5GAAAAaTBnBgkqhkiG9w0BBwagWjBYAgEAMFMGCSqGSIb3DQEHATAeBglghkgBZQMEAS4wEQQMxGIq7N/hB2XW5NODAgEQgCZeBBgSs9LrXXuCsMAHE53Rsg1WGKfDzjMaAoFRDjEKoGTT9uFThQ== ## ssh -ssh.host=AQICAHg2j0pl3GguoQNkjcreuBPYJqI3OPeLEOelKIkMSzn01AGU6PSF+1N5z7We+p8jZ0o0AAAAaDBmBgkqhkiG9w0BBwagWTBXAgEAMFIGCSqGSIb3DQEHATAeBglghkgBZQMEAS4wEQQM9b3AkdokJsb66zbHAgEQgCXIPbqF5l817FjPbh2LXBzXndYJiSUqyDGZXzyfppZi3qqlSYZV -ssh.username=AQICAHg2j0pl3GguoQNkjcreuBPYJqI3OPeLEOelKIkMSzn01AE68oCmRn5p/q+G/NzwrKpHAAAAYjBgBgkqhkiG9w0BBwagUzBRAgEAMEwGCSqGSIb3DQEHATAeBglghkgBZQMEAS4wEQQMCABMThPwxXQHcl5bAgEQgB8+W4uWWbUm8bpo7QTCtjYyJ/ZB5hv4SKstc3Xa4Ltt -ssh.password=AQICAHg2j0pl3GguoQNkjcreuBPYJqI3OPeLEOelKIkMSzn01AGlm0DJ1SuCTcwtPCyXZLYjAAAAaTBnBgkqhkiG9w0BBwagWjBYAgEAMFMGCSqGSIb3DQEHATAeBglghkgBZQMEAS4wEQQM1awvQRELJm1vQL/oAgEQgCasN+qZQ0q7w4FOhwRTCzPYzoMnraA1yx4T9hz2U3j4SGn3+3yEaQ== -ssh.datasource.origin=AQICAHg2j0pl3GguoQNkjcreuBPYJqI3OPeLEOelKIkMSzn01AGuDWPowi/9gzZpLApcSpl9AAAAmzCBmAYJKoZIhvcNAQcGoIGKMIGHAgEAMIGBBgkqhkiG9w0BBwEwHgYJYIZIAWUDBAEuMBEEDNqU18Wps+61WNJv6QIBEIBUziHPbeZlunGk/0EvzFYVr2TG4HYuwKd9bQcUdRL7PPkZqO+zdFXeYRtgfhyq/isQqKav0E7LAsnrruFaM0BfGmoqHChECFdSABUJ7+uSdWF2F/vV +ssh.host=AQICAHg2j0pl3GguoQNkjcreuBPYJqI3OPeLEOelKIkMSzn01AGc1mlusKIbT/FmW65+2rl4AAAAbDBqBgkqhkiG9w0BBwagXTBbAgEAMFYGCSqGSIb3DQEHATAeBglghkgBZQMEAS4wEQQMvijHTTZUUuGjjF4jAgEQgCmKq00a3J3yAUkdljTk342nBjYaeLr5BQeJ2kIISM3P/WPMXKQB/0WzlQ== +ssh.username=AQICAHg2j0pl3GguoQNkjcreuBPYJqI3OPeLEOelKIkMSzn01AE26DRJsDEHLdAnA5QIkHfYAAAAZjBkBgkqhkiG9w0BBwagVzBVAgEAMFAGCSqGSIb3DQEHATAeBglghkgBZQMEAS4wEQQMd4p4zWU1dg+tbLAKAgEQgCNWOoyj2Ual/lQaCe7yz2JkY6TXbUR25FO6SkPkYaAncbgkcA== +ssh.password=AQICAHg2j0pl3GguoQNkjcreuBPYJqI3OPeLEOelKIkMSzn01AFNH5Ud+NVY/FVqOa99UOeMAAAAaTBnBgkqhkiG9w0BBwagWjBYAgEAMFMGCSqGSIb3DQEHATAeBglghkgBZQMEAS4wEQQMsRopSwW2oDrqOTNrAgEQgCacSRENpF2QbZBfiyN/mlQlY21Qd6PSHef54Rg29FfM5rhWlEuFfg== +ssh.datasource.origin=AQICAHg2j0pl3GguoQNkjcreuBPYJqI3OPeLEOelKIkMSzn01AFY15QxnieQA6WGHi+ZBdpTAAAAtDCBsQYJKoZIhvcNAQcGoIGjMIGgAgEAMIGaBgkqhkiG9w0BBwEwHgYJYIZIAWUDBAEuMBEEDDHB9KlaPh/a8J528wIBEIBtds8VUJXlJZSbxWDeV9mnr+16QcsLiVr4C9GlnR44Wb9opywAAUFBCBYqN1SX4czjhkdEgryY9/QYyzSx+VHLT5ORfVTFZ58IbMRGBpZdoXVgXfCH9WSXz3xDDBZQQ7MDlMAj2dECNsgLAA6i2A== ssh.port=22 ssh.local-port=3306 ## kms -aws.kms.keyId=03703854-534e-40ec-838c-cf65541f88f8 +aws.kms.keyId=5d1c783d-6c8e-4661-a8ed-a12654aac8c3 aws.kms.encryptionAlgorithm=SYMMETRIC_DEFAULT aws.kms.profile=default diff --git a/src/main/resources/application-local.properties b/src/main/resources/application-local.properties index eee38e3..531f0bc 100644 --- a/src/main/resources/application-local.properties +++ b/src/main/resources/application-local.properties @@ -2,19 +2,19 @@ spring.datasource.driver-class-name=org.mariadb.jdbc.Driver ## spring datasource spring.datasource.url=AQICAHg2j0pl3GguoQNkjcreuBPYJqI3OPeLEOelKIkMSzn01AEZqo9kRIKYisZIm0Z0xpuOAAAAiDCBhQYJKoZIhvcNAQcGoHgwdgIBADBxBgkqhkiG9w0BBwEwHgYJYIZIAWUDBAEuMBEEDMoZI5smgDwlG+0kBgIBEIBE1VE7k3neYIx1Pkx6YqUrTf7LEBAxddoUbZVTZxC7HQJpNJKNlwMoaXXyHdPTkBW15dJiCw5jUzuY9CRV7o/vpogIg9Q= -spring.datasource.username=AQICAHg2j0pl3GguoQNkjcreuBPYJqI3OPeLEOelKIkMSzn01AGLdMIjOGdWmBOvj9YZ5685AAAAajBoBgkqhkiG9w0BBwagWzBZAgEAMFQGCSqGSIb3DQEHATAeBglghkgBZQMEAS4wEQQMDgyL4QtIvG2hM9/5AgEQgCdVSGC6ySfTUn8ZyXKzj2x9eFu+05ACK2sP55fJtoGP0hncckeuVmQ= -spring.datasource.password=AQICAHg2j0pl3GguoQNkjcreuBPYJqI3OPeLEOelKIkMSzn01AGVzdO6dwAvzNw42TIj6JZ1AAAAaTBnBgkqhkiG9w0BBwagWjBYAgEAMFMGCSqGSIb3DQEHATAeBglghkgBZQMEAS4wEQQMjonbIr69Og3D+ujOAgEQgCatIXU02fuulW5mm6Bn+X9e/FPMq3Fk/GhOLyYpudTHfSkRtMORQQ== +spring.datasource.username=AQICAHg2j0pl3GguoQNkjcreuBPYJqI3OPeLEOelKIkMSzn01AFDjW/RUZSn5wxJhd1XeZOgAAAAYzBhBgkqhkiG9w0BBwagVDBSAgEAME0GCSqGSIb3DQEHATAeBglghkgBZQMEAS4wEQQM0eyz4OI2Vkkc/uTUAgEQgCAXcQUOKDsI26jXFzQfba7Cv2EHO51213zwOT0hzc0SnQ== +spring.datasource.password=AQICAHg2j0pl3GguoQNkjcreuBPYJqI3OPeLEOelKIkMSzn01AGiM8q8PoYW89muC9gXzZ5GAAAAaTBnBgkqhkiG9w0BBwagWjBYAgEAMFMGCSqGSIb3DQEHATAeBglghkgBZQMEAS4wEQQMxGIq7N/hB2XW5NODAgEQgCZeBBgSs9LrXXuCsMAHE53Rsg1WGKfDzjMaAoFRDjEKoGTT9uFThQ== ## ssh -ssh.host=AQICAHg2j0pl3GguoQNkjcreuBPYJqI3OPeLEOelKIkMSzn01AGU6PSF+1N5z7We+p8jZ0o0AAAAaDBmBgkqhkiG9w0BBwagWTBXAgEAMFIGCSqGSIb3DQEHATAeBglghkgBZQMEAS4wEQQM9b3AkdokJsb66zbHAgEQgCXIPbqF5l817FjPbh2LXBzXndYJiSUqyDGZXzyfppZi3qqlSYZV -ssh.username=AQICAHg2j0pl3GguoQNkjcreuBPYJqI3OPeLEOelKIkMSzn01AE68oCmRn5p/q+G/NzwrKpHAAAAYjBgBgkqhkiG9w0BBwagUzBRAgEAMEwGCSqGSIb3DQEHATAeBglghkgBZQMEAS4wEQQMCABMThPwxXQHcl5bAgEQgB8+W4uWWbUm8bpo7QTCtjYyJ/ZB5hv4SKstc3Xa4Ltt -ssh.password=AQICAHg2j0pl3GguoQNkjcreuBPYJqI3OPeLEOelKIkMSzn01AGlm0DJ1SuCTcwtPCyXZLYjAAAAaTBnBgkqhkiG9w0BBwagWjBYAgEAMFMGCSqGSIb3DQEHATAeBglghkgBZQMEAS4wEQQM1awvQRELJm1vQL/oAgEQgCasN+qZQ0q7w4FOhwRTCzPYzoMnraA1yx4T9hz2U3j4SGn3+3yEaQ== -ssh.datasource.origin=AQICAHg2j0pl3GguoQNkjcreuBPYJqI3OPeLEOelKIkMSzn01AGuDWPowi/9gzZpLApcSpl9AAAAmzCBmAYJKoZIhvcNAQcGoIGKMIGHAgEAMIGBBgkqhkiG9w0BBwEwHgYJYIZIAWUDBAEuMBEEDNqU18Wps+61WNJv6QIBEIBUziHPbeZlunGk/0EvzFYVr2TG4HYuwKd9bQcUdRL7PPkZqO+zdFXeYRtgfhyq/isQqKav0E7LAsnrruFaM0BfGmoqHChECFdSABUJ7+uSdWF2F/vV +ssh.host=AQICAHg2j0pl3GguoQNkjcreuBPYJqI3OPeLEOelKIkMSzn01AGc1mlusKIbT/FmW65+2rl4AAAAbDBqBgkqhkiG9w0BBwagXTBbAgEAMFYGCSqGSIb3DQEHATAeBglghkgBZQMEAS4wEQQMvijHTTZUUuGjjF4jAgEQgCmKq00a3J3yAUkdljTk342nBjYaeLr5BQeJ2kIISM3P/WPMXKQB/0WzlQ== +ssh.username=AQICAHg2j0pl3GguoQNkjcreuBPYJqI3OPeLEOelKIkMSzn01AE26DRJsDEHLdAnA5QIkHfYAAAAZjBkBgkqhkiG9w0BBwagVzBVAgEAMFAGCSqGSIb3DQEHATAeBglghkgBZQMEAS4wEQQMd4p4zWU1dg+tbLAKAgEQgCNWOoyj2Ual/lQaCe7yz2JkY6TXbUR25FO6SkPkYaAncbgkcA== +ssh.password=AQICAHg2j0pl3GguoQNkjcreuBPYJqI3OPeLEOelKIkMSzn01AFNH5Ud+NVY/FVqOa99UOeMAAAAaTBnBgkqhkiG9w0BBwagWjBYAgEAMFMGCSqGSIb3DQEHATAeBglghkgBZQMEAS4wEQQMsRopSwW2oDrqOTNrAgEQgCacSRENpF2QbZBfiyN/mlQlY21Qd6PSHef54Rg29FfM5rhWlEuFfg== +ssh.datasource.origin=AQICAHg2j0pl3GguoQNkjcreuBPYJqI3OPeLEOelKIkMSzn01AFY15QxnieQA6WGHi+ZBdpTAAAAtDCBsQYJKoZIhvcNAQcGoIGjMIGgAgEAMIGaBgkqhkiG9w0BBwEwHgYJYIZIAWUDBAEuMBEEDDHB9KlaPh/a8J528wIBEIBtds8VUJXlJZSbxWDeV9mnr+16QcsLiVr4C9GlnR44Wb9opywAAUFBCBYqN1SX4czjhkdEgryY9/QYyzSx+VHLT5ORfVTFZ58IbMRGBpZdoXVgXfCH9WSXz3xDDBZQQ7MDlMAj2dECNsgLAA6i2A== ssh.port=22 ssh.local-port=3306 ## kms -aws.kms.keyId=03703854-534e-40ec-838c-cf65541f88f8 +aws.kms.keyId=5d1c783d-6c8e-4661-a8ed-a12654aac8c3 aws.kms.encryptionAlgorithm=SYMMETRIC_DEFAULT aws.kms.profile=default diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index 4b8f1b6..2dc9ecf 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -4,28 +4,34 @@ spring.datasource.driver-class-name=org.mariadb.jdbc.Driver ## spring datasource spring.datasource.url=AQICAHg2j0pl3GguoQNkjcreuBPYJqI3OPeLEOelKIkMSzn01AEZqo9kRIKYisZIm0Z0xpuOAAAAiDCBhQYJKoZIhvcNAQcGoHgwdgIBADBxBgkqhkiG9w0BBwEwHgYJYIZIAWUDBAEuMBEEDMoZI5smgDwlG+0kBgIBEIBE1VE7k3neYIx1Pkx6YqUrTf7LEBAxddoUbZVTZxC7HQJpNJKNlwMoaXXyHdPTkBW15dJiCw5jUzuY9CRV7o/vpogIg9Q= -spring.datasource.username=AQICAHg2j0pl3GguoQNkjcreuBPYJqI3OPeLEOelKIkMSzn01AGLdMIjOGdWmBOvj9YZ5685AAAAajBoBgkqhkiG9w0BBwagWzBZAgEAMFQGCSqGSIb3DQEHATAeBglghkgBZQMEAS4wEQQMDgyL4QtIvG2hM9/5AgEQgCdVSGC6ySfTUn8ZyXKzj2x9eFu+05ACK2sP55fJtoGP0hncckeuVmQ= -spring.datasource.password=AQICAHg2j0pl3GguoQNkjcreuBPYJqI3OPeLEOelKIkMSzn01AGVzdO6dwAvzNw42TIj6JZ1AAAAaTBnBgkqhkiG9w0BBwagWjBYAgEAMFMGCSqGSIb3DQEHATAeBglghkgBZQMEAS4wEQQMjonbIr69Og3D+ujOAgEQgCatIXU02fuulW5mm6Bn+X9e/FPMq3Fk/GhOLyYpudTHfSkRtMORQQ== +spring.datasource.username=AQICAHg2j0pl3GguoQNkjcreuBPYJqI3OPeLEOelKIkMSzn01AFDjW/RUZSn5wxJhd1XeZOgAAAAYzBhBgkqhkiG9w0BBwagVDBSAgEAME0GCSqGSIb3DQEHATAeBglghkgBZQMEAS4wEQQM0eyz4OI2Vkkc/uTUAgEQgCAXcQUOKDsI26jXFzQfba7Cv2EHO51213zwOT0hzc0SnQ== +spring.datasource.password=AQICAHg2j0pl3GguoQNkjcreuBPYJqI3OPeLEOelKIkMSzn01AGiM8q8PoYW89muC9gXzZ5GAAAAaTBnBgkqhkiG9w0BBwagWjBYAgEAMFMGCSqGSIb3DQEHATAeBglghkgBZQMEAS4wEQQMxGIq7N/hB2XW5NODAgEQgCZeBBgSs9LrXXuCsMAHE53Rsg1WGKfDzjMaAoFRDjEKoGTT9uFThQ== ## ssh -ssh.host=AQICAHg2j0pl3GguoQNkjcreuBPYJqI3OPeLEOelKIkMSzn01AGU6PSF+1N5z7We+p8jZ0o0AAAAaDBmBgkqhkiG9w0BBwagWTBXAgEAMFIGCSqGSIb3DQEHATAeBglghkgBZQMEAS4wEQQM9b3AkdokJsb66zbHAgEQgCXIPbqF5l817FjPbh2LXBzXndYJiSUqyDGZXzyfppZi3qqlSYZV -ssh.username=AQICAHg2j0pl3GguoQNkjcreuBPYJqI3OPeLEOelKIkMSzn01AE68oCmRn5p/q+G/NzwrKpHAAAAYjBgBgkqhkiG9w0BBwagUzBRAgEAMEwGCSqGSIb3DQEHATAeBglghkgBZQMEAS4wEQQMCABMThPwxXQHcl5bAgEQgB8+W4uWWbUm8bpo7QTCtjYyJ/ZB5hv4SKstc3Xa4Ltt -ssh.password=AQICAHg2j0pl3GguoQNkjcreuBPYJqI3OPeLEOelKIkMSzn01AGlm0DJ1SuCTcwtPCyXZLYjAAAAaTBnBgkqhkiG9w0BBwagWjBYAgEAMFMGCSqGSIb3DQEHATAeBglghkgBZQMEAS4wEQQM1awvQRELJm1vQL/oAgEQgCasN+qZQ0q7w4FOhwRTCzPYzoMnraA1yx4T9hz2U3j4SGn3+3yEaQ== -ssh.datasource.origin=AQICAHg2j0pl3GguoQNkjcreuBPYJqI3OPeLEOelKIkMSzn01AGuDWPowi/9gzZpLApcSpl9AAAAmzCBmAYJKoZIhvcNAQcGoIGKMIGHAgEAMIGBBgkqhkiG9w0BBwEwHgYJYIZIAWUDBAEuMBEEDNqU18Wps+61WNJv6QIBEIBUziHPbeZlunGk/0EvzFYVr2TG4HYuwKd9bQcUdRL7PPkZqO+zdFXeYRtgfhyq/isQqKav0E7LAsnrruFaM0BfGmoqHChECFdSABUJ7+uSdWF2F/vV +ssh.host=AQICAHg2j0pl3GguoQNkjcreuBPYJqI3OPeLEOelKIkMSzn01AGc1mlusKIbT/FmW65+2rl4AAAAbDBqBgkqhkiG9w0BBwagXTBbAgEAMFYGCSqGSIb3DQEHATAeBglghkgBZQMEAS4wEQQMvijHTTZUUuGjjF4jAgEQgCmKq00a3J3yAUkdljTk342nBjYaeLr5BQeJ2kIISM3P/WPMXKQB/0WzlQ== +ssh.username=AQICAHg2j0pl3GguoQNkjcreuBPYJqI3OPeLEOelKIkMSzn01AE26DRJsDEHLdAnA5QIkHfYAAAAZjBkBgkqhkiG9w0BBwagVzBVAgEAMFAGCSqGSIb3DQEHATAeBglghkgBZQMEAS4wEQQMd4p4zWU1dg+tbLAKAgEQgCNWOoyj2Ual/lQaCe7yz2JkY6TXbUR25FO6SkPkYaAncbgkcA== +ssh.password=AQICAHg2j0pl3GguoQNkjcreuBPYJqI3OPeLEOelKIkMSzn01AFNH5Ud+NVY/FVqOa99UOeMAAAAaTBnBgkqhkiG9w0BBwagWjBYAgEAMFMGCSqGSIb3DQEHATAeBglghkgBZQMEAS4wEQQMsRopSwW2oDrqOTNrAgEQgCacSRENpF2QbZBfiyN/mlQlY21Qd6PSHef54Rg29FfM5rhWlEuFfg== +ssh.datasource.origin=AQICAHg2j0pl3GguoQNkjcreuBPYJqI3OPeLEOelKIkMSzn01AFY15QxnieQA6WGHi+ZBdpTAAAAtDCBsQYJKoZIhvcNAQcGoIGjMIGgAgEAMIGaBgkqhkiG9w0BBwEwHgYJYIZIAWUDBAEuMBEEDDHB9KlaPh/a8J528wIBEIBtds8VUJXlJZSbxWDeV9mnr+16QcsLiVr4C9GlnR44Wb9opywAAUFBCBYqN1SX4czjhkdEgryY9/QYyzSx+VHLT5ORfVTFZ58IbMRGBpZdoXVgXfCH9WSXz3xDDBZQQ7MDlMAj2dECNsgLAA6i2A== ssh.port=22 ssh.local-port=3306 ## kms -aws.kms.keyId=03703854-534e-40ec-838c-cf65541f88f8 +aws.kms.keyId=5d1c783d-6c8e-4661-a8ed-a12654aac8c3 aws.kms.encryptionAlgorithm=SYMMETRIC_DEFAULT aws.kms.profile=default ## movie api movie.baseUrl=http://www.kobis.or.kr/kobisopenapi/webservice/rest/boxoffice/searchDailyBoxOfficeList.json movie.key=AQICAHg2j0pl3GguoQNkjcreuBPYJqI3OPeLEOelKIkMSzn01AEdAQDVPqdOhpfNbxFhaX/rAAAAfjB8BgkqhkiG9w0BBwagbzBtAgEAMGgGCSqGSIb3DQEHATAeBglghkgBZQMEAS4wEQQMnYW/M8ND+IPKIhQ8AgEQgDv37SLjLvGtPBohoi8i1Z+SFBaopteVK3e+36yH3RB44h/Ik0ZyxE69hlJ0T8SHnTLWzLKsk5TKP0uwFA== + +## festival api festival.baseUrl=http://api.data.go.kr/openapi/tn_pubr_public_cltur_fstvl_api festival.key=AQICAHg2j0pl3GguoQNkjcreuBPYJqI3OPeLEOelKIkMSzn01AGEXII6Ufa8dIEGD6MQNyM9AAAAujCBtwYJKoZIhvcNAQcGoIGpMIGmAgEAMIGgBgkqhkiG9w0BBwEwHgYJYIZIAWUDBAEuMBEEDEphbmyNQTiCTHtF/gIBEIBz8Fj7Ij/xk+O5hXWQfMOsIfc6uAYrvF2Xew+p0qLkX3DO0Plzjt4EMzaUP504RIMr7s+Yhx2y2Lq5SZ9I/cZ4swMYIOwj8FXDLeFy/k3dfwFdnBRh1kmvIDiMSg5kj4kgk05nzHyJ5KloYXXngp/ZQzsdpA== +## movie api tmdb +movie.tmdb.baseUrl=https://api.themoviedb.org/3/discover/movie +movie.tmdb.key=AQICAHg2j0pl3GguoQNkjcreuBPYJqI3OPeLEOelKIkMSzn01AELxjw41yAPSTnmp5zrZNWQAAAAfjB8BgkqhkiG9w0BBwagbzBtAgEAMGgGCSqGSIb3DQEHATAeBglghkgBZQMEAS4wEQQMHCIOEwhqioIojbKiAgEQgDsmsdMzlgQamoyDnGglRz5A2BNtMvn/4BIVT75wmxUz82NvOoh+Tno236+8lcoAoYdWzfgFVk7cAMNZdw== + #update the schema with the given values. spring.jpa.hibernate.ddl-auto=update #To beautify or pretty print the SQL From 8f919314b851ded220f2c27658a9fe00ae644107 Mon Sep 17 00:00:00 2001 From: cheolwon1994 Date: Fri, 10 Nov 2023 14:50:05 +0900 Subject: [PATCH 3/4] remove unneeded code --- src/main/resources/application-dev.properties | 1 - src/main/resources/application-local.properties | 1 - src/main/resources/application.properties | 1 - 3 files changed, 3 deletions(-) diff --git a/src/main/resources/application-dev.properties b/src/main/resources/application-dev.properties index 531f0bc..bdf9a5a 100644 --- a/src/main/resources/application-dev.properties +++ b/src/main/resources/application-dev.properties @@ -16,7 +16,6 @@ ssh.local-port=3306 ## kms aws.kms.keyId=5d1c783d-6c8e-4661-a8ed-a12654aac8c3 aws.kms.encryptionAlgorithm=SYMMETRIC_DEFAULT -aws.kms.profile=default ## movie api movie.baseUrl=http://www.kobis.or.kr/kobisopenapi/webservice/rest/boxoffice/searchDailyBoxOfficeList.json diff --git a/src/main/resources/application-local.properties b/src/main/resources/application-local.properties index 531f0bc..bdf9a5a 100644 --- a/src/main/resources/application-local.properties +++ b/src/main/resources/application-local.properties @@ -16,7 +16,6 @@ ssh.local-port=3306 ## kms aws.kms.keyId=5d1c783d-6c8e-4661-a8ed-a12654aac8c3 aws.kms.encryptionAlgorithm=SYMMETRIC_DEFAULT -aws.kms.profile=default ## movie api movie.baseUrl=http://www.kobis.or.kr/kobisopenapi/webservice/rest/boxoffice/searchDailyBoxOfficeList.json diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index 2dc9ecf..2f7bd75 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -18,7 +18,6 @@ ssh.local-port=3306 ## kms aws.kms.keyId=5d1c783d-6c8e-4661-a8ed-a12654aac8c3 aws.kms.encryptionAlgorithm=SYMMETRIC_DEFAULT -aws.kms.profile=default ## movie api movie.baseUrl=http://www.kobis.or.kr/kobisopenapi/webservice/rest/boxoffice/searchDailyBoxOfficeList.json From f7d11edc2e2431da0052e1c8f634548c69f8a400 Mon Sep 17 00:00:00 2001 From: HongGeun Date: Sat, 11 Nov 2023 14:13:52 +0900 Subject: [PATCH 4/4] add regions and apply ssh tunneling --- .../config/DatabaseConfiguration.java | 43 ++++++++----------- .../batch/infrastructure/utils/KmsUtils.java | 2 + 2 files changed, 21 insertions(+), 24 deletions(-) diff --git a/src/main/java/com/catcher/batch/datasource/config/DatabaseConfiguration.java b/src/main/java/com/catcher/batch/datasource/config/DatabaseConfiguration.java index f04cd47..6c8541b 100644 --- a/src/main/java/com/catcher/batch/datasource/config/DatabaseConfiguration.java +++ b/src/main/java/com/catcher/batch/datasource/config/DatabaseConfiguration.java @@ -53,32 +53,27 @@ public class DatabaseConfiguration { @Bean public DataSource dataSource() throws Exception { // KMS 활용한 연결 -// JSch jsch = new JSch(); -// Session session = jsch.getSession( -// KmsUtils.decrypt(sshUsername), -// KmsUtils.decrypt(sshHost), -// sshPort -// ); -// session.setPassword(KmsUtils.decrypt(sshPassword)); -// session.setConfig("StrictHostKeyChecking", "no"); -// session.connect(); -// -// int assignedPort = session.setPortForwardingL(0, -// KmsUtils.decrypt(originUrl), -// localPort -// ); // TODO: lport 값(현재 0)은 추후 서버 올릴때는 지정해줘야함 -// -// return DataSourceBuilder.create() -// .url(KmsUtils.decrypt(databaseUrl).replace(Integer.toString(localPort), Integer.toString(assignedPort))) -// .username(KmsUtils.decrypt(databaseUsername)) -// .password(KmsUtils.decrypt(databasePassword)) -// .build(); - // EKS ConfigMap & Secret + JSch jsch = new JSch(); + Session session = jsch.getSession( + KmsUtils.decrypt(sshUsername), + KmsUtils.decrypt(sshHost), + sshPort + ); + session.setPassword(KmsUtils.decrypt(sshPassword)); + session.setConfig("StrictHostKeyChecking", "no"); + session.connect(); + + int assignedPort = session.setPortForwardingL(0, + KmsUtils.decrypt(originUrl), + localPort + ); // TODO: lport 값(현재 0)은 추후 서버 올릴때는 지정해줘야함 + DriverManagerDataSource dataSource = new DriverManagerDataSource(); dataSource.setDriverClassName(driverClassName); - dataSource.setUrl(databaseUrl); - dataSource.setUsername(databaseUsername); - dataSource.setPassword(databasePassword); + dataSource.setUrl(KmsUtils.decrypt(databaseUrl).replace(Integer.toString(localPort), Integer.toString(assignedPort))); + dataSource.setUsername(KmsUtils.decrypt(databaseUsername)); + dataSource.setPassword(KmsUtils.decrypt(databasePassword)); + return dataSource; } } diff --git a/src/main/java/com/catcher/batch/infrastructure/utils/KmsUtils.java b/src/main/java/com/catcher/batch/infrastructure/utils/KmsUtils.java index 26f4136..cc00443 100644 --- a/src/main/java/com/catcher/batch/infrastructure/utils/KmsUtils.java +++ b/src/main/java/com/catcher/batch/infrastructure/utils/KmsUtils.java @@ -32,6 +32,7 @@ public class KmsUtils { public static String encrypt(String text) { try { AWSKMS kmsClient = AWSKMSClientBuilder.standard() + .withRegion(Regions.AP_NORTHEAST_2) .withCredentials(DefaultAWSCredentialsProviderChain.getInstance()) .build(); @@ -50,6 +51,7 @@ public static String encrypt(String text) { public static String decrypt(String cipherBase64) { try { AWSKMS kmsClient = AWSKMSClientBuilder.standard() + .withRegion(Regions.AP_NORTHEAST_2) .withCredentials(DefaultAWSCredentialsProviderChain.getInstance()) .build();