fixes

superstreamlabs · Oct 27, 2023 · 425e7ed · 425e7ed
1 parent ff1c0d5
commit 425e7ed
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 16 deletions.
diff --git a/models/functions.go b/models/functions.go
@@ -34,10 +34,10 @@ type FunctionsResult struct {
 }
 
 type FunctionsRes struct {
-	InstallFunctions []FunctionsResult        `json:"install_functions"`
-	OtherFunctions   []FunctionsResult        `json:"other_functions"`
-	ScmIntegrated    bool                     `json:"scm_integrated"`
-	ConnectedRepos   []map[string]interface{} `json:"connected_repos"`
+	InstalledFunctions []FunctionsResult        `json:"installed_functions"`
+	OtherFunctions     []FunctionsResult        `json:"other_functions"`
+	ScmIntegrated      bool                     `json:"scm_integrated"`
+	ConnectedRepos     []map[string]interface{} `json:"connected_repos"`
 }
 
 type GetFunctionDetails struct {

diff --git a/server/memphis_handlers_functions_cloud.go b/server/memphis_handlers_functions_cloud.go
@@ -50,7 +50,7 @@ func (fh FunctionsHandler) GetAllFunctions(c *gin.Context) {
 		}
 	}
 
-	c.IndentedJSON(200, gin.H{"scm_integrated": functionsResult.ScmIntegrated, "other": functionsResult.OtherFunctions, "installed": functionsResult.InstallFunctions, "connected_repos": functionsResult.ConnectedRepos})
+	c.IndentedJSON(200, gin.H{"scm_integrated": functionsResult.ScmIntegrated, "other": functionsResult.OtherFunctions, "installed": functionsResult.InstalledFunctions, "connected_repos": functionsResult.ConnectedRepos})
 }
 
 func (fh FunctionsHandler) GetFunctions(tenantName string) (models.FunctionsRes, error) {
@@ -62,12 +62,8 @@ func (fh FunctionsHandler) GetFunctions(tenantName string) (models.FunctionsRes,
 	if err != nil {
 		return models.FunctionsRes{}, err
 	}
-	if len(functions) > 10 {
-		functions["install"] = functions["install"][:10]
-		functions["other"] = functions["other"][:10]
-	}
 
-	installedFunctions := functions["install"]
+	installedFunctions := functions["installed"]
 	OtherFunctions := functions["other"]
 	if len(installedFunctions) == 0 {
 		installedFunctions = []models.FunctionsResult{}
@@ -81,10 +77,10 @@ func (fh FunctionsHandler) GetFunctions(tenantName string) (models.FunctionsRes,
 	memphisDevFucntions = append(memphisDevFucntions, memphisFunctions)
 
 	allFunctions := models.FunctionsRes{
-		InstallFunctions: installedFunctions,
-		OtherFunctions:   OtherFunctions,
-		ScmIntegrated:    scmIntegrated,
-		ConnectedRepos:   memphisDevFucntions,
+		InstalledFunctions: installedFunctions,
+		OtherFunctions:     OtherFunctions,
+		ScmIntegrated:      scmIntegrated,
+		ConnectedRepos:     memphisDevFucntions,
 	}
 
 	return allFunctions, nil
@@ -275,7 +271,7 @@ func GetFunctionsDetails(functionsDetails map[string][]functionDetails) (map[str
 			}
 
 			byMemphis := false
-			if repo == memphisDevFunctionsRepoName {
+			if repo == memphisDevFunctionsRepoName && owner == memphisDevFunctionsOwnerName {
 				byMemphis = true
 			}
 

diff --git a/server/source_code_management_github_cloud.go b/server/source_code_management_github_cloud.go
@@ -87,7 +87,11 @@ func GetGithubContentFromConnectedRepo(connectedRepo map[string]interface{}, fun
 		return functionsDetails, err
 	}
 
-	for _, directoryContent := range repoContent {
+	for k, directoryContent := range repoContent {
+		// In order to restrict the api calls per repo
+		if k == 10 {
+			break
+		}
 		if directoryContent.GetType() == "dir" {
 			_, filesContent, _, err := client.Repositories.GetContents(context.Background(), owner, repo, *directoryContent.Path, &github.RepositoryContentGetOptions{
 				Ref: branch})