-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #27 from lsst-sqre/tickets/DM-44524
Tickets DM-44524 - Enable CloudSQL UWS database for SSO TAP service
- Loading branch information
Showing
8 changed files
with
194 additions
and
14 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,19 @@ | ||
| # Change log | ||
|
|
||
| tap-postgres is versioned with [semver](https://semver.org/). Dependencies are updated to the latest available version during each release. Those changes are not noted here explicitly. | ||
|
|
||
| Find changes for the upcoming release in the project's [changelog.d](https://github.com/lsst-sqre/tap-postgres/tree/main/changelog.d/). | ||
|
|
||
| <!-- scriv-insert-here --> | ||
|
|
||
| <a id='changelog-8.1.0'></a> | ||
| ## 1.16.0 (2024-05-30) | ||
|
|
||
| ### New features | ||
|
|
||
| - Added UWSInitAction class, which can be used to initialise the database schema & tables for UWS. Modified the web.xml to run the class on initialisation | ||
|
|
||
|
|
||
| ### Bug fixes | ||
|
|
||
| - Freeze the cadc-tap dependencies to the versions that came with the most recently released image, to address backwards incompatible changes in the most recent cadc-tap util package release |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,7 @@ | ||
| <!-- Delete the sections that don't apply --> | ||
| {%- for cat in config.categories %} | ||
|
|
||
| ### {{ cat }} | ||
|
|
||
| - | ||
| {%- endfor %} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
141 changes: 141 additions & 0 deletions
141
tap/src/main/java/ca/nrc/cadc/uws/impl/UWSInitAction.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,141 @@ | ||
| /* | ||
| ************************************************************************ | ||
| ******************* CANADIAN ASTRONOMY DATA CENTRE ******************* | ||
| ************** CENTRE CANADIEN DE DONNÉES ASTRONOMIQUES ************** | ||
| * | ||
| * (c) 2022. (c) 2022. | ||
| * Government of Canada Gouvernement du Canada | ||
| * National Research Council Conseil national de recherches | ||
| * Ottawa, Canada, K1A 0R6 Ottawa, Canada, K1A 0R6 | ||
| * All rights reserved Tous droits réservés | ||
| * | ||
| * NRC disclaims any warranties, Le CNRC dénie toute garantie | ||
| * expressed, implied, or énoncée, implicite ou légale, | ||
| * statutory, of any kind with de quelque nature que ce | ||
| * respect to the software, soit, concernant le logiciel, | ||
| * including without limitation y compris sans restriction | ||
| * any warranty of merchantability toute garantie de valeur | ||
| * or fitness for a particular marchande ou de pertinence | ||
| * purpose. NRC shall not be pour un usage particulier. | ||
| * liable in any event for any Le CNRC ne pourra en aucun cas | ||
| * damages, whether direct or être tenu responsable de tout | ||
| * indirect, special or general, dommage, direct ou indirect, | ||
| * consequential or incidental, particulier ou général, | ||
| * arising from the use of the accessoire ou fortuit, résultant | ||
| * software. Neither the name de l'utilisation du logiciel. Ni | ||
| * of the National Research le nom du Conseil National de | ||
| * Council of Canada nor the Recherches du Canada ni les noms | ||
| * names of its contributors may de ses participants ne peuvent | ||
| * be used to endorse or promote être utilisés pour approuver ou | ||
| * products derived from this promouvoir les produits dérivés | ||
| * software without specific prior de ce logiciel sans autorisation | ||
| * written permission. préalable et particulière | ||
| * par écrit. | ||
| * | ||
| * This file is part of the Ce fichier fait partie du projet | ||
| * OpenCADC project. OpenCADC. | ||
| * | ||
| * OpenCADC is free software: OpenCADC est un logiciel libre ; | ||
| * you can redistribute it and/or vous pouvez le redistribuer ou le | ||
| * modify it under the terms of modifier suivant les termes de | ||
| * the GNU Affero General Public la "GNU Affero General Public | ||
| * License as published by the License" telle que publiée | ||
| * Free Software Foundation, par la Free Software Foundation | ||
| * either version 3 of the : soit la version 3 de cette | ||
| * License, or (at your option) licence, soit (à votre gré) | ||
| * any later version. toute version ultérieure. | ||
| * | ||
| * OpenCADC is distributed in the OpenCADC est distribué | ||
| * hope that it will be useful, dans l’espoir qu’il vous | ||
| * but WITHOUT ANY WARRANTY; sera utile, mais SANS AUCUNE | ||
| * without even the implied GARANTIE : sans même la garantie | ||
| * warranty of MERCHANTABILITY implicite de COMMERCIALISABILITÉ | ||
| * or FITNESS FOR A PARTICULAR ni d’ADÉQUATION À UN OBJECTIF | ||
| * PURPOSE. See the GNU Affero PARTICULIER. Consultez la Licence | ||
| * General Public License for Générale Publique GNU Affero | ||
| * more details. pour plus de détails. | ||
| * | ||
| * You should have received Vous devriez avoir reçu une | ||
| * a copy of the GNU Affero copie de la Licence Générale | ||
| * General Public License along Publique GNU Affero avec | ||
| * with OpenCADC. If not, see OpenCADC ; si ce n’est | ||
| * <http://www.gnu.org/licenses/>. pas le cas, consultez : | ||
| * <http://www.gnu.org/licenses/>. | ||
| * | ||
| ************************************************************************ | ||
| */ | ||
|
|
||
| package ca.nrc.cadc.uws.impl; | ||
|
|
||
| import ca.nrc.cadc.db.DBUtil; | ||
| import ca.nrc.cadc.rest.InitAction; | ||
| import ca.nrc.cadc.uws.server.impl.InitDatabaseUWS; | ||
| import javax.sql.DataSource; | ||
| import org.apache.log4j.Logger; | ||
|
|
||
| import java.sql.Connection; | ||
| import java.sql.DatabaseMetaData; | ||
| import java.sql.ResultSet; | ||
| import java.sql.SQLException; | ||
|
|
||
| /** | ||
| * | ||
| * @author pdowler | ||
| */ | ||
| public class UWSInitAction extends InitAction { | ||
| private static final Logger log = Logger.getLogger(UWSInitAction.class); | ||
|
|
||
| public UWSInitAction() { | ||
| } | ||
|
|
||
| @Override | ||
| public void doInit() { | ||
| DataSource uws = null; | ||
| Connection conn = null; | ||
| try { | ||
| uws = DBUtil.findJNDIDataSource("jdbc/uws"); | ||
| conn = uws.getConnection(); | ||
| if (!schemaExists(conn, "uws")) { | ||
| log.info("uws schema does not exist, creating..."); | ||
| createSchema(conn, "uws"); | ||
| log.info("uws schema created"); | ||
|
|
||
| // Continue with initialization only if the schema was just created | ||
| InitDatabaseUWS uwsi = new InitDatabaseUWS(uws, null, "uws"); | ||
| uwsi.doInit(); | ||
| log.info("init uws: OK"); | ||
| } else { | ||
| log.info("uws schema already exists"); | ||
| return; // Exit the method early if the schema already exists | ||
| } | ||
| } catch (Exception ex) { | ||
| throw new RuntimeException("INIT FAIL", ex); | ||
| } finally { | ||
| if (conn != null) { | ||
| try { | ||
| conn.close(); | ||
| } catch (SQLException e) { | ||
| log.error("Failed to close connection", e); | ||
| } | ||
| } | ||
| } | ||
| } | ||
|
|
||
| private boolean schemaExists(Connection conn, String schemaName) throws SQLException { | ||
| DatabaseMetaData dbMetaData = conn.getMetaData(); | ||
| try (ResultSet rs = dbMetaData.getSchemas()) { | ||
| while (rs.next()) { | ||
| if (schemaName.equalsIgnoreCase(rs.getString("TABLE_SCHEM").trim())) { | ||
| return true; | ||
| } | ||
| } | ||
| } | ||
| return false; | ||
| } | ||
|
|
||
| private void createSchema(Connection conn, String schemaName) throws SQLException { | ||
| try (java.sql.Statement stmt = conn.createStatement()) { | ||
| stmt.execute("CREATE SCHEMA " + schemaName); | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters