Skip to content

Commit 2890b38

Browse files
iskeyiskey
authored
Merge pull request #2485 from swaroopar/feature/release1.0.26
Feature/release1.0.26
2 parents 71dc444 + d67d1dc commit 2890b38

File tree

7 files changed

+1341
-2
lines changed

7 files changed

+1341
-2
lines changed

‎.github/workflows/release.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -98,9 +98,9 @@ jobs:
9898
with:
9999
files: >
100100
modules/database/src/main/resources/liquibase/full/mysql/xpanse-${{steps.new_version.outputs.next-version}}-full.mysql.xml,
101-
modules/database/src/main/resources/liquibase/full/mysql/xpanse-${{steps.new_version.outputs.next-version}}-full.h2.xml,
101+
modules/database/src/main/resources/liquibase/full/h2/xpanse-${{steps.new_version.outputs.next-version}}-full.h2.xml,
102102
modules/database/src/main/resources/liquibase/upgrades/mysql/xpanse-${{ env.CURRENT_VERSION }}-to-${{steps.new_version.outputs.next-version}}-upgrade.mysql.xml,
103-
modules/database/src/main/resources/liquibase/upgrades/mysql/xpanse-${{ env.CURRENT_VERSION }}-to-${{steps.new_version.outputs.next-version}}-upgrade.h2.xml
103+
modules/database/src/main/resources/liquibase/upgrades/h2/xpanse-${{ env.CURRENT_VERSION }}-to-${{steps.new_version.outputs.next-version}}-upgrade.h2.xml
104104
fail: true
105105
ignore_case: 'false'
106106

‎modules/database/src/main/resources/liquibase/full/h2/xpanse-1.0.26-full.h2.xml

+393
Large diffs are not rendered by default.

‎modules/database/src/main/resources/liquibase/full/mysql/xpanse-1.0.26-full.mysql.xml

+339
Large diffs are not rendered by default.

‎modules/database/src/main/resources/liquibase/liquibase.h2.properties

+1
Original file line numberDiff line numberDiff line change
@@ -13,4 +13,5 @@ password=Xpanse@2023
1313
driver=org.h2.Driver
1414
outputChangeLogFile=src/main/resources/liquibase/full/h2/xpanse-REPLACE_NEW_RELEASE-full.h2.xml
1515
diffChangeLogFile=src/main/resources/liquibase/upgrades/h2/xpanse-REPLACE_OLD_RELEASE-to-REPLACE_NEW_RELEASE-upgrade.h2.xml
16+
changeLogFile=src/main/resources/liquibase/upgrades/h2/xpanse-REPLACE_OLD_RELEASE-to-REPLACE_NEW_RELEASE-upgrade.h2.xml
1617
excludeObjects=table:ACT_.*

‎modules/database/src/main/resources/liquibase/liquibase.mysql.properties

+1
Original file line numberDiff line numberDiff line change
@@ -13,4 +13,5 @@ password=Xpanse@2023
1313
driver=com.mysql.cj.jdbc.Driver
1414
outputChangeLogFile=src/main/resources/liquibase/full/mysql/xpanse-REPLACE_NEW_RELEASE-full.mysql.xml
1515
diffChangeLogFile=src/main/resources/liquibase/upgrades/mysql/xpanse-REPLACE_OLD_RELEASE-to-REPLACE_NEW_RELEASE-upgrade.mysql.xml
16+
changeLogFile=src/main/resources/liquibase/upgrades/mysql/xpanse-REPLACE_OLD_RELEASE-to-REPLACE_NEW_RELEASE-upgrade.mysql.xml
1617
excludeObjects=table:ACT_.*

‎modules/database/src/main/resources/liquibase/upgrades/h2/xpanse-1.0.25-to-1.0.26-upgrade.h2.xml

+393
Large diffs are not rendered by default.

‎modules/database/src/main/resources/liquibase/upgrades/mysql/xpanse-1.0.25-to-1.0.26-upgrade.mysql.xml

