refactor CRD downloads

function-hcl-ls/internal/features/crds/api.go

@@ -27,12 +27,6 @@ type CRDs struct {
 	schemas atomic.Pointer[resource.Schemas]
 }
 
-// Download processes the offline source definition and downloads a list
-// of images on to the filesystem.
-func Download(sourcesFile string, deleteCache bool) error {
-	return downloadCRDs(sourcesFile, deleteCache)
-}
-
 // New creates an instance of the CRD discovery feature.
 func New(c Config) *CRDs {
 	ret := &CRDs{

function-hcl-ls/internal/features/crds/store/source-store.go

@@ -10,7 +10,7 @@ import (
 // sourceInfo tracks the set of files and the schema for a single CRD source
 type sourceInfo struct {
 	sourcePath    string
-	source        *types.CRDSourceRuntime
+	source        *types.CRDSource
 	expandedFiles map[string]bool
 	schema        *resource.Schemas
 }

function-hcl-ls/internal/features/crds/store/store.go

@@ -120,11 +120,9 @@ func (s *Store) getSourceInfo(dir string) (ret types.CRDSource, _ error) {
 		return ret, fmt.Errorf("load source store at %s: no sources file or default directory", filePath)
 	}
 	return types.CRDSource{
-		Runtime: types.CRDSourceRuntime{
-			Scope: types.ScopeBoth,
-			Paths: []string{
-				filepath.Join(types.DefaultSourcesDir, "*.yaml"),
-			},
+		Scope: types.ScopeBoth,
+		Paths: []string{
+			filepath.Join(types.DefaultSourcesDir, "*.yaml"),
 		},
 	}, nil
 }
@@ -135,7 +133,7 @@ func (s *Store) loadSourceStoreAt(dir string) error {
 		return err
 	}
 	foundFiles := map[string]bool{}
-	for _, p := range src.Runtime.Paths {
+	for _, p := range src.Paths {
 		var pattern string
 		if filepath.IsAbs(p) {
 			pattern = p
@@ -168,13 +166,13 @@ func (s *Store) loadSourceStoreAt(dir string) error {
 	if ss == nil { // never before seen
 		ss = &sourceInfo{
 			sourcePath:    dir,
-			source:        &src.Runtime,
+			source:        &src,
 			expandedFiles: foundFiles,
 			schema:        emptySchema,
 		}
 	} else {
 		// but leave the last known schema for this one alone
-		ss.source = &src.Runtime
+		ss.source = &src
 		ss.expandedFiles = foundFiles
 	}
 	s.sources.put(ss)

function-hcl-ls/main.go

@@ -39,7 +39,6 @@ func main() {
 	cmd.Version = VersionString()
 	cmd.AddServeCommand(root)
 	cmd.AddVersionCommand(root)
-	cmd.AddDownloadCRDsCommand(root)
 	cmd.AddDumpASTCommand(root)
 
 	if err := root.Execute(); err != nil {

function-hcl-ls/types/v1/crd-source.go

@@ -16,22 +16,8 @@ const (
 	ScopeBoth       Scope = resource.ScopeBoth
 )
 
-// CRDSourceRuntime is used by the language server at runtime to
-// load schemas from filesystem paths.
-type CRDSourceRuntime struct {
-	Scope Scope    `json:"scope,omitempty"`
-	Paths []string `json:"paths"`
-}
-
-// CRDSourceOffline is the section used by tooling to download
-// CRDs from remote packages to the local filesystem.
-type CRDSourceOffline struct {
-	CacheDir string   `json:"cache-dir"`
-	Images   []string `json:"images"`
-}
-
 // CRDSource provides a source for loading CRDs.
 type CRDSource struct {
-	Runtime CRDSourceRuntime `json:"runtime"`
-	Offline CRDSourceOffline `json:"offline"`
+	Scope Scope    `json:"scope,omitempty"`
+	Paths []string `json:"paths"`
 }