[sc] Remove allowlist for structured_config.

anp · Fuchsia Internal LUCI · commit f050e47098cc · 2022-05-16T23:35:29.000Z
We're not quite ready for OOT usage still but anything in fuchsia.git should be able to use the feature without expecting much churn. Fixed: 95369 Fixed: 68460 Change-Id: Ief7cc09097d8cd9f29e39062d42eaf371b4cff29 Reviewed-on: https://fuchsia-review.googlesource.com/c/fuchsia/+/679663 Commit-Queue: Adam Perry <adamperry@google.com> Reviewed-by: Gabe Schine <thatguy@google.com>
diff --git a/docs/development/components/structured_config.md b/docs/development/components/structured_config.md
@@ -1,10 +1,5 @@
 # Structured Configuration
 
-Caution: Structured configuration is an experimental, allowlisted feature. Its behavior and APIs
-are subject to change. The allowlist will be removed when the feature does not require active
-guidance from the Component Framework team. Follow [this bug][remove-allowlist-bug] for updates.
-If you encounter bugs, please file them against our [Monorail component][file-monorail-bug]!
-
 Structured configuration allows C++/Rust components to declare configuration schemas directly in
 their manifest. Benefits of using structured configuration include:
 
@@ -13,24 +8,21 @@ their manifest. Benefits of using structured configuration include:
 * Components read their configuration with statically-typed libraries.
 * Component Framework only starts components with valid configuration.
 * Configuration can be viewed at runtime with `ffx` tooling.
+* Values can be set at runtime in tests with RealmBuilder.
 
 To use structured configuration in your component, you must update build rules, declare a schema,
 define values, and generate a client library.
 
 ## Update build rules
 
 To prevent cyclic dependencies when generating client libraries, define a
-`fuchsia_component_manifest` rule that compiles the component manifest. Add `structured_config` as
-a restricted feature for this manifest. Pass this compiled manifest GN label into the
-`fuchsia_component` rule.
+`fuchsia_component_manifest` rule that compiles the component manifest. Pass this compiled manifest
+GN label into the `fuchsia_component` rule.
 
 ```gn
 {% includecode gerrit_repo="fuchsia/fuchsia" gerrit_path="examples/components/config/cpp/BUILD.gn" region_tag="component" adjust_indentation="auto" %}
 ```
 
-Because structured config is an [experimental feature][restricted-features],
-these GN build rules must be added to the allowlist in [`//tools/cmc/build/restricted_features/BUILD.gn`][restricted-features-build-gn]
-
 ## Declare configuration schema
 
 You must declare a configuration schema in a component's manifest. Structured config supports
@@ -234,9 +226,5 @@ a component.
 
 Realm Builder validates the replaced value against the component's configuration schema.
 
-[remove-allowlist-bug]: https://fxbug.dev/95369
-[file-monorail-bug]: https://bugs.fuchsia.dev/p/fuchsia/issues/entry?components=ComponentFramework%3EStructuredConfig&labels=ComponentFeedback
-[restricted-features]: /docs/development/components/build.md#restricted-features
-[restricted-features-build-gn]: https://cs.opensource.google/fuchsia/fuchsia/+/main:/tools/cmc/build/restricted_features/BUILD.gn
 [cml-ref-doc]: https://fuchsia.dev/reference/cml#config
