Update db tables + fix test failure

msm1992 · msm1992 · commit a313237a2a30 · 2025-02-14T15:06:18.000+05:30
diff --git a/components/apimgt/org.wso2.carbon.apimgt.impl/src/main/java/org/wso2/carbon/apimgt/impl/APIAdminImpl.java b/components/apimgt/org.wso2.carbon.apimgt.impl/src/main/java/org/wso2/carbon/apimgt/impl/APIAdminImpl.java
@@ -180,7 +180,9 @@ public Environment getEnvironment(String tenantDomain, String uuid) throws APIMa
                 );
             }
         }
-        maskValues(env);
+        if (env.getProvider().equalsIgnoreCase(APIConstants.EXTERNAL_GATEWAY_VENDOR)) {
+            maskValues(env);
+        }
         return env;
     }
 
diff --git a/features/apimgt/org.wso2.carbon.apimgt.core.feature/src/main/resources/multi-dc/OGG/oracle/apimgt/tables.sql b/features/apimgt/org.wso2.carbon.apimgt.core.feature/src/main/resources/multi-dc/OGG/oracle/apimgt/tables.sql
@@ -2184,7 +2184,7 @@ CREATE TABLE AM_API_EXTERNAL_API_MAPPING (
      GATEWAY_ENV_ID VARCHAR(255) NOT NULL,
      REFERENCE_ARTIFACT LONGBLOB NOT NULL,
      FOREIGN KEY (API_ID) REFERENCES AM_API(API_UUID) ON DELETE CASCADE,
-     FOREIGN KEY (GATEWAY_ENV_ID) REFERENCES AM_GATEWAY_ENVIRONMENT(UUID) ON DELETE RESTRICT,
+     FOREIGN KEY (GATEWAY_ENV_ID) REFERENCES AM_GATEWAY_ENVIRONMENT(UUID),
      PRIMARY KEY (API_ID, GATEWAY_ENV_ID)
 )
 /
diff --git a/features/apimgt/org.wso2.carbon.apimgt.core.feature/src/main/resources/multi-dc/OGG/oracle/apimgt/tables_23c.sql b/features/apimgt/org.wso2.carbon.apimgt.core.feature/src/main/resources/multi-dc/OGG/oracle/apimgt/tables_23c.sql
@@ -2184,7 +2184,7 @@ CREATE TABLE AM_API_EXTERNAL_API_MAPPING (
      GATEWAY_ENV_ID VARCHAR(255) NOT NULL,
      REFERENCE_ARTIFACT LONGBLOB NOT NULL,
      FOREIGN KEY (API_ID) REFERENCES AM_API(API_UUID) ON DELETE CASCADE,
-     FOREIGN KEY (GATEWAY_ENV_ID) REFERENCES AM_GATEWAY_ENVIRONMENT(UUID) ON DELETE RESTRICT,
+     FOREIGN KEY (GATEWAY_ENV_ID) REFERENCES AM_GATEWAY_ENVIRONMENT(UUID),
      PRIMARY KEY (API_ID, GATEWAY_ENV_ID)
 )
 /
diff --git a/features/apimgt/org.wso2.carbon.apimgt.core.feature/src/main/resources/multi-dc/Postgresql/apimgt/tables.sql b/features/apimgt/org.wso2.carbon.apimgt.core.feature/src/main/resources/multi-dc/Postgresql/apimgt/tables.sql
@@ -2687,7 +2687,7 @@ CREATE TABLE AM_API_EXTERNAL_API_MAPPING (
      GATEWAY_ENV_ID VARCHAR(255) NOT NULL,
      REFERENCE_ARTIFACT LONGBLOB NOT NULL,
      FOREIGN KEY (API_ID) REFERENCES AM_API(API_UUID) ON DELETE CASCADE,
-     FOREIGN KEY (GATEWAY_ENV_ID) REFERENCES AM_GATEWAY_ENVIRONMENT(UUID) ON DELETE RESTRICT,
+     FOREIGN KEY (GATEWAY_ENV_ID) REFERENCES AM_GATEWAY_ENVIRONMENT(UUID),
      PRIMARY KEY (API_ID, GATEWAY_ENV_ID)
 );
 
