Skip to content

Commit aae6d43

Browse files
committed
feat(account): Enable MONACO_FEAT_ACCESS_CONTROL_SETTINGS feature flag by default
1 parent 1cfa303 commit aae6d43

File tree

3 files changed

+17
-9
lines changed

3 files changed

+17
-9
lines changed

cmd/monaco/download/download_integration_test.go

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1050,8 +1050,9 @@ func TestDownloadIntegrationDownloadsAPIsAndSettings(t *testing.T) {
10501050
"/fake-api": "fake-api/__LIST.json",
10511051
"/fake-api/id-1": "fake-api/id-1.json",
10521052
"/fake-api/id-2": "fake-api/id-2.json",
1053-
"/platform/classic/environment-api/v2/settings/schemas": "settings/__SCHEMAS.json",
1054-
"/platform/classic/environment-api/v2/settings/objects": "settings/objects.json",
1053+
"/platform/classic/environment-api/v2/settings/schemas": "settings/__SCHEMAS.json",
1054+
"/platform/classic/environment-api/v2/settings/schemas/settings-schema": "schemas/schema.json",
1055+
"/platform/classic/environment-api/v2/settings/objects": "settings/objects.json",
10551056
}
10561057

10571058
// Server
@@ -1106,8 +1107,9 @@ func TestDownloadGoTemplateExpressionsAreEscaped(t *testing.T) {
11061107

11071108
// Responses
11081109
responses := map[string]string{
1109-
"/platform/classic/environment-api/v2/settings/schemas": "settings/__SCHEMAS.json",
1110-
"/platform/classic/environment-api/v2/settings/objects": "settings/objects.json",
1110+
"/platform/classic/environment-api/v2/settings/schemas": "settings/__SCHEMAS.json",
1111+
"/platform/classic/environment-api/v2/settings/objects": "settings/objects.json",
1112+
"/platform/classic/environment-api/v2/settings/schemas/settings-schema": "schemas/schema.json",
11111113
}
11121114

11131115
// Server
@@ -1228,8 +1230,9 @@ func TestDownloadIntegrationDoesNotDownloadUnmodifiableSettings(t *testing.T) {
12281230
const testBasePath = "test-resources/" + projectName
12291231

12301232
responses := map[string]string{
1231-
"/platform/classic/environment-api/v2/settings/schemas": "settings/__SCHEMAS.json",
1232-
"/platform/classic/environment-api/v2/settings/objects": "settings/objects.json",
1233+
"/platform/classic/environment-api/v2/settings/schemas": "settings/__SCHEMAS.json",
1234+
"/platform/classic/environment-api/v2/settings/objects": "settings/objects.json",
1235+
"/platform/classic/environment-api/v2/settings/schemas/settings-schema": "schemas/schema.json",
12331236
}
12341237

12351238
// GIVEN Server
@@ -1285,8 +1288,9 @@ func TestDownloadIntegrationDownloadsUnmodifiableSettingsIfFFTurnedOff(t *testin
12851288
const testBasePath = "test-resources/" + projectName
12861289

12871290
responses := map[string]string{
1288-
"/platform/classic/environment-api/v2/settings/schemas": "settings/__SCHEMAS.json",
1289-
"/platform/classic/environment-api/v2/settings/objects": "settings/objects.json",
1291+
"/platform/classic/environment-api/v2/settings/schemas": "settings/__SCHEMAS.json",
1292+
"/platform/classic/environment-api/v2/settings/objects": "settings/objects.json",
1293+
"/platform/classic/environment-api/v2/settings/schemas/settings-schema": "schemas/schema.json",
12901294
}
12911295

12921296
// GIVEN Server
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
{
2+
"schemaId": "builtin:container.built-in-monitoring-rule",
3+
"ordered": false
4+
}

internal/featureflags/temporary.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,6 @@ var temporaryDefaultValues = map[FeatureFlag]defaultValue{
6363
ServiceUsers: true,
6464
OnlyCreateReferencesInStringValues: false,
6565
ServiceLevelObjective: true,
66-
AccessControlSettings: false,
66+
AccessControlSettings: true,
6767
SanitizeBucketNames: true,
6868
}

0 commit comments

Comments
 (0)