Increase target name to 128 and target controller id to 256 #849

floruschbaschan · 2019-06-06T12:54:53Z

Signed-off-by: Florian Ruschbaschan Florian.Ruschbaschan@bosch-si.com

Signed-off-by: Florian Ruschbaschan <Florian.Ruschbaschan@bosch-si.com>

hawkbit · 2019-06-06T12:55:01Z

Thanks for taking the time to contribute to hawkBit! We really appreciate this. Make yourself comfortable while I'm looking for a committer to help you with your contribution.
Please make sure you read the contribution guide and signed the Eclipse Contributor Agreement (ECA).

hawkbit-bot · 2019-06-06T12:57:02Z

Can one of the admins verify this patch?

Signed-off-by: Florian Ruschbaschan <Florian.Ruschbaschan@bosch-si.com>

a-sayyed · 2019-06-12T15:29:43Z

hawkbit-runtime/hawkbit-update-server/src/main/resources/application-db2.properties

+
+# This profile adds basic configurations for a DB2 DB usage.
+# Keep in mind that you need the DB2 driver in your classpath on compile.
+# see https://www.eclipse.org/hawkbit/documentation/guide/runhawkbit.html


url is no longer valid, would you please change it to https://www.eclipse.org/hawkbit/guides/runhawkbit/ also in the other places where it might be used?

Done. I have also changed the URL for application-mysql.properties and application-mssql.properties

a-sayyed · 2019-06-12T15:32:33Z

...rc/main/resources/db/migration/H2/V1_12_12__change_length_of_controller_id_and_name___H2.sql

+ALTER TABLE sp_target_tag ALTER COLUMN name VARCHAR(128);
+
+
+ALTER TABLE sp_target ALTER COLUMN controller_id VARCHAR(256);


add new line at the end of this file, for github

a-sayyed · 2019-06-12T15:35:36Z

.../main/resources/db/migration/DB2/V1_12_12__change_length_of_controller_id_and_name___DB2.sql

+ALTER TABLE sp_target_tag ALTER COLUMN name SET DATA TYPE VARCHAR(128);
+
+
+ALTER TABLE sp_target ALTER COLUMN controller_id SET DATA TYPE VARCHAR(256);


add new line at the end of this file, for github

a-sayyed · 2019-06-12T15:36:36Z

...n/resources/db/migration/MYSQL/V1_12_12__change_length_of_controller_id_and_name___MYSQL.sql

+ALTER TABLE sp_target_tag MODIFY name VARCHAR(128);
+
+
+ALTER TABLE sp_target MODIFY controller_id VARCHAR(256);


add new line at the end of this file, for github

a-sayyed · 2019-06-12T15:36:47Z

...s/db/migration/SQL_SERVER/V1_12_12__change_length_of_controller_id_and_name___SQL_SERVER.sql

+ALTER TABLE sp_target_tag ALTER COLUMN name VARCHAR(128);
+
+
+ALTER TABLE sp_target ALTER COLUMN controller_id VARCHAR(256);


add new line at the end of this file, for github

a-sayyed · 2019-06-12T15:38:08Z

...tory-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/DistributionSetManagementTest.java

@@ -251,7 +252,7 @@ private void createAndUpdateDistributionSetWithInvalidVersion(final Distribution

        assertThatExceptionOfType(ConstraintViolationException.class)
                .isThrownBy(() -> distributionSetManagement.create(entityFactory.distributionSet().create().name("a")
-                        .version(RandomStringUtils.randomAlphanumeric(65))))
+                        .version(RandomStringUtils.randomAlphanumeric(NamedEntity.NAME_MAX_SIZE + 1))))


wrong field is being tested here, should be .name() instead of .version(), would you mind adding another block that tests the name and leaving the one that tests the version as is?

a-sayyed · 2019-06-12T15:38:24Z

...tory-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/DistributionSetManagementTest.java

@@ -260,7 +261,7 @@ private void createAndUpdateDistributionSetWithInvalidVersion(final Distribution

        assertThatExceptionOfType(ConstraintViolationException.class)
                .isThrownBy(() -> distributionSetManagement.update(entityFactory.distributionSet().update(set.getId())
-                        .version(RandomStringUtils.randomAlphanumeric(65))))
+                        .version(RandomStringUtils.randomAlphanumeric(NamedEntity.NAME_MAX_SIZE + 1))))


wrong field is being tested here, should be .name() instead of .version(), would you mind adding another block that tests the name and leaving the one that tests the version as is?

a-sayyed · 2019-06-12T15:38:34Z

...-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/DistributionSetTypeManagementTest.java

@@ -165,7 +166,7 @@ private void createAndUpdateDistributionSetWithInvalidVersion(final Distribution

        assertThatExceptionOfType(ConstraintViolationException.class)
                .isThrownBy(() -> distributionSetManagement.create(entityFactory.distributionSet().create().name("a")
-                        .version(RandomStringUtils.randomAlphanumeric(65))))
+                        .version(RandomStringUtils.randomAlphanumeric(NamedEntity.NAME_MAX_SIZE + 1))))


