fmt

Author: mschuwalow

cli/golem-cli/src/model/component.rs

@@ -13,19 +13,15 @@
 // limitations under the License.
 
 use crate::agent_id_display::SourceLanguage;
+use crate::agent_id_display::render_type_for_language;
+use crate::model::app_raw;
 use crate::model::environment::ResolvedEnvironmentIdentity;
 use crate::model::worker::RawAgentId;
 use chrono::{DateTime, Utc};
 use golem_common::base_model::component_metadata::AgentTypeProvisionConfig;
 use golem_common::model::agent::AgentTypeName;
-use golem_common::model::card::{PolymorphicCard, PolymorphicManifestCard};
-use golem_common::model::card::recipient::RecipientMonomorphizationContext;
-use golem_common::model::agent::{
-    AgentType, ComponentModelElementSchema, DataSchema, ElementSchema,
-};
 use golem_common::model::card::PolymorphicManifestPermissionPattern;
 use golem_common::model::card::recipient::{RecipientMonomorphizationContext, RecipientPattern};
-use golem_common::model::card::{PolymorphicCard, PolymorphicManifestPermissionPattern};
 use golem_common::model::component::{
     AgentConfigEntryDto, ComponentDto, ComponentId, ComponentRevision,
 };
@@ -34,12 +30,9 @@ use golem_common::model::component::{
     ArchiveFilePath, PluginInstallation,
 };
 use golem_common::model::component::{AgentFilePermissions, ComponentName};
+use golem_common::model::environment::EnvironmentId;
 use golem_common::schema::agent::{AgentTypeSchema, FieldSource, InputSchema, OutputSchema};
 use golem_common::schema::graph::SchemaGraph;
-use golem_common::model::component_metadata::default_agent_initial_card;
-use crate::agent_id_display::render_type_for_language;
-use crate::model::app_raw;
-use golem_common::model::environment::EnvironmentId;
 use heck::{ToLowerCamelCase, ToSnakeCase};
 use itertools::Itertools;
 use serde::{Deserialize, Serialize};
@@ -433,7 +426,6 @@ pub fn agent_interface_name(component: &ComponentDto, agent_type_name: &str) ->
     }
 }
 
