maxmustermann/pulumi
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into ctpp

Browse source
This commit is contained in:
Fraser Waters 2021-11-04 21:00:51 +00:00
parent 3e73c036fb f8a98b2a86
commit 12c0188329
8 changed files with 12 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
.devcontainer/Dockerfile
View file

@ -22,6 +22,7 @@ ARG USER_GID=$USER_UID
RUN groupadd --gid $USER_GID $USER_NAME \
&& useradd --uid $USER_UID --gid $USER_GID --shell /bin/bash -m $USER_NAME \
&& mkdir -p /etc/sudoers.d \
&& echo "$USER_NAME ALL=(ALL:ALL) NOPASSWD: ALL" > /etc/sudoers.d/$USER_NAME \
&& chmod 0440 /etc/sudoers.d/$USER_NAME

2
CHANGELOG_PENDING.md
View file

@ -3,3 +3,5 @@
### Bug Fixes
- [programgen/go] - Don't change imported resource names.
[#8353](https://github.com/pulumi/pulumi/pull/8353)

8
pkg/codegen/go/gen_program.go
View file

@ -431,7 +431,7 @@ func (g *generator) genResourceOptions(w io.Writer, block *model.Block) {
func (g *generator) genResource(w io.Writer, r *pcl.Resource) {
resName := makeValidIdentifier(r.Name())
resName, resNameVar := r.Name(), makeValidIdentifier(r.Name())
pkg, mod, typ, _ := r.DecomposeToken()
if mod == "" || strings.HasPrefix(mod, "/") || strings.HasPrefix(mod, "index/") {
mod = pkg
@ -487,7 +487,7 @@ func (g *generator) genResource(w io.Writer, r *pcl.Resource) {
rangeExpr, temps := g.lowerExpression(r.Options.Range, rangeType)
g.genTemps(w, temps)
g.Fgenf(w, "var %s []*%s.%s\n", resName, modOrAlias, typ)
g.Fgenf(w, "var %s []*%s.%s\n", resNameVar, modOrAlias, typ)
// ahead of range statement declaration generate the resource instantiation
// to detect and removed unused k,v variables
@ -502,11 +502,11 @@ func (g *generator) genResource(w io.Writer, r *pcl.Resource) {
g.Fgenf(w, "for key0, %s := range %.v {\n", valVar, rangeExpr)
g.Fgen(w, instantiation)
g.Fgenf(w, "%s = append(%s, __res)\n", resName, resName)
g.Fgenf(w, "%[1]s = append(%[1]s, __res)\n", resNameVar)
g.Fgenf(w, "}\n")
} else {
instantiate(resName, fmt.Sprintf("%q", resName), w)
instantiate(resNameVar, fmt.Sprintf("%q", resName), w)
}
}

2
pkg/codegen/internal/test/testdata/random-pet-pp/dotnet/random-pet.cs vendored
View file

@ -5,7 +5,7 @@ class MyStack : Stack
{
public MyStack()
{
var random_pet = new Random.RandomPet("random_pet", new Random.RandomPetArgs
var random_pet = new Random.RandomPet("random-pet", new Random.RandomPetArgs
{
Prefix = "doggo",
});

2
pkg/codegen/internal/test/testdata/random-pet-pp/go/random-pet.go vendored
View file

@ -7,7 +7,7 @@ import (
func main() {
pulumi.Run(func(ctx *pulumi.Context) error {
_, err := random.NewRandomPet(ctx, "random_pet", &random.RandomPetArgs{
_, err := random.NewRandomPet(ctx, "random-pet", &random.RandomPetArgs{
Prefix: pulumi.String("doggo"),
})
if err != nil {

2
pkg/codegen/internal/test/testdata/random-pet-pp/nodejs/random-pet.ts vendored
View file

@ -1,4 +1,4 @@
import * as pulumi from "@pulumi/pulumi";
import * as random from "@pulumi/random";
const random_pet = new random.RandomPet("random_pet", {prefix: "doggo"});
const random_pet = new random.RandomPet("random-pet", {prefix: "doggo"});

2
pkg/codegen/internal/test/testdata/random-pet-pp/python/random-pet.py vendored
View file

@ -1,4 +1,4 @@
import pulumi
import pulumi_random as random
random_pet = random.RandomPet("random_pet", prefix="doggo")
random_pet = random.RandomPet("random-pet", prefix="doggo")

2
pkg/codegen/internal/test/testdata/random-pet-pp/random-pet.pp vendored
View file

@ -1,3 +1,3 @@
resource random_pet "random:index/randomPet:RandomPet" {
resource random-pet "random:index/randomPet:RandomPet" {
prefix = "doggo"
}