wrong field is being tested here, should be .name() instead of .version(), would you mind adding another block that tests the name and leaving the one that tests the version as is?

a-sayyed · 2019-06-12T15:38:43Z

...-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/DistributionSetTypeManagementTest.java

@@ -184,7 +185,7 @@ private void createAndUpdateDistributionSetWithInvalidVersion(final Distribution

        assertThatExceptionOfType(ConstraintViolationException.class)
                .isThrownBy(() -> distributionSetManagement.update(entityFactory.distributionSet().update(set.getId())
-                        .version(RandomStringUtils.randomAlphanumeric(65))))
+                        .version(RandomStringUtils.randomAlphanumeric(NamedEntity.NAME_MAX_SIZE + 1))))


wrong field is being tested here, should be .name() instead of .version(), would you mind adding another block that tests the name and leaving the one that tests the version as is?

a-sayyed · 2019-06-12T15:39:18Z

...it-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/TargetManagementTest.java

@@ -281,7 +282,7 @@ private void createAndUpdateTargetWithInvalidSecurityToken(final Target target)

        assertThatExceptionOfType(ConstraintViolationException.class)
                .isThrownBy(() -> targetManagement.create(entityFactory.target().create().controllerId("a")
-                        .securityToken(RandomStringUtils.randomAlphanumeric(129))))
+                        .securityToken(RandomStringUtils.randomAlphanumeric(NamedEntity.NAME_MAX_SIZE + 1))))


wrong field is being tested here, should be .controllerId() instead of .securityToken(), would you mind adding another block that tests the controllerId and leaving the one that tests the securityToken as is?

a-sayyed · 2019-06-12T15:39:47Z

...it-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/TargetManagementTest.java

@@ -291,7 +292,7 @@ private void createAndUpdateTargetWithInvalidSecurityToken(final Target target)

        assertThatExceptionOfType(ConstraintViolationException.class)
                .isThrownBy(() -> targetManagement.update(entityFactory.target().update(target.getControllerId())
-                        .securityToken(RandomStringUtils.randomAlphanumeric(129))))
+                        .securityToken(RandomStringUtils.randomAlphanumeric(NamedEntity.NAME_MAX_SIZE + 1))))


wrong field is being tested here, should be .controllerId() instead of .securityToken(), would you mind adding another block that tests the controllerId and leaving the one that tests the securityToken as is?

- Use correct constant field for junit tests - Change Hawkbit documentation url of application-<db>.properties - Add new line at the end of db migration scripts Signed-off-by: Florian Ruschbaschan <Florian.Ruschbaschan@bosch-si.com>

a-sayyed · 2019-06-13T08:37:58Z

...tory-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/DistributionSetManagementTest.java

@@ -252,7 +253,7 @@ private void createAndUpdateDistributionSetWithInvalidVersion(final Distribution

        assertThatExceptionOfType(ConstraintViolationException.class)
                .isThrownBy(() -> distributionSetManagement.create(entityFactory.distributionSet().create().name("a")
-                        .version(RandomStringUtils.randomAlphanumeric(NamedEntity.NAME_MAX_SIZE + 1))))
+                        .version(RandomStringUtils.randomAlphanumeric(NamedVersionedEntity.VERSION_MAX_SIZE + 1))))
                .as("entity with too long name should not be created");


could you please fix the assertion error message, entity with too long version should not be created instead of entity with too long name should not be created. It's in multiple places in this file

Signed-off-by: Florian Ruschbaschan <Florian.Ruschbaschan@bosch-si.com>

a-sayyed · 2019-06-13T09:33:57Z

looks good! 👍

laverman · 2019-06-14T06:08:50Z

hawkbit-runtime/hawkbit-update-server/src/main/resources/application-mysql.properties

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2015 Bosch Software Innovations GmbH and others.
+# Copyright (c) 2019 Bosch Software Innovations GmbH and others.


Please revert back to 2015, since there has been the original inception

laverman · 2019-06-14T06:09:05Z

hawkbit-runtime/hawkbit-update-server/src/main/resources/application-mssql.properties

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2018 Bosch Software Innovations GmbH and others.
+# Copyright (c) 2019 Bosch Software Innovations GmbH and others.


laverman · 2019-06-14T06:10:53Z

@hawkbit-bot please verify

Signed-off-by: Florian Ruschbaschan <Florian.Ruschbaschan@bosch-si.com>

stefbehl

Looks good. Thank you!

) * Increase target name to 128 and target controller id to 256 * Fix test failures by using constant NamedEntity.NAME_MAX_SIZE + 1 * Use constant NamedEntity.NAME_MAX_SIZE + 1 for mgmt-resource tests * Add db migration scripts to increase the controllerId and name limit * Fix review issues * Use correct constant field for junit tests * Change Hawkbit documentation url of application-<db>.properties * Add new line at the end of db migration scripts * Update assertion description * Revert copyright years to its creator year * Add DDI-, AMQP- and controller management-tests Signed-off-by: Florian Ruschbaschan <Florian.Ruschbaschan@bosch-si.com>

