You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by ma...@apache.org on 2020/04/01 15:30:48 UTC
[airavata] branch develop updated (790082f -> b1396d7)
This is an automated email from the ASF dual-hosted git repository.
machristie pushed a change to branch develop
in repository https://gitbox.apache.org/repos/asf/airavata.git.
from 790082f Update Python SDK generated stubs
add a1040e7 Added the new PACE gateway URL
add c858046 Added the new PACE gateway URL
add dcca0fd Ansible: control setting django KEYCLOAK_CA_CERTFILE setting
add 5bef547 Ansible: comment out django_keycloak_ca_certfile_path for iam.scigap.org
add c480b7c Updating production and staging trust stores to support iam.scigap certificate change
add 1222b7b Ansible: comment out cafile-path
add b5ccb39 Ansible: sufficient to just run composer install
add a83a811 Ansible: comment out cafile-path in SimV too
new ec9562c AIRAVATA-3303 Replace slashes with underscores
new b1396d7 Merge branch 'AIRAVATA-3303--404-Not-Found-when-forward-slash-in-experiment-id' into develop
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../scigap/production/files/client_truststore.jks | Bin 21868 -> 5312 bytes
.../scigap/production/group_vars/django/vars.yml | 2 +-
.../production/host_vars/pace-gatech/vars.yml | 8 +--
.../pga_config/simvascular/files/pga_config.php.j2 | 2 +-
.../scigap/staging/files/client_truststore.jks | Bin 21868 -> 5312 bytes
.../scigap/staging/group_vars/django/vars.yml | 2 +-
dev-tools/ansible/roles/pga/tasks/main.yml | 4 +-
.../ansible/roles/pga/templates/pga_config.php.j2 | 2 +-
.../airavata/common/utils/AiravataUtils.java | 2 +-
.../expcatalog/ExperimentRepositoryTest.java | 65 +++++++++++++--------
.../experimentCatalog_schema_delta.sql | 13 +++++
.../DeltaScripts/sharingCatalog_schema_delta.sql | 8 +++
12 files changed, 74 insertions(+), 34 deletions(-)
[airavata] 02/02: Merge branch
'AIRAVATA-3303--404-Not-Found-when-forward-slash-in-experiment-id' into
develop
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
machristie pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/airavata.git
commit b1396d7c90823b077cc2c6b32b84e5bad10b7278
Merge: 790082f ec9562c
Author: Marcus Christie <ma...@apache.org>
AuthorDate: Wed Apr 1 11:30:06 2020 -0400
Merge branch 'AIRAVATA-3303--404-Not-Found-when-forward-slash-in-experiment-id' into develop
.../scigap/production/files/client_truststore.jks | Bin 21868 -> 5312 bytes
.../scigap/production/group_vars/django/vars.yml | 2 +-
.../production/host_vars/pace-gatech/vars.yml | 8 +--
.../pga_config/simvascular/files/pga_config.php.j2 | 2 +-
.../scigap/staging/files/client_truststore.jks | Bin 21868 -> 5312 bytes
.../scigap/staging/group_vars/django/vars.yml | 2 +-
dev-tools/ansible/roles/pga/tasks/main.yml | 4 +-
.../ansible/roles/pga/templates/pga_config.php.j2 | 2 +-
.../airavata/common/utils/AiravataUtils.java | 2 +-
.../expcatalog/ExperimentRepositoryTest.java | 65 +++++++++++++--------
.../experimentCatalog_schema_delta.sql | 13 +++++
.../DeltaScripts/sharingCatalog_schema_delta.sql | 8 +++
12 files changed, 74 insertions(+), 34 deletions(-)
[airavata] 01/02: AIRAVATA-3303 Replace slashes with underscores
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
machristie pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/airavata.git
commit ec9562cd11cc6c5bbf345cc6e601941afa5b33bf
Author: Marcus Christie <ma...@apache.org>
AuthorDate: Wed Apr 1 11:28:10 2020 -0400
AIRAVATA-3303 Replace slashes with underscores
---
.../airavata/common/utils/AiravataUtils.java | 2 +-
.../expcatalog/ExperimentRepositoryTest.java | 65 ++++++++++++++--------
.../experimentCatalog_schema_delta.sql | 13 +++++
.../DeltaScripts/sharingCatalog_schema_delta.sql | 8 +++
4 files changed, 64 insertions(+), 24 deletions(-)
diff --git a/modules/commons/src/main/java/org/apache/airavata/common/utils/AiravataUtils.java b/modules/commons/src/main/java/org/apache/airavata/common/utils/AiravataUtils.java
index 21292b5..fc61153 100644
--- a/modules/commons/src/main/java/org/apache/airavata/common/utils/AiravataUtils.java
+++ b/modules/commons/src/main/java/org/apache/airavata/common/utils/AiravataUtils.java
@@ -39,7 +39,7 @@ public class AiravataUtils {
}
public static String getId (String name){
- String id = name.trim().replaceAll("\\s|\\.", "_");
+ String id = name.trim().replaceAll("\\s|\\.|/|\\\\", "_");
return id + "_" + UUID.randomUUID();
}
}
diff --git a/modules/registry/registry-core/src/test/java/org/apache/airavata/registry/core/repositories/expcatalog/ExperimentRepositoryTest.java b/modules/registry/registry-core/src/test/java/org/apache/airavata/registry/core/repositories/expcatalog/ExperimentRepositoryTest.java
index 0f9b623..6f63c10 100644
--- a/modules/registry/registry-core/src/test/java/org/apache/airavata/registry/core/repositories/expcatalog/ExperimentRepositoryTest.java
+++ b/modules/registry/registry-core/src/test/java/org/apache/airavata/registry/core/repositories/expcatalog/ExperimentRepositoryTest.java
@@ -45,6 +45,10 @@ public class ExperimentRepositoryTest extends TestBase {
ProjectRepository projectRepository;
ExperimentRepository experimentRepository;
+ private String gatewayId;
+
+ private String projectId;
+
public ExperimentRepositoryTest() {
super(Database.EXP_CATALOG);
gatewayRepository = new GatewayRepository();
@@ -52,20 +56,26 @@ public class ExperimentRepositoryTest extends TestBase {
experimentRepository = new ExperimentRepository();
}
- @Test
- public void ExperimentRepositoryTest() throws RegistryException {
+ @Override
+ public void setUp() throws Exception {
+ super.setUp();
+
Gateway gateway = new Gateway();
gateway.setGatewayId("gateway");
gateway.setDomain("SEAGRID");
gateway.setEmailAddress("abc@d.com");
- String gatewayId = gatewayRepository.addGateway(gateway);
+ gatewayId = gatewayRepository.addGateway(gateway);
Project project = new Project();
project.setName("projectName");
project.setOwner("user");
project.setGatewayId(gatewayId);
- String projectId = projectRepository.addProject(project, gatewayId);
+ projectId = projectRepository.addProject(project, gatewayId);
+ }
+
+ @Test
+ public void ExperimentRepositoryTest() throws RegistryException {
ExperimentModel experimentModel = new ExperimentModel();
experimentModel.setProjectId(projectId);
@@ -133,27 +143,11 @@ public class ExperimentRepositoryTest extends TestBase {
experimentRepository.removeExperiment(experimentId);
assertFalse(experimentRepository.isExperimentExist(experimentId));
-
- gatewayRepository.removeGateway(gatewayId);
- projectRepository.removeProject(projectId);
}
@Test
public void testExperimentInputs() throws RegistryException {
- Gateway gateway = new Gateway();
- gateway.setGatewayId("gateway");
- gateway.setDomain("SEAGRID");
- gateway.setEmailAddress("abc@d.com");
- String gatewayId = gatewayRepository.addGateway(gateway);
-
- Project project = new Project();
- project.setName("projectName");
- project.setOwner("user");
- project.setGatewayId(gatewayId);
-
- String projectId = projectRepository.addProject(project, gatewayId);
-
ExperimentModel experimentModel = new ExperimentModel();
experimentModel.setProjectId(projectId);
experimentModel.setGatewayId(gatewayId);
@@ -232,9 +226,34 @@ public class ExperimentRepositoryTest extends TestBase {
experimentRepository.removeExperiment(experimentId);
assertFalse(experimentRepository.isExperimentExist(experimentId));
-
- gatewayRepository.removeGateway(gatewayId);
- projectRepository.removeProject(projectId);
}
+ /**
+ * Verify that slashes (forward and backward) are replaced with underscores.
+ */
+ @Test
+ public void testSlashesInExperimentName() throws RegistryException {
+
+ // Forward slashes
+ ExperimentModel experimentModel = new ExperimentModel();
+ experimentModel.setProjectId(projectId);
+ experimentModel.setGatewayId(gatewayId);
+ experimentModel.setExperimentType(ExperimentType.SINGLE_APPLICATION);
+ experimentModel.setUserName("user");
+ experimentModel.setExperimentName("name/forward-slash//a");
+
+ String experimentId = experimentRepository.addExperiment(experimentModel);
+ assertTrue(experimentId.startsWith("name_forward-slash__a"));
+
+ // Backward slashes
+ experimentModel = new ExperimentModel();
+ experimentModel.setProjectId(projectId);
+ experimentModel.setGatewayId(gatewayId);
+ experimentModel.setExperimentType(ExperimentType.SINGLE_APPLICATION);
+ experimentModel.setUserName("user");
+ experimentModel.setExperimentName("name\\backward-slash\\\\a");
+
+ experimentId = experimentRepository.addExperiment(experimentModel);
+ assertTrue(experimentId.startsWith("name_backward-slash__a"));
+ }
}
diff --git a/modules/registry/release-migration-scripts/next/DeltaScripts/experimentCatalog_schema_delta.sql b/modules/registry/release-migration-scripts/next/DeltaScripts/experimentCatalog_schema_delta.sql
index 256ecf0..aefe32d 100644
--- a/modules/registry/release-migration-scripts/next/DeltaScripts/experimentCatalog_schema_delta.sql
+++ b/modules/registry/release-migration-scripts/next/DeltaScripts/experimentCatalog_schema_delta.sql
@@ -19,3 +19,16 @@
--
use experiment_catalog;
+
+-- AIRAVATA-3303 Slashes in experiment id
+set FOREIGN_KEY_CHECKS=0;
+
+update EXPERIMENT set EXPERIMENT_ID = REPLACE(EXPERIMENT_ID, "/", "_") where EXPERIMENT_ID like '%/%';
+update EXPERIMENT_INPUT set EXPERIMENT_ID = REPLACE(EXPERIMENT_ID, "/", "_") where EXPERIMENT_ID like '%/%';
+update EXPERIMENT_OUTPUT set EXPERIMENT_ID = REPLACE(EXPERIMENT_ID, "/", "_") where EXPERIMENT_ID like '%/%';
+update EXPERIMENT_STATUS set EXPERIMENT_ID = REPLACE(EXPERIMENT_ID, "/", "_") where EXPERIMENT_ID like '%/%';
+update EXPERIMENT_ERROR set EXPERIMENT_ID = REPLACE(EXPERIMENT_ID, "/", "_") where EXPERIMENT_ID like '%/%';
+update USER_CONFIGURATION_DATA set EXPERIMENT_ID = REPLACE(EXPERIMENT_ID, "/", "_") where EXPERIMENT_ID like '%/%';
+update PROCESS set EXPERIMENT_ID = REPLACE(EXPERIMENT_ID, "/", "_") where EXPERIMENT_ID like '%/%';
+
+set FOREIGN_KEY_CHECKS=1;
diff --git a/modules/registry/release-migration-scripts/next/DeltaScripts/sharingCatalog_schema_delta.sql b/modules/registry/release-migration-scripts/next/DeltaScripts/sharingCatalog_schema_delta.sql
index 6ddb67c..30f137c 100644
--- a/modules/registry/release-migration-scripts/next/DeltaScripts/sharingCatalog_schema_delta.sql
+++ b/modules/registry/release-migration-scripts/next/DeltaScripts/sharingCatalog_schema_delta.sql
@@ -19,3 +19,11 @@
--
use sharing_catalog;
+
+-- AIRAVATA-3303 Slashes in experiment id
+set FOREIGN_KEY_CHECKS=0;
+
+update SHARING set ENTITY_ID = REPLACE(ENTITY_ID, "/", "_") where ENTITY_ID in (select ENTITY_ID from ENTITY where ENTITY_ID like '%/%' and ENTITY_TYPE_ID like '%:EXPERIMENT');
+update ENTITY set ENTITY_ID = REPLACE(ENTITY_ID, "/", "_") where ENTITY_ID like '%/%' and ENTITY_TYPE_ID like '%:EXPERIMENT';
+
+set FOREIGN_KEY_CHECKS=1;