From bafce18db6275d84c2f953b1d3a27c86bd7e916f Mon Sep 17 00:00:00 2001 From: Melanie Retter Date: Fri, 29 Jun 2018 10:34:26 +0200 Subject: [PATCH] Change length of createdBy and lastModifiedBy property to 64 characters (#699) * Change length of createdBy and lastModifiedBy property to 64 characters * Change length of approval_decided_by property to 64 characters * Use one update statement for one DB table for MySQL * Fix migration skript for rollout approval Signed-off-by: Melanie Retter --- .../hawkbit/repository/model/Rollout.java | 3 +- .../jpa/model/AbstractJpaBaseEntity.java | 4 +- ...2_7__add_rollout_approval_fields___DB2.sql | 4 +- ...ngth_of_created_last_modified_by___DB2.sql | 45 +++++++++++++++++++ ...ength_of_created_last_modified_by___H2.sql | 45 +++++++++++++++++++ ...th_of_created_last_modified_by___MYSQL.sql | 29 ++++++++++++ ...d_rollout_approval_fields___SQL_SERVER.sql | 4 +- ..._created_last_modified_by___SQL_SERVER.sql | 45 +++++++++++++++++++ .../security/HawkbitSecurityProperties.java | 2 +- 9 files changed, 172 insertions(+), 9 deletions(-) create mode 100644 hawkbit-repository/hawkbit-repository-jpa/src/main/resources/db/migration/DB2/V1_12_8__change_length_of_created_last_modified_by___DB2.sql create mode 100644 hawkbit-repository/hawkbit-repository-jpa/src/main/resources/db/migration/H2/V1_12_8__change_length_of_created_last_modified_by___H2.sql create mode 100644 hawkbit-repository/hawkbit-repository-jpa/src/main/resources/db/migration/MYSQL/V1_12_8__change_length_of_created_last_modified_by___MYSQL.sql create mode 100644 hawkbit-repository/hawkbit-repository-jpa/src/main/resources/db/migration/SQL_SERVER/V1_12_8__change_length_of_created_last_modified_by___SQL_SERVER.sql diff --git a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/model/Rollout.java b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/model/Rollout.java index 586e53513..c8e8eded6 100644 --- a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/model/Rollout.java +++ b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/model/Rollout.java @@ -28,8 +28,7 @@ public interface Rollout extends NamedEntity { /** * Maximum length of author name. */ - int APPROVED_BY_MAX_SIZE = 40; - + int APPROVED_BY_MAX_SIZE = 64; /** * Maximum length on comment regarding approval decision. diff --git a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/model/AbstractJpaBaseEntity.java b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/model/AbstractJpaBaseEntity.java index b3486262a..2585705de 100644 --- a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/model/AbstractJpaBaseEntity.java +++ b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/model/AbstractJpaBaseEntity.java @@ -67,7 +67,7 @@ public abstract class AbstractJpaBaseEntity implements BaseEntity { @Override @Access(AccessType.PROPERTY) - @Column(name = "created_by", insertable = true, updatable = false, nullable = false, length = 40) + @Column(name = "created_by", insertable = true, updatable = false, nullable = false, length = 64) public String getCreatedBy() { return createdBy; } @@ -81,7 +81,7 @@ public abstract class AbstractJpaBaseEntity implements BaseEntity { @Override @Access(AccessType.PROPERTY) - @Column(name = "last_modified_by", insertable = true, updatable = true, nullable = false, length = 40) + @Column(name = "last_modified_by", insertable = true, updatable = true, nullable = false, length = 64) public String getLastModifiedBy() { return lastModifiedBy; } diff --git a/hawkbit-repository/hawkbit-repository-jpa/src/main/resources/db/migration/DB2/V1_12_7__add_rollout_approval_fields___DB2.sql b/hawkbit-repository/hawkbit-repository-jpa/src/main/resources/db/migration/DB2/V1_12_7__add_rollout_approval_fields___DB2.sql index 8438d909e..93824dc9d 100644 --- a/hawkbit-repository/hawkbit-repository-jpa/src/main/resources/db/migration/DB2/V1_12_7__add_rollout_approval_fields___DB2.sql +++ b/hawkbit-repository/hawkbit-repository-jpa/src/main/resources/db/migration/DB2/V1_12_7__add_rollout_approval_fields___DB2.sql @@ -1,2 +1,2 @@ -ALTER TABLE sp_rollout ADD column approval_decided_by varchar(40); -ALTER TABLE sp_rollout ADD column approval_remark varchar(255); \ No newline at end of file +ALTER TABLE sp_rollout ADD COLUMN approval_decided_by varchar(40); +ALTER TABLE sp_rollout ADD COLUMN approval_remark varchar(255); \ No newline at end of file diff --git a/hawkbit-repository/hawkbit-repository-jpa/src/main/resources/db/migration/DB2/V1_12_8__change_length_of_created_last_modified_by___DB2.sql b/hawkbit-repository/hawkbit-repository-jpa/src/main/resources/db/migration/DB2/V1_12_8__change_length_of_created_last_modified_by___DB2.sql new file mode 100644 index 000000000..46d0b8f3c --- /dev/null +++ b/hawkbit-repository/hawkbit-repository-jpa/src/main/resources/db/migration/DB2/V1_12_8__change_length_of_created_last_modified_by___DB2.sql @@ -0,0 +1,45 @@ +ALTER TABLE sp_action ALTER COLUMN created_by SET DATA TYPE VARCHAR(64); +ALTER TABLE sp_action ALTER COLUMN last_modified_by SET DATA TYPE VARCHAR(64); + +ALTER TABLE sp_action_status ALTER COLUMN created_by SET DATA TYPE VARCHAR(64); +ALTER TABLE sp_action_status ALTER COLUMN last_modified_by SET DATA TYPE VARCHAR(64); + +ALTER TABLE sp_artifact ALTER COLUMN created_by SET DATA TYPE VARCHAR(64); +ALTER TABLE sp_artifact ALTER COLUMN last_modified_by SET DATA TYPE VARCHAR(64); + +ALTER TABLE sp_base_software_module ALTER COLUMN created_by SET DATA TYPE VARCHAR(64); +ALTER TABLE sp_base_software_module ALTER COLUMN last_modified_by SET DATA TYPE VARCHAR(64); + +ALTER TABLE sp_distributionset_tag ALTER COLUMN created_by SET DATA TYPE VARCHAR(64); +ALTER TABLE sp_distributionset_tag ALTER COLUMN last_modified_by SET DATA TYPE VARCHAR(64); + +ALTER TABLE sp_distribution_set ALTER COLUMN created_by SET DATA TYPE VARCHAR(64); +ALTER TABLE sp_distribution_set ALTER COLUMN last_modified_by SET DATA TYPE VARCHAR(64); + +ALTER TABLE sp_distribution_set_type ALTER COLUMN created_by SET DATA TYPE VARCHAR(64); +ALTER TABLE sp_distribution_set_type ALTER COLUMN last_modified_by SET DATA TYPE VARCHAR(64); + +ALTER TABLE sp_rollout ALTER COLUMN created_by SET DATA TYPE VARCHAR(64); +ALTER TABLE sp_rollout ALTER COLUMN last_modified_by SET DATA TYPE VARCHAR(64); +ALTER TABLE sp_rollout ALTER COLUMN approval_decided_by SET DATA TYPE VARCHAR(64); + +ALTER TABLE sp_rolloutgroup ALTER COLUMN created_by SET DATA TYPE VARCHAR(64); +ALTER TABLE sp_rolloutgroup ALTER COLUMN last_modified_by SET DATA TYPE VARCHAR(64); + +ALTER TABLE sp_software_module_type ALTER COLUMN created_by SET DATA TYPE VARCHAR(64); +ALTER TABLE sp_software_module_type ALTER COLUMN last_modified_by SET DATA TYPE VARCHAR(64); + +ALTER TABLE sp_target ALTER COLUMN created_by SET DATA TYPE VARCHAR(64); +ALTER TABLE sp_target ALTER COLUMN last_modified_by SET DATA TYPE VARCHAR(64); + +ALTER TABLE sp_target_filter_query ALTER COLUMN created_by SET DATA TYPE VARCHAR(64); +ALTER TABLE sp_target_filter_query ALTER COLUMN last_modified_by SET DATA TYPE VARCHAR(64); + +ALTER TABLE sp_target_tag ALTER COLUMN created_by SET DATA TYPE VARCHAR(64); +ALTER TABLE sp_target_tag ALTER COLUMN last_modified_by SET DATA TYPE VARCHAR(64); + +ALTER TABLE sp_tenant ALTER COLUMN created_by SET DATA TYPE VARCHAR(64); +ALTER TABLE sp_tenant ALTER COLUMN last_modified_by SET DATA TYPE VARCHAR(64); + +ALTER TABLE sp_tenant_configuration ALTER COLUMN created_by SET DATA TYPE VARCHAR(64); +ALTER TABLE sp_tenant_configuration ALTER COLUMN last_modified_by SET DATA TYPE VARCHAR(64); \ No newline at end of file diff --git a/hawkbit-repository/hawkbit-repository-jpa/src/main/resources/db/migration/H2/V1_12_8__change_length_of_created_last_modified_by___H2.sql b/hawkbit-repository/hawkbit-repository-jpa/src/main/resources/db/migration/H2/V1_12_8__change_length_of_created_last_modified_by___H2.sql new file mode 100644 index 000000000..a89ece18d --- /dev/null +++ b/hawkbit-repository/hawkbit-repository-jpa/src/main/resources/db/migration/H2/V1_12_8__change_length_of_created_last_modified_by___H2.sql @@ -0,0 +1,45 @@ +ALTER TABLE sp_action ALTER COLUMN created_by VARCHAR(64); +ALTER TABLE sp_action ALTER COLUMN last_modified_by VARCHAR(64); + +ALTER TABLE sp_action_status ALTER COLUMN created_by VARCHAR(64); +ALTER TABLE sp_action_status ALTER COLUMN last_modified_by VARCHAR(64); + +ALTER TABLE sp_artifact ALTER COLUMN created_by VARCHAR(64); +ALTER TABLE sp_artifact ALTER COLUMN last_modified_by VARCHAR(64); + +ALTER TABLE sp_base_software_module ALTER COLUMN created_by VARCHAR(64); +ALTER TABLE sp_base_software_module ALTER COLUMN last_modified_by VARCHAR(64); + +ALTER TABLE sp_distributionset_tag ALTER COLUMN created_by VARCHAR(64); +ALTER TABLE sp_distributionset_tag ALTER COLUMN last_modified_by VARCHAR(64); + +ALTER TABLE sp_distribution_set ALTER COLUMN created_by VARCHAR(64); +ALTER TABLE sp_distribution_set ALTER COLUMN last_modified_by VARCHAR(64); + +ALTER TABLE sp_distribution_set_type ALTER COLUMN created_by VARCHAR(64); +ALTER TABLE sp_distribution_set_type ALTER COLUMN last_modified_by VARCHAR(64); + +ALTER TABLE sp_rollout ALTER COLUMN created_by VARCHAR(64); +ALTER TABLE sp_rollout ALTER COLUMN last_modified_by VARCHAR(64); +ALTER TABLE sp_rollout ALTER COLUMN approval_decided_by VARCHAR(64); + +ALTER TABLE sp_rolloutgroup ALTER COLUMN created_by VARCHAR(64); +ALTER TABLE sp_rolloutgroup ALTER COLUMN last_modified_by VARCHAR(64); + +ALTER TABLE sp_software_module_type ALTER COLUMN created_by VARCHAR(64); +ALTER TABLE sp_software_module_type ALTER COLUMN last_modified_by VARCHAR(64); + +ALTER TABLE sp_target ALTER COLUMN created_by VARCHAR(64); +ALTER TABLE sp_target ALTER COLUMN last_modified_by VARCHAR(64); + +ALTER TABLE sp_target_filter_query ALTER COLUMN created_by VARCHAR(64); +ALTER TABLE sp_target_filter_query ALTER COLUMN last_modified_by VARCHAR(64); + +ALTER TABLE sp_target_tag ALTER COLUMN created_by VARCHAR(64); +ALTER TABLE sp_target_tag ALTER COLUMN last_modified_by VARCHAR(64); + +ALTER TABLE sp_tenant ALTER COLUMN created_by VARCHAR(64); +ALTER TABLE sp_tenant ALTER COLUMN last_modified_by VARCHAR(64); + +ALTER TABLE sp_tenant_configuration ALTER COLUMN created_by VARCHAR(64); +ALTER TABLE sp_tenant_configuration ALTER COLUMN last_modified_by VARCHAR(64); \ No newline at end of file diff --git a/hawkbit-repository/hawkbit-repository-jpa/src/main/resources/db/migration/MYSQL/V1_12_8__change_length_of_created_last_modified_by___MYSQL.sql b/hawkbit-repository/hawkbit-repository-jpa/src/main/resources/db/migration/MYSQL/V1_12_8__change_length_of_created_last_modified_by___MYSQL.sql new file mode 100644 index 000000000..283fdf2c9 --- /dev/null +++ b/hawkbit-repository/hawkbit-repository-jpa/src/main/resources/db/migration/MYSQL/V1_12_8__change_length_of_created_last_modified_by___MYSQL.sql @@ -0,0 +1,29 @@ +ALTER TABLE sp_action MODIFY created_by VARCHAR(64), MODIFY last_modified_by VARCHAR(64); + +ALTER TABLE sp_action_status MODIFY created_by VARCHAR(64), MODIFY last_modified_by VARCHAR(64); + +ALTER TABLE sp_artifact MODIFY created_by VARCHAR(64), MODIFY last_modified_by VARCHAR(64); + +ALTER TABLE sp_base_software_module MODIFY created_by VARCHAR(64), MODIFY last_modified_by VARCHAR(64); + +ALTER TABLE sp_distributionset_tag MODIFY created_by VARCHAR(64), MODIFY last_modified_by VARCHAR(64); + +ALTER TABLE sp_distribution_set MODIFY created_by VARCHAR(64), MODIFY last_modified_by VARCHAR(64); + +ALTER TABLE sp_distribution_set_type MODIFY created_by VARCHAR(64), MODIFY last_modified_by VARCHAR(64); + +ALTER TABLE sp_rollout MODIFY created_by VARCHAR(64), MODIFY last_modified_by VARCHAR(64), MODIFY approval_decided_by VARCHAR(64); + +ALTER TABLE sp_rolloutgroup MODIFY created_by VARCHAR(64), MODIFY last_modified_by VARCHAR(64); + +ALTER TABLE sp_software_module_type MODIFY created_by VARCHAR(64), MODIFY last_modified_by VARCHAR(64); + +ALTER TABLE sp_target MODIFY created_by VARCHAR(64), MODIFY last_modified_by VARCHAR(64); + +ALTER TABLE sp_target_filter_query MODIFY created_by VARCHAR(64), MODIFY last_modified_by VARCHAR(64); + +ALTER TABLE sp_target_tag MODIFY created_by VARCHAR(64), MODIFY last_modified_by VARCHAR(64); + +ALTER TABLE sp_tenant MODIFY created_by VARCHAR(64), MODIFY last_modified_by VARCHAR(64); + +ALTER TABLE sp_tenant_configuration MODIFY created_by VARCHAR(64), MODIFY last_modified_by VARCHAR(64); \ No newline at end of file diff --git a/hawkbit-repository/hawkbit-repository-jpa/src/main/resources/db/migration/SQL_SERVER/V1_12_7__add_rollout_approval_fields___SQL_SERVER.sql b/hawkbit-repository/hawkbit-repository-jpa/src/main/resources/db/migration/SQL_SERVER/V1_12_7__add_rollout_approval_fields___SQL_SERVER.sql index 8438d909e..18d86a1ee 100644 --- a/hawkbit-repository/hawkbit-repository-jpa/src/main/resources/db/migration/SQL_SERVER/V1_12_7__add_rollout_approval_fields___SQL_SERVER.sql +++ b/hawkbit-repository/hawkbit-repository-jpa/src/main/resources/db/migration/SQL_SERVER/V1_12_7__add_rollout_approval_fields___SQL_SERVER.sql @@ -1,2 +1,2 @@ -ALTER TABLE sp_rollout ADD column approval_decided_by varchar(40); -ALTER TABLE sp_rollout ADD column approval_remark varchar(255); \ No newline at end of file +ALTER TABLE sp_rollout ADD approval_decided_by varchar(40); +ALTER TABLE sp_rollout ADD approval_remark varchar(255); \ No newline at end of file diff --git a/hawkbit-repository/hawkbit-repository-jpa/src/main/resources/db/migration/SQL_SERVER/V1_12_8__change_length_of_created_last_modified_by___SQL_SERVER.sql b/hawkbit-repository/hawkbit-repository-jpa/src/main/resources/db/migration/SQL_SERVER/V1_12_8__change_length_of_created_last_modified_by___SQL_SERVER.sql new file mode 100644 index 000000000..a89ece18d --- /dev/null +++ b/hawkbit-repository/hawkbit-repository-jpa/src/main/resources/db/migration/SQL_SERVER/V1_12_8__change_length_of_created_last_modified_by___SQL_SERVER.sql @@ -0,0 +1,45 @@ +ALTER TABLE sp_action ALTER COLUMN created_by VARCHAR(64); +ALTER TABLE sp_action ALTER COLUMN last_modified_by VARCHAR(64); + +ALTER TABLE sp_action_status ALTER COLUMN created_by VARCHAR(64); +ALTER TABLE sp_action_status ALTER COLUMN last_modified_by VARCHAR(64); + +ALTER TABLE sp_artifact ALTER COLUMN created_by VARCHAR(64); +ALTER TABLE sp_artifact ALTER COLUMN last_modified_by VARCHAR(64); + +ALTER TABLE sp_base_software_module ALTER COLUMN created_by VARCHAR(64); +ALTER TABLE sp_base_software_module ALTER COLUMN last_modified_by VARCHAR(64); + +ALTER TABLE sp_distributionset_tag ALTER COLUMN created_by VARCHAR(64); +ALTER TABLE sp_distributionset_tag ALTER COLUMN last_modified_by VARCHAR(64); + +ALTER TABLE sp_distribution_set ALTER COLUMN created_by VARCHAR(64); +ALTER TABLE sp_distribution_set ALTER COLUMN last_modified_by VARCHAR(64); + +ALTER TABLE sp_distribution_set_type ALTER COLUMN created_by VARCHAR(64); +ALTER TABLE sp_distribution_set_type ALTER COLUMN last_modified_by VARCHAR(64); + +ALTER TABLE sp_rollout ALTER COLUMN created_by VARCHAR(64); +ALTER TABLE sp_rollout ALTER COLUMN last_modified_by VARCHAR(64); +ALTER TABLE sp_rollout ALTER COLUMN approval_decided_by VARCHAR(64); + +ALTER TABLE sp_rolloutgroup ALTER COLUMN created_by VARCHAR(64); +ALTER TABLE sp_rolloutgroup ALTER COLUMN last_modified_by VARCHAR(64); + +ALTER TABLE sp_software_module_type ALTER COLUMN created_by VARCHAR(64); +ALTER TABLE sp_software_module_type ALTER COLUMN last_modified_by VARCHAR(64); + +ALTER TABLE sp_target ALTER COLUMN created_by VARCHAR(64); +ALTER TABLE sp_target ALTER COLUMN last_modified_by VARCHAR(64); + +ALTER TABLE sp_target_filter_query ALTER COLUMN created_by VARCHAR(64); +ALTER TABLE sp_target_filter_query ALTER COLUMN last_modified_by VARCHAR(64); + +ALTER TABLE sp_target_tag ALTER COLUMN created_by VARCHAR(64); +ALTER TABLE sp_target_tag ALTER COLUMN last_modified_by VARCHAR(64); + +ALTER TABLE sp_tenant ALTER COLUMN created_by VARCHAR(64); +ALTER TABLE sp_tenant ALTER COLUMN last_modified_by VARCHAR(64); + +ALTER TABLE sp_tenant_configuration ALTER COLUMN created_by VARCHAR(64); +ALTER TABLE sp_tenant_configuration ALTER COLUMN last_modified_by VARCHAR(64); \ No newline at end of file diff --git a/hawkbit-security-core/src/main/java/org/eclipse/hawkbit/security/HawkbitSecurityProperties.java b/hawkbit-security-core/src/main/java/org/eclipse/hawkbit/security/HawkbitSecurityProperties.java index 879974b5d..ef4ae7c7d 100644 --- a/hawkbit-security-core/src/main/java/org/eclipse/hawkbit/security/HawkbitSecurityProperties.java +++ b/hawkbit-security-core/src/main/java/org/eclipse/hawkbit/security/HawkbitSecurityProperties.java @@ -147,7 +147,7 @@ public class HawkbitSecurityProperties { /** * Maximum number of targets per rollout group */ - private int maxActionsPerTarget = 500; + private int maxActionsPerTarget = 2000; /** * Maximum number of targets for a manual distribution set assignment.