-[rb-feature-matrix]: /docs/development/testing/components/realm_builder.md#language-feature-matrix
+[rb-feature-matrix]: /docs/development/testing/components/realm_builder.md#language-feature-matrix
diff --git a/examples/assembly/structured_config/configured_by_assembly/BUILD.gn b/examples/assembly/structured_config/configured_by_assembly/BUILD.gn
@@ -12,7 +12,6 @@ rustc_binary("bin") {
 
 fuchsia_component("to_configure") {
   manifest = "meta/to_configure.cml"
-  restricted_features = [ "structured_config" ]
   deps = [ ":bin" ]
 }
 
diff --git a/examples/components/config/cpp/BUILD.gn b/examples/components/config/cpp/BUILD.gn
@@ -39,7 +39,6 @@ executable("bin") {
 fuchsia_component_manifest("manifest") {
   component_name = "config_example"
   manifest = "meta/config_example.cml"
-  restricted_features = [ "structured_config" ]
 }
 
 fuchsia_component("component") {
diff --git a/examples/components/config/rust/BUILD.gn b/examples/components/config/rust/BUILD.gn
@@ -41,7 +41,6 @@ rustc_binary("bin") {
 fuchsia_component_manifest("manifest") {
   component_name = "config_example"
   manifest = "meta/config_example.cml"
-  restricted_features = [ "structured_config" ]
 }
 
 fuchsia_component("component") {
diff --git a/sdk/lib/sys/component/cpp/tests/BUILD.gn b/sdk/lib/sys/component/cpp/tests/BUILD.gn
@@ -129,7 +129,6 @@ fuchsia_component_manifest("echo_server_sc_manifest") {
   testonly = true
   component_name = "echo_server_sc"
   manifest = "meta/echo_server_sc.cml"
-  restricted_features = [ "structured_config" ]
 }
 
 fuchsia_component("echo_server_sc") {
diff --git a/src/bringup/bin/console/BUILD.gn b/src/bringup/bin/console/BUILD.gn
@@ -8,7 +8,6 @@ import("//build/test.gni")
 fuchsia_component_manifest("manifest") {
   component_name = "console"
   manifest = "meta/console.cml"
-  restricted_features = [ "structured_config" ]
 }
 
 fuchsia_structured_config_cpp_elf_lib("console_config") {
diff --git a/src/connectivity/wlan/wlanstack/BUILD.gn b/src/connectivity/wlan/wlanstack/BUILD.gn
@@ -95,7 +95,6 @@ rustc_binary("bin") {
 fuchsia_component_manifest("wlanstack-manifest") {
   component_name = "wlanstack"
   manifest = "meta/wlanstack.cml"
-  restricted_features = [ "structured_config" ]
 }
 
 fuchsia_component("wlanstack-comp") {
diff --git a/src/diagnostics/archivist/BUILD.gn b/src/diagnostics/archivist/BUILD.gn
@@ -182,13 +182,11 @@ archivist_optimized_binary("bin") {
 fuchsia_component_manifest("root-manifest") {
   manifest = "meta/archivist.cml"
   component_name = "archivist"
-  restricted_features = [ "structured_config" ]
 }
 
 fuchsia_component_manifest("archivist-for-embedding-v2-manifest") {
   manifest = "meta/archivist-for-embedding.cml"
   component_name = "archivist-for-embedding"
-  restricted_features = [ "structured_config" ]
 }
 
 # fxbug.dev/83213 Retain this component while out of tree tests depend on it
diff --git a/src/diagnostics/archivist/tests/v2/BUILD.gn b/src/diagnostics/archivist/tests/v2/BUILD.gn
@@ -86,7 +86,6 @@ rustc_test("integration_tests_bin") {
 fuchsia_component_manifest("with-log-connector-manifest") {
   manifest = "meta/archivist_for_integration_with_log_connector.cml"
   component_name = "archivist_with_log_connector"
-  restricted_features = [ "structured_config" ]
 }
 
 fuchsia_component("archivist-for-integration-with-log-connector") {
@@ -98,7 +97,6 @@ fuchsia_component("archivist-for-integration-with-log-connector") {
 fuchsia_component_manifest("with-klog-manifest") {
   manifest = "meta/archivist_with_klog.cml"
   component_name = "archivist_with_klog"
-  restricted_features = [ "structured_config" ]
 }
 
 fuchsia_component("archivist-with-klog") {
@@ -110,7 +108,6 @@ fuchsia_component("archivist-with-klog") {
 fuchsia_component_manifest("for-integration-manifest") {
   manifest = "meta/archivist_for_integration.cml"
   component_name = "archivist"
-  restricted_features = [ "structured_config" ]
 }
 
 fuchsia_component("archivist-for-integration") {
@@ -122,7 +119,6 @@ fuchsia_component("archivist-for-integration") {
 fuchsia_component_manifest("small-caches-manifest") {
   manifest = "meta/archivist-with-small-caches.cml"
   component_name = "archivist-with-small-caches"
-  restricted_features = [ "structured_config" ]
 }
 
 fuchsia_component("archivist-with-small-caches") {
@@ -134,7 +130,6 @@ fuchsia_component("archivist-with-small-caches") {
 fuchsia_component_manifest("with-feedback-filtering-manifest") {
   manifest = "meta/archivist_for_integration.cml"
   component_name = "archivist-with-feedback-filtering"
-  restricted_features = [ "structured_config" ]
 }
 
 fuchsia_component("archivist-with-feedback-filtering") {
@@ -146,7 +141,6 @@ fuchsia_component("archivist-with-feedback-filtering") {
 fuchsia_component_manifest("with-legacy-metrics-filtering-manifest") {
   manifest = "meta/archivist_for_integration.cml"
   component_name = "archivist-with-legacy-metrics-filtering"
-  restricted_features = [ "structured_config" ]
 }
 
 fuchsia_component("archivist-with-legacy-metrics-filtering") {
@@ -158,7 +152,6 @@ fuchsia_component("archivist-with-legacy-metrics-filtering") {
 fuchsia_component_manifest("with-feedback-filtering-disabled-manifest") {
   manifest = "meta/archivist_for_integration.cml"
   component_name = "archivist-with-feedback-filtering-disabled"
-  restricted_features = [ "structured_config" ]
 }
 
 fuchsia_component("archivist-with-feedback-filtering-disabled") {
diff --git a/src/diagnostics/detect/BUILD.gn b/src/diagnostics/detect/BUILD.gn
@@ -69,7 +69,6 @@ rustc_library("lib") {
 fuchsia_component_manifest("triage-detect-manifest") {
   manifest = "meta/triage-detect.cml"
   component_name = "triage-detect"
-  restricted_features = [ "structured_config" ]
 }
 
 fuchsia_structured_config_values("triage-detect-prod-config") {
diff --git a/src/diagnostics/sampler/BUILD.gn b/src/diagnostics/sampler/BUILD.gn
@@ -71,7 +71,6 @@ fuchsia_unittest_package("sampler-tests") {
 fuchsia_component_manifest("sampler-manifest") {
   component_name = "sampler"
   manifest = "meta/sampler.cml"
-  restricted_features = [ "structured_config" ]
 }
 
 fuchsia_component("sampler-component") {
diff --git a/src/identity/bin/password_authenticator/BUILD.gn b/src/identity/bin/password_authenticator/BUILD.gn
@@ -72,7 +72,6 @@ rustc_binary("bin") {
 fuchsia_component_manifest("manifest") {
   component_name = "password-authenticator"
   manifest = "meta/password-authenticator.cml"
-  restricted_features = [ "structured_config" ]
 }
 
 fuchsia_component("component") {
diff --git a/src/lib/component_hub/tests/BUILD.gn b/src/lib/component_hub/tests/BUILD.gn
@@ -37,7 +37,6 @@ fuchsia_component_manifest("foo_manifest") {
   testonly = true
   component_name = "foo"
   manifest = "meta/foo.cml"
-  restricted_features = [ "structured_config" ]
 }
 
 fuchsia_component("foo") {
diff --git a/src/lib/fuchsia-component-test/tests/echo_client_sc/BUILD.gn b/src/lib/fuchsia-component-test/tests/echo_client_sc/BUILD.gn
@@ -22,7 +22,6 @@ rustc_binary("bin") {
 fuchsia_component_manifest("manifest") {
   component_name = "echo_client_sc"
   manifest = "meta/echo_client_sc.cml"
-  restricted_features = [ "structured_config" ]
 }
 
 fuchsia_component("component") {
diff --git a/src/proc/bin/galaxies/galaxy.gni b/src/proc/bin/galaxies/galaxy.gni
@@ -30,7 +30,6 @@ template("starnix_galaxy_package") {
   fuchsia_component_manifest(manifest_target) {
     component_name = "starnix_runner"
     manifest = "//src/proc/bin/starnix/meta/starnix_runner.cml"
-    restricted_features = [ "structured_config" ]
   }
 
   fuchsia_component(component_target) {
diff --git a/src/proc/bin/starnix/BUILD.gn b/src/proc/bin/starnix/BUILD.gn
@@ -243,7 +243,6 @@ if (target_cpu == "x64") {
   # The starnix runner manifest, used by all galaxies.
   fuchsia_component_manifest("starnix_runner_manifest") {
     manifest = "meta/starnix_runner.cml"
-    restricted_features = [ "structured_config" ]
   }
 
   # The starnix runner configuration library, used by the Rust binary to parse configuration.
diff --git a/src/session/bin/session_manager/BUILD.gn b/src/session/bin/session_manager/BUILD.gn
@@ -77,7 +77,6 @@ rustc_library("lib") {
 fuchsia_component_manifest("manifest") {
   component_name = "session_manager"
   manifest = "meta/session_manager.cml"
-  restricted_features = [ "structured_config" ]
 }
 
 fuchsia_structured_config_rust_lib("session_manager_config") {
diff --git a/src/session/build/session_manager.gni b/src/session/build/session_manager.gni
@@ -27,7 +27,6 @@ template("session_manager_package") {
 
   fuchsia_component_manifest(manifest_target) {
     manifest = "//src/session/bin/session_manager/meta/session_manager.cml"
-    restricted_features = [ "structured_config" ]
     component_name = "session_manager"
   }
 
diff --git a/src/storage/fshost/BUILD.gn b/src/storage/fshost/BUILD.gn
@@ -421,7 +421,6 @@ fuchsia_component_manifest("test-fshost-manifest") {
   manifest_outputs = get_target_outputs(":test-fshost.cml")
   manifest = manifest_outputs[0]
   deps = [ ":test-fshost.cml" ]
-  restricted_features = [ "structured_config" ]
 }
 
 # This is a test version of fshost, not a component with fshost tests.
@@ -460,7 +459,6 @@ fuchsia_component_manifest("test-fshost-no-watcher-manifest") {
   manifest_outputs = get_target_outputs(":test-fshost-no-watcher.cml")
   manifest = manifest_outputs[0]
   deps = [ ":test-fshost-no-watcher.cml" ]
-  restricted_features = [ "structured_config" ]
 }
 
 # This is a test version of fshost with no block watcher.
@@ -556,7 +554,6 @@ fuchsia_component_manifest("fshost_manifest") {
   manifest = get_target_outputs(":fshost.cml")
   manifest = manifest[0]
   deps = [ ":fshost.cml" ]
-  restricted_features = [ "structured_config" ]
 }
 
 fuchsia_structured_config_cpp_elf_lib("fshost_config") {
diff --git a/src/storage/fshost/generated_fshost_config.gni b/src/storage/fshost/generated_fshost_config.gni
@@ -97,7 +97,6 @@ template("generated_fshost_config") {
   fuchsia_component_manifest(_manifest_target) {
     component_name = _component_name
     manifest = "//src/storage/fshost/meta/config.cml"
-    restricted_features = [ "structured_config" ]
     metadata = {
       # we don't want this in the packaged output, it's just to give cmc something to work with
       distribution_entries_barrier = []
diff --git a/src/sys/component_manager/tests/hub/BUILD.gn b/src/sys/component_manager/tests/hub/BUILD.gn
@@ -74,7 +74,6 @@ fuchsia_component_manifest("structured_config_reporter_manifest") {
   testonly = true
   component_name = "structured_config_reporter"
   manifest = "components/structured_config/meta/reporter.cml"
-  restricted_features = [ "structured_config" ]
 }
 
 fuchsia_component("structured_config_reporter") {
diff --git a/src/sys/component_manager/tests/structured_config/client_integration/cpp_driver/BUILD.gn b/src/sys/component_manager/tests/structured_config/client_integration/cpp_driver/BUILD.gn
@@ -40,10 +40,7 @@ fuchsia_component_manifest("receiver_manifest") {
   testonly = true
   component_name = "cpp_driver_receiver"
   manifest = "meta/receiver.cml"
-  restricted_features = [
-    "structured_config",
-    "services",
-  ]
+  restricted_features = [ "services" ]
 }
 
 fuchsia_driver_component("receiver_component") {
diff --git a/src/sys/component_manager/tests/structured_config/client_integration/cpp_elf/BUILD.gn b/src/sys/component_manager/tests/structured_config/client_integration/cpp_elf/BUILD.gn
@@ -24,7 +24,6 @@ fuchsia_component_manifest("manifest") {
   testonly = true
   component_name = "cpp_elf_receiver"
   manifest = "meta/receiver.cml"
-  restricted_features = [ "structured_config" ]
 }
 
 fuchsia_structured_config_cpp_elf_lib("config_lib") {
diff --git a/src/sys/component_manager/tests/structured_config/different_values/BUILD.gn b/src/sys/component_manager/tests/structured_config/different_values/BUILD.gn
@@ -33,7 +33,6 @@ fuchsia_component_manifest("receiver_manifest") {
   testonly = true
   component_name = "receiver"
   manifest = "//src/sys/component_manager/tests/structured_config/client_integration/rust/meta/receiver.cml"
-  restricted_features = [ "structured_config" ]
 }
 
 fuchsia_component("receiver_component") {
diff --git a/src/sys/pkg/bin/omaha-client/BUILD.gn b/src/sys/pkg/bin/omaha-client/BUILD.gn
@@ -121,7 +121,6 @@ grand_swd_binary("bin") {
 fuchsia_component_manifest("manifest") {
   component_name = "omaha-client-service"
   manifest = "meta/omaha-client-service.cml"
-  restricted_features = [ "structured_config" ]
 }
 
 fuchsia_component("component") {
diff --git a/src/ui/bin/brightness_manager/BUILD.gn b/src/ui/bin/brightness_manager/BUILD.gn
@@ -172,7 +172,6 @@ fuchsia_unittest_package("test-helpers-tests") {
 fuchsia_component_manifest("brightness_manager_manifest") {
   component_name = "brightness_manager"
   manifest = "meta/brightness_manager.cml"
-  restricted_features = [ "structured_config" ]
 }
 
 fuchsia_component("brightness_manager_component") {
diff --git a/tools/cmc/BUILD.gn b/tools/cmc/BUILD.gn
@@ -99,7 +99,6 @@ fuchsia_component_manifest("example_component_manifest") {
   restricted_features = [
     "services",
     "dynamic_offers",
-    "structured_config",
     "allow_long_names",
   ]
   component_name = "example"
diff --git a/tools/cmc/build/cml.gni b/tools/cmc/build/cml.gni
@@ -125,7 +125,10 @@ template("cm") {
     #
     # Useful for features which we want to allow globally in tree but
     # restrict out of tree.
-    restricted_features += [ "hub" ]
+    restricted_features += [
+      "hub",
+      "structured_config",
+    ]
 
     # Opt-in to the requested restricted_features.
     args += [ "--features" ] + restricted_features
diff --git a/tools/cmc/build/restricted_features/BUILD.gn b/tools/cmc/build/restricted_features/BUILD.gn
diff --git a/tools/configc/BUILD.gn b/tools/configc/BUILD.gn

Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,6 @@ rustc_binary("bin") {`
`12`	`12`
`13`	`13`	`fuchsia_component("to_configure") {`
`14`	`14`	`manifest = "meta/to_configure.cml"`
`15`		`- restricted_features = [ "structured_config" ]`
`16`	`15`	`deps = [ ":bin" ]`
`17`	`16`	`}`
`18`	`17`
Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,6 @@ executable("bin") {`
`39`	`39`	`fuchsia_component_manifest("manifest") {`
`40`	`40`	`component_name = "config_example"`
`41`	`41`	`manifest = "meta/config_example.cml"`
`42`		`- restricted_features = [ "structured_config" ]`
`43`	`42`	`}`
`44`	`43`
`45`	`44`	`fuchsia_component("component") {`
Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,6 @@ rustc_binary("bin") {`
`41`	`41`	`fuchsia_component_manifest("manifest") {`
`42`	`42`	`component_name = "config_example"`
`43`	`43`	`manifest = "meta/config_example.cml"`
`44`		`- restricted_features = [ "structured_config" ]`
`45`	`44`	`}`
`46`	`45`
`47`	`46`	`fuchsia_component("component") {`
Original file line number	Diff line number	Diff line change
`@@ -129,7 +129,6 @@ fuchsia_component_manifest("echo_server_sc_manifest") {`
`129`	`129`	`testonly = true`
`130`	`130`	`component_name = "echo_server_sc"`
`131`	`131`	`manifest = "meta/echo_server_sc.cml"`
`132`		`- restricted_features = [ "structured_config" ]`
`133`	`132`	`}`
`134`	`133`
`135`	`134`	`fuchsia_component("echo_server_sc") {`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,6 @@ import("//build/test.gni")`
`8`	`8`	`fuchsia_component_manifest("manifest") {`
`9`	`9`	`component_name = "console"`
`10`	`10`	`manifest = "meta/console.cml"`
`11`		`- restricted_features = [ "structured_config" ]`
`12`	`11`	`}`
`13`	`12`
`14`	`13`	`fuchsia_structured_config_cpp_elf_lib("console_config") {`
Original file line number	Diff line number	Diff line change
`@@ -95,7 +95,6 @@ rustc_binary("bin") {`
`95`	`95`	`fuchsia_component_manifest("wlanstack-manifest") {`
`96`	`96`	`component_name = "wlanstack"`
`97`	`97`	`manifest = "meta/wlanstack.cml"`
`98`		`- restricted_features = [ "structured_config" ]`
`99`	`98`	`}`
`100`	`99`
`101`	`100`	`fuchsia_component("wlanstack-comp") {`
Original file line number	Diff line number	Diff line change
`@@ -182,13 +182,11 @@ archivist_optimized_binary("bin") {`
`182`	`182`	`fuchsia_component_manifest("root-manifest") {`
`183`	`183`	`manifest = "meta/archivist.cml"`
`184`	`184`	`component_name = "archivist"`
`185`		`- restricted_features = [ "structured_config" ]`
`186`	`185`	`}`
`187`	`186`
`188`	`187`	`fuchsia_component_manifest("archivist-for-embedding-v2-manifest") {`
`189`	`188`	`manifest = "meta/archivist-for-embedding.cml"`
`190`	`189`	`component_name = "archivist-for-embedding"`
`191`		`- restricted_features = [ "structured_config" ]`
`192`	`190`	`}`
`193`	`191`
`194`	`192`	`# fxbug.dev/83213 Retain this component while out of tree tests depend on it`
Original file line number	Diff line number	Diff line change
`@@ -69,7 +69,6 @@ rustc_library("lib") {`
`69`	`69`	`fuchsia_component_manifest("triage-detect-manifest") {`
`70`	`70`	`manifest = "meta/triage-detect.cml"`
`71`	`71`	`component_name = "triage-detect"`
`72`		`- restricted_features = [ "structured_config" ]`
`73`	`72`	`}`
`74`	`73`
`75`	`74`	`fuchsia_structured_config_values("triage-detect-prod-config") {`