fix: repo info for Gitlab does not support group nesting

backstage-plugins/plugins/aws-apps-backend/src/api/aws-platform.ts

@@ -437,7 +437,7 @@ export class AwsAppsPlatformApi {
 
     if (this.gitProvider===GitProviders.GITLAB)
       {
-        resultBody = await result.value.json();
+        resultBody = result.value;
       }
       else if (this.gitProvider===GitProviders.GITHUB) 
       {

backstage-plugins/plugins/aws-apps-backend/src/api/gitlab-api.ts

@@ -24,7 +24,7 @@ export class GitLabAPI implements ISCMBackendAPI {
         }
         else
         {
-            groupName=""
+            groupName=gitProjectGroup
             repoName = gitRepoName;
         }
         const url = `https://${gitHost}/api/v4/projects?search=${repoName}`;
@@ -156,7 +156,7 @@ export class GitLabAPI implements ISCMBackendAPI {
                 isSuccuess: true,
                 message: `Retrieved file content successfully`,            
                 httpResponse : result.status,
-                value:resultBody.content
+                value: Buffer.from(resultBody.content, 'base64').toString()
             };
         }
     }

backstage-plugins/plugins/aws-apps-common/src/utils/git-util.ts

@@ -60,18 +60,20 @@ export const getRepoInfo = (entity:Entity) : IRepositoryInfo => {
 
     switch (gitProvider) {
       case GitProviders.GITLAB:
+        var projectSlugArray = entity.metadata.annotations ? entity.metadata.annotations['gitlab.com/project-slug']?.toString().split('/') : [];
         return {
           gitProvider,
           gitHost: entity.metadata.annotations ? entity.metadata.annotations['gitlab.com/instance']?.toString() : "",
-          gitRepoName: entity.metadata.annotations ? entity.metadata.annotations['gitlab.com/project-slug']?.toString() : "",
-          gitProjectGroup: entity.metadata.annotations ? entity.metadata.annotations['gitlab.com/project-slug']?.toString().split('/')[0] : "",
+          gitRepoName: projectSlugArray.pop() || "", // get last element of path for the repository name or empty string if the array is empty
+          gitProjectGroup: projectSlugArray.join("/"), // re-join the remainder of the array to get the namespace
           isPrivate: true
         }
       case GitProviders.GITHUB:
+        var projectSlugArray = entity.metadata.annotations ? entity.metadata.annotations['github.com/project-slug']?.toString().split('/') : []
         return {
           gitHost: "github.com",
-          gitRepoName: entity.metadata.annotations ? entity.metadata.annotations['github.com/project-slug']?.toString().split('/')[1] : "",
-          gitOrganization: entity.metadata.annotations ? entity.metadata.annotations['github.com/project-slug']?.toString().split('/')[0] : "",
+          gitRepoName: projectSlugArray[1], // get last element of the array (repo name)
+          gitOrganization: projectSlugArray[0], // get first element of the array (organization)
           gitProvider,
           isPrivate: true
         }

backstage-plugins/plugins/aws-apps/src/components/AwsEnvironmentProviderCard/AwsEnvironmentProviderCard.tsx

@@ -117,7 +117,6 @@ const AwsEnvironmentProviderCard = ({
     };
 
     let repoInfo = getRepoInfo(entity);
-    repoInfo.gitProjectGroup = 'aws-environments'
 
     const params = {
       repoInfo,

backstage-plugins/plugins/aws-apps/src/components/DeleteEnvironmentCard/DeleteEnvironmentCard.tsx

@@ -30,7 +30,6 @@ const DeleteEnvironmentPanel = ({
 
   const [disabled, setDisabled] = useState(false);
   let repoInfo = getRepoInfo(entity);
-  repoInfo.gitProjectGroup = 'aws-environments';
 
   const deleteRepo = () => {
     api.deleteRepository({

backstage-plugins/plugins/aws-apps/src/components/DeleteProviderCard/DeleteProviderCard.tsx

@@ -41,7 +41,6 @@ const DeleteProviderPanel = ({
 
   const [disabled, setDisabled] = useState(false);
   let repoInfo = getRepoInfo(entity);
-  repoInfo.gitProjectGroup = 'aws-providers';
 
   const deleteRepo = () => {