Merge #11339

11339: Account for version when caching schemas r=iwahbe a=iwahbe

This is necessary to unblock pulumi/docs#8230

Co-authored-by: Ian Wahbe <ian@wahbe.com>

pkg/codegen/schema/loader.go

@@ -182,14 +182,31 @@ func (l *pluginLoader) LoadPackageReference(pkg string, version *semver.Version)
 }
 
 func LoadPackageReference(loader Loader, pkg string, version *semver.Version) (PackageReference, error) {
+	var ref PackageReference
+	var err error
 	if refLoader, ok := loader.(ReferenceLoader); ok {
-		return refLoader.LoadPackageReference(pkg, version)
+		ref, err = refLoader.LoadPackageReference(pkg, version)
+	} else {
+		p, pErr := loader.LoadPackage(pkg, version)
+		err = pErr
+		if err == nil {
+			ref = p.Reference()
+		}
 	}
-	p, err := loader.LoadPackage(pkg, version)
+
 	if err != nil {
 		return nil, err
 	}
-	return p.Reference(), nil
+
+	if pkg != ref.Name() || version != nil && ref.Version() != nil && !ref.Version().Equals(*version) {
+		if l, ok := loader.(*pluginLoader); ok {
+			return nil, fmt.Errorf("req: %s@%v: entries: %v (returned %s@%v)", pkg, version,
+				l.entries, ref.Name(), ref.Version())
+		}
+		return nil, fmt.Errorf("loader returned %s@%v: expected %s@%v", ref.Name(), ref.Version(), pkg, version)
+	}
+
+	return ref, nil
 }
 
 func (l *pluginLoader) loadSchemaBytes(pkg string, version *semver.Version) ([]byte, *semver.Version, error) {

sdk/go/common/workspace/plugins.go

@@ -672,7 +672,11 @@ func (info *PluginInfo) SetFileMetadata(path string) error {
 	info.LastUsedTime = tinfo.AccessTime()
 
 	if info.Kind == ResourcePlugin {
-		info.SchemaPath = filepath.Join(filepath.Dir(path), "schema-"+info.Name+".json")
+		var v string
+		if info.Version != nil {
+			v = "-" + info.Version.String() + "-"
+		}
+		info.SchemaPath = filepath.Join(filepath.Dir(path), "schema-"+info.Name+v+".json")
 		info.SchemaTime = tinfo.ModTime()
 	}