2017-08-30 03:24:12 +02:00
|
|
|
// Copyright 2017, Pulumi Corporation. All rights reserved.
|
|
|
|
|
2017-08-23 01:56:15 +02:00
|
|
|
package engine
|
|
|
|
|
|
|
|
import (
|
|
|
|
"io/ioutil"
|
|
|
|
"os"
|
2017-11-30 17:14:47 +01:00
|
|
|
"path"
|
2017-08-23 01:56:15 +02:00
|
|
|
"path/filepath"
|
2017-11-30 17:14:47 +01:00
|
|
|
"strings"
|
2017-08-23 01:56:15 +02:00
|
|
|
|
|
|
|
"github.com/pkg/errors"
|
2017-11-16 16:49:07 +01:00
|
|
|
|
2017-09-22 04:18:21 +02:00
|
|
|
"github.com/pulumi/pulumi/pkg/encoding"
|
|
|
|
"github.com/pulumi/pulumi/pkg/pack"
|
|
|
|
"github.com/pulumi/pulumi/pkg/workspace"
|
2017-08-23 01:56:15 +02:00
|
|
|
)
|
|
|
|
|
2017-11-16 16:49:07 +01:00
|
|
|
type Pkginfo struct {
|
2017-08-30 03:24:12 +02:00
|
|
|
Pkg *pack.Package
|
|
|
|
Root string
|
2017-08-23 01:56:15 +02:00
|
|
|
}
|
|
|
|
|
2017-11-16 16:49:07 +01:00
|
|
|
// GetPwdMain returns the working directory and main entrypoint to use for this package.
|
|
|
|
func (pkginfo *Pkginfo) GetPwdMain() (string, string, error) {
|
|
|
|
pwd := pkginfo.Root
|
|
|
|
main := pkginfo.Pkg.Main
|
|
|
|
if main != "" {
|
2017-11-30 17:14:47 +01:00
|
|
|
// The path must be relative from the package root.
|
|
|
|
if filepath.IsAbs(main) {
|
|
|
|
return "", "", errors.New("project 'main' must be a relative path")
|
|
|
|
}
|
|
|
|
|
|
|
|
// Check that main is a subdirectory.
|
|
|
|
cleanPwd := filepath.Clean(pwd)
|
|
|
|
main = filepath.Clean(path.Join(cleanPwd, main))
|
|
|
|
if !strings.HasPrefix(main, cleanPwd) {
|
|
|
|
return "", "", errors.New("project 'main' must be a subfolder")
|
2017-11-16 16:49:07 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
// So that any relative paths inside of the program are correct, we still need to pass the pwd
|
|
|
|
// of the main program's parent directory. How we do this depends on if the target is a dir or not.
|
|
|
|
maininfo, err := os.Stat(main)
|
|
|
|
if err != nil {
|
|
|
|
return "", "", errors.Wrapf(err, "project 'main' could not be read")
|
|
|
|
}
|
|
|
|
if maininfo.IsDir() {
|
|
|
|
pwd = main
|
|
|
|
main = ""
|
|
|
|
} else {
|
|
|
|
pwd = filepath.Dir(main)
|
|
|
|
main = filepath.Base(main)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return pwd, main, nil
|
|
|
|
}
|
|
|
|
|
|
|
|
// ReadPackageFromArg reads a package from an argument value. It can be "-" to request reading from Stdin, and is
|
2017-08-23 01:56:15 +02:00
|
|
|
// interpreted as a path otherwise. If an error occurs, it is printed to Stderr, and the returned value will be nil.
|
|
|
|
// In addition to the package, a root directory is returned that the compiler should be formed over, if any.
|
2017-11-16 16:49:07 +01:00
|
|
|
func ReadPackageFromArg(arg string) (*Pkginfo, error) {
|
2017-08-30 03:24:12 +02:00
|
|
|
// If the arg is "-", read from stdin.
|
2017-08-23 01:56:15 +02:00
|
|
|
if arg == "-" {
|
2017-11-16 16:49:07 +01:00
|
|
|
return ReadPackageFromStdin()
|
2017-08-23 01:56:15 +02:00
|
|
|
}
|
|
|
|
|
2017-08-30 03:24:12 +02:00
|
|
|
// If the path is empty, we need to detect it based on the current working directory.
|
|
|
|
var path string
|
|
|
|
if arg == "" {
|
|
|
|
pwd, err := os.Getwd()
|
|
|
|
if err != nil {
|
|
|
|
return nil, err
|
|
|
|
}
|
|
|
|
path = pwd
|
|
|
|
// Now that we got here, we have a path, so we will try to load it.
|
Improve the overall cloud CLI experience
This improves the overall cloud CLI experience workflow.
Now whether a stack is local or cloud is inherent to the stack
itself. If you interact with a cloud stack, we transparently talk
to the cloud; if you interact with a local stack, we just do the
right thing, and perform all operations locally. Aside from sometimes
seeing a cloud emoji pop-up ☁️, the experience is quite similar.
For example, to initialize a new cloud stack, simply:
$ pulumi login
Logging into Pulumi Cloud: https://pulumi.com/
Enter Pulumi access token: <enter your token>
$ pulumi stack init my-cloud-stack
Note that you may log into a specific cloud if you'd like. For
now, this is just for our own testing purposes, but someday when we
support custom clouds (e.g., Enterprise), you can just say:
$ pulumi login --cloud-url https://corp.acme.my-ppc.net:9873
The cloud is now the default. If you instead prefer a "fire and
forget" style of stack, you can skip the login and pass `--local`:
$ pulumi stack init my-faf-stack --local
If you are logged in and run `pulumi`, we tell you as much:
$ pulumi
Usage:
pulumi [command]
// as before...
Currently logged into the Pulumi Cloud ☁️
https://pulumi.com/
And if you list your stacks, we tell you which one is local or not:
$ pulumi stack ls
NAME LAST UPDATE RESOURCE COUNT CLOUD URL
my-cloud-stack 2017-12-01 ... 3 https://pulumi.com/
my-faf-stack n/a 0 n/a
And `pulumi stack` by itself prints information like your cloud org,
PPC name, and so on, in addition to the usuals.
I shall write up more details and make sure to document these changes.
This change also fairly significantly refactors the layout of cloud
versus local logic, so that the cmd/ package is resonsible for CLI
things, and the new pkg/backend/ package is responsible for the
backends. The following is the overall resulting package architecture:
* The backend.Backend interface can be implemented to substitute
a new backend. This has operations to get and list stacks,
perform updates, and so on.
* The backend.Stack struct is a wrapper around a stack that has
or is being manipulated by a Backend. It resembles our existing
Stack notions in the engine, but carries additional metadata
about its source. Notably, it offers functions that allow
operations like updating and deleting on the Backend from which
it came.
* There is very little else in the pkg/backend/ package.
* A new package, pkg/backend/local/, encapsulates all local state
management for "fire and forget" scenarios. It simply implements
the above logic and contains anything specific to the local
experience.
* A peer package, pkg/backend/cloud/, encapsulates all logic
required for the cloud experience. This includes its subpackage
apitype/ which contains JSON schema descriptions required for
REST calls against the cloud backend. It also contains handy
functions to list which clouds we have authenticated with.
* A subpackage here, pkg/backend/state/, is not a provider at all.
Instead, it contains all of the state management functions that
are currently shared between local and cloud backends. This
includes configuration logic -- including encryption -- as well
as logic pertaining to which stacks are known to the workspace.
This addresses pulumi/pulumi#629 and pulumi/pulumi#494.
2017-12-02 16:29:46 +01:00
|
|
|
pkgpath, err := workspace.DetectPackageFrom(path)
|
2017-08-30 03:24:12 +02:00
|
|
|
if err != nil {
|
|
|
|
return nil, errors.Errorf("could not locate a package to load: %v", err)
|
|
|
|
} else if pkgpath == "" {
|
2017-12-03 14:38:31 +01:00
|
|
|
return nil, errors.Errorf("could not find Pulumi.yaml (searching upwards from %s)", path)
|
2017-08-30 03:24:12 +02:00
|
|
|
}
|
|
|
|
path = pkgpath
|
|
|
|
} else {
|
|
|
|
path = arg
|
|
|
|
}
|
|
|
|
|
|
|
|
// Finally, go ahead and load the package directly from the path that we ended up with.
|
2017-11-16 16:49:07 +01:00
|
|
|
return ReadPackage(path)
|
2017-08-23 01:56:15 +02:00
|
|
|
}
|
|
|
|
|
2017-11-16 16:49:07 +01:00
|
|
|
// ReadPackageFromStdin attempts to read a package from Stdin; if an error occurs, it will be printed to Stderr, and
|
2017-08-23 01:56:15 +02:00
|
|
|
// the returned value will be nil.
|
2017-11-16 16:49:07 +01:00
|
|
|
func ReadPackageFromStdin() (*Pkginfo, error) {
|
2017-08-23 01:56:15 +02:00
|
|
|
// If stdin, read the package from text, and then create a compiler using the working directory.
|
|
|
|
b, err := ioutil.ReadAll(os.Stdin)
|
|
|
|
if err != nil {
|
2017-08-30 03:24:12 +02:00
|
|
|
return nil, errors.Wrapf(err, "could not read package from stdin")
|
2017-08-23 01:56:15 +02:00
|
|
|
}
|
|
|
|
|
2017-08-30 03:24:12 +02:00
|
|
|
m := encoding.Marshalers[".json"]
|
2017-10-17 20:27:54 +02:00
|
|
|
var pkg pack.Package
|
|
|
|
err = m.Unmarshal(b, &pkg)
|
2017-08-30 03:24:12 +02:00
|
|
|
if err != nil {
|
|
|
|
return nil, errors.Wrap(err, "a problem occurred when unmarshaling stdin into a package")
|
|
|
|
}
|
2017-08-31 19:21:17 +02:00
|
|
|
if err = pkg.Validate(); err != nil {
|
|
|
|
return nil, err
|
|
|
|
}
|
|
|
|
|
2017-11-16 16:49:07 +01:00
|
|
|
return &Pkginfo{
|
2017-10-17 20:27:54 +02:00
|
|
|
Pkg: &pkg,
|
2017-08-30 03:24:12 +02:00
|
|
|
Root: "",
|
|
|
|
}, nil
|
2017-08-23 01:56:15 +02:00
|
|
|
}
|
|
|
|
|
2017-11-16 16:49:07 +01:00
|
|
|
// ReadPackage attempts to read a package from the given path; if an error occurs, it will be printed to Stderr, and
|
2017-08-23 01:56:15 +02:00
|
|
|
// the returned value will be nil. If the path is a directory, nil is returned.
|
2017-11-16 16:49:07 +01:00
|
|
|
func ReadPackage(path string) (*Pkginfo, error) {
|
2017-08-30 03:24:12 +02:00
|
|
|
// If the path refers to a directory, bail early.
|
2017-08-23 01:56:15 +02:00
|
|
|
info, err := os.Stat(path)
|
|
|
|
if err != nil {
|
2017-08-30 03:24:12 +02:00
|
|
|
return nil, errors.Wrapf(err, "could not read path '%v'", path)
|
|
|
|
} else if info.IsDir() {
|
2017-11-16 16:49:07 +01:00
|
|
|
return nil, errors.Errorf("path '%v' is a directory and not a path to package file", path)
|
2017-08-23 01:56:15 +02:00
|
|
|
}
|
|
|
|
|
2017-10-17 20:27:54 +02:00
|
|
|
pkg, err := pack.Load(path)
|
2017-08-23 01:56:15 +02:00
|
|
|
if err != nil {
|
2017-08-31 19:21:17 +02:00
|
|
|
return nil, err
|
|
|
|
}
|
|
|
|
|
2017-11-16 16:49:07 +01:00
|
|
|
return &Pkginfo{
|
2017-08-30 03:24:12 +02:00
|
|
|
Pkg: pkg,
|
|
|
|
Root: filepath.Dir(path),
|
|
|
|
}, nil
|
2017-08-23 01:56:15 +02:00
|
|
|
}
|