Nightly Merge Fri 21 Feb 2025 15:24:46 GMT

oracle · Feb 21, 2025 · 36dc845 · 36dc845
2 parents cf22598 + e2f39aa
commit 36dc845
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 11 deletions.
diff --git a/ocd/package.json b/ocd/package.json
@@ -23,7 +23,7 @@
   "scripts": {
     "github-action-install": "npm install --legacy-peer-deps ",
     "github-action-compile-for-codegen": "npm run compile --workspace=packages/core --workspace=packages/codegen --workspace=packages/codegen-cli",
-    "github-action-generate": "npm run import-and-generate --workspace=packages/codegen-cli && npm run generate-ocd-build-date --workspace=packages/codegen-cli",
+    "github-action-generate": "npm run import-and-generate --workspace=packages/codegen-cli && npm run generate-ocd-build-date --workspace=packages/codegen-cli && npm run generate-ocd-svg-css-desktop --workspace=packages/codegen-cli",
     "github-action-compile": "npm run compile --workspaces --if-present",
     "github-action-pack": "npm run pack --workspaces --if-present",
     "github-action-build": "npm run build --workspaces --if-present",
@@ -33,7 +33,8 @@
     "test": "echo \"Error: no test specified\" && exit 1",
     "install-and-codegen": "npm install --legacy-peer-deps && npm run compile-for-codegen && npm run import-and-generate && npm run build",
     "fresh-install": "npm run install-and-codegen",
-    "reinstall": "npm run purge && npm run install-and-codegen",
+    "new-install": "npm run github-action-install && npm run github-action-compile-for-codegen && npm run github-action-generate && npm run github-action-build",
+    "reinstall": "npm run purge && npm run new-install",
     "clean": "npm run clean --workspaces --if-present && rm -rf lib dist build",
     "purge": "npm run purge --workspaces --if-present && rm -rf node_modules lib dist build",
     "build": "npm run build --workspaces --if-present",

diff --git a/ocd/packages/codegen-cli/schema/oci-schema.json b/ocd/packages/codegen-cli/schema/oci-schema.json
@@ -8284,7 +8284,7 @@
       },
       "data_storage_size_in_gb": {
         "provider": "oci",
-        "key": "dataStorageSizeInGb",
+        "key": "dataStorageSizeInGBs",
         "name": "data_storage_size_in_gb",
         "type": "number",
         "subtype": "",

diff --git a/ocd/packages/codegen/src/importer/data/OciElementOverrides.ts b/ocd/packages/codegen/src/importer/data/OciElementOverrides.ts
@@ -115,6 +115,9 @@ export const elementOverrides: OcdElementOverrides = {
         "oci_core_volume": {
             "size_in_gbs": "sizeInGBs",
             "vpus_per_gb": "vpusPerGB"
+        },
+        "oci_database_db_system": {
+            "data_storage_size_in_gb": "dataStorageSizeInGBs"
         }
     },
     "required": {

diff --git a/ocd/packages/export/src/data/OcdBuildDetails.ts b/ocd/packages/export/src/data/OcdBuildDetails.ts
@@ -12,10 +12,10 @@
 
 export const buildDetails: Record<string, string> = {
     version: '0.2.7',
-    date: '1/27/2025',
-    time: '2:54:58 PM',
-    datetime: '1/27/2025, 2:54:58 PM',
-    utc: 'Mon, 27 Jan 2025 14:54:58 GMT'
+    date: '21/02/2025',
+    time: '14:33:57',
+    datetime: '21/02/2025, 14:33:57',
+    utc: 'Fri, 21 Feb 2025 14:33:57 GMT'
 }
 
 export default buildDetails

diff --git a/ocd/packages/react/src/data/OcdBuildDetails.ts b/ocd/packages/react/src/data/OcdBuildDetails.ts
@@ -12,10 +12,10 @@
 
 export const buildDetails: Record<string, string> = {
     version: '0.2.7',
-    date: '1/27/2025',
-    time: '2:54:57 PM',
-    datetime: '1/27/2025, 2:54:57 PM',
-    utc: 'Mon, 27 Jan 2025 14:54:57 GMT'
+    date: '21/02/2025',
+    time: '14:33:56',
+    datetime: '21/02/2025, 14:33:56',
+    utc: 'Fri, 21 Feb 2025 14:33:56 GMT'
 }
 
 export default buildDetails