Skip to content

Commit

Permalink
Merge #11610
Browse files Browse the repository at this point in the history
11610: Fix generate flag for pcl convert r=Frassle a=Frassle

Had the setting of this flag to false on the "read pcl", but it actually needs to be set on the "write pcl" side. That is if we write out a PCL project, don't try to install dependencies on it.

Co-authored-by: Fraser Waters <fraser@pulumi.com>
  • Loading branch information
bors[bot] and Frassle committed Dec 9, 2022
2 parents a5e7c3a + 809ccaf commit 43b03d6
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions pkg/cmd/pulumi/convert.go
Original file line number Diff line number Diff line change
Expand Up @@ -178,6 +178,8 @@ func runConvert(
projectGenerator = yamlgen.GenerateProject
case "pulumi", "pcl":
if cmdutil.IsTruthy(os.Getenv("PULUMI_DEV")) {
// No plugin for PCL to install dependencies with
generateOnly = true
projectGenerator = pclGenerateProject
break
}
Expand Down Expand Up @@ -214,8 +216,6 @@ func runConvert(
}
} else if from == "pcl" {
if cmdutil.IsTruthy(os.Getenv("PULUMI_DEV")) {
// No plugin for PCL to generate with
generateOnly = true
proj, program, err = pclEject(cwd, loader)
if err != nil {
return result.FromError(fmt.Errorf("could not load pcl program: %w", err))
Expand Down

0 comments on commit 43b03d6

Please sign in to comment.