Add sourceLocation

Author: jreynard-code

api/src/main/resources/application.yml

@@ -95,7 +95,7 @@ csm:
         imageVersion: "0.0.5"
       - name: "StorageTwingraphImport"
         imageRegistry: "ghcr.io"
-        imageName: "cosmo-tech/azStorage-twincache-connector"
+        imageName: "cosmo-tech/azstorage-twincache-connector"
         imageVersion: "latest"
     authorization:
       principal-jwt-claim: "sub"

build.gradle.kts

@@ -39,7 +39,7 @@ group = "com.cosmotech"
 version = scmVersion.version
 
 val kotlinJvmTarget = 17
-val cosmotechApiCommonVersion = "0.1.23-SNAPSHOT"
+val cosmotechApiCommonVersion = "0.1.24-SNAPSHOT"
 val cosmotechApiAzureVersion = "0.1.6-SNAPSHOT"
 val azureSpringBootBomVersion = "3.14.0"
 
@@ -49,7 +49,6 @@ allprojects {
   apply(plugin = "io.gitlab.arturbosch.detekt")
 
   repositories {
-    mavenLocal()
     maven {
       name = "GitHubPackages"
       url = uri("https://maven.pkg.github.com/Cosmo-Tech/cosmotech-api-common")

doc/Models/SourceInfo.md

@@ -3,8 +3,9 @@
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**name** | **String** | the source name containing the files to import | [default to null]
+**name** | **String** | the source name containing the files to import | [optional] [default to null]
 **location** | **String** | the source location containing the files to import | [default to null]
+**path** | **String** | the source location containing the files to import | [optional] [default to null]
 **type** | **String** | the source type containing the files to import | [default to null]
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)

openapi/plantuml/schemas.plantuml

@@ -415,8 +415,9 @@ entity Solution {
 }
 
 entity SourceInfo {
-    * name: String
+    name: String
     * location: String
+    path: String
     * type: String
 }
 

scenariorun/src/main/kotlin/com/cosmotech/scenariorun/azure/ScenarioRunServiceImpl.kt

@@ -369,15 +369,15 @@ internal class ScenarioRunServiceImpl(
         mutableMapOf(
             "TWIN_CACHE_NAME" to jobImportInfo.graphId,
             "LOG_LEVEL" to "DEBUG",
-            "AZURE_DIGITAL_TWINS_NAME" to jobImportInfo.sourceName,
-            "AZURE_DIGITAL_TWINS_URL" to jobImportInfo.sourcePath)
+            "AZURE_DIGITAL_TWINS_URL" to jobImportInfo.sourceLocation)
       }
       "Storage" -> {
         mutableMapOf(
             "TWIN_CACHE_NAME" to jobImportInfo.graphId,
             "LOG_LEVEL" to "DEBUG",
             "ACCOUNT_NAME" to jobImportInfo.sourceName,
-            "CONTAINER_NAME" to jobImportInfo.sourcePath)
+            "CONTAINER_NAME" to jobImportInfo.sourceLocation,
+            "STORAGE_PATH" to jobImportInfo.sourcePath)
       }
       else -> {
         throw IllegalArgumentException(

twingraph/src/main/kotlin/com/cosmotech/twingraph/api/TwingraphServiceImpl.kt

@@ -45,8 +45,9 @@ class TwingraphServiceImpl(
             requestJobId,
             organizationId,
             twinGraphImport.graphId,
-            twinGraphImport.source.name,
+            twinGraphImport.source.name ?: "",
             twinGraphImport.source.location,
+            twinGraphImport.source.path ?: "",
             twinGraphImport.source.type.value,
             twinGraphImport.version)
     this.eventPublisher.publishEvent(graphImportEvent)

twingraph/src/main/openapi/twingraph.yaml

@@ -197,14 +197,16 @@ components:
         location:
           type: string
           description: the source location containing the files to import
+        path:
+          type: string
+          description: the source location containing the files to import
         type:
           type: string
           description: the source type containing the files to import
           enum:
             - ADT
             - Storage
       required:
-        - name
         - location
         - type
     TwinGraphImportInfo:
@@ -223,7 +225,6 @@ components:
       description: Run import job with ADT as source
       value:
         source:
-          name: "my-adt-name-instance"
           location: "https://my-adt-name-instance.api.weu.digitaltwins.azure.net"
           type: "ADT"
         graphId: "my-graph-id"
@@ -234,5 +235,6 @@ components:
         source:
           name: "my-storage-account-name"
           location: "my-container-name"
+          path: "my-data-folder"
           type: "Storage"
         graphId: "my-graph-id"