Rename set_x/unset_x spec functions to with_x/without_x (#609)

For spec where chaining is possible:
- Rename `set_x` to `with_x`
- Rename `unset_x` to `without_x`

Author: Catoverflow

src/controller_examples/fluent_controller/fluentbit/model/resource/daemon_set.rs

@@ -94,19 +94,19 @@ pub open spec fn update_daemon_set(fb: FluentBitView, found_daemon_set: DaemonSe
 
 pub open spec fn make_daemon_set(fb: FluentBitView) -> DaemonSetView {
     DaemonSetView::default()
-        .set_metadata(ObjectMetaView::default()
-            .set_name(make_daemon_set_name(fb))
-            .set_labels(make_labels(fb))
-            .set_annotations(fb.spec.annotations)
-            .set_owner_references(make_owner_references(fb))
-        ).set_spec(DaemonSetSpecView::default()
-            .set_selector(LabelSelectorView::default().set_match_labels(make_base_labels(fb)))
-            .set_template(PodTemplateSpecView::default()
-                .set_metadata(ObjectMetaView::default()
-                    .set_labels(make_labels(fb))
-                    .set_annotations(fb.spec.annotations)
+        .with_metadata(ObjectMetaView::default()
+            .with_name(make_daemon_set_name(fb))
+            .with_labels(make_labels(fb))
+            .with_annotations(fb.spec.annotations)
+            .with_owner_references(make_owner_references(fb))
+        ).with_spec(DaemonSetSpecView::default()
+            .with_selector(LabelSelectorView::default().with_match_labels(make_base_labels(fb)))
+            .with_template(PodTemplateSpecView::default()
+                .with_metadata(ObjectMetaView::default()
+                    .with_labels(make_labels(fb))
+                    .with_annotations(fb.spec.annotations)
                 )
-                .set_spec(make_fluentbit_pod_spec(fb))
+                .with_spec(make_fluentbit_pod_spec(fb))
             )
         )
 }
@@ -125,21 +125,21 @@ pub open spec fn make_fluentbit_pod_spec(fb: FluentBitView) -> PodSpecView {
                 PodSpecView::default().init_containers
             },
         volumes: Some({
-            let config_volume = VolumeView::default().set_name("config"@)
-                    .set_secret(SecretVolumeSourceView::default().set_secret_name(fb.spec.fluentbit_config_name));
-            let varlibcontainers_volume = VolumeView::default().set_name("varlibcontainers"@)
-                    .set_host_path(HostPathVolumeSourceView::default().set_path({
+            let config_volume = VolumeView::default().with_name("config"@)
+                    .with_secret(SecretVolumeSourceView::default().with_secret_name(fb.spec.fluentbit_config_name));
+            let varlibcontainers_volume = VolumeView::default().with_name("varlibcontainers"@)
+                    .with_host_path(HostPathVolumeSourceView::default().with_path({
                         if fb.spec.container_log_real_path.is_Some() {
                             fb.spec.container_log_real_path.get_Some_0()
                         } else { "/containers"@ }
                     }));
-            let varlogs_volume = VolumeView::default().set_name("varlogs"@)
-                    .set_host_path(HostPathVolumeSourceView::default().set_path("/var/log"@));
-            let systemd_volume = VolumeView::default().set_name("systemd"@)
-                    .set_host_path(HostPathVolumeSourceView::default().set_path("/var/log/journal"@));
+            let varlogs_volume = VolumeView::default().with_name("varlogs"@)
+                    .with_host_path(HostPathVolumeSourceView::default().with_path("/var/log"@));
+            let systemd_volume = VolumeView::default().with_name("systemd"@)
+                    .with_host_path(HostPathVolumeSourceView::default().with_path("/var/log/journal"@));
             if fb.spec.position_db.is_Some() {
-                let positions_volume = VolumeView::default().set_name("positions"@)
-                    .set_host_path(fb.spec.position_db.get_Some_0());
+                let positions_volume = VolumeView::default().with_name("positions"@)
+                    .with_host_path(fb.spec.position_db.get_Some_0());
                 if !fb.spec.disable_log_volumes && fb.spec.volumes.is_Some() {
                     fb.spec.volumes.get_Some_0().push(config_volume).push(varlibcontainers_volume).push(varlogs_volume)
                         .push(systemd_volume).push(positions_volume)
@@ -244,8 +244,8 @@ pub open spec fn make_fluentbit_pod_spec(fb: FluentBitView) -> PodSpecView {
                 }),
                 ports: {
                     let metrics_port = ContainerPortView::default()
-                        .set_name("metrics"@)
-                        .set_container_port({
+                        .with_name("metrics"@)
+                        .with_container_port({
                             let port = if fb.spec.metrics_port.is_Some() { fb.spec.metrics_port.get_Some_0() } else { 2020 };
                             port
                         });

src/controller_examples/fluent_controller/fluentbit/model/resource/role_binding.rs

@@ -94,19 +94,19 @@ pub open spec fn update_role_binding(fb: FluentBitView, found_role_binding: Role
 
 pub open spec fn make_role_binding(fb: FluentBitView) -> RoleBindingView {
     RoleBindingView::default()
-        .set_metadata(ObjectMetaView::default()
-            .set_name(make_role_binding_name(fb))
-            .set_owner_references(make_owner_references(fb))
-            .set_labels(make_labels(fb))
-            .set_annotations(fb.spec.annotations)
-        ).set_role_ref(RoleRefView::default()
-            .set_api_group("rbac.authorization.k8s.io"@)
-            .set_kind("Role"@)
-            .set_name(make_role_name(fb))
-        ).set_subjects(seq![SubjectView::default()
-            .set_kind("ServiceAccount"@)
-            .set_name(make_service_account_name(fb))
-            .set_namespace(fb.metadata.namespace.get_Some_0())
+        .with_metadata(ObjectMetaView::default()
+            .with_name(make_role_binding_name(fb))
+            .with_owner_references(make_owner_references(fb))
+            .with_labels(make_labels(fb))
+            .with_annotations(fb.spec.annotations)
+        ).with_role_ref(RoleRefView::default()
+            .with_api_group("rbac.authorization.k8s.io"@)
+            .with_kind("Role"@)
+            .with_name(make_role_name(fb))
+        ).with_subjects(seq![SubjectView::default()
+            .with_kind("ServiceAccount"@)
+            .with_name(make_service_account_name(fb))
+            .with_namespace(fb.metadata.namespace.get_Some_0())
         ])
 }
 

src/controller_examples/fluent_controller/fluentbit_config/model/resource/secret.rs

@@ -79,10 +79,10 @@ pub open spec fn make_secret_key(fbc: FluentBitConfigView) -> ObjectRef {
 
 pub open spec fn make_secret(fbc: FluentBitConfigView) -> SecretView {
     SecretView::default()
-        .set_metadata(ObjectMetaView::default()
-            .set_name(make_secret_name(fbc))
-            .set_owner_references(make_owner_references(fbc))
-        ).set_data(Map::empty()
+        .with_metadata(ObjectMetaView::default()
+            .with_name(make_secret_name(fbc))
+            .with_owner_references(make_owner_references(fbc))
+        ).with_data(Map::empty()
             .insert("fluent-bit.conf"@, fbc.spec.fluentbit_config)
             .insert("parsers.conf"@, fbc.spec.parsers_config)
         )

src/controller_examples/rabbitmq_controller/model/resource/common.rs

@@ -23,31 +23,31 @@ pub open spec fn make_owner_references(rabbitmq: RabbitmqClusterView) -> Seq<Own
 
 pub open spec fn make_secret(rabbitmq: RabbitmqClusterView, name: StringView, data: Map<StringView, StringView>) -> SecretView {
     SecretView::default()
-        .set_metadata(ObjectMetaView::default()
-            .set_name(name)
-            .set_namespace(rabbitmq.metadata.namespace.get_Some_0())
-            .set_owner_references(make_owner_references(rabbitmq))
-            .set_labels(make_labels(rabbitmq))
-            .set_annotations(rabbitmq.spec.annotations)
-        ).set_data(data)
+        .with_metadata(ObjectMetaView::default()
+            .with_name(name)
+            .with_namespace(rabbitmq.metadata.namespace.get_Some_0())
+            .with_owner_references(make_owner_references(rabbitmq))
+            .with_labels(make_labels(rabbitmq))
+            .with_annotations(rabbitmq.spec.annotations)
+        ).with_data(data)
 }
 
 pub open spec fn make_service(rabbitmq: RabbitmqClusterView, name: StringView, ports: Seq<ServicePortView>, cluster_ip: bool) -> ServiceView {
     ServiceView::default()
-        .set_metadata(ObjectMetaView::default()
-            .set_name(name)
-            .set_namespace(rabbitmq.metadata.namespace.get_Some_0())
-            .set_owner_references(make_owner_references(rabbitmq))
-            .set_labels(make_labels(rabbitmq))
-            .set_annotations(rabbitmq.spec.annotations)
-        ).set_spec({
+        .with_metadata(ObjectMetaView::default()
+            .with_name(name)
+            .with_namespace(rabbitmq.metadata.namespace.get_Some_0())
+            .with_owner_references(make_owner_references(rabbitmq))
+            .with_labels(make_labels(rabbitmq))
+            .with_annotations(rabbitmq.spec.annotations)
+        ).with_spec({
             let spec = ServiceSpecView::default()
-                .set_ports(ports)
-                .set_selector(Map::empty()
+                .with_ports(ports)
+                .with_selector(Map::empty()
                     .insert("app"@, rabbitmq.metadata.name.get_Some_0())
-                ).set_publish_not_ready_addresses(true);
+                ).with_publish_not_ready_addresses(true);
             if !cluster_ip {
-                spec.set_cluster_ip("None"@)
+                spec.with_cluster_ip("None"@)
             } else {
                 spec
             }

src/controller_examples/rabbitmq_controller/model/resource/headless_service.rs

@@ -102,8 +102,8 @@ pub open spec fn update_headless_service(rabbitmq: RabbitmqClusterView, found_he
 
 pub open spec fn make_headless_service(rabbitmq: RabbitmqClusterView) -> ServiceView {
     let mut ports = seq![
-        ServicePortView::default().set_name("epmd"@).set_port(4369),
-        ServicePortView::default().set_name("cluster-rpc"@).set_port(25672)
+        ServicePortView::default().with_name("epmd"@).with_port(4369),
+        ServicePortView::default().with_name("cluster-rpc"@).with_port(25672)
     ];
     make_service(rabbitmq, make_headless_service_name(rabbitmq), ports, false)
 }

src/controller_examples/rabbitmq_controller/model/resource/rabbitmq_plugins.rs

@@ -96,14 +96,14 @@ pub open spec fn update_plugins_config_map(rabbitmq: RabbitmqClusterView, found_
 
 pub open spec fn make_plugins_config_map(rabbitmq: RabbitmqClusterView) -> ConfigMapView {
     ConfigMapView::default()
-        .set_metadata(ObjectMetaView::default()
-            .set_name(make_plugins_config_map_name(rabbitmq))
-            .set_namespace(rabbitmq.metadata.namespace.get_Some_0())
-            .set_owner_references(make_owner_references(rabbitmq))
-            .set_labels(make_labels(rabbitmq))
-            .set_annotations(rabbitmq.spec.annotations)
+        .with_metadata(ObjectMetaView::default()
+            .with_name(make_plugins_config_map_name(rabbitmq))
+            .with_namespace(rabbitmq.metadata.namespace.get_Some_0())
+            .with_owner_references(make_owner_references(rabbitmq))
+            .with_labels(make_labels(rabbitmq))
+            .with_annotations(rabbitmq.spec.annotations)
         )
-        .set_data(Map::empty()
+        .with_data(Map::empty()
             .insert("enabled_plugins"@, "[rabbitmq_peer_discovery_k8s,rabbitmq_prometheus,rabbitmq_management]."@)
         )
 }

src/controller_examples/rabbitmq_controller/model/resource/role.rs

@@ -96,16 +96,16 @@ pub open spec fn update_role(rabbitmq: RabbitmqClusterView, found_role: RoleView
 
 pub open spec fn make_role(rabbitmq: RabbitmqClusterView) -> RoleView {
     RoleView::default()
-        .set_metadata(ObjectMetaView::default()
-            .set_name(make_role_name(rabbitmq))
-            .set_namespace(rabbitmq.metadata.namespace.get_Some_0())
-            .set_owner_references(make_owner_references(rabbitmq))
-            .set_labels(make_labels(rabbitmq))
-            .set_annotations(rabbitmq.spec.annotations)
-        ).set_rules(
+        .with_metadata(ObjectMetaView::default()
+            .with_name(make_role_name(rabbitmq))
+            .with_namespace(rabbitmq.metadata.namespace.get_Some_0())
+            .with_owner_references(make_owner_references(rabbitmq))
+            .with_labels(make_labels(rabbitmq))
+            .with_annotations(rabbitmq.spec.annotations)
+        ).with_rules(
             seq![
-                PolicyRuleView::default().set_api_groups(seq![""@]).set_resources(seq!["endpoints"@]).set_verbs(seq!["get"@]),
-                PolicyRuleView::default().set_api_groups(seq![""@]).set_resources(seq!["events"@]).set_verbs(seq!["create"@]),
+                PolicyRuleView::default().with_api_groups(seq![""@]).with_resources(seq!["endpoints"@]).with_verbs(seq!["get"@]),
+                PolicyRuleView::default().with_api_groups(seq![""@]).with_resources(seq!["events"@]).with_verbs(seq!["create"@]),
             ]
         )
 }

src/controller_examples/rabbitmq_controller/model/resource/role_binding.rs

@@ -96,20 +96,20 @@ pub open spec fn update_role_binding(rabbitmq: RabbitmqClusterView, found_role_b
 
 pub open spec fn make_role_binding(rabbitmq: RabbitmqClusterView) -> RoleBindingView {
     RoleBindingView::default()
-        .set_metadata(ObjectMetaView::default()
-            .set_name(make_role_binding_name(rabbitmq))
-            .set_namespace(rabbitmq.metadata.namespace.get_Some_0())
-            .set_owner_references(make_owner_references(rabbitmq))
-            .set_labels(make_labels(rabbitmq))
-            .set_annotations(rabbitmq.spec.annotations)
-        ).set_role_ref(RoleRefView::default()
-            .set_api_group("rbac.authorization.k8s.io"@)
-            .set_kind("Role"@)
-            .set_name(rabbitmq.metadata.name.get_Some_0() + "-peer-discovery"@)
-        ).set_subjects(seq![SubjectView::default()
-            .set_kind("ServiceAccount"@)
-            .set_name(rabbitmq.metadata.name.get_Some_0() + "-server"@)
-            .set_namespace(rabbitmq.metadata.namespace.get_Some_0())
+        .with_metadata(ObjectMetaView::default()
+            .with_name(make_role_binding_name(rabbitmq))
+            .with_namespace(rabbitmq.metadata.namespace.get_Some_0())
+            .with_owner_references(make_owner_references(rabbitmq))
+            .with_labels(make_labels(rabbitmq))
+            .with_annotations(rabbitmq.spec.annotations)
+        ).with_role_ref(RoleRefView::default()
+            .with_api_group("rbac.authorization.k8s.io"@)
+            .with_kind("Role"@)
+            .with_name(rabbitmq.metadata.name.get_Some_0() + "-peer-discovery"@)
+        ).with_subjects(seq![SubjectView::default()
+            .with_kind("ServiceAccount"@)
+            .with_name(rabbitmq.metadata.name.get_Some_0() + "-server"@)
+            .with_namespace(rabbitmq.metadata.namespace.get_Some_0())
         ])
 }
 

src/controller_examples/rabbitmq_controller/model/resource/service.rs

@@ -104,9 +104,9 @@ pub open spec fn update_main_service(rabbitmq: RabbitmqClusterView, found_main_s
 
 pub open spec fn make_main_service(rabbitmq: RabbitmqClusterView) -> ServiceView {
     let ports = seq![
-        ServicePortView::default().set_name("amqp"@).set_port(5672).set_app_protocol("amqp"@),
-        ServicePortView::default().set_name("management"@).set_port(15672).set_app_protocol("http"@),
-        ServicePortView::default().set_name("prometheus"@).set_port(15692).set_app_protocol("prometheus.io/metrics"@),
+        ServicePortView::default().with_name("amqp"@).with_port(5672).with_app_protocol("amqp"@),
+        ServicePortView::default().with_name("management"@).with_port(15672).with_app_protocol("http"@),
+        ServicePortView::default().with_name("prometheus"@).with_port(15692).with_app_protocol("prometheus.io/metrics"@),
     ];
     make_service(rabbitmq, make_main_service_name(rabbitmq), ports, true)
 }