diff --git a/TOOLS/config/dev/profile.env b/TOOLS/config/dev/profile.env index 74e52b5..627f2b5 100644 --- a/TOOLS/config/dev/profile.env +++ b/TOOLS/config/dev/profile.env @@ -4,7 +4,7 @@ TOKEN_FILE="secrets/dev.token" # Release versions # Version -VERSION="3.1.9" +VERSION="3.1.10" # Registry/S3 settings REGISTRY_HOST="registry.kube5s.ru" diff --git a/TOOLS/config/prod/profile.env b/TOOLS/config/prod/profile.env index ca3bc09..2d871a2 100644 --- a/TOOLS/config/prod/profile.env +++ b/TOOLS/config/prod/profile.env @@ -4,7 +4,7 @@ TOKEN_FILE="secrets/prod.token" # Release versions # Version -VERSION="2.1.8" +VERSION="2.1.9" # Registry/S3 settings REGISTRY_HOST="registry.kube5s.ru" diff --git a/TOOLS/config/test/profile.env b/TOOLS/config/test/profile.env index 6b4ca83..81aa563 100644 --- a/TOOLS/config/test/profile.env +++ b/TOOLS/config/test/profile.env @@ -3,7 +3,7 @@ NUBES_API_ENDPOINT="https://lk-api-gateway-test.ngcloud.ru/api/v1/svc" TOKEN_FILE="secrets/test.token" # Version -VERSION="5.1.11" +VERSION="5.1.12" # Docs generation — ONLY from docs_gen// (never from docs/) DOCS_GEN_DIR="provider/docs_gen/test" diff --git a/provider/internal/core/client.go b/provider/internal/core/client.go index 5b9e344..a8e0367 100644 --- a/provider/internal/core/client.go +++ b/provider/internal/core/client.go @@ -1188,7 +1188,7 @@ func (c *UniversalClient) resolveRefSvcParamValues(ctx context.Context, opParams } if len(refById) == 0 { // Даже без refSvcId — резолвим s3Uid внутри map-fixed (соглашение об именах). - return c.resolveS3UidInAllMapFixed(params, opParams), nil + return c.ResolveS3UidInAllMapFixed(params, opParams), nil } resolved := make(map[int]string, len(params)) @@ -1219,10 +1219,10 @@ func (c *UniversalClient) resolveRefSvcParamValues(ctx context.Context, opParams return resolved, nil } -// resolveS3UidInAllMapFixed проходит по всем параметрам и для map-fixed +// ResolveS3UidInAllMapFixed проходит по всем параметрам и для map-fixed // резолвит s3Uid-подобные значения в UUID. Используется когда нет ни одного // параметра с refSvcId (ранний выход resolveRefSvcParamValues). -func (c *UniversalClient) resolveS3UidInAllMapFixed(params map[int]string, opParams []universalCfsParam) map[int]string { +func (c *UniversalClient) ResolveS3UidInAllMapFixed(params map[int]string, opParams []universalCfsParam) map[int]string { result := make(map[int]string, len(params)) for paramId, value := range params { if strings.TrimSpace(value) != "" && value != "{}" && strings.HasPrefix(strings.TrimSpace(value), "{") { diff --git a/provider/internal/resources_core/required_params_compare.go b/provider/internal/resources_core/required_params_compare.go index 4217744..9be9b85 100644 --- a/provider/internal/resources_core/required_params_compare.go +++ b/provider/internal/resources_core/required_params_compare.go @@ -21,6 +21,8 @@ func RequiredParamsMismatch(ctx context.Context, client *core.UniversalClient, s return nil, nil } + desiredParamsByID = client.ResolveS3UidInAllMapFixed(desiredParamsByID, nil) + requiredIDs, err := getServiceRequiredParamIDs(serviceID) if err != nil { return nil, err