Compare commits
4 commits
master
...
pgavlin/sc
Author | SHA1 | Date | |
---|---|---|---|
b95932b8d6 | |||
289989689b | |||
04c9402887 | |||
38a5f976e7 |
|
@ -3,14 +3,17 @@
|
|||
- [cli] - Differentiate in-progress actions by bolding output.
|
||||
[#7918](https://github.com/pulumi/pulumi/pull/7918)
|
||||
|
||||
- [CLI] Adding the ability to set `refresh: always` in an options object at a Pulumi.yaml level
|
||||
- [cli] Add the ability to set `refresh: always` in an options object at a Pulumi.yaml level
|
||||
to allow a user to be able to always refresh their derivative stacks by default
|
||||
[#8071](https://github.com/pulumi/pulumi/pull/8071)
|
||||
|
||||
- [cli] Add `pulumi schema generate-sdk`. This command generates language-specific SDKs from a package schema.
|
||||
[#7876](https://github.com/pulumi/pulumi/pull/7876)
|
||||
|
||||
### Bug Fixes
|
||||
|
||||
- [codegen/go] - Fix generation of cyclic struct types.
|
||||
[#8049](https://github.com/pulumi/pulumi/pull/8049)
|
||||
|
||||
- [sdk/go] - Fix --target / --replace args
|
||||
[#8109](https://github.com/pulumi/pulumi/pull/8109)
|
||||
[#8109](https://github.com/pulumi/pulumi/pull/8109)
|
||||
|
|
|
@ -15,8 +15,16 @@
|
|||
package main
|
||||
|
||||
import (
|
||||
"encoding/json"
|
||||
"fmt"
|
||||
"io/ioutil"
|
||||
"os"
|
||||
"path/filepath"
|
||||
|
||||
"github.com/pulumi/pulumi/pkg/v3/codegen/schema"
|
||||
"github.com/pulumi/pulumi/sdk/v3/go/common/util/cmdutil"
|
||||
"github.com/spf13/cobra"
|
||||
"gopkg.in/yaml.v3"
|
||||
)
|
||||
|
||||
func newSchemaCmd() *cobra.Command {
|
||||
|
@ -31,5 +39,43 @@ package schemas for errors.`,
|
|||
}
|
||||
|
||||
cmd.AddCommand(newSchemaCheckCommand())
|
||||
cmd.AddCommand(newSchemaGenerateSDKCommand())
|
||||
return cmd
|
||||
}
|
||||
|
||||
func loadSchemaSpec(path, kind string) (schema.PackageSpec, error) {
|
||||
// Read from stdin or a specified file
|
||||
reader := os.Stdin
|
||||
if path != "-" {
|
||||
f, err := os.Open(path)
|
||||
if err != nil {
|
||||
return schema.PackageSpec{}, fmt.Errorf("could not open %v: %w", path, err)
|
||||
}
|
||||
defer f.Close()
|
||||
|
||||
reader = f
|
||||
}
|
||||
schemaBytes, err := ioutil.ReadAll(reader)
|
||||
if err != nil {
|
||||
return schema.PackageSpec{}, fmt.Errorf("failed to read schema: %w", err)
|
||||
}
|
||||
|
||||
var pkgSpec schema.PackageSpec
|
||||
if kind == "" {
|
||||
if ext := filepath.Ext(path); ext == ".yaml" || ext == ".yml" {
|
||||
kind = "yaml"
|
||||
} else {
|
||||
kind = "json"
|
||||
}
|
||||
}
|
||||
|
||||
if kind == "yaml" {
|
||||
err = yaml.Unmarshal(schemaBytes, &pkgSpec)
|
||||
} else {
|
||||
err = json.Unmarshal(schemaBytes, &pkgSpec)
|
||||
}
|
||||
if err != nil {
|
||||
return schema.PackageSpec{}, fmt.Errorf("failed to unmarshal schema: %w", err)
|
||||
}
|
||||
return pkgSpec, nil
|
||||
}
|
||||
|
|
164
pkg/cmd/pulumi/schema_generate_sdk.go
Normal file
164
pkg/cmd/pulumi/schema_generate_sdk.go
Normal file
|
@ -0,0 +1,164 @@
|
|||
// Copyright 2016-2021, Pulumi Corporation.
|
||||
//
|
||||
// Licensed under the Apache License, Version 2.0 (the "License");
|
||||
// you may not use this file except in compliance with the License.
|
||||
// You may obtain a copy of the License at
|
||||
//
|
||||
// http://www.apache.org/licenses/LICENSE-2.0
|
||||
//
|
||||
// Unless required by applicable law or agreed to in writing, software
|
||||
// distributed under the License is distributed on an "AS IS" BASIS,
|
||||
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
// See the License for the specific language governing permissions and
|
||||
// limitations under the License.
|
||||
|
||||
package main
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
"os"
|
||||
"path"
|
||||
"path/filepath"
|
||||
"sort"
|
||||
|
||||
"github.com/hashicorp/hcl/v2"
|
||||
"github.com/spf13/cobra"
|
||||
|
||||
dotnetgen "github.com/pulumi/pulumi/pkg/v3/codegen/dotnet"
|
||||
gogen "github.com/pulumi/pulumi/pkg/v3/codegen/go"
|
||||
nodejsgen "github.com/pulumi/pulumi/pkg/v3/codegen/nodejs"
|
||||
pythongen "github.com/pulumi/pulumi/pkg/v3/codegen/python"
|
||||
"github.com/pulumi/pulumi/pkg/v3/codegen/schema"
|
||||
"github.com/pulumi/pulumi/sdk/v3/go/common/util/cmdutil"
|
||||
"github.com/pulumi/pulumi/sdk/v3/go/common/util/contract"
|
||||
)
|
||||
|
||||
func newSchemaGenerateSDKCommand() *cobra.Command {
|
||||
var target string
|
||||
var outputDirectory string
|
||||
|
||||
cmd := &cobra.Command{
|
||||
Use: "generate-sdk",
|
||||
Args: cmdutil.ExactArgs(1),
|
||||
Short: "Generate language SDKs from a Pulumi package schema",
|
||||
Long: "Generate language SDKs from a Pulumi package schema.\n" +
|
||||
"\n" +
|
||||
"Given a Pulumi package schema, write out language SDKs for the package.\n" +
|
||||
"The schema is validated as if by `pulumi schema check` prior to generation.\n" +
|
||||
"\n" +
|
||||
"Valid targets are dotnet, go, nodejs, and python. The 'all' target will\n" +
|
||||
"generate an SDK for each suported target.",
|
||||
Run: cmdutil.RunFunc(func(cmd *cobra.Command, args []string) error {
|
||||
if outputDirectory == "" {
|
||||
return fmt.Errorf("an output directory must be specified")
|
||||
}
|
||||
|
||||
pkgSpec, err := loadSchemaSpec(args[0], "")
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
pkg, diags, err := schema.BindSpec(pkgSpec, nil)
|
||||
if len(diags) != 0 {
|
||||
diagWriter := hcl.NewDiagnosticTextWriter(os.Stderr, nil, 0, true)
|
||||
wrErr := diagWriter.WriteDiagnostics(diags)
|
||||
contract.IgnoreError(wrErr)
|
||||
|
||||
if diags.HasErrors() {
|
||||
return fmt.Errorf("too many errors")
|
||||
}
|
||||
}
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
var files map[string][]byte
|
||||
switch target {
|
||||
case "all":
|
||||
files, err = genAllSDKs(pkg)
|
||||
case "dotnet":
|
||||
files, err = genDotnetSDK(pkg)
|
||||
case "go":
|
||||
files, err = genGoSDK(pkg)
|
||||
case "nodejs":
|
||||
files, err = genNodeSDK(pkg)
|
||||
case "python":
|
||||
files, err = genPythonSDK(pkg)
|
||||
default:
|
||||
return fmt.Errorf("unknown target '%v'", target)
|
||||
}
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
if err = os.MkdirAll(outputDirectory, 0755); err != nil {
|
||||
return err
|
||||
}
|
||||
paths := make([]string, 0, len(files))
|
||||
for p := range files {
|
||||
paths = append(paths, p)
|
||||
}
|
||||
sort.Strings(paths)
|
||||
for _, path := range paths {
|
||||
realPath := filepath.Join(outputDirectory, filepath.FromSlash(path))
|
||||
if err = os.MkdirAll(filepath.Dir(realPath), 0755); err != nil {
|
||||
return err
|
||||
}
|
||||
if err = os.WriteFile(realPath, files[path], 0600); err != nil {
|
||||
return err
|
||||
}
|
||||
}
|
||||
|
||||
return nil
|
||||
}),
|
||||
}
|
||||
|
||||
cmd.PersistentFlags().StringVarP(&target, "target", "t", "all",
|
||||
"the target language for SDK generation")
|
||||
cmd.PersistentFlags().StringVarP(&outputDirectory, "output-directory", "o", "",
|
||||
"the output directory for the generated SDK")
|
||||
|
||||
return cmd
|
||||
}
|
||||
|
||||
const toolName = "'pulumi schema generate-sdk'"
|
||||
|
||||
func genAllSDKs(pkg *schema.Package) (map[string][]byte, error) {
|
||||
files := map[string][]byte{}
|
||||
|
||||
gens := []struct {
|
||||
name string
|
||||
gen func(pkg *schema.Package) (map[string][]byte, error)
|
||||
}{
|
||||
{name: "dotnet", gen: genDotnetSDK},
|
||||
{name: "go", gen: genGoSDK},
|
||||
{name: "nodejs", gen: genNodeSDK},
|
||||
{name: "python", gen: genPythonSDK},
|
||||
}
|
||||
for _, g := range gens {
|
||||
sdk, err := g.gen(pkg)
|
||||
if err != nil {
|
||||
return nil, fmt.Errorf("failed to generate %v SDK: %w", g.name, err)
|
||||
}
|
||||
for file, contents := range sdk {
|
||||
files[path.Join(g.name, file)] = contents
|
||||
}
|
||||
}
|
||||
return files, nil
|
||||
}
|
||||
|
||||
func genDotnetSDK(pkg *schema.Package) (map[string][]byte, error) {
|
||||
return dotnetgen.GeneratePackage(toolName, pkg, nil)
|
||||
}
|
||||
|
||||
func genGoSDK(pkg *schema.Package) (map[string][]byte, error) {
|
||||
return gogen.GeneratePackage(toolName, pkg)
|
||||
}
|
||||
|
||||
func genNodeSDK(pkg *schema.Package) (map[string][]byte, error) {
|
||||
return nodejsgen.GeneratePackage(toolName, pkg, nil)
|
||||
}
|
||||
|
||||
func genPythonSDK(pkg *schema.Package) (map[string][]byte, error) {
|
||||
return pythongen.GeneratePackage(toolName, pkg, nil)
|
||||
}
|
Loading…
Reference in a new issue