Increase target name to 128 and target controller id to 256

5472223

Signed-off-by: Florian Ruschbaschan <Florian.Ruschbaschan@bosch-si.com>

floruschbaschan added 3 commits June 6, 2019 18:58

Fix test failures by using constant NamedEntity.NAME_MAX_SIZE + 1

58ef4cc

Signed-off-by: Florian Ruschbaschan <Florian.Ruschbaschan@bosch-si.com>

Use constant NamedEntity.NAME_MAX_SIZE + 1 for mgmt-resource tests

4d9bd78

Signed-off-by: Florian Ruschbaschan <Florian.Ruschbaschan@bosch-si.com>

Add db migration scripts to increase the controllerId and name limit

853c119

Signed-off-by: Florian Ruschbaschan <Florian.Ruschbaschan@bosch-si.com>

a-sayyed reviewed Jun 12, 2019

View reviewed changes

Fix review issues

1fde5a0

- Use correct constant field for junit tests - Change Hawkbit documentation url of application-<db>.properties - Add new line at the end of db migration scripts Signed-off-by: Florian Ruschbaschan <Florian.Ruschbaschan@bosch-si.com>

a-sayyed reviewed Jun 13, 2019

View reviewed changes

Update assertion description

4700f5b

Signed-off-by: Florian Ruschbaschan <Florian.Ruschbaschan@bosch-si.com>

floruschbaschan marked this pull request as ready for review June 13, 2019 09:32

laverman reviewed Jun 14, 2019

View reviewed changes

floruschbaschan added 2 commits June 14, 2019 08:15

Revert copyright years to its creator year

07a8c4c

Signed-off-by: Florian Ruschbaschan <Florian.Ruschbaschan@bosch-si.com>

Add DDI-, AMQP- and controller management-tests

70b5ad4

Signed-off-by: Florian Ruschbaschan <Florian.Ruschbaschan@bosch-si.com>

stefbehl self-requested a review June 18, 2019 07:27

stefbehl approved these changes Jun 18, 2019

View reviewed changes

stefbehl merged commit f6c0edf into eclipse:master Jun 18, 2019

stefbehl deleted the feature/IncreaseTargetControllerIdAndTargetNameLimit branch June 18, 2019 13:29

schabdo added this to the 0.3.0M5 milestone Jul 1, 2019

schabdo added the enhancement label Jul 30, 2019

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Increase target name to 128 and target controller id to 256 #849

Increase target name to 128 and target controller id to 256 #849

floruschbaschan commented Jun 6, 2019

hawkbit bot commented Jun 6, 2019

hawkbit-bot commented Jun 6, 2019

a-sayyed Jun 12, 2019

floruschbaschan Jun 13, 2019

a-sayyed Jun 12, 2019

a-sayyed Jun 12, 2019

a-sayyed Jun 12, 2019

a-sayyed Jun 12, 2019

a-sayyed Jun 12, 2019 •

edited

a-sayyed Jun 12, 2019 •

edited

a-sayyed Jun 12, 2019 •

edited

a-sayyed Jun 12, 2019 •

edited

a-sayyed Jun 12, 2019 •

edited

a-sayyed Jun 12, 2019 •

edited

a-sayyed Jun 13, 2019

a-sayyed commented Jun 13, 2019

laverman Jun 14, 2019

laverman Jun 14, 2019

laverman commented Jun 14, 2019

stefbehl left a comment

		ALTER TABLE sp_target_tag ALTER COLUMN name VARCHAR(128);


		ALTER TABLE sp_target ALTER COLUMN controller_id VARCHAR(256);

		ALTER TABLE sp_target_tag MODIFY name VARCHAR(128);


		ALTER TABLE sp_target MODIFY controller_id VARCHAR(256);

Increase target name to 128 and target controller id to 256 #849

Increase target name to 128 and target controller id to 256 #849

Conversation

floruschbaschan commented Jun 6, 2019

hawkbit bot commented Jun 6, 2019

hawkbit-bot commented Jun 6, 2019

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

a-sayyed Jun 12, 2019 • edited

Choose a reason for hiding this comment

a-sayyed Jun 12, 2019 • edited

Choose a reason for hiding this comment

a-sayyed Jun 12, 2019 • edited

Choose a reason for hiding this comment

a-sayyed Jun 12, 2019 • edited

Choose a reason for hiding this comment

a-sayyed Jun 12, 2019 • edited

Choose a reason for hiding this comment

a-sayyed Jun 12, 2019 • edited

Choose a reason for hiding this comment

Choose a reason for hiding this comment

a-sayyed commented Jun 13, 2019

Choose a reason for hiding this comment

Choose a reason for hiding this comment

laverman commented Jun 14, 2019

stefbehl left a comment

Choose a reason for hiding this comment

a-sayyed Jun 12, 2019 •

edited

a-sayyed Jun 12, 2019 •

edited

a-sayyed Jun 12, 2019 •

edited

a-sayyed Jun 12, 2019 •

edited

a-sayyed Jun 12, 2019 •

edited

a-sayyed Jun 12, 2019 •

edited