diff --git a/features/apimgt/org.wso2.carbon.apimgt.core.feature/src/main/resources/multi-dc/SQLServer/mssql/apimgt/tables.sql b/features/apimgt/org.wso2.carbon.apimgt.core.feature/src/main/resources/multi-dc/SQLServer/mssql/apimgt/tables.sql
@@ -2571,7 +2571,7 @@ CREATE TABLE AM_API_EXTERNAL_API_MAPPING (
      GATEWAY_ENV_ID VARCHAR(255) NOT NULL,
      REFERENCE_ARTIFACT LONGBLOB NOT NULL,
      FOREIGN KEY (API_ID) REFERENCES AM_API(API_UUID) ON DELETE CASCADE,
-     FOREIGN KEY (GATEWAY_ENV_ID) REFERENCES AM_GATEWAY_ENVIRONMENT(UUID) ON DELETE RESTRICT,
+     FOREIGN KEY (GATEWAY_ENV_ID) REFERENCES AM_GATEWAY_ENVIRONMENT(UUID),
      PRIMARY KEY (API_ID, GATEWAY_ENV_ID)
 );
 
diff --git a/features/apimgt/org.wso2.carbon.apimgt.core.feature/src/main/resources/sql/db2.sql b/features/apimgt/org.wso2.carbon.apimgt.core.feature/src/main/resources/sql/db2.sql
@@ -3150,7 +3150,7 @@ CREATE TABLE AM_API_EXTERNAL_API_MAPPING (
     GATEWAY_ENV_ID VARCHAR(255) NOT NULL,
     REFERENCE_ARTIFACT LONGBLOB NOT NULL,
     FOREIGN KEY (API_ID) REFERENCES AM_API(API_UUID) ON DELETE CASCADE,
-    FOREIGN KEY (GATEWAY_ENV_ID) REFERENCES AM_GATEWAY_ENVIRONMENT(UUID) ON DELETE RESTRICT,
+    FOREIGN KEY (GATEWAY_ENV_ID) REFERENCES AM_GATEWAY_ENVIRONMENT(UUID),
     PRIMARY KEY (API_ID, GATEWAY_ENV_ID)
 )/
 
diff --git a/features/apimgt/org.wso2.carbon.apimgt.core.feature/src/main/resources/sql/h2.sql b/features/apimgt/org.wso2.carbon.apimgt.core.feature/src/main/resources/sql/h2.sql
@@ -2312,7 +2312,7 @@ CREATE TABLE IF NOT EXISTS AM_API_EXTERNAL_API_MAPPING (
     GATEWAY_ENV_ID VARCHAR(255) NOT NULL,
     REFERENCE_ARTIFACT LONGBLOB NOT NULL,
     FOREIGN KEY (API_ID) REFERENCES AM_API(API_UUID) ON DELETE CASCADE,
-    FOREIGN KEY (GATEWAY_ENV_ID) REFERENCES AM_GATEWAY_ENVIRONMENT(UUID) ON DELETE RESTRICT,
+    FOREIGN KEY (GATEWAY_ENV_ID) REFERENCES AM_GATEWAY_ENVIRONMENT(UUID),
     PRIMARY KEY (API_ID, GATEWAY_ENV_ID)
 );
 
