Skip to content

Commit

Permalink
Merge #11315
Browse files Browse the repository at this point in the history 
11315: Add default dependencies for {.NET,nodejs} r=iwahbe a=iwahbe

Fixes #11241
Fixes #11237

Co-authored-by: Ian Wahbe <ian@wahbe.com>
  • Loading branch information
@bors @iwahbe
bors[bot] and iwahbe committed Nov 10, 2022
2 parents 42cb2c8 + 7c4bfa1 commit e6e027e
Show file tree
Hide file tree
Showing 67 changed files with 100 additions and 36 deletions.
4 changes: 4 additions & 0 deletions .../pending/20221109--sdkgen-dotnet-nodejs--add-default-dependencies-for-generated-sdks.yaml
View file
@@ -0,0 +1,4 @@
changes:
- type: feat
scope: sdkgen/dotnet,nodejs
description: Add default dependencies for generated SDKs.
6 changes: 6 additions & 0 deletions pkg/codegen/dotnet/gen.go
View file
Expand Up @@ -2190,6 +2190,12 @@ func genProjectFile(pkg *schema.Package,
packageReferences map[string]string,
projectReferences []string) ([]byte, error) {

if packageReferences == nil {
packageReferences = map[string]string{}
}
if _, ok := packageReferences["Pulumi"]; !ok {
packageReferences["Pulumi"] = "3.*"
}
w := &bytes.Buffer{}
err := csharpProjectFileTemplate.Execute(w, csharpProjectFileTemplateContext{
XMLDoc: fmt.Sprintf(`.\%s.xml`, assemblyName),
Expand Down
14 changes: 10 additions & 4 deletions pkg/codegen/nodejs/gen.go
View file
Expand Up @@ -42,6 +42,11 @@ import (
"github.com/pulumi/pulumi/sdk/v3/go/common/util/contract"
)

// The minimum version of @pulumi/pulumi compatible with the generated SDK.
const MinimumValidSDKVersion string = "^3.42.0"
const MinimumTypescriptVersion string = "^4.3.5"
const MinimumNodeTypesVersion string = "^14"

type typeDetails struct {
outputType bool
inputType bool
Expand Down Expand Up @@ -2190,8 +2195,9 @@ func genNPMPackageMetadata(pkg *schema.Package, info NodePackageInfo) string {
if info.TypeScriptVersion != "" {
devDependencies["typescript"] = info.TypeScriptVersion
} else {
devDependencies["typescript"] = "^4.3.5"
devDependencies["typescript"] = MinimumTypescriptVersion
}
devDependencies["@types/node"] = MinimumNodeTypesVersion

version := "${VERSION}"
versionSet := pkg.Version != nil && info.RespectSchemaVersion
Expand Down Expand Up @@ -2269,10 +2275,10 @@ func genNPMPackageMetadata(pkg *schema.Package, info NodePackageInfo) string {
if npminfo.Dependencies[sdkPack] == "" &&
npminfo.DevDependencies[sdkPack] == "" &&
npminfo.PeerDependencies[sdkPack] == "" {
if npminfo.PeerDependencies == nil {
npminfo.PeerDependencies = make(map[string]string)
if npminfo.Dependencies == nil {
npminfo.Dependencies = make(map[string]string)
}
npminfo.PeerDependencies["@pulumi/pulumi"] = "latest"
npminfo.Dependencies["@pulumi/pulumi"] = MinimumValidSDKVersion
}

// Now write out the serialized form.
Expand Down
1 change: 1 addition & 0 deletions pkg/codegen/testing/test/testdata/azure-native-nested-types/dotnet/Pulumi.AzureNative.csproj
View file
Expand Up @@ -45,6 +45,7 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Pulumi" Version="3.*" />
<PackageReference Include="System.Collections.Immutable" Version="5.0.0" />
</ItemGroup>

Expand Down
1 change: 1 addition & 0 deletions pkg/codegen/testing/test/testdata/azure-native-nested-types/nodejs/package.json
View file
Expand Up @@ -19,6 +19,7 @@
"@pulumi/pulumi": "^3.0.0"
},
"devDependencies": {
"@types/node": "^14",
"typescript": "^4.3.5"
},
"pulumi": {
Expand Down
1 change: 1 addition & 0 deletions pkg/codegen/testing/test/testdata/cyclic-types/dotnet/Pulumi.Example.csproj
View file
Expand Up @@ -45,6 +45,7 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Pulumi" Version="3.*" />
</ItemGroup>

<ItemGroup>
Expand Down
1 change: 1 addition & 0 deletions pkg/codegen/testing/test/testdata/cyclic-types/nodejs/package.json
View file
Expand Up @@ -9,6 +9,7 @@
"@pulumi/pulumi": "^3.12"
},
"devDependencies": {
"@types/node": "^14",
"typescript": "^3.7.0"
},
"pulumi": {
Expand Down
1 change: 1 addition & 0 deletions pkg/codegen/testing/test/testdata/dash-named-schema/dotnet/Pulumi.FooBar.csproj
View file
Expand Up @@ -45,6 +45,7 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Pulumi" Version="3.*" />
<PackageReference Include="Pulumi.Aws" Version="4.20" ExcludeAssets="contentFiles" />
<PackageReference Include="Pulumi.Kubernetes" Version="3.7" ExcludeAssets="contentFiles" />
<PackageReference Include="Pulumi.Random" Version="4.2" ExcludeAssets="contentFiles" />
Expand Down
1 change: 1 addition & 0 deletions pkg/codegen/testing/test/testdata/dash-named-schema/nodejs/package.json
View file
Expand Up @@ -9,6 +9,7 @@
"@pulumi/pulumi": "^3.12"
},
"devDependencies": {
"@types/node": "^14",
"typescript": "^3.7.0"
},
"pulumi": {
Expand Down
1 change: 1 addition & 0 deletions pkg/codegen/testing/test/testdata/dashed-import-schema/dotnet/Pulumi.Plant.csproj
View file
Expand Up @@ -45,6 +45,7 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Pulumi" Version="3.*" />
</ItemGroup>

<ItemGroup>
Expand Down
1 change: 1 addition & 0 deletions pkg/codegen/testing/test/testdata/dashed-import-schema/nodejs/package.json
View file
Expand Up @@ -9,6 +9,7 @@
"@pulumi/pulumi": "^3.12"
},
"devDependencies": {
"@types/node": "^14",
"typescript": "^3.7.0"
},
"pulumi": {
Expand Down
1 change: 1 addition & 0 deletions pkg/codegen/testing/test/testdata/different-enum/nodejs/package.json
View file
Expand Up @@ -9,6 +9,7 @@
"@pulumi/pulumi": "^3.12"
},
"devDependencies": {
"@types/node": "^14",
"typescript": "^3.7.0"
},
"pulumi": {
Expand Down
7 changes: 3 additions & 4 deletions pkg/codegen/testing/test/testdata/external-node-compatibility/nodejs/package.json
View file
Expand Up @@ -6,14 +6,13 @@
"install": "node scripts/install-pulumi-plugin.js resource example ${VERSION}"
},
"dependencies": {
"@pulumi/google-native": "^0.11.0"
"@pulumi/google-native": "^0.11.0",
"@pulumi/pulumi": "^3.42.0"
},
"devDependencies": {
"@types/node": "^14",
"typescript": "^4.3.5"
},
"peerDependencies": {
"@pulumi/pulumi": "latest"
},
"pulumi": {
"resource": true,
"name": "example"
Expand Down
5 changes: 2 additions & 3 deletions pkg/codegen/testing/test/testdata/external-resource-schema/nodejs/package.json
View file
Expand Up @@ -8,14 +8,13 @@
"dependencies": {
"@pulumi/aws": "^4.19.0",
"@pulumi/kubernetes": "^3.7.0",
"@pulumi/pulumi": "^3.42.0",
"@pulumi/random": "^4.2.0"
},
"devDependencies": {
"@types/node": "^14",
"typescript": "^4.3.5"
},
"peerDependencies": {
"@pulumi/pulumi": "latest"
},
"pulumi": {
"resource": true,
"name": "example"
Expand Down
1 change: 1 addition & 0 deletions pkg/codegen/testing/test/testdata/functions-secrets/dotnet/Pulumi.Mypkg.csproj
View file
Expand Up @@ -45,6 +45,7 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Pulumi" Version="3.*" />
</ItemGroup>

<ItemGroup>
Expand Down
6 changes: 3 additions & 3 deletions pkg/codegen/testing/test/testdata/functions-secrets/nodejs/package.json
View file
Expand Up @@ -5,13 +5,13 @@
"build": "tsc",
"install": "node scripts/install-pulumi-plugin.js resource mypkg ${VERSION}"
},
"dependencies": {
"@pulumi/pulumi": "^3.42.0"
},
"devDependencies": {
"@types/node": "latest",
"typescript": "^4.3.5"
},
"peerDependencies": {
"@pulumi/pulumi": "latest"
},
"pulumi": {
"resource": true,
"name": "mypkg"
Expand Down
1 change: 1 addition & 0 deletions pkg/codegen/testing/test/testdata/hyphen-url/dotnet/Pulumi.Registrygeoreplication.csproj
View file
Expand Up @@ -45,6 +45,7 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Pulumi" Version="3.*" />
<PackageReference Include="Pulumi.AzureNative" Version="1.28.*" ExcludeAssets="contentFiles" />
</ItemGroup>

Expand Down
1 change: 1 addition & 0 deletions pkg/codegen/testing/test/testdata/hyphen-url/nodejs/package.json
View file
Expand Up @@ -10,6 +10,7 @@
"@pulumi/pulumi": "^3.7.0"
},
"devDependencies": {
"@types/node": "^14",
"typescript": "^3.7.0"
},
"pulumi": {
Expand Down
1 change: 1 addition & 0 deletions pkg/codegen/testing/test/testdata/naming-collisions/dotnet/Pulumi.Example.csproj
View file
Expand Up @@ -45,6 +45,7 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Pulumi" Version="3.*" />
</ItemGroup>

<ItemGroup>
Expand Down
1 change: 1 addition & 0 deletions pkg/codegen/testing/test/testdata/naming-collisions/nodejs/package.json
View file
Expand Up @@ -9,6 +9,7 @@
"@pulumi/pulumi": "^3.12"
},
"devDependencies": {
"@types/node": "^14",
"typescript": "^3.7.0"
},
"pulumi": {
Expand Down
1 change: 1 addition & 0 deletions pkg/codegen/testing/test/testdata/nested-module-thirdparty/dotnet/Pulumi.FooBar.csproj
View file
Expand Up @@ -45,6 +45,7 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Pulumi" Version="3.*" />
</ItemGroup>

<ItemGroup>
Expand Down
1 change: 1 addition & 0 deletions pkg/codegen/testing/test/testdata/nested-module-thirdparty/nodejs/package.json
View file
Expand Up @@ -9,6 +9,7 @@
"@pulumi/pulumi": "^3.12"
},
"devDependencies": {
"@types/node": "^14",
"typescript": "^3.7.0"
},
"pulumi": {
Expand Down
1 change: 1 addition & 0 deletions pkg/codegen/testing/test/testdata/nested-module/nodejs/package.json
View file
Expand Up @@ -9,6 +9,7 @@
"@pulumi/pulumi": "^3.12"
},
"devDependencies": {
"@types/node": "^14",
"typescript": "^3.7.0"
},
"pulumi": {
Expand Down
1 change: 1 addition & 0 deletions pkg/codegen/testing/test/testdata/output-funcs-edgeorder/dotnet/Pulumi.Myedgeorder.csproj
View file
Expand Up @@ -45,6 +45,7 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Pulumi" Version="3.*" />
</ItemGroup>

<ItemGroup>
Expand Down
6 changes: 3 additions & 3 deletions pkg/codegen/testing/test/testdata/output-funcs-edgeorder/nodejs/package.json
View file
Expand Up @@ -5,14 +5,14 @@
"build": "tsc",
"install": "node scripts/install-pulumi-plugin.js resource myedgeorder ${VERSION}"
},
"dependencies": {
"@pulumi/pulumi": "^3.42.0"
},
"devDependencies": {
"@types/node": "latest",
"ts-node": "latest",
"typescript": "^4.3.5"
},
"peerDependencies": {
"@pulumi/pulumi": "latest"
},
"pulumi": {
"resource": true,
"name": "myedgeorder"
Expand Down
1 change: 1 addition & 0 deletions pkg/codegen/testing/test/testdata/output-funcs-tfbridge20/dotnet/Pulumi.Mypkg.csproj
View file
Expand Up @@ -50,6 +50,7 @@
<PackageReference Include="Moq" Version="4.13.1" />
<PackageReference Include="NUnit" Version="3.12.0" />
<PackageReference Include="NUnit3TestAdapter" Version="4.2.1" />
<PackageReference Include="Pulumi" Version="3.*" />
</ItemGroup>

<ItemGroup>
Expand Down
6 changes: 3 additions & 3 deletions pkg/codegen/testing/test/testdata/output-funcs-tfbridge20/nodejs/package.json
View file
Expand Up @@ -5,16 +5,16 @@
"build": "tsc",
"install": "node scripts/install-pulumi-plugin.js resource mypkg ${VERSION}"
},
"dependencies": {
"@pulumi/pulumi": "^3.42.0"
},
"devDependencies": {
"@types/mocha": "latest",
"@types/node": "latest",
"mocha": "latest",
"ts-node": "latest",
"typescript": "^4.3.5"
},
"peerDependencies": {
"@pulumi/pulumi": "latest"
},
"pulumi": {
"resource": true,
"name": "mypkg"
Expand Down
1 change: 1 addition & 0 deletions pkg/codegen/testing/test/testdata/output-funcs/dotnet/Pulumi.Mypkg.csproj
View file
Expand Up @@ -50,6 +50,7 @@
<PackageReference Include="Moq" Version="4.13.1" />
<PackageReference Include="NUnit" Version="3.12.0" />
<PackageReference Include="NUnit3TestAdapter" Version="4.2.1" />
<PackageReference Include="Pulumi" Version="3.*" />
</ItemGroup>

<ItemGroup>
Expand Down
6 changes: 3 additions & 3 deletions pkg/codegen/testing/test/testdata/output-funcs/nodejs/package.json
View file
Expand Up @@ -5,16 +5,16 @@
"build": "tsc",
"install": "node scripts/install-pulumi-plugin.js resource mypkg ${VERSION}"
},
"dependencies": {
"@pulumi/pulumi": "^3.42.0"
},
"devDependencies": {
"@types/mocha": "latest",
"@types/node": "latest",
"mocha": "latest",
"ts-node": "latest",
"typescript": "^4.3.5"
},
"peerDependencies": {
"@pulumi/pulumi": "latest"
},
"pulumi": {
"resource": true,
"name": "mypkg"
Expand Down
1 change: 1 addition & 0 deletions pkg/codegen/testing/test/testdata/plain-and-default/dotnet/Pulumi.FooBar.csproj
View file
Expand Up @@ -45,6 +45,7 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Pulumi" Version="3.*" />
</ItemGroup>

<ItemGroup>
Expand Down
1 change: 1 addition & 0 deletions pkg/codegen/testing/test/testdata/plain-and-default/nodejs/package.json
View file
Expand Up @@ -9,6 +9,7 @@
"@pulumi/pulumi": "^3.12"
},
"devDependencies": {
"@types/node": "^14",
"typescript": "^3.7.0"
},
"pulumi": {
Expand Down
1 change: 1 addition & 0 deletions pkg/codegen/testing/test/testdata/plain-object-defaults/dotnet/Pulumi.Example.csproj
View file
Expand Up @@ -45,6 +45,7 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Pulumi" Version="3.*" />
</ItemGroup>

<ItemGroup>
Expand Down
1 change: 1 addition & 0 deletions pkg/codegen/testing/test/testdata/plain-object-defaults/nodejs/package.json
View file
Expand Up @@ -9,6 +9,7 @@
"@pulumi/pulumi": "^3.12"
},
"devDependencies": {
"@types/node": "^14",
"typescript": "^3.7.0"
},
"pulumi": {
Expand Down
1 change: 1 addition & 0 deletions pkg/codegen/testing/test/testdata/plain-object-disable-defaults/dotnet/Pulumi.Example.csproj
View file
Expand Up @@ -45,6 +45,7 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Pulumi" Version="3.*" />
</ItemGroup>

<ItemGroup>
Expand Down
1 change: 1 addition & 0 deletions pkg/codegen/testing/test/testdata/plain-object-disable-defaults/nodejs/package.json
View file
Expand Up @@ -9,6 +9,7 @@
"@pulumi/pulumi": "^3.12"
},
"devDependencies": {
"@types/node": "^14",
"typescript": "^3.7.0"
},
"pulumi": {
Expand Down
1 change: 1 addition & 0 deletions pkg/codegen/testing/test/testdata/plain-schema-gh6957/dotnet/Pulumi.Xyz.csproj
View file
Expand Up @@ -45,6 +45,7 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Pulumi" Version="3.*" />
<PackageReference Include="Pulumi.Aws" Version="4.*" ExcludeAssets="contentFiles" />
</ItemGroup>

Expand Down
1 change: 1 addition & 0 deletions pkg/codegen/testing/test/testdata/plain-schema-gh6957/nodejs/package.json
View file
Expand Up @@ -10,6 +10,7 @@
"@pulumi/pulumi": "^3.12"
},
"devDependencies": {
"@types/node": "^14",
"typescript": "^3.7.0"
},
"pulumi": {
Expand Down
1 change: 1 addition & 0 deletions pkg/codegen/testing/test/testdata/provider-config-schema/nodejs/package.json
View file
Expand Up @@ -9,6 +9,7 @@
"@pulumi/pulumi": "^3.12"
},
"devDependencies": {
"@types/node": "^14",
"typescript": "^3.7.0"
},
"pulumi": {
Expand Down

0 comments on commit e6e027e

Please sign in to comment.