-
 #[cfg(test)]
 mod tests {
     use super::{AgentTypeManifestProvisionConfig, ParsedInitialPermissionCard};

golem-common/src/base_model/component.rs

@@ -24,12 +24,12 @@ use crate::base_model::plugin_registration::PluginRegistrationId;
 use crate::base_model::validate_lower_kebab_case_identifier;
 use crate::base_model::worker::AgentConfigEntryDto;
 use crate::model::agent::AgentTypeName;
-use crate::schema::agent::AgentTypeSchema;
 use crate::model::card::recipient::RecipientPattern;
 use crate::model::card::{
     PolymorphicCard, PolymorphicPermissionPattern, default_agent_initial_permission_grants,
     render_polymorphic_permission,
 };
+use crate::schema::agent::AgentTypeSchema;
 use crate::{
     declare_enums, declare_revision, declare_structs, declare_transparent_newtypes, declare_unions,
     newtype_uuid,

golem-common/src/base_model/component_metadata.rs

@@ -15,8 +15,8 @@
 use crate::base_model::component::{InitialAgentFile, InstalledPlugin};
 use crate::base_model::worker::TypedAgentConfigEntry;
 use crate::model::agent::AgentTypeName;
-use crate::schema::AgentTypeSchema;
 use crate::model::card::PolymorphicCard;
+use crate::schema::AgentTypeSchema;
 use serde::{Deserialize, Serialize, Serializer};
 use std::collections::BTreeMap;
 use std::fmt;

golem-registry-service/src/services/component/write.rs

@@ -828,7 +828,7 @@ impl ComponentWriteService {
         component_revision: ComponentRevision,
         update: AgentTypeProvisionConfigUpdate,
         uploaded_files: &HashMap<ArchiveFilePath, (AgentFileContentHash, u64)>,
-        agent_type: &AgentType,
+        agent_type: &AgentTypeSchema,
         environment: &Environment,
         auth: &AuthCtx,
     ) -> Result<AgentTypeProvisionConfig, ComponentError> {

golem-test-framework/src/config/dsl_impl.rs

@@ -16,8 +16,7 @@ use crate::components::redis::Redis;
 use crate::config::TestDependencies;
 use crate::dsl::{
     AgentResult, EnvironmentOptions, TestDsl, TestDslExtended, WorkerLogEventStream,
-    build_ifs_archive,
-    default_agent_type_provision_config_creation_for_account,
+    build_ifs_archive, default_agent_type_provision_config_creation_for_account,
 };
 use crate::model::IFSEntry;
 use anyhow::{Context, anyhow};

golem-worker-executor-test-utils/src/dsl_impl.rs

@@ -32,8 +32,8 @@ use golem_api_grpc::proto::golem::workerexecutor::v1::{
 use golem_common::base_model::component_metadata::AgentTypeProvisionConfig;
 use golem_common::base_model::worker::TypedAgentConfigEntry;
 use golem_common::model::PromiseId;
-use golem_common::model::agent::ParsedAgentId;
 use golem_common::model::account::AccountEmail;
+use golem_common::model::agent::ParsedAgentId;
 use golem_common::model::agent::{AgentFileContentHash, AgentTypeName};
 use golem_common::model::component::{
     AgentFilePath, AgentTypeProvisionConfigCreation, AgentTypeProvisionConfigUpdate,

integration-tests/tests/api/component.rs

@@ -400,11 +400,14 @@ async fn component_update_preserves_existing_provision_config_when_omitted(
         updated_component
             .metadata
             .agent_type_config(&AgentTypeName("CounterAgent".to_string()))
-            .unwrap_or_default(),
-        &[golem_common::model::worker::TypedAgentConfigEntry {
-            path: vec!["var1".to_string()],
-            value: ValueAndType::new(Value::String("value1".to_string()), str())
-        }]
+            .unwrap_or_default()
+            .iter()
+            .map(|e| (e.path.clone(), e.value.value().clone()))
+            .collect::<Vec<_>>(),
+        vec![(
+            vec!["var1".to_string()],
+            SchemaValue::String("value1".to_string())
+        )]
     );
     assert_eq!(
         updated_component

openapi/golem-registry-service.yaml

@@ -8163,20 +8163,6 @@ components:
           format: uint64
         secretValue:
           $ref: '#/components/schemas/OptionalFieldUpdate_SchemaValue'
-    AgentTypeInitialPermissionBoundCreation:
-      type: object
-      title: AgentTypeInitialPermissionBoundCreation
-      properties:
-        positive:
-          type: array
-          default: []
-          items:
-            type: string
-        negative:
-          type: array
-          default: []
-          items:
-            type: string
     AgentTypeInitialPermission:
       type: object
       title: AgentTypeInitialPermission
@@ -8199,6 +8185,51 @@ components:
           - default:
               negative: []
               positive: []
+    AgentTypeInitialPermissionBoundCreation:
+      type: object
+      title: AgentTypeInitialPermissionBoundCreation
+      properties:
+        positive:
+          type: array
+          default: []
+          items:
+            type: string
+        negative:
+          type: array
+          default: []
+          items:
+            type: string
+    AgentTypeProvisionConfig:
+      type: object
+      title: AgentTypeProvisionConfig
+      description: |-
+        Per-agent-type provisioning configuration stored alongside AgentType declarations
+        in ComponentMetadata. Holds runtime setup data separate from agent type declarations.
+      required:
+      - initialPermission
+      - env
+      - config
+      - plugins
+      - files
+      properties:
+        initialPermission:
+          $ref: '#/components/schemas/PolymorphicCard'
+        env:
+          type: object
+          additionalProperties:
+            type: string
+        config:
+          type: array
+          items:
+            $ref: '#/components/schemas/TypedAgentConfigEntry'
+        plugins:
+          type: array
+          items:
+            $ref: '#/components/schemas/InstalledPlugin'
+        files:
+          type: array
+          items:
+            $ref: '#/components/schemas/InitialAgentFile'
     AgentTypeProvisionConfigCreation:
       type: object
       title: AgentTypeProvisionConfigCreation
@@ -10174,6 +10205,26 @@ components:
           type: array
           items:
             $ref: '#/components/schemas/PathSegment'
+    InitialAgentFile:
+      type: object
+      title: InitialAgentFile
+      required:
+      - contentHash
+      - path
+      - permissions
+      - size
+      properties:
+        contentHash:
+          type: string
+          format: hash
+        path:
+          type: string
+          description: Absolute path in an agent's filesystem.
+        permissions:
+          $ref: '#/components/schemas/AgentFilePermissions'
+        size:
+          type: integer
+          format: uint64
     InputSchema:
       type: object
       oneOf:
@@ -10190,6 +10241,43 @@ components:
             type: array
             items:
               $ref: '#/components/schemas/NamedField'
+    InstalledPlugin:
+      type: object
+      title: InstalledPlugin
+      required:
+      - environmentPluginGrantId
+      - priority
+      - parameters
+      - pluginRegistrationId
+      - pluginName
+      - pluginVersion
+      properties:
+        environmentPluginGrantId:
+          type: string
+          format: uuid
+        priority:
+          type: integer
+          format: int32
+          title: |-
+            Priority of a given plugin. Plugins with a lower priority will be applied before plugins with a higher priority.
+            There can only be a single plugin with a given priority installed to a component.
+        parameters:
+          type: object
+          additionalProperties:
+            type: string
+        pluginRegistrationId:
+          type: string
+          format: uuid
+        pluginName:
+          type: string
+        pluginVersion:
+          type: string
+        oplogProcessorComponentId:
+          type: string
+          format: uuid
+        oplogProcessorComponentRevision:
+          type: integer
+          format: uint64
     KnownExports:
       type: object
       title: KnownExports
@@ -11100,6 +11188,8 @@ components:
           type: string
           format: uuid
           description: EnvironmentPluginGrantId to identify the plugin to update
+    PolymorphicCard:
+      type: object
     ProducerField:
       type: object
       title: ProducerField
@@ -12541,105 +12631,6 @@ components:
           - nullable: true
         metadata:
           $ref: '#/components/schemas/MetadataEnvelope'
-    AgentTypeProvisionConfig:
-      type: object
-      title: AgentTypeProvisionConfig
-      description: |-
-        Per-agent-type provisioning configuration stored alongside AgentType declarations
-        in ComponentMetadata. Holds runtime setup data separate from agent type declarations.
-      required:
-      - initialPermission
-      - env
-      - config
-      - plugins
-      - files
-      properties:
-        initialPermission:
-          $ref: '#/components/schemas/PolymorphicCard'
-        env:
-          type: object
-          additionalProperties:
-            type: string
-        config:
-          type: array
-          items:
-            $ref: '#/components/schemas/TypedAgentConfigEntry'
-        plugins:
-          type: array
-          items:
-            $ref: '#/components/schemas/InstalledPlugin'
-        files:
-          type: array
-          items:
-            $ref: '#/components/schemas/InitialAgentFile'
-    InitialAgentFile:
-      type: object
-      title: InitialAgentFile
-      required:
-      - contentHash
-      - path
-      - permissions
-      - size
-      properties:
-        contentHash:
-          type: string
-          format: hash
-        path:
-          type: string
-          description: Absolute path in an agent's filesystem.
-        permissions:
-          $ref: '#/components/schemas/AgentFilePermissions'
-        size:
-          type: integer
-          format: uint64
-    InstalledPlugin:
-      type: object
-      title: InstalledPlugin
-      required:
-      - environmentPluginGrantId
-      - priority
-      - parameters
-      - pluginRegistrationId
-      - pluginName
-      - pluginVersion
-      properties:
-        environmentPluginGrantId:
-          type: string
-          format: uuid
-        priority:
-          type: integer
-          format: int32
-          title: |-
-            Priority of a given plugin. Plugins with a lower priority will be applied before plugins with a higher priority.
-            There can only be a single plugin with a given priority installed to a component.
-        parameters:
-          type: object
-          additionalProperties:
-            type: string
-        pluginRegistrationId:
-          type: string
-          format: uuid
-        pluginName:
-          type: string
-        pluginVersion:
-          type: string
-        oplogProcessorComponentId:
-          type: string
-          format: uuid
-        oplogProcessorComponentRevision:
-          type: integer
-          format: uint64
-    PolymorphicCard:
-      type: object
-    ValueAndType:
-      type: object
-      required:
-      - typ
-      - value
-      properties:
-        typ:
-          $ref: '#/components/schemas/AnalysedType'
-        value: {}
     VersionInfo:
       type: object
       title: VersionInfo
@@ -12667,3 +12658,4 @@ components:
     Token:
       type: http
       scheme: bearer
+