fwserver.ListResourceSchema++

Author: bbasata

internal/fwserver/server.go

@@ -125,6 +125,16 @@ type Server struct {
 	// access from race conditions.
 	listResourceFuncsMutex sync.Mutex
 
+	// listResourceSchemas is the cached ListResource Schemas for RPCs that
+	// need to convert configuration data from the protocol. If not found, it
+	// will be fetched from the [list.ListResource.ListResourceConfigSchema]
+	// method.
+	listResourceSchemas map[string]fwschema.Schema
+
+	// listResourceSchemasMutex is a mutex to protect concurrent
+	// listResourceSchemas access from race conditions.
+	listResourceSchemasMutex sync.RWMutex
+
 	// providerSchema is the cached Provider Schema for RPCs that need to
 	// convert configuration data from the protocol. If not found, it will be
 	// fetched from the Provider.GetSchema() method.

internal/fwserver/server_listresources.go

@@ -117,19 +117,48 @@ func (s *Server) ListResourceMetadatas(ctx context.Context) ([]ListResourceMetad
 	return listResourceMetadatas, diags
 }
 
+// ListResourceSchema returns the ListResource Schema for the given type name and
+// caches the result for later ListResource operations.
 func (s *Server) ListResourceSchema(ctx context.Context, typeName string) (fwschema.Schema, diag.Diagnostics) {
-	schemas, _ := s.ListResourceSchemas(ctx)
-	schema, ok := schemas[typeName]
-	if !ok {
-		return nil, diag.Diagnostics{
-			diag.NewErrorDiagnostic(
-				"ListResource Schema Not Found",
-				fmt.Sprintf("No ListResource schema was found for type %q.", typeName),
-			),
-		}
+	s.listResourceSchemasMutex.RLock()
+	listResourceSchema, ok := s.listResourceSchemas[typeName]
+	s.listResourceSchemasMutex.RUnlock()
+
+	if ok {
+		return listResourceSchema, nil
+	}
+
+	var diags diag.Diagnostics
+
+	listResource, listResourceDiags := s.ListResourceType(ctx, typeName)
+	diags.Append(listResourceDiags...)
+	if diags.HasError() {
+		return nil, diags
+	}
+
+	schemaReq := list.ListResourceSchemaRequest{}
+	schemaResp := list.ListResourceSchemaResponse{}
+
+	logging.FrameworkTrace(ctx, "Calling provider defined ListResourceConfigSchema method", map[string]interface{}{logging.KeyListResourceType: typeName})
+	listResource.ListResourceConfigSchema(ctx, schemaReq, &schemaResp)
+	logging.FrameworkTrace(ctx, "Called provider defined ListResourceConfigSchema method", map[string]interface{}{logging.KeyListResourceType: typeName})
+
+	diags.Append(schemaResp.Diagnostics...)
+	if diags.HasError() {
+		return schemaResp.Schema, diags
+	}
+
+	s.listResourceSchemasMutex.Lock()
+
+	if s.listResourceSchemas == nil {
+		s.listResourceSchemas = make(map[string]fwschema.Schema)
 	}
 
-	return schema, nil
+	s.listResourceSchemas[typeName] = schemaResp.Schema
+
+	s.listResourceSchemasMutex.Unlock()
+
+	return schemaResp.Schema, diags
 }
 
 // ListResourceSchemas returns a map of ListResource Schemas for the