@@ -146,6 +146,7 @@ func NewCopier(gitPlatformURL, gitPlatformUserName, gitRepositoryName, nodeName,
146
146
data := map [string ]interface {}{
147
147
"GitRepositoryName" : gitRepositoryName ,
148
148
"NodeName" : strings .ToLower (nodeName ),
149
+ "MicroServiceName" : frameworks .GetMicroServiceName (nodeDirectoryName ),
149
150
"GitPlatformUserName" : gitPlatformUserName ,
150
151
"GitPlatformURL" : strings .Replace (gitPlatformURL , "https://" , "" , - 1 ),
151
152
}
@@ -196,11 +197,6 @@ func NewCopier(gitPlatformURL, gitPlatformUserName, gitRepositoryName, nodeName,
196
197
}
197
198
}
198
199
199
- func getMicroServiceName (name string ) string {
200
- splitted := strings .Split (name , "/" )
201
- return splitted [len (splitted )- 1 ]
202
- }
203
-
204
200
// createRestServerDirectories creates rest server directories.
205
201
func (c * Copier ) createRestServerDirectories () error {
206
202
applicationDirectory := c .NodeDirectoryName + ApplicationPath
@@ -287,7 +283,7 @@ func (c *Copier) createRestServerDirectories() error {
287
283
return err
288
284
}
289
285
290
- microServiceNameDirectory := c .NodeDirectoryName + "/" + getMicroServiceName (c .NodeDirectoryName )
286
+ microServiceNameDirectory := c .NodeDirectoryName + "/" + frameworks . GetMicroServiceName (c .NodeDirectoryName )
291
287
microServiceNameControllersDirectory := microServiceNameDirectory + MicroServiceNameControllersPath
292
288
microServiceNamePropertiesDirectory := microServiceNameDirectory + MicroServiceNamePropertiesPath
293
289
if err := utils .CreateDirectories (microServiceNameDirectory ); err != nil {
@@ -579,7 +575,7 @@ func (c *Copier) addInfrastructureRelatedDirectoriesAndFiles(resource *corenode.
579
575
func (c * Copier ) addMicroServiceNameRelatedDirectoriesAndFiles (resource * corenode.Resource , filePaths * []* string ) error {
580
576
var err error
581
577
// copy MicroServiceName/Controllers/ResourceNameServiceController.cs
582
- targetMicroServiceNameControllersResourceNameServiceControllerFileName := c .NodeDirectoryName + "/" + getMicroServiceName (c .NodeDirectoryName ) + MicroServiceNameControllersPath + "/" + resource .Name + "ServiceController.cs"
578
+ targetMicroServiceNameControllersResourceNameServiceControllerFileName := c .NodeDirectoryName + "/" + frameworks . GetMicroServiceName (c .NodeDirectoryName ) + MicroServiceNameControllersPath + "/" + resource .Name + "ServiceController.cs"
583
579
_ , err = utils .CopyFile (targetMicroServiceNameControllersResourceNameServiceControllerFileName , c .TemplatesRootPath + MicroServiceNameControllersResourceNameServiceControllerCSFile )
584
580
if err != nil {
585
581
log .Errorf ("error copying MicroServiceName controllers resource name service controller file: %v" , err )
@@ -588,7 +584,7 @@ func (c *Copier) addMicroServiceNameRelatedDirectoriesAndFiles(resource *corenod
588
584
* filePaths = append (* filePaths , & targetMicroServiceNameControllersResourceNameServiceControllerFileName )
589
585
590
586
// copy MicroServiceName/Properties/launchSettings.json
591
- targetMicroServiceNamePropertiesLaunchSettingsJSONFileName := c .NodeDirectoryName + "/" + getMicroServiceName (c .NodeDirectoryName ) + MicroServiceNamePropertiesPath + "/" + "launchSettings.json"
587
+ targetMicroServiceNamePropertiesLaunchSettingsJSONFileName := c .NodeDirectoryName + "/" + frameworks . GetMicroServiceName (c .NodeDirectoryName ) + MicroServiceNamePropertiesPath + "/" + "launchSettings.json"
592
588
_ , err = utils .CopyFile (targetMicroServiceNamePropertiesLaunchSettingsJSONFileName , c .TemplatesRootPath + MicroServiceNamePropertiesLaunchSettingsJSONFile )
593
589
if err != nil {
594
590
log .Errorf ("error copying MicroServiceName properties launch settings json file: %v" , err )
@@ -597,7 +593,7 @@ func (c *Copier) addMicroServiceNameRelatedDirectoriesAndFiles(resource *corenod
597
593
* filePaths = append (* filePaths , & targetMicroServiceNamePropertiesLaunchSettingsJSONFileName )
598
594
599
595
// copy MicroServiceName/MicroServiceName.csproj
600
- targetMicroServiceNameCSProjFileName := c .NodeDirectoryName + "/" + getMicroServiceName (c .NodeDirectoryName ) + "/" + getMicroServiceName (c .NodeDirectoryName ) + ".csproj"
596
+ targetMicroServiceNameCSProjFileName := c .NodeDirectoryName + "/" + frameworks . GetMicroServiceName (c .NodeDirectoryName ) + "/" + frameworks . GetMicroServiceName (c .NodeDirectoryName ) + ".csproj"
601
597
_ , err = utils .CopyFile (targetMicroServiceNameCSProjFileName , c .TemplatesRootPath + MicroServiceNameCSProjFile )
602
598
if err != nil {
603
599
log .Errorf ("error copying MicroServiceName csproj file: %v" , err )
@@ -606,7 +602,7 @@ func (c *Copier) addMicroServiceNameRelatedDirectoriesAndFiles(resource *corenod
606
602
* filePaths = append (* filePaths , & targetMicroServiceNameCSProjFileName )
607
603
608
604
// copy MicroServiceName/MicroServiceName.csproj.user
609
- targetMicroServiceNameCSProjUserFileName := c .NodeDirectoryName + "/" + getMicroServiceName (c .NodeDirectoryName ) + "/" + getMicroServiceName (c .NodeDirectoryName ) + ".csproj.user"
605
+ targetMicroServiceNameCSProjUserFileName := c .NodeDirectoryName + "/" + frameworks . GetMicroServiceName (c .NodeDirectoryName ) + "/" + frameworks . GetMicroServiceName (c .NodeDirectoryName ) + ".csproj.user"
610
606
_ , err = utils .CopyFile (targetMicroServiceNameCSProjUserFileName , c .TemplatesRootPath + MicroServiceNameCSProjUserFile )
611
607
if err != nil {
612
608
log .Errorf ("error copying MicroServiceName csproj.user file: %v" , err )
@@ -615,7 +611,7 @@ func (c *Copier) addMicroServiceNameRelatedDirectoriesAndFiles(resource *corenod
615
611
* filePaths = append (* filePaths , & targetMicroServiceNameCSProjUserFileName )
616
612
617
613
// copy MicroServiceName/Program.cs
618
- targetMicroServiceNameProgramCSFileName := c .NodeDirectoryName + "/" + getMicroServiceName (c .NodeDirectoryName ) + "/" + "Program.cs"
614
+ targetMicroServiceNameProgramCSFileName := c .NodeDirectoryName + "/" + frameworks . GetMicroServiceName (c .NodeDirectoryName ) + "/" + "Program.cs"
619
615
_ , err = utils .CopyFile (targetMicroServiceNameProgramCSFileName , c .TemplatesRootPath + MicroServiceNameProgramCSFile )
620
616
if err != nil {
621
617
log .Errorf ("error copying MicroServiceName program cs file: %v" , err )
@@ -624,7 +620,7 @@ func (c *Copier) addMicroServiceNameRelatedDirectoriesAndFiles(resource *corenod
624
620
* filePaths = append (* filePaths , & targetMicroServiceNameProgramCSFileName )
625
621
626
622
// copy MicroServiceName/appsettings.Development.json
627
- targetMicroServiceNameAppSettingsDevelopmentFileName := c .NodeDirectoryName + "/" + getMicroServiceName (c .NodeDirectoryName ) + "/" + "appsettings.Development.json"
623
+ targetMicroServiceNameAppSettingsDevelopmentFileName := c .NodeDirectoryName + "/" + frameworks . GetMicroServiceName (c .NodeDirectoryName ) + "/" + "appsettings.Development.json"
628
624
_ , err = utils .CopyFile (targetMicroServiceNameAppSettingsDevelopmentFileName , c .TemplatesRootPath + MicroServiceNameAppSettingsDevelopmentFile )
629
625
if err != nil {
630
626
log .Errorf ("error copying MicroServiceName appsettings.Development.json file: %v" , err )
@@ -633,7 +629,7 @@ func (c *Copier) addMicroServiceNameRelatedDirectoriesAndFiles(resource *corenod
633
629
* filePaths = append (* filePaths , & targetMicroServiceNameAppSettingsDevelopmentFileName )
634
630
635
631
// copy MicroServiceName/appsettings.json
636
- targetMicroServiceNameAppSettingsFileName := c .NodeDirectoryName + "/" + getMicroServiceName (c .NodeDirectoryName ) + "/" + "appsettings.json"
632
+ targetMicroServiceNameAppSettingsFileName := c .NodeDirectoryName + "/" + frameworks . GetMicroServiceName (c .NodeDirectoryName ) + "/" + "appsettings.json"
637
633
_ , err = utils .CopyFile (targetMicroServiceNameAppSettingsFileName , c .TemplatesRootPath + MicroServiceNameAppSettingsFile )
638
634
if err != nil {
639
635
log .Errorf ("error copying MicroServiceName appsettings.json file: %v" , err )
@@ -861,7 +857,7 @@ func (c *Copier) copyTestsFiles() error {
861
857
862
858
func (c * Copier ) copyMicroServiceNameSlnFile () error {
863
859
filePaths := & []* string {}
864
- targetMicroServiceNameSLNFileName := c .NodeDirectoryName + "/" + getMicroServiceName (c .NodeDirectoryName ) + ".sln"
860
+ targetMicroServiceNameSLNFileName := c .NodeDirectoryName + "/" + frameworks . GetMicroServiceName (c .NodeDirectoryName ) + ".sln"
865
861
_ , err := utils .CopyFile (targetMicroServiceNameSLNFileName , c .TemplatesRootPath + MicroServiceNameSlnFile )
866
862
if err != nil {
867
863
log .Errorf ("error copying MicroServiceName.sln file: %v" , err )
0 commit comments