+212
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,212 @@
1+
<?xml version="1.1" encoding="UTF-8" standalone="no"?>
2+
<!--
3+
~ SPDX-License-Identifier: Apache-2.0
4+
~ SPDX-FileCopyrightText: Huawei Inc.
5+
~
6+
-->
7+
<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:pro="http://www.liquibase.org/xml/ns/pro" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/pro http://www.liquibase.org/xml/ns/pro/liquibase-pro-latest.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-latest.xsd">
8+
<changeSet author="swaroop.ar" id="1741667557051-28">
9+
<dropForeignKeyConstraint baseTableName="SERVICE_CHANGE_DETAILS" constraintName="FK_SERVICE_DEPLOYMENT_SERVICE_CHANGE_DETAILS"/>
10+
</changeSet>
11+
<changeSet author="swaroop.ar" id="1741667557051-29">
12+
<dropForeignKeyConstraint baseTableName="SERVICE_CHANGE_DETAILS" constraintName="FK_SERVICE_ORDER_SERVICE_CHANGE_DETAILS"/>
13+
</changeSet>
14+
<changeSet author="swaroop.ar" id="1741667557051-2">
15+
<createTable tableName="SERVICE_CHANGE_REQUEST">
16+
<column name="ID" type="BINARY(16)">
17+
<constraints nullable="false" primaryKey="true"/>
18+
</column>
19+
<column name="CREATED_TIME" type="datetime(6)"/>
20+
<column name="LAST_MODIFIED_TIME" type="datetime(6)"/>
21+
<column name="CHANGE_HANDLER" type="VARCHAR(255)">
22+
<constraints nullable="false"/>
23+
</column>
24+
<column name="ORIGINAL_REQUEST_PROPERTIES" type="JSON"/>
25+
<column name="PROPERTIES" type="JSON"/>
26+
<column name="RESOURCENAME" type="VARCHAR(255)"/>
27+
<column name="RESULTMESSAGE" type="VARCHAR(255)"/>
28+
<column name="STATUS" type="ENUM('PENDING', 'PROCESSING', 'SUCCESSFUL', 'ERROR')"/>
29+
<column name="TASK_RESULT" type="JSON"/>
30+
<column name="SERVICE_ID" type="BINARY(16)">
31+
<constraints nullable="false"/>
32+
</column>
33+
<column name="ORDER_ID" type="BINARY(16)">
34+
<constraints nullable="false"/>
35+
</column>
36+
</createTable>
37+
</changeSet>
38+
<changeSet author="swaroop.ar" id="1741667557051-3">
39+
<createTable tableName="SERVICE_DEPLOYMENT_INPUT">
40+
<column name="SERVICE_ID" type="BINARY(16)">
41+
<constraints nullable="false" primaryKey="true"/>
42+
</column>
43+
<column name="P_VALUE" type="VARCHAR(255)"/>
44+
<column name="P_KEY" type="VARCHAR(255)">
45+
<constraints nullable="false" primaryKey="true"/>
46+
</column>
47+
</createTable>
48+
</changeSet>
49+
<changeSet author="swaroop.ar" id="1741667557051-4">
50+
<addColumn tableName="SERVICE_DEPLOYMENT">
51+
<column name="CREATED_TIME" type="datetime(6)"/>
52+
</addColumn>
53+
</changeSet>
54+
<changeSet author="swaroop.ar" id="1741667557051-5">
55+
<addColumn tableName="SERVICE_POLICY">
56+
<column name="CREATED_TIME" type="datetime(6)"/>
57+
</addColumn>
58+
</changeSet>
59+
<changeSet author="swaroop.ar" id="1741667557051-6">
60+
<addColumn tableName="SERVICE_RESOURCE">
61+
<column name="CREATED_TIME" type="datetime(6)"/>
62+
</addColumn>
63+
</changeSet>
64+
<changeSet author="swaroop.ar" id="1741667557051-7">
65+
<addColumn tableName="SERVICE_TEMPLATE">
66+
<column name="CREATED_TIME" type="datetime(6)"/>
67+
</addColumn>
68+
</changeSet>
69+
<changeSet author="swaroop.ar" id="1741667557051-8">
70+
<addColumn tableName="SERVICE_TEMPLATE_REQUEST_HISTORY">
71+
<column name="CREATED_TIME" type="datetime(6)"/>
72+
</addColumn>
73+
</changeSet>
74+
<changeSet author="swaroop.ar" id="1741667557051-9">
75+
<addColumn tableName="USER_POLICY">
76+
<column name="CREATED_TIME" type="datetime(6)"/>
77+
</addColumn>
78+
</changeSet>
79+
<changeSet author="swaroop.ar" id="1741667557051-10">
80+
<addColumn tableName="SERVICE_DEPLOYMENT">
81+
<column name="AVAILABILITY_ZONES" type="JSON"/>
82+
</addColumn>
83+
</changeSet>
84+
<changeSet author="swaroop.ar" id="1741667557051-11">
85+
<addColumn tableName="SERVICE_ORDER">
86+
<column name="HANDLER" type="ENUM('TERRAFORM_LOCAL', 'TERRA_BOOT', 'OPEN_TOFU_LOCAL', 'TOFU_MAKER', 'INTERNAL', 'WORKFLOW', 'AGENT', 'PLUGIN')"/>
87+
</addColumn>
88+
</changeSet>
89+
<changeSet author="swaroop.ar" id="1741667557051-12">
90+
<addColumn tableName="SERVICE_DEPLOYMENT">
91+
<column name="BILLING_MODE" type="ENUM('FIXED', 'PAY_PER_USE')"/>
92+
</addColumn>
93+
</changeSet>
94+
<changeSet author="swaroop.ar" id="1741667557051-13">
95+
<addColumn tableName="SERVICE_ORDER">
96+
<column name="ORDER_STATUS" type="ENUM('CREATED', 'IN_PROGRESS', 'SUCCESSFUL', 'FAILED')"/>
97+
</addColumn>
98+
</changeSet>
99+
<changeSet author="swaroop.ar" id="1741667557051-14">
100+
<addColumn tableName="SERVICE_DEPLOYMENT">
101+
<column name="CUSTOMER_SERVICE_NAME" type="VARCHAR(255)"/>
102+
</addColumn>
103+
</changeSet>
104+
<changeSet author="swaroop.ar" id="1741667557051-15">
105+
<addColumn tableName="SERVICE_DEPLOYMENT">
106+
<column name="IS_EULA_ACCEPTED" type="BIT(1)">
107+
<constraints nullable="false"/>
108+
</column>
109+
</addColumn>
110+
</changeSet>
111+
<changeSet author="swaroop.ar" id="1741667557051-16">
112+
<addColumn tableName="SERVICE_DEPLOYMENT">
113+
<column name="LOCK_CONFIG" type="JSON"/>
114+
</addColumn>
115+
</changeSet>
116+
<changeSet author="swaroop.ar" id="1741667557051-17">
117+
<addColumn tableName="SERVICE_DEPLOYMENT">
118+
<column name="REGION" type="JSON">
119+
<constraints nullable="false"/>
120+
</column>
121+
</addColumn>
122+
</changeSet>
123+
<changeSet author="swaroop.ar" id="1741667557051-18">
124+
<addColumn tableName="SERVICE_DEPLOYMENT">
125+
<column name="SERVICE_HOSTING_TYPE" type="ENUM('SELF', 'SERVICE_VENDOR')"/>
126+
</addColumn>
127+
</changeSet>
128+
<changeSet author="swaroop.ar" id="1741667557051-19">
129+
<addColumn tableName="SERVICE_DEPLOYMENT">
130+
<column name="SERVICE_VENDOR" type="VARCHAR(255)">
131+
<constraints nullable="false"/>
132+
</column>
133+
</addColumn>
134+
</changeSet>
135+
<changeSet author="swaroop.ar" id="1741667557051-20">
136+
<addColumn tableName="SERVICE_DEPLOYMENT">
137+
<column name="USER_ID" type="VARCHAR(255)"/>
138+
</addColumn>
139+
</changeSet>
140+
<changeSet author="swaroop.ar" id="1741667557051-21">
141+
<createIndex associatedWith="" indexName="FK_SERVICE_DEPLOYMENT_SERVICE_CHANGE_REQUEST" tableName="SERVICE_CHANGE_REQUEST">
142+
<column name="SERVICE_ID"/>
143+
</createIndex>
144+
</changeSet>
145+
<changeSet author="swaroop.ar" id="1741667557051-22">
146+
<createIndex associatedWith="" indexName="FK_SERVICE_ORDER_SERVICE_CHANGE_REQUEST" tableName="SERVICE_CHANGE_REQUEST">
147+
<column name="ORDER_ID"/>
148+
</createIndex>
149+
</changeSet>
150+
<changeSet author="swaroop.ar" id="1741667557051-23">
151+
<createIndex associatedWith="" indexName="FK_SERVICE_TEMPLATE_SERVICE_DEPLOYMENT" tableName="SERVICE_DEPLOYMENT">
152+
<column name="SERVICE_TEMPLATE_ID"/>
153+
</createIndex>
154+
</changeSet>
155+
<changeSet author="swaroop.ar" id="1741667557051-24">
156+
<addForeignKeyConstraint baseColumnNames="SERVICE_ID" baseTableName="SERVICE_CHANGE_REQUEST" constraintName="FK_SERVICE_DEPLOYMENT_SERVICE_CHANGE_REQUEST" deferrable="false" initiallyDeferred="false" onDelete="CASCADE" onUpdate="RESTRICT" referencedColumnNames="ID" referencedTableName="SERVICE_DEPLOYMENT" validate="true"/>
157+
</changeSet>
158+
<changeSet author="swaroop.ar" id="1741667557051-25">
159+
<addForeignKeyConstraint baseColumnNames="SERVICE_ID" baseTableName="SERVICE_DEPLOYMENT_INPUT" constraintName="FK_SERVICE_DEPLOYMENT_SERVICE_DEPLOYMENT_INPUT" deferrable="false" initiallyDeferred="false" onDelete="CASCADE" onUpdate="RESTRICT" referencedColumnNames="ID" referencedTableName="SERVICE_DEPLOYMENT" validate="true"/>
160+
</changeSet>
161+
<changeSet author="swaroop.ar" id="1741667557051-26">
162+
<addForeignKeyConstraint baseColumnNames="ORDER_ID" baseTableName="SERVICE_CHANGE_REQUEST" constraintName="FK_SERVICE_ORDER_SERVICE_CHANGE_REQUEST" deferrable="false" initiallyDeferred="false" onDelete="CASCADE" onUpdate="RESTRICT" referencedColumnNames="ORDER_ID" referencedTableName="SERVICE_ORDER" validate="true"/>
163+
</changeSet>
164+
<changeSet author="swaroop.ar" id="1741667557051-27">
165+
<addForeignKeyConstraint baseColumnNames="SERVICE_TEMPLATE_ID" baseTableName="SERVICE_DEPLOYMENT" constraintName="FK_SERVICE_TEMPLATE_SERVICE_DEPLOYMENT" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="ID" referencedTableName="SERVICE_TEMPLATE" validate="true"/>
166+
</changeSet>
167+
<changeSet author="swaroop.ar" id="1741667557051-30">
168+
<dropTable tableName="SERVICE_CHANGE_DETAILS"/>
169+
</changeSet>
170+
<changeSet author="swaroop.ar" id="1741667557051-31">
171+
<dropColumn columnName="CREATE_TIME" tableName="SERVICE_DEPLOYMENT"/>
172+
</changeSet>
173+
<changeSet author="swaroop.ar" id="1741667557051-32">
174+
<dropColumn columnName="CREATE_TIME" tableName="SERVICE_POLICY"/>
175+
</changeSet>
176+
<changeSet author="swaroop.ar" id="1741667557051-33">
177+
<dropColumn columnName="CREATE_TIME" tableName="SERVICE_RESOURCE"/>
178+
</changeSet>
179+
<changeSet author="swaroop.ar" id="1741667557051-34">
180+
<dropColumn columnName="CREATE_TIME" tableName="SERVICE_TEMPLATE"/>
181+
</changeSet>
182+
<changeSet author="swaroop.ar" id="1741667557051-35">
183+
<dropColumn columnName="CREATE_TIME" tableName="SERVICE_TEMPLATE_REQUEST_HISTORY"/>
184+
</changeSet>
185+
<changeSet author="swaroop.ar" id="1741667557051-36">
186+
<dropColumn columnName="CREATE_TIME" tableName="USER_POLICY"/>
187+
</changeSet>
188+
<changeSet author="swaroop.ar" id="1741667557051-37">
189+
<dropColumn columnName="CUSTOMERSERVICENAME" tableName="SERVICE_DEPLOYMENT"/>
190+
</changeSet>
191+
<changeSet author="swaroop.ar" id="1741667557051-38">
192+
<dropColumn columnName="DEPLOYREQUEST" tableName="SERVICE_DEPLOYMENT"/>
193+
</changeSet>
194+
<changeSet author="swaroop.ar" id="1741667557051-39">
195+
<dropColumn columnName="LOCKCONFIG" tableName="SERVICE_DEPLOYMENT"/>
196+
</changeSet>
197+
<changeSet author="swaroop.ar" id="1741667557051-40">
198+
<dropColumn columnName="RESULT_MESSAGE" tableName="SERVICE_DEPLOYMENT"/>
199+
</changeSet>
200+
<changeSet author="swaroop.ar" id="1741667557051-41">
201+
<dropColumn columnName="SERVICEVENDOR" tableName="SERVICE_DEPLOYMENT"/>
202+
</changeSet>
203+
<changeSet author="swaroop.ar" id="1741667557051-42">
204+
<dropColumn columnName="TASK_STATUS" tableName="SERVICE_ORDER"/>
205+
</changeSet>
206+
<changeSet author="swaroop.ar" id="1741667557051-43">
207+
<dropColumn columnName="USERID" tableName="SERVICE_DEPLOYMENT"/>
208+
</changeSet>
209+
<changeSet author="swaroop.ar" id="1741667557051-1">
210+
<addNotNullConstraint columnDataType="boolean" columnName="ENABLED" tableName="SERVICE_POLICY" validate="true"/>
211+
</changeSet>
212+
</databaseChangeLog>

0 commit comments

Comments
 (0)