diff --git a/features/apimgt/org.wso2.carbon.apimgt.core.feature/src/main/resources/sql/mssql.sql b/features/apimgt/org.wso2.carbon.apimgt.core.feature/src/main/resources/sql/mssql.sql
@@ -2641,7 +2641,7 @@ CREATE TABLE AM_API_EXTERNAL_API_MAPPING (
     GATEWAY_ENV_ID VARCHAR(255) NOT NULL,
     REFERENCE_ARTIFACT LONGBLOB NOT NULL,
     FOREIGN KEY (API_ID) REFERENCES AM_API(API_UUID) ON DELETE CASCADE,
-    FOREIGN KEY (GATEWAY_ENV_ID) REFERENCES AM_GATEWAY_ENVIRONMENT(UUID) ON DELETE RESTRICT,
+    FOREIGN KEY (GATEWAY_ENV_ID) REFERENCES AM_GATEWAY_ENVIRONMENT(UUID),
     PRIMARY KEY (API_ID, GATEWAY_ENV_ID)
 );
 
diff --git a/features/apimgt/org.wso2.carbon.apimgt.core.feature/src/main/resources/sql/mysql.sql b/features/apimgt/org.wso2.carbon.apimgt.core.feature/src/main/resources/sql/mysql.sql
@@ -2372,7 +2372,7 @@ CREATE TABLE IF NOT EXISTS AM_API_EXTERNAL_API_MAPPING (
     GATEWAY_ENV_ID VARCHAR(255) NOT NULL,
     REFERENCE_ARTIFACT LONGBLOB NOT NULL,
     FOREIGN KEY (API_ID) REFERENCES AM_API(API_UUID) ON DELETE CASCADE,
-    FOREIGN KEY (GATEWAY_ENV_ID) REFERENCES AM_GATEWAY_ENVIRONMENT(UUID) ON DELETE RESTRICT,
+    FOREIGN KEY (GATEWAY_ENV_ID) REFERENCES AM_GATEWAY_ENVIRONMENT(UUID),
     PRIMARY KEY (API_ID, GATEWAY_ENV_ID)
 )ENGINE=InnoDB;
 
diff --git a/features/apimgt/org.wso2.carbon.apimgt.core.feature/src/main/resources/sql/mysql_cluster.sql b/features/apimgt/org.wso2.carbon.apimgt.core.feature/src/main/resources/sql/mysql_cluster.sql
@@ -2551,7 +2551,7 @@ CREATE TABLE IF NOT EXISTS AM_API_EXTERNAL_API_MAPPING (
     GATEWAY_ENV_ID VARCHAR(255) NOT NULL,
     REFERENCE_ARTIFACT LONGBLOB NOT NULL,
     FOREIGN KEY (API_ID) REFERENCES AM_API(API_UUID) ON DELETE CASCADE,
-    FOREIGN KEY (GATEWAY_ENV_ID) REFERENCES AM_GATEWAY_ENVIRONMENT(UUID) ON DELETE RESTRICT,
+    FOREIGN KEY (GATEWAY_ENV_ID) REFERENCES AM_GATEWAY_ENVIRONMENT(UUID),
     PRIMARY KEY (API_ID, GATEWAY_ENV_ID)
 )ENGINE=NDB;
 
diff --git a/features/apimgt/org.wso2.carbon.apimgt.core.feature/src/main/resources/sql/oracle.sql b/features/apimgt/org.wso2.carbon.apimgt.core.feature/src/main/resources/sql/oracle.sql
@@ -3659,7 +3659,7 @@ CREATE TABLE AM_API_EXTERNAL_API_MAPPING (
      GATEWAY_ENV_ID VARCHAR(255) NOT NULL,
      REFERENCE_ARTIFACT LONGBLOB NOT NULL,
      FOREIGN KEY (API_ID) REFERENCES AM_API(API_UUID) ON DELETE CASCADE,
-     FOREIGN KEY (GATEWAY_ENV_ID) REFERENCES AM_GATEWAY_ENVIRONMENT(UUID) ON DELETE RESTRICT,
+     FOREIGN KEY (GATEWAY_ENV_ID) REFERENCES AM_GATEWAY_ENVIRONMENT(UUID),
      PRIMARY KEY (API_ID, GATEWAY_ENV_ID)
 )
 /
