From 8786156ff60a89059c8041ce2fabc48b9207dd4f Mon Sep 17 00:00:00 2001 From: Dmitriy Kopylenko Date: Mon, 22 Feb 2021 09:33:55 -0500 Subject: [PATCH] Boot 2.4 wip --- ...tityDescriptorEnversVersioningTests.groovy | 3 + .../resources/application.properties | 104 ++++++++++++++++++ .../src/main/resources/application.properties | 2 +- ui/package-lock.json | 6 +- 4 files changed, 112 insertions(+), 3 deletions(-) create mode 100644 backend/src/enversTest/resources/application.properties diff --git a/backend/src/enversTest/groovy/edu/internet2/tier/shibboleth/admin/ui/repository/envers/EntityDescriptorEnversVersioningTests.groovy b/backend/src/enversTest/groovy/edu/internet2/tier/shibboleth/admin/ui/repository/envers/EntityDescriptorEnversVersioningTests.groovy index b7f31270a..03bfe5661 100644 --- a/backend/src/enversTest/groovy/edu/internet2/tier/shibboleth/admin/ui/repository/envers/EntityDescriptorEnversVersioningTests.groovy +++ b/backend/src/enversTest/groovy/edu/internet2/tier/shibboleth/admin/ui/repository/envers/EntityDescriptorEnversVersioningTests.groovy @@ -44,9 +44,11 @@ import edu.internet2.tier.shibboleth.admin.ui.repository.EntityDescriptorReposit import edu.internet2.tier.shibboleth.admin.ui.service.EntityDescriptorService import org.springframework.beans.factory.annotation.Autowired import org.springframework.boot.autoconfigure.domain.EntityScan +import org.springframework.boot.test.autoconfigure.jdbc.AutoConfigureTestDatabase import org.springframework.boot.test.autoconfigure.orm.jpa.DataJpaTest import org.springframework.data.jpa.repository.config.EnableJpaRepositories import org.springframework.test.context.ContextConfiguration +import org.springframework.test.context.TestPropertySource import org.springframework.transaction.PlatformTransactionManager import spock.lang.Specification @@ -64,6 +66,7 @@ import static edu.internet2.tier.shibboleth.admin.ui.repository.envers.EnversTes @ContextConfiguration(classes = [CoreShibUiConfiguration, InternationalizationConfiguration, SearchConfiguration, TestConfiguration]) @EnableJpaRepositories(basePackages = ["edu.internet2.tier.shibboleth.admin.ui"]) @EntityScan("edu.internet2.tier.shibboleth.admin.ui") +@AutoConfigureTestDatabase(replace = AutoConfigureTestDatabase.Replace.NONE) class EntityDescriptorEnversVersioningTests extends Specification { @Autowired diff --git a/backend/src/enversTest/resources/application.properties b/backend/src/enversTest/resources/application.properties new file mode 100644 index 000000000..4d88d62df --- /dev/null +++ b/backend/src/enversTest/resources/application.properties @@ -0,0 +1,104 @@ +# Server Configuration +#server.port=8080 + +# Logging Configuration +#logging.config=classpath:log4j2.xml + +#logging.level.org.springframework.security=DEBUG +logging.level.org.springframework=INFO +logging.level.edu.internet2.tier.shibboleth.admin.ui=INFO + +spring.main.allow-bean-definition-overriding=true + +# Database Credentials +spring.datasource.username=shibui +spring.datasource.password=shibui + +# Database Configuration H2 +spring.datasource.url=jdbc:h2:mem:shibui;DB_CLOSE_DELAY=-1;DB_CLOSE_ON_EXIT=FALSE +spring.datasource.platform=h2 +spring.datasource.driverClassName=org.h2.Driver +spring.jpa.database-platform=org.hibernate.dialect.H2Dialect +spring.h2.console.enabled=true + +# spring.jackson.default-property-inclusion=non_absent +spring.jackson.default-property-inclusion=NON_NULL + +# Database Configuration PostgreSQL +#spring.datasource.url=jdbc:postgresql://localhost:5432/shibui +#spring.datasource.driverClassName=org.postgresql.Driver +#spring.jpa.properties.hibernate.dialect=org.hibernate.dialect.PostgreSQLDialect + +#Maria/MySQL DB +#spring.datasource.url=jdbc:mariadb://localhost:3306/shibui +#spring.datasource.driverClassName=org.mariadb.jdbc.Driver +#spring.jpa.properties.hibernate.dialect=org.hibernate.dialect.MariaDBDialect + +# Liquibase properties +spring.liquibase.enabled=false +#spring.liquibase.change-log=classpath:edu/internet2/tier/shibboleth/admin/ui/database/masterchangelog.xml + +# Hibernate properties +# for production never ever use create, create-drop. It's BEST to use validate +spring.jpa.hibernate.ddl-auto=update +spring.jpa.hibernate.naming.implicit-strategy=org.hibernate.boot.model.naming.ImplicitNamingStrategyJpaCompliantImpl +spring.jpa.show-sql=false +spring.jpa.properties.hibernate.format_sql=false + +spring.jpa.hibernate.use-new-id-generator-mappings=true + +#Envers versioning +spring.jpa.properties.org.hibernate.envers.store_data_at_delete=true + +# Set the following property to periodically write out the generated metadata files. There is no default value; the following is just an example +# shibui.metadata-dir=/opt/shibboleth-idp/metadata/generated +shibui.logout-url=/dashboard + +# spring.profiles.active=default + +#shibui.default-password= + +shibui.metadata-sources-ui-schema-location=classpath:metadata-sources-ui-schema.json +shibui.entity-attributes-filters-ui-schema-location=classpath:entity-attributes-filters-ui-schema.json +shibui.nameid-filter-ui-schema-location=classpath:nameid-filter.schema.json + +#Actuator endpoints (info) +# Un-comment to get full git details exposed like author, abbreviated SHA-1, commit message +#management.info.git.mode=full + +### +# metadata-providers.xml write configuration + +# Set the following property to periodically write out metadata providers configuration. There is no default value; the following is just an example +# shibui.metadataProviders.target=file:/opt/shibboleth-idp/conf/shibui-metadata-providers.xml +# shibui.metadataProviders.taskRunRate=30000 + +# Email configuration (local mailhog) +# spring.mail.host=mailhog +# spring.mail.port=1025 +# spring.mail.username=username +# spring.mail.password=password +# spring.mail.properties.mail.smtp.auth=false +# spring.mail.properties.mail.smtp.starttls.enable=false + +shibui.mail.text-email-template-path-prefix=/mail/text/ +shibui.mail.html.email-template-path-prefix=/mail/html/ +shibui.mail.system-email-address=doNotReply@shibui.org + +shibui.roles=ROLE_ADMIN,ROLE_USER,ROLE_NONE + +#In order to enable authentication via configured pac4j library (with external SAMl Idp, for example) +#This property must be set to true and pac4j properties configured. For sample pac4j properties, see application.yml +#for an example pac4j configuration +#shibui.pac4j-enabled=true + +#This property must be set to true in order to enable posting stats to beacon endpoint. Furthermore, appropriate +#environment variables must be set for beacon publisher to be used (the ones that are set when running shib-ui in +#docker container +shibui.beacon-enabled=true + + + + + +spring.jpa.properties.hibernate.current_session_context_class=org.springframework.orm.hibernate5.SpringSessionContext diff --git a/backend/src/main/resources/application.properties b/backend/src/main/resources/application.properties index e040917f3..fd85c0aee 100644 --- a/backend/src/main/resources/application.properties +++ b/backend/src/main/resources/application.properties @@ -95,4 +95,4 @@ shibui.roles=ROLE_ADMIN,ROLE_USER,ROLE_NONE #This property must be set to true in order to enable posting stats to beacon endpoint. Furthermore, appropriate #environment variables must be set for beacon publisher to be used (the ones that are set when running shib-ui in #docker container -shibui.beacon-enabled=true \ No newline at end of file +shibui.beacon-enabled=true diff --git a/ui/package-lock.json b/ui/package-lock.json index 922d700dd..421964f7a 100644 --- a/ui/package-lock.json +++ b/ui/package-lock.json @@ -4989,7 +4989,8 @@ }, "kind-of": { "version": "6.0.2", - "resolved": "", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz", + "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==", "dev": true } } @@ -17186,7 +17187,8 @@ }, "kind-of": { "version": "6.0.2", - "resolved": "", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz", + "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==", "dev": true } }