Merge pull request #40 from sitecorelabs/main

Merge from Dev
ramangupta44 · Jun 27, 2023 · f76c5d0 · f76c5d0
2 parents 7909f09 + 7f3ed75
commit f76c5d0
Show file tree

Hide file tree

Showing 7 changed files with 53 additions and 14 deletions.
diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json
@@ -3,7 +3,7 @@
   "isRoot": true,
   "tools": {
     "sitecore.cli": {
-      "version": "5.1.25",
+      "version": "5.2.113",
       "commands": [
         "sitecore"
       ]

diff --git a/.sitecore/schemas/RootConfigurationFile.schema.json b/.sitecore/schemas/RootConfigurationFile.schema.json
@@ -64,6 +64,11 @@
           "description": "Specifies remove orphans functionality for roles serialization",
           "default": true
         },
+        "removeOrphansForUsers": {
+          "type": "boolean",
+          "description": "Specifies remove orphans functionality for users serialization",
+          "default": true
+        },
         "continueOnItemFailure": {
           "type": "boolean",
           "description": "Specifies behavior when item synchronization fails",
@@ -97,12 +102,23 @@
         "telemetryEnabled": {
           "type": "boolean",
           "description": "Determines if telemetry is enabled in cli.",
-          "default": false
+          "default": true
         },
-        "versionComparingEnabled": {
+        "cacheAuthenticationToken": {
           "type": "boolean",
-          "description": "Determines if CLI\\SMS version comparing is enabled.",
+          "description": "Determines if CLI should cache authentication token.",
           "default": true
+        },
+        "versionComparisonEnabled": {
+          "type": "boolean",
+          "description": "Determines if CLI\\SMS version comparison is enabled.",
+          "default": true
+        },
+        "apiClientTimeoutInMinutes": {
+          "type": "integer",
+          "description": "Determines timeout for Sitecore Api client.",
+          "format": "int32",
+          "default": 5
         }
       }
     }

diff --git a/.sitecore/schemas/UserConfiguration.schema.json b/.sitecore/schemas/UserConfiguration.schema.json
@@ -14,6 +14,10 @@
     },
     "$schema": {
       "type": "string"
+    },
+    "defaultEndpoint": {
+      "type": "string",
+      "description": "Default Sitecore instance to fetch or push data to"
     }
   },
   "definitions": {
@@ -68,6 +72,22 @@
             "type": "string"
           }
         },
+        "expiresIn": {
+          "type": [
+            "integer",
+            "null"
+          ],
+          "description": "Preserves access token lifetime. Set during the login operation. Related to LastUpdated property. System use only.",
+          "format": "int32"
+        },
+        "lastUpdated": {
+          "type": [
+            "null",
+            "string"
+          ],
+          "description": "Preserve date and time when environmet was updated during the login. System use only.",
+          "format": "date-time"
+        },
         "clientId": {
           "type": "string",
           "description": "OAuth client ID for this endpoint",

diff --git a/docker-compose.override.yml b/docker-compose.override.yml
@@ -8,7 +8,8 @@ services:
       args:
         PARENT_IMAGE: ${NODEJS_PARENT_IMAGE}
         NODEJS_VERSION: ${NODEJS_VERSION}
-    scale: 0
+    deploy:
+      replicas: 0
 
   rendering:
     image: ${REGISTRY}${COMPOSE_PROJECT_NAME}-rendering:${VERSION:-latest}

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -1,4 +1,3 @@
-version: "2.4"
 services:
   traefik:
     isolation: ${TRAEFIK_ISOLATION}

diff --git a/sitecore.json b/sitecore.json
@@ -4,21 +4,24 @@
     "src/*.module.json"
   ],
   "plugins": [
-    "Sitecore.DevEx.Extensibility.Serialization@5.1.25",
-    "Sitecore.DevEx.Extensibility.Publishing@5.1.25",
-    "Sitecore.DevEx.Extensibility.Indexing@5.1.25",
-    "Sitecore.DevEx.Extensibility.ResourcePackage@5.1.25",
+    "Sitecore.DevEx.Extensibility.Serialization@5.2.113",
+    "Sitecore.DevEx.Extensibility.Publishing@5.2.113",
+    "Sitecore.DevEx.Extensibility.Indexing@5.2.113",
+    "Sitecore.DevEx.Extensibility.ResourcePackage@5.2.113",
     "[email protected]"
   ],
   "serialization": {
     "defaultMaxRelativeItemPathLength": 100,
     "defaultModuleRelativeSerializationPath": "items",
     "removeOrphansForRoles": true,
+    "removeOrphansForUsers": true,
     "continueOnItemFailure": false,
     "excludedFields": []
   },
   "settings": {
     "telemetryEnabled": false,
-    "versionComparingEnabled": true
+    "cacheAuthenticationToken": true,
+    "versionComparisonEnabled": true,
+    "apiClientTimeoutInMinutes": 5
   }
 }
diff --git a/up.ps1 b/up.ps1
@@ -41,14 +41,14 @@ docker pull "$($sitecoreDockerRegistry)sitecore-xmcloud-cm:$($sitecoreVersion)"
 
 # Build all containers in the Sitecore instance, forcing a pull of latest base containers
 Write-Host "Building containers..." -ForegroundColor Green
-docker-compose build
+docker compose build
 if ($LASTEXITCODE -ne 0) {
     Write-Error "Container build failed, see errors above."
 }
 
 # Start the Sitecore instance
 Write-Host "Starting Sitecore environment..." -ForegroundColor Green
-docker-compose up -d
+docker compose up -d
 
 # Wait for Traefik to expose CM route
 Write-Host "Waiting for CM to become available..." -ForegroundColor Green
@@ -117,5 +117,5 @@ if ($ClientCredentialsLogin -ne "true") {
 
 Write-Host ""
 Write-Host "Use the following command to monitor your Rendering Host:" -ForegroundColor Green
-Write-Host "docker-compose logs -f rendering"
+Write-Host "docker compose logs -f rendering"
 Write-Host ""