diff --git a/features/apimgt/org.wso2.carbon.apimgt.core.feature/src/main/resources/sql/oracle_23c.sql b/features/apimgt/org.wso2.carbon.apimgt.core.feature/src/main/resources/sql/oracle_23c.sql
@@ -3661,7 +3661,7 @@ CREATE TABLE AM_API_EXTERNAL_API_MAPPING (
      GATEWAY_ENV_ID VARCHAR(255) NOT NULL,
      REFERENCE_ARTIFACT LONGBLOB NOT NULL,
      FOREIGN KEY (API_ID) REFERENCES AM_API(API_UUID) ON DELETE CASCADE,
-     FOREIGN KEY (GATEWAY_ENV_ID) REFERENCES AM_GATEWAY_ENVIRONMENT(UUID) ON DELETE RESTRICT,
+     FOREIGN KEY (GATEWAY_ENV_ID) REFERENCES AM_GATEWAY_ENVIRONMENT(UUID),
      PRIMARY KEY (API_ID, GATEWAY_ENV_ID)
 )
 /
diff --git a/features/apimgt/org.wso2.carbon.apimgt.core.feature/src/main/resources/sql/oracle_rac.sql b/features/apimgt/org.wso2.carbon.apimgt.core.feature/src/main/resources/sql/oracle_rac.sql
@@ -3634,7 +3634,7 @@ CREATE TABLE AM_API_EXTERNAL_API_MAPPING (
      GATEWAY_ENV_ID VARCHAR(255) NOT NULL,
      REFERENCE_ARTIFACT LONGBLOB NOT NULL,
      FOREIGN KEY (API_ID) REFERENCES AM_API(API_UUID) ON DELETE CASCADE,
-     FOREIGN KEY (GATEWAY_ENV_ID) REFERENCES AM_GATEWAY_ENVIRONMENT(UUID) ON DELETE RESTRICT,
+     FOREIGN KEY (GATEWAY_ENV_ID) REFERENCES AM_GATEWAY_ENVIRONMENT(UUID),
      PRIMARY KEY (API_ID, GATEWAY_ENV_ID)
 )
 /
diff --git a/features/apimgt/org.wso2.carbon.apimgt.core.feature/src/main/resources/sql/postgresql.sql b/features/apimgt/org.wso2.carbon.apimgt.core.feature/src/main/resources/sql/postgresql.sql
@@ -2729,7 +2729,7 @@ CREATE TABLE AM_API_EXTERNAL_API_MAPPING (
      GATEWAY_ENV_ID VARCHAR(255) NOT NULL,
      REFERENCE_ARTIFACT LONGBLOB NOT NULL,
      FOREIGN KEY (API_ID) REFERENCES AM_API(API_UUID) ON DELETE CASCADE,
-     FOREIGN KEY (GATEWAY_ENV_ID) REFERENCES AM_GATEWAY_ENVIRONMENT(UUID) ON DELETE RESTRICT,
+     FOREIGN KEY (GATEWAY_ENV_ID) REFERENCES AM_GATEWAY_ENVIRONMENT(UUID),
      PRIMARY KEY (API_ID, GATEWAY_ENV_ID)
 );
 

Original file line number	Diff line number	Diff line change
`@@ -180,7 +180,9 @@ public Environment getEnvironment(String tenantDomain, String uuid) throws APIMa`
`180`	`180`	`);`
`181`	`181`	`}`
`182`	`182`	`}`
`183`		`- maskValues(env);`
	`183`	`+ if (env.getProvider().equalsIgnoreCase(APIConstants.EXTERNAL_GATEWAY_VENDOR)) {`
	`184`	`+ maskValues(env);`
	`185`	`+ }`
