Database governance built for humans and agents — controlling changes and access across every major database.
Go cicddata-governancedata-maskingdata-securitydatabase-accessdatabase-governancedevopsdevsecopsflywaygitopsliquibasemongodbmysqloraclepostgresqlschema-migrationssecuritysql-clientsqlservertidb
refactor: revoke settings permission from the workspace member (#18795)
ecmadaod4910b7ed677
diff --git a/backend/api/v1/setting_service.go b/backend/api/v1/setting_service.goindex c9286cc2ea..50d52c4e26 100644--- a/backend/api/v1/setting_service.go+++ b/backend/api/v1/setting_service.go@@ -16,6 +16,7 @@ import ("github.com/bytebase/bytebase/backend/common""github.com/bytebase/bytebase/backend/common/log""github.com/bytebase/bytebase/backend/component/config"+ "github.com/bytebase/bytebase/backend/component/iam""github.com/bytebase/bytebase/backend/enterprise"storepb "github.com/bytebase/bytebase/backend/generated-go/store"@@ -36,6 +37,7 @@ type SettingService struct {store *store.Storeprofile *config.ProfilelicenseService *enterprise.LicenseService+ iamManager *iam.Manager}// NewSettingService creates a new setting service.@@ -43,11 +45,13 @@ func NewSettingService(store *store.Store,profile *config.Profile,licenseService *enterprise.LicenseService,+ iamManager *iam.Manager,) *SettingService {return &SettingService{store: store,profile: profile,licenseService: licenseService,+ iamManager: iamManager,}}@@ -63,6 +67,10 @@ func (s *SettingService) ListSettings(ctx context.Context, _ *connect.Request[v1if isSettingDisallowed(setting.Name) {continue}+ // environment setting is controlled by bb.settings.getEnvironment permission, not expose in the ListSettings API.+ if setting.Name == storepb.SettingName_ENVIRONMENT {+ continue+ }settingMessage, err := convertToSettingMessage(setting, s.profile)if err != nil {return nil, connect.NewError(connect.CodeInternal, errors.Errorf("failed to convert setting message: %v", err))@@ -81,15 +89,24 @@ func (s *SettingService) GetSetting(ctx context.Context, request *connect.Requesif settingName == "" {return nil, connect.NewError(connect.CodeInvalidArgument, errors.Errorf("setting name is empty"))}- apiSettingName, err := convertStringToSettingName(settingName)++ storeSettingName, err := convertStringToSettingName(settingName)if err != nil {return nil, connect.NewError(connect.CodeInvalidArgument, errors.Errorf("invalid setting name: %v", err))}- if isSettingDisallowed(apiSettingName) {+ if isSettingDisallowed(storeSettingName) {return nil, connect.NewError(connect.CodeInvalidArgument, errors.Errorf("setting is not available"))}- setting, err := s.store.GetSetting(ctx, apiSettingName)+ permission := iam.PermissionSettingsGet+ if storeSettingName == storepb.SettingName_ENVIRONMENT {+ permission = iam.PermissionEnvironmentSettingsGet+ }+ if err := s.CheckSettingPermission(ctx, permission); err != nil {+ return nil, err+ }++ setting, err := s.store.GetSetting(ctx, storeSettingName)if err != nil {return nil, connect.NewError(connect.CodeInternal, errors.Errorf("failed to get setting: %v", err))}@@ -118,17 +135,26 @@ func (s *SettingService) UpdateSetting(ctx context.Context, request *connect.Reqif settingName == "" {return nil, connect.NewError(connect.CodeInvalidArgument, errors.Errorf("setting name is empty"))}- apiSettingName, err := convertStringToSettingName(settingName)+ storeSettingName, err := convertStringToSettingName(settingName)if err != nil {return nil, connect.NewError(connect.CodeInvalidArgument, errors.Errorf("invalid setting name: %v", err))}- if isSettingDisallowed(apiSettingName) {+ if isSettingDisallowed(storeSettingName) {return nil, connect.NewError(connect.CodeInvalidArgument, errors.Errorf("setting is not available"))}if s.profile.IsFeatureUnavailable(settingName) {return nil, connect.NewError(connect.CodeInvalidArgument, errors.Errorf("feature %s is unavailable in current mode", settingName))}- existedSetting, err := s.store.GetSetting(ctx, apiSettingName)++ permission := iam.PermissionSettingsSet+ if storeSettingName == storepb.SettingName_ENVIRONMENT {+ permission = iam.PermissionEnvironmentSettingsSet+ }+ if err := s.CheckSettingPermission(ctx, permission); err != nil {+ return nil, err+ }++ existedSetting, err := s.store.GetSetting(ctx, storeSettingName)if err != nil {return nil, connect.NewError(connect.CodeInternal, errors.Errorf("failed to find setting %s with error: %v", settingName, err))}@@ -152,7 +178,7 @@ func (s *SettingService) UpdateSetting(ctx context.Context, request *connect.Reqvar resetAuditLogStdout boolvar resetClassification bool- switch apiSettingName {+ switch storeSettingName {case storepb.SettingName_WORKSPACE_PROFILE:if request.Msg.UpdateMask == nil {return nil, connect.NewError(connect.CodeInvalidArgument, errors.Errorf("update mask is required"))@@ -160,7 +186,7 @@ func (s *SettingService) UpdateSetting(ctx context.Context, request *connect.Reqpayload := convertWorkspaceProfileSetting(request.Msg.Setting.Value.GetWorkspaceProfile())oldSetting, err := s.store.GetWorkspaceProfileSetting(ctx)if err != nil {- return nil, connect.NewError(connect.CodeInternal, errors.Errorf("failed to find setting %s with error: %v", apiSettingName, err))+ return nil, connect.NewError(connect.CodeInternal, errors.Errorf("failed to find setting %s with error: %v", storeSettingName, err))}for _, path := range request.Msg.UpdateMask.Paths {@@ -517,7 +543,7 @@ func (s *SettingService) UpdateSetting(ctx context.Context, request *connect.ReqstoreSettingValue = environmentSettingdefault:- return nil, connect.NewError(connect.CodeInvalidArgument, errors.Errorf("unsupported setting %v", apiSettingName))+ return nil, connect.NewError(connect.CodeInvalidArgument, errors.Errorf("unsupported setting %v", storeSettingName))}if request.Msg.ValidateOnly {@@ -528,7 +554,7 @@ func (s *SettingService) UpdateSetting(ctx context.Context, request *connect.Req}setting, err := s.store.UpsertSetting(ctx, &store.SettingMessage{- Name: apiSettingName,+ Name: storeSettingName,Value: storeSettingValue,})if err != nil {@@ -580,6 +606,22 @@ func (s *SettingService) UpdateSetting(ctx context.Context, request *connect.Reqreturn connect.NewResponse(settingMessage), nil}+func (s *SettingService) CheckSettingPermission(ctx context.Context, permission iam.Permission) error {+ user, ok := GetUserFromContext(ctx)+ if !ok {+ return connect.NewError(connect.CodeInternal, errors.Errorf("user not found"))+ }++ ok, err := s.iamManager.CheckPermission(ctx, permission, user)+ if err != nil {+ return connect.NewError(connect.CodeInternal, errors.Errorf("failed to check permission with error: %v", err.Error()))+ }+ if !ok {+ return connect.NewError(connect.CodePermissionDenied, errors.Errorf("user does not have permission %q", iam.PermissionEnvironmentSettingsGet))+ }+ return nil+}+var domainRegexp = regexp.MustCompile(`^(?i:[a-z0-9](?:[a-z0-9-]{0,61}[a-z0-9])?\.)+[a-z]{2,}$`)var disallowedDomains = map[string]bool{"gmail.com": true,diff --git a/backend/component/iam/acl.yaml b/backend/component/iam/acl.yamlindex 6ce9f9f2d3..d4a234d04d 100644--- a/backend/component/iam/acl.yaml+++ b/backend/component/iam/acl.yaml@@ -83,8 +83,10 @@ roles:- bb.rollouts.get- bb.rollouts.list- bb.settings.get+ - bb.settings.getEnvironment- bb.settings.list- bb.settings.set+ - bb.settings.setEnvironment- bb.sheets.create- bb.sheets.get- bb.sheets.update@@ -192,8 +194,10 @@ roles:- bb.rollouts.get- bb.rollouts.list- bb.settings.get+ - bb.settings.getEnvironment- bb.settings.list- bb.settings.set+ - bb.settings.setEnvironment- bb.sheets.create- bb.sheets.get- bb.sheets.update@@ -223,8 +227,7 @@ roles:- bb.reviewConfigs.list- bb.roles.list- bb.roles.get- - bb.settings.get- - bb.settings.list+ - bb.settings.getEnvironment- bb.groups.create- bb.groups.get- bb.groups.listdiff --git a/backend/component/iam/permission.go b/backend/component/iam/permission.goindex ab09c6e6f3..93dba14d6b 100644--- a/backend/component/iam/permission.go+++ b/backend/component/iam/permission.go@@ -1,5 +1,14 @@package iam+import (+ _ "embed"++ "gopkg.in/yaml.v3"+)++//go:embed permission.yaml+var permissionYAML []byte+type Permission = stringconst (@@ -86,6 +95,8 @@ const (PermissionSettingsGet Permission = "bb.settings.get"PermissionSettingsList Permission = "bb.settings.list"PermissionSettingsSet Permission = "bb.settings.set"+ PermissionEnvironmentSettingsGet Permission = "bb.settings.getEnvironment"+ PermissionEnvironmentSettingsSet Permission = "bb.settings.setEnvironment"PermissionSheetsCreate Permission = "bb.sheets.create"PermissionSheetsGet Permission = "bb.sheets.get"PermissionSheetsUpdate Permission = "bb.sheets.update"@@ -115,118 +126,15 @@ const (PermissionWorkspacesSetIamPolicy Permission = "bb.workspaces.setIamPolicy")-var allPermissions = []Permission{- PermissionAuditLogsExport,- PermissionAuditLogsSearch,- PermissionChangelogsGet,- PermissionChangelogsList,- PermissionDatabaseCatalogsGet,- PermissionDatabaseCatalogsUpdate,- PermissionDatabaseGroupsCreate,- PermissionDatabaseGroupsDelete,- PermissionDatabaseGroupsGet,- PermissionDatabaseGroupsList,- PermissionDatabaseGroupsUpdate,- PermissionDatabasesCheck,- PermissionDatabasesGet,- PermissionDatabasesGetSchema,- PermissionDatabasesList,- PermissionDatabasesSync,- PermissionDatabasesUpdate,- PermissionIdentityProvidersCreate,- PermissionIdentityProvidersDelete,- PermissionIdentityProvidersGet,- PermissionIdentityProvidersUpdate,- PermissionInstancesCreate,- PermissionInstancesDelete,- PermissionInstancesGet,- PermissionInstancesList,- PermissionInstancesSync,- PermissionInstancesUndelete,- PermissionInstancesUpdate,- PermissionInstanceRolesGet,- PermissionInstanceRolesList,- PermissionIssueCommentsCreate,- PermissionIssueCommentsList,- PermissionIssueCommentsUpdate,- PermissionIssuesCreate,- PermissionIssuesGet,- PermissionIssuesList,- PermissionIssuesUpdate,- PermissionPlanCheckRunsGet,- PermissionPlanCheckRunsRun,- PermissionPlansCreate,- PermissionPlansGet,- PermissionPlansList,- PermissionPlansUpdate,- PermissionPoliciesCreate,- PermissionPoliciesDelete,- PermissionPoliciesGet,- PermissionPoliciesList,- PermissionPoliciesUpdate,- PermissionProjectsCreate,- PermissionProjectsDelete,- PermissionProjectsGet,- PermissionProjectsGetIAMPolicy,- PermissionProjectsList,- PermissionProjectsSetIAMPolicy,- PermissionProjectsUndelete,- PermissionProjectsUpdate,- PermissionReleasesCheck,- PermissionReleasesCreate,- PermissionReleasesDelete,- PermissionReleasesGet,- PermissionReleasesList,- PermissionReleasesUndelete,- PermissionReleasesUpdate,- PermissionReviewConfigsCreate,- PermissionReviewConfigsDelete,- PermissionReviewConfigsGet,- PermissionReviewConfigsList,- PermissionReviewConfigsUpdate,- PermissionRevisionsCreate,- PermissionRevisionsDelete,- PermissionRevisionsGet,- PermissionRevisionsList,- PermissionRolesCreate,- PermissionRolesDelete,- PermissionRolesList,- PermissionRolesGet,- PermissionRolesUpdate,- PermissionRolloutsCreate,- PermissionRolloutsGet,- PermissionRolloutsList,- PermissionSettingsGet,- PermissionSettingsList,- PermissionSettingsSet,- PermissionSheetsCreate,- PermissionSheetsGet,- PermissionSheetsUpdate,- PermissionSQLSelect,- PermissionSQLDdl,- PermissionSQLDml,- PermissionSQLExplain,- PermissionSQLInfo,- PermissionSQLAdmin,- PermissionTaskRunsCreate,- PermissionTaskRunsList,- PermissionGroupsCreate,- PermissionGroupsDelete,- PermissionGroupsGet,- PermissionGroupsList,- PermissionGroupsUpdate,- PermissionUsersCreate,- PermissionUsersDelete,- PermissionUsersGet,- PermissionUsersList,- PermissionUsersUndelete,- PermissionUsersUpdate,- PermissionUsersUpdateEmail,- PermissionWorksheetsGet,- PermissionWorksheetsManage,- PermissionWorkspacesGetIamPolicy,- PermissionWorkspacesSetIamPolicy,-}+var allPermissions = func() []Permission {+ var data struct {+ Permissions []Permission `yaml:"permissions"`+ }+ if err := yaml.Unmarshal(permissionYAML, &data); err != nil {+ panic("failed to load permissions from YAML: " + err.Error())+ }+ return data.Permissions+}()var allPermissionsMap = func() map[Permission]bool {m := make(map[Permission]bool)@@ -245,7 +153,7 @@ func PermissionsExist(permissions ...string) bool {return true}-// PermissionExist checks if a single permission exists+// PermissionExist checks if a single permission exists in permission.yamlfunc PermissionExist(permission string) bool {return allPermissionsMap[permission]}diff --git a/backend/component/iam/permission.yaml b/backend/component/iam/permission.yamlindex e55e648eb0..168e770058 100644--- a/backend/component/iam/permission.yaml+++ b/backend/component/iam/permission.yaml@@ -85,8 +85,10 @@ permissions:- bb.rollouts.get- bb.rollouts.list- bb.settings.get+ - bb.settings.getEnvironment- bb.settings.list- bb.settings.set+ - bb.settings.setEnvironment- bb.sheets.create- bb.sheets.get- bb.sheets.updatediff --git a/backend/generated-go/v1/setting_service.pb.go b/backend/generated-go/v1/setting_service.pb.goindex 36efe816ea..a3151b19d8 100644--- a/backend/generated-go/v1/setting_service.pb.go+++ b/backend/generated-go/v1/setting_service.pb.go@@ -3023,8 +3023,8 @@ const file_v1_setting_service_proto_rawDesc = "" +"\x0eSettingService\x12\x84\x01\n" +"\fListSettings\x12 .bytebase.v1.ListSettingsRequest\x1a!.bytebase.v1.ListSettingsResponse\"/\xdaA\x00\x8a\xea0\x10bb.settings.list\x90\xea0\x01\x82\xd3\xe4\x93\x02\x0e\x12\f/v1/settings\x12\x7f\n" +"\n" +- "GetSetting\x12\x1e.bytebase.v1.GetSettingRequest\x1a\x14.bytebase.v1.Setting\";\xdaA\x04name\x8a\xea0\x0fbb.settings.get\x90\xea0\x01\x82\xd3\xe4\x93\x02\x17\x12\x15/v1/{name=settings/*}\x12\x93\x01\n" +- "\rUpdateSetting\x12!.bytebase.v1.UpdateSettingRequest\x1a\x14.bytebase.v1.Setting\"I\x8a\xea0\x0fbb.settings.set\x90\xea0\x01\x98\xea0\x01\x82\xd3\xe4\x93\x02(:\asetting2\x1d/v1/{setting.name=settings/*}B\xa9\x01\n" ++ "GetSetting\x12\x1e.bytebase.v1.GetSettingRequest\x1a\x14.bytebase.v1.Setting\";\xdaA\x04name\x8a\xea0\x0fbb.settings.get\x90\xea0\x02\x82\xd3\xe4\x93\x02\x17\x12\x15/v1/{name=settings/*}\x12\x93\x01\n" ++ "\rUpdateSetting\x12!.bytebase.v1.UpdateSettingRequest\x1a\x14.bytebase.v1.Setting\"I\x8a\xea0\x0fbb.settings.set\x90\xea0\x02\x98\xea0\x01\x82\xd3\xe4\x93\x02(:\asetting2\x1d/v1/{setting.name=settings/*}B\xa9\x01\n" +"\x0fcom.bytebase.v1B\x13SettingServiceProtoP\x01Z4github.com/bytebase/bytebase/backend/generated-go/v1\xa2\x02\x03BXX\xaa\x02\vBytebase.V1\xca\x02\vBytebase\\V1\xe2\x02\x17Bytebase\\V1\\GPBMetadata\xea\x02\fBytebase::V1b\x06proto3"var (diff --git a/backend/server/grpc_routes.go b/backend/server/grpc_routes.goindex 921e20671f..96ce08b85d 100644--- a/backend/server/grpc_routes.go+++ b/backend/server/grpc_routes.go@@ -107,7 +107,7 @@ func configureGrpcRouters(revisionService := apiv1.NewRevisionService(stores)roleService := apiv1.NewRoleService(stores, iamManager, licenseService)rolloutService := apiv1.NewRolloutService(stores, dbFactory, bus, webhookManager, iamManager)- settingService := apiv1.NewSettingService(stores, profile, licenseService)+ settingService := apiv1.NewSettingService(stores, profile, licenseService, iamManager)sheetService := apiv1.NewSheetService(stores)sqlService := apiv1.NewSQLService(stores, schemaSyncer, dbFactory, licenseService, iamManager)subscriptionService := apiv1.NewSubscriptionService(profile, licenseService)diff --git a/frontend/src/components/AdvancedSearch/useCommonSearchScopeOptions.ts b/frontend/src/components/AdvancedSearch/useCommonSearchScopeOptions.tsindex 89aa22f477..12ec2182c3 100644--- a/frontend/src/components/AdvancedSearch/useCommonSearchScopeOptions.ts+++ b/frontend/src/components/AdvancedSearch/useCommonSearchScopeOptions.ts@@ -9,7 +9,6 @@ import {import { t } from "@/plugins/i18n";import {environmentNamePrefix,- useEnvironmentV1List,useEnvironmentV1Store,useInstanceV1Store,useProjectV1Store,@@ -33,7 +32,6 @@ export const useCommonSearchScopeOptions = (const projectStore = useProjectV1Store();const instanceStore = useInstanceV1Store();const environmentStore = useEnvironmentV1Store();- const environmentList = useEnvironmentV1List();// fullScopeOptions provides full search scopes and options.// we need this as the source of truth.@@ -140,7 +138,10 @@ export const useCommonSearchScopeOptions = (id: "environment",title: t("issue.advanced-search.scope.environment.title"),description: t("issue.advanced-search.scope.environment.description"),- options: [unknownEnvironment(), ...environmentList.value].map((env) => {+ options: [+ unknownEnvironment(),+ ...environmentStore.environmentList,+ ].map((env) => {return {value: env.id,keywords: [`${environmentNamePrefix}${env.id}`, env.title],diff --git a/frontend/src/components/EnvironmentForm/Form.vue b/frontend/src/components/EnvironmentForm/Form.vueindex e9073b7024..e2f4a064c1 100644--- a/frontend/src/components/EnvironmentForm/Form.vue+++ b/frontend/src/components/EnvironmentForm/Form.vue@@ -3,7 +3,7 @@<div class="flex flex-col gap-y-6"><div v-if="features.includes('BASE')" class="flex flex-col gap-y-2"><div for="name" class="flex item-center gap-x-2">- <div class="w-4 h-4 relative">+ <div class="relative ml-1 mr-3"><component :is="renderColorPicker()" /></div><span for="name" class="font-medium">@@ -24,11 +24,7 @@:value="state.environment.id":resource-title="state.environment.title":fetch-resource="- (id) =>- environmentStore.getOrFetchEnvironmentByName(- `${environmentNamePrefix}${id}`,- true /* silent */- )+ (id) => getEnvironmentById(id)"/></div>@@ -159,11 +155,11 @@ import {hasFeature,pushNotification,useDatabaseV1Store,- useEnvironmentV1List,useEnvironmentV1Store,useInstanceV1Store,} from "@/store";import { environmentNamePrefix } from "@/store/modules/v1/common";+import { isValidEnvironmentName } from "@/types";import { PlanFeature } from "@/types/proto-es/v1/subscription_service_pb";import { FeatureBadge } from "../FeatureGuard";import SQLReviewForResource from "../SQLReview/components/SQLReviewForResource.vue";@@ -198,11 +194,9 @@ const {allowEdit,valueChanged,missingFeature,- hasPermission,events,resourceIdField,} = useEnvironmentFormContext();-const environmentList = useEnvironmentV1List();const environmentStore = useEnvironmentV1Store();const instanceStore = useInstanceV1Store();const databaseStore = useDatabaseV1Store();@@ -212,6 +206,17 @@ const accessControlConfigureRef =const sqlReviewForResourceRef =ref<InstanceType<typeof SQLReviewForResource>>();+const getEnvironmentById = (id: string) => {+ const environment = environmentStore.getEnvironmentByName(+ `${environmentNamePrefix}${id}`,+ false /* not fallback */+ );+ if (!isValidEnvironmentName(environment.name)) {+ return Promise.resolve(undefined);+ }+ return Promise.resolve(environment);+};+watch(() => [accessControlConfigureRef.value?.isDirty ?? false,@@ -231,7 +236,7 @@ const hasEnvironmentPolicyFeature = computed(() =>);const allowArchive = computed(() => {- return hasPermission("bb.settings.set") && environmentList.value.length > 1;+ return allowEdit.value && environmentStore.environmentList.length > 1;});const fetchInstances = async () => {diff --git a/frontend/src/components/EnvironmentForm/context.ts b/frontend/src/components/EnvironmentForm/context.tsindex 4be58bfbea..59a00ba291 100644--- a/frontend/src/components/EnvironmentForm/context.ts+++ b/frontend/src/components/EnvironmentForm/context.ts@@ -82,7 +82,9 @@ export const provideEnvironmentFormContext = (baseContext: {});const allowEdit = computed(() => {- return create.value || hasWorkspacePermissionV2("bb.settings.set");+ return (+ create.value || hasWorkspacePermissionV2("bb.settings.setEnvironment")+ );});watch(environment, (cur) => {@@ -101,7 +103,6 @@ export const provideEnvironmentFormContext = (baseContext: {resourceIdField,allowCreate,allowEdit,- hasPermission: hasWorkspacePermissionV2,valueChanged,};provide(KEY, context);diff --git a/frontend/src/components/Permission/RoutePermissionGuard.vue b/frontend/src/components/Permission/RoutePermissionGuard.vueindex 759d558c59..24a74227f8 100644--- a/frontend/src/components/Permission/RoutePermissionGuard.vue+++ b/frontend/src/components/Permission/RoutePermissionGuard.vue@@ -3,6 +3,7 @@<NoPermissionPlaceholderv-elsev-bind="$attrs"+ :path="requestPath":resources="project ? [project.name] : []":permissions="missedPermissions"/>@@ -28,6 +29,10 @@ const flattenRoutes = computed(() => {return getFlattenRoutes(props.routes);});+const requestPath = computed(() => {+ return router.currentRoute.value.fullPath;+});+const requiredPermissions = computed(() => {const routeConfig = flattenRoutes.value.find((workspaceRoute) => workspaceRoute.name === router.currentRoute.value.namediff --git a/frontend/src/components/Plan/components/PlanDataTable/PlanDataTable.vue b/frontend/src/components/Plan/components/PlanDataTable/PlanDataTable.vueindex a137e7fe35..e91246052b 100644--- a/frontend/src/components/Plan/components/PlanDataTable/PlanDataTable.vue+++ b/frontend/src/components/Plan/components/PlanDataTable/PlanDataTable.vue@@ -97,7 +97,7 @@ const columnList = computed((): DataTableColumn<Plan>[] => {{key: "creator",title: t("issue.table.creator"),- width: 128,+ width: 140,render: (plan) => {const creator =userStore.getUserByIdentifier(plan.creator) ||diff --git a/frontend/src/components/ProvideDashboardContext.vue b/frontend/src/components/ProvideDashboardContext.vueindex 23221e31d2..d6429b9867 100644--- a/frontend/src/components/ProvideDashboardContext.vue+++ b/frontend/src/components/ProvideDashboardContext.vue@@ -23,17 +23,16 @@ const policyStore = usePolicyV1Store();onMounted(async () => {await router.isReady();- // Prepare roles, workspace policies and settings first.+ // Prepare workspace policies first.+ await policyStore.fetchPolicies({+ resourceType: PolicyResourceType.WORKSPACE,+ });+await Promise.all([- policyStore.fetchPolicies({- resourceType: PolicyResourceType.WORKSPACE,- }),+ useEnvironmentV1Store().fetchEnvironments(),useSettingV1Store().fetchSettingList(),]);- // Then prepare the other resources.- await Promise.all([useEnvironmentV1Store().fetchEnvironments()]);-useUIStateStore().restoreState();isInitializing.value = false;diff --git a/frontend/src/components/Rollout/RolloutDataTable.vue b/frontend/src/components/Rollout/RolloutDataTable.vueindex 04c686bf05..fbcfba2987 100644--- a/frontend/src/components/Rollout/RolloutDataTable.vue+++ b/frontend/src/components/Rollout/RolloutDataTable.vue@@ -93,6 +93,7 @@ const columnList = computed(key: "stages",title: t("rollout.stage.self", 2),resizable: true,+ ellipsis: true,render: (rollout) => {if (rollout.stages.length === 0) {return (diff --git a/frontend/src/components/misc/NoPermissionPlaceholder.vue b/frontend/src/components/misc/NoPermissionPlaceholder.vueindex 46f79bc269..b92888acb4 100644--- a/frontend/src/components/misc/NoPermissionPlaceholder.vue+++ b/frontend/src/components/misc/NoPermissionPlaceholder.vue@@ -8,6 +8,12 @@<ShieldAlertIcon /></template><div class="flex flex-col gap-2">+ <div v-if="path">+ Path: {{ path }}+ </div>+ <div v-if="api">+ API: {{ api }}+ </div><div v-if="resources && resources.length > 0">{{ $t("common.resources") }}<ul class="list-disc pl-4">@@ -37,6 +43,8 @@ import type { Permission } from "@/types";defineProps<{description?: string;+ path?: string;+ api?: string;resources?: string[];permissions?: Permission[];}>();diff --git a/frontend/src/components/v2/Model/DatabaseV1Table/DatabaseOperations.vue b/frontend/src/components/v2/Model/DatabaseV1Table/DatabaseOperations.vueindex 59d41f2568..247ebae912 100644--- a/frontend/src/components/v2/Model/DatabaseV1Table/DatabaseOperations.vue+++ b/frontend/src/components/v2/Model/DatabaseV1Table/DatabaseOperations.vue@@ -422,6 +422,7 @@ const actions = computed((): DatabaseAction[] => {"bb.issues.create","bb.plans.create","bb.rollouts.create",+ "bb.sheets.create",],});}@@ -468,7 +469,7 @@ const actions = computed((): DatabaseAction[] => {text: t("database.edit-environment"),disabled: props.databases.length < 1,click: () => (state.showEditEnvironmentDrawer = true),- requiredPermissions: ["bb.databases.update"],+ requiredPermissions: ["bb.databases.update", "bb.settings.get"],});break;case "TRANSFER-IN": {diff --git a/frontend/src/components/v2/Model/EnvironmentV1Table.vue b/frontend/src/components/v2/Model/EnvironmentV1Table.vuedeleted file mode 100644index 2fe3f14655..0000000000--- a/frontend/src/components/v2/Model/EnvironmentV1Table.vue+++ /dev/null@@ -1,73 +0,0 @@-<template>- <NDataTable- key="environment-table"- size="small"- v-bind="$attrs"- :columns="columnList"- :data="environmentList"- :striped="true"- :bordered="bordered"- :row-key="(data: Environment) => data.id"- :row-props="rowProps"- :paginate-single-page="false"- />-</template>--<script lang="tsx" setup>-import { type DataTableColumn, NDataTable } from "naive-ui";-import { computed } from "vue";-import { useI18n } from "vue-i18n";-import { useRouter } from "vue-router";-import {- type Environment,- formatEnvironmentName,-} from "@/types/v1/environment";-import { EnvironmentV1Name } from ".";--withDefaults(- defineProps<{- environmentList: Environment[];- bordered?: boolean;- }>(),- {- bordered: true,- }-);--const router = useRouter();--const { t } = useI18n();--const rowProps = (environment: Environment) => {- return {- style: "cursor: pointer;",- onClick: (e: MouseEvent) => {- const url = `/${formatEnvironmentName(environment.id)}`;- if (e.ctrlKey || e.metaKey) {- window.open(url, "_blank");- } else {- router.push(url);- }- },- };-};--const columnList = computed((): DataTableColumn<Environment>[] => {- return [- {- key: "id",- title: t("common.id"),- resizable: true,- ellipsis: true,- render: (env) => {- return formatEnvironmentName(env.id);- },- },- {- key: "title",- title: t("common.name"),- render: (env) => <EnvironmentV1Name environment={env} link={false} />,- },- ];-});-</script>diff --git a/frontend/src/components/v2/Model/index.ts b/frontend/src/components/v2/Model/index.tsindex 8a4c234b86..ca8dd34bc6 100644--- a/frontend/src/components/v2/Model/index.ts+++ b/frontend/src/components/v2/Model/index.ts@@ -1,7 +1,6 @@import DatabaseV1Name from "./DatabaseV1Name.vue";import DatabaseView from "./DatabaseView.vue";import EnvironmentV1Name from "./EnvironmentV1Name.vue";-import EnvironmentV1Table from "./EnvironmentV1Table.vue";import HighlightLabelText from "./HighlightLabelText.vue";import RichEngineName from "./Instance/RichEngineName.vue";import PagedProjectTable from "./PagedProjectTable.vue";@@ -19,7 +18,6 @@ export {DatabaseV1Name,RichDatabaseName,EnvironmentV1Name,- EnvironmentV1Table,ProductionEnvironmentV1Icon,ProjectV1Name,ProjectV1Table,diff --git a/frontend/src/components/v2/ResourceOccupiedModal/useResourceByName.ts b/frontend/src/components/v2/ResourceOccupiedModal/useResourceByName.tsindex fe0501d7f4..6c7d767da2 100644--- a/frontend/src/components/v2/ResourceOccupiedModal/useResourceByName.ts+++ b/frontend/src/components/v2/ResourceOccupiedModal/useResourceByName.ts@@ -81,7 +81,7 @@ export const useResourceByName = ({return;case "environment":if (hasWorkspacePermissionV2("bb.settings.get")) {- await environmentV1Store.getOrFetchEnvironmentByName(resource.value);+ environmentV1Store.getEnvironmentByName(resource.value);}return;case "project":diff --git a/frontend/src/components/v2/Select/EnvironmentSelect.vue b/frontend/src/components/v2/Select/EnvironmentSelect.vueindex d9ebe12bfd..cab3bf0433 100644--- a/frontend/src/components/v2/Select/EnvironmentSelect.vue+++ b/frontend/src/components/v2/Select/EnvironmentSelect.vue@@ -5,7 +5,7 @@:virtual-scroll="true":placeholder="t('environment.select')":multiple="multiple"- :disabled="disabled"+ :disabled="disabled || !hasPermission":size="size":value="value":options="options"@@ -27,6 +27,7 @@ import { useI18n } from "vue-i18n";import { useEnvironmentV1Store } from "@/store";import { formatEnvironmentName } from "@/types";import type { Environment } from "@/types/v1/environment";+import { hasWorkspacePermissionV2 } from "@/utils";import { EnvironmentV1Name } from "../Model";import type {ResourceSelectOption,@@ -61,9 +62,12 @@ defineEmits<{const environmentV1Store = useEnvironmentV1Store();+const hasPermission = computed(() =>+ hasWorkspacePermissionV2("bb.settings.get")+);+const rawEnvironmentList = computed(() => {- const list = environmentV1Store.getEnvironmentList();- return list;+ return environmentV1Store.environmentList;});const combinedEnvironmentList = computed(() => {diff --git a/frontend/src/components/v2/TabFilter/EnvironmentTabFilter.vue b/frontend/src/components/v2/TabFilter/EnvironmentTabFilter.vuedeleted file mode 100644index 0b5e144c6d..0000000000--- a/frontend/src/components/v2/TabFilter/EnvironmentTabFilter.vue+++ /dev/null@@ -1,77 +0,0 @@-<template>- <TabFilter- :value="environment"- :items="items"- @update:value="$emit('update:environment', $event as string)"- >- <template #label="{ item }">- <template v-if="item.value === UNKNOWN_ENVIRONMENT_NAME">{{- item.label- }}</template>- <EnvironmentV1Name- v-else- :environment="(item as EnvironmentTabFilterItem).environment"- :link="false"- />- </template>- </TabFilter>-</template>--<script lang="ts" setup>-import { computed } from "vue";-import { useI18n } from "vue-i18n";-import { useEnvironmentV1List } from "@/store";-import {- formatEnvironmentName,- UNKNOWN_ENVIRONMENT_NAME,- unknownEnvironment,-} from "@/types";-import type { Environment } from "@/types/v1/environment";-import { EnvironmentV1Name } from "../Model";-import TabFilter from "./TabFilter.vue";-import type { TabFilterItem } from "./types";--interface EnvironmentTabFilterItem extends TabFilterItem<string> {- environment: Environment;-}--const props = withDefaults(- defineProps<{- environment?: string; // UNKNOWN_ENVIRONMENT_NAME to "ALL"- includeAll?: boolean;- }>(),- {- environment: UNKNOWN_ENVIRONMENT_NAME,- includeAll: false,- }-);--defineEmits<{- (event: "update:environment", name: string): void;-}>();--const { t } = useI18n();-const environmentList = useEnvironmentV1List();--const items = computed(() => {- const reversedEnvironmentList = [...environmentList.value].reverse();- const environmentItems =- reversedEnvironmentList.map<EnvironmentTabFilterItem>((env) => ({- value: formatEnvironmentName(env.id),- label: env.title,- environment: env,- }));- if (props.environment === UNKNOWN_ENVIRONMENT_NAME || props.includeAll) {- const dummyAll = {- ...unknownEnvironment(),- title: t("common.all"),- };- environmentItems.unshift({- value: formatEnvironmentName(dummyAll.id),- label: dummyAll.title,- environment: dummyAll,- });- }- return environmentItems;-});-</script>diff --git a/frontend/src/components/v2/TabFilter/index.ts b/frontend/src/components/v2/TabFilter/index.tsindex a79b224054..408fdd9c60 100644--- a/frontend/src/components/v2/TabFilter/index.ts+++ b/frontend/src/components/v2/TabFilter/index.ts@@ -1,5 +1,4 @@-import EnvironmentTabFilter from "./EnvironmentTabFilter.vue";import TabFilter from "./TabFilter.vue";export * from "./types";-export { TabFilter, EnvironmentTabFilter };+export { TabFilter };diff --git a/frontend/src/connect/middlewares/authInterceptorMiddleware.ts b/frontend/src/connect/middlewares/authInterceptorMiddleware.tsindex 32f158dfeb..78a485438a 100644--- a/frontend/src/connect/middlewares/authInterceptorMiddleware.ts+++ b/frontend/src/connect/middlewares/authInterceptorMiddleware.ts@@ -84,7 +84,8 @@ export const authInterceptor: Interceptor = (next) => async (req) => {name: WORKSPACE_ROUTE_403,query: errorDetail? {- method: errorDetail.method,+ from: router.currentRoute.value.fullPath,+ api: errorDetail.method,permissions: errorDetail.requiredPermissions.join(","),resources: errorDetail.resources.join(","),}diff --git a/frontend/src/layouts/SQLEditorLayout.vue b/frontend/src/layouts/SQLEditorLayout.vueindex f0dca2edf4..e252519839 100644--- a/frontend/src/layouts/SQLEditorLayout.vue+++ b/frontend/src/layouts/SQLEditorLayout.vue@@ -50,8 +50,6 @@ const prepare = async () => {const policyV1Store = usePolicyV1Store();// Prepare roles, workspace policies and settings.await Promise.all([- useSettingV1Store().fetchSettingList(),- useEnvironmentV1Store().fetchEnvironments(),policyV1Store.fetchPolicies({resourceType: PolicyResourceType.WORKSPACE,}),@@ -62,6 +60,10 @@ const prepare = async () => {resourceType: PolicyResourceType.PROJECT,}),]);+ await Promise.all([+ useSettingV1Store().fetchSettingList(),+ useEnvironmentV1Store().fetchEnvironments(),+ ]);ready.value = true;};diff --git a/frontend/src/router/dashboard/workspace.ts b/frontend/src/router/dashboard/workspace.tsindex 082c1e3908..17184a205f 100644--- a/frontend/src/router/dashboard/workspace.ts+++ b/frontend/src/router/dashboard/workspace.ts@@ -90,7 +90,10 @@ const workspaceRoutes: RouteRecordRaw[] = [name: ENVIRONMENT_V1_ROUTE_DASHBOARD,meta: {title: () => t("common.environments"),- requiredPermissionList: () => ["bb.settings.get", "bb.policies.get"],+ requiredPermissionList: () => [+ "bb.settings.getEnvironment",+ "bb.policies.get",+ ],},components: {content: () => import("@/views/EnvironmentDashboard.vue"),diff --git a/frontend/src/router/dashboard/workspaceSetting.ts b/frontend/src/router/dashboard/workspaceSetting.tsindex 62edf099e0..347261aeee 100644--- a/frontend/src/router/dashboard/workspaceSetting.ts+++ b/frontend/src/router/dashboard/workspaceSetting.ts@@ -65,7 +65,6 @@ const workspaceSettingRoutes: RouteRecordRaw[] = [requiredPermissionList: () => ["bb.projects.list","bb.instances.list",- "bb.settings.get",],},component: () => import("@/views/Archive.vue"),diff --git a/frontend/src/store/modules/v1/environment.ts b/frontend/src/store/modules/v1/environment.tsindex cd9b5e7583..e765511df4 100644--- a/frontend/src/store/modules/v1/environment.ts+++ b/frontend/src/store/modules/v1/environment.ts@@ -1,12 +1,9 @@import { create } from "@bufbuild/protobuf";-import { createContextValues } from "@connectrpc/connect";import { orderBy } from "lodash-es";import { defineStore } from "pinia";-import { computed } from "vue";-import { settingServiceClientConnect } from "@/connect";-import { silentContextKey } from "@/connect/context-key";import type { ResourceId } from "@/types";import {+ isValidEnvironmentName,NULL_ENVIRONMENT_NAME,nullEnvironment,unknownEnvironment,@@ -18,13 +15,13 @@ import type {import {EnvironmentSetting_EnvironmentSchema,EnvironmentSettingSchema,- GetSettingRequestSchema,Setting_SettingName,- SettingSchema,- UpdateSettingRequestSchema,+ SettingValueSchema,} from "@/types/proto-es/v1/setting_service_pb";import type { Environment } from "@/types/v1/environment";+import { hasWorkspacePermissionV2 } from "@/utils";import { environmentNamePrefix } from "./common";+import { useSettingV1Store } from "./setting";interface EnvironmentState {environmentMapById: Map<ResourceId, Environment>;@@ -73,41 +70,18 @@ const convertEnvironments = (return environments.map(convertEnvironment);};-const getEnvironmentSetting = async (- silent = false-): Promise<Environment[]> => {- const request = create(GetSettingRequestSchema, {- name: `settings/${Setting_SettingName[Setting_SettingName.ENVIRONMENT]}`,- });- const response = await settingServiceClientConnect.getSetting(request, {- contextValues: createContextValues().set(silentContextKey, silent),- });- // Extract environments from proto-es format- if (response.value?.value?.case === "environment") {- const settingEnvironments = response.value.value.value.environments ?? [];- return convertToEnvironments(settingEnvironments);- }- return [];-};-const updateEnvironmentSetting = async (environment: EnvironmentSetting): Promise<Environment[]> => {- const setting = create(SettingSchema, {- name: `settings/${Setting_SettingName[Setting_SettingName.ENVIRONMENT]}`,- value: {+ const response = await useSettingV1Store().upsertSetting({+ name: Setting_SettingName.ENVIRONMENT,+ value: create(SettingValueSchema, {value: {case: "environment",value: environment,},- },- });-- const request = create(UpdateSettingRequestSchema, {- setting,- updateMask: { paths: ["environment_setting"] },+ }),});- const response = await settingServiceClientConnect.updateSetting(request);// Extract environments from proto-es responseif (response.value?.value?.case === "environment") {@@ -132,12 +106,19 @@ export const useEnvironmentV1Store = defineStore("environment_v1", {},actions: {async fetchEnvironments(silent = false) {- const environments = await getEnvironmentSetting(silent);- this.environmentMapById = getEnvironmentByIdMap(environments);- return environments;- },- getEnvironmentList(): Environment[] {- return this.environmentList;+ if (!hasWorkspacePermissionV2("bb.settings.getEnvironment")) {+ return;+ }+ const setting = await useSettingV1Store().fetchSettingByName(+ Setting_SettingName.ENVIRONMENT,+ silent+ );+ if (setting?.value?.value?.case === "environment") {+ const settingEnvironments =+ setting.value.value.value.environments ?? [];+ const environments = convertToEnvironments(settingEnvironments);+ this.environmentMapById = getEnvironmentByIdMap(environments);+ }},async createEnvironment(environment: Partial<Environment>@@ -171,9 +152,7 @@ export const useEnvironmentV1Store = defineStore("environment_v1", {async updateEnvironment(update: Partial<Environment>): Promise<Environment> {- const originData = await this.getOrFetchEnvironmentByName(- update.id || ""- );+ const originData = this.getEnvironmentByName(update.id || "");if (!originData) {throw new Error(`environment with id ${update.id} not found`);}@@ -223,30 +202,22 @@ export const useEnvironmentV1Store = defineStore("environment_v1", {this.environmentMapById = getEnvironmentByIdMap(newEnvironments);return newEnvironments;},- async getOrFetchEnvironmentByName(- name: string,- silent = false- ): Promise<Environment | undefined> {- const id = name.replace(environmentNamePrefix, "");- const cachedData = this.environmentMapById.get(id);- if (cachedData) {- return cachedData;- }- await this.fetchEnvironments(silent);- const environment = this.environmentMapById.get(id);- return environment;- },- getEnvironmentByName(name: string) {+ getEnvironmentByName(name: string, fallback: boolean = true) {if (name === NULL_ENVIRONMENT_NAME) {return nullEnvironment();}const id = name.replace(environmentNamePrefix, "");- return this.environmentMapById.get(id) ?? unknownEnvironment();+ const environment =+ this.environmentMapById.get(id) ?? unknownEnvironment();+ if (!isValidEnvironmentName(environment.name) && fallback) {+ return {+ ...environment,+ id,+ name,+ title: name,+ };+ }+ return environment;},},});--export const useEnvironmentV1List = () => {- const store = useEnvironmentV1Store();- return computed(() => store.getEnvironmentList());-};diff --git a/frontend/src/store/modules/v1/setting.ts b/frontend/src/store/modules/v1/setting.tsindex 2591444010..ca08098712 100644--- a/frontend/src/store/modules/v1/setting.ts+++ b/frontend/src/store/modules/v1/setting.ts@@ -17,10 +17,9 @@ import {SettingValueSchema,UpdateSettingRequestSchema,type WorkspaceProfileSetting,- type WorkspaceProfileSetting_PasswordRestriction,- WorkspaceProfileSetting_PasswordRestrictionSchema,WorkspaceProfileSettingSchema,} from "@/types/proto-es/v1/setting_service_pb";+import { hasWorkspacePermissionV2 } from "@/utils";import { useActuatorV1Store } from "./actuator";interface SettingState {@@ -43,9 +42,6 @@ export const useSettingV1Store = defineStore("setting_v1", {}return undefined;},- brandingLogo(): string | undefined {- return this.workspaceProfileSetting?.brandingLogo;- },classification(): DataClassificationSetting_DataClassificationConfig[] {const setting = this.settingMapByName.get(`${settingNamePrefix}${Setting_SettingName[Setting_SettingName.DATA_CLASSIFICATION]}`@@ -57,15 +53,6 @@ export const useSettingV1Store = defineStore("setting_v1", {}return [];},- passwordRestriction(): WorkspaceProfileSetting_PasswordRestriction {- return (- this.workspaceProfileSetting?.passwordRestriction ??- create(WorkspaceProfileSetting_PasswordRestrictionSchema, {- minLength: 8,- requireLetter: true,- })- );- },},actions: {getProjectClassification(@@ -116,6 +103,9 @@ export const useSettingV1Store = defineStore("setting_v1", {);},async fetchSettingList() {+ if (!hasWorkspacePermissionV2("bb.settings.list")) {+ return;+ }const request = create(ListSettingsRequestSchema, {});const response = await settingServiceClientConnect.listSettings(request);for (const setting of response.settings) {@@ -175,7 +165,7 @@ export const useSettingV1Store = defineStore("setting_v1", {}),updateMask: updateMask,});- // Fetch the latest server info to refresh the disallow signup flag.+ // Refresh the latest server info.await useActuatorV1Store().fetchServerInfo();},},diff --git a/frontend/src/store/modules/workspaceApprovalSetting.ts b/frontend/src/store/modules/workspaceApprovalSetting.tsindex bdb52406e8..2e81c093ee 100644--- a/frontend/src/store/modules/workspaceApprovalSetting.ts+++ b/frontend/src/store/modules/workspaceApprovalSetting.ts@@ -3,15 +3,11 @@ import { cloneDeep } from "lodash-es";import { defineStore } from "pinia";import { v4 as uuidv4 } from "uuid";import { ref } from "vue";-import { settingServiceClientConnect } from "@/connect";import type { LocalApprovalConfig, LocalApprovalRule } from "@/types";import type { Setting } from "@/types/proto-es/v1/setting_service_pb";import {- GetSettingRequestSchema,Setting_SettingName,- SettingSchema,SettingValueSchema as SettingSettingValueSchema,- UpdateSettingRequestSchema,WorkspaceApprovalSetting_Rule_Source,} from "@/types/proto-es/v1/setting_service_pb";import {@@ -19,12 +15,12 @@ import {resolveLocalApprovalConfig,} from "@/utils";import { useGracefulRequest } from "./utils";--const SETTING_NAME = `settings/${Setting_SettingName[Setting_SettingName.WORKSPACE_APPROVAL]}`;+import { useSettingV1Store } from "./v1/setting";export const useWorkspaceApprovalSettingStore = defineStore("workspaceApprovalSetting",() => {+ const settingStore = useSettingV1Store();const config = ref<LocalApprovalConfig>({rules: [],});@@ -38,10 +34,12 @@ export const useWorkspaceApprovalSettingStore = defineStore(const fetchConfig = async () => {try {- const request = create(GetSettingRequestSchema, {- name: SETTING_NAME,- });- const response = await settingServiceClientConnect.getSetting(request);+ const response = await settingStore.fetchSettingByName(+ Setting_SettingName.WORKSPACE_APPROVAL+ );+ if (!response) {+ return;+ }await setConfigSetting(response);} catch (ex) {console.error(ex);@@ -50,9 +48,8 @@ export const useWorkspaceApprovalSettingStore = defineStore(const updateConfig = async () => {const approvalSetting = await buildWorkspaceApprovalSetting(config.value);-- const setting = create(SettingSchema, {- name: SETTING_NAME,+ await settingStore.upsertSetting({+ name: Setting_SettingName.WORKSPACE_APPROVAL,value: create(SettingSettingValueSchema, {value: {case: "workspaceApproval",@@ -60,12 +57,6 @@ export const useWorkspaceApprovalSettingStore = defineStore(},}),});-- const request = create(UpdateSettingRequestSchema, {- allowMissing: true,- setting,- });- await settingServiceClientConnect.updateSetting(request);};const useBackupAndUpdateConfig = async (update: () => Promise<void>) => {diff --git a/frontend/src/types/iam/permission-generated.ts b/frontend/src/types/iam/permission-generated.tsindex f013e1fed8..13eeb9d76a 100644--- a/frontend/src/types/iam/permission-generated.ts+++ b/frontend/src/types/iam/permission-generated.ts@@ -88,8 +88,10 @@ export type Permission =| "bb.rollouts.get"| "bb.rollouts.list"| "bb.settings.get"+ | "bb.settings.getEnvironment"| "bb.settings.list"| "bb.settings.set"+ | "bb.settings.setEnvironment"| "bb.sheets.create"| "bb.sheets.get"| "bb.sheets.update"diff --git a/frontend/src/types/proto-es/v1/setting_service_pb.js b/frontend/src/types/proto-es/v1/setting_service_pb.jsindex 33420bff81..aeb035316f 100644--- a/frontend/src/types/proto-es/v1/setting_service_pb.js+++ b/frontend/src/types/proto-es/v1/setting_service_pb.js@@ -17,7 +17,7 @@ import { file_v1_issue_service } from "./issue_service_pb";* Describes the file v1/setting_service.proto.*/export const file_v1_setting_service = /*@__PURE__*/- fileDesc("Chh2MS9zZXR0aW5nX3NlcnZpY2UucHJvdG8SC2J5dGViYXNlLnYxIhUKE0xpc3RTZXR0aW5nc1JlcXVlc3QiPgoUTGlzdFNldHRpbmdzUmVzcG9uc2USJgoIc2V0dGluZ3MYASADKAsyFC5ieXRlYmFzZS52MS5TZXR0aW5nIj8KEUdldFNldHRpbmdSZXF1ZXN0EioKBG5hbWUYASABKAlCHOBBAvpBFgoUYnl0ZWJhc2UuY29tL1NldHRpbmciOwoSR2V0U2V0dGluZ1Jlc3BvbnNlEiUKB3NldHRpbmcYASABKAsyFC5ieXRlYmFzZS52MS5TZXR0aW5nIqEBChRVcGRhdGVTZXR0aW5nUmVxdWVzdBIqCgdzZXR0aW5nGAEgASgLMhQuYnl0ZWJhc2UudjEuU2V0dGluZ0ID4EECEhUKDXZhbGlkYXRlX29ubHkYAiABKAgSFQoNYWxsb3dfbWlzc2luZxgDIAEoCBIvCgt1cGRhdGVfbWFzaxgEIAEoCzIaLmdvb2dsZS5wcm90b2J1Zi5GaWVsZE1hc2siqQIKB1NldHRpbmcSEQoEbmFtZRgBIAEoCUID4EEIEi0KBXZhbHVlGAIgASgLMhkuYnl0ZWJhc2UudjEuU2V0dGluZ1ZhbHVlQgPgQQIirAEKC1NldHRpbmdOYW1lEhwKGFNFVFRJTkdfTkFNRV9VTlNQRUNJRklFRBAAEhUKEVdPUktTUEFDRV9QUk9GSUxFEAESFgoSV09SS1NQQUNFX0FQUFJPVkFMEAISCgoGQVBQX0lNEAMSBgoCQUkQBBIXChNEQVRBX0NMQVNTSUZJQ0FUSU9OEAUSEgoOU0VNQU5USUNfVFlQRVMQBhIPCgtFTlZJUk9OTUVOVBAHOi3qQSoKFGJ5dGViYXNlLmNvbS9TZXR0aW5nEhJzZXR0aW5ncy97c2V0dGluZ30irAMKDFNldHRpbmdWYWx1ZRIrCgZhcHBfaW0YASABKAsyGS5ieXRlYmFzZS52MS5BcHBJTVNldHRpbmdIABJBChF3b3Jrc3BhY2VfcHJvZmlsZRgCIAEoCzIkLmJ5dGViYXNlLnYxLldvcmtzcGFjZVByb2ZpbGVTZXR0aW5nSAASQwoSd29ya3NwYWNlX2FwcHJvdmFsGAMgASgLMiUuYnl0ZWJhc2UudjEuV29ya3NwYWNlQXBwcm92YWxTZXR0aW5nSAASRQoTZGF0YV9jbGFzc2lmaWNhdGlvbhgEIAEoCzImLmJ5dGViYXNlLnYxLkRhdGFDbGFzc2lmaWNhdGlvblNldHRpbmdIABI5Cg1zZW1hbnRpY190eXBlGAUgASgLMiAuYnl0ZWJhc2UudjEuU2VtYW50aWNUeXBlU2V0dGluZ0gAEiQKAmFpGAYgASgLMhYuYnl0ZWJhc2UudjEuQUlTZXR0aW5nSAASNgoLZW52aXJvbm1lbnQYByABKAsyHy5ieXRlYmFzZS52MS5FbnZpcm9ubWVudFNldHRpbmdIAEIHCgV2YWx1ZSK8BgoMQXBwSU1TZXR0aW5nEjUKCHNldHRpbmdzGAEgAygLMiMuYnl0ZWJhc2UudjEuQXBwSU1TZXR0aW5nLklNU2V0dGluZxobCgVTbGFjaxISCgV0b2tlbhgBIAEoCUID4EEEGjYKBkZlaXNodRITCgZhcHBfaWQYASABKAlCA+BBBBIXCgphcHBfc2VjcmV0GAIgASgJQgPgQQQaSQoFV2Vjb20SFAoHY29ycF9pZBgBIAEoCUID4EEEEhUKCGFnZW50X2lkGAIgASgJQgPgQQQSEwoGc2VjcmV0GAMgASgJQgPgQQQaNAoETGFyaxITCgZhcHBfaWQYASABKAlCA+BBBBIXCgphcHBfc2VjcmV0GAIgASgJQgPgQQQaVwoIRGluZ1RhbGsSFgoJY2xpZW50X2lkGAEgASgJQgPgQQQSGgoNY2xpZW50X3NlY3JldBgCIAEoCUID4EEEEhcKCnJvYm90X2NvZGUYAyABKAlCA+BBBBpTCgVUZWFtcxIWCgl0ZW5hbnRfaWQYASABKAlCA+BBBBIWCgljbGllbnRfaWQYAiABKAlCA+BBBBIaCg1jbGllbnRfc2VjcmV0GAMgASgJQgPgQQQa8AIKCUlNU2V0dGluZxImCgR0eXBlGAEgASgOMhguYnl0ZWJhc2UudjEuV2ViaG9va1R5cGUSMAoFc2xhY2sYAiABKAsyHy5ieXRlYmFzZS52MS5BcHBJTVNldHRpbmcuU2xhY2tIABIyCgZmZWlzaHUYAyABKAsyIC5ieXRlYmFzZS52MS5BcHBJTVNldHRpbmcuRmVpc2h1SAASMAoFd2Vjb20YBCABKAsyHy5ieXRlYmFzZS52MS5BcHBJTVNldHRpbmcuV2Vjb21IABIuCgRsYXJrGAUgASgLMh4uYnl0ZWJhc2UudjEuQXBwSU1TZXR0aW5nLkxhcmtIABI2CghkaW5ndGFsaxgGIAEoCzIiLmJ5dGViYXNlLnYxLkFwcElNU2V0dGluZy5EaW5nVGFsa0gAEjAKBXRlYW1zGAcgASgLMh8uYnl0ZWJhc2UudjEuQXBwSU1TZXR0aW5nLlRlYW1zSABCCQoHcGF5bG9hZCL5BwoXV29ya3NwYWNlUHJvZmlsZVNldHRpbmcSFAoMZXh0ZXJuYWxfdXJsGAEgASgJEhcKD2Rpc2FsbG93X3NpZ251cBgCIAEoCBITCgtyZXF1aXJlXzJmYRgDIAEoCBI5ChZyZWZyZXNoX3Rva2VuX2R1cmF0aW9uGAQgASgLMhkuZ29vZ2xlLnByb3RvYnVmLkR1cmF0aW9uEjgKFWFjY2Vzc190b2tlbl9kdXJhdGlvbhgSIAEoCzIZLmdvb2dsZS5wcm90b2J1Zi5EdXJhdGlvbhIvCgxhbm5vdW5jZW1lbnQYBSABKAsyGS5ieXRlYmFzZS52MS5Bbm5vdW5jZW1lbnQSOgoXbWF4aW11bV9yb2xlX2V4cGlyYXRpb24YBiABKAsyGS5nb29nbGUucHJvdG9idWYuRHVyYXRpb24SDwoHZG9tYWlucxgHIAMoCRIfChdlbmZvcmNlX2lkZW50aXR5X2RvbWFpbhgIIAEoCBI9ChRkYXRhYmFzZV9jaGFuZ2VfbW9kZRgJIAEoDjIfLmJ5dGViYXNlLnYxLkRhdGFiYXNlQ2hhbmdlTW9kZRIgChhkaXNhbGxvd19wYXNzd29yZF9zaWduaW4YCiABKAgSIAoYZW5hYmxlX21ldHJpY19jb2xsZWN0aW9uGAsgASgIEjsKGGluYWN0aXZlX3Nlc3Npb25fdGltZW91dBgMIAEoCzIZLmdvb2dsZS5wcm90b2J1Zi5EdXJhdGlvbhIfChdlbmFibGVfYXVkaXRfbG9nX3N0ZG91dBgNIAEoCBIRCgl3YXRlcm1hcmsYDiABKAgSHAoUZGlyZWN0b3J5X3N5bmNfdG9rZW4YDyABKAkSFQoNYnJhbmRpbmdfbG9nbxgQIAEoCRJWChRwYXNzd29yZF9yZXN0cmljdGlvbhgRIAEoCzI4LmJ5dGViYXNlLnYxLldvcmtzcGFjZVByb2ZpbGVTZXR0aW5nLlBhc3N3b3JkUmVzdHJpY3Rpb24ahAIKE1Bhc3N3b3JkUmVzdHJpY3Rpb24SEgoKbWluX2xlbmd0aBgBIAEoBRIWCg5yZXF1aXJlX251bWJlchgCIAEoCBIWCg5yZXF1aXJlX2xldHRlchgDIAEoCBIgChhyZXF1aXJlX3VwcGVyY2FzZV9sZXR0ZXIYBCABKAgSIQoZcmVxdWlyZV9zcGVjaWFsX2NoYXJhY3RlchgFIAEoCBIuCiZyZXF1aXJlX3Jlc2V0X3Bhc3N3b3JkX2Zvcl9maXJzdF9sb2dpbhgGIAEoCBI0ChFwYXNzd29yZF9yb3RhdGlvbhgHIAEoCzIZLmdvb2dsZS5wcm90b2J1Zi5EdXJhdGlvbiKvAQoMQW5ub3VuY2VtZW50EjMKBWxldmVsGAEgASgOMiQuYnl0ZWJhc2UudjEuQW5ub3VuY2VtZW50LkFsZXJ0TGV2ZWwSDAoEdGV4dBgCIAEoCRIMCgRsaW5rGAMgASgJIk4KCkFsZXJ0TGV2ZWwSGwoXQUxFUlRfTEVWRUxfVU5TUEVDSUZJRUQQABIICgRJTkZPEAESCwoHV0FSTklORxACEgwKCENSSVRJQ0FMEAMi5wIKGFdvcmtzcGFjZUFwcHJvdmFsU2V0dGluZxI5CgVydWxlcxgBIAMoCzIqLmJ5dGViYXNlLnYxLldvcmtzcGFjZUFwcHJvdmFsU2V0dGluZy5SdWxlGo8CCgRSdWxlEi8KCHRlbXBsYXRlGAEgASgLMh0uYnl0ZWJhc2UudjEuQXBwcm92YWxUZW1wbGF0ZRIkCgljb25kaXRpb24YAiABKAsyES5nb29nbGUudHlwZS5FeHByEkEKBnNvdXJjZRgDIAEoDjIxLmJ5dGViYXNlLnYxLldvcmtzcGFjZUFwcHJvdmFsU2V0dGluZy5SdWxlLlNvdXJjZSJtCgZTb3VyY2USFgoSU09VUkNFX1VOU1BFQ0lGSUVEEAASEwoPQ0hBTkdFX0RBVEFCQVNFEAESEwoPQ1JFQVRFX0RBVEFCQVNFEAISDwoLRVhQT1JUX0RBVEEQAxIQCgxSRVFVRVNUX1JPTEUQBCKYBQoZRGF0YUNsYXNzaWZpY2F0aW9uU2V0dGluZxJQCgdjb25maWdzGAEgAygLMj8uYnl0ZWJhc2UudjEuRGF0YUNsYXNzaWZpY2F0aW9uU2V0dGluZy5EYXRhQ2xhc3NpZmljYXRpb25Db25maWcaqAQKGERhdGFDbGFzc2lmaWNhdGlvbkNvbmZpZxIKCgJpZBgBIAEoCRINCgV0aXRsZRgCIAEoCRJVCgZsZXZlbHMYAyADKAsyRS5ieXRlYmFzZS52MS5EYXRhQ2xhc3NpZmljYXRpb25TZXR0aW5nLkRhdGFDbGFzc2lmaWNhdGlvbkNvbmZpZy5MZXZlbBJrCg5jbGFzc2lmaWNhdGlvbhgEIAMoCzJTLmJ5dGViYXNlLnYxLkRhdGFDbGFzc2lmaWNhdGlvblNldHRpbmcuRGF0YUNsYXNzaWZpY2F0aW9uQ29uZmlnLkNsYXNzaWZpY2F0aW9uRW50cnkaNwoFTGV2ZWwSCgoCaWQYASABKAkSDQoFdGl0bGUYAiABKAkSEwoLZGVzY3JpcHRpb24YAyABKAkaaAoSRGF0YUNsYXNzaWZpY2F0aW9uEgoKAmlkGAEgASgJEg0KBXRpdGxlGAIgASgJEhMKC2Rlc2NyaXB0aW9uGAMgASgJEhUKCGxldmVsX2lkGAQgASgJSACIAQFCCwoJX2xldmVsX2lkGokBChNDbGFzc2lmaWNhdGlvbkVudHJ5EgsKA2tleRgBIAEoCRJhCgV2YWx1ZRgCIAEoCzJSLmJ5dGViYXNlLnYxLkRhdGFDbGFzc2lmaWNhdGlvblNldHRpbmcuRGF0YUNsYXNzaWZpY2F0aW9uQ29uZmlnLkRhdGFDbGFzc2lmaWNhdGlvbjoCOAEizAEKE1NlbWFudGljVHlwZVNldHRpbmcSPAoFdHlwZXMYASADKAsyLS5ieXRlYmFzZS52MS5TZW1hbnRpY1R5cGVTZXR0aW5nLlNlbWFudGljVHlwZRp3CgxTZW1hbnRpY1R5cGUSCgoCaWQYASABKAkSDQoFdGl0bGUYAiABKAkSEwoLZGVzY3JpcHRpb24YAyABKAkSKQoJYWxnb3JpdGhtGAYgASgLMhYuYnl0ZWJhc2UudjEuQWxnb3JpdGhtEgwKBGljb24YByABKAki/wQKCUFsZ29yaXRobRI0CglmdWxsX21hc2sYASABKAsyHy5ieXRlYmFzZS52MS5BbGdvcml0aG0uRnVsbE1hc2tIABI2CgpyYW5nZV9tYXNrGAIgASgLMiAuYnl0ZWJhc2UudjEuQWxnb3JpdGhtLlJhbmdlTWFza0gAEjIKCG1kNV9tYXNrGAMgASgLMh4uYnl0ZWJhc2UudjEuQWxnb3JpdGhtLk1ENU1hc2tIABJBChBpbm5lcl9vdXRlcl9tYXNrGAQgASgLMiUuYnl0ZWJhc2UudjEuQWxnb3JpdGhtLklubmVyT3V0ZXJNYXNrSAAaIAoIRnVsbE1hc2sSFAoMc3Vic3RpdHV0aW9uGAEgASgJGn4KCVJhbmdlTWFzaxI2CgZzbGljZXMYASADKAsyJi5ieXRlYmFzZS52MS5BbGdvcml0aG0uUmFuZ2VNYXNrLlNsaWNlGjkKBVNsaWNlEg0KBXN0YXJ0GAEgASgFEgsKA2VuZBgCIAEoBRIUCgxzdWJzdGl0dXRpb24YAyABKAkaFwoHTUQ1TWFzaxIMCgRzYWx0GAEgASgJGskBCg5Jbm5lck91dGVyTWFzaxISCgpwcmVmaXhfbGVuGAEgASgFEhIKCnN1ZmZpeF9sZW4YAiABKAUSPAoEdHlwZRgDIAEoDjIuLmJ5dGViYXNlLnYxLkFsZ29yaXRobS5Jbm5lck91dGVyTWFzay5NYXNrVHlwZRIUCgxzdWJzdGl0dXRpb24YBCABKAkiOwoITWFza1R5cGUSGQoVTUFTS19UWVBFX1VOU1BFQ0lGSUVEEAASCQoFSU5ORVIQARIJCgVPVVRFUhACQgYKBG1hc2si7wEKCUFJU2V0dGluZxIPCgdlbmFibGVkGAEgASgIEjEKCHByb3ZpZGVyGAIgASgOMh8uYnl0ZWJhc2UudjEuQUlTZXR0aW5nLlByb3ZpZGVyEhAKCGVuZHBvaW50GAMgASgJEg8KB2FwaV9rZXkYBCABKAkSDQoFbW9kZWwYBSABKAkSDwoHdmVyc2lvbhgGIAEoCSJbCghQcm92aWRlchIYChRQUk9WSURFUl9VTlNQRUNJRklFRBAAEgsKB09QRU5fQUkQARIKCgZDTEFVREUQAhIKCgZHRU1JTkkQAxIQCgxBWlVSRV9PUEVOQUkQBCKWAgoSRW52aXJvbm1lbnRTZXR0aW5nEkEKDGVudmlyb25tZW50cxgBIAMoCzIrLmJ5dGViYXNlLnYxLkVudmlyb25tZW50U2V0dGluZy5FbnZpcm9ubWVudBq8AQoLRW52aXJvbm1lbnQSEQoEbmFtZRgBIAEoCUID4EEDEgoKAmlkGAIgASgJEg0KBXRpdGxlGAMgASgJEkMKBHRhZ3MYBCADKAsyNS5ieXRlYmFzZS52MS5FbnZpcm9ubWVudFNldHRpbmcuRW52aXJvbm1lbnQuVGFnc0VudHJ5Eg0KBWNvbG9yGAUgASgJGisKCVRhZ3NFbnRyeRILCgNrZXkYASABKAkSDQoFdmFsdWUYAiABKAk6AjgBKlQKEkRhdGFiYXNlQ2hhbmdlTW9kZRIkCiBEQVRBQkFTRV9DSEFOR0VfTU9ERV9VTlNQRUNJRklFRBAAEgwKCFBJUEVMSU5FEAESCgoGRURJVE9SEAIyrgMKDlNldHRpbmdTZXJ2aWNlEoQBCgxMaXN0U2V0dGluZ3MSIC5ieXRlYmFzZS52MS5MaXN0U2V0dGluZ3NSZXF1ZXN0GiEuYnl0ZWJhc2UudjEuTGlzdFNldHRpbmdzUmVzcG9uc2UiL9pBAIrqMBBiYi5zZXR0aW5ncy5saXN0kOowAYLT5JMCDhIML3YxL3NldHRpbmdzEn8KCkdldFNldHRpbmcSHi5ieXRlYmFzZS52MS5HZXRTZXR0aW5nUmVxdWVzdBoULmJ5dGViYXNlLnYxLlNldHRpbmciO9pBBG5hbWWK6jAPYmIuc2V0dGluZ3MuZ2V0kOowAYLT5JMCFxIVL3YxL3tuYW1lPXNldHRpbmdzLyp9EpMBCg1VcGRhdGVTZXR0aW5nEiEuYnl0ZWJhc2UudjEuVXBkYXRlU2V0dGluZ1JlcXVlc3QaFC5ieXRlYmFzZS52MS5TZXR0aW5nIkmK6jAPYmIuc2V0dGluZ3Muc2V0kOowAZjqMAGC0+STAig6B3NldHRpbmcyHS92MS97c2V0dGluZy5uYW1lPXNldHRpbmdzLyp9QqkBCg9jb20uYnl0ZWJhc2UudjFCE1NldHRpbmdTZXJ2aWNlUHJvdG9QAVo0Z2l0aHViLmNvbS9ieXRlYmFzZS9ieXRlYmFzZS9iYWNrZW5kL2dlbmVyYXRlZC1nby92MaICA0JYWKoCC0J5dGViYXNlLlYxygILQnl0ZWJhc2VcVjHiAhdCeXRlYmFzZVxWMVxHUEJNZXRhZGF0YeoCDEJ5dGViYXNlOjpWMWIGcHJvdG8z", [file_google_api_annotations, file_google_api_client, file_google_api_field_behavior, file_google_api_resource, file_google_protobuf_duration, file_google_protobuf_field_mask, file_google_type_expr, file_v1_annotation, file_v1_common, file_v1_issue_service]);+ fileDesc("Chh2MS9zZXR0aW5nX3NlcnZpY2UucHJvdG8SC2J5dGViYXNlLnYxIhUKE0xpc3RTZXR0aW5nc1JlcXVlc3QiPgoUTGlzdFNldHRpbmdzUmVzcG9uc2USJgoIc2V0dGluZ3MYASADKAsyFC5ieXRlYmFzZS52MS5TZXR0aW5nIj8KEUdldFNldHRpbmdSZXF1ZXN0EioKBG5hbWUYASABKAlCHOBBAvpBFgoUYnl0ZWJhc2UuY29tL1NldHRpbmciOwoSR2V0U2V0dGluZ1Jlc3BvbnNlEiUKB3NldHRpbmcYASABKAsyFC5ieXRlYmFzZS52MS5TZXR0aW5nIqEBChRVcGRhdGVTZXR0aW5nUmVxdWVzdBIqCgdzZXR0aW5nGAEgASgLMhQuYnl0ZWJhc2UudjEuU2V0dGluZ0ID4EECEhUKDXZhbGlkYXRlX29ubHkYAiABKAgSFQoNYWxsb3dfbWlzc2luZxgDIAEoCBIvCgt1cGRhdGVfbWFzaxgEIAEoCzIaLmdvb2dsZS5wcm90b2J1Zi5GaWVsZE1hc2siqQIKB1NldHRpbmcSEQoEbmFtZRgBIAEoCUID4EEIEi0KBXZhbHVlGAIgASgLMhkuYnl0ZWJhc2UudjEuU2V0dGluZ1ZhbHVlQgPgQQIirAEKC1NldHRpbmdOYW1lEhwKGFNFVFRJTkdfTkFNRV9VTlNQRUNJRklFRBAAEhUKEVdPUktTUEFDRV9QUk9GSUxFEAESFgoSV09SS1NQQUNFX0FQUFJPVkFMEAISCgoGQVBQX0lNEAMSBgoCQUkQBBIXChNEQVRBX0NMQVNTSUZJQ0FUSU9OEAUSEgoOU0VNQU5USUNfVFlQRVMQBhIPCgtFTlZJUk9OTUVOVBAHOi3qQSoKFGJ5dGViYXNlLmNvbS9TZXR0aW5nEhJzZXR0aW5ncy97c2V0dGluZ30irAMKDFNldHRpbmdWYWx1ZRIrCgZhcHBfaW0YASABKAsyGS5ieXRlYmFzZS52MS5BcHBJTVNldHRpbmdIABJBChF3b3Jrc3BhY2VfcHJvZmlsZRgCIAEoCzIkLmJ5dGViYXNlLnYxLldvcmtzcGFjZVByb2ZpbGVTZXR0aW5nSAASQwoSd29ya3NwYWNlX2FwcHJvdmFsGAMgASgLMiUuYnl0ZWJhc2UudjEuV29ya3NwYWNlQXBwcm92YWxTZXR0aW5nSAASRQoTZGF0YV9jbGFzc2lmaWNhdGlvbhgEIAEoCzImLmJ5dGViYXNlLnYxLkRhdGFDbGFzc2lmaWNhdGlvblNldHRpbmdIABI5Cg1zZW1hbnRpY190eXBlGAUgASgLMiAuYnl0ZWJhc2UudjEuU2VtYW50aWNUeXBlU2V0dGluZ0gAEiQKAmFpGAYgASgLMhYuYnl0ZWJhc2UudjEuQUlTZXR0aW5nSAASNgoLZW52aXJvbm1lbnQYByABKAsyHy5ieXRlYmFzZS52MS5FbnZpcm9ubWVudFNldHRpbmdIAEIHCgV2YWx1ZSK8BgoMQXBwSU1TZXR0aW5nEjUKCHNldHRpbmdzGAEgAygLMiMuYnl0ZWJhc2UudjEuQXBwSU1TZXR0aW5nLklNU2V0dGluZxobCgVTbGFjaxISCgV0b2tlbhgBIAEoCUID4EEEGjYKBkZlaXNodRITCgZhcHBfaWQYASABKAlCA+BBBBIXCgphcHBfc2VjcmV0GAIgASgJQgPgQQQaSQoFV2Vjb20SFAoHY29ycF9pZBgBIAEoCUID4EEEEhUKCGFnZW50X2lkGAIgASgJQgPgQQQSEwoGc2VjcmV0GAMgASgJQgPgQQQaNAoETGFyaxITCgZhcHBfaWQYASABKAlCA+BBBBIXCgphcHBfc2VjcmV0GAIgASgJQgPgQQQaVwoIRGluZ1RhbGsSFgoJY2xpZW50X2lkGAEgASgJQgPgQQQSGgoNY2xpZW50X3NlY3JldBgCIAEoCUID4EEEEhcKCnJvYm90X2NvZGUYAyABKAlCA+BBBBpTCgVUZWFtcxIWCgl0ZW5hbnRfaWQYASABKAlCA+BBBBIWCgljbGllbnRfaWQYAiABKAlCA+BBBBIaCg1jbGllbnRfc2VjcmV0GAMgASgJQgPgQQQa8AIKCUlNU2V0dGluZxImCgR0eXBlGAEgASgOMhguYnl0ZWJhc2UudjEuV2ViaG9va1R5cGUSMAoFc2xhY2sYAiABKAsyHy5ieXRlYmFzZS52MS5BcHBJTVNldHRpbmcuU2xhY2tIABIyCgZmZWlzaHUYAyABKAsyIC5ieXRlYmFzZS52MS5BcHBJTVNldHRpbmcuRmVpc2h1SAASMAoFd2Vjb20YBCABKAsyHy5ieXRlYmFzZS52MS5BcHBJTVNldHRpbmcuV2Vjb21IABIuCgRsYXJrGAUgASgLMh4uYnl0ZWJhc2UudjEuQXBwSU1TZXR0aW5nLkxhcmtIABI2CghkaW5ndGFsaxgGIAEoCzIiLmJ5dGViYXNlLnYxLkFwcElNU2V0dGluZy5EaW5nVGFsa0gAEjAKBXRlYW1zGAcgASgLMh8uYnl0ZWJhc2UudjEuQXBwSU1TZXR0aW5nLlRlYW1zSABCCQoHcGF5bG9hZCL5BwoXV29ya3NwYWNlUHJvZmlsZVNldHRpbmcSFAoMZXh0ZXJuYWxfdXJsGAEgASgJEhcKD2Rpc2FsbG93X3NpZ251cBgCIAEoCBITCgtyZXF1aXJlXzJmYRgDIAEoCBI5ChZyZWZyZXNoX3Rva2VuX2R1cmF0aW9uGAQgASgLMhkuZ29vZ2xlLnByb3RvYnVmLkR1cmF0aW9uEjgKFWFjY2Vzc190b2tlbl9kdXJhdGlvbhgSIAEoCzIZLmdvb2dsZS5wcm90b2J1Zi5EdXJhdGlvbhIvCgxhbm5vdW5jZW1lbnQYBSABKAsyGS5ieXRlYmFzZS52MS5Bbm5vdW5jZW1lbnQSOgoXbWF4aW11bV9yb2xlX2V4cGlyYXRpb24YBiABKAsyGS5nb29nbGUucHJvdG9idWYuRHVyYXRpb24SDwoHZG9tYWlucxgHIAMoCRIfChdlbmZvcmNlX2lkZW50aXR5X2RvbWFpbhgIIAEoCBI9ChRkYXRhYmFzZV9jaGFuZ2VfbW9kZRgJIAEoDjIfLmJ5dGViYXNlLnYxLkRhdGFiYXNlQ2hhbmdlTW9kZRIgChhkaXNhbGxvd19wYXNzd29yZF9zaWduaW4YCiABKAgSIAoYZW5hYmxlX21ldHJpY19jb2xsZWN0aW9uGAsgASgIEjsKGGluYWN0aXZlX3Nlc3Npb25fdGltZW91dBgMIAEoCzIZLmdvb2dsZS5wcm90b2J1Zi5EdXJhdGlvbhIfChdlbmFibGVfYXVkaXRfbG9nX3N0ZG91dBgNIAEoCBIRCgl3YXRlcm1hcmsYDiABKAgSHAoUZGlyZWN0b3J5X3N5bmNfdG9rZW4YDyABKAkSFQoNYnJhbmRpbmdfbG9nbxgQIAEoCRJWChRwYXNzd29yZF9yZXN0cmljdGlvbhgRIAEoCzI4LmJ5dGViYXNlLnYxLldvcmtzcGFjZVByb2ZpbGVTZXR0aW5nLlBhc3N3b3JkUmVzdHJpY3Rpb24ahAIKE1Bhc3N3b3JkUmVzdHJpY3Rpb24SEgoKbWluX2xlbmd0aBgBIAEoBRIWCg5yZXF1aXJlX251bWJlchgCIAEoCBIWCg5yZXF1aXJlX2xldHRlchgDIAEoCBIgChhyZXF1aXJlX3VwcGVyY2FzZV9sZXR0ZXIYBCABKAgSIQoZcmVxdWlyZV9zcGVjaWFsX2NoYXJhY3RlchgFIAEoCBIuCiZyZXF1aXJlX3Jlc2V0X3Bhc3N3b3JkX2Zvcl9maXJzdF9sb2dpbhgGIAEoCBI0ChFwYXNzd29yZF9yb3RhdGlvbhgHIAEoCzIZLmdvb2dsZS5wcm90b2J1Zi5EdXJhdGlvbiKvAQoMQW5ub3VuY2VtZW50EjMKBWxldmVsGAEgASgOMiQuYnl0ZWJhc2UudjEuQW5ub3VuY2VtZW50LkFsZXJ0TGV2ZWwSDAoEdGV4dBgCIAEoCRIMCgRsaW5rGAMgASgJIk4KCkFsZXJ0TGV2ZWwSGwoXQUxFUlRfTEVWRUxfVU5TUEVDSUZJRUQQABIICgRJTkZPEAESCwoHV0FSTklORxACEgwKCENSSVRJQ0FMEAMi5wIKGFdvcmtzcGFjZUFwcHJvdmFsU2V0dGluZxI5CgVydWxlcxgBIAMoCzIqLmJ5dGViYXNlLnYxLldvcmtzcGFjZUFwcHJvdmFsU2V0dGluZy5SdWxlGo8CCgRSdWxlEi8KCHRlbXBsYXRlGAEgASgLMh0uYnl0ZWJhc2UudjEuQXBwcm92YWxUZW1wbGF0ZRIkCgljb25kaXRpb24YAiABKAsyES5nb29nbGUudHlwZS5FeHByEkEKBnNvdXJjZRgDIAEoDjIxLmJ5dGViYXNlLnYxLldvcmtzcGFjZUFwcHJvdmFsU2V0dGluZy5SdWxlLlNvdXJjZSJtCgZTb3VyY2USFgoSU09VUkNFX1VOU1BFQ0lGSUVEEAASEwoPQ0hBTkdFX0RBVEFCQVNFEAESEwoPQ1JFQVRFX0RBVEFCQVNFEAISDwoLRVhQT1JUX0RBVEEQAxIQCgxSRVFVRVNUX1JPTEUQBCKYBQoZRGF0YUNsYXNzaWZpY2F0aW9uU2V0dGluZxJQCgdjb25maWdzGAEgAygLMj8uYnl0ZWJhc2UudjEuRGF0YUNsYXNzaWZpY2F0aW9uU2V0dGluZy5EYXRhQ2xhc3NpZmljYXRpb25Db25maWcaqAQKGERhdGFDbGFzc2lmaWNhdGlvbkNvbmZpZxIKCgJpZBgBIAEoCRINCgV0aXRsZRgCIAEoCRJVCgZsZXZlbHMYAyADKAsyRS5ieXRlYmFzZS52MS5EYXRhQ2xhc3NpZmljYXRpb25TZXR0aW5nLkRhdGFDbGFzc2lmaWNhdGlvbkNvbmZpZy5MZXZlbBJrCg5jbGFzc2lmaWNhdGlvbhgEIAMoCzJTLmJ5dGViYXNlLnYxLkRhdGFDbGFzc2lmaWNhdGlvblNldHRpbmcuRGF0YUNsYXNzaWZpY2F0aW9uQ29uZmlnLkNsYXNzaWZpY2F0aW9uRW50cnkaNwoFTGV2ZWwSCgoCaWQYASABKAkSDQoFdGl0bGUYAiABKAkSEwoLZGVzY3JpcHRpb24YAyABKAkaaAoSRGF0YUNsYXNzaWZpY2F0aW9uEgoKAmlkGAEgASgJEg0KBXRpdGxlGAIgASgJEhMKC2Rlc2NyaXB0aW9uGAMgASgJEhUKCGxldmVsX2lkGAQgASgJSACIAQFCCwoJX2xldmVsX2lkGokBChNDbGFzc2lmaWNhdGlvbkVudHJ5EgsKA2tleRgBIAEoCRJhCgV2YWx1ZRgCIAEoCzJSLmJ5dGViYXNlLnYxLkRhdGFDbGFzc2lmaWNhdGlvblNldHRpbmcuRGF0YUNsYXNzaWZpY2F0aW9uQ29uZmlnLkRhdGFDbGFzc2lmaWNhdGlvbjoCOAEizAEKE1NlbWFudGljVHlwZVNldHRpbmcSPAoFdHlwZXMYASADKAsyLS5ieXRlYmFzZS52MS5TZW1hbnRpY1R5cGVTZXR0aW5nLlNlbWFudGljVHlwZRp3CgxTZW1hbnRpY1R5cGUSCgoCaWQYASABKAkSDQoFdGl0bGUYAiABKAkSEwoLZGVzY3JpcHRpb24YAyABKAkSKQoJYWxnb3JpdGhtGAYgASgLMhYuYnl0ZWJhc2UudjEuQWxnb3JpdGhtEgwKBGljb24YByABKAki/wQKCUFsZ29yaXRobRI0CglmdWxsX21hc2sYASABKAsyHy5ieXRlYmFzZS52MS5BbGdvcml0aG0uRnVsbE1hc2tIABI2CgpyYW5nZV9tYXNrGAIgASgLMiAuYnl0ZWJhc2UudjEuQWxnb3JpdGhtLlJhbmdlTWFza0gAEjIKCG1kNV9tYXNrGAMgASgLMh4uYnl0ZWJhc2UudjEuQWxnb3JpdGhtLk1ENU1hc2tIABJBChBpbm5lcl9vdXRlcl9tYXNrGAQgASgLMiUuYnl0ZWJhc2UudjEuQWxnb3JpdGhtLklubmVyT3V0ZXJNYXNrSAAaIAoIRnVsbE1hc2sSFAoMc3Vic3RpdHV0aW9uGAEgASgJGn4KCVJhbmdlTWFzaxI2CgZzbGljZXMYASADKAsyJi5ieXRlYmFzZS52MS5BbGdvcml0aG0uUmFuZ2VNYXNrLlNsaWNlGjkKBVNsaWNlEg0KBXN0YXJ0GAEgASgFEgsKA2VuZBgCIAEoBRIUCgxzdWJzdGl0dXRpb24YAyABKAkaFwoHTUQ1TWFzaxIMCgRzYWx0GAEgASgJGskBCg5Jbm5lck91dGVyTWFzaxISCgpwcmVmaXhfbGVuGAEgASgFEhIKCnN1ZmZpeF9sZW4YAiABKAUSPAoEdHlwZRgDIAEoDjIuLmJ5dGViYXNlLnYxLkFsZ29yaXRobS5Jbm5lck91dGVyTWFzay5NYXNrVHlwZRIUCgxzdWJzdGl0dXRpb24YBCABKAkiOwoITWFza1R5cGUSGQoVTUFTS19UWVBFX1VOU1BFQ0lGSUVEEAASCQoFSU5ORVIQARIJCgVPVVRFUhACQgYKBG1hc2si7wEKCUFJU2V0dGluZxIPCgdlbmFibGVkGAEgASgIEjEKCHByb3ZpZGVyGAIgASgOMh8uYnl0ZWJhc2UudjEuQUlTZXR0aW5nLlByb3ZpZGVyEhAKCGVuZHBvaW50GAMgASgJEg8KB2FwaV9rZXkYBCABKAkSDQoFbW9kZWwYBSABKAkSDwoHdmVyc2lvbhgGIAEoCSJbCghQcm92aWRlchIYChRQUk9WSURFUl9VTlNQRUNJRklFRBAAEgsKB09QRU5fQUkQARIKCgZDTEFVREUQAhIKCgZHRU1JTkkQAxIQCgxBWlVSRV9PUEVOQUkQBCKWAgoSRW52aXJvbm1lbnRTZXR0aW5nEkEKDGVudmlyb25tZW50cxgBIAMoCzIrLmJ5dGViYXNlLnYxLkVudmlyb25tZW50U2V0dGluZy5FbnZpcm9ubWVudBq8AQoLRW52aXJvbm1lbnQSEQoEbmFtZRgBIAEoCUID4EEDEgoKAmlkGAIgASgJEg0KBXRpdGxlGAMgASgJEkMKBHRhZ3MYBCADKAsyNS5ieXRlYmFzZS52MS5FbnZpcm9ubWVudFNldHRpbmcuRW52aXJvbm1lbnQuVGFnc0VudHJ5Eg0KBWNvbG9yGAUgASgJGisKCVRhZ3NFbnRyeRILCgNrZXkYASABKAkSDQoFdmFsdWUYAiABKAk6AjgBKlQKEkRhdGFiYXNlQ2hhbmdlTW9kZRIkCiBEQVRBQkFTRV9DSEFOR0VfTU9ERV9VTlNQRUNJRklFRBAAEgwKCFBJUEVMSU5FEAESCgoGRURJVE9SEAIyrgMKDlNldHRpbmdTZXJ2aWNlEoQBCgxMaXN0U2V0dGluZ3MSIC5ieXRlYmFzZS52MS5MaXN0U2V0dGluZ3NSZXF1ZXN0GiEuYnl0ZWJhc2UudjEuTGlzdFNldHRpbmdzUmVzcG9uc2UiL9pBAIrqMBBiYi5zZXR0aW5ncy5saXN0kOowAYLT5JMCDhIML3YxL3NldHRpbmdzEn8KCkdldFNldHRpbmcSHi5ieXRlYmFzZS52MS5HZXRTZXR0aW5nUmVxdWVzdBoULmJ5dGViYXNlLnYxLlNldHRpbmciO9pBBG5hbWWK6jAPYmIuc2V0dGluZ3MuZ2V0kOowAoLT5JMCFxIVL3YxL3tuYW1lPXNldHRpbmdzLyp9EpMBCg1VcGRhdGVTZXR0aW5nEiEuYnl0ZWJhc2UudjEuVXBkYXRlU2V0dGluZ1JlcXVlc3QaFC5ieXRlYmFzZS52MS5TZXR0aW5nIkmK6jAPYmIuc2V0dGluZ3Muc2V0kOowApjqMAGC0+STAig6B3NldHRpbmcyHS92MS97c2V0dGluZy5uYW1lPXNldHRpbmdzLyp9QqkBCg9jb20uYnl0ZWJhc2UudjFCE1NldHRpbmdTZXJ2aWNlUHJvdG9QAVo0Z2l0aHViLmNvbS9ieXRlYmFzZS9ieXRlYmFzZS9iYWNrZW5kL2dlbmVyYXRlZC1nby92MaICA0JYWKoCC0J5dGViYXNlLlYxygILQnl0ZWJhc2VcVjHiAhdCeXRlYmFzZVxWMVxHUEJNZXRhZGF0YeoCDEJ5dGViYXNlOjpWMWIGcHJvdG8z", [file_google_api_annotations, file_google_api_client, file_google_api_field_behavior, file_google_api_resource, file_google_protobuf_duration, file_google_protobuf_field_mask, file_google_type_expr, file_v1_annotation, file_v1_common, file_v1_issue_service]);/*** Describes the message bytebase.v1.ListSettingsRequest.diff --git a/frontend/src/utils/expr.ts b/frontend/src/utils/expr.tsindex f42afd3b80..d7f48713fc 100644--- a/frontend/src/utils/expr.ts+++ b/frontend/src/utils/expr.ts@@ -50,7 +50,7 @@ const getRenderOptionFunc = (resource: {};export const getEnvironmentIdOptions = () => {- const environmentList = useEnvironmentV1Store().getEnvironmentList();+ const environmentList = useEnvironmentV1Store().environmentList;return environmentList.map<ResourceSelectOption<unknown>>((env) => {const environmentId = env.id;return {diff --git a/frontend/src/utils/iam/permission-utils.ts b/frontend/src/utils/iam/permission-utils.tsindex 9cd8448392..a518fffa7d 100644--- a/frontend/src/utils/iam/permission-utils.ts+++ b/frontend/src/utils/iam/permission-utils.ts@@ -2,19 +2,14 @@ import { type ComposedDatabase } from "@/types";import type { Project } from "@/types/proto-es/v1/project_service_pb";import { hasProjectPermissionV2 } from "./permission";-export const hasPermissionToCreateRequestGrantIssue = (- database: ComposedDatabase-) => {- return hasProjectPermissionV2(database.projectEntity, "bb.issues.create");-};-export const hasPermissionToCreateChangeDatabaseIssueInProject = (project: Project) => {return (hasProjectPermissionV2(project, "bb.issues.create") &&hasProjectPermissionV2(project, "bb.plans.create") &&- hasProjectPermissionV2(project, "bb.rollouts.create")+ hasProjectPermissionV2(project, "bb.rollouts.create") &&+ hasProjectPermissionV2(project, "bb.sheets.create"));};diff --git a/frontend/src/views/EnvironmentDashboard.vue b/frontend/src/views/EnvironmentDashboard.vueindex abd25c5b76..7e98dfa844 100644--- a/frontend/src/views/EnvironmentDashboard.vue+++ b/frontend/src/views/EnvironmentDashboard.vue@@ -27,7 +27,7 @@<template #suffix><PermissionGuardWrapperv-slot="slotProps"- :permissions="['bb.settings.set']"+ :permissions="['bb.settings.setEnvironment']"><div class="flex items-center justify-end gap-x-2 px-2 pb-1"><NButton@@ -129,7 +129,6 @@ import { useRouteChangeGuard } from "@/composables/useRouteChangeGuard";import {environmentNamePrefix,pushNotification,- useEnvironmentV1List,useEnvironmentV1Store,useUIStateStore,} from "@/store";@@ -166,9 +165,10 @@ const environmentV1Store = useEnvironmentV1Store();const uiStateStore = useUIStateStore();const policyV1Store = usePolicyV1Store();const router = useRouter();-const environmentList = useEnvironmentV1List();const environmentDetailRefs = ref<InstanceType<typeof EnvironmentDetail>[]>([]);+const environmentList = computed(() => environmentV1Store.environmentList);+const state = reactive<LocalState>({selectedId: "",reorderedEnvironmentList: [],diff --git a/frontend/src/views/EnvironmentDetail.vue b/frontend/src/views/EnvironmentDetail.vueindex 28ee280f8a..08e1aea47c 100644--- a/frontend/src/views/EnvironmentDetail.vue+++ b/frontend/src/views/EnvironmentDetail.vue@@ -20,7 +20,7 @@<script lang="ts" setup>import { cloneDeep, isEqual } from "lodash-es";-import { computed, reactive, ref, watch, watchEffect } from "vue";+import { computed, reactive, ref, watchEffect } from "vue";import {EnvironmentForm,Form as EnvironmentFormBody,@@ -64,16 +64,6 @@ const stateEnvironmentName = computed(() => {return formatEnvironmentName(state.environment.id);});-const prepareEnvironment = async () => {- await environmentV1Store.getOrFetchEnvironmentByName(- `${environmentNamePrefix}${props.environmentName}`- );-};--watch(() => props.environmentName, prepareEnvironment, {- immediate: true,-});-// Fetch rollout policy directly using getOrFetchPolicyByParentAndType// The backend now returns default policy if none exists, so no manual fallback neededconst preparePolicy = async () => {diff --git a/frontend/src/views/Page403.vue b/frontend/src/views/Page403.vueindex 6877478c10..fa266f0803 100644--- a/frontend/src/views/Page403.vue+++ b/frontend/src/views/Page403.vue@@ -1,6 +1,8 @@<template><NoPermissionPlaceholderclass="mx-6 my-2"+ :path="fromPath"+ :api="requestAPI":resources="resources":permissions="permissions">@@ -43,6 +45,14 @@ const resources = computed(() => {return [];});+const fromPath = computed(() => {+ return route.query.from as string;+});++const requestAPI = computed(() => {+ return route.query.api as string;+});+const goHome = () => {router.push({ name: WORKSPACE_ROOT_MODULE });};diff --git a/frontend/src/views/project/ProjectDatabaseGroupDetail.vue b/frontend/src/views/project/ProjectDatabaseGroupDetail.vueindex ee82e37948..3663e56d84 100644--- a/frontend/src/views/project/ProjectDatabaseGroupDetail.vue+++ b/frontend/src/views/project/ProjectDatabaseGroupDetail.vue@@ -20,6 +20,7 @@'bb.issues.create','bb.plans.create','bb.rollouts.create',+ 'bb.sheets.create',]"><NTooltipdiff --git a/frontend/src/views/sql-editor/ConnectionPanel/ConnectionPane/ConnectionPane.vue b/frontend/src/views/sql-editor/ConnectionPanel/ConnectionPane/ConnectionPane.vueindex a9318687ec..92c0bef04a 100644--- a/frontend/src/views/sql-editor/ConnectionPanel/ConnectionPane/ConnectionPane.vue+++ b/frontend/src/views/sql-editor/ConnectionPanel/ConnectionPane/ConnectionPane.vue@@ -225,7 +225,7 @@ import {useCurrentUserV1,useDatabaseV1Store,useDBGroupStore,- useEnvironmentV1List,+ useEnvironmentV1Store,useInstanceResourceByName,useProjectV1Store,useSQLEditorStore,@@ -292,10 +292,11 @@ const editorStore = useSQLEditorStore();const databaseStore = useDatabaseV1Store();const dbGroupStore = useDBGroupStore();const projectStore = useProjectV1Store();-const environmentList = useEnvironmentV1List();const currentUser = useCurrentUserV1();const { t } = useI18n();+const environmentList = computed(() => useEnvironmentV1Store().environmentList);+const expandedState = useDynamicLocalStorage<{initialized: boolean;expandedKeys: string[];diff --git a/frontend/src/views/sql-editor/EditorCommon/ResultView/RequestQueryButton.vue b/frontend/src/views/sql-editor/EditorCommon/ResultView/RequestQueryButton.vueindex 07a0153570..6e662a98b1 100644--- a/frontend/src/views/sql-editor/EditorCommon/ResultView/RequestQueryButton.vue+++ b/frontend/src/views/sql-editor/EditorCommon/ResultView/RequestQueryButton.vue@@ -25,7 +25,7 @@ import {isValidDatabaseName,PresetRoleType,} from "@/types";-import { hasPermissionToCreateRequestGrantIssue } from "@/utils";+import { hasProjectPermissionV2 } from "@/utils";const props = withDefaults(defineProps<{@@ -56,7 +56,10 @@ const available = computed(() => {return false;}- return hasPermissionToCreateRequestGrantIssue(database.value);+ return hasProjectPermissionV2(+ database.value.projectEntity,+ "bb.issues.create"+ );});const onClick = (e: MouseEvent) => {diff --git a/proto/v1/v1/setting_service.proto b/proto/v1/v1/setting_service.protoindex d4d1d28f5c..e510143c75 100644--- a/proto/v1/v1/setting_service.proto+++ b/proto/v1/v1/setting_service.proto@@ -32,7 +32,7 @@ service SettingService {option (google.api.http) = {get: "/v1/{name=settings/*}"};option (google.api.method_signature) = "name";option (bytebase.v1.permission) = "bb.settings.get";- option (bytebase.v1.auth_method) = IAM;+ option (bytebase.v1.auth_method) = CUSTOM;}// Updates a workspace setting.@@ -43,7 +43,7 @@ service SettingService {body: "setting"};option (bytebase.v1.permission) = "bb.settings.set";- option (bytebase.v1.auth_method) = IAM;+ option (bytebase.v1.auth_method) = CUSTOM;option (bytebase.v1.audit) = true;}}