addressing review comments

Author: tsivaprasad

server/internal/orchestrator/swarm/rag_config_resource.go

@@ -44,20 +44,14 @@ type RAGConfigResource struct {
 	DatabaseName      string                     `json:"database_name"`
 	DatabaseHost      string                     `json:"database_host"`
 	DatabasePort      int                        `json:"database_port"`
-	Username          string                     `json:"username"`
-	Password          string                     `json:"password"`
 }
 
 func (r *RAGConfigResource) ResourceVersion() string {
 	return "1"
 }
 
 func (r *RAGConfigResource) DiffIgnore() []string {
-	return []string{
-		// Credentials are populated at runtime from ServiceUserRole.
-		"/username",
-		"/password",
-	}
+	return nil
 }
 
 func (r *RAGConfigResource) Identifier() resource.Identifier {
@@ -91,10 +85,6 @@ func (r *RAGConfigResource) Refresh(ctx context.Context, rc *resource.Context) e
 		return fmt.Errorf("failed to get service data dir path: %w", err)
 	}
 
-	if err := r.populateCredentials(rc); err != nil {
-		return err
-	}
-
 	_, err = readResourceFile(fs, filepath.Join(dirPath, ragConfigFilename))
 	if err != nil {
 		return fmt.Errorf("failed to read RAG config: %w", err)
@@ -114,11 +104,7 @@ func (r *RAGConfigResource) Create(ctx context.Context, rc *resource.Context) er
 		return fmt.Errorf("failed to get service data dir path: %w", err)
 	}
 
-	if err := r.populateCredentials(rc); err != nil {
-		return err
-	}
-
-	return r.writeConfigFile(fs, dirPath)
+	return r.writeConfigFile(fs, dirPath, rc)
 }
 
 func (r *RAGConfigResource) Update(ctx context.Context, rc *resource.Context) error {
@@ -132,26 +118,27 @@ func (r *RAGConfigResource) Update(ctx context.Context, rc *resource.Context) er
 		return fmt.Errorf("failed to get service data dir path: %w", err)
 	}
 
-	if err := r.populateCredentials(rc); err != nil {
-		return err
-	}
-
-	return r.writeConfigFile(fs, dirPath)
+	return r.writeConfigFile(fs, dirPath, rc)
 }
 
 func (r *RAGConfigResource) Delete(ctx context.Context, rc *resource.Context) error {
 	// Cleanup is handled by the parent DirResource deletion.
 	return nil
 }
 
-func (r *RAGConfigResource) writeConfigFile(fs afero.Fs, dirPath string) error {
+func (r *RAGConfigResource) writeConfigFile(fs afero.Fs, dirPath string, rc *resource.Context) error {
+	userRole, err := resource.FromContext[*ServiceUserRole](rc, ServiceUserRoleIdentifier(r.ServiceID, ServiceUserRoleRO))
+	if err != nil {
+		return fmt.Errorf("failed to get RAG service user role from state: %w", err)
+	}
+
 	content, err := GenerateRAGConfig(&RAGConfigParams{
 		Config:       r.Config,
 		DatabaseName: r.DatabaseName,
 		DatabaseHost: r.DatabaseHost,
 		DatabasePort: r.DatabasePort,
-		Username:     r.Username,
-		Password:     r.Password,
+		Username:     userRole.Username,
+		Password:     userRole.Password,
 		KeysDir:      ragKeysContainerDir,
 	})
 	if err != nil {
@@ -168,15 +155,3 @@ func (r *RAGConfigResource) writeConfigFile(fs afero.Fs, dirPath string) error {
 
 	return nil
 }
-
-// populateCredentials fetches username and password from the ServiceUserRole
-// resource in the current reconciliation context.
-func (r *RAGConfigResource) populateCredentials(rc *resource.Context) error {
-	userRole, err := resource.FromContext[*ServiceUserRole](rc, ServiceUserRoleIdentifier(r.ServiceID, ServiceUserRoleRO))
-	if err != nil {
-		return fmt.Errorf("failed to get RAG service user role from state: %w", err)
-	}
-	r.Username = userRole.Username
-	r.Password = userRole.Password
-	return nil
-}

server/internal/orchestrator/swarm/rag_config_resource_test.go

@@ -46,17 +46,8 @@ func TestRAGConfigResource_Executor(t *testing.T) {
 func TestRAGConfigResource_DiffIgnore(t *testing.T) {
 	r := &RAGConfigResource{}
 	ignored := r.DiffIgnore()
-	want := map[string]bool{
-		"/username": true,
-		"/password": true,
-	}
-	if len(ignored) != len(want) {
-		t.Errorf("DiffIgnore() length = %d, want %d", len(ignored), len(want))
-	}
-	for _, path := range ignored {
-		if !want[path] {
-			t.Errorf("unexpected path in DiffIgnore(): %q", path)
-		}
+	if len(ignored) != 0 {
+		t.Errorf("DiffIgnore() = %v, want empty", ignored)
 	}
 }