`184`	`186`	`return env;`
`185`	`187`	`}`
`186`	`188`
Original file line number	Diff line number	Diff line change
`@@ -2184,7 +2184,7 @@ CREATE TABLE AM_API_EXTERNAL_API_MAPPING (`
`2184`	`2184`	`GATEWAY_ENV_ID VARCHAR(255) NOT NULL,`
`2185`	`2185`	`REFERENCE_ARTIFACT LONGBLOB NOT NULL,`
`2186`	`2186`	`FOREIGN KEY (API_ID) REFERENCES AM_API(API_UUID) ON DELETE CASCADE,`
`2187`		`- FOREIGN KEY (GATEWAY_ENV_ID) REFERENCES AM_GATEWAY_ENVIRONMENT(UUID) ON DELETE RESTRICT,`
	`2187`	`+ FOREIGN KEY (GATEWAY_ENV_ID) REFERENCES AM_GATEWAY_ENVIRONMENT(UUID),`
`2188`	`2188`	`PRIMARY KEY (API_ID, GATEWAY_ENV_ID)`
`2189`	`2189`	`)`
`2190`	`2190`	`/`
Original file line number	Diff line number	Diff line change
`@@ -3659,7 +3659,7 @@ CREATE TABLE AM_API_EXTERNAL_API_MAPPING (`
`3659`	`3659`	`GATEWAY_ENV_ID VARCHAR(255) NOT NULL,`
`3660`	`3660`	`REFERENCE_ARTIFACT LONGBLOB NOT NULL,`
`3661`	`3661`	`FOREIGN KEY (API_ID) REFERENCES AM_API(API_UUID) ON DELETE CASCADE,`
`3662`		`- FOREIGN KEY (GATEWAY_ENV_ID) REFERENCES AM_GATEWAY_ENVIRONMENT(UUID) ON DELETE RESTRICT,`
	`3662`	`+ FOREIGN KEY (GATEWAY_ENV_ID) REFERENCES AM_GATEWAY_ENVIRONMENT(UUID),`
`3663`	`3663`	`PRIMARY KEY (API_ID, GATEWAY_ENV_ID)`
`3664`	`3664`	`)`
`3665`	`3665`	`/`
Original file line number	Diff line number	Diff line change
`@@ -3661,7 +3661,7 @@ CREATE TABLE AM_API_EXTERNAL_API_MAPPING (`
`3661`	`3661`	`GATEWAY_ENV_ID VARCHAR(255) NOT NULL,`
`3662`	`3662`	`REFERENCE_ARTIFACT LONGBLOB NOT NULL,`
`3663`	`3663`	`FOREIGN KEY (API_ID) REFERENCES AM_API(API_UUID) ON DELETE CASCADE,`
`3664`		`- FOREIGN KEY (GATEWAY_ENV_ID) REFERENCES AM_GATEWAY_ENVIRONMENT(UUID) ON DELETE RESTRICT,`
	`3664`	`+ FOREIGN KEY (GATEWAY_ENV_ID) REFERENCES AM_GATEWAY_ENVIRONMENT(UUID),`
`3665`	`3665`	`PRIMARY KEY (API_ID, GATEWAY_ENV_ID)`
`3666`	`3666`	`)`
`3667`	`3667`	`/`
Original file line number	Diff line number	Diff line change
`@@ -3634,7 +3634,7 @@ CREATE TABLE AM_API_EXTERNAL_API_MAPPING (`
`3634`	`3634`	`GATEWAY_ENV_ID VARCHAR(255) NOT NULL,`
`3635`	`3635`	`REFERENCE_ARTIFACT LONGBLOB NOT NULL,`
`3636`	`3636`	`FOREIGN KEY (API_ID) REFERENCES AM_API(API_UUID) ON DELETE CASCADE,`
`3637`		`- FOREIGN KEY (GATEWAY_ENV_ID) REFERENCES AM_GATEWAY_ENVIRONMENT(UUID) ON DELETE RESTRICT,`
	`3637`	`+ FOREIGN KEY (GATEWAY_ENV_ID) REFERENCES AM_GATEWAY_ENVIRONMENT(UUID),`
`3638`	`3638`	`PRIMARY KEY (API_ID, GATEWAY_ENV_ID)`
`3639`	`3639`	`)`
`3640`	`3640`	`/`