From 85526b06b6eafaf70fd72f5f2d5ba682236d0339 Mon Sep 17 00:00:00 2001 From: DanielGrunbergerCA Date: Mon, 4 Apr 2022 12:27:30 +0300 Subject: [PATCH] fix control input for yaml scan --- core/cautils/getter/armoapi.go | 9 ++++++++- core/cautils/getter/armoapiutils.go | 6 ++++++ 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/core/cautils/getter/armoapi.go b/core/cautils/getter/armoapi.go index 0c4f5770..fcddfd59 100644 --- a/core/cautils/getter/armoapi.go +++ b/core/cautils/getter/armoapi.go @@ -233,7 +233,14 @@ func (armoAPI *ArmoAPI) GetAccountConfig(clusterName string) (*armotypes.Custome } if err = JSONDecoder(respStr).Decode(&accountConfig); err != nil { - return nil, err + // try with default scope + respStr, err = armoAPI.Get(armoAPI.getAccountConfigDefault(clusterName), nil) + if err != nil { + return nil, err + } + if err = JSONDecoder(respStr).Decode(&accountConfig); err != nil { + return nil, err + } } return accountConfig, nil diff --git a/core/cautils/getter/armoapiutils.go b/core/cautils/getter/armoapiutils.go index ce55e6f5..8a19f406 100644 --- a/core/cautils/getter/armoapiutils.go +++ b/core/cautils/getter/armoapiutils.go @@ -73,6 +73,12 @@ func (armoAPI *ArmoAPI) exceptionsURL(exceptionsPolicyName string) string { return u.String() } +func (armoAPI *ArmoAPI) getAccountConfigDefault(clusterName string) string { + config := armoAPI.getAccountConfig(clusterName) + url := config + "&scope=default" + return url +} + func (armoAPI *ArmoAPI) getAccountConfig(clusterName string) string { u := url.URL{} u